diff --git a/setup.py b/setup.py
index ca16875..2c94422 100755
--- a/setup.py
+++ b/setup.py
@@ -154,6 +154,8 @@ def setShortcuts():
 			if(kintotype == 1):
 				cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Walk Through Windows" "Ctrl+Tools,Alt+Tab,Walk Through Windows"')
 				cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Walk Through Windows (Reverse)" "Ctrl+Shift+Tools,Alt+Shift+Backtab,Walk Through Windows (Reverse)"')
+				cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Walk Through Windows of Current Application" "Alt+F6,none,Walk Through Windows of Current Application"')
+				cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Walk Through Windows of Current Application (Reverse)" "Alt+Shift+F6,none,Walk Through Windows of Current Application (Reverse)"')
 			else:
 				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 (Reverse)" "Ctrl+Shift+F14,Alt+Shift+Backtab,Walk Through Windows (Reverse)"')
diff --git a/xkeysnail-config/kinto.py b/xkeysnail-config/kinto.py
index 9dfdbca..5f2d3cb 100644
--- a/xkeysnail-config/kinto.py
+++ b/xkeysnail-config/kinto.py
@@ -67,7 +67,8 @@ define_keymap(None,{
     # Cmd Tab - App Switching Default
     K("RC-Tab"): K("RC-F13"),                     # Default
     K("RC-Shift-Tab"): K("RC-Shift-F13"),         # Default
-    K("RC-Grave"): K("RC-Shift-F13"),             # Default
+    K("RC-Grave"): K("M-F6"),                     # Default
+    K("RC-Shift-Grave"): K("M-Shift-F6"),         # Default
     # K("RC-Tab"): K("RC-backslash"),               # Chromebook
     # K("RC-Shift-Tab"): K("RC-Shift-backslash"),   # Chromebook
     # K("RC-Grave"): K("RC-Shift-backslash"),       # Chromebook
@@ -77,7 +78,6 @@ define_keymap(None,{
     # K("M-Grave") : K("C-Shift-Tab"),              # Chromebook - In-App Tab switching
     K("Super-Tab"): K("LC-Tab"),                  # Default
     K("Super-Shift-Tab"): K("LC-Shift-Tab"),      # Default
-    K("LC-Grave") : K("LC-Shift-Tab"),            # Default
 
     # Wordwise
     K("RC-Left"): K("Home"),                      # Beginning of Line