Added xfce4-terminal to xkb remap

.gitattributes

@@ -1,3 +1,3 @@
-*.py linguist-detectable=true
+*.py linguist-detectable=false
 *.json liguist-detectable=false
-*.c linguist-detectable=true
+*.c linguist-detectable=true

.github/ISSUE_TEMPLATE/bug_report.md

@@ -19,16 +19,21 @@ A clear and concise description of what you expected to happen.
 **Branch:** master, dev
 **Commit:** git rev-parse --short HEAD
 
-Logs and status if relevant
+**Kinto Input Caret Status**
+```
+cat /tmp/kinto/caret
 ```
-# xkeysnail
-sudo systemctl status xkeysnail
-sudo journalctl --unit=xkeysnail.service -b
 
-# xkb
-systemctl --user status keyswap
+**Kinto Standard Log**
+```
 journalctl --user-unit=keyswap.service -b
 ```
+**Kinto Debug Log (1.0.6-2+)**
+```
+systemctl --user stop keyswap
+cd ~/.config/kinto
+./kintox11 --debug
+```
 
 **Screenshots**
 If applicable, add screenshots to help explain your problem.

.gitignore

@@ -1,6 +1,3 @@
 .env/
 .DS_Store
 __pycache__/
-xkeysnail/
-keybindings_*
-mutter_*

README.md

@@ -1,86 +1,58 @@
-# Kinto.sh
+# Kinto
 
-![kinto-color-132](https://user-images.githubusercontent.com/10969616/94909977-9d2d4900-0469-11eb-8710-986289fe7240.gif)
+![kinto_carrot](https://user-images.githubusercontent.com/10969616/77842401-4744b500-7157-11ea-854a-d7dec6f9a250.gif)
 
+![alt text](https://raw.githubusercontent.com/rbreaves/kinto/master/Kinto.png)
 
 [![GitHub release](https://img.shields.io/github/release/rbreaves/kinto.svg)](https://github.com/rbreaves/kinto/releases/latest)
 
 \- Type in Linux & Windows like it's a Mac. \-
 
-Seamless copy and paste with all apps and terminals. 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)
-
-[How to install (Linux)](#How-to-install-Linux)
-
-[How to install (Windows)](#How-to-install-Windows)
-
-[What does Kinto require?](#What-does-Kinto-require)
-
-[Shortcut Creation](#Shortcut-Creation)
-
-[How to Upgrade/Control Kinto](#How-to-Upgrade-Kinto)
-
-[Troubleshooting](#Troubleshooting)
-
-[Language Support](#Language-Support)
-
-[Related or Useful Resources](#Related-or-Useful-Resources)
-
-[Contributing](#Contributing)
-
-[More information about Kinto](#More-information-about-Kinto)
-
-[License](#License)
-
-[Credits and Contributions](#Credits-and-Contributions)
+Seamless copy and paste with all apps and terminals. Also the only linux remapper that is aware of your cursor/caret status - meaning it avoids shortcut conflicts within an app versus wordwise shortcuts when a text field is in use.
 
 ## What does this do exactly?
 
-Kinto works for standard Windows, Apple and Chromebook keyboards. The following however describes the dynamic rebinding based on a standard Windows/Mac keyboard.
+Kinto works for standard Windows, Apple and Chromebook keyboards. The following however describes the dynamic rebinding based on a standard Windows keyboard. (Alt location is Cmd for Apple keyboards)
+
+- Normal apps - Alt → Ctrl, Win/Super → Alt, Ctrl → Win/Super
+
+- Terminal apps - Alt → Ctrl+Shift, Win/Super → Alt, Ctrl → Ctrl
 
 - Cursor/word-wise shortcut keys have been added to align with macOS keyboard shortcuts.
 
-**GUI**
-|**Physical**| Ctrl  |  Win/Alt |  Alt/Cmd | Spacebar|
-|---|---|---|---|---|
-|**Virtual**|  Win/Super* | Alt  |  RCtrl |Spacebar|
+## What does Kinto require?
 
-*Win/Super will properly remap to LCtrl when needed to fully support expected keymaps.
+- Python (initial install only)
+- systemd
+- x11
+- IBus*
+- Fedora/RHEL/Manjaro/Arch/Debian/Ubuntu based distro 16.04+
 
-**Terminal**
-|**Physical**| Ctrl  |  Win/Alt |  Alt/Cmd | Spacebar|
-|---|---|---|---|---|
-|**Virtual**|  LCtrl | Alt  |  RCtrl |Spacebar|
+Binary is included and will be installed, but you can also compile kintox11.c on your system. You will need to compile and install json-c first as its libraries will be required to compile and run the program.
 
-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.
+*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.
 
-## What's different?
+On most distros you can confirm navigate to your "Language Support" and set "Keyboard input method system:" to IBus for full word-wise support with web browsers. 
 
-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.
+Wayland support is planned, but not ready yet.
 
-It also retains some of the most commonly used system level shortcut keys, such as Cmd-C/V, Cmd-Tab, and Ctrl-Tab among others. You will keep seamless copy & paste between all apps, ability to switch Windows while still using the physical Cmd/Alt key position; switch tabs in your favorite terminals, code editors, or web browsers. Depending on your OS and/or Desktop Environment you may also be able to switch Virtual Desktop environments the same way as well and other basic system level shortcuts.
+## Kinto for Windows 10 Requirements
 
-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.
+- WSL Ubuntu edition
+- Powershell - run as Administrator
+- Python3
 
-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)
+Other programs that will be installed when you run ./setup.py
+- Chocolatey
+- Autohotkey
 
-## How to install (Linux)
+Does not have complete parity with the Linux edition, but it does work and can be built on and added to as needed. Modify ./windows/kinto.ahk if you want to add more WSL editions or other terminals.
 
-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%">
+## How to install
 
 1. clone this repo
 ```
 git clone https://github.com/rbreaves/kinto.git
-cd kinto
 ```
 2. Install python3 (If needed)
 
@@ -90,164 +62,42 @@ sudo apt update
 sudo apt install python3
 ```
 
-3. Run the script, press 1 or 2 keys and you are done.
+3. Follow the prompts and the script will guide you through the rest of the setup.
 ```
 ./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 -r
+./uninstall.sh
 ```
 
-## How to Install (Windows)
+## Other Notes Related to Install
 
-Video Tutorial: [How to Install Kinto.sh on Windows 10](https://youtu.be/sRk8A8krz40)
+**Manjaro with Gnome there are issues.** 
 
-1. Open Powershell (Right click and Run as Administrator)
+Please see this ticket for more information.
 
-2. clone this repo
+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
 ```
-git clone https://github.com/rbreaves/kinto.git
-cd kinto
+export GTK_IM_MODULE=xim
+export XMODIFIERS=@im=ibus
+export QT_IM_MODULE=xim
 ```
-3. Install - Select keyboard type
-```
-py setup.py
-```
-
-4. How to make Kinto stay visible in system tray (optional)
-
-<img src="https://user-images.githubusercontent.com/10969616/85195077-2f338c00-b295-11ea-8aa3-e6aa06a9a279.png" width="50%" height="50%">
-<img src="https://user-images.githubusercontent.com/10969616/85195079-30fd4f80-b295-11ea-8bcd-257990b77dcb.png" width="50%" height="50%">
-<img src="https://user-images.githubusercontent.com/10969616/85195082-322e7c80-b295-11ea-8c81-320dab424c3c.png" width="50%" height="50%">
-
-To Uninstall Kinto - Select Uninstall
-
-```
-py setup.py
-```
-
-## 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)
-
-[Windows Shortcut Creation (Autohotkey)](#Windows-Autohotkey)
-
-
-## Linux (Xkeysnail)
-
-**GUI Keys**
-| Value| Description|Mac/Kinto Equivalent|
-| ----- |:--------:|:--------:|
-|C,Ctrl|Control|Cmd|
-|M,Alt| Alt/Option|Alt/Option|
-|Super | Win/Super|Ctrl|
-
-**Terminal Keys**
-| Value| Description|Mac/Kinto Equivalent|
-| ----- |:--------:|:--------:|
-|RC,RCtrl|Right Control → Left & Right Alt/Cmd key|Cmd|
-|M,Alt|Alt/Option|Alt/Option|
-|LC,LCtrl |Left Control|Ctrl|
-
-You can define new keymaps for your specific app via this method. You also do not have to cancel out the original keybinding if you do not need or want to, but you can do so with "pass_through_key".
-
-### Defining Keymaps Per App
-```
-# Keybindings for Sublime Text
-define_keymap(re.compile("Sublime_text"),{
-    K("C-h"): pass_through_key,          # cancel replace
-    K("Ctrl-Alt-f"): K("Ctrl-h"),        # replace
-    K("C-M-v"): [K("C-k"), K("C-v")],    # paste_from_history
-}
-```
-
-In the above example I am also showing that you can define a single shortcut to enact multiple shortcut keys if needed by defining an array of shortcuts to trigger.
-
-You can also make changes to the file in your /tmp/kinto/xkeysnail/kinto.py location and see them take affect in real time, but for your changes to be permanent you will need to make your changes in the ~/.config/kinto/kinto.py location & restart the xkeysnail service.
-
-```
-sudo systemctl restart xkeysnail
-```
-
-More information can be seen on the readme page of [xkeysnail](https://github.com/mooz/xkeysnail).
-
-## Windows (Autohotkey)
-
-This applies to the Windows version of Kinto and how to add additional support for Applications. The configuration file location is `~/.kinto/kinto.ahk` and after updating it you will want to right click on the tray icon and click on setting your keyboard type again and it will re-apply the latest changes.
-
-Windows 10 has a couple of ways that you need to be aware of when trying to add a specific application, the typical method of how to add any exe program, but then there is also the newer UWP app format that some applications use which will require a similar but different method, both will be discussed.
-
-### Defining Keymaps Per App by EXE Name
-You can use the following legend **but** realize that these remaps reference the Virtual keys in the diagrams mentioned near the beginning of this document, so **do not** confuse it with the physical key unless they happen to be the same key.
-
-|Autohotkey Symbol|Virtual key|Description|
-|---|---|---|
-|^,Ctrl|Control|Primary modifier, 1st rock from the spacebar|
-|!,Alt|Alt|Secondary modifier, 2nd rock from the spacebar|
-|#,Win|Win/Super|Tertiary modifier, 3rd rock from the spacebar|
-
-```
-...
-#IfWinActive ahk_exe sublime_text.exe
-    #^Up::send !{O}                                         ; Switch file
-    #^f::send {F11}                                         ; toggle_full_screen
-    ^!v::send {Ctrl Down}k{Ctrl Up}{Ctrl Down}v{Ctrl Up}    ; paste_from_history
-    ...
-#If
-...
-```
-
-With this being Autohotkey you can easily pull knowledge from the Autohotkey forums for just about any issue you may have as well.
-
-### Defining Keymaps Per UWP App
-
-```
-#If WinActive("- OneNote ahk_class ApplicationFrameWindow", "OneNote")
-...
-    ; Add your keymaps here
-...
-#If
-```
-
-I don't have too many examples on this one, most developers seem to be shying away from UWP. Kinto currently supports "Fluent Terminal" which is a UWP app, but it is also being grouped with other Terminal apps for hotkey remapping. You may take a look at that, but you may also want to try creating a new Autohotkey file and use the Window Spy feature built into Autohotkey to help you discover the full name and class names of any application.
-
-## Shortcut Creation (XKB)
-The older xkb shortcut method info can be read about in ticket [#125](https://github.com/rbreaves/kinto/issues/125).
 
 ## How to Upgrade Kinto
 
-Simply bring down the latest then you can re-run the setup.py installer, it will stop the service and re-install 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.
 
-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.
+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.
 
 ```
 git pull origin master
@@ -256,69 +106,360 @@ git pull origin master
 
 ## How to Control Kinto
 
-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.
+Under systemd this is how you control Kinto.
 
 Status
 ```
-sudo systemctl status xkeysnail
+systemctl --user status keyswap
 ```
 
 Stop (your keymap will return to normal)
 ```
-sudo systemctl stop xkeysnail
+systemctl --user stop keyswap
 ```
 
 Start
 ```
-sudo systemctl start xkeysnail
+systemctl --user start keyswap
 ```
 
 Restart
 ```
-sudo systemctl restart xkeysnail
+systemctl --user restart keyswap
+```
+
+Enable
+```
+systemctl --user enable keyswap
+```
+
+Disable
+```
+systemctl --user disable keyswap
+```
+
+## How to Add Setxkbmap Option inside Kinto
+
+To summarize you'll need to pull the partial out of the symbols file the option resides in and then add that to the mac_gui file and lastly reference it in the keymap file(s) you want it in.
+
+symbols directory
+```
+/usr/share/X11/xkb/symbols/ 
+```
+
+symbols file
+```
+~/.xkb/symbols/mac_gui
+```
+
+keymap files
+```
+~/.xkb/keymap/kbd.mac.gui
+~/.xkb/keymap/kbd.mac.term
+```
+
+A more detailed explaination is here.
+https://github.com/rbreaves/kinto/issues/50#issuecomment-595953373
+
+## How to Add or Change keymaps for Applications
+
+Note: All of the following is already done in Kinto (but may also change as improvements are made). The following is purely for documentation and example sake as they are real examples of how to leverage the json config to support additional keymaps.
+
+**First it is important to understand how Kinto operates.**
+
+1. It listens for any focus/active window changes
+2. It applies the proper keymap based on the programs name.
+3. It may monitor your caret/cursor input status, if the app is known to cause shortcut conflicts with wordwise
+4. It runs anywhere from 1 to 3 commands to fully remap your computer.
+
+Ok great, we've covered the basics, now what are your options on modifying functionality?
+It depends.
+
+Do you want to remap keys using xkb or xbindkeys with xdotool, or something else entirely?
+The choice is yours, but I'd recommend xbindkeys with xdotool for anyone that doesn't want to spend the time or learn xkb. I prefer xkb but it completely remaps your keyboard and it could break things if done poorly.
+
+**How to Remap using XBindKeys with Xdotool - Firefox**
+
+1. By default Firefox is mapped with the standard gui based xkb config, and only if no input has focus does it then run xbindkeys to map the Cmd+Left/Right arrow key location to the Back and Forwards functionality you'd expect.
+
+2. The xbindkeys script takes into account the xkb mapping being the base because it is actually remapping Home and End to Back and Forwards as there is no real reason to reload an entire xkb layout.
+
+~/.config/kinto/user_config.json
+```
+...
+{
+    "name": "firefox",
+    "run": "setxkbmap -option;xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.gui $DISPLAY",
+    "run_onInput": "killall xbindkeys > /dev/null 2>&1",
+    "run_offInput": "killall xbindkeys > /dev/null 2>&1;xbindkeys -f $HOME/.config/kinto/.firefox-nw",
+    "symbols": "",
+    "types": "",
+    "de": [
+	2
+    ],
+    "appnames": [
+	"Firefox"
+    ]
+},
+...
+```
+~/.config/kinto/.firefox-nw
+```
+"xdotool key --delay 0 --clearmodifiers Control_L+bracketleft"
+  // Alt/Cmd + Left
+  Home + Release
+
+"xdotool key --delay 0 --clearmodifiers Control_L+bracketright"
+  // Alt/Cmd + Right
+  End + Release
+  
+# Note additional keymaps can easily be added to this file and I will accept any PR's with keymaps that align with macs
+```
+
+Once you have made your changes you can restart the Kinto service and the changes will take affect.
+```
+systemctl --user restart keyswap
+```
+
+Under normal circumstances this keymap would not have worked well had Firefox not included 2 keymap options for going forwards or back. In the next example, Chrome, you will see how to solve this very same problem but in xkb format and it is the only way to fix it for Chrome due to conflicting with wordwise shortcuts.
+
+Also the choice of xdotool over something like xte (xautomation) was explicit, xdotool allows you to hold down a modifier and continue to repeat the action(s) and xte does not.
+
+**How to Remap Using XKB - Chrome**
+
+This gets to be a little more complicated, but this is what you have to do to accomplish the same on the xkb level.
+
+**Summary**
+1. Copy ~/.xkb/keymap/kbd.mac.gui and append the name of the app. (e.g. chrome)
+2. Edit ~/.xkb/keymap/kbd.mac.gui.chrome
+3. Add new keybindings to ~/.xkb/symbols/mac_gui
+4. Only edit types if you absolutely need to add another modifier level (~/.xkb/types/mac_gui)
+
+Understand that as you add or modify the ~/.xkb/symbols/ files that these two groups **symbols[Group1]** and **actions[Group1]** will be following the order of the modifier levels that are configured in the related ~/.xkb/types/mac_gui or mac_term file.
+
+Also you will have to discover the proper xkb names for keys and that they will often follow *two different* labels/names. eg RGHT vs Right ... **replace key \<RGHT\>** vs **symbols[Group1]= [ Right, ...**.
+
+A good place to get the proper names/labels are these two files.
+```
+/usr/share/X11/xkb/symbols/us
+/usr/share/X11/xkb/symbols/inet
+```
+
+Ok, so here are the detailed instructions.
+
+1. cp ~/.xkb/keymap/kbd.mac.gui ~/.xkb/keymap/kbd.mac.gui.chrome
+
+2. nano ~/.xkb/keymap/kbd.mac.gui.chrome
+```
+# Change mac_gui(mac_levelssym)
+...
+xkb_symbols   { include "pc+us+us:2+inet(evdev)+ctrl(swap_lwin_lctl)+ctrl(swap_rwin_rctl)+mac_gui(mac_levelssym)"	};
+...
+# To +mac_gui(mac_chrome)
+xkb_symbols   { include "pc+us+us:2+inet(evdev)+ctrl(swap_lwin_lctl)+ctrl(swap_rwin_rctl)+mac_gui(mac_chrome)"	};
+...
+};
+```
+
+3. Add your new "partial xkb_symbols" via nano ~/.xkb/symbols/mac_gui
+```
+partial xkb_symbols "mac_chrome" {
+    // Back Button
+    replace key <LEFT> {
+        type[Group1]= "ONE_LEVEL_CTRL",
+        symbols[Group1]= [
+            Left,
+            Left,
+            Left
+        ],
+        actions[Group1]= [
+            NoAction(),
+            RedirectKey(key=<UP>),
+            RedirectKey(key=<LEFT>,modifiers=Mod1,clearmods=Control)
+        ]
+    };
+    // Forwards Button
+    replace key <RGHT> {
+        type[Group1]= "ONE_LEVEL_CTRL",
+        symbols[Group1]= [
+            Right,
+            Right,
+            Right
+        ],
+        actions[Group1]= [
+            NoAction(),
+            RedirectKey(key=<DOWN>),
+            RedirectKey(key=<RGHT>,modifiers=Mod1,clearmods=Control)
+        ]
+    };
+```
+
+~/.config/kinto/user_config.json
+```
+{
+    "name": "chrome",
+    "run": "setxkbmap -option;xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.gui.chrome $DISPLAY",
+    "run_onInput": "xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.gui $DISPLAY",
+    "run_offInput": "xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.gui.chrome $DISPLAY",
+    "symbols": "",
+    "types": "",
+    "de": [
+	2
+    ],
+    "appnames": [
+	"Chromium",
+	"Chromium-browser",
+	"Google-chrome"
+    ]
+}
+```
+4. Not making changes to types but it looks like this. It contains 5 levels of modifiers, Base, Alt, Control, Shift+Control, and Shift+Alt. Additional Levels can and may be added later, but please do not change the order of the Levels or existing symbols files will break!! You can add new levels however without issue.
+```
+default partial xkb_types "addmac_levels" {
+    type "ONE_LEVEL_CTRL" {
+        modifiers= Mod1+Control+Shift;
+        map[Mod1]= Level2;
+        map[Control]= Level3;
+        map[Mod1+Control]= Level3;
+        map[Shift+Control]= Level4;
+        map[Shift+Mod1] = Level5;
+        level_name[Level1]= "Base";
+        level_name[Level2]= "Alt";
+        level_name[Level3]= "Control";
+        level_name[Level4]= "Shift with Control";
+        level_name[Level5] = "Shift Alt";
+    };
+};
+```
+
+Once you have made your changes you can restart the Kinto service and the changes will take affect.
+```
+systemctl --user restart keyswap
+```
+
+## JSON config files
+
+Features
+- Unlimited keyboard configurations per App/category (user_config.json - config -> create app object)
+- Dynamic Desktop Environment shortcut capabilities (user_config.json - de -> create DE tweak/remap)
+
+Located at ~/.config/kinto/ you will find user_config.json which will look like the following after an install. You can modify the defaults.json file in the root directory of kinto to create additional keyboard layout types/support without needing to modify any of the underlying Kinto code. 
+
+You can also add additional Desktop Environment related tweaks to user_config.json in the install directory as well and the installer will prompt you to install them. You may also fork and submit any json or additional .xkb configurations to me for approval if you believe it makes Linux more like typing on a Mac.
+
+```
+{"config":[
+	//
+	// Each config category contains the category name, and references to the de tweaks
+	// And contains the default run commands plus what behavior they should exhibit for
+	// input fields on/off focus, if any.
+	// Symbols and types are not currently used - may later replace the need for static
+	// files with xkbcomp.
+	//
+	// If you use xbindkeys outside of Kinto then you may want to remove xbindkeys from
+	// this config after setup or rewrite the command to exclude your own xbindkeys.
+	//
+	{
+		"name":"gui",
+		"run":"setxkbmap -option;xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.gui $DISPLAY",
+		"de":[2],
+		"appnames":[ "" ],
+		"run_onInput":"",
+		"run_offInput": "killall xbindkeys > /dev/null 2>&1",
+		"symbols":"",
+		"types":"",
+		"de":[],
+		"appnames":[ "" ]
+	},
+	{
+		"name":"term",
+		"run":"setxkbmap -option;xkbcomp -w0 -I$HOME/.xkb ~/.xkb/keymap/kbd.mac.term $DISPLAY",
+		"de":[2],
+		"appnames":[ "Gnome-terminal","konsole","io.elementary.terminal","terminator","sakura","guake","tilda","xterm","eterm","kitty" ],
+		"run_onInput":"",
+		"run_offInput": "killall xbindkeys > /dev/null 2>&1",
+		"symbols":"",
+		"types":"",
+		"de":[],
+		"appnames":[ "" ]
+	}],
+	// Init - Array that references de objects by their ID and runs the "run" command
+	// when the app initially runs.
+	"init": [1],
+	// detypes - DE's with support or planned support
+	"detypes":["gnome2","gnome3","kde4","kde5","xfce","i3wm"],
+	// de - tweak objects and initial command to be ran on start.
+	//
+	//    Intent - init or gui_term, to signify what type of tweak it is.
+	//      run, run_term, run_gui - run is only relevant for init, and the
+	//      other two relate to gui_term and running under those modes.
+	"de":[{
+		"id": 1,
+		"type": ["gnome3"],
+		"active": false,
+		"intent":"init",
+		"name":"gnome-init",
+		"description":"Gnome - Remove Superkey Overlay keybinding to Activities Overview",
+		"run":"gsettings set org.gnome.mutter overlay-key ''",
+		"run_term":"",
+		"run_gui":""
+	},
+	{
+		"id": 2,
+		"type": ["gnome3"],
+		"active": false,
+		"intent":"gui_term",
+		"name":"Gnome Activities Overview",
+		"description":"Cmd+Space activates Activities Overview",
+		"run":"",
+		"run_term":"gsettings set org.gnome.desktop.wm.keybindings panel-main-menu \"['<Control><Shift>Space']\"",
+		"run_gui":"gsettings set org.gnome.desktop.wm.keybindings panel-main-menu \"['<Ctrl>Space']\""
+	},
+	{
+		"id": 3,
+		"type": ["kde5"],
+		"active": false,
+		"intent":"init",
+		"name":"kde-init",
+		"description":"KDE Plasma 5 - Removes Superkey Overlay from the Launcher Menu",
+		"run":"kwriteconfig5 --file ~/.config/kwinrc --group ModifierOnlyShortcuts --key Meta \"\";qdbus org.kde.KWin /KWin reconfigure",
+		"run_term":"",
+		"run_gui":""
+	}]
+}
+```
+
+## 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?
-
-Are you using a VM on macOS? If so you may need to disable automatic remapping of the Cmd key when using Vmware Fusion of Parallels.
-
-Disable Parallels Re-mapping:
-1) Open Parallels and go to Preferences.
-2) Click Keyboard and disable the Virtual machine shortcuts.
-3) Close Preferences.
-
-To disable keyboard mapping:
-1) From Fusion's menu bar, click VMware Fusion > Preferences...
-2) Click Keyboard & Mouse.
-3) Click the Key Mappings tab.
-4) Deselect Enable Key Mapping.
-
 ### Does not start when you log in or after you reboot?
 
+1. Check the status
+```
+systemctl --user status keyswap
+```
+2. Check the service journal
+```
+journalctl --user-unit=keyswap.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
 ```
 
-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
+nano ~/.config/systemd/user/keyswap.service
 ```
 ...
 [Service]
@@ -330,103 +471,48 @@ 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.
+
+Now that Kinto 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
+```
+2. Restart Kinto
+```
+systemctl --user restart keyswap
+```
+3. Check the Status again and open a ticket if you need to.
+```
+systemctl --user status keyswap
+```
+
+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
+
+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.
+
+```
+systemctl --user stop keyswap
+cd ~/.config/kinto
+./kintox11 --debug
+```
+
 ## 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.
 
-## Related or Useful Resources
+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
 
-[Xkeysnail](https://github.com/mooz/xkeysnail) by mooz
+## Notes about Windows 10
+Sharpkeys was used to create the layout/reg files to swap the Ctrl, Win and Alt keys. Sharpkeys was not required however because the reg keys were extracted. Autohotkey is used to manage keyswaps needed for terminal usage. Autohotkey is also used to add additional mac like keybinds for Sublime text and can be used for other apps as well.
 
-Yet another keyboard remapping tool for X environment
-
-[mac-precision-touchpad](https://github.com/imbushuo/mac-precision-touchpad) by imbushuo
-
-Windows 10 touchpad to precision touchpad driver
-
-[fusuma](https://github.com/iberianpig/fusuma) by iberianpig
-
-Multitouch gestures with libinput driver on Linux
-
-[Facetime HD Camera for Linux](https://github.com/patjak/bcwc_pcie) by patjak
-
-Linux driver for Facetime HD on macbooks
-
-[Fluent Terminal - Windows only](https://github.com/felixse/FluentTerminal) by felixse
-
-
-A Terminal Emulator based on UWP and web technologies.
-
-[PowerToys - Windows only](https://github.com/microsoft/PowerToys) by microsoft
-
-Windows system utilities to maximize productivity
-
-[AutoHotKey - Windows only](https://github.com/AutoHotkey/AutoHotkey) by AutoHotkey
-
-AutoHotkey is a powerful and easy to use scripting language for desktop automation on Windows.
-
-[pykeymacs](https://github.com/zhanghai/pykeymacs) by zhanghai
-
-Emacs style keyboard macros implemented in Python
-
-[Dynamic Wallpapers](https://github.com/adi1090x/dynamic-wallpaper) by adi1090x
-
-Simple bash script to set a Dynamic Wallpaper according to certain conditions.
-
-[macify-linux](https://github.com/Jonchun/macify-linux) by JonChun
-
-Automated setup scripts to transform Linux into macOS. (Uses Kinto for key remaps)
-
-[ibus-typing-booster](https://github.com/mike-fabian/ibus-typing-booster) by mike-fabian
-
-ibus-typing-booster is a completion input method for faster typing
-
-[twemoji color font](https://github.com/eosrei/twemoji-color-font) by eosrei
-
-Twitter Unicode 12 emoji color SVGinOT font for Linux/MacOS/Windows
-
-[iTerm2 Color Schemes](https://github.com/mbadolato/iTerm2-Color-Schemes) by mbadolato
-
-Over 225 terminal color schemes/themes for iTerm/iTerm2. Includes ports to Terminal, Konsole, PuTTY, Xresources, XRDB, Remmina, Termite, XFCE, Tilda, FreeBSD VT, Terminator, Kitty...
-
-[espanso](https://github.com/federico-terzi/espanso) by federico-terzi
-
-Cross-platform Text Expander written in Rust
-
-[GalliumOS](https://github.com/GalliumOS/galliumos-distro) by GalliumOS
-
-Docs, issues, and artwork sources for GalliumOS
-
-[eOS-X](https://github.com/ipproductions/eOS-X) by ipproductions
-
-Dark & Light Theme w/ OSX controls for Elementary OS
-
-[Autorandr](https://github.com/phillipberndt/autorandr) by phillipberndt
-
-Auto-detect the connected display hardware and load the appropriate X11 setup using xrandr
-
-[Barrier](https://github.com/debauchee/barrier) by debauchee
-
-Open-source KVM software
-
-[Synergy Free Binaries](https://github.com/amankhoza/synergy-binaries) by amankhoza
-
-The latest freely available Synergy binaries
-
-[Synergy Official](https://symless.com/) by Symless
-
-Latest Official Synergy
-
-[Karabiner-Elements](https://github.com/pqrs-org/Karabiner-Elements) by pqrs-org
-
-Karabiner-Elements is a powerful utility for keyboard customization on macOS Sierra (10.12) or later. 
-
-[mbpfan](https://github.com/linux-on-mac/mbpfan) by linux-on-mac
-
-A simple daemon to control fan speed on all MacBook/MacBook Pros (probably all Apple computers) for Linux Kernel 3 and newer
-
-[vala-panel](https://github.com/rilian-la-te/vala-panel) by rilian-la-te
-
-Vala rewrite of SimplePanel - GitHub mirror (Global Menu for XFCE)
+Microsoft is working on a new Powertoy Keyboard Manager that could be used with an easier to use GUI interface, but this approach should be fully sufficient for a mac like experience and autohotkeys appears to be more than capable enough to handle complex rebinding of any or most mac like shortcuts.
 
 ## Contributing
 
@@ -449,7 +535,7 @@ GPL v2
 
 I would just like to thank a few people here directly that have helped me tremendously with completing this project and without their support, direct, indirect or otherwise I would have had difficulty completing this undertaking. I will list these things off in chronological order mostly.
 
-First off I'd like to thank the Stackoverflow and Stackexchange community. I have probably rubbed some mods the wrong way over there, but the people from the community in general are extremely helpful and gracious and without their contributions would have made this much more difficult. The person I'd like to thank most though from over there is Glen Whitney. Without his detailed explaining of how to rebind keys in xkb this would not have come together at all, as every other remapping solution were non-starters as complexity increases. *Kinto today no longer uses xkb, but Glen Whitney did provide the basis of a workable method that helped me pursue this method and think it was a worthwhile project to pursue, so for that I thank him.*
+First off I'd like to thank the Stackoverflow and Stackexchange community. I have probably rubbed some mods the wrong way over there, but the people from the community in general are extremely helpful and gracious and without their contributions would have made this much more difficult. The person I'd like to thank most though from over there is Glen Whitney. Without his detailed explaining of how to rebind keys in xkb this would not have come together at all, as every other remapping solution were non-starters as complexity increases.
 
 Secondarily I'd like to thank Christian Eriksson*, as he provided information that kept me up at night.. literally. Even after I implemented a similar bash script to one he had suggested I knew that fully implementing a c/c++ solution was where Kinto needed to head to and his explaination was better than I remember it being now that I have gone back to read it again. He also never provided a full implementation of a c/c++ solution - he did hit on the pain points pretty well of what one would need to do and watch out for. I am not sure where I got the first example code of implementing a c based solution, but he definitely went over it well.
 
@@ -458,14 +544,8 @@ Kui and his gist file** was really the c based solution that I found had the few
 
 Lastly these four people were also very helpful to me as well. @probonopd for being one of the first people to install and use Kinto and gave me the initial feedback to include wordwise support! He also has really great articles*** posted on HackerNews & Medium about UI/UX design. Another person I'd like to thank is @owzim, his feedback allowed me to rapidly iterate and fix several bugs to support additional platforms better. The last two are members of the #ubuntu channel in IRC on freenode, tarzeau ( @alexmyczko ) and sarnold. Alex contributing a proper Makefile, so the project can be packaged properly, and sarnold help me find that IBus could resolve an issue I was having with needing to detect the caret status.
 
-**Updated 6/13/2020**
-
-I would also like to thank Jonathan Chun for his patience in helping me work through a very difficult problem related to Alt-Tab switching, which led to the current xkeysnail iteration of Kinto for Linux that far exceeds the original xkb implementation. There are also several others that have created issue tickets that have contributed greatly.
-
 If I left anyone out then I apologize, that was not intentional. I am happy to say that this project is at a state of completion. Bug fixes will primarily be the only activity happening going forward and possibly a rewrite for Wayland at some point. Contributions as mentioned above are welcomed, and will be merged into master if they help with the goal of making typing on linux more like a mac.
 
 *https://askubuntu.com/questions/1010276/can-i-act-on-the-event-that-a-window-opens-without-polling
-
 **https://gist.github.com/kui/2622504
-
 ***https://medium.com/@probonopd/make-it-simple-linux-desktop-usability-part-1-5fa0fb369b42

defaults.json

@@ -1,6 +1,6 @@
 {"defaultapps":[{
 		"name":"term",
-		"appnames":[ "Gnome-terminal","konsole","io.elementary.terminal","terminator","sakura","guake","tilda","xterm","eterm","kitty" ]
+		"appnames":[ "Gnome-terminal","konsole","io.elementary.terminal","xfce4-terminal","terminator","sakura","guake","tilda","xterm","eterm","kitty" ]
 	}],
 	"defaulttypes":["windows","mac","chromebook"],
 	"defaults":[{

kinto_old/setup.py

@@ -1,631 +0,0 @@
-#!/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/system-config/budgie-daemon_10.5.1.md5

@@ -1 +0,0 @@
-3cd35e15350ca7dac0c3cbfce1c661f7  /usr/bin/budgie-daemon

kinto_old/system-config/budgie-desktop_10.5.1.md5

@@ -1 +0,0 @@
-8660c2f8e0a9d3cff896254f6c0f9159  /usr/bin/budgie-desktop

kinto_old/system-config/caret_status_xkey.sh

@@ -1,78 +0,0 @@
-#!/bin/bash
-
-for pid in $(pidof -x caret_status_xkey.sh); do
-    if [ $pid != $$ ]; then
-        echo "[$(date)] : caret_status_xkey.sh : Process is already running with PID $pid"
-        exit 1
-    fi
-done
-
-mkdir -p /tmp/kinto/xkeysnail
-echo "0" > /tmp/kinto/caret
-
-millitime=`date +%s%3N`
-echo "$millitime" > /tmp/kinto/millitime
-
-IBUSADD=$(cat ~/.config/ibus/bus/`ls ~/.config/ibus/bus -1rt | tail -n1` | awk -F'IBUS_ADDRESS=' '{print $2}' | xargs)
-dbus-monitor --address $IBUSADD "path='/org/freedesktop/IBus/Panel',interface='org.freedesktop.IBus.Panel',member='FocusOut'" 2> /dev/null | grep --line-buffered -o -P '(?<=object path \"/org/freedesktop/IBus/InputContext_).*(?=[\"])' |
-while read ln
-do
-	newtime=`date +%s%3N`
-	difftime=$(( newtime - millitime ))
-	millitime="$newtime"
-	echo "$millitime" > /tmp/kinto/millitime
-	appname=$(xprop -id `xprop -root | grep "_NET_ACTIVE_WINDOW(WINDOW)" | awk '{print $5}'` | grep "WM_CLASS(STRING)" | awk '{print substr($4,2,length($4)-2)}')
-	if [ "${ln}" == "1" ]; then
-		appname=$(xprop -id `xprop -root | grep "_NET_ACTIVE_WINDOW(WINDOW)" | awk '{print $5}'` | grep "WM_CLASS(STRING)" | awk '{print substr($4,2,length($4)-2)}')
-		if [ "${appname}" == "Firefox" ]; then
-			# echo "ff ww"
-			printf 'ff ww %s\n' "1" > /tmp/kinto/caret
-		elif [ "${appname}" == "Chromium" ] || [ "${appname}" == "Chromium-browser" ] || [ "${appname}" == "Google-chrome" ] || [ "${appname}" == "Epiphany" ]; then
-			# echo "chrome ww"
-			printf 'chrome ww %s\n' "1" > /tmp/kinto/caret
-		else
-			echo "reset" > /tmp/kinto/caret
-		fi
-	else
-		if [ "${appname}" == "Firefox" ]; then
-			# echo "ff nw"
-			printf 'ff nw\n' > /tmp/kinto/caret
-		elif [ "${appname}" == "Chromium" ] || [ "${appname}" == "Chromium-browser" ] || [ "${appname}" == "Google-chrome" ] || [ "${appname}" == "Epiphany" ]; then
-			# echo "chrome nw"
-			printf 'chrome nw\n' > /tmp/kinto/caret
-		else
-			echo "reset" > /tmp/kinto/caret
-		fi
-	fi
-
-done&
-
-while (true);do
-	sleep 0.2
-	appname2=$(xprop -id `xprop -root | grep "_NET_ACTIVE_WINDOW(WINDOW)" | awk '{print $5}'` | grep "WM_CLASS(STRING)" | awk '{print substr($4,2,length($4)-2)}')
-	check=$(cat /tmp/kinto/caret)
-	millitime=$(cat /tmp/kinto/millitime)
-	newtime=`date +%s%3N`
-	difftime=$(( newtime - millitime ))
-	if (( $difftime > 200 )); then
-		if [ "${check}" == "ff nw" ] && [ "${lastcheck}" != 1 ]; then
-			echo "firefox no wordwise"
-			# Sets new config
-			perl -pi -e "s/[^\n]\s{3}(K.*)(# Chrome-nw)/    # \$1\$2/g;s/[^\n]\s{3}#\s(K.*)(# Firefox-nw)/    \$1\$2/g;s/[^\n]\s{3}(K.*)(# Beginning of Line)/    # \$1\$2/g;s/[^\n]\s{3}(K.*)(# End of Line)/    # \$1\$2/g" /tmp/kinto/xkeysnail/kinto.py 2>/dev/null
-			lastcheck=1
-			ww=0
-		elif [ "${check}" == "chrome nw" ] && [ "${lastcheck}" != 2 ]; then
-			echo "chrome no wordwise"
-			# Sets new config
-			perl -pi -e "s/[^\n]\s{3}(K.*)(# Firefox-nw)/    # \$1\$2/g;s/[^\n]\s{3}(K.*)(# Beginning of Line)/    # \$1\$2/g;s/[^\n]\s{3}(K.*)(# End of Line)/    # \$1\$2/g;s/[^\n]\s{3}#\s(K.*)(# Chrome-nw)/    \$1\$2/g" /tmp/kinto/xkeysnail/kinto.py 2>/dev/null
-			lastcheck=2
-			ww=0
-		elif ([ "${check}" != "chrome nw" ] && [ "${check}" != "ff nw" ] && [ "${lastcheck}" != 3 ]) || ([ "${appname2}" != "Firefox" ] && [ "${appname2}" != "Chromium" ] && [ "${appname2}" != "Chromium-browser" ] && [ "${appname2}" != "Google-chrome" ] && [ "${appname2}" != "Epiphany" ] && [ "${check}" == "reset" ] && [ "${lastcheck}" != 3 ]); then
-			echo "wordwise"
-			# Sets original config
-			perl -pi -e "s/[^\n]\s{3}(K.*)(# Firefox-nw)/    # \$1\$2/g;s/[^\n]\s{3}#\s(K.*)(# Beginning of Line)/    \$1\$2/g;s/[^\n]\s{3}#\s(K.*)(# End of Line)/    \$1\$2/g;s/[^\n]\s{3}(K.*)(# Chrome-nw)/    # \$1\$2/g" /tmp/kinto/xkeysnail/kinto.py 2>/dev/null
-			# cp /home/ryan/.config/kinto/kinto.py /tmp/kinto/xkeysnail/kinto.py
-			lastcheck=3
-		fi
-	fi
-done

kinto_old/xkeysnail_service.sh

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

references/builtin-keyboard.json

@@ -1,432 +0,0 @@
-{"scancode":"01",
-"eventcode":1,
-"eventname":"ESC"},
-{"scancode":"02",
-"eventcode":2,
-"eventname":"1"},
-{"scancode":"03",
-"eventcode":3,
-"eventname":"2"},
-{"scancode":"04",
-"eventcode":4,
-"eventname":"3"},
-{"scancode":"05",
-"eventcode":5,
-"eventname":"4"},
-{"scancode":"06",
-"eventcode":6,
-"eventname":"5"},
-{"scancode":"07",
-"eventcode":7,
-"eventname":"6"},
-{"scancode":"08",
-"eventcode":8,
-"eventname":"7"},
-{"scancode":"09",
-"eventcode":9,
-"eventname":"8"},
-{"scancode":"0a",
-"eventcode":10,
-"eventname":"9"},
-{"scancode":"0b",
-"eventcode":11,
-"eventname":"0"},
-{"scancode":"0c",
-"eventcode":12,
-"eventname":"MINUS"},
-{"scancode":"0d",
-"eventcode":13,
-"eventname":"EQUAL"},
-{"scancode":"0e",
-"eventcode":14,
-"eventname":"BACKSPACE"},
-{"scancode":"0f",
-"eventcode":15,
-"eventname":"TAB"},
-{"scancode":"10",
-"eventcode":16,
-"eventname":"Q"},
-{"scancode":"11",
-"eventcode":17,
-"eventname":"W"},
-{"scancode":"12",
-"eventcode":18,
-"eventname":"E"},
-{"scancode":"13",
-"eventcode":19,
-"eventname":"R"},
-{"scancode":"14",
-"eventcode":20,
-"eventname":"T"},
-{"scancode":"15",
-"eventcode":21,
-"eventname":"Y"},
-{"scancode":"16",
-"eventcode":22,
-"eventname":"U"},
-{"scancode":"17",
-"eventcode":23,
-"eventname":"I"},
-{"scancode":"18",
-"eventcode":24,
-"eventname":"O"},
-{"scancode":"19",
-"eventcode":25,
-"eventname":"P"},
-{"scancode":"1a",
-"eventcode":26,
-"eventname":"LEFTBRACE"},
-{"scancode":"1b",
-"eventcode":27,
-"eventname":"RIGHTBRACE"},
-{"scancode":"1c",
-"eventcode":28,
-"eventname":"ENTER"},
-{"scancode":"1d",
-"eventcode":29,
-"eventname":"LEFTCTRL"},
-{"scancode":"1e",
-"eventcode":30,
-"eventname":"A"},
-{"scancode":"1f",
-"eventcode":31,
-"eventname":"S"},
-{"scancode":"20",
-"eventcode":32,
-"eventname":"D"},
-{"scancode":"21",
-"eventcode":33,
-"eventname":"F"},
-{"scancode":"22",
-"eventcode":34,
-"eventname":"G"},
-{"scancode":"23",
-"eventcode":35,
-"eventname":"H"},
-{"scancode":"24",
-"eventcode":36,
-"eventname":"J"},
-{"scancode":"25",
-"eventcode":37,
-"eventname":"K"},
-{"scancode":"26",
-"eventcode":38,
-"eventname":"L"},
-{"scancode":"27",
-"eventcode":39,
-"eventname":"SEMICOLON"},
-{"scancode":"28",
-"eventcode":40,
-"eventname":"APOSTROPHE"},
-{"scancode":"29",
-"eventcode":41,
-"eventname":"GRAVE"},
-{"scancode":"2a",
-"eventcode":42,
-"eventname":"LEFTSHIFT"},
-{"scancode":"2b",
-"eventcode":43,
-"eventname":"BACKSLASH"},
-{"scancode":"2c",
-"eventcode":44,
-"eventname":"Z"},
-{"scancode":"2d",
-"eventcode":45,
-"eventname":"X"},
-{"scancode":"2e",
-"eventcode":46,
-"eventname":"C"},
-{"scancode":"2f",
-"eventcode":47,
-"eventname":"V"},
-{"scancode":"30",
-"eventcode":48,
-"eventname":"B"},
-{"scancode":"31",
-"eventcode":49,
-"eventname":"N"},
-{"scancode":"32",
-"eventcode":50,
-"eventname":"M"},
-{"scancode":"33",
-"eventcode":51,
-"eventname":"COMMA"},
-{"scancode":"34",
-"eventcode":52,
-"eventname":"DOT"},
-{"scancode":"35",
-"eventcode":53,
-"eventname":"SLASH"},
-{"scancode":"36",
-"eventcode":54,
-"eventname":"RIGHTSHIFT"},
-{"scancode":"37",
-"eventcode":55,
-"eventname":"KPASTERISK"},
-{"scancode":"38",
-"eventcode":56,
-"eventname":"LEFTALT"},
-{"scancode":"39",
-"eventcode":57,
-"eventname":"SPACE"},
-{"scancode":"40",
-"eventcode":58,
-"eventname":"CAPSLOCK"},
-{"scancode":"41",
-"eventcode":59,
-"eventname":"F1"},
-{"scancode":"42",
-"eventcode":60,
-"eventname":"F2"},
-{"scancode":"43",
-"eventcode":61,
-"eventname":"F3"},
-{"scancode":"44",
-"eventcode":62,
-"eventname":"F4"},
-{"scancode":"45",
-"eventcode":63,
-"eventname":"F5"},
-{"scancode":"46",
-"eventcode":64,
-"eventname":"F6"},
-{"scancode":"47",
-"eventcode":65,
-"eventname":"F7"},
-{"scancode":"48",
-"eventcode":66,
-"eventname":"F8"},
-{"scancode":"49",
-"eventcode":67,
-"eventname":"F9"},
-{"scancode":"50",
-"eventcode":68,
-"eventname":"F10"},
-{"scancode":"51",
-"eventcode":69,
-"eventname":"NUMLOCK"},
-{"scancode":"52",
-"eventcode":70,
-"eventname":"SCROLLLOCK"},
-{"scancode":"53",
-"eventcode":71,
-"eventname":"KP7"},
-{"scancode":"54",
-"eventcode":72,
-"eventname":"KP8"},
-{"scancode":"55",
-"eventcode":73,
-"eventname":"KP9"},
-{"scancode":"56",
-"eventcode":74,
-"eventname":"KPMINUS"},
-{"scancode":"57",
-"eventcode":75,
-"eventname":"KP4"},
-{"scancode":"58",
-"eventcode":76,
-"eventname":"KP5"},
-{"scancode":"59",
-"eventcode":77,
-"eventname":"KP6"},
-{"scancode":"5A",
-"eventcode":78,
-"eventname":"KPPLUS"},
-{"scancode":"5B",
-"eventcode":79,
-"eventname":"KP1"},
-{"scancode":"5C",
-"eventcode":80,
-"eventname":"KP2"},
-{"scancode":"5D",
-"eventcode":81,
-"eventname":"KP3"},
-{"scancode":"5E",
-"eventcode":82,
-"eventname":"KP0"},
-{"scancode":"5F",
-"eventcode":83,
-"eventname":"KPDOT"},
-{"scancode":"60",
-"eventcode":85,
-"eventname":"ZENKAKUHANKAKU"},
-{"scancode":"61",
-"eventcode":86,
-"eventname":"102ND"},
-{"scancode":"62",
-"eventcode":87,
-"eventname":"F11"},
-{"scancode":"63",
-"eventcode":88,
-"eventname":"F12"},
-{"scancode":"64",
-"eventcode":89,
-"eventname":"RO"},
-{"scancode":"65",
-"eventcode":90,
-"eventname":"KATAKANA"},
-{"scancode":"66",
-"eventcode":91,
-"eventname":"HIRAGANA"},
-{"scancode":"67",
-"eventcode":92,
-"eventname":"HENKAN"},
-{"scancode":"68",
-"eventcode":93,
-"eventname":"KATAKANAHIRAGANA"},
-{"scancode":"69",
-"eventcode":94,
-"eventname":"MUHENKAN"},
-{"scancode":"6A",
-"eventcode":95,
-"eventname":"KPJPCOMMA"},
-{"scancode":"6B",
-"eventcode":96,
-"eventname":"KPENTER"},
-{"scancode":"6C",
-"eventcode":97,
-"eventname":"RIGHTCTRL"},
-{"scancode":"6D",
-"eventcode":98,
-"eventname":"KPSLASH"},
-{"scancode":"6E",
-"eventcode":99,
-"eventname":"SYSRQ"},
-{"scancode":"6F",
-"eventcode":100,
-"eventname":"RIGHTALT"},
-{"scancode":"70",
-"eventcode":102,
-"eventname":"HOME"},
-{"scancode":"71",
-"eventcode":103,
-"eventname":"UP"},
-{"scancode":"72",
-"eventcode":104,
-"eventname":"PAGEUP"},
-{"scancode":"73",
-"eventcode":105,
-"eventname":"LEFT"},
-{"scancode":"74",
-"eventcode":106,
-"eventname":"RIGHT"},
-{"scancode":"75",
-"eventcode":107,
-"eventname":"END"},
-{"scancode":"76",
-"eventcode":108,
-"eventname":"DOWN"},
-{"scancode":"77",
-"eventcode":109,
-"eventname":"PAGEDOWN"},
-{"scancode":"78",
-"eventcode":110,
-"eventname":"INSERT"},
-{"scancode":"79",
-"eventcode":111,
-"eventname":"DELETE"},
-{"scancode":"7A",
-"eventcode":112,
-"eventname":"MACRO"},
-{"scancode":"7B",
-"eventcode":113,
-"eventname":"MUTE"},
-{"scancode":"7C",
-"eventcode":114,
-"eventname":"VOLUMEDOWN"},
-{"scancode":"7D",
-"eventcode":115,
-"eventname":"VOLUMEUP"},
-{"scancode":"7E",
-"eventcode":116,
-"eventname":"POWER"},
-{"scancode":"7F",
-"eventcode":117,
-"eventname":"KPEQUAL"},
-{"scancode":"80",
-"eventcode":118,
-"eventname":"KPPLUSMINUS"},
-{"scancode":"81",
-"eventcode":119,
-"eventname":"PAUSE"},
-{"scancode":"82",
-"eventcode":121,
-"eventname":"KPCOMMA"},
-{"scancode":"83",
-"eventcode":122,
-"eventname":"HANGUEL"},
-{"scancode":"84",
-"eventcode":123,
-"eventname":"HANJA"},
-{"scancode":"85",
-"eventcode":124,
-"eventname":"YEN"},
-{"scancode":"86",
-"eventcode":125,
-"eventname":"LEFTMETA"},
-{"scancode":"87",
-"eventcode":126,
-"eventname":"RIGHTMETA"},
-{"scancode":"88",
-"eventcode":127,
-"eventname":"COMPOSE"},
-{"scancode":"89",
-"eventcode":128,
-"eventname":"STOP"},
-{"scancode":"8A",
-"eventcode":140,
-"eventname":"CALC"},
-{"scancode":"8B",
-"eventcode":142,
-"eventname":"SLEEP"},
-{"scancode":"8C",
-"eventcode":143,
-"eventname":"WAKEUP"},
-{"scancode":"8D",
-"eventcode":155,
-"eventname":"MAIL"},
-{"scancode":"8E",
-"eventcode":156,
-"eventname":"BOOKMARKS"},
-{"scancode":"8F",
-"eventcode":157,
-"eventname":"COMPUTER"},
-{"scancode":"90",
-"eventcode":158,
-"eventname":"BACK"},
-{"scancode":"91",
-"eventcode":159,
-"eventname":"FORWARD"},
-{"scancode":"92",
-"eventcode":163,
-"eventname":"NEXTSONG"},
-{"scancode":"93",
-"eventcode":164,
-"eventname":"PLAYPAUSE"},
-{"scancode":"94",
-"eventcode":165,
-"eventname":"PREVIOUSSONG"},
-{"scancode":"95",
-"eventcode":166,
-"eventname":"STOPCD"},
-{"scancode":"96",
-"eventcode":172,
-"eventname":"HOMEPAGE"},
-{"scancode":"97",
-"eventcode":173,
-"eventname":"REFRESH"},
-{"scancode":"98",
-"eventcode":183,
-"eventname":"F13"},
-{"scancode":"99",
-"eventcode":184,
-"eventname":"F14"},
-{"scancode":"9A",
-"eventcode":185,
-"eventname":"F15"},
-{"scancode":"9B",
-"eventcode":217,
-"eventname":"SEARCH"},
-{"scancode":"9C",
-"eventcode":226,
-"eventname":"MEDIA"}

setup.py

@@ -1,91 +1,10 @@
 #!/usr/bin/env python3
-import json, time, os, sys, subprocess, shlex, platform,argparse
+import json, time, os, sys
 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","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(
@@ -95,48 +14,498 @@ def cmdline(command):
         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' 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()
-		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()
 
+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":
+			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')
+			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']\"")
+			cmdline("gsettings set org.gnome.desktop.wm.keybindings panel-main-menu \"['<Primary><Shift>Space','<Primary>Space']\"")
+		if distro == "ubuntu" and dename == "gnome":
+			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":
+			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']\"")
+			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 == "galliumos" and dename == "xfce":
+			print("Applying GalliumOS (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"')
+			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 Alternative" "none,none,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 "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("A supported OS and DE was not found, you may not have full system level shortcuts installed.")
+		if dename == "gnome":
+			# 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')
+			# cmdline('dconf update')
+
+def windows_setup():
+	keymaps = ["Apple keyboard standard", "Apple keyboard w/ Caps lock as Esc", "Windows keyboard standard", "Windows keyboard w/ Caps lock as Esc","Uninstall"]
+	for index, item in enumerate(keymaps):
+		print("    %i. %s" % (index+1, item.capitalize()))
+	default = 0
+	while not int(default) in range(1,len(keymaps)+1):
+		default = int(input("\nPlease enter your desired keymap (1 - " + str(len(keymaps)) + ") : "))
+	print("")
+	path= cmdline('echo %cd%')[:-1]
+	if default == 1:
+		os.system("regedit " + path + "\\windows\\macbook_winctrl_swap.reg")
+	elif default == 2:
+		os.system("regedit " + path + "\\windows\\macbook_winctrl_capsesc_swap.reg")
+	elif default == 3:
+		os.system("regedit " + path + "\\windows\\standard_ctrlalt_swap.reg")
+	elif default == 4:
+		os.system("regedit " + path + "\\windows\\standard_ctrlalt_capsesc_swap.reg")
+	elif default == 5:
+		os.system("regedit " + path + "\\windows\\remove_keyswap.reg")
+	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("\nWill now install Ubuntu Terminal Theme as default...")
+		os.system("regedit " + path + "\\windows\\theme_ubuntu.reg")
+		print("Copying autohotkey combinations for Terminals & Editors...")
+		os.system("copy /Y " + path + "\\windows\\kinto.ahk \"C:\\ProgramData\\Microsoft\\Windows\\Start Menu\\Programs\\StartUp\\kinto.ahk\"")
+		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\"")
+
+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")
+			cmdline("./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")
+		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")
+			cmdline("./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.")
+
+# check_x11 = cmdline("env | grep -i x11").strip()
+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("You are detected as running Windows.")
+		windows_setup()
+		sys.exit()
+
+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
 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:
+	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)
 
-
-cmdline("git fetch")
+with open('defaults.json') as json_file:
+	data = json.load(json_file)
 
 color_arr = [bcolors.CBEIGE,bcolors.CRED2,bcolors.CGREEN,bcolors.CYELLOW ]
 
-kintover = cmdline('echo "$(git describe --tag --abbrev=0 | head -n 1)" "build" "$(git rev-parse --short HEAD)"')
+print("\nKinto - Type in Linux like it's a Mac.\n")
 
-print("\nKinto " + kintover + "Type in Linux like it's a Mac.\n")
+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))
 
-if args.uninstall:
-	subprocess.check_call(shlex.split("./xkeysnail_service.sh uninstall"))
+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()
 
-subprocess.check_call(shlex.split("./xkeysnail_service.sh"))
+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")

system-config/dename.sh

@@ -1,182 +1,167 @@
 #!/bin/bash
 
-function detect_budgie()
-{
-	ps -e | grep -E '^.* budgie-wm' > /dev/null
-	if [ $? -ne 0 ];
-	then
-	return 0
-	fi
-	VERSION=`dpkg-query -l | grep budgie-core | awk '{print $3}'`
-	DESKTOP="budgie"
-	return 1
-}
-
 function detect_gnome()
 {
-	ps -e | grep -E '^.* gnome-session' > /dev/null
-	if [ $? -ne 0 ];
-	then
+    ps -e | grep -E '^.* gnome-session' > /dev/null
+    if [ $? -ne 0 ];
+    then
 	return 0
-	fi
-	VERSION=`gnome-session --version | awk '{print $2}'`
-	DESKTOP="gnome"
-	return 1
+    fi
+    VERSION=`gnome-session --version | awk '{print $2}'`
+    DESKTOP="gnome"
+    return 1
 }
 
 function detect_kde4()
 {
-	ps -e | grep -E '^.* kded4$' > /dev/null
-	if [ $? -ne 0 ];
-	then
-		return 0
-	else    
-		VERSION=`kded4 --version | grep -m 1 'KDE' | awk -F ':' '{print $2}' | awk '{print $1}'`
-		DESKTOP="KDE"
-		return 1
-	fi
+    ps -e | grep -E '^.* kded4$' > /dev/null
+    if [ $? -ne 0 ];
+    then
+        return 0
+    else    
+        VERSION=`kded4 --version | grep -m 1 'KDE' | awk -F ':' '{print $2}' | awk '{print $1}'`
+        DESKTOP="KDE"
+        return 1
+    fi
 }
 
 function detect_kde()
 {
-	ps -e | grep -E '^.* kded5$' > /dev/null
-	if [ $? -ne 0 ];
-	then
-		return 0
-	else    
-		VERSION=`kded5 --version | grep -m 1 'KDE' | awk -F ':' '{print $2}' | awk '{print $1}'`
-		DESKTOP="KDE"
-		return 1
-	fi
+    ps -e | grep -E '^.* kded5$' > /dev/null
+    if [ $? -ne 0 ];
+    then
+        return 0
+    else    
+        VERSION=`kded5 --version | grep -m 1 'KDE' | awk -F ':' '{print $2}' | awk '{print $1}'`
+        DESKTOP="KDE"
+        return 1
+    fi
 }
 
 function detect_unity()
 {
-	ps -e | grep -E 'unity-panel' > /dev/null
-	if [ $? -ne 0 ];
-	then
+    ps -e | grep -E 'unity-panel' > /dev/null
+    if [ $? -ne 0 ];
+    then
 	return 0
-	fi
-	VERSION=`unity --version | awk '{print $2}'`
-	DESKTOP="unity"
-	return 1
+    fi
+    VERSION=`unity --version | awk '{print $2}'`
+    DESKTOP="unity"
+    return 1
 }
 
 function detect_xfce()
 {
-	ps -e | grep -E '^.* xfce4-session$' > /dev/null
-	if [ $? -ne 0 ];
-	then
+    ps -e | grep -E '^.* xfce4-session$' > /dev/null
+    if [ $? -ne 0 ];
+    then
 	return 0
-	fi
-	VERSION=`xfce4-session --version | grep xfce4-session | awk '{print $2}'`
-	DESKTOP="xfce"
-	return 1
+    fi
+    VERSION=`xfce4-session --version | grep xfce4-session | awk '{print $2}'`
+    DESKTOP="xfce"
+    return 1
 }
 
 function detect_cinnamon()
 {
-	ps -e | grep -E '^.* cinnamon$' > /dev/null
-	if [ $? -ne 0 ];
-	then
+    ps -e | grep -E '^.* cinnamon$' > /dev/null
+    if [ $? -ne 0 ];
+    then
 	return 0
-	fi
-	VERSION=`cinnamon --version | awk '{print $2}'`
-	DESKTOP="cinnamon"
-	return 1
+    fi
+    VERSION=`cinnamon --version | awk '{print $2}'`
+    DESKTOP="cinnamon"
+    return 1
 }
 
 function detect_mate()
 {
-	ps -e | grep -E '^.* mate-panel$' > /dev/null
-	if [ $? -ne 0 ];
-	then
+    ps -e | grep -E '^.* mate-panel$' > /dev/null
+    if [ $? -ne 0 ];
+    then
 	return 0
-	fi
-	VERSION=`mate-about --version | awk '{print $4}'`
-	DESKTOP="mate"
-	return 1
+    fi
+    VERSION=`mate-about --version | awk '{print $4}'`
+    DESKTOP="mate"
+    return 1
 }
 
 function detect_lxde()
 {
-	ps -e | grep -E '^.* lxsession$' > /dev/null
-	if [ $? -ne 0 ];
-	then
+    ps -e | grep -E '^.* lxsession$' > /dev/null
+    if [ $? -ne 0 ];
+    then
 	return 0
-	fi
+    fi
 
-	# We can detect LXDE version only thru package manager
-	which apt-cache > /dev/null 2> /dev/null
-	if [ $? -ne 0 ];
-	then
+    # We can detect LXDE version only thru package manager
+    which apt-cache > /dev/null 2> /dev/null
+    if [ $? -ne 0 ];
+    then
 	which yum > /dev/null 2> /dev/null
 	if [ $? -ne 0 ];
 	then
-		VERSION='unknown'
+	    VERSION='unknown'
 	else
-		# For Fedora
-		VERSION=`yum list lxde-common | grep lxde-common | awk '{print $2}' | awk -F '-' '{print $1}'`
+	    # For Fedora
+	    VERSION=`yum list lxde-common | grep lxde-common | awk '{print $2}' | awk -F '-' '{print $1}'`
 	fi
-	else    
+    else    
 	# For Lubuntu and Knoppix
 	VERSION=`apt-cache show lxde-common /| grep 'Version:' | awk '{print $2}' | awk -F '-' '{print $1}'`
-	fi
-	DESKTOP="lxde"
-	return 1
+    fi
+    DESKTOP="lxde"
+    return 1
 }
 
 function detect_sugar()
 {
-	if [ "$DESKTOP_SESSION" == "sugar" ];
-	then
+    if [ "$DESKTOP_SESSION" == "sugar" ];
+    then
 	VERSION=`python -c "from jarabe import config; print config.version"`
 	DESKTOP="sugar"
-	else
+    else
 	return 0
-	fi
+    fi
 }
 
 
 DESKTOP="unknown"
 if detect_unity;
 then
-	if detect_kde;
-	then
-		if detect_kde4;
-		then
-			if detect_budgie;
-			then
-				if detect_gnome;
-				then
-					if detect_xfce;
-					then
-						if detect_cinnamon;
-						then
-							if detect_mate;
-							then
-								if detect_lxde;
-								then
-									detect_sugar
-								fi
-							fi
-						fi
-					fi
-				fi
-			fi
-		fi
-	fi
+    if detect_kde;
+    then
+        if detect_kde4;
+        then
+        	if detect_gnome;
+        	then
+        	    if detect_xfce;
+        	    then
+            		if detect_cinnamon;
+            		then
+            		    if detect_mate;
+            		    then
+                			if detect_lxde;
+                			then
+                			    detect_sugar
+                			fi
+            		    fi
+            		fi
+        	    fi
+        	fi
+        fi
+    fi
 fi
 
 
 if [ "$1" == '-v' ];
 then
-	echo $VERSION
+    echo $VERSION
 else
-	if [ "$1" == '-n' ];
-	then
+    if [ "$1" == '-n' ];
+    then
 	echo $DESKTOP
-	else
+    else
 	echo $DESKTOP $VERSION
-	fi
+    fi
 fi

system-config/keyswap.service

@@ -8,9 +8,9 @@ Restart=always
 # eg DISPLAY=:0.0
 #Environment=DISPLAY={displayid}
 RestartSec=1
-WorkingDirectory={homedir}/.config/kinto
-ExecStart=/bin/bash -c "{homedir}/.config/kinto/xactive.sh carrots"
-ExecStop=/bin/bash {homedir}/.config/kinto/cleanup.sh
+WorkingDirectory=/home/{username}/.config/kinto
+ExecStart=/bin/bash -c "/home/{username}/.config/kinto/xactive.sh carrots"
+ExecStop=/bin/bash /home/{username}/.config/kinto/cleanup.sh
 
 [Install]
 WantedBy=default.target

system-config/unipkg.sh

@@ -1,21 +0,0 @@
-#!/bin/bash
-
-if pkgmgr="$( which apt-get )" 2> /dev/null; then
-   echo "Debian"
-   $pkgmgr update
-   $pkgmgr --yes --force-yes install $1
-elif pkgmgr="$( which dnf )" 2> /dev/null; then
-   echo "dnf"
-   $pkgmgr check-update; $pkgmgr install -y $1
-elif pkgmgr="$( which pacman )" 2> /dev/null; then
-   echo "Arch-based"
-   $pkgmgr -Syy;yes | $pkgmgr -S $1
-else
-   echo "Package manager not found, please install $1" >&2
-   exit 1
-fi
-if [[ 1 -ne $# ]]; then
-   echo "Syntax: $0 PACKAGE"
-   exit 1
-fi
-exit $?

uninstall.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+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
+systemctl daemon-reload
+sed -i '/xkb/d' ~/.Xsession 2>/dev/null

user_config.json

@@ -16,7 +16,7 @@
 		"symbols":"",
 		"types":"",
 		"de":[],
-		"appnames":[ "Gnome-terminal","konsole","io.elementary.terminal","terminator","sakura","guake","tilda","xterm","eterm","kitty","alacritty","mate-terminal","tilix","xfce4-terminal" ]
+		"appnames":[ "Gnome-terminal","konsole","xfce4-terminal","io.elementary.terminal","terminator","sakura","guake","tilda","xterm","eterm","kitty" ]
 	},
 	{
         "name": "firefox",
@@ -73,4 +73,4 @@
 		"run_term":"",
 		"run_gui":""
 	}]
-}
+}

windows/NoShell.vbs

@@ -1,14 +0,0 @@
-If WScript.Arguments.Count >= 1 Then
-    ReDim arr(WScript.Arguments.Count-1)
-    prog = WScript.Arguments(0)
-    For i = 1 To WScript.Arguments.Count-1
-        Arg = WScript.Arguments(i)
-        If InStr(Arg, " ") > 1 Then Arg = """" & Arg & """"
-      arr(i) = Arg
-    Next
-
-    RunCmd = Join(arr)
-    ' CreateObject("Wscript.Shell").Run RunCmd, 0, True
-    Set oShell = CreateObject("Shell.Application")
-	oShell.ShellExecute prog, RunCmd, , "runas", 0
-End If

windows/autohotkey.ps1

@@ -1,22 +1,12 @@
-if(-not(Get-Command "choco" -errorAction SilentlyContinue)){
+$testchoco = powershell choco -v
+if(-not($testchoco)){
     Write-Output "Seems Chocolatey is not installed, installing now"
     Set-ExecutionPolicy Bypass -Scope Process -Force; iex ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))
-    refreshenv
 }
 else{
-    Write-Output "Chocolatey is already installed"
+    Write-Output "Chocolatey Version $testchoco is already installed"
 }
 
 if(-not(test-path "C:\Program Files\AutoHotkey\AutoHotkey.exe")){
 	choco install autohotkey.install
 }
-else{
-	Write-Output "Autohotkey is already installed"
-}
-if(-not(test-path "C:\Strawberry\")){
-	choco install strawberryperl
-	refreshenv
-}
-else{
-	Write-Output "Perl is already installed"
-}

windows/detectUSB.ahk

@@ -1,38 +0,0 @@
-#SingleInstance, force
-#NoTrayIcon
-OnMessage(0x219, "notify_change") 
-Return
-
-lastkb = ""
-
-DllCall("AllocConsole")
-WinHide % "ahk_id " DllCall("GetConsoleWindow", "ptr")
-
-notify_change(wParam, lParam, msg, hwnd) 
-{
-	global lastkb
-	DetectHiddenWindows On
-	Run %ComSpec%,, Hide, pid
-	WinWait ahk_pid %pid%
-	DllCall("AttachConsole", "UInt", pid)
-	WshShell := ComObjCreate("Wscript.Shell")
-	exec := WshShell.Exec("cscript /nologo ""%userprofile%\.kinto\usb.vbs""")
-	kbtype := exec.StdOut.ReadAll()
-	DllCall("FreeConsole")
-	Process Close, %pid%
-	if lastkb != %kbtype%
-	{
-
-		if InStr(kbtype, "Apple")
-		{
-			; MsgBox, Apple
-			Run, "%A_ScriptDir%\NoShell.vbs" "%A_ScriptDir%\toggle_kb.bat" mac, "%A_ScriptDir%"
-		}
-		else{
-			; MsgBox, Windows
-			Run, "%A_ScriptDir%\NoShell.vbs" "%A_ScriptDir%\toggle_kb.bat" win, "%A_ScriptDir%"
-		}
-		; MsgBox % kbtype
-	}
-	lastkb = %kbtype%
-}

windows/kinto-start.vbs

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

windows/kinto.ahk

@@ -1,734 +1,128 @@
-#SingleInstance force
-#NoEnv
-#Persistent
-
-; DetectHiddenWindows, On           ; Autodetect
-; Run, %A_ScriptDir%\detectUSB.ahk  ; Autodetect
-
-; Enable Left clicks on Kinto Icon
-; https://www.autohotkey.com/boards/viewtopic.php?t=9501
-OnMessage(0x404, "AHK_NOTIFYICON")
-
-AHK_NOTIFYICON(wParam, lParam) 
-{
-    if (lParam = 0x202) { ; user left-clicked tray icon
-        ;ADD ANY SUBROUTINE OR FUNCTION HERE
-        Menu, Tray, Show
-        return
-    }
-    else if (lParam = 0x203) { ; user double left-clicked tray icon
-        ;ADD ANY SUBROUTINE OR FUNCTION HERE
-        Menu, Tray, Show
-        return
-    }
-}
-; End Enable Left clicks
-
-; I_Icon = %A_ScriptDir%\assets\kinto-white-invert.ico    ; MacModifiers
-; IfExist, %I_Icon%                                       ; MacModifiers
-; Menu, Tray, Icon, %I_Icon%,, 1                          ; MacModifiers
-; Menu, Tray, Tip, Mac - Kinto                            ; MacModifiers
-
-; I_Icon = %A_ScriptDir%\assets\kinto-white-invert.ico    ; WinModifiers/CB/IBM
-; IfExist, %I_Icon%                                       ; WinModifiers/CB/IBM
-; Menu, Tray, Icon, %I_Icon%,, 1                          ; WinModifiers/CB/IBM
-; Menu, Tray, Tip, Windows - Kinto                        ; WinModifiers
-; Menu, Tray, Tip, Chromebook - Kinto                     ; Chromebook
-; Menu, Tray, Tip, IBM - Kinto                            ; IBM
-
-Menu, Keyboards, Add, Windows, winkb
-Menu, Keyboards, Add, Apple, mackb
-Menu, Keyboards, Add, Chromebook, chromekb
-Menu, Keyboards, Add, IBM (No Super/Win key), ibmkb
-
-paramkb=%1%
-
-if paramkb = mac
-    checkKB = Apple
-if paramkb = win
-    checkKB = Windows
-if paramkb = chrome
-    checkKB = Chromebook
-if paramkb = ibm
-    checkKB = IBM (No Super/Win key)
-
-menu, Keyboards, check, %checkKB%
-
-; Set Tray menu
-; Menu, Tray, Standard
-Menu, Tray, NoStandard ; to remove default menu
-Menu, Tray, Add, Keyboard Types, :Keyboards
-Menu, Tray, Add, Autodetect Keyboards, autodetect
-; Menu, Tray, check, Autodetect Keyboards ; Autodetect
-; Menu, Tray, disable, Autodetect Keyboards ; CB/IBM
-Menu, Tray, Add, Suspend Kinto, tray_suspend
-; Menu, Tray, Add, Returns to Desktop, min
-Menu, Tray, Add
-Menu, Tray, Add, Close, Exit
-Menu, Tray, Click, 1
-
-winkb(){
-    Run, "%A_ScriptDir%\NoShell.vbs" "%A_ScriptDir%\toggle_kb.bat" win, "%A_ScriptDir%"
-}
-
-mackb(){
-    Run, "%A_ScriptDir%\NoShell.vbs" "%A_ScriptDir%\toggle_kb.bat" mac, "%A_ScriptDir%"
-}
-
-chromekb(){
-    Run, "%A_ScriptDir%\NoShell.vbs" "%A_ScriptDir%\toggle_kb.bat" chrome, "%A_ScriptDir%"
-}
-
-ibmkb(){
-    Run, "%A_ScriptDir%\NoShell.vbs" "%A_ScriptDir%\toggle_kb.bat" ibm, "%A_ScriptDir%"
-}
-
-autodetect(){
-    IfWinExist, detectUSB.ahk
-        WinClose
-    Run, "%A_ScriptDir%\NoShell.vbs" "%A_ScriptDir%\toggle_kb.bat" auto, "%A_ScriptDir%"
-}
-
-min(){
-; Refocus last active Window
-Send {LAlt down}{tab}{LAlt up}
-}  
-
-tray_suspend(){
-    suspend toggle
-    if (a_isSuspended = 1){
-        Gosub ReleaseModifiers
-        menu, tray, check  , Suspend Kinto
-        I_Icon = %A_ScriptDir%\assets\kinto-white.ico
-        Menu, Tray, Icon, %I_Icon%,, 1
-        Menu, Tray, Tip, Suspended - Kinto
-        IfWinExist, detectUSB.ahk
-            WinClose
-    }
-    else{
-        menu, tray, unCheck, Suspend Kinto
-;         I_Icon = %A_ScriptDir%\assets\kinto-white-invert.ico    ; MacModifiers
-;         I_Icon = %A_ScriptDir%\assets\kinto-white-invert.ico    ; WinModifiers/CB/IBM
-;         Menu, Tray, Tip, Mac - Kinto                            ; MacModifiers
-;         Menu, Tray, Tip, Windows - Kinto                        ; WinModifiers
-;         Menu, Tray, Tip, Chromebook - Kinto                     ; Chromebook
-;         Menu, Tray, Tip, IBM - Kinto                            ; IBM
-        Menu, Tray, Icon, %I_Icon%,,1
-        Run, %A_ScriptDir%\detectUSB.ahk
-    }
-    ; Refocus last active Window
-    Send {LAlt down}{tab}{LAlt up}
-}
-
-Exit() {
-    Gosub ReleaseModifiers
-    IfWinExist, detectUSB.ahk
-        WinClose
-
-    ExitApp
-}
-
-SetTitleMatchMode, 2
-
 GroupAdd, terminals, ahk_exe ubuntu.exe
 GroupAdd, terminals, ahk_exe ConEmu.exe
 GroupAdd, terminals, ahk_exe ConEmu64.exe
 GroupAdd, terminals, ahk_exe powershell.exe
 GroupAdd, terminals, ahk_exe WindowsTerminal.exe
 GroupAdd, terminals, ahk_exe Hyper.exe
-GroupAdd, terminals, ahk_exe mintty.exe
-GroupAdd, terminals, ahk_exe Cmd.exe
-GroupAdd, terminals, ahk_exe box.exe
-GroupAdd, terminals, ahk_exe Terminus.exe
-GroupAdd, terminals, Fluent Terminal ahk_class ApplicationFrameWindow
-GroupAdd, terminals, ahk_class Console_2_Main
 
 GroupAdd, posix, ahk_exe ubuntu.exe
 GroupAdd, posix, ahk_exe ConEmu.exe
 GroupAdd, posix, ahk_exe ConEmu64.exe
-GroupAdd, posix, ahk_exe Hyper.exe
 GroupAdd, posix, ahk_exe mintty.exe
-GroupAdd, posix, ahk_exe Terminus.exe
-GroupAdd, posix, Fluent Terminal ahk_class ApplicationFrameWindow
-GroupAdd, posix, ahk_class Console_2_Main
-GroupAdd, posix, ahk_exe WindowsTerminal.exe
 
 GroupAdd, ConEmu, ahk_exe ConEmu.exe
 GroupAdd, ConEmu, ahk_exe ConEmu64.exe
-
-GroupAdd, ExcPaste, ahk_exe Cmd.exe
-GroupAdd, ExcPaste, ahk_exe mintty.exe
+GroupAdd, ConEmu, ahk_exe WindowsTerminal.exe
 
 GroupAdd, editors, ahk_exe sublime_text.exe
-GroupAdd, editors, ahk_exe VSCodium.exe
-GroupAdd, editors, ahk_exe Code.exe
 
-GroupAdd, browsers, ahk_exe chrome.exe
-GroupAdd, browsers, ahk_exe opera.exe
-GroupAdd, browsers, ahk_exe firefox.exe
-GroupAdd, browsers, ahk_exe msedge.exe
+; Cmd+Space Alternative
+LWin & vk07::return
+LWin::return
+RWin & vk07::return
+RWin::return
+^Space::Send ^{Esc}
+; ^Space::run AppName
 
-; Disable Key Remapping for Virtual Machines
-; Disable for Remote desktop solutions too
-GroupAdd, virtm, ahk_exe VirtualBoxVM.exe
-GroupAdd, virtm, ahk_exe mstsc.exe
+; Cmd Tab For App Switching
+LCtrl & Tab::AltTab
+RCtrl & Tab::AltTab
+; Ctrl Tab for In-App Tab Switching
+LWin & Tab::Send ^{Tab}
+RWin & Tab::Send ^{Tab}
 
-; Disabled Edge for now - no ability to close all instances
-; GroupAdd, browsers, Microsoft Edge ahk_class ApplicationFrameWindow
+; Close Apps
+^q::Send !{F4}
 
-GroupAdd, vscode, ahk_exe VSCodium.exe
-GroupAdd, vscode, ahk_exe Code.exe
+; wordwise support
+$^Left::Send {Home}
+$^+Left::Send +{Home}
+$^Right::Send {End}
+$^+Right::Send +{End}
+^Up::Send ^{Home}
+^+Up::Send ^+{Home}
+^Down::Send ^{End}
+^+Down::Send ^+{End}
+^Backspace::Send +{Home}{Delete}
+!Backspace::Send ^{Backspace}
+!Left::Send ^{Left}
+!+Left::Send ^+{Left}
+!Right::Send ^{Right}
+!+Right::Send ^+{Right}
 
-GroupAdd, vstudio, ahk_exe devenv.exe
+#IfWinActive ahk_group editors
+	; Remap Ctrl+Shift to behave like macOS Sublimetext
+	; Will extend cursor to multiple lines
+	#+Up::send {shift up}^!{Up}
+	#+Down::send {shift up}^!{Down}
 
-GroupAdd, intellij, ahk_exe idea.exe
-GroupAdd, intellij, ahk_exe idea64.exe
-
-; SetCapsLockState, AlwaysOff ; CB/IBM
-
-#IfWinNotActive ahk_group virtm
-
-    ; New AltTab and CtrlTab fix
-    *tab:: 
-    {
-        ; Tertiary 
-        if (GetKeyState("LCtrl", "P") AND GetKeyState("LShift", "P") = false) {
-            ; Secondary
-            ; Send {LCtrl down}{Secondary up}{tab}
-    ;        Send {LCtrl down}{LWin up}{tab}               ; WinModifiers
-    ;        Send {LCtrl down}{LAlt up}{tab}               ; MacModifiers
-    ;        Send {LCtrl down}{CapsLock up}{tab}           ; CB/IBM
-            KeyWait, tab
-        ; Tertiary
-        } else if (GetKeyState("LCtrl", "P") AND GetKeyState("LShift", "P")) {
-            ; Secondary
-            ; Send {LCtrl down}{Secondary up}{LShift down}{tab}
-    ;        Send {LCtrl down}{LWin up}{LShift down}{tab}     ; WinModifiers/CB
-    ;        Send {LCtrl down}{LAlt up}{LShift down}{tab}     ; MacModifiers
-    ;        Send {LCtrl down}{CapsLock up}{LShift down}{tab} ; IBM
-            KeyWait, tab
-        ; Primary
-    ;    } else if (GetKeyState("LAlt", "P") AND GetKeyState("LShift", "P") = false) {   ; WinModifiers/CB/IBM
-    ;    } else if (GetKeyState("LWin", "P") AND GetKeyState("LShift", "P") = false) {   ; MacModifiers
-            Send {LAlt down}{tab}
-            KeyWait, tab
-        ; Primary
-    ;    } else if (GetKeyState("LAlt", "P") AND GetKeyState("LShift", "P")) { ; WinModifiers/CB/IBM
-    ;    } else if (GetKeyState("LWin", "P") AND GetKeyState("LShift", "P")) { ; MacModifiers
-            Send {LAlt down}{LShift down}{tab}
-            KeyWait, tab
-        ; Secondary 
-    ;    } else if (GetKeyState("LWin", "P") AND GetKeyState("LShift", "P")) = false {     ; WinModifiers/CB
-    ;    } else if (GetKeyState("LAlt", "P") AND GetKeyState("LShift", "P") = false) {     ; MacModifiers
-    ;    } else if (GetKeyState("CapsLock", "P") AND GetKeyState("LShift", "P")) = false { ; IBM
-            return
-        ; Secondary
-    ;     } else if (GetKeyState("LWin", "P") AND GetKeyState("LShift", "P")) {     ; WinModifiers/CB
-    ;     } else if (GetKeyState("LAlt", "P") AND GetKeyState("LShift", "P")) {     ; MacModifiers
-    ;     } else if (GetKeyState("CapsLock", "P") AND GetKeyState("LShift", "P")) { ; IBM
-            return
-        } else {
-            send {Blind}{tab}
-        }
-        return
-    }
-
-    tab::Send {tab}
-
-    +tab::Send {Shift down}{tab}{Shift up}
-
-    ; Basic Remap
-    ;
-    ; Primary::LCtrl
-    ; Secondary::LAlt
-    ; Tertiary::LWin
-
-    ; $LAlt::LCtrl     ; CB/IBM
-    ; $RAlt::RCtrl     ; CB/IBM
-    ; $RCtrl::RAlt     ; CB/IBM
-    ; $CapsLock::LWin  ; IBM
-    ; $LCtrl::LAlt     ; CB/IBM
-
-    ; $LAlt::LCtrl   ; WinModifiers
-    ; $RAlt::RCtrl   ; WinModifiers
-    ; $RCtrl::RAlt   ; WinModifiers
-    ; $LWin::LAlt    ; WinModifiers
-    ; $LCtrl::LWin   ; WinModifiers
-
-    ; $LWin::LCtrl   ; MacModifiers
-    ; $RWin::RCtrl   ; MacModifiers
-    ; $LCtrl::LWin   ; MacModifiers
-
-    ; Hack to disable start menu on winkey
-    ; Static
-    $LCtrl up::Send {Ctrl down}{LWin up}{Ctrl up}
-
-    ; temporary hack to ensure keys don't get stuck
-    ; impacts Alt-Tab fix
-    ; Primary
-    ; $LAlt up::Send {LWin up}{LAlt up}{LCtrl up} ; WinModifiers
-    ; $LWin up::Send {LWin up}{LAlt up}{LCtrl up} ; MacModifiers
-    ; $LAlt up::Send {LWin up}{CapsLock up}{LAlt up}{LCtrl up} ; CB/IBM
-
-    ; Close Apps 
-    ^q::Send !{F4}
-
-    ; Minimize specific Window
-    ^m::WinMinimize, A
-
-    ; Minimize all but Active Window
-    !^m::
-    WinGet, winid ,, A
-    WinMinimizeAll
-    WinActivate ahk_id %winid%
-    return
-
-    ; hide all instances of active Program
-    ^h::
-    WinGetClass, class, A
-    WinGet, AllWindows, List
-    loop %AllWindows% {
-        WinGetClass, WinClass, % "ahk_id " AllWindows%A_Index%
-        if(InStr(WinClass,class)){
-            WinMinimize, % "ahk_id " AllWindows%A_Index%
-        }
-    }
-    return
-
-    ; hide all but active program
-    !^h::
-    WinGetClass, class, A
-    WinMinimizeAll
-    WinGet, AllWindows, List
-    loop %AllWindows% {
-        WinGetClass, WinClass, % "ahk_id " AllWindows%A_Index%
-        if(InStr(WinClass,class)){
-            WinRestore, % "ahk_id " AllWindows%A_Index%
-        }
-    }
-    return
-
-    ; Show Desktop
-    ^F3::Send #d
-
-    ; Emoji Panel
-    #^Space::Send {LWin down};{LWin up}
-
-    ; Full Screenshot
-    ^+3::Send {PrintScreen}
-
-    ; Region Screenshot
-    ^+4::Send #+{S}
-
-    ; wordwise support
-    $^Left::Send {Home}
-    $^+Left::Send +{Home}
-    $^Right::Send {End}
-    $^+Right::Send +{End}
-    ^Up::Send ^{Home}
-    ^+Up::Send ^+{Home}
-    ^Down::Send ^{End}
-    ^+Down::Send ^+{End}
-    $^Backspace::Send +{Home}{Delete}
-    !Backspace::Send ^{Backspace}
-    !Left::Send ^{Left}
-    !+Left::Send ^+{Left}
-    !Right::Send ^{Right}
-    !+Right::Send ^+{Right}
-
-    #IfWinNotActive ahk_group terminals
-        ; emacs style
-        #n::Send {Down}
-        #p::Send {Up}
-        #f::Send {Right}
-        #b::Send {Left}
-        #a::Send {Home}
-        #e::Send {End}
-        #d::Send {Delete}
-        #k::Send +{End}{Backspace}
-    #If
-
-    ; Cmd+Space Alternative
-    $^Space::Send ^{Esc}
-
-    #IfWinActive ahk_group intellij
-        ; General
-        ^0::Send !{0}                   ;Open corresponding tool window
-        ^1::Send !{1}                   ;Open corresponding tool window
-        ^2::Send !{2}                   ;Open corresponding tool window
-        ^3::Send !{3}                   ;Open corresponding tool window
-        ^4::Send !{4}                   ;Open corresponding tool window
-        ^5::Send !{5}                   ;Open corresponding tool window
-        ^6::Send !{6}                   ;Open corresponding tool window
-        ^7::Send !{7}                   ;Open corresponding tool window
-        ^8::Send !{8}                   ;Open corresponding tool window
-        ^9::Send !{9}                   ;Open corresponding tool window
-        #`::Send ^`                     ;Quick switch current scheme
-        ^,::Send ^!s                    ;Open Settings dialog
-        ^;::Send ^!+s                   ;Open Project Structure dialog
-        ; Debugging
-        ^!r::Send {F9}                  ;Resume program
-        ; Search/Replace
-        ^g::Send {F3}                   ;Find next
-        ^+F3::Send +{F3}                ;Find previous
-        #g::Send !j                     ;Select next occurrence
-        ^#g::Send ^!+j                  ;Select all occurrences
-        #+g::Send !+j                   ;Unselect occurrence
-        ; Editing
-        ; #Space::Send ^{Space}           ; Default - Basic code completion
-        ; !Space::Send ^{Space}           ; CB/IBM - Basic code completion
-        #+Space::Send ^+{Space}         ;Smart code completion
-        #j::Send ^q                     ;Quick documentation lookup
-        ^n::Send !{Insert}              ;Generate code...
-        #o::Send ^o                     ;Override methods
-        #i::Send ^i                     ;Implement methods
-        !Up::Send ^w                    ;Extend selection
-        !Down::Send ^+w                 ;Shrink selection
-        #+q::Send !q                    ;Context info
-        #!o::Send ^!o                   ;Optimize imports
-        #!i::Send ^!i                   ;Auto-indent line(s)
-        $^Backspace::Send ^y            ;Delete line at caret
-        #+j::Send ^+j                   ;Smart line join
-        !Delete::Send ^{Delete}         ;Delete to word end
-        !Backspace::Send ^{Backspace}   ;Delete to word start
-        ^+::Send ^{NumpadAdd}           ;Expand code block
-        ^-::Send ^{NumpadSub}           ;Collapse code block
-        ^++::Send ^+{NumpadAdd}         ;Expand all
-        ^+-::Send ^+{NumpadSub}         ;Collapse all
-        ^w::Send ^{F4}                  ;Close active editor tab
-        ; Refactoring
-        ^Delete::Send !{Delete}         ;Safe Delete
-        ^T::Send ^!+T                   ;Refactor this
-        ; Navigation
-        ^o::Send ^n                     ;Go to class
-        ^+o::Send ^+n                   ;Go to file
-        ^!o::Send ^!+n                  ;Go to symbol
-        #Right::Send !{Right}           ;Go to next editor tab
-        #Left::Send !{Left}             ;Go to previous editor tab
-        #l::Send ^g                     ;Go to line
-        #e::Send ^e                     ;Recent files popup
-        ; !Space::Send ^+i                ; Default - Open quick definition lookup
-        ; #Space::Send ^+i                ; CB/IBM - Open quick definition lookup
-        ^Y::Send ^+i                    ;Open quick definition lookup
-        #+b::Send ^+b                   ;Go to type declaration
-        #Up::Send !{Up}                 ;Go to previous
-        #Down::Send !{Down}             ;Go to next method
-        #h::Send ^h                     ;Type hierarchy
-        #!h::Send ^!h                   ;Call hierarchy
-        ^Down::Send ^{Enter}            ;Edit source/View source
-        !Home::Send !{Home}             ;Show navigation bar
-        F2::Send {F11}                  ;Toggle bookmark
-        #F3::Send ^{F11}                ;Toggle bookmark with mnemonic
-        #0::Send ^{0}                   ;Go to numbered bookmark
-        #1::Send ^{1}                   ;Go to numbered bookmark
-        #2::Send ^{2}                   ;Go to numbered bookmark
-        #3::Send ^{3}                   ;Go to numbered bookmark
-        #4::Send ^{4}                   ;Go to numbered bookmark
-        #5::Send ^{5}                   ;Go to numbered bookmark
-        #6::Send ^{6}                   ;Go to numbered bookmark
-        #7::Send ^{7}                   ;Go to numbered bookmark
-        #8::Send ^{8}                   ;Go to numbered bookmark
-        #9::Send ^{9}                   ;Go to numbered bookmark
-        ^F3::Send +{F11}                ;Show bookmarks
-        ; Compile and Run
-        #!r::Send !+{F10}               ;Select configuration and run
-        #!d::Send !+{F9}                ;Select configuration and debug
-        #r::Send +{F10}                 ;Run
-        #d::Send +{F9}                  ;Debug
-        #+r::Send ^+{F10}               ;Run context configuration from editor
-        #+d::Send ^+{F9}                ;Debug context configuration from editor
-        ; VCS/Local History
-        #v::Send !`                     ;VCS quick popup
-    #If
-
-    ; Close all browsers
-    #IfWinActive ahk_group browsers
-        ^q::send {Alt Down}f{Alt Up}x   ; exit all windows
-        ; Dev Tools
-        #^i::send {Ctrl Down}{Shift Down}i{Shift Up}{Ctrl Up}
-        #^j::send {Ctrl Down}{Shift Down}j{Shift Up}{Ctrl Up}
-        ; Open preferences
-        #IfWinActive ahk_exe firefox.exe
-            ^,::send {Alt Down}{Shift Down}t{Shift Up}{Alt Up}o{Enter}
-        #If
-        #IfWinActive ahk_exe chrome.exe
-            ^,::send {Alt Down}e{Alt Up}s{Enter}
-        #If
-        #IfWinActive ahk_exe msedge.exe
-            ^,::send {Alt Down}e{Alt Up}s{Enter}
-        #If
-        #IfWinActive ahk_exe opera.exe
-            ^,::send {Ctrl Down}{F12}{Ctrl Up}
-        #If
-    #If
-
-    ; Sublime Text Remaps for VS Code
-    #IfWinActive ahk_group vscode
-        #p::send {Up}                                        ; Allow for traversing quick list
-        #n::send {Down}                                      ; Allow for traversing quick list
-        ; Remap Ctrl+Shift to behave like macOS Sublimetext
-        ; Will extend cursor to multiple lines
-    ;    #+Up::send ^!{Up}                                   ; Default - ST2CODE
-    ;    !+Up::send ^!{Up}                                   ; CB/IBM - ST2CODE
-    ;    #+Down::send ^!{Down}                               ; Default - ST2CODE
-    ;    !+Down::send ^!{Down}                               ; CB/IBM - ST2CODE
-        ; Remap Ctrl+Cmd+G to select all matches
-    ;    #^g::send ^+{L}                                     ; Default - ST2CODE
-    ;    !^g::send ^+{L}                                     ; CB/IBM - ST2CODE
-        !+g::send ^+{G}                                      ; View source control
-    ;    $#c::Send {Ctrl down}c{Ctrl up}                     ; Default - Sigints interrupt
-    ;    $!c::Send {Ctrl down}c{Ctrl up}                     ; CB/IBM
-
-    ;   #Space::Send ^{Space}                                ; Default - Basic code completion
-    ;   !Space::Send ^{Space}                                ; CB/IBM - Basic code completion
-    #If
-
-    #IfWinActive ahk_exe sublime_text.exe
-        ; #Space::Send ^{Space}                                   ; Default - Basic code completion
-        ; !Space::Send ^{Space}                                   ; CB/IBM - Basic code completion
-        #^Up::send !{O}                                         ; Switch file
-        #^f::send {F11}                                         ; toggle_full_screen
-        ^!v::send {Ctrl Down}k{Ctrl Up}{Ctrl Down}v{Ctrl Up}    ; paste_from_history
-        ^Up::Return                                             ; cancel scroll_lines up
-        ^!Up::send ^{Up}                                        ; scroll_lines up
-        ^Down::Return                                           ; cancel scroll_lines down
-        ^!Down::send ^{Down}                                    ; scroll_lines down
-        ; #+Up::send {shift up}^!{Up}                             ; Default - multi-cursor up
-        ; #+Down::send {shift up}^!{Down}                         ; Default - multi-cursor down
-        ; #+Up::send {shift up}^!{Up}                             ; CB/IBM - multi-cursor up
-        ; #+Down::send {shift up}^!{Down}                         ; CB/IBM - multi-cursor down
-        ^PgDn::Return                                           ; cancel next_view
-        ^PgUp::Return                                           ; cancel prev_view
-        ^+{::send ^{PgDn}                                       ; next_view
-        ^+}::send ^{PgUp}                                       ; prev_view
-        ^!Right::send ^{PgDn}                                   ; next_view
-        ^!Left::send ^{PgUp}                                    ; prev_view
-        Insert::Return                                          ; cancel toggle_overwrite
-        ^!O::send {Insert}                                      ; toggle_overwrite
-        !c::Return                                              ; cancel toggle_case_sensitive
-        ^!c::send !{c}                                          ; toggle_case_sensitive
-        ; ^h::Return                                              ; cancel replace
-        ^!f::send ^{h}                                          ; replace
-        ^+h::Return                                             ; cancel replace_next
-        ^!e::send ^+{h}                                         ; replace_next
-        F3::Return                                              ; cancel find_next
-        ^g::send {F3}                                           ; find_next
-        *F3::Return                                             ; cancel find_prev, find_under, find_all_under
-        ^+g::send +{F3}                                         ; find_prev
-        #!g::send ^{F3}                                         ; find_under
-        #!+g::send ^+{F3}                                       ; find_under_prev
-        ; #^g::send !{F3}                                         ; Default - find_all_under
-        ; !^g::send !{F3}                                         ; CB/IBM - find_all_under
-        ^+Up::Return                                            ; cancel swap_line_up
-        #!Up::send ^+{Up}                                       ; swap_line_up
-        ^+Down::Return                                          ; cancel swap_line_down
-        #!Down::send ^+{Down}                                   ; swap_line_down
-        ^Pause::Return                                          ; cancel cancel_build
-        #c::send ^{Pause}                                       ; cancel_build
-        F9::Return                                              ; cancel sort_lines case_s false
-        F5::send {F9}                                           ; sort_lines case_s false
-        #F9::Return                                             ; cancel sort_lines case_s true
-        #F5::send #{F9}                                         ; sort_lines case_s true
-        !+1::Return                                             ; cancel set_layout
-        ^!1::send !+1                                           ; set_layout
-        !+2::Return                                             ; cancel set_layout
-        ^!2::send !+2                                           ; set_layout
-        !+3::Return                                             ; cancel set_layout
-        ^!3::send !+3                                           ; set_layout
-        !+4::Return                                             ; cancel set_layout
-        ^!4::send !+4                                           ; set_layout
-        !+5::Return                                             ; cancel set_layout
-        ^!5::send !+5                                           ; set_layout
-        !+8::Return                                             ; cancel set_layout
-        ^!8::send !+8                                           ; set_layout
-        !+9::Return                                             ; cancel set_layout
-        ^!9::send !+9                                           ; set_layout
-    #If
-
-    #IfWinActive ahk_group terminals
-
-        ; End of Line
-        ; #e:: ; Default
-        ; !e:: ; CB/IBM
-        Send {End}
-        return
-
-        ; Beginning of Line
-        ; #a:: ; Default
-        ; !a:: ; CB/IBM
-        Send {Home}
-        return
-
-        ; Copy
-        ^c::
-        If WinActive("ahk_exe cmd.exe") OR WinActive("ahk_exe box.exe"){
-            Send {Enter}
-        }
-        else if WinActive("ahk_exe mintty.exe"){
-            SetKeyDelay -1
-            Send {Blind}{Insert}
-        }
-        ; else if WinActive("ahk_exe WindowsTerminal.exe"){ ; WinTerm
-        ;     SetKeyDelay -1                                ; WinTerm
-        ;     Send {Blind}{F13}                             ; WinTerm
-        ; }                                                 ; WinTerm
-        else{
-            SetKeyDelay -1
-            Send {Blind}{LShift down}{c DownTemp}
-        }
-        return
-
-        ^c up::
-        If not WinActive("ahk_group cmd.exe") OR WinActive("ahk_exe box.exe"){
-            SetKeyDelay -1
-            Send {Blind}{c Up}{LShift Up}
-        }
-        return
-
-        ; Sigints - interrupt
-        ; $#c::Send {Ctrl down}c{Ctrl up} ; Default
-        ; $!c::Send {Ctrl down}c{Ctrl up} ; CB/IBM
-
-        ; Windows Terminal
-        ; Ctrl+Shift+C should do nothing
-        If WinActive("ahk_exe WindowsTerminal.exe"){
-            $#+c::return
-        }
-
-        ; Paste
-        $^v::
-        If WinActive("ahk_exe mintty.exe"){
-            Send {Shift down}{Insert}{Shift up}
-        }
-        else if WinActive("ahk_group posix"){
-            Send {Blind}{Shift down}v{Shift up}
-        }
-        else if WinActive("ahk_exe box.exe"){
-            SendEvent {RButton}
-        }
-        else{
-            Send {Blind}v
-        }
-        return
-    #If
-
-    #IfWinActive ahk_group posix
-        ; Open/Close Tab for those that support it
-        $^t::
-        If not WinActive("ahk_group ConEmu") AND not WinActive("ahk_class Console_2_Main"){
-            Send {Blind}{LShift down}t{LShift Up}
-        }
-        else if WinActive("ahk_class Console_2_Main"){
-            Send {Blind}{F1}{LShift Up}
-        }
-        else{
-            Send {Blind}t
-        }
-        return
-
-
-        $^w::
-        If not WinActive("ahk_group ConEmu"){
-            Send {Blind}{LShift down}w{LShift Up}
-        }
-        else{
-            Send ^w
-        }
-        return
-
-        ^l::Send clear{Enter}
-        ; #l::return
-        ; Clear Terminal and Scroll Buffer
-        ^k::Send clear && printf '\e[3J'{Enter}
-        ; Remap Physical Ctrl back to Ctrl
-        #0::Send {LCtrl down}0{Ctrl up}  ; Default
-        #1::Send {LCtrl down}1{Ctrl up}  ; Default
-        #2::Send {LCtrl down}2{Ctrl up}  ; Default
-        #3::Send {LCtrl down}3{Ctrl up}  ; Default
-        #4::Send {LCtrl down}4{Ctrl up}  ; Default
-        #5::Send {LCtrl down}5{Ctrl up}  ; Default
-        #6::Send {LCtrl down}6{Ctrl up}  ; Default
-        #7::Send {LCtrl down}7{Ctrl up}  ; Default
-        #8::Send {LCtrl down}8{Ctrl up}  ; Default
-        #9::Send {LCtrl down}9{Ctrl up}  ; Default
-        #-::Send {LCtrl down}-{Ctrl up}  ; Default
-        #=::Send {LCtrl down}={Ctrl up}  ; Default
-        #`::Send {LCtrl down}`{Ctrl up}  ; Default
-        #a::Send {LCtrl down}a{Ctrl up}  ; Default
-        #b::Send {LCtrl down}b{Ctrl up}  ; Default
-        #c::Send {LCtrl down}c{Ctrl up}  ; Default
-        #d::Send {LCtrl down}d{Ctrl up}  ; Default
-        #e::Send {LCtrl down}e{Ctrl up}  ; Default
-        #f::Send {LCtrl down}f{Ctrl up}  ; Default
-        #g::Send {LCtrl down}g{Ctrl up}  ; Default
-        #h::Send {LCtrl down}h{Ctrl up}  ; Default
-        #i::Send {LCtrl down}i{Ctrl up}  ; Default
-        #j::Send {LCtrl down}j{Ctrl up}  ; Default
-        #k::Send {LCtrl down}k{Ctrl up}  ; Default
-        #l::Send {LCtrl down}l{Ctrl up}  ; Default
-        #m::Send {LCtrl down}m{Ctrl up}  ; Default
-        #n::Send {LCtrl down}n{Ctrl up}  ; Default
-        #o::Send {LCtrl down}o{Ctrl up}  ; Default
-        #p::Send {LCtrl down}p{Ctrl up}  ; Default
-        #q::Send {LCtrl down}q{Ctrl up}  ; Default
-        #r::Send {LCtrl down}r{Ctrl up}  ; Default
-        #s::Send {LCtrl down}s{Ctrl up}  ; Default
-        #t::Send {LCtrl down}t{Ctrl up}  ; Default
-        #u::Send {LCtrl down}u{Ctrl up}  ; Default
-        #v::Send {LCtrl down}v{Ctrl up}  ; Default
-        #w::Send {LCtrl down}w{Ctrl up}  ; Default
-        #x::Send {LCtrl down}x{Ctrl up}  ; Default
-        #y::Send {LCtrl down}y{Ctrl up}  ; Default
-        #z::Send {LCtrl down}z{Ctrl up}  ; Default
-        ; !0::Send {LCtrl down}0{Ctrl up}  ; CB/IBM
-        ; !1::Send {LCtrl down}1{Ctrl up}  ; CB/IBM
-        ; !2::Send {LCtrl down}2{Ctrl up}  ; CB/IBM
-        ; !3::Send {LCtrl down}3{Ctrl up}  ; CB/IBM
-        ; !4::Send {LCtrl down}4{Ctrl up}  ; CB/IBM
-        ; !5::Send {LCtrl down}5{Ctrl up}  ; CB/IBM
-        ; !6::Send {LCtrl down}6{Ctrl up}  ; CB/IBM
-        ; !7::Send {LCtrl down}7{Ctrl up}  ; CB/IBM
-        ; !8::Send {LCtrl down}8{Ctrl up}  ; CB/IBM
-        ; !9::Send {LCtrl down}9{Ctrl up}  ; CB/IBM
-        ; !-::Send {LCtrl down}-{Ctrl up}  ; CB/IBM
-        ; !=::Send {LCtrl down}={Ctrl up}  ; CB/IBM
-        ; !`::Send {LCtrl down}`{Ctrl up}  ; CB/IBM
-        ; !a::Send {LCtrl down}a{Ctrl up}  ; CB/IBM
-        ; !b::Send {LCtrl down}b{Ctrl up}  ; CB/IBM
-        ; !c::Send {LCtrl down}c{Ctrl up}  ; CB/IBM
-        ; !d::Send {LCtrl down}d{Ctrl up}  ; CB/IBM
-        ; !e::Send {LCtrl down}e{Ctrl up}  ; CB/IBM
-        ; !f::Send {LCtrl down}f{Ctrl up}  ; CB/IBM
-        ; !g::Send {LCtrl down}g{Ctrl up}  ; CB/IBM
-        ; !h::Send {LCtrl down}h{Ctrl up}  ; CB/IBM
-        ; !i::Send {LCtrl down}i{Ctrl up}  ; CB/IBM
-        ; !j::Send {LCtrl down}j{Ctrl up}  ; CB/IBM
-        ; !k::Send {LCtrl down}k{Ctrl up}  ; CB/IBM
-        ; !l::Send {LCtrl down}l{Ctrl up}  ; CB/IBM
-        ; !m::Send {LCtrl down}m{Ctrl up}  ; CB/IBM
-        ; !n::Send {LCtrl down}n{Ctrl up}  ; CB/IBM
-        ; !o::Send {LCtrl down}o{Ctrl up}  ; CB/IBM
-        ; !p::Send {LCtrl down}p{Ctrl up}  ; CB/IBM
-        ; !q::Send {LCtrl down}q{Ctrl up}  ; CB/IBM
-        ; !r::Send {LCtrl down}r{Ctrl up}  ; CB/IBM
-        ; !s::Send {LCtrl down}s{Ctrl up}  ; CB/IBM
-        ; !t::Send {LCtrl down}t{Ctrl up}  ; CB/IBM
-        ; !u::Send {LCtrl down}u{Ctrl up}  ; CB/IBM
-        ; !v::Send {LCtrl down}v{Ctrl up}  ; CB/IBM
-        ; !w::Send {LCtrl down}w{Ctrl up}  ; CB/IBM
-        ; !x::Send {LCtrl down}x{Ctrl up}  ; CB/IBM
-        ; !y::Send {LCtrl down}y{Ctrl up}  ; CB/IBM
-        ; !z::Send {LCtrl down}z{Ctrl up}  ; CB/IBM
-    #If
+	; Remap Ctrl+Cmd+G to select all matches
+	#^g::send !{F3}
 #If
 
-ReleaseModifiers:
-Send {RCtrl up}
-Send {LCtrl up}
-Send {RAlt up}
-Send {LAlt up}
-Send {RWin up}
-Send {LWin up}
-Send {RShift up}
-Send {LShift up}
-return
+#IfWinActive ahk_group terminals
+	; Copy
+	^c::Send {LCtrl down}{LShift down}c{LCtrl Up}{LShift Up}
+	#c::Send {LCtrl down}c{LCtrl Up}
+	#IfWinNotActive ahk_group ConEmu
+		; Paste
+		^v::Send {LCtrl down}{LShift down}v{LCtrl Up}{LShift Up}
+	#If
+#If
+
+#IfWinActive ahk_group posix
+	; End of Line
+	#e::Send {LCtrl down}e{LCtrl Up}
+	^e::return
+	; Beginning of Line
+	#a::Send {LCtrl down}a{LCtrl Up}
+	^a::return
+	;^l::Send clear{Enter}
+	;#l::return
+	; Clear Terminal and Scroll Buffer
+	^k::Send clear && printf '\e[3J'{Enter}
+	; Nano editor shortcuts
+	#k::Send {LCtrl down}k{LCtrl Up}
+	#x::Send {LCtrl down}x{LCtrl Up}
+	#o::Send {LCtrl down}o{LCtrl Up}
+	#r::Send {LCtrl down}r{LCtrl Up}
+	#w::Send {LCtrl down}w{LCtrl Up}
+	#\::Send {LCtrl down}\{LCtrl Up}
+	#u::Send {LCtrl down}u{LCtrl Up}
+	#j::Send {LCtrl down}j{LCtrl Up}
+	#t::Send {LCtrl down}t{LCtrl Up}
+	#_::Send {LCtrl down}_{LCtrl Up}
+	#z::Send {LCtrl down}z{LCtrl Up}
+#If
+
+#IfWinActive ahk_group ConEmu
+	; Paste
+	$^v::Send {Shift down}{Insert}{Shift Up}
+	#v::Send {LCtrl down}v{LCtrl Up}
+#If
+
+#IfWinActive ahk_exe mintty.exe
+	; Copy
+	$^c::Send {Control down}{Insert}{Control Up}
+	#c::Send {LCtrl down}c{LCtrl Up}
+	; Paste
+	$^v::Send {Shift down}{Insert}{Shift Up}
+	#v::Send {LCtrl down}v{LCtrl Up}
+#If
+
+;Disable win + l key locking (This line must come before any hotkey assignments in the .ahk file)
+
+; Admin privileges required
+; Sets Workstation Lock to not occur on Win+L
+; RegWrite, REG_DWORD, HKEY_CURRENT_USER, Software\Microsoft\Windows\CurrentVersion\Policies\System, DisableLockWorkstation, 1
+
+; Re-enables Workstation lock on Ctrl+Cmd+Q
+; Need to Remove Quick Assist and reboot
+; Remove-WindowsCapability -online -name App.Support.QuickAssist~~~~0.0.1.0
+#^q::
+;  re-enable locking workstation, then lock it
+;  RegWrite, REG_DWORD, HKEY_CURRENT_USER, Software\Microsoft\Windows\CurrentVersion\Policies\System, DisableLockWorkstation, 0
+;  DllCall("LockWorkStation")
+; Reload script to relock Workstation Lock
+;  Reload 
+;return

windows/toggle_kb.bat

@@ -1,65 +0,0 @@
-@echo off
-
-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:\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:\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
-exit

windows/usb.vbs

@@ -1,73 +0,0 @@
-Option Explicit
-Dim oWMISrv, collDvcs, iUSBDvc , iDvc, sDvcID, sPID, sVID, deviceID
-
-' add item to array
-Function AddItem(arr, val)
-    ReDim Preserve arr(UBound(arr) + 1)
-    arr(UBound(arr)) = val
-    AddItem = arr
-End Function
-
-' returns an array of the unique items in for-each-able collection fex
-Function uniqFE(fex)
-	Dim dicTemp : Set dicTemp = CreateObject("Scripting.Dictionary")
-	Dim xItem
-	For Each xItem In fex
-		dicTemp(xItem) = 0
-	Next
-	uniqFE = dicTemp.Keys()
-End Function
-
-Function ReplaceX(ByVal sValue, ByVal sPattern, ByVal sNValue)
-    Dim oReg : Set oReg = New RegExp
-    oReg.Pattern = sPattern
-    ReplaceX = oReg.Replace(sValue, sNValue)
-    Set oReg = Nothing
-End Function
-
-Set oWMISrv = GetObject("winmgmts:\\.\root\cimv2")
-Set collDvcs = oWMISrv.ExecQuery("Select * From Win32_PnPEntity WHERE Service='kbdhid'")
-
-Dim deviceVID : deviceVID=Array()
-Dim devicePID : devicePID=Array()
-Dim deviceDesc : deviceDesc=Array()
-Dim counter: counter=0
-
-For Each iUSBDvc In collDvcs
-    sVID = ReplaceX(iUSBDvc.DeviceID, ".*VID_(.{4}).*", "$1")
-    sPID = ReplaceX(iUSBDvc.DeviceID, ".*PID_(.{4}).*", "$1")
-    deviceVID = AddItem(deviceVID, sVID)
-    devicePID = AddItem(devicePID, sPID)
-    deviceDesc = AddItem(deviceDesc, iUSBDvc.Description)
-    counter = counter + 1
-    ' Wscript.Echo "Name : "& iUSBDvc.Description &"VID_PID : "& sVID & sPID
-    Next
-
-Dim uniqueVID: uniqueVID = uniqFE(deviceVID)
-Dim vcount: vcount = UBound(uniqueVID) + 1
-Dim nonApple: nonApple = 0
-Dim i
-
-If vcount = 1 Then
-	deviceID = deviceVID(0)
-	If StrComp(deviceVID(0), "05AC") = 0 Then
-		Wscript.Echo "Apple " & deviceID
-	Else
-		Wscript.Echo "Windows " & deviceID
-	End If
-Else
-	For i = 0 To counter-1
-		deviceID = deviceVID(i)
-    	If StrComp(deviceVID(i), "05AC") = -1 Then
-    		nonApple = 1
-    	End If
-	Next
-	If nonApple = 1 Then
-		Wscript.Echo "Windows " & deviceID
-	Else
-		Wscript.Echo "Apple " & deviceID
-	End If
-End If
-
-Set collDvcs = Nothing
-Set oWMISrv = Nothing

xkeysnail-config/gnome_logoff.sh

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

@@ -1,11 +0,0 @@
-[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

@@ -1,40 +0,0 @@
-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

@@ -1,20 +0,0 @@
-#!/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,492 +0,0 @@
-# -*- coding: utf-8 -*-
-# autostart = true
-
-import re
-from xkeysnail.transform import *
-
-# Use the following for testing terminal keymaps
-# terminals = [ "", ... ]
-# xbindkeys -mk
-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","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,{
-
-    # 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 Win
-    # Key.LEFT_ALT: Key.RIGHT_CTRL,   # WinMac
-    # Key.LEFT_META: Key.LEFT_ALT,    # WinMac
-    # Key.LEFT_CTRL: Key.LEFT_META,   # WinMac
-    # Key.RIGHT_ALT: Key.RIGHT_CTRL,  # WinMac - Multi-language (Remove)
-    # Key.RIGHT_META: Key.RIGHT_ALT,  # WinMac - Multi-language (Remove)
-    # Key.RIGHT_CTRL: Key.RIGHT_META, # WinMac - Multi-language (Remove)
-
-    # - Mac Only
-    # Key.LEFT_META: Key.RIGHT_CTRL,  # Mac
-    # Key.LEFT_CTRL: Key.LEFT_META,   # Mac
-    # Key.RIGHT_META: Key.RIGHT_CTRL, # Mac - Multi-language (Remove)
-    # Key.RIGHT_CTRL: Key.RIGHT_META, # Mac - Multi-language (Remove)
-})
-
-# [Conditional modmap] Change modifier keys in certain applications
-define_conditional_modmap(re.compile(termStr, re.IGNORECASE), {
-    # - 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
-    # Key.RIGHT_ALT: Key.RIGHT_CTRL,    # Chromebook - Multi-language (Remove)
-    # Key.RIGHT_CTRL: Key.RIGHT_ALT,    # Chromebook
-    # # Right Meta does not exist on chromebooks
-
-    # - 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
-    # Key.RIGHT_ALT: Key.RIGHT_CTRL,  # WinMac - Multi-language (Remove)
-    # Key.RIGHT_META: Key.RIGHT_ALT,  # WinMac - Multi-language (Remove)
-    # Key.RIGHT_CTRL: Key.LEFT_CTRL,  # WinMac - Multi-language (Remove)
-
-    # - Mac Only
-    # Key.LEFT_META: Key.RIGHT_CTRL,  # Mac
-    # # Left Ctrl Stays Left Ctrl
-    # Key.RIGHT_META: Key.RIGHT_CTRL, # Mac - Multi-language (Remove)
-    # Key.RIGHT_CTRL: Key.LEFT_CTRL,  # Mac - Multi-language (Remove)
-})
-
-# Keybindings for IntelliJ
-define_keymap(re.compile("jetbrains-idea", re.IGNORECASE),{
-    # General
-    K("C-Key_0"): K("M-Key_0"),                 # Open corresponding tool window
-    K("C-Key_1"): K("M-Key_1"),                 # Open corresponding tool window
-    K("C-Key_2"): K("M-Key_2"),                 # Open corresponding tool window
-    K("C-Key_3"): K("M-Key_3"),                 # Open corresponding tool window
-    K("C-Key_4"): K("M-Key_4"),                 # Open corresponding tool window
-    K("C-Key_5"): K("M-Key_5"),                 # Open corresponding tool window
-    K("C-Key_6"): K("M-Key_6"),                 # Open corresponding tool window
-    K("C-Key_7"): K("M-Key_7"),                 # Open corresponding tool window
-    K("C-Key_8"): K("M-Key_8"),                 # Open corresponding tool window
-    K("C-Key_9"): K("M-Key_9"),                 # Open corresponding tool window
-    K("Super-Grave"): K("C-Grave"),             # Quick switch current scheme
-    K("C-Comma"): K("C-M-s"),                   # Open Settings dialog
-    K("C-Semicolon"): K("C-M-Shift-s"),         # Open Project Structure dialog
-    # Debugging
-    K("C-M-r"): K("F9"),                        # Resume program
-    # Search/Replace
-    K("C-g"): K("F3"),                          # Find next
-    K("C-Shift-F3"): K("Shift-F3"),             # Find previous
-    K("Super-g"): K("M-j"),                     # Select next occurrence
-    K("C-Super-g"): K("C-M-Shift-j"),           # Select all occurrences
-    K("Super-Shift-g"): K("M-Shift-j"),         # Unselect occurrence
-    # Editing
-    K("Super-Space"): K("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
-    K("Super-i"): K("C-i"),                     # Implement methods
-    K("M-Up"): K("C-w"),                        # Extend selection
-    K("M-Down"): K("C-Shift-w"),                # Shrink selection
-    K("Super-Shift-q"): K("M-q"),               # Context info
-    K("Super-M-o"): K("C-M-o"),                 # Optimize imports
-    K("Super-M-i"): K("C-M-i"),                 # Auto-indent line(s)
-    K("C-Backspace"): K("C-y"),                 # Delete line at caret
-    K("Super-Shift-j"): K("C-Shift-j"),         # Smart line join
-    K("M-Delete"): K("C-Delete"),               # Delete to word end
-    K("M-Backspace"): K("C-Backspace"),         # Delete to word start
-    K("C-Shift-Equal"): K("C-KPPLUS"),          # Expand code block
-    K("C-Minus"): K("C-KPMINUS"),               # Collapse code block
-    K("C-Shift-Equal"): K("C-Shift-KPPLUS"),    # Expand all
-    K("C-Shift-Minus"): K("C-Shift-KPMINUS"),   # Collapse all
-    K("C-w"): K("C-F4"),                        # Close active editor tab
-    # Refactoring
-    K("C-Delete"): K("M-Delete"),               # Safe Delete
-    K("C-T"): K("C-M-Shift-t"),                 # Refactor this
-    # Navigation
-    K("C-o"): K("C-n"),                         # Go to class
-    K("C-Shift-o"): K("C-Shift-n"),             # Go to file
-    K("C-M-o"): K("C-M-Shift-n"),               # Go to symbol
-    K("Super-Right"): K("M-Right"),             # Go to next editor tab
-    K("Super-Left"): K("M-Left"),               # Go to previous editor tab
-    K("Super-l"): K("C-g"),                     # Go to line
-    K("Super-e"): K("C-e"),                     # Recent files popup
-    K("M-Space"): K("C-Shift-i"),               # Open quick definition lookup
-    K("C-Y"): K("C-Shift-i"),                   # Open quick definition lookup
-    K("Super-Shift-b"): K("C-Shift-b"),         # Go to type declaration
-    K("Super-Up"): K("M-Up"),                   # Go to previous
-    K("Super-Down"): K("M-Down"),               # Go to next method
-    K("Super-h"): K("C-h"),                     # Type hierarchy
-    K("Super-M-h"): K("C-M-h"),                 # Call hierarchy
-    K("C-Down"): K("C-Enter"),                  # Edit source/View source
-    K("M-Home"): K("M-Home"),                   # Show navigation bar
-    K("F2"): K("F11"),                          # Toggle bookmark
-    K("Super-F3"): K("C-F11"),                  # Toggle bookmark with mnemonic
-    K("Super-Key_0"): K("C-Key_0"),             # Go to numbered bookmark
-    K("Super-Key_1"): K("C-Key_1"),             # Go to numbered bookmark
-    K("Super-Key_2"): K("C-Key_2"),             # Go to numbered bookmark
-    K("Super-Key_3"): K("C-Key_3"),             # Go to numbered bookmark
-    K("Super-Key_4"): K("C-Key_4"),             # Go to numbered bookmark
-    K("Super-Key_5"): K("C-Key_5"),             # Go to numbered bookmark
-    K("Super-Key_6"): K("C-Key_6"),             # Go to numbered bookmark
-    K("Super-Key_7"): K("C-Key_7"),             # Go to numbered bookmark
-    K("Super-Key_8"): K("C-Key_8"),             # Go to numbered bookmark
-    K("Super-Key_9"): K("C-Key_9"),             # Go to numbered bookmark
-    K("C-F3"): K("Shift-F11"),                  # Show bookmarks
-    # Compile and Run
-    K("Super-M-r"): K("M-Shift-F10"),           # Select configuration and run
-    K("Super-M-d"): K("M-Shift-F9"),            # Select configuration and debug
-    K("Super-r"): K("Shift-F10"),               # Run
-    K("Super-d"): K("Shift-F9"),                # Debug
-    K("Super-Shift-r"): K("C-Shift-F10"),       # Run context configuration from editor
-    K("Super-Shift-d"): K("C-Shift-F9"),        # Debug context configuration from editor
-    # VCS/Local History
-    K("Super-v"): K("M-Grave"),                 # VCS quick popup
-    K("Super-c"): K("LC-c"),                    # Sigints - interrupt
-})
-
-# Keybindings for Nautilus
-define_keymap(re.compile("org.gnome.nautilus", re.IGNORECASE),{
-    K("RC-Up"): K("M-Up"),          # Go Up dir
-    K("RC-Down"): K("M-Down"),      # Go Down dir
-    K("RC-Left"): K("M-Left"),      # Go Back
-    K("RC-Right"): K("M-Right"),    # Go Forward
-})
-
-# Keybindings for Browsers
-define_keymap(re.compile(browserStr, re.IGNORECASE),{
-    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-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-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/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("RC-Shift-Left"): K("Shift-Home"),          # Select all to Beginning of Line
-    K("RC-Right"): 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
-    # K("RC-Left"): K("M-LEFT"),                    # Chrome-nw - Back
-    # K("RC-Right"): K("M-RIGHT"),                  # Chrome-nw - Forward
-    K("RC-Up"): K("C-Home"),                      # Beginning of File
-    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/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(""): pass_through_key,                      # cancel
-    # K(""): K(""),                                 #
-})
-
-define_keymap(lambda wm_class: wm_class.casefold() not in mscodes,{
-    # Wordwise remaining - for Everything but VS Code
-    K("M-Left"): K("C-Left"),               # Left of Word
-    K("M-Shift-Left"): K("C-Shift-Left"),   # Select Left of Word
-    K("M-Right"): K("C-Right"),             # Right of Word
-    K("M-Shift-Right"): K("C-Shift-Right"), # Select Right of Word
-    K("M-Shift-g"): K("C-Shift-g"),         # View source control
-    # ** VS Code fix **
-    #   Electron issue precludes normal keybinding fix.
-    #   Alt menu auto-focus/toggle gets in the way.
-    #
-    #   refer to ./xkeysnail-config/vscode_keybindings.json
-    # **
-    #
-    # ** Firefox fix **
-    #   User will need to set "ui.key.menuAccessKeyFocuses"
-    #   under about:config to false.
-    #
-    #   https://superuser.com/questions/770301/pentadactyl-how-to-disable-menu-bar-toggle-by-alt
-    # **
-    #
-})
-
-# 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
-    K("M-Right"): [K("M-F19"),K("C-Right")],                # Right of Word
-    K("M-Shift-Left"): [K("M-F19"),K("C-Shift-Left")],      # Select Left of Word
-    K("M-Shift-Right"): [K("M-F19"),K("C-Shift-Right")],    # Select Right of Word
-    
-    # K("C-PAGE_DOWN"): pass_through_key,         # cancel next_view
-    # K("C-PAGE_UP"): pass_through_key,           # cancel prev_view
-    K("C-M-Left"): K("C-PAGE_UP"),              # next_view
-    K("C-M-Right"): K("C-PAGE_DOWN"),           # prev_view
-
-    # VS Code Shortcuts
-    K("C-g"): pass_through_key,                 # cancel Go to Line...
-    K("Super-g"): K("C-g"),                     # Go to Line...
-    K("F3"): pass_through_key,                  # cancel Find next
-    K("C-h"): pass_through_key,                 # cancel replace
-    K("C-M-f"): K("C-h"),                       # replace
-    K("C-Shift-h"): pass_through_key,           # cancel replace_next
-    K("C-M-e"): K("C-Shift-h"),                 # replace_next
-    K("f3"): pass_through_key,                  # cancel find_next
-    K("C-g"): K("f3"),                          # find_next
-    K("Shift-f3"): pass_through_key,            # cancel find_prev
-    K("C-Shift-g"): K("Shift-f3"),              # find_prev
-    K("Super-c"): K("LC-c"),                    # Sigints - interrupt
-    # K("Super-C-g"): K("C-f2"),                  # Default - Sublime - find_all_under
-    # K("C-M-g"): K("C-f2"),                      # Chromebook/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
-    # K(""): K(""),                               #
-}, "Code")
-
-# Keybindings for Sublime Text
-define_keymap(re.compile("Sublime_text", re.IGNORECASE),{
-    K("Super-Space"): K("C-Space"),             # Basic code completion
-    K("C-Super-up"): K("M-o"),                  # Switch file
-    K("Super-RC-f"): K("f11"),                  # toggle_full_screen
-    K("C-M-v"): [K("C-k"), K("C-v")],           # paste_from_history
-    K("C-up"): pass_through_key,                # cancel scroll_lines up
-    K("C-M-up"): K("C-up"),                     # scroll_lines up
-    K("C-down"): pass_through_key,              # cancel scroll_lines down
-    K("C-M-down"): K("C-down"),                 # scroll_lines down
-    K("Super-Shift-up"): K("M-Shift-up"),       # multi-cursor up
-    K("Super-Shift-down"): K("M-Shift-down"),   # multi-cursor down
-    K("C-PAGE_DOWN"): pass_through_key,         # cancel next_view
-    K("C-PAGE_UP"): pass_through_key,           # cancel prev_view
-    K("C-Shift-left_brace"): K("C-PAGE_DOWN"),  # next_view
-    K("C-Shift-right_brace"): K("C-PAGE_UP"),   # prev_view
-    K("C-M-right"): K("C-PAGE_DOWN"),           # next_view
-    K("C-M-left"): K("C-PAGE_UP"),              # prev_view
-    K("insert"): pass_through_key,              # cancel toggle_overwrite
-    K("C-M-o"): K("insert"),                    # toggle_overwrite
-    K("M-c"): pass_through_key,                 # cancel toggle_case_sensitive
-    K("C-M-c"): K("M-c"),                       # toggle_case_sensitive
-    K("C-h"): pass_through_key,                 # cancel replace
-    K("C-M-f"): K("C-h"),                       # replace
-    K("C-Shift-h"): pass_through_key,           # cancel replace_next
-    K("C-M-e"): K("C-Shift-h"),                 # replace_next
-    K("f3"): pass_through_key,                  # cancel find_next
-    K("C-g"): K("f3"),                          # find_next
-    K("Shift-f3"): pass_through_key,            # cancel find_prev
-    K("C-Shift-g"): K("Shift-f3"),              # find_prev
-    K("C-f3"): pass_through_key,                # cancel find_under
-    K("Super-M-g"): K("C-f3"),                  # find_under
-    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/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
-    K("C-Shift-down"): pass_through_key,        # cancel swap_line_down
-    K("Super-M-down"): K("C-Shift-down"),       # swap_line_down
-    K("C-Pause"): pass_through_key,             # cancel cancel_build
-    K("Super-c"): K("C-Pause"),                 # cancel_build
-    K("f9"): pass_through_key,                  # cancel sort_lines case_s false
-    K("f5"): K("f9"),                           # sort_lines case_s false
-    K("Super-f9"): pass_through_key,            # cancel sort_lines case_s true
-    K("Super-f5"): K("Super-f9"),               # sort_lines case_s true
-    K("M-Shift-Key_1"): pass_through_key,       # cancel set_layout
-    K("C-M-Key_1"): K("M-Shift-Key_1"),         # set_layout
-    K("M-Shift-Key_2"): pass_through_key,       # cancel set_layout
-    K("C-M-Key_2"): K("M-Shift-Key_2"),         # set_layout
-    K("M-Shift-Key_3"): pass_through_key,       # cancel set_layout
-    K("C-M-Key_3"): K("M-Shift-Key_3"),         # set_layout
-    K("M-Shift-Key_4"): pass_through_key,       # cancel set_layout
-    K("C-M-Key_4"): K("M-Shift-Key_4"),         # set_layout
-    K("M-Shift-Key_8"): pass_through_key,       # cancel set_layout
-    K("C-M-Shift-Key_2"): K("M-Shift-Key_8"),   # set_layout
-    K("M-Shift-Key_9"): pass_through_key,       # cancel set_layout
-    K("C-M-Shift-Key_3"): K("M-Shift-Key_9"),   # set_layout
-    K("M-Shift-Key_5"): pass_through_key,       # cancel set_layout
-    K("C-M-Shift-Key_5"): K("M-Shift-Key_5"),   # set_layout
-    # K(""): pass_through_key,                    # cancel
-    # K(""): K(""),                               #
-}, "Sublime Text")
-
-define_keymap(re.compile("konsole", re.IGNORECASE),{
-    # Ctrl Tab - In App Tab Switching
-    K("LC-Tab") : K("Shift-Right"),
-    K("LC-Shift-Tab") : K("Shift-Left"),
-    K("LC-Grave") : K("Shift-Left"),
-
-}, "Konsole tab switching")
-
-define_keymap(re.compile("Io.elementary.terminal|kitty", re.IGNORECASE),{
-    # Ctrl Tab - In App Tab Switching
-    K("LC-Tab") : K("LC-Shift-Right"),
-    K("LC-Shift-Tab") : K("LC-Shift-Left"),
-    K("LC-Grave") : K("LC-Shift-Left"),
-
-}, "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"),
-    K("LC-Grave") : K("LC-PAGE_UP"),
-    # Converts Cmd to use Ctrl-Shift
-    K("RC-Tab"): K("RC-F13"),
-    K("RC-Shift-Tab"): K("RC-Shift-F13"),
-    K("RC-V"): K("C-Shift-V"),
-    K("RC-MINUS"): K("C-Shift-MINUS"),
-    K("RC-EQUAL"): K("C-Shift-EQUAL"),
-    K("RC-BACKSPACE"): K("C-Shift-BACKSPACE"),
-    K("RC-W"): K("C-Shift-W"),
-    K("RC-E"): K("C-Shift-E"),
-    K("RC-R"): K("C-Shift-R"),
-    K("RC-T"): K("C-Shift-t"),
-    K("RC-Y"): K("C-Shift-Y"),
-    K("RC-U"): K("C-Shift-U"),
-    K("RC-I"): K("C-Shift-I"),
-    K("RC-O"): K("C-Shift-O"),
-    K("RC-P"): K("C-Shift-P"),
-    K("RC-LEFT_BRACE"): K("C-Shift-LEFT_BRACE"),
-    K("RC-RIGHT_BRACE"): K("C-Shift-RIGHT_BRACE"),
-    K("RC-A"): K("C-Shift-A"),
-    K("RC-S"): K("C-Shift-S"),
-    K("RC-D"): K("C-Shift-D"),
-    K("RC-F"): K("C-Shift-F"),
-    K("RC-G"): K("C-Shift-G"),
-    K("RC-H"): K("C-Shift-H"),
-    K("RC-J"): K("C-Shift-J"),
-    K("RC-K"): K("C-Shift-K"),
-    K("RC-L"): K("C-Shift-L"),
-    K("RC-SEMICOLON"): K("C-Shift-SEMICOLON"),
-    K("RC-APOSTROPHE"): K("C-Shift-APOSTROPHE"),
-    K("RC-GRAVE"): K("C-Shift-GRAVE"),
-    K("RC-BACKSLASH"): K("C-Shift-BACKSLASH"),
-    K("RC-Z"): K("C-Shift-Z"),
-    K("RC-X"): K("C-Shift-X"),
-    K("RC-C"): K("C-Shift-C"),
-    K("RC-V"): K("C-Shift-V"),
-    K("RC-B"): K("C-Shift-B"),
-    K("RC-N"): K("C-Shift-N"),
-    K("RC-M"): K("C-Shift-M"),
-    K("RC-COMMA"): K("C-Shift-COMMA"),
-    K("RC-DOT"): K("C-Shift-DOT"),
-    K("RC-SLASH"): K("C-Shift-SLASH"),
-    K("RC-KPASTERISK"): K("C-Shift-KPASTERISK"),
-}, "terminals")

xkeysnail-config/limitedadmins

@@ -1,10 +0,0 @@
-# /etc/sudoers.d/limitedadmins
-%{username} ALL=NOPASSWD: {systemctl} restart xkeysnail
-%{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/prexk.sh

@@ -1,13 +0,0 @@
-#!/bin/bash
-if [ -f {homedir}/.config/systemd/user/keyswap.timer ]; then
-	systemctl --user stop keyswap.timer >/dev/null 2>&1
-	systemctl --user disable keyswap.timer >/dev/null 2>&1
-fi
-if [ -f {homedir}/.config/systemd/user/keyswap.service ]; then
-	systemctl --user stop keyswap >/dev/null 2>&1
-	systemctl --user disable keyswap >/dev/null 2>&1
-fi
-
-# export DISPLAY={displayid};/usr/bin/xhost +SI:localuser:root
-mkdir -p /tmp/kinto/xkeysnail
-cp {homedir}/.config/kinto/kinto.py /tmp/kinto/xkeysnail/kinto.py

xkeysnail-config/root_logoff.sh

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

@@ -1,41 +0,0 @@
-<?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

@@ -1,41 +0,0 @@
-<?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

@@ -1,28 +0,0 @@
-<?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

@@ -1,28 +0,0 @@
-<?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

@@ -1,24 +0,0 @@
-<?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

@@ -1,25 +0,0 @@
-<?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

@@ -1,27 +0,0 @@
-<?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

@@ -1,8 +0,0 @@
-[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

@@ -1,719 +0,0 @@
-#!/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/vscode_keybindings.json

@@ -1,31 +0,0 @@
-// Place your key bindings in this file to override the defaultsauto[]
-[
-    {
-        "key": "alt+left",
-        "command": "-workbench.action.terminal.focusPreviousPane",
-        "when": "terminalFocus"
-    },
-    {
-        "key": "alt+right",
-        "command": "-workbench.action.terminal.focusNextPane",
-        "when": "terminalFocus"
-    },
-    {
-        "key": "alt+right",
-        "command": "cursorWordRight"
-    },
-    {
-        "key": "alt+left",
-        "command": "cursorWordLeft"
-    },
-    {
-        "key": "shift+alt+left",
-        "command": "cursorWordStartLeftSelect",
-        "when": "textInputFocus"
-    },
-    {
-        "key": "shift+alt+right",
-        "command": "cursorWordEndRightSelect",
-        "when": "textInputFocus"
-    }
-]

xkeysnail-config/xkeysnail.desktop

@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=Kinto_xkey
-GenericName=Kinto_xkey
-Comment=Make Linux Type Like it's a Mac
-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

@@ -1,14 +0,0 @@
-[Unit]
-Description=xkeysnail
-
-[Service]
-Type=simple
-KillMode=process
-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}
-
-[Install]
-WantedBy=graphical.target

xkeysnail-config/xkeystart.sh

@@ -1,19 +0,0 @@
-#!/bin/bash
-# >/dev/null 2>&1
-
-if [ -f /usr/local/bin/xkeysnail ];then
-	xkeyfullpath="/usr/local/bin/xkeysnail"
-elif [ -f /usr/bin/xkeysnail ];then
-	xkeyfullpath="/usr/bin/xkeysnail"
-else
-	xkeyfullpath=`which xkeysnail`
-fi
-
-"$xkeyfullpath" --quiet --watch "$1" &
-
-inotifywait -m -e close_write,moved_to,create,modify /tmp/kinto/xkeysnail |
-
-while read -r path; do
-	/usr/bin/killall xkeysnail
-	"$xkeyfullpath" --quiet --watch "$1" &
-done

xkeysnail/kinto.py

@@ -0,0 +1,210 @@
+# -*- coding: utf-8 -*-
+
+import re
+from xkeysnail.transform import *
+
+# [Global modemap] Change modifier keys as in xmodmap
+define_conditional_modmap(lambda wm_class: wm_class not in ("Gnome-terminal","konsole","io.elementary.terminal","terminator","sakura","guake","tilda","xterm","eterm","kitty"),{
+    # # Chromebook
+    # Key.LEFT_ALT: Key.RIGHT_CTRL,   # Chromebook
+    # Key.LEFT_CTRL: Key.LEFT_ALT,    # Chromebook
+    # Key.RIGHT_ALT: Key.RIGHT_CTRL,  # Chromebook
+    # Key.RIGHT_CTRL: Key.RIGHT_ALT,  # Chromebook
+
+    # Default Mac/Win
+    Key.LEFT_ALT: Key.RIGHT_CTRL,   # WinMac
+    Key.LEFT_META: Key.LEFT_ALT,    # WinMac
+    Key.LEFT_CTRL: Key.LEFT_META,   # WinMac
+    Key.RIGHT_ALT: Key.RIGHT_CTRL,  # WinMac
+    Key.RIGHT_META: Key.RIGHT_ALT,  # WinMac
+    Key.RIGHT_CTRL: Key.RIGHT_META, # WinMac
+
+    # # Mac Only
+    # Key.LEFT_META: Key.RIGHT_CTRL,  # Mac
+    # Key.LEFT_CTRL: Key.LEFT_META,   # Mac
+    # Key.RIGHT_META: Key.RIGHT_CTRL, # Mac
+    # Key.RIGHT_CTRL: Key.RIGHT_META, # Mac
+})
+
+# [Conditional modmap] Change modifier keys in certain applications
+define_conditional_modmap(re.compile("Gnome-terminal|konsole|io.elementary.terminal|terminator|sakura|guake|tilda|xterm|eterm|kitty"), {
+    # # Chromebook
+    # Key.LEFT_ALT: Key.RIGHT_CTRL,
+    # # Left Ctrl Stays Left Ctrl
+    # Key.LEFT_META: Key.LEFT_ALT,
+    # Key.RIGHT_ALT: Key.RIGHT_CTRL,
+    # Key.RIGHT_CTRL: Key.RIGHT_ALT,
+    # # Right Meta does not exist on chromebooks
+
+    # Default Mac/Win
+    Key.LEFT_ALT: Key.RIGHT_CTRL,   # WinMac
+    Key.LEFT_META: Key.LEFT_ALT,    # WinMac
+    Key.LEFT_CTRL: Key.LEFT_CTRL,   # WinMac
+    Key.RIGHT_ALT: Key.RIGHT_CTRL,  # WinMac
+    Key.RIGHT_META: Key.RIGHT_ALT,  # WinMac
+    Key.RIGHT_CTRL: Key.LEFT_CTRL,  # WinMac
+
+    # # Mac Only
+    # Key.LEFT_META: Key.RIGHT_CTRL,  # Mac
+    # # Left Ctrl Stays Left Ctrl
+    # Key.RIGHT_META: Key.RIGHT_CTRL, # Mac
+    # Key.RIGHT_CTRL: Key.LEFT_CTRL,  # Mac
+})
+
+# Keybindings for Sublime Text
+define_keymap(re.compile("Sublime_text"),{
+    K("C-Super-up"): K("M-o"),                  # Switch file
+    K("C-M-f"): K("f11"),                       # toggle_full_screen
+    K("C-M-v"): [K("C-k"), K("C-v")],           # paste_from_history
+    K("C-up"): pass_through_key,                # cancel scroll_lines up
+    K("Super-M-up"): K("C-up"),                 # scroll_lines up
+    K("C-down"): pass_through_key,              # cancel scroll_lines down
+    K("Super-M-down"): K("C-down"),             # scroll_lines down
+    K("C-PAGE_DOWN"): pass_through_key,         # cancel next_view
+    K("C-PAGE_UP"): pass_through_key,           # cancel prev_view
+    K("C-Shift-left_brace"): K("C-PAGE_DOWN"),  # next_view
+    K("C-Shift-right_brace"): K("C-PAGE_UP"),   # prev_view
+    K("C-M-right"): K("C-PAGE_DOWN"),           # next_view
+    K("C-M-left"): K("C-PAGE_UP"),              # prev_view
+    K("insert"): pass_through_key,              # cancel toggle_overwrite
+    K("C-M-o"): K("insert"),                    # toggle_overwrite
+    K("M-c"): pass_through_key,                 # cancel toggle_case_sensitive
+    K("C-M-c"): K("M-c"),                       # toggle_case_sensitive
+    K("C-h"): pass_through_key,                 # cancel replace
+    K("C-M-f"): K("C-h"),                       # replace
+    K("C-Shift-h"): pass_through_key,           # cancel replace_next
+    K("C-M-e"): K("C-Shift-h"),                 # replace_next
+    K("f3"): pass_through_key,                  # cancel find_next
+    K("C-g"): K("f3"),                          # find_next
+    K("Shift-f3"): pass_through_key,            # cancel find_prev
+    K("C-Shift-g"): K("Shift-f3"),              # find_prev
+    K("C-f3"): pass_through_key,                # cancel find_under
+    K("Super-M-g"): K("C-f3"),                  # find_under
+    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("Super-C-g"): K("M-f3"),                  # Default - find_all_under
+    K("C-Shift-up"): pass_through_key,          # cancel swap_line_up
+    K("Super-C-up"): K("C-Shift-up"),           # swap_line_up
+    K("C-Shift-down"): pass_through_key,        # cancel swap_line_down
+    K("Super-C-down"): K("C-Shift-down"),       # swap_line_down
+    K("C-Pause"): pass_through_key,             # cancel cancel_build
+    K("Super-c"): K("C-Pause"),                 # cancel_build
+    K("f9"): pass_through_key,                  # cancel sort_lines case_s false
+    K("f5"): K("f9"),                           # sort_lines case_s false
+    K("Super-f9"): pass_through_key,            # cancel sort_lines case_s true
+    K("Super-f5"): K("Super-f9"),               # sort_lines case_s true
+    K("M-Shift-Key_1"): pass_through_key,       # cancel set_layout
+    K("C-M-Key_1"): K("M-Shift-Key_1"),         # set_layout
+    K("M-Shift-Key_2"): pass_through_key,       # cancel set_layout
+    K("C-M-Key_2"): K("M-Shift-Key_2"),         # set_layout
+    K("M-Shift-Key_3"): pass_through_key,       # cancel set_layout
+    K("C-M-Key_3"): K("M-Shift-Key_3"),         # set_layout
+    K("M-Shift-Key_4"): pass_through_key,       # cancel set_layout
+    K("C-M-Key_4"): K("M-Shift-Key_4"),         # set_layout
+    K("M-Shift-Key_8"): pass_through_key,       # cancel set_layout
+    K("C-M-Shift-Key_2"): K("M-Shift-Key_8"),   # set_layout
+    K("M-Shift-Key_9"): pass_through_key,       # cancel set_layout
+    K("C-M-Shift-Key_3"): K("M-Shift-Key_9"),   # set_layout
+    K("M-Shift-Key_5"): pass_through_key,       # cancel set_layout
+    K("C-M-Shift-Key_5"): K("M-Shift-Key_5"),   # set_layout
+    # K(""): pass_through_key,                    # cancel
+    # K(""): K(""),                               #
+}, "Sublime Text")
+
+define_keymap(None,{
+    # Cmd Tab - App Switching Default
+    K("RC-Tab"): K("RC-F13"),
+    K("RC-Shift-Tab"): K("RC-Shift-F13"),
+    K("RC-Grave"): K("RC-Shift-F13"),
+    # In-App Tab switching
+    # K("M-Tab"): K("C-Tab"),                   # Chromebook
+    # K("M-Shift-Tab"): K("C-Shift-Tab"),       # Chromebook
+    K("Super-Tab"): K("LC-Tab"),                # Default
+    K("Super-Shift-Tab"): K("LC-Shift-Tab"),    # Default
+    K("LC-Grave") : K("LC-Shift-Tab"),          # Default
+
+    # Wordwise
+    K("RC-Left"): K("Home"),        # Beginning of Line
+    K("RC-Right"): K("End"),        # End of Line
+    K("M-Left"): K("C-Left"),       # Left of Word
+    K("M-Right"): K("C-Right"),     # Right of Word
+    K("RC-Up"): K("C-Home"),        # Beginning of File
+    K("RC-Down"): K("C-End"),       # End of File
+    K("M-Backspace"): K("Delete"),  # Delete
+    # K(""): pass_through_key,        # cancel
+    # K(""): K(""),                   #
+})
+
+# define_keymap(re.compile("Gnome-terminal|io.elementary.terminal|terminator|sakura|guake|tilda|xterm|eterm|kitty"),{
+#     # Ctrl Tab - In App Tab Switching
+#     # LC is already set
+#     K("LC-Grave") : K("LC-Shift-Tab"),
+# }, "Terminals tab switching")
+
+define_keymap(re.compile("konsole"),{
+    # Ctrl Tab - In App Tab Switching
+    K("LC-Tab") : K("Shift-Right"),
+    K("LC-Shift-Tab") : K("Shift-Left"),
+    K("LC-Grave") : K("Shift-Left"),
+
+}, "Konsole tab switching")
+
+
+
+define_keymap(re.compile("Gnome-terminal|konsole|io.elementary.terminal|terminator|sakura|guake|tilda|xterm|eterm|kitty"),{
+    # Ctrl Tab - In App Tab Switching
+    K("LC-Tab") : K("LC-PAGE_DOWN"),
+    K("LC-Shift-Tab") : K("LC-PAGE_UP"),
+    K("LC-Grave") : K("LC-PAGE_UP"),
+    # Converts Cmd to use Ctrl-Shift
+    K("RC-Tab"): K("RC-F13"),
+    K("RC-Shift-Tab"): K("RC-Shift-F13"),
+    K("RC-V"): K("C-Shift-V"),
+    K("RC-MINUS"): K("C-Shift-MINUS"),
+    K("RC-EQUAL"): K("C-Shift-EQUAL"),
+    K("RC-BACKSPACE"): K("C-Shift-BACKSPACE"),
+    K("RC-Q"): K("C-Shift-Q"),
+    K("RC-W"): K("C-Shift-W"),
+    K("RC-E"): K("C-Shift-E"),
+    K("RC-R"): K("C-Shift-R"),
+    K("RC-T"): K("C-Shift-t"),
+    K("RC-Y"): K("C-Shift-Y"),
+    K("RC-U"): K("C-Shift-U"),
+    K("RC-I"): K("C-Shift-I"),
+    K("RC-O"): K("C-Shift-O"),
+    K("RC-P"): K("C-Shift-P"),
+    K("RC-LEFT_BRACE"): K("C-Shift-LEFT_BRACE"),
+    K("RC-RIGHT_BRACE"): K("C-Shift-RIGHT_BRACE"),
+    K("RC-A"): K("C-Shift-A"),
+    K("RC-S"): K("C-Shift-S"),
+    K("RC-D"): K("C-Shift-D"),
+    K("RC-F"): K("C-Shift-F"),
+    K("RC-G"): K("C-Shift-G"),
+    K("RC-H"): K("C-Shift-H"),
+    K("RC-J"): K("C-Shift-J"),
+    K("RC-K"): K("C-Shift-K"),
+    K("RC-L"): K("C-Shift-L"),
+    K("RC-SEMICOLON"): K("C-Shift-SEMICOLON"),
+    K("RC-APOSTROPHE"): K("C-Shift-APOSTROPHE"),
+    K("RC-GRAVE"): K("C-Shift-GRAVE"),
+    K("RC-BACKSLASH"): K("C-Shift-BACKSLASH"),
+    K("RC-Z"): K("C-Shift-Z"),
+    K("RC-X"): K("C-Shift-X"),
+    K("RC-C"): K("C-Shift-C"),
+    K("RC-V"): K("C-Shift-V"),
+    K("RC-B"): K("C-Shift-B"),
+    K("RC-N"): K("C-Shift-N"),
+    K("RC-M"): K("C-Shift-M"),
+    K("RC-COMMA"): K("C-Shift-COMMA"),
+    K("RC-DOT"): K("C-Shift-DOT"),
+    K("RC-SLASH"): K("C-Shift-SLASH"),
+    K("RC-KPASTERISK"): K("C-Shift-KPASTERISK"),
+}, "terminals")
+
+# define_keymap(re.compile("Chromium-browser"),{
+#     # K("RC-Tab"): K("C-F13"),
+#     # K("RC-Shift-Tab"): K("C-f1"),
+# }, "Chromium-browser")

xkeysnail_service.sh

@@ -1,558 +0,0 @@
-#!/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" { 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.\nPress N to skip. (f/r/N)\n' yn
-		case $yn in
-			[Ff]* ) yn="f"; break;;
-			[Rr]* ) yn="r";break;;
-			[Nn]* ) yn="n";break;;
-			* ) yn="n";break;;
-		esac
-	done
-
-	if [ "$yn" == "f" ];then
-		echo "Reset to factory shortcuts"
-		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
-			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" || $dename == "budgie" ]]; 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
-	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
-}
-
-function removeAppleKB {
-	# Undo Apple keyboard cmd & alt swap
-	if test -f "/sys/module/hid_apple/parameters/swap_opt_cmd" && [ `cat /sys/module/hid_apple/parameters/swap_opt_cmd` == "1" ]; then
-		echo '0' | sudo tee /sys/module/hid_apple/parameters/swap_opt_cmd
-		echo 'options hid_apple swap_opt_cmd=0' | sudo tee /etc/modprobe.d/hid_apple.conf
-		sudo update-initramfs -u -k all
-	fi
-	if test -f "/sys/module/applespi/parameters/swap_opt_cmd" && [ `cat /sys/module/applespi/parameters/swap_opt_cmd` == "1" ]; then
-		echo '0' | sudo tee /sys/module/applespi/parameters/swap_opt_cmd
-		echo 'options applespi swap_opt_cmd=0' | sudo tee /etc/modprobe.d/applespi.conf
-		sudo update-initramfs -u -k all
-	fi
-}
-
-function budgieUninstall {
-	if [ -f /usr/bin/budgie-desktop ];then
-		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
-			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 [[ $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
-
-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
-
-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 $'\nWould you like to update your SELinux state from enforcing to permissive? (y/n)\n' yn
-		case $yn in
-			[Yy]* ) setSE='yes'; break;;
-			[Nn]* ) exp='no'; expsh=" " break;;
-			# * ) echo "Please answer yes or no.";;
-		esac
-		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 "SELinux state should be ok for Kinto to install"
-	fi
-	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
-		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 [ $# -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 [ "$distro" == "gnome" ] || [ "$distro" == "fedora" ] || [ "$distro" == "debian" ] || [ "$distro" == 'linuxmint' ]; then
-		echo "Will need to install $pydev..."
-		sudo ./system-config/unipkg.sh "$pydev"
-	fi
-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
-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 not-xfce4)/# \$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 ! [[ $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 >/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
-	xhost +SI:localuser:root
-	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
-		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 ..
-	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
-	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"
-
-	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"
-
-	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
-
-	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
-
-fi