diff --git a/files b/files
index 1f03409..2c53d77 100644
--- a/files
+++ b/files
@@ -1,11 +1,11 @@
-system/fonts/fontconfig.sh     /etc/profile.d/fontconfig.sh
 network                        /etc/systemd/network/*
 network/icecast.xml            /etc/icecast.xml
 network/motsognir.conf         /etc/motsognir.conf
 network/mpd.conf               ~/.config/mpd/mpd.conf
 network/nginx.conf             /etc/nginx/nginx.conf
+system/fonts/fontconfig.sh     /etc/profile.d/fontconfig.sh
 system/grub                    /etc/default/grub
-system/progm.xkb               /usr/share/X11/xkb/symbols/progm
 system/services/sans.service   /etc/systemd/system/sans.service
+system/xorg/xkb/progm          /usr/share/X11/xkb/symbols/progm
 themes                         ~/.slade3/text_styles/*
 themes/userChrome.css          ~/.mozilla/firefox/*/chrome/userChrome.css
diff --git a/system/progm.xkb b/system/progm.xkb
deleted file mode 100644
index 47cd4eb..0000000
--- a/system/progm.xkb
+++ /dev/null
@@ -1,55 +0,0 @@
-partial
-xkb_symbols "us-intl" {
- name[Group1] = "English (US, Programmer, intl., with dead keys)";
- include "us(intl)"
- key <AB08> { [       comma,            less ] }; // , <
- key <AB09> { [      period,         greater ] }; // . >
- key <AB10> { [       slash,        question ] }; // / ?
- key <AC10> { [   semicolon,            plus ] }; // ; +
- key <AC11> { [          at,       quoteleft ] }; // @ `
- key <AD11> { [ bracketleft,       braceleft ] }; // [ {
- key <AD12> { [bracketright,      braceright ] }; // ] }
- key <AE01> { [           1,          exclam ] }; // 1 !
- key <AE02> { [           2,        quotedbl ] }; // 2 "
- key <AE03> { [           3,      numbersign ] }; // 3 #
- key <AE04> { [           4,          dollar ] }; // 4 $
- key <AE05> { [           5,         percent ] }; // 5 %
- key <AE06> { [           6,       ampersand ] }; // 6 &
- key <AE07> { [           7,      quoteright ] }; // 7 '
- key <AE08> { [           8,       parenleft ] }; // 8 (
- key <AE09> { [           9,      parenright ] }; // 9 )
- key <AE10> { [           0,           minus ] }; // 0 -
- key <AE11> { [       colon,        asterisk ] }; // : *
- key <AE12> { [  underscore,           equal ] }; // _ =
- key <BKSL> { [   backslash,             bar ] }; // \ |
- key <TLDE> { [ asciicircum,      asciitilde ] }; // ^ ~
-};
-
-partial
-xkb_symbols "us-workman-intl" {
- name[Group1] = "English (Workman, Programmer, intl., with dead keys)";
- include "us(workman-intl)"
- key <AB08> { [       comma,            less ] }; // , <
- key <AB09> { [      period,         greater ] }; // . >
- key <AB10> { [       slash,        question ] }; // / ?
- key <AD10> { [   semicolon,            plus ] }; // ; +
- key <AC11> { [          at,       quoteleft ] }; // @ `
- key <AD11> { [ bracketleft,       braceleft ] }; // [ {
- key <AD12> { [bracketright,      braceright ] }; // ] }
- key <AE01> { [           1,          exclam ] }; // 1 !
- key <AE02> { [           2,        quotedbl ] }; // 2 "
- key <AE03> { [           3,      numbersign ] }; // 3 #
- key <AE04> { [           4,          dollar ] }; // 4 $
- key <AE05> { [           5,         percent ] }; // 5 %
- key <AE06> { [           6,       ampersand ] }; // 6 &
- key <AE07> { [           7,      quoteright ] }; // 7 '
- key <AE08> { [           8,       parenleft ] }; // 8 (
- key <AE09> { [           9,      parenright ] }; // 9 )
- key <AE10> { [           0,           minus ] }; // 0 -
- key <AE11> { [       colon,        asterisk ] }; // : *
- key <AE12> { [  underscore,           equal ] }; // _ =
- key <BKSL> { [   backslash,             bar ] }; // \ |
- key <TLDE> { [ asciicircum,      asciitilde ] }; // ^ ~
- key <CAPS> { [   Caps_Lock                  ] };
-};
-
diff --git a/system/xorg/xkb/progm b/system/xorg/xkb/progm
new file mode 100644
index 0000000..125f4d1
--- /dev/null
+++ b/system/xorg/xkb/progm
@@ -0,0 +1,25 @@
+partial default alphanumeric_keys
+xkb_symbols "progm" {
+	include "us(intl)"
+	key <AB08> { [       comma,            less] }; // , <
+	key <AB09> { [      period,         greater] }; // . >
+	key <AB10> { [       slash,        question] }; // / ?
+	key <AC10> { [   semicolon,            plus] }; // ; +
+	key <AC11> { [          at,       quoteleft] }; // @ `
+	key <AD11> { [ bracketleft,       braceleft] }; // [ {
+	key <AD12> { [bracketright,      braceright] }; // ] }
+	key <AE01> { [           1,          exclam] }; // 1 !
+	key <AE02> { [           2,        quotedbl] }; // 2 "
+	key <AE03> { [           3,      numbersign] }; // 3 #
+	key <AE04> { [           4,          dollar] }; // 4 $
+	key <AE05> { [           5,         percent] }; // 5 %
+	key <AE06> { [           6,       ampersand] }; // 6 &
+	key <AE07> { [           7,      quoteright] }; // 7 '
+	key <AE08> { [           8,       parenleft] }; // 8 (
+	key <AE09> { [           9,      parenright] }; // 9 )
+	key <AE10> { [           0,           minus] }; // 0 -
+	key <AE11> { [       colon,        asterisk] }; // : *
+	key <AE12> { [  underscore,           equal] }; // _ =
+	key <BKSL> { [   backslash,             bar] }; // \ |
+	key <TLDE> { [ asciicircum,      asciitilde] }; // ^ ~
+};