diff --git a/.config/sway/config b/.config/sway/config
index 2dd55fe..ef7ca0a 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -68,9 +68,9 @@ bindsym $mod+Pause exec swaylock -f --color 000000 --font "IBM Plex Sans" --imag
 # You can get the names of your inputs by running: swaymsg -t get_inputs
 # Read `man 5 sway-input` for more information about this section.
 input * {
-    xkb_layout "custom,custom"
-    xkb_variant "dvp,basic"
-    xkb_options "altwin:swap_lalt_lwin,ctrl:nocaps,lv3:ralt_switch"
+    xkb_layout "ambrose,us"
+    xkb_variant "dvp,"
+    xkb_options "lv3:ralt_switch"
     scroll_factor 3
 }
 # Switch keyboard layouts
diff --git a/.dockerignore b/.dockerignore
index b40e202..fe2510b 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -7,6 +7,8 @@
 .audacity*
 .bash*
 .cache
+.cargo/registry
+.cargo/.package-cache
 .config/*
 !.config/contain
 !.config/containers
@@ -28,6 +30,7 @@
 !.config/yabai
 !.config/yadm
 .dbus
+.esd_auth
 .gem
 .ghidra
 .gnupg/*
@@ -52,6 +55,7 @@
 !.local/share/yadm/archive
 .mc/share
 .mozilla
+.npm
 .password-store
 .pki
 !.pwn
diff --git a/.github/README.md b/.github/README.md
index 78c7266..d5cec0a 100644
--- a/.github/README.md
+++ b/.github/README.md
@@ -41,3 +41,40 @@ yadm clone git@github.com:serverwentdown/env.git
 ```sh
 git clone git@makerforce.io:ambrose/pass.git ~/.password-store
 ```
+
+### GNOME Keyboard
+
+First, copy the custom layout:
+
+```
+cp ~/.xkb/symbols/ambrose /usr/share/X11/xkb/symbols/ambrose
+```
+
+Then, open `/usr/share/X11/xkb/rules/evdev.xml` in an editor and add this block in `<layoutList>`:
+
+```
+    <layout>
+      <configItem>
+        <name>ambrose</name>
+        <shortDescription>amb</shortDescription>
+        <description>English (Ambrose)</description>
+        <languageList>
+          <iso639Id>eng</iso639Id>
+        </languageList>
+      </configItem>
+      <variantList>
+        <variant>
+          <configItem>
+            <name>dvp</name>
+            <description>English (Ambrose, Programmer Dvorak)</description>
+          </configItem>
+        </variant>
+        <variant>
+          <configItem>
+            <name>basic</name>
+            <description>English (Ambrose, Qwerty)</description>
+          </configItem>
+        </variant>
+      </variantList>
+    </layout>
+```
diff --git a/.gitignore b/.gitignore
index 29144cc..6ac4d55 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,8 @@
 .audacity*
 .bash*
 .cache
+.cargo/registry
+.cargo/.package-cache
 .config/*
 !.config/contain
 !.config/containers
@@ -28,6 +30,7 @@
 !.config/yabai
 !.config/yadm
 .dbus
+.esd_auth
 .gem
 .ghidra
 .gnupg/*
@@ -52,6 +55,7 @@
 !.local/share/yadm/archive
 .mc/share
 .mozilla
+.npm
 .password-store
 .pki
 !.pwn
diff --git a/.xkb/symbols/ambrose b/.xkb/symbols/ambrose
new file mode 100644
index 0000000..e61c99a
--- /dev/null
+++ b/.xkb/symbols/ambrose
@@ -0,0 +1,37 @@
+hidden partial modifier_keys
+xkb_symbols "lctrl_escape" {
+    key <LCTL> { [ Escape ] };
+};
+
+hidden partial modifier_keys
+xkb_symbols "caps_lctrl" {
+    replace key <CAPS> { [ Control_L, Control_L ] };
+    modifier_map  Control { <CAPS>, <LCTL> };
+};
+
+hidden partial modifier_keys
+xkb_symbols "swap_lalt_lwin" {
+    key <LALT> { type[Group1] = "ONE_LEVEL",
+                 symbols[Group1] = [ Super_L ] };
+    key <LWIN> { [ Alt_L, Meta_L ] };
+};
+
+partial alphanumeric_keys
+xkb_symbols "basic" {
+    include "us(basic)"
+    name[Group1]= "English (Ambrose, Qwerty)";
+
+    include "ambrose(lctrl_escape)"
+    include "ambrose(caps_lctrl)"
+    include "ambrose(swap_lalt_lwin)"
+};
+
+default partial alphanumeric_keys
+xkb_symbols "dvp" {
+    include "us(dvp)"
+    name[Group1]= "English (Ambrose, Programmer Dvorak)";
+
+    include "ambrose(lctrl_escape)"
+    include "ambrose(caps_lctrl)"
+    include "ambrose(swap_lalt_lwin)"
+};
diff --git a/.xkb/symbols/custom b/.xkb/symbols/custom
deleted file mode 100644
index 0ba4152..0000000
--- a/.xkb/symbols/custom
+++ /dev/null
@@ -1,30 +0,0 @@
-hidden partial modifier_keys
-xkb_symbols "lctrl_escape" {
-    key <LCTL> { [ Escape ] };
-};
-
-hidden partial modifier_keys
-xkb_symbols "caps_lctrl" {
-    replace key <CAPS> { [ Control_L, Control_L ] };
-    modifier_map  Control { <CAPS>, <LCTL> };
-};
-
-partial alphanumeric_keys
-xkb_symbols "basic" {
-
-    include "us(basic)"
-    name[Group1]= "English (Qwerty)";
-
-    include "custom(lctrl_escape)"
-    include "custom(caps_lctrl)"
-};
-
-default partial alphanumeric_keys
-xkb_symbols "dvp" {
-
-    include "us(dvp)"
-    name[Group1]= "English (Programmer Dvorak)";
-
-    include "custom(lctrl_escape)"
-    include "custom(caps_lctrl)"
-};