Merge pull request #542 from rbreaves/make_intall_on_fedora_work_in_enforcing_mode

Make intall on fedora work in enforcing mode
Merge branch 'master' into make_intall_on_fedora_work_in_enforcing_mode
2025-08-02 09:06:40 +02:00 · 2021-07-04 00:22:27 -05:00 · 2021-07-04 00:10:05 -05:00 · 2021-06-30 00:58:58 -05:00 · 2021-06-30 00:54:20 -05:00 · 2021-06-29 20:38:12 -05:00
13 changed files with 873 additions and 297 deletions
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@

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

-\- Linux & Windows with Mac-style shortcut keys. \-
+\- Mac-style shortcut keys for Linux & Windows. \-

 Seamless copy and paste with all apps and terminals. The zero effort solution.

@@ -13,6 +13,10 @@ v1.2 Release - Kinto now includes a system tray and simple wizard to setup the i

 Kinto is powered by [xkeysnail](https://github.com/mooz/xkeysnail) for Linux & by [Autohotkey](https://github.com/Lexikos/AutoHotkey_L) for Windows 10.

+Note: If you plan to remote into Linux via VNC, xRDP, Synergy or other remote desktop solutions then remove the current release & try an earlier [v1.0.7-3](https://github.com/rbreaves/kinto/releases/tag/1.0.7-3) release. It uses xkb so it'll work with virtual xinput devices. Some v1.1-x releases may offer both, but all v1.2.x releases ended support for xkb. I do plan to bring offical support back for virtual input devices.
+
+Additionally VMware, Virtualbox, KVM and other virtualization technologies work best with the current release - so *this note only applies to remote desktop into Linux* - not virtualization.
+
 ### [Table of Contents ](#Table-of-Contents)

 ## Donations
@@ -32,21 +36,25 @@ Video Tutorial: [Install Kinto.sh for Linux in less than a minute](https://www.y

 <img src="https://user-images.githubusercontent.com/10969616/97070698-179c4500-15a0-11eb-8064-c03aa7f4d4a5.png" width="75%">

-1. clone this repo
+### Quick Install Method
+
+Paste the following into your Terminal
+```
+/bin/bash -c "$(wget -qO- https://raw.githubusercontent.com/rbreaves/kinto/HEAD/install/linux.sh || curl -fsSL https://raw.githubusercontent.com/rbreaves/kinto/HEAD/install/linux.sh)"
+```
+
+Uninstall
+```
+/bin/bash <( wget -qO- https://raw.githubusercontent.com/rbreaves/kinto/HEAD/install/linux.sh || curl -fsSL https://raw.githubusercontent.com/rbreaves/kinto/HEAD/install/linux.sh ) -r
+```
+
+### Old Install Method
+
 ```
 git clone https://github.com/rbreaves/kinto.git
 cd kinto
-```
-2. Install python3 (If needed)
-
-Debian or Ubuntu 16.04 or 18.04
-```
 sudo apt update
 sudo apt install python3
-```
-
-3. Run the script, press 1 or 2 keys and you are done.
-```
 ./setup.py
 ```

@@ -72,16 +80,38 @@ Try toggling numlock on & off (clear key on official mac keyboards). If it still
 If you want a global menu app similar to what mac users have then I strongly recommend Ubuntu Budgie as it has the Vala Appmenu built in and ready for activation. Short of that Vala-AppMenu can be installed in various distros, mileage will vary. If you try to activate it in the latest 20.xx releases with XFCE then you may need to run the following commands.

 ```
-sudo apt install xfce4-appmenu-plugin vala-panel-appmenu-common
+sudo apt install xfce4-appmenu-plugin vala-panel-appmenu-common appmenu-gtk2-module appmenu-gtk3-module appmenu-gtk-module-common
 xfconf-query -c xsettings -p /Gtk/Modules -n -t string -s "appmenu-gtk-module"
 ```

+**Perfect HiDPI fractional scaling on Ubuntu Budgie 20.04 under x11**
+
+https://discourse.ubuntubudgie.org/t/ubuntu-budgie-20-04-fractional-hidpi-for-x11/4777
+
 ## How to Install (Windows)

 Video Tutorial: [How to Install Kinto.sh on Windows 10](https://youtu.be/sRk8A8krz40)

 [Windows 10 Requirements](#Kinto-for-Windows-10-Requirements)

+### Quick install
+Open Powershell as Administrator and copy and paste the following. This will download & extract Kinto, install chocolatey, python3 and then install Kinto.
+
+**⚠ NOTE: Please inspect https://raw.githubusercontent.com/rbreaves/kinto/master/install/windows.ps1 and https://chocolatey.org/install.ps1 before running scripts directly. More information about running powershell scripts in this context can be found [here](https://chocolatey.org/install).**
+
+```
+Set-ExecutionPolicy Bypass -Scope Process -Force
+iwr https://raw.githubusercontent.com/rbreaves/kinto/master/install/windows.ps1 -UseBasicParsing | iex
+```
+
+
+Update system tray to show Kinto icon at all times (optional)
+```
+cmd /c "explorer shell:::{05d7b0f4-2121-4eff-bf6b-ed3f69b894d9}"
+```
+
+### Old method
+
 1. Open Powershell (Right click and Run as Administrator)

 2. clone this repo
@@ -110,10 +140,11 @@ Select Uninstall

 ## How to use in Remote Desktop Solutions

-RDP fully works as long as the entire keyboard input is being captured. RDP had been working for awhile with Windows but as of 2/14/2021 Linux is now supported and potentially macOS as well. VNC & other protocols may work, but is likely most dependent on how the keyboard input is captured on the computer running the client.
+RDP fully works as long as the entire keyboard input is being captured. RDP had been working for awhile with Windows but as of 2/14/2021 Linux & macOS is now supported. VNC & other protocols may work, but is likely most dependent on how the keyboard input is captured on the computer running the client.

 |Program|Src/Remote Client ⇒|Dst/Remote Server|Works? |Notes|
 |---|---|---|---|---|
+|Official MS RDP (mstsc.exe)| ❖Windows ⇒| 🐧Linux  | ✅ Yes| Note: [v1.0.7-3 Only](https://github.com/rbreaves/kinto/releases/tag/1.0.7-3). Should work for xRDP/VNC and other remote server protocols.  |
 |Official MS RDP (mstsc.exe)| ❖Windows ⇒| ❖Windows  | ✅ Yes|   |
 |Official MS RDP| ChromeOS 87+⇒| ❖Windows  | ✅ Yes|May work on earlier versions as well, if they support Android apps|
 |Remmina| 🐧Linux*/ChromeOS 87+⇒| ❖Windows  | ✅ Yes|*Use hover menu to enable "Grab all keyboard events"|
@@ -226,7 +257,7 @@ Additionally, if you are using a cross-platform app and if it happens to have a
 ## What does Kinto require?

 - Python
- systemd
+- systemd or sysvinit
 - x11
 - xkeysnail

@@ -284,10 +315,16 @@ In the above example I am also showing that you can define a single shortcut to

 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.

+systemd
 ```
 sudo systemctl restart xkeysnail
 ```

+sysvinit
+```
+sudo -E /etc/init.d/kinto restart
+```
+
 More information can be seen on the readme page of [xkeysnail](https://github.com/mooz/xkeysnail).

 ## Windows (Autohotkey)
@@ -349,25 +386,53 @@ git pull origin master
 This info is now superceded by the fact that linux has a full fledge GUI and system tray app that is very easy to use, but I will keep the command line options for those that want to know what they are.

 Status
+
+systemd
 ```
 sudo systemctl status xkeysnail
 ```

+sysvinit
+```
+tail -f /tmp/kinto.log
+```
+
 Stop (your keymap will return to normal)
+
+systemd
 ```
 sudo systemctl stop xkeysnail
 ```

+sysvinit
+```
+sudo -E /etc/init.d/kinto stop
+```
+
 Start
+
+systemd
 ```
 sudo systemctl start xkeysnail
 ```

+sysvinit
+```
+sudo -E /etc/init.d/kinto start
+```
+
 Restart
+
+systemd
 ```
 sudo systemctl restart xkeysnail
 ```

+sysvinit
+```
+sudo -E /etc/init.d/kinto restart
+```
+
 ## Troubleshooting

 ### Installed successfully, but modifier keys are not properly remapped?
@@ -449,6 +514,10 @@ Windows 10 touchpad to precision touchpad driver

 macOS cursors for Windows

+[QuickLook](https://github.com/QL-Win/QuickLook) for Windows by QL-Win
+
+It allows users to peek into a file content in lightning speed by just pressing the Space key
+
 [fusuma](https://github.com/iberianpig/fusuma) by iberianpig

 Multitouch gestures with libinput driver on Linux
@@ -537,11 +606,9 @@ Vala rewrite of SimplePanel - GitHub mirror (Global Menu for XFCE)

 ## Contributing

-I welcome any and all contributors who want to contribute something to this project.
+I welcome any and all contributors who want to add something to this project.

-If you are specifically wanting to contribute additional custom keymaps to help with aligning Kinto's behavior to that of a mac keyboard then I would strongly recommend that you read Glen Whitney's comment on Superuser (the link is below). You may also look at the .xkb directory, mac_wordwise.sh and xactive.sh files to better understand how Kinto operates so that you can test your own keymaps without having to use the systemd service or running the xactive.sh script.
-
-https://superuser.com/questions/385748/binding-superc-superv-to-copy-and-paste
+You can read the configuration files and the open issue tickets such as [#44 Shortcut Translation Tables](https://github.com/rbreaves/kinto/issues/44), [#115 Shortcut Creation (xkeysnail)](https://github.com/rbreaves/kinto/issues/115), and [#348 Missing Shortcuts: Post them here](https://github.com/rbreaves/kinto/issues/348) to best understand what's currently happening and how best to contribute.

 ## More information about Kinto

--- a/install/linux.sh
+++ b/install/linux.sh
@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+
+# /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/rbreaves/kinto/master/install/linux.sh)"
+
+wget https://github.com/rbreaves/kinto/archive/refs/heads/master.zip -O ~/Downloads/kinto.zip || curl https://github.com/rbreaves/kinto/archive/refs/heads/master.zip -J -L -o ~/Downloads/kinto.zip
+unzip ~/Downloads/kinto.zip -d ~/Downloads/
+cd ~/Downloads/kinto-master/
+
+kintorelease=`wget -qO- https://api.github.com/repos/rbreaves/kinto/releases/latest | awk -F'tag_name": ' '{if ($2) print $2}' | tr -d \", || curl -s https://api.github.com/repos/rbreaves/kinto/releases/latest | awk -F'tag_name": ' '{if ($2) print $2}' | tr -d \",`
+kintohash=`unzip -z ~/Downloads/kinto.zip | tail -n1`
+kintoshort=${kintohash::7}
+
+echo "$kintorelease" "build" "$kintoshort" > ./dl_version
+
+if [ $# -eq 0 ];then
+	echo "Installing Kinto..."
+	./setup.py
+elif [ $1 == "-r" ];then
+	echo "Uninstall Kinto..."
+	./setup.py -r
+fi
--- a/install/windows.ps1
+++ b/install/windows.ps1
@@ -0,0 +1,7 @@
+Invoke-WebRequest -Uri https://github.com/rbreaves/kinto/archive/refs/heads/master.zip -OutFile $env:USERPROFILE\Downloads\kinto.zip
+Expand-Archive -LiteralPath "$env:USERPROFILE\Downloads\kinto.zip" -DestinationPath "$env:USERPROFILE\Downloads" -Force
+Set-ExecutionPolicy Bypass -Scope Process -Force
+iwr https://chocolatey.org/install.ps1 -UseBasicParsing | iex
+choco install -y python3
+cd "$env:USERPROFILE\Downloads\kinto-master"
+py .\setup.py
--- a/linux/gui/kinto-gui.py
+++ b/linux/gui/kinto-gui.py
@@ -1,6 +1,8 @@
 #!/usr/bin/env python3

 import gi,os,time,fcntl,argparse,re
+import warnings
+warnings.filterwarnings("ignore")
 gi.require_version('Gtk', '3.0')
 gi.require_version('Vte', '2.91')
 from gi.repository import Gtk,Gdk,GdkPixbuf
@@ -48,13 +50,21 @@ class MyWindow(Gtk.Window):
    page = 1

    label = Gtk.Label()
-    label.set_alignment(1, 0)
+    label.set_halign(Gtk.Align.END)
    ostype = os.environ.get('XDG_CURRENT_DESKTOP')
    global openWin
    openWin = False

    global child_pid
-    kinto_status = Popen("while :; do clear; systemctl is-active xkeysnail; sleep 2; done", stdout=PIPE, shell=True)
+    global sysv
+    try:
+        sysv = int(Popen("pidof systemd >/dev/null 2>&1 && echo '0' || echo '1'", stdout=PIPE, shell=True).communicate()[0].strip().decode('UTF-8'))
+    except:
+        sysv = 2
+    if sysv:
+        kinto_status = Popen("while :; do clear; pgrep 'xkeysnail' && echo 'active'; sleep 2; done", stdout=PIPE, shell=True)
+    else:
+        kinto_status = Popen("while :; do clear; systemctl is-active xkeysnail; sleep 2; done", stdout=PIPE, shell=True)
    child_pid = kinto_status.pid

    winkb = Gtk.RadioMenuItem(label='Windows')
@@ -114,9 +124,15 @@ class MyWindow(Gtk.Window):
            None,
        )
        if self.args.debug:
-            self.command = 'sudo systemctl stop xkeysnail && sudo pkill -f bin/xkeysnail && sudo xkeysnail ~/.config/kinto/kinto.py\n'
+            if sysv:
+                self.command = 'sudo /etc/init.d/kinto stop && sudo pkill -f bin/xkeysnail && sudo xkeysnail ~/.config/kinto/kinto.py\n'
+            else:
+                self.command = 'sudo systemctl stop xkeysnail && sudo pkill -f bin/xkeysnail && sudo xkeysnail ~/.config/kinto/kinto.py\n'
        else:
-            self.command = "journalctl -f --unit=xkeysnail.service -b\n"
+            if sysv:
+                self.command = "tail -f /tmp/kinto.log\n"
+            else:
+                self.command = "journalctl -f --unit=xkeysnail.service -b\n"
        
        self.InputToTerm(self.command)

@@ -153,6 +169,14 @@ class MyWindow(Gtk.Window):
        menuitem_file = Gtk.MenuItem(label="File")
        menubar.append(menuitem_file)
        submenu_file = Gtk.Menu()
+
+        menuitem_restart = Gtk.MenuItem(label="Restart")
+        menuitem_restart.connect('activate',self.runRestart)
+        submenu_file.append(menuitem_restart)
+        menuitem_stop = Gtk.MenuItem(label="Stop")
+        menuitem_stop.connect('activate',self.runStop)
+        submenu_file.append(menuitem_stop)
+
        menuitem_file.set_submenu(submenu_file)
        submenu_file.append(self.menuitem_auto)
        kintotray = int(self.queryConfig('ps -aux | grep [k]intotray >/dev/null 2>&1 && echo "1" || echo "0"'))
@@ -164,12 +188,6 @@ class MyWindow(Gtk.Window):
            self.menuitem_systray.signal_id = self.menuitem_systray.connect('activate',self.checkTray,True)
        menuitem_file.connect('activate',self.refreshFile)
        submenu_file.append(self.menuitem_systray)
-        menuitem_restart = Gtk.MenuItem(label="Restart")
-        menuitem_restart.connect('activate',self.runRestart)
-        submenu_file.append(menuitem_restart)
-        menuitem_stop = Gtk.MenuItem(label="Stop")
-        menuitem_stop.connect('activate',self.runStop)
-        submenu_file.append(menuitem_stop)

        menuitem_quit = Gtk.MenuItem(label="Quit")
        submenu_file.append(menuitem_quit)
@@ -179,19 +197,19 @@ class MyWindow(Gtk.Window):
        menubar.append(menuitem_edit)
        submenu_edit = Gtk.Menu()
        menuitem_edit.set_submenu(submenu_edit)
-        edititem_tweaks = Gtk.MenuItem("Tweaks")
+        edititem_tweaks = Gtk.MenuItem(label="Tweaks")
        edititem_tweaks.connect('activate',self.setTweaks)
        submenu_edit.append(edititem_tweaks)
-        edititem_config = Gtk.MenuItem("Kinto Config (shortcuts)")
+        edititem_config = Gtk.MenuItem(label="Kinto Config (shortcuts)")
        edititem_config.connect('activate',self.setConfig)
        submenu_edit.append(edititem_config)
-        edititem_service = Gtk.MenuItem("Kinto Service")
+        edititem_service = Gtk.MenuItem(label="Kinto Service")
        edititem_service.connect('activate',self.setService)
        submenu_edit.append(edititem_service)
-        edititem_shortcuts = Gtk.MenuItem("System Shortcuts")
+        edititem_shortcuts = Gtk.MenuItem(label="System Shortcuts")
        edititem_shortcuts.connect('activate',self.setSysKB)
        submenu_edit.append(edititem_shortcuts)
-        edititem_language = Gtk.MenuItem("Change Language")
+        edititem_language = Gtk.MenuItem(label="Change Language")
        edititem_language.connect('activate',self.setRegion)
        submenu_edit.append(edititem_language)

@@ -205,11 +223,11 @@ class MyWindow(Gtk.Window):
        helpitem_debug = Gtk.MenuItem(label="Debug")
        helpitem_debug.connect('activate',self.runDebug)
        submenu_help.append(helpitem_debug)
-        helpitem_support = Gtk.MenuItem("Support")
+        helpitem_support = Gtk.MenuItem(label="Support")
        helpitem_support.connect('activate',self.openSupport)
        submenu_help.append(helpitem_support)
        menuitem_help.set_submenu(submenu_help)
-        helpitem_about = Gtk.MenuItem("About")
+        helpitem_about = Gtk.MenuItem(label="About")
        helpitem_about.connect('activate',self.runAbout)
        submenu_help.append(helpitem_about)

@@ -341,7 +359,6 @@ class MyWindow(Gtk.Window):
            self.menuitem_systray.signal_id = self.menuitem_systray.connect('activate',self.checkTray,False)

        restartsvc = True
-
    
    def initSetup(self):
        global win,openWin,restartsvc
@@ -418,21 +435,20 @@ class MyWindow(Gtk.Window):
            pixbuf = GdkPixbuf.Pixbuf.new_from_file(os.environ['HOME']+'/.config/kinto/gui/tuxcry4.png')
            pixbuf = pixbuf.scale_simple(600, 360, GdkPixbuf.InterpType.BILINEAR)
            self.bgsuccess4 = self.bgsuccess4.new_from_pixbuf(pixbuf)
-            self.bgsuccess4.set_alignment(0, 1)
+            self.bgsuccess4.set_valign(Gtk.Align.END)

            pixbuf = GdkPixbuf.Pixbuf.new_from_file(os.environ['HOME']+'/.config/kinto/gui/tuxuninstall.png')
            pixbuf = pixbuf.scale_simple(600, 360, GdkPixbuf.InterpType.BILINEAR)
            self.bguninstall = self.bguninstall.new_from_pixbuf(pixbuf)
-            self.bguninstall.set_alignment(0, 1)
+            self.bguninstall.set_valign(Gtk.Align.END)

            pixbuf = GdkPixbuf.Pixbuf.new_from_file(os.environ['HOME']+'/.config/kinto/gui/tuxbg.png')
            pixbuf = pixbuf.scale_simple(600, 360, GdkPixbuf.InterpType.BILINEAR)
            self.background = self.background.new_from_pixbuf(pixbuf)
-            self.background.set_alignment(0, 1)
+            self.background.set_valign(Gtk.Align.END)
            self.bgcaps = self.bgcaps.new_from_pixbuf(pixbuf2)
-            self.bgcaps.set_alignment(0, 1)
            self.bgspace = self.bgspace.new_from_pixbuf(pixbuf3)
-            self.bgspace.set_alignment(0, 1)
+            self.bgspace.set_valign(Gtk.Align.END)
            self.overlay.add(self.background)
            self.overlay.add_overlay(self.container)
            self.setupwin.add(self.container)
@@ -454,7 +470,7 @@ class MyWindow(Gtk.Window):
    def image2pixbuf(self,im):
        data = im.tobytes()
        w, h = im.size
-        print(im.size)
+        # print(im.size)
        data = GLib.Bytes.new(data)
        pix = GdkPixbuf.Pixbuf.new_from_bytes(data, GdkPixbuf.Colorspace.RGB,True, 8, w, h, w * 4)
        return pix
@@ -515,7 +531,10 @@ class MyWindow(Gtk.Window):
        return

    def runDebug(self,button):
-        command = 'send \003 sudo systemctl stop xkeysnail && sudo pkill -f bin/xkeysnail && sudo xkeysnail ~/.config/kinto/kinto.py\n'
+        if sysv:
+            command = 'send \003 sudo /etc/init.d/kinto stop && sudo pkill -f bin/xkeysnail && sudo xkeysnail ~/.config/kinto/kinto.py\n'
+        else:
+            command = 'send \003 sudo systemctl stop xkeysnail && sudo pkill -f bin/xkeysnail && sudo xkeysnail ~/.config/kinto/kinto.py\n'
        self.InputToTerm(command)

    def openSupport(self,button):
@@ -608,7 +627,10 @@ class MyWindow(Gtk.Window):
            self.queryConfig(killspawn)
            time.sleep(1)
            global child_pid
-            self.kinto_status = Popen("while :; do clear; systemctl is-active xkeysnail; sleep 2; done", stdout=PIPE, shell=True)
+            if sysv:
+                self.kinto_status = Popen("export TERM=xterm-color;while :; do clear; pgrep 'xkeysnail'; sleep 2; done", stdout=PIPE, shell=True)
+            else:
+                self.kinto_status = Popen("export TERM=xterm-color;while :; do clear; systemctl is-active xkeysnail; sleep 2; done", stdout=PIPE, shell=True)
            child_pid = self.kinto_status.pid
            self.menuitem_systray.disconnect(self.menuitem_systray.signal_id)
            self.menuitem_systray.set_active(False)
@@ -616,6 +638,7 @@ class MyWindow(Gtk.Window):
        return

    def setKB(self,button,kbtype):
+        global sysv
        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'
@@ -652,7 +675,10 @@ class MyWindow(Gtk.Window):
            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'

-            restart = ['sudo', 'systemctl','restart','xkeysnail']
+            if sysv:
+                restart = ['sudo', '-E','/etc/init.d/kinto','restart']
+            else:
+                restart = ['sudo', 'systemctl','restart','xkeysnail']
            cmds = ['perl','-pi','-e',setkb,self.kconfig]

            cmdsTerm = Popen(cmds)
@@ -744,11 +770,14 @@ class MyWindow(Gtk.Window):
    }

    def on_delete_event(event, self, widget):
-        global restartsvc, openWin
+        global restartsvc, openWin, sysv
        
        if restartsvc == True:
            try:
-                restartcmd = ['sudo', 'systemctl','restart','xkeysnail']
+                if sysv:
+                    restartcmd = ['sudo', '-E','/etc/init.d/kinto','restart']
+                else:
+                    restartcmd = ['sudo', 'systemctl','restart','xkeysnail']
                Popen(restartcmd)
                restartsvc = False

@@ -868,8 +897,12 @@ class MyWindow(Gtk.Window):
        return

    def runRestart(self,button):
+        global sysv
        try:
-            stop = Popen(['sudo', 'systemctl','stop','xkeysnail'])
+            if sysv:
+                stop = Popen(['sudo', '-E','/etc/init.d/kinto','stop'])
+            else:
+                stop = Popen(['sudo', 'systemctl','stop','xkeysnail'])
            stop.wait()
            time.sleep(1)
            res = Popen(['pgrep','xkeysnail'])
@@ -878,15 +911,23 @@ class MyWindow(Gtk.Window):
            if res.returncode == 0:
                pkillxkey = Popen(['sudo', 'pkill','-f','bin/xkeysnail'])
                pkillxkey.wait()
-            Popen(['sudo', 'systemctl','start','xkeysnail'])
-            self.command = "send \003 journalctl -f --unit=xkeysnail.service -b\n"
+            if sysv:
+                Popen(['sudo','-E','/etc/init.d/kinto','start'])
+                self.command = "send \003 tail -f /tmp/kinto.log\n"
+            else:
+                Popen(['sudo','systemctl','start','xkeysnail'])
+                self.command = "send \003 journalctl -f --unit=xkeysnail.service -b\n"
            self.InputToTerm(self.command)
        except:
            Popen(['notify-send','Kinto: Errror restarting Kinto!'])

    def runStop(self,button):
+        global sysv
        try:
-            stop = Popen(['sudo', 'systemctl','stop','xkeysnail'])
+            if sysv:
+                stop = Popen(['sudo', '-E','/etc/init.d/kinto','stop'])
+            else:
+                stop = Popen(['sudo', 'systemctl','stop','xkeysnail'])
            stop.wait()
            time.sleep(1)
            res = Popen(['pgrep','xkeysnail'])
@@ -1075,7 +1116,7 @@ class MyWindow(Gtk.Window):
            except:
                pass

-        print(Vte.get_minor_version())
+        # print(Vte.get_minor_version())

    # def on_menu_auto(self, widget):
    #     print("add file open dialog")
@@ -1104,34 +1145,36 @@ class UninstallPage(Gtk.Box):

        label_start = Gtk.Label()
        label_start.set_markup('<b>Uninstall</b>\n\n\n\nWould you like to uninstall kinto?\n\n If you need support please visit <a href="http://kinto.sh">kinto.sh</a>.')
-        label_start.set_alignment(0,0)
+        label_start.set_valign(Gtk.Align.START)
+        label_start.set_halign(Gtk.Align.START)
+
        label_start.set_line_wrap(True)
        vbox.add(label_start)
        scroller.add(vbox)

        hbox = Gtk.HBox()
-        previous = Gtk.Button("Uninstall")
+        previous = Gtk.Button(label="Uninstall")
        previous.connect("clicked", self.goback)
-        previous.set_margin_right(206)
+        previous.set_margin_end(206)
        hbox.add(previous)

-        onward = Gtk.Button("Continue")
+        onward = Gtk.Button(label="Continue")
        onward.connect("clicked", self.forward)
        hbox.add(onward)

        hbox.set_hexpand(False)
        hbox.set_vexpand(False)
        hbox.set_margin_bottom(6)
-        hbox.set_margin_right(25)
+        hbox.set_margin_end(25)

        scroller.set_hexpand(True)
        scroller.set_vexpand(True)
        vbox_container.add(scroller)
        vbox_container.set_margin_top(55)
-        vbox_container.set_margin_right(25)
-        self.grid.set_margin_left(157)
+        vbox_container.set_margin_end(25)
+        self.grid.set_margin_start(157)
        vbox_container.set_margin_bottom(18)
-        vbox.set_margin_right(10)
+        vbox.set_margin_end(10)
        vbox.set_margin_bottom(18)
        self.grid.add(vbox_container)
        self.grid.attach_next_to(hbox, vbox_container, Gtk.PositionType.BOTTOM, 2, 1)
@@ -1163,18 +1206,19 @@ class FirstPage(Gtk.Box):

        label_start = Gtk.Label()
        label_start.set_markup("Before we continue please make sure you do not have any other remappers running. Kinto works best when it is the only application remapping your keys.\n\nBy continuing you also agree that Kinto is not held liable for any harm, damage(s) or unexpected behaviors.\nThis software is free, open-source, and provided as-is.\n\n<sup><b>© 2019, 2020 by Ben Reaves ~ Kinto is licensed on GPLv2.</b></sup>")
-        label_start.set_alignment(0,0)
+        label_start.set_valign(Gtk.Align.START)
+        label_start.set_halign(Gtk.Align.START)
        label_start.set_line_wrap(True)
        vbox.add(label_start)
        scroller.add(vbox)

        hbox = Gtk.HBox()
-        previous = Gtk.Button("")
+        previous = Gtk.Button(label="")
        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)
+        previous.set_margin_end(245)
        hbox.add(previous)

        self.__parent_window.first_onward.set_label("")
@@ -1188,16 +1232,16 @@ class FirstPage(Gtk.Box):
        hbox.set_hexpand(False)
        hbox.set_vexpand(False)
        hbox.set_margin_bottom(6)
-        hbox.set_margin_right(25)
+        hbox.set_margin_end(25)

        scroller.set_hexpand(True)
        scroller.set_vexpand(True)
        vbox_container.add(scroller)
        vbox_container.set_margin_top(55)
-        vbox_container.set_margin_right(28)
-        self.grid.set_margin_left(157)
+        vbox_container.set_margin_end(28)
+        self.grid.set_margin_start(157)
        vbox_container.set_margin_bottom(18)
-        vbox.set_margin_right(10)
+        vbox.set_margin_end(10)
        vbox.set_margin_bottom(18)
        self.grid.add(vbox_container)
        self.grid.attach_next_to(hbox, vbox_container, Gtk.PositionType.BOTTOM, 2, 1)
@@ -1236,37 +1280,38 @@ class SecondPage(Gtk.Box):
        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.\n\n<sub>If stuck here then unset Overlay (Super) key on your DE.</sub>')
-        label_start.set_alignment(0,0)
+        label_start.set_valign(Gtk.Align.START)
+        label_start.set_halign(Gtk.Align.START)
        label_start.set_line_wrap(True)
        vbox.add(label_start)
        scroller.add(vbox)

        hbox = Gtk.HBox()
-        previous = Gtk.Button("")
+        previous = Gtk.Button(label="")
        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)
+        previous.set_margin_end(315)
        hbox.add(previous)

-        # onward = Gtk.Button("Continue")
+        # onward = Gtk.Button(label="Continue")
        # onward.connect("clicked", self.forward)
        # hbox.add(onward)

        hbox.set_hexpand(False)
        hbox.set_vexpand(False)
        hbox.set_margin_bottom(6)
-        hbox.set_margin_right(25)
+        hbox.set_margin_end(25)

        scroller.set_hexpand(True)
        scroller.set_vexpand(True)
        vbox_container.add(scroller)
        vbox_container.set_margin_top(55)
-        vbox_container.set_margin_right(25)
-        self.grid.set_margin_left(157)
+        vbox_container.set_margin_end(25)
+        self.grid.set_margin_start(157)
        vbox_container.set_margin_bottom(18)
-        vbox.set_margin_right(10)
+        vbox.set_margin_end(10)
        vbox.set_margin_bottom(18)
        self.grid.add(vbox_container)
        self.grid.attach_next_to(hbox, vbox_container, Gtk.PositionType.BOTTOM, 2, 1)
@@ -1320,37 +1365,38 @@ class CapsPage(Gtk.Box):

        label_start = Gtk.Label()
        label_start.set_markup('<b>Identifying your Keyboard...</b>\n\nPress the <b>capslock</b> key twice.')
-        label_start.set_alignment(0,0)
+        label_start.set_valign(Gtk.Align.START)
+        label_start.set_halign(Gtk.Align.START)
        label_start.set_line_wrap(True)
        vbox.add(label_start)
        scroller.add(vbox)

        hbox = Gtk.HBox()
-        previous = Gtk.Button("")
+        previous = Gtk.Button(label="")
        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)
+        previous.set_margin_end(315)
        hbox.add(previous)

-        # onward = Gtk.Button("Continue")
+        # onward = Gtk.Button(label="Continue")
        # onward.connect("clicked", self.forward)
        # hbox.add(onward)

        hbox.set_hexpand(False)
        hbox.set_vexpand(False)
        hbox.set_margin_bottom(6)
-        hbox.set_margin_right(25)
+        hbox.set_margin_end(25)

        scroller.set_hexpand(True)
        scroller.set_vexpand(True)
        vbox_container.add(scroller)
        vbox_container.set_margin_top(55)
-        vbox_container.set_margin_right(25)
-        self.grid.set_margin_left(157)
+        vbox_container.set_margin_end(25)
+        self.grid.set_margin_start(157)
        vbox_container.set_margin_bottom(18)
-        vbox.set_margin_right(10)
+        vbox.set_margin_end(10)
        vbox.set_margin_bottom(18)
        self.grid.add(vbox_container)
        self.grid.attach_next_to(hbox, vbox_container, Gtk.PositionType.BOTTOM, 2, 1)
@@ -1387,9 +1433,9 @@ class SuccessPage(Gtk.Box):
        self.grid = Gtk.Grid()

        hbox = Gtk.HBox()
-        previous = Gtk.Button("       ")
+        previous = Gtk.Button(label="       ")
        previous.props.relief = Gtk.ReliefStyle.NONE
-        previous.set_margin_right(245)
+        previous.set_margin_end(245)
        hbox.add(previous)

        self.__parent_window.last_onward.set_label("")
@@ -1402,7 +1448,7 @@ class SuccessPage(Gtk.Box):
        hbox.set_hexpand(False)
        hbox.set_vexpand(False)
        hbox.set_margin_bottom(6)
-        hbox.set_margin_right(25)
+        hbox.set_margin_end(25)

        scroller = Gtk.ScrolledWindow()
        scroller.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.NEVER)
@@ -1411,11 +1457,11 @@ class SuccessPage(Gtk.Box):
        vbox = Gtk.VBox()
        vbox_container = Gtk.VBox()
        vbox_container.set_margin_top(55)
-        vbox_container.set_margin_right(28)
+        vbox_container.set_margin_end(28)
        vbox_container.add(scroller)
-        self.grid.set_margin_left(157)
+        self.grid.set_margin_start(157)
        vbox_container.set_margin_bottom(18)
-        vbox.set_margin_right(10)
+        vbox.set_margin_end(10)
        vbox.set_margin_bottom(18)
        self.grid.add(vbox_container)
        self.grid.attach_next_to(hbox, vbox_container, Gtk.PositionType.BOTTOM, 2, 1)
@@ -1435,4 +1481,4 @@ if openWin:
    win.show_all()
    openWin = False

-Gtk.main()
+Gtk.main()
--- a/linux/kinto-service.sh
+++ b/linux/kinto-service.sh
@@ -0,0 +1,57 @@
+#!/bin/bash
+#
+# chkconfig: 35 90 12
+# description: Kinto service
+#
+
+# Get function from functions library
+# . /etc/init.d/functions
+
+# Start the service
+start() {
+        echo -n "Starting Kinto (xkeynsail)" | logger
+        xkeycount=$(pgrep 'xkeysnail' | wc -l)
+
+        if [[ $xkeycount -eq 0 ]]; then
+            /usr/bin/xhost +SI:localuser:root && script -q -c "xkeysnail --quiet --watch `echo $HOME`/.config/kinto/kinto.py" /dev/null | tee -a /tmp/kinto.log &
+            ### Create the lock file ###
+            touch /var/lock/subsys/kinto
+            success $"Kinto (xkeynsail) started"
+        else
+            echo "Kinto (xkeynsail) service is already running."
+        fi
+        
+        echo
+}
+
+# Restart the service
+stop() {
+        echo -n "Stopping Kinto (xkeynsail)" | logger
+        sudo pkill -f bin/xkeysnail >/dev/null 2>&1
+        ### Now, delete the lock file ###
+        rm -f /var/lock/subsys/kinto
+        echo
+}
+
+### main logic ###
+case "$1" in
+  start)
+        start
+        ;;
+  stop)
+        stop
+        ;;
+  status)
+        status
+        ;;
+  restart|reload|condrestart)
+        stop
+        sleep 5
+        start
+        ;;
+  *)
+        echo $"Usage: $0 {start|stop|restart|reload|status}"
+        exit 1
+esac
+
+exit 0
--- a/linux/kinto.py
+++ b/linux/kinto.py
@@ -7,17 +7,49 @@ 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","hyper"]
+terminals = [
+    "alacritty",
+    "deepin-terminal",
+    "eterm",
+    "gnome-terminal",
+    "guake",
+    "hyper",
+    "io.elementary.terminal",
+    "kinto-gui.py",
+    "kitty",
+    "konsole",
+    "lxterminal",
+    "mate-terminal",
+    "qterminal",
+    "st",
+    "sakura",
+    "station",
+    "terminator",
+    "termite",
+    "tilda",
+    "tilix",
+    "urxvt",
+    "xfce4-terminal",
+    "xterm",
+]
 terminals = [term.casefold() for term in terminals]
-termStr = "|".join(str(x) for x in terminals)
+termStr = "|".join(str('^'+x+'$') for x in terminals)

 mscodes = ["code","vscodium"]
-codeStr = "|".join(str(x) for x in mscodes)
+codeStr = "|".join(str('^'+x+'$') for x in mscodes)

 # Add remote desktop clients & VM software here
 # Ideally we'd only exclude the client window,
 # but that may not be easily done.
-remotes = ["org.remmina.Remmina"]
+remotes = [
+    "Gnome-boxes",
+    "org.remmina.Remmina",
+    "qemu-system-.*",
+    "Virt-manager",
+    "VirtualBox",
+    "VirtualBox Machine",
+    "xfreerdp",
+]
 remotes = [client.casefold() for client in remotes]

 # Add remote desktop clients & VMs for no remapping
@@ -25,17 +57,32 @@ terminals.extend(remotes)
 mscodes.extend(remotes)

 # Use for browser specific hotkeys
-browsers = ["Chromium","Chromium-browser","Google-chrome","microsoft-edge-dev","microsoft-edge","Epiphany","Firefox","Discord"]
+browsers = [
+    "Chromium",
+    "Chromium-browser",
+    "Discord",
+    "Epiphany",
+    "Firefox",
+    "Google-chrome",
+    "microsoft-edge",
+    "microsoft-edge-dev",
+]
 browsers = [browser.casefold() for browser in browsers]
-browserStr = "|".join(str(x) for x in browsers)
+browserStr = "|".join(str('^'+x+'$') for x in browsers)

-chromes = ["Chromium","Chromium-browser","Google-chrome","microsoft-edge-dev","microsoft-edge"]
+chromes = [
+    "Chromium",
+    "Chromium-browser",
+    "Google-chrome",
+    "microsoft-edge",
+    "microsoft-edge-dev",
+]
 chromes = [chrome.casefold() for chrome in chromes]
-chromeStr = "|".join(str(x) for x 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)
+# edgeStr = "|".join(str('^'+x+'$') for x in edges)

 define_multipurpose_modmap(
    # {Key.ENTER: [Key.ENTER, Key.RIGHT_CTRL]   # Enter2Cmd
@@ -44,6 +91,12 @@ define_multipurpose_modmap(
    {                                         # Placeholder
 })

+# Fix for avoiding modmapping when using Synergy keyboard/mouse sharing.
+# Synergy doesn't set a wm_class, so this may cause issues with other
+# applications that also don't set the wm_class.
+# Enable only if you use Synergy.
+# define_conditional_modmap(lambda wm_class: wm_class == '', {})
+
 # [Global modemap] Change modifier keys as in xmodmap
 define_conditional_modmap(lambda wm_class: wm_class.casefold() not in terminals,{

@@ -88,7 +141,7 @@ define_conditional_modmap(re.compile(termStr, re.IGNORECASE), {
    # 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)

@@ -170,8 +223,7 @@ define_keymap(re.compile("^jetbrains-(?!.*toolbox).*$", re.IGNORECASE),{
    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("C-l"): K("C-g"),                         # Go to line
    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
@@ -204,15 +256,143 @@ define_keymap(re.compile("^jetbrains-(?!.*toolbox).*$", re.IGNORECASE),{
    # VCS/Local History
    K("Super-v"): K("M-Grave"),                 # VCS quick popup
    K("Super-c"): K("LC-c"),                    # Sigints - interrupt
-})
+},"Jetbrains")

-# Keybindings for Nautilus
-define_keymap(re.compile("org.gnome.nautilus", re.IGNORECASE),{
-    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
-})
+##############################################
+### START OF FILE MANAGER GROUP OF KEYMAPS ###
+##############################################
+
+# Keybindings overrides for Caja
+# (overrides some bindings from general file manager code block below)
+define_keymap(re.compile("caja", re.IGNORECASE),{
+    # K("RC-Super-o"): K("RC-Shift-Enter"),       # Open in new tab
+    K("RC-Super-o"): K("RC-Shift-W"),           # Open in new window
+},"Overrides for Caja - Finder")
+
+# Keybindings overrides for DDE (Deepin) File Manager
+# (overrides some bindings from general file manager code block below)
+define_keymap(re.compile("dde-file-manager", re.IGNORECASE),{
+    K("RC-i"): K("RC-i"),                   # File properties dialog (Get Info)
+    K("RC-comma"): None,                    # Disable preferences shortcut (no shortcut available)
+    K("RC-Up"): K("RC-Up"),                 # Go Up dir
+},"Overrides for DDE File Manager - Finder")
+
+# Keybindings overrides for Dolphin
+# (overrides some bindings from general file manager code block below)
+define_keymap(re.compile("dolphin", re.IGNORECASE),{
+    ##########################################################################################
+    ### "Open in new window" requires manually setting custom shortcut of Ctrl+Shift+o
+    ### in Dolphin's keyboard shortcuts. There is no default shortcut set for this function.
+    ##########################################################################################
+    ### "Open in new tab" requires manually setting custom shortcut of Ctrl+Shift+o in
+    ### Dolphin's keyboard shortcuts. There is no default shortcut set for this function.
+    ##########################################################################################
+    K("RC-Super-o"): K("RC-Shift-o"),           # Open in new window (or new tab, user's choice, see above)
+    K("RC-Shift-N"): K("F10"),                  # Create new folder
+    K("RC-comma"): K("RC-Shift-comma"),         # Open preferences dialog
+},"Overrides for Dolphin - Finder")
+
+# Keybindings overrides for elementary OS Files
+# (overrides some bindings from general file manager code block below)
+define_keymap(re.compile("io.elementary.files", re.IGNORECASE),{
+    # K("RC-Super-o"): K("Shift-Enter"),          # Open folder in new tab
+    K("RC-Comma"): None,                        # Disable preferences shortcut since none available
+},"Overrides for Pantheon - Finder")
+
+# Keybindings overrides for Nautilus
+# (overrides some bindings from general file manager code block below)
+define_keymap(re.compile("org.gnome.nautilus|nautilus", re.IGNORECASE),{
+    K("RC-Super-o"): K("Shift-Enter"),          # Open in new window
+    # K("RC-Super-o"): K("RC-Enter"),             # Open in new tab
+    K("RC-comma"): K("RC-comma"),               # Overrides "Open preferences dialog" shortcut below
+},"Overrides for Nautilus - Finder")
+
+# Keybindings overrides for PCManFM and PCManFM-Qt
+# (overrides some bindings from general file manager code block below)
+define_keymap(re.compile("pcmanfm|pcmanfm-qt", re.IGNORECASE),{
+    K("RC-Backspace"): [K("Delete"),K("Enter")],    # Move to Trash (delete, bypass dialog)
+},"Overrides for PCManFM - Finder")
+
+# Keybindings overrides for SpaceFM
+# (overrides some bindings from general file manager code block below)
+define_keymap(re.compile("spacefm", re.IGNORECASE),{
+    K("RC-Shift-N"): [K("RC-F")],	                # Create new folder is Ctrl+F by default
+    K("RC-Backspace"): [K("Delete"),K("Enter")],	# Move to Trash (delete, bypass dialog)
+    K("RC-comma"): [K("M-V"),K("p")],               # Overrides "Open preferences dialog" shortcut below
+    # This shortcut ^^^^^^^^^^^^^^^ is not fully working in SpaceFM. Opens "View" menu but not Preferences.
+    # SpaceFM seems to be doing some nasty binding that blocks things like Alt+Tab while the menu is open.
+},"Overrides for SpaceFM - Finder")
+
+# Keybindings overrides for Thunar
+# (overrides some bindings from general file manager code block below)
+define_keymap(re.compile("thunar", re.IGNORECASE),{
+    K("RC-Super-o"): K("RC-Shift-P"),          # Open in new tab
+    K("RC-comma"): [K("M-E"),K("E")],          # Overrides "Open preferences dialog" shortcut below
+},"Overrides for Thunar - Finder")
+
+filemanagers = [
+    "caja",
+    "dde-file-manager",
+    "dolphin",
+    "io.elementary.files",
+    "nautilus",
+    "nemo",
+    "org.gnome.nautilus",
+    "pcmanfm",
+    "pcmanfm-qt",
+    "spacefm",
+    "thunar",
+]
+filemanagers = [filemanager.casefold() for filemanager in filemanagers]
+filemanagerStr = "|".join(str('^'+x+'$') for x in filemanagers)
+
+# Currently supported Linux file managers (file browsers):
+#
+# Caja File Browser (MATE file manager, fork of Nautilus)
+# DDE File Manager (Deepin Linux file manager)
+# Dolphin (KDE file manager)
+# Nautilus (GNOME file manager, may be named "Files")
+# Nemo (Cinnamon file manager, fork of Nautilus, may be named "Files")
+# Pantheon Files (elementary OS file manager, may be named "Files")
+# PCManFM (LXDE file manager)
+# PCManFM-Qt (LXQt file manager)
+# SpaceFM (Fork of PCManFM file manager)
+# Thunar File Manager (Xfce file manager)
+#
+# Keybindings for general Linux file managers group:
+define_keymap(re.compile(filemanagerStr, re.IGNORECASE),{
+    ###########################################################################################################
+    ###  Show Properties (Get Info) | Open Settings/Preferences | Show/Hide hidden files                    ###
+    ###########################################################################################################
+    K("RC-i"): K("M-Enter"),                # File properties dialog (Get Info)
+    K("RC-comma"): [K("M-E"),K("N")],       # Open preferences dialog
+    K("RC-Shift-dot"): K("RC-H"),           # Show/hide hidden files ("dot" files)
+    ###########################################################################################################
+    ###  Navigation                                                                                         ###
+    ###########################################################################################################
+    K("RC-Left"): K("M-Left"),              # Go Back
+    K("RC-Right"): K("M-Right"),            # Go Forward
+    K("RC-Up"): K("M-Up"),                  # Go Up dir
+    # K("RC-Down"): K("M-Down"),              # Go Down dir (only works on folders) [not universal]
+    # K("RC-Down"): K("RC-O"),                # Go Down dir (open folder/file) [not universal]
+    K("RC-Down"): K("Enter"),               # Go Down dir (open folder/file) [universal]
+    ###########################################################################################################
+    ###  Open in New Window | Move to Trash | Duplicate file/folder                                         ###
+    ###########################################################################################################
+    K("RC-Super-o"): K("RC-Shift-o"),       # Open in new window (or tab, depends on FM setup) [not universal]
+    K("RC-Backspace"): K("Delete"),	        # Move to Trash (delete)
+    K("RC-D"): [K("RC-C"),K("RC-V")],       # Mimic Finder's Duplicate command (Copy, then Paste)
+    ###########################################################################################################
+    ###  To enable renaming files with the Enter key, uncomment the two keymapping lines just below this.   ###
+    ###  Use Ctrl+Shift+Enter to escape or activate text fields such as "[F]ind" and "[L]ocation" fields.   ###
+    ###########################################################################################################
+    # K("Enter"): K("F2"),                    # Rename with Enter key
+    # K("RC-Shift-Enter"): K("Enter"),        # Remap alternative "Enter" key to easily activate/exit text fields
+},"File Managers - Finder")
+
+############################################
+### END OF FILE MANAGER GROUP OF KEYMAPS ###
+############################################

 # Keybindings for Browsers
 define_keymap(re.compile(browserStr, re.IGNORECASE),{
@@ -228,33 +408,46 @@ define_keymap(re.compile(browserStr, re.IGNORECASE),{
    K("RC-Key_7"): K("M-Key_7"),
    K("RC-Key_8"): K("M-Key_8"),
    K("RC-Key_9"): K("M-Key_9"),    # Jump to last tab
+    K("C-Left_Brace"): K("C-Page_Up"),
+    K("C-Right_Brace"): K("C-Page_Down"),
 })

 # Open preferences in browsers
 define_keymap(re.compile("Firefox", re.IGNORECASE),{
-    K("C-comma"): [K("C-T"),K("a"),K("b"),K("o"),K("u"),K("t"),K("Shift-SEMICOLON"),K("p"),K("r"),K("e"),K("f"),K("e"),K("r"),K("e"),K("n"),K("c"),K("e"),K("s"),K("Enter")],
+    K("C-comma"): [
+        K("C-T"),K("a"),K("b"),K("o"),K("u"),K("t"),
+        K("Shift-SEMICOLON"),K("p"),K("r"),K("e"),K("f"),
+        K("e"),K("r"),K("e"),K("n"),K("c"),K("e"),K("s"),K("Enter")
+    ],
 })
 define_keymap(re.compile(chromeStr, re.IGNORECASE),{
    K("C-comma"): [K("M-e"), K("s"),K("Enter")],
-})
+}, "Browsers")
 # Opera C-F12

+# Note: terminals extends to remotes as well
+define_keymap(lambda wm_class: wm_class.casefold() not in terminals,{
+    K("RC-Dot"): K("Esc"),                        # Mimic macOS Cmd+dot = Escape key (not in terminals)
+})
+
 # None referenced here originally
 # - but remote clients and VM software ought to be set here
 # These are the typical remaps for ALL GUI based apps
 define_keymap(lambda wm_class: wm_class.casefold() not in remotes,{
    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("RC-Super-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("M-Tab"): pass_through_key,                 # Default - Cmd Tab - App Switching Default
+    K("RC-Tab"): K("M-Tab"),                      # Default - Cmd Tab - App Switching Default
+    K("RC-Shift-Tab"): K("M-Shift-Tab"),          # Default - Cmd Tab - App Switching Default
    K("RC-Grave"): K("M-Grave"),                  # Default not-xfce4 - Cmd ` - Same App Switching
    K("RC-Shift-Grave"): K("M-Shift-Grave"),      # Default not-xfce4 - Cmd ` - Same App Switching
+    # K("RC-Grave"): K("Super-Tab"),                # xfce4 Switch within app group
+    # K("RC-Shift-Grave"): K("Super-Shift-Tab"),    # xfce4 Switch within app group
    # 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)
@@ -270,10 +463,6 @@ define_keymap(lambda wm_class: wm_class.casefold() not in remotes,{
    # 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
@@ -283,7 +472,7 @@ define_keymap(lambda wm_class: wm_class.casefold() not in remotes,{

    # Fn to Alt style remaps
    K("RM-Enter"): K("insert"),                   # Insert
-    
+
    # emacs style
    K("Super-a"): K("Home"),                      # Beginning of Line
    K("Super-e"): K("End"),                       # End of Line
@@ -294,7 +483,7 @@ define_keymap(lambda wm_class: wm_class.casefold() not in remotes,{
    K("Super-k"): [K("Shift-End"), K("Backspace")],
    K("Super-d"): K("Delete"),

-    # K("M-RC-Space"): K(""),                   # Open Finder - Placeholder
+    # K("M-RC-Space"): K(""),                       # Open Finder - Placeholder

    # Wordwise
    K("RC-Left"): K("Home"),                      # Beginning of Line
@@ -309,14 +498,16 @@ define_keymap(lambda wm_class: wm_class.casefold() not in remotes,{
    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("RM-Backspace"): K("Delete"),               # Chromebook/IBM - Delete
+    K("Super-Backspace"): K("C-Backspace"),       # Delete Left Word of Cursor
+    K("Super-Delete"): K("C-Delete"),             # Delete Right Word of Cursor
+    # K("LM-Backspace"): K("C-Backspace"),          # Chromebook/IBM - Delete Left Word of Cursor
+    K("M-Backspace"): K("C-Backspace"),           # Default not-chromebook
+    K("RC-Backspace"): K("C-Shift-Backspace"),    # Delete Entire Line Left of Cursor
+    K("Alt-Delete"): K("C-Delete"),               # Delete Right Word of Cursor
    # K(""): pass_through_key,                      # cancel
    # K(""): K(""),                                 #
-})
+}, "General GUI")

 define_keymap(lambda wm_class: wm_class.casefold() not in mscodes,{
    # Wordwise remaining - for Everything but VS Code
@@ -339,7 +530,7 @@ define_keymap(lambda wm_class: wm_class.casefold() not in mscodes,{
    #   https://superuser.com/questions/770301/pentadactyl-how-to-disable-menu-bar-toggle-by-alt
    # **
    #
-})
+}, "Wordwise - not vscode")

 # Keybindings for VS Code
 define_keymap(re.compile(codeStr, re.IGNORECASE),{
@@ -350,7 +541,7 @@ define_keymap(re.compile(codeStr, re.IGNORECASE),{
    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
@@ -368,8 +559,8 @@ define_keymap(re.compile(codeStr, re.IGNORECASE),{
    K("C-g"): K("f3"),                          # find_next
    K("Shift-f3"): pass_through_key,            # cancel find_prev
    K("C-Shift-g"): K("Shift-f3"),              # find_prev
-    # K("Super-c"): K("LC-c"),                    #  Default - Terminal - Sigint
-    # K("Super-x"): K("LC-x"),                    #  Default - Terminal - Exit nano
+    # K("Super-c"): K("LC-c"),                    # Default - Terminal - Sigint
+    # K("Super-x"): K("LC-x"),                    # Default - Terminal - Exit nano
    # K("M-c"): K("LC-c"),                        #  Chromebook/IBM - Terminal - Sigint
    # K("M-x"): K("LC-x"),                        #  Chromebook/IBM - Terminal - Exit nano
    # K("Super-C-g"): K("C-f2"),                  # Default - Sublime - find_all_under
@@ -382,8 +573,8 @@ define_keymap(re.compile(codeStr, re.IGNORECASE),{

 # Keybindings for Sublime Text
 define_keymap(re.compile("Sublime_text", re.IGNORECASE),{
-    # K("Super-c"): K("LC-c"),                    #  Default - Terminal - Sigint
-    # K("Super-x"): K("LC-x"),                    #  Default - Terminal - Exit nano
+    # K("Super-c"): K("LC-c"),                    # Default - Terminal - Sigint
+    # K("Super-x"): K("LC-x"),                    # Default - Terminal - Exit nano
    # K("M-c"): K("LC-c"),                        #  Chromebook/IBM - Terminal - Sigint
    # K("M-x"): K("LC-x"),                        #  Chromebook/IBM - Terminal - Exit nano
    K("Super-Space"): K("C-Space"),             # Basic code completion
@@ -467,11 +658,14 @@ define_keymap(re.compile("Io.elementary.terminal|kitty", re.IGNORECASE),{
 }, "Elementary Terminal tab switching")

 define_keymap(re.compile(termStr, re.IGNORECASE),{
+    K("LC-RC-f"): K("M-F10"),                       # Toggle window maximized state
+    # K("RC-Grave"): K("Super-Tab"),                # xfce4 Switch within app group
+    # K("RC-Shift-Grave"): K("Super-Shift-Tab"),    # xfce4 Switch within app group
    # 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-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)
@@ -481,16 +675,11 @@ define_keymap(re.compile(termStr, re.IGNORECASE),{
    K("LC-Tab") : K("LC-PAGE_DOWN"),
    K("LC-Shift-Tab") : K("LC-PAGE_UP"),
    K("LC-Grave") : K("LC-PAGE_UP"),
-    # 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
-    # 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
+    # K("M-Tab"): pass_through_key,                 # Default - Cmd Tab - App Switching Default
+    # K("RC-Tab"): K("M-Tab"),                      # Default - Cmd Tab - App Switching Default
+    # K("RC-Shift-Tab"): K("M-Shift-Tab"),          # Default - Cmd Tab - App Switching Default
    # Converts Cmd to use Ctrl-Shift
-    K("RC-V"): K("C-Shift-V"),
-    K("RC-MINUS"): K("C-Shift-MINUS"),
+    K("RC-MINUS"): K("C-MINUS"),
    K("RC-EQUAL"): K("C-Shift-EQUAL"),
    K("RC-BACKSPACE"): K("C-Shift-BACKSPACE"),
    K("RC-W"): K("C-Shift-W"),
@@ -516,7 +705,6 @@ define_keymap(re.compile(termStr, re.IGNORECASE),{
    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"),
@@ -525,7 +713,7 @@ define_keymap(re.compile(termStr, re.IGNORECASE),{
    K("RC-N"): K("C-Shift-N"),
    K("RC-M"): K("C-Shift-M"),
    K("RC-COMMA"): K("C-Shift-COMMA"),
-    K("RC-DOT"): K("C-Shift-DOT"),
+    K("RC-Dot"): K("LC-c"),
    K("RC-SLASH"): K("C-Shift-SLASH"),
    K("RC-KPASTERISK"): K("C-Shift-KPASTERISK"),
 }, "terminals")
--- a/linux/limitedadmins
+++ b/linux/limitedadmins
@@ -1,4 +1,7 @@
 # /etc/sudoers.d/limitedadmins
+Defaults    secure_path="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/X11/bin"
+Defaults!/etc/init.d/kinto setenv,env_reset,env_delete+=PATH,env_delete+=LD_PRELOAD,env_delete+=LD_LIBRARY_PATH,env_delete+=SSH_AUTH_SOCK,env_delete+=PYTHONPATH,env_delete+=PERL5LIB
+%{username} ALL=NOPASSWD: /etc/init.d/kinto *
 %{username} ALL=NOPASSWD: {systemctl} restart xkeysnail
 %{username} ALL=NOPASSWD: {systemctl} start xkeysnail
 %{username} ALL=NOPASSWD: {systemctl} stop xkeysnail
@@ -6,5 +9,6 @@
 %{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: {xkeysnail} *
 %{username} ALL=NOPASSWD: {systemctl} is-active --quiet xkeysnail
+%{username} ALL=NOPASSWD: /usr/lib/systemd/system/xkeysnail.service
--- a/linux/trayapps/appindicator/kintotray.py
+++ b/linux/trayapps/appindicator/kintotray.py
@@ -29,7 +29,15 @@ 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)
+    global sysv
+    try:
+        sysv = int(Popen("pidof systemd >/dev/null 2>&1 && echo '0' || echo '1'", stdout=PIPE, shell=True).communicate()[0].strip().decode('UTF-8'))
+    except:
+        sysv = 2
+    if sysv:
+        kinto_status = Popen("export TERM=xterm-color;while :; do clear; pgrep 'xkeysnail' && echo 'active'; sleep 2; done", stdout=PIPE, shell=True)
+    else:
+        kinto_status = Popen("export TERM=xterm-color;while :; do clear; systemctl is-active xkeysnail; sleep 2; done", stdout=PIPE, shell=True)
    child_pid = kinto_status.pid

    homedir = os.path.expanduser("~")
@@ -42,44 +50,52 @@ class Indicator():
    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')
+    checkbox_autostart = Gtk.CheckMenuItem(label='Autostart')
+    restart = Gtk.MenuItem(label='Restart')
+    stop = Gtk.MenuItem(label='Stop')
+    keyboards = Gtk.MenuItem(label='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 = Gtk.MenuItem(label='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')
+    tweaks = Gtk.MenuItem(label='Tweaks')
+    rightmod =  Gtk.CheckButton(label='AltGr on Right Cmd')
+    vsc2st3 = Gtk.CheckButton(label='ST3 hotkeys for VS Code')
+    caps2esc = Gtk.CheckButton(label='Capslock is Escape when tapped, Cmd when held')
+    caps2cmd = Gtk.CheckButton(label='Capslock is Cmd')
+    button_config = Gtk.MenuItem(label='Kinto Config (shortcuts)')
+    service = Gtk.MenuItem(label='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')
+    button_syskb = Gtk.MenuItem(label='System Shortcuts')
+    button_region = Gtk.MenuItem(label='Change Language')
+    systray = Gtk.CheckMenuItem(label='Tray Enabled')
+    helpm = Gtk.MenuItem(label='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')
+    debug = Gtk.MenuItem(label='Debug')
+    opengui = Gtk.MenuItem(label='Open Kinto')
+    support = Gtk.MenuItem(label='Support')
+    about = Gtk.MenuItem(label='About')
    global restartsvc
    restartsvc = False
    unixts = int(time.time())
-    last_status = ""
+    last_status = ''

    def __init__(self):
-        res = Popen(['sudo', 'systemctl','is-active','--quiet','xkeysnail'])
+        global sysv
+        try:
+            sysv = int(Popen("pidof systemd >/dev/null 2>&1 && echo '0' || echo '1'", stdout=PIPE, shell=True).communicate()[0].strip().decode('UTF-8'))
+        except:
+            sysv = 1
+        if sysv:
+            res = Popen(['pgrep','xkeysnail'])
+        else:
+            res = Popen(['sudo', 'systemctl','is-active','--quiet','xkeysnail'])
        res.wait()

        if res.returncode == 0:
@@ -183,7 +199,7 @@ class Indicator():
        # self.button_region.connect('activate',self.setRegion)
        # self.menu.append(self.button_region)

-        item_quit = Gtk.MenuItem('Close')
+        item_quit = Gtk.MenuItem(label='Close')
        item_quit.connect('activate', quit)
        self.menu.append(item_quit)
        self.menu.show_all()
@@ -401,10 +417,10 @@ class Indicator():
        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')
+        self.rightmod =  Gtk.CheckButton(label='AltGr on Right Cmd')
+        self.vsc2st3 = Gtk.CheckButton(label='ST3 hotkeys for VS Code')
+        self.caps2esc = Gtk.CheckButton(label='Capslock is Escape when tapped, Cmd when held')
+        self.caps2cmd = Gtk.CheckButton(label='Capslock is Cmd')
        
        if rightmod_result == 0:
            self.rightmod.set_active(True)
@@ -446,7 +462,10 @@ class Indicator():
        global restartsvc 
        if restartsvc == True:
            try:
-                restartcmd = ['sudo', 'systemctl','restart','xkeysnail']
+                if sysv:
+                    restartcmd = ['sudo', '-E','/etc/init.d/kinto','restart']
+                else:
+                    restartcmd = ['sudo', 'systemctl','restart','xkeysnail']
                Popen(restartcmd)
                restartsvc = False

@@ -555,8 +574,12 @@ class Indicator():
        return

    def runRestart(self,button):
+        global sysv
        try:
-            stop = Popen(['sudo', 'systemctl','stop','xkeysnail'])
+            if sysv:
+                stop = Popen(['sudo', '-E','/etc/init.d/kinto','stop'])
+            else:
+                stop = Popen(['sudo', 'systemctl','stop','xkeysnail'])
            stop.wait()
            time.sleep(1)
            res = Popen(['pgrep','xkeysnail'])
@@ -567,13 +590,20 @@ class Indicator():
                pkillxkey = Popen(['sudo', 'pkill','-f','bin/xkeysnail'])
                pkillxkey.wait()
            
-            Popen(['sudo', 'systemctl','start','xkeysnail'])
+            if sysv:
+                Popen(['sudo', '-E','/etc/init.d/kinto','start'])
+            else:
+                Popen(['sudo', 'systemctl','start','xkeysnail'])
        except:
            Popen(['notify-send','Kinto: Error restarting Kinto!'])

    def runStop(self,button):
+        global sysv
        try:
-            stop = Popen(['sudo', 'systemctl','stop','xkeysnail'])
+            if sysv:
+                stop = Popen(['sudo', '-E','/etc/init.d/kinto','stop'])
+            else:
+                stop = Popen(['sudo', 'systemctl','stop','xkeysnail'])
            stop.wait()
            time.sleep(1)
            res = Popen(['pgrep','xkeysnail'])
@@ -689,7 +719,10 @@ class Indicator():
            cmdsTerm = Popen(cmds)
            cmdsTerm.wait()

-            restart = ['sudo', 'systemctl','restart','xkeysnail']
+            if sysv:
+                restart = ['sudo', '-E','/etc/init.d/kinto','restart']
+            else:
+                restart = ['sudo', 'systemctl','restart','xkeysnail']
            Popen(restart)

        except CalledProcessError:
--- a/linux/xkeysnail.service
+++ b/linux/xkeysnail.service
@@ -4,8 +4,8 @@ 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'
+ExecStart={sudo}/bin/bash -c '/usr/bin/xhost +SI:localuser:root && {homedir}/.config/kinto/killdups.sh && {xkeysnail} --quiet --watch {homedir}/.config/kinto/kinto.py'
+ExecStop={sudo}/bin/bash -c '{sudo}pkill -f bin/xkeysnail && exit 0'
 Restart=on-failure
 RestartSec=3
 Environment=DISPLAY={displayid}
--- a/linux/xkeysnail_sysv.desktop
+++ b/linux/xkeysnail_sysv.desktop
@@ -0,0 +1,8 @@
+[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 && sudo -E /etc/init.d/kinto restart"
+Terminal=false
+Type=Application
+X-GNOME-Autostart-enabled=true
--- a/setup.py
+++ b/setup.py
@@ -29,15 +29,15 @@ def windows_setup():
 		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"')
+		os.system('copy /Y "' + path + '\\windows\\kinto.ahk" "' + homedir + '\\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')
+		os.system('C:\\Strawberry\\perl\\bin\\perl.exe -pi -e "s/(; )(.*)(; Default)(?!( - ST2CODE))(.*)/$2$3$5/gm" ' + homedir + '\\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')
+		os.system('C:\\Strawberry\\perl\\bin\\perl.exe -pi -e "s/(; )(.*)(; MacModifiers)/$2$3/gm" ' + homedir + '\\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')
+		os.system('C:\\Strawberry\\perl\\bin\\perl.exe -pi -e "s/(; )(.*)(; WinModifiers)/$2$3/gm" ' + homedir + '\\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)
@@ -52,32 +52,32 @@ def windows_setup():
 		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')
+		os.system('C:\\Strawberry\\perl\\bin\\perl.exe -pi -e "s/(; )(.*)(; Chromebook)/$2$3/gm" ' + homedir + '\\kinto-new.ahk')
+		os.system('C:\\Strawberry\\perl\\bin\\perl.exe -pi -e "s/(; )(.*)(; WinModifiers\/CB)/$2$3/gm" ' + homedir + '\\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')
-		os.system('C:\\Strawberry\\perl\\bin\\perl.exe -pi -e "s/(; )(.*)(; WinModifiers\/CB\/IBM)/$2$3/g" .\\windows\\kinto-new.ahk')
+		os.system('C:\\Strawberry\\perl\\bin\\perl.exe -pi -e "s/(; )(.*)(; CB\/IBM)/$2$3/gm" ' + homedir + '\\kinto-new.ahk')
+		os.system('C:\\Strawberry\\perl\\bin\\perl.exe -pi -e "s/(; )(.*)(; WinModifiers\/CB\/IBM)/$2$3/gm" ' + homedir + '\\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/(; )(.*)(; IBM)/$2$3/gm" ' + homedir + '\\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...")
+		print("\nWill now install Ubuntu Terminal 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')
+			os.system('C:\\Strawberry\\perl\\bin\\perl.exe -pi -e "s/(; )(.*)(; Default - ST2CODE)/$2$3/gm" ' + homedir + '\\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('C:\\Strawberry\\perl\\bin\\perl.exe -pi -e "s/(; )(.*)(; CB/IBM - ST2CODE)/$2$3/gm" ' + homedir + '\\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('C:\\Strawberry\\perl\\bin\\perl.exe -pi -e "s/{kbtype}/' + kbtype + '/gm" "%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('mklink "%userprofile%\\AppData\\Roaming\\Microsoft\\Windows\\STARTM~1\\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('copy /Y "'+ homedir + '\\kinto-new.ahk" "%userprofile%\\.kinto\\kinto.ahk"')
+		os.system("del /f " + homedir + "\\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"')
--- a/windows/kinto.ahk
+++ b/windows/kinto.ahk
@@ -131,6 +131,7 @@ Exit() {
 SetTitleMatchMode, 2

 GroupAdd, terminals, ahk_exe ubuntu.exe
+GroupAdd, terminals, ahk_exe ubuntu2004.exe
 GroupAdd, terminals, ahk_exe ConEmu.exe
 GroupAdd, terminals, ahk_exe ConEmu64.exe
 GroupAdd, terminals, ahk_exe powershell.exe
@@ -144,6 +145,7 @@ GroupAdd, terminals, Fluent Terminal ahk_class ApplicationFrameWindow
 GroupAdd, terminals, ahk_class Console_2_Main

 GroupAdd, posix, ahk_exe ubuntu.exe
+GroupAdd, posix, ahk_exe ubuntu2004.exe
 GroupAdd, posix, ahk_exe ConEmu.exe
 GroupAdd, posix, ahk_exe ConEmu64.exe
 GroupAdd, posix, ahk_exe Hyper.exe
@@ -170,8 +172,10 @@ GroupAdd, browsers, ahk_exe msedge.exe

 ; Disable Key Remapping for Virtual Machines
 ; Disable for Remote desktop solutions too
-GroupAdd, virtm, ahk_exe VirtualBoxVM.exe
-GroupAdd, virtm, ahk_exe mstsc.exe
+GroupAdd, remotes, ahk_exe VirtualBoxVM.exe
+GroupAdd, remotes, ahk_exe mstsc.exe
+GroupAdd, remotes, ahk_exe msrdc.exe
+GroupAdd, remotes, ahk_exe nxplayer.bin

 ; Disabled Edge for now - no ability to close all instances
 ; GroupAdd, browsers, Microsoft Edge ahk_class ApplicationFrameWindow
@@ -186,7 +190,19 @@ GroupAdd, intellij, ahk_exe idea64.exe

 ; SetCapsLockState, AlwaysOff ; CB/IBM

-#IfWinNotActive ahk_group virtm
+; Keyboards w/o media keys can use this Remap
+; This will replace unneeded dedicated keys
+; with most commonly used media keys
+;
+; Insert::SoundSet, +1, , mute  ; Toggles Speaker
+; +Insert::Insert               ; Shift Insert maps to Insert
+; Home::SoundSetWaveVolume, -10 ; Decrease volume
+; PgUp::SoundSetWaveVolume, +10 ; Increase volume
+; Delete::Send {Media_Prev}     ; Previous
+; End::Send {Media_Play_Pause}  ; Pause/Play
+; PgDn::Send {Media_Next}       ; Next
+
+#IfWinNotActive ahk_group remotes

    ; New AltTab and CtrlTab fix
    *tab:: 
@@ -411,6 +427,7 @@ GroupAdd, intellij, ahk_exe idea64.exe
    ; #If                                                      ; Chromebook

    #IfWinNotActive ahk_group terminals
+        ^.::Send {Esc}
        ; emacs style
        #n::Send {Down}
        #p::Send {Up}
@@ -565,7 +582,7 @@ GroupAdd, intellij, ahk_exe idea64.exe
        ; #x::Send ^{x}                                           ; Default - Terminal - Ctrl-x
        ; #c::Send ^{c}                                           ; Default - Terminal - Ctrl-c sigint
        ; !x::Send ^{x}                                           ; CB/IBM
-        ; !c::Send ^{c}                                           ; CB/IBM
+        ; !c::Send ^{c}                                           ; CB/IBM - Sigint
        ; #c::send ^{Pause}                                       ; cancel_build
        ; #Space::Send ^{Space}                                   ; Default - Basic code completion
        ; !Space::Send ^{Space}                                   ; CB/IBM - Basic code completion
@@ -588,9 +605,7 @@ GroupAdd, intellij, ahk_exe idea64.exe
        ^!Left::send ^{PgUp}                                    ; prev_view
        Insert::Return                                          ; cancel toggle_overwrite
        ^!O::send {Insert}                                      ; toggle_overwrite
-        ; $#c::Send {Ctrl down}c{Ctrl up}                         ; Default - Sigints interrupt
        ; !c::Return                                              ; Default - cancel toggle_case_sensitive
-        ; $!c::send ^{c}                                          ; CB/IBM - Sigint
        ^!c::send !{c}                                          ; toggle_case_sensitive
        ; ^h::Return                                              ; cancel replace
        ^!f::send ^{h}                                          ; replace
@@ -598,6 +613,7 @@ GroupAdd, intellij, ahk_exe idea64.exe
        ^!e::send ^+{h}                                         ; replace_next
        F3::Return                                              ; cancel find_next
        ^g::send {F3}                                           ; find_next
+        #g::send ^{g}                                           ; goto line - disable game bar - Start menu -> Game bar shortcuts -> toggle Off
        *F3::Return                                             ; cancel find_prev, find_under, find_all_under
        ^+g::send +{F3}                                         ; find_prev
        #!g::send ^{F3}                                         ; find_under
@@ -673,6 +689,7 @@ GroupAdd, intellij, ahk_exe idea64.exe
        ; Sigints - interrupt
        ; $#c::Send {Ctrl down}c{Ctrl up} ; Default
        ; $!c::Send {Ctrl down}c{Ctrl up} ; CB/IBM
+        $^.::Send {Ctrl down}c{Ctrl up}

        ; Windows Terminal
        ; Ctrl+Shift+C should do nothing
@@ -726,45 +743,45 @@ GroupAdd, intellij, ahk_exe idea64.exe
        ; 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}  ; 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
--- a/xkeysnail_service.sh
+++ b/xkeysnail_service.sh
@@ -3,11 +3,18 @@
 # set about:config?filter=ui.key.menuAccessKeyFocuses
 # to false for wordwise to work in Firefox

+function pause(){
+ read -s -n 1 -p "Press any key to continue . . ."
+ echo ""
+}
+
 typeset -l distro
 distro=$(awk -F= '$1=="NAME" { gsub("[\",!,_, ]","",$2);print $2 ;}' /etc/os-release)
 typeset -l dename
 dename=$(./linux/system-config/dename.sh | cut -d " " -f1)

+sysv=$(pidof systemd >/dev/null 2>&1 && echo "1" || echo "0")
+
 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."
@@ -38,7 +45,11 @@ function uninstall {
 			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
+			if test -f "/etc/mx-version";then
+				cp /etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml ~/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
+			else
+				cp /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml ~/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
+			fi
 		fi
 	elif [ "$yn" == "r" ]; then
 		echo "Restore original user shortcuts"
@@ -77,6 +88,12 @@ function uninstall {
 		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'
+	# Repetitive - xfce restore factory or backup does this
+	# Also needs to check if whiskermenu is even being used
+	# elif [[ $dename == "xfce" ]]; then
+	# 	echo -e "\nWill still be restoring the overlay key"
+	# 	echo -e "xfconf-query --channel xfce4-keyboard-shortcuts --property \"/commands/custom/Super_L\" --create --type string --set \"xfce4-popup-whiskermenu\""
+	# 	xfconf-query --channel xfce4-keyboard-shortcuts --property "/commands/custom/Super_L" --create --type string --set "xfce4-popup-whiskermenu"
 	fi
 }

@@ -189,6 +206,7 @@ if [[ $1 == "5" || $1 == "uninstall" || $1 == "Uninstall" ]]; then
 	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/init.d/kinto >/dev/null 2>&1
 	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
@@ -207,9 +225,29 @@ 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 kinto-gui.py >/dev/null 2>&1
+sudo pkill -f kintotray.py >/dev/null 2>&1
+ps aux | awk '/[s]h -c while/ {print $2}' | xargs -r -n1 sudo kill
 sudo pkill -f "is-active xkeysnail" >/dev/null 2>&1

-pip3 install pillow
+if [ "$distro" == "manjarolinux" ]; then
+	while true; do
+		read -rep $'\nHave you run \"sudo pacman -Syu\" before running Kinto setup? (y/n): ' updated	
+		case $updated in
+			[Yy]* ) mjupdated='yes'; break;;
+			[Nn]* ) mjupdated='no'; break;;
+			* ) echo -e "\nPlease answer [y]es or [n]o.";;
+		esac
+	done
+	if [[ "$mjupdated" == "no" ]]; then 
+		echo 
+		echo "================================================================================"
+		echo "==========  Please run a full system update before installing Kinto.  ==========" 
+		echo "================================================================================"
+		echo 
+		exit 0
+	fi
+fi

 # Add additional shortcuts if needed, does not modify existing ones

@@ -219,6 +257,34 @@ if [[ $dename == 'gnome' || $dename == 'budgie' ]];then
 		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
+elif [[ $dename == 'xfce' ]];then
+	launcher=$(cat ~/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml | grep 'name="Super_L"' | sed 's:.*="::')
+	# echo "${#launcher}"
+	if [[ "${#launcher}" -eq 0 ]]; then
+		xfconf-query --channel xfce4-keyboard-shortcuts --property "/commands/custom/Super_L" --create --type string --set "xfce4-popup-whiskermenu"
+		echo "Resetting Super_L, please wait..."
+		sleep 6
+		launcher=$(cat ~/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml | grep 'name="Super_L"' | sed 's:.*="::')
+		if [[ "${#launcher}" -gt 0 ]]; then
+			echo "Success."
+		else
+			echo "Failed. Skipping setup of Cmd-Space."
+		fi
+	fi
+	if [[ "${#launcher}" -gt 0 ]]; then
+		nlauncher=${launcher::-3}
+		# Replace Alt-F1 help file w/ whisker menu alternative hotkey
+		xfconf-query --channel xfce4-keyboard-shortcuts --property "/commands/custom/<Alt>F1" --reset
+		# Clear Alt-F3 App Finder for sublime text global replace
+		xfconf-query --channel xfce4-keyboard-shortcuts --property "/commands/custom/<Alt>F3" --reset
+		xfconf-query --channel xfce4-keyboard-shortcuts --property "/commands/custom/<Alt>F1" --create --type string --set "$nlauncher" && echo "$nlauncher has been set to Alt-F1 for Cmd-Space to work."
+		# Unset Super_L to avoid issues during setup, will re-apply at the end
+		xfconf-query --channel xfce4-keyboard-shortcuts --property "/commands/custom/Super_L" --reset
+		# xfconf-query --channel xfce4-keyboard-shortcuts --property "/commands/custom/<Super>grave" --create --type string --set "switch_window_key"
+
+	fi
+	# Unset Super-Tab, breaks Ctrl-Tab. switch_window_key
+	sed -i '/.*name=\"&lt;Super&gt;Tab.*$/d' ~/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
 fi

 # if ls /etc/apt/sources.list.d/system76* 1> /dev/null 2>&1; then
@@ -263,25 +329,6 @@ if [[ $distro == 'kdeneon' ]]; then
 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
@@ -326,17 +373,21 @@ expsh=" "
 # 	echo "Will need to install inotify-tools to restart key remapper live for config file changes..."
 # 	sudo ./linux/system-config/unipkg.sh inotify-tools
 # fi
+if ! [ -x "$(command -v git)" ]; then
+	echo "Will need to install git..."
+	sudo ./linux/system-config/unipkg.sh git
+fi
 if ! [ -x "$(command -v pip3)" ]; then
 	echo "Will need to install python3-pip..."
 	sudo ./linux/system-config/unipkg.sh python3-pip
 fi
 if ! [ -x "$(command -v python3-config)" ]; then
-	if [ "$distro" == "ubuntu" ] || [ "$distro" == "debian" ] || [ "$distro" == 'linuxmint' ]; then
+	if [ "$distro" == "ubuntu" ] || [ "${distro::6}" == "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
+	if [ "$distro" == "gnome" ] || [ "$distro" == "fedora" ] || [ "${distro::6}" == "debian" ] || [ "$distro" == 'linuxmint' ]; then
 		echo "Will need to install $pydev..."
 		sudo ./linux/system-config/unipkg.sh "$pydev"
 	fi
@@ -349,10 +400,14 @@ if ! [ -x "$(command -v xhost)" ] || ! [ -x "$(command -v gcc)" ]; then
 		sudo ./linux/system-config/unipkg.sh "xorg-xhost gcc"
 	fi
 fi
-if [ "$distro" == 'linuxmint' ]; then
+if [ "$distro" == 'linuxmint' ] ; then
 	pip3 install setuptools
+elif [ "${distro::6}" == "debian" ]; then
+	sudo pip3 install setuptools wheel
 fi

+pip3 install pillow
+
 # echo "Transferring files..."
 mkdir -p ~/.config/kinto

@@ -363,7 +418,11 @@ mkdir -p ~/.config/kinto

 # KDE startup - xhost fix
 mkdir -p ~/.config/autostart
-yes | cp -rf ./linux/xkeysnail.desktop ~/.config/kinto/xkeysnail.desktop
+if [ ! "$sysv" -eq 0 ];then
+	yes | cp -rf ./linux/xkeysnail.desktop ~/.config/kinto/xkeysnail.desktop
+else
+	yes | cp -rf ./linux/xkeysnail_sysv.desktop ~/.config/kinto/xkeysnail.desktop
+fi

 # yes | cp -rf ./linux/xkeystart.sh ~/.config/kinto/xkeystart.sh

@@ -377,9 +436,17 @@ yes | cp -rf ./linux/xkeysnail.desktop ~/.config/kinto/xkeysnail.desktop
 # logoff fix - not solid for every os. Prevents missed 1 character input on login
 # yes | sudo cp -rf linux/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
+if [ -d "./.git" ] 
+then
+	echo "$(git describe --tag --abbrev=0 | head -n 1)" "build" "$(git rev-parse --short HEAD)" > ~/.config/kinto/version
+elif [ -f "./dl_version" ]; then
+	cp ./dl_version  ~/.config/kinto/version
+else
+	# Not a typo - v is built in
+	echo "ersion Unknown"  > ~/.config/kinto/version
+fi
+
 yes | cp -rf ./linux/kinto.py ./linux/kinto.py.new
-yes | cp -rf ./linux/limitedadmins ./linux/limitedadmins.new
 yes | cp -rf ./linux/gui/ ~/.config/kinto/
 yes | cp -nrf ./linux/initkb ~/.config/kinto/initkb
 yes | cp -rf ./linux/killdups.sh ~/.config/kinto/killdups.sh
@@ -392,29 +459,36 @@ yes | cp -rf ./linux/trayapps/appindicator/icons/kinto-invert-16.svg ~/.config/k
 yes | cp -rf ./linux/trayapps/appindicator/icons/kinto-solid-16.svg ~/.config/kinto/kinto-solid.svg
 yes | cp -rf ./linux/trayapps/appindicator/icons/kinto.svg ~/.config/kinto/kinto.svg
 # yes | cp -rf ./linux/system-config/caret_status_xkey.sh ~/.config/kinto/caret_status_xkey.sh
-yes | cp -rf ./linux/xkeysnail.service ./linux/xkeysnail.service.new
-# yes | cp -rf ./linux/xkeysnail.timer ~/.config/systemd/user/xkeysnail.timer
-sed -i "s#{experimental-caret}#$exp#g" ./linux/xkeysnail.service.new
-if [ "$expsh" != " " ];then
-	sed -i "s#{kill-caret}#/usr/bin/pkill -f $expsh#g" ./linux/xkeysnail.service.new
+
+yes | cp -rf ./linux/limitedadmins ./linux/limitedadmins.new
+sed -i "s/{username}/`whoami`/g" ./linux/limitedadmins.new
+sed -i "s#{systemctl}#`\\which systemctl`#g" ./linux/limitedadmins.new
+sed -i "s#{pkill}#`\\which pkill`#g" ./linux/limitedadmins.new
+if [ ! "$sysv" -eq 0 ];then
+	echo "Using systemd..."
+	yes | cp -rf ./linux/xkeysnail.service ./linux/xkeysnail.service.new
+	# yes | cp -rf ./linux/xkeysnail.timer ~/.config/systemd/user/xkeysnail.timer
+	sed -i "s#{experimental-caret}#$exp#g" ./linux/xkeysnail.service.new
+	if [ "$expsh" != " " ];then
+		sed -i "s#{kill-caret}#/usr/bin/pkill -f $expsh#g" ./linux/xkeysnail.service.new
+	else
+		sed -i "s#{kill-caret}#$expsh#g" ./linux/xkeysnail.service.new
+	fi
+	sed -i "s/{username}/`whoami`/g" ./linux/xkeysnail.service.new
+	sed -i "s#{homedir}#`echo "$HOME"`#g" ./linux/xkeysnail.service.new
+	sed -i "s#{xhost}#`\\which xhost`#g" ./linux/xkeysnail.service.new
+	sed -i "s/{displayid}/`echo "$DISPLAY"`/g" ./linux/xkeysnail.service.new
 else
-	sed -i "s#{kill-caret}#$expsh#g" ./linux/xkeysnail.service.new
+	echo "Using sysvinit..."
 fi
-sed -i "s/{username}/`whoami`/g" ./linux/xkeysnail.service.new
-sed -i "s#{homedir}#`echo "$HOME"`#g" ./linux/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" ./linux/gui/kinto.desktop.new
 sudo mv ./linux/gui/kinto.desktop.new /usr/share/applications/kinto.desktop
-sed -i "s#{xhost}#`\\which xhost`#g" ./linux/xkeysnail.service.new
-sed -i "s/{username}/`whoami`/g" ./linux/limitedadmins.new
-sed -i "s#{systemctl}#`\\which systemctl`#g" ./linux/limitedadmins.new
-sed -i "s#{pkill}#`\\which pkill`#g" ./linux/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" ./linux/xkeysnail.service.new
 # sed -i "s/{displayid}/`echo "$DISPLAY"`/g" ~/.config/kinto/prexk.sh

 if [[ $dename == "budgie" ]]; then
@@ -427,6 +501,11 @@ fi

 if [[ $distro == "fedora" ]]; then
 	perl -pi -e "\s{4}(# )(K.*)(# SL - .*fedora.*)/    \$2\$3/g" ./linux/kinto.py.new >/dev/null 2>&1
+	sed -i "s#{sudo}##g" ./linux/xkeysnail.service.new
+	selinuxuser=system_u
+	selinuxtype=systemd_unit_file_t
+else
+	sed -i "s#{sudo}#`\\which sudo` #g" ./linux/xkeysnail.service.new
 fi

 if [[ $distro == "elementaryos" ]]; then
@@ -459,9 +538,16 @@ if [[ $dename == "xfce" ]] && ls /etc/apt/sources.list.d/enso* 1> /dev/null 2>&1
 fi

 if ! [[ $1 == "5" || $1 == "uninstall" || $1 == "Uninstall" ]]; then
+
 	mv ./linux/kinto.py.new ~/.config/kinto/kinto.py
 	# if [ "$distro" == "fedora" ];then
-	sudo rm /etc/systemd/system/xkeysnail.service >/dev/null 2>&1
+	if [ ! "$sysv" -eq 0 ];then
+		# echo "Using systemd..."
+		sudo rm /etc/systemd/system/xkeysnail.service >/dev/null 2>&1
+	else
+		# echo "Using sysvinit..."
+		echo ""
+	fi
 	if [ -d /usr/lib/systemd/system ];then
 		xkeypath="/usr/lib/systemd/system/"
 	elif [ -d /lib/systemd/system ];then
@@ -489,19 +575,42 @@ if ! [[ $1 == "5" || $1 == "uninstall" || $1 == "Uninstall" ]]; then
 		echo -e "Run 'sudo pip3 install --upgrade .' to debug issue"
 		exit 0
 	fi
-	sed -i "s#{xkeysnail}#`which xkeysnail`#g" ./linux/xkeysnail.service.new
 	sed -i "s#{xkeysnail}#`which xkeysnail`#g" ./linux/limitedadmins.new
-	sudo mv ./linux/xkeysnail.service.new "$xkeypath"xkeysnail.service && echo "Service file added to "$xkeypath"xkeysnail.service"
+	if [[ $distro == "fedora" ]]; then
+		echo "Changing SELinux context"
+		sudo chcon -v --user=$selinuxuser --type=$selinuxtype "$xkeypath"xkeysnail.service
+	fi
 	sudo chown root:root ./linux/limitedadmins.new
 	# Add a check here for xkeysnail path resolving
 	sudo mv ./linux/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
+	if [ ! "$sysv" -eq 0 ];then
+		# echo "Using systemd..."
+		sed -i "s#{xkeysnail}#`which xkeysnail`#g" ./linux/xkeysnail.service.new
+		sudo mv ./linux/xkeysnail.service.new "$xkeypath"xkeysnail.service && echo "Service file added to "$xkeypath"xkeysnail.service"
+
+		if [[ $distro == "fedora" ]]; then
+			sudo cp "$xkeypath"xkeysnail.service /etc/systemd/system/xkeysnail.service && echo "Copied service file to system..." || echo "Failed to create copy..."
+			sudo cp "$xkeypath"xkeysnail.service /etc/systemd/system/graphical.target.wants/xkeysnail.service && echo "Copied service file to system for graphical target..." || echo "Failed to create copy for graphical target..."
+			sudo chown -R root:root /etc/systemd/system/xkeysnail.service && echo "Ownership set for root..." || echo "Failed to set ownership..."
+			sudo chown -R root:root /etc/systemd/system/graphical.target.wants/xkeysnail.service && echo "Ownership set for root..." || echo "Failed to set ownership..."
+			sudo chmod 644 /etc/systemd/system/xkeysnail.service && echo "Permissions set to 644..." || echo "Failed to set permissions..."
+			sudo chmod 644 /etc/systemd/system/graphical.target.wants/xkeysnail.service && echo "Permissions set to 644..." || echo "Failed to set permissions..."
+		else
+			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..."
+		fi
+		sudo systemctl daemon-reload
+		sudo systemctl disable xkeysnail
+		sudo systemctl stop xkeysnail
+	else
+		# echo "Using sysvinit..."
+		echo ""
+		sudo cp ./linux/kinto-service.sh /etc/init.d/kinto
+		sudo -E /etc/init.d/kinto stop
+		mv /tmp/kinto.log /tmp/kinto.log.bak
+	fi
 	# sudo systemctl --state=not-found --all | grep xkeysnail
 	# if [ "$distro" == "fedora" ];then
 	# 	systemctl enable xkeysnail.service
@@ -509,8 +618,9 @@ if ! [[ $1 == "5" || $1 == "uninstall" || $1 == "Uninstall" ]]; then
 	# 	sudo systemctl enable xkeysnail.service
 	# fi
 	# sudo systemctl restart xkeysnail
-	sudo pkill -f kintotray >/dev/null 2>&1
-	if [[ $dename == "gnome" || $dename == "kde" ]];then
+	sudo pkill -f kintotray &
+	# >/dev/null 2>&1
+	if [[ $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 &
@@ -541,6 +651,24 @@ if ! [[ $1 == "5" || $1 == "uninstall" || $1 == "Uninstall" ]]; then
 	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"

+	# echo -e "\033[0;91mAfter the installer completes press Any key to re-apply your overlay (Super key) menu launcher.\e[0m\n"
+
+	# if [[ $dename == 'gnome' || $dename == 'budgie' ]];then
+	# 	echo "GNOME: gsettings set org.gnome.mutter overlay-key 'super'"
+	# elif [[ $dename == 'xfce' ]];then
+	# 	echo "XFCE: xfconf-query --channel xfce4-keyboard-shortcuts --property \"/commands/custom/Super_L\" --create --type string --set \"$nlauncher\""
+	# fi
+
+	# read -n 1 -s -r -p ""
+
+	# if [[ $dename == 'gnome' || $dename == 'budgie' ]];then
+	# 	gsettings set org.gnome.mutter overlay-key 'super'
+	# elif [[ $dename == 'xfce' ]];then
+	# 	echo -e "\nSetting xfce4 launcher $nlauncher back to Super_L."
+	# 	xfconf-query --channel xfce4-keyboard-shortcuts --property "/commands/custom/Super_L" --create --type string --set "$nlauncher" && echo "Success."
+	# fi
+	
+
 	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"
Author	SHA1	Message	Date
Ben Reaves	9a52bd864a	Merge pull request #542 from rbreaves/make_intall_on_fedora_work_in_enforcing_mode Make intall on fedora work in enforcing mode	2021-07-04 00:22:27 -05:00
Ben Reaves	9b87fda382	Merge branch 'master' into make_intall_on_fedora_work_in_enforcing_mode	2021-07-04 00:10:05 -05:00
Ben Reaves	e54dba20a1	Merge pull request #540 from rbreaves/chrome-fix Fix for toggling between Chrome/IBM/Windows/Mac on Windows	2021-06-30 00:58:58 -05:00
Ben Reaves	56cae8a009	Fixed chrome/IBM setup issues on Windows	2021-06-30 00:54:20 -05:00
Ben Reaves	e7dd3684c2	Fixed syntax issue and regex formulas for chrome/ibm on Windows	2021-06-29 20:38:12 -05:00
Ben Reaves	982cdcb92a	Fixes Chrome/IBM layout issue on Windows	2021-06-29 20:23:45 -05:00
Ben Reaves	829289ba78	Merge branch 'hotfix'	2021-06-29 00:27:54 -05:00
Ben Reaves	b8793cff49	Added missing Go to shortcut for Sublime & VSCode for Windows	2021-06-29 00:26:28 -05:00
Ben Reaves	8b522461a5	Update README.md	2021-06-27 23:57:44 -05:00
Ben Reaves	04bc3f60e4	Merge branch 'hotfix'	2021-06-05 02:37:51 -05:00
Ben Reaves	8ffd3159c8	Allowing system tray to be enabled on Gnome by default	2021-06-05 02:37:34 -05:00
Ben Reaves	b19b0bea4b	Merge pull request #527 from RedBearAK/patch-28 Make window maximize toggle shortcut work in terminals too	2021-06-03 22:45:49 -05:00
RedBearAK	07bee26ddb	Make window maximize toggle shortcut work in terminals too No Super key in terminals, so "maximize" toggle shortcut from GUI block needs to be modified for the terminals block.	2021-06-03 19:36:13 -08:00
Ben Reaves	6dc97a5628	Merge pull request #526 from RedBearAK/patch-27 Fix zoom in/out (font size) shortcuts in terminals	2021-06-03 22:01:42 -05:00
RedBearAK	59e47dbbd6	Fix zoom in/out (font size) shortcuts in terminals On macOS the terminal, like a web browser, lets you "zoom" in and out with Cmd+Equal and Cmd+Minus. It doesn't force you to type Cmd+Shift+Equal to get to the "Plus" keycode on the Equal key. On Linux of course, terminals want you to use Ctrl+Shift+Equal (Plus) to zoom in (increase font size) and then Ctrl+Minus without the Shift key to decrease the font size (zoom out). This is very awkward. Mapping RC-Minus to C-Minus in the termStr block instead of to C-Shift-Minus lets the user zoom in and out in terminals by just pressing the equivalent of Cmd-(Equal/Minus) keys, without ever worrying about the Shift key. Same as terminals in macOS, and GUI web browsers. Since this is probably just one of the keys that was blanket remapped from RC to C-Shift, I don't know of any reason this should be harmful.	2021-06-03 17:42:30 -08:00
Ben Reaves	e6d0512ff4	Update README.md	2021-06-02 18:54:28 -05:00
Ben Reaves	6587a149ce	Merge branch 'hotfix'	2021-06-01 21:03:20 -05:00
Ben Reaves	f80a1d616d	Reconfigured media keys for Windows w/o mapping over the delete key	2021-06-01 21:02:56 -05:00
Ben Reaves	c391b6abf8	Update README.md	2021-06-01 16:05:24 -05:00
Ben Reaves	f6d57eae4c	Update README.md	2021-06-01 16:04:33 -05:00
Ben Reaves	06531dd6cc	Update README.md	2021-05-31 12:53:23 -05:00
Ben Reaves	4c2a4993ef	Merge branch 'hotfix'	2021-05-28 10:54:42 -05:00
Ben Reaves	572739360e	Added NoMachine for Windows => Linux	2021-05-28 10:53:54 -05:00
Ben Reaves	d87802918d	Merge pull request #521 from rbreaves/hotfix Added TERM env fix to remove garbage in syslog. Closes #515	2021-05-27 19:07:12 -05:00
Ben Reaves	e5b2ef8155	Added TERM env fix to remove garbage in syslog. Closes #515	2021-05-27 18:59:36 -05:00
Ben Reaves	7149b4ab24	Merge pull request #519 from rbreaves/hotfix Closes #518, regex now matches whole wm_class names only & Commented media keys for Windows	2021-05-24 21:01:09 -05:00
Ben Reaves	db61f2d937	Closes #518 . Joining wm_class names into regex updated to be whole matches only	2021-05-24 20:59:06 -05:00
Ben Reaves	19aefd68e0	Added commented out media keys for Windows	2021-05-24 18:57:13 -05:00
Ben Reaves	9fb72c95b1	Renamed virtm group to remotes, added msrdc	2021-05-18 17:27:46 -05:00
Ben Reaves	ec8b0fdc22	Merge pull request #514 from RedBearAK/patch-26 Add qemu-system- WM_CLASS variants to remotes list	2021-05-13 09:35:38 -05:00
RedBearAK	1e98cfc29d	Add qemu-system- WM_CLASS variants to remotes list Adding a regex for variants of `qemu-system-.*` to remotes list to bypass Kinto mapping. This is working for me. Variants I've seen on my system: `qemu-system-i386` `qemu-system-x86_64` A snap package called Sosumi operates as a QEMU/KVM front end, and caused a problem because it wanted to see Control_L+Alt_L+G to let go of mouse and keyboard. This solves that problem.	2021-05-13 00:08:34 -08:00
Ben Reaves	e92bc37308	Merge pull request #513 from RedBearAK/patch-26 Add Virt-manager to remotes WM_CLASS list, alphabetize list	2021-05-12 19:57:01 -05:00
RedBearAK	14021fbf67	Add Virt-manager to remotes WM_CLASS list, alphabetize list Just adding "Virt-manager" WM_CLASS and re-ordering `remotes` alphabetically to conform to other lists.	2021-05-12 16:26:06 -08:00
Ben Reaves	1562096889	Merge pull request #510 from RedBearAK/patch-25 Add Station terminal WM_CLASS to terminals list	2021-05-11 15:23:29 -05:00
RedBearAK	c84d13118a	Add Station terminal WM_CLASS to terminals list Nitrux Linux default terminal is called Station, with WM_CLASS name "station".	2021-05-11 12:14:57 -08:00
Ben Reaves	bec547bbda	Merge pull request #509 from rakin406/add-rakin-fork Add more terminal emulators	2021-05-11 13:28:13 -05:00
rakin406	724006ef3a	Add more terminal emulators	2021-05-11 20:02:17 +06:00
Ben Reaves	ef60bf8a59	Fixed broken system tray for linux 1.2-9	2021-05-07 10:46:13 -05:00
Ben Reaves	44080c25da	Update README.md	2021-05-05 21:26:45 -05:00
Ben Reaves	6fa6d05123	Update README.md	2021-05-05 21:24:08 -05:00
Ben Reaves	1d1971f7cc	Merge pull request #498 from rbreaves/dev Add support for sysvinit & mxlinux w/ xfce	2021-05-05 21:16:29 -05:00
Ben Reaves	eb113125b5	Corrected the killing of xkeysnail under sysvinit	2021-05-05 21:11:30 -05:00
Ben Reaves	c298bd2b5a	Fixes Cmd-Grave for In-App switching	2021-05-05 06:55:42 -05:00
Ben Reaves	e1f1907e46	Reverted adding back of Super for now, fixed Ctrl-Tab for xfce4	2021-05-05 06:17:06 -05:00
Ben Reaves	5d1b1d6598	XFCE super key install conflict resolved. Improved launcher detection/remapping.	2021-05-05 05:30:59 -05:00
Ben Reaves	7375dd78bf	Updated hotkeys for xfce4	2021-05-05 01:43:06 -05:00
Ben Reaves	e4540afcb5	Update README.md	2021-05-05 00:30:40 -05:00
Ben Reaves	2490417b85	Updated linux.sh install file to accept use wget or curl	2021-05-05 00:22:00 -05:00
Ben Reaves	9a3521d05c	Added missing sysvinit file copy	2021-05-04 23:58:09 -05:00
Ben Reaves	32fba15d75	Aligning systray w/ GUI app for sysv detection	2021-05-04 18:19:46 -05:00
Ben Reaves	23e2f7018b	Merge pull request #495 from rbreaves/feature/mxlinux Adding support for sysvinit & mxlinux w/ xfce	2021-05-04 18:07:43 -05:00
Ben Reaves	eeb5cc9ecb	Quieted most warnings & updated gtk methods	2021-05-04 17:17:26 -05:00
Ben Reaves	4a65034713	Adding support for sysvinit for mxlinux w/ xfce	2021-05-04 16:10:03 -05:00
Ben Reaves	3418e6bf3f	Update README.md	2021-05-02 16:59:11 -05:00
Ben Reaves	dbd614783f	Update README.md	2021-05-02 05:09:38 -05:00
Ben Reaves	cf15be6414	Merge pull request #479 from RedBearAK/patch-17 Add GNOME Boxes WM_CLASS for Linux, and a comma	2021-04-13 18:28:35 -05:00
RedBearAK	87dae12d9b	Add GNOME Boxes WM_CLASS for Linux, and a comma Note: I'm trying to consistently leave a comma after the last item in each vertically formatted python list, so that when someone with less python knowledge wants to add something to the list and does it the "lazy way" by just copying the last line, pasting it on the end and editing it to add a new item, they won't cause the "missing comma" python error too easily. Having a comma on the very end of the list with no element after it doesn't seem to cause any harm or python errors. And you can copy/paste the last item as many times as you want without getting into trouble.	2021-04-12 23:40:36 -08:00
Ben Reaves	3b5c35f806	Merge pull request #476 from rbreaves/feature/virtualbox Added Virtualbox host exception for Linux	2021-04-10 02:14:24 -05:00
Ben Reaves	cf72e880d5	Added Virtualbox host exception for Linux	2021-04-10 02:13:23 -05:00
Ben Reaves	0bcdb8c9b2	Merge pull request #471 from rbreaves/feature/KI-469-File-Managers-Followup Feature/ki 469 file managers followup	2021-04-07 03:07:13 -05:00
Ben Reaves	e71fa554d3	KI-469 Aligned comments	2021-04-07 03:06:18 -05:00
RedBearAK	2ff2b4c082	Tabs to spaces	2021-04-06 23:31:35 -08:00
RedBearAK	2b83e34c3f	Fix comment alignment (two more spaces if line is disabled)	2021-04-06 23:23:16 -08:00
RedBearAK	9af4d29bbf	Add PCManFM-Qt to PCManFM override, Fix typos, clarify Dolphin Just doing some sweeping up and prettifying. Main thing is adding the PCManFM fork, PCManFM-Qt to the overrides block for PCManFM. Working on the Nautilus variant reminded me.	2021-04-06 21:59:59 -08:00
Ben Reaves	c3337b5682	Merge pull request #468 from rbreaves/feature/KI-463-File-Managers Feature/ki 463 file managers	2021-04-06 22:36:12 -05:00
Ben Reaves	045598bcd5	Merge pull request #467 from RedBearAK/patch-17 Add LXTerminal (LXDE terminal emulator)	2021-04-06 21:51:47 -05:00
RedBearAK	32806c956d	Add LXTerminal (LXDE terminal emulator) Tested working.	2021-04-06 18:38:47 -08:00
Ben Reaves	046c800295	Merge pull request #466 from OlegSmelov/intellij-keymap-line-recent Fix go to line, recent files popup IntelliJ shortcuts	2021-04-06 18:57:14 -05:00
Oleg Smelov	0cbbc94b2d	Fix go to line, recent files popup IntelliJ shortcuts	2021-04-06 23:42:08 +03:00
RedBearAK	4d9d073997	Zorin OS uses "nautilus" instead of "org.gnome.nautilus". Zorin OS uses Nautilus as default file manager, but its WM_CLASS is shortened to "nautilus" instead of the original "org.gnome.nautilus". So we have to add that to the list (and also to the overrides for Nautilus).	2021-04-05 20:40:03 -08:00
RedBearAK	f0412438b4	Finder mods for Linux file managers (v2021-04-05) 2021-04-05 updated version of Finder mods, supporting common Linux file managers: ``` # # Caja File Browser (MATE file manager, fork of Nautilus) # DDE File Manager (Deepin Linux file manager) # Dolphin (KDE file manager) # Nautilus (GNOME file manager, may be named "Files") # Nemo (Cinnamon file manager, fork of Nautilus, may be named "Files") # Pantheon Files (elementary OS file manager, may be named "Files") # PCManFM (LXDE file manager) # PCManFM-Qt (LXQt file manager) # SpaceFM (Fork of PCManFM file manager) # Thunar File Manager (Xfce file manager) # ``` This adds support for the Deepin Linux default file manager, and some rearranging/code clarification improvements on the previous iteration. Closing PR #450 in favor of this update.	2021-04-05 16:02:32 -08:00
Ben Reaves	44d8be7822	Update README.md	2021-04-05 14:23:35 -05:00
Ben Reaves	6bc73c1c23	Merge pull request #462 from RedBearAK/patch-16 Add deepin-terminal WM_CLASS to terminals	2021-04-05 09:43:46 -05:00
RedBearAK	2d3dc5016d	Add deepin-terminal WM_CLASS to terminals	2021-04-05 02:29:24 -08:00
Ben Reaves	5864765ed1	Updated readme with uninstall for new install method	2021-04-04 14:31:09 -05:00
Ben Reaves	022dedb1dd	Merge pull request #458 from rbreaves/feature/manjaro-update Feature/manjaro update	2021-04-03 21:29:35 -05:00
Ben Reaves	3e3c27cde3	Merge branch 'master' into feature/manjaro-update	2021-04-03 21:27:19 -05:00
Ben Reaves	93b7fe8d49	Update README.md	2021-04-03 17:59:15 -05:00
Ben Reaves	68c3d23bfe	Merge branch 'feature/setup'	2021-04-03 17:41:26 -05:00
Ben Reaves	8fe1bc7772	Added quick Windows installer	2021-04-03 17:40:31 -05:00
Ben Reaves	d640ebfce7	Update README.md	2021-04-03 17:32:13 -05:00
Ben Reaves	1ae096daf5	Merge branch 'hotfix'	2021-04-03 03:36:57 -05:00
Ben Reaves	46354a971c	Added git dependency install	2021-04-03 03:36:22 -05:00
Ben Reaves	af6f56d2dc	Merge branch 'hotfix'	2021-04-03 02:26:02 -05:00
Ben Reaves	fbc630f1d5	Updated quick install to pull in release & build correctly	2021-04-03 02:25:30 -05:00
Ben Reaves	e1e9b08442	Update README.md	2021-04-03 01:15:00 -05:00
Ben Reaves	b0ba86623b	Moved pillow dependency to install after pip3 is installed	2021-04-03 01:09:56 -05:00
Ben Reaves	a798b736b6	Merge pull request #456 from rbreaves/feature/setup Quick setup script added for Linux	2021-04-03 00:58:25 -05:00
Ben Reaves	3dc68314f9	Quick setup script added for Linux	2021-04-03 00:56:42 -05:00
RedBearAK	5c40258265	Ask user to verify if Manjaro is updated Install will fail (GUI window will not appear) on Manjaro unless system is fully updated first. This patch asks users to verify that they've run "sudo pacman -Syu" before attempting install. Failure is possibly related to the GLIB error mentioned later in the install script. Not certain. But a full update always got Manjaro to finally show the GUI installer window.	2021-04-01 11:03:57 -08:00
Ben Reaves	1529d90918	Fixed breaking some system OS shortcuts w/ Cmd-Dot update on Linux	2021-04-01 01:01:44 -05:00
Ben Reaves	56493b4eec	Merge pull request #441 from RedBearAK/patch-7 Reformat WM_CLASS lists as vertically stacked for easier reading/editing	2021-04-01 00:21:34 -05:00
Ben Reaves	974cd13fae	Merge pull request #448 from rbreaves/feature/cmd-dot-sigint Adds Cmd-Dot sigint to Terminals	2021-04-01 00:18:26 -05:00
Ben Reaves	d8ad4b874f	Added Cmd-Dot for Windows	2021-04-01 00:17:02 -05:00
Ben Reaves	b532a9891d	Updated remotes and terminals groupings for Linux. Adds Cmd-Dot sigint from #442	2021-03-31 23:43:14 -05:00
Ben Reaves	294ba3b89f	Merge pull request #443 from RedBearAK/patch-9 Remove duplicate line for mapping Ctrl+V in terminals	2021-03-31 22:22:54 -05:00
Ben Reaves	c908b00a38	Update README.md	2021-03-30 22:33:41 -05:00
Ben Reaves	56f4f679e4	Update README.md	2021-03-30 21:17:23 -05:00
Johannes von Bargen	5e28015a31	remove extra space	2021-03-31 01:22:58 +02:00
Johannes von Bargen	3a59edb51e	make the installation run on fedora * in enforcing mode * without sudo in the unit file	2021-03-31 01:16:57 +02:00
RedBearAK	ba46c4ff97	Remove duplicate line for mapping Ctrl+V in terminals	2021-03-29 00:35:45 -08:00
RedBearAK	980ae6a237	Mapping Cmd+Dot to Ctrl+C (terminals) and Escape (GUIs)	2021-03-29 00:32:39 -08:00
RedBearAK	1a57dd9a5e	Reformat python lists as vertically stacked for easier reading/editing	2021-03-28 19:31:37 -08:00
Ben Reaves	c9810838a1	Merge pull request #440 from mamercad/browser-prev-next-tab Add shortcuts for browser prev and next tab switching	2021-03-28 20:57:49 -05:00
Mark Mercado	e60f7cffea	Add shortcuts for browser prev and next tab switching	2021-03-28 21:46:45 -04:00
Ben Reaves	c8b169b6a0	Update README.md	2021-03-21 00:34:29 -05:00
Ben Reaves	81c0c52902	Merge pull request #428 from RedBearAK/patch-4 Fix typo	2021-03-18 02:22:59 -07:00
RedBearAK	4d697d9cdc	Fix typo Fixed typo in output, line 65	2021-03-17 19:38:57 -08:00
Ben Reaves	307c9bc2d1	Update README.md	2021-03-16 21:58:00 -05:00
Ben Reaves	7436825c93	Update README.md	2021-03-16 21:57:31 -05:00
Ben Reaves	d680a58d04	Merge pull request #426 from jfsso/fix-win-start-path Fix start script symlink path on Windows install	2021-03-14 10:58:15 -05:00
João Orui	71af27be24	Fix start script symlink path on Windows install Fixes #256	2021-03-14 17:29:40 +09:00
Ben Reaves	2ce4bbdb82	Merge pull request #422 from RedBearAK/patch-2 Fix "toggle maximization state" shortcut for gnome/kde	2021-03-13 03:19:47 -06:00
RedBearAK	085485dcfc	Fix maximize window toggle shortcut for gnome/kde Changed "LC" to "Super" to fix the "toggle maximization state" shortcut. [ K("RC-Super-f"):K("M-F10"), ] Not changing the other three instances, not sure if they need to be changed. (eos, manjaro, manjaro)	2021-03-12 23:47:01 -09:00
Ben Reaves	e7188ca693	Update README.md	2021-03-13 00:21:16 -06:00
Ben Reaves	4cf795619d	- Updated chromebook remap for Backspace combos	2021-03-12 20:52:37 -06:00
Ben Reaves	588fe1a0dc	- Added delete entire line via Cmd-Backspace (Linux)	2021-03-12 20:30:43 -06:00
Ben Reaves	18ae403188	Update README.md	2021-03-12 17:15:53 -06:00
Ben Reaves	de8e674027	Update README.md	2021-03-12 17:14:03 -06:00
Ben Reaves	625f775464	Update README.md	2021-03-12 14:02:00 -06:00
Ben Reaves	4980c4a35e	Merge branch 'hotfix'	2021-03-11 00:06:19 -06:00
Ben Reaves	c09d8b07e4	Merge pull request #414 from RedBearAK/patch-1 Tweak GUI app menu to be more like tray icon menu	2021-03-10 22:02:29 -08:00
Ben Reaves	a34acfb0b5	- Added xfreerdp to Linux	2021-03-10 23:59:34 -06:00
RedBearAK	9f694fd198	Tweak GUI app menu to be more like tray icon menu This tweak moves the "Restart" and "Stop" actions to the top of the File menu in the Kinto.sh GUI. More like the tray icon menu.	2021-03-06 19:03:52 -09:00
Ben Reaves	4349c4f9dd	Merge pull request #412 from m000/patch-1 temporary fix for using kinto with Synergy	2021-03-06 19:44:12 -06:00
Manolis Stamatogiannakis	68395fd91c	temporary fix for using kinto with Synergy If you use kinto and [Synergy](https://symless.com/synergy) at the same time, kinto will apply transformations when Synergy has the focus. This messes up input because the transformed keypresses are consumed by a different desktop. However it is not possible to write a rule to avoid transforming keypresses specifically for Synergy, because Synergy doesn't seem to set the wm_class. The conditional modmap in this commit solves the problem. But it will also affect any other applications not setting the wm_class. For this, the modmap is commented by default, and Synergy users (which shouldn't be too many) need to enable it manually.	2021-03-06 19:33:40 +01:00
Ben Reaves	482de09dcc	- Removed extra spacing on remap comments	2021-02-28 22:29:05 -06:00
Ben Reaves	f075f3a927	Merge branch 'hotfix'	2021-02-26 14:19:27 -06:00
Ben Reaves	00cbd59a4e	- Removed conflict (windows ahk)	2021-02-26 14:17:53 -06:00