diff --git a/zofle/build.bash b/zofle/build.bash
index e642812..50cacbd 100755
--- a/zofle/build.bash
+++ b/zofle/build.bash
@@ -6,8 +6,10 @@ docker run -it --rm \
 	-v ${PWD}/.cache:/zofle \
 	-v ${PWD}/config:/zofle/config:ro \
 	-v ${PWD}/build:/build \
-	"$ZMK_DOCKER_IMAGE" sh -c 'cd /zofle
-		west init -l config
+	"$ZMK_DOCKER_IMAGE" sh -c 'set -x
+		set -e
+		cd /zofle
+		west init -l config || true # allowed to fail since it will fail if already initialized
 		west update
 		west zephyr-export
 		echo "Building left"
diff --git a/zofle/config/sofle.keymap b/zofle/config/sofle.keymap
index 5911302..42ba76e 100644
--- a/zofle/config/sofle.keymap
+++ b/zofle/config/sofle.keymap
@@ -10,8 +10,7 @@
 #include <dt-bindings/zmk/bt.h>
 #include <dt-bindings/zmk/ext_power.h>
 
-#define NUM_BASE_LAYERS 1
-#define LOWER_LAYER_ID (NUM_BASE_LAYERS)
+#define LOWER_LAYER_ID 2
 #define RAISE_LAYER_ID (LOWER_LAYER_ID + 1)
 #define COMBO_LAYER_ID (RAISE_LAYER_ID + 1)
 
@@ -51,17 +50,17 @@
       sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN &inc_dec_kp PG_DN PG_UP >;
     };
 
-    // gamer_layer {
-    //   bindings = <
-    //     &kp ESC   &kp N1   &kp N2   &kp N3   &kp N4    &kp N5                        &kp N6  &kp N7    &kp N8    &kp N9    &kp N0   &kp BSPC
-    //     &kp TAB   &kp Q    &kp W    &kp E    &kp R     &kp T                         &kp Y   &kp U     &kp I     &kp O     &kp P    &kp BSPC
-    //     &mt LCTRL &kp A    &kp S    &kp D    &kp F     &kp G                         &kp H   &kp J     &kp K     &kp L     &kp SEMI &kp SQT
-    //     &kp LSHFT &kp Z    &kp X    &kp C    &kp V     &kp B   &kp C_MUTE   &kp K_PP &kp N   &kp M     &kp COMMA &kp DOT   &kp FSLH &kp RET
-    //                        &kp LALT &kp LGUI &kp SPACE &mo L_L &kp LSHFT    &kp RET  &mo L_R &kp SPACE &kp RALT  &kp RSHFT
-    //   >;
+    gamer_layer {
+      bindings = <
+        &kp ESC   &trans   &trans   &trans   &trans    &trans                        &trans  &trans    &trans    &trans    &trans   &trans
+        &kp TAB   &trans   &trans   &trans   &trans    &trans                        &trans  &trans    &trans    &trans    &trans   &trans
+        &mt LCTRL &trans   &trans   &trans   &trans    &trans                        &trans  &trans    &trans    &trans    &trans   &trans
+        &trans    &trans   &trans   &trans   &trans    &trans  &trans       &trans   &trans  &trans    &trans    &trans    &trans   &trans
+                           &trans   &trans   &trans    &trans  &trans       &trans   &trans  &trans    &trans    &trans
+      >;
 
-    //   sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN &inc_dec_kp PG_DN PG_UP >;
-    // };
+      sensor-bindings = <&inc_dec_kp C_VOL_UP C_VOL_DN &inc_dec_kp PG_DN PG_UP >;
+    };
 
     lower_layer {
       bindings = <
@@ -89,7 +88,7 @@
 
     combo_layer {
       bindings = <
-&bootloader       &trans           &trans       &trans       &bt BT_CLR   &out OUT_TOG                 &trans     &trans       &trans   &trans       &trans           &bootloader
+&bootloader       &tog 1           &trans       &trans       &bt BT_CLR   &out OUT_TOG                 &trans     &trans       &trans   &trans       &trans           &bootloader
 &reset            &trans           &trans       &trans       &trans       &out OUT_BLE                 &kp C_PREV &kp C_VOL_DN &kp K_PP &kp C_VOL_UP &kp C_NEXT       &reset
 &ext_power EP_TOG &ext_power EP_ON &trans       &trans       &trans       &out OUT_USB                 &kp LEFT   &kp DOWN     &kp UP   &kp RIGHT    &ext_power EP_ON &ext_power EP_TOG
 &trans            &bt BT_SEL 0     &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &trans   &trans &kp HOME   &kp PGDN     &kp PGUP &kp END      &trans           &trans
diff --git a/zofle/makefile b/zofle/makefile
index 4f1c4af..45ee4b4 100644
--- a/zofle/makefile
+++ b/zofle/makefile
@@ -12,4 +12,7 @@ sleep:
 	echo "Sleeping for 2 seconds for disks to fully sync and unmount..."
 	@sleep 2
 
+clean:
+	@sudo rm -r .cache build
+
 everything: build flash-left sleep flash-right