diff --git a/linux/gui/kinto-gui.py b/linux/gui/kinto-gui.py
index 5c50528..7f5c1c0 100755
--- a/linux/gui/kinto-gui.py
+++ b/linux/gui/kinto-gui.py
@@ -353,7 +353,7 @@ class MyWindow(Gtk.Window):
             self.queryConfig('cp '+os.environ['HOME']+'/.config/kinto/xkeysnail.desktop '+os.environ['HOME']+'/.config/autostart/xkeysnail.desktop')
         if self.options["systray"]:
             self.queryConfig('cp '+os.environ['HOME']+'/.config/kinto/kintotray.desktop '+os.environ['HOME']+'/.config/autostart/kintotray.desktop')
-            self.queryConfig("nohup python3 ~/.config/kinto/kintotray.py >/dev/null 2>&1 &")
+            self.queryConfig("nohup /usr/bin/python3 ~/.config/kinto/kintotray.py >/dev/null 2>&1 &")
             self.menuitem_systray.disconnect(self.menuitem_systray.signal_id)
             self.menuitem_systray.set_active(True)
             self.menuitem_systray.signal_id = self.menuitem_systray.connect('activate',self.checkTray,False)
@@ -616,7 +616,7 @@ class MyWindow(Gtk.Window):
         if tray_bool:
             Popen(['cp',os.environ['HOME']+'/.config/kinto/kintotray.desktop',os.environ['HOME']+'/.config/autostart/kintotray.desktop'])
             if not kintotray:
-                Popen([os.environ['HOME']+'/.config/kinto/kintotray.py'])
+                Popen(['/usr/bin/python3',os.environ['HOME']+'/.config/kinto/kintotray.py'])
             self.menuitem_systray.disconnect(self.menuitem_systray.signal_id)
             self.menuitem_systray.set_active(True)
             self.menuitem_systray.signal_id = self.menuitem_systray.connect('activate',self.checkTray,False)
diff --git a/linux/gui/kinto.desktop b/linux/gui/kinto.desktop
index 6d9d95d..b09a19e 100755
--- a/linux/gui/kinto.desktop
+++ b/linux/gui/kinto.desktop
@@ -4,7 +4,7 @@ Name=Kinto.sh
 GenericName=Kinto.sh
 Categories=Utility;
 Type=Application
-Exec={homedir}/.config/kinto/gui/kinto-gui.py
+Exec=/usr/bin/python3 {homedir}/.config/kinto/gui/kinto-gui.py
 Icon={homedir}/.config/kinto/kinto-color-48.svg
 # Icon=/usr/share/icons/Pocillo/kinto-color.svg
 Terminal=false
diff --git a/linux/trayapps/appindicator/kintotray.py b/linux/trayapps/appindicator/kintotray.py
index b6cae9f..5255a5d 100755
--- a/linux/trayapps/appindicator/kintotray.py
+++ b/linux/trayapps/appindicator/kintotray.py
@@ -116,6 +116,8 @@ class Indicator():
         with open(self.kconfig) as configfile:
             autostart_line = configfile.read().split('\n')[1]
 
+        autostart_bool = False
+
         # Autostart
         if "autostart = true" in autostart_line.casefold():
             autostart_bool = True
@@ -619,9 +621,9 @@ class Indicator():
     def runDebug(self,button,opendebug):
         try:
             if opendebug:
-                Popen([os.environ['HOME']+'/.config/kinto/gui/kinto-gui.py','-d'])
+                Popen(['/usr/bin/python3',os.environ['HOME']+'/.config/kinto/gui/kinto-gui.py','-d'])
             else:
-                Popen([os.environ['HOME']+'/.config/kinto/gui/kinto-gui.py'])
+                Popen(['/usr/bin/python3',os.environ['HOME']+'/.config/kinto/gui/kinto-gui.py'])
         except:
             Popen(['notify-send','Kinto: Error opening Kinto!'])
 
diff --git a/xkeysnail_service.sh b/xkeysnail_service.sh
index a3330fa..69749d6 100755
--- a/xkeysnail_service.sh
+++ b/xkeysnail_service.sh
@@ -554,17 +554,15 @@ if ! [[ $1 == "5" || $1 == "uninstall" || $1 == "Uninstall" ]]; then
 		xkeypath="/lib/systemd/system/"
 	fi
 	xhost +SI:localuser:root
-	git clone --depth 10 https://github.com/rbreaves/xkeysnail.git
+	git clone -b kinto --depth 10 https://github.com/rbreaves/xkeysnail.git
 	cd xkeysnail
-	git checkout kinto
 	giturl=$(git ls-remote --get-url)
 	if [ "$giturl" != "https://github.com/rbreaves/xkeysnail.git" ];then
 		echo -e "\nreplacing xkeysnail with fork...\n"
 		cd ..
 		rm -rf ./xkeysnail
-		git clone --depth 10 https://github.com/rbreaves/xkeysnail.git
+		git clone -b kinto --depth 10 https://github.com/rbreaves/xkeysnail.git
 		cd xkeysnail
-		git checkout kinto
 	fi
 	sudo pip3 install --upgrade .
 	cd ..