diff --git a/pd_key_maps/keymap_us.py b/pd_key_maps/keymap_us.py
index 1a03fd3..73d8125 100644
--- a/pd_key_maps/keymap_us.py
+++ b/pd_key_maps/keymap_us.py
@@ -53,13 +53,13 @@
     "SPACE": 44,
     "-": 45,
     "=": 46,
-    "(": 47,
-    ")": 48,
+    "[": 47,
+    "]": 48,
     "\\": 49,
-    "#": 50,
+    #    "#": 50,  # Non us only
     ";": 51,
-    '"': 52,
-    "~": 53,
+    "'": 52,
+    "`": 53,
     ",": 54,
     ".": 55,
     "/": 56,
@@ -136,24 +136,28 @@
     # volume-up:128,
     # volume-down:129,
 }
-c2map = {}
+c2map = {
+    "~": "SHIFT `",
+    "!": "SHIFT 1",
+    "@": "SHIFT 2",
+    "#": "SHIFT 3",
+    "$": "SHIFT 4",
+    "%": "SHIFT 5",
+    "^": "SHIFT 6",
+    "&": "SHIFT 7",
+    "*": "SHIFT 8",
+    "(": "SHIFT 9",
+    ")": "SHIFT 0",
+    "_": "SHIFT -",
+    "+": "SHIFT =",
+    "<": "SHIFT ,",
+    ">": "SHIFT .",
+    "?": "SHIFT /",
+    '"': "SHIFT '",
+    ":": "SHIFT ;",
+    "{": "SHIFT [",
+    "}": "SHIFT ]",
+    "|": "SHIFT \\",
+}
 for i in range(65, 91):
     c2map[chr(i)] = "SHIFT " + chr(i).lower()
-aliasmap = {
-    "CTRL": "LCTRL",
-    "SHIFT": "LSHIFT",
-    "ALT": "LALT",
-    "META": "LMETA",
-    "CONTROL": "CTRL",
-    "GUI": "META",
-    "ESCAPE": "ESC",
-    "RIGHTARROW": "RIGHT",
-    "LEFTARROW": "LEFT",
-    "DOWNARROW": "DOWN",
-    "UPARROW": "UP",
-    "CTRL-ALT": "CTRL ALT",
-    "CTRL-SHIFT": "CTRL SHIFT",
-    "DEFAULT_DELAY": "DEFAULTDELAY",
-    " ": "SPACE",
-    "BREAK": "PAUSE",
-}
diff --git a/piduck.py b/piduck.py
index 9d4bf15..58a10f2 100755
--- a/piduck.py
+++ b/piduck.py
@@ -66,8 +66,8 @@ def pharse(line, known, deltrue):
     elif command[0] in keymap.c2map:
         pharse(keymap.c2map[command[0]] + " " + " ".join(command[1:]), known, True)
         return
-    elif command[0] in keymap.aliasmap:
-        pharse(keymap.aliasmap[command[0]] + " " + " ".join(command[1:]), known, True)
+    elif command[0] in aliasmap:
+        pharse(aliasmap[command[0]] + " " + " ".join(command[1:]), known, True)
         return
     else:
         eprint('Could not find "' + command[0] + '"')
@@ -119,6 +119,25 @@ def main():
     default_delay = 10
     string_delay = 1
 
+    aliasmap = {
+        "CTRL": "LCTRL",
+        "SHIFT": "LSHIFT",
+        "ALT": "LALT",
+        "META": "LMETA",
+        "CONTROL": "CTRL",
+        "GUI": "META",
+        "ESCAPE": "ESC",
+        "RIGHTARROW": "RIGHT",
+        "LEFTARROW": "LEFT",
+        "DOWNARROW": "DOWN",
+        "UPARROW": "UP",
+        "CTRL-ALT": "CTRL ALT",
+        "CTRL-SHIFT": "CTRL SHIFT",
+        "DEFAULT_DELAY": "DEFAULTDELAY",
+        " ": "SPACE",
+        "BREAK": "PAUSE",
+    }
+
     piparser = argparse.ArgumentParser()
     piparser.add_argument("-i", "--input", help="File input")
     piparser.add_argument(
@@ -140,8 +159,8 @@ def main():
     except ModuleNotFoundError:
         eprint('Keymap "' + key_layout + '" could not be found')
         exit(3)
-try:
-    main()
-except KeyboardInterrupt:
-    pass
-exit(0)
+    try:
+        main()
+    except KeyboardInterrupt:
+        pass
+    exit(0)