diff --git a/xkeysnail-config/trayapps/appindicator/kintotray.py b/xkeysnail-config/trayapps/appindicator/kintotray.py
index d196e06..4e6f6eb 100755
--- a/xkeysnail-config/trayapps/appindicator/kintotray.py
+++ b/xkeysnail-config/trayapps/appindicator/kintotray.py
@@ -18,6 +18,7 @@ class Indicator():
 
     homedir = os.path.expanduser("~")
     kconfig = homedir+"/.config/kinto/kinto.py"
+    ostype = os.environ.get('XDG_CURRENT_DESKTOP')
 
     enable_id = 0
     winmac_id = 0
@@ -183,10 +184,16 @@ class Indicator():
             subprocess.Popen(['notify-send','Kinto: Error Resetting KB Type!','-i','budgie-desktop-symbolic'])
 
     def setSysKB(self,button):
-        subprocess.Popen(['gnome-control-center','keyboard'])
+        if self.ostype == "XFCE":
+            subprocess.Popen(['xfce4-keyboard-settings'])
+        else:
+            subprocess.Popen(['gnome-control-center','keyboard'])
 
     def setRegion(self,button):
-        subprocess.Popen(['gnome-control-center','region'])
+        if self.ostype == "XFCE":
+            subprocess.Popen(['xfce4-keyboard-settings'])
+        else:
+            subprocess.Popen(['gnome-language-selector'])
 
     def quit(source):
         Gtk.main_quit()
diff --git a/xkeysnail_service.sh b/xkeysnail_service.sh
index c726a87..e6ae73c 100755
--- a/xkeysnail_service.sh
+++ b/xkeysnail_service.sh
@@ -201,7 +201,7 @@ rightalt=false
 vssublime=false
 
 if [[ $1 == "1" || $1 == "2" || $1 == "3" || $1 == "winmac" || $1 == "mac" || $1 == "chromebook" ]]; then
-	if [[ $dename == "gnome" || $dename == "budgie" || $dename == "mate" ]];then
+	if [[ $dename == "gnome" || $dename == "budgie" || $dename == "mate" || $dename == "xfce" ]];then
 		installtray=true
 		while true; do
 		read -rep $'\nWould you like to install the Kinto System Tray (AppInidcator)? (Y/n)\n' yn