- Adding support for WSL2

- Added emacs style, courtesy bryanhpchiang. Closes #336

README.md

@@ -69,11 +69,13 @@ It also retains some of the most commonly used system level shortcut keys, such
 
 If your OS and macOS have similar functionality on the system level, but only differ by a slight difference of a shortcut command then Kinto likely supports it already. If Kinto doesn't have what you need then you can open up a support ticket and it will be added. You can also fork the project to add the fix and I will merge it via a PR you make.
 
-Additionally, if you are using a cross-platform app and if it happens to have a few shortcut keys that differ then that can very easily be added to either the kinto.py or kinto.ahk configuration files which on Windows is located here `~/.kinto/kinto.ahk` and on Linux it can be found here `~/.config/kinto/kinto.py`. More info can be found here [Shortcut Creation (Xkeysnail)](#Shortcut-Creation-Xkeysnail) for Linux.
+Additionally, if you are using a cross-platform app and if it happens to have a few shortcut keys that differ then that can very easily be added to either the kinto.py or kinto.ahk configuration files which on Windows is located here `~/.kinto/kinto.ahk` and on Linux it can be found here `~/.config/kinto/kinto.py`. More info can be found here [Shortcut Creation](#Shortcut-Creation)
 
 ## How to install (Linux)
 
-<img src="https://user-images.githubusercontent.com/10969616/96675561-c20e3100-1330-11eb-8472-813de1edec90.png" width="50%">
+Video Tutorial: [Install Kinto.sh for Linux in less than a minute](https://www.youtube.com/watch?v=kd4al45XD1g)
+
+<img src="https://user-images.githubusercontent.com/10969616/97070698-179c4500-15a0-11eb-8064-c03aa7f4d4a5.png" width="75%">
 
 1. clone this repo
 ```
@@ -93,7 +95,12 @@ sudo apt install python3
 ./setup.py
 ```
 
-Note: You can actually press Enter to agree to the wizard setup, and to finish it. No mouse is required to complete the setup, every element is properly focused.
+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
 
@@ -136,8 +143,6 @@ py setup.py
 - x11
 - xkeysnail
 
-On most distros you can confirm Input Methods by navigating to "Language Support" and set "Keyboard input method system:" to IBus for full word-wise support with web browsers. 
-
 ### Kinto for Windows 10 Requirements
 
 - [Git for Windows](https://git-scm.com/download/win)
@@ -150,16 +155,8 @@ Other programs that will be installed when you run ./setup.py
 - Strawberry Perl
 
 Note: Sublime Text users should disable screen rotation hotkeys as they will interfere with multi-cursor and possibly other combos. See https://windowsloop.com/disable-screen-rotation-keyboard-shortcut/ for details.
-
-Users can now hotswap between Apple and Windows based keyboards without having to logoff and back on, and Windows is currently the only implementation with a system tray (but this feature is coming to Budgie, XFCE, Mate, Gnome, and lastly KDE).
-
-<img src="https://user-images.githubusercontent.com/10969616/84471498-100c7d00-ac4b-11ea-972d-60c1907831ec.png" width="50%">
-<img src="https://user-images.githubusercontent.com/10969616/84471501-10a51380-ac4b-11ea-9e0e-c19a7ebfad6d.png" width="50%">
-
 ## Shortcut Creation
 
-Note: A new project, [Universal Keys](https://github.com/rbreaves/Universal-Keys), has been created that will be updated to contain all current remaps - plus many more. Once that is done, Kinto will be updated to programmatically pull the latest keymaps from simple csv comma delimited files & will build out key remaps from there. This will also allow for more types of remaps within an application category, Sublime Text 3 to VS Code or VS Code to Sublime Text 3, Photoshop to Gimp, Gimp to Photoshop, etc & it will ensure that xkeysnail (linux) & autohotkey (windows) are pulling from the same data set.
-
 [Linux Shortcut Creation (Xkeysnail)](#Linux-Xkeysnail)
 
 [Windows Shortcut Creation (Autohotkey)](#Windows-Autohotkey)
@@ -248,7 +245,7 @@ The older xkb shortcut method info can be read about in ticket [#125](https://gi
 
 ## How to Upgrade Kinto
 
-Simply bring down the latest in either the master branch or dev, but dev is sometimes in flux as new features are being developed. Then you can re-run the setup.py installer, it will stop the service and re-install Kinto.
+Simply bring down the latest then you can re-run the setup.py installer, it will stop the service and re-install Kinto.
 
 Note: If you have made any custom changes to ~/.config/kinto then you will need to backup or rename those directories before running an update.
 
@@ -300,14 +297,11 @@ To disable keyboard mapping:
 
 ### Does not start when you log in or after you reboot?
 
-Kinto
-
 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)
 
-
-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.
+To reset the display variable
 
 ```
 echo $DISPLAY
@@ -339,9 +333,6 @@ If you continue to have issues then open a ticket and send me the info.
 ## Language Support
 I'd appreciate any help from people with non-US based keyboards, to help ensure that these keymaps and keyswap methods work in all or most languages.
 
-If you would like to attempt adding additional custom keymaps for other languages then I strongly recommend reading Glen Whitney's post here.
-https://superuser.com/questions/385748/binding-superc-superv-to-copy-and-paste
-
 ## Related or Useful Resources
 
 [Xkeysnail](https://github.com/mooz/xkeysnail) by mooz

keycheck.py

@@ -1,344 +0,0 @@
-#!/usr/bin/env python3
-
-# pip3 install pynput
-# pip3 install --no-deps pynput
-
-# from pynput.keyboard import Key, Listener
-import sys, subprocess, time, os
-from subprocess import PIPE, Popen
-delay=3
-
-def cmdline(command):
-    process = Popen(
-        args=command,
-        stdout=PIPE,
-        universal_newlines=True,
-        shell=True
-    )
-    return process.communicate()[0]
-
-class color:
-   PURPLE = '\033[95m'
-   CYAN = '\033[96m'
-   DARKCYAN = '\033[36m'
-   BLUE = '\033[94m'
-   GREEN = '\033[92m'
-   YELLOW = '\033[93m'
-   RED = '\033[91m'
-   BOLD = '\033[1m'
-   UNDERLINE = '\033[4m'
-   END = '\033[0m'
-
-def countdown(secs):
-    for i in range(0,secs):
-        print(secs-i, end="\r", flush=True)
-        time.sleep(1)
-
-def on_press(key):
-    print('{0} pressed'.format(key))
-
-def on_release(key):
-    # print('{0} release'.format(key))
-    if key == Key.esc:
-        # Stop listener
-        return False
-
-def yn_choice(message, default='y'):
-    choices = 'Y/n' if default.lower() in ('y', 'yes') else 'y/N'
-    choice = input("%s (%s) " % (message, choices))
-    values = ('y', 'yes', '') if choices == 'Y/n' else ('y', 'yes')
-    return choice.strip().lower() in values
-
-modifier_keys = {
-    "primary":"",
-    "secondary":"",
-    "rprimary":"",
-    "rsecondary":"",
-    "capslock":"",
-    "capswap":""
-}
-
-def set_key(key):
-    global modifier_keys
-    print("\nWhich key would you like to set?\n")
-
-    while True:
-        try:
-            keytype = int(input(
-                "1) Ctrl\n" +
-                "2) Alt\n" +
-                "3) Super/Win/Cmd/Chrome search key\n"))
-            if keytype < 4 and keytype > 0:
-                break
-        except:
-            print("That's not a valid option!")
-    print("")
-    if keytype == 1:
-        modifier_keys[key] = "Ctrl"
-    elif keytype == 2:
-        modifier_keys[key] = "Alt"
-    elif keytype == 3:
-        modifier_keys[key] = "Cmd"
-
-def set_cap():
-    global modifier_keys
-    print("\nWhich key would you like to swap?\n")
-
-    while True:
-        try:
-            keytype = int(input(
-                "1) Ctrl (swap)\n" +
-                "2) Ctrl (duplicate)\n" +
-                "3) Esc (swap)\n"))
-            if keytype < 4 and keytype > 0:
-                break
-        except:
-            print("That's not a valid option!")
-    print("")
-    if keytype == 1:
-        modifier_keys["capslock"] = "Ctrl-swap"
-    elif keytype == 2:
-        modifier_keys["capslock"] = "Ctrl-dup"
-    elif keytype == 3:
-        modifier_keys["capswap"] = "Escape"
-
-def is_primary(key):
-    global modifier_keys
-    if not (str(key).replace("Key.", "").title() == "Enter" or str(key).replace("Key.", "").title() == "Escape"):
-        print(str(key).replace("Key.", "").title() + " will be remapped to Ctrl, the Cmd ⌘  key position.")
-        # countdown(3)
-        modifier_keys["primary"] = str(key).replace("Key.", "").title()
-    elif str(key).replace("Key.", "").title() == "Escape":
-        modifier_keys["primary"] = "Escape"
-        # countdown(3)
-    else:
-        return True
-    return False
-
-def is_secondary(key):
-    global modifier_keys
-    if not (str(key).replace("Key.", "").title() == "Enter" or str(key).replace("Key.", "").title() == "Escape"):
-        print(str(key).replace("Key.", "").title() + " will be remapped to Alt, the Option ⌥  key position.")
-        # countdown(3)
-        modifier_keys["secondary"] = str(key).replace("Key.", "").title()
-        return False
-    elif str(key).replace("Key.", "").title() == "Escape":
-        modifier_keys["secondary"] = "Escape"
-        # countdown(3)
-        return False
-    else:
-        return True
-
-def is_rprimary(key):
-    global modifier_keys
-    if not (str(key).replace("Key.", "").title() == "Enter" or str(key).replace("Key.", "").title() == "Escape"):
-        print(str(key).replace("Key.", "").title() + " will be remapped to Ctrl, the Cmd ⌘  key position.")
-        # countdown(3)
-        modifier_keys["rprimary"] = str(key).replace("Key.", "").title()
-        return False
-    elif str(key).replace("Key.", "").title() == "Escape":
-        modifier_keys["rprimary"] = "Escape"
-        # countdown(3)
-        return False
-    else:
-        return True
-
-def is_rsecondary(key):
-    global modifier_keys
-    if not (str(key).replace("Key.", "").title() == "Enter" or str(key).replace("Key.", "").title() == "Escape"):
-        print(str(key).replace("Key.", "").title() + " will be remapped to Alt, the Option ⌥  key position.")
-        # countdown(3)
-        modifier_keys["rsecondary"] = str(key).replace("Key.", "").title()
-        return False
-    elif str(key).replace("Key.", "").title() == "Escape":
-        modifier_keys["rsecondary"] = "Escape"
-        # countdown(3)
-        return False
-    else:
-        return True
-
-
-print(color.UNDERLINE + color.YELLOW + "\n\nPlease ignore the FN key." + color.END + " FN cannot be remapped by software, some Thinkpads can swap it with Ctrl in the BIOS.\n")
-input("Press Enter to continue...\n\n")
-print(chr(27) + "[2J")
-
-counter = 0
-
-while True:
-    
-    print(color.UNDERLINE + color.YELLOW + "\n\nPress the 1st key Left of the spacebar" + color.END + " (Press Esc to set manaully)\n")
-    print("    👇")
-    print(" □ □ ▣ ░░░░░░░\n")
-    # listener = Listener(on_release=is_primary,suppress=True)
-    # listener.start()
-
-    # with Listener(
-    #     on_release=is_primary,suppress=True) as listener:
-    #         try:
-    #             listener.join()
-    #         except MyException as e:
-    #             print('{0} was pressed'.format(e.args[0]))
-
-    modifier_keys["primary"] = cmdline("xbindkeys -k | awk 'END {print $NF}'").strip()
-    print(modifier_keys["primary"] + " will be remapped to Ctrl, the Cmd ⌘  key position.")
-
-    if modifier_keys["primary"] != "Escape":
-        choice = yn_choice("Is this correct?")
-        if(choice):
-            # print("Left Physical " + modifier_keys["primary"] + " = Ctrl/Cmd ⌘")
-            # listener.stop()
-            # input("Press Enter to continue...\n\n")
-            break
-    else:
-        set_key("primary")
-        print("Left Physical " + modifier_keys["primary"] + " = Ctrl/Cmd ⌘\n")
-        # listener.stop()
-        input("Press Enter to continue...\n\n")
-        break
-    counter += 1
-    print(str(counter)+"\n")
-    time.sleep(1)
-
-print(chr(27) + "[2J")
-
-while True:
-    print(color.UNDERLINE + color.YELLOW + "\n\nPress the 2nd key Left of the spacebar" + color.END + " (Press Esc to set manaully)\n")
-    print("  👇")
-    print(" □ ▣ □ ░░░░░░░\n")
-    
-    # with Listener(
-    #     on_release=is_secondary,suppress=True) as listener:
-    #         try:
-    #             listener.join()
-    #         except MyException as e:
-    #             print('{0} was pressed'.format(e.args[0]))
-    modifier_keys["secondary"] = cmdline("xbindkeys -k | awk 'END {print $NF}'").strip()
-    print(modifier_keys["secondary"] + " will be remapped to Alt, the Option ⌥  key position.")
-
-    if modifier_keys["secondary"] != "Escape":
-        choice = yn_choice("Is this correct?")
-        if(choice):
-            # listener.stop()
-            # print("Left Physical " + modifier_keys["secondary"] + " = Alt/Option ⌥")
-            # input("Press Enter to continue...\n\n")
-            break
-    else:
-        set_key("secondary")
-        print("Left Physical " + modifier_keys["secondary"] + " = Alt/Option ⌥\n")
-        # listener.stop()
-        input("Press Enter to continue...\n\n")
-        break
-
-print(chr(27) + "[2J")
-
-while True:
-    print(color.UNDERLINE + color.YELLOW + "\n\nPress the 1st key Right of the spacebar" + color.END + " (Press Esc to set manaully)\n")
-    print("        👇")
-    print(" ░░░░░░░ ▣ □")
-    
-    # with Listener(
-    #     on_release=is_rprimary,suppress=True) as listener:
-    #         try:
-    #             listener.join()
-    #         except MyException as e:
-    #             print('{0} was pressed'.format(e.args[0]))
-    modifier_keys["rprimary"] = cmdline("xbindkeys -k | awk 'END {print $NF}'").strip()
-    print(modifier_keys["rprimary"] + " will be remapped to Ctrl, the Cmd ⌘  key position.")
-
-    if modifier_keys["rprimary"] != "Escape":
-        choice = yn_choice("Is this correct?")
-        if(choice):
-            # listener.stop()
-            # print("Right Physical " + modifier_keys["rprimary"] + " = Ctrl/Cmd ⌘")
-            # input("Press Enter to continue...\n\n")
-            break
-    else:
-        set_key("rprimary")
-        print("Right Physical " + modifier_keys["rprimary"] + " = Ctrl/Cmd ⌘\n")
-        # listener.stop()
-        input("Press Enter to continue...\n\n")
-        break
-
-print(chr(27) + "[2J")
-
-while True:
-    print(color.UNDERLINE + color.YELLOW + "\n\nPress the 2nd key Right of the spacebar" + color.END + " (Press Esc to set manaully)\n")
-    print("          👇")
-    print(" ░░░░░░░ □ ▣")
-
-    # with Listener(
-    #     on_release=is_rsecondary,suppress=True) as listener:
-    #         try:
-    #             listener.join()
-    #         except MyException as e:
-    #             print('{0} was pressed'.format(e.args[0]))
-    modifier_keys["rsecondary"] = cmdline("xbindkeys -k | awk 'END {print $NF}'").strip()
-    print(modifier_keys["rsecondary"] + " will be remapped to Alt, the Option ⌥  key position.")
-
-    if modifier_keys["rsecondary"] != "Escape":
-        choice = yn_choice("Is this correct?")
-        if(choice):
-            # listener.stop()
-            # print("Right Physical " + modifier_keys["rsecondary"] + " = Alt/Option ⌥")
-            # modifier_keys["rsecondary"] = str(os.system("xbindkeys -k | awk 'END {print $NF}'"))
-            break
-    else:
-        set_key("rsecondary")
-        print("Right Physical " + modifier_keys["rsecondary"] + " = Alt/Option ⌥\n")
-        # listener.stop()
-        input("Press Enter to continue...\n\n")
-        break
-
-print(chr(27) + "[2J")
-
-if not (modifier_keys["secondary"] == "Ctrl" or modifier_keys["secondary"] == "Control_R"):
-    print(color.UNDERLINE + color.YELLOW + "GUI Usage (Physical Ctrl key)\n"+ color.END)
-    print("Ctrl key will be mapped to Super. (Search key on chromebooks)")
-    print("👇")
-    print(" ▣ □ □ ░░░░░░░\n")
-
-    print("Note: Super may still activate Ctrl based shortcuts\n")
-    print("at times depending on application or system level shortcuts.\n")
-    print("This will only be done to align shortcuts to their expected functionality.\n")
-
-    input("Press Enter to continue...\n\n")
-    # print(chr(27) + "[2J")
-
-    print(color.UNDERLINE + color.YELLOW + "Terminal Usage" + color.END + "\n")
-    print("Ctrl key will be the Ctrl key.")
-    print("👇")
-    print(" ▣ □ □ ░░░░░░░\n")
-    print("The Cmd ⌘  key position during terminal usage will usually be Ctrl+Shift.")
-    print("    👇 ")
-    print(" □ □ ▣ ░░░░░░░\n")
-    input("Press Enter to continue...\n")
-else:
-    print("Chromebook detected.")
-
-    print(color.UNDERLINE + color.YELLOW + "GUI Usage\n"+ color.END)
-    print("Search key (capslock position) on chromebooks will be Super\n")
-
-    print("Note: Super may still activate Ctrl based shortcuts")
-    print("at times depending on application or system level shortcuts.\n")
-    print("Efforts have been made though to use the physical Ctrl key")
-    print("when it makes sense to do so, and more often than standard")
-    print("keyboards. How it feels to type is more important than technical")
-    print("accuracy.\n")
-    print("If you believe an improvement can be made or an error was made")
-    print("please let me know on github or you can fork this project.\n")
-
-    input("Press Enter to continue...\n\n")
-
-    print(color.UNDERLINE + color.YELLOW + "Terminal Usage" + color.END + "\n")
-    print(" □ capslock/search key = Alt")
-    print(" shift")
-    print(" ▣ □ ░░░░░░░")
-    print("☝️\n")
-
-    input("Press Enter to continue...\n\n")
-
-print(chr(27) + "[2J")
-
-choice = yn_choice(color.UNDERLINE + color.YELLOW + "Do you want to swap Capslock with another key?" + color.END + "\n","n")
-if(choice):
-    set_cap()

setup.py

@@ -104,9 +104,12 @@ if platform.system() == 'Windows':
 check_x11 = cmdline("(env | grep -i x11 || loginctl show-session \"$XDG_SESSION_ID\" -p Type) | awk -F= '{print $2}'").strip()
 
 if len(check_x11) == 0:
-	if os.name != 'nt':
+	if os.name != 'nt' and os.name != 'posix':
+		print(os.name)
 		print("You are not using x11, please logout and back in using x11/Xorg")
 		sys.exit()
+	elif os.name == 'posix':
+		print("You may be trying to run Kinto under WSL2 w/ Linux. We will continue...")
 	else:
 		print("\nYou are detected as running Windows.")
 		windows_setup()
@@ -121,9 +124,14 @@ if os.path.isdir(homedir + "/.config/kinto") == False:
 	os.mkdir(homedir + "/.config/kinto")
 	time.sleep(0.5)
 
+
+cmdline("git fetch")
+
 color_arr = [bcolors.CBEIGE,bcolors.CRED2,bcolors.CGREEN,bcolors.CYELLOW ]
 
-print("\nKinto - Type in Linux like it's a Mac.\n")
+kintover = cmdline('echo "$(git describe --tag --abbrev=0 | head -n 1)" "build" "$(git rev-parse --short HEAD)"')
+
+print("\nKinto " + kintover + "Type in Linux like it's a Mac.\n")
 
 if args.uninstall:
 	subprocess.check_call(shlex.split("./xkeysnail_service.sh uninstall"))

windows/kinto.ahk

@@ -24,7 +24,7 @@ AHK_NOTIFYICON(wParam, lParam)
 }
 ; End Enable Left clicks
 
-; I_Icon = %A_ScriptDir%\assets\kinto-white.ico           ; MacModifiers
+; 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
@@ -97,8 +97,9 @@ 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-color-invert.ico
+        I_Icon = %A_ScriptDir%\assets\kinto-white.ico
         Menu, Tray, Icon, %I_Icon%,, 1
         Menu, Tray, Tip, Suspended - Kinto
         IfWinExist, detectUSB.ahk
@@ -106,8 +107,12 @@ tray_suspend(){
     }
     else{
         menu, tray, unCheck, Suspend Kinto
-;         I_Icon = %A_ScriptDir%\assets\kinto-white.ico           ; MacModifiers
+;         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
     }
@@ -116,6 +121,7 @@ tray_suspend(){
 }
 
 Exit() {
+    Gosub ReleaseModifiers
     IfWinExist, detectUSB.ahk
         WinClose
 
@@ -132,8 +138,10 @@ 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
@@ -142,10 +150,11 @@ 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, ConEmu, ahk_exe WindowsTerminal.exe
 
 GroupAdd, ExcPaste, ahk_exe Cmd.exe
 GroupAdd, ExcPaste, ahk_exe mintty.exe
@@ -157,6 +166,7 @@ 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
 
 ; Disable Key Remapping for Virtual Machines
 ; Disable for Remote desktop solutions too
@@ -235,11 +245,13 @@ GroupAdd, intellij, ahk_exe idea64.exe
 
     ; $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
 
@@ -324,6 +336,18 @@ GroupAdd, intellij, ahk_exe idea64.exe
     !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}
 
@@ -419,7 +443,23 @@ GroupAdd, intellij, ahk_exe idea64.exe
 
     ; Close all browsers
     #IfWinActive ahk_group browsers
-       ^q::send {Alt Down}f{Alt Up}x   ; exit all windows
+        ^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
@@ -521,13 +561,17 @@ GroupAdd, intellij, ahk_exe idea64.exe
 
         ; Copy
         ^c::
-        If WinActive("ahk_exe cmd.exe"){
+        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}
@@ -535,7 +579,7 @@ GroupAdd, intellij, ahk_exe idea64.exe
         return
 
         ^c up::
-        If not WinActive("ahk_group cmd.exe"){
+        If not WinActive("ahk_group cmd.exe") OR WinActive("ahk_exe box.exe"){
             SetKeyDelay -1
             Send {Blind}{c Up}{LShift Up}
         }
@@ -545,6 +589,12 @@ GroupAdd, intellij, ahk_exe idea64.exe
         ; $#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"){
@@ -553,6 +603,9 @@ GroupAdd, intellij, ahk_exe idea64.exe
         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
         }
@@ -562,17 +615,21 @@ GroupAdd, intellij, ahk_exe idea64.exe
     #IfWinActive ahk_group posix
         ; Open/Close Tab for those that support it
         $^t::
-        If not WinActive("ahk_group ConEmu"){
-            Send {LCtrl down}{LShift down}t{LCtrl Up}{LShift Up}
+        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 ^t
+            Send {Blind}t
         }
         return
 
+
         $^w::
         If not WinActive("ahk_group ConEmu"){
-            Send {LCtrl down}{LShift down}w{LCtrl Up}{LShift Up}
+            Send {Blind}{LShift down}w{LShift Up}
         }
         else{
             Send ^w
@@ -583,34 +640,95 @@ GroupAdd, intellij, ahk_exe idea64.exe
         ; #l::return
         ; Clear Terminal and Scroll Buffer
         ^k::Send clear && printf '\e[3J'{Enter}
-        ; Nano editor shortcuts
-        #g::Send {LCtrl down}g{LCtrl Up} ; Default
-        #k::Send {LCtrl down}k{LCtrl Up} ; Default
-        #x::Send {LCtrl down}x{LCtrl Up} ; Default
-        #o::Send {LCtrl down}o{LCtrl Up} ; Default
-        #r::Send {LCtrl down}r{LCtrl Up} ; Default
-        #w::Send {LCtrl down}w{LCtrl Up} ; Default
-        #\::Send {LCtrl down}\{LCtrl Up} ; Default
-        #u::Send {LCtrl down}u{LCtrl Up} ; Default
-        #j::Send {LCtrl down}j{LCtrl Up} ; Default
-        #t::Send {LCtrl down}t{LCtrl Up} ; Default
-        #_::Send {LCtrl down}_{LCtrl Up} ; Default
-        #z::Send {LCtrl down}z{LCtrl Up} ; Default
-        #y::Send {LCtrl down}y{LCtrl Up} ; Default
-        #v::Send {LCtrl down}v{LCtrl Up} ; Default
-        !g::Send {LCtrl down}g{LCtrl Up} ; CB/IBM
-        !k::Send {LCtrl down}k{LCtrl Up} ; CB/IBM
-        !x::Send {LCtrl down}x{LCtrl Up} ; CB/IBM
-        !o::Send {LCtrl down}o{LCtrl Up} ; CB/IBM
-        !r::Send {LCtrl down}r{LCtrl Up} ; CB/IBM
-        !w::Send {LCtrl down}w{LCtrl Up} ; CB/IBM
-        !\::Send {LCtrl down}\{LCtrl Up} ; CB/IBM
-        !u::Send {LCtrl down}u{LCtrl Up} ; CB/IBM
-        !j::Send {LCtrl down}j{LCtrl Up} ; CB/IBM
-        !t::Send {LCtrl down}t{LCtrl Up} ; CB/IBM
-        !_::Send {LCtrl down}_{LCtrl Up} ; CB/IBM
-        !z::Send {LCtrl down}z{LCtrl Up} ; CB/IBM
-        !y::Send {LCtrl down}y{LCtrl Up} ; CB/IBM
-        !v::Send {LCtrl down}v{LCtrl Up} ; CB/IBM
+        ; 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
-#If
+#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

xkeysnail-config/gui/kinto-gui.py

@@ -5,6 +5,7 @@ gi.require_version('Gtk', '3.0')
 gi.require_version('Vte', '2.91')
 from gi.repository import Gtk,Gdk,GdkPixbuf
 from gi.repository import Vte,GLib
+from shutil import which
 from subprocess import Popen,PIPE,CalledProcessError
 from distutils.util import strtobool
 
@@ -43,6 +44,8 @@ class MyWindow(Gtk.Window):
     bgerror = Gtk.Image()
     bguninstall = Gtk.Image()
     last_onward = Gtk.Button()
+    first_onward = Gtk.ToggleButton()
+    page = 1
 
     label = Gtk.Label()
     label.set_alignment(1, 0)
@@ -78,6 +81,7 @@ class MyWindow(Gtk.Window):
 
         homedir = os.path.expanduser("~")
         self.kconfig = homedir+"/.config/kinto/kinto.py"
+        autostart_bool = False
 
         path = os.environ['HOME']+'/.config/kinto/kinto-color.svg'
         width = -1
@@ -397,6 +401,7 @@ class MyWindow(Gtk.Window):
             self.setupwin.set_position(Gtk.WindowPosition.CENTER)
 
             self.setupwin.add(self.overlay)
+            self.setupwin.signal_id = 0
             
             from PIL import Image
 
@@ -914,10 +919,14 @@ class MyWindow(Gtk.Window):
         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:
+            elif which('gedit') is not None:
                 Popen(['gedit',os.environ['HOME']+'/.config/kinto/kinto.py'])
-            elif which(mousepad) is not None:
+            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!'])
@@ -926,10 +935,14 @@ class MyWindow(Gtk.Window):
         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:
+            elif which('gedit') is not None:
                 Popen(['gedit','/lib/systemd/system/xkeysnail.service'])
-            elif which(mousepad) is not None:
+            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!'])
@@ -937,12 +950,16 @@ class MyWindow(Gtk.Window):
     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'])
 
@@ -987,55 +1004,63 @@ class MyWindow(Gtk.Window):
             self.label.set_markup("  " + status + "  ")
         return self.kinto_status.poll() is None
 
-    def key_press_event(self, widget, event, page):
+    def key_press_event(self, widget, event):
         global openWin
         trigger = "None"
         keyname = Gdk.keyval_name(event.keyval)
         current = self.second_page
         bg = self.bgsuccess4
         onward = self.success_page
+        print("page value: "+str(self.page))
 
-        if page == 1 and "Control" in keyname:
+        if self.page == 1 and "Control" in keyname and openWin == False:
             print("IBM or Chromebook")
             print("Continue to page 2")
             bg = self.bgcaps
             onward = self.caps_page
             trigger = "Half"
-        elif page == 2 and "Caps_Lock" in keyname and event.state & Gdk.ModifierType.LOCK_MASK:
+            self.page += 1
+        elif self.page == 2 and "Caps_Lock" in keyname and event.state & Gdk.ModifierType.LOCK_MASK:
             print("Set IBM Keyboard")
             current = self.caps_page
             self.options["kbtype"] = "ibm"
             trigger = "Done"
-        elif page == 2 and "Super" in keyname:
+        elif self.page == 2 and "Super" in keyname:
             print("Set Chromebook Keyboard")
             current = self.caps_page
             self.options["kbtype"] = "cbk"
             trigger = "Done"
-        elif page == 1 and "Alt" in keyname:
+        elif self.page == 1 and "Alt" in keyname:
             print("Set Mac Keyboard")
             self.options["kbtype"] = "mac"
             trigger = "Done"
-        elif page == 1 and "Super" in keyname:
+        elif self.page == 1 and "Super" in keyname:
             print("Set Win Keyboard")
             self.options["kbtype"] = "win"
             trigger = "Done"
 
-        if trigger == "Half" or trigger == "Done":
+        if trigger == "Half" or trigger == "Done" and openWin == False:
             for grandkid in self.overlay.get_children():
                 self.overlay.remove(grandkid)
             self.overlay.add(bg)
             self.overlay.add_overlay(self.container)
             self.container.add(onward)
             self.container.remove(current)
-            self.setupwin.disconnect(self.setupwin.signal_id)
-        if trigger == "Half":
-            self.setupwin.signal_id = self.setupwin.connect("key_press_event", self.key_press_event,2)
+            # self.setupwin.disconnect(self.setupwin.signal_id)
+        if trigger == "Half" and openWin == False:
+            # print("reset key_press_event")
+            # self.setupwin.signal_id = self.setupwin.connect("key_press_event", self.key_press_event)
             self.setupwin.show_all()
-        elif trigger == "Done":
+        elif trigger == "Done" and openWin == False:
+            print("in Done")
             self.setKinto()
             self.setupwin.show_all()
             openWin = True
             self.last_onward.grab_focus()
+            # print(self.setupwin.signal_id)
+            self.setupwin.disconnect(self.setupwin.signal_id)
+            # print(self.setupwin.signal_id)
+        print("key press event is on")
 
     def InputToTerm(self,cmd):
         # Not clearly known which VTE versions
@@ -1144,15 +1169,22 @@ class FirstPage(Gtk.Box):
         scroller.add(vbox)
 
         hbox = Gtk.HBox()
-        previous = Gtk.Button("Decline")
+        previous = Gtk.Button("")
+        for child in previous.get_children():
+            child.set_label("<b>Decline</b>")
+            child.set_use_markup(True)
         previous.connect("clicked", self.goback)
         previous.set_margin_right(245)
         hbox.add(previous)
 
-        onward = Gtk.Button("Agree")
-        onward.connect("clicked", self.forward)
+        self.__parent_window.first_onward.set_label("")
+        for child in self.__parent_window.first_onward.get_children():
+            child.set_label("<b>Agree</b>")
+            child.set_use_markup(True)
+        self.__parent_window.first_onward.set_active(True)
+        self.__parent_window.first_onward.connect("clicked", self.forward)
 
-        hbox.add(onward)
+        hbox.add(self.__parent_window.first_onward)
         hbox.set_hexpand(False)
         hbox.set_vexpand(False)
         hbox.set_margin_bottom(6)
@@ -1170,19 +1202,22 @@ class FirstPage(Gtk.Box):
         self.grid.add(vbox_container)
         self.grid.attach_next_to(hbox, vbox_container, Gtk.PositionType.BOTTOM, 2, 1)
         self.add(self.grid)
-        onward.grab_focus()
+        self.__parent_window.first_onward.grab_focus()
 
     def goback(self, *args):
         Gtk.main_quit()
         self.hide()
 
     def forward(self, button):
+        self.__parent_window.first_onward.set_active(True)
         for grandkid in self.__parent_window.overlay.get_children():
             self.__parent_window.overlay.remove(grandkid)
         self.__parent_window.overlay.add(self.__parent_window.bgspace)
         self.__parent_window.overlay.add_overlay(self.__parent_window.container)
         self.__parent_window.container.add(self.__parent_window.second_page)
-        self.__parent_window.setupwin.signal_id = self.__parent_window.setupwin.connect("key_press_event", self.__parent_window.key_press_event,1)
+        # print(self.__parent_window.setupwin.signal_id)
+        self.__parent_window.setupwin.signal_id = self.__parent_window.setupwin.connect("key_press_event", self.__parent_window.key_press_event)
+        # print(self.__parent_window.setupwin.signal_id)
         self.__parent_window.container.remove(self.__parent_window.first_page)
         self.__parent_window.setupwin.show_all()
         self.hide()
@@ -1199,14 +1234,18 @@ class SecondPage(Gtk.Box):
         scroller.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.ALWAYS)
 
         label_start = Gtk.Label()
-        label_start.set_markup('<b>Identifying your Keyboard...</b>\n\nPress the <b>2nd</b> key <b>Left</b> of the spacebar.')
+        
+        label_start.set_markup('<b>Identifying your Keyboard...</b>\n\nPress the <b>2nd</b> key <b>Left</b> of the spacebar.\n\n<sub>If stuck here then unset Overlay (Super) key on your DE.</sub>')
         label_start.set_alignment(0,0)
         label_start.set_line_wrap(True)
         vbox.add(label_start)
         scroller.add(vbox)
 
         hbox = Gtk.HBox()
-        previous = Gtk.Button("Go Back")
+        previous = Gtk.Button("")
+        for child in previous.get_children():
+            child.set_label("<b>Go Back</b>")
+            child.set_use_markup(True)
         previous.connect("clicked", self.goback)
         previous.set_margin_right(315)
         hbox.add(previous)
@@ -1242,29 +1281,31 @@ class SecondPage(Gtk.Box):
         self.__parent_window.container.remove(self.__parent_window.second_page)
         self.__parent_window.setupwin.disconnect(self.__parent_window.setupwin.signal_id)
         self.__parent_window.setupwin.show_all()
+        self.__parent_window.first_onward.grab_focus()
         self.hide()
 
-    def capsforward(self, *args):
-        for grandkid in self.__parent_window.overlay.get_children():
-            self.__parent_window.overlay.remove(grandkid)
-        self.__parent_window.overlay.add(self.__parent_window.bgcaps)
-        self.__parent_window.overlay.add_overlay(self.__parent_window.container)
-        self.__parent_window.container.add(self.__parent_window.caps_page)
-        self.__parent_window.container.remove(self.__parent_window.second_page)
-        self.__parent_window.setupwin.signal_id = self.__parent_window.setupwin.connect("key_press_event", self.__parent_window.key_press_event,2)
-        self.__parent_window.setupwin.show_all()
-        self.hide()
+    # def capsforward(self, *args):
+    #     for grandkid in self.__parent_window.overlay.get_children():
+    #         self.__parent_window.overlay.remove(grandkid)
+    #     self.__parent_window.overlay.add(self.__parent_window.bgcaps)
+    #     self.__parent_window.overlay.add_overlay(self.__parent_window.container)
+    #     self.__parent_window.container.add(self.__parent_window.caps_page)
+    #     self.__parent_window.container.remove(self.__parent_window.second_page)
+    #     self.__parent_window.setupwin.disconnect(self.__parent_window.setupwin.signal_id)
+    #     self.__parent_window.setupwin.signal_id = self.__parent_window.setupwin.connect("key_press_event", self.__parent_window.key_press_event,2)
+    #     self.__parent_window.setupwin.show_all()
+    #     self.hide()
 
-    def forward(self, *args):
-        for grandkid in self.__parent_window.overlay.get_children():
-            self.__parent_window.overlay.remove(grandkid)
-        self.__parent_window.overlay.add(self.__parent_window.bgsuccess4)
-        self.__parent_window.overlay.add_overlay(self.__parent_window.container)
-        self.__parent_window.container.add(self.__parent_window.success_page)
-        self.__parent_window.container.remove(self.__parent_window.second_page)
-        self.__parent_window.setupwin.disconnect(self.__parent_window.setupwin.signal_id)
-        self.__parent_window.setupwin.show_all()
-        self.hide()
+    # def forward(self, *args):
+    #     for grandkid in self.__parent_window.overlay.get_children():
+    #         self.__parent_window.overlay.remove(grandkid)
+    #     self.__parent_window.overlay.add(self.__parent_window.bgsuccess4)
+    #     self.__parent_window.overlay.add_overlay(self.__parent_window.container)
+    #     self.__parent_window.container.add(self.__parent_window.success_page)
+    #     self.__parent_window.container.remove(self.__parent_window.second_page)
+    #     self.__parent_window.setupwin.disconnect(self.__parent_window.setupwin.signal_id)
+    #     self.__parent_window.setupwin.show_all()
+    #     self.hide()
 
 class CapsPage(Gtk.Box):
     def __init__(self, parent_window):
@@ -1285,7 +1326,10 @@ class CapsPage(Gtk.Box):
         scroller.add(vbox)
 
         hbox = Gtk.HBox()
-        previous = Gtk.Button("Go Back")
+        previous = Gtk.Button("")
+        for child in previous.get_children():
+            child.set_label("<b>Go Back</b>")
+            child.set_use_markup(True)
         previous.connect("clicked", self.goback)
         previous.set_margin_right(315)
         hbox.add(previous)
@@ -1318,37 +1362,69 @@ class CapsPage(Gtk.Box):
         self.__parent_window.overlay.add(self.__parent_window.bgspace)
         self.__parent_window.overlay.add_overlay(self.__parent_window.container)
         self.__parent_window.container.add(self.__parent_window.second_page)
-        self.__parent_window.setupwin.disconnect(self.__parent_window.setupwin.signal_id)
-        self.__parent_window.setupwin.signal_id = self.__parent_window.setupwin.connect("key_press_event", self.__parent_window.key_press_event,1)
+        self.__parent_window.page = 1
+        # self.__parent_window.setupwin.disconnect(self.__parent_window.setupwin.signal_id)
+        # self.__parent_window.setupwin.signal_id = self.__parent_window.setupwin.connect("key_press_event", self.__parent_window.key_press_event)
         self.__parent_window.container.remove(self.__parent_window.caps_page)
         self.__parent_window.setupwin.show_all()
         self.hide()
 
-    def forward(self, *args):
-        for grandkid in self.__parent_window.overlay.get_children():
-            self.__parent_window.overlay.remove(grandkid)
-        self.__parent_window.overlay.add(self.__parent_window.bgsuccess4)
-        self.__parent_window.overlay.add_overlay(self.__parent_window.container)
-        self.__parent_window.container.add(self.__parent_window.success_page)
-        self.__parent_window.container.remove(self.__parent_window.caps_page)
-        self.__parent_window.setupwin.disconnect(self.__parent_window.setupwin.signal_id)
-        self.__parent_window.setupwin.show_all()
-        self.hide()
+    # def forward(self, *args):
+    #     for grandkid in self.__parent_window.overlay.get_children():
+    #         self.__parent_window.overlay.remove(grandkid)
+    #     self.__parent_window.overlay.add(self.__parent_window.bgsuccess4)
+    #     self.__parent_window.overlay.add_overlay(self.__parent_window.container)
+    #     self.__parent_window.container.add(self.__parent_window.success_page)
+    #     self.__parent_window.container.remove(self.__parent_window.caps_page)
+    #     self.__parent_window.setupwin.disconnect(self.__parent_window.setupwin.signal_id)
+    #     self.__parent_window.setupwin.show_all()
+    #     self.hide()
 
 class SuccessPage(Gtk.Box):
     def __init__(self, parent_window):
         super().__init__(spacing=10)
         self.__parent_window = parent_window
+        self.grid = Gtk.Grid()
 
-        vbox_container = Gtk.VBox()
-        self.__parent_window.last_onward.props.relief = Gtk.ReliefStyle.NONE
+        hbox = Gtk.HBox()
+        previous = Gtk.Button("       ")
+        previous.props.relief = Gtk.ReliefStyle.NONE
+        previous.set_margin_right(245)
+        hbox.add(previous)
+
+        self.__parent_window.last_onward.set_label("")
+        for child in self.__parent_window.last_onward.get_children():
+            child.set_label("<b>Done</b>")
+            child.set_use_markup(True)
         self.__parent_window.last_onward.connect("clicked", self.forward)
-        vbox_container.set_margin_top(600)
-        vbox_container.add(self.__parent_window.last_onward)
-        self.add(vbox_container)
+
+        hbox.add(self.__parent_window.last_onward)
+        hbox.set_hexpand(False)
+        hbox.set_vexpand(False)
+        hbox.set_margin_bottom(6)
+        hbox.set_margin_right(25)
+
+        scroller = Gtk.ScrolledWindow()
+        scroller.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.NEVER)
+        scroller.set_hexpand(True)
+        scroller.set_vexpand(True)
+        vbox = Gtk.VBox()
+        vbox_container = Gtk.VBox()
+        vbox_container.set_margin_top(55)
+        vbox_container.set_margin_right(28)
+        vbox_container.add(scroller)
+        self.grid.set_margin_left(157)
+        vbox_container.set_margin_bottom(18)
+        vbox.set_margin_right(10)
+        vbox.set_margin_bottom(18)
+        self.grid.add(vbox_container)
+        self.grid.attach_next_to(hbox, vbox_container, Gtk.PositionType.BOTTOM, 2, 1)
+        self.add(self.grid)
+        self.__parent_window.last_onward.grab_focus()
 
     def forward(self, *args):
         self.hide()
+        # self.__parent_window.setupwin.disconnect(self.__parent_window.setupwin.signal_id)/
         self.__parent_window.setupwin.close()
 
 

xkeysnail-config/kinto.py

@@ -12,10 +12,18 @@ terminals = [term.casefold() for term in terminals]
 termStr = "|".join(str(x) for x in terminals)
 
 # Use for browser specific hotkeys
-browsers = ["Chromium","Chromium-browser","Google-chrome","Epiphany","Firefox","Discord"]
+browsers = ["Chromium","Chromium-browser","Google-chrome","microsoft-edge-dev","microsoft-edge","Epiphany","Firefox","Discord"]
 browsers = [browser.casefold() for browser in browsers]
 browserStr = "|".join(str(x) for x in browsers)
 
+chromes = ["Chromium","Chromium-browser","Google-chrome","microsoft-edge-dev","microsoft-edge"]
+chromes = [chrome.casefold() for chrome in chromes]
+chromeStr = "|".join(str(x) for x in chromes)
+
+# edges = ["microsoft-edge-dev","microsoft-edge"]
+# edges = [edge.casefold() for edge in edges]
+# edgeStr = "|".join(str(x) for x in edges)
+
 mscodes = ["code","vscodium"]
 codeStr = "|".join(str(x) for x in mscodes)
 
@@ -198,9 +206,20 @@ define_keymap(re.compile("org.gnome.nautilus", re.IGNORECASE),{
 
 # Keybindings for Browsers
 define_keymap(re.compile(browserStr, re.IGNORECASE),{
-    K("RC-Q"): K("RC-Q"),          # Close all browsers Instances
+    K("RC-Q"): K("RC-Q"),               # Close all browsers Instances
+    K("Super-RC-I"): K("RC-Shift-I"),   # Dev tools
+    K("Super-RC-J"): K("RC-Shift-J"),   # Dev tools
 })
 
+# Open preferences in browsers
+define_keymap(re.compile("Firefox", re.IGNORECASE),{
+    K("C-comma"): [K("M-t"), K("o"),K("Enter")],
+})
+define_keymap(re.compile(chromeStr, re.IGNORECASE),{
+    K("C-comma"): [K("M-e"), K("s"),K("Enter")],
+})
+# Opera C-F12
+
 define_keymap(None,{
     K("RC-Space"): K("Alt-F1"),                   # Default SL - Launch Application Menu (gnome/kde)
     K("RC-F3"):K("Super-d"),                      # Default SL - Show Desktop (gnome/kde,eos)
@@ -239,13 +258,21 @@ define_keymap(None,{
     # K("M-Grave") : K("C-Shift-Tab"),              # Chromebook/IBM - In-App Tab switching
     K("Super-Tab"): K("LC-Tab"),                  # Default not-chromebook
     K("Super-Shift-Tab"): K("LC-Shift-Tab"),      # Default not-chromebook
+    
+    # emacs style
+    K("Super-a"): K("Home"),                      # Beginning of Line
+    K("Super-e"): K("End"),                       # End of Line
+    K("Super-b"): K("Left"),
+    K("Super-f"): K("Right"),
+    K("Super-n"): K("Down"),
+    K("Super-p"): K("Up"),
+    K("Super-k"): [K("Shift-End"), K("Backspace")],
+    K("Super-d"): K("Delete"),
 
     # Wordwise
     K("RC-Left"): K("Home"),                      # Beginning of Line
-    K("Super-a"): K("Home"),                      # Beginning of Line
     K("RC-Shift-Left"): K("Shift-Home"),          # Select all to Beginning of Line
     K("RC-Right"): K("End"),                      # End of Line
-    K("Super-e"): K("End"),                       # End of Line
     K("RC-Shift-Right"): K("Shift-End"),          # Select all to End of Line
     # K("RC-Left"): K("C-LEFT_BRACE"),              # Firefox-nw - Back
     # K("RC-Right"): K("C-RIGHT_BRACE"),            # Firefox-nw - Forward

xkeysnail-config/trayapps/appindicator/kintotray.py

@@ -620,10 +620,14 @@ class Indicator():
         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:
+            elif which('gedit') is not None:
                 Popen(['gedit',os.environ['HOME']+'/.config/kinto/kinto.py'])
-            elif which(mousepad) is not None:
+            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!'])
@@ -632,10 +636,14 @@ class Indicator():
         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:
+            elif which('gedit') is not None:
                 Popen(['gedit','/lib/systemd/system/xkeysnail.service'])
-            elif which(mousepad) is not None:
+            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!'])
@@ -690,12 +698,16 @@ class Indicator():
     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'])
 

xkeysnail-config/xkeysnail.service

@@ -4,7 +4,7 @@ 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 && /usr/local/bin/xkeysnail --quiet --watch {homedir}/.config/kinto/kinto.py'
+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

xkeysnail_service.sh

@@ -8,90 +8,17 @@ distro=$(awk -F= '$1=="NAME" { gsub("[\",!,_, ]","",$2);print $2 ;}' /etc/os-rel
 typeset -l dename
 dename=$(./system-config/dename.sh | cut -d " " -f1)
 
-
-# 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.."
-		echo "Overlay key, Super, 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
-	pip3 install pillow
-	# 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 [[ $dename == "kde" ]]; then
-	if [[ $distroy == "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
-
-
 function uninstall {
 
+	echo -e "\nNote: Restoring keys is only relevant if you had installed a version prior to 1.2 of Kinto. You should skip this step if 1.2+ is all you have installed."
+
 	while true; do
-	read -rep $'\nPress R to restore your original shortcuts.\nPress F to reset to factory shortcuts. (f/r)\n' yn
+	read -rep $'\nPress R to restore your original shortcuts.\nPress F to reset to factory shortcuts.\nPress N to skip. (f/r/N)\n' yn
 		case $yn in
 			[Ff]* ) yn="f"; break;;
 			[Rr]* ) yn="r";break;;
-			* ) echo "Please answer yes or no.";;
+			[Nn]* ) yn="n";break;;
+			* ) yn="n";break;;
 		esac
 	done
 
@@ -103,8 +30,6 @@ function uninstall {
 			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
@@ -145,6 +70,13 @@ function uninstall {
 			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
 }
 
@@ -226,6 +158,141 @@ function budgieUpdate {
 	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)"
@@ -274,6 +341,9 @@ if ! [ -x "$(command -v python3-config)" ]; then
 		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"
@@ -307,7 +377,7 @@ yes | cp -rf ./xkeysnail-config/xkeysnail.desktop ~/.config/kinto/xkeysnail.desk
 # 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
 
-git describe --tags --always origin master | perl -ne "print \"\$1 build `git rev-parse --short HEAD`\n\" for m/\b(.*)-\w+-\w{8}/" | head -n 1 > ~/.config/kinto/version
+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/
@@ -340,9 +410,6 @@ 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/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
@@ -400,11 +467,6 @@ if ! [[ $1 == "5" || $1 == "uninstall" || $1 == "Uninstall" ]]; then
 	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
 	cd xkeysnail
@@ -421,6 +483,23 @@ if ! [[ $1 == "5" || $1 == "uninstall" || $1 == "Uninstall" ]]; then
 	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
@@ -431,9 +510,8 @@ if ! [[ $1 == "5" || $1 == "uninstall" || $1 == "Uninstall" ]]; then
 	# 	sudo systemctl enable xkeysnail.service
 	# fi
 	# sudo systemctl restart xkeysnail
-	if ! [[ $dename == "gnome" || $dename == "kde" ]];then
-		sudo pkill -f kintotray >/dev/null 2>&1
-	else
+	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 &
@@ -460,33 +538,21 @@ if ! [[ $1 == "5" || $1 == "uninstall" || $1 == "Uninstall" ]]; then
 
 	echo -e "Kinto install is \e[1m\e[32mcomplete\e[0m.\n"
 
-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 pkill -f bin/xkeysnail >/dev/null 2>&1
-	sudo pkill -f "is-active xkeysnail" >/dev/null 2>&1
-	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 /etc/systemd/system/xkeysnail.service >/dev/null 2>&1
-	sudo rm /usr/share/applications/kinto.desktop  >/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
+	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
-	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"
+
+	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