Merge pull request #268 from rbreaves/hotfix

- Additional fixes for Windows 10 user profile spaces
2025-08-02 17:16:39 +02:00 · 2020-08-24 14:31:40 -05:00 · 2020-08-24 14:30:50 -05:00 · 2020-08-24 03:59:11 -05:00 · 2020-08-24 03:57:22 -05:00 · 2020-08-24 03:50:16 -05:00
31 changed files with 5135 additions and 505 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.md
+++ b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -19,21 +19,16 @@ A clear and concise description of what you expected to happen.
 **Branch:** master, dev
 **Commit:** git rev-parse --short HEAD

-**Kinto Input Caret Status**
-```
-cat /tmp/kinto/caret
+Logs and status if relevant
 ```
+# xkeysnail
+sudo systemctl status xkeysnail
+sudo journalctl --unit=xkeysnail.service -b

-**Kinto Standard Log**
-```
+# xkb
+systemctl --user status keyswap
 journalctl --user-unit=keyswap.service -b
 ```
-**Kinto Debug Log (1.0.6-2+)**
-```
-systemctl --user stop keyswap
-cd ~/.config/kinto
-./kintox11 --debug
-```

 **Screenshots**
 If applicable, add screenshots to help explain your problem.
--- a/README.md
+++ b/README.md
@@ -1,24 +1,27 @@
 # Kinto

-![kinto_carrot](https://user-images.githubusercontent.com/10969616/77842401-4744b500-7157-11ea-854a-d7dec6f9a250.gif)
+![kinto-color-132](https://user-images.githubusercontent.com/10969616/84361571-7d5bd780-ab91-11ea-81bc-4d3a2ca51c4e.png)

-![alt text](https://raw.githubusercontent.com/rbreaves/kinto/master/Kinto.png)

 [![GitHub release](https://img.shields.io/github/release/rbreaves/kinto.svg)](https://github.com/rbreaves/kinto/releases/latest)

 \- Type in Linux & Windows like it's a Mac. \-

-Seamless copy and paste with all apps and terminals. Also the only linux remapper that is aware of your cursor/caret status - meaning it avoids shortcut conflicts within an app versus wordwise shortcuts when a text field is in use. (xkeysnail implementation of Kinto has caret checking disabled in master for now.)
+Seamless copy and paste with all apps and terminals. The zero effort solution.

 ## Table of Contents

 [What does this do exactly?](#What-does-this-do-exactly)

+[What's different from other remappers?](#Whats-different)
+
 [What does Kinto require?](#What-does-Kinto-require)

-[How to install](#How-to-install)
+[How to install (Linux)](#How-to-install-Linux)

-[Shortcut Creation (Xkeysnail)](#Shortcut-Creation-Xkeysnail)
+[How to install (Windows)](#How-to-install-Windows)
+
+[Shortcut Creation](#Shortcut-Creation)

 [Other Notes Related to Install](#Other-Notes-Related-to-Install)

@@ -40,21 +43,35 @@ Seamless copy and paste with all apps and terminals. Also the only linux remappe

 ## What does this do exactly?

-Kinto works for standard Windows, Apple and Chromebook keyboards. The following however describes the dynamic rebinding based on a standard Windows keyboard. (Alt location is Cmd for Apple keyboards)
-
- Normal apps - Alt → Ctrl, Win/Super → Alt, Ctrl → Win/Super
-
- Terminal apps - Alt → Ctrl+Shift, Win/Super → Alt, Ctrl → Ctrl
+Kinto works for standard Windows, Apple and Chromebook keyboards. The following however describes the dynamic rebinding based on a standard Windows/Mac keyboard.

 - Cursor/word-wise shortcut keys have been added to align with macOS keyboard shortcuts.

-Does Kinto have to have specific keyamps for individual apps?
+**GUI**
+|**Physical**| Ctrl  |  Win/Alt |  Alt/Cmd | Spacebar|
+|---|---|---|---|---|
+|**Virtual**|  Win/Super* | Alt  |  RCtrl |Spacebar|

-I'd say 90+% of the time no, but every OS has their default conventions that sometimes run afoul to macs. For this reason you can easily edit kinto.py or kinto.ahk to support the few shortcut keys Kinto may miss. If you do add additional support please consider forking this project and sharing your new keymaps with the rest of us!
+*Win/Super will properly remap to LCtrl when needed to fully support expected keymaps.
+
+**Terminal**
+|**Physical**| Ctrl  |  Win/Alt |  Alt/Cmd | Spacebar|
+|---|---|---|---|---|
+|**Virtual**|  LCtrl | Alt  |  RCtrl |Spacebar|
+
+## What's different?
+
+Compared to most other remappers ***this is a complete system-wide remap of your base level modifier keys***, this saves time. You're not going to die a death of a thousand papercuts from trying to support every shortcut key under the sun.
+
+It also retains some of the most commonly used system level shortcut keys, such as Cmd-C/V, Cmd-Tab, and Ctrl-Tab among others. You will keep seamless copy & paste between all apps, ability to switch Windows while still using the physical Cmd/Alt key position; switch tabs in your favorite terminals, code editors, or web browsers. Depending on your OS and/or Desktop Environment you may also be able to switch Virtual Desktop environments the same way as well and other basic system level shortcuts.
+
+If your OS and macOS have similar functionality on the system level, but only differ by a slight difference of a shortcut command then Kinto likely supports it already. If Kinto doesn't have what you need then you can open up a support ticket and it will be added. You can also fork the project to add the fix and I will merge it via a PR you make.
+
+Additionally, if you are using a cross-platform app and if it happens to have a few shortcut keys that differ then that can very easily be added to either the kinto.py or kinto.ahk configuration files which on Windows is located here `~/.kinto/kinto.ahk` and on Linux it can be found here `~/.config/kinto/kinto.py`. More info can be found here [Shortcut Creation (Xkeysnail)](#Shortcut-Creation-Xkeysnail) for Linux.

 ## What does Kinto require?

- Python (initial install only)
+- Python
 - systemd
 - x11
 - IBus*
@@ -62,29 +79,39 @@ I'd say 90+% of the time no, but every OS has their default conventions that som
 - Fedora/RHEL (may not work w/ xkeysnail, but original xkb version does)
 - xkeysnail (Recommended, but optional)

+Note: Budgie DE's, so Ubuntu Budgie, appears to have a bug where keybinds may not save across reboots. Please reset the Cmd+Tab keymap before rebooting to ensure it remembers that setting. I will remove this once the issue is resolved.
+
 *IBus is needed to support wordwise during browser app usage as the keymap will need to change slightly depending if the cursor/caret is on screen waiting for input. Setup.py will set it but you can manually set it as well or check your current Input Method.

-On most distros you can confirm navigate to your "Language Support" and set "Keyboard input method system:" to IBus for full word-wise support with web browsers. 
+On most distros you can confirm Input Methods by navigating to "Language Support" and set "Keyboard input method system:" to IBus for full word-wise support with web browsers. 

 Wayland support is planned, but not ready yet.

 ### Kinto for Windows 10 Requirements

- WSL Ubuntu edition
+- [Git for Windows](https://git-scm.com/download/win)
 - Powershell - run as Administrator
- Python3
+- [Python3](https://www.python.org/downloads/windows/)

 Other programs that will be installed when you run ./setup.py
 - Chocolatey
 - Autohotkey
+- Strawberry Perl

-Does not have complete parity with the Linux edition, but it does work and can be built on and added to as needed. Modify ./windows/kinto.ahk if you want to add more WSL editions or other terminals.
+Note: Sublime Text users should disable screen rotation hotkeys as they will interfere with multi-cursor and possibly other combos. See https://windowsloop.com/disable-screen-rotation-keyboard-shortcut/ for details.

-## How to install
+Users can now hotswap between Apple and Windows based keyboards without having to logoff and back on, and Windows is currently the only implementation with a system tray (but this feature is coming to Budgie, XFCE, Mate, Gnome, and lastly KDE).
+
+<img src="https://user-images.githubusercontent.com/10969616/84471498-100c7d00-ac4b-11ea-972d-60c1907831ec.png" width="50%">
+<img src="https://user-images.githubusercontent.com/10969616/84471501-10a51380-ac4b-11ea-9e0e-c19a7ebfad6d.png" width="50%">
+
+
+## How to install (Linux)

 1. clone this repo
 ```
 git clone https://github.com/rbreaves/kinto.git
+cd kinto
 ```
 2. Install python3 (If needed)

@@ -105,7 +132,43 @@ To Uninstall Kinto
 ./setup.py
 ```

-## Shortcut Creation (Xkeysnail)
+## How to Install (Windows)
+
+Video Tutorial: [How to Install Kinto.sh on Windows 10](https://youtu.be/sRk8A8krz40)
+
+1. Open Powershell (Right click and Run as Administrator)
+
+2. clone this repo
+```
+git clone https://github.com/rbreaves/kinto.git
+cd kinto
+```
+3. Install - Select keyboard type
+```
+py setup.py
+```
+
+4. How to make Kinto stay visible in system tray (optional)
+
+<img src="https://user-images.githubusercontent.com/10969616/85195077-2f338c00-b295-11ea-8aa3-e6aa06a9a279.png" width="50%" height="50%">
+<img src="https://user-images.githubusercontent.com/10969616/85195079-30fd4f80-b295-11ea-8bcd-257990b77dcb.png" width="50%" height="50%">
+<img src="https://user-images.githubusercontent.com/10969616/85195082-322e7c80-b295-11ea-8c81-320dab424c3c.png" width="50%" height="50%">
+
+To Uninstall Kinto - Select Uninstall
+
+```
+py setup.py
+```
+## Shortcut Creation
+
+Note: A new project, [Universal Keys](https://github.com/rbreaves/Universal-Keys), has been created that will be updated to contain all current remaps - plus many more. Once that is done, Kinto will be updated to programmatically pull the latest keymaps from simple csv comma delimited files & will build out key remaps from there. This will also allow for more types of remaps within an application category, Sublime Text 3 to VS Code or VS Code to Sublime Text 3, Photoshop to Gimp, Gimp to Photoshop, etc & it will ensure that xkeysnail (linux) & autohotkey (windows) are pulling from the same data set.
+
+[Linux Shortcut Creation (Xkeysnail)](#Linux-Xkeysnail)
+
+[Windows Shortcut Creation (Autohotkey)](#Windows-Autohotkey)
+
+
+## Linux (Xkeysnail)

 **GUI Keys**
 | Value| Description|Mac/Kinto Equivalent|
@@ -143,6 +206,46 @@ sudo systemctl restart xkeysnail

 More information can be seen on the readme page of [xkeysnail](https://github.com/mooz/xkeysnail).

+## Windows (Autohotkey)
+
+This applies to the Windows version of Kinto and how to add additional support for Applications. The configuration file location is `~/.kinto/kinto.ahk` and after updating it you will want to right click on the tray icon and click on setting your keyboard type again and it will re-apply the latest changes.
+
+Windows 10 has a couple of ways that you need to be aware of when trying to add a specific application, the typical method of how to add any exe program, but then there is also the newer UWP app format that some applications use which will require a similar but different method, both will be discussed.
+
+### Defining Keymaps Per App by EXE Name
+You can use the following legend **but** realize that these remaps reference the Virtual keys in the diagrams mentioned near the beginning of this document, so **do not** confuse it with the physical key unless they happen to be the same key.
+
+|Autohotkey Symbol|Virtual key|Description|
+|---|---|---|
+|^,Ctrl|Control|Primary modifier, 1st rock from the spacebar|
+|!,Alt|Alt|Secondary modifier, 2nd rock from the spacebar|
+|#,Win|Win/Super|Tertiary modifier, 3rd rock from the spacebar|
+
+```
+...
+#IfWinActive ahk_exe sublime_text.exe
+    #^Up::send !{O}                                         ; Switch file
+    #^f::send {F11}                                         ; toggle_full_screen
+    ^!v::send {Ctrl Down}k{Ctrl Up}{Ctrl Down}v{Ctrl Up}    ; paste_from_history
+    ...
+#If
+...
+```
+
+With this being Autohotkey you can easily pull knowledge from the Autohotkey forums for just about any issue you may have as well.
+
+### Defining Keymaps Per UWP App
+
+```
+#If WinActive("- OneNote ahk_class ApplicationFrameWindow", "OneNote")
+...
+    ; Add your keymaps here
+...
+#If
+```
+
+I don't have too many examples on this one, most developers seem to be shying away from UWP. Kinto currently supports "Fluent Terminal" which is a UWP app, but it is also being grouped with other Terminal apps for hotkey remapping. You may take a look at that, but you may also want to try creating a new Autohotkey file and use the Window Spy feature built into Autohotkey to help you discover the full name and class names of any application.
+
 ## Shortcut Creation (XKB)
 The older xkb shortcut method info can be read about in ticket [#125](https://github.com/rbreaves/kinto/issues/125).

@@ -234,6 +337,21 @@ systemctl --user stop keyswap && setxkbmap -option;setxkbmap -option altwin:swap

 ## Troubleshooting

+### Installed successfully, but modifier keys are not properly remapped?
+
+Are you using a VM on macOS? If so you may need to disable automatic remapping of the Cmd key when using Vmware Fusion of Parallels.
+
+Disable Parallels Re-mapping:
+1) Open Parallels and go to Preferences.
+2) Click Keyboard and disable the Virtual machine shortcuts.
+3) Close Preferences.
+
+To disable keyboard mapping:
+1) From Fusion's menu bar, click VMware Fusion > Preferences...
+2) Click Keyboard & Mouse.
+3) Click the Key Mappings tab.
+4) Deselect Enable Key Mapping.
+
 ### Does not start when you log in or after you reboot?

 Kinto (xkb/x11) = keyswap
@@ -309,7 +427,7 @@ cd ~/.config/kinto
 ./kintox11
 ```

-## Debug
+## Debug (Linux - xkb method only)

 If all else fails you can now run Kinto in debug mode as of 1.0.6-2. The output will become more verbose and I'd recommend running this directly after stopping the service.

@@ -346,11 +464,6 @@ sudo systemctl start xkeysnail
 sudo systemctl status xkeysnail
 ```

-## Notes about Windows 10
-Sharpkeys was used to create the layout/reg files to swap the Ctrl, Win and Alt keys. Sharpkeys was not required however because the reg keys were extracted. Autohotkey is used to manage keyswaps needed for terminal usage. Autohotkey is also used to add additional mac like keybinds for Sublime text and can be used for other apps as well.
-
-Microsoft is working on a new Powertoy Keyboard Manager that could be used with an easier to use GUI interface, but this approach should be fully sufficient for a mac like experience and autohotkeys appears to be more than capable enough to handle complex rebinding of any or most mac like shortcuts.
-
 ## Language Support
 I'd appreciate any help from people with non-US based keyboards, to help ensure that these keymaps and keyswap methods work in all or most languages.

@@ -363,12 +476,21 @@ https://superuser.com/questions/385748/binding-superc-superv-to-copy-and-paste

 Yet another keyboard remapping tool for X environment

+[mac-precision-touchpad](https://github.com/imbushuo/mac-precision-touchpad) by imbushuo
+
+Windows 10 touchpad to precision touchpad driver
+
 [fusuma](https://github.com/iberianpig/fusuma) by iberianpig

 Multitouch gestures with libinput driver on Linux

+[Facetime HD Camera for Linux](https://github.com/patjak/bcwc_pcie) by patjak
+
+Linux driver for Facetime HD on macbooks
+
 [Fluent Terminal - Windows only](https://github.com/felixse/FluentTerminal) by felixse

+
 A Terminal Emulator based on UWP and web technologies.

 [PowerToys - Windows only](https://github.com/microsoft/PowerToys) by microsoft
@@ -464,7 +586,7 @@ GPL v2

 I would just like to thank a few people here directly that have helped me tremendously with completing this project and without their support, direct, indirect or otherwise I would have had difficulty completing this undertaking. I will list these things off in chronological order mostly.

-First off I'd like to thank the Stackoverflow and Stackexchange community. I have probably rubbed some mods the wrong way over there, but the people from the community in general are extremely helpful and gracious and without their contributions would have made this much more difficult. The person I'd like to thank most though from over there is Glen Whitney. Without his detailed explaining of how to rebind keys in xkb this would not have come together at all, as every other remapping solution were non-starters as complexity increases.
+First off I'd like to thank the Stackoverflow and Stackexchange community. I have probably rubbed some mods the wrong way over there, but the people from the community in general are extremely helpful and gracious and without their contributions would have made this much more difficult. The person I'd like to thank most though from over there is Glen Whitney. Without his detailed explaining of how to rebind keys in xkb this would not have come together at all, as every other remapping solution were non-starters as complexity increases. *Kinto today no longer uses xkb, but Glen Whitney did provide the basis of a workable method that helped me pursue this method and think it was a worthwhile project to pursue, so for that I thank him.*

 Secondarily I'd like to thank Christian Eriksson*, as he provided information that kept me up at night.. literally. Even after I implemented a similar bash script to one he had suggested I knew that fully implementing a c/c++ solution was where Kinto needed to head to and his explaination was better than I remember it being now that I have gone back to read it again. He also never provided a full implementation of a c/c++ solution - he did hit on the pain points pretty well of what one would need to do and watch out for. I am not sure where I got the first example code of implementing a c based solution, but he definitely went over it well.

@@ -473,6 +595,10 @@ Kui and his gist file** was really the c based solution that I found had the few

 Lastly these four people were also very helpful to me as well. @probonopd for being one of the first people to install and use Kinto and gave me the initial feedback to include wordwise support! He also has really great articles*** posted on HackerNews & Medium about UI/UX design. Another person I'd like to thank is @owzim, his feedback allowed me to rapidly iterate and fix several bugs to support additional platforms better. The last two are members of the #ubuntu channel in IRC on freenode, tarzeau ( @alexmyczko ) and sarnold. Alex contributing a proper Makefile, so the project can be packaged properly, and sarnold help me find that IBus could resolve an issue I was having with needing to detect the caret status.

+**Updated 6/13/2020**
+
+I would also like to thank Jonathan Chun for his patience in helping me work through a very difficult problem related to Alt-Tab switching, which led to the current xkeysnail iteration of Kinto for Linux that far exceeds the original xkb implementation. There are also several others that have created issue tickets that have contributed greatly.
+
 If I left anyone out then I apologize, that was not intentional. I am happy to say that this project is at a state of completion. Bug fixes will primarily be the only activity happening going forward and possibly a rewrite for Wayland at some point. Contributions as mentioned above are welcomed, and will be merged into master if they help with the goal of making typing on linux more like a mac.

 *https://askubuntu.com/questions/1010276/can-i-act-on-the-event-that-a-window-opens-without-polling
--- a/assets/kinto-black-invert.ico
+++ b/assets/kinto-black-invert.ico
--- a/assets/kinto-black.ico
+++ b/assets/kinto-black.ico
--- a/assets/kinto-color-black-invert.ico
+++ b/assets/kinto-color-black-invert.ico
--- a/assets/kinto-color-black.ico
+++ b/assets/kinto-color-black.ico
--- a/assets/kinto-color-invert-border.ico
+++ b/assets/kinto-color-invert-border.ico
--- a/assets/kinto-color-invert.ico
+++ b/assets/kinto-color-invert.ico
--- a/assets/kinto-color-white-invert.ico
+++ b/assets/kinto-color-white-invert.ico
--- a/assets/kinto-color.ico
+++ b/assets/kinto-color.ico
--- a/assets/kinto-white-invert.ico
+++ b/assets/kinto-white-invert.ico
--- a/assets/kinto-white.ico
+++ b/assets/kinto-white.ico
--- a/keycheck.py
+++ b/keycheck.py
@@ -0,0 +1,344 @@
+#!/usr/bin/env python3
+
+# pip3 install pynput
+# pip3 install --no-deps pynput
+
+# from pynput.keyboard import Key, Listener
+import sys, subprocess, time, os
+from subprocess import PIPE, Popen
+delay=3
+
+def cmdline(command):
+    process = Popen(
+        args=command,
+        stdout=PIPE,
+        universal_newlines=True,
+        shell=True
+    )
+    return process.communicate()[0]
+
+class color:
+   PURPLE = '\033[95m'
+   CYAN = '\033[96m'
+   DARKCYAN = '\033[36m'
+   BLUE = '\033[94m'
+   GREEN = '\033[92m'
+   YELLOW = '\033[93m'
+   RED = '\033[91m'
+   BOLD = '\033[1m'
+   UNDERLINE = '\033[4m'
+   END = '\033[0m'
+
+def countdown(secs):
+    for i in range(0,secs):
+        print(secs-i, end="\r", flush=True)
+        time.sleep(1)
+
+def on_press(key):
+    print('{0} pressed'.format(key))
+
+def on_release(key):
+    # print('{0} release'.format(key))
+    if key == Key.esc:
+        # Stop listener
+        return False
+
+def yn_choice(message, default='y'):
+    choices = 'Y/n' if default.lower() in ('y', 'yes') else 'y/N'
+    choice = input("%s (%s) " % (message, choices))
+    values = ('y', 'yes', '') if choices == 'Y/n' else ('y', 'yes')
+    return choice.strip().lower() in values
+
+modifier_keys = {
+    "primary":"",
+    "secondary":"",
+    "rprimary":"",
+    "rsecondary":"",
+    "capslock":"",
+    "capswap":""
+}
+
+def set_key(key):
+    global modifier_keys
+    print("\nWhich key would you like to set?\n")
+
+    while True:
+        try:
+            keytype = int(input(
+                "1) Ctrl\n" +
+                "2) Alt\n" +
+                "3) Super/Win/Cmd/Chrome search key\n"))
+            if keytype < 4 and keytype > 0:
+                break
+        except:
+            print("That's not a valid option!")
+    print("")
+    if keytype == 1:
+        modifier_keys[key] = "Ctrl"
+    elif keytype == 2:
+        modifier_keys[key] = "Alt"
+    elif keytype == 3:
+        modifier_keys[key] = "Cmd"
+
+def set_cap():
+    global modifier_keys
+    print("\nWhich key would you like to swap?\n")
+
+    while True:
+        try:
+            keytype = int(input(
+                "1) Ctrl (swap)\n" +
+                "2) Ctrl (duplicate)\n" +
+                "3) Esc (swap)\n"))
+            if keytype < 4 and keytype > 0:
+                break
+        except:
+            print("That's not a valid option!")
+    print("")
+    if keytype == 1:
+        modifier_keys["capslock"] = "Ctrl-swap"
+    elif keytype == 2:
+        modifier_keys["capslock"] = "Ctrl-dup"
+    elif keytype == 3:
+        modifier_keys["capswap"] = "Escape"
+
+def is_primary(key):
+    global modifier_keys
+    if not (str(key).replace("Key.", "").title() == "Enter" or str(key).replace("Key.", "").title() == "Escape"):
+        print(str(key).replace("Key.", "").title() + " will be remapped to Ctrl, the Cmd ⌘  key position.")
+        # countdown(3)
+        modifier_keys["primary"] = str(key).replace("Key.", "").title()
+    elif str(key).replace("Key.", "").title() == "Escape":
+        modifier_keys["primary"] = "Escape"
+        # countdown(3)
+    else:
+        return True
+    return False
+
+def is_secondary(key):
+    global modifier_keys
+    if not (str(key).replace("Key.", "").title() == "Enter" or str(key).replace("Key.", "").title() == "Escape"):
+        print(str(key).replace("Key.", "").title() + " will be remapped to Alt, the Option ⌥  key position.")
+        # countdown(3)
+        modifier_keys["secondary"] = str(key).replace("Key.", "").title()
+        return False
+    elif str(key).replace("Key.", "").title() == "Escape":
+        modifier_keys["secondary"] = "Escape"
+        # countdown(3)
+        return False
+    else:
+        return True
+
+def is_rprimary(key):
+    global modifier_keys
+    if not (str(key).replace("Key.", "").title() == "Enter" or str(key).replace("Key.", "").title() == "Escape"):
+        print(str(key).replace("Key.", "").title() + " will be remapped to Ctrl, the Cmd ⌘  key position.")
+        # countdown(3)
+        modifier_keys["rprimary"] = str(key).replace("Key.", "").title()
+        return False
+    elif str(key).replace("Key.", "").title() == "Escape":
+        modifier_keys["rprimary"] = "Escape"
+        # countdown(3)
+        return False
+    else:
+        return True
+
+def is_rsecondary(key):
+    global modifier_keys
+    if not (str(key).replace("Key.", "").title() == "Enter" or str(key).replace("Key.", "").title() == "Escape"):
+        print(str(key).replace("Key.", "").title() + " will be remapped to Alt, the Option ⌥  key position.")
+        # countdown(3)
+        modifier_keys["rsecondary"] = str(key).replace("Key.", "").title()
+        return False
+    elif str(key).replace("Key.", "").title() == "Escape":
+        modifier_keys["rsecondary"] = "Escape"
+        # countdown(3)
+        return False
+    else:
+        return True
+
+
+print(color.UNDERLINE + color.YELLOW + "\n\nPlease ignore the FN key." + color.END + " FN cannot be remapped by software, some Thinkpads can swap it with Ctrl in the BIOS.\n")
+input("Press Enter to continue...\n\n")
+print(chr(27) + "[2J")
+
+counter = 0
+
+while True:
+    
+    print(color.UNDERLINE + color.YELLOW + "\n\nPress the 1st key Left of the spacebar" + color.END + " (Press Esc to set manaully)\n")
+    print("    👇")
+    print(" □ □ ▣ ░░░░░░░\n")
+    # listener = Listener(on_release=is_primary,suppress=True)
+    # listener.start()
+
+    # with Listener(
+    #     on_release=is_primary,suppress=True) as listener:
+    #         try:
+    #             listener.join()
+    #         except MyException as e:
+    #             print('{0} was pressed'.format(e.args[0]))
+
+    modifier_keys["primary"] = cmdline("xbindkeys -k | awk 'END {print $NF}'").strip()
+    print(modifier_keys["primary"] + " will be remapped to Ctrl, the Cmd ⌘  key position.")
+
+    if modifier_keys["primary"] != "Escape":
+        choice = yn_choice("Is this correct?")
+        if(choice):
+            # print("Left Physical " + modifier_keys["primary"] + " = Ctrl/Cmd ⌘")
+            # listener.stop()
+            # input("Press Enter to continue...\n\n")
+            break
+    else:
+        set_key("primary")
+        print("Left Physical " + modifier_keys["primary"] + " = Ctrl/Cmd ⌘\n")
+        # listener.stop()
+        input("Press Enter to continue...\n\n")
+        break
+    counter += 1
+    print(str(counter)+"\n")
+    time.sleep(1)
+
+print(chr(27) + "[2J")
+
+while True:
+    print(color.UNDERLINE + color.YELLOW + "\n\nPress the 2nd key Left of the spacebar" + color.END + " (Press Esc to set manaully)\n")
+    print("  👇")
+    print(" □ ▣ □ ░░░░░░░\n")
+    
+    # with Listener(
+    #     on_release=is_secondary,suppress=True) as listener:
+    #         try:
+    #             listener.join()
+    #         except MyException as e:
+    #             print('{0} was pressed'.format(e.args[0]))
+    modifier_keys["secondary"] = cmdline("xbindkeys -k | awk 'END {print $NF}'").strip()
+    print(modifier_keys["secondary"] + " will be remapped to Alt, the Option ⌥  key position.")
+
+    if modifier_keys["secondary"] != "Escape":
+        choice = yn_choice("Is this correct?")
+        if(choice):
+            # listener.stop()
+            # print("Left Physical " + modifier_keys["secondary"] + " = Alt/Option ⌥")
+            # input("Press Enter to continue...\n\n")
+            break
+    else:
+        set_key("secondary")
+        print("Left Physical " + modifier_keys["secondary"] + " = Alt/Option ⌥\n")
+        # listener.stop()
+        input("Press Enter to continue...\n\n")
+        break
+
+print(chr(27) + "[2J")
+
+while True:
+    print(color.UNDERLINE + color.YELLOW + "\n\nPress the 1st key Right of the spacebar" + color.END + " (Press Esc to set manaully)\n")
+    print("        👇")
+    print(" ░░░░░░░ ▣ □")
+    
+    # with Listener(
+    #     on_release=is_rprimary,suppress=True) as listener:
+    #         try:
+    #             listener.join()
+    #         except MyException as e:
+    #             print('{0} was pressed'.format(e.args[0]))
+    modifier_keys["rprimary"] = cmdline("xbindkeys -k | awk 'END {print $NF}'").strip()
+    print(modifier_keys["rprimary"] + " will be remapped to Ctrl, the Cmd ⌘  key position.")
+
+    if modifier_keys["rprimary"] != "Escape":
+        choice = yn_choice("Is this correct?")
+        if(choice):
+            # listener.stop()
+            # print("Right Physical " + modifier_keys["rprimary"] + " = Ctrl/Cmd ⌘")
+            # input("Press Enter to continue...\n\n")
+            break
+    else:
+        set_key("rprimary")
+        print("Right Physical " + modifier_keys["rprimary"] + " = Ctrl/Cmd ⌘\n")
+        # listener.stop()
+        input("Press Enter to continue...\n\n")
+        break
+
+print(chr(27) + "[2J")
+
+while True:
+    print(color.UNDERLINE + color.YELLOW + "\n\nPress the 2nd key Right of the spacebar" + color.END + " (Press Esc to set manaully)\n")
+    print("          👇")
+    print(" ░░░░░░░ □ ▣")
+
+    # with Listener(
+    #     on_release=is_rsecondary,suppress=True) as listener:
+    #         try:
+    #             listener.join()
+    #         except MyException as e:
+    #             print('{0} was pressed'.format(e.args[0]))
+    modifier_keys["rsecondary"] = cmdline("xbindkeys -k | awk 'END {print $NF}'").strip()
+    print(modifier_keys["rsecondary"] + " will be remapped to Alt, the Option ⌥  key position.")
+
+    if modifier_keys["rsecondary"] != "Escape":
+        choice = yn_choice("Is this correct?")
+        if(choice):
+            # listener.stop()
+            # print("Right Physical " + modifier_keys["rsecondary"] + " = Alt/Option ⌥")
+            # modifier_keys["rsecondary"] = str(os.system("xbindkeys -k | awk 'END {print $NF}'"))
+            break
+    else:
+        set_key("rsecondary")
+        print("Right Physical " + modifier_keys["rsecondary"] + " = Alt/Option ⌥\n")
+        # listener.stop()
+        input("Press Enter to continue...\n\n")
+        break
+
+print(chr(27) + "[2J")
+
+if not (modifier_keys["secondary"] == "Ctrl" or modifier_keys["secondary"] == "Control_R"):
+    print(color.UNDERLINE + color.YELLOW + "GUI Usage (Physical Ctrl key)\n"+ color.END)
+    print("Ctrl key will be mapped to Super. (Search key on chromebooks)")
+    print("👇")
+    print(" ▣ □ □ ░░░░░░░\n")
+
+    print("Note: Super may still activate Ctrl based shortcuts\n")
+    print("at times depending on application or system level shortcuts.\n")
+    print("This will only be done to align shortcuts to their expected functionality.\n")
+
+    input("Press Enter to continue...\n\n")
+    # print(chr(27) + "[2J")
+
+    print(color.UNDERLINE + color.YELLOW + "Terminal Usage" + color.END + "\n")
+    print("Ctrl key will be the Ctrl key.")
+    print("👇")
+    print(" ▣ □ □ ░░░░░░░\n")
+    print("The Cmd ⌘  key position during terminal usage will usually be Ctrl+Shift.")
+    print("    👇 ")
+    print(" □ □ ▣ ░░░░░░░\n")
+    input("Press Enter to continue...\n")
+else:
+    print("Chromebook detected.")
+
+    print(color.UNDERLINE + color.YELLOW + "GUI Usage\n"+ color.END)
+    print("Search key (capslock position) on chromebooks will be Super\n")
+
+    print("Note: Super may still activate Ctrl based shortcuts")
+    print("at times depending on application or system level shortcuts.\n")
+    print("Efforts have been made though to use the physical Ctrl key")
+    print("when it makes sense to do so, and more often than standard")
+    print("keyboards. How it feels to type is more important than technical")
+    print("accuracy.\n")
+    print("If you believe an improvement can be made or an error was made")
+    print("please let me know on github or you can fork this project.\n")
+
+    input("Press Enter to continue...\n\n")
+
+    print(color.UNDERLINE + color.YELLOW + "Terminal Usage" + color.END + "\n")
+    print(" □ capslock/search key = Alt")
+    print(" shift")
+    print(" ▣ □ ░░░░░░░")
+    print("☝️\n")
+
+    input("Press Enter to continue...\n\n")
+
+print(chr(27) + "[2J")
+
+choice = yn_choice(color.UNDERLINE + color.YELLOW + "Do you want to swap Capslock with another key?" + color.END + "\n","n")
+if(choice):
+    set_cap()
--- a/references/overlay.py
+++ b/references/overlay.py
@@ -1,138 +0,0 @@
-import wx
-# import wx.richtext as rt
-# import images
-# http://www.ccp4.ac.uk/dist/checkout/wxPython-src-3.0.2.0/wxPython/demo/RichTextCtrl.py
-# https://stackoverflow.com/questions/40257359/how-to-dynamically-update-multiple-wxpython-static-text
-
-def GetRoundBitmap( w, h, r ):
-    maskColor = wx.Colour(0,0,0)
-    shownColor = wx.Colour(5,5,5)
-    b = wx.EmptyBitmap(w,h)
-    dc = wx.MemoryDC(b)
-    dc.SetBrush(wx.Brush(maskColor))
-    dc.DrawRectangle(0,0,w,h)
-    dc.SetBrush(wx.Brush(shownColor))
-    dc.SetPen(wx.Pen(shownColor))
-    dc.DrawRoundedRectangle(0,0,w,h,r)
-    dc.SelectObject(wx.NullBitmap)
-    b.SetMaskColour(maskColor)
-    return b
-
-def GetRoundShape( w, h, r ):
-    return wx.Region( GetRoundBitmap(w,h,r) )
-
-class PanelOne(wx.Panel):
-    def __init__(self, parent):
-        wx.Panel.__init__(self, parent)
-        self.Bind(wx.EVT_KEY_UP, self.OnKeyDown)
-        wx.StaticText(self, label = "'^⌘G - Select All    (Ctrl-Cmd-G)        ^⌘G - Select All    (Ctrl-Cmd-G)\n^⌘G - Select All    (Ctrl-Cmd-G)        ^⌘G - Select All    (Ctrl-Cmd-G)")
-        self.SetTransparent( 220 )
-
-    def OnKeyDown(self, event):
-        self.Destroy()
-
-class FancyFrame(wx.Frame):
-    def __init__(self):
-        sizer = wx.GridBagSizer()
-        style = ( wx.CLIP_CHILDREN | wx.STAY_ON_TOP | wx.FRAME_NO_TASKBAR |
-                  wx.NO_BORDER | wx.FRAME_SHAPED  )
-        wx.Frame.__init__(self, None, title='Fancy', style = style)
-
-        # self.rtc = rt.RichTextCtrl(self, style=wx.VSCROLL|wx.TE_READONLY|wx.HSCROLL|wx.NO_BORDER);
-        # self.rtc.Disable()
-        boldstatic = wx.Font(pointSize = 24, family = wx.DEFAULT,
-               style = wx.BOLD, weight = wx.BOLD,
-               faceName = 'Consolas')
-        normalstatic = wx.Font(pointSize = 10, family = wx.DEFAULT,
-               style = wx.NORMAL, weight = wx.NORMAL,
-               faceName = 'Consolas')
-        # font = wx.Font(pointSize = 18, family = wx.DEFAULT,
-        #        style = wx.NORMAL, weight = wx.NORMAL,
-        #        faceName = 'Consolas')
-        self.SetFont(boldstatic)
-        self.SetBackgroundColour((211,211,211))
-        self.label = wx.StaticText(self, label = "^⌘G", pos = (100,50))
-        self.SetFont(normalstatic)
-        self.label2 = wx.StaticText(self, label = " - Select All    (Ctrl-Cmd-G)", pos = (200,50))
-        # sizer.Add(self.label, (4, 0), (1, 5), wx.EXPAND)
-        # sizer.Add(self.label2, (5, 0), (1, 5), wx.EXPAND)
-        # wx.StaticText(self, label = "^⌘G - Select All    (Ctrl-Cmd-G)  ||  ^⌘G - Select All    (Ctrl-Cmd-G)\n^⌘G - Select All    (Ctrl-Cmd-G)        ^⌘G - Select All    (Ctrl-Cmd-G)")
-        # self.rtc.Bind(wx.EVT_SET_FOCUS,self.OnInput)
-        # self.rtc.Bind(wx.EVT_KILL_FOCUS,self.OnInput)
-        # self.rtc.Bind(wx.EVT_KEY_UP, self.OnKeyDown)
-        # self.rtc.BeginFontSize(14)
-        # self.rtc.BeginBold()
-        # self.rtc.WriteText("^⌘G")
-        # self.rtc.EndBold()
-        # self.rtc.BeginFontSize(10)
-        # self.rtc.WriteText(" - Select All    (Ctrl-Cmd-G)\n")
-        # self.rtc.BeginFontSize(14)
-        # self.rtc.WriteText("Different font sizes on the same line is allowed, too.")
-        # self.rtc.EndFontSize()
-
-        # self.rtc.WriteText(" Next we'll show an indented paragraph.")
-
-        # self.rtc.BeginLeftIndent(60)
-        # self.rtc.Newline()
-
-        # self.rtc.WriteText("It was in January, the most down-trodden month of an Edinburgh winter. An attractive woman came into the cafe, which is nothing remarkable.")
-        # self.rtc.EndLeftIndent()
-        # self.SetFont(wx.Font(20, wx.SWISS, wx.NORMAL, wx.BOLD))
-        # font = wx.Font(18, wx.DECORATIVE, wx.ITALIC, wx.NORMAL)
-        # wx.text.SetFont(font)
-        # self.panelOne = PanelOne(self)
-        # self.SetFocus()
-        w, h = wx.GetDisplaySize()
-        self.SetSize((w/2, h/2))
-        self.SetPosition( ((w-w/2)/2,(h-h/2)/2) )
-        self.SetTransparent( 220 )
-
-        self.Bind(wx.EVT_KEY_UP, self.OnKeyDown)
-        self.Bind(wx.EVT_MOTION, self.OnMouse)
-        self.Bind(wx.EVT_PAINT, self.OnPaint)
-        if wx.Platform == '__WXGTK__':
-            self.Bind(wx.EVT_WINDOW_CREATE, self.SetRoundShape)
-        else:
-            self.SetRoundShape()
-
-        self.SetSizer(sizer)
-        self.Show(True)
-
-    
-    def OnInput(self, e):
-        self.Destroy()
-        # e.Skip()
-
-    def SetRoundShape(self, event=None):
-        w, h = self.GetSizeTuple()
-        self.SetShape(GetRoundShape( w,h, 10 ) )
-
-    def OnPaint(self, event):
-        dc = wx.PaintDC(self)
-        dc = wx.GCDC(dc)
-        w, h = self.GetSizeTuple()
-        r = 10
-        dc.SetPen( wx.Pen("#D3D3D3dth = 2"))
-        dc.SetBrush( wx.Brush("#D3D3D3"))
-        dc.DrawRoundedRectangle( 0,0,w,h,r )
-
-    def OnKeyDown(self, event):
-        # self.Close(force=True)
-        self.Destroy()
-
-    def OnMouse(self, event):
-        """implement dragging"""
-        if not event.Dragging():
-            self._dragPos = None
-            return
-        self.CaptureMouse()
-        if not self._dragPos:
-            self._dragPos = event.GetPosition()
-        else:
-            pos = event.GetPosition()
-            displacement = self._dragPos - pos
-            self.SetPosition( self.GetPosition() - displacement )
-
-app = wx.App()
-f = FancyFrame()
-app.MainLoop()
--- a/setup.py
+++ b/setup.py
@@ -1,48 +1,67 @@
 #!/usr/bin/env python3
-import json, time, os, sys, subprocess, shlex
+import json, time, os, sys, subprocess, shlex, platform
 from shutil import copyfile
 from subprocess import PIPE, Popen
 from prekinto import *

 homedir = os.path.expanduser("~")
+kintotype = 0

 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"]
+	keymaps = ["Apple keyboard standard", "Windows keyboard standard","Uninstall"]
 	for index, item in enumerate(keymaps):
 		print("    %i. %s" % (index+1, item.capitalize()))
 	default = 0
 	while not int(default) in range(1,len(keymaps)+1):
 		default = int(input("\nPlease enter your desired keymap (1 - " + str(len(keymaps)) + ") : "))
 	print("")
-	path= cmdline('echo %cd%')[:-1]
-	if default == 1:
-		os.system("regedit " + path + "\\windows\\macbook_winctrl_swap.reg")
-	elif default == 2:
-		os.system("regedit " + path + "\\windows\\macbook_winctrl_capsesc_swap.reg")
-	elif default == 3:
-		os.system("regedit " + path + "\\windows\\standard_ctrlalt_swap.reg")
-	elif default == 4:
-		os.system("regedit " + path + "\\windows\\standard_ctrlalt_capsesc_swap.reg")
-	elif default == 5:
-		os.system("regedit " + path + "\\windows\\remove_keyswap.reg")
-	stvscode = yn_choice(bcolors.CYELLOW2 + "Would you like to use Sublime Text 3 keymaps in VS Code?\n" + bcolors.ENDC)
-	if default > 0 and default < 5:
+	# Short DOS path notation
+	path= cmdline('echo ''%cd%''')[:-1]
+	if default > 0 and default < 3:
 		print("Will now install chocolatey and autohotkey with elevated privileges...")
 		print("This install will fail if you are not running with elevated privileges")
 		os.system('powershell -executionpolicy bypass ".\\windows\\autohotkey.ps1"')
-		os.system('refreshenv')
-		print("\nWill now install Ubuntu Terminal Theme as default...")
-		os.system("regedit " + path + "\\windows\\theme_ubuntu.reg")
 		print("Copying autohotkey combinations for Terminals & Editors...")
-		os.system("copy /Y " + path + "\\windows\\kinto.ahk " + path + "\\windows\\kinto-new.ahk")
+		os.system('copy /Y "' + path + '\\windows\\kinto.ahk" "' + path + '\\windows\\kinto-new.ahk"')
+	if default == 1:
+		os.system('C:\\Strawberry\\perl\\bin\\perl.exe -pi -e "s/(; )(.*)(; MacModifiers)/$2$3/g" .\\windows\\kinto-new.ahk')
+	elif default == 2:	
+		os.system('C:\\Strawberry\\perl\\bin\\perl.exe -pi -e "s/(; )(.*)(; WinModifiers)/$2$3/g" .\\windows\\kinto-new.ahk')
+	elif default == 3:
+		print("Removing any old registry keys from prior versions...")
+		p = subprocess.Popen(['powershell.exe', "Remove-ItemProperty -Path HKLM:'SYSTEM\CurrentControlSet\Control\Keyboard Layout' -Name 'Scancode Map' -ErrorAction SilentlyContinue"], stdout=sys.stdout)
+		print("Removing Kinto from Startup folder...")
+		os.system("(del \"C:\\ProgramData\\Microsoft\\Windows\\Start Menu\\Programs\\StartUp\\kinto.ahk\") 2> nul")
+		os.system('(del "%userprofile%\\AppData\\Roaming\\Microsoft\\Windows\\STARTM~1\\Programs\\Startup\\kinto-start.vbs") 2> nul')
+		print("Ending any running Kinto tasks...")
+		os.system("(taskkill /IM autohotkey.exe) 2> nul")
+		print("Removing Kinto from users profile directory...")
+		os.system('(rd /s /q "%userprofile%\\.kinto") 2> nul')
+		print("")
+		print("Uninstall of Kinto is Complete.")
+	if default > 0 and default < 3:
+		stvscode = yn_choice(bcolors.CYELLOW2 + "Would you like to use Sublime Text 3 keymaps in VS Code?\n" + bcolors.ENDC)
+		print("\nWill now install Ubuntu Termimnal Theme as default...")
+		os.system('regedit "' + path + '\\windows\\theme_ubuntu.reg"')
+		os.system('robocopy "'+ path + '\\assets" "%userprofile%\\.kinto\\assets" /E')
 		if(stvscode):
-			os.system('perl -pi -e "s/(; )(.*)(; ST2CODE)/$2$3/g" ./windows/kinto-new.ahk')
-		os.system("copy /Y " + path + "\\windows\\kinto-new.ahk \"C:\\ProgramData\\Microsoft\\Windows\\Start Menu\\Programs\\StartUp\\kinto.ahk\"")
+			os.system('C:\\Strawberry\\perl\\bin\\perl.exe -pi -e "s/(; )(.*)(; ST2CODE)/$2$3/g" .\\windows\\kinto-new.ahk')
+		os.system('copy /Y "' + path + '\\windows\\kinto-start.vbs" "%userprofile%\\.kinto\\kinto-start.vbs"')
+		os.system('copy /Y "' + path + '\\windows\\usb.vbs" "%userprofile%\\.kinto\\usb.vbs"')
+		os.system('copy /Y "' + path + '\\windows\\detectUSB.ahk" "%userprofile%\\.kinto\\detectUSB.ahk"')
+		os.system('mklink "%userprofile%\\Start Menu\\Programs\\Startup\\kinto-start.vbs" "%userprofile%\\.kinto\\kinto-start.vbs"')
+		os.system('copy /Y "'+ path + '\\windows\\NoShell.vbs" "%userprofile%\\.kinto\\NoShell.vbs"')
+		os.system('copy /Y "'+ path + '\\windows\\toggle_kb.bat" "%userprofile%\\.kinto\\toggle_kb.bat"')
+		os.system('copy /Y "'+ path + '\\windows\\kinto-new.ahk" "%userprofile%\\.kinto\\kinto.ahk"')
 		os.system("del /f .\\windows\\kinto-new.ahk")
-		print("\nPlease log off and back on for changes to take full effect.")
+		os.system("del \"C:\\ProgramData\\Microsoft\\Windows\\Start Menu\\Programs\\StartUp\\kinto.ahk\" 2> nul")
+		userpath = cmdline('cmd /c for %A in ("%userprofile%") do @echo %~sA')[:-1]
+		print('Starting... "' + userpath + '\\AppData\\Roaming\\Microsoft\\Windows\\STARTM~1\\Programs\\Startup\\kinto-start.vbs"')
+		os.system('"' + userpath + '\\AppData\\Roaming\\Microsoft\\Windows\\STARTM~1\\Programs\\Startup\\kinto-start.vbs"')
+	# 	# print("\nPlease log off and back on for changes to take full effect.")
 		print("If using WSL then please remember to right click on title bar -> Properties -> Edit Options -> Use Ctrl+Shift+C/V as Copy/Paste and enable it.")
 	else:
-		os.system("del \"C:\\ProgramData\\Microsoft\\Windows\\Start Menu\\Programs\\StartUp\\kinto.ahk\"")
+		os.system("(del \"C:\\ProgramData\\Microsoft\\Windows\\Start Menu\\Programs\\StartUp\\kinto.ahk\") 2> nul")

 def cmdline(command):
    process = Popen(
@@ -53,7 +72,11 @@ def cmdline(command):
    )
    return process.communicate()[0]

-# check_x11 = cmdline("env | grep -i x11").strip()
+if platform.system() == 'Windows':
+	print("\nYou are detected as running Windows.")
+	windows_setup()
+	sys.exit()
+
 check_x11 = cmdline("(env | grep -i x11 || loginctl show-session \"$XDG_SESSION_ID\" -p Type) | awk -F= '{print $2}'").strip()

 if len(check_x11) == 0:
@@ -112,7 +135,7 @@ def setShortcuts():
 	addhotkeys = yn_choice("\nDo you want to apply system level shortcuts?")
 	if(addhotkeys):
 		distro = distro.lower()
-		if dename == "gnome" or dename == "mate":
+		if dename == "gnome" or dename == "mate" or dename == "budgie":
 			cmdline('dconf dump /org/gnome/desktop/wm/keybindings/ > keybindings_`date +"%Y.%m.%d-%s"`.conf')
 			cmdline('dconf dump /org/gnome/mutter/keybindings/ > mutter_`date +"%Y.%m.%d-%s"`.conf')
 			if(kintotype == 1):
@@ -122,11 +145,19 @@ def setShortcuts():
 				cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-applications \"['<Primary>F13','<Primary><Shift>F13','<Alt>Tab']\"")
 				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 minimize \"['<Super>h','<Alt>F9']\"")
+			#
+			# Leaving run dialog disabled for now
+			# 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']\"")
+			# 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']\"")
 			cmdline("gsettings set org.gnome.shell.keybindings toggle-application-view \"['LaunchB']\"")
 			if dename != "mate":
 				cmdline("gsettings set org.gnome.mutter overlay-key ''")
-		if (distro == "ubuntu" and dename == "gnome") or (distro == "linux" and dename == "mate") or (distro == "ubuntu" and dename == "mate"):
+		if (distro == "ubuntu" and dename == "gnome") or (distro == "ubuntu" and dename == "budgie") or (distro == "linux" and dename == "mate") or (distro == "ubuntu" and dename == "mate"):
 			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 ['']")
@@ -154,14 +185,15 @@ def setShortcuts():
 			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']\"")
-			cmdline('perl -pi -e "s/(\/\/ )(.*)(\/\/ Elementary cmdtab)/\$2\$3/g" ~/.xkb/symbols/mac_term')
-			cmdline('perl -pi -e "s/(\w.*)(\/\/ Default cmdtab)/\/\/ \$1\$2/g" ~/.xkb/symbols/mac_term')
-			cmdline('perl -pi -e "s/(\/\/ )(.*)(\/\/ Elementary cmdtab)/\$2\$3/g" ~/.xkb/symbols/mac_gui')
-			cmdline('perl -pi -e "s/(\w.*)(\/\/ Default cmdtab)/\/\/ \$1\$2/g" ~/.xkb/symbols/mac_gui')
+			if(kintotype == 2):
+				cmdline('perl -pi -e "s/(\/\/ )(.*)(\/\/ Elementary cmdtab)/\$2\$3/g" ~/.xkb/symbols/mac_term')
+				cmdline('perl -pi -e "s/(\w.*)(\/\/ Default cmdtab)/\/\/ \$1\$2/g" ~/.xkb/symbols/mac_term')
+				cmdline('perl -pi -e "s/(\/\/ )(.*)(\/\/ Elementary cmdtab)/\$2\$3/g" ~/.xkb/symbols/mac_gui')
+				cmdline('perl -pi -e "s/(\w.*)(\/\/ Default cmdtab)/\/\/ \$1\$2/g" ~/.xkb/symbols/mac_gui')
 		# elif distro == "budgie" and dename == "gnome":
 		# 	print("Apply budgie shortcuts here")
-		elif (distro == "galliumos" and dename == "xfce") or (distro == "ubuntu" and dename == "xfce"):
-			print("Applying GalliumOS (xfce) shortcuts...")
+		elif (dename == "xfce"):
+			print("Applying xfce shortcuts...")
 			cmdline('cp ~/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml ./xfce4-keyboard-shortcuts_`date +"%Y.%m.%d-%s"`.xml')
 			# Reset Show desktop
 			cmdline('xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/<Primary><Alt>d" --reset')
@@ -225,14 +257,17 @@ def setShortcuts():
 			os.system('kquitapp5 kglobalaccel && sleep 2s && kglobalaccel5 &')
 		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":
+			print(bcolors.CRED2 + "A supported OS and DE was not found, you may not have full system level shortcuts installed." + bcolors.ENDC)
+			print(bcolors.CRED2 + "You may want to find your DE or Window Manager settings and manually set Alt-Tab & other OS related shortcuts." + bcolors.ENDC)
+		if dename == "gnome" or dename == "mate" or dename == "budgie":
 			# 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')
+			if dename == "budgie":
+				print('** Make sure to open Keyboard settings & reset "switch applications" to cmd+tab **')
 			# cmdline('dconf update')

 def Uninstall():
@@ -297,14 +332,14 @@ def Uninstall():

 def kintoImpOne():

-	check_xbind = cmdline("which xbindkeys 2>/dev/null").strip()
-	check_xdotool = cmdline("which xdotool 2>/dev/null").strip()
-	check_ibus = cmdline("which ibus-setup 2>/dev/null").strip()
+	check_xbind = cmdline("\\which xbindkeys 2>/dev/null").strip()
+	check_xdotool = cmdline("\\which xdotool 2>/dev/null").strip()
+	check_ibus = cmdline("\\which ibus-setup 2>/dev/null").strip()

-	pkgm = cmdline("which apt-get 2>/dev/null").strip()
+	pkgm = cmdline("\\which apt-get 2>/dev/null").strip()

 	if len(pkgm) == 0:
-		pkgm = cmdline("which dnf 2>/dev/null").strip()
+		pkgm = cmdline("\\which dnf 2>/dev/null").strip()
 		if len(pkgm) > 0:
 			pkgm += " check-update;sudo dnf install -y "
 	else:
@@ -312,7 +347,7 @@ def kintoImpOne():
 		pkgm += " update; sudo apt-get install -y "

 	if len(pkgm) == 0:
-		pkgm = cmdline("which pacman 2>/dev/null").strip()
+		pkgm = cmdline("\\which pacman 2>/dev/null").strip()
 		if len(pkgm) > 0:
 			pkgm += " -Syy; sudo pacman -S "

--- a/system-config/dename.sh
+++ b/system-config/dename.sh
@@ -1,167 +1,182 @@
 #!/bin/bash

+function detect_budgie()
+{
+	ps -e | grep -E '^.* budgie-wm' > /dev/null
+	if [ $? -ne 0 ];
+	then
+	return 0
+	fi
+	VERSION=`dpkg-query -l | grep budgie-core | awk '{print $3}'`
+	DESKTOP="budgie"
+	return 1
+}
+
 function detect_gnome()
 {
-    ps -e | grep -E '^.* gnome-session' > /dev/null
-    if [ $? -ne 0 ];
-    then
+	ps -e | grep -E '^.* gnome-session' > /dev/null
+	if [ $? -ne 0 ];
+	then
 	return 0
-    fi
-    VERSION=`gnome-session --version | awk '{print $2}'`
-    DESKTOP="gnome"
-    return 1
+	fi
+	VERSION=`gnome-session --version | awk '{print $2}'`
+	DESKTOP="gnome"
+	return 1
 }

 function detect_kde4()
 {
-    ps -e | grep -E '^.* kded4$' > /dev/null
-    if [ $? -ne 0 ];
-    then
-        return 0
-    else    
-        VERSION=`kded4 --version | grep -m 1 'KDE' | awk -F ':' '{print $2}' | awk '{print $1}'`
-        DESKTOP="KDE"
-        return 1
-    fi
+	ps -e | grep -E '^.* kded4$' > /dev/null
+	if [ $? -ne 0 ];
+	then
+		return 0
+	else    
+		VERSION=`kded4 --version | grep -m 1 'KDE' | awk -F ':' '{print $2}' | awk '{print $1}'`
+		DESKTOP="KDE"
+		return 1
+	fi
 }

 function detect_kde()
 {
-    ps -e | grep -E '^.* kded5$' > /dev/null
-    if [ $? -ne 0 ];
-    then
-        return 0
-    else    
-        VERSION=`kded5 --version | grep -m 1 'KDE' | awk -F ':' '{print $2}' | awk '{print $1}'`
-        DESKTOP="KDE"
-        return 1
-    fi
+	ps -e | grep -E '^.* kded5$' > /dev/null
+	if [ $? -ne 0 ];
+	then
+		return 0
+	else    
+		VERSION=`kded5 --version | grep -m 1 'KDE' | awk -F ':' '{print $2}' | awk '{print $1}'`
+		DESKTOP="KDE"
+		return 1
+	fi
 }

 function detect_unity()
 {
-    ps -e | grep -E 'unity-panel' > /dev/null
-    if [ $? -ne 0 ];
-    then
+	ps -e | grep -E 'unity-panel' > /dev/null
+	if [ $? -ne 0 ];
+	then
 	return 0
-    fi
-    VERSION=`unity --version | awk '{print $2}'`
-    DESKTOP="unity"
-    return 1
+	fi
+	VERSION=`unity --version | awk '{print $2}'`
+	DESKTOP="unity"
+	return 1
 }

 function detect_xfce()
 {
-    ps -e | grep -E '^.* xfce4-session$' > /dev/null
-    if [ $? -ne 0 ];
-    then
+	ps -e | grep -E '^.* xfce4-session$' > /dev/null
+	if [ $? -ne 0 ];
+	then
 	return 0
-    fi
-    VERSION=`xfce4-session --version | grep xfce4-session | awk '{print $2}'`
-    DESKTOP="xfce"
-    return 1
+	fi
+	VERSION=`xfce4-session --version | grep xfce4-session | awk '{print $2}'`
+	DESKTOP="xfce"
+	return 1
 }

 function detect_cinnamon()
 {
-    ps -e | grep -E '^.* cinnamon$' > /dev/null
-    if [ $? -ne 0 ];
-    then
+	ps -e | grep -E '^.* cinnamon$' > /dev/null
+	if [ $? -ne 0 ];
+	then
 	return 0
-    fi
-    VERSION=`cinnamon --version | awk '{print $2}'`
-    DESKTOP="cinnamon"
-    return 1
+	fi
+	VERSION=`cinnamon --version | awk '{print $2}'`
+	DESKTOP="cinnamon"
+	return 1
 }

 function detect_mate()
 {
-    ps -e | grep -E '^.* mate-panel$' > /dev/null
-    if [ $? -ne 0 ];
-    then
+	ps -e | grep -E '^.* mate-panel$' > /dev/null
+	if [ $? -ne 0 ];
+	then
 	return 0
-    fi
-    VERSION=`mate-about --version | awk '{print $4}'`
-    DESKTOP="mate"
-    return 1
+	fi
+	VERSION=`mate-about --version | awk '{print $4}'`
+	DESKTOP="mate"
+	return 1
 }

 function detect_lxde()
 {
-    ps -e | grep -E '^.* lxsession$' > /dev/null
-    if [ $? -ne 0 ];
-    then
+	ps -e | grep -E '^.* lxsession$' > /dev/null
+	if [ $? -ne 0 ];
+	then
 	return 0
-    fi
+	fi

-    # We can detect LXDE version only thru package manager
-    which apt-cache > /dev/null 2> /dev/null
-    if [ $? -ne 0 ];
-    then
+	# We can detect LXDE version only thru package manager
+	which apt-cache > /dev/null 2> /dev/null
+	if [ $? -ne 0 ];
+	then
 	which yum > /dev/null 2> /dev/null
 	if [ $? -ne 0 ];
 	then
-	    VERSION='unknown'
+		VERSION='unknown'
 	else
-	    # For Fedora
-	    VERSION=`yum list lxde-common | grep lxde-common | awk '{print $2}' | awk -F '-' '{print $1}'`
+		# For Fedora
+		VERSION=`yum list lxde-common | grep lxde-common | awk '{print $2}' | awk -F '-' '{print $1}'`
 	fi
-    else    
+	else    
 	# For Lubuntu and Knoppix
 	VERSION=`apt-cache show lxde-common /| grep 'Version:' | awk '{print $2}' | awk -F '-' '{print $1}'`
-    fi
-    DESKTOP="lxde"
-    return 1
+	fi
+	DESKTOP="lxde"
+	return 1
 }

 function detect_sugar()
 {
-    if [ "$DESKTOP_SESSION" == "sugar" ];
-    then
+	if [ "$DESKTOP_SESSION" == "sugar" ];
+	then
 	VERSION=`python -c "from jarabe import config; print config.version"`
 	DESKTOP="sugar"
-    else
+	else
 	return 0
-    fi
+	fi
 }


 DESKTOP="unknown"
 if detect_unity;
 then
-    if detect_kde;
-    then
-        if detect_kde4;
-        then
-        	if detect_gnome;
-        	then
-        	    if detect_xfce;
-        	    then
-            		if detect_cinnamon;
-            		then
-            		    if detect_mate;
-            		    then
-                			if detect_lxde;
-                			then
-                			    detect_sugar
-                			fi
-            		    fi
-            		fi
-        	    fi
-        	fi
-        fi
-    fi
+	if detect_kde;
+	then
+		if detect_kde4;
+		then
+			if detect_budgie;
+			then
+				if detect_gnome;
+				then
+					if detect_xfce;
+					then
+						if detect_cinnamon;
+						then
+							if detect_mate;
+							then
+								if detect_lxde;
+								then
+									detect_sugar
+								fi
+							fi
+						fi
+					fi
+				fi
+			fi
+		fi
+	fi
 fi


 if [ "$1" == '-v' ];
 then
-    echo $VERSION
+	echo $VERSION
 else
-    if [ "$1" == '-n' ];
-    then
+	if [ "$1" == '-n' ];
+	then
 	echo $DESKTOP
-    else
+	else
 	echo $DESKTOP $VERSION
-    fi
+	fi
 fi
--- a/system-config/keyboard.ids
+++ b/system-config/keyboard.ids
--- a/system-config/keyswap.service
+++ b/system-config/keyswap.service
@@ -8,9 +8,9 @@ Restart=always
 # eg DISPLAY=:0.0
 #Environment=DISPLAY={displayid}
 RestartSec=1
-WorkingDirectory=/home/{username}/.config/kinto
-ExecStart=/bin/bash -c "/home/{username}/.config/kinto/xactive.sh carrots"
-ExecStop=/bin/bash /home/{username}/.config/kinto/cleanup.sh
+WorkingDirectory={homedir}/.config/kinto
+ExecStart=/bin/bash -c "{homedir}/.config/kinto/xactive.sh carrots"
+ExecStop=/bin/bash {homedir}/.config/kinto/cleanup.sh

 [Install]
 WantedBy=default.target
--- a/uninstall.sh
+++ b/uninstall.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
 # Undo Apple keyboard cmd & alt swap
 if test -f "/sys/module/hid_apple/parameters/swap_opt_cmd" && [ `cat /sys/module/hid_apple/parameters/swap_opt_cmd` == "1" ]; then
-	echo '0' | sudo tee -a /sys/module/hid_apple/parameters/swap_opt_cmd
-	echo 'options hid_apple swap_opt_cmd=0' | sudo tee -a /etc/modprobe.d/hid_apple.conf
+	echo '0' | sudo tee /sys/module/hid_apple/parameters/swap_opt_cmd
+	echo 'options hid_apple swap_opt_cmd=0' | sudo tee /etc/modprobe.d/hid_apple.conf
 	sudo update-initramfs -u -k all
 fi
 systemctl --user stop keyswap 2>/dev/null
--- a/windows/NoShell.vbs
+++ b/windows/NoShell.vbs
@@ -0,0 +1,14 @@
+If WScript.Arguments.Count >= 1 Then
+    ReDim arr(WScript.Arguments.Count-1)
+    prog = WScript.Arguments(0)
+    For i = 1 To WScript.Arguments.Count-1
+        Arg = WScript.Arguments(i)
+        If InStr(Arg, " ") > 1 Then Arg = """" & Arg & """"
+      arr(i) = Arg
+    Next
+
+    RunCmd = Join(arr)
+    ' CreateObject("Wscript.Shell").Run RunCmd, 0, True
+    Set oShell = CreateObject("Shell.Application")
+	oShell.ShellExecute prog, RunCmd, , "runas", 0
+End If
--- a/windows/autohotkey.ps1
+++ b/windows/autohotkey.ps1
@@ -1,15 +1,22 @@
-$testchoco = powershell choco -v
-if(-not($testchoco)){
+if(-not(Get-Command "choco" -errorAction SilentlyContinue)){
    Write-Output "Seems Chocolatey is not installed, installing now"
    Set-ExecutionPolicy Bypass -Scope Process -Force; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))
+    refreshenv
 }
 else{
-    Write-Output "Chocolatey Version $testchoco is already installed"
+    Write-Output "Chocolatey is already installed"
 }

 if(-not(test-path "C:\Program Files\AutoHotkey\AutoHotkey.exe")){
 	choco install autohotkey.install
 }
+else{
+	Write-Output "Autohotkey is already installed"
+}
 if(-not(test-path "C:\Strawberry\")){
 	choco install strawberryperl
+	refreshenv
+}
+else{
+	Write-Output "Perl is already installed"
 }
--- a/windows/detectUSB.ahk
+++ b/windows/detectUSB.ahk
@@ -0,0 +1,38 @@
+#SingleInstance, force
+#NoTrayIcon
+OnMessage(0x219, "notify_change") 
+Return
+
+lastkb = ""
+
+DllCall("AllocConsole")
+WinHide % "ahk_id " DllCall("GetConsoleWindow", "ptr")
+
+notify_change(wParam, lParam, msg, hwnd) 
+{
+	global lastkb
+	DetectHiddenWindows On
+	Run %ComSpec%,, Hide, pid
+	WinWait ahk_pid %pid%
+	DllCall("AttachConsole", "UInt", pid)
+	WshShell := ComObjCreate("Wscript.Shell")
+	exec := WshShell.Exec("cscript /nologo ""%userprofile%\.kinto\usb.vbs""")
+	kbtype := exec.StdOut.ReadAll()
+	DllCall("FreeConsole")
+	Process Close, %pid%
+	if lastkb != %kbtype%
+	{
+
+		if InStr(kbtype, "Apple")
+		{
+			; MsgBox, Apple
+			Run, "%A_ScriptDir%\NoShell.vbs" "%A_ScriptDir%\toggle_kb.bat" mac, "%A_ScriptDir%"
+		}
+		else{
+			; MsgBox, Windows
+			Run, "%A_ScriptDir%\NoShell.vbs" "%A_ScriptDir%\toggle_kb.bat" win, "%A_ScriptDir%"
+		}
+		; MsgBox % kbtype
+	}
+	lastkb = %kbtype%
+}
--- a/windows/kinto-start.vbs
+++ b/windows/kinto-start.vbs
@@ -0,0 +1,7 @@
+Set oShell = CreateObject("Shell.Application")
+Set wShell = WScript.CreateObject("WScript.Shell")
+Set fso = CreateObject("Scripting.FileSystemObject")
+
+path = wShell.ExpandEnvironmentStrings("""%userprofile%")
+strFolder = fso.BuildPath( path, "\.kinto\kinto.ahk""")
+oShell.ShellExecute "C:\Program Files\AutoHotkey\AutoHotkey.exe", strFolder, , "runas", 0
--- a/windows/kinto.ahk
+++ b/windows/kinto.ahk
@@ -1,3 +1,91 @@
+#SingleInstance force
+#NoEnv
+#Persistent
+
+DetectHiddenWindows, On
+Run, %A_ScriptDir%\detectUSB.ahk
+
+; Enable Left clicks on Kinto Icon
+; https://www.autohotkey.com/boards/viewtopic.php?t=9501
+OnMessage(0x404, "AHK_NOTIFYICON")
+
+AHK_NOTIFYICON(wParam, lParam) 
+{
+    if (lParam = 0x202) { ; user left-clicked tray icon
+        ;ADD ANY SUBROUTINE OR FUNCTION HERE
+        Menu, Tray, Show
+        return
+    }
+    else if (lParam = 0x203) { ; user double left-clicked tray icon
+        ;ADD ANY SUBROUTINE OR FUNCTION HERE
+        Menu, Tray, Show
+        return
+    }
+}
+; End Enable Left clicks
+
+; I_Icon = %A_ScriptDir%\assets\kinto-white.ico           ; MacModifiers
+; IfExist, %I_Icon%                                       ; MacModifiers
+; Menu, Tray, Icon, %I_Icon%,, 1                          ; MacModifiers
+; Menu, Tray, Tip, Mac - Kinto                            ; MacModifiers
+
+; I_Icon = %A_ScriptDir%\assets\kinto-white-invert.ico    ; WinModifiers
+; IfExist, %I_Icon%                                       ; WinModifiers
+; Menu, Tray, Icon, %I_Icon%,, 1                          ; WinModifiers
+; Menu, Tray, Tip, Windows - Kinto                        ; WinModifiers
+
+; Set Tray menu
+; Menu, Tray, Standard
+Menu, Tray, NoStandard ; to remove default menu
+Menu, Tray, Add, Set Windows Keyboard, winkb
+Menu, Tray, Add, Set Apple Keyboard, mackb
+Menu, Tray, Add, Suspend Kinto, tray_suspend
+Menu, Tray, Add, Returns to Desktop, min
+Menu, Tray, Add
+Menu, Tray, Add, Close, Exit
+Menu, Tray, Click, 1
+
+winkb(){
+    Run, "%A_ScriptDir%\NoShell.vbs" "%A_ScriptDir%\toggle_kb.bat" win, "%A_ScriptDir%"
+}
+
+mackb(){
+    Run, "%A_ScriptDir%\NoShell.vbs" "%A_ScriptDir%\toggle_kb.bat" mac, "%A_ScriptDir%"
+}
+
+min(){
+; Refocus last active Window
+Send {LAlt down}{tab}{LAlt up}
+}  
+
+tray_suspend(){
+    suspend toggle
+    if (a_isSuspended = 1){
+        menu, tray, check  , Suspend Kinto
+        I_Icon = %A_ScriptDir%\assets\kinto-color-invert.ico
+        Menu, Tray, Icon, %I_Icon%,, 1
+        Menu, Tray, Tip, Suspended - Kinto
+        IfWinExist, detectUSB.ahk
+            WinClose
+    }
+    else{
+        menu, tray, unCheck, Suspend Kinto
+;         I_Icon = %A_ScriptDir%\assets\kinto-white.ico           ; MacModifiers
+;         I_Icon = %A_ScriptDir%\assets\kinto-white-invert.ico    ; WinModifiers
+        Menu, Tray, Icon, %I_Icon%,,1
+        Run, %A_ScriptDir%\detectUSB.ahk
+    }
+    ; Refocus last active Window
+    Send {LAlt down}{tab}{LAlt up}
+}
+
+Exit() {
+    IfWinExist, detectUSB.ahk
+        WinClose
+
+    ExitApp
+}
+
 SetTitleMatchMode, 2

 GroupAdd, terminals, ahk_exe ubuntu.exe
@@ -6,7 +94,9 @@ GroupAdd, terminals, ahk_exe ConEmu64.exe
 GroupAdd, terminals, ahk_exe powershell.exe
 GroupAdd, terminals, ahk_exe WindowsTerminal.exe
 GroupAdd, terminals, ahk_exe Hyper.exe
+GroupAdd, terminals, ahk_exe mintty.exe
 GroupAdd, terminals, ahk_exe Cmd.exe
+GroupAdd, terminals, ahk_exe Terminus.exe
 GroupAdd, terminals, Fluent Terminal ahk_class ApplicationFrameWindow

 GroupAdd, posix, ahk_exe ubuntu.exe
@@ -14,6 +104,7 @@ GroupAdd, posix, ahk_exe ConEmu.exe
 GroupAdd, posix, ahk_exe ConEmu64.exe
 GroupAdd, posix, ahk_exe Hyper.exe
 GroupAdd, posix, ahk_exe mintty.exe
+GroupAdd, posix, ahk_exe Terminus.exe
 GroupAdd, posix, Fluent Terminal ahk_class ApplicationFrameWindow

 GroupAdd, ConEmu, ahk_exe ConEmu.exe
@@ -24,12 +115,131 @@ GroupAdd, editors, ahk_exe sublime_text.exe
 GroupAdd, editors, ahk_exe VSCodium.exe
 GroupAdd, editors, ahk_exe Code.exe

+GroupAdd, browsers, ahk_exe chrome.exe
+GroupAdd, browsers, ahk_exe opera.exe
+GroupAdd, browsers, ahk_exe firefox.exe
+; Disabled Edge for now - no ability to close all instances
+; GroupAdd, browsers, Microsoft Edge ahk_class ApplicationFrameWindow
+
 GroupAdd, vscode, ahk_exe VSCodium.exe
 GroupAdd, vscode, ahk_exe Code.exe

-; Close Apps
+GroupAdd, vstudio, ahk_exe devenv.exe
+
+GroupAdd, intellij, ahk_exe idea.exe
+GroupAdd, intellij, ahk_exe idea64.exe
+
+; New AltTab and CtrlTab fix
+*tab:: 
+{
+    ; Tertiary 
+    if (GetKeyState("LCtrl", "P") AND GetKeyState("LShift", "P") = false) {
+        ; Secondary
+        ; Send {LCtrl down}{Secondary up}{tab}
+;        Send {LCtrl down}{LWin up}{tab}               ; WinModifiers
+;        Send {LCtrl down}{LAlt up}{tab}               ; MacModifiers
+        KeyWait, tab
+    ; Tertiary
+    } else if (GetKeyState("LCtrl", "P") AND GetKeyState("LShift", "P")) {
+        ; Secondary
+        ; Send {LCtrl down}{Secondary up}{LShift down}{tab}
+;        Send {LCtrl down}{LWin up}{LShift down}{tab}  ; WinModifiers
+;        Send {LCtrl down}{LAlt up}{LShift down}{tab}  ; MacModifiers
+        KeyWait, tab
+    ; Primary
+;    } else if (GetKeyState("LAlt", "P") AND GetKeyState("LShift", "P") = false) {   ; WinModifiers
+;    } else if (GetKeyState("LWin", "P") AND GetKeyState("LShift", "P") = false) {   ; MacModifiers
+        Send {LAlt down}{tab}
+        KeyWait, tab
+    ; Primary
+;    } else if (GetKeyState("LAlt", "P") AND GetKeyState("LShift", "P")) { ; WinModifiers
+;    } else if (GetKeyState("LWin", "P") AND GetKeyState("LShift", "P")) { ; MacModifiers
+        Send {LAlt down}{LShift down}{tab}
+        KeyWait, tab
+    ; Secondary 
+;    } else if (GetKeyState("LWin", "P") AND GetKeyState("LShift", "P")) = false {   ; WinModifiers
+;    } else if (GetKeyState("LAlt", "P") AND GetKeyState("LShift", "P") = false) {   ; MacModifiers
+        return
+    ; Secondary
+;     } else if (GetKeyState("LWin", "P") AND GetKeyState("LShift", "P")) {   ; WinModifiers
+;     } else if (GetKeyState("LAlt", "P") AND GetKeyState("LShift", "P")) {   ; MacModifiers
+        return
+    } else {
+        send {Blind}{tab}
+    }
+    return
+}
+
+tab::Send {tab}
+
+tab::Send {Shift down}{tab}{Shift up}
+
+; Basic Remap
+;
+; Primary::LCtrl
+; Secondary::LAlt
+; Tertiary::LWin
+
+; $LAlt::LCtrl   ; WinModifiers
+; $RAlt::RCtrl   ; WinModifiers
+; $LWin::LAlt    ; WinModifiers
+; $LCtrl::LWin   ; WinModifiers
+
+; $LWin::LCtrl   ; MacModifiers
+; $RWin::RCtrl   ; MacModifiers
+; $LCtrl::LWin   ; MacModifiers
+
+; Hack to disable start menu on winkey
+; Static
+$LCtrl up::Send {Ctrl down}{LWin up}{Ctrl up}
+
+; temporary hack to ensure keys don't get stuck
+; impacts Alt-Tab fix
+; Primary
+; $LAlt up::Send {LWin up}{LAlt up}{LCtrl up} ; WinModifiers
+; $LWin up::Send {LWin up}{LAlt up}{LCtrl up} ; MacModifiers
+
+; Close Apps 
 ^q::Send !{F4}

+; Minimize specific Window
+^m::WinMinimize, A
+
+; Minimize all but Active Window
+!^m::
+WinGet, winid ,, A
+WinMinimizeAll
+WinActivate ahk_id %winid%
+return
+
+; hide all instances of active Program
+^h::
+WinGetClass, class, A
+WinGet, AllWindows, List
+loop %AllWindows% {
+    WinGetClass, WinClass, % "ahk_id " AllWindows%A_Index%
+    if(InStr(WinClass,class)){
+        WinMinimize, % "ahk_id " AllWindows%A_Index%
+    }
+}
+return
+
+; hide all but active program
+!^h::
+WinGetClass, class, A
+WinMinimizeAll
+WinGet, AllWindows, List
+loop %AllWindows% {
+    WinGetClass, WinClass, % "ahk_id " AllWindows%A_Index%
+    if(InStr(WinClass,class)){
+        WinRestore, % "ahk_id " AllWindows%A_Index%
+    }
+}
+return
+
+; Show Desktop
+^F3::Send #d
+
 ; Emoji Panel
 #^Space::Send {LWin down};{LWin up}

@@ -48,7 +258,7 @@ $^+Right::Send +{End}
 ^+Up::Send ^+{Home}
 ^Down::Send ^{End}
 ^+Down::Send ^+{End}
-^Backspace::Send +{Home}{Delete}
+$^Backspace::Send +{Home}{Delete}
 !Backspace::Send ^{Backspace}
 !Left::Send ^{Left}
 !+Left::Send ^+{Left}
@@ -56,143 +266,250 @@ $^+Right::Send +{End}
 !+Right::Send ^+{Right}

 ; Cmd+Space Alternative
-LWin & vk07::return
-LWin::return
-RWin & vk07::return
-RWin::return
-^Space::Send ^{Esc}
-; ^Space::run AppName
+$^Space::Send ^{Esc}

-; Cmd Tab For App Switching
-LCtrl & Tab::AltTab
-RCtrl & Tab::AltTab
+#IfWinActive ahk_group intellij
+    ; General
+    ^0::Send !{0}                   ;Open corresponding tool window
+    ^1::Send !{1}                   ;Open corresponding tool window
+    ^2::Send !{2}                   ;Open corresponding tool window
+    ^3::Send !{3}                   ;Open corresponding tool window
+    ^4::Send !{4}                   ;Open corresponding tool window
+    ^5::Send !{5}                   ;Open corresponding tool window
+    ^6::Send !{6}                   ;Open corresponding tool window
+    ^7::Send !{7}                   ;Open corresponding tool window
+    ^8::Send !{8}                   ;Open corresponding tool window
+    ^9::Send !{9}                   ;Open corresponding tool window
+    #`::Send ^`                     ;Quick switch current scheme
+    ^,::Send ^!s                    ;Open Settings dialog
+    ^;::Send ^!+s                   ;Open Project Structure dialog
+    ; Debugging
+    ^!r::Send {F9}                  ;Resume program
+    ; Search/Replace
+    ^g::Send {F3}                   ;Find next
+    ^+F3::Send +{F3}                ;Find previous
+    #g::Send !j                     ;Select next occurrence
+    ^#g::Send ^!+j                  ;Select all occurrences
+    #+g::Send !+j                   ;Unselect occurrence
+    ; Editing
+    #Space::Send ^{Space}           ;Basic code completion
+    #+Space::Send ^+{Space}         ;Smart code completion
+    #j::Send ^q                     ;Quick documentation lookup
+    ^n::Send !{Insert}              ;Generate code...
+    #o::Send ^o                     ;Override methods
+    #i::Send ^i                     ;Implement methods
+    !Up::Send ^w                    ;Extend selection
+    !Down::Send ^+w                 ;Shrink selection
+    #+q::Send !q                    ;Context info
+    #!o::Send ^!o                   ;Optimize imports
+    #!i::Send ^!i                   ;Auto-indent line(s)
+    $^Backspace::Send ^y             ;Delete line at caret
+    #+j::Send ^+j                   ;Smart line join
+    !Delete::Send ^{Delete}         ;Delete to word end
+    !Backspace::Send ^{Backspace}   ;Delete to word start
+    ^+::Send ^{NumpadAdd}           ;Expand code block
+    ^-::Send ^{NumpadSub}           ;Collapse code block
+    ^++::Send ^+{NumpadAdd}         ;Expand all
+    ^+-::Send ^+{NumpadSub}         ;Collapse all
+    ^w::Send ^{F4}                  ;Close active editor tab
+    ; Refactoring
+    ^Delete::Send !{Delete}         ;Safe Delete
+    ^T::Send ^!+T                   ;Refactor this
+    ; Navigation
+    ^o::Send ^n                     ;Go to class
+    ^+o::Send ^+n                   ;Go to file
+    ^!o::Send ^!+n                  ;Go to symbol
+    #Right::Send !{Right}           ;Go to next editor tab
+    #Left::Send !{Left}             ;Go to previous editor tab
+    #l::Send ^g                     ;Go to line
+    #e::Send ^e                     ;Recent files popup
+    !Space::Send ^+i                ;Open quick definition lookup
+    ^Y::Send ^+i                    ;Open quick definition lookup
+    #+b::Send ^+b                   ;Go to type declaration
+    #Up::Send !{Up}                 ;Go to previous
+    #Down::Send !{Down}             ;Go to next method
+    #h::Send ^h                     ;Type hierarchy
+    #!h::Send ^!h                   ;Call hierarchy
+    ^Down::Send ^{Enter}            ;Edit source/View source
+    !Home::Send !{Home}             ;Show navigation bar
+    F2::Send {F11}                  ;Toggle bookmark
+    #F3::Send ^{F11}                ;Toggle bookmark with mnemonic
+    #0::Send ^{0}                   ;Go to numbered bookmark
+    #1::Send ^{1}                   ;Go to numbered bookmark
+    #2::Send ^{2}                   ;Go to numbered bookmark
+    #3::Send ^{3}                   ;Go to numbered bookmark
+    #4::Send ^{4}                   ;Go to numbered bookmark
+    #5::Send ^{5}                   ;Go to numbered bookmark
+    #6::Send ^{6}                   ;Go to numbered bookmark
+    #7::Send ^{7}                   ;Go to numbered bookmark
+    #8::Send ^{8}                   ;Go to numbered bookmark
+    #9::Send ^{9}                   ;Go to numbered bookmark
+    ^F3::Send +{F11}                ;Show bookmarks
+    ; Compile and Run
+    #!r::Send !+{F10}               ;Select configuration and run
+    #!d::Send !+{F9}                ;Select configuration and debug
+    #r::Send +{F10}                 ;Run
+    #d::Send +{F9}                  ;Debug
+    #+r::Send ^+{F10}               ;Run context configuration from editor
+    #+d::Send ^+{F9}                ;Debug context configuration from editor
+    ; VCS/Local History
+    #v::Send !`                     ;VCS quick popup
+#If

-; Ctrl Tab for In-App Tab Switching
-; https://autohotkey.com/board/topic/72433-controltab/
-#if GetKeyState("LWin")
-*Tab::
-if(!GetKeyState("LControl"))
-	Send {LControl Down}
-Send {Tab}
-SetTimer, WaitForWinUp, 10
-ToolTip trigger
-return
-
-WaitForWinUp:
-if(!GetKeyState("LWin", "P"))
-{
-	Send {LControl Up}
-	SetTimer, WaitForWinUp, Off
-}
-return
+; Close all browsers
+#IfWinActive ahk_group browsers
+   ^q::send {Alt Down}f{Alt Up}x   ; exit all windows
+#If

 ; Sublime Text Remaps for VS Code
-#IfWinActive ahk_group vscode                               ; ST2CODE
-	; Remap Ctrl+Shift to behave like macOS Sublimetext
-	; Will extend cursor to multiple lines
-	#+Up::send ^!{Up}                                   ; ST2CODE
-	#+Down::send ^!{Down}                               ; ST2CODE
-	; Remap Ctrl+Cmd+G to select all matches
-	#^g::send ^+{L}                                     ; ST2CODE
-#If                                                         ; ST2CODE
+#IfWinActive ahk_group vscode
+    #Space::Send ^{Space}                                ; Basic code completion
+    ; Remap Ctrl+Shift to behave like macOS Sublimetext
+    ; Will extend cursor to multiple lines
+;    #+Up::send ^!{Up}                                   ; ST2CODE
+;    #+Down::send ^!{Down}                               ; ST2CODE
+    ; Remap Ctrl+Cmd+G to select all matches
+;    #^g::send ^+{L}                                     ; ST2CODE
+    !+g::send ^+{G}                                     ; View source control
+    ; Sigints - interrupt
+    $#c::Send {Ctrl down}c{Ctrl up}
+#If

 #IfWinActive ahk_exe sublime_text.exe
-	; Remap Ctrl+Shift to behave like macOS Sublimetext
-	; Will extend cursor to multiple lines
-	#+Up::send {shift up}^!{Up}
-	#+Down::send {shift up}^!{Down}
-
-	; Remap Ctrl+Cmd+G to select all matches
-	#^g::send !{F3}
+    #Space::Send ^{Space}                                   ; Basic code completion
+    #^Up::send !{O}                                         ; Switch file
+    #^f::send {F11}                                         ; toggle_full_screen
+    ^!v::send {Ctrl Down}k{Ctrl Up}{Ctrl Down}v{Ctrl Up}    ; paste_from_history
+    ^Up::Return                                             ; cancel scroll_lines up
+    ^!Up::send ^{Up}                                        ; scroll_lines up
+    ^Down::Return                                           ; cancel scroll_lines down
+    ^!Down::send ^{Down}                                    ; scroll_lines down
+    #+Up::send {shift up}^!{Up}                             ; multi-cursor up
+    #+Down::send {shift up}^!{Down}                         ; multi-cursor down
+    ^PgDn::Return                                           ; cancel next_view
+    ^PgUp::Return                                           ; cancel prev_view
+    ^+{::send ^{PgDn}                                       ; next_view
+    ^+}::send ^{PgUp}                                       ; prev_view
+    ^!Right::send ^{PgDn}                                   ; next_view
+    ^!Left::send ^{PgUp}                                    ; prev_view
+    Insert::Return                                          ; cancel toggle_overwrite
+    ^!O::send {Insert}                                      ; toggle_overwrite
+    !c::Return                                              ; cancel toggle_case_sensitive
+    ^!c::send !{c}                                          ; toggle_case_sensitive
+    ; ^h::Return                                              ; cancel replace
+    ^!f::send ^{h}                                          ; replace
+    ^+h::Return                                             ; cancel replace_next
+    ^!e::send ^+{h}                                         ; replace_next
+    F3::Return                                              ; cancel find_next
+    ^g::send {F3}                                           ; find_next
+    *F3::Return                                             ; cancel find_prev, find_under, find_all_under
+    ^+g::send +{F3}                                         ; find_prev
+    #!g::send ^{F3}                                         ; find_under
+    #!+g::send ^+{F3}                                       ; find_under_prev
+    #^g::send !{F3}                                         ; find_all_under
+    ^+Up::Return                                            ; cancel swap_line_up
+    #!Up::send ^+{Up}                                       ; swap_line_up
+    ^+Down::Return                                          ; cancel swap_line_down
+    #!Down::send ^+{Down}                                   ; swap_line_down
+    ^Pause::Return                                          ; cancel cancel_build
+    #c::send ^{Pause}                                       ; cancel_build
+    F9::Return                                              ; cancel sort_lines case_s false
+    F5::send {F9}                                           ; sort_lines case_s false
+    #F9::Return                                             ; cancel sort_lines case_s true
+    #F5::send #{F9}                                         ; sort_lines case_s true
+    !+1::Return                                             ; cancel set_layout
+    ^!1::send !+1                                           ; set_layout
+    !+2::Return                                             ; cancel set_layout
+    ^!2::send !+2                                           ; set_layout
+    !+3::Return                                             ; cancel set_layout
+    ^!3::send !+3                                           ; set_layout
+    !+4::Return                                             ; cancel set_layout
+    ^!4::send !+4                                           ; set_layout
+    !+5::Return                                             ; cancel set_layout
+    ^!5::send !+5                                           ; set_layout
+    !+8::Return                                             ; cancel set_layout
+    ^!8::send !+8                                           ; set_layout
+    !+9::Return                                             ; cancel set_layout
+    ^!9::send !+9                                           ; set_layout
 #If

 #IfWinActive ahk_group terminals
-	; Copy
-	^c::Send {LCtrl down}{LShift down}c{LCtrl Up}{LShift Up}
-	#c::Send {LCtrl down}c{LCtrl Up}
-	; Paste
-	$^v::
-	If not WinActive("ahk_group ConEmu") && not WinActive("ahk_exe cmd.exe"){
-	 	Send {LCtrl down}{LShift down}v{LCtrl Up}{LShift Up}
-	}
-	else{
-		Send ^v
-	}
-	return
+
+    ; End of Line
+    #e::
+    Send {End}
+    return
+
+    ; Beginning of Line
+    #a::
+    Send {Home}
+    return
+
+    ; Copy
+    ^c::
+    SetKeyDelay -1
+    Send {Blind}{LShift down}{c DownTemp}
+    return
+
+    ^c up::
+    SetKeyDelay -1
+    Send {Blind}{c Up}{LShift Up}
+    return
+
+    ; Sigints - interrupt
+    $#c::Send {Ctrl down}c{Ctrl up}
+
+    ; Paste
+    ^v::
+    If WinActive("ahk_exe mintty.exe"){
+        Send {Shift down}{Insert}{Shift up}
+    }
+    else if WinActive("ahk_group posix"){
+        Send {Blind}{Shift down}v{Shift up}
+    }
+    else{
+        Send {Blind}v
+    }
+    return
 #If

 #IfWinActive ahk_group posix
-	; Open/Close Tab for those that support it
-	$^t::
-	If not WinActive("ahk_group ConEmu"){
-		Send {LCtrl down}{LShift down}t{LCtrl Up}{LShift Up}
-	}
-	else{
-		Send ^t
-	}
-	return
+    ; Open/Close Tab for those that support it
+    $^t::
+    If not WinActive("ahk_group ConEmu"){
+        Send {LCtrl down}{LShift down}t{LCtrl Up}{LShift Up}
+    }
+    else{
+        Send ^t
+    }
+    return

-	$^w::
-	If not WinActive("ahk_group ConEmu"){
-		Send {LCtrl down}{LShift down}w{LCtrl Up}{LShift Up}
-	}
-	else{
-		Send ^w
-	}
-	return
+    $^w::
+    If not WinActive("ahk_group ConEmu"){
+        Send {LCtrl down}{LShift down}w{LCtrl Up}{LShift Up}
+    }
+    else{
+        Send ^w
+    }
+    return

-	; End of Line
-	#e::Send {LCtrl down}e{LCtrl Up}
-	^e::return
-	; Beginning of Line
-	#a::Send {LCtrl down}a{LCtrl Up}
-	^a::return
-	;^l::Send clear{Enter}
-	;#l::return
-	; Clear Terminal and Scroll Buffer
-	^k::Send clear && printf '\e[3J'{Enter}
-	; Nano editor shortcuts
-	#k::Send {LCtrl down}k{LCtrl Up}
-	#x::Send {LCtrl down}x{LCtrl Up}
-	#o::Send {LCtrl down}o{LCtrl Up}
-	#r::Send {LCtrl down}r{LCtrl Up}
-	#w::Send {LCtrl down}w{LCtrl Up}
-	#\::Send {LCtrl down}\{LCtrl Up}
-	#u::Send {LCtrl down}u{LCtrl Up}
-	#j::Send {LCtrl down}j{LCtrl Up}
-	#t::Send {LCtrl down}t{LCtrl Up}
-	#_::Send {LCtrl down}_{LCtrl Up}
-	#z::Send {LCtrl down}z{LCtrl Up}
-#If
-
-; #IfWinActive ahk_group ConEmu
-;	; Paste
-;	$^v::Send {Shift down}{Insert}{Shift Up}
-;	#v::Send {LCtrl down}v{LCtrl Up}
-; #If
-
-#IfWinActive ahk_exe mintty.exe
-	; Copy
-	$^c::Send {Control down}{Insert}{Control Up}
-	#c::Send {LCtrl down}c{LCtrl Up}
-	; Paste
-	$^v::Send {Shift down}{Insert}{Shift Up}
-	#v::Send {LCtrl down}v{LCtrl Up}
-#If
-
-;Disable win + l key locking (This line must come before any hotkey assignments in the .ahk file)
-
-; Admin privileges required
-; Sets Workstation Lock to not occur on Win+L
-; RegWrite, REG_DWORD, HKEY_CURRENT_USER, Software\Microsoft\Windows\CurrentVersion\Policies\System, DisableLockWorkstation, 1
-
-; Re-enables Workstation lock on Ctrl+Cmd+Q
-; Need to Remove Quick Assist and reboot
-; Remove-WindowsCapability -online -name App.Support.QuickAssist~~~~0.0.1.0
-#^q::
-;  re-enable locking workstation, then lock it
-;  RegWrite, REG_DWORD, HKEY_CURRENT_USER, Software\Microsoft\Windows\CurrentVersion\Policies\System, DisableLockWorkstation, 0
-;  DllCall("LockWorkStation")
-; Reload script to relock Workstation Lock
-;  Reload 
-;return
+    ^l::Send clear{Enter}
+    ; #l::return
+    ; Clear Terminal and Scroll Buffer
+    ^k::Send clear && printf '\e[3J'{Enter}
+    ; Nano editor shortcuts
+    #g::Send {LCtrl down}g{LCtrl Up}
+    #k::Send {LCtrl down}k{LCtrl Up}
+    #x::Send {LCtrl down}x{LCtrl Up}
+    #o::Send {LCtrl down}o{LCtrl Up}
+    #r::Send {LCtrl down}r{LCtrl Up}
+    #w::Send {LCtrl down}w{LCtrl Up}
+    #\::Send {LCtrl down}\{LCtrl Up}
+    #u::Send {LCtrl down}u{LCtrl Up}
+    #j::Send {LCtrl down}j{LCtrl Up}
+    #t::Send {LCtrl down}t{LCtrl Up}
+    #_::Send {LCtrl down}_{LCtrl Up}
+    #z::Send {LCtrl down}z{LCtrl Up}
+    #y::Send {LCtrl down}y{LCtrl Up}
+    #v::Send {LCtrl down}v{LCtrl Up}
+#If
--- a/windows/toggle_kb.bat
+++ b/windows/toggle_kb.bat
@@ -0,0 +1,22 @@
+@echo off
+
+IF "%1"=="mac" goto mac
+IF "%1"=="win" goto win
+
+echo Not found.
+goto commonexit
+
+:win
+C:\Strawberry\perl\bin\perl.exe -pi -e "s/(; )(.*)(; WinModifiers)/$2$3/g" "%userprofile%\.kinto\kinto.ahk"
+C:\Strawberry\perl\bin\perl.exe -pi -e "s/^(?!;)(.*)(; MacModifiers)/; $1$2/gm" "%userprofile%\.kinto\kinto.ahk"
+"C:\Program Files\AutoHotkey\AutoHotkey.exe" "%userprofile%\.kinto\kinto.ahk"
+goto commonexit
+
+:mac
+C:\Strawberry\perl\bin\perl.exe -pi -e "s/(; )(.*)(; MacModifiers)/$2$3/g" "%userprofile%\.kinto\kinto.ahk"
+C:\Strawberry\perl\bin\perl.exe -pi -e "s/^(?!;)(.*)(; WinModifiers)/; $1$2/gm" "%userprofile%\.kinto\kinto.ahk"
+"C:\Program Files\AutoHotkey\AutoHotkey.exe" "%userprofile%\.kinto\kinto.ahk"
+goto commonexit
+
+:commonexit
+exit
--- a/windows/usb.vbs
+++ b/windows/usb.vbs
@@ -0,0 +1,73 @@
+Option Explicit
+Dim oWMISrv, collDvcs, iUSBDvc , iDvc, sDvcID, sPID, sVID, deviceID
+
+' add item to array
+Function AddItem(arr, val)
+    ReDim Preserve arr(UBound(arr) + 1)
+    arr(UBound(arr)) = val
+    AddItem = arr
+End Function
+
+' returns an array of the unique items in for-each-able collection fex
+Function uniqFE(fex)
+	Dim dicTemp : Set dicTemp = CreateObject("Scripting.Dictionary")
+	Dim xItem
+	For Each xItem In fex
+		dicTemp(xItem) = 0
+	Next
+	uniqFE = dicTemp.Keys()
+End Function
+
+Function ReplaceX(ByVal sValue, ByVal sPattern, ByVal sNValue)
+    Dim oReg : Set oReg = New RegExp
+    oReg.Pattern = sPattern
+    ReplaceX = oReg.Replace(sValue, sNValue)
+    Set oReg = Nothing
+End Function
+
+Set oWMISrv = GetObject("winmgmts:\\.\root\cimv2")
+Set collDvcs = oWMISrv.ExecQuery("Select * From Win32_PnPEntity WHERE Service='kbdhid'")
+
+Dim deviceVID : deviceVID=Array()
+Dim devicePID : devicePID=Array()
+Dim deviceDesc : deviceDesc=Array()
+Dim counter: counter=0
+
+For Each iUSBDvc In collDvcs
+    sVID = ReplaceX(iUSBDvc.DeviceID, ".*VID_(.{4}).*", "$1")
+    sPID = ReplaceX(iUSBDvc.DeviceID, ".*PID_(.{4}).*", "$1")
+    deviceVID = AddItem(deviceVID, sVID)
+    devicePID = AddItem(devicePID, sPID)
+    deviceDesc = AddItem(deviceDesc, iUSBDvc.Description)
+    counter = counter + 1
+    ' Wscript.Echo "Name : "& iUSBDvc.Description &"VID_PID : "& sVID & sPID
+    Next
+
+Dim uniqueVID: uniqueVID = uniqFE(deviceVID)
+Dim vcount: vcount = UBound(uniqueVID) + 1
+Dim nonApple: nonApple = 0
+Dim i
+
+If vcount = 1 Then
+	deviceID = deviceVID(0)
+	If StrComp(deviceVID(0), "05AC") = 0 Then
+		Wscript.Echo "Apple " & deviceID
+	Else
+		Wscript.Echo "Windows " & deviceID
+	End If
+Else
+	For i = 0 To counter-1
+		deviceID = deviceVID(i)
+    	If StrComp(deviceVID(i), "05AC") = -1 Then
+    		nonApple = 1
+    	End If
+	Next
+	If nonApple = 1 Then
+		Wscript.Echo "Windows " & deviceID
+	Else
+		Wscript.Echo "Apple " & deviceID
+	End If
+End If
+
+Set collDvcs = Nothing
+Set oWMISrv = Nothing
--- a/xkeysnail-config/kinto.py
+++ b/xkeysnail-config/kinto.py
@@ -10,6 +10,11 @@ terminals = ["gnome-terminal","konsole","io.elementary.terminal","terminator","s
 terminals = [term.casefold() for term in terminals]
 termStr = "|".join(str(x) for x in terminals)

+# Use for browser specific hotkeys
+browsers = ["Chromium","Chromium-browser","Google-chrome","Epiphany","Firefox","Discord"]
+browsers = [browser.casefold() for browser in browsers]
+browserStr = "|".join(str(x) for x in browsers)
+
 mscodes = ["code","vscodium"]
 codeStr = "|".join(str(x) for x in mscodes)

@@ -18,25 +23,22 @@ define_conditional_modmap(lambda wm_class: wm_class.casefold() not in terminals,
    # # Chromebook
    # Key.LEFT_ALT: Key.RIGHT_CTRL,   # Chromebook
    # Key.LEFT_CTRL: Key.LEFT_ALT,    # Chromebook
-    # Key.RIGHT_ALT: Key.RIGHT_CTRL,  # Chromebook
-    # Key.RIGHT_CTRL: Key.RIGHT_ALT,  # Chromebook
+    # Key.RIGHT_ALT: Key.RIGHT_CTRL,  # Chromebook - Multi-language (Remove)
+    # Key.RIGHT_CTRL: Key.RIGHT_ALT,  # Chromebook - Multi-language (Remove)

    # # Default Mac/Win
    # Key.LEFT_ALT: Key.RIGHT_CTRL,   # WinMac
    # Key.LEFT_META: Key.LEFT_ALT,    # WinMac
    # Key.LEFT_CTRL: Key.LEFT_META,   # WinMac
-    # Key.RIGHT_ALT: Key.RIGHT_CTRL,  # WinMac
-    # Key.RIGHT_META: Key.RIGHT_ALT,  # WinMac
-    # Key.RIGHT_CTRL: Key.RIGHT_META, # WinMac
-
-    # # KintoWin
-    # Key.LEFT_CTRL: Key.RIGHT_CTRL,   # KintoWin
+    # Key.RIGHT_ALT: Key.RIGHT_CTRL,  # WinMac - Multi-language (Remove)
+    # Key.RIGHT_META: Key.RIGHT_ALT,  # WinMac - Multi-language (Remove)
+    # Key.RIGHT_CTRL: Key.RIGHT_META, # WinMac - Multi-language (Remove)

    # # Mac Only
    # Key.LEFT_META: Key.RIGHT_CTRL,  # Mac
    # Key.LEFT_CTRL: Key.LEFT_META,   # Mac
-    # Key.RIGHT_META: Key.RIGHT_CTRL, # Mac
-    # Key.RIGHT_CTRL: Key.RIGHT_META, # Mac
+    # Key.RIGHT_META: Key.RIGHT_CTRL, # Mac - Multi-language (Remove)
+    # Key.RIGHT_CTRL: Key.RIGHT_META, # Mac - Multi-language (Remove)
 })

 # [Conditional modmap] Change modifier keys in certain applications
@@ -54,18 +56,104 @@ define_conditional_modmap(re.compile(termStr, re.IGNORECASE), {
    # Key.LEFT_META: Key.LEFT_ALT,    # WinMac
    # Key.LEFT_CTRL: Key.LEFT_CTRL,   # WinMac
    # Key.RIGHT_ALT: Key.RIGHT_CTRL,  # WinMac - Multi-language (Remove)
-    # Key.RIGHT_META: Key.RIGHT_ALT,  # WinMac
-    # Key.RIGHT_CTRL: Key.LEFT_CTRL,  # WinMac
-
-    # # KintoWin
-    # Key.LEFT_CTRL: Key.RIGHT_CTRL,   # KintoWin
-    # Key.LEFT_META: Key.LEFT_CTRL,    # KintoWin
+    # Key.RIGHT_META: Key.RIGHT_ALT,  # WinMac - Multi-language (Remove)
+    # Key.RIGHT_CTRL: Key.LEFT_CTRL,  # WinMac - Multi-language (Remove)

    # # Mac Only
    # Key.LEFT_META: Key.RIGHT_CTRL,  # Mac
    # # Left Ctrl Stays Left Ctrl
-    # Key.RIGHT_META: Key.RIGHT_CTRL, # Mac
-    # Key.RIGHT_CTRL: Key.LEFT_CTRL,  # Mac
+    # Key.RIGHT_META: Key.RIGHT_CTRL, # Mac - Multi-language (Remove)
+    # Key.RIGHT_CTRL: Key.LEFT_CTRL,  # Mac - Multi-language (Remove)
+})
+
+# Keybindings for IntelliJ
+define_keymap(re.compile("jetbrains-idea", re.IGNORECASE),{
+    # General
+    K("C-Key_0"): K("M-Key_0"),                 # Open corresponding tool window
+    K("C-Key_1"): K("M-Key_1"),                 # Open corresponding tool window
+    K("C-Key_2"): K("M-Key_2"),                 # Open corresponding tool window
+    K("C-Key_3"): K("M-Key_3"),                 # Open corresponding tool window
+    K("C-Key_4"): K("M-Key_4"),                 # Open corresponding tool window
+    K("C-Key_5"): K("M-Key_5"),                 # Open corresponding tool window
+    K("C-Key_6"): K("M-Key_6"),                 # Open corresponding tool window
+    K("C-Key_7"): K("M-Key_7"),                 # Open corresponding tool window
+    K("C-Key_8"): K("M-Key_8"),                 # Open corresponding tool window
+    K("C-Key_9"): K("M-Key_9"),                 # Open corresponding tool window
+    K("Super-Grave"): K("C-Grave"),             # Quick switch current scheme
+    K("C-Comma"): K("C-M-s"),                   # Open Settings dialog
+    K("C-Semicolon"): K("C-M-Shift-s"),         # Open Project Structure dialog
+    # Debugging
+    K("C-M-r"): K("F9"),                        # Resume program
+    # Search/Replace
+    K("C-g"): K("F3"),                          # Find next
+    K("C-Shift-F3"): K("Shift-F3"),             # Find previous
+    K("Super-g"): K("M-j"),                     # Select next occurrence
+    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-j"): K("C-q"),                     # Quick documentation lookup
+    K("C-n"): K("M-Insert"),                    # Generate code...
+    K("Super-o"): K("C-o"),                     # Override methods
+    K("Super-i"): K("C-i"),                     # Implement methods
+    K("M-Up"): K("C-w"),                        # Extend selection
+    K("M-Down"): K("C-Shift-w"),                # Shrink selection
+    K("Super-Shift-q"): K("M-q"),               # Context info
+    K("Super-M-o"): K("C-M-o"),                 # Optimize imports
+    K("Super-M-i"): K("C-M-i"),                 # Auto-indent line(s)
+    K("C-Backspace"): K("C-y"),                 # Delete line at caret
+    K("Super-Shift-j"): K("C-Shift-j"),         # Smart line join
+    K("M-Delete"): K("C-Delete"),               # Delete to word end
+    K("M-Backspace"): K("C-Backspace"),         # Delete to word start
+    K("C-Shift-Equal"): K("C-KPPLUS"),          # Expand code block
+    K("C-Minus"): K("C-KPMINUS"),               # Collapse code block
+    K("C-Shift-Equal"): K("C-Shift-KPPLUS"),    # Expand all
+    K("C-Shift-Minus"): K("C-Shift-KPMINUS"),   # Collapse all
+    K("C-w"): K("C-F4"),                        # Close active editor tab
+    # Refactoring
+    K("C-Delete"): K("M-Delete"),               # Safe Delete
+    K("C-T"): K("C-M-Shift-t"),                 # Refactor this
+    # Navigation
+    K("C-o"): K("C-n"),                         # Go to class
+    K("C-Shift-o"): K("C-Shift-n"),             # Go to file
+    K("C-M-o"): K("C-M-Shift-n"),               # Go to symbol
+    K("Super-Right"): K("M-Right"),             # Go to next editor tab
+    K("Super-Left"): K("M-Left"),               # Go to previous editor tab
+    K("Super-l"): K("C-g"),                     # Go to line
+    K("Super-e"): K("C-e"),                     # Recent files popup
+    K("M-Space"): K("C-Shift-i"),               # Open quick definition lookup
+    K("C-Y"): K("C-Shift-i"),                   # Open quick definition lookup
+    K("Super-Shift-b"): K("C-Shift-b"),         # Go to type declaration
+    K("Super-Up"): K("M-Up"),                   # Go to previous
+    K("Super-Down"): K("M-Down"),               # Go to next method
+    K("Super-h"): K("C-h"),                     # Type hierarchy
+    K("Super-M-h"): K("C-M-h"),                 # Call hierarchy
+    K("C-Down"): K("C-Enter"),                  # Edit source/View source
+    K("M-Home"): K("M-Home"),                   # Show navigation bar
+    K("F2"): K("F11"),                          # Toggle bookmark
+    K("Super-F3"): K("C-F11"),                  # Toggle bookmark with mnemonic
+    K("Super-Key_0"): K("C-Key_0"),             # Go to numbered bookmark
+    K("Super-Key_1"): K("C-Key_1"),             # Go to numbered bookmark
+    K("Super-Key_2"): K("C-Key_2"),             # Go to numbered bookmark
+    K("Super-Key_3"): K("C-Key_3"),             # Go to numbered bookmark
+    K("Super-Key_4"): K("C-Key_4"),             # Go to numbered bookmark
+    K("Super-Key_5"): K("C-Key_5"),             # Go to numbered bookmark
+    K("Super-Key_6"): K("C-Key_6"),             # Go to numbered bookmark
+    K("Super-Key_7"): K("C-Key_7"),             # Go to numbered bookmark
+    K("Super-Key_8"): K("C-Key_8"),             # Go to numbered bookmark
+    K("Super-Key_9"): K("C-Key_9"),             # Go to numbered bookmark
+    K("C-F3"): K("Shift-F11"),                  # Show bookmarks
+    # Compile and Run
+    K("Super-M-r"): K("M-Shift-F10"),           # Select configuration and run
+    K("Super-M-d"): K("M-Shift-F9"),            # Select configuration and debug
+    K("Super-r"): K("Shift-F10"),               # Run
+    K("Super-d"): K("Shift-F9"),                # Debug
+    K("Super-Shift-r"): K("C-Shift-F10"),       # Run context configuration from editor
+    K("Super-Shift-d"): K("C-Shift-F9"),        # Debug context configuration from editor
+    # VCS/Local History
+    K("Super-v"): K("M-Grave"),                 # VCS quick popup
+    K("Super-c"): K("LC-c"),                    # Sigints - interrupt
 })

 # Keybindings for Nautilus
@@ -76,6 +164,11 @@ define_keymap(re.compile("org.gnome.nautilus", re.IGNORECASE),{
    K("RC-Right"): K("M-Right"),    # Go Forward
 })

+# Keybindings for Browsers
+define_keymap(re.compile(browserStr, re.IGNORECASE),{
+    K("RC-Q"): K("RC-Q"),          # Close all browsers Instances
+})
+
 define_keymap(None,{
    # Basic App hotkey functions
    K("RC-Q"): K("Alt-F4"),
@@ -120,11 +213,13 @@ define_keymap(None,{
 })

 define_keymap(lambda wm_class: wm_class.casefold() not in mscodes,{
+    K("Super-Space"): K("C-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
    # ** VS Code fix **
    #   Electron issue precludes normal keybinding fix.
    #   Alt menu auto-focus/toggle gets in the way.
@@ -167,6 +262,7 @@ define_keymap(re.compile(codeStr, re.IGNORECASE),{
    K("C-g"): K("f3"),                          # find_next
    K("Shift-f3"): pass_through_key,            # cancel find_prev
    K("C-Shift-g"): K("Shift-f3"),              # find_prev
+    K("Super-c"): K("LC-c"),                    # Sigints - interrupt
    # K("Super-C-g"): K("C-f2"),                  # Default - Sublime - find_all_under
    # K("C-M-g"): K("C-f2"),                      # Chromebook - Sublime - find_all_under
    # K("Super-Shift-up"): K("M-Shift-up"),       # multi-cursor up - Sublime
@@ -177,13 +273,14 @@ define_keymap(re.compile(codeStr, re.IGNORECASE),{

 # Keybindings for Sublime Text
 define_keymap(re.compile("Sublime_text", re.IGNORECASE),{
+    K("Super-Space"): K("C-Space"),             # Basic code completion
    K("C-Super-up"): K("M-o"),                  # Switch file
-    K("C-M-f"): K("f11"),                       # toggle_full_screen
+    K("Super-RC-f"): K("f11"),                  # toggle_full_screen
    K("C-M-v"): [K("C-k"), K("C-v")],           # paste_from_history
    K("C-up"): pass_through_key,                # cancel scroll_lines up
-    K("Super-M-up"): K("C-up"),                 # scroll_lines up
+    K("C-M-up"): K("C-up"),                     # scroll_lines up
    K("C-down"): pass_through_key,              # cancel scroll_lines down
-    K("Super-M-down"): K("C-down"),             # scroll_lines down
+    K("C-M-down"): K("C-down"),                 # scroll_lines down
    K("Super-Shift-up"): K("M-Shift-up"),       # multi-cursor up
    K("Super-Shift-down"): K("M-Shift-down"),   # multi-cursor down
    K("C-PAGE_DOWN"): pass_through_key,         # cancel next_view
@@ -213,9 +310,9 @@ define_keymap(re.compile("Sublime_text", re.IGNORECASE),{
    # K("M-C-g"): K("M-Refresh"),                 # Chromebook - find_all_under
    K("Super-C-g"): K("M-f3"),                  # Default - find_all_under
    K("C-Shift-up"): pass_through_key,          # cancel swap_line_up
-    K("Super-C-up"): K("C-Shift-up"),           # swap_line_up
+    K("Super-M-up"): K("C-Shift-up"),           # swap_line_up
    K("C-Shift-down"): pass_through_key,        # cancel swap_line_down
-    K("Super-C-down"): K("C-Shift-down"),       # swap_line_down
+    K("Super-M-down"): K("C-Shift-down"),       # swap_line_down
    K("C-Pause"): pass_through_key,             # cancel cancel_build
    K("Super-c"): K("C-Pause"),                 # cancel_build
    K("f9"): pass_through_key,                  # cancel sort_lines case_s false
--- a/xkeysnail-config/prexk.sh
+++ b/xkeysnail-config/prexk.sh
@@ -1,14 +1,13 @@
 #!/bin/bash
-
-if [ -f /home/{username}/.config/systemd/user/keyswap.timer ]; then
+if [ -f {homedir}/.config/systemd/user/keyswap.timer ]; then
 	systemctl --user stop keyswap.timer >/dev/null 2>&1
 	systemctl --user disable keyswap.timer >/dev/null 2>&1
 fi
-if [ -f /home/{username}/.config/systemd/user/keyswap.service ]; then
+if [ -f {homedir}/.config/systemd/user/keyswap.service ]; then
 	systemctl --user stop keyswap >/dev/null 2>&1
 	systemctl --user disable keyswap >/dev/null 2>&1
 fi

 # export DISPLAY={displayid};/usr/bin/xhost +SI:localuser:root
 mkdir -p /tmp/kinto/xkeysnail
-cp /home/{username}/.config/kinto/kinto.py /tmp/kinto/xkeysnail/kinto.py
+cp {homedir}/.config/kinto/kinto.py /tmp/kinto/xkeysnail/kinto.py
--- a/xkeysnail-config/vscode_keybindings.json
+++ b/xkeysnail-config/vscode_keybindings.json
@@ -0,0 +1,31 @@
+// Place your key bindings in this file to override the defaultsauto[]
+[
+    {
+        "key": "alt+left",
+        "command": "-workbench.action.terminal.focusPreviousPane",
+        "when": "terminalFocus"
+    },
+    {
+        "key": "alt+right",
+        "command": "-workbench.action.terminal.focusNextPane",
+        "when": "terminalFocus"
+    },
+    {
+        "key": "alt+right",
+        "command": "cursorWordRight"
+    },
+    {
+        "key": "alt+left",
+        "command": "cursorWordLeft"
+    },
+    {
+        "key": "shift+alt+left",
+        "command": "cursorWordStartLeftSelect",
+        "when": "textInputFocus"
+    },
+    {
+        "key": "shift+alt+right",
+        "command": "cursorWordEndRightSelect",
+        "when": "textInputFocus"
+    }
+]
--- a/xkeysnail-config/xkeysnail.service
+++ b/xkeysnail-config/xkeysnail.service
@@ -4,12 +4,12 @@ Description=xkeysnail
 [Service]
 Type=simple
 KillMode=process
-ExecStartPre=/bin/bash -c "{xhost} +SI:localuser:root && /sbin/runuser -l {username} -c /home/{username}/.config/kinto/prexk.sh"
-ExecStart=/usr/bin/sudo /bin/bash -c '{experimental-caret}/home/{username}/.config/kinto/xkeystart.sh /tmp/kinto/xkeysnail/kinto.py'
+ExecStartPre=/bin/bash -c "{xhost} +SI:localuser:root && /sbin/runuser -l {username} -c {homedir}/.config/kinto/prexk.sh"
+ExecStart=/usr/bin/sudo /bin/bash -c '{experimental-caret}{homedir}/.config/kinto/xkeystart.sh /tmp/kinto/xkeysnail/kinto.py'
 ExecStop=/bin/bash -c 'me=$$;ps -ef | grep \'[t]mp/kinto\' | awk -v me=$me \'$2 != me {print $2}\' | xargs kill;/usr/bin/killall dbus-monitor;/usr/bin/killall xkeysnail;{kill-caret}'
 Restart=on-failure
 RestartSec=3
 Environment=DISPLAY={displayid}

 [Install]
-WantedBy=graphical.target
+WantedBy=graphical.target
--- a/xkeysnail_service.sh
+++ b/xkeysnail_service.sh
@@ -72,6 +72,20 @@ function uninstall {
 	fi
 }

+function removeAppleKB {
+	# Undo Apple keyboard cmd & alt swap
+	if test -f "/sys/module/hid_apple/parameters/swap_opt_cmd" && [ `cat /sys/module/hid_apple/parameters/swap_opt_cmd` == "1" ]; then
+		echo '0' | sudo tee /sys/module/hid_apple/parameters/swap_opt_cmd
+		echo 'options hid_apple swap_opt_cmd=0' | sudo tee /etc/modprobe.d/hid_apple.conf
+		sudo update-initramfs -u -k all
+	fi
+	if test -f "/sys/module/applespi/parameters/swap_opt_cmd" && [ `cat /sys/module/applespi/parameters/swap_opt_cmd` == "1" ]; then
+		echo '0' | sudo tee /sys/module/applespi/parameters/swap_opt_cmd
+		echo 'options applespi swap_opt_cmd=0' | sudo tee /etc/modprobe.d/applespi.conf
+		sudo update-initramfs -u -k all
+	fi
+}
+
 function budgieUninstall {
 	if [ -f /usr/bin/budgie-desktop ];then
 		read -n 1 -s -r -p "Your system may log you off immediately during the restoration of budgie-daemon. Press any key to continue..."
@@ -101,7 +115,7 @@ function budgieUpdate {
 			budgieVersion="$(/usr/bin/budgie-desktop --version | awk '{ print $2; }' | head -n1)"
 			if [ "$budgieVersion" == "10.5.1" ]; then
 				if ! [ -f ./system-config/budgie-daemon_10.5.1 ]; then
-					wget https://github.com/rbreaves/budgie-desktop/raw/43d3b44243b0bcaee3262a79818024a651475b58/binaries/budgie-daemon_10.5.1 -O ./system-config/budgie-daemon_10.5.1
+					wget https://github.com/rbreaves/budgie-desktop/blob/binaries/binaries/budgie-daemon_10.5.1?raw=true -O ./system-config/budgie-daemon_10.5.1
 				fi
 				bdmd5=$(md5sum /usr/bin/budgie-daemon | awk '{ print $1 }')
 				newbdmd5=$(md5sum ./system-config/budgie-daemon_10.5.1 | awk '{ print $1 }')
@@ -137,10 +151,9 @@ function budgieUpdate {

 if [ $# -eq 0 ]; then
 	echo "Install Kinto - xkeysnail (udev)"
-	echo "  1) Windows & Mac (HID driver)"
-	echo "  2) Mac Only & VMs on Macbooks"
-	echo "  3) Chromebook"
-	echo "  4) Windows w/ Kinto - aka Linux VM"
+	echo "  1) Windows & Mac (HID driver) - Most Standard keyboards (& 1st party usb/bt Apple keyboards)"
+	echo "  2) Mac Only & VMs on Macbooks - 3rd & 1st party Apple keyboards"
+	echo "  3) Chromebook - Chromebook running Linux"
 	# echo "  5) Uninstall"

 	read n
@@ -153,9 +166,9 @@ rightalt=false
 # VS code remap
 vssublime=false

-if [[ $1 == "1" || $1 == "2" || $1 == "3" || $1 == "4" || $1 == "kintowin" || $1 == "winmac" || $1 == "mac" || $1 == "chromebook" ]]; then
+if [[ $1 == "1" || $1 == "2" || $1 == "3" || $1 == "winmac" || $1 == "mac" || $1 == "chromebook" ]]; then
 	while true; do
-	read -rep $'\nDo you want multi-language support (the right Alt key will not remap)? (y/N)\n' yn
+	read -rep $'\nDo you want multi-language on Right Alt key? (y/N)\naka Left side remaps, right side doesn\'t\n' yn
 	case $yn in
 		[Yy]* ) rightalt=true; break;;
 		* ) break;;
@@ -173,7 +186,7 @@ if [[ $1 == "1" || $1 == "2" || $1 == "3" || $1 == "4" || $1 == "kintowin" || $1
 		while true; do
 		read -rep $'\nExperimental Support for Firefox/Chrome Back/Forward hotkeys (Cmd+Left/Right)?\n(Keys could get stuck, switch windows or press ctrl &/or super to release) (y/n)\n' yn
 		case $yn in
-			[Yy]* ) exp='/sbin/runuser -l {username} -c "export DISPLAY={displayid};/home/{username}/.config/kinto/caret_status_xkey.sh\&";'; expsh='"/home/{username}/.config/kinto/caret_status_xkey.sh"'; break;;
+			[Yy]* ) exp='/sbin/runuser -l {username} -c "export DISPLAY={displayid};{homedir}/.config/kinto/caret_status_xkey.sh\&";'; expsh='"{homedir}/.config/kinto/caret_status_xkey.sh"'; break;;
 			[Nn]* ) exp=" "; expsh=" " break;;
 			# * ) echo "Please answer yes or no.";;
 		esac
@@ -214,13 +227,14 @@ if [[ $1 == "1" || $1 == "2" || $1 == "3" || $1 == "4" || $1 == "kintowin" || $1

 	# echo "Transferring files..."
 	mkdir -p ~/.config/kinto
-	
+
 	# KDE xhost fix
 	mkdir -p ~/.kde/Autostart
 	echo -e '#!/bin/sh\rxhost +SI:localuser:root' > ~/.kde/Autostart/kintohost.sh
 	chmod +x ~/.kde/Autostart/kintohost.sh

 	# KDE startup - xhost fix
+	mkdir -p ~/.config/autostart
 	yes | cp -rf ./xkeysnail-config/xkeysnail.desktop ~/.config/autostart/xkeysnail.desktop

 	yes | cp -rf ./xkeysnail-config/xkeystart.sh ~/.config/kinto/xkeystart.sh
@@ -237,14 +251,16 @@ if [[ $1 == "1" || $1 == "2" || $1 == "3" || $1 == "4" || $1 == "kintowin" || $1
 		sed -i "s#{kill-caret}#$expsh#g" ./xkeysnail-config/xkeysnail.service.new
 	fi
 	sed -i "s/{username}/`whoami`/g" ./xkeysnail-config/xkeysnail.service.new
-	sed -i "s#{xhost}#`which xhost`#g" ./xkeysnail-config/xkeysnail.service.new
+	sed -i "s#{homedir}#`echo "$HOME"`#g" ./xkeysnail-config/xkeysnail.service.new
+	sed -i "s#{xhost}#`\\which xhost`#g" ./xkeysnail-config/xkeysnail.service.new
 	sed -i "s/{username}/`whoami`/g" ./xkeysnail-config/limitedadmins.new
-	sed -i "s#{systemctl}#`which systemctl`#g" ./xkeysnail-config/limitedadmins.new
+	sed -i "s#{homedir}#`echo "$HOME"`#g" ./xkeysnail-config/limitedadmins.new
+	sed -i "s#{systemctl}#`\\which systemctl`#g" ./xkeysnail-config/limitedadmins.new
 	sudo chown root:root ./xkeysnail-config/limitedadmins.new
 	sudo mv ./xkeysnail-config/limitedadmins.new /etc/sudoers.d/limitedadmins
-	sed -i "s#{systemctl}#`which systemctl`#g" ~/.config/autostart/xkeysnail.desktop
-	sed -i "s#{xhost}#`which xhost`#g" ~/.config/autostart/xkeysnail.desktop
-	sed -i "s/{username}/`whoami`/g" ~/.config/kinto/prexk.sh
+	sed -i "s#{systemctl}#`\\which systemctl`#g" ~/.config/autostart/xkeysnail.desktop
+	sed -i "s#{xhost}#`\\which xhost`#g" ~/.config/autostart/xkeysnail.desktop
+	sed -i "s#{homedir}#`echo "$HOME"`#g" ~/.config/kinto/prexk.sh
 	sed -i "s/{displayid}/`echo "$DISPLAY"`/g" ./xkeysnail-config/xkeysnail.service.new
 	sed -i "s/{displayid}/`echo "$DISPLAY"`/g" ~/.config/kinto/prexk.sh

@@ -254,13 +270,22 @@ if [[ $1 == "1" || $1 == "2" || $1 == "3" || $1 == "4" || $1 == "kintowin" || $1
 fi

 if [[ $1 == "1" || $1 == "winmac" ]]; then
-	echo '1' | sudo tee -a /sys/module/hid_apple/parameters/swap_opt_cmd;echo 'options hid_apple swap_opt_cmd=1' | sudo tee -a /etc/modprobe.d/hid_apple.conf;sudo update-initramfs -u -k all
+	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
+	fi
+	if ls /sys/module | grep applespi >/dev/null 2>&1 ; then
+		echo '1' | sudo tee /sys/module/applespi/parameters/swap_opt_cmd;echo 'options applespi swap_opt_cmd=1' | sudo tee /etc/modprobe.d/applespi.conf;sudo update-initramfs -u -k all
+	fi
+	if ! ls /sys/module | grep apple ; then
+		removeAppleKB
+	fi
 	perl -pi -e "s/(# )(.*)(# WinMac)/\$2\$3/g" ./xkeysnail-config/kinto.py.new
 	if [[ $dename == "xfce" ]]; then
 		perl -pi -e "s/(# )(.*)(# xfce4)/\$2\$3/g" ./xkeysnail-config/kinto.py.new
 		perl -pi -e "s/(\w.*)(# Default not-xfce4)/# \$1\$2/g" ./xkeysnail-config/kinto.py.new
 	fi
 elif [[ $1 == "2" || $1 == "mac" ]]; then
+	removeAppleKB
 	perl -pi -e "s/(# )(.*)(# Mac)/\$2\$3/g" ./xkeysnail-config/kinto.py.new
 	if [[ $dename == "xfce" ]]; then
 		perl -pi -e "s/(# )(.*)(# xfce4)/\$2\$3/g" ./xkeysnail-config/kinto.py.new
@@ -270,15 +295,13 @@ elif [[ $1 == "3" || $1 == "chromebook" ]]; then
 	perl -pi -e "s/(# )(.*)(# Chromebook)/\$2\$3/g" ./xkeysnail-config/kinto.py.new
 	perl -pi -e "s/(# )(.*)(# xfce4)/\$2\$3/g" ./xkeysnail-config/kinto.py.new
 	perl -pi -e "s/(\w.*)(# Default)/# \$1\$2/g" ./xkeysnail-config/kinto.py.new
-elif [[ $1 == "4" || $1 == "kintowin" ]]; then
-	perl -pi -e "s/(# )(.*)(# KintoWin)/\$2\$3/g" ./xkeysnail-config/kinto.py.new
 fi

 if $rightalt ; then
 	perl -pi -e "s/(\w.*)(Multi-language)/# \$1\$2/g" ./xkeysnail-config/kinto.py.new >/dev/null 2>&1
 fi

-if [[ $1 == "1" || $1 == "2" || $1 == "3" || $1 == "4" || $1 == "kintowin" || $1 == "winmac" || $1 == "mac" || $1 == "chromebook" ]]; then
+if [[ $1 == "1" || $1 == "2" || $1 == "3" || $1 == "winmac" || $1 == "mac" || $1 == "chromebook" ]]; then
 	mv ./xkeysnail-config/kinto.py.new ~/.config/kinto/kinto.py
 	# if [ "$distro" == "fedora" ];then
 	sudo rm /etc/systemd/system/xkeysnail.service
@@ -359,12 +382,7 @@ if [[ $1 == "1" || $1 == "2" || $1 == "3" || $1 == "4" || $1 == "kintowin" || $1
 elif [[ $1 == "5" || $1 == "uninstall" || $1 == "Uninstall" ]]; then
 	echo "Uninstalling Kinto - xkeysnail (udev)"
 	uninstall
-	# Undo Apple keyboard cmd & alt swap
-	if test -f "/sys/module/hid_apple/parameters/swap_opt_cmd" && [ `cat /sys/module/hid_apple/parameters/swap_opt_cmd` == "1" ]; then
-		echo '0' | sudo tee -a /sys/module/hid_apple/parameters/swap_opt_cmd
-		echo 'options hid_apple swap_opt_cmd=0' | sudo tee -a /etc/modprobe.d/hid_apple.conf
-		sudo update-initramfs -u -k all
-	fi
+	removeAppleKB
 	sudo systemctl stop xkeysnail
 	sudo systemctl disable xkeysnail
 	sudo rm /etc/sudoers.d/limitedadmins
@@ -381,4 +399,4 @@ elif [[ $1 == "5" || $1 == "budgieUpdate" ]]; then
 	budgieUpdate
 else
 	echo "Expected argument was not provided"
-fi
+fi
Author	SHA1	Message	Date
Ben Reaves	efe01c94d4	Merge pull request #268 from rbreaves/hotfix - Additional fixes for Windows 10 user profile spaces	2020-08-24 14:31:40 -05:00
Ben Reaves	0a5c526941	- Additional fixes for Windows 10 user profile spaces	2020-08-24 14:30:50 -05:00
Ben Reaves	0c7ca8586b	Merge pull request #267 from rbreaves/hotfix - Adds Windows 10 Support for spaces in user profile, code completion fix.	2020-08-24 03:59:11 -05:00
Ben Reaves	b1c361080a	- Prevents physical Ctrl+Space from remapping into Ctrl+Esc, aka start menu. #264	2020-08-24 03:57:22 -05:00
Ben Reaves	b1d5aa68f3	- Added support for user profiles with spaces under Windows 10. Closes #266	2020-08-24 03:50:16 -05:00
Ben Reaves	4dd1c26563	Merge pull request #265 from rbreaves/hotfix - Added manual code completion for vscode and sublimetext. Closes #264	2020-08-24 01:51:11 -05:00
Ben Reaves	c38cccdb44	- Added manual code completion for vscode and sublimetext. Closes #264	2020-08-24 01:49:30 -05:00
Ben Reaves	558e86dd78	Merge pull request #258 from matteron/FixAltBackspaces Fixing Alt + Backspace on Windows	2020-08-12 14:20:54 -05:00
Schiano, Mattia	463730fe1b	Making autohotkey hotkey for ctrl + backspace only read raw keyboard input to prevent alt + backspace from triggering ctrl + backspace	2020-08-11 15:51:50 -04:00
Ben Reaves	be0f2e67bb	Merge branch 'dev'	2020-08-03 15:43:50 -05:00
Ben Reaves	2270ea5d0d	- Enabled left clicks on Kinto system tray in Windows	2020-08-03 03:10:51 -05:00
Ben Reaves	7e69d6c03f	Merge pull request #251 from rbreaves/dev - Added missing intellij grouping for Windows 10	2020-07-30 02:54:20 -05:00
Ben Reaves	6f83fafc66	Merge branch 'master' into dev	2020-07-30 02:53:21 -05:00
Ben Reaves	eab147bd88	- Added missing intellij grouping for Windows 10	2020-07-30 02:52:54 -05:00
Ben Reaves	c4dcd3febc	Update README.md	2020-07-24 01:43:30 -05:00
Ben Reaves	7c289b7d0c	Update README.md	2020-07-24 01:22:21 -05:00
Ben Reaves	48ef1c596a	Merge pull request #246 from rbreaves/dev - Corrected Minimize all but current window	2020-07-22 23:09:44 -05:00
Ben Reaves	8c677e8ef0	- Corrected Minimize all but current window	2020-07-22 23:08:23 -05:00
Ben Reaves	bd8ea9c4e1	Merge pull request #245 from rbreaves/dev - IntelliJ corrections, Minimize & Hide Additions for Windows 10	2020-07-22 22:48:16 -05:00
Ben Reaves	9df95e8b8d	- Added 3 variations of hide combos for Windows 10	2020-07-22 22:46:42 -05:00
Ben Reaves	e654929d1e	- Added show desktop, minimize windows and fixed syntax issues (Windows only)	2020-07-22 20:03:25 -05:00
Ben Reaves	f1b37a8cbd	Merge pull request #244 from rbreaves/dev - Adds budgie message and windows terminal hotkeys	2020-07-21 17:59:42 -05:00
Ben Reaves	f922caff78	- Added Beginning and End of line for terminals on Windows 10 more generically	2020-07-21 17:42:42 -05:00
Ben Reaves	68173fb5b6	Merge branch 'master' into dev	2020-07-21 17:39:59 -05:00
Ben Reaves	53f320e0b9	Update README.md	2020-07-16 13:03:54 -05:00
Ben Reaves	dfec4f7eb1	Update README.md	2020-07-16 11:19:29 -05:00
Ben Reaves	1fb5bf2a4b	- Added budgie message for user to reset cmd-tab	2020-07-12 21:10:10 -05:00
Ben Reaves	656e2fafc9	Merge pull request #241 from rbreaves/dev - Added proper shortcut re-apply fix for mate and budgie	2020-07-12 00:47:12 -05:00
Ben Reaves	3af5eb286d	- Added proper shortcut re-apply fix for mate and budgie	2020-07-12 00:45:24 -05:00
Ben Reaves	3945d5c29e	Merge pull request #240 from rbreaves/dev - Corrected kinto.py syntax and url for budgie-daemon	2020-07-12 00:19:40 -05:00
Ben Reaves	afefc5b0f1	- Corrected kinto.py syntax and url for budgie-daemon	2020-07-12 00:12:43 -05:00
Ben Reaves	b66f2c591a	Merge pull request #239 from rbreaves/dev - Added IntelliJ remaps, minor eOS fix, alias busting on which, fixed uninstaller, improved budgie support	2020-07-11 17:36:56 -05:00
Ben Reaves	e12c51f98f	- Added IntelliJ remaps to Linux	2020-07-11 17:32:24 -05:00
Ben Reaves	8690436629	- Updated which to avoid alias overrides, Ubuntu Budgie Tab Switching support improvements, Uninstaller updated.	2020-07-11 15:46:50 -05:00
Ben Reaves	0eadd9b3a4	- Skip xkb modifications if install type is xkeysnail. Closes #238	2020-07-08 18:17:22 -05:00
Ben Reaves	1d6d367c39	- Added sigint Ctrl-C for VS Code & IntelliJ keymaps for Windows	2020-07-08 17:44:48 -05:00
Ben Reaves	1e46a4dc74	Merge pull request #237 from RedBearAK/patch-1 Update xkeysnail_service.sh Looks good, thanks!	2020-07-08 11:39:16 -05:00
RedBearAK	7aeb3dc44c	Update xkeysnail_service.sh Add command to create ~/.config/autostart in case it doesn’t exist.	2020-07-07 23:27:00 -08:00
Ben Reaves	6968e08f2f	Update README.md	2020-07-07 19:49:36 -05:00
Ben Reaves	40ea2b6175	Update README.md	2020-07-07 17:37:12 -05:00
Ben Reaves	367d55b04b	Merge pull request #235 from rbreaves/dev - Fixed alt/cmd swap append issue & added proper close all for browsers	2020-07-07 17:02:49 -05:00
Ben Reaves	2864ae409a	- Added proper quit hotkey for browsers, except edge (windows). Closes #232	2020-07-07 16:54:43 -05:00
Ben Reaves	e477848b59	- Removes appending argument from alt/cmd swap on official apple keyboards. Closes #233	2020-07-07 16:15:32 -05:00
Ben Reaves	26dacc7984	Merge pull request #234 from thebitstick/patch-1 Electron Apps have their own names unfortunately	2020-07-06 23:53:23 -05:00
TheBitStick	a3d8ac782a	Electron Apps have their own names unfortunately #232	2020-07-06 23:23:30 -05:00
Ben Reaves	acd0b8031e	- Added proper quit hotkey for browsers (linux)	2020-07-06 20:20:16 -05:00
Ben Reaves	9543eba753	Merge pull request #231 from rbreaves/dev - Multi-language on Right Alt key was incompleted. Closes #192	2020-07-04 17:54:16 -05:00
Ben Reaves	738aee9465	- Multi-language on Right Alt key was incompleted. Closes #192	2020-07-04 17:52:48 -05:00
Ben Reaves	dc826b8454	Merge pull request #230 from rbreaves/dev - Added copy/paste/sigint for mintty (Windows)	2020-07-03 23:16:41 -05:00
Ben Reaves	8bd6ed242f	- Added copy/paste/sigint for mintty (Windows)	2020-07-03 23:15:51 -05:00
Ben Reaves	d96e238550	Merge pull request #226 from rbreaves/dev - Fuller description of the install type options	2020-07-01 16:04:51 -05:00
Ben Reaves	e1948dcb08	- Fuller description of the install type options	2020-07-01 16:03:34 -05:00
Ben Reaves	7e0680ff75	Update README.md	2020-06-28 12:28:37 -05:00
Ben Reaves	a46bb911c9	Update README.md	2020-06-21 19:42:50 -05:00
Ben Reaves	f4cad2a1e3	Update README.md	2020-06-21 19:37:24 -05:00
Ben Reaves	ba10ff6ced	Update README.md	2020-06-20 02:21:52 -05:00
Ben Reaves	089fe469a5	Update README.md	2020-06-20 01:37:54 -05:00
Ben Reaves	f39323071a	Merge pull request #223 from rbreaves/windows - Multiple fixes to Windows based install	2020-06-20 01:36:23 -05:00
Ben Reaves	85d6653261	- toggle_kb.bat syntax fix	2020-06-20 01:35:11 -05:00
Ben Reaves	c7c063ada5	Update README.md	2020-06-20 01:32:01 -05:00
Ben Reaves	6a866dec54	Update README.md	2020-06-19 20:58:09 -05:00
Ben Reaves	d52d8cc34f	- Windows installer fixes, perl fixes	2020-06-19 18:53:29 -07:00
Ben Reaves	70774c3431	- More updates to the Windows based installer	2020-06-19 20:18:03 -07:00
Ben Reaves	da22daf1f3	- Corrected autohotkey/choco install script, added setup for powershell	2020-06-19 19:03:06 -07:00
Ben Reaves	918f4bbf94	Update README.md	2020-06-19 20:33:17 -05:00
Ben Reaves	065dad7ce3	Update README.md	2020-06-19 16:32:00 -05:00
Ben Reaves	032c317c7e	Update README.md	2020-06-19 16:30:58 -05:00
Ben Reaves	80735aefaa	Update README.md	2020-06-19 12:11:01 -05:00
Ben Reaves	39bd27ec25	Update README.md	2020-06-19 11:31:13 -05:00
Ben Reaves	f57b02849a	Update README.md	2020-06-19 11:30:19 -05:00
Ben Reaves	da98afe154	Update README.md	2020-06-19 11:28:22 -05:00
Ben Reaves	bbb1429c8e	Merge pull request #222 from rbreaves/dev - Updated Uninstaller to silence some output	2020-06-19 11:14:08 -05:00
Ben Reaves	9a1e66620b	- Updated Uninstaller to silence some output	2020-06-19 11:04:31 -05:00
Ben Reaves	d527347bdc	Merge pull request #221 from rbreaves/dev - Sublime Text 3 keymaps corrections, completed remaps for Windows	2020-06-18 22:54:32 -05:00
Ben Reaves	efc772d687	- Sublime Text 3 keymaps corrections, completed remaps for Windows	2020-06-18 22:53:04 -05:00
Ben Reaves	7fcd94fda5	- Updated Windows uninstaller	2020-06-18 20:44:57 -05:00
Ben Reaves	5a46aad268	Merge pull request #220 from rbreaves/dev - Corrected Suspend error, duplicate code issue	2020-06-18 20:31:29 -05:00
Ben Reaves	c66dcbca9a	Update README.md	2020-06-18 19:11:04 -05:00
Ben Reaves	72bedf856d	Update README.md	2020-06-18 15:10:07 -05:00
Ben Reaves	3d9d2524a2	- Corrected Suspend error, duplicate code issue	2020-06-18 11:39:48 -05:00
Ben Reaves	8848f8cbea	Update README.md	2020-06-18 00:50:39 -05:00
Ben Reaves	f5318c9807	Merge pull request #219 from rbreaves/dev - Corrected copy order and syntax issues	2020-06-17 14:35:42 -05:00
Ben Reaves	de42816a01	- Corrected copy order and syntax issues	2020-06-17 14:34:56 -05:00
Ben Reaves	1acc948fbc	Merge pull request #214 from rbreaves/dev - Windows auto-keyboard detection, new icon status, Terminus support	2020-06-16 13:35:04 -05:00
Ben Reaves	7174904434	- Added source control remap to VS Code. Closes #191 .	2020-06-16 02:37:02 -05:00
Ben Reaves	b5ab41de9d	- Added proper disabling of the autodetect feature when program is disabled.	2020-06-16 00:44:44 -05:00
Ben Reaves	86582466cf	- Updated uninstaller for Windows to fully remove kinto	2020-06-15 23:13:31 -05:00
Ben Reaves	cc05da2f59	- Added more assets and added suspend and unique windows vs apple keyboard status icons for Windows	2020-06-15 23:01:38 -05:00
Ben Reaves	2b9598c84f	- Completed Windows autoset keyboard feature	2020-06-15 01:39:56 -05:00
Ben Reaves	7f9ccabf77	- WIP autoset keyboard type for Windows	2020-06-14 22:20:28 -05:00
Ben Reaves	2249c4538d	Merge branch 'dev' into alpha	2020-06-14 15:03:57 -05:00
Ben Reaves	fb630a7d33	Merge branch 'master' into dev	2020-06-14 15:03:12 -05:00
Ben Reaves	28e5141079	Update README.md	2020-06-14 01:15:27 -05:00
Ben Reaves	d29579e0a5	- Fixed posix grouping for Terminus	2020-06-14 00:58:00 -05:00
Ben Reaves	dcd8191bfb	Merge pull request #211 from rbreaves/dev - Sped up installer, improved mac kb & budgie support	2020-06-13 19:30:56 -05:00
Ben Reaves	5b4269fc1f	- Allowing galliumOS shortcut keys to apply to any XFCE DE	2020-06-13 19:27:17 -05:00
Ben Reaves	1fc62a54da	- Proper Budgie detection, improved mac kb support (hid/spi), installs faster.	2020-06-13 19:25:06 -05:00
Ben Reaves	4c8d8412b8	- converted dename.sh to tabs only	2020-06-13 18:08:55 -05:00
Ben Reaves	6cb66a6b72	Updated resources to include Win10 touchpad driver	2020-06-13 17:22:12 -05:00
Ben Reaves	7c36021642	- Removed another reference to old KintoWin VM Linux	2020-06-13 17:00:29 -05:00
Ben Reaves	3622eeb279	Update README.md	2020-06-13 16:22:54 -05:00
Ben Reaves	a82632fc63	Update README.md	2020-06-13 16:16:15 -05:00
Ben Reaves	3d55b232a9	Merge pull request #210 from rbreaves/dev - Removed the Windows based Linux VM install option, not needed.	2020-06-13 16:14:02 -05:00
Ben Reaves	d68ca6226c	- Removed the Windows based Linux VM install option. No longer needed with registry keyswap removal.	2020-06-13 16:13:07 -05:00
Ben Reaves	9d5ac9142b	Merge pull request #209 from rbreaves/dev - Ubuntu Budgie 20.04 Patch Update	2020-06-13 01:58:25 -05:00
Ben Reaves	87a4c6934d	- Updated Budgie patch to use the proper fork for Ubuntu Budgie 20.04	2020-06-13 01:36:36 -05:00
Ben Reaves	7b67a4988e	Merge branch 'master' into dev	2020-06-13 01:35:24 -05:00
Ben Reaves	f0404299ac	Update README.md	2020-06-12 03:10:27 -05:00
Ben Reaves	894c7b7a69	Update README.md	2020-06-12 02:23:35 -05:00
Ben Reaves	bcabd5d65b	Update README.md	2020-06-12 02:20:43 -05:00
Ben Reaves	ffab720b50	Update README.md	2020-06-12 02:18:59 -05:00
Ben Reaves	57d430ae36	Updated readme	2020-06-12 01:38:17 -05:00
Ben Reaves	49613ec470	Merge pull request #208 from rbreaves/windows - Improved Windows UX, Added System Tray, Kinto icon assets	2020-06-12 01:29:31 -05:00
Ben Reaves	7c1f92db5b	- Kinto system tray preview added to readme	2020-06-12 01:29:13 -05:00
Ben Reaves	329e821440	- Improved Windows UX, Added System Tray, Kinto icon assets	2020-06-12 01:18:40 -05:00
Ben Reaves	046eaa05cd	Revert "- Proof of concept cheatsheet feature" This reverts commit `cbb60668e3`.	2020-06-12 01:16:52 -05:00
Ben Reaves	7c0a431472	Updated readme with logo revision	2020-06-11 03:13:57 -05:00
Ben Reaves	1b2e7ab57b	Updated readme with cleaner logo	2020-06-11 03:04:43 -05:00
Ben Reaves	ea78de7909	Updated readme with new logo	2020-06-09 22:13:39 -05:00
Ben Reaves	dae728d04a	Merge pull request #205 from japert/issue-204-non-canonical-homedir Allow non-canonical homedirs in setup.	2020-06-09 17:15:45 -05:00
Janis Peukert	6578065024	Allow non-canonical homedirs in setup.	2020-06-09 13:01:54 -07:00
Ben Reaves	8f22bc63ff	- Fixes on paste in terminals for windows	2020-06-08 12:23:50 -05:00
Ben Reaves	1ed7fa5f73	- renamed file and added shortcuts	2020-06-08 02:01:17 -05:00
Ben Reaves	c9f7b81796	- Fixed back tab after new Alt-Tab fix	2020-06-07 19:22:39 -05:00
Ben Reaves	4f259481f4	- Added back vscode keybindings json file	2020-06-07 16:06:25 -05:00
Ben Reaves	3143f11d4b	Merge branch 'dev'	2020-06-07 15:36:53 -05:00
Ben Reaves	520ea7683b	- Fixed a mismapped fullscreen toggle for st3	2020-06-07 15:35:49 -05:00
Ben Reaves	ba1471e397	- Additional refinements for Apple and Win keyboards for ahk	2020-06-07 15:29:05 -05:00
Ben Reaves	a00998b1e3	- WIP autohotkey update negates need for logoff/reg modification	2020-06-06 21:29:33 -05:00
Ben Reaves	1a0c99a763	Merge pull request #197 from rbreaves/dev - xkb & windows 10 shortcut fixes	2020-06-01 19:24:48 -05:00
Ben Reaves	e741989128	- Made formatting improvements	2020-06-01 14:49:49 -05:00
Ben Reaves	0adc44907c	- Swapped out unstable pynput with xbindkeys	2020-06-01 03:39:16 -05:00
Ben Reaves	7a2aac9d79	- New terminal wizard for Kinto setup.	2020-06-01 01:56:36 -05:00
Ben Reaves	f3df35662b	Merge pull request #196 from rbreaves/dev - Added Windows 10 Emoji Panel Ctrl-Cmd-Spacebar	2020-05-31 16:40:18 -05:00
Ben Reaves	1ab00452b0	Merge pull request #195 from rbreaves/dev - Fixes RCtrl key on Left Cmd position for Windows using VMs & VS Code remaps. Recloses #191	2020-05-30 19:47:49 -05:00
Ben Reaves	712b2e0e69	Merge pull request #194 from rbreaves/dev - Fixed shortcuts by re-ordering code (windows)	2020-05-30 00:12:20 -05:00
Ben Reaves	06180c3517	Update issue templates	2020-05-29 16:15:02 -05:00
Ben Reaves	8b07fb9037	Merge pull request #193 from rbreaves/dev - Sublime text remaps in VS Code now optional (linux). Closes #191	2020-05-29 16:07:52 -05:00
Ben Reaves	7a07382d30	Merge pull request #190 from rbreaves/dev - Added cmd-t/w - open/close tabs to win terminals	2020-05-29 15:35:20 -05:00
Ben Reaves	8dc05e7ace	Update README.md	2020-05-27 15:08:37 -05:00
Ben Reaves	8fdaaf592d	Merge pull request #189 from rbreaves/dev - Added support for Windows 10 Hosts w/ Kinto & running Linux VMs	2020-05-26 22:03:57 -07:00
Ben Reaves	e2a767fbec	Merge pull request #188 from rbreaves/dev - Added proper Ctrl/Alt + Backspace behavior for Linux remap. Closes #187	2020-05-23 16:06:40 -05:00
Ben Reaves	1d088b2e1d	Typo correction	2020-05-20 01:29:14 -05:00
Ben Reaves	e63d8ee5b5	Merge pull request #184 from rbreaves/dev - Adding basic hotkey functions for apps	2020-05-18 14:23:47 -05:00
Ben Reaves	42c04d062e	Merge pull request #183 from rbreaves/dev Extension of #182 merge and added mate support	2020-05-18 14:09:51 -05:00