diff --git a/.xkb/symbols/mac_term b/.xkb/symbols/mac_term
index 31ca621..6a57a0c 100644
--- a/.xkb/symbols/mac_term
+++ b/.xkb/symbols/mac_term
@@ -2,14 +2,14 @@ default partial xkb_symbols "mac_apple" {
     key <LWIN> {
       repeat= no,
       type= "ONE_LEVEL",
-      symbols[Group1]= [ Hyper_L ],
-      actions[group1]=[ SetMods(modifiers=Shift+Control) ]
+      symbols[Group1]= [ Control_L ],
+      actions[group1]=[ SetMods(modifiers=Control+Shift) ]
     };
     key <RWIN> {
       repeat= no,
       type= "ONE_LEVEL",
-      symbols[Group1]= [ Hyper_R ],
-      actions[group1]=[ SetMods(modifiers=Shift+Control) ]
+      symbols[Group1]= [ Control_R ],
+      actions[group1]=[ SetMods(modifiers=Control+Shift) ]
     };
 };
 partial xkb_symbols "mac_win" {
@@ -111,7 +111,7 @@ partial xkb_symbols "mac_global" {
             NoAction(),
             NoAction(),
             // Redirect(key=<FK13>) // Default cmdtab
-            // Redirect(key=<FK13>) // KDE cmdtab
+            // Redirect(key=<FK13>,clearmods=Shift) // KDE cmdtab
             // Redirect(key=<RGHT>,mods=Control+Shift,clearmods=Mod4+Super) // Elementary cmdtab
         ]
     };
diff --git a/setup.py b/setup.py
index 70795f7..4446977 100755
--- a/setup.py
+++ b/setup.py
@@ -135,7 +135,7 @@ def setShortcuts():
 			cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Switch to Previous Desktop" "Meta+Left,Meta+Left,Switch to Previous Desktop"')
 			cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Window Operations Menu" "none,Alt+F3,Window Operations Menu"')
 			cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Walk Through Windows" "Ctrl+F13,Alt+Tab,Walk Through Windows"')
-			cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Walk Through Windows Alternative" "Ctrl+Shift+F13,none,Walk Through Windows"')
+			cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Walk Through Windows Alternative" "none,none,Walk Through Windows"')
 			cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Walk Through Windows (Reverse)" "Ctrl+Shift+F14,Alt+Shift+Backtab,Walk Through Windows (Reverse)"')
 			cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Maximize Window" "none,Meta+PgUp,Maximize Window"')
 			cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Window Maximize" "Meta+Ctrl+F,Alt+F10,Maximize Window"')
@@ -145,6 +145,14 @@ def setShortcuts():
 		else:
 			print('distro: ' + distro + ' de: ' + dename)
 			print("A supported OS and DE was not found, you may not have full system level shortcuts installed.")
+		if dename == "gnome":
+			# Apply dconf update to make updates survive reboots
+			cmdline('dconf dump /org/gnome/desktop/wm/keybindings/ > tempkb.conf')
+			cmdline('dconf dump /org/gnome/mutter/keybindings/ > tempmt.conf')
+			cmdline('dconf load /org/gnome/desktop/wm/keybindings/ < tempkb.conf')
+			cmdline('dconf load /org/gnome/mutter/keybindings/ < tempmt.conf')
+			cmdline('sleep 1 && rm -f ./tempkb.conf;rm -f ./tempmt.conf')
+			# cmdline('dconf update')
 
 def windows_setup():
 	keymaps = ["Apple keyboard standard", "Apple keyboard w/ Caps lock as Esc", "Windows keyboard standard", "Windows keyboard w/ Caps lock as Esc","Uninstall"]
diff --git a/user_config.json b/user_config.json
index 92268c2..ba995ac 100644
--- a/user_config.json
+++ b/user_config.json
@@ -21,8 +21,8 @@
 	{
         "name": "firefox",
         "run": "",
-        "run_onInput": "killall xbindkeys > /dev/null 2>&1",
-        "run_offInput": "killall xbindkeys > /dev/null 2>&1;xbindkeys -f $HOME/.config/kinto/.firefox-nw",
+        "run_onInput": "pkill -f ~/.config/kinto/.firefox-nw",
+        "run_offInput": "xbindkeys -f $HOME/.config/kinto/.firefox-nw",
         "symbols": "",
         "types": "",
         "de": [],