diff --git a/keyswap_service.sh b/keyswap_service.sh
index a18a9cc..0f41f93 100755
--- a/keyswap_service.sh
+++ b/keyswap_service.sh
@@ -1,36 +1,12 @@
 #!/bin/bash
 
-swapbehavior=$1
-noswapcmd=$2
-
-systemtype=$3
-internalid=$4
-usbid=$5
-chromeswap=$6
-
-if [[ "$swapbehavior" == "1" ]]; then
-	swapcmd="\/bin\/bash\ \/home\/`whoami`\/.config\/xactive.sh\ ${systemtype}\ ${internalid}\ ${usbid}\ ${chromeswap}"
-	mkdir -p ~/.config/systemd/user
-	mkdir -p ~/.config/autostart
-	cp ./system-config/keyswap.service ~/.config/systemd/user/keyswap.service
-	cp ./system-config/keyswap.sh ~/.config/autostart/keyswap.sh
-	cp ./system-config/xactive.sh ~/.config/xactive.sh
-	cp ./system-config/keyswap_toggle.sh ~/.config/keyswap_toggle.sh
-	cp ./kintox11/binary/kintox11_ubuntu19-10 ~/.config/kintox11
-	cp ./kintox11/binary/kinto.json ~/.config/kinto.json
-	sed -i "s/{username}/`whoami`/g" ~/.config/systemd/user/keyswap.service
-	sed -i "s/ExecStart=/ExecStart=${swapcmd}/g" ~/.config/systemd/user/keyswap.service
-	systemctl --user enable keyswap
-	systemctl --user start keyswap
-else
-	#/usr/bin/setxkbmap
-	#/usr/bin/xkbcomp
-	#echo $XDG_SESSION_TYPE
-	if [ ! -f "~/.Xsession" ]; then
-		echo "$noswapcmd" > ~/.Xsession
-	fi
-	grep "xkb" ~/.Xsession 1>/dev/null
-	if [ $? -eq 1 ]; then
-		echo "$noswapcmd" >> ~/.Xsession
-	fi
-fi
\ No newline at end of file
+swapcmd="\/bin\/bash\ \/home\/`whoami`\/.config\/kinto\/kintox11"
+mkdir -p ~/.config/systemd/user
+mkdir -p ~/.config/autostart
+cp ./system-config/keyswap.service ~/.config/systemd/user/keyswap.service
+cp ./system-config/keyswap.sh ~/.config/autostart/keyswap.sh
+cp ./kintox11/binary/kintox11_ubuntu19-10 ~/.config/kinto/kintox11
+sed -i "s/{username}/`whoami`/g" ~/.config/systemd/user/keyswap.service
+sed -i "s/ExecStart=/ExecStart=${swapcmd}/g" ~/.config/systemd/user/keyswap.service
+systemctl --user enable keyswap
+systemctl --user start keyswap
\ No newline at end of file
diff --git a/kintox11/binary/kintox11_ubuntu19-10 b/kintox11/binary/kintox11_ubuntu19-10
index fed9721..6320156 100755
Binary files a/kintox11/binary/kintox11_ubuntu19-10 and b/kintox11/binary/kintox11_ubuntu19-10 differ
diff --git a/kintox11/src/kintox11.c b/kintox11/src/kintox11.c
index f5fb0a5..793ca59 100644
--- a/kintox11/src/kintox11.c
+++ b/kintox11/src/kintox11.c
@@ -128,7 +128,7 @@ int main(void){
 
   size_t i,n,r; 
 
-  fp = fopen("kinto.json","r");
+  fp = fopen("user_config.json","r");
   fread(buffer, 10240, 1, fp);
   fclose(fp);
 
diff --git a/system-config/keyswap.service b/system-config/keyswap.service
index 2834351..b7e3bd6 100755
--- a/system-config/keyswap.service
+++ b/system-config/keyswap.service
@@ -8,7 +8,7 @@ Type=simple
 #Group={username}
 Environment=DISPLAY=:0
 Restart=always
-WorkingDirectory=/home/{username}/.config/
+WorkingDirectory=/home/{username}/.config/kinto
 ExecStart=
 
 [Install]
diff --git a/user_config.json b/user_config.json
index f2b974c..4b2516a 100644
--- a/user_config.json
+++ b/user_config.json
@@ -30,7 +30,7 @@
 		"active": false,
 		"name":"gnome-term",
 		"description":"Gnome - Terminal - Superkey+Space opens Activities Overview",
-		"run":"gsettings set org.gnome.desktop.wm.keybindings panel-main-menu \"['<Super>Space']\""
+		"run":"gsettings set org.gnome.desktop.wm.keybindings panel-main-menu \"['<Control><Shift>Space']\""
 	},
 	{
 		"id": 3,