diff --git a/plugins/dbus_plugin/__init__.py b/plugins/dbus_plugin/__init__.py
index 3851c6bb9..e35d8d4db 100644
--- a/plugins/dbus_plugin/__init__.py
+++ b/plugins/dbus_plugin/__init__.py
@@ -1 +1 @@
-from plugin import DBusPlugin
+from .plugin import DBusPlugin
diff --git a/plugins/dbus_plugin/plugin.py b/plugins/dbus_plugin/plugin.py
index a3dcae62e..fa7842b16 100644
--- a/plugins/dbus_plugin/plugin.py
+++ b/plugins/dbus_plugin/plugin.py
@@ -34,7 +34,8 @@ Based on src/remote_control.py
 :license: GPL
 '''
 import os
-import new
+# import new # depricated in python3; use types instead
+import types
 
 import gobject
 
@@ -722,10 +723,9 @@ class DBusPlugin(GajimPlugin):
     def _set_handling_methods(self):
         for event_name in self.events_names:
             setattr(self, event_name,
-                            new.instancemethod(
+                            types.MethodType(
                                     self._generate_handling_method(event_name),
-                                    self,
-                                    DBusPlugin))
+                                    self))
             self.events_handlers[event_name] = (ged.POSTCORE,
                 getattr(self, event_name))
 
diff --git a/plugins/events_dump/__init__.py b/plugins/events_dump/__init__.py
index de174c1b9..99525a969 100644
--- a/plugins/events_dump/__init__.py
+++ b/plugins/events_dump/__init__.py
@@ -1 +1 @@
-from plugin import EventsDumpPlugin
+from .plugin import EventsDumpPlugin
diff --git a/plugins/events_dump/plugin.py b/plugins/events_dump/plugin.py
index 19c5eccfc..bd298911c 100644
--- a/plugins/events_dump/plugin.py
+++ b/plugins/events_dump/plugin.py
@@ -25,7 +25,7 @@ Dumps info about selected events to console.
 :license: GPL
 '''
 
-import new
+import types
 from pprint import pformat
 
 from plugins import GajimPlugin
@@ -110,15 +110,14 @@ class EventsDumpPlugin(GajimPlugin):
     def _set_handling_methods(self):
         for event_name in self.events_names:
             setattr(self, event_name,
-                            new.instancemethod(
+                            types.MethodType(
                                     self._generate_handling_method(event_name),
-                                    self,
-                                    EventsDumpPlugin))
+                                    self))
             self.events_handlers[event_name] = (ged.POSTCORE,
                                                                                getattr(self, event_name))
 
     def _generate_handling_method(self, event_name):
         def handler(self, *args):
-            print "Event '%s' occured. Arguments: %s\n\n===\n"%(event_name, pformat(args))
+            print ("Event '%s' occured. Arguments: %s\n\n===\n" % (event_name, pformat(args)))
 
         return handler
diff --git a/plugins/new_events_example/__init__.py b/plugins/new_events_example/__init__.py
index 523d43e14..075519934 100644
--- a/plugins/new_events_example/__init__.py
+++ b/plugins/new_events_example/__init__.py
@@ -1 +1 @@
-from plugin import NewEventsExamplePlugin
+from .plugin import NewEventsExamplePlugin
diff --git a/plugins/new_events_example/plugin.py b/plugins/new_events_example/plugin.py
index f66c0dda2..67de30c31 100644
--- a/plugins/new_events_example/plugin.py
+++ b/plugins/new_events_example/plugin.py
@@ -26,7 +26,7 @@ based on existing one.
 :license: GPL
 '''
 
-import new
+#import new # Depricated in python3 for types module
 from pprint import pformat
 
 from common import helpers
diff --git a/plugins/roster_buttons/__init__.py b/plugins/roster_buttons/__init__.py
index 48754d57c..5d12ff946 100644
--- a/plugins/roster_buttons/__init__.py
+++ b/plugins/roster_buttons/__init__.py
@@ -1,4 +1,4 @@
 
 __all__ = ['RosterButtonsPlugin']
 
-from plugin import RosterButtonsPlugin
+from .plugin import RosterButtonsPlugin
diff --git a/src/history_manager.py b/src/history_manager.py
index 6bee92053..1e48658de 100644
--- a/src/history_manager.py
+++ b/src/history_manager.py
@@ -49,7 +49,10 @@ if os.name == 'nt':
 
 import sys
 import signal
+import gi
+gi.require_version('Gtk', '3.0')
 from gi.repository import Gtk
+gi.require_version('GdkX11', '3.0')
 from gi.repository import Gdk
 from gi.repository import GLib
 import time
diff --git a/src/plugins/__init__.py b/src/plugins/__init__.py
index 07b0b6c56..a2c6986a6 100644
--- a/src/plugins/__init__.py
+++ b/src/plugins/__init__.py
@@ -25,6 +25,6 @@ Main file of plugins package.
 '''
 
 from .pluginmanager import PluginManager
-from .plugin import GajimPlugin
+from .gajimplugin import GajimPlugin
 
 __all__ = ['PluginManager', 'GajimPlugin']
diff --git a/src/plugins/plugin.py b/src/plugins/gajimplugin.py
similarity index 100%
rename from src/plugins/plugin.py
rename to src/plugins/gajimplugin.py
diff --git a/src/plugins/pluginmanager.py b/src/plugins/pluginmanager.py
index 7b53ee8f8..792a402ef 100644
--- a/src/plugins/pluginmanager.py
+++ b/src/plugins/pluginmanager.py
@@ -40,7 +40,7 @@ from common.exceptions import PluginsystemError
 
 from plugins.helpers import log, log_calls, Singleton
 from plugins.helpers import GajimPluginActivateException
-from plugins.plugin import GajimPlugin, GajimPluginException
+from plugins.GajimPlugin import GajimPlugin, GajimPluginException
 
 class PluginManager(metaclass=Singleton):
     '''