diff --git a/config/base.keymap b/config/base.keymap
index c5da7e0..4d16fc2 100644
--- a/config/base.keymap
+++ b/config/base.keymap
@@ -72,9 +72,9 @@
         compatible = "zmk,keymap";
         default_layer {
             bindings = <
-                &kp W     &kp C     &kp L     &kp D     &kp P       &kp K     &kp U     &kp O     &kp Y     &kp QUOT
-                &kp R     &kp S     &kp N     &kp T     &kp B       &kp J     &kp A     &kp E     &kp I     &kp H    
-                          &kp F     &kp M     &kp G                           &kp X     &kp COMMA &kp DOT
+                &kp X     &kp C     &kp L     &kp F     &kp P       &kp K     &kp Y     &kp O     &kp U     &kp QUOT
+                &kp R     &kp S     &kp N     &kp T     &kp B       &kp J     &kp H     &kp E     &kp I     &kp A
+                          &kp W     &kp M     &kp G                           &kp D     &kp COMMA &kp DOT
                                     &sl NAV_L &kp SPACE             &sk LSHFT &sl SYM_L
             >;
         };
diff --git a/images/keymap.svg b/images/keymap.svg
index b136916..921555b 100644
--- a/images/keymap.svg
+++ b/images/keymap.svg
@@ -95,23 +95,23 @@ path.combo {
 <g class="layer-base">
 <text x="30.0" y="28.0" class="label">base:</text>
 <rect rx="6.0" ry="6.0" x="32.0" y="86.0" width="56.0" height="52.0" class="key"/>
-<text x="60.0" y="112.0" class="tap">w</text>
+<text x="60.0" y="112.0" class="tap">x</text>
 <rect rx="6.0" ry="6.0" x="92.0" y="58.0" width="56.0" height="52.0" class="key"/>
 <text x="120.0" y="84.0" class="tap">c</text>
 <rect rx="6.0" ry="6.0" x="152.0" y="58.0" width="56.0" height="52.0" class="key"/>
 <text x="180.0" y="84.0" class="tap">l</text>
 <rect rx="6.0" ry="6.0" x="212.0" y="58.0" width="56.0" height="52.0" class="key"/>
-<text x="240.0" y="84.0" class="tap">d</text>
+<text x="240.0" y="84.0" class="tap">f</text>
 <rect rx="6.0" ry="6.0" x="272.0" y="86.0" width="56.0" height="52.0" class="key"/>
 <text x="300.0" y="112.0" class="tap">p</text>
 <rect rx="6.0" ry="6.0" x="362.0" y="86.0" width="56.0" height="52.0" class="key"/>
 <text x="390.0" y="112.0" class="tap">k</text>
 <rect rx="6.0" ry="6.0" x="422.0" y="58.0" width="56.0" height="52.0" class="key"/>
-<text x="450.0" y="84.0" class="tap">u</text>
+<text x="450.0" y="84.0" class="tap">y</text>
 <rect rx="6.0" ry="6.0" x="482.0" y="58.0" width="56.0" height="52.0" class="key"/>
 <text x="510.0" y="84.0" class="tap">o</text>
 <rect rx="6.0" ry="6.0" x="542.0" y="58.0" width="56.0" height="52.0" class="key"/>
-<text x="570.0" y="84.0" class="tap">y</text>
+<text x="570.0" y="84.0" class="tap">u</text>
 <rect rx="6.0" ry="6.0" x="602.0" y="86.0" width="56.0" height="52.0" class="key"/>
 <text x="630.0" y="112.0" class="tap">&#x27;</text>
 <rect rx="6.0" ry="6.0" x="32.0" y="142.0" width="56.0" height="52.0" class="key"/>
@@ -127,21 +127,21 @@ path.combo {
 <rect rx="6.0" ry="6.0" x="362.0" y="142.0" width="56.0" height="52.0" class="key"/>
 <text x="390.0" y="168.0" class="tap">j</text>
 <rect rx="6.0" ry="6.0" x="422.0" y="114.0" width="56.0" height="52.0" class="key"/>
-<text x="450.0" y="140.0" class="tap">a</text>
+<text x="450.0" y="140.0" class="tap">h</text>
 <rect rx="6.0" ry="6.0" x="482.0" y="114.0" width="56.0" height="52.0" class="key"/>
 <text x="510.0" y="140.0" class="tap">e</text>
 <rect rx="6.0" ry="6.0" x="542.0" y="114.0" width="56.0" height="52.0" class="key"/>
 <text x="570.0" y="140.0" class="tap">i</text>
 <rect rx="6.0" ry="6.0" x="602.0" y="142.0" width="56.0" height="52.0" class="key"/>
-<text x="630.0" y="168.0" class="tap">h</text>
+<text x="630.0" y="168.0" class="tap">a</text>
 <rect rx="6.0" ry="6.0" x="92.0" y="170.0" width="56.0" height="52.0" class="key"/>
-<text x="120.0" y="196.0" class="tap">f</text>
+<text x="120.0" y="196.0" class="tap">w</text>
 <rect rx="6.0" ry="6.0" x="152.0" y="170.0" width="56.0" height="52.0" class="key"/>
 <text x="180.0" y="196.0" class="tap">m</text>
 <rect rx="6.0" ry="6.0" x="212.0" y="170.0" width="56.0" height="52.0" class="key"/>
 <text x="240.0" y="196.0" class="tap">g</text>
 <rect rx="6.0" ry="6.0" x="422.0" y="170.0" width="56.0" height="52.0" class="key"/>
-<text x="450.0" y="196.0" class="tap">x</text>
+<text x="450.0" y="196.0" class="tap">d</text>
 <rect rx="6.0" ry="6.0" x="482.0" y="170.0" width="56.0" height="52.0" class="key"/>
 <text x="510.0" y="196.0" class="tap">,</text>
 <rect rx="6.0" ry="6.0" x="542.0" y="170.0" width="56.0" height="52.0" class="key"/>
diff --git a/keymap-drawer.yaml b/keymap-drawer.yaml
index 2cf8328..5ab8624 100644
--- a/keymap-drawer.yaml
+++ b/keymap-drawer.yaml
@@ -8,9 +8,9 @@ layout:
         drop_inner: true
 layers:
     base:
-    - [w, c, l, d, p, k, u, o, y, "'"]
-    - [r, s, n, t, b, j, a, e, i, h]
-    -    [f, m, g,       x, ',', .]
+    - [x, c, l, f, p, k, y, o, u, "'"]
+    - [r, s, n, t, b, j, h, e, i, a]
+    -    [w, m, g,       d, ',', .]
     - nav
     - space
     - shift