diff --git a/linux/kinto.py b/linux/kinto.py
index 5e68f72..0611087 100755
--- a/linux/kinto.py
+++ b/linux/kinto.py
@@ -22,7 +22,8 @@ remotes = [client.casefold() for client in remotes]
 
 # Add remote desktop clients & VMs for no remapping
 terminals.extend(remotes)
-mscodes.extend(remotes)
+remotes.extend(terminals)
+remotes = list(set(remotes))
 
 # Use for browser specific hotkeys
 browsers = ["Chromium","Chromium-browser","Google-chrome","microsoft-edge-dev","microsoft-edge","Epiphany","Firefox","Discord"]
@@ -210,7 +211,7 @@ define_keymap(re.compile("^jetbrains-(?!.*toolbox).*$", re.IGNORECASE),{
     # VCS/Local History
     K("Super-v"): K("M-Grave"),                 # VCS quick popup
     K("Super-c"): K("LC-c"),                    # Sigints - interrupt
-})
+},"Jetbrains")
 
 # Keybindings for Nautilus
 define_keymap(re.compile("org.gnome.nautilus", re.IGNORECASE),{
@@ -218,7 +219,7 @@ define_keymap(re.compile("org.gnome.nautilus", re.IGNORECASE),{
     K("RC-Down"): K("M-Down"),      # Go Down dir
     K("RC-Left"): K("M-Left"),      # Go Back
     K("RC-Right"): K("M-Right"),    # Go Forward
-})
+},"Nautilus - Finder")
 
 # Keybindings for Browsers
 define_keymap(re.compile(browserStr, re.IGNORECASE),{
@@ -244,19 +245,9 @@ define_keymap(re.compile("Firefox", re.IGNORECASE),{
 })
 define_keymap(re.compile(chromeStr, re.IGNORECASE),{
     K("C-comma"): [K("M-e"), K("s"),K("Enter")],
-})
+}, "Browsers")
 # Opera C-F12
 
-################################################################
-################################################################
-# THIS BLOCK IS TO BE REMOVED AFTER FIGURING OUT WHY GUI MAPPING 
-# IN NEXT BLOCK IS OVERRIDING TERMINAL MAPPING FOR SAME SHORTCUT
-define_keymap(re.compile(termStr, re.IGNORECASE),{
-    K("RC-Dot"): K("LC-c"),                         # Map Ctrl+Dot to Ctrl+C in terminals
-}, "Mapping Ctrl+Dot to Ctrl+C in terminals")
-################################################################
-################################################################
-
 # None referenced here originally
 # - but remote clients and VM software ought to be set here
 # These are the typical remaps for ALL GUI based apps
@@ -337,7 +328,7 @@ define_keymap(lambda wm_class: wm_class.casefold() not in remotes,{
     K("Alt-Delete"): K("C-Delete"),               # Delete Right Word of Cursor
     # K(""): pass_through_key,                      # cancel
     # K(""): K(""),                                 #
-})
+}, "General GUI")
 
 define_keymap(lambda wm_class: wm_class.casefold() not in mscodes,{
     # Wordwise remaining - for Everything but VS Code
@@ -360,7 +351,7 @@ define_keymap(lambda wm_class: wm_class.casefold() not in mscodes,{
     #   https://superuser.com/questions/770301/pentadactyl-how-to-disable-menu-bar-toggle-by-alt
     # **
     #
-})
+}, "Wordwise - not vscode")
 
 # Keybindings for VS Code
 define_keymap(re.compile(codeStr, re.IGNORECASE),{
@@ -546,7 +537,6 @@ define_keymap(re.compile(termStr, re.IGNORECASE),{
     K("RC-N"): K("C-Shift-N"),
     K("RC-M"): K("C-Shift-M"),
     K("RC-COMMA"): K("C-Shift-COMMA"),
-    # K("RC-DOT"): K("C-Shift-DOT"),
     K("RC-Dot"): K("LC-c"),
     K("RC-SLASH"): K("C-Shift-SLASH"),
     K("RC-KPASTERISK"): K("C-Shift-KPASTERISK"),