diff --git a/setup.py b/setup.py
index 24f1543..6952486 100755
--- a/setup.py
+++ b/setup.py
@@ -150,7 +150,8 @@ def setShortcuts():
 			# Too slow on appearing, compared to the app menu
 			#
 			# if dename != "budgie":
-			cmdline("gsettings set org.gnome.desktop.wm.keybindings panel-main-menu \"['<Primary><Shift>Space','<Primary>Space']\"")
+			cmdline("gsettings reset org.gnome.desktop.wm.keybindings panel-main-menu")
+			# cmdline("gsettings set org.gnome.desktop.wm.keybindings panel-main-menu \"['<Primary><Shift>Space','<Primary>Space']\"")
 			# else:
 			# 	cmdline("gsettings set org.gnome.desktop.wm.keybindings panel-main-menu \"['<Alt>F1']\"")
 			# 	cmdline("gsettings set org.gnome.desktop.wm.keybindings panel-run-dialog \"['<Primary><Shift>Space','<Primary>Space']\"")
@@ -163,12 +164,14 @@ def setShortcuts():
 			cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-left ['']")
 			cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-right ['']")
 			cmdline("gsettings set org.gnome.desktop.wm.keybindings minimize \"['<Super>h','<Alt>F9']\"")
-			cmdline("gsettings set org.gnome.desktop.wm.keybindings panel-main-menu \"['<Primary><Shift>Space','<Primary>Space']\"")
+			cmdline("gsettings reset org.gnome.desktop.wm.keybindings panel-main-menu")
+			# cmdline("gsettings set org.gnome.desktop.wm.keybindings panel-main-menu \"['<Primary><Shift>Space','<Primary>Space']\"")
 		elif distro == "pop!_os" and dename == "gnome":
 			cmdline("gsettings set org.gnome.desktop.wm.keybindings close \"['<Alt>F4','<Super>w']\"")
 			cmdline("gsettings set org.gnome.desktop.wm.keybindings toggle-maximized \"['<Alt>F10','<Primary><Super>Up']\"")
 			cmdline("gsettings set org.gnome.desktop.wm.keybindings minimize \"['<Super>h','<Alt>F9']\"")
-			cmdline("gsettings set org.gnome.desktop.wm.keybindings panel-main-menu \"['<Primary><Shift>Space','<Primary>Space']\"")
+			cmdline("gsettings reset org.gnome.desktop.wm.keybindings panel-main-menu")
+			# cmdline("gsettings set org.gnome.desktop.wm.keybindings panel-main-menu \"['<Primary><Shift>Space','<Primary>Space']\"")
 			cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-up \"['<Super>Up','<Super>Left']\"")
 			cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-down \"['<Super>Down','<Super>Right']\"")
 			cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-left ['']")
@@ -182,7 +185,8 @@ def setShortcuts():
 				cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-applications-backward \"['<Primary>F14','<Primary><Shift>F14','<Alt><Shift>Tab']\"")
 			cmdline("gsettings set org.gnome.desktop.wm.keybindings show-desktop \"['<Super>d','<Super>Down']\"")
 			cmdline("gsettings set org.gnome.desktop.wm.keybindings toggle-maximized \"['<Alt>F10','<Super>Up']\"")
-			cmdline("gsettings set org.gnome.desktop.wm.keybindings panel-main-menu \"['<Control><Shift>Space','<Super>Space']\"")
+			cmdline("gsettings reset org.gnome.desktop.wm.keybindings panel-main-menu")
+			# cmdline("gsettings set org.gnome.desktop.wm.keybindings panel-main-menu \"['<Control><Shift>Space','<Super>Space']\"")
 			cmdline("gsettings set org.gnome.desktop.wm.keybindings minimize \"['<Super>h','<Alt>F9']\"")
 			cmdline("gsettings set org.gnome.desktop.wm.keybindings panel-main-menu \"['<Super>Space','<Primary>Space']\"")
 			if(kintotype == 2):
@@ -205,8 +209,11 @@ def setShortcuts():
 			cmdline('xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/<Primary><Shift>backslash" --create --type string --set "cycle_reverse_windows_key"')
 			# cmdline('xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/<Super>h" --create --type string --set "hide_window_key"')
 			# Don't need to undo other maps for menu
-			cmdline('xfconf-query --channel xfce4-keyboard-shortcuts --property "/commands/custom/<Primary>space" --create --type string --set "xfce4-popup-whiskermenu"')
-			cmdline('xfconf-query --channel xfce4-keyboard-shortcuts --property "/commands/custom/<Primary><Shift>space" --create --type string --set "xfce4-popup-whiskermenu"')
+			# cmdline('xfconf-query --channel xfce4-keyboard-shortcuts --property "/commands/custom/<Primary>space" --create --type string --set "xfce4-popup-whiskermenu"')
+			# cmdline('xfconf-query --channel xfce4-keyboard-shortcuts --property "/commands/custom/<Primary><Shift>space" --create --type string --set "xfce4-popup-whiskermenu"')
+			cmdline('xfconf-query --reset --channel xfce4-keyboard-shortcuts --property "/commands/custom/<Primary>space"')
+			cmdline('xfconf-query --reset --channel xfce4-keyboard-shortcuts --property "/commands/custom/<Primary><Shift>space"')
+			cmdline('xfconf-query --channel xfce4-keyboard-shortcuts --property "/commands/default/<Primary>Escape" --create --type string --set "xfce4-popup-whiskermenu"')
 			# Reset move to desktop shortcuts
 			cmdline('xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/<Primary><Alt>Home" --reset')
 			cmdline('xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/<Primary><Alt>End" --reset')
@@ -229,7 +236,8 @@ def setShortcuts():
 			cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-left ['']")
 			cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-right ['']")
 			cmdline("gsettings set org.gnome.desktop.wm.keybindings minimize \"['<Super>h','<Alt>F9']\"")
-			cmdline("gsettings set org.gnome.desktop.wm.keybindings panel-main-menu \"['<Primary><Shift>Space','<Primary>Space']\"")
+			# cmdline("gsettings set org.gnome.desktop.wm.keybindings panel-main-menu \"['<Primary><Shift>Space','<Primary>Space']\"")
+			cmdline("gsettings reset org.gnome.desktop.wm.keybindings panel-main-menu")
 			cmdline("gsettings set org.gnome.mutter.keybindings toggle-tiled-right \"['<Super><Alt>Right']\"")
 			cmdline("gsettings set org.gnome.mutter.keybindings toggle-tiled-left \"['<Super><Alt>Left']\"")
 			# org.gnome.mutter.keybindings toggle-tiled-right ['<Super>Right']
diff --git a/xkeysnail-config/kinto.py b/xkeysnail-config/kinto.py
index 4fd35e5..3a54d2f 100644
--- a/xkeysnail-config/kinto.py
+++ b/xkeysnail-config/kinto.py
@@ -91,8 +91,8 @@ define_keymap(re.compile("jetbrains-idea", re.IGNORECASE),{
     K("C-Super-g"): K("C-M-Shift-j"),           # Select all occurrences
     K("Super-Shift-g"): K("M-Shift-j"),         # Unselect occurrence
     # Editing
-    K("Super-Space"): K("C-Space"),             # Basic code completion
-    K("Super-Shift-Space"): K("C-Shift-Space"), # Smart code completion
+    K("Super-Space"): K("LC-Space"),            # Basic code completion
+    K("Super-Shift-Space"): K("LC-Shift-Space"),# Smart code completion
     K("Super-j"): K("C-q"),                     # Quick documentation lookup
     K("C-n"): K("M-Insert"),                    # Generate code...
     K("Super-o"): K("C-o"),                     # Override methods
@@ -170,6 +170,10 @@ define_keymap(re.compile(browserStr, re.IGNORECASE),{
 })
 
 define_keymap(None,{
+    # Launch Application Menu
+    # K("RC-Space"): K("Alt-F1"),                   # gnome
+    # K("RC-Space"): K("LC-Escape"),                # xfce4
+    # # K("RC-Space"): K(""),                       # kde
     # Basic App hotkey functions
     K("RC-Q"): K("Alt-F4"),
     K("RC-H"): K("Alt-F9"),
@@ -213,13 +217,13 @@ define_keymap(None,{
 })
 
 define_keymap(lambda wm_class: wm_class.casefold() not in mscodes,{
-    K("Super-Space"): K("C-Space"),         # Basic code completion
+    K("Super-Space"): K("LC-Space"),                    # Basic code completion
     # Wordwise remaining - for Everything but VS Code
-    K("M-Left"): K("C-Left"),               # Left of Word
-    K("M-Shift-Left"): K("C-Shift-Left"),   # Select Left of Word
-    K("M-Right"): K("C-Right"),             # Right of Word
-    K("M-Shift-Right"): K("C-Shift-Right"), # Select Right of Word
-    K("M-Shift-g"): K("C-Shift-g"),         # View source control
+    K("M-Left"): K("C-Left"),                           # Left of Word
+    K("M-Shift-Left"): K("C-Shift-Left"),               # Select Left of Word
+    K("M-Right"): K("C-Right"),                         # Right of Word
+    K("M-Shift-Right"): K("C-Shift-Right"),             # Select Right of Word
+    K("M-Shift-g"): K("C-Shift-g"),                     # View source control
     # ** VS Code fix **
     #   Electron issue precludes normal keybinding fix.
     #   Alt menu auto-focus/toggle gets in the way.
diff --git a/xkeysnail_service.sh b/xkeysnail_service.sh
index bbe8ce9..0e9e320 100755
--- a/xkeysnail_service.sh
+++ b/xkeysnail_service.sh
@@ -269,6 +269,10 @@ if [[ $1 == "1" || $1 == "2" || $1 == "3" || $1 == "winmac" || $1 == "mac" || $1
 	fi
 fi
 
+if [[ $dename == "gnome" || dename == "budgie" ]]; then
+	perl -pi -e "s/(# )(.*)(# gnome)/\$2\$3/g" ./xkeysnail-config/kinto.py.new
+fi
+
 if [[ $1 == "1" || $1 == "winmac" ]]; then
 	if ls /sys/module | grep hid_apple >/dev/null 2>&1 ; then
 		echo '1' | sudo tee /sys/module/hid_apple/parameters/swap_opt_cmd;echo 'options hid_apple swap_opt_cmd=1' | sudo tee /etc/modprobe.d/hid_apple.conf;sudo update-initramfs -u -k all