diff --git a/app-configs/sublime-text3/linux.sublime-keybinds.chromebook b/references/app-configs/sublime-text3/linux.sublime-keybinds.chromebook
similarity index 100%
rename from app-configs/sublime-text3/linux.sublime-keybinds.chromebook
rename to references/app-configs/sublime-text3/linux.sublime-keybinds.chromebook
diff --git a/app-configs/sublime-text3/linux.sublime-keybinds.mac b/references/app-configs/sublime-text3/linux.sublime-keybinds.mac
similarity index 100%
rename from app-configs/sublime-text3/linux.sublime-keybinds.mac
rename to references/app-configs/sublime-text3/linux.sublime-keybinds.mac
diff --git a/app-configs/sublime-text3/linux.sublime-keybinds.org b/references/app-configs/sublime-text3/linux.sublime-keybinds.org
similarity index 100%
rename from app-configs/sublime-text3/linux.sublime-keybinds.org
rename to references/app-configs/sublime-text3/linux.sublime-keybinds.org
diff --git a/app-configs/sublime-text3/mac.sublime-keybinds.json b/references/app-configs/sublime-text3/mac.sublime-keybinds.json
similarity index 100%
rename from app-configs/sublime-text3/mac.sublime-keybinds.json
rename to references/app-configs/sublime-text3/mac.sublime-keybinds.json
diff --git a/references/builtin-keyboard.json b/references/builtin-keyboard.json
new file mode 100644
index 0000000..061087d
--- /dev/null
+++ b/references/builtin-keyboard.json
@@ -0,0 +1,432 @@
+{"scancode":"01",
+"eventcode":1,
+"eventname":"ESC"},
+{"scancode":"02",
+"eventcode":2,
+"eventname":"1"},
+{"scancode":"03",
+"eventcode":3,
+"eventname":"2"},
+{"scancode":"04",
+"eventcode":4,
+"eventname":"3"},
+{"scancode":"05",
+"eventcode":5,
+"eventname":"4"},
+{"scancode":"06",
+"eventcode":6,
+"eventname":"5"},
+{"scancode":"07",
+"eventcode":7,
+"eventname":"6"},
+{"scancode":"08",
+"eventcode":8,
+"eventname":"7"},
+{"scancode":"09",
+"eventcode":9,
+"eventname":"8"},
+{"scancode":"0a",
+"eventcode":10,
+"eventname":"9"},
+{"scancode":"0b",
+"eventcode":11,
+"eventname":"0"},
+{"scancode":"0c",
+"eventcode":12,
+"eventname":"MINUS"},
+{"scancode":"0d",
+"eventcode":13,
+"eventname":"EQUAL"},
+{"scancode":"0e",
+"eventcode":14,
+"eventname":"BACKSPACE"},
+{"scancode":"0f",
+"eventcode":15,
+"eventname":"TAB"},
+{"scancode":"10",
+"eventcode":16,
+"eventname":"Q"},
+{"scancode":"11",
+"eventcode":17,
+"eventname":"W"},
+{"scancode":"12",
+"eventcode":18,
+"eventname":"E"},
+{"scancode":"13",
+"eventcode":19,
+"eventname":"R"},
+{"scancode":"14",
+"eventcode":20,
+"eventname":"T"},
+{"scancode":"15",
+"eventcode":21,
+"eventname":"Y"},
+{"scancode":"16",
+"eventcode":22,
+"eventname":"U"},
+{"scancode":"17",
+"eventcode":23,
+"eventname":"I"},
+{"scancode":"18",
+"eventcode":24,
+"eventname":"O"},
+{"scancode":"19",
+"eventcode":25,
+"eventname":"P"},
+{"scancode":"1a",
+"eventcode":26,
+"eventname":"LEFTBRACE"},
+{"scancode":"1b",
+"eventcode":27,
+"eventname":"RIGHTBRACE"},
+{"scancode":"1c",
+"eventcode":28,
+"eventname":"ENTER"},
+{"scancode":"1d",
+"eventcode":29,
+"eventname":"LEFTCTRL"},
+{"scancode":"1e",
+"eventcode":30,
+"eventname":"A"},
+{"scancode":"1f",
+"eventcode":31,
+"eventname":"S"},
+{"scancode":"20",
+"eventcode":32,
+"eventname":"D"},
+{"scancode":"21",
+"eventcode":33,
+"eventname":"F"},
+{"scancode":"22",
+"eventcode":34,
+"eventname":"G"},
+{"scancode":"23",
+"eventcode":35,
+"eventname":"H"},
+{"scancode":"24",
+"eventcode":36,
+"eventname":"J"},
+{"scancode":"25",
+"eventcode":37,
+"eventname":"K"},
+{"scancode":"26",
+"eventcode":38,
+"eventname":"L"},
+{"scancode":"27",
+"eventcode":39,
+"eventname":"SEMICOLON"},
+{"scancode":"28",
+"eventcode":40,
+"eventname":"APOSTROPHE"},
+{"scancode":"29",
+"eventcode":41,
+"eventname":"GRAVE"},
+{"scancode":"2a",
+"eventcode":42,
+"eventname":"LEFTSHIFT"},
+{"scancode":"2b",
+"eventcode":43,
+"eventname":"BACKSLASH"},
+{"scancode":"2c",
+"eventcode":44,
+"eventname":"Z"},
+{"scancode":"2d",
+"eventcode":45,
+"eventname":"X"},
+{"scancode":"2e",
+"eventcode":46,
+"eventname":"C"},
+{"scancode":"2f",
+"eventcode":47,
+"eventname":"V"},
+{"scancode":"30",
+"eventcode":48,
+"eventname":"B"},
+{"scancode":"31",
+"eventcode":49,
+"eventname":"N"},
+{"scancode":"32",
+"eventcode":50,
+"eventname":"M"},
+{"scancode":"33",
+"eventcode":51,
+"eventname":"COMMA"},
+{"scancode":"34",
+"eventcode":52,
+"eventname":"DOT"},
+{"scancode":"35",
+"eventcode":53,
+"eventname":"SLASH"},
+{"scancode":"36",
+"eventcode":54,
+"eventname":"RIGHTSHIFT"},
+{"scancode":"37",
+"eventcode":55,
+"eventname":"KPASTERISK"},
+{"scancode":"38",
+"eventcode":56,
+"eventname":"LEFTALT"},
+{"scancode":"39",
+"eventcode":57,
+"eventname":"SPACE"},
+{"scancode":"40",
+"eventcode":58,
+"eventname":"CAPSLOCK"},
+{"scancode":"41",
+"eventcode":59,
+"eventname":"F1"},
+{"scancode":"42",
+"eventcode":60,
+"eventname":"F2"},
+{"scancode":"43",
+"eventcode":61,
+"eventname":"F3"},
+{"scancode":"44",
+"eventcode":62,
+"eventname":"F4"},
+{"scancode":"45",
+"eventcode":63,
+"eventname":"F5"},
+{"scancode":"46",
+"eventcode":64,
+"eventname":"F6"},
+{"scancode":"47",
+"eventcode":65,
+"eventname":"F7"},
+{"scancode":"48",
+"eventcode":66,
+"eventname":"F8"},
+{"scancode":"49",
+"eventcode":67,
+"eventname":"F9"},
+{"scancode":"50",
+"eventcode":68,
+"eventname":"F10"},
+{"scancode":"51",
+"eventcode":69,
+"eventname":"NUMLOCK"},
+{"scancode":"52",
+"eventcode":70,
+"eventname":"SCROLLLOCK"},
+{"scancode":"53",
+"eventcode":71,
+"eventname":"KP7"},
+{"scancode":"54",
+"eventcode":72,
+"eventname":"KP8"},
+{"scancode":"55",
+"eventcode":73,
+"eventname":"KP9"},
+{"scancode":"56",
+"eventcode":74,
+"eventname":"KPMINUS"},
+{"scancode":"57",
+"eventcode":75,
+"eventname":"KP4"},
+{"scancode":"58",
+"eventcode":76,
+"eventname":"KP5"},
+{"scancode":"59",
+"eventcode":77,
+"eventname":"KP6"},
+{"scancode":"5A",
+"eventcode":78,
+"eventname":"KPPLUS"},
+{"scancode":"5B",
+"eventcode":79,
+"eventname":"KP1"},
+{"scancode":"5C",
+"eventcode":80,
+"eventname":"KP2"},
+{"scancode":"5D",
+"eventcode":81,
+"eventname":"KP3"},
+{"scancode":"5E",
+"eventcode":82,
+"eventname":"KP0"},
+{"scancode":"5F",
+"eventcode":83,
+"eventname":"KPDOT"},
+{"scancode":"60",
+"eventcode":85,
+"eventname":"ZENKAKUHANKAKU"},
+{"scancode":"61",
+"eventcode":86,
+"eventname":"102ND"},
+{"scancode":"62",
+"eventcode":87,
+"eventname":"F11"},
+{"scancode":"63",
+"eventcode":88,
+"eventname":"F12"},
+{"scancode":"64",
+"eventcode":89,
+"eventname":"RO"},
+{"scancode":"65",
+"eventcode":90,
+"eventname":"KATAKANA"},
+{"scancode":"66",
+"eventcode":91,
+"eventname":"HIRAGANA"},
+{"scancode":"67",
+"eventcode":92,
+"eventname":"HENKAN"},
+{"scancode":"68",
+"eventcode":93,
+"eventname":"KATAKANAHIRAGANA"},
+{"scancode":"69",
+"eventcode":94,
+"eventname":"MUHENKAN"},
+{"scancode":"6A",
+"eventcode":95,
+"eventname":"KPJPCOMMA"},
+{"scancode":"6B",
+"eventcode":96,
+"eventname":"KPENTER"},
+{"scancode":"6C",
+"eventcode":97,
+"eventname":"RIGHTCTRL"},
+{"scancode":"6D",
+"eventcode":98,
+"eventname":"KPSLASH"},
+{"scancode":"6E",
+"eventcode":99,
+"eventname":"SYSRQ"},
+{"scancode":"6F",
+"eventcode":100,
+"eventname":"RIGHTALT"},
+{"scancode":"70",
+"eventcode":102,
+"eventname":"HOME"},
+{"scancode":"71",
+"eventcode":103,
+"eventname":"UP"},
+{"scancode":"72",
+"eventcode":104,
+"eventname":"PAGEUP"},
+{"scancode":"73",
+"eventcode":105,
+"eventname":"LEFT"},
+{"scancode":"74",
+"eventcode":106,
+"eventname":"RIGHT"},
+{"scancode":"75",
+"eventcode":107,
+"eventname":"END"},
+{"scancode":"76",
+"eventcode":108,
+"eventname":"DOWN"},
+{"scancode":"77",
+"eventcode":109,
+"eventname":"PAGEDOWN"},
+{"scancode":"78",
+"eventcode":110,
+"eventname":"INSERT"},
+{"scancode":"79",
+"eventcode":111,
+"eventname":"DELETE"},
+{"scancode":"7A",
+"eventcode":112,
+"eventname":"MACRO"},
+{"scancode":"7B",
+"eventcode":113,
+"eventname":"MUTE"},
+{"scancode":"7C",
+"eventcode":114,
+"eventname":"VOLUMEDOWN"},
+{"scancode":"7D",
+"eventcode":115,
+"eventname":"VOLUMEUP"},
+{"scancode":"7E",
+"eventcode":116,
+"eventname":"POWER"},
+{"scancode":"7F",
+"eventcode":117,
+"eventname":"KPEQUAL"},
+{"scancode":"80",
+"eventcode":118,
+"eventname":"KPPLUSMINUS"},
+{"scancode":"81",
+"eventcode":119,
+"eventname":"PAUSE"},
+{"scancode":"82",
+"eventcode":121,
+"eventname":"KPCOMMA"},
+{"scancode":"83",
+"eventcode":122,
+"eventname":"HANGUEL"},
+{"scancode":"84",
+"eventcode":123,
+"eventname":"HANJA"},
+{"scancode":"85",
+"eventcode":124,
+"eventname":"YEN"},
+{"scancode":"86",
+"eventcode":125,
+"eventname":"LEFTMETA"},
+{"scancode":"87",
+"eventcode":126,
+"eventname":"RIGHTMETA"},
+{"scancode":"88",
+"eventcode":127,
+"eventname":"COMPOSE"},
+{"scancode":"89",
+"eventcode":128,
+"eventname":"STOP"},
+{"scancode":"8A",
+"eventcode":140,
+"eventname":"CALC"},
+{"scancode":"8B",
+"eventcode":142,
+"eventname":"SLEEP"},
+{"scancode":"8C",
+"eventcode":143,
+"eventname":"WAKEUP"},
+{"scancode":"8D",
+"eventcode":155,
+"eventname":"MAIL"},
+{"scancode":"8E",
+"eventcode":156,
+"eventname":"BOOKMARKS"},
+{"scancode":"8F",
+"eventcode":157,
+"eventname":"COMPUTER"},
+{"scancode":"90",
+"eventcode":158,
+"eventname":"BACK"},
+{"scancode":"91",
+"eventcode":159,
+"eventname":"FORWARD"},
+{"scancode":"92",
+"eventcode":163,
+"eventname":"NEXTSONG"},
+{"scancode":"93",
+"eventcode":164,
+"eventname":"PLAYPAUSE"},
+{"scancode":"94",
+"eventcode":165,
+"eventname":"PREVIOUSSONG"},
+{"scancode":"95",
+"eventcode":166,
+"eventname":"STOPCD"},
+{"scancode":"96",
+"eventcode":172,
+"eventname":"HOMEPAGE"},
+{"scancode":"97",
+"eventcode":173,
+"eventname":"REFRESH"},
+{"scancode":"98",
+"eventcode":183,
+"eventname":"F13"},
+{"scancode":"99",
+"eventcode":184,
+"eventname":"F14"},
+{"scancode":"9A",
+"eventcode":185,
+"eventname":"F15"},
+{"scancode":"9B",
+"eventcode":217,
+"eventname":"SEARCH"},
+{"scancode":"9C",
+"eventcode":226,
+"eventname":"MEDIA"}
\ No newline at end of file
diff --git a/kintopy/kinto.py b/references/kintopy/kinto.py
similarity index 100%
rename from kintopy/kinto.py
rename to references/kintopy/kinto.py
diff --git a/old-files/chromebook.sh b/references/old-files/chromebook.sh
similarity index 100%
rename from old-files/chromebook.sh
rename to references/old-files/chromebook.sh
diff --git a/old-files/install.py b/references/old-files/install.py
similarity index 100%
rename from old-files/install.py
rename to references/old-files/install.py
diff --git a/old-files/mac_only.sh b/references/old-files/mac_only.sh
similarity index 100%
rename from old-files/mac_only.sh
rename to references/old-files/mac_only.sh
diff --git a/old-files/mac_wordwise.sh b/references/old-files/mac_wordwise.sh
similarity index 100%
rename from old-files/mac_wordwise.sh
rename to references/old-files/mac_wordwise.sh
diff --git a/old-files/old_uninstall.sh b/references/old-files/old_uninstall.sh
similarity index 100%
rename from old-files/old_uninstall.sh
rename to references/old-files/old_uninstall.sh
diff --git a/old-files/test.py b/references/old-files/test.py
similarity index 100%
rename from old-files/test.py
rename to references/old-files/test.py
diff --git a/setup.py b/setup.py
index 5ac1222..4eb95ea 100755
--- a/setup.py
+++ b/setup.py
@@ -238,7 +238,7 @@ def Uninstall():
 			cmdline('cp ./' + xfcekeys + ' ~/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml')
 		if dename == "gnome" or dename == "kde" or dename == "xfce":
 			print("./uninstall.sh\n")
-			cmdline("./uninstall.sh")
+			subprocess.check_call(shlex.split("./uninstall.sh"))
 			print("Done.")
 		if dename == "kde" or dename == "xfce":
 			print("Please log off and back on for your original hotkeys to take effect.")
@@ -258,7 +258,7 @@ def Uninstall():
 			cmdline('cp /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml ~/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml')
 		if dename == "gnome" or dename == "kde" or dename == "xfce":
 			print("./uninstall.sh\n")
-			cmdline("./uninstall.sh")
+			subprocess.check_call(shlex.split("./uninstall.sh"))
 			print("Done.")
 		if dename == "kde" or dename == "xfce":
 			print("Please log off and back on for your original DE hotkeys to take effect.")
diff --git a/terminal-configs/linux/gnome-terminal/.placeholder b/terminal-configs/linux/gnome-terminal/.placeholder
deleted file mode 100644
index e69de29..0000000
diff --git a/terminal-configs/linux/konsole/.placeholder b/terminal-configs/linux/konsole/.placeholder
deleted file mode 100644
index e69de29..0000000
diff --git a/terminal-configs/windows/cmdr/.placeholder b/terminal-configs/windows/cmdr/.placeholder
deleted file mode 100644
index e69de29..0000000
diff --git a/terminal-configs/windows/mintty/.placeholder b/terminal-configs/windows/mintty/.placeholder
deleted file mode 100644
index e69de29..0000000
diff --git a/uninstall.sh b/uninstall.sh
index e1424ca..6a62058 100755
--- a/uninstall.sh
+++ b/uninstall.sh
@@ -1,5 +1,10 @@
 #!/bin/bash
-
+# Undo Apple keyboard cmd & alt swap
+if test -f "/sys/module/hid_apple/parameters/swap_opt_cmd" && [ `cat /sys/module/hid_apple/parameters/swap_opt_cmd` == "1" ]; then
+	echo '0' | sudo tee -a /sys/module/hid_apple/parameters/swap_opt_cmd
+	echo 'options hid_apple swap_opt_cmd=0' | sudo tee -a /etc/modprobe.d/hid_apple.conf
+	sudo update-initramfs -u -k all
+fi
 systemctl --user stop keyswap 2>/dev/null
 systemctl --user disable keyswap
 systemctl --user stop keyswap.timer 2>/dev/null