- Adding support for WSL2

- Added emacs style, courtesy bryanhpchiang. Closes #336

README.md

@@ -1,6 +1,6 @@
-# Kinto
+# Kinto.sh
 
-![kinto-color-132](https://user-images.githubusercontent.com/10969616/84361571-7d5bd780-ab91-11ea-81bc-4d3a2ca51c4e.png)
+![kinto-color-132](https://user-images.githubusercontent.com/10969616/94909977-9d2d4900-0469-11eb-8710-986289fe7240.gif)
 
 
 [![GitHub release](https://img.shields.io/github/release/rbreaves/kinto.svg)](https://github.com/rbreaves/kinto/releases/latest)
@@ -9,21 +9,21 @@
 
 Seamless copy and paste with all apps and terminals. The zero effort solution.
 
+v1.2 Release - Kinto now includes a system tray and simple wizard to setup the install with minimal effort.
+
 ## 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 (Linux)](#How-to-install-Linux)
 
 [How to install (Windows)](#How-to-install-Windows)
 
-[Shortcut Creation](#Shortcut-Creation)
+[What does Kinto require?](#What-does-Kinto-require)
 
-[Other Notes Related to Install](#Other-Notes-Related-to-Install)
+[Shortcut Creation](#Shortcut-Creation)
 
 [How to Upgrade/Control Kinto](#How-to-Upgrade-Kinto)
 
@@ -59,6 +59,8 @@ Kinto works for standard Windows, Apple and Chromebook keyboards. The following
 |---|---|---|---|---|
 |**Virtual**|  LCtrl | Alt  |  RCtrl |Spacebar|
 
+Note: RCtrl for terminals is also adding in Shift most of the time, however it depends on the specific terminal in use and will change itself to the expected keymaps of that terminal application.
+
 ## 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.
@@ -67,47 +69,14 @@ It also retains some of the most commonly used system level shortcut keys, such
 
 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
-- systemd
-- x11
-- IBus*
-- Manjaro/Arch/Debian/Ubuntu based distro 16.04+
-- 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 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
-
-- [Git for Windows](https://git-scm.com/download/win)
-- Powershell - run as Administrator
-- [Python3](https://www.python.org/downloads/windows/)
-
-Other programs that will be installed when you run ./setup.py
-- Chocolatey
-- Autohotkey
-- Strawberry Perl
-
-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.
-
-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%">
-
+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](#Shortcut-Creation)
 
 ## How to install (Linux)
 
+Video Tutorial: [Install Kinto.sh for Linux in less than a minute](https://www.youtube.com/watch?v=kd4al45XD1g)
+
+<img src="https://user-images.githubusercontent.com/10969616/97070698-179c4500-15a0-11eb-8064-c03aa7f4d4a5.png" width="75%">
+
 1. clone this repo
 ```
 git clone https://github.com/rbreaves/kinto.git
@@ -121,15 +90,22 @@ sudo apt update
 sudo apt install python3
 ```
 
-3. Follow the prompts and the script will guide you through the rest of the setup.
+3. Run the script, press 1 or 2 keys and you are done.
 ```
 ./setup.py
 ```
 
+Troubleshoot
+
+If the wizard does not appear then either type in "kinto.sh" in your application overview search bar or run this following command.
+```
+~/.config/kinto/gui/kinto-gui.py
+```
+
 To Uninstall Kinto
 
 ```
-./setup.py
+./setup.py -r
 ```
 
 ## How to Install (Windows)
@@ -159,9 +135,27 @@ 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.
+## What does Kinto require?
+
+- Python
+- systemd
+- x11
+- xkeysnail
+
+### Kinto for Windows 10 Requirements
+
+- [Git for Windows](https://git-scm.com/download/win)
+- Powershell - run as Administrator
+- [Python3](https://www.python.org/downloads/windows/)
+
+Other programs that will be installed when you run ./setup.py
+- Chocolatey
+- Autohotkey
+- Strawberry Perl
+
+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.
+## Shortcut Creation
 
 [Linux Shortcut Creation (Xkeysnail)](#Linux-Xkeysnail)
 
@@ -249,33 +243,11 @@ I don't have too many examples on this one, most developers seem to be shying aw
 ## Shortcut Creation (XKB)
 The older xkb shortcut method info can be read about in ticket [#125](https://github.com/rbreaves/kinto/issues/125).
 
-## Other Notes Related to Install
-
-**Manjaro with Gnome there are issues with caret/input checking.**
-
-Only impacts back/forward hotkeys for web browsers.
-
-Please see this ticket for more information.
-
-https://github.com/rbreaves/kinto/issues/59
-
-https://wiki.archlinux.org/index.php/IBus
-
-**For other Arch based distros.**
-
-Append the following and logoff and back on, but only after running setup.py to install all packages and the kinto service. Please report if there are any difficulties.
-nano ~/.bashrc
-```
-export GTK_IM_MODULE=xim
-export XMODIFIERS=@im=ibus
-export QT_IM_MODULE=xim
-```
-
 ## How to Upgrade Kinto
 
-Simply bring down the latest in either the master branch or dev, but dev is sometimes in flux as new features are being developed. Then you can re-run the setup.py installer, it will stop the service and re-install Kinto.
+Simply bring down the latest then you can re-run the setup.py installer, it will stop the service and re-install Kinto.
 
-Note: If you have made any custom changes to ~/.xkb or ~/.config/kinto then you will need to backup or rename those directories before running an update.
+Note: If you have made any custom changes to ~/.config/kinto then you will need to backup or rename those directories before running an update.
 
 ```
 git pull origin master
@@ -284,57 +256,28 @@ git pull origin master
 
 ## How to Control Kinto
 
-Under systemd this is how you control Kinto.
-
-Kinto (xkb/x11) = keyswap
-
-Kinto (udev/xkeysnail/x11) = xkeysnail
+This info is now superceded by the fact that linux has a full fledge GUI and system tray app that is very easy to use, but I will keep the command line options for those that want to know what they are.
 
 Status
 ```
-systemctl --user status keyswap
 sudo systemctl status xkeysnail
 ```
 
 Stop (your keymap will return to normal)
 ```
-systemctl --user stop keyswap
 sudo systemctl stop xkeysnail
 ```
 
 Start
 ```
-systemctl --user start keyswap
 sudo systemctl start xkeysnail
 ```
 
 Restart
 ```
-systemctl --user restart keyswap
 sudo systemctl restart xkeysnail
 ```
 
-Enable
-```
-systemctl --user enable keyswap
-sudo systemctl enable xkeysnail
-```
-
-Disable
-```
-systemctl --user disable keyswap
-sudo systemctl disable xkeysnail
-```
-
-## Learning macOS style hotkeys on Linux
-
-You can use websites like https://www.shortcutfoo.com in Google Chrome while using the terminal style keymap, but Firefox is not compatible due to detecting "cmd" as keycode 224. Chrome detects Win/Super/Cmd as keycode 91 on all OS's.
-
-To make sure you are in the terminal style keymap you can just simply open the terminal and turn off the kinto service, and then switch back to Chrome.
-```
-systemctl --user stop keyswap && setxkbmap -option;setxkbmap -option altwin:swap_alt_win
-```
-
 ## Troubleshooting
 
 ### Installed successfully, but modifier keys are not properly remapped?
@@ -354,36 +297,26 @@ To disable keyboard mapping:
 
 ### Does not start when you log in or after you reboot?
 
-Kinto (xkb/x11) = keyswap
-
-Kinto (udev/xkeysnail/x11) = xkeysnail
-
-1. Check the status
-```
-systemctl --user status keyswap
-sudo systemctl status xkeysnail
-```
-2. Check the service journal
-```
-journalctl --user-unit=keyswap.service -b
-sudo journalctl --unit=xkeysnail.service -b
-```
-
-Note: You can also watch your log live
-```
-journalctl -l --user-unit=keyswap.service -b
-sudo journalctl -l --unit=xkeysnail.service -b
-```
-
 You may need to manually set your DISPLAY in the systemd service file. Normally it pulls in the proper DISPLAY value but if it doesn't you can try this.
 
+Another possibility is the SELinux could be enabled and needs to be set to permissive. (aka /etc/selinux/config)
+
+To reset the display variable
+
 ```
 echo $DISPLAY
 
 # :0.0
 ```
 
-nano ~/.config/systemd/user/keyswap.service
+You can use the Kinto.sh app or system tray to edit your service file.
+
+kinto.sh gui
+1. Edit -> Edit Service
+kinto tray
+1. Customize -> Edit Service
+
+or you can use your terminal.
 
 sudo nano /etc/systemd/system/xkeysnail.service
 ```
@@ -397,79 +330,9 @@ Environment=DISPLAY=:0.0
 
 If you continue to have issues then open a ticket and send me the info.
 
-### Keyswap is not occurring, but it was working.
-
-Kinto (xkb/x11) = keyswap
-
-Kinto (udev/xkeysnail/x11) = xkeysnail
-
-Now that Kinto (xkb/x11) is using a custom written C program I am not aware of any specific bugs or issues, but you can start here if you having difficulties and please report it if it is reproducible.
-
-1. Get status
-```
-systemctl --user status keyswap
-sudo systemctl status xkeysnail
-```
-2. Restart Kinto
-```
-systemctl --user restart keyswap
-sudo systemctl restart xkeysnail
-```
-3. Check the Status again and open a ticket if you need to.
-```
-systemctl --user status keyswap
-sudo systemctl status xkeysnail
-```
-
-You can also do the following to see if it is an actual issue with kintox11 not running or your service file.
-```
-cd ~/.config/kinto
-./kintox11
-```
-
-## 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.
-
-Kinto (xkb/x11)
-```
-systemctl --user stop keyswap
-cd ~/.config/kinto
-./kintox11 --debug
-```
-
-Kinto (udev/xkeysnail)
-
-Stop
-```
-sudo systemctl stop xkeysnail
-```
-nano ~/.config/kinto/xkeystart.sh
-
-Remove the 2 instances of --quiet and resave
-```
-#!/bin/bash
-
-/usr/local/bin/xkeysnail --quiet --watch "$1" &
-
-inotifywait -m -e close_write,moved_to,create -q "$1" |
-while read -r path; do
-        /usr/bin/killall xkeysnail
-        /usr/local/bin/xkeysnail --quiet --watch "$1" &
-done
-```
-Start
-```
-sudo systemctl start xkeysnail
-sudo systemctl status xkeysnail
-```
-
 ## 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.
 
-If you would like to attempt adding additional custom keymaps for other languages then I strongly recommend reading Glen Whitney's post here.
-https://superuser.com/questions/385748/binding-superc-superv-to-copy-and-paste
-
 ## Related or Useful Resources
 
 [Xkeysnail](https://github.com/mooz/xkeysnail) by mooz

keycheck.py

@@ -1,344 +0,0 @@
-#!/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()

kinto_old/setup.py

@@ -0,0 +1,631 @@
+#!/usr/bin/env python3
+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", "Windows keyboard standard","Chromebook","IBM - No Super/Win","Uninstall"]
+	for index, item in enumerate(keymaps):
+		print("    %i. %s" % (index+1, item))
+	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("")
+	# Short DOS path notation
+	path= cmdline('echo ''%cd%''')[:-1]
+	if default > 0 and default < 5:
+		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"')
+		print("Copying autohotkey combinations for Terminals & Editors...")
+		os.system('copy /Y "' + path + '\\windows\\kinto.ahk" "' + path + '\\windows\\kinto-new.ahk"')
+	if default < 3:
+		os.system('C:\\Strawberry\\perl\\bin\\perl.exe -pi -e "s/(; )(.*)(; Default)(?!( - ST2CODE))(.*)/$2$3$5/g" .\\windows\\kinto-new.ahk')
+	if default == 1:
+		kbtype = "mac"
+		os.system('C:\\Strawberry\\perl\\bin\\perl.exe -pi -e "s/(; )(.*)(; MacModifiers)/$2$3/g" .\\windows\\kinto-new.ahk')
+	elif default == 2:
+		kbtype = "win"
+		os.system('C:\\Strawberry\\perl\\bin\\perl.exe -pi -e "s/(; )(.*)(; WinModifiers)/$2$3/g" .\\windows\\kinto-new.ahk')
+	elif default == 5:
+		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 == 3:
+		kbtype = "chrome"
+		os.system('C:\\Strawberry\\perl\\bin\\perl.exe -pi -e "s/(; )(.*)(; Chromebook)/$2$3/g" .\\windows\\kinto-new.ahk')
+		os.system('C:\\Strawberry\\perl\\bin\\perl.exe -pi -e "s/(; )(.*)(; WinModifiers/CB)/$2$3/g" .\\windows\\kinto-new.ahk')
+	if default == 3 or default == 4:
+		os.system('C:\\Strawberry\\perl\\bin\\perl.exe -pi -e "s/(; )(.*)(; CB/IBM)/$2$3/g" .\\windows\\kinto-new.ahk')
+	if default == 4:
+		kbtype = "ibm"
+		os.system('C:\\Strawberry\\perl\\bin\\perl.exe -pi -e "s/(; )(.*)(; IBM)/$2$3/g" .\\windows\\kinto-new.ahk')
+		os.system('C:\\Strawberry\\perl\\bin\\perl.exe -pi -e "s/(; )(.*)(; WinModifiers/CB/IBM)/$2$3/g" .\\windows\\kinto-new.ahk')
+	if default > 0 and default < 5:
+		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 and (default > 0 or default < 3)):
+			os.system('C:\\Strawberry\\perl\\bin\\perl.exe -pi -e "s/(; )(.*)(; Default - ST2CODE)/$2$3/g" .\\windows\\kinto-new.ahk')
+		elif (stvscode and (default == 3 or default == 4 )):
+			os.system('C:\\Strawberry\\perl\\bin\\perl.exe -pi -e "s/(; )(.*)(; CB/IBM - ST2CODE)/$2$3/g" .\\windows\\kinto-new.ahk')
+		os.system('copy /Y "' + path + '\\windows\\kinto-start.vbs" "%userprofile%\\.kinto\\kinto-start.vbs"')
+		os.system('C:\\Strawberry\\perl\\bin\\perl.exe -pi -e "s/{kbtype}/' + kbtype + '/g" "%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")
+		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\") 2> nul")
+
+def cmdline(command):
+    process = Popen(
+        args=command,
+        stdout=PIPE,
+        universal_newlines=True,
+        shell=True
+    )
+    return process.communicate()[0]
+
+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:
+	if os.name != 'nt':
+		print("You are not using x11, please logout and back in using x11/Xorg")
+		sys.exit()
+	else:
+		print("\nYou are detected as running Windows.")
+		windows_setup()
+		sys.exit()
+
+distro = cmdline("awk -F= '$1==\"NAME\" { print $2 ;}' /etc/os-release").replace('"','').strip().split(" ")[0]
+dename = cmdline("./system-config/dename.sh").replace('"','').strip().split(" ")[0].lower()
+
+run_pkg = ""
+
+def requirements(pkgm):
+	print(bcolors.CYELLOW2 + "You need to install some packages, " +run_pkg+ ", for Kinto to fully remap browsers during input focus.\n" + bcolors.ENDC)
+	print("sudo " + pkgm + " " + run_pkg + "\n")
+	run_install = yn_choice(bcolors.CYELLOW2 + "Would you like to run it now? (Will require sudo privileges.)\n" + bcolors.ENDC)
+	if(run_install):
+		os.system("sudo " + pkgm  + run_pkg)
+		print("\n")
+
+def install_ibus():
+	global distro
+	print(bcolors.CYELLOW2 + "You need to set IBus as the default Input Method for full word-wise support and re-run this installer.\n" + bcolors.ENDC)
+	print(bcolors.CYELLOW2 + "Confirm the IBus Setup by saying Yes and then closing the window.\n" + bcolors.ENDC)
+	print("ibus-setup\n")
+	print("im-config -n ibus or im-chooser\n")
+	run_install = yn_choice(bcolors.CYELLOW2 + "Would you like to run it now? (Will require logoff and logon.)\n" + bcolors.ENDC)
+	if(run_install):
+		if distro=="fedora":
+			os.system("ibus-setup")
+			os.system("im-chooser")
+			print("\n")
+			print("IBus needs to have Input Method set to your language.")
+			print("im-chooser needs IBus to be selected & closed.")
+			input("Will need to log off and back on for it take effect...")
+		else:
+			os.system("ibus-setup")
+			os.system("im-config -n ibus")
+			print("\n")
+			input("IBus has been set as the default Input Method.\nPress any key to exit and re-run after logoff & logon...")
+		sys.exit()
+
+def setShortcuts():
+	global distro
+	distroVersion = cmdline("awk -F= '$1==\"VERSION_ID\" { print $2 ;}' /etc/os-release").replace('"','').strip()
+	
+	print("\nIf Kinto is already running it will be stopped...")
+	print("If you cancel the installer you can re-run Kinto via\n systemctl --user start keyswap")
+
+	cmdline("systemctl --user stop keyswap")
+	print("\nDetected " + distro + " " + distroVersion.strip() + " DE: " + dename + "\n")
+	addhotkeys = yn_choice("\nDo you want to apply system level shortcuts?")
+	if(addhotkeys):
+		distro = distro.lower()
+		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):
+				cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-applications \"['<Primary>Tools','<Alt>Tab']\"")
+				cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-applications-backward \"['<Primary><Shift>Tools','<Alt><Shift>Tab']\"")
+			else:
+				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 reset org.gnome.desktop.wm.keybindings panel-main-menu")
+			# cmdline("gsettings set org.gnome.desktop.wm.keybindings panel-main-menu \"['<Primary><Shift>Space','<Primary>Space']\"")
+			# else:
+			# 	cmdline("gsettings set org.gnome.desktop.wm.keybindings panel-main-menu \"['<Alt>F1']\"")
+			# 	cmdline("gsettings set org.gnome.desktop.wm.keybindings panel-run-dialog \"['<Primary><Shift>Space','<Primary>Space']\"")
+			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 == "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 ['']")
+			cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-right ['']")
+			cmdline("gsettings set org.gnome.desktop.wm.keybindings minimize \"['<Super>h','<Alt>F9']\"")
+			cmdline("gsettings reset org.gnome.desktop.wm.keybindings panel-main-menu")
+			# cmdline("gsettings set org.gnome.desktop.wm.keybindings panel-main-menu \"['<Primary><Shift>Space','<Primary>Space']\"")
+		elif distro == "pop!_os" and dename == "gnome":
+			cmdline("gsettings set org.gnome.desktop.wm.keybindings close \"['<Alt>F4','<Super>w']\"")
+			cmdline("gsettings set org.gnome.desktop.wm.keybindings toggle-maximized \"['<Alt>F10','<Primary><Super>Up']\"")
+			cmdline("gsettings set org.gnome.desktop.wm.keybindings minimize \"['<Super>h','<Alt>F9']\"")
+			cmdline("gsettings reset org.gnome.desktop.wm.keybindings panel-main-menu")
+			# cmdline("gsettings set org.gnome.desktop.wm.keybindings panel-main-menu \"['<Primary><Shift>Space','<Primary>Space']\"")
+			cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-up \"['<Super>Up','<Super>Left']\"")
+			cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-down \"['<Super>Down','<Super>Right']\"")
+			cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-left ['']")
+			cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-right ['']")
+		elif distro == "elementary" and dename == "gnome":
+			if(kintotype == 1):
+				cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-applications \"['<Primary>Tools','<Alt>Tab']\"")
+				cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-applications-backward \"['<Primary><Shift>Tools','<Alt><Shift>Tab']\"")
+			else:
+				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 show-desktop \"['<Super>d','<Super>Down']\"")
+			cmdline("gsettings set org.gnome.desktop.wm.keybindings toggle-maximized \"['<Alt>F10','<Super>Up']\"")
+			cmdline("gsettings reset org.gnome.desktop.wm.keybindings panel-main-menu")
+			# cmdline("gsettings set org.gnome.desktop.wm.keybindings panel-main-menu \"['<Control><Shift>Space','<Super>Space']\"")
+			cmdline("gsettings set org.gnome.desktop.wm.keybindings minimize \"['<Super>h','<Alt>F9']\"")
+			cmdline("gsettings set org.gnome.desktop.wm.keybindings panel-main-menu \"['<Super>Space','<Primary>Space']\"")
+			if(kintotype == 2):
+				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 (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')
+			cmdline('xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/<Super>d" --create --type string --set "show_desktop_key"')
+			# Reset App Cycle
+			cmdline('xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/<Alt>Tab" --reset')
+			cmdline('xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/<Alt><Shift>Tab" --reset')
+			cmdline('xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/<Primary>backslash" --create --type string --set "cycle_windows_key"')
+			cmdline('xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/<Primary><Shift>backslash" --create --type string --set "cycle_reverse_windows_key"')
+			# cmdline('xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/<Super>h" --create --type string --set "hide_window_key"')
+			# Don't need to undo other maps for menu
+			# cmdline('xfconf-query --channel xfce4-keyboard-shortcuts --property "/commands/custom/<Primary>space" --create --type string --set "xfce4-popup-whiskermenu"')
+			# cmdline('xfconf-query --channel xfce4-keyboard-shortcuts --property "/commands/custom/<Primary><Shift>space" --create --type string --set "xfce4-popup-whiskermenu"')
+			cmdline('xfconf-query --reset --channel xfce4-keyboard-shortcuts --property "/commands/custom/<Primary>space"')
+			cmdline('xfconf-query --reset --channel xfce4-keyboard-shortcuts --property "/commands/custom/<Primary><Shift>space"')
+			cmdline('xfconf-query --channel xfce4-keyboard-shortcuts --property "/commands/default/<Primary>Escape" --create --type string --set "xfce4-popup-whiskermenu"')
+			# Reset move to desktop shortcuts
+			cmdline('xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/<Primary><Alt>Home" --reset')
+			cmdline('xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/<Primary><Alt>End" --reset')
+			cmdline('xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/<Primary><Alt>Left" --reset')
+			cmdline('xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/<Primary><Alt>Right" --reset')
+			os.system('xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/<Primary><Alt>Left" --create --type string --set "move_window_prev_workspace_key"')
+			os.system('xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/<Primary><Alt>Right" --create --type string --set "move_window_next_workspace_key"')
+			# Reset Change Workspace
+			cmdline('xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/<Primary><Alt>Left" --reset')
+			cmdline('xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/<Primary><Alt>Right" --reset')
+			cmdline('xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/<Super>Left" --create --type string --set "left_workspace_key"')
+			cmdline('xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/<Super>Right" --create --type string --set "right_workspace_key"')
+			print("\nYou may need to run these commands manually to make sure they are set, if you want to move windows between desktops.\n")
+			print('     xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/<Primary><Alt>Left" --create --type string --set "move_window_prev_workspace_key"')
+			print('     xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/<Primary><Alt>Right" --create --type string --set "move_window_next_workspace_key"\n')
+		elif distro == "fedora" and dename == "gnome":
+			cmdline("gsettings set org.gnome.desktop.wm.keybindings show-desktop \"['<Super>d']\"")
+			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 ['']")
+			cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-right ['']")
+			cmdline("gsettings set org.gnome.desktop.wm.keybindings minimize \"['<Super>h','<Alt>F9']\"")
+			# cmdline("gsettings set org.gnome.desktop.wm.keybindings panel-main-menu \"['<Primary><Shift>Space','<Primary>Space']\"")
+			cmdline("gsettings reset org.gnome.desktop.wm.keybindings panel-main-menu")
+			cmdline("gsettings set org.gnome.mutter.keybindings toggle-tiled-right \"['<Super><Alt>Right']\"")
+			cmdline("gsettings set org.gnome.mutter.keybindings toggle-tiled-left \"['<Super><Alt>Left']\"")
+			# org.gnome.mutter.keybindings toggle-tiled-right ['<Super>Right']
+			# org.gnome.mutter.keybindings toggle-tiled-left ['<Super>Left']
+		elif dename == "kde":
+			# cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "krunner.desktop" --key "_launch","Alt+Space\tAlt+F2\tSearch,Alt+Space\tAlt+F2\tSearch,KRunner"')
+			# Remove Alt+F3 Operations Menu - Sublimetext Select-All
+			cmdline('cp ~/.config/kwinrc ./kwinrc_`date +"%Y.%m.%d-%s"`')
+			cmdline('cp ~/.config/kglobalshortcutsrc ./kde_kglobalshortcutsrc_`date +"%Y.%m.%d-%s"`')
+			cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Switch to Previous Desktop" "Meta+Left,Meta+Left,Switch to Previous Desktop"')
+			cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Window Operations Menu" "none,Alt+F3,Window Operations Menu"')
+			if(kintotype == 1):
+				cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Walk Through Windows" "Ctrl+Tools,Alt+Tab,Walk Through Windows"')
+				cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Walk Through Windows (Reverse)" "Ctrl+Shift+Tools,Alt+Shift+Backtab,Walk Through Windows (Reverse)"')
+				cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Walk Through Windows of Current Application" "Alt+F6,none,Walk Through Windows of Current Application"')
+				cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Walk Through Windows of Current Application (Reverse)" "Alt+Shift+F6,none,Walk Through Windows of Current Application (Reverse)"')
+			else:
+				cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Walk Through Windows" "Ctrl+F13,Alt+Tab,Walk Through Windows"')
+				cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Walk Through Windows (Reverse)" "Ctrl+Shift+F14,Alt+Shift+Backtab,Walk Through Windows (Reverse)"')
+			cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Walk Through Windows Alternative" "none,none,Walk Through Windows"')
+			cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Maximize Window" "none,Meta+PgUp,Maximize Window"')
+			cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Window Maximize" "Meta+Ctrl+F,Alt+F10,Maximize Window"')
+			cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Minimize Window" "Meta+h,Meta+PgDown,Minimize Window"')
+			cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Switch to Next Desktop" "Meta+Right,Meta+Right,Switch to Next Desktop"')
+			os.system('kquitapp5 kglobalaccel && sleep 2s && kglobalaccel5 &')
+		else:
+			print('distro: ' + distro + ' de: ' + dename)
+			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():
+	print("You selected to Uninstall Kinto.\n")
+	restore = yn_choice("\nYour DE is " + dename + ".\n\nY: Restore hotkeys from backup\nN: Reset OS/DE hotkeys\nWhich option would you prefer?")
+	print("")
+	if(restore):
+		if dename == "gnome":
+			print("Restoring DE hotkeys...")
+			wmkeys = cmdline('ls | grep -m1 "keybinding"')
+			mutterkeys = cmdline('ls | grep -m1 "mutter_"')
+			if len(wmkeys) > 0:
+				print('dconf load /org/gnome/desktop/wm/keybindings/ < ' + wmkeys)
+				cmdline('dconf load /org/gnome/desktop/wm/keybindings/ < ' + wmkeys)
+			else:
+				print('Gnome Desktop keybindings backup not found...')
+			if len(mutterkeys) > 0:
+				print('dconf load /org/gnome/mutter/keybindings/ < ' + mutterkeys)
+				cmdline('dconf load /org/gnome/mutter/keybindings/ < ' + mutterkeys)
+			if len(wmkeys) > 0 or len(mutterkeys) > 0:
+				print("Gnome hotkeys have been successfully restored.")
+		elif dename == "kde":
+			print("Restoring DE hotkeys...")
+			kwinkeys = cmdline('ls | grep -m1 "kwinrc"').strip()
+			kdekeys = cmdline('ls | grep -m1 "kglobalshortcutsrc"').strip()
+			cmdline('cp ./' + kdekeys + ' ~/.config/kglobalshortcutsrc')
+			cmdline('cp ./' + kwinkeys + ' ~/.config/kwinrc')
+		elif dename == "xfce":
+			print("Restoring DE hotkeys...")
+			xfcekeys = cmdline('ls | grep -m1 "xfce4-keyboard"').strip()
+			cmdline('cp ./' + xfcekeys + ' ~/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml')
+		if dename == "gnome" or dename == "kde" or dename == "xfce":
+			print("./uninstall.sh\n")
+			subprocess.check_call(shlex.split("./uninstall.sh"))
+			print("Done.")
+		if dename == "kde" or dename == "xfce":
+			print("Please log off and back on for your original hotkeys to take effect.")
+	else:
+		if dename == "gnome":
+			print("Resetting DE hotkeys...\n")
+			print("gsettings reset-recursively org.gnome.desktop.wm.keybindings")
+			cmdline("gsettings reset-recursively org.gnome.desktop.wm.keybindings")
+			print("gsettings reset-recursively org.gnome.mutter.keybindings")
+			cmdline("gsettings reset-recursively org.gnome.mutter.keybindings")
+			print("gsettings set org.gnome.mutter overlay-key 'super'")
+			cmdline("gsettings set org.gnome.mutter overlay-key 'super'")
+			cmdline('dconf dump /org/gnome/mutter/ > mutter.conf')
+			cmdline('dconf load /org/gnome/mutter/ < mutter.conf')
+		elif dename == "kde":
+			print("Resetting DE hotkeys...\n")
+			cmdline('mv ~/.config/kwinrc ~/.config/kwinrc.kinto')
+			cmdline('mv ~/.config/kglobalshortcutsrc ~/.config/kglobalshortcutsrc.kinto')
+		elif dename == "xfce":
+			print("Resetting DE hotkeys...\n")
+			cmdline('cp /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml ~/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml')
+		if dename == "gnome" or dename == "kde" or dename == "xfce":
+			print("./uninstall.sh\n")
+			subprocess.check_call(shlex.split("./uninstall.sh"))
+			print("Done.")
+		if dename == "kde" or dename == "xfce":
+			print("Please log off and back on for your original DE hotkeys to take effect.")
+
+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()
+
+	pkgm = cmdline("\\which apt-get 2>/dev/null").strip()
+
+	if len(pkgm) == 0:
+		pkgm = cmdline("\\which dnf 2>/dev/null").strip()
+		if len(pkgm) > 0:
+			pkgm += " check-update;sudo dnf install -y "
+	else:
+		pkgm += " install -y "
+		pkgm += " update; sudo apt-get install -y "
+
+	if len(pkgm) == 0:
+		pkgm = cmdline("\\which pacman 2>/dev/null").strip()
+		if len(pkgm) > 0:
+			pkgm += " -Syy; sudo pacman -S "
+
+
+	if len(pkgm) == 0:
+		print("No supported package manager found. Exiting...")
+		sys.exit()
+
+
+	runpkg = 0
+	global run_pkg
+
+	if len(check_xbind) > 0 and len(check_xdotool) > 0 and len(check_ibus) > 0:
+		print("Xbindkeys, xdotool and IBus requirement is installed.")
+	if len(check_xbind) == 0:
+		run_pkg = "xbindkeys"
+		runpkg = 1
+	if len(check_xdotool) == 0:
+		run_pkg += " xdotool"
+		runpkg = 1
+	if len(check_ibus) == 0:
+		# may differ with distro, but for now
+		run_pkg += " ibus"
+		runpkg = 1
+
+	if runpkg != 0:
+		print(runpkg)
+		requirements(pkgm)
+
+	if not os.path.exists(homedir + '/.config/ibus/bus') and cmdline("ls ~/.config/ibus/bus -1rt") == "":
+		install_ibus()
+
+try:
+	f = open("defaults.json")
+except IOError:
+	print("defaults.json file is missing. Will exit.\n")
+	exit()
+f.close()
+
+try:
+	f = open("defaults.json")
+except IOError:
+	print("defaults.json file is missing. Will exit.\n")
+	exit()
+f.close()
+
+try:
+	f = open("user_config.json")
+except IOError:
+	print("user_config.json file is missing. Will exit.\n")
+	exit()
+f.close()
+
+if os.path.isdir(homedir + "/.config/kinto") == False:
+	os.mkdir(homedir + "/.config/kinto")
+	time.sleep(0.5)
+
+with open('defaults.json') as json_file:
+	data = json.load(json_file)
+
+
+color_arr = [bcolors.CBEIGE,bcolors.CRED2,bcolors.CGREEN,bcolors.CYELLOW ]
+
+print("\nKinto - Type in Linux like it's a Mac.\n")
+
+kintotype = int(input(color_arr[2] +
+	"1) Kinto - xkeysnail (udev/x11) - Recommended\n" + color_arr[0] +
+	"2) Kinto - Original xkb/x11 implementation\n" + color_arr[3] +
+	"3) Uninstall Kinto - xkeysnail\n" +
+	"4) Uninstall Kinto - Original xkb\n\n"
+	+ bcolors.ENDC))
+print("")
+if(kintotype == 1):
+	subprocess.check_call(shlex.split("./xkeysnail_service.sh"))
+	if os.path.isdir(homedir + "/.config/kinto") == True:
+		setShortcuts()
+		subprocess.check_call(shlex.split("./xkeysnail_service.sh budgieUpdate"))
+	exit()
+
+if(kintotype == 3):
+	subprocess.check_call(shlex.split("./xkeysnail_service.sh uninstall"))
+	exit()
+
+if(kintotype == 4):
+	Uninstall()
+	exit()
+
+kintoImpOne()
+
+for index, item in enumerate(data['defaulttypes']):
+	ossym = ""
+	if item == "windows":
+		ossym = u'\u2756'
+	elif item == "mac":
+		ossym = u'\u2318'
+	elif item == "chromebook":
+		ossym = u'\u2707'
+	print("%s    %i. %s  %s %s" % (color_arr[index], index+1, ossym, item.capitalize(), bcolors.ENDC))
+
+print("%s    %i. Uninstall %s" % (color_arr[3], len(data['defaulttypes'])+1, bcolors.ENDC))
+
+default = 0
+while not int(default) in range(1,len(data['defaulttypes'])+2):
+	default = int(input(bcolors.CYELLOW2 + "\nPlease enter your keyboard type (1 - " + str(len(data['defaulttypes'])) + ") : " + bcolors.ENDC))
+print("")
+
+if default == len(data['defaulttypes'])+1:
+	Uninstall()
+	exit()
+
+try:
+	f = open(homedir + "/.config/kinto/user_config.json")
+	rewrite = yn_choice("~/.config/kinto/user_config.json already exists. Do you want to overwrite it with a new config?")
+	print("")
+	if(rewrite):
+		copyfile("user_config.json", homedir + "/.config/kinto/user_config.json")
+	else:
+		exit()
+except IOError:
+	pass
+	copyfile("user_config.json", homedir + "/.config/kinto/user_config.json")
+finally:
+    f.close()
+
+keyboardconfigs = [obj for obj in data['defaults'] if(obj['type'] == data['defaulttypes'][default-1])]
+
+# for k in keyboardconfigs:
+for index, k in enumerate(keyboardconfigs):
+	print(color_arr[default-1] + bcolors.BOLD + str(index+1) + '. ' + k['name'] + bcolors.ENDC)
+	print(bcolors.CYELLOW2 + 'Description: ' + k['description'] + bcolors.ENDC)
+
+print("")
+defaultkb = 0
+while not int(defaultkb) in range(1,len(keyboardconfigs)+1):
+	defaultkb = int(input(bcolors.CYELLOW2 + "Please enter your keyboard config (1 - " + str(len(keyboardconfigs)) + ") : " + bcolors.ENDC))
+print("")
+
+if 'hack' in keyboardconfigs[defaultkb-1]:
+	print(bcolors.CYELLOW2 + "You have selected a keyboard config that needs the following command to be ran.\n" + bcolors.ENDC)
+	print(keyboardconfigs[defaultkb-1]['hack'].replace(";", "\n") + "\n")
+	runhack = yn_choice(bcolors.CYELLOW2 + "Would you like to run it now? (Will require sudo privileges. Will exit on No.)" + bcolors.ENDC)
+	if(runhack):
+		os.system(keyboardconfigs[defaultkb-1]['hack'])
+
+# Setup the selected keyboards config
+os.system("cp -TRv ./.xkb ~/.xkb/")
+if os.path.isdir(homedir + "/.xkb/keymap") == False:
+	os.mkdir(homedir + "/.xkb/keymap")
+	time.sleep(0.5)
+os.system('setxkbmap -option')
+os.system('setxkbmap -print > ~/.xkb/keymap/kbd.mac.gui')
+os.system('setxkbmap -print > ~/.xkb/keymap/kbd.mac.gui.chrome')
+os.system('setxkbmap -print > ~/.xkb/keymap/kbd.mac.gui.browsers')
+os.system('setxkbmap -print > ~/.xkb/keymap/kbd.mac.term')
+time.sleep(0.5)
+
+symbols_line = cmdline("cat ~/.xkb/keymap/kbd.mac.gui | grep -n 'xkb_symbols' | cut -f1 -d:").strip()
+types_line = cmdline("cat ~/.xkb/keymap/kbd.mac.gui | grep -n 'xkb_types' | cut -f1 -d:").strip()
+
+cmdline('sed -i '' -e "' + symbols_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_symbols_gui'] + '\\"/2" ~/.xkb/keymap/kbd.mac.gui')
+cmdline('sed -i '' -e "' + types_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_types_gui'] + '\\"/2" ~/.xkb/keymap/kbd.mac.gui')
+cmdline('sed -i '' -e "' + symbols_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_symbols_term'] + '\\"/2" ~/.xkb/keymap/kbd.mac.term')
+cmdline('sed -i '' -e "' + types_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_types_term'] + '\\"/2" ~/.xkb/keymap/kbd.mac.term')
+
+# Set chrome file accordingly for chromebooks or normal
+if default != 3:
+	cmdline('sed -i '' -e "' + symbols_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_symbols_gui'].replace("+mac_gui(mac_levelssym)+mac_gui(mac_appcycle)","+mac_gui(mac_levelssym)+mac_gui(mac_browsers)") + '\\"/2" ~/.xkb/keymap/kbd.mac.gui.browsers')
+	cmdline('sed -i '' -e "' + symbols_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_symbols_gui'].replace("+mac_gui(mac_levelssym)+mac_gui(mac_appcycle)","+mac_gui(mac_browsers)+mac_gui(mac_chrome)") + '\\"/2" ~/.xkb/keymap/kbd.mac.gui.chrome')
+else:
+	# Fix multicursor in mac_gui
+	cmdline('perl -pi -e "s/(\/\/ )(.*)(\/\/ Chromebook multicursor)/\$2\$3/g" ~/.xkb/symbols/mac_gui')
+	cmdline('perl -pi -e "s/(\w.*)(\/\/ Default multicursor)/\/\/ \$1\$2/g" ~/.xkb/symbols/mac_gui')
+	# Fix browsers
+	cmdline('sed -i '' -e "' + symbols_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_symbols_gui'].replace("+mac_gui(mac_levelssym)+mac_gui(mac_appcycle_chromebook)","+mac_gui(mac_levelssym)+mac_gui(mac_browsers_chromebook)") + '\\"/2" ~/.xkb/keymap/kbd.mac.gui.browsers')
+	cmdline('sed -i '' -e "' + symbols_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_symbols_gui'].replace("+mac_gui(mac_levelssym)+mac_gui(mac_appcycle_chromebook)","+mac_gui(mac_browsers_chromebook)+mac_gui(mac_chrome)") + '\\"/2" ~/.xkb/keymap/kbd.mac.gui.chrome')
+if dename == "kde":
+	# Fix maximize shortcut
+	cmdline('perl -pi -e "s/(\/\/ )(.*)(\/\/ KDE maximize)/\$2\$3/g" ~/.xkb/symbols/mac_gui')
+	# term app switching
+	cmdline('perl -pi -e "s/(\/\/ )(.*)(\/\/ KDE cmdtab)/\$2\$3/g" ~/.xkb/symbols/mac_term')
+else:
+	# Fix maximize shortcut
+	cmdline('perl -pi -e "s/(\/\/ )(.*)(\/\/ Default maximize)/\$2\$3/g" ~/.xkb/symbols/mac_gui')
+	# term app switching
+	cmdline('perl -pi -e "s/(\/\/ )(.*)(\/\/ Default cmdtab)/\$2\$3/g" ~/.xkb/symbols/mac_term')
+cmdline('sed -i '' -e "' + types_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_types_gui'] + '\\"/2" ~/.xkb/keymap/kbd.mac.gui.browsers')
+cmdline('sed -i '' -e "' + types_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_types_gui'] + '\\"/2" ~/.xkb/keymap/kbd.mac.gui.chrome')
+
+setShortcuts()
+
+user_file = homedir + '/.config/kinto/user_config.json'
+with open(user_file, 'r') as f:
+    user_config = json.load(f)
+
+onetime = yn_choice("\nOne time initialization tweaks are available. Would you like to view them?")
+print("")
+if(onetime):
+	intents = [obj for obj in user_config['de'] if(obj['intent'] == "init")]
+
+	for index, k in enumerate(intents):
+		print(color_arr[default-1] + bcolors.BOLD + str(index+1) + '. ' + k['name'] + bcolors.ENDC)
+		print(bcolors.CYELLOW2 + 'Description: ' + k['description'] + bcolors.ENDC)
+		print(bcolors.CYELLOW2 + 'run: ' + k['run'].replace(";", "\n") + bcolors.ENDC + '\n')
+
+	print(bcolors.CYELLOW2 + "Please enter your init tweak(s) (eg 1 or 1 2 3 - leave blank to skip): " + bcolors.ENDC)
+	defaultinit = [int(i) for i in input().split()]
+	if len(defaultinit) != 0:
+		user_config['init'] = [intents[defaultinit[0]-1]['id']]
+
+print("\nDynamic shortcut tweaks\n")
+
+intents = [obj for obj in user_config['de'] if(obj['intent'] == "gui_term")]
+tweaks = []
+tweaks_selected = []
+
+for index, k in enumerate(intents):
+	print(color_arr[default-1] + bcolors.BOLD + str(index+1) + '. ' + k['name'] + bcolors.ENDC)
+	print(bcolors.CYELLOW2 + 'Description: ' + k['description'] + bcolors.ENDC)
+	print(bcolors.CYELLOW2 + 'run in gui mode: ' + k['run_gui'].replace(";", "\n") + bcolors.ENDC)
+	print(bcolors.CYELLOW2 + 'run in terminal mode: ' + k['run_term'].replace(";", "\n") + bcolors.ENDC + '\n')
+	tweaks.append(k['id'])
+
+print(bcolors.CYELLOW2 + "Please enter your dynamic shortcut tweak(s) (eg 1 or 1 2 3 - leave blank to skip): " + bcolors.ENDC)
+defaultde = [int(i) for i in input().split()]
+
+for d in defaultde:
+    user_config['de'][tweaks[d-1]]['active'] = True
+    tweaks_selected.append(tweaks[d-1])
+
+if len(defaultde) != 0:
+	# gui
+	user_config['config'][0]['de'] = tweaks_selected
+	# term
+	user_config['config'][1]['de'] = tweaks_selected
+	# firefox
+	user_config['config'][2]['de'] = tweaks_selected
+	# chrome
+	user_config['config'][3]['de'] = tweaks_selected
+
+user_config['config'][0]['run'] = keyboardconfigs[defaultkb-1]['gui']
+user_config['config'][1]['run'] = keyboardconfigs[defaultkb-1]['term']
+user_config['config'][2]['run'] = keyboardconfigs[defaultkb-1]['gui'].replace("kbd.mac.gui","kbd.mac.gui.browsers")
+user_config['config'][3]['run'] = keyboardconfigs[defaultkb-1]['gui'].replace("kbd.mac.gui","kbd.mac.gui.chrome")
+
+os.remove(user_file)
+with open(user_file, 'w') as f:
+    json.dump(user_config, f, indent=4)
+print("Saved configuration to ~/.config/kinto/user_config.json\n")
+print("Now running keyswap_service.sh to setup the keyswap service...")
+print("Keyswap will be configured to run on user login\n")
+print("You may start, stop, restart or view the status of the service with following commands\n")
+print("systemctl --user start keyswap")
+print("systemctl --user stop keyswap")
+print("systemctl --user restart keyswap")
+print("systemctl --user status keyswap")
+os.system("./keyswap_service.sh")

kinto_old/xkeysnail_service.sh

@@ -0,0 +1,508 @@
+#!/bin/bash
+
+# set about:config?filter=ui.key.menuAccessKeyFocuses
+# to false for wordwise to work in Firefox
+
+typeset -l distro
+distro=$(awk -F= '$1=="NAME" { print $2 ;}' /etc/os-release)
+typeset -l dename
+dename=$(./system-config/dename.sh | cut -d " " -f1)
+
+function uninstall {
+
+	while true; do
+	read -rep $'\nPress R to restore your original shortcuts.\nPress F to reset to factory shortcuts. (f/r)\n' yn
+		case $yn in
+			[Ff]* ) yn="f"; break;;
+			[Rr]* ) yn="r";break;;
+			* ) echo "Please answer yes or no.";;
+		esac
+	done
+
+	if [ "$yn" == "f" ];then
+		echo "Reset to factory shortcuts"
+		if [ "$dename" == "gnome" ];then
+			echo "Resetting DE hotkeys..."
+			echo "gsettings reset-recursively org.gnome.desktop.wm.keybindings"
+			gsettings reset-recursively org.gnome.desktop.wm.keybindings
+			echo "gsettings reset-recursively org.gnome.mutter.keybindings"
+			gsettings reset-recursively org.gnome.mutter.keybindings
+			echo "gsettings set org.gnome.mutter overlay-key 'super'"
+			gsettings set org.gnome.mutter overlay-key 'super'
+			dconf dump /org/gnome/mutter/ > mutter.conf
+			dconf load /org/gnome/mutter/ < mutter.conf
+		elif [ "$dename" == "kde" ];then
+			echo "Resetting DE hotkeys..."
+			mv ~/.config/kwinrc ~/.config/kwinrc.kinto
+			mv ~/.config/kglobalshortcutsrc ~/.config/kglobalshortcutsrc.kinto
+		elif [ "$dename" == "xfce" ];then
+			echo "Resetting DE hotkeys..."
+			cp /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml ~/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
+		fi
+	elif [ "$yn" == "r" ]; then
+		echo "Restore original user shortcuts"
+		if [ "$dename" == "gnome" ]; then
+			echo "Restoring DE hotkeys..."
+			wmkeys=$(ls | grep -m1 "keybinding")
+			mutterkeys=$(ls | grep -m1 "mutter_")
+			if [[ ${#wmkeys} > 0 ]]; then
+				echo "dconf load /org/gnome/desktop/wm/keybindings/ < $wmkeys"
+				dconf load /org/gnome/desktop/wm/keybindings/ < "$wmkeys"
+			else
+				echo "Gnome Desktop keybindings backup not found..."
+			fi
+			if [[ ${#mutterkeys} > 0 ]]; then
+				echo "dconf load /org/gnome/mutter/keybindings/ < $mutterkeys"
+				dconf load /org/gnome/mutter/keybindings/ <"$mutterkeys"
+			fi
+			if [[ ${#wmkeys} > 0 ]] || [[ ${#mutterkeys} > 0 ]]; then
+				echo "Gnome hotkeys have been successfully restored."
+			fi
+		elif [ "$dename" == "kde" ]; then
+			echo "Restoring DE hotkeys..."
+			kwinkeys=$(ls | grep -m1 "kwinrc")
+			kdekeys=$(ls | grep -m1 "kglobalshortcutsrc")
+			cp ./"$kdekeys" ~/.config/kglobalshortcutsrc
+			cp ./"$kwinkeys" ~/.config/kwinrc
+		elif [ "$dename" == "xfce" ]; then
+			echo "Restoring DE hotkeys..."
+			xfcekeys=$(ls | grep -m1 "xfce4-keyboard")
+			cp ./"$xfcekeys" ~/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
+		fi
+	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 trayApp {
+	if [ -f /usr/bin/budgie-desktop ];then
+		while true; do
+			read -rep $'Would you like to install the Kinto Budgie Applet? (y/n)\n(You will need log off & back on and go to Budgie Desktop Settings & add Kinto to your top panel.)\n' yn
+			case $yn in
+				[Yy]* ) yn="y"; break;;
+				[Nn]* ) yn="n";break;;
+				* ) echo "Please answer yes or no.";;
+			esac
+		done
+		if [ "$yn" == "y" ]; then
+			cd ./xkeysnail-config/trayapps/BudgieApplet/
+			sudo ./install-applet.sh
+			cd ../../../
+			echo "Please logoff and back on for the Applet to be available for the top panel."
+			sudo /usr/local/bin/logoff.sh $USER $DISPLAY&
+		fi
+	else
+		while true; do
+			read -rep $'Would you like to install the Kinto Gnome/XFCE System Tray? (y/n)\n' yn
+			case $yn in
+				[Yy]* ) yn="y"; break;;
+				[Nn]* ) yn="n";break;;
+				* ) echo "Please answer yes or no.";;
+			esac
+		done
+		if [ "$yn" == "y" ]; then
+			echo "Kinto Gnome/XFCE System Tray Installed."
+		fi
+	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..."
+		bdmd5="$(md5sum /usr/bin/budgie-daemon | awk '{ print $1 }')"
+		oldbdmd5=$(md5sum ./budgie-daemon_10.5.1.bak | awk '{ print $1 }')
+		if [ "$bdmd5" != "$oldbdmd5" ]; then
+			echo -e "\nReplacing budgie-daemon with backup..."
+			sudo pkill budgie-daemon && sudo cp ./budgie-daemon_10.5.1.bak /usr/bin/budgie-daemon
+		else
+			echo -e "\nBudgie-daemon is already an original."
+		fi
+	fi
+}
+
+function budgieUpdate {
+	# Check for budgie and install App Switching hack
+	if [ -f /usr/bin/budgie-desktop ];then
+		while true; do
+			read -rep $'Would you like to update Budgie to support proper App Switching? (y/n)\n(Your system may immediately log you out after this runs.)\n' yn
+			case $yn in
+				[Yy]* ) yn="y"; break;;
+				[Nn]* ) yn="n";break;;
+				* ) echo "Please answer yes or no.";;
+			esac
+		done
+		if [ "$yn" == "y" ]; then
+			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/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 }')
+				if [ "$bdmd5" != "$newbdmd5" ]; then
+					cp /usr/bin/budgie-daemon ./budgie-daemon_"$budgieVersion".bak
+					sudo pkill budgie-daemon && sudo cp ./system-config/budgie-daemon_10.5.1 /usr/bin/budgie-daemon
+					echo "Updated Budgie to use App Switching Patch"
+				else
+					echo "Budgie-daemon already patched, skipping replacement."
+				fi
+			else
+				echo "Your Budgie version was $budgieVersion and the patch is for 10.5.1."
+				while true; do
+					read -rep $'Would you like to replace it any ways? (y/n)\n(A backup will be made)\n' yn
+					case $yn in
+						[Yy]* ) yn="y"; break;;
+						[Nn]* ) yn="n";break;;
+						* ) echo "Please answer yes or no.";;
+					esac
+				done
+				if [ "$yn" == "y" ]; 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
+					fi
+					cp /usr/bin/budgie-daemon ./budgie-daemon_"$budgieVersion".bak
+					sudo pkill budgie-daemon && sudo cp ./system-config/budgie-daemon_10.5.1 /usr/bin/budgie-daemon
+					echo "Updated Budgie to use App Switching Patch"
+				fi
+			fi
+		fi
+	fi
+}
+
+if [ $# -eq 0 ]; then
+	echo "Install Kinto - xkeysnail (udev)"
+	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 "  4) IBM M - Keyboards w/o Super/Win keys"
+	# echo "  5) Uninstall"
+
+	read n
+
+	set "$n"
+fi
+
+# Kinto tray
+installtray=false
+# multi-language
+rightalt=false
+# VS code remap
+vssublime=false
+
+if [[ $1 == "1" || $1 == "2" || $1 == "3" || $1 == "4" || $1 == "winmac" || $1 == "mac" || $1 == "chromebook" || $1 == "ibm" ]]; then
+	if [[ $dename == "gnome" || $dename == "budgie" || $dename == "mate" || $dename == "xfce" ]];then
+		installtray=true
+		while true; do
+		read -rep $'\nWould you like to install the Kinto System Tray (AppInidcator)? (Y/n)\n' yn
+		case $yn in
+			[Nn]* ) installtray=false; break;;
+			* ) break;;
+		esac
+		done
+		if [[ $dename == "gnome" ]]; then
+			echo "Please install KStatusNotifierItem for AppIndicators to show up."
+			echo "https://extensions.gnome.org/extension/615/appindicator-support/"
+			echo "Note: This may still fail. If so use the Kinto gui app instead."
+			read -p "Press enter to continue"
+		fi
+	fi
+
+	while true; do
+	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;;
+	esac
+	done
+	while true; do
+	read -rep $'\nWould you like to give VS Code Sublime Text keymaps? (y/N)\n' yn
+	case $yn in
+		[Yy]* ) vssublime=true; break;;
+		* ) break;;
+	esac
+	done
+	# branch=$(git rev-parse --abbrev-ref HEAD)
+	# if [ "$branch" == "dev" ] || [ "$branch" == "alpha" ];then
+	# 	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};{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
+	# 	done
+	# else
+	# 	echo -e "\nSupport for Firefox/Chrome Back/Forward hotkeys (Cmd+Left/Right) disabled on $branch w/ xkeysnail \n"
+	exp=" "
+	expsh=" "
+	# fi
+	sudo systemctl enable xkeysnail >/dev/null 2>&1
+	# if ! [ -x "$(command -v inotifywait)" ]; then
+	# 	echo "Will need to install inotify-tools to restart key remapper live for config file changes..."
+	# 	sudo ./system-config/unipkg.sh inotify-tools
+	# fi
+	if ! [ -x "$(command -v pip3)" ]; then
+		echo "Will need to install python3-pip..."
+		sudo ./system-config/unipkg.sh python3-pip
+	fi
+	if ! [ -x "$(command -v python3-config)" ]; then
+		if [ "$distro" == "ubuntu" ] || [ "$distro" == "debian" ] || [ "$distro" == '"linux mint"' ]; then
+			pydev="python3-dev"
+		elif [ "$distro" == "fedora" ]; then
+			pydev="python3-devel"
+		fi
+		if [ "$distro" == "gnome" ] || [ "$distro" == "fedora" ] || [ "$distro" == "debian" ] || [ "$distro" == '"linux mint"' ]; then
+			echo "Will need to install $pydev..."
+			sudo ./system-config/unipkg.sh "$pydev"
+		fi
+	fi
+	if ! [ -x "$(command -v xhost)" ] || ! [ -x "$(command -v gcc)" ]; then
+		if [ "$distro" == "\"manjaro linux\"" ]; then
+			sudo ./system-config/unipkg.sh "xorg-xhost gcc"
+		fi
+	fi
+	if [ "$distro" == '"linux mint"' ]; then
+		pip3 install setuptools
+	fi
+
+	# 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
+	
+	# *** More testing needing, universal way of killing kinto on user log out? ***
+	# yes | sudo cp -rf xkeysnail-config/root_logoff.sh /usr/local/bin/logoff.sh
+	# sudo chown root:root /usr/local/bin/logoff.sh
+	# sudo chmod u+rwx /usr/local/bin/logoff.sh
+	# sudo chmod go-w+rx /usr/local/bin/logoff.sh
+	# *** End universal killing of kinto
+	if $installtray ; then
+		yes | sudo cp -rf xkeysnail-config/gnome_logoff.sh ~/.config/kinto/logoff.sh
+	fi
+	
+	yes | cp -rf ./xkeysnail-config/kinto.py ./xkeysnail-config/kinto.py.new
+	yes | cp -rf ./xkeysnail-config/limitedadmins ./xkeysnail-config/limitedadmins.new
+	yes | cp -rf ./xkeysnail-config/killdups.sh ~/.config/kinto/killdups.sh
+	yes | cp -rf ./xkeysnail-config/appleKB.sh ~/.config/kinto/appleKB.sh
+	yes | cp -rf ./xkeysnail-config/trayapps/appindicator/kintotray.py ~/.config/kinto/kintotray.py
+	yes | cp -rf ./xkeysnail-config/trayapps/appindicator/kintotray.desktop ~/.config/kinto/kintotray.desktop
+	yes | cp -rf ./xkeysnail-config/trayapps/BudgieApplet/icons/kinto-color-16.svg ~/.config/kinto/kinto-color.svg
+	yes | cp -rf ./xkeysnail-config/trayapps/BudgieApplet/icons/kinto-invert-16.svg ~/.config/kinto/kinto-invert.svg
+	yes | cp -rf ./xkeysnail-config/trayapps/BudgieApplet/icons/kinto-solid-16.svg ~/.config/kinto/kinto-solid.svg
+	# yes | cp -rf ./system-config/caret_status_xkey.sh ~/.config/kinto/caret_status_xkey.sh
+	yes | cp -rf ./xkeysnail-config/xkeysnail.service ./xkeysnail-config/xkeysnail.service.new
+	# yes | cp -rf ./xkeysnail-config/xkeysnail.timer ~/.config/systemd/user/xkeysnail.timer
+	sed -i "s#{experimental-caret}#$exp#g" ./xkeysnail-config/xkeysnail.service.new
+	if [ "$expsh" != " " ];then
+		sed -i "s#{kill-caret}#/usr/bin/pkill -f $expsh#g" ./xkeysnail-config/xkeysnail.service.new
+	else
+		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#{homedir}#`echo "$HOME"`#g" ./xkeysnail-config/xkeysnail.service.new
+	sed -i "s#{homedir}#`echo "$HOME"`#g" ~/.config/kinto/kintotray.desktop
+	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#{pkill}#`\\which pkill`#g" ./xkeysnail-config/limitedadmins.new
+	sed -i "s#{xkeysnail}#/usr/local/bin/xkeysnail#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
+	yes | cp -rf ~/.config/kinto/kintotray.desktop ~/.config/autostart/kintotray.desktop
+	if $installtray ; then
+		sed -i "s#-c \"grep#-c \"python3 {homedir}/.config/kinto/kintotray.py;grep#g" ~/.config/autostart/xkeysnail.desktop
+		sed -i "s#xkeysnail\"#xkeysnail;{homedir}/.config/kinto/logoff.sh\"#g" ~/.config/autostart/xkeysnail.desktop
+	fi
+	sed -i "s#{xhost}#`\\which xhost`#g" ~/.config/autostart/xkeysnail.desktop
+	sed -i "s#{homedir}#`echo "$HOME"`#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
+
+	if $vssublime ; then
+		perl -pi -e "s/(# )(.*)(- Sublime)/\$2\$3/g" ./xkeysnail-config/kinto.py.new >/dev/null 2>&1
+	fi
+fi
+
+if [[ $dename == "gnome" || dename == "budgie" ]]; then
+	perl -pi -e "s/(# )(.*)(# gnome)/\$2\$3/g" ./xkeysnail-config/kinto.py.new >/dev/null 2>&1
+fi
+if [[ $dename == "kde" ]]; then
+	echo "Applying Cmd-Space to open App Launcher for KDE..."
+	perl -pi -e "s/(# )(.*)(#.*kde)/\$2\$3/g" ./xkeysnail-config/kinto.py.new >/dev/null 2>&1
+fi
+
+if [[ $1 == "1" || $1 == "winmac" ]]; then
+	if ls /sys/module | grep hid_apple >/dev/null 2>&1 ; then
+		echo '1' | sudo tee /sys/module/hid_apple/parameters/swap_opt_cmd;echo 'options hid_apple swap_opt_cmd=1' | sudo tee /etc/modprobe.d/hid_apple.conf;sudo update-initramfs -u -k all
+	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
+		perl -pi -e "s/(\w.*)(# Default not-xfce4)/# \$1\$2/g" ./xkeysnail-config/kinto.py.new
+	fi
+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 == "ibm" ]]; then
+	perl -pi -e "s/(# )(.*)(# IBM)/\$2\$3/g" ./xkeysnail-config/kinto.py.new
+	perl -pi -e "s=(# )(.*)(# Chromebook/IBM)=\$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
+fi
+if [[ $dename == "xfce" ]] && ls /etc/apt/sources.list.d/enso* 1> /dev/null 2>&1; then
+    echo "enso OS detected, applying Cmd-Space for Launchy..."
+    perl -pi -e "s/(K\(\"RC-Space)(.*)(# )(xfce4)/\$3\$1\$2\$3\$4/g" ./xkeysnail-config/kinto.py.new >/dev/null 2>&1
+    xfconf-query --channel xfce4-keyboard-shortcuts --property "/commands/custom/<Primary>space" --create --type string --set "launchy"
+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 == "winmac" || $1 == "mac" || $1 == "chromebook" ]]; then
+	mv ./xkeysnail-config/kinto.py.new ~/.config/kinto/kinto.py
+	git describe --tags | perl -ne "print \"\$1 build `git rev-parse --short HEAD`\n\" for m/\b(.*)-\w+-\w{8}/" > ~/.config/kinto/version
+	# if [ "$distro" == "fedora" ];then
+	sudo rm /etc/systemd/system/xkeysnail.service
+	if [ -d /usr/lib/systemd/system ];then
+		xkeypath="/usr/lib/systemd/system/"
+	elif [ -d /lib/systemd/system ];then
+		xkeypath="/lib/systemd/system/"
+	fi
+	sudo mv ./xkeysnail-config/xkeysnail.service.new "$xkeypath"xkeysnail.service && echo "Service file added to "$xkeypath"xkeysnail.service"
+	sudo chown -R root:root "$xkeypath"xkeysnail.service && echo "Ownership set for root..." || echo "Failed to set ownership..."
+	sudo chmod 644 "$xkeypath"xkeysnail.service && echo "Permissions set to 644..." || echo "Failed to set permissions..."
+	sudo ln -s "$xkeypath"xkeysnail.service /etc/systemd/system/xkeysnail.service && echo "Created soft symlink..." || echo "Failed to create soft symlink..."
+	sudo ln -s "$xkeypath"xkeysnail.service /etc/systemd/system/graphical.target.wants/xkeysnail.service && echo "Created soft symlink for graphical target..." || echo "Failed to create soft symlink for graphical target..."
+	xhost +SI:localuser:root
+	git clone --depth 10 https://github.com/rbreaves/xkeysnail.git || git pull --depth 10
+	cd xkeysnail
+	git checkout 51c369084e0045a8410d227bab52411bf84fb65b
+	giturl=$(git ls-remote --get-url)
+	if [ "$giturl" != "https://github.com/rbreaves/xkeysnail.git" ];then
+		echo -e "\nreplacing xkeysnail with fork...\n"
+		cd ..
+		rm -rf ./xkeysnail
+		git clone --depth 10 https://github.com/rbreaves/xkeysnail.git
+		cd xkeysnail
+		git checkout 51c369084e0045a8410d227bab52411bf84fb65b
+	fi
+	sudo pip3 install --upgrade .
+	cd ..
+	sudo systemctl daemon-reload
+	sudo systemctl disable xkeysnail
+	# sudo systemctl --state=not-found --all | grep xkeysnail
+	# if [ "$distro" == "fedora" ];then
+	# 	systemctl enable xkeysnail.service
+	# else
+	# 	sudo systemctl enable xkeysnail.service
+	# fi
+	sudo systemctl restart xkeysnail
+	sudo pkill -f kintotray >/dev/null 2>&1
+	nohup python3 ~/.config/kinto/kintotray.py& >/dev/null 2>&1
+
+	echo -e "Adding xhost fix...\n"
+
+	LINE='xhost +SI:localuser:root'
+
+	if [ ! -e "~/.xprofile" ]; then
+		# Ubuntu xhost fix
+		echo "$LINE" > ~/.xprofile
+		# echo "$LINE" > ~/.xinitrc
+	fi
+	# Ubuntu xhost fix
+	grep -qF -- "$LINE" ~/.xprofile || echo "$LINE" >> ~/.xprofile
+	# KDE xhost fix
+	# grep -qF -- "$LINE" ~/.bashrc || echo "$LINE" >> ~/.bashrc
+	# grep -qF -- "$LINE" ~/.xinitrc || echo "$LINE" >> ~/.xinitrc
+
+	# remove kintox11 login startup
+	if test -f "~/.config/autostart/kinto.desktop"; then
+		rm ~/.config/autostart/kinto.desktop
+	fi
+
+	echo -e "Kinto install is \e[1m\e[32mcomplete\e[0m.\n"
+	if `sudo systemctl is-active --quiet xkeysnail`;then
+		echo -e "Kinto \e[1m\e[32mxkeysnail service is running\e[0m.\n"
+		echo "Commands for controlling Kinto's xkeysnail service"
+		echo "sudo systemctl restart xkeysnail"
+		echo "sudo systemctl stop xkeysnail"
+		echo "sudo systemctl start xkeysnail"
+		echo "sudo systemctl status xkeysnail"
+	else
+		echo -e "Kinto \e[1m\e[91mxkeysnail service has failed.\e[0m"
+		echo "You can run 'sudo systemctl status xkeysnail' for more info"
+		echo "You can also run 'sudo journalctl -u xkeysnail'"
+	fi
+	echo ""
+	if $vssublime ; then
+		echo -e "\e[1m\e[32mEnabled\e[0m VS Code Sublime Text remap."
+	fi
+	if $rightalt ; then
+		echo -e "\e[1m\e[32mEnabled\e[0m mutli-language support."
+	fi
+
+	# trayApp
+
+elif [[ $1 == "5" || $1 == "uninstall" || $1 == "Uninstall" ]]; then
+	echo "Uninstalling Kinto - xkeysnail (udev)"
+	uninstall
+	removeAppleKB
+	pkill -f kintotray >/dev/null 2>&1
+	sudo systemctl stop xkeysnail >/dev/null 2>&1
+	sudo systemctl disable xkeysnail >/dev/null 2>&1
+	sudo rm /etc/sudoers.d/limitedadmins
+	rm ~/.config/autostart/xkeysnail.desktop
+	rm -rf ~/.config/kinto
+	sudo rm /etc/systemd/system/xkeysnail.service >/dev/null 2>&1
+	sudo rm /etc/systemd/system/graphical.target.wants/xkeysnail.service >/dev/null 2>&1
+	sudo rm /usr/lib/systemd/system/xkeysnail.service >/dev/null 2>&1
+	if [ -f /usr/local/bin/logoff.sh ];then
+		sudo rm /usr/local/bin/logoff.sh
+	fi
+	sudo systemctl daemon-reload
+	sudo systemctl --state=not-found --all | grep xkeysnail
+	budgieUninstall
+	exit 0
+elif [[ $1 == "budgieUpdate" ]]; then
+	budgieUpdate
+else
+	echo "Expected argument was not provided"
+fi

setup.py

@@ -1,33 +1,44 @@
 #!/usr/bin/env python3
-import json, time, os, sys, subprocess, shlex, platform
+import json, time, os, sys, subprocess, shlex, platform,argparse
 from shutil import copyfile
 from subprocess import PIPE, Popen
 from prekinto import *
 
+parser = argparse.ArgumentParser()
+
+parser.add_argument('-r', dest='uninstall', action='store_true', help="uninstall kinto")
+parser.add_argument('--remove', dest='uninstall', action='store_true', help="uninstall kinto")
+
+args = parser.parse_args()
+
 homedir = os.path.expanduser("~")
 kintotype = 0
 
 def windows_setup():
-	keymaps = ["Apple keyboard standard", "Windows keyboard standard","Uninstall"]
+	keymaps = ["Apple keyboard standard", "Windows keyboard standard","Chromebook","IBM - No Super/Win","Uninstall"]
 	for index, item in enumerate(keymaps):
-		print("    %i. %s" % (index+1, item.capitalize()))
+		print("    %i. %s" % (index+1, item))
 	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("")
 	# Short DOS path notation
 	path= cmdline('echo ''%cd%''')[:-1]
-	if default > 0 and default < 3:
+	if default > 0 and default < 5:
 		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"')
 		print("Copying autohotkey combinations for Terminals & Editors...")
 		os.system('copy /Y "' + path + '\\windows\\kinto.ahk" "' + path + '\\windows\\kinto-new.ahk"')
+	if default < 3:
+		os.system('C:\\Strawberry\\perl\\bin\\perl.exe -pi -e "s/(; )(.*)(; Default)(?!( - ST2CODE))(.*)/$2$3$5/g" .\\windows\\kinto-new.ahk')
 	if default == 1:
+		kbtype = "mac"
 		os.system('C:\\Strawberry\\perl\\bin\\perl.exe -pi -e "s/(; )(.*)(; MacModifiers)/$2$3/g" .\\windows\\kinto-new.ahk')
-	elif default == 2:	
+	elif default == 2:
+		kbtype = "win"
 		os.system('C:\\Strawberry\\perl\\bin\\perl.exe -pi -e "s/(; )(.*)(; WinModifiers)/$2$3/g" .\\windows\\kinto-new.ahk')
-	elif default == 3:
+	elif default == 5:
 		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...")
@@ -39,14 +50,27 @@ def windows_setup():
 		os.system('(rd /s /q "%userprofile%\\.kinto") 2> nul')
 		print("")
 		print("Uninstall of Kinto is Complete.")
-	if default > 0 and default < 3:
+	if default == 3:
+		kbtype = "chrome"
+		os.system('C:\\Strawberry\\perl\\bin\\perl.exe -pi -e "s/(; )(.*)(; Chromebook)/$2$3/g" .\\windows\\kinto-new.ahk')
+		os.system('C:\\Strawberry\\perl\\bin\\perl.exe -pi -e "s/(; )(.*)(; WinModifiers/CB)/$2$3/g" .\\windows\\kinto-new.ahk')
+	if default == 3 or default == 4:
+		os.system('C:\\Strawberry\\perl\\bin\\perl.exe -pi -e "s/(; )(.*)(; CB/IBM)/$2$3/g" .\\windows\\kinto-new.ahk')
+	if default == 4:
+		kbtype = "ibm"
+		os.system('C:\\Strawberry\\perl\\bin\\perl.exe -pi -e "s/(; )(.*)(; IBM)/$2$3/g" .\\windows\\kinto-new.ahk')
+		os.system('C:\\Strawberry\\perl\\bin\\perl.exe -pi -e "s/(; )(.*)(; WinModifiers/CB/IBM)/$2$3/g" .\\windows\\kinto-new.ahk')
+	if default > 0 and default < 5:
 		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('C:\\Strawberry\\perl\\bin\\perl.exe -pi -e "s/(; )(.*)(; ST2CODE)/$2$3/g" .\\windows\\kinto-new.ahk')
+		if (stvscode and (default > 0 or default < 3)):
+			os.system('C:\\Strawberry\\perl\\bin\\perl.exe -pi -e "s/(; )(.*)(; Default - ST2CODE)/$2$3/g" .\\windows\\kinto-new.ahk')
+		elif (stvscode and (default == 3 or default == 4 )):
+			os.system('C:\\Strawberry\\perl\\bin\\perl.exe -pi -e "s/(; )(.*)(; CB/IBM - ST2CODE)/$2$3/g" .\\windows\\kinto-new.ahk')
 		os.system('copy /Y "' + path + '\\windows\\kinto-start.vbs" "%userprofile%\\.kinto\\kinto-start.vbs"')
+		os.system('C:\\Strawberry\\perl\\bin\\perl.exe -pi -e "s/{kbtype}/' + kbtype + '/g" "%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"')
@@ -80,9 +104,12 @@ if platform.system() == 'Windows':
 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:
-	if os.name != 'nt':
+	if os.name != 'nt' and os.name != 'posix':
+		print(os.name)
 		print("You are not using x11, please logout and back in using x11/Xorg")
 		sys.exit()
+	elif os.name == 'posix':
+		print("You may be trying to run Kinto under WSL2 w/ Linux. We will continue...")
 	else:
 		print("\nYou are detected as running Windows.")
 		windows_setup()
@@ -93,514 +120,23 @@ dename = cmdline("./system-config/dename.sh").replace('"','').strip().split(" ")
 
 run_pkg = ""
 
-def requirements(pkgm):
-	print(bcolors.CYELLOW2 + "You need to install some packages, " +run_pkg+ ", for Kinto to fully remap browsers during input focus.\n" + bcolors.ENDC)
-	print("sudo " + pkgm + " " + run_pkg + "\n")
-	run_install = yn_choice(bcolors.CYELLOW2 + "Would you like to run it now? (Will require sudo privileges.)\n" + bcolors.ENDC)
-	if(run_install):
-		os.system("sudo " + pkgm  + run_pkg)
-		print("\n")
-
-def install_ibus():
-	global distro
-	print(bcolors.CYELLOW2 + "You need to set IBus as the default Input Method for full word-wise support and re-run this installer.\n" + bcolors.ENDC)
-	print(bcolors.CYELLOW2 + "Confirm the IBus Setup by saying Yes and then closing the window.\n" + bcolors.ENDC)
-	print("ibus-setup\n")
-	print("im-config -n ibus or im-chooser\n")
-	run_install = yn_choice(bcolors.CYELLOW2 + "Would you like to run it now? (Will require logoff and logon.)\n" + bcolors.ENDC)
-	if(run_install):
-		if distro=="fedora":
-			os.system("ibus-setup")
-			os.system("im-chooser")
-			print("\n")
-			print("IBus needs to have Input Method set to your language.")
-			print("im-chooser needs IBus to be selected & closed.")
-			input("Will need to log off and back on for it take effect...")
-		else:
-			os.system("ibus-setup")
-			os.system("im-config -n ibus")
-			print("\n")
-			input("IBus has been set as the default Input Method.\nPress any key to exit and re-run after logoff & logon...")
-		sys.exit()
-
-def setShortcuts():
-	global distro
-	distroVersion = cmdline("awk -F= '$1==\"VERSION_ID\" { print $2 ;}' /etc/os-release").replace('"','').strip()
-	
-	print("\nIf Kinto is already running it will be stopped...")
-	print("If you cancel the installer you can re-run Kinto via\n systemctl --user start keyswap")
-
-	cmdline("systemctl --user stop keyswap")
-	print("\nDetected " + distro + " " + distroVersion.strip() + " DE: " + dename + "\n")
-	addhotkeys = yn_choice("\nDo you want to apply system level shortcuts?")
-	if(addhotkeys):
-		distro = distro.lower()
-		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):
-				cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-applications \"['<Primary>Tools','<Alt>Tab']\"")
-				cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-applications-backward \"['<Primary><Shift>Tools','<Alt><Shift>Tab']\"")
-			else:
-				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 == "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 ['']")
-			cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-right ['']")
-			cmdline("gsettings set org.gnome.desktop.wm.keybindings minimize \"['<Super>h','<Alt>F9']\"")
-			cmdline("gsettings set org.gnome.desktop.wm.keybindings panel-main-menu \"['<Primary><Shift>Space','<Primary>Space']\"")
-		elif distro == "pop!_os" and dename == "gnome":
-			cmdline("gsettings set org.gnome.desktop.wm.keybindings close \"['<Alt>F4','<Super>w']\"")
-			cmdline("gsettings set org.gnome.desktop.wm.keybindings toggle-maximized \"['<Alt>F10','<Primary><Super>Up']\"")
-			cmdline("gsettings set org.gnome.desktop.wm.keybindings minimize \"['<Super>h','<Alt>F9']\"")
-			cmdline("gsettings set org.gnome.desktop.wm.keybindings panel-main-menu \"['<Primary><Shift>Space','<Primary>Space']\"")
-			cmdline("gsettings 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 ['']")
-			cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-right ['']")
-		elif distro == "elementary" and dename == "gnome":
-			if(kintotype == 1):
-				cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-applications \"['<Primary>Tools','<Alt>Tab']\"")
-				cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-applications-backward \"['<Primary><Shift>Tools','<Alt><Shift>Tab']\"")
-			else:
-				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 show-desktop \"['<Super>d','<Super>Down']\"")
-			cmdline("gsettings set org.gnome.desktop.wm.keybindings toggle-maximized \"['<Alt>F10','<Super>Up']\"")
-			cmdline("gsettings set org.gnome.desktop.wm.keybindings panel-main-menu \"['<Control><Shift>Space','<Super>Space']\"")
-			cmdline("gsettings set org.gnome.desktop.wm.keybindings minimize \"['<Super>h','<Alt>F9']\"")
-			cmdline("gsettings set org.gnome.desktop.wm.keybindings panel-main-menu \"['<Super>Space','<Primary>Space']\"")
-			if(kintotype == 2):
-				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 (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')
-			cmdline('xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/<Super>d" --create --type string --set "show_desktop_key"')
-			# Reset App Cycle
-			cmdline('xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/<Alt>Tab" --reset')
-			cmdline('xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/<Alt><Shift>Tab" --reset')
-			cmdline('xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/<Primary>backslash" --create --type string --set "cycle_windows_key"')
-			cmdline('xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/<Primary><Shift>backslash" --create --type string --set "cycle_reverse_windows_key"')
-			# cmdline('xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/<Super>h" --create --type string --set "hide_window_key"')
-			# Don't need to undo other maps for menu
-			cmdline('xfconf-query --channel xfce4-keyboard-shortcuts --property "/commands/custom/<Primary>space" --create --type string --set "xfce4-popup-whiskermenu"')
-			cmdline('xfconf-query --channel xfce4-keyboard-shortcuts --property "/commands/custom/<Primary><Shift>space" --create --type string --set "xfce4-popup-whiskermenu"')
-			# Reset move to desktop shortcuts
-			cmdline('xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/<Primary><Alt>Home" --reset')
-			cmdline('xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/<Primary><Alt>End" --reset')
-			cmdline('xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/<Primary><Alt>Left" --reset')
-			cmdline('xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/<Primary><Alt>Right" --reset')
-			os.system('xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/<Primary><Alt>Left" --create --type string --set "move_window_prev_workspace_key"')
-			os.system('xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/<Primary><Alt>Right" --create --type string --set "move_window_next_workspace_key"')
-			# Reset Change Workspace
-			cmdline('xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/<Primary><Alt>Left" --reset')
-			cmdline('xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/<Primary><Alt>Right" --reset')
-			cmdline('xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/<Super>Left" --create --type string --set "left_workspace_key"')
-			cmdline('xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/<Super>Right" --create --type string --set "right_workspace_key"')
-			print("\nYou may need to run these commands manually to make sure they are set, if you want to move windows between desktops.\n")
-			print('     xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/<Primary><Alt>Left" --create --type string --set "move_window_prev_workspace_key"')
-			print('     xfconf-query --channel xfce4-keyboard-shortcuts --property "/xfwm4/custom/<Primary><Alt>Right" --create --type string --set "move_window_next_workspace_key"\n')
-		elif distro == "fedora" and dename == "gnome":
-			cmdline("gsettings set org.gnome.desktop.wm.keybindings show-desktop \"['<Super>d']\"")
-			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 ['']")
-			cmdline("gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-right ['']")
-			cmdline("gsettings set org.gnome.desktop.wm.keybindings minimize \"['<Super>h','<Alt>F9']\"")
-			cmdline("gsettings set org.gnome.desktop.wm.keybindings panel-main-menu \"['<Primary><Shift>Space','<Primary>Space']\"")
-			cmdline("gsettings set org.gnome.mutter.keybindings toggle-tiled-right \"['<Super><Alt>Right']\"")
-			cmdline("gsettings set org.gnome.mutter.keybindings toggle-tiled-left \"['<Super><Alt>Left']\"")
-			# org.gnome.mutter.keybindings toggle-tiled-right ['<Super>Right']
-			# org.gnome.mutter.keybindings toggle-tiled-left ['<Super>Left']
-		elif dename == "kde":
-			# cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "krunner.desktop" --key "_launch","Alt+Space\tAlt+F2\tSearch,Alt+Space\tAlt+F2\tSearch,KRunner"')
-			# Remove Alt+F3 Operations Menu - Sublimetext Select-All
-			cmdline('cp ~/.config/kwinrc ./kwinrc_`date +"%Y.%m.%d-%s"`')
-			cmdline('cp ~/.config/kglobalshortcutsrc ./kde_kglobalshortcutsrc_`date +"%Y.%m.%d-%s"`')
-			cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Switch to Previous Desktop" "Meta+Left,Meta+Left,Switch to Previous Desktop"')
-			cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Window Operations Menu" "none,Alt+F3,Window Operations Menu"')
-			if(kintotype == 1):
-				cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Walk Through Windows" "Ctrl+Tools,Alt+Tab,Walk Through Windows"')
-				cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Walk Through Windows (Reverse)" "Ctrl+Shift+Tools,Alt+Shift+Backtab,Walk Through Windows (Reverse)"')
-				cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Walk Through Windows of Current Application" "Alt+F6,none,Walk Through Windows of Current Application"')
-				cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Walk Through Windows of Current Application (Reverse)" "Alt+Shift+F6,none,Walk Through Windows of Current Application (Reverse)"')
-			else:
-				cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Walk Through Windows" "Ctrl+F13,Alt+Tab,Walk Through Windows"')
-				cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Walk Through Windows (Reverse)" "Ctrl+Shift+F14,Alt+Shift+Backtab,Walk Through Windows (Reverse)"')
-			cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Walk Through Windows Alternative" "none,none,Walk Through Windows"')
-			cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Maximize Window" "none,Meta+PgUp,Maximize Window"')
-			cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Window Maximize" "Meta+Ctrl+F,Alt+F10,Maximize Window"')
-			cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Minimize Window" "Meta+h,Meta+PgDown,Minimize Window"')
-			cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Switch to Next Desktop" "Meta+Right,Meta+Right,Switch to Next Desktop"')
-			os.system('kquitapp5 kglobalaccel && sleep 2s && kglobalaccel5 &')
-		else:
-			print('distro: ' + distro + ' de: ' + dename)
-			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():
-	print("You selected to Uninstall Kinto.\n")
-	restore = yn_choice("\nYour DE is " + dename + ".\n\nY: Restore hotkeys from backup\nN: Reset OS/DE hotkeys\nWhich option would you prefer?")
-	print("")
-	if(restore):
-		if dename == "gnome":
-			print("Restoring DE hotkeys...")
-			wmkeys = cmdline('ls | grep -m1 "keybinding"')
-			mutterkeys = cmdline('ls | grep -m1 "mutter_"')
-			if len(wmkeys) > 0:
-				print('dconf load /org/gnome/desktop/wm/keybindings/ < ' + wmkeys)
-				cmdline('dconf load /org/gnome/desktop/wm/keybindings/ < ' + wmkeys)
-			else:
-				print('Gnome Desktop keybindings backup not found...')
-			if len(mutterkeys) > 0:
-				print('dconf load /org/gnome/mutter/keybindings/ < ' + mutterkeys)
-				cmdline('dconf load /org/gnome/mutter/keybindings/ < ' + mutterkeys)
-			if len(wmkeys) > 0 or len(mutterkeys) > 0:
-				print("Gnome hotkeys have been successfully restored.")
-		elif dename == "kde":
-			print("Restoring DE hotkeys...")
-			kwinkeys = cmdline('ls | grep -m1 "kwinrc"').strip()
-			kdekeys = cmdline('ls | grep -m1 "kglobalshortcutsrc"').strip()
-			cmdline('cp ./' + kdekeys + ' ~/.config/kglobalshortcutsrc')
-			cmdline('cp ./' + kwinkeys + ' ~/.config/kwinrc')
-		elif dename == "xfce":
-			print("Restoring DE hotkeys...")
-			xfcekeys = cmdline('ls | grep -m1 "xfce4-keyboard"').strip()
-			cmdline('cp ./' + xfcekeys + ' ~/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml')
-		if dename == "gnome" or dename == "kde" or dename == "xfce":
-			print("./uninstall.sh\n")
-			subprocess.check_call(shlex.split("./uninstall.sh"))
-			print("Done.")
-		if dename == "kde" or dename == "xfce":
-			print("Please log off and back on for your original hotkeys to take effect.")
-	else:
-		if dename == "gnome":
-			print("Resetting DE hotkeys...\n")
-			print("gsettings reset-recursively org.gnome.desktop.wm.keybindings")
-			cmdline("gsettings reset-recursively org.gnome.desktop.wm.keybindings")
-			print("gsettings reset-recursively org.gnome.mutter.keybindings")
-			cmdline("gsettings reset-recursively org.gnome.mutter.keybindings")
-			print("gsettings set org.gnome.mutter overlay-key 'super'")
-			cmdline("gsettings set org.gnome.mutter overlay-key 'super'")
-			cmdline('dconf dump /org/gnome/mutter/ > mutter.conf')
-			cmdline('dconf load /org/gnome/mutter/ < mutter.conf')
-		elif dename == "kde":
-			print("Resetting DE hotkeys...\n")
-			cmdline('mv ~/.config/kwinrc ~/.config/kwinrc.kinto')
-			cmdline('mv ~/.config/kglobalshortcutsrc ~/.config/kglobalshortcutsrc.kinto')
-		elif dename == "xfce":
-			print("Resetting DE hotkeys...\n")
-			cmdline('cp /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml ~/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml')
-		if dename == "gnome" or dename == "kde" or dename == "xfce":
-			print("./uninstall.sh\n")
-			subprocess.check_call(shlex.split("./uninstall.sh"))
-			print("Done.")
-		if dename == "kde" or dename == "xfce":
-			print("Please log off and back on for your original DE hotkeys to take effect.")
-
-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()
-
-	pkgm = cmdline("\\which apt-get 2>/dev/null").strip()
-
-	if len(pkgm) == 0:
-		pkgm = cmdline("\\which dnf 2>/dev/null").strip()
-		if len(pkgm) > 0:
-			pkgm += " check-update;sudo dnf install -y "
-	else:
-		pkgm += " install -y "
-		pkgm += " update; sudo apt-get install -y "
-
-	if len(pkgm) == 0:
-		pkgm = cmdline("\\which pacman 2>/dev/null").strip()
-		if len(pkgm) > 0:
-			pkgm += " -Syy; sudo pacman -S "
-
-
-	if len(pkgm) == 0:
-		print("No supported package manager found. Exiting...")
-		sys.exit()
-
-
-	runpkg = 0
-	global run_pkg
-
-	if len(check_xbind) > 0 and len(check_xdotool) > 0 and len(check_ibus) > 0:
-		print("Xbindkeys, xdotool and IBus requirement is installed.")
-	if len(check_xbind) == 0:
-		run_pkg = "xbindkeys"
-		runpkg = 1
-	if len(check_xdotool) == 0:
-		run_pkg += " xdotool"
-		runpkg = 1
-	if len(check_ibus) == 0:
-		# may differ with distro, but for now
-		run_pkg += " ibus"
-		runpkg = 1
-
-	if runpkg != 0:
-		print(runpkg)
-		requirements(pkgm)
-
-	if not os.path.exists(homedir + '/.config/ibus/bus') and cmdline("ls ~/.config/ibus/bus -1rt") == "":
-		install_ibus()
-
-try:
-	f = open("defaults.json")
-except IOError:
-	print("defaults.json file is missing. Will exit.\n")
-	exit()
-f.close()
-
-try:
-	f = open("defaults.json")
-except IOError:
-	print("defaults.json file is missing. Will exit.\n")
-	exit()
-f.close()
-
-try:
-	f = open("user_config.json")
-except IOError:
-	print("user_config.json file is missing. Will exit.\n")
-	exit()
-f.close()
-
 if os.path.isdir(homedir + "/.config/kinto") == False:
 	os.mkdir(homedir + "/.config/kinto")
 	time.sleep(0.5)
 
-with open('defaults.json') as json_file:
-	data = json.load(json_file)
 
+cmdline("git fetch")
 
 color_arr = [bcolors.CBEIGE,bcolors.CRED2,bcolors.CGREEN,bcolors.CYELLOW ]
 
-print("\nKinto - Type in Linux like it's a Mac.\n")
+kintover = cmdline('echo "$(git describe --tag --abbrev=0 | head -n 1)" "build" "$(git rev-parse --short HEAD)"')
 
-kintotype = int(input(color_arr[2] +
-	"1) Kinto - xkeysnail (udev/x11) - Recommended\n" + color_arr[0] +
-	"2) Kinto - Original xkb/x11 implementation\n" + color_arr[3] +
-	"3) Uninstall Kinto - xkeysnail\n" +
-	"4) Uninstall Kinto - Original xkb\n\n"
-	+ bcolors.ENDC))
-print("")
-if(kintotype == 1):
-	subprocess.check_call(shlex.split("./xkeysnail_service.sh"))
-	if os.path.isdir(homedir + "/.config/kinto") == True:
-		setShortcuts()
-		subprocess.check_call(shlex.split("./xkeysnail_service.sh budgieUpdate"))
-	exit()
+print("\nKinto " + kintover + "Type in Linux like it's a Mac.\n")
 
-if(kintotype == 3):
+if args.uninstall:
 	subprocess.check_call(shlex.split("./xkeysnail_service.sh uninstall"))
 	exit()
 
-if(kintotype == 4):
-	Uninstall()
-	exit()
+subprocess.check_call(shlex.split("./xkeysnail_service.sh"))
 
-kintoImpOne()
 
-for index, item in enumerate(data['defaulttypes']):
-	ossym = ""
-	if item == "windows":
-		ossym = u'\u2756'
-	elif item == "mac":
-		ossym = u'\u2318'
-	elif item == "chromebook":
-		ossym = u'\u2707'
-	print("%s    %i. %s  %s %s" % (color_arr[index], index+1, ossym, item.capitalize(), bcolors.ENDC))
-
-print("%s    %i. Uninstall %s" % (color_arr[3], len(data['defaulttypes'])+1, bcolors.ENDC))
-
-default = 0
-while not int(default) in range(1,len(data['defaulttypes'])+2):
-	default = int(input(bcolors.CYELLOW2 + "\nPlease enter your keyboard type (1 - " + str(len(data['defaulttypes'])) + ") : " + bcolors.ENDC))
-print("")
-
-if default == len(data['defaulttypes'])+1:
-	Uninstall()
-	exit()
-
-try:
-	f = open(homedir + "/.config/kinto/user_config.json")
-	rewrite = yn_choice("~/.config/kinto/user_config.json already exists. Do you want to overwrite it with a new config?")
-	print("")
-	if(rewrite):
-		copyfile("user_config.json", homedir + "/.config/kinto/user_config.json")
-	else:
-		exit()
-except IOError:
-	pass
-	copyfile("user_config.json", homedir + "/.config/kinto/user_config.json")
-finally:
-    f.close()
-
-keyboardconfigs = [obj for obj in data['defaults'] if(obj['type'] == data['defaulttypes'][default-1])]
-
-# for k in keyboardconfigs:
-for index, k in enumerate(keyboardconfigs):
-	print(color_arr[default-1] + bcolors.BOLD + str(index+1) + '. ' + k['name'] + bcolors.ENDC)
-	print(bcolors.CYELLOW2 + 'Description: ' + k['description'] + bcolors.ENDC)
-
-print("")
-defaultkb = 0
-while not int(defaultkb) in range(1,len(keyboardconfigs)+1):
-	defaultkb = int(input(bcolors.CYELLOW2 + "Please enter your keyboard config (1 - " + str(len(keyboardconfigs)) + ") : " + bcolors.ENDC))
-print("")
-
-if 'hack' in keyboardconfigs[defaultkb-1]:
-	print(bcolors.CYELLOW2 + "You have selected a keyboard config that needs the following command to be ran.\n" + bcolors.ENDC)
-	print(keyboardconfigs[defaultkb-1]['hack'].replace(";", "\n") + "\n")
-	runhack = yn_choice(bcolors.CYELLOW2 + "Would you like to run it now? (Will require sudo privileges. Will exit on No.)" + bcolors.ENDC)
-	if(runhack):
-		os.system(keyboardconfigs[defaultkb-1]['hack'])
-
-# Setup the selected keyboards config
-os.system("cp -TRv ./.xkb ~/.xkb/")
-if os.path.isdir(homedir + "/.xkb/keymap") == False:
-	os.mkdir(homedir + "/.xkb/keymap")
-	time.sleep(0.5)
-os.system('setxkbmap -option')
-os.system('setxkbmap -print > ~/.xkb/keymap/kbd.mac.gui')
-os.system('setxkbmap -print > ~/.xkb/keymap/kbd.mac.gui.chrome')
-os.system('setxkbmap -print > ~/.xkb/keymap/kbd.mac.gui.browsers')
-os.system('setxkbmap -print > ~/.xkb/keymap/kbd.mac.term')
-time.sleep(0.5)
-
-symbols_line = cmdline("cat ~/.xkb/keymap/kbd.mac.gui | grep -n 'xkb_symbols' | cut -f1 -d:").strip()
-types_line = cmdline("cat ~/.xkb/keymap/kbd.mac.gui | grep -n 'xkb_types' | cut -f1 -d:").strip()
-
-cmdline('sed -i '' -e "' + symbols_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_symbols_gui'] + '\\"/2" ~/.xkb/keymap/kbd.mac.gui')
-cmdline('sed -i '' -e "' + types_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_types_gui'] + '\\"/2" ~/.xkb/keymap/kbd.mac.gui')
-cmdline('sed -i '' -e "' + symbols_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_symbols_term'] + '\\"/2" ~/.xkb/keymap/kbd.mac.term')
-cmdline('sed -i '' -e "' + types_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_types_term'] + '\\"/2" ~/.xkb/keymap/kbd.mac.term')
-
-# Set chrome file accordingly for chromebooks or normal
-if default != 3:
-	cmdline('sed -i '' -e "' + symbols_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_symbols_gui'].replace("+mac_gui(mac_levelssym)+mac_gui(mac_appcycle)","+mac_gui(mac_levelssym)+mac_gui(mac_browsers)") + '\\"/2" ~/.xkb/keymap/kbd.mac.gui.browsers')
-	cmdline('sed -i '' -e "' + symbols_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_symbols_gui'].replace("+mac_gui(mac_levelssym)+mac_gui(mac_appcycle)","+mac_gui(mac_browsers)+mac_gui(mac_chrome)") + '\\"/2" ~/.xkb/keymap/kbd.mac.gui.chrome')
-else:
-	# Fix multicursor in mac_gui
-	cmdline('perl -pi -e "s/(\/\/ )(.*)(\/\/ Chromebook multicursor)/\$2\$3/g" ~/.xkb/symbols/mac_gui')
-	cmdline('perl -pi -e "s/(\w.*)(\/\/ Default multicursor)/\/\/ \$1\$2/g" ~/.xkb/symbols/mac_gui')
-	# Fix browsers
-	cmdline('sed -i '' -e "' + symbols_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_symbols_gui'].replace("+mac_gui(mac_levelssym)+mac_gui(mac_appcycle_chromebook)","+mac_gui(mac_levelssym)+mac_gui(mac_browsers_chromebook)") + '\\"/2" ~/.xkb/keymap/kbd.mac.gui.browsers')
-	cmdline('sed -i '' -e "' + symbols_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_symbols_gui'].replace("+mac_gui(mac_levelssym)+mac_gui(mac_appcycle_chromebook)","+mac_gui(mac_browsers_chromebook)+mac_gui(mac_chrome)") + '\\"/2" ~/.xkb/keymap/kbd.mac.gui.chrome')
-if dename == "kde":
-	# Fix maximize shortcut
-	cmdline('perl -pi -e "s/(\/\/ )(.*)(\/\/ KDE maximize)/\$2\$3/g" ~/.xkb/symbols/mac_gui')
-	# term app switching
-	cmdline('perl -pi -e "s/(\/\/ )(.*)(\/\/ KDE cmdtab)/\$2\$3/g" ~/.xkb/symbols/mac_term')
-else:
-	# Fix maximize shortcut
-	cmdline('perl -pi -e "s/(\/\/ )(.*)(\/\/ Default maximize)/\$2\$3/g" ~/.xkb/symbols/mac_gui')
-	# term app switching
-	cmdline('perl -pi -e "s/(\/\/ )(.*)(\/\/ Default cmdtab)/\$2\$3/g" ~/.xkb/symbols/mac_term')
-cmdline('sed -i '' -e "' + types_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_types_gui'] + '\\"/2" ~/.xkb/keymap/kbd.mac.gui.browsers')
-cmdline('sed -i '' -e "' + types_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_types_gui'] + '\\"/2" ~/.xkb/keymap/kbd.mac.gui.chrome')
-
-setShortcuts()
-
-user_file = homedir + '/.config/kinto/user_config.json'
-with open(user_file, 'r') as f:
-    user_config = json.load(f)
-
-onetime = yn_choice("\nOne time initialization tweaks are available. Would you like to view them?")
-print("")
-if(onetime):
-	intents = [obj for obj in user_config['de'] if(obj['intent'] == "init")]
-
-	for index, k in enumerate(intents):
-		print(color_arr[default-1] + bcolors.BOLD + str(index+1) + '. ' + k['name'] + bcolors.ENDC)
-		print(bcolors.CYELLOW2 + 'Description: ' + k['description'] + bcolors.ENDC)
-		print(bcolors.CYELLOW2 + 'run: ' + k['run'].replace(";", "\n") + bcolors.ENDC + '\n')
-
-	print(bcolors.CYELLOW2 + "Please enter your init tweak(s) (eg 1 or 1 2 3 - leave blank to skip): " + bcolors.ENDC)
-	defaultinit = [int(i) for i in input().split()]
-	if len(defaultinit) != 0:
-		user_config['init'] = [intents[defaultinit[0]-1]['id']]
-
-print("\nDynamic shortcut tweaks\n")
-
-intents = [obj for obj in user_config['de'] if(obj['intent'] == "gui_term")]
-tweaks = []
-tweaks_selected = []
-
-for index, k in enumerate(intents):
-	print(color_arr[default-1] + bcolors.BOLD + str(index+1) + '. ' + k['name'] + bcolors.ENDC)
-	print(bcolors.CYELLOW2 + 'Description: ' + k['description'] + bcolors.ENDC)
-	print(bcolors.CYELLOW2 + 'run in gui mode: ' + k['run_gui'].replace(";", "\n") + bcolors.ENDC)
-	print(bcolors.CYELLOW2 + 'run in terminal mode: ' + k['run_term'].replace(";", "\n") + bcolors.ENDC + '\n')
-	tweaks.append(k['id'])
-
-print(bcolors.CYELLOW2 + "Please enter your dynamic shortcut tweak(s) (eg 1 or 1 2 3 - leave blank to skip): " + bcolors.ENDC)
-defaultde = [int(i) for i in input().split()]
-
-for d in defaultde:
-    user_config['de'][tweaks[d-1]]['active'] = True
-    tweaks_selected.append(tweaks[d-1])
-
-if len(defaultde) != 0:
-	# gui
-	user_config['config'][0]['de'] = tweaks_selected
-	# term
-	user_config['config'][1]['de'] = tweaks_selected
-	# firefox
-	user_config['config'][2]['de'] = tweaks_selected
-	# chrome
-	user_config['config'][3]['de'] = tweaks_selected
-
-user_config['config'][0]['run'] = keyboardconfigs[defaultkb-1]['gui']
-user_config['config'][1]['run'] = keyboardconfigs[defaultkb-1]['term']
-user_config['config'][2]['run'] = keyboardconfigs[defaultkb-1]['gui'].replace("kbd.mac.gui","kbd.mac.gui.browsers")
-user_config['config'][3]['run'] = keyboardconfigs[defaultkb-1]['gui'].replace("kbd.mac.gui","kbd.mac.gui.chrome")
-
-os.remove(user_file)
-with open(user_file, 'w') as f:
-    json.dump(user_config, f, indent=4)
-print("Saved configuration to ~/.config/kinto/user_config.json\n")
-print("Now running keyswap_service.sh to setup the keyswap service...")
-print("Keyswap will be configured to run on user login\n")
-print("You may start, stop, restart or view the status of the service with following commands\n")
-print("systemctl --user start keyswap")
-print("systemctl --user stop keyswap")
-print("systemctl --user restart keyswap")
-print("systemctl --user status keyswap")
-os.system("./keyswap_service.sh")

uninstall.sh

@@ -1,19 +0,0 @@
-#!/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 /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
-systemctl --user disable keyswap
-systemctl --user stop keyswap.timer 2>/dev/null
-systemctl --user disable keyswap.timer
-rm ~/.config/systemd/user/keyswap.service
-rm ~/.config/systemd/user/keyswap.timer
-rm -rf ~/.config/autostart/kinto.desktop
-rm -rf ~/.config/kinto
-rm -rf ~/.xkb
-sudo systemctl daemon-reload
-sed -i '/xkb/d' ~/.Xsession 2>/dev/null
-exit 0

windows/kinto-start.vbs

@@ -3,5 +3,5 @@ Set wShell = WScript.CreateObject("WScript.Shell")
 Set fso = CreateObject("Scripting.FileSystemObject")
 
 path = wShell.ExpandEnvironmentStrings("""%userprofile%")
-strFolder = fso.BuildPath( path, "\.kinto\kinto.ahk""")
+strFolder = fso.BuildPath( path, "\.kinto\kinto.ahk"" {kbtype}")
 oShell.ShellExecute "C:\Program Files\AutoHotkey\AutoHotkey.exe", strFolder, , "runas", 0

windows/toggle_kb.bat

@@ -2,20 +2,63 @@
 
 IF "%1"=="mac" goto mac
 IF "%1"=="win" goto win
+IF "%1"=="chrome" goto chrome
+IF "%1"=="ibm" goto ibm
+IF "%1"=="auto" goto auto
 
 echo Not found.
 goto commonexit
 
+:auto
+C:\Strawberry\perl\bin\perl.exe -pi -e "s/^(;)( )(.*)(; Autodetect)|^(?!; )(.*)(; )(Autodetect)/$6$5$6$7$3$4/g" "%userprofile%\.kinto\kinto.ahk"
+"%userprofile%\.kinto\kinto-start.vbs"
+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/(; )(.*)(; Default)/$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"
+C:\Strawberry\perl\bin\perl.exe -pi -e "s/^(?!;)(.*)(; CB\/IBM)/; $1$2/gm" "%userprofile%\.kinto\kinto.ahk"
+C:\Strawberry\perl\bin\perl.exe -pi -e "s/^(?!;)(.*)(; Chromebook)/; $1$2/gm" "%userprofile%\.kinto\kinto.ahk"
+C:\Strawberry\perl\bin\perl.exe -pi -e "s/^(?!;)(.*)(; IBM)/; $1$2/gm" "%userprofile%\.kinto\kinto.ahk"
+C:\Strawberry\perl\bin\perl.exe -pi -e "s/(ahk\"\" )(\w*)/$1win/gm" "%userprofile%\.kinto\kinto-start.vbs"
+"C:\Program Files\AutoHotkey\AutoHotkey.exe" "%userprofile%\.kinto\kinto.ahk" win
 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/(; )(.*)(; Default)/$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"
+C:\Strawberry\perl\bin\perl.exe -pi -e "s/^(?!;)(.*)(; CB\/IBM)/; $1$2/gm" "%userprofile%\.kinto\kinto.ahk"
+C:\Strawberry\perl\bin\perl.exe -pi -e "s/^(?!;)(.*)(; Chromebook)/; $1$2/gm" "%userprofile%\.kinto\kinto.ahk"
+C:\Strawberry\perl\bin\perl.exe -pi -e "s/^(?!;)(.*)(; IBM)/; $1$2/gm" "%userprofile%\.kinto\kinto.ahk"
+C:\Strawberry\perl\bin\perl.exe -pi -e "s/(ahk\"\" )(\w*)/$1mac/gm" "%userprofile%\.kinto\kinto-start.vbs"
+"C:\Program Files\AutoHotkey\AutoHotkey.exe" "%userprofile%\.kinto\kinto.ahk" mac
+goto commonexit
+
+:chrome
+C:\Strawberry\perl\bin\perl.exe -pi -e "s/^(?!; )(.*)(; Autodetect)/; $1$2/gm" "%userprofile%\.kinto\kinto.ahk"
+C:\Strawberry\perl\bin\perl.exe -pi -e "s/^(?!;)(.*)(; WinModifiers)/; $1$2/gm" "%userprofile%\.kinto\kinto.ahk"
+C:\Strawberry\perl\bin\perl.exe -pi -e "s/^(?!;)(.*)(; MacModifiers)/; $1$2/gm" "%userprofile%\.kinto\kinto.ahk"
+C:\Strawberry\perl\bin\perl.exe -pi -e "s/^(?!;)(.*)(; Default)/; $1$2/gm" "%userprofile%\.kinto\kinto.ahk"
+C:\Strawberry\perl\bin\perl.exe -pi -e "s/(; )(.*)(; Chromebook)/$2$3/g" "%userprofile%\.kinto\kinto.ahk"
+C:\Strawberry\perl\bin\perl.exe -pi -e "s/(; )(.*)(; WinModifiers\/CB)/$2$3/g" "%userprofile%\.kinto\kinto.ahk"
+C:\Strawberry\perl\bin\perl.exe -pi -e "s/(; )(.*)(; CB\/IBM)/$2$3/g" "%userprofile%\.kinto\kinto.ahk"
+C:\Strawberry\perl\bin\perl.exe -pi -e "s/(ahk\"\" )(\w*)/$1chrome/gm" "%userprofile%\.kinto\kinto-start.vbs"
+"C:\Program Files\AutoHotkey\AutoHotkey.exe" "%userprofile%\.kinto\kinto.ahk" chrome
+goto commonexit
+
+:ibm
+C:\Strawberry\perl\bin\perl.exe -pi -e "s/^(?!; )(.*)(; Autodetect)/; $1$2/gm" "%userprofile%\.kinto\kinto.ahk"
+C:\Strawberry\perl\bin\perl.exe -pi -e "s/^(?!;)(.*)(; WinModifiers)/; $1$2/gm" "%userprofile%\.kinto\kinto.ahk"
+C:\Strawberry\perl\bin\perl.exe -pi -e "s/^(?!;)(.*)(; Chromebook)/; $1$2/gm" "%userprofile%\.kinto\kinto.ahk"
+C:\Strawberry\perl\bin\perl.exe -pi -e "s/^(?!;)(.*)(; MacModifiers)/; $1$2/gm" "%userprofile%\.kinto\kinto.ahk"
+C:\Strawberry\perl\bin\perl.exe -pi -e "s/^(?!;)(.*)(; Default)/; $1$2/gm" "%userprofile%\.kinto\kinto.ahk"
+C:\Strawberry\perl\bin\perl.exe -pi -e "s/(; )(.*)(; IBM)/$2$3/g" "%userprofile%\.kinto\kinto.ahk"
+C:\Strawberry\perl\bin\perl.exe -pi -e "s/(; )(.*)(; WinModifiers\/CB\/IBM)/$2$3/g" "%userprofile%\.kinto\kinto.ahk"
+C:\Strawberry\perl\bin\perl.exe -pi -e "s/(; )(.*)(; CB\/IBM)/$2$3/g" "%userprofile%\.kinto\kinto.ahk"
+C:\Strawberry\perl\bin\perl.exe -pi -e "s/(ahk\"\" )(\w*)/$1ibm/gm" "%userprofile%\.kinto\kinto-start.vbs"
+"C:\Program Files\AutoHotkey\AutoHotkey.exe" "%userprofile%\.kinto\kinto.ahk" ibm
 goto commonexit
 
 :commonexit

xkeysnail-config/gnome_logoff.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+dbus-monitor --session "type='signal',interface='org.gnome.SessionManager.Logout'" | grep '1' |
+while read x; do
+  # echo "$x"
+  sudo systemctl stop xkeysnail
+  exit 0
+done

xkeysnail-config/gui/kinto.desktop

@@ -0,0 +1,11 @@
+[Desktop Entry]
+# /.local/share/applications
+Name=Kinto.sh
+GenericName=Kinto.sh
+Categories=Utility;
+Type=Application
+Exec={homedir}/.config/kinto/gui/kinto-gui.py
+Icon={homedir}/.config/kinto/kinto-color-48.svg
+# Icon=/usr/share/icons/Pocillo/kinto-color.svg
+Terminal=false
+NoDisplay=false

xkeysnail-config/initkb

@@ -0,0 +1,40 @@
+kbtype = ask
+rightmod = true
+vsc2st3 = false
+capslock = default
+systray = true
+autostart = true
+
+#
+# kbtype   - ask|win|mac|ibm|cbk|wmk
+#
+#    What physical keyboard type does the user have?
+#        ask - Prompt the user
+#        win - Standard layout     Ctrl,  Win, Alt, Spacebar
+#        mac - Mac layout          Ctrl,  Alt, Cmd, Spacebar
+#        ibm - Model M layout            Ctrl, Alt, Spacebar (Capslock is Capslock)
+#        cbk - Chromebook layout         Ctrl, Alt, Spacebar (Capslock is Search (Win))
+#        wmk - WinMac layout 
+#                  wmk - Uses Apple driver to swap Cmd & Alt so 
+#                  swapping between Win & Mac keyboards is seamless.
+#
+# rightmod - Remap modifiers on right
+#    true (default)
+#
+#    ^ Note: Useful to set to false for multi-language users (aka AltGr)
+#
+# vsc2st3  - Remap VS Code to use Sublime Text keymap
+#    false (default)
+#
+# capslock - esc_cmd|cmd|default
+#    esc_cmd - escape if tapped, cmd if held
+#    cmd     - remaps to cmd
+#    default - no remap
+#
+# systray - Sets whether the system tray will show
+#    true - default
+#    false - only defaults on gnome3 and kde
+#
+# autostart - Sets whether or not kinto will automatically start
+#    true - deefault
+#

xkeysnail-config/killdups.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+xkeycount=$(pgrep 'xkeysnail' | wc -l)
+
+if [[ $xkeycount -le 1 ]]; then
+	# No dups found
+	exit 0
+fi
+
+while ! zenity --entry --title="Kinto Duplicates" --text="Type Password to end duplicates:" --hide-text| sudo -S cat /dev/null >/dev/null; do
+if ! $(zenity --question --text="Wrong password, try again?"); then
+	# Dups still exist
+	exit 1
+fi
+done
+# pgrep 'xkeysnail' | head -n -1 | xargs -r -n1 sudo kill
+pgrep 'xkeysnail' | xargs -r -n1 sudo kill
+sudo -K # remove privilege
+# No dups should exist
+exit 0

xkeysnail-config/kinto.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+# autostart = true
 
 import re
 from xkeysnail.transform import *
@@ -6,27 +7,54 @@ from xkeysnail.transform import *
 # Use the following for testing terminal keymaps
 # terminals = [ "", ... ]
 # xbindkeys -mk
-terminals = ["gnome-terminal","konsole","io.elementary.terminal","terminator","sakura","guake","tilda","xterm","eterm","kitty","alacritty","mate-terminal","tilix","xfce4-terminal"]
+terminals = ["kinto-gui.py","gnome-terminal","konsole","io.elementary.terminal","terminator","sakura","guake","tilda","xterm","eterm","kitty","alacritty","mate-terminal","tilix","xfce4-terminal"]
 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 = ["Chromium","Chromium-browser","Google-chrome","microsoft-edge-dev","microsoft-edge","Epiphany","Firefox","Discord"]
 browsers = [browser.casefold() for browser in browsers]
 browserStr = "|".join(str(x) for x in browsers)
 
+chromes = ["Chromium","Chromium-browser","Google-chrome","microsoft-edge-dev","microsoft-edge"]
+chromes = [chrome.casefold() for chrome in chromes]
+chromeStr = "|".join(str(x) for x in chromes)
+
+# edges = ["microsoft-edge-dev","microsoft-edge"]
+# edges = [edge.casefold() for edge in edges]
+# edgeStr = "|".join(str(x) for x in edges)
+
 mscodes = ["code","vscodium"]
 codeStr = "|".join(str(x) for x in mscodes)
 
+define_multipurpose_modmap(
+    # {Key.ENTER: [Key.ENTER, Key.RIGHT_CTRL]   # Enter2Cmd
+    # {Key.CAPSLOCK: [Key.ESC, Key.RIGHT_CTRL]  # Caps2Esc
+    # {Key.LEFT_META: [Key.ESC, Key.RIGHT_CTRL] # Caps2Esc - Chromebook
+    {                                         # Placeholder
+})
+
 # [Global modemap] Change modifier keys as in xmodmap
 define_conditional_modmap(lambda wm_class: wm_class.casefold() not in terminals,{
-    # # Chromebook
+
+    # Key.CAPSLOCK: Key.RIGHT_CTRL,   # Caps2Cmd
+    # Key.LEFT_META: Key.RIGHT_CTRL,  # Caps2Cmd - Chromebook
+
+    # - IBM
+    # Key.LEFT_ALT: Key.RIGHT_CTRL,   # IBM
+    # Key.LEFT_CTRL: Key.LEFT_ALT,    # IBM
+    # Key.CAPSLOCK: Key.LEFT_META,    # IBM
+    # Key.RIGHT_ALT: Key.RIGHT_CTRL,  # IBM - Multi-language (Remove)
+    # Key.RIGHT_CTRL: Key.RIGHT_ALT,  # IBM - Multi-language (Remove)
+
+    # - Chromebook
     # Key.LEFT_ALT: Key.RIGHT_CTRL,   # Chromebook
     # Key.LEFT_CTRL: Key.LEFT_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
+    # - Default Mac/Win
+    # - Default Win
     # Key.LEFT_ALT: Key.RIGHT_CTRL,   # WinMac
     # Key.LEFT_META: Key.LEFT_ALT,    # WinMac
     # Key.LEFT_CTRL: Key.LEFT_META,   # WinMac
@@ -34,7 +62,7 @@ define_conditional_modmap(lambda wm_class: wm_class.casefold() not in terminals,
     # Key.RIGHT_META: Key.RIGHT_ALT,  # WinMac - Multi-language (Remove)
     # Key.RIGHT_CTRL: Key.RIGHT_META, # WinMac - Multi-language (Remove)
 
-    # # Mac Only
+    # - Mac Only
     # Key.LEFT_META: Key.RIGHT_CTRL,  # Mac
     # Key.LEFT_CTRL: Key.LEFT_META,   # Mac
     # Key.RIGHT_META: Key.RIGHT_CTRL, # Mac - Multi-language (Remove)
@@ -43,7 +71,18 @@ define_conditional_modmap(lambda wm_class: wm_class.casefold() not in terminals,
 
 # [Conditional modmap] Change modifier keys in certain applications
 define_conditional_modmap(re.compile(termStr, re.IGNORECASE), {
-    # # Chromebook
+    # - IBM
+    # Key.LEFT_ALT: Key.RIGHT_CTRL,     # IBM
+    # # Left Ctrl Stays Left Ctrl
+    # Key.CAPSLOCK: Key.LEFT_ALT,       # IBM
+    # Key.RIGHT_ALT: Key.RIGHT_CTRL,    # IBM - Multi-language (Remove)
+    # Key.RIGHT_CTRL: Key.RIGHT_ALT,    # IBM
+    # # Right Meta does not exist on chromebooks
+    
+    # Key.RIGHT_ALT: Key.RIGHT_CTRL,  # IBM - Multi-language (Remove)
+    # Key.RIGHT_CTRL: Key.RIGHT_ALT,  # IBM - Multi-language (Remove)
+
+    # - Chromebook
     # Key.LEFT_ALT: Key.RIGHT_CTRL,     # Chromebook
     # # Left Ctrl Stays Left Ctrl
     # Key.LEFT_META: Key.LEFT_ALT,      # Chromebook
@@ -51,7 +90,8 @@ define_conditional_modmap(re.compile(termStr, re.IGNORECASE), {
     # Key.RIGHT_CTRL: Key.RIGHT_ALT,    # Chromebook
     # # Right Meta does not exist on chromebooks
 
-    # # Default Mac/Win
+    # - Default Mac/Win
+    # - Default Win
     # Key.LEFT_ALT: Key.RIGHT_CTRL,   # WinMac
     # Key.LEFT_META: Key.LEFT_ALT,    # WinMac
     # Key.LEFT_CTRL: Key.LEFT_CTRL,   # WinMac
@@ -59,7 +99,7 @@ define_conditional_modmap(re.compile(termStr, re.IGNORECASE), {
     # Key.RIGHT_META: Key.RIGHT_ALT,  # WinMac - Multi-language (Remove)
     # Key.RIGHT_CTRL: Key.LEFT_CTRL,  # WinMac - Multi-language (Remove)
 
-    # # Mac Only
+    # - Mac Only
     # Key.LEFT_META: Key.RIGHT_CTRL,  # Mac
     # # Left Ctrl Stays Left Ctrl
     # Key.RIGHT_META: Key.RIGHT_CTRL, # Mac - Multi-language (Remove)
@@ -91,8 +131,8 @@ define_keymap(re.compile("jetbrains-idea", re.IGNORECASE),{
     K("C-Super-g"): K("C-M-Shift-j"),           # Select all occurrences
     K("Super-Shift-g"): K("M-Shift-j"),         # Unselect occurrence
     # Editing
-    K("Super-Space"): K("C-Space"),             # Basic code completion
-    K("Super-Shift-Space"): K("C-Shift-Space"), # Smart code completion
+    K("Super-Space"): K("LC-Space"),            # Basic code completion
+    K("Super-Shift-Space"): K("LC-Shift-Space"),# Smart code completion
     K("Super-j"): K("C-q"),                     # Quick documentation lookup
     K("C-n"): K("M-Insert"),                    # Generate code...
     K("Super-o"): K("C-o"),                     # Override methods
@@ -166,34 +206,73 @@ define_keymap(re.compile("org.gnome.nautilus", re.IGNORECASE),{
 
 # Keybindings for Browsers
 define_keymap(re.compile(browserStr, re.IGNORECASE),{
-    K("RC-Q"): K("RC-Q"),          # Close all browsers Instances
+    K("RC-Q"): K("RC-Q"),               # Close all browsers Instances
+    K("Super-RC-I"): K("RC-Shift-I"),   # Dev tools
+    K("Super-RC-J"): K("RC-Shift-J"),   # Dev tools
 })
 
+# Open preferences in browsers
+define_keymap(re.compile("Firefox", re.IGNORECASE),{
+    K("C-comma"): [K("M-t"), K("o"),K("Enter")],
+})
+define_keymap(re.compile(chromeStr, re.IGNORECASE),{
+    K("C-comma"): [K("M-e"), K("s"),K("Enter")],
+})
+# Opera C-F12
+
 define_keymap(None,{
+    K("RC-Space"): K("Alt-F1"),                   # Default SL - Launch Application Menu (gnome/kde)
+    K("RC-F3"):K("Super-d"),                      # Default SL - Show Desktop (gnome/kde,eos)
+    K("RC-LC-f"):K("M-F10"),                      # Default SL - Maximize app (gnome/kde)
+    # K("Super-Right"):K("C-M-Right"),              # Default SL - Change workspace (budgie)
+    # K("Super-Left"):K("C-M-Left"),                # Default SL - Change workspace (budgie)
+    K("RC-Q"): K("M-F4"),                         # Default SL - not-popos
+    K("RC-H"):K("Super-h"),                       # Default SL - Minimize app (gnome/budgie/popos/fedora)
+    K("M-Tab"): pass_through_key,                 # Default not-xfce4 - Cmd Tab - App Switching Default
+    K("RC-Tab"): K("M-Tab"),                      # Default not-xfce4 - Cmd Tab - App Switching Default
+    K("RC-Shift-Tab"): K("M-Shift-Tab"),          # Default not-xfce4 - Cmd Tab - App Switching Default
+    K("RC-Grave"): K("M-Grave"),                  # Default not-xfce4 - Cmd ` - Same App Switching
+    K("RC-Shift-Grave"): K("M-Grave"),            # Default not-xfce4 - Cmd ` - Same App Switching
+    # K("Super-Right"):K("Super-Page_Up"),          # SL - Change workspace (ubuntu/fedora)
+    # K("Super-Left"):K("Super-Page_Down"),         # SL - Change workspace (ubuntu/fedora)
+    # K("Super-Right"):K("Super-C-Up"),             # SL - Change workspace (popos)
+    # K("Super-Left"):K("Super-C-Down"),            # SL - Change workspace (popos)
+    # K("RC-Q"):K("Super-q"),                       # SL - Close Apps (popos)
+    # K("RC-Space"): K("Super-Space"),              # SL - Launch Application Menu (eos)
+    # K("RC-H"): K("Super-Page_Down"),              # SL - Minimize app (kde_neon)
+                                                  # SL - Default SL - Change workspace (kde_neon)
+    # K("RC-Space"): K("LC-Esc"),                   # SL- Launch Application Menu xfce4
+    # K("RC-F3"):K("C-M-d"),                        # SL- Show Desktop xfce4
+    # K("RC-LC-f"):K("Super-Up"),                   # SL- Maximize app eos
+    # K("RC-LC-f"):K("Super-PAGE_UP"),              # SL- Maximize app manjaro
     # Basic App hotkey functions
-    K("RC-Q"): K("Alt-F4"),
-    K("RC-H"): K("Alt-F9"),
+    # K("RC-H"):K("M-F9"),                          # SL - Minimize app xfce4
+    # K("RC-LC-f"):K("Super-PAGE_DOWN"),            # SL - Minimize app manjaro
     # Cmd Tab - App Switching Default
-    K("RC-Tab"): K("RC-F13"),                     # Default not-xfce4
-    K("RC-Shift-Tab"): K("RC-Shift-F13"),         # Default not-xfce4
-    K("RC-Grave"): K("M-F6"),                     # Default not-xfce4
-    K("RC-Shift-Grave"): K("M-Shift-F6"),         # Default not-xfce4
     # K("RC-Tab"): K("RC-backslash"),               # xfce4
     # K("RC-Shift-Tab"): K("RC-Shift-backslash"),   # xfce4
     # K("RC-Grave"): K("RC-Shift-backslash"),       # xfce4
     # In-App Tab switching
-    # K("M-Tab"): K("C-Tab"),                       # Chromebook - In-App Tab switching
-    # K("M-Shift-Tab"): K("C-Shift-Tab"),           # Chromebook - In-App Tab switching
-    # K("M-Grave") : K("C-Shift-Tab"),              # Chromebook - In-App Tab switching
+    # K("M-Tab"): K("C-Tab"),                       # Chromebook/IBM - In-App Tab switching
+    # K("M-Shift-Tab"): K("C-Shift-Tab"),           # Chromebook/IBM - In-App Tab switching
+    # K("M-Grave") : K("C-Shift-Tab"),              # Chromebook/IBM - In-App Tab switching
     K("Super-Tab"): K("LC-Tab"),                  # Default not-chromebook
     K("Super-Shift-Tab"): K("LC-Shift-Tab"),      # Default not-chromebook
+    
+    # emacs style
+    K("Super-a"): K("Home"),                      # Beginning of Line
+    K("Super-e"): K("End"),                       # End of Line
+    K("Super-b"): K("Left"),
+    K("Super-f"): K("Right"),
+    K("Super-n"): K("Down"),
+    K("Super-p"): K("Up"),
+    K("Super-k"): [K("Shift-End"), K("Backspace")],
+    K("Super-d"): K("Delete"),
 
     # Wordwise
     K("RC-Left"): K("Home"),                      # Beginning of Line
-    K("Super-a"): K("Home"),                      # Beginning of Line
     K("RC-Shift-Left"): K("Shift-Home"),          # Select all to Beginning of Line
     K("RC-Right"): K("End"),                      # End of Line
-    K("Super-e"): K("End"),                       # End of Line
     K("RC-Shift-Right"): K("Shift-End"),          # Select all to End of Line
     # K("RC-Left"): K("C-LEFT_BRACE"),              # Firefox-nw - Back
     # K("RC-Right"): K("C-RIGHT_BRACE"),            # Firefox-nw - Forward
@@ -203,17 +282,16 @@ define_keymap(None,{
     K("RC-Shift-Up"): K("C-Shift-Home"),          # Select all to Beginning of File
     K("RC-Down"): K("C-End"),                     # End of File
     K("RC-Shift-Down"): K("C-Shift-End"),         # Select all to End of File
-    # K("M-Backspace"): K("Delete"),                # Chromebook - Delete
+    # K("M-Backspace"): K("Delete"),                # Chromebook/IBM - Delete
     K("Super-Backspace"): K("C-Backspace"),       # Default not-chromebook - Delete Left Word of Cursor
     K("Super-Delete"): K("C-Delete"),             # Default not-chromebook - Delete Right Word of Cursor
-    K("Alt-Backspace"): K("C-Backspace"),       # Default not-chromebook - Delete Left Word of Cursor
-    K("Alt-Delete"): K("C-Delete"),             # Default not-chromebook - Delete Right Word of Cursor
+    K("Alt-Backspace"): K("C-Backspace"),         # Default not-chromebook - Delete Left Word of Cursor
+    K("Alt-Delete"): K("C-Delete"),               # Default not-chromebook - Delete Right Word of Cursor
     # K(""): pass_through_key,                      # cancel
     # K(""): K(""),                                 #
 })
 
 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
@@ -238,6 +316,7 @@ define_keymap(lambda wm_class: wm_class.casefold() not in mscodes,{
 
 # Keybindings for VS Code
 define_keymap(re.compile(codeStr, re.IGNORECASE),{
+    K("Super-Space"): K("LC-Space"),                        # Basic code completion
     # Wordwise remaining - for VS Code
     # Alt-F19 hack fixes Alt menu activation
     K("M-Left"): [K("M-F19"),K("C-Left")],                  # Left of Word
@@ -264,7 +343,7 @@ define_keymap(re.compile(codeStr, re.IGNORECASE),{
     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("C-M-g"): K("C-f2"),                      # Chromebook/IBM - Sublime - find_all_under
     # K("Super-Shift-up"): K("M-Shift-up"),       # multi-cursor up - Sublime
     # K("Super-Shift-down"): K("M-Shift-down"),   # multi-cursor down - Sublime
     # K(""): pass_through_key,                    # cancel
@@ -306,8 +385,8 @@ define_keymap(re.compile("Sublime_text", re.IGNORECASE),{
     K("C-Shift-f3"): pass_through_key,          # cancel find_under_prev
     K("Super-M-Shift-g"): K("C-Shift-f3"),      # find_under_prev
     K("M-f3"): pass_through_key,                # Default - cancel find_all_under
-    # K("M-Refresh"): pass_through_key,           # Chromebook - cancel find_all_under
-    # K("M-C-g"): K("M-Refresh"),                 # Chromebook - find_all_under
+    # K("M-Refresh"): pass_through_key,           # Chromebook/IBM - cancel find_all_under
+    # K("M-C-g"): K("M-Refresh"),                 # Chromebook/IBM - 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-M-up"): K("C-Shift-up"),           # swap_line_up
@@ -354,6 +433,16 @@ define_keymap(re.compile("Io.elementary.terminal|kitty", re.IGNORECASE),{
 }, "Elementary Terminal tab switching")
 
 define_keymap(re.compile(termStr, re.IGNORECASE),{
+    # K("LC-Right"):K("C-M-Right"),                 # Default SL - Change workspace (budgie)
+    # K("LC-Left"):K("C-M-Left"),                   # Default SL - Change workspace (budgie)
+    # K("LC-Left"):K("C-M-End"),                    # SL - Change workspace xfce4     
+    # K("LC-Left"):K("Super-Left"),                 # SL - Change workspace eos 
+    # K("LC-Right"):K("C-M-Home"),                  # SL - Change workspace xfce4     
+    # K("LC-Right"):K("Super-Right"),               # SL - Change workspace eos
+    # K("LC-Right"):K("Super-Page_Up"),             # SL - Change workspace (ubuntu/fedora)
+    # K("LC-Left"):K("Super-Page_Down"),            # SL - Change workspace (ubuntu/fedora)
+    # K("LC-Right"):K("Super-C-Up"),                # SL - Change workspace (popos)
+    # K("LC-Left"):K("Super-C-Down"),               # SL - Change workspace (popos)
     # Ctrl Tab - In App Tab Switching
     K("LC-Tab") : K("LC-PAGE_DOWN"),
     K("LC-Shift-Tab") : K("LC-PAGE_UP"),

xkeysnail-config/limitedadmins

@@ -3,3 +3,8 @@
 %{username} ALL=NOPASSWD: {systemctl} start xkeysnail
 %{username} ALL=NOPASSWD: {systemctl} stop xkeysnail
 %{username} ALL=NOPASSWD: {systemctl} status xkeysnail
+%{username} ALL=(root) NOPASSWD: /usr/local/bin/logoff.sh
+%{username} ALL=NOPASSWD: {pkill} -f logoff
+%{username} ALL=NOPASSWD: {pkill} -f bin/xkeysnail
+%{username} ALL=NOPASSWD: {xkeysnail} /home/{username}/.config/kinto/kinto.py
+%{username} ALL=NOPASSWD: {systemctl} is-active --quiet xkeysnail

xkeysnail-config/root_logoff.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+# /usr/local/bin/logoff.sh
+while true; do
+  w | grep -E "$1.*$2" > /dev/null 2>&1 || (sudo systemctl stop xkeysnail && sudo pkill -f logoff)
+  sleep 5
+done

xkeysnail-config/trayapps/appindicator/icons/kinto-color-16.svg

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1"
+	 id="svg5082" inkscape:version="0.92.2 5c3e80d, 2017-08-06" sodipodi:docname="budgie-restart2.svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 18.3 19.8"
+	 style="enable-background:new 0 0 18.3 19.8;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#61BB46;}
+	.st1{fill:#FDB827;}
+	.st2{fill:#F5821F;}
+	.st3{fill:#E03A3E;}
+	.st4{fill:#963D97;}
+	.st5{fill:#009DDC;}
+	.st6{fill:#FFFFFF;}
+</style>
+<title  id="title5087">Symbolic Icons</title>
+<sodipodi:namedview  bordercolor="#000000" borderopacity="0.34509804" fit-margin-bottom="0" fit-margin-left="0" fit-margin-right="0" fit-margin-top="0" id="base" inkscape:current-layer="layer2" inkscape:cx="3.6222888" inkscape:cy="4.1549938" inkscape:document-units="px" inkscape:grid-bbox="true" inkscape:object-nodes="true" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-height="740" inkscape:window-maximized="1" inkscape:window-width="1360" inkscape:window-x="0" inkscape:window-y="0" inkscape:zoom="33.811791" pagecolor="#37474f" showborder="false" showgrid="false">
+	<inkscape:grid  empspacing="4" id="grid5636" originx="-0.28935368" originy="-119.88235" type="xygrid"></inkscape:grid>
+</sodipodi:namedview>
+<g id="layer4" transform="translate(-0.28935366,-60.349598)" inkscape:groupmode="layer" inkscape:label="status">
+</g>
+<g id="layer3" transform="translate(-0.28935366,-60.349598)" inkscape:groupmode="layer" inkscape:label="actions">
+</g>
+<g id="layer2">
+	<title>kinto-final</title>
+	<path id="Green" class="st0" d="M13.5,3.6H4.7c-1,0-1.9,0.9-1.9,1.9v0.2h12.6V5.5C15.4,4.5,14.5,3.6,13.5,3.6z"/>
+	<rect id="Yellow" x="2.8" y="5.7" class="st1" width="12.6" height="2.2"/>
+	<rect id="Orange" x="2.8" y="7.8" class="st2" width="12.6" height="2.2"/>
+	<rect id="Red" x="2.8" y="10" class="st3" width="12.6" height="2.2"/>
+	<path id="Purple" class="st4" d="M2.8,14.3L2.8,14.3h12.6l0,0v-2.1H2.8V14.3z"/>
+	<path id="Blue" class="st5" d="M4.7,16.2h9c1-0.1,1.7-1,1.7-1.9H2.8C2.8,15.3,3.7,16.2,4.7,16.2z"/>
+	<g id="Border">
+		<path class="st6" d="M16.2,2.8c-0.6-0.6-1.4-1-2.2-0.9H4.3c-0.9,0-1.7,0.3-2.2,0.9c-0.6,0.6-1,1.4-1,2.2v9.7c0,0.9,0.3,1.7,1,2.2
+			c0.5,0.6,1.3,1,2.2,1h2.1l0,0h2.3l0,0h3.5l0,0l0,0H14c1.7,0,3.1-1.4,3.1-3.1V5C17.2,4.2,16.8,3.4,16.2,2.8z M15.4,14.3
+			c0,1-0.7,1.8-1.7,1.9L11,11.6l2.8-2.9h-2.5l-2.5,3V5.9H6.7v10.3H4.7c-1,0-1.9-0.9-1.9-1.9V5.5c0-1,0.9-1.9,1.9-1.9h8.7
+			c1,0,1.9,0.9,1.9,1.9L15.4,14.3z M8.7,16.2V14l0.9-0.9l1.7,3.1L8.7,16.2z"/>
+	</g>
+</g>
+<g id="layer1">
+</g>
+</svg>

xkeysnail-config/trayapps/appindicator/icons/kinto-color.svg

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1"
+	 id="svg5082" inkscape:version="0.92.2 5c3e80d, 2017-08-06" sodipodi:docname="budgie-restart2.svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 18.3 19.8"
+	 style="enable-background:new 0 0 18.3 19.8;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#61BB46;}
+	.st1{fill:#FDB827;}
+	.st2{fill:#F5821F;}
+	.st3{fill:#E03A3E;}
+	.st4{fill:#963D97;}
+	.st5{fill:#009DDC;}
+	.st6{fill:#FFFFFF;}
+</style>
+<title  id="title5087">Symbolic Icons</title>
+<sodipodi:namedview  bordercolor="#000000" borderopacity="0.34509804" fit-margin-bottom="0" fit-margin-left="0" fit-margin-right="0" fit-margin-top="0" id="base" inkscape:current-layer="layer2" inkscape:cx="3.6222888" inkscape:cy="4.1549938" inkscape:document-units="px" inkscape:grid-bbox="true" inkscape:object-nodes="true" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-height="740" inkscape:window-maximized="1" inkscape:window-width="1360" inkscape:window-x="0" inkscape:window-y="0" inkscape:zoom="33.811791" pagecolor="#37474f" showborder="false" showgrid="false">
+	<inkscape:grid  empspacing="4" id="grid5636" originx="-0.28935368" originy="-119.88235" type="xygrid"></inkscape:grid>
+</sodipodi:namedview>
+<g id="layer4" transform="translate(-0.28935366,-60.349598)" inkscape:groupmode="layer" inkscape:label="status">
+</g>
+<g id="layer3" transform="translate(-0.28935366,-60.349598)" inkscape:groupmode="layer" inkscape:label="actions">
+</g>
+<g id="layer2">
+	<title>kinto-final</title>
+	<path id="Green" class="st0" d="M14.1,2.7h-10c-1.2,0-2.2,1-2.2,2.2v0.2h14.4V4.9C16.3,3.7,15.3,2.7,14.1,2.7z"/>
+	<rect id="Yellow" x="1.9" y="5.1" class="st1" width="14.4" height="2.5"/>
+	<rect id="Orange" x="1.9" y="7.5" class="st2" width="14.4" height="2.5"/>
+	<rect id="Red" x="1.9" y="10" class="st3" width="14.4" height="2.5"/>
+	<path id="Purple" class="st4" d="M1.9,14.9C1.9,14.9,1.9,14.9,1.9,14.9l14.4,0c0,0,0,0,0,0v-2.4H1.9V14.9z"/>
+	<path id="Blue" class="st5" d="M4.1,17.1l10.3,0c1.1-0.1,1.9-1.1,1.9-2.2H1.9C1.9,16.1,2.9,17.1,4.1,17.1z"/>
+	<g id="Border">
+		<path class="st6" d="M17.2,1.8c-0.7-0.7-1.6-1.1-2.5-1H3.6c-1,0-1.9,0.4-2.5,1C0.4,2.5,0,3.4,0,4.3v11.1c0,1,0.4,1.9,1.1,2.5
+			C1.7,18.6,2.6,19,3.6,19H6v0h2.6v0h4l0,0l0,0h2.1c2,0,3.6-1.6,3.6-3.6V4.3C18.3,3.4,17.9,2.5,17.2,1.8z M16.3,14.9
+			c0,1.1-0.8,2.1-1.9,2.2l-3.1-5.3l3.2-3.3h-2.9l-2.9,3.4V5.3H6.3v11.8H4.1c-1.2,0-2.2-1-2.2-2.2v-10c0-1.2,1-2.2,2.2-2.2h10
+			c1.2,0,2.2,1,2.2,2.2L16.3,14.9z M8.6,17.1v-2.5l1-1l2,3.6L8.6,17.1z"/>
+	</g>
+</g>
+<g id="layer1">
+</g>
+</svg>

xkeysnail-config/trayapps/appindicator/icons/kinto-invert-16.svg

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1"
+	 id="svg5082" inkscape:version="0.92.2 5c3e80d, 2017-08-06" sodipodi:docname="budgie-restart2.svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 18.3 19.8"
+	 style="enable-background:new 0 0 18.3 19.8;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+</style>
+<title  id="title5087">Symbolic Icons</title>
+<sodipodi:namedview  bordercolor="#000000" borderopacity="0.34509804" fit-margin-bottom="0" fit-margin-left="0" fit-margin-right="0" fit-margin-top="0" id="base" inkscape:current-layer="layer2" inkscape:cx="3.6222888" inkscape:cy="4.1549938" inkscape:document-units="px" inkscape:grid-bbox="true" inkscape:object-nodes="true" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-height="740" inkscape:window-maximized="1" inkscape:window-width="1360" inkscape:window-x="0" inkscape:window-y="0" inkscape:zoom="33.811791" pagecolor="#37474f" showborder="false" showgrid="false">
+	<inkscape:grid  empspacing="4" id="grid5636" originx="-0.28935368" originy="-119.88235" type="xygrid"></inkscape:grid>
+</sodipodi:namedview>
+<g id="layer4" transform="translate(-0.28935366,-60.349598)" inkscape:groupmode="layer" inkscape:label="status">
+</g>
+<g id="layer3" transform="translate(-0.28935366,-60.349598)" inkscape:groupmode="layer" inkscape:label="actions">
+</g>
+<g id="layer2">
+	<g id="White_K">
+		<path class="st0" d="M16.1,2.9c-0.6-0.6-1.4-1-2.2-1H4.2C3.3,2,2.5,2.3,2,2.9S1,4.3,1,5.1v9.7c0,0.9,0.4,1.7,1,2.2
+			c0.5,0.7,1.3,1,2.2,1h2.1V5.6h2.3V12l2.9-3.3h2.8l-3.2,3.2l3.6,6c0.5-0.2,1.1-0.4,1.4-0.8c0.6-0.6,1-1.4,1-2.2V5.1
+			C17,4.3,16.7,3.6,16.1,2.9z"/>
+		<polygon class="st0" points="8.5,14.6 8.5,18 11.9,18 9.4,13.6 		"/>
+	</g>
+</g>
+<g id="layer1">
+</g>
+</svg>

xkeysnail-config/trayapps/appindicator/icons/kinto-invert.svg

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1"
+	 id="svg5082" inkscape:version="0.92.2 5c3e80d, 2017-08-06" sodipodi:docname="budgie-restart2.svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 18.3 19.8"
+	 style="enable-background:new 0 0 18.3 19.8;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+</style>
+<title  id="title5087">Symbolic Icons</title>
+<sodipodi:namedview  bordercolor="#000000" borderopacity="0.34509804" fit-margin-bottom="0" fit-margin-left="0" fit-margin-right="0" fit-margin-top="0" id="base" inkscape:current-layer="layer2" inkscape:cx="3.6222888" inkscape:cy="4.1549938" inkscape:document-units="px" inkscape:grid-bbox="true" inkscape:object-nodes="true" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-height="740" inkscape:window-maximized="1" inkscape:window-width="1360" inkscape:window-x="0" inkscape:window-y="0" inkscape:zoom="33.811791" pagecolor="#37474f" showborder="false" showgrid="false">
+	<inkscape:grid  empspacing="4" id="grid5636" originx="-0.28935368" originy="-119.88235" type="xygrid"></inkscape:grid>
+</sodipodi:namedview>
+<g id="layer4" transform="translate(-0.28935366,-60.349598)" inkscape:groupmode="layer" inkscape:label="status">
+</g>
+<g id="layer3" transform="translate(-0.28935366,-60.349598)" inkscape:groupmode="layer" inkscape:label="actions">
+</g>
+<g id="layer2">
+	<g id="White_K">
+		<path class="st0" d="M17.2,1.8c-0.7-0.7-1.6-1.1-2.5-1.1H3.6c-1,0-1.9,0.4-2.5,1.1S0,3.4,0,4.3v11.1c0,1,0.4,1.9,1.1,2.5
+			C1.7,18.7,2.6,19,3.6,19H6V4.8h2.6v7.3l3.3-3.8h3.2L11.5,12l4.1,6.9c0.6-0.2,1.2-0.5,1.6-0.9c0.7-0.7,1.1-1.6,1.1-2.5V4.3
+			C18.3,3.4,17.9,2.5,17.2,1.8z"/>
+		<polygon class="st0" points="8.6,15.1 8.6,19 12.5,19 9.6,14 		"/>
+	</g>
+</g>
+<g id="layer1">
+</g>
+</svg>

xkeysnail-config/trayapps/appindicator/icons/kinto-solid-16.svg

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1"
+	 id="svg5082" inkscape:version="0.92.2 5c3e80d, 2017-08-06" sodipodi:docname="budgie-restart2.svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 18.3 19.8"
+	 style="enable-background:new 0 0 18.3 19.8;" xml:space="preserve">
+<title  id="title5087">Symbolic Icons</title>
+<sodipodi:namedview  bordercolor="#000000" borderopacity="0.34509804" fit-margin-bottom="0" fit-margin-left="0" fit-margin-right="0" fit-margin-top="0" id="base" inkscape:current-layer="layer2" inkscape:cx="3.6222888" inkscape:cy="4.1549938" inkscape:document-units="px" inkscape:grid-bbox="true" inkscape:object-nodes="true" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-height="740" inkscape:window-maximized="1" inkscape:window-width="1360" inkscape:window-x="0" inkscape:window-y="0" inkscape:zoom="33.811791" pagecolor="#37474f" showborder="false" showgrid="false">
+	<inkscape:grid  empspacing="4" id="grid5636" originx="-0.28935368" originy="-119.88235" type="xygrid"></inkscape:grid>
+</sodipodi:namedview>
+<g id="layer4" transform="translate(-0.28935366,-60.349598)" inkscape:groupmode="layer" inkscape:label="status">
+</g>
+<g id="layer3" transform="translate(-0.28935366,-60.349598)" inkscape:groupmode="layer" inkscape:label="actions">
+</g>
+<g id="layer2">
+	<g id="White_K">
+		<path d="M16.1,2.9c-0.6-0.6-1.4-1-2.2-1H4.2C3.3,2,2.5,2.3,2,2.9S1,4.3,1,5.1v9.7c0,0.9,0.4,1.7,1,2.2c0.5,0.7,1.3,1,2.2,1h2.1
+			V5.6h2.3V12l2.9-3.3h2.8l-3.2,3.2l3.6,6c0.5-0.2,1.1-0.4,1.4-0.8c0.6-0.6,1-1.4,1-2.2V5.1C17,4.3,16.7,3.6,16.1,2.9z"/>
+		<polygon points="8.5,14.6 8.5,18 11.9,18 9.4,13.6 		"/>
+	</g>
+</g>
+<g id="layer1">
+</g>
+</svg>

xkeysnail-config/trayapps/appindicator/icons/kinto-solid.svg

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1"
+	 id="svg5082" inkscape:version="0.92.2 5c3e80d, 2017-08-06" sodipodi:docname="budgie-restart2.svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 18.3 19.8"
+	 style="enable-background:new 0 0 18.3 19.8;" xml:space="preserve">
+<title  id="title5087">Symbolic Icons</title>
+<sodipodi:namedview  bordercolor="#000000" borderopacity="0.34509804" fit-margin-bottom="0" fit-margin-left="0" fit-margin-right="0" fit-margin-top="0" id="base" inkscape:current-layer="layer2" inkscape:cx="3.6222888" inkscape:cy="4.1549938" inkscape:document-units="px" inkscape:grid-bbox="true" inkscape:object-nodes="true" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-height="740" inkscape:window-maximized="1" inkscape:window-width="1360" inkscape:window-x="0" inkscape:window-y="0" inkscape:zoom="33.811791" pagecolor="#37474f" showborder="false" showgrid="false">
+	<inkscape:grid  empspacing="4" id="grid5636" originx="-0.28935368" originy="-119.88235" type="xygrid"></inkscape:grid>
+</sodipodi:namedview>
+<g id="layer4" transform="translate(-0.28935366,-60.349598)" inkscape:groupmode="layer" inkscape:label="status">
+</g>
+<g id="layer3" transform="translate(-0.28935366,-60.349598)" inkscape:groupmode="layer" inkscape:label="actions">
+</g>
+<g id="layer2">
+	<g id="White_K">
+		<path d="M17.2,1.8c-0.7-0.7-1.6-1.1-2.5-1.1H3.6c-1,0-1.9,0.4-2.5,1.1S0,3.4,0,4.3v11.1c0,1,0.4,1.9,1.1,2.5
+			C1.7,18.7,2.6,19,3.6,19H6V4.8h2.6v7.3l3.3-3.8h3.2L11.5,12l4.1,6.9c0.6-0.2,1.2-0.5,1.6-0.9c0.7-0.7,1.1-1.6,1.1-2.5V4.3
+			C18.3,3.4,17.9,2.5,17.2,1.8z"/>
+		<polygon points="8.6,15.1 8.6,19 12.5,19 9.6,14 		"/>
+	</g>
+</g>
+<g id="layer1">
+</g>
+</svg>

xkeysnail-config/trayapps/appindicator/icons/kinto.svg

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 23.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<svg version="1.1"
+	 id="svg5082" inkscape:version="0.92.2 5c3e80d, 2017-08-06" sodipodi:docname="budgie-restart2.svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 18.3 19.8"
+	 style="enable-background:new 0 0 18.3 19.8;" xml:space="preserve">
+<style type="text/css">
+	.st0{fill:#FFFFFF;}
+</style>
+<title  id="title5087">Symbolic Icons</title>
+<sodipodi:namedview  bordercolor="#000000" borderopacity="0.34509804" fit-margin-bottom="0" fit-margin-left="0" fit-margin-right="0" fit-margin-top="0" id="base" inkscape:current-layer="layer2" inkscape:cx="3.6222888" inkscape:cy="4.1549938" inkscape:document-units="px" inkscape:grid-bbox="true" inkscape:object-nodes="true" inkscape:pageopacity="0" inkscape:pageshadow="2" inkscape:window-height="740" inkscape:window-maximized="1" inkscape:window-width="1360" inkscape:window-x="0" inkscape:window-y="0" inkscape:zoom="33.811791" pagecolor="#37474f" showborder="false" showgrid="false">
+	<inkscape:grid  empspacing="4" id="grid5636" originx="-0.28935368" originy="-119.88235" type="xygrid"></inkscape:grid>
+</sodipodi:namedview>
+<g id="layer4" transform="translate(-0.28935366,-60.349598)" inkscape:groupmode="layer" inkscape:label="status">
+</g>
+<g id="layer3" transform="translate(-0.28935366,-60.349598)" inkscape:groupmode="layer" inkscape:label="actions">
+</g>
+<g id="layer2">
+	<path class="st0" d="M17.3,1.8c-0.7-0.7-1.6-1.1-2.5-1.1H3.6C1.6,0.7,0,2.3,0,4.3v11.1c0,2,1.6,3.6,3.6,3.6H6v0h2.6v0h4l0,0l0,0
+		h2.1c2,0,3.6-1.6,3.6-3.6V4.3C18.3,3.4,17.9,2.5,17.3,1.8z M17.2,15.4C17.2,15.5,17.2,15.5,17.2,15.4c0,1.3-1,2.3-2.2,2.5l-1.4-2.4
+		L12,12.8L11.5,12l1.9-2l1.6-1.7h-3.2L10.4,10l-1.8,2v-2V7.3V4.8H6v2.5V10v2.8v2.7v2.4H3.6c-1.4,0-2.5-1.1-2.5-2.4c0,0,0,0,0-0.1
+		v-2.7V10V7.3V4.5V4.3c0-1.4,1.1-2.5,2.5-2.5h11.1c1.4,0,2.5,1.1,2.5,2.5v0.2v2.7V10v2.8V15.4z M8.6,15.5v-0.4L9.6,14l0.9,1.5
+		l1.4,2.4H8.6V15.5z"/>
+</g>
+<g id="layer1">
+</g>
+</svg>

xkeysnail-config/trayapps/appindicator/kintotray.desktop

@@ -0,0 +1,8 @@
+[Desktop Entry]
+Name=Kinto Tray
+GenericName=Kintotray
+Comment=Make Linux Type Like it's a Mac
+Exec=/bin/bash -c "{homedir}/.config/kinto/kintotray.py"
+Terminal=false
+Type=Application
+X-GNOME-Autostart-enabled=true

xkeysnail-config/trayapps/appindicator/kintotray.py

@@ -0,0 +1,719 @@
+#!/usr/bin/env python3
+
+import gi
+
+gi.require_version('Gtk', '3.0')
+gi.require_version('AppIndicator3', '0.1')
+gi.require_version('Notify', '0.7')
+
+import signal,time,os,fcntl,datetime,re
+from subprocess import Popen, PIPE, CalledProcessError
+from shutil import which
+from gi.repository import Gtk,GLib,GdkPixbuf
+from gi.repository import AppIndicator3 as appindicator
+from gi.repository import Notify as notify
+
+import signal
+
+def kill_child():
+    if child_pid is None:
+        pass
+    else:
+        os.kill(child_pid, signal.SIGTERM)
+
+import atexit
+atexit.register(kill_child)
+
+APPINDICATOR_ID = 'Kinto'
+
+class Indicator():
+
+    global child_pid
+    kinto_status = Popen("while :; do clear; systemctl is-active xkeysnail; sleep 2s; done", stdout=PIPE, shell=True)
+    child_pid = kinto_status.pid
+
+    homedir = os.path.expanduser("~")
+    kconfig = homedir+"/.config/kinto/kinto.py"
+    ostype = os.environ.get('XDG_CURRENT_DESKTOP')
+
+    enable_id = 0
+    winmac_id = 0
+    chkautostart_id = 0
+    autostart_bool = False
+    menu = Gtk.Menu()
+    menukb = Gtk.Menu()
+    checkbox_autostart = Gtk.CheckMenuItem('Autostart')
+    restart = Gtk.MenuItem('Restart')
+    stop = Gtk.MenuItem('Stop')
+    keyboards = Gtk.MenuItem('Keyboard Types')
+    keyboards.set_submenu(menukb)
+    winkb = Gtk.RadioMenuItem(label='Windows')
+    mackb = Gtk.RadioMenuItem(label='Apple',group=winkb)
+    chromekb = Gtk.RadioMenuItem(label='Chromebook',group=winkb)
+    ibmkb = Gtk.RadioMenuItem(label='IBM (No Super/Win key)',group=winkb)
+    winmackb = Gtk.RadioMenuItem(label='Windows & Apple*',group=winkb)
+    edit = Gtk.MenuItem('Customize')
+    edit_submenu = Gtk.Menu()
+    edit.set_submenu(edit_submenu)
+    tweaks = Gtk.MenuItem('Tweaks')
+    rightmod =  Gtk.CheckButton('AltGr on Right Cmd')
+    vsc2st3 = Gtk.CheckButton('ST3 hotkeys for VS Code')
+    caps2esc = Gtk.CheckButton('Capslock is Escape when tapped, Cmd when held')
+    caps2cmd = Gtk.CheckButton('Capslock is Cmd')
+    button_config = Gtk.MenuItem('Kinto Config (shortcuts)')
+    service = Gtk.MenuItem('Kinto Service')
+    # Keyboard type set below
+    button_syskb = Gtk.MenuItem('System Shortcuts')
+    button_region = Gtk.MenuItem('Change Language')
+    systray = Gtk.CheckMenuItem('Tray Enabled')
+    helpm = Gtk.MenuItem('Help')
+    help_submenu = Gtk.Menu()
+    helpm.set_submenu(help_submenu)
+    debug = Gtk.MenuItem('Debug')
+    opengui = Gtk.MenuItem('Open Kinto')
+    support = Gtk.MenuItem("Support")
+    about = Gtk.MenuItem('About')
+    global restartsvc
+    restartsvc = False
+    unixts = int(time.time())
+    last_status = ""
+
+    def __init__(self):
+        res = Popen(['sudo', 'systemctl','is-active','--quiet','xkeysnail'])
+        res.wait()
+
+        if res.returncode == 0:
+            self.last_status = 'active'
+            self.indicator = appindicator.Indicator.new(APPINDICATOR_ID, os.environ['HOME']+'/.config/kinto/kinto-invert.svg', appindicator.IndicatorCategory.SYSTEM_SERVICES)
+        else:
+            self.last_status = 'inactive'
+            self.indicator = appindicator.Indicator.new(APPINDICATOR_ID, os.environ['HOME']+'/.config/kinto/kinto.svg', appindicator.IndicatorCategory.SYSTEM_SERVICES)
+
+        self.indicator.set_status(appindicator.IndicatorStatus.ACTIVE)
+        self.indicator.set_menu(self.build_menu(res))
+        notify.init(APPINDICATOR_ID)
+
+        GLib.timeout_add(2000, self.update_terminal)
+
+    def build_menu(self,res):
+
+        with open(self.kconfig) as configfile:
+            autostart_line = configfile.read().split('\n')[1]
+
+        # Autostart
+        if "autostart = true" in autostart_line.casefold():
+            autostart_bool = True
+
+        if autostart_bool:
+            # Popen(['sudo', 'systemctl','restart','xkeysnail'])
+            self.checkbox_autostart.set_active(True)
+            self.chkautostart_id = self.checkbox_autostart.connect('activate',self.setAutostart,False)
+        else:
+            self.checkbox_autostart.set_active(False)
+            self.chkautostart_id = self.checkbox_autostart.connect('activate',self.setAutostart,True)
+
+        self.restart.connect('activate',self.runRestart)
+        self.menu.append(self.restart)
+        self.stop.connect('activate',self.runStop)
+        self.menu.append(self.stop)
+
+        self.refreshKB()
+
+        self.mackb.signal_id = self.mackb.connect('activate',self.setKB,"mac")
+        self.winkb.signal_id = self.winkb.connect('activate',self.setKB,"win")
+        self.chromekb.signal_id = self.chromekb.connect('activate',self.setKB,"chrome")
+        self.ibmkb.signal_id = self.ibmkb.connect('activate',self.setKB,"ibm")
+        self.winmackb.signal_id = self.winmackb.connect('activate',self.setKB,"winmac")
+
+        self.menukb.append(self.winkb)
+        self.menukb.append(self.mackb)
+        self.menukb.append(self.chromekb)
+        self.menukb.append(self.ibmkb)
+        self.menukb.append(self.winmackb)
+        self.menu.append(self.keyboards)
+
+        self.tweaks.connect('activate',self.setTweaks)
+        self.edit_submenu.append(self.tweaks)
+        self.button_config.connect('activate',self.setConfig)
+        self.edit_submenu.append(self.button_config)
+        self.service.connect('activate',self.setService)
+        self.edit_submenu.append(self.service)
+        # Set System Keyboard Shortcuts
+        self.button_syskb.connect('activate',self.setSysKB)
+        self.edit_submenu.append(self.button_syskb)
+        # Set Language
+        self.button_region.connect('activate',self.setRegion)
+        self.edit_submenu.append(self.button_region)
+        self.edit_submenu.append(self.checkbox_autostart)
+        if os.path.exists(os.environ['HOME']+'/.config/autostart/kintotray.desktop'):
+            self.systray.set_active(True)
+            self.systray.signal_id = self.systray.connect('activate',self.checkTray,False)
+        else:
+            self.systray.signal_id = self.systray.connect('activate',self.checkTray,True)
+        self.edit_submenu.append(self.systray)
+        self.menu.append(self.edit)
+
+        self.debug.connect('activate',self.runDebug,1)
+        self.help_submenu.append(self.debug)
+        self.opengui.connect('activate',self.runDebug,0)
+        self.help_submenu.append(self.opengui)
+        self.support.connect('activate',self.openSupport)
+        self.help_submenu.append(self.support)
+        self.about.connect('activate',self.runAbout)
+        self.help_submenu.append(self.about)
+        self.menu.append(self.helpm)
+
+        self.keyboards.connect('activate',self.refresh)
+
+        # self.debug.connect('activate',self.runDebug)
+        # self.menu.append(self.debug)
+
+        # self.tweaks.connect('activate',self.setTweaks)
+        # self.menu.append(self.tweaks)
+
+        # Edit Config
+        # self.button_config.connect('activate',self.setConfig)
+        # self.menu.append(self.button_config)
+
+        # # Set System Keyboard Shortcuts
+        # self.button_syskb.connect('activate',self.setSysKB)
+        # self.menu.append(self.button_syskb)
+
+        # # Set Language
+        # self.button_region.connect('activate',self.setRegion)
+        # self.menu.append(self.button_region)
+
+        item_quit = Gtk.MenuItem('Close')
+        item_quit.connect('activate', quit)
+        self.menu.append(item_quit)
+        self.menu.show_all()
+
+        return self.menu
+
+    # def refresh(self, widget, event):
+    #     print('refresh!!!')
+    #     if event.button != 1:
+    #         return False  #only intercept left mouse button
+    #     md = gtk.MessageDialog(self, gtk.DIALOG_DESTROY_WITH_PARENT, gtk.MESSAGE_INFO, gtk.BUTTONS_CLOSE, "herp derp, I only needed one click")
+    #     md.run()
+    #     md.destroy()
+    #     return True
+
+    def checkTray(self,button,tray_bool):
+        # path.exists('.config/autostart/kintotray.py')
+        if tray_bool:
+            Popen(['cp',os.environ['HOME']+'/.config/kinto/kintotray.desktop',os.environ['HOME']+'/.config/autostart/kintotray.desktop'])
+            self.systray.disconnect(self.systray.signal_id)
+            self.systray.set_active(True)
+            self.systray.signal_id = self.systray.connect('activate',self.checkTray,False)
+        else:
+            Popen(['rm',os.environ['HOME']+'/.config/autostart/kintotray.desktop'])
+            Gtk.main_quit()
+            self.systray.disconnect(self.systray.signal_id)
+            self.systray.set_active(False)
+            self.systray.signal_id = self.systray.connect('activate',self.checkTray,True)
+        return
+
+    def refresh(self,button):
+        self.refreshKB()
+
+    def refreshKB(self):
+        # Keyboard Types
+        ismac = "perl -ne 'print if /^(\s{4})((?!#).*)(# Mac\n)/' ~/.config/kinto/kinto.py | wc -l"
+        iswin = "perl -ne 'print if /^(\s{4})(# -- Default Win)/' ~/.config/kinto/kinto.py | wc -l"
+        ischrome = "perl -ne 'print if /^(\s{4})((?!#).*)(# Chromebook\n)/' ~/.config/kinto/kinto.py | wc -l"
+        iswinmac = "perl -ne 'print if /^(\s{4})(# -- Default Mac)/' ~/.config/kinto/kinto.py | wc -l"
+        isibm = "perl -ne 'print if /^(\s{4})((?!#).*)(# IBM\n)/' ~/.config/kinto/kinto.py | wc -l"
+        mac_result = int(self.queryConfig(ismac))
+        win_result = int(self.queryConfig(iswin))
+        chrome_result = int(self.queryConfig(ischrome))
+        ibm_result = int(self.queryConfig(isibm))
+        winmac_result = int(self.queryConfig(iswinmac))
+
+        countkb = 0
+
+        if mac_result:
+            self.mackb.set_active(True)
+            countkb += 1
+        if win_result:
+            self.winkb.set_active(True)
+            countkb += 1
+        if chrome_result:
+            self.chromekb.set_active(True)
+            countkb += 1
+        if winmac_result:
+            self.winmackb.set_active(True)
+            countkb += 1
+        if ibm_result:
+            ibmkb.set_active(True)
+            countkb += 1
+
+        if countkb > 1:
+            Popen(['notify-send','Kinto: Remove ' + str(countkb-1) + ' kb type(s)'])
+
+        return
+
+    def non_block_read(self):
+        ''' even in a thread, a normal read with block until the buffer is full '''
+        output = self.kinto_status.stdout
+        # with open('goodlines.txt') as f:
+        #     mylist = list(f)
+        # output = '\n'.join(self.kinto_status.stdout.splitlines()[-1:])
+        # '\n'.join(stderr.splitlines()[-N:])
+        # .splitlines()[-1:]
+        fd = output.fileno()
+        fl = fcntl.fcntl(fd, fcntl.F_GETFL)
+        fcntl.fcntl(fd, fcntl.F_SETFL, fl | os.O_NONBLOCK)
+        op = output.read()
+        if op == None:
+            return ''
+        status = op.decode('utf-8').rstrip()
+        if "inactive" in status or "failed" in status or "deactivating" in status or "activating" in status:
+            stats = "inactive"
+        elif "active" in status:
+            stats = "active"
+        else:
+            stats = "inactive"
+        return stats
+
+    def update_terminal(self):
+        status = self.non_block_read().strip()
+        nowts = int(time.time())
+        if (nowts - self.unixts) > 5 and (status=='active' and self.indicator.get_icon() != os.environ['HOME']+'/.config/kinto/kinto-invert.svg'):
+            self.indicator.set_icon(os.environ['HOME']+'/.config/kinto/kinto-invert.svg')
+        elif (nowts - self.unixts) > 5 and (status == 'inactive' and self.indicator.get_icon() != os.environ['HOME']+'/.config/kinto/kinto.svg'):
+            self.indicator.set_icon(os.environ['HOME']+'/.config/kinto/kinto.svg')
+        self.last_status = status
+
+        return self.kinto_status.poll() is None
+
+    def openSupport(self,button):
+        Gtk.show_uri_on_window(None, "https://github.com/rbreaves/kinto#table-of-contents", Gtk.get_current_event_time())
+        return
+
+    def runAbout(self,button):
+        win = Gtk.Window()
+
+        path = os.environ['HOME']+'/.config/kinto/kinto-color.svg'
+        width = -1
+        height = 128
+        preserve_aspect_ratio = True
+
+        pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_scale(path, width, height, preserve_aspect_ratio)
+        win.set_default_icon_list([pixbuf])
+
+        win.set_title("About")
+        win.set_default_size(350, 200)
+        win.set_position(Gtk.WindowPosition.CENTER)
+
+        context = win.get_style_context()
+        default_background = str(context.get_background_color(Gtk.StateType.NORMAL))
+
+        tokenValue = re.search('red=(\d.\d+), green=(\d.\d+), blue=(\d.\d+), alpha=(\d.\d+)', default_background)
+        red = float(tokenValue.group(1))
+        green = float(tokenValue.group(2))
+        blue = float(tokenValue.group(3))
+        alpha = float(tokenValue.group(4))
+
+        bgAvg = (red + green + blue)/3
+
+        if(bgAvg > 0.5):
+            theme = "light"
+        else:
+            theme = "dark"
+
+        vbox = Gtk.VBox()
+        # innervbox = Gtk.VBox()
+
+        if theme == "dark":
+            path = os.environ['HOME']+'/.config/kinto/kinto-invert.svg'
+        else:
+            path = os.environ['HOME']+'/.config/kinto/kinto-color.svg'
+        width = -1
+        height = 128
+        preserve_aspect_ratio = True
+
+        pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_scale(path, width, height, preserve_aspect_ratio)
+        image = Gtk.Image()
+        image.set_from_pixbuf(pixbuf)
+
+        with open(os.environ['HOME']+'/.config/kinto/version', 'r') as file:
+            verdata = file.read().replace('\n', '')
+
+        version = Gtk.Label('Kinto v' + verdata)
+
+        credits = Gtk.Label("Author: Ben Reaves")
+        spacer = Gtk.Label(" ")
+        copy = Gtk.Label("© 2019, 2020 - GPLv2")
+        url = Gtk.LinkButton("http://kinto.sh", label="kinto.sh")
+
+        vbox.add(image)
+        vbox.add(version)
+        vbox.add(spacer)
+        vbox.add(credits)
+        vbox.add(copy)
+        vbox.add(url)
+        win.add(vbox)
+
+        win.show_all()
+
+        version.set_selectable(True)      
+        win.connect('delete-event', self.on_delete_event)
+
+        return
+
+    def setTweaks(self,button):
+        win = Gtk.Window()
+
+        path = os.environ['HOME']+'/.config/kinto/kinto-color.svg'
+        width = -1
+        height = 128
+        preserve_aspect_ratio = True
+
+        pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_scale(path, width, height, preserve_aspect_ratio)
+        win.set_default_icon_list([pixbuf])
+
+        win.set_title("Kinto Tweaks")
+        win.set_default_size(350, 200)
+        win.set_position(Gtk.WindowPosition.CENTER)
+
+        # Check AltGr - commented out is enabled
+        is_rightmod = "perl -ne 'print if /^(\s{4})(Key.*)(Multi-language)/' ~/.config/kinto/kinto.py | wc -l"
+        rightmod_result = int(self.queryConfig(is_rightmod))
+
+        # Sublime enabled for vscode
+        is_vsc2st3 = "perl -ne 'print if /^(\s{4}\w.*)(- Sublime)/' ~/.config/kinto/kinto.py | wc -l"
+        vsc2st3_result = int(self.queryConfig(is_vsc2st3))
+
+        # Caps2Esc enabled
+        is_caps2esc = "perl -ne 'print if /^(\s{4}{\w.*)(# Caps2Esc)/' ~/.config/kinto/kinto.py | wc -l"
+        caps2esc_result = int(self.queryConfig(is_caps2esc))
+
+        # Caps2Cmd enabled
+        is_caps2cmd = "perl -ne 'print if /^(\s{4}\w.*)(# Caps2Cmd)/' ~/.config/kinto/kinto.py | wc -l"
+        caps2cmd_result = int(self.queryConfig(is_caps2cmd))
+
+        # Enter2Cmd enabled
+        # (\s{4}{\w.*)(# Enter2Cmd)
+
+        vbox = Gtk.VBox()
+
+        self.lbl = Gtk.Label()
+        global restartsvc 
+        restartsvc = False
+        self.rightmod =  Gtk.CheckButton('AltGr on Right Cmd')
+        self.vsc2st3 = Gtk.CheckButton('ST3 hotkeys for VS Code')
+        self.caps2esc = Gtk.CheckButton('Capslock is Escape when tapped, Cmd when held')
+        self.caps2cmd = Gtk.CheckButton('Capslock is Cmd')
+        
+        if rightmod_result == 0:
+            self.rightmod.set_active(True)
+
+        if vsc2st3_result > 0:
+            self.vsc2st3.set_active(True)
+
+        if caps2esc_result > 0:
+            self.caps2esc.set_active(True)
+            self.caps2cmd.set_sensitive(False)
+
+        if caps2cmd_result > 0:
+            self.caps2cmd.set_active(True)
+            self.caps2esc.set_sensitive(False)
+
+        self.rightmod.signal_id = self.rightmod.connect('toggled',self.setRightMod)
+        self.vsc2st3.signal_id = self.vsc2st3.connect('toggled',self.setVSC2ST3)
+        self.caps2esc.signal_id = self.caps2esc.connect('toggled',self.setCaps2Esc)
+        self.caps2cmd.signal_id = self.caps2cmd.connect('toggled',self.setCaps2Cmd)
+
+        vbox.add(self.rightmod)
+        vbox.add(self.vsc2st3)
+        vbox.add(self.caps2esc)
+        vbox.add(self.caps2cmd)
+        vbox.add(self.lbl)
+        win.add(vbox)
+
+        win.show_all()
+
+        win.connect('delete-event', self.on_delete_event)
+
+        return
+
+    __gsignals__ = {
+        "delete-event" : "override"
+    }
+
+    def on_delete_event(event, self, widget):
+        global restartsvc 
+        if restartsvc == True:
+            try:
+                restartcmd = ['sudo', 'systemctl','restart','xkeysnail']
+                Popen(restartcmd)
+                restartsvc = False
+
+            except CalledProcessError:
+                Popen(['notify-send','Kinto: Error restarting Kinto after setting tweaks!'])
+
+        self.hide()
+        self.destroy()
+        return True
+
+    def setRightMod(self,button):
+        global restartsvc 
+        try:
+            if self.winkb.get_active() or self.winmackb.get_active():
+                # print('winkb true')
+                setkb = 's/^(\s{4})((# )(.*)(# )(WinMac - Multi-language.*)|(K)(.*)(# )(WinMac - Multi-language.*))/    $4$5$6$9$7$8$9$10/g'
+            if self.mackb.get_active():
+                # print('mackb true')
+                setkb = 's/^(\s{4})((# )(.*)(# )(Mac - Multi-language.*)|(K)(.*)(# )(Mac - Multi-language.*))/    $4$5$6$9$7$8$9$10/g'
+            if self.chromekb.get_active():
+                # print('chromekb true')
+                setkb = 's/^(\s{4})((# )(.*)(# )(Chromebook - Multi-language.*)|(K)(.*)(# )(Chromebook - Multi-language.*))/    $4$5$6$9$7$8$9$10/g'
+            if self.ibmkb.get_active():
+                # print('ibmkb true')
+                setkb = 's/^(\s{4})((# )(.*)(# )(IBM - Multi-language.*)|(K)(.*)(# )(IBM - Multi-language.*))/    $4$5$6$9$7$8$9$10/g'
+
+            cmds = ['perl','-pi','-e',setkb,self.kconfig]
+
+            cmdsTerm = Popen(cmds)
+
+            restartsvc = True
+
+        except CalledProcessError:
+            Popen(['notify-send','Kinto: Error Resetting AltGr!'])
+
+        return
+
+    def setVSC2ST3(self,button):
+        global restartsvc 
+
+        try:
+            if self.chromekb.get_active() or self.ibmkb.get_active():
+                setkb = 's/^(\s{4})(\w.*)(# )(Chromebook/IBM - Sublime)|^(\s{4})(# )(\w.*)(# Chromebook/IBM - Sublime)/$5$7$8$1$3$2$3$4/g'
+            else:
+                setkb = 's/^(\s{4})(\w.*)(# )(Default - Sublime)|^(\s{4})(# )(\w.*)(# Default - Sublime)/$5$7$8$1$3$2$3$4/g'
+
+            cmds = ['perl','-pi','-e',setkb,self.kconfig]
+
+            cmdsTerm = Popen(cmds)
+
+            restartsvc = True
+
+        except CalledProcessError:
+            Popen(['notify-send','Kinto: Error Resetting SublimeText remaps for VSCode!'])
+        return
+
+    def setCaps2Esc(self,button):
+
+        global restartsvc
+        try:
+            if self.winkb.get_active() or self.winmackb.get_active() or self.ibmkb.get_active() or self.mackb.get_active():
+                setkb = 's/^(\s{4})((# )(\{\w.*)(# Caps2Esc\n)|(\{\w.*)(# )(Caps2Esc - Chrome.*)|(\{.*)(# )(Caps2Esc\n|Placeholder)|(\w.*)(# )(Caps2Cmd.*)|(# )(\{.*)(# )(Placeholder))/    $4$5$7$6$7$8$10$9$10$11$13$12$13$14$16$17$18/g'
+            if self.chromekb.get_active():
+                setkb = 's/^(\s{4})((# )(\{\w.*)(# Caps2Esc - Chrome.*)|(\{\w.*)(# )(Caps2Esc\n)|(\{.*)(# )(Caps2Esc - Chrome.*|Placeholder)|(\w.*)(# )(Caps2Cmd.*)|(# )(\{.*)(# )(Placeholder))/    $4$5$7$6$7$8$10$9$10$11$13$12$13$14$16$17$18/g'
+
+            cmds = ['perl','-pi','-e',setkb,self.kconfig]
+
+            if self.caps2esc.get_active():
+                self.caps2cmd.set_sensitive(False)
+            else:
+                self.caps2cmd.set_sensitive(True)
+
+            cmdsTerm = Popen(cmds)
+
+            restartsvc = True
+
+        except CalledProcessError:
+            Popen(['notify-send','Kinto: Error resetting caps2esc!'])
+
+        return
+
+    def setCaps2Cmd(self,button):
+
+        global restartsvc
+
+        try:
+            if self.winkb.get_active() or self.winmackb.get_active() or self.ibmkb.get_active() or self.mackb.get_active():
+                setkb = 's/^(\s{4})((\w.*)(# )(Caps2Cmd\n)|(\w.*)(# )(Caps2Cmd - Chrome.*)|(# )(\w.*)(# )(Caps2Cmd\n)|(\{\w.*)(# )(Caps2Esc.*)|(# )(\{.*)(# )(Placeholder))/    $4$3$4$5$7$6$7$8$10$11$12$14$13$14$15$17$18$19/g'
+            if self.chromekb.get_active():
+                setkb = 's/^(\s{4})((\w.*)(# )(Caps2Cmd - Chrome.*)|(\w.*)(# )(Caps2Cmd\n)|(# )(\w.*)(# )(Caps2Cmd - Chrome.*)|(\{\w.*)(# )(Caps2Esc.*)|(# )(\{.*)(# )(Placeholder))/    $4$3$4$5$7$6$7$8$10$11$12$14$13$14$15$17$18$19/g'
+
+            cmds = ['perl','-pi','-e',setkb,self.kconfig]
+
+            if self.caps2cmd.get_active():
+                self.caps2esc.set_sensitive(False)
+            else:
+                self.caps2esc.set_sensitive(True)
+
+            cmdsTerm = Popen(cmds)
+
+            restartsvc = True
+
+        except CalledProcessError:
+            Popen(['notify-send','Kinto: Error resetting caps2cmd!'])
+
+        return
+
+    def runRestart(self,button):
+        try:
+            stop = Popen(['sudo', 'systemctl','stop','xkeysnail'])
+            stop.wait()
+            time.sleep(1)
+            res = Popen(['pgrep','xkeysnail'])
+            res.wait()
+
+            if res.returncode == 0:
+                # Popen(['notify-send','Kinto: Ending Debug'])
+                pkillxkey = Popen(['sudo', 'pkill','-f','bin/xkeysnail'])
+                pkillxkey.wait()
+            
+            Popen(['sudo', 'systemctl','start','xkeysnail'])
+        except:
+            Popen(['notify-send','Kinto: Error restarting Kinto!'])
+
+    def runStop(self,button):
+        try:
+            stop = Popen(['sudo', 'systemctl','stop','xkeysnail'])
+            stop.wait()
+            time.sleep(1)
+            res = Popen(['pgrep','xkeysnail'])
+            res.wait()
+
+            if res.returncode == 0:
+                # Popen(['notify-send','Kinto: Ending Debug'])
+                pkillxkey = Popen(['sudo', 'pkill','-f','bin/xkeysnail'])
+                pkillxkey.wait()
+        except:
+            Popen(['notify-send','Kinto: Error stopping Kinto!'])
+
+    def runDebug(self,button,opendebug):
+        try:
+            if opendebug:
+                Popen([os.environ['HOME']+'/.config/kinto/gui/kinto-gui.py','-d'])
+            else:
+                Popen([os.environ['HOME']+'/.config/kinto/gui/kinto-gui.py'])
+        except:
+            Popen(['notify-send','Kinto: Error opening Kinto!'])
+
+    def queryConfig(self,query):
+        res = Popen(query, stdout=PIPE, stderr=None, shell=True)
+        res.wait()
+        return res.communicate()[0].strip().decode('UTF-8')
+
+    def setAutostart(self,button,autostart):
+        try:
+            if autostart == False:
+                Popen(['perl','-pi','-e','s/autostart = true/autostart = false/g',os.environ['HOME']+'/.config/kinto/kinto.py'])
+                self.checkbox_autostart.set_active(False)
+                self.checkbox_autostart.disconnect(self.chkautostart_id)
+                self.chkautostart_id = self.checkbox_autostart.connect('activate',self.setAutostart,True)
+            else:
+                Popen(['perl','-pi','-e','s/autostart = false/autostart = true/g',os.environ['HOME']+'/.config/kinto/kinto.py'])
+                self.checkbox_autostart.set_active(True)
+                self.checkbox_autostart.disconnect(self.chkautostart_id)
+                self.chkautostart_id = self.checkbox_autostart.connect('activate',self.setAutostart,False)
+
+        except CalledProcessError:
+            Popen(['notify-send','Kinto: Error setting autostart!'])
+
+    def setConfig(self,button):
+        try:
+            if os.path.exists('/opt/sublime_text/sublime_text'):
+                Popen(['/opt/sublime_text/sublime_text',os.environ['HOME']+'/.config/kinto/kinto.py'])
+            elif which('gedit') is not None:
+                Popen(['gedit',os.environ['HOME']+'/.config/kinto/kinto.py'])
+            elif which('mousepad') is not None:
+                Popen(['mousepad',os.environ['HOME']+'/.config/kinto/kinto.py'])
+            elif which('kate') is not None:
+                Popen(['kate',os.environ['HOME']+'/.config/kinto/kinto.py'])
+            elif which('kwrite') is not None:
+                Popen(['kwrite',os.environ['HOME']+'/.config/kinto/kinto.py'])
+
+        except CalledProcessError:                                  # Notify user about error on running restart commands.
+            Popen(['notify-send','Kinto: Error could not open config file!'])
+
+    def setService(self,button):
+        try:
+            if os.path.exists('/opt/sublime_text/sublime_text'):
+                Popen(['/opt/sublime_text/sublime_text','/lib/systemd/system/xkeysnail.service'])
+            elif which('gedit') is not None:
+                Popen(['gedit','/lib/systemd/system/xkeysnail.service'])
+            elif which('mousepad') is not None:
+                Popen(['mousepad','/lib/systemd/system/xkeysnail.service'])
+            elif which('kate') is not None:
+                Popen(['kate','/lib/systemd/system/xkeysnail.service'])
+            elif which('kwrite') is not None:
+                Popen(['kwrite','/lib/systemd/system/xkeysnail.service'])
+
+        except CalledProcessError:                                  # Notify user about error on running restart commands.
+            Popen(['notify-send','Kinto: Error could not open config file!'])
+
+    def setKB(self,button,kbtype):
+        try:
+            if kbtype == "win":
+                setkb = 's/^(\s{3})(\s{1}#)(.*# WinMac.*)|^(?!\s{4}#)(\s{3})(\s{1})(.*)( # )(Mac.*)|^(?!\s{4}#)(\s{3})(\s{1})(.*)( # )(IBM.*)|^(?!\s{4}#)(\s{3})(\s{1})(.*)( # )(Chromebook.*)|^(\s{3})(\s{1}# )(-)( Default Win)|^(\s{3})(\s{1}# )(-)(- Default Mac*)/   $3$7$6$7$8$12$11$12$13$17$16$17$18$20$21$21$22$24$26/g'
+            elif kbtype == "winmac":
+                setkb = 's/^(\s{3})(\s{1}#)(.*# WinMac.*)|^(?!\s{4}#)(\s{3})(\s{1})(.*)( # )(Mac.*)|^(?!\s{4}#)(\s{3})(\s{1})(.*)( # )(IBM.*)|^(?!\s{4}#)(\s{3})(\s{1})(.*)( # )(Chromebook.*)|^(\s{3})(\s{1}# )(-)( Default Mac.*)|^(\s{3})(\s{1}# )(-)(- Default Win)/   $3$7$6$7$8$12$11$12$13$17$16$17$18$20$21$21$22$24$26/g'
+                if os.path.isfile('/sys/module/hid_apple/parameters/swap_opt_cmd'):
+                    with open('/sys/module/applespi/parameters/swap_opt_cmd', 'r') as ocval:
+                        optcmd = ocval.read().replace('\n', '')
+                    if optcmd == '0':
+                        # print("found hid_apple")
+                        self.queryConfig("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")
+                if os.path.isfile('/sys/module/applespi/parameters/swap_opt_cmd'):
+                    with open('/sys/module/applespi/parameters/swap_opt_cmd', 'r') as ocval:
+                        optcmd = ocval.read().replace('\n', '')
+                    if optcmd == '0':
+                        # print("found applespi")
+                        self.queryConfig("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")
+            elif kbtype == "mac":
+                if os.path.isfile('/sys/module/hid_apple/parameters/swap_opt_cmd'):
+                    with open('/sys/module/hid_apple/parameters/swap_opt_cmd', 'r') as ocval:
+                        optcmd = ocval.read().replace('\n', '')
+                    if optcmd == '1':
+                        # print("found hid_apple - remove")
+                        self.queryConfig("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")
+                if os.path.isfile('/sys/module/applespi/parameters/swap_opt_cmd'):
+                    with open('/sys/module/applespi/parameters/swap_opt_cmd', 'r') as ocval:
+                        optcmd = ocval.read().replace('\n', '')
+                    if optcmd == '1':
+                        # print("found applespi - remove")
+                        self.queryConfig("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")
+                setkb = 's/^(\s{3})(\s{1}#)(.*# Mac\n|.*# Mac -)|^(?!\s{4}#)(\s{3})(\s{1})(.*)( # )(WinMac.*)|^(?!\s{4}#)(\s{3})(\s{1})(.*)( # )(IBM.*)|^(?!\s{4}#)(\s{3})(\s{1})(.*)( # )(Chromebook.*)|^(\s{3})(\s{1}# )(-)(- Default (Win|Mac.*))/   $3$7$6$7$8$12$11$12$13$17$16$17$18$20$22/g'
+            elif kbtype == "chrome":
+                setkb = 's/^(\s{3})(\s{1}#)(.*# Chromebook.*)|^(?!\s{4}#)(\s{3})(\s{1})(.*)( # )(WinMac.*)|^(?!\s{4}#)(\s{3})(\s{1})(.*)( # )(Mac.*)|^(?!\s{4}#)(\s{3})(\s{1})(.*)( # )(IBM.*)|^(\s{3})(\s{1}# )(-)(- Default (Win|Mac.*))/   $3$7$6$7$8$12$11$12$13$17$16$17$18$20$22/g'
+            elif kbtype == "ibm":
+                setkb ='s/^(\s{3})(\s{1}#)(.*# IBM.*)|^(?!\s{4}#)(\s{3})(\s{1})(.*)( # )(WinMac.*)|^(?!\s{4}#)(\s{3})(\s{1})(.*)( # )(Mac.*)|^(?!\s{4}#)(\s{3})(\s{1})(.*)( # )(Chromebook.*)|^(\s{3})(\s{1}# )(-)(- Default (Win|Mac.*))/   $3$7$6$7$8$12$11$12$13$17$16$17$18$20$22/g'
+
+            cmds = ['perl','-pi','-e',setkb,self.kconfig]
+            cmdsTerm = Popen(cmds)
+            cmdsTerm.wait()
+
+            restart = ['sudo', 'systemctl','restart','xkeysnail']
+            Popen(restart)
+
+        except CalledProcessError:
+            Popen(['notify-send','Kinto: Error Resetting KB Type!'])
+
+    def setSysKB(self,button):
+        if self.ostype == "XFCE":
+            Popen(['xfce4-keyboard-settings'])
+        elif self.ostype == "KDE":
+            self.queryConfig('systemsettings >/dev/null 2>&1 || systemsettings5 >/dev/null 2>&1')
+        else:
+            Popen(['gnome-control-center','keyboard'])
+
+    def setRegion(self,button):
+        if self.ostype == "XFCE":
+            Popen(['gnome-language-selector'])
+        elif self.ostype == "KDE":
+            self.queryConfig('kcmshell4 kcm_translations >/dev/null 2>&1 || kcmshell5 kcm_translations >/dev/null 2>&1')
+        else:
+            Popen(['gnome-control-center','region'])
+
+    def quit(source):
+        Gtk.main_quit()
+
+Indicator()
+signal.signal(signal.SIGINT, signal.SIG_DFL)
+Gtk.main()

xkeysnail-config/xkeysnail.desktop

@@ -2,7 +2,10 @@
 Name=Kinto_xkey
 GenericName=Kinto_xkey
 Comment=Make Linux Type Like it's a Mac
-Exec=/bin/bash -c "{xhost} +SI:localuser:root && sudo {systemctl} restart xkeysnail"
+Exec=/bin/bash -c "grep -q 'autostart = true' {homedir}/.config/kinto/kinto.py && {xhost} +SI:localuser:root && sudo {systemctl} restart xkeysnail"
+# Budgie logoff fix to avoid key input loss
+# ;{homedir}/.config/kinto/logoff.sh
+# ;sudo /usr/local/bin/logoff.sh $USER $DISPLAY
 Terminal=false
 Type=Application
 X-GNOME-Autostart-enabled=true

xkeysnail-config/xkeysnail.service

@@ -4,9 +4,8 @@ Description=xkeysnail
 [Service]
 Type=simple
 KillMode=process
-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}'
+ExecStart=/usr/bin/sudo /bin/bash -c '/usr/bin/xhost +SI:localuser:root && {homedir}/.config/kinto/killdups.sh && {xkeysnail} --quiet --watch {homedir}/.config/kinto/kinto.py'
+ExecStop=/usr/bin/sudo /bin/bash -c '/usr/bin/sudo pkill -f bin/xkeysnail && exit 0'
 Restart=on-failure
 RestartSec=3
 Environment=DISPLAY={displayid}

xkeysnail_service.sh

@@ -4,31 +4,32 @@
 # to false for wordwise to work in Firefox
 
 typeset -l distro
-distro=$(awk -F= '$1=="NAME" { print $2 ;}' /etc/os-release)
+distro=$(awk -F= '$1=="NAME" { gsub("[\",!,_, ]","",$2);print $2 ;}' /etc/os-release)
 typeset -l dename
 dename=$(./system-config/dename.sh | cut -d " " -f1)
 
 function uninstall {
 
+	echo -e "\nNote: Restoring keys is only relevant if you had installed a version prior to 1.2 of Kinto. You should skip this step if 1.2+ is all you have installed."
+
 	while true; do
-	read -rep $'\nPress R to restore your original shortcuts.\nPress F to reset to factory shortcuts. (f/r)\n' yn
+	read -rep $'\nPress R to restore your original shortcuts.\nPress F to reset to factory shortcuts.\nPress N to skip. (f/r/N)\n' yn
 		case $yn in
 			[Ff]* ) yn="f"; break;;
 			[Rr]* ) yn="r";break;;
-			* ) echo "Please answer yes or no.";;
+			[Nn]* ) yn="n";break;;
+			* ) yn="n";break;;
 		esac
 	done
 
 	if [ "$yn" == "f" ];then
 		echo "Reset to factory shortcuts"
-		if [ "$dename" == "gnome" ];then
+		if [[ $dename == "gnome" || $dename == "budgie" ]];then
 			echo "Resetting DE hotkeys..."
 			echo "gsettings reset-recursively org.gnome.desktop.wm.keybindings"
 			gsettings reset-recursively org.gnome.desktop.wm.keybindings
 			echo "gsettings reset-recursively org.gnome.mutter.keybindings"
 			gsettings reset-recursively org.gnome.mutter.keybindings
-			echo "gsettings set org.gnome.mutter overlay-key 'super'"
-			gsettings set org.gnome.mutter overlay-key 'super'
 			dconf dump /org/gnome/mutter/ > mutter.conf
 			dconf load /org/gnome/mutter/ < mutter.conf
 		elif [ "$dename" == "kde" ];then
@@ -41,7 +42,7 @@ function uninstall {
 		fi
 	elif [ "$yn" == "r" ]; then
 		echo "Restore original user shortcuts"
-		if [ "$dename" == "gnome" ]; then
+		if [[ $dename == "gnome" || $dename == "budgie" ]]; then
 			echo "Restoring DE hotkeys..."
 			wmkeys=$(ls | grep -m1 "keybinding")
 			mutterkeys=$(ls | grep -m1 "mutter_")
@@ -60,15 +61,22 @@ function uninstall {
 			fi
 		elif [ "$dename" == "kde" ]; then
 			echo "Restoring DE hotkeys..."
-			kwinkeys = $(ls | grep -m1 "kwinrc")
-			kdekeys = $(ls | grep -m1 "kglobalshortcutsrc")
+			kwinkeys=$(ls | grep -m1 "kwinrc")
+			kdekeys=$(ls | grep -m1 "kglobalshortcutsrc")
 			cp ./"$kdekeys" ~/.config/kglobalshortcutsrc
 			cp ./"$kwinkeys" ~/.config/kwinrc
 		elif [ "$dename" == "xfce" ]; then
 			echo "Restoring DE hotkeys..."
-			xfcekeys = $(ls | grep -m1 "xfce4-keyboard")
+			xfcekeys=$(ls | grep -m1 "xfce4-keyboard")
 			cp ./"$xfcekeys" ~/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
 		fi
+	elif [ "$yn" == "n" ]; then
+		echo "Skipping..."
+	fi
+	if [[ $dename == "gnome" || $dename == "budgie" || $dename == "mate" ]]; then
+		echo -e "\nWill still be restoring the overlay key"
+		echo -e "gsettings set org.gnome.mutter overlay-key 'super'\n"
+		gsettings set org.gnome.mutter overlay-key 'super'
 	fi
 }
 
@@ -88,7 +96,8 @@ function removeAppleKB {
 
 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..."
+		echo -e "\nYour system may log you off immediately during the restoration of budgie-daemon.\n"
+		read -n 1 -s -r -p "Press any key to continue..."
 		bdmd5="$(md5sum /usr/bin/budgie-daemon | awk '{ print $1 }')"
 		oldbdmd5=$(md5sum ./budgie-daemon_10.5.1.bak | awk '{ print $1 }')
 		if [ "$bdmd5" != "$oldbdmd5" ]; then
@@ -104,7 +113,7 @@ function budgieUpdate {
 	# Check for budgie and install App Switching hack
 	if [ -f /usr/bin/budgie-desktop ];then
 		while true; do
-			read -rep $'Would you like to update Budgie to support proper App Switching? (y/n)\n(Your system will immediately log you out after this runs.)\n' yn
+			read -rep $'Would you like to update Budgie to support proper App Switching? (y/n)\n(Your system may immediately log you out after this runs.)\n' yn
 			case $yn in
 				[Yy]* ) yn="y"; break;;
 				[Nn]* ) yn="n";break;;
@@ -149,175 +158,319 @@ function budgieUpdate {
 	fi
 }
 
-if [ $# -eq 0 ]; then
-	echo "Install Kinto - xkeysnail (udev)"
-	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
-
-	set "$n"
+if [[ $1 == "5" || $1 == "uninstall" || $1 == "Uninstall" ]]; then
+	echo "Uninstalling Kinto - xkeysnail (udev)"
+	uninstall
+	echo "Removing any Apple driver settings Kinto may have have set..."
+	removeAppleKB
+	echo "Killing the Kinto tray..."
+	pkill -f kintotray >/dev/null 2>&1
+	echo "Stopping the Kinto service..."
+	sudo systemctl stop xkeysnail >/dev/null 2>&1
+	echo "Disabling the Kinto service..."
+	sudo systemctl disable xkeysnail >/dev/null 2>&1
+	echo "Killing any remaining xkeysnail processes..."
+	sudo pkill -f bin/xkeysnail >/dev/null 2>&1
+	echo "Killing any Kinto related threads from Kinto tray or the gui..."
+	sudo pkill -f "is-active xkeysnail" >/dev/null 2>&1
+	echo -e "\nRemoving Kinto..."
+	echo "rm /etc/sudoers.d/limitedadmins"
+	echo "rm ~/.config/autostart/xkeysnail.desktop"
+	echo "rm ~/.config/autostart/kintotray.desktop"
+	echo "rm -rf ~/.config/kinto"
+	echo "rm /usr/share/applications/kinto.desktop"
+	sudo rm /etc/sudoers.d/limitedadmins >/dev/null 2>&1
+	rm ~/.config/autostart/xkeysnail.desktop >/dev/null 2>&1
+	rm ~/.config/autostart/kintotray.desktop  >/dev/null 2>&1
+	rm -rf ~/.config/kinto >/dev/null 2>&1
+	sudo rm /usr/share/applications/kinto.desktop  >/dev/null 2>&1
+	echo -e "\nRemoving Kinto's systemd service files..."
+	echo "rm /etc/systemd/system/xkeysnail.service"
+	echo "rm /etc/systemd/system/graphical.target.wants/xkeysnail.service"
+	echo "rm /usr/lib/systemd/system/xkeysnail.service"
+	echo "rm /lib/systemd/system/xkeysnail.service"
+	sudo rm /etc/systemd/system/xkeysnail.service >/dev/null 2>&1
+	sudo rm /etc/systemd/system/graphical.target.wants/xkeysnail.service >/dev/null 2>&1
+	sudo rm /usr/lib/systemd/system/xkeysnail.service >/dev/null 2>&1
+	sudo rm /lib/systemd/system/xkeysnail.service >/dev/null 2>&1
+	if [ -f /usr/local/bin/logoff.sh ];then
+		sudo rm /usr/local/bin/logoff.sh
+	fi
+	if [[ $distro == "elementaryos" ]]; then
+		gsettings set io.elementary.terminal.settings natural-copy-paste true
+	fi
+	sudo systemctl daemon-reload
+	# sudo systemctl --state=not-found --all | grep xkeysnail
+	exit 0
 fi
 
-# multi-language
-rightalt=false
-# VS code remap
-vssublime=false
+sudo systemctl stop xkeysnail >/dev/null 2>&1
+sudo systemctl disable xkeysnail >/dev/null 2>&1
+sudo pkill -f bin/xkeysnail >/dev/null 2>&1
+sudo pkill -f "is-active xkeysnail" >/dev/null 2>&1
 
-if [[ $1 == "1" || $1 == "2" || $1 == "3" || $1 == "winmac" || $1 == "mac" || $1 == "chromebook" ]]; then
-	while true; do
-	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;;
-	esac
-	done
-	while true; do
-	read -rep $'\nWould you like to give VS Code Sublime Text keymaps? (y/N)\n' yn
-	case $yn in
-		[Yy]* ) vssublime=true; break;;
-		* ) break;;
-	esac
-	done
-	branch=$(git rev-parse --abbrev-ref HEAD)
-	if [ "$branch" == "dev" ] || [ "$branch" == "alpha" ];then
+pip3 install pillow
+
+# Add additional shortcuts if needed, does not modify existing ones
+
+if [[ $dename == 'gnome' || $dename == 'budgie' ]];then
+	if [[ $(gsettings get org.gnome.mutter overlay-key | grep "''\|' '" | wc -l) != 1 ]];then
+		bound=$(gsettings get org.gnome.mutter overlay-key)
+		echo "Overlay key, " $bound ", detected. Will be removing so Super-Space can remap to Cmd-Space for app launching.."
+		gsettings set org.gnome.mutter overlay-key ''
+	fi
+fi
+
+# if ls /etc/apt/sources.list.d/system76* 1> /dev/null 2>&1; then
+if [[ $distro == 'popos' ]]; then
+	# Addition, does not overwrite existing
+	if [[ $(gsettings get org.gnome.desktop.wm.keybindings minimize | grep "\[\]" | wc -l) != 1 ]];then
+		echo "Adding Super-h (Cmd+h) to hide/minimize Window."
+		gsettings set org.gnome.desktop.wm.keybindings minimize "['<Super>h','<Alt>F9']"
+		# work around to make sure settings survive reboot
+		dconf dump /org/gnome/desktop/wm/keybindings/ > tempkb.conf
+		dconf load /org/gnome/desktop/wm/keybindings/ < tempkb.conf
+	else
+		bound=$(gsettings get org.gnome.desktop.wm.keybindings minimize)
+		echo "Hide/minimize Window is already bound to " $bound " , please remap it to Super-H for kinto."
+		echo "gsettings set org.gnome.desktop.wm.keybindings minimize \"['<Super>h','<Alt>F9']\""
+	fi
+fi
+
+if [[ $distro == "elementaryos" ]]; then
+	gsettings set io.elementary.terminal.settings natural-copy-paste false
+fi
+
+if ! [ -x "$(command -v xhost)" ] || ! [ -x "$(command -v gcc)" ]; then
+	if [ "$distro" == "manjarolinux" ]; then
+		sudo ./system-config/unipkg.sh "xorg-xhost gcc"
+	fi
+fi
+
+if [[ $dename == "kde" ]]; then
+	if [[ $distro == "manjarolinux" ]]; then
+		sudo ./system-config/unipkg.sh vte3
+	else
+		sudo ./system-config/unipkg.sh libvte-2.91-dev
+	fi
+fi
+if [[ $distro == 'kdeneon' ]]; then
+	kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Show Desktop" "Meta+D,none,Show Desktop"
+	kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Window Close" "Alt+F4,none,Close Window"
+	kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Window Minimize" "Meta+PgDown,none,Minimize Window"
+	kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Window Maximize" "Meta+PgUp,none,Maximize Window"
+	kquitapp5 kglobalaccel && sleep 2s && kglobalaccel5 &
+fi
+
+if [[ $distro == 'fedora' ]]; then
+	echo "Checking SELinux status..."
+	if [[ $(perl -ne 'print if /^SELINUX=enforcing/' /etc/selinux/config | wc -l) != 0 ]]; then
 		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
+		read -rep $'\nWould you like to update your SELinux state from enforcing to permissive? (y/n)\n' yn
 		case $yn in
-			[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;;
+			[Yy]* ) setSE='yes'; break;;
+			[Nn]* ) exp='no'; expsh=" " break;;
 			# * ) echo "Please answer yes or no.";;
 		esac
-		done
+		done	
+
+		if [[ $yn == "yes" ]]; then
+			sed -i "s/SELINUX=enforcing/SELINUX=permissive/g" /etc/selinux/config
+			echo "/etc/selinux/config has been updated. Please reboot your computer before continuing."
+			exit 0
+		fi
 	else
-		echo -e "\nSupport for Firefox/Chrome Back/Forward hotkeys (Cmd+Left/Right) disabled on $branch w/ xkeysnail \n"
-		exp=" "
-		expsh=" "
+		echo "SELinux state should be ok for Kinto to install"
 	fi
-	sudo systemctl enable xkeysnail >/dev/null 2>&1
-	if ! [ -x "$(command -v inotifywait)" ]; then
-		echo "Will need to install inotify-tools to restart key remapper live for config file changes..."
-		sudo ./system-config/unipkg.sh inotify-tools
-	fi
-	if ! [ -x "$(command -v pip3)" ]; then
-		echo "Will need to install python3-pip..."
-		sudo ./system-config/unipkg.sh python3-pip
-	fi
-	if ! [ -x "$(command -v python3-config)" ]; then
-		if [ "$distro" == "ubuntu" ] || [ "$distro" == "debian" ] || [ "$distro" == '"linux mint"' ]; then
-			pydev="python3-dev"
-		elif [ "$distro" == "fedora" ]; then
-			pydev="python3-devel"
-		fi
-		if [ "$distro" == "gnome" ] || [ "$distro" == "fedora" ] || [ "$distro" == "debian" ] || [ "$distro" == '"linux mint"' ]; then
-			echo "Will need to install $pydev..."
-			sudo ./system-config/unipkg.sh "$pydev"
-		fi
-	fi
-	if ! [ -x "$(command -v xhost)" ] || ! [ -x "$(command -v gcc)" ]; then
-		if [ "$distro" == "\"manjaro linux\"" ]; then
-			sudo ./system-config/unipkg.sh "xorg-xhost gcc"
-		fi
-	fi
-	if [ "$distro" == '"linux mint"' ]; then
-		pip3 install setuptools
-	fi
-
-	# 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
-	yes | cp -rf ./xkeysnail-config/kinto.py ./xkeysnail-config/kinto.py.new
-	yes | cp -rf ./xkeysnail-config/limitedadmins ./xkeysnail-config/limitedadmins.new
-	yes | cp -rf ./xkeysnail-config/prexk.sh ~/.config/kinto/prexk.sh
-	yes | cp -rf ./system-config/caret_status_xkey.sh ~/.config/kinto/caret_status_xkey.sh
-	yes | cp -rf ./xkeysnail-config/xkeysnail.service ./xkeysnail-config/xkeysnail.service.new
-	# yes | cp -rf ./xkeysnail-config/xkeysnail.timer ~/.config/systemd/user/xkeysnail.timer
-	sed -i "s#{experimental-caret}#$exp#g" ./xkeysnail-config/xkeysnail.service.new
-	if [ "$expsh" != " " ];then
-		sed -i "s#{kill-caret}#/usr/bin/pkill -f $expsh#g" ./xkeysnail-config/xkeysnail.service.new
+	if [[ $(gsettings get org.gnome.desktop.wm.keybindings show-desktop | grep "\[\]" | wc -l) == 1 ]];then
+		gsettings set org.gnome.desktop.wm.keybindings show-desktop "['<Super>d']"
 	else
-		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#{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#{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#{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
-
-	if $vssublime ; then
-		perl -pi -e "s/(# )(.*)(- Sublime)/\$2\$3/g" ./xkeysnail-config/kinto.py.new >/dev/null 2>&1
+		if [[ $(gsettings get org.gnome.desktop.wm.keybindings show-desktop | grep "<Super>d" | wc -l) == 0 ]]; then
+			echo 'Kinto will not set your "Show Desktop" hotkey due to it already being set.\nPlease set Show Desktop to Super-D, or Edit Kinto'"'"'s config.'
+			echo "Did not run the following."
+			echo "gsettings set org.gnome.desktop.wm.keybindings show-desktop \"['<Super>d']\""	
+		fi
 	fi
 fi
 
-if [[ $1 == "1" || $1 == "winmac" ]]; then
-	if ls /sys/module | grep hid_apple >/dev/null 2>&1 ; then
-		echo '1' | sudo tee /sys/module/hid_apple/parameters/swap_opt_cmd;echo 'options hid_apple swap_opt_cmd=1' | sudo tee /etc/modprobe.d/hid_apple.conf;sudo update-initramfs -u -k all
+# if [ $# -eq 0 ]; then
+# 	echo "Install Kinto - xkeysnail (udev)"
+# 	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 "  4) IBM M - Keyboards w/o Super/Win keys"
+# 	# echo "  5) Uninstall"
+
+# 	read n
+
+# 	set "$n"
+# fi
+
+# branch=$(git rev-parse --abbrev-ref HEAD)
+# if [ "$branch" == "dev" ] || [ "$branch" == "alpha" ];then
+# 	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};{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
+# 	done
+# else
+# 	echo -e "\nSupport for Firefox/Chrome Back/Forward hotkeys (Cmd+Left/Right) disabled on $branch w/ xkeysnail \n"
+exp=" "
+expsh=" "
+# fi
+# sudo systemctl enable xkeysnail >/dev/null 2>&1
+# if ! [ -x "$(command -v inotifywait)" ]; then
+# 	echo "Will need to install inotify-tools to restart key remapper live for config file changes..."
+# 	sudo ./system-config/unipkg.sh inotify-tools
+# fi
+if ! [ -x "$(command -v pip3)" ]; then
+	echo "Will need to install python3-pip..."
+	sudo ./system-config/unipkg.sh python3-pip
+fi
+if ! [ -x "$(command -v python3-config)" ]; then
+	if [ "$distro" == "ubuntu" ] || [ "$distro" == "debian" ] || [ "$distro" == 'linuxmint' ]; then
+		pydev="python3-dev"
+	elif [ "$distro" == "fedora" ]; then
+		pydev="python3-devel"
 	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
+	if [ "$distro" == "gnome" ] || [ "$distro" == "fedora" ] || [ "$distro" == "debian" ] || [ "$distro" == 'linuxmint' ]; then
+		echo "Will need to install $pydev..."
+		sudo ./system-config/unipkg.sh "$pydev"
 	fi
-	if ! ls /sys/module | grep apple ; then
-		removeAppleKB
+fi
+# if [ "$distro" == "ubuntu" ] && [ "$dename" == "gnome" ];then
+# 	sudo ./system-config/unipkg.sh gnome-tweaks gnome-shell-extension-appindicator gir1.2-appindicator3-0.1
+# fi
+if ! [ -x "$(command -v xhost)" ] || ! [ -x "$(command -v gcc)" ]; then
+	if [ "$distro" == "\"manjaro linux\"" ]; then
+		sudo ./system-config/unipkg.sh "xorg-xhost gcc"
 	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
-		perl -pi -e "s/(\w.*)(# Default not-xfce4)/# \$1\$2/g" ./xkeysnail-config/kinto.py.new
-	fi
-elif [[ $1 == "3" || $1 == "chromebook" ]]; then
-	perl -pi -e "s/(# )(.*)(# Chromebook)/\$2\$3/g" ./xkeysnail-config/kinto.py.new
+fi
+if [ "$distro" == 'linuxmint' ]; then
+	pip3 install setuptools
+fi
+
+# 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/kinto/xkeysnail.desktop
+
+# yes | cp -rf ./xkeysnail-config/xkeystart.sh ~/.config/kinto/xkeystart.sh
+
+# *** More testing needing, universal way of killing kinto on user log out? ***
+# yes | sudo cp -rf xkeysnail-config/root_logoff.sh /usr/local/bin/logoff.sh
+# sudo chown root:root /usr/local/bin/logoff.sh
+# sudo chmod u+rwx /usr/local/bin/logoff.sh
+# sudo chmod go-w+rx /usr/local/bin/logoff.sh
+# *** End universal killing of kinto
+
+# logoff fix - not solid for every os. Prevents missed 1 character input on login
+# yes | sudo cp -rf xkeysnail-config/gnome_logoff.sh ~/.config/kinto/logoff.sh
+
+echo "$(git describe --tag --abbrev=0 | head -n 1)" "build" "$(git rev-parse --short HEAD)" > ~/.config/kinto/version
+yes | cp -rf ./xkeysnail-config/kinto.py ./xkeysnail-config/kinto.py.new
+yes | cp -rf ./xkeysnail-config/limitedadmins ./xkeysnail-config/limitedadmins.new
+yes | cp -rf ./xkeysnail-config/gui/ ~/.config/kinto/
+yes | cp -nrf ./xkeysnail-config/initkb ~/.config/kinto/initkb
+yes | cp -rf ./xkeysnail-config/killdups.sh ~/.config/kinto/killdups.sh
+yes | cp -rf ./xkeysnail-config/trayapps/appindicator/kintotray.py ~/.config/kinto/kintotray.py
+yes | cp -rf ./xkeysnail-config/trayapps/appindicator/kintotray.desktop ~/.config/kinto/kintotray.desktop
+yes | cp -rf ./xkeysnail-config/gui/kinto.desktop ./xkeysnail-config/gui/kinto.desktop.new
+yes | cp -rf ./xkeysnail-config/trayapps/appindicator/icons/kinto-color-16.svg ~/.config/kinto/kinto-color.svg
+yes | cp -rf ./xkeysnail-config/trayapps/appindicator/icons/kinto-color-16.svg ~/.config/kinto/kinto-color-48.svg
+yes | cp -rf ./xkeysnail-config/trayapps/appindicator/icons/kinto-invert-16.svg ~/.config/kinto/kinto-invert.svg
+yes | cp -rf ./xkeysnail-config/trayapps/appindicator/icons/kinto-solid-16.svg ~/.config/kinto/kinto-solid.svg
+yes | cp -rf ./xkeysnail-config/trayapps/appindicator/icons/kinto.svg ~/.config/kinto/kinto.svg
+# yes | cp -rf ./system-config/caret_status_xkey.sh ~/.config/kinto/caret_status_xkey.sh
+yes | cp -rf ./xkeysnail-config/xkeysnail.service ./xkeysnail-config/xkeysnail.service.new
+# yes | cp -rf ./xkeysnail-config/xkeysnail.timer ~/.config/systemd/user/xkeysnail.timer
+sed -i "s#{experimental-caret}#$exp#g" ./xkeysnail-config/xkeysnail.service.new
+if [ "$expsh" != " " ];then
+	sed -i "s#{kill-caret}#/usr/bin/pkill -f $expsh#g" ./xkeysnail-config/xkeysnail.service.new
+else
+	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#{homedir}#`echo "$HOME"`#g" ./xkeysnail-config/xkeysnail.service.new
+sed -i "s#{homedir}#`echo "$HOME"`#g" ~/.config/kinto/kintotray.desktop
+sed -i "s#{homedir}#`echo "$HOME"`#g" ~/.config/kinto/gui/kinto-gui.py
+sed -i "s#{homedir}#`echo "$HOME"`#g" ./xkeysnail-config/gui/kinto.desktop.new
+sudo mv ./xkeysnail-config/gui/kinto.desktop.new /usr/share/applications/kinto.desktop
+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#{pkill}#`\\which pkill`#g" ./xkeysnail-config/limitedadmins.new
+sed -i "s#{systemctl}#`\\which systemctl`#g" ~/.config/kinto/xkeysnail.desktop
+sed -i "s#{xhost}#`\\which xhost`#g" ~/.config/kinto/xkeysnail.desktop
+sed -i "s#{homedir}#`echo "$HOME"`#g" ~/.config/kinto/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
+
+if [[ $dename == "budgie" ]]; then
+	perl -pi -e "s/\s{4}(# )(K.*)(# Default SL - Change workspace.*budgie.*)/    \$2\$3/g" ./xkeysnail-config/kinto.py.new >/dev/null 2>&1
+fi
+
+if [[ $distro == "popos" ]]; then
+	perl -pi -e "\s{4}(# )(K.*)(# SL - .*popos.*)/    \$2\$3/g" ./xkeysnail-config/kinto.py.new >/dev/null 2>&1
+fi
+
+if [[ $distro == "fedora" ]]; then
+	perl -pi -e "\s{4}(# )(K.*)(# SL - .*fedora.*)/    \$2\$3/g" ./xkeysnail-config/kinto.py.new >/dev/null 2>&1
+fi
+
+if [[ $distro == "elementaryos" ]]; then
+	perl -pi -e "\s{4}(# )(K.*)(# SL - .*eos.*)/    \$2\$3/g" ./xkeysnail-config/kinto.py.new >/dev/null 2>&1
+fi
+
+if [[ "$distro" == "manjaro"* ]]; then
+	perl -pi -e "\s{4}(# )(K.*)(# SL - .*manjaro.*)/    \$2\$3/g" ./xkeysnail-config/kinto.py.new >/dev/null 2>&1
+fi
+
+if [[ $dename == "gnome" ]]; then
+	perl -pi -e "\s{4}(# )(K.*)(# SL - .*ubuntu.*)/    \$2\$3/g" ./xkeysnail-config/kinto.py.new >/dev/null 2>&1
+fi
+
+if [[ $dename == "kde" ]]; then
+	echo "Applying Cmd-Space to open App Launcher for KDE..."
+	perl -pi -e "s/(# )(.*)(#.*kde)/\$2\$3/g" ./xkeysnail-config/kinto.py.new >/dev/null 2>&1
+fi
+
+if [[ $dename == "xfce" ]]; then
+	perl -pi -e "\s{4}(# )(K.*)(# SL - .*xfce.*)/    \$2\$3/g" ./xkeysnail-config/kinto.py.new >/dev/null 2>&1
 	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
+	perl -pi -e "s/(\w.*)(# Default not-xfce4)/# \$1\$2/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
+if [[ $dename == "xfce" ]] && ls /etc/apt/sources.list.d/enso* 1> /dev/null 2>&1; then
+    echo "enso OS detected, applying Cmd-Space for Launchy..."
+    perl -pi -e "s/(K\(\"RC-Space)(.*)(# )(xfce4)/\$3\$1\$2\$3\$4/g" ./xkeysnail-config/kinto.py.new >/dev/null 2>&1
+    xfconf-query --channel xfce4-keyboard-shortcuts --property "/commands/custom/<Primary>space" --create --type string --set "launchy"
 fi
 
-if [[ $1 == "1" || $1 == "2" || $1 == "3" || $1 == "winmac" || $1 == "mac" || $1 == "chromebook" ]]; then
+if ! [[ $1 == "5" || $1 == "uninstall" || $1 == "Uninstall" ]]; then
 	mv ./xkeysnail-config/kinto.py.new ~/.config/kinto/kinto.py
 	# if [ "$distro" == "fedora" ];then
-	sudo rm /etc/systemd/system/xkeysnail.service
+	sudo rm /etc/systemd/system/xkeysnail.service >/dev/null 2>&1
 	if [ -d /usr/lib/systemd/system ];then
 		xkeypath="/usr/lib/systemd/system/"
 	elif [ -d /lib/systemd/system ];then
 		xkeypath="/lib/systemd/system/"
 	fi
-	sudo mv ./xkeysnail-config/xkeysnail.service.new "$xkeypath"xkeysnail.service && echo "Service file added to "$xkeypath"xkeysnail.service"
-	sudo chown -R root:root "$xkeypath"xkeysnail.service && echo "Ownership set for root..." || echo "Failed to set ownership..."
-	sudo chmod 644 "$xkeypath"xkeysnail.service && echo "Permissions set to 644..." || echo "Failed to set permissions..."
-	sudo ln -s "$xkeypath"xkeysnail.service /etc/systemd/system/xkeysnail.service && echo "Created soft symlink..." || echo "Failed to create soft symlink..."
-	sudo ln -s "$xkeypath"xkeysnail.service /etc/systemd/system/graphical.target.wants/xkeysnail.service && echo "Created soft symlink for graphical target..." || echo "Failed to create soft symlink for graphical target..."
 	xhost +SI:localuser:root
-	git clone --depth 10 https://github.com/rbreaves/xkeysnail.git || git pull --depth 10
+	git clone --depth 10 https://github.com/rbreaves/xkeysnail.git
 	cd xkeysnail
+	git pull --depth 10
 	git checkout 51c369084e0045a8410d227bab52411bf84fb65b
 	giturl=$(git ls-remote --get-url)
 	if [ "$giturl" != "https://github.com/rbreaves/xkeysnail.git" ];then
@@ -330,14 +483,38 @@ if [[ $1 == "1" || $1 == "2" || $1 == "3" || $1 == "winmac" || $1 == "mac" || $1
 	fi
 	sudo pip3 install --upgrade .
 	cd ..
-	sudo systemctl daemon-reload
-	sudo systemctl --state=not-found --all | grep xkeysnail
-	if [ "$distro" == "fedora" ];then
-		systemctl enable xkeysnail.service
-	else
-		sudo systemctl enable xkeysnail.service
+	which xkeysnail
+	if [ $? -eq 1 ]; then
+		echo -e "\nKinto install has \e[1m\033[0;91mfailed\e[0m.\n"
+		echo -e "cd into ./xkeysnail"
+		echo -e "Run 'sudo pip3 install --upgrade .' to debug issue"
+		exit 0
 	fi
-	sudo systemctl restart xkeysnail
+	sed -i "s#{xkeysnail}#`which xkeysnail`#g" ./xkeysnail-config/xkeysnail.service.new
+	sed -i "s#{xkeysnail}#`which xkeysnail`#g" ./xkeysnail-config/limitedadmins.new
+	sudo mv ./xkeysnail-config/xkeysnail.service.new "$xkeypath"xkeysnail.service && echo "Service file added to "$xkeypath"xkeysnail.service"
+	sudo chown root:root ./xkeysnail-config/limitedadmins.new
+	# Add a check here for xkeysnail path resolving
+	sudo mv ./xkeysnail-config/limitedadmins.new /etc/sudoers.d/limitedadmins
+	sudo chown -R root:root "$xkeypath"xkeysnail.service && echo "Ownership set for root..." || echo "Failed to set ownership..."
+	sudo chmod 644 "$xkeypath"xkeysnail.service && echo "Permissions set to 644..." || echo "Failed to set permissions..."
+	sudo ln -s "$xkeypath"xkeysnail.service /etc/systemd/system/xkeysnail.service && echo "Created soft symlink..." || echo "Failed to create soft symlink..."
+	sudo ln -s "$xkeypath"xkeysnail.service /etc/systemd/system/graphical.target.wants/xkeysnail.service && echo "Created soft symlink for graphical target..." || echo "Failed to create soft symlink for graphical target..."
+	sudo systemctl daemon-reload
+	sudo systemctl disable xkeysnail
+	sudo systemctl stop xkeysnail
+	# sudo systemctl --state=not-found --all | grep xkeysnail
+	# if [ "$distro" == "fedora" ];then
+	# 	systemctl enable xkeysnail.service
+	# else
+	# 	sudo systemctl enable xkeysnail.service
+	# fi
+	# sudo systemctl restart xkeysnail
+	sudo pkill -f kintotray >/dev/null 2>&1
+	if [[ $dename == "gnome" || $dename == "kde" ]];then
+		sed -i "s/systray = true/systray = false/g" ~/.config/kinto/initkb
+	fi
+	nohup python3 ~/.config/kinto/gui/kinto-gui.py >/dev/null 2>&1 &
 
 	echo -e "Adding xhost fix...\n"
 
@@ -360,43 +537,22 @@ if [[ $1 == "1" || $1 == "2" || $1 == "3" || $1 == "winmac" || $1 == "mac" || $1
 	fi
 
 	echo -e "Kinto install is \e[1m\e[32mcomplete\e[0m.\n"
-	if `sudo systemctl is-active --quiet xkeysnail`;then
-		echo -e "Kinto \e[1m\e[32mxkeysnail service is running\e[0m.\n"
-		echo "Commands for controlling Kinto's xkeysnail service"
-		echo "sudo systemctl restart xkeysnail"
-		echo "sudo systemctl stop xkeysnail"
-		echo "sudo systemctl start xkeysnail"
-		echo "sudo systemctl status xkeysnail"
-	else
-		echo -e "Kinto \e[1m\e[91mxkeysnail service has failed.\e[0m"
-		echo "You can run 'sudo systemctl status xkeysnail' for more info"
-		echo "You can also run 'sudo journalctl -u xkeysnail'"
+
+	echo "If the setup wizard fails to appear then please run this command."
+	echo -e "~/.config/kinto/gui/kinto-gui.py\n"
+	echo -e "You can then either \e]8;;https://google.com\a\e[1m\e[36mG\033[0;91mo\033[0;93mo\e[1m\e[36mg\e[1m\e[32ml\033[0;91me\e[0m\e]8;;\a what dependencies you may be missing\nor \e]8;;https://github.com/rbreaves/kinto/issues/new\?assignees=rbreaves&labels=bug&template=bug_report.md&title=\aopen an issue ticket.\e]8;;\a\n"
+
+	if [ "$distro" == "manjarolinux" ]; then
+		echo "If you are using Manjaro and see an error about 'GLIBC_2.xx not found' appears then please update your system."
+		echo "sudo pacman -Syu"
 	fi
-	echo ""
-	if $vssublime ; then
-		echo -e "\e[1m\e[32mEnabled\e[0m VS Code Sublime Text remap."
+
+	if [ "$dename" == "gnome" ];then
+		echo "Gnome may not support appindicators well, so by default you may need to install packages before enabling the System Tray."
+		echo "You may try one of the following extensions."
+		echo -e "    1) \e]8;;https://extensions.gnome.org/extension/615/appindicator-support/\aAppIndicator and KStatusNotifierItem Support\e]8;;\a"
+		echo -e "    2) \e]8;;https://extensions.gnome.org/extension/1031/topicons/\aTopIcons Plus\e]8;;\a"
+		echo -e "\nNote: you may want these supporting packages\n'sudo apt install gnome-tweaks gnome-shell-extension-appindicator gir1.2-appindicator3-0.1'"
 	fi
-	if $rightalt ; then
-		echo -e "\e[1m\e[32mEnabled\e[0m mutli-language support."
-	fi
-elif [[ $1 == "5" || $1 == "uninstall" || $1 == "Uninstall" ]]; then
-	echo "Uninstalling Kinto - xkeysnail (udev)"
-	uninstall
-	removeAppleKB
-	sudo systemctl stop xkeysnail
-	sudo systemctl disable xkeysnail
-	sudo rm /etc/sudoers.d/limitedadmins
-	rm ~/.config/autostart/xkeysnail.desktop
-	rm -rf ~/.config/kinto
-	sudo rm /etc/systemd/system/xkeysnail.service
-	sudo rm /etc/systemd/system/graphical.target.wants/xkeysnail.service
-	sudo rm /usr/lib/systemd/system/xkeysnail.service
-	sudo systemctl daemon-reload
-	sudo systemctl --state=not-found --all | grep xkeysnail
-	budgieUninstall
-	exit 0
-elif [[ $1 == "5" || $1 == "budgieUpdate" ]]; then
-	budgieUpdate
-else
-	echo "Expected argument was not provided"
+
 fi