diff --git a/addon.xml b/addon.xml
index 62aaadc..4aaed8e 100644
--- a/addon.xml
+++ b/addon.xml
@@ -4,6 +4,7 @@
   <requires>
 	<!-- jarvis -->
     <import addon="xbmc.python" version="2.26.0"/>
+    <import addon="script.module.kodi-six" version="0.1.0"/>
     <import addon="script.module.httplib2" version="0.8.0" />
     <import addon="script.module.oauth2client" version="4.1.2" />
     <import addon="script.module.uritemplate" version="0.6" />
diff --git a/default.py b/default.py
index 04cfe04..9062a64 100644
--- a/default.py
+++ b/default.py
@@ -1,5 +1,5 @@
 import sys, urlparse
-import xbmc, xbmcgui
+from kodi_six import xbmc, xbmcgui
 import resources.lib.utils as utils
 from resources.lib.backup import XbmcBackup
 
diff --git a/launcher.py b/launcher.py
index 0b0fa1b..6868fb8 100644
--- a/launcher.py
+++ b/launcher.py
@@ -1,8 +1,6 @@
 import sys
 import urlparse
-import xbmc
-import xbmcgui
-import xbmcvfs
+from kodi_six import xbmc, xbmcgui, xbmcvfs
 import resources.lib.utils as utils
 from resources.lib.authorizers import DropboxAuthorizer,GoogleDriveAuthorizer
 from resources.lib.advanced_editor import AdvancedBackupEditor
diff --git a/resources/lib/advanced_editor.py b/resources/lib/advanced_editor.py
index 84c41ac..2c21779 100644
--- a/resources/lib/advanced_editor.py
+++ b/resources/lib/advanced_editor.py
@@ -1,7 +1,5 @@
 import json
-import xbmcvfs
-import xbmc
-import xbmcgui
+from kodi_six import xbmc, xbmcgui, xbmcvfs
 from . import utils as utils
 
 class BackupSetManager:
diff --git a/resources/lib/authorizers.py b/resources/lib/authorizers.py
index 2799339..0763017 100644
--- a/resources/lib/authorizers.py
+++ b/resources/lib/authorizers.py
@@ -1,6 +1,4 @@
-import xbmc
-import xbmcgui
-import xbmcvfs
+from kodi_six import xbmc, xbmcgui, xbmcvfs
 import resources.lib.tinyurl as tinyurl
 import resources.lib.utils as utils
 
diff --git a/resources/lib/backup.py b/resources/lib/backup.py
index 370a702..70dc512 100644
--- a/resources/lib/backup.py
+++ b/resources/lib/backup.py
@@ -1,8 +1,6 @@
-import xbmc
-import xbmcgui
-import xbmcvfs
 import time
 import json
+from kodi_six import xbmc, xbmcgui, xbmcvfs
 from . import utils as utils
 from datetime import datetime
 from . vfs import XBMCFileSystem,DropboxFileSystem,ZipFileSystem,GoogleDriveFilesystem
diff --git a/resources/lib/guisettings.py b/resources/lib/guisettings.py
index 3c71752..63e7b0d 100644
--- a/resources/lib/guisettings.py
+++ b/resources/lib/guisettings.py
@@ -1,5 +1,5 @@
 import json
-import xbmc,xbmcvfs
+from kodi_six import xbmc, xbmcvfs
 from . import utils as utils
 from xml.dom import minidom
 from xml.parsers.expat import ExpatError
diff --git a/resources/lib/progressbar.py b/resources/lib/progressbar.py
index e68cb04..c84dfbf 100644
--- a/resources/lib/progressbar.py
+++ b/resources/lib/progressbar.py
@@ -1,4 +1,4 @@
-import xbmcgui
+from kodi_six import xbmcgui
 from . import utils as utils
 
 class BackupProgressBar:
diff --git a/resources/lib/utils.py b/resources/lib/utils.py
index 5b46261..6f28cca 100644
--- a/resources/lib/utils.py
+++ b/resources/lib/utils.py
@@ -1,6 +1,4 @@
-import xbmc
-import xbmcgui
-import xbmcaddon
+from kodi_six import xbmc, xbmcgui, xbmcaddon
 
 __addon_id__= 'script.xbmcbackup'
 __Addon = xbmcaddon.Addon(__addon_id__)
diff --git a/resources/lib/vfs.py b/resources/lib/vfs.py
index 34e73a2..4ddb7c5 100644
--- a/resources/lib/vfs.py
+++ b/resources/lib/vfs.py
@@ -1,9 +1,7 @@
-import xbmc
-import xbmcvfs
-import xbmcgui
 import zipfile
 import os.path
 import sys
+from kodi_six import xbmc, xbmcvfs, xbmcgui
 from . import dropbox
 from . import utils as utils
 from . dropbox.files import WriteMode,CommitInfo,UploadSessionCursor
diff --git a/scheduler.py b/scheduler.py
index 0c5acb3..32ba566 100644
--- a/scheduler.py
+++ b/scheduler.py
@@ -1,8 +1,6 @@
-import xbmc
-import xbmcvfs
-import xbmcgui
-from datetime import datetime
 import time
+from datetime import datetime
+from kodi_six import xbmc, xbmcvfs, xbmcgui
 import resources.lib.utils as utils
 from resources.lib.croniter import croniter
 from resources.lib.backup import XbmcBackup