Update README.md

- Multiple fixes to Windows based install

README.md

@@ -13,12 +13,18 @@ Seamless copy and paste with all apps and terminals. The zero effort solution.
 
 [What does this do exactly?](#What-does-this-do-exactly)
 
+[What's different from other remappers?](#Whats-different)
+
 [What does Kinto require?](#What-does-Kinto-require)
 
-[How to install](#How-to-install)
+[How to install (Linux)](#How-to-install-Linux)
+
+[How to install (Windows)](#How-to-install-Windows)
 
 [Shortcut Creation (Xkeysnail)](#Shortcut-Creation-Xkeysnail)
 
+[Shortcut Creation (Autohotkey)](#Shortcut-Creation-Autohotkey)
+
 [Other Notes Related to Install](#Other-Notes-Related-to-Install)
 
 [How to Upgrade/Control Kinto](#How-to-Upgrade-Kinto)
@@ -55,13 +61,19 @@ Kinto works for standard Windows, Apple and Chromebook keyboards. The following
 |---|---|---|---|---|
 |**Virtual**|  LCtrl | Alt  |  RCtrl |Spacebar|
 
-Does Kinto have to have specific keymaps for individual apps?
+## What's different?
 
-I'd say 90+% of the time no, but every OS has their default conventions that sometimes run afoul to macs. For this reason you can easily edit kinto.py or kinto.ahk to support the few shortcut keys Kinto may miss. If you do add additional support please consider forking this project and sharing your new keymaps with the rest of us!
+Compared to most other remappers ***this is a complete system-wide remap of your base level modifier keys*** , this saves time. You're not going to die a death of thousand papercuts from trying to support every shortcut key under the sun.
+
+It also retains some of the most commonly used system level shortcut keys, such as Cmd-C/V, Cmd-Tab, and Ctrl-Tab among others. You will keep seamless copy & paste between all apps, ability to switch Windows while still using the physical Cmd/Alt key position; switch tabs in your favorite terminals, code editors, or web browsers. Depending on your OS and/or Desktop Environment you may also be able to switch Virtual Desktop environments the same way as well and other basic system level shortcuts.
+
+If your OS and macOS have similar functionality on the system level, but only differ by a slight difference of a shortcut command then Kinto likely supports it already. If Kinto doesn't have what you need then you can open up a support ticket and it will be added. You can also fork the project to add the fix and I will merge it via a PR you make.
+
+Additionally, if you are using a cross-platform app and if it happens to have a few shortcut keys that differ then that can very easily be added to either the kinto.py or kinto.ahk configuration files which on Windows is located here `~/.kinto/kinto.ahk` and on Linux it can be found here `~/.config/kinto/kinto.py`. More info can be found here [Shortcut Creation (Xkeysnail)](#Shortcut-Creation-Xkeysnail) for Linux.
 
 ## What does Kinto require?
 
-- Python (initial install only)
+- Python
 - systemd
 - x11
 - IBus*
@@ -77,13 +89,14 @@ Wayland support is planned, but not ready yet.
 
 ### Kinto for Windows 10 Requirements
 
-- WSL Ubuntu edition
+- [Git for Windows](https://git-scm.com/download/win)
 - Powershell - run as Administrator
-- Python3
+- [Python3](https://www.python.org/downloads/windows/)
 
 Other programs that will be installed when you run ./setup.py
 - Chocolatey
 - Autohotkey
+- Strawberry Perl
 
 Note: Sublime Text users should disable screen rotation hotkeys as they will interfere with multi-cursor and possibly other combos. See https://windowsloop.com/disable-screen-rotation-keyboard-shortcut/ for details.
 
@@ -95,7 +108,7 @@ Users can now hotswap between Apple and Windows based keyboards without having t
 <img src="https://user-images.githubusercontent.com/10969616/84471501-10a51380-ac4b-11ea-9e0e-c19a7ebfad6d.png" width="50%">
 
 
-## How to install
+## How to install (Linux)
 
 1. clone this repo
 ```
@@ -120,6 +133,34 @@ To Uninstall Kinto
 ./setup.py
 ```
 
+## How to Install (Windows)
+
+Video Tutorial: [How to Install Kinto.sh on Windows 10](https://youtu.be/sRk8A8krz40)
+
+1. Open Powershell (Right click and Run as Administrator)
+
+2. clone this repo
+```
+git clone https://github.com/rbreaves/kinto.git
+cd kinto
+```
+3. Install - Select keyboard type
+```
+py setup.py
+```
+
+4. How to make Kinto stay visible in system tray (optional)
+
+<img src="https://user-images.githubusercontent.com/10969616/85195077-2f338c00-b295-11ea-8aa3-e6aa06a9a279.png" width="50%" height="50%">
+<img src="https://user-images.githubusercontent.com/10969616/85195079-30fd4f80-b295-11ea-8bcd-257990b77dcb.png" width="50%" height="50%">
+<img src="https://user-images.githubusercontent.com/10969616/85195082-322e7c80-b295-11ea-8c81-320dab424c3c.png" width="50%" height="50%">
+
+To Uninstall Kinto - Select Uninstall
+
+```
+py setup.py
+```
+
 ## Shortcut Creation (Xkeysnail)
 
 **GUI Keys**
@@ -158,6 +199,46 @@ sudo systemctl restart xkeysnail
 
 More information can be seen on the readme page of [xkeysnail](https://github.com/mooz/xkeysnail).
 
+## Shortcut Creation (Autohotkey)
+
+This applies to the Windows version of Kinto and how to add additional support for Applications. The configuration file location is `~/.kinto/kinto.ahk` and after updating it you will want to right click on the tray icon and click on setting your keyboard type again and it will re-apply the latest changes.
+
+Windows 10 has a couple of ways that you need to be aware of when trying to add a specific application, the typical method of how to add any exe program, but then there is also the newer UWP app format that some applications use which will require a similar but different method, both will be discussed.
+
+### Defining Keymaps Per App by EXE Name
+You can use the following legend **but** realize that these remaps reference the Virtual keys in the diagrams mentioned near the beginning of this document, so **do not** confuse it with the physical key unless they happen to be the same key.
+
+|Autohotkey Symbol|Virtual key|Description|
+|---|---|---|
+|^,Ctrl|Control|Primary modifier, 1st rock from the spacebar|
+|!,Alt|Alt|Secondary modifier, 2nd rock from the spacebar|
+|#,Win|Win/Super|Tertiary modifier, 3rd rock from the spacebar|
+
+```
+...
+#IfWinActive ahk_exe sublime_text.exe
+    #^Up::send !{O}                                         ; Switch file
+    #^f::send {F11}                                         ; toggle_full_screen
+    ^!v::send {Ctrl Down}k{Ctrl Up}{Ctrl Down}v{Ctrl Up}    ; paste_from_history
+    ...
+#If
+...
+```
+
+With this being Autohotkey you can easily pull knowledge from the Autohotkey forums for just about any issue you may have as well.
+
+### Defining Keymaps Per UWP App
+
+```
+#If WinActive("- OneNote ahk_class ApplicationFrameWindow", "OneNote")
+...
+    ; Add your keymaps here
+...
+#If
+```
+
+I don't have too many examples on this one have only ran into a single UWP app, and most developers seem to be shying away from it. Kinto currently support "Fluent Terminal" which is a UWP app, but it is also being grouped together with other Terminal apps for hotkey remapping. You may take a look at that, but you may also create a new Autohotkey file and use the Window Spy feature built into Autohotkey to help you discover the full name and class names of any application.
+
 ## Shortcut Creation (XKB)
 The older xkb shortcut method info can be read about in ticket [#125](https://github.com/rbreaves/kinto/issues/125).
 
@@ -324,7 +405,7 @@ cd ~/.config/kinto
 ./kintox11
 ```
 
-## Debug
+## Debug (Linux - xkb method only)
 
 If all else fails you can now run Kinto in debug mode as of 1.0.6-2. The output will become more verbose and I'd recommend running this directly after stopping the service.
 

setup.py

@@ -1,5 +1,5 @@
 #!/usr/bin/env python3
-import json, time, os, sys, subprocess, shlex
+import json, time, os, sys, subprocess, shlex, platform
 from shutil import copyfile
 from subprocess import PIPE, Popen
 from prekinto import *
@@ -16,47 +16,50 @@ def windows_setup():
 	print("")
 	# Short DOS path notation
 	path= cmdline('echo %cd%')[:-1]
-	print("Copying autohotkey combinations for Terminals & Editors...")
-	os.system("copy /Y " + path + "\\windows\\kinto.ahk " + path + "\\windows\\kinto-new.ahk")
-	if default == 1:
-		os.system('perl -pi -e "s/(; )(.*)(; MacModifiers)/$2$3/g" ./windows/kinto-new.ahk')
-		# os.system("regedit " + path + "\\windows\\macbook_winctrl_swap.reg")
-	elif default == 2:
-		os.system('perl -pi -e "s/(; )(.*)(; WinModifiers)/$2$3/g" ./windows/kinto-new.ahk')
-		# os.system("regedit " + path + "\\windows\\standard_ctrlalt_swap.reg")
-	elif default == 3:
-		os.system("regedit " + path + "\\windows\\remove_keyswap.reg")
-		os.system("del /f .\\windows\\kinto-new.ahk")
-		os.system("del \"C:\\ProgramData\\Microsoft\\Windows\\Start Menu\\Programs\\StartUp\\kinto.ahk\"")
-		os.system("taskkill /IM autohotkey.exe")
-		os.system('rd /s /q %userprofile%\\.kinto')
-		os.system('del "%userprofile%\\AppData\\Roaming\\Microsoft\\Windows\\STARTM~1\\Programs\\Startup\\kinto-start.vbs"')
-	stvscode = yn_choice(bcolors.CYELLOW2 + "Would you like to use Sublime Text 3 keymaps in VS Code?\n" + bcolors.ENDC)
 	if default > 0 and default < 3:
 		print("Will now install chocolatey and autohotkey with elevated privileges...")
 		print("This install will fail if you are not running with elevated privileges")
 		os.system('powershell -executionpolicy bypass ".\\windows\\autohotkey.ps1"')
-		os.system('refreshenv')
-		print("\nWill now install Ubuntu Terminal Theme as default...")
+		print("Copying autohotkey combinations for Terminals & Editors...")
+		os.system("copy /Y " + path + "\\windows\\kinto.ahk " + path + "\\windows\\kinto-new.ahk")
+	if default == 1:
+		os.system('C:\\Strawberry\\perl\\bin\\perl.exe -pi -e "s/(; )(.*)(; MacModifiers)/$2$3/g" .\\windows\\kinto-new.ahk')
+	elif default == 2:	
+		os.system('C:\\Strawberry\\perl\\bin\\perl.exe -pi -e "s/(; )(.*)(; WinModifiers)/$2$3/g" .\\windows\\kinto-new.ahk')
+	elif default == 3:
+		print("Removing any old registry keys from prior versions...")
+		p = subprocess.Popen(['powershell.exe', "Remove-ItemProperty -Path HKLM:'SYSTEM\CurrentControlSet\Control\Keyboard Layout' -Name 'Scancode Map' -ErrorAction SilentlyContinue"], stdout=sys.stdout)
+		print("Removing Kinto from Startup folder...")
+		os.system("(del \"C:\\ProgramData\\Microsoft\\Windows\\Start Menu\\Programs\\StartUp\\kinto.ahk\") 2> nul")
+		os.system('(del "%userprofile%\\AppData\\Roaming\\Microsoft\\Windows\\STARTM~1\\Programs\\Startup\\kinto-start.vbs") 2> nul')
+		print("Ending any running Kinto tasks...")
+		os.system("(taskkill /IM autohotkey.exe) 2> nul")
+		print("Removing Kinto from users profile directory...")
+		os.system('(rd /s /q %userprofile%\\.kinto) 2> nul')
+		print("")
+		print("Uninstall of Kinto is Complete.")
+	if default > 0 and default < 3:
+		stvscode = yn_choice(bcolors.CYELLOW2 + "Would you like to use Sublime Text 3 keymaps in VS Code?\n" + bcolors.ENDC)
+		print("\nWill now install Ubuntu Termimnal Theme as default...")
 		os.system("regedit " + path + "\\windows\\theme_ubuntu.reg")
-		if(stvscode):
-			os.system('perl -pi -e "s/(; )(.*)(; ST2CODE)/$2$3/g" ./windows/kinto-new.ahk')
-		os.system('copy /Y ' + path + '\\windows\\kinto-start.vbs "%userprofile%\\.kinto\\kinto-start.vbs"')
-		os.system('copy /Y ' + path + '\\windows\\usb.vbs "%userprofile%\\.kinto\\usb.vbs"')
-		os.system('copy /Y ' + path + '\\windows\\usb.vbs "%userprofile%\\.kinto\\detectUSB.vbs"')
-		os.system('mklink "%userprofile%\\Start Menu\\Programs\\Startup\\kinto-start.vbs" "%userprofile%\\.kinto\\kinto-start.vbs"')
-		os.system('cp '+ path + '\\windows\\NoShell.vbs "%userprofile%\\.kinto\\NoShell.vbs"')
-		os.system('cp '+ path + '\\windows\\toggle_kb.bat "%userprofile%\\.kinto\\toggle_kb.bat"')
-		os.system('cp '+ path + '\\windows\\kinto-new.ahk "%userprofile%\\.kinto\\kinto.ahk"')
 		os.system('robocopy '+ path + '\\assets "%userprofile%\\.kinto\\assets" /E')
+		if(stvscode):
+			os.system('C:\\Strawberry\\perl\\bin\\perl.exe -pi -e "s/(; )(.*)(; ST2CODE)/$2$3/g" .\\windows\\kinto-new.ahk')
+		os.system('copy /Y ' + path + '\\windows\\kinto-start.vbs "%userprofile%\\.kinto\\kinto-start.vbs')
+		os.system('copy /Y ' + path + '\\windows\\usb.vbs "%userprofile%\\.kinto\\usb.vbs"')
+		os.system('copy /Y ' + path + '\\windows\\detectUSB.ahk "%userprofile%\\.kinto\\detectUSB.ahk"')
+		os.system('mklink "%userprofile%\\Start Menu\\Programs\\Startup\\kinto-start.vbs" "%userprofile%\\.kinto\\kinto-start.vbs"')
+		os.system('copy /Y '+ path + '\\windows\\NoShell.vbs "%userprofile%\\.kinto\\NoShell.vbs"')
+		os.system('copy /Y '+ path + '\\windows\\toggle_kb.bat "%userprofile%\\.kinto\\toggle_kb.bat"')
+		os.system('copy /Y '+ path + '\\windows\\kinto-new.ahk "%userprofile%\\.kinto\\kinto.ahk"')
 		os.system("del /f .\\windows\\kinto-new.ahk")
-		os.system("del \"C:\\ProgramData\\Microsoft\\Windows\\Start Menu\\Programs\\StartUp\\kinto.ahk\"")
+		os.system("del \"C:\\ProgramData\\Microsoft\\Windows\\Start Menu\\Programs\\StartUp\\kinto.ahk\" 2> nul")
 		os.system("%userprofile%\\AppData\\Roaming\\Microsoft\\Windows\\STARTM~1\\Programs\\Startup\\kinto-start.vbs")
 
 	# 	# print("\nPlease log off and back on for changes to take full effect.")
 		print("If using WSL then please remember to right click on title bar -> Properties -> Edit Options -> Use Ctrl+Shift+C/V as Copy/Paste and enable it.")
 	else:
-		os.system("del \"C:\\ProgramData\\Microsoft\\Windows\\Start Menu\\Programs\\StartUp\\kinto.ahk\"")
+		os.system("(del \"C:\\ProgramData\\Microsoft\\Windows\\Start Menu\\Programs\\StartUp\\kinto.ahk\") 2> nul")
 
 def cmdline(command):
     process = Popen(
@@ -67,7 +70,11 @@ def cmdline(command):
     )
     return process.communicate()[0]
 
-# check_x11 = cmdline("env | grep -i x11").strip()
+if platform.system() == 'Windows':
+	print("\nYou are detected as running Windows.")
+	windows_setup()
+	sys.exit()
+
 check_x11 = cmdline("(env | grep -i x11 || loginctl show-session \"$XDG_SESSION_ID\" -p Type) | awk -F= '{print $2}'").strip()
 
 if len(check_x11) == 0:

windows/autohotkey.ps1

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

windows/kinto.ahk

@@ -67,44 +67,6 @@ Exit() {
     ExitApp
 }
 
-OnMessage(0x219, "notify_change")
-return
-
-lastkb = ""
-
-DllCall("AllocConsole")
-WinHide % "ahk_id " DllCall("GetConsoleWindow", "ptr")
-
-notify_change(wParam, lParam, msg, hwnd) 
-{
-    global lastkb
-    ; kbtype = % ComObjCreate("WScript.Shell").Exec("cscript /nologo usb.vbs").StdOut.ReadAll()
-    DetectHiddenWindows On
-    Run %ComSpec%,, Hide, pid
-    WinWait ahk_pid %pid%
-    DllCall("AttachConsole", "UInt", pid)
-    WshShell := ComObjCreate("Wscript.Shell")
-    exec := WshShell.Exec("cscript /nologo usb.vbs")
-    kbtype := exec.StdOut.ReadAll()
-    DllCall("FreeConsole")
-    Process Close, %pid%
-    if lastkb != %kbtype%
-    {
-
-        if InStr(kbtype, "Apple")
-        {
-            ; MsgBox, Apple
-            Run, %A_ScriptDir%\NoShell.vbs %A_ScriptDir%\toggle_kb.bat mac, %A_ScriptDir%
-        }
-        else{
-            ; MsgBox, Windows
-            Run, %A_ScriptDir%\NoShell.vbs %A_ScriptDir%\toggle_kb.bat win, %A_ScriptDir%
-        }
-        ; MsgBox % kbtype
-    }
-    lastkb = %kbtype%
-}
-
 SetTitleMatchMode, 2
 
 GroupAdd, terminals, ahk_exe ubuntu.exe
@@ -251,13 +213,60 @@ $^+Right::Send +{End}
 #If
 
 #IfWinActive ahk_exe sublime_text.exe
-    ; Remap Ctrl+Shift to behave like macOS Sublimetext
-    ; Will extend cursor to multiple lines
-    #+Up::send {shift up}^!{Up}
-    #+Down::send {shift up}^!{Down}
-
-    ; Remap Ctrl+Cmd+G to select all matches
-    #^g::send !{F3}
+    #^Up::send !{O}                                         ; Switch file
+    #^f::send {F11}                                         ; toggle_full_screen
+    ^!v::send {Ctrl Down}k{Ctrl Up}{Ctrl Down}v{Ctrl Up}    ; paste_from_history
+    ^Up::Return                                             ; cancel scroll_lines up
+    ^!Up::send ^{Up}                                        ; scroll_lines up
+    ^Down::Return                                           ; cancel scroll_lines down
+    ^!Down::send ^{Down}                                    ; scroll_lines down
+    #+Up::send {shift up}^!{Up}                             ; multi-cursor up
+    #+Down::send {shift up}^!{Down}                         ; multi-cursor down
+    ^PgDn::Return                                           ; cancel next_view
+    ^PgUp::Return                                           ; cancel prev_view
+    ^+{::send ^{PgDn}                                       ; next_view
+    ^+}::send ^{PgUp}                                       ; prev_view
+    ^!Right::send ^{PgDn}                                   ; next_view
+    ^!Left::send ^{PgUp}                                    ; prev_view
+    Insert::Return                                          ; cancel toggle_overwrite
+    ^!O::send {Insert}                                      ; toggle_overwrite
+    !c::Return                                              ; cancel toggle_case_sensitive
+    ^!c::send !{c}                                          ; toggle_case_sensitive
+    ^h::Return                                              ; cancel replace
+    ^!f::send ^{h}                                          ; replace
+    ^+h::Return                                             ; cancel replace_next
+    ^!e::send ^+{h}                                         ; replace_next
+    F3::Return                                              ; cancel find_next
+    ^g::send {F3}                                           ; find_next
+    *F3::Return                                             ; cancel find_prev, find_under, find_all_under
+    ^+g::send +{F3}                                         ; find_prev
+    #!g::send ^{F3}                                         ; find_under
+    #!+g::send ^+{F3}                                       ; find_under_prev
+    #^g::send !{F3}                                         ; find_all_under
+    ^+Up::Return                                            ; cancel swap_line_up
+    #!Up::send ^+{Up}                                       ; swap_line_up
+    ^+Down::Return                                          ; cancel swap_line_down
+    #!Down::send ^+{Down}                                   ; swap_line_down
+    ^Pause::Return                                          ; cancel cancel_build
+    #c::send ^{Pause}                                       ; cancel_build
+    F9::Return                                              ; cancel sort_lines case_s false
+    F5::send {F9}                                           ; sort_lines case_s false
+    #F9::Return                                             ; cancel sort_lines case_s true
+    #F5::send #{F9}                                         ; sort_lines case_s true
+    !+1::Return                                             ; cancel set_layout
+    ^!1::send !+1                                           ; set_layout
+    !+2::Return                                             ; cancel set_layout
+    ^!2::send !+2                                           ; set_layout
+    !+3::Return                                             ; cancel set_layout
+    ^!3::send !+3                                           ; set_layout
+    !+4::Return                                             ; cancel set_layout
+    ^!4::send !+4                                           ; set_layout
+    !+5::Return                                             ; cancel set_layout
+    ^!5::send !+5                                           ; set_layout
+    !+8::Return                                             ; cancel set_layout
+    ^!8::send !+8                                           ; set_layout
+    !+9::Return                                             ; cancel set_layout
+    ^!9::send !+9                                           ; set_layout
 #If
 
 #IfWinActive ahk_group terminals

windows/toggle_kb.bat

@@ -7,14 +7,14 @@ echo Not found.
 goto commonexit
 
 :win
-perl -pi -e "s/(; )(.*)(; WinModifiers)/$2$3/g" "%userprofile%\.kinto\kinto.ahk"
-perl -pi -e "s/^(?!;)(.*)(; MacModifiers)/; $1$2/gm" "%userprofile%\.kinto\kinto.ahk"
+C:\Strawberry\perl\bin\perl.exe -pi -e "s/(; )(.*)(; WinModifiers)/$2$3/g" "%userprofile%\.kinto\kinto.ahk"
+C:\Strawberry\perl\bin\perl.exe -pi -e "s/^(?!;)(.*)(; MacModifiers)/; $1$2/gm" "%userprofile%\.kinto\kinto.ahk"
 "C:\Program Files\AutoHotkey\AutoHotkey.exe" "%userprofile%\.kinto\kinto.ahk"
 goto commonexit
 
 :mac
-perl -pi -e "s/(; )(.*)(; MacModifiers)/$2$3/g" "%userprofile%\.kinto\kinto.ahk"
-perl -pi -e "s/^(?!;)(.*)(; WinModifiers)/; $1$2/gm" "%userprofile%\.kinto\kinto.ahk"
+C:\Strawberry\perl\bin\perl.exe -pi -e "s/(; )(.*)(; MacModifiers)/$2$3/g" "%userprofile%\.kinto\kinto.ahk"
+C:\Strawberry\perl\bin\perl.exe -pi -e "s/^(?!;)(.*)(; WinModifiers)/; $1$2/gm" "%userprofile%\.kinto\kinto.ahk"
 "C:\Program Files\AutoHotkey\AutoHotkey.exe" "%userprofile%\.kinto\kinto.ahk"
 goto commonexit
 

xkeysnail-config/kinto.py

@@ -175,9 +175,9 @@ define_keymap(re.compile("Sublime_text", re.IGNORECASE),{
     K("Super-RC-f"): K("f11"),                  # toggle_full_screen
     K("C-M-v"): [K("C-k"), K("C-v")],           # paste_from_history
     K("C-up"): pass_through_key,                # cancel scroll_lines up
-    K("Super-M-up"): K("C-up"),                 # scroll_lines up
+    K("C-M-up"): K("C-up"),                     # scroll_lines up
     K("C-down"): pass_through_key,              # cancel scroll_lines down
-    K("Super-M-down"): K("C-down"),             # scroll_lines down
+    K("C-M-down"): K("C-down"),                 # scroll_lines down
     K("Super-Shift-up"): K("M-Shift-up"),       # multi-cursor up
     K("Super-Shift-down"): K("M-Shift-down"),   # multi-cursor down
     K("C-PAGE_DOWN"): pass_through_key,         # cancel next_view
@@ -207,9 +207,9 @@ define_keymap(re.compile("Sublime_text", re.IGNORECASE),{
     # K("M-C-g"): K("M-Refresh"),                 # Chromebook - find_all_under
     K("Super-C-g"): K("M-f3"),                  # Default - find_all_under
     K("C-Shift-up"): pass_through_key,          # cancel swap_line_up
-    K("Super-C-up"): K("C-Shift-up"),           # swap_line_up
+    K("Super-M-up"): K("C-Shift-up"),           # swap_line_up
     K("C-Shift-down"): pass_through_key,        # cancel swap_line_down
-    K("Super-C-down"): K("C-Shift-down"),       # swap_line_down
+    K("Super-M-down"): K("C-Shift-down"),       # swap_line_down
     K("C-Pause"): pass_through_key,             # cancel cancel_build
     K("Super-c"): K("C-Pause"),                 # cancel_build
     K("f9"): pass_through_key,                  # cancel sort_lines case_s false