Fix formatting

3 files changed, 337 insertions, 334 deletions

diff --git a/config/corneish_zen.keymap b/config/corneish_zen.keymap
index b6209d2..dedaed1 100644
--- a/config/corneish_zen.keymap
+++ b/config/corneish_zen.keymap
@@ -1,12 +1,13 @@
+;; -*- mode: dts-mode; tab-width: 2 -*-
 #include <behaviors.dtsi>
 #include <dt-bindings/zmk/keys.h>
 #include <dt-bindings/zmk/bt.h>
 #include <dt-bindings/zmk/mouse.h>
 / {
-        chosen {
-                zmk,matrix_transform = &default_transform;
-                //zmk,matrix_transform = &five_column_transform;
-        };
+  chosen {
+    zmk,matrix_transform = &default_transform;
+    //zmk,matrix_transform = &five_column_transform;
+  };
 };
 #define DV     0
 #define QW     1
@@ -29,160 +30,160 @@
 // #define HM4(k) kp k
 
 &caps_word {
-        continue-list = <UNDERSCORE MINUS>;
+  continue-list = <UNDERSCORE MINUS>;
 };
 
 / {
-        behaviors {
-                hm_slow: homerow_mods_slow {
-                        compatible = "zmk,behavior-hold-tap";
-                        label = "HMOD_S";
-                        #binding-cells = <2>;
-                        tapping-term-ms = <250>;
-                        quick-tap-ms = <0>;
-                        flavor = "tap-preferred";
-                        bindings = <&kp>, <&kp>;
-                };
-                hm_med: homerow_mods_medium {
-                        compatible = "zmk,behavior-hold-tap";
-                        label = "HMOD_M";
-                        #binding-cells = <2>;
-                        tapping-term-ms = <200>;
-                        quick-tap-ms = <0>;
-                        flavor = "tap-preferred";
-                        bindings = <&kp>, <&kp>;
-                };
-                hm_fast: homerow_mods_fast {
-                        compatible = "zmk,behavior-hold-tap";
-                        label = "HMOD_F";
-                        #binding-cells = <2>;
-                        tapping-term-ms = <160>;
-                        quick-tap-ms = <0>;
-                        flavor = "tap-preferred";
-                        bindings = <&kp>, <&kp>;
-                };
-        };
-
-        conditional_layers {
-                compatible = "zmk,conditional-layers";
-                fn_layer {
-                        if-layers = <LOW UPR>;
-                        then-layer = <FN>;
-                };
-                qwlow_layer {
-                        if-layers = <QW LOW>;
-                        then-layer = <QVLOW>;
-                };
-                gamelow_layer {
-                        if-layers = <GAMING LOW>;
-                        then-layer = <GAMELOW>;
-                };
-        };
-
-        keymap {
-                compatible = "zmk,keymap";
-
-                default_layer {
-                        label = "DVORAK";
-                        // DV - Dvorak layer
-                        bindings = <
-                        &kp TAB   &kp SQT  &kp COMMA &kp DOT &kp P &kp Y   &kp F &kp G  &kp C &kp R &kp L &trans
-                        &kp LCTRL &HM1(A)    &HM2(O)     &HM3(E) &HM4(U) &kp I   &kp D &HM4(H)  &HM3(T) &HM2(N) &HM1(S) &trans
-                        &kp LSHFT &kp SEMI &kp Q     &kp   J &kp K &kp X   &kp B &kp M  &kp W &kp V &kp Z &trans
-                        &mo MOUSE &mo LOW &kp SPACE &kp SPACE &mo UPR &mo NAV
-                        >;
-                };
-
-                dvorak_layer {
-                        label = "QWERTY";
-                        // This is a "QWERTY" keymap, but it's really intended to be used in dvorak mode
-                        // (with setxkbmap us -variant dvorak -option compose:ralt).
-                        bindings = <
-                        &kp TAB   &kp Q       &kp W     &kp E     &kp R     &kp T     &kp Y     &kp U     &kp I     &kp O     &kp P      &trans
-                        &kp LCTRL &HM1(A)     &HM2(S)   &HM3(D)   &HM4(F)   &kp G     &kp H     &HM4(J)   &HM3(K)   &HM2(L)   &HM1(SEMI) &trans
-                        &kp LSHFT &kp Z       &kp X     &kp C     &kp V     &kp B     &kp N     &kp M     &kp COMMA &kp DOT   &kp SLASH  &trans
-                        &mo MOUSE  &mo LOW &kp SPACE    &kp SPACE &mo UPR   &mo NAV
-                        >;
-                };
-
-                gaming_layer {
-                        label = "GAMING";
-                        bindings = <
-                        &kp TAB   &kp Q       &kp W     &kp E     &kp R     &kp T     &kp Y     &kp U     &kp I     &kp O     &kp P      &trans
-                        &kp LCTRL &kp A     &kp S   &kp D   &kp F   &kp G     &kp H     &kp J   &kp K   &kp L   &kp SEMI &trans
-                        &kp LSHFT &kp Z       &kp X     &kp C     &kp V     &kp B     &kp N     &kp M     &kp COMMA &kp DOT   &kp SLASH  &trans
-
-                        &kp SPACE &mo LOW     &kp SPACE &kp SPACE &mo UPR   &mo NAV
-                        >;
-                };
-
-                lower_layer {
-                        bindings = <
-                        &trans    &kp EXCL    &kp AT    &kp HASH  &kp DLLR  &kp PRCNT &kp CARET &kp AMPS  &kp STAR  &kp LPAR  &kp RPAR   &trans
-                        &trans    &kp LGUI    &kp LALT  &kp LCTL  &kp LSHFT &kp BSLH  &kp FSLH  &kp UNDER   &kp PLUS  &kp LBRC &kp RBRC   &trans
-                        &trans    &kp GRAVE   &kp TILDE &kp TAB   &kp ESC   &kp PIPE  &kp QMARK &kp MINUS  &kp EQUAL   &kp LBKT  &kp RBKT &trans
-                        &trans &trans      &trans       &trans        &trans       &trans
-                        >;
-                };
-
-                raise_layer {
-                        bindings = <
-                        &trans &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &trans
-                        &trans &trans &trans &trans &trans &trans &kp BSPC &kp LSHFT &kp LCTL &kp LALT &kp LGUI &trans
-                        &trans &trans &trans &trans &trans &trans &kp RALT &kp RET &kp DEL &trans &trans &trans
-
-                        &trans &trans &trans &trans &trans &trans
-                        >;
-                };
-
-                navigation_layer {
-                        bindings = <
-                        &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans
-                        &trans &trans &trans &trans &trans &trans &trans &kp LEFT &kp DOWN &kp UP &kp RIGHT &trans
-                        &trans &trans &trans &trans &trans &trans &trans &kp HOME &kp PG_DN &kp PG_UP &kp END &trans
-
-                        &trans &trans &trans &trans &trans &trans
-                        >;
-                };
-
-                mouse_layer {
-                        // Waiting for https://github.com/zmkfirmware/zmk/pull/778
-		        // Using fork at https://github.com/ftc/zmk/blob/mouse-ftc
-                        bindings = <
-                        &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans
-                        &trans &mkp MB4 &mkp MB3 &mkp MB2 &mkp MB1 &trans &trans &kp LEFT &kp DOWN &kp UP &kp RIGHT &trans
-                        &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans
-
-                        &trans &trans &trans &trans &trans
-                        >;
-                };
-
-                qwerty_lower_layer {
-                        bindings = <
-                        &trans &kp EXCL &kp AT &kp HASH &kp DLLR &kp PRCNT &kp CARET &kp AMPS &kp STAR &kp LPAR &kp RPAR &trans
-                        &trans &kp LGUI &kp LALT &kp LCTL &kp LSHFT &kp BSLH &kp LBKT &kp DQT &kp RBRC &kp UNDER &kp PLUS &trans
-                        &trans &kp GRAVE &kp TILDE &kp TAB &kp ESC &kp PIPE &kp LBRC &kp SQT &kp RBKT &kp MINUS &kp EQUAL &trans
-                        &trans &trans &trans &trans &trans &trans
-                        >;
-                };
-
-                gaming_lower_layer {
-                        bindings = <
-                        &trans &kp N1 &kp N2 &kp N3 &kp N4 &kp N9 &trans &trans &trans &trans &trans &trans
-                        &trans &kp N5 &kp N6 &kp N7 &kp N8 &kp N0 &trans &trans &trans &trans &trans &trans
-                        &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans
-                        &trans &trans &trans &trans &trans &trans
-                        >;
-                };
-
-                function_layer {
-                        bindings = <
-                        &trans &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &trans
-                        &trans &kp F11 &kp F12 &to GAMING &to DV &to QW &trans &trans &trans &trans &trans &trans
-                        &trans &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &bt BT_CLR &trans &trans &trans &trans
-                        &trans &trans &trans &trans &trans &trans
-                        >;
-                };
-
-        };
+  behaviors {
+    hm_slow: homerow_mods_slow {
+      compatible = "zmk,behavior-hold-tap";
+      label = "HMOD_S";
+      #binding-cells = <2>;
+      tapping-term-ms = <250>;
+      quick-tap-ms = <0>;
+      flavor = "tap-preferred";
+      bindings = <&kp>, <&kp>;
+    };
+    hm_med: homerow_mods_medium {
+      compatible = "zmk,behavior-hold-tap";
+      label = "HMOD_M";
+      #binding-cells = <2>;
+      tapping-term-ms = <200>;
+      quick-tap-ms = <0>;
+      flavor = "tap-preferred";
+      bindings = <&kp>, <&kp>;
+    };
+    hm_fast: homerow_mods_fast {
+      compatible = "zmk,behavior-hold-tap";
+      label = "HMOD_F";
+      #binding-cells = <2>;
+      tapping-term-ms = <160>;
+      quick-tap-ms = <0>;
+      flavor = "tap-preferred";
+      bindings = <&kp>, <&kp>;
+    };
+  };
+
+  conditional_layers {
+    compatible = "zmk,conditional-layers";
+    fn_layer {
+      if-layers = <LOW UPR>;
+      then-layer = <FN>;
+    };
+    qwlow_layer {
+      if-layers = <QW LOW>;
+      then-layer = <QVLOW>;
+    };
+    gamelow_layer {
+      if-layers = <GAMING LOW>;
+      then-layer = <GAMELOW>;
+    };
+  };
+
+  keymap {
+    compatible = "zmk,keymap";
+
+    default_layer {
+      label = "DVORAK";
+      // DV - Dvorak layer
+      bindings = <
+      &kp TAB   &kp SQT  &kp COMMA &kp DOT &kp P &kp Y   &kp F &kp G  &kp C &kp R &kp L &trans
+      &kp LCTRL &HM1(A)    &HM2(O)     &HM3(E) &HM4(U) &kp I   &kp D &HM4(H)  &HM3(T) &HM2(N) &HM1(S) &trans
+      &kp LSHFT &kp SEMI &kp Q     &kp   J &kp K &kp X   &kp B &kp M  &kp W &kp V &kp Z &trans
+      &mo MOUSE &mo LOW &kp SPACE &kp SPACE &mo UPR &mo NAV
+      >;
+    };
+
+    dvorak_layer {
+      label = "QWERTY";
+      // This is a "QWERTY" keymap, but it's really intended to be used in dvorak mode
+      // (with setxkbmap us -variant dvorak -option compose:ralt).
+      bindings = <
+      &kp TAB   &kp Q       &kp W     &kp E     &kp R     &kp T     &kp Y     &kp U     &kp I     &kp O     &kp P      &trans
+      &kp LCTRL &HM1(A)     &HM2(S)   &HM3(D)   &HM4(F)   &kp G     &kp H     &HM4(J)   &HM3(K)   &HM2(L)   &HM1(SEMI) &trans
+      &kp LSHFT &kp Z       &kp X     &kp C     &kp V     &kp B     &kp N     &kp M     &kp COMMA &kp DOT   &kp SLASH  &trans
+      &mo MOUSE  &mo LOW &kp SPACE    &kp SPACE &mo UPR   &mo NAV
+      >;
+    };
+
+    gaming_layer {
+      label = "GAMING";
+      bindings = <
+      &kp TAB   &kp Q       &kp W     &kp E     &kp R     &kp T     &kp Y     &kp U     &kp I     &kp O     &kp P      &trans
+      &kp LCTRL &kp A     &kp S   &kp D   &kp F   &kp G     &kp H     &kp J   &kp K   &kp L   &kp SEMI &trans
+      &kp LSHFT &kp Z       &kp X     &kp C     &kp V     &kp B     &kp N     &kp M     &kp COMMA &kp DOT   &kp SLASH  &trans
+
+      &kp SPACE &mo LOW     &kp SPACE &kp SPACE &mo UPR   &mo NAV
+      >;
+    };
+
+    lower_layer {
+      bindings = <
+      &trans    &kp EXCL    &kp AT    &kp HASH  &kp DLLR  &kp PRCNT &kp CARET &kp AMPS  &kp STAR  &kp LPAR  &kp RPAR   &trans
+      &trans    &kp LGUI    &kp LALT  &kp LCTL  &kp LSHFT &kp BSLH  &kp FSLH  &kp UNDER   &kp PLUS  &kp LBRC &kp RBRC   &trans
+      &trans    &kp GRAVE   &kp TILDE &kp TAB   &kp ESC   &kp PIPE  &kp QMARK &kp MINUS  &kp EQUAL   &kp LBKT  &kp RBKT &trans
+      &trans &trans      &trans       &trans        &trans       &trans
+      >;
+    };
+
+    raise_layer {
+      bindings = <
+      &trans &kp N1 &kp N2 &kp N3 &kp N4 &kp N5 &kp N6 &kp N7 &kp N8 &kp N9 &kp N0 &trans
+      &trans &trans &trans &trans &trans &trans &kp BSPC &kp LSHFT &kp LCTL &kp LALT &kp LGUI &trans
+      &trans &trans &trans &trans &trans &trans &kp RALT &kp RET &kp DEL &trans &trans &trans
+
+      &trans &trans &trans &trans &trans &trans
+      >;
+    };
+
+    navigation_layer {
+      bindings = <
+      &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans
+      &trans &trans &trans &trans &trans &trans &trans &kp LEFT &kp DOWN &kp UP &kp RIGHT &trans
+      &trans &trans &trans &trans &trans &trans &trans &kp HOME &kp PG_DN &kp PG_UP &kp END &trans
+
+      &trans &trans &trans &trans &trans &trans
+      >;
+    };
+
+    mouse_layer {
+      // Waiting for https://github.com/zmkfirmware/zmk/pull/778
+		  // Using fork at https://github.com/ftc/zmk/blob/mouse-ftc
+      bindings = <
+      &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans
+      &trans &mkp MB4 &mkp MB3 &mkp MB2 &mkp MB1 &trans &trans &kp LEFT &kp DOWN &kp UP &kp RIGHT &trans
+      &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans
+
+      &trans &trans &trans &trans &trans
+      >;
+    };
+
+    qwerty_lower_layer {
+      bindings = <
+      &trans &kp EXCL &kp AT &kp HASH &kp DLLR &kp PRCNT &kp CARET &kp AMPS &kp STAR &kp LPAR &kp RPAR &trans
+      &trans &kp LGUI &kp LALT &kp LCTL &kp LSHFT &kp BSLH &kp LBKT &kp DQT &kp RBRC &kp UNDER &kp PLUS &trans
+      &trans &kp GRAVE &kp TILDE &kp TAB &kp ESC &kp PIPE &kp LBRC &kp SQT &kp RBKT &kp MINUS &kp EQUAL &trans
+      &trans &trans &trans &trans &trans &trans
+      >;
+    };
+
+    gaming_lower_layer {
+      bindings = <
+      &trans &kp N1 &kp N2 &kp N3 &kp N4 &kp N9 &trans &trans &trans &trans &trans &trans
+      &trans &kp N5 &kp N6 &kp N7 &kp N8 &kp N0 &trans &trans &trans &trans &trans &trans
+      &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans
+      &trans &trans &trans &trans &trans &trans
+      >;
+    };
+
+    function_layer {
+      bindings = <
+      &trans &kp F1 &kp F2 &kp F3 &kp F4 &kp F5 &kp F6 &kp F7 &kp F8 &kp F9 &kp F10 &trans
+      &trans &kp F11 &kp F12 &to GAMING &to DV &to QW &trans &trans &trans &trans &trans &trans
+      &trans &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &bt BT_CLR &trans &trans &trans &trans
+      &trans &trans &trans &trans &trans &trans
+      >;
+    };
+
+  };
 };
diff --git a/config/planck_rev6.keymap b/config/planck_rev6.keymap
index 43130ff..036e6f8 100644
--- a/config/planck_rev6.keymap
+++ b/config/planck_rev6.keymap
@@ -1,3 +1,4 @@
+;; -*- mode: dts-mode; tab-width: 2 -*-
 #include <behaviors.dtsi>
 #include <dt-bindings/zmk/keys.h>
 
@@ -22,93 +23,93 @@
 // https://precondition.github.io/home-row-mods
 
 / {
-    behaviors {
-        hm_slow: homerow_mods_slow {
-            compatible = "zmk,behavior-hold-tap";
-            label = "HMOD_S";
-            #binding-cells = <2>;
-            tapping-term-ms = <250>;
-            #quick-tap-ms = <0>;
-            flavor = "tap-preferred";
-            bindings = <&kp>, <&kp>;
+        behaviors {
+                hm_slow: homerow_mods_slow {
+                        compatible = "zmk,behavior-hold-tap";
+                        label = "HMOD_S";
+                        #binding-cells = <2>;
+                        tapping-term-ms = <250>;
+                        #quick-tap-ms = <0>;
+                        flavor = "tap-preferred";
+                        bindings = <&kp>, <&kp>;
+                };
+                hm_med: homerow_mods_medium {
+                        compatible = "zmk,behavior-hold-tap";
+                        label = "HMOD_M";
+                        #binding-cells = <2>;
+                        tapping-term-ms = <200>;
+                        #quick-tap-ms = <0>;
+                        flavor = "tap-preferred";
+                        bindings = <&kp>, <&kp>;
+                };
+                hm_fast: homerow_mods_fast {
+                        compatible = "zmk,behavior-hold-tap";
+                        label = "HMOD_F";
+                        #binding-cells = <2>;
+                        tapping-term-ms = <160>;
+                        #quick-tap-ms = <0>;
+                        flavor = "tap-preferred";
+                        bindings = <&kp>, <&kp>;
+                };
         };
-        hm_med: homerow_mods_medium {
-            compatible = "zmk,behavior-hold-tap";
-            label = "HMOD_M";
-            #binding-cells = <2>;
-            tapping-term-ms = <200>;
-            #quick-tap-ms = <0>;
-            flavor = "tap-preferred";
-            bindings = <&kp>, <&kp>;
-        };
-        hm_fast: homerow_mods_fast {
-            compatible = "zmk,behavior-hold-tap";
-            label = "HMOD_F";
-            #binding-cells = <2>;
-            tapping-term-ms = <160>;
-            #quick-tap-ms = <0>;
-            flavor = "tap-preferred";
-            bindings = <&kp>, <&kp>;
-        };
-    };
 
 	keymap {
 		compatible = "zmk,keymap";
 
 		default_layer {
-// This is a "QWERTY" keymap, but it's really intended to be used in dvorak mode
-// (with setxkbmap us -variant dvorak -option compose:ralt).
+                        // This is a "QWERTY" keymap, but it's really intended to be used in dvorak mode
+                        // (with setxkbmap us -variant dvorak -option compose:ralt).
 			bindings = <
-&trans    &kp Q       &kp W     &kp E     &kp R     &kp T     &kp Y     &kp U     &kp I     &kp O     &kp P      &trans
-&trans    &HM1(A)     &HM2(S)   &HM3(D)   &HM4(F)   &kp G     &kp H     &HM4(J)   &HM3(K)   &HM2(L)   &HM1(SEMI) &trans
-&trans    &kp Z       &kp X     &kp C     &kp V     &kp B     &kp N     &kp M     &kp COMMA &kp DOT   &kp SLASH  &trans
-&trans    &trans      &trans   &mo NAV &mo LOW   &kp SPACE &kp SPACE &mo UPR   &mo NAV   &trans    &trans     &trans
+                        &trans    &kp Q       &kp W     &kp E     &kp R     &kp T     &kp Y     &kp U     &kp I     &kp O     &kp P      &trans
+                        &trans    &HM1(A)     &HM2(S)   &HM3(D)   &HM4(F)   &kp G     &kp H     &HM4(J)   &HM3(K)   &HM2(L)   &HM1(SEMI) &trans
+                        &trans    &kp Z       &kp X     &kp C     &kp V     &kp B     &kp N     &kp M     &kp COMMA &kp DOT   &kp SLASH  &trans
+                        &trans    &trans      &trans   &mo NAV &mo LOW   &kp SPACE &kp SPACE &mo UPR   &mo NAV   &trans    &trans     &trans
 			>;
 		};
 
-//		dvorak {
-//        // Incomplete!
-//			bindings = <
-//&kp TAB   &kp SQT     &kp COMMA &kp DOT   &kp P     &kp Y     &kp F     &kp G     &kp C     &kp R     &kp L      &kp BSPC
-//&kp ESC   &kp A       &kp O     &kp E     &kp U     &kp I     &kp D     &kp H     &kp T     &kp N     &kp S      &kp RET
-//&kp LSHFT &kp SEMI    &kp Q     &kp J     &kp K     &kp X     &kp B     &kp M     &kp W     &kp V     &kp Z      &kp SLASH
-//&trans    &trans      &kp LGUI  &kp LALT  &mo LOW   &kp ESC   &kp SPACE &mo UPR   &trans    &trans    &trans     &trans
-//			>;
-//		};
+                //		dvorak {
+                        //        // Incomplete!
+                        //			bindings = <
+                        //&kp TAB   &kp SQT     &kp COMMA &kp DOT   &kp P     &kp Y     &kp F     &kp G     &kp C     &kp R     &kp L      &kp BSPC
+                        //&kp ESC   &kp A       &kp O     &kp E     &kp U     &kp I     &kp D     &kp H     &kp T     &kp N     &kp S      &kp RET
+                        //&kp LSHFT &kp SEMI    &kp Q     &kp J     &kp K     &kp X     &kp B     &kp M     &kp W     &kp V     &kp Z      &kp SLASH
+                        //&trans    &trans      &kp LGUI  &kp LALT  &mo LOW   &kp ESC   &kp SPACE &mo UPR   &trans    &trans    &trans     &trans
+                        //			>;
+                //		};
 
 		lower {
 			bindings = <
-&trans    &kp EXCL    &kp AT    &kp HASH  &kp DLLR  &kp PRCNT &kp CARET &kp AMPS  &kp STAR  &kp LPAR  &kp RPAR   &trans
-&trans    &kp LGUI    &kp LALT  &kp LCTL  &kp LSHFT &kp BSLH  &kp LBKT  &kp DQT   &kp RBRC  &kp UNDER &kp PLUS   &trans
-&trans    &kp GRAVE   &kp TILDE &kp TAB   &kp ESC   &kp PIPE  &kp LBRC  &kp SQT   &kp RBKT  &kp MINUS &kp EQUAL  &trans
-&trans    &trans      &trans    &trans    &trans    &kp SPACE &kp SPACE &trans    &trans    &trans    &trans     &trans
+                        &trans    &kp EXCL    &kp AT    &kp HASH  &kp DLLR  &kp PRCNT &kp CARET &kp AMPS  &kp STAR  &kp LPAR  &kp RPAR   &trans
+                        &trans    &kp LGUI    &kp LALT  &kp LCTL  &kp LSHFT &kp BSLH  &kp LBKT  &kp DQT   &kp RBRC  &kp UNDER &kp PLUS   &trans
+                        &trans    &kp GRAVE   &kp TILDE &kp TAB   &kp ESC   &kp PIPE  &kp LBRC  &kp SQT   &kp RBKT  &kp MINUS &kp EQUAL  &trans
+                        &trans    &trans      &trans    &trans    &trans    &kp SPACE &kp SPACE &trans    &trans    &trans    &trans     &trans
 			>;
 		};
 
 		upper {
 			bindings = <
-&trans    &kp N1      &kp N2    &kp N3    &kp N4    &kp N5    &kp N6    &kp N7    &kp N8    &kp N9    &kp N0     &trans
-&trans    &trans      &trans    &trans    &trans    &trans    &kp BSPC  &kp LSHFT &kp LCTL  &kp LALT  &kp LGUI   &trans
-&trans    &trans      &trans    &trans    &trans    &trans    &kp RALT  &kp RET   &kp DEL   &trans    &trans     &trans
-&trans    &trans      &trans    &trans    &mo FN    &kp SPACE &kp SPACE &trans    &trans    &trans    &trans     &trans
+                        &trans    &kp N1      &kp N2    &kp N3    &kp N4    &kp N5    &kp N6    &kp N7    &kp N8    &kp N9    &kp N0     &trans
+                        &trans    &trans      &trans    &trans    &trans    &trans    &kp BSPC  &kp LSHFT &kp LCTL  &kp LALT  &kp LGUI   &trans
+                        &trans    &trans      &trans    &trans    &trans    &trans    &kp RALT  &kp RET   &kp DEL   &trans    &trans     &trans
+                        &trans    &trans      &trans    &trans    &mo FN    &kp SPACE &kp SPACE &trans    &trans    &trans    &trans     &trans
  			>;
  		};
 
 		navigation {
 			bindings = <
-&trans    &trans      &trans    &trans    &trans    &trans    &trans    &trans    &trans    &trans    &trans     &trans
-&trans    &kp KP_N4   &kp KP_N3 &kp KP_N2 &kp KP_N1 &trans    &trans    &kp LEFT  &kp DOWN  &kp UP    &kp RIGHT  &trans
-&trans    &trans      &trans    &trans    &trans    &trans    &trans    &kp HOME  &kp PG_DN &kp PG_UP &kp END    &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    &kp KP_N4   &kp KP_N3 &kp KP_N2 &kp KP_N1 &trans    &trans    &kp LEFT  &kp DOWN  &kp UP    &kp RIGHT  &trans
+                        &trans    &trans      &trans    &trans    &trans    &trans    &trans    &kp HOME  &kp PG_DN &kp PG_UP &kp END    &trans
+                        &trans    &trans      &trans    &trans    &trans    &trans    &trans    &trans    &trans    &trans    &trans     &trans
  			>;
  		};
 
 		function {
 			bindings = <
-&trans &kp F1      &kp F2  &kp F3 &kp F4     &kp F5 &kp F6 &kp F7     &kp F8 &kp F9 &kp F10 &trans
-&trans &kp F11     &kp F12 &trans &trans     &trans &trans &trans     &trans &trans &trans  &trans
-&trans &bootloader &trans  &trans &trans     &trans &trans &trans     &trans &trans &trans  &trans
-&trans &trans      &trans  &trans &trans     &trans &trans &trans     &trans &trans &trans  &trans
+                        &trans &kp F1      &kp F2  &kp F3 &kp F4     &kp F5 &kp F6 &kp F7     &kp F8 &kp F9 &kp F10 &trans
+                        &trans &kp F11     &kp F12 &trans &trans     &trans &trans &trans     &trans &trans &trans  &trans
+                        &trans &bootloader &trans  &trans &trans     &trans &trans &trans     &trans &trans &trans  &trans
+                        &trans &trans      &trans  &trans &trans     &trans &trans &trans     &trans &trans &trans  &trans
 			>;
 		};
 	};
diff --git a/config/reviung41.keymap b/config/reviung41.keymap
index 70fa443..baf7268 100644
--- a/config/reviung41.keymap
+++ b/config/reviung41.keymap
@@ -1,3 +1,4 @@
+;; -*- mode: dts-mode; tab-width: 2 -*-
 #include <behaviors.dtsi>
 #include <dt-bindings/zmk/keys.h>
 #include <dt-bindings/zmk/bt.h>
@@ -56,177 +57,177 @@
 // #define HM4(k) kp k
 
 &caps_word {
-    continue-list = <UNDERSCORE MINUS>;
+        continue-list = <UNDERSCORE MINUS>;
 };
 
 / {
-    behaviors {
-        hm_slow: homerow_mods_slow {
-            compatible = "zmk,behavior-hold-tap";
-            label = "HMOD_S";
-            #binding-cells = <2>;
-            tapping-term-ms = <250>;
-            quick-tap-ms = <0>;
-            flavor = "tap-preferred";
-            bindings = <&kp>, <&kp>;
-        };
-        hm_med: homerow_mods_medium {
-            compatible = "zmk,behavior-hold-tap";
-            label = "HMOD_M";
-            #binding-cells = <2>;
-            tapping-term-ms = <200>;
-            quick-tap-ms = <0>;
-            flavor = "tap-preferred";
-            bindings = <&kp>, <&kp>;
-        };
-        hm_fast: homerow_mods_fast {
-            compatible = "zmk,behavior-hold-tap";
-            label = "HMOD_F";
-            #binding-cells = <2>;
-            tapping-term-ms = <160>;
-            quick-tap-ms = <0>;
-            flavor = "tap-preferred";
-            bindings = <&kp>, <&kp>;
+        behaviors {
+                hm_slow: homerow_mods_slow {
+                        compatible = "zmk,behavior-hold-tap";
+                        label = "HMOD_S";
+                        #binding-cells = <2>;
+                        tapping-term-ms = <250>;
+                        quick-tap-ms = <0>;
+                        flavor = "tap-preferred";
+                        bindings = <&kp>, <&kp>;
+                };
+                hm_med: homerow_mods_medium {
+                        compatible = "zmk,behavior-hold-tap";
+                        label = "HMOD_M";
+                        #binding-cells = <2>;
+                        tapping-term-ms = <200>;
+                        quick-tap-ms = <0>;
+                        flavor = "tap-preferred";
+                        bindings = <&kp>, <&kp>;
+                };
+                hm_fast: homerow_mods_fast {
+                        compatible = "zmk,behavior-hold-tap";
+                        label = "HMOD_F";
+                        #binding-cells = <2>;
+                        tapping-term-ms = <160>;
+                        quick-tap-ms = <0>;
+                        flavor = "tap-preferred";
+                        bindings = <&kp>, <&kp>;
+                };
         };
-    };
 
-    conditional_layers {
-        compatible = "zmk,conditional-layers";
-        fn_layer {
-            if-layers = <LOW UPR>;
-            then-layer = <FN>;
-        };
-        dvlow_layer {
-            if-layers = <DV LOW>;
-            then-layer = <DVLOW>;
-        };
-        gamelow_layer {
-            if-layers = <GAMING LOW>;
-            then-layer = <GAMELOW>;
+        conditional_layers {
+                compatible = "zmk,conditional-layers";
+                fn_layer {
+                        if-layers = <LOW UPR>;
+                        then-layer = <FN>;
+                };
+                dvlow_layer {
+                        if-layers = <DV LOW>;
+                        then-layer = <DVLOW>;
+                };
+                gamelow_layer {
+                        if-layers = <GAMING LOW>;
+                        then-layer = <GAMELOW>;
+                };
         };
-    };
 
-    keymap {
-        compatible = "zmk,keymap";
+        keymap {
+                compatible = "zmk,keymap";
 
-        default_layer {
-// This is a "QWERTY" keymap, but it's really intended to be used in dvorak mode
-// (with setxkbmap us -variant dvorak -option compose:ralt).
-            bindings = <
-&kp TAB   &kp Q       &kp W     &kp E     &kp R     &kp T     &kp Y     &kp U     &kp I     &kp O     &kp P      &trans
-&kp LCTRL &HM1(A)     &HM2(S)   &HM3(D)   &HM4(F)   &kp G     &kp H     &HM4(J)   &HM3(K)   &HM2(L)   &HM1(SEMI) &trans
-&kp LSHFT &kp Z       &kp X     &kp C     &kp V     &kp B     &kp N     &kp M     &kp COMMA &kp DOT   &kp SLASH  &trans
+                default_layer {
+                        // This is a "QWERTY" keymap, but it's really intended to be used in dvorak mode
+                        // (with setxkbmap us -variant dvorak -option compose:ralt).
+                        bindings = <
+                        &kp TAB   &kp Q       &kp W     &kp E     &kp R     &kp T     &kp Y     &kp U     &kp I     &kp O     &kp P      &trans
+                        &kp LCTRL &HM1(A)     &HM2(S)   &HM3(D)   &HM4(F)   &kp G     &kp H     &HM4(J)   &HM3(K)   &HM2(L)   &HM1(SEMI) &trans
+                        &kp LSHFT &kp Z       &kp X     &kp C     &kp V     &kp B     &kp N     &kp M     &kp COMMA &kp DOT   &kp SLASH  &trans
 
-&mo MOUSE  &mo LOW     &kp SPACE &mo UPR   &mo NAV
-            >;
-        };
+                        &mo MOUSE  &mo LOW     &kp SPACE &mo UPR   &mo NAV
+                        >;
+                };
 
-        dvorak_layer {
-        // DV - Dvorak layer
-            bindings = <
-   &kp TAB   &kp SQT  &kp COMMA &kp DOT &kp P &kp Y   &kp F &kp G  &kp C &kp R &kp L &trans
-   &kp LCTRL &HM1(A)    &HM2(O)     &HM3(E) &HM4(U) &kp I   &kp D &HM4(H)  &HM3(T) &HM2(N) &HM1(S) &trans
-   &kp LSHFT &kp SEMI &kp Q     &kp   J &kp K &kp X   &kp B &kp M  &kp W &kp V &kp Z &trans
-                              &mo MOUSE &mo LOW &kp SPACE &mo UPR &mo NAV
-            >;
-        };
+                dvorak_layer {
+                        // DV - Dvorak layer
+                        bindings = <
+                        &kp TAB   &kp SQT  &kp COMMA &kp DOT &kp P &kp Y   &kp F &kp G  &kp C &kp R &kp L &trans
+                        &kp LCTRL &HM1(A)    &HM2(O)     &HM3(E) &HM4(U) &kp I   &kp D &HM4(H)  &HM3(T) &HM2(N) &HM1(S) &trans
+                        &kp LSHFT &kp SEMI &kp Q     &kp   J &kp K &kp X   &kp B &kp M  &kp W &kp V &kp Z &trans
+                        &mo MOUSE &mo LOW &kp SPACE &mo UPR &mo NAV
+                        >;
+                };
 
-        gaming_layer {
-            bindings = <
-&kp TAB   &kp Q       &kp W     &kp E     &kp R     &kp T     &kp Y     &kp U     &kp I     &kp O     &kp P      &trans
-&kp LCTRL &kp A     &kp S   &kp D   &kp F   &kp G     &kp H     &kp J   &kp K   &kp L   &kp SEMI &trans
-&kp LSHFT &kp Z       &kp X     &kp C     &kp V     &kp B     &kp N     &kp M     &kp COMMA &kp DOT   &kp SLASH  &trans
+                gaming_layer {
+                        bindings = <
+                        &kp TAB   &kp Q       &kp W     &kp E     &kp R     &kp T     &kp Y     &kp U     &kp I     &kp O     &kp P      &trans
+                        &kp LCTRL &kp A     &kp S   &kp D   &kp F   &kp G     &kp H     &kp J   &kp K   &kp L   &kp SEMI &trans
+                        &kp LSHFT &kp Z       &kp X     &kp C     &kp V     &kp B     &kp N     &kp M     &kp COMMA &kp DOT   &kp SLASH  &trans
 
-&kp SPACE &mo LOW     &kp SPACE &mo UPR   &mo NAV
-            >;
-        };
+                        &kp SPACE &mo LOW     &kp SPACE &mo UPR   &mo NAV
+                        >;
+                };
 
                 lower_layer {
                         bindings = <
-&trans    &kp EXCL    &kp AT    &kp HASH  &kp DLLR  &kp PRCNT &kp CARET &kp AMPS  &kp STAR  &kp LPAR  &kp RPAR   &trans
-&trans    &kp LGUI    &kp LALT  &kp LCTL  &kp LSHFT &kp BSLH  &kp LBKT  &kp DQT   &kp RBRC  &kp UNDER &kp PLUS   &trans
-&trans    &kp GRAVE   &kp TILDE &kp TAB   &kp ESC   &kp PIPE  &kp LBRC  &kp SQT   &kp RBKT  &kp MINUS &kp EQUAL  &trans
+                        &trans    &kp EXCL    &kp AT    &kp HASH  &kp DLLR  &kp PRCNT &kp CARET &kp AMPS  &kp STAR  &kp LPAR  &kp RPAR   &trans
+                        &trans    &kp LGUI    &kp LALT  &kp LCTL  &kp LSHFT &kp BSLH  &kp LBKT  &kp DQT   &kp RBRC  &kp UNDER &kp PLUS   &trans
+                        &trans    &kp GRAVE   &kp TILDE &kp TAB   &kp ESC   &kp PIPE  &kp LBRC  &kp SQT   &kp RBKT  &kp MINUS &kp EQUAL  &trans
 
-&trans      &trans       &trans        &trans       &trans
+                        &trans      &trans       &trans        &trans       &trans
                         >;
                 };
 
                 raise_layer {
                         bindings = <
-&trans    &kp N1      &kp N2    &kp N3    &kp N4    &kp N5    &kp N6    &kp N7    &kp N8    &kp N9    &kp N0     &trans
-&trans    &trans      &trans    &trans    &trans    &trans    &kp BSPC  &kp LSHFT &kp LCTL  &kp LALT  &kp LGUI   &trans
-&trans    &trans      &trans    &trans    &trans    &trans    &kp RALT  &kp RET   &kp DEL   &trans    &trans     &trans
+                        &trans    &kp N1      &kp N2    &kp N3    &kp N4    &kp N5    &kp N6    &kp N7    &kp N8    &kp N9    &kp N0     &trans
+                        &trans    &trans      &trans    &trans    &trans    &trans    &kp BSPC  &kp LSHFT &kp LCTL  &kp LALT  &kp LGUI   &trans
+                        &trans    &trans      &trans    &trans    &trans    &trans    &kp RALT  &kp RET   &kp DEL   &trans    &trans     &trans
 
-&trans      &trans       &trans        &trans       &trans
+                        &trans      &trans       &trans        &trans       &trans
                         >;
                 };
 
                 navigation_layer {
                         bindings = <
-&trans    &trans      &trans    &trans    &trans    &trans    &trans    &trans    &trans    &trans    &trans     &trans
-&trans    &trans      &trans    &trans    &trans    &trans    &trans    &kp LEFT  &kp DOWN  &kp UP    &kp RIGHT  &trans
-&trans    &trans      &trans    &trans    &trans    &trans    &trans    &kp HOME  &kp PG_DN &kp PG_UP &kp END    &trans
+                        &trans    &trans      &trans    &trans    &trans    &trans    &trans    &trans    &trans    &trans    &trans     &trans
+                        &trans    &trans      &trans    &trans    &trans    &trans    &trans    &kp LEFT  &kp DOWN  &kp UP    &kp RIGHT  &trans
+                        &trans    &trans      &trans    &trans    &trans    &trans    &trans    &kp HOME  &kp PG_DN &kp PG_UP &kp END    &trans
 
-&trans      &trans       &trans        &trans       &trans
+                        &trans      &trans       &trans        &trans       &trans
                         >;
                 };
 
                 mouse_layer {
-                // Waiting for https://github.com/zmkfirmware/zmk/pull/778
-		// Using fork at https://github.com/ftc/zmk/blob/mouse-ftc
+                        // Waiting for https://github.com/zmkfirmware/zmk/pull/778
+		        // Using fork at https://github.com/ftc/zmk/blob/mouse-ftc
                         bindings = <
-&trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans
-&trans    &mkp MB4   &mkp MB3 &mkp MB2 &mkp MB1 &trans    &trans    &kp LEFT  &kp DOWN  &kp UP    &kp RIGHT  &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    &mkp MB4   &mkp MB3 &mkp MB2 &mkp MB1 &trans    &trans    &kp LEFT  &kp DOWN  &kp UP    &kp RIGHT  &trans
+                        &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans &trans
 
-&trans      &trans       &trans        &trans       &trans
+                        &trans      &trans       &trans        &trans       &trans
                         >;
                 };
 
                 dvorak_lower_layer {
                         bindings = <
-&trans    &kp EXCL    &kp AT    &kp HASH  &kp DLLR  &kp PRCNT &kp CARET &kp AMPS  &kp STAR  &kp LPAR  &kp RPAR   &trans
-&trans    &kp LGUI    &kp LALT  &kp LCTL  &kp LSHFT &kp BSLH  &kp FSLH  &kp UNDER   &kp PLUS  &kp LBRC &kp RBRC   &trans
-&trans    &kp GRAVE   &kp TILDE &kp TAB   &kp ESC   &kp PIPE  &kp QMARK &kp MINUS  &kp EQUAL   &kp LBKT  &kp RBKT &trans
+                        &trans    &kp EXCL    &kp AT    &kp HASH  &kp DLLR  &kp PRCNT &kp CARET &kp AMPS  &kp STAR  &kp LPAR  &kp RPAR   &trans
+                        &trans    &kp LGUI    &kp LALT  &kp LCTL  &kp LSHFT &kp BSLH  &kp FSLH  &kp UNDER   &kp PLUS  &kp LBRC &kp RBRC   &trans
+                        &trans    &kp GRAVE   &kp TILDE &kp TAB   &kp ESC   &kp PIPE  &kp QMARK &kp MINUS  &kp EQUAL   &kp LBKT  &kp RBKT &trans
 
-&trans      &trans       &trans        &trans       &trans
+                        &trans      &trans       &trans        &trans       &trans
                         >;
                 };
 
-         gaming_lower_layer {
+                gaming_lower_layer {
                         bindings = <
-&trans    &kp N1      &kp N2    &kp N3    &kp N4    &kp N9    &trans    &trans    &trans    &trans    &trans     &trans
-&trans    &kp N5      &kp N6    &kp N7    &kp N8    &kp N0    &trans    &trans    &trans    &trans    &trans     &trans
-&trans    &trans      &trans    &trans    &trans    &trans    &trans    &trans    &trans    &trans    &trans     &trans
+                        &trans    &kp N1      &kp N2    &kp N3    &kp N4    &kp N9    &trans    &trans    &trans    &trans    &trans     &trans
+                        &trans    &kp N5      &kp N6    &kp N7    &kp N8    &kp N0    &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
                         >;
                 };
 
                 function_layer {
                         bindings = <
-&trans       &kp F1       &kp F2       &kp F3       &kp F4       &kp F5     &kp F6          &kp F7 &kp F8          &kp F9          &kp F10         &trans
-&trans       &kp F11      &kp F12      &to GAMING   &to DV       &to QW     &rgb_ug RGB_TOG &trans &rgb_ug RGB_EFF &rgb_ug RGB_HUI &rgb_ug RGB_SAI &rgb_ug RGB_BRI
-&bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &bt BT_CLR &trans          &trans &rgb_ug RGB_EFR &rgb_ug RGB_HUD &rgb_ug RGB_SAD &rgb_ug RGB_BRD
+                        &trans       &kp F1       &kp F2       &kp F3       &kp F4       &kp F5     &kp F6          &kp F7 &kp F8          &kp F9          &kp F10         &trans
+                        &trans       &kp F11      &kp F12      &to GAMING   &to DV       &to QW     &rgb_ug RGB_TOG &trans &rgb_ug RGB_EFF &rgb_ug RGB_HUI &rgb_ug RGB_SAI &rgb_ug RGB_BRI
+                        &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &bt BT_CLR &trans          &trans &rgb_ug RGB_EFR &rgb_ug RGB_HUD &rgb_ug RGB_SAD &rgb_ug RGB_BRD
 
-&trans      &trans       &trans        &trans       &trans
+                        &trans      &trans       &trans        &trans       &trans
                         >;
                 };
 
 
-//                adjust_layer {
-// -----------------------------------------------------------------------------------------
-// | RGB BRI+ | RGB SAT+ | RGB HUE+ | RGB ANI+ |    | RGB TOG |   |  BT1  | BT2 | BT3 | BT4 | BT5 | BT CLR |
-// | RGB BRI- | RGB SAT- | RGB HUE- | RGB ANI- |    |         |   |       |     |     |     |     |        |
-// |          |          |          |          |    |         |   | RESET |     |     |     |     |        |
-//                                              |     |     |     |     |     |
-//                        bindings = <
-//   &rgb_ug RGB_BRI &rgb_ug RGB_SAI &rgb_ug RGB_HUI &rgb_ug RGB_EFF &none &rgb_ug RGB_TOG    &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &bt BT_CLR
-//   &rgb_ug RGB_BRD &rgb_ug RGB_SAD &rgb_ug RGB_HUD &rgb_ug RGB_EFR &none &none              &none        &none        &none        &none        &none        &none
-//   &none           &none           &none           &none           &none &none              &reset       &none        &none        &none        &none        &none
-//                                                             &trans      &trans       &tog 3        &trans      &trans
-//                        >;
-//                };
-//        };
-   };
+                //                adjust_layer {
+                        // -----------------------------------------------------------------------------------------
+                        // | RGB BRI+ | RGB SAT+ | RGB HUE+ | RGB ANI+ |    | RGB TOG |   |  BT1  | BT2 | BT3 | BT4 | BT5 | BT CLR |
+                        // | RGB BRI- | RGB SAT- | RGB HUE- | RGB ANI- |    |         |   |       |     |     |     |     |        |
+                        // |          |          |          |          |    |         |   | RESET |     |     |     |     |        |
+                        //                                              |     |     |     |     |     |
+                        //                        bindings = <
+                        //   &rgb_ug RGB_BRI &rgb_ug RGB_SAI &rgb_ug RGB_HUI &rgb_ug RGB_EFF &none &rgb_ug RGB_TOG    &bt BT_SEL 0 &bt BT_SEL 1 &bt BT_SEL 2 &bt BT_SEL 3 &bt BT_SEL 4 &bt BT_CLR
+                        //   &rgb_ug RGB_BRD &rgb_ug RGB_SAD &rgb_ug RGB_HUD &rgb_ug RGB_EFR &none &none              &none        &none        &none        &none        &none        &none
+                        //   &none           &none           &none           &none           &none &none              &reset       &none        &none        &none        &none        &none
+                        //                                                             &trans      &trans       &tog 3        &trans      &trans
+                        //                        >;
+                //                };
+        //        };
+};
 };