From ed70d95c44b7ffc0c4f059db5b88bd3557e14df5 Mon Sep 17 00:00:00 2001
From: Luflosi <luflosi@luflosi.de>
Date: Tue, 17 Sep 2019 15:49:58 +0200
Subject: [PATCH 1/3] Move aliases for common key name variations to the end of
 key_name_aliases

---
 kitty/key_names.py | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/kitty/key_names.py b/kitty/key_names.py
index c136ac520..efac23917 100644
--- a/kitty/key_names.py
+++ b/kitty/key_names.py
@@ -21,18 +21,6 @@ key_name_aliases = {
     '\\': 'BACKSLASH',
     ']': 'RIGHT_BRACKET',
     '`': 'GRAVE_ACCENT',
-
-    'ESC': 'ESCAPE',
-    'PGUP': 'PAGE_UP',
-    'PAGEUP': 'PAGE_UP',
-    'PGDN': 'PAGE_DOWN',
-    'PAGEDOWN': 'PAGE_DOWN',
-    'RETURN': 'ENTER',
-    'ARROWUP': 'UP',
-    'ARROWDOWN': 'DOWN',
-    'ARROWRIGHT': 'RIGHT',
-    'ARROWLEFT': 'LEFT',
-
     '§': 'PARAGRAPH',
     'º': 'MASCULINE',
     'À': 'A_GRAVE',
@@ -82,8 +70,18 @@ key_name_aliases = {
     'Э': 'CYRILLIC_E',
     'Ю': 'CYRILLIC_YU',
     'Я': 'CYRILLIC_YA',
-    'Ё': 'CYRILLIC_IO'
+    'Ё': 'CYRILLIC_IO',
 
+    'ESC': 'ESCAPE',
+    'PGUP': 'PAGE_UP',
+    'PAGEUP': 'PAGE_UP',
+    'PGDN': 'PAGE_DOWN',
+    'PAGEDOWN': 'PAGE_DOWN',
+    'RETURN': 'ENTER',
+    'ARROWUP': 'UP',
+    'ARROWDOWN': 'DOWN',
+    'ARROWRIGHT': 'RIGHT',
+    'ARROWLEFT': 'LEFT'
 }
 
 

From 1ffe9bef350f1885caa6786e692c17bbf48379ad Mon Sep 17 00:00:00 2001
From: Luflosi <luflosi@luflosi.de>
Date: Wed, 18 Sep 2019 15:56:56 +0200
Subject: [PATCH 2/3] Order key_name_aliases by their ASCII value

---
 kitty/key_names.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kitty/key_names.py b/kitty/key_names.py
index efac23917..26a861738 100644
--- a/kitty/key_names.py
+++ b/kitty/key_names.py
@@ -12,7 +12,6 @@ key_name_aliases = {
     "'": 'APOSTROPHE',
     ',': 'COMMA',
     '-': 'MINUS',
-    '_': 'UNDERSCORE',
     '.': 'PERIOD',
     '/': 'SLASH',
     ';': 'SEMICOLON',
@@ -20,6 +19,7 @@ key_name_aliases = {
     '[': 'LEFT_BRACKET',
     '\\': 'BACKSLASH',
     ']': 'RIGHT_BRACKET',
+    '_': 'UNDERSCORE',
     '`': 'GRAVE_ACCENT',
     '§': 'PARAGRAPH',
     'º': 'MASCULINE',

From be696a9d76f7359c17528a5f114b3c32d71c33d9 Mon Sep 17 00:00:00 2001
From: Luflosi <luflosi@luflosi.de>
Date: Tue, 17 Sep 2019 15:51:38 +0200
Subject: [PATCH 3/3] Add missing keys to key_name_aliases

---
 kitty/key_names.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/kitty/key_names.py b/kitty/key_names.py
index 26a861738..7f367a474 100644
--- a/kitty/key_names.py
+++ b/kitty/key_names.py
@@ -9,13 +9,24 @@ from .constants import is_macos
 
 
 key_name_aliases = {
+    '!': 'EXCLAM',
+    '"': 'DOUBLE_QUOTE',
+    '#': 'NUMBER_SIGN',
+    '$': 'DOLLAR',
+    '&': 'AMPERSAND',
     "'": 'APOSTROPHE',
+    '(': 'PARENTHESIS_LEFT',
+    ')': 'PARENTHESIS_RIGHT',
     ',': 'COMMA',
     '-': 'MINUS',
     '.': 'PERIOD',
     '/': 'SLASH',
+    ':': 'COLON',
     ';': 'SEMICOLON',
+    '<': 'LESS',
     '=': 'EQUAL',
+    '>': 'GREATER',
+    '@': 'AT',
     '[': 'LEFT_BRACKET',
     '\\': 'BACKSLASH',
     ']': 'RIGHT_BRACKET',