diff --git a/config/dilemma.keymap b/config/dilemma.keymap
index 842f7fd..9a6b21a 100644
--- a/config/dilemma.keymap
+++ b/config/dilemma.keymap
@@ -52,19 +52,19 @@
   };
 
   behaviors {
-        swap: swapper {
-            compatible = "zmk,behavior-tri-state";
-            label = "SWAPPER";
-            #binding-cells = <0>;
-            bindings = <&kt LALT>, <&kp TAB>, <&kt LALT>;
-            ignored-key-positions = <24>;
-        };
-        swap2: swapper2 {
-            compatible = "zmk,behavior-tri-state";
-            label = "SWAPPER_2";
-            #binding-cells = <0>;
-            bindings = <&kt LALT>, <&kp GRAVE>, <&kt LALT>;
-        };
+        // swap: swapper {
+        //     compatible = "zmk,behavior-tri-state";
+        //     label = "SWAPPER";
+        //     #binding-cells = <0>;
+        //     bindings = <&kt LALT>, <&kp TAB>, <&kt LALT>;
+        //     ignored-key-positions = <24>;
+        // };
+        // swap2: swapper2 {
+        //     compatible = "zmk,behavior-tri-state";
+        //     label = "SWAPPER_2";
+        //     #binding-cells = <0>;
+        //     bindings = <&kt LALT>, <&kp GRAVE>, <&kt LALT>;
+        // };
         lh: left_hand_positional_hold_tap {
             compatible = "zmk,behavior-hold-tap";
             label = "LEFT_POSITIONAL_HOLD_TAP";
@@ -103,8 +103,8 @@
 
     nav_layer {
       bindings = <
-      &swap2    &trans     &trans     &trans       &trans       &trans                    &trans     &trans      &kp HOME    &kp END    &trans     &none
-      &swap     &sk LGUI   &sk LALT   &sk LSHFT    &sk LCTRL    &sk RALT                  &kp LEFT   &kp DOWN    &kp UP      &kp RIGHT  &trans     &kp F11
+      &none     &trans     &trans     &trans       &trans       &trans                    &trans     &trans      &kp HOME    &kp END    &trans     &none
+      &none     &sk LGUI   &sk LALT   &sk LSHFT    &sk LCTRL    &sk RALT                  &kp LEFT   &kp DOWN    &kp UP      &kp RIGHT  &trans     &kp F11
       &kp STAB  &kp LC(Z)  &kp LC(X)  &kp LC(C)    &kp LC(V)    &kp PSCRN                 &trans     &trans      &trans      &trans     &trans     &none 
                                       &trans       &trans       &trans                    &trans     &trans      &trans  
       >;
diff --git a/config/west.yml b/config/west.yml
index b00ef18..8e2e78f 100644
--- a/config/west.yml
+++ b/config/west.yml
@@ -2,12 +2,10 @@ manifest:
   remotes:
     - name: zmkfirmware
       url-base: https://github.com/zmkfirmware
-    - name: nickconway
-      url-base: https://github.com/nickconway
   projects:
     - name: zmk
-      remote: nickconway
-      revision: smart-interrupt
+      remote: zmkfirmware
+      revision: f3110d1d1ea195725551b4c997c542a4003e1452
       import: app/west.yml
   self:
     path: config