From b01a02c3b81ee85cb0474d728db31c72524bae67 Mon Sep 17 00:00:00 2001
From: Manna Harbour <51143715+manna-harbour@users.noreply.github.com>
Date: Mon, 2 Nov 2020 21:31:51 +1100
Subject: [PATCH] Test build

---
 config/corne.keymap     | 196 ++++++++++++++++++++--------------------
 config/corne.keymap.old |   1 +
 config/makefile         |   3 +
 miryoku-zmk.org         | 194 +++++++++++++++++++--------------------
 miryoku.keymap          | 196 ++++++++++++++++++++--------------------
 5 files changed, 298 insertions(+), 292 deletions(-)
 create mode 100644 config/makefile

diff --git a/config/corne.keymap b/config/corne.keymap
index 22e9af2..8ca81f2 100644
--- a/config/corne.keymap
+++ b/config/corne.keymap
@@ -1,8 +1,8 @@
 // generated from miryoku_zmk.org  -*- buffer-read-only: t -*-
 
-//#include <behaviors.dtsi>
-//#include <dt-bindings/zmk/keys.h>
-//#include <dt-bindings/zmk/bt.h>
+#include <behaviors.dtsi>
+#include <dt-bindings/zmk/keys.h>
+#include <dt-bindings/zmk/bt.h>
 
 #define MIRYOKU_SUBMAP(\
       K00,  K01,  K02,  K03,  K04,         K05,  K06,  K07,  K08,  K09,\
@@ -14,16 +14,17 @@
 &none K10   K11   K12   K13   K14          K15   K16   K17   K18   K19   &none \
 &none K20   K21   K22   K23   K24          K25   K26   K27   K28   K29   &none \
                   K32   K33   K34          K35   K36   K37
+
 #define MIRYOKU_SUPERMAP(\
-      K00,  K01,  K02,  K03,  K04,         K05,  K06,  K07,  K08,  K09,\
-      K10,  K11,  K12,  K13,  K14,         K15,  K16,  K17,  K18,  K19,\
-      K20,  K21,  K22,  K23,  K24,         K25,  K26,  K27,  K28,  K29,\
-      N30,  N31,  K32,  K33,  K34,         K35,  K36,  K37,  N38,  N39\
+         K00,     K01,     K02,     K03,     K04,               K05,     K06,     K07,     K08,     K09,\
+         K10,     K11,     K12,     K13,     K14,               K15,     K16,     K17,     K18,     K19,\
+         K20,     K21,     K22,     K23,     K24,               K25,     K26,     K27,     K28,     K29,\
+         N30,     N31,     K32,     K33,     K34,               K35,     K36,     K37,     N38,     N39\
 )\
-LALT  K00   K01   K02   K03   K04          K05   K06   K07   K08   K09   LGUI  \
-LCTL  K10   K11   K12   K13   K14          K15   K16   K17   K18   K19   LCTL  \
-LSFT  K20   K21   K22   K23   K24          K25   K26   K27   K28   K29   LSFT  \
-                  K32   K33   K34          K35   K36   K37
+&kp LALT K00      K01      K02      K03      K04                K05      K06      K07      K08      K09      &kp LGUI  \
+&kp LCTL K10      K11      K12      K13      K14                K15      K16      K17      K18      K19      &kp LCTL  \
+&kp LSFT K20      K21      K22      K23      K24                K25      K26      K27      K28      K29      &kp LSFT  \
+                           K32      K33      K34                K35      K36      K37
 
 #define BASE 0
 #define TAP  1
@@ -52,211 +53,210 @@ LSFT  K20   K21   K22   K23   K24          K25   K26   K27   K28   K29   LSFT  \
   };
   keymap {
     compatible = "zmk,keymap";
-      BASE_layer {
-        bindings = <
+    BASE_layer {
+      bindings = <
 #if defined MIRYOKU_ALPHAS_COLEMAK
-          MIRYOKU_SUBMAP(
+        MIRYOKU_SUBMAP(
 &kp Q,        &kp W,        &kp F,        &kp P,        &kp G,        &kp J,        &kp L,        &kp U,        &kp Y,        &kp QUOT,
 &hm LGUI A,   &hm LALT R,   &hm LCTL S,   &hm LSFT T,   &kp D,        &kp H,        &hm LSFT N,   &hm LCTL E,   &hm LALT I,   &hm LGUI O,
 &kp Z,        &hm RALT X,   &kp C,        &kp V,        &kp B,        &kp K,        &kp M,        &kp CMMA,     &hm RALT DOT, &kp FSLH,
 X_NP,         X_NP,         &lt MEDR ESC, &lt NAVR SPC, &lt MOUR TAB, &lt NSSL RET, &lt NSL BKSP, &lt FUNL DEL, X_NP,         X_NP
-          )
+        )
 #elif defined MIRYOKU_ALPHAS_COLEMAKDH
-          MIRYOKU_SUBMAP(
+        MIRYOKU_SUBMAP(
 &kp Q,        &kp W,        &kp F,        &kp P,        &kp B,        &kp J,        &kp L,        &kp U,        &kp Y,        &kp QUOT,
 &hm LGUI A,   &hm LALT R,   &hm LCTL S,   &hm LSFT T,   &kp G,        &kp K,        &hm LSFT N,   &hm LCTL E,   &hm LALT I,   &hm LGUI O,
 &kp Z,        &hm RALT X,   &kp C,        &kp D,        &kp V,        &kp M,        &kp H,        &kp CMMA,     &hm RALT DOT, &kp FSLH,
 X_NP,         X_NP,         &lt MEDR ESC, &lt NAVR SPC, &lt MOUR TAB, &lt NSSL RET, &lt NSL BKSP, &lt FUNL DEL, X_NP,         X_NP
-          )
+        )
 #elif defined MIRYOKU_ALPHAS_DVORAK
-          MIRYOKU_SUBMAP(
+        MIRYOKU_SUBMAP(
 &kp QUOT,     &kp CMMA,     &kp DOT,      &kp P,        &kp Y,        &kp F,        &kp G,        &kp C,        &kp R,        &kp L,
 &hm LGUI A,   &hm LALT O,   &hm LCTL E,   &hm LSFT U,   &kp I,        &kp D,        &hm LSFT H,   &hm LCTL T,   &hm LALT N,   &hm LGUI S,
 &kp FSLH,     &hm RALT Q,   &kp J,        &kp K,        &kp X,        &kp B,        &kp M,        &kp W,        &hm RALT V,   &kp Z,
 X_NP,         X_NP,         &lt MEDR ESC, &lt NAVR SPC, &lt MOUR TAB, &lt NSSL RET, &lt NSL BKSP, &lt FUNL DEL, X_NP,         X_NP
-          )
+        )
 #elif defined MIRYOKU_ALPHAS_HALMAK
-          MIRYOKU_SUBMAP(
+        MIRYOKU_SUBMAP(
 &kp W,        &kp L,        &kp R,        &kp B,        &kp Z,        &kp QUOT,     &kp Q,        &kp U,        &kp D,        &kp J,
 &hm LGUI S,   &hm LALT H,   &hm LCTL N,   &hm LSFT T,   &kp CMMA,     &kp DOT,      &hm LSFT A,   &hm LCTL E,   &hm LALT O,   &hm LGUI I,
 &kp F,        &hm RALT M,   &kp V,        &kp C,        &kp FSLH,     &kp G,        &kp P,        &kp X,        &hm RALT K,   &kp Y,
 X_NP,         X_NP,         &lt MEDR ESC, &lt NAVR SPC, &lt MOUR TAB, &lt NSSL RET, &lt NSL BKSP, &lt FUNL DEL, X_NP,         X_NP
-          )
+        )
 #elif defined MIRYOKU_ALPHAS_WORKMAN
-          MIRYOKU_SUBMAP(
+        MIRYOKU_SUBMAP(
 &kp Q,        &kp D,        &kp R,        &kp W,        &kp B,        &kp J,        &kp F,        &kp U,        &kp P,        &kp QUOT,
 &hm LGUI A,   &hm LALT S,   &hm LCTL H,   &hm LSFT T,   &kp G,        &kp Y,        &hm LSFT N,   &hm LCTL E,   &hm LALT O,   &hm LGUI I,
 &kp Z,        &hm RALT X,   &kp M,        &kp C,        &kp V,        &kp K,        &kp L,        &kp CMMA,     &hm RALT DOT, &kp FSLH,
 X_NP,         X_NP,         &lt MEDR ESC, &lt NAVR SPC, &lt MOUR TAB, &lt NSSL RET, &lt NSL BKSP, &lt FUNL DEL, X_NP,         X_NP
-          )
+        )
 #elif defined MIRYOKU_ALPHAS_QWERTY
-          MIRYOKU_SUBMAP(
+        MIRYOKU_SUBMAP(
 &kp Q,        &kp W,        &kp E,        &kp R,        &kp T,        &kp Y,        &kp U,        &kp I,        &kp O,        &kp P,
 &hm LGUI A,   &hm LALT S,   &hm LCTL D,   &hm LSFT F,   &kp G,        &kp H,        &hm LSFT J,   &hm LCTL K,   &hm LALT L,   &hm LGUI QUOT,
 &kp Z,        &hm RALT X,   &kp C,        &kp V,        &kp B,        &kp N,        &kp M,        &kp CMMA,     &hm RALT DOT, &kp FSLH,
 X_NP,         X_NP,         &lt MEDR ESC, &lt NAVR SPC, &lt MOUR TAB, &lt NSSL RET, &lt NSL BKSP, &lt FUNL DEL, X_NP,         X_NP
-          )
+        )
 #else
-          MIRYOKU_SUBMAP(
+        MIRYOKU_SUBMAP(
 &kp Q,        &kp W,        &kp F,        &kp P,        &kp B,        &kp J,        &kp L,        &kp U,        &kp Y,        &kp QUOT,
 &hm LGUI A,   &hm LALT R,   &hm LCTL S,   &hm LSFT T,   &kp G,        &kp M,        &hm LSFT N,   &hm LCTL E,   &hm LALT I,   &hm LGUI O,
 &kp Z,        &hm RALT X,   &kp C,        &kp D,        &kp V,        &kp K,        &kp H,        &kp CMMA,     &hm RALT DOT, &kp FSLH,
 X_NP,         X_NP,         &lt MEDR ESC, &lt NAVR SPC, &lt MOUR TAB, &lt NSSL RET, &lt NSL BKSP, &lt FUNL DEL, X_NP,         X_NP
-          )
+        )
 #endif
-        >;
-      };
-      TAP_layer {
-        bindings = <
+      >;
+    };
+    TAP_layer {
+      bindings = <
 #if defined MIRYOKU_ALPHAS_COLEMAK
-          MIRYOKU_SUPERMAP(
+        MIRYOKU_SUPERMAP(
 &kp Q,    &kp W,    &kp F,    &kp P,    &kp G,    &kp J,    &kp L,    &kp U,    &kp Y,    &kp QUOT,
 &kp A,    &kp R,    &kp S,    &kp T,    &kp D,    &kp H,    &kp N,    &kp E,    &kp I,    &kp O,
 &kp Z,    &kp X,    &kp C,    &kp V,    &kp B,    &kp K,    &kp M,    &kp CMMA, &kp DOT,  &kp FSLH,
 X_NP,     X_NP,     &kp ESC,  &kp SPC,  &kp TAB,  &kp RET,  &kp BKSP, &kp DEL,  X_NP,     X_NP
-          )
+        )
 #elif defined MIRYOKU_ALPHAS_COLEMAKDH
-          MIRYOKU_SUPERMAP(
+        MIRYOKU_SUPERMAP(
 &kp Q,    &kp W,    &kp F,    &kp P,    &kp B,    &kp J,    &kp L,    &kp U,    &kp Y,    &kp QUOT,
 &kp A,    &kp R,    &kp S,    &kp T,    &kp G,    &kp K,    &kp N,    &kp E,    &kp I,    &kp O,
 &kp Z,    &kp X,    &kp C,    &kp D,    &kp V,    &kp M,    &kp H,    &kp CMMA, &kp DOT,  &kp FSLH,
 X_NP,     X_NP,     &kp ESC,  &kp SPC,  &kp TAB,  &kp RET,  &kp BKSP, &kp DEL,  X_NP,     X_NP
-          )
+        )
 #elif defined MIRYOKU_ALPHAS_DVORAK
-          MIRYOKU_SUPERMAP(
+         MIRYOKU_SUPERMAP(
 &kp QUOT, &kp CMMA, &kp DOT,  &kp P,    &kp Y,    &kp F,    &kp G,    &kp C,    &kp R,    &kp L,
 &kp A,    &kp O,    &kp E,    &kp U,    &kp I,    &kp D,    &kp H,    &kp T,    &kp N,    &kp S,
 &kp FSLH, &kp Q,    &kp J,    &kp K,    &kp X,    &kp B,    &kp M,    &kp W,    &kp V,    &kp Z,
 X_NP,     X_NP,     &kp ESC,  &kp SPC,  &kp TAB,  &kp RET,  &kp BKSP, &kp DEL,  X_NP,     X_NP
-          )
+        )
 #elif defined MIRYOKU_ALPHAS_HALMAK
-          MIRYOKU_SUPERMAP(
+        MIRYOKU_SUPERMAP(
 &kp W,    &kp L,    &kp R,    &kp B,    &kp Z,    &kp QUOT, &kp Q,    &kp U,    &kp D,    &kp J,
 &kp S,    &kp H,    &kp N,    &kp T,    &kp CMMA, &kp DOT,  &kp A,    &kp E,    &kp O,    &kp I,
 &kp F,    &kp M,    &kp V,    &kp C,    &kp FSLH, &kp G,    &kp P,    &kp X,    &kp K,    &kp Y,
 X_NP,     X_NP,     &kp ESC,  &kp SPC,  &kp TAB,  &kp RET,  &kp BKSP, &kp DEL,  X_NP,     X_NP
-          )
+        )
 #elif defined MIRYOKU_ALPHAS_WORKMAN
-          MIRYOKU_SUPERMAP(
+        MIRYOKU_SUPERMAP(
 &kp Q,    &kp D,    &kp R,    &kp W,    &kp B,    &kp J,    &kp F,    &kp U,    &kp P,    &kp QUOT,
 &kp A,    &kp S,    &kp H,    &kp T,    &kp G,    &kp Y,    &kp N,    &kp E,    &kp O,    &kp I,
 &kp Z,    &kp X,    &kp M,    &kp C,    &kp V,    &kp K,    &kp L,    &kp CMMA, &kp DOT,  &kp FSLH,
 X_NP,     X_NP,     &kp ESC,  &kp SPC,  &kp TAB,  &kp RET,  &kp BKSP, &kp DEL,  X_NP,     X_NP
-          )
+        )
 #elif defined MIRYOKU_ALPHAS_QWERTY
-          MIRYOKU_SUPERMAP(
+        MIRYOKU_SUPERMAP(
 &kp Q,    &kp W,    &kp E,    &kp R,    &kp T,    &kp Y,    &kp U,    &kp I,    &kp O,    &kp P,
 &kp A,    &kp S,    &kp D,    &kp F,    &kp G,    &kp H,    &kp J,    &kp K,    &kp L,    &kp QUOT,
 &kp Z,    &kp X,    &kp C,    &kp V,    &kp B,    &kp N,    &kp M,    &kp CMMA, &kp DOT,  &kp FSLH,
 X_NP,     X_NP,     &kp ESC,  &kp SPC,  &kp TAB,  &kp RET,  &kp BKSP, &kp DEL,  X_NP,     X_NP
-          )
+        )
 #else
-          MIRYOKU_SUPERMAP(
+        MIRYOKU_SUPERMAP(
 &kp Q,    &kp W,    &kp F,    &kp P,    &kp B,    &kp J,    &kp L,    &kp U,    &kp Y,    &kp QUOT,
 &kp A,    &kp R,    &kp S,    &kp T,    &kp G,    &kp M,    &kp N,    &kp E,    &kp I,    &kp O,
 &kp Z,    &kp X,    &kp C,    &kp D,    &kp V,    &kp K,    &kp H,    &kp CMMA, &kp DOT,  &kp FSLH,
 X_NP,     X_NP,     &kp ESC,  &kp SPC,  &kp TAB,  &kp RET,  &kp BKSP, &kp DEL,  X_NP,     X_NP
-          )
+        )
 #endif
-        >;
-      };
-      MBO_layer {
-        bindings = <
-          MIRYOKU_SUBMAP(
+      >;
+    };
+    MBO_layer {
+      bindings = <
+        MIRYOKU_SUBMAP(
 &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,
-X_NP,     X_NP,     &trans,   &trans,   &trans,   X_NU,     X_NU,     X_NU,     X_NP,     X_NP
-          )
-        >;
-      };
-      NAVR_layer {
-        bindings = <
+X_NP,     X_NP,     &trans,   &trans,   &trans,   &kp A,    X_NU,     X_NU,     X_NP,     X_NP
+        )
+      >;
+    };
+    NAVR_layer {
+      bindings = <
 #if defined MIRYOKU_NAV_VI
-          MIRYOKU_SUBMAP(
+        MIRYOKU_SUBMAP(
 &bootloader, X_NA,        X_NA,        X_NA,        X_NA,        X_NU,        &kp UNDO,    &kp CUT,     &kp COPY,    &kp PSTE,
 &kp LGUI,    &kp LALT,    &kp LCTL,    &kp LSFT,    X_NA,        &kp LARW,    &kp DARW,    &kp UARW,    &kp RARW,    &kp CLCK,
 X_NA,        &kp RALT,    X_NA,        X_NA,        X_NA,        &kp HOME,    &kp PGDN,    &kp PGUP,    &kp END,     &kp INS,
 X_NP,        X_NP,        X_NA,        X_NA,        X_NA,        &kp RET,     &kp BKSP,    &kp DEL,     X_NP,        X_NP
-          )
+        )
 #else
-          MIRYOKU_SUBMAP(
+        MIRYOKU_SUBMAP(
 &bootloader, X_NA,        X_NA,        X_NA,        X_NA,        X_NU,        &kp UNDO,    &kp CUT,     &kp COPY,    &kp PSTE,
 &kp LGUI,    &kp LALT,    &kp LCTL,    &kp LSFT,    X_NA,        &kp CLCK,    &kp LARW,    &kp DARW,    &kp UARW,    &kp RARW,
 X_NA,        &kp RALT,    X_NA,        X_NA,        X_NA,        &kp INS,     &kp HOME,    &kp PGDN,    &kp PGUP,    &kp END,
 X_NP,        X_NP,        X_NA,        X_NA,        X_NA,        &kp RET,     &kp BKSP,    &kp DEL,     X_NP,        X_NP
-          )
+        )
 #endif
-        >;
-      };
-      MOUR_layer {
-        bindings = <
+      >;
+    };
+    MOUR_layer {
+      bindings = <
 #if defined MIRYOKU_NAV_VI
-          MIRYOKU_SUBMAP(
+        MIRYOKU_SUBMAP(
 &bootloader, X_NA,        X_NA,        X_NA,        X_NA,        X_NU,        X_NU,        X_NU,        X_NU,        X_NU,
 &kp LGUI,    &kp LALT,    &kp LCTL,    &kp LSFT,    X_NA,        X_NU,        X_NU,        X_NU,        X_NU,        X_NU,
 X_NA,        &kp RALT,    X_NA,        X_NA,        X_NA,        X_NU,        X_NU,        X_NU,        X_NU,        X_NU,
-X_NP,        X_NP,        X_NA,        X_NA,        X_NA,        X_NU,        X_NU,        X_NU,        X_NP,        X_NP
-          )
+X_NP,        X_NP,        X_NA,        X_NA,        X_NA,        &kp A,       X_NU,        X_NU,        X_NP,        X_NP
+        )
 #else
-          MIRYOKU_SUBMAP(
+        MIRYOKU_SUBMAP(
 &bootloader, X_NA,        X_NA,        X_NA,        X_NA,        X_NU,        X_NU,        X_NU,        X_NU,        X_NU,
 &kp LGUI,    &kp LALT,    &kp LCTL,    &kp LSFT,    X_NA,        X_NU,        X_NU,        X_NU,        X_NU,        X_NU,
 X_NA,        &kp RALT,    X_NA,        X_NA,        X_NA,        X_NU,        X_NU,        X_NU,        X_NU,        X_NU,
-X_NP,        X_NP,        X_NA,        X_NA,        X_NA,        X_NU,        X_NU,        X_NU,        X_NP,        X_NP
-          )
+X_NP,        X_NP,        X_NA,        X_NA,        X_NA,        &kp A,       X_NU,        X_NU,        X_NP,        X_NP
+        )
 #endif
-        >;
-      };
-      MEDR_layer {
-        bindings = <
+      >;
+    };
+    MEDR_layer {
+      bindings = <
 #if defined MIRYOKU_NAV_VI
-          MIRYOKU_SUBMAP(
+        MIRYOKU_SUBMAP(
 &bootloader, X_NA,        X_NA,        X_NA,        X_NA,        X_NU,        X_NU,        X_NU,        X_NU,        X_NU,
 &kp LGUI,    &kp LALT,    &kp LCTL,    &kp LSFT,    X_NA,        &kp M_PREV,  &kp VOLD,    &kp VOLU,    &kp M_NEXT,  X_NU,
 X_NA,        &kp RALT,    X_NA,        X_NA,        X_NA,        X_NU,        X_NU,        X_NU,        X_NU,        X_NU,
 X_NP,        X_NP,        X_NA,        X_NA,        X_NA,        &kp M_STOP,  &kp M_PLAY,  &kp M_MUTE,  X_NP,        X_NP
-          )
+        )
 #else
-          MIRYOKU_SUBMAP(
+        MIRYOKU_SUBMAP(
 &bootloader, X_NA,        X_NA,        X_NA,        X_NA,        X_NU,        X_NU,        X_NU,        X_NU,        X_NU,
 &kp LGUI,    &kp LALT,    &kp LCTL,    &kp LSFT,    X_NA,        X_NU,        &kp M_PREV,  &kp VOLD,    &kp VOLU,    &kp M_NEXT,
 X_NA,        &kp RALT,    X_NA,        X_NA,        X_NA,        X_NU,        X_NU,        X_NU,        X_NU,        X_NU,
 X_NP,        X_NP,        X_NA,        X_NA,        X_NA,        &kp M_STOP,  &kp M_PLAY,  &kp M_MUTE,  X_NP,        X_NP
-          )
+        )
 #endif
-        >;
-      };
-      NSL_layer {
-        bindings = <
-          MIRYOKU_SUBMAP(
+      >;
+    };
+    NSL_layer {
+      bindings = <
+        MIRYOKU_SUBMAP(
 &kp LBKT,    &kp NUM_7,   &kp NUM_8,   &kp NUM_9,   &kp RBKT,    X_NA,        X_NA,        X_NA,        X_NA,        &bootloader,
 &kp SCLN,    &kp NUM_4,   &kp NUM_5,   &kp NUM_6,   &kp EQL,     X_NA,        &kp LSFT,    &kp LCTL,    &kp LALT,    &kp LGUI,
 &kp GRAV,    &kp NUM_1,   &kp NUM_2,   &kp NUM_3,   &kp BSLH,    X_NA,        X_NA,        X_NA,        &kp RALT,    X_NA,
 X_NP,        X_NP,        &kp DOT,     &kp NUM_0,   &kp MINUS,   X_NA,        X_NA,        X_NA,        X_NP,        X_NP
-          )
-        >;
-      };
-      NSSL_layer {
-        bindings = <
-          MIRYOKU_SUBMAP(
+        )
+      >;
+    };
+    NSSL_layer {
+      bindings = <
+        MIRYOKU_SUBMAP(
 X_NU,        X_NU,        X_NU,        X_NU,        X_NU,        X_NA,        X_NA,        X_NA,        X_NA,        &bootloader,
 X_NU,        X_NU,        X_NU,        X_NU,        X_NU,        X_NA,        &kp LSFT,    &kp LCTL,    &kp LALT,    &kp LGUI,
 X_NU,        X_NU,        X_NU,        X_NU,        X_NU,        X_NA,        X_NA,        X_NA,        &kp RALT,    X_NA,
 X_NP,        X_NP,        X_NU,        X_NU,        X_NU,        X_NA,        X_NA,        X_NA,        X_NP,        X_NP
-          )
-        >;
-      };
-      FUNL_layer {
-        bindings = <
-          MIRYOKU_SUBMAP(
+        )
+      >;
+    };
+    FUNL_layer {
+      bindings = <
+        MIRYOKU_SUBMAP(
 &kp F12,     &kp F7,      &kp F8,      &kp F9,      &kp PRSC,    X_NA,        X_NA,        X_NA,        X_NA,        &bootloader,
 &kp F11,     &kp F4,      &kp F5,      &kp F6,      &kp SCLK,    X_NA,        &kp LSFT,    &kp LCTL,    &kp LALT,    &kp LGUI,
 &kp F10,     &kp F1,      &kp F2,      &kp F3,      &kp PAUS,    X_NA,        X_NA,        X_NA,        &kp RALT,    X_NA,
 X_NP,        X_NP,        X_NU,        &kp SPC,     &kp TAB,     X_NA,        X_NA,        X_NA,        X_NP,        X_NP
-          )
-        >;
-      };
+        )
+      >;
     };
   };
 };
diff --git a/config/corne.keymap.old b/config/corne.keymap.old
index 8379395..ae2e799 100644
--- a/config/corne.keymap.old
+++ b/config/corne.keymap.old
@@ -16,6 +16,7 @@
 #define NSSL 5
 #define FUNL 6
 
+
 / {
     behaviors {
         hm: homerow_mods {
diff --git a/config/makefile b/config/makefile
new file mode 100644
index 0000000..97bd9a6
--- /dev/null
+++ b/config/makefile
@@ -0,0 +1,3 @@
+
+default:
+	cd ${HOME}/tmp/src/github/manna-harbour/zmk/app && ${HOME}/.local/bin/west build -d build/left -b nice_nano -- -DSHIELD=corne_left -DZMK_CONFIG=${HOME}/tmp/src/github/manna-harbour/zmk-config/config/
diff --git a/miryoku-zmk.org b/miryoku-zmk.org
index 9e99d3d..fe841d8 100644
--- a/miryoku-zmk.org
+++ b/miryoku-zmk.org
@@ -567,6 +567,7 @@ prepended.
 #+NAME: nonkp
 | X_ | &  |
 
+
 *** keycode-translation
 
 standard keycode to implementation equivalent
@@ -590,7 +591,7 @@ standard keycode to implementation equivalent
 | AT      | X_NU        |
 | BSLS    | BSLH        |
 | BSPC    | BKSP        |
-| BTN1    | X_NU        |
+| BTN1    | A           |
 | BTN2    | X_NU        |
 | BTN3    | X_NU        |
 | CAPS    | CLCK        |
@@ -681,6 +682,7 @@ standard keycode to implementation equivalent
 | WH_R    | X_NU        |
 | WH_U    | X_NU        |
 
+
 *** header
 
 Header for tangled source files.
@@ -703,9 +705,9 @@ layout is mapped onto keyboards with different physical layouts as a subset.
 #+BEGIN_SRC C :noweb yes :padline no :tangle miryoku.keymap
 // <<header>>
 
-//#include <behaviors.dtsi>
-//#include <dt-bindings/zmk/keys.h>
-//#include <dt-bindings/zmk/bt.h>
+#include <behaviors.dtsi>
+#include <dt-bindings/zmk/keys.h>
+#include <dt-bindings/zmk/bt.h>
 
 #define MIRYOKU_SUBMAP(\
       K00,  K01,  K02,  K03,  K04,         K05,  K06,  K07,  K08,  K09,\
@@ -717,16 +719,17 @@ layout is mapped onto keyboards with different physical layouts as a subset.
 &none K10   K11   K12   K13   K14          K15   K16   K17   K18   K19   &none \
 &none K20   K21   K22   K23   K24          K25   K26   K27   K28   K29   &none \
                   K32   K33   K34          K35   K36   K37
+
 #define MIRYOKU_SUPERMAP(\
-      K00,  K01,  K02,  K03,  K04,         K05,  K06,  K07,  K08,  K09,\
-      K10,  K11,  K12,  K13,  K14,         K15,  K16,  K17,  K18,  K19,\
-      K20,  K21,  K22,  K23,  K24,         K25,  K26,  K27,  K28,  K29,\
-      N30,  N31,  K32,  K33,  K34,         K35,  K36,  K37,  N38,  N39\
+         K00,     K01,     K02,     K03,     K04,               K05,     K06,     K07,     K08,     K09,\
+         K10,     K11,     K12,     K13,     K14,               K15,     K16,     K17,     K18,     K19,\
+         K20,     K21,     K22,     K23,     K24,               K25,     K26,     K27,     K28,     K29,\
+         N30,     N31,     K32,     K33,     K34,               K35,     K36,     K37,     N38,     N39\
 )\
-LALT  K00   K01   K02   K03   K04          K05   K06   K07   K08   K09   LGUI  \
-LCTL  K10   K11   K12   K13   K14          K15   K16   K17   K18   K19   LCTL  \
-LSFT  K20   K21   K22   K23   K24          K25   K26   K27   K28   K29   LSFT  \
-                  K32   K33   K34          K35   K36   K37
+&kp LALT K00      K01      K02      K03      K04                K05      K06      K07      K08      K09      &kp LGUI  \
+&kp LCTL K10      K11      K12      K13      K14                K15      K16      K17      K18      K19      &kp LCTL  \
+&kp LSFT K20      K21      K22      K23      K24                K25      K26      K27      K28      K29      &kp LSFT  \
+                           K32      K33      K34                K35      K36      K37
 
 <<table-layer-defines()>>
 
@@ -747,139 +750,138 @@ LSFT  K20   K21   K22   K23   K24          K25   K26   K27   K28   K29   LSFT  \
   };
   keymap {
     compatible = "zmk,keymap";
-      BASE_layer {
-        bindings = <
+    BASE_layer {
+      bindings = <
 #if defined MIRYOKU_ALPHAS_COLEMAK
-          MIRYOKU_SUBMAP(
+        MIRYOKU_SUBMAP(
 <<table-map-taphold(tap_table=colemak)>>
-          )
+        )
 #elif defined MIRYOKU_ALPHAS_COLEMAKDH
-          MIRYOKU_SUBMAP(
+        MIRYOKU_SUBMAP(
 <<table-map-taphold(tap_table=colemakdh)>>
-          )
+        )
 #elif defined MIRYOKU_ALPHAS_DVORAK
-          MIRYOKU_SUBMAP(
+        MIRYOKU_SUBMAP(
 <<table-map-taphold(tap_table=dvorak)>>
-          )
+        )
 #elif defined MIRYOKU_ALPHAS_HALMAK
-          MIRYOKU_SUBMAP(
+        MIRYOKU_SUBMAP(
 <<table-map-taphold(tap_table=halmak)>>
-          )
+        )
 #elif defined MIRYOKU_ALPHAS_WORKMAN
-          MIRYOKU_SUBMAP(
+        MIRYOKU_SUBMAP(
 <<table-map-taphold(tap_table=workman)>>
-          )
+        )
 #elif defined MIRYOKU_ALPHAS_QWERTY
-          MIRYOKU_SUBMAP(
+        MIRYOKU_SUBMAP(
 <<table-map-taphold(tap_table=qwerty)>>
-          )
+        )
 #else
-          MIRYOKU_SUBMAP(
+        MIRYOKU_SUBMAP(
 <<table-map-taphold(tap_table=colemakdhm)>>
-          )
+        )
 #endif
-        >;
-      };
-      TAP_layer {
-        bindings = <
+      >;
+    };
+    TAP_layer {
+      bindings = <
 #if defined MIRYOKU_ALPHAS_COLEMAK
-          MIRYOKU_SUPERMAP(
+        MIRYOKU_SUPERMAP(
 <<table-map-full(table=colemak)>>
-          )
+        )
 #elif defined MIRYOKU_ALPHAS_COLEMAKDH
-          MIRYOKU_SUPERMAP(
+        MIRYOKU_SUPERMAP(
 <<table-map-full(table=colemakdh)>>
-          )
+        )
 #elif defined MIRYOKU_ALPHAS_DVORAK
-          MIRYOKU_SUPERMAP(
+         MIRYOKU_SUPERMAP(
 <<table-map-full(table=dvorak)>>
-          )
+        )
 #elif defined MIRYOKU_ALPHAS_HALMAK
-          MIRYOKU_SUPERMAP(
+        MIRYOKU_SUPERMAP(
 <<table-map-full(table=halmak)>>
-          )
+        )
 #elif defined MIRYOKU_ALPHAS_WORKMAN
-          MIRYOKU_SUPERMAP(
+        MIRYOKU_SUPERMAP(
 <<table-map-full(table=workman)>>
-          )
+        )
 #elif defined MIRYOKU_ALPHAS_QWERTY
-          MIRYOKU_SUPERMAP(
+        MIRYOKU_SUPERMAP(
 <<table-map-full(table=qwerty)>>
-          )
+        )
 #else
-          MIRYOKU_SUPERMAP(
+        MIRYOKU_SUPERMAP(
 <<table-map-full(table=colemakdhm)>>
-          )
+        )
 #endif
-        >;
-      };
-      MBO_layer {
-        bindings = <
-          MIRYOKU_SUBMAP(
+      >;
+    };
+    MBO_layer {
+      bindings = <
+        MIRYOKU_SUBMAP(
 <<table-map-full(table=mbo)>>
-          )
-        >;
-      };
-      NAVR_layer {
-        bindings = <
+        )
+      >;
+    };
+    NAVR_layer {
+      bindings = <
 #if defined MIRYOKU_NAV_VI
-          MIRYOKU_SUBMAP(
+        MIRYOKU_SUBMAP(
 <<table-map-half(mode="r", half_table=navr-vi)>>
-          )
+        )
 #else
-          MIRYOKU_SUBMAP(
+        MIRYOKU_SUBMAP(
 <<table-map-half(mode="r", half_table=navr)>>
-          )
+        )
 #endif
-        >;
-      };
-      MOUR_layer {
-        bindings = <
+      >;
+    };
+    MOUR_layer {
+      bindings = <
 #if defined MIRYOKU_NAV_VI
-          MIRYOKU_SUBMAP(
+        MIRYOKU_SUBMAP(
 <<table-map-half(mode="r", half_table=mour-vi)>>
-          )
+        )
 #else
-          MIRYOKU_SUBMAP(
+        MIRYOKU_SUBMAP(
 <<table-map-half(mode="r", half_table=mour)>>
-          )
+        )
 #endif
-        >;
-      };
-      MEDR_layer {
-        bindings = <
+      >;
+    };
+    MEDR_layer {
+      bindings = <
 #if defined MIRYOKU_NAV_VI
-          MIRYOKU_SUBMAP(
+        MIRYOKU_SUBMAP(
 <<table-map-half(mode="r", half_table=medr-vi)>>
-          )
+        )
 #else
-          MIRYOKU_SUBMAP(
+        MIRYOKU_SUBMAP(
 <<table-map-half(mode="r", half_table=medr)>>
-          )
+        )
 #endif
-        >;
-      };
-      NSL_layer {
-        bindings = <
-          MIRYOKU_SUBMAP(
+      >;
+    };
+    NSL_layer {
+      bindings = <
+        MIRYOKU_SUBMAP(
 <<table-map-half(mode="l", half_table=nsl)>>
-          )
-        >;
-      };
-      NSSL_layer {
-        bindings = <
-          MIRYOKU_SUBMAP(
+        )
+      >;
+    };
+    NSSL_layer {
+      bindings = <
+        MIRYOKU_SUBMAP(
 <<table-map-half(mode="l", half_table=nssl)>>
-          )
-        >;
-      };
-      FUNL_layer {
-        bindings = <
-          MIRYOKU_SUBMAP(
+        )
+      >;
+    };
+    FUNL_layer {
+      bindings = <
+        MIRYOKU_SUBMAP(
 <<table-map-half(mode="l", half_table=funl)>>
-          )
-        >;
-      };
+        )
+      >;
     };
   };
 };
diff --git a/miryoku.keymap b/miryoku.keymap
index 22e9af2..8ca81f2 100644
--- a/miryoku.keymap
+++ b/miryoku.keymap
@@ -1,8 +1,8 @@
 // generated from miryoku_zmk.org  -*- buffer-read-only: t -*-
 
-//#include <behaviors.dtsi>
-//#include <dt-bindings/zmk/keys.h>
-//#include <dt-bindings/zmk/bt.h>
+#include <behaviors.dtsi>
+#include <dt-bindings/zmk/keys.h>
+#include <dt-bindings/zmk/bt.h>
 
 #define MIRYOKU_SUBMAP(\
       K00,  K01,  K02,  K03,  K04,         K05,  K06,  K07,  K08,  K09,\
@@ -14,16 +14,17 @@
 &none K10   K11   K12   K13   K14          K15   K16   K17   K18   K19   &none \
 &none K20   K21   K22   K23   K24          K25   K26   K27   K28   K29   &none \
                   K32   K33   K34          K35   K36   K37
+
 #define MIRYOKU_SUPERMAP(\
-      K00,  K01,  K02,  K03,  K04,         K05,  K06,  K07,  K08,  K09,\
-      K10,  K11,  K12,  K13,  K14,         K15,  K16,  K17,  K18,  K19,\
-      K20,  K21,  K22,  K23,  K24,         K25,  K26,  K27,  K28,  K29,\
-      N30,  N31,  K32,  K33,  K34,         K35,  K36,  K37,  N38,  N39\
+         K00,     K01,     K02,     K03,     K04,               K05,     K06,     K07,     K08,     K09,\
+         K10,     K11,     K12,     K13,     K14,               K15,     K16,     K17,     K18,     K19,\
+         K20,     K21,     K22,     K23,     K24,               K25,     K26,     K27,     K28,     K29,\
+         N30,     N31,     K32,     K33,     K34,               K35,     K36,     K37,     N38,     N39\
 )\
-LALT  K00   K01   K02   K03   K04          K05   K06   K07   K08   K09   LGUI  \
-LCTL  K10   K11   K12   K13   K14          K15   K16   K17   K18   K19   LCTL  \
-LSFT  K20   K21   K22   K23   K24          K25   K26   K27   K28   K29   LSFT  \
-                  K32   K33   K34          K35   K36   K37
+&kp LALT K00      K01      K02      K03      K04                K05      K06      K07      K08      K09      &kp LGUI  \
+&kp LCTL K10      K11      K12      K13      K14                K15      K16      K17      K18      K19      &kp LCTL  \
+&kp LSFT K20      K21      K22      K23      K24                K25      K26      K27      K28      K29      &kp LSFT  \
+                           K32      K33      K34                K35      K36      K37
 
 #define BASE 0
 #define TAP  1
@@ -52,211 +53,210 @@ LSFT  K20   K21   K22   K23   K24          K25   K26   K27   K28   K29   LSFT  \
   };
   keymap {
     compatible = "zmk,keymap";
-      BASE_layer {
-        bindings = <
+    BASE_layer {
+      bindings = <
 #if defined MIRYOKU_ALPHAS_COLEMAK
-          MIRYOKU_SUBMAP(
+        MIRYOKU_SUBMAP(
 &kp Q,        &kp W,        &kp F,        &kp P,        &kp G,        &kp J,        &kp L,        &kp U,        &kp Y,        &kp QUOT,
 &hm LGUI A,   &hm LALT R,   &hm LCTL S,   &hm LSFT T,   &kp D,        &kp H,        &hm LSFT N,   &hm LCTL E,   &hm LALT I,   &hm LGUI O,
 &kp Z,        &hm RALT X,   &kp C,        &kp V,        &kp B,        &kp K,        &kp M,        &kp CMMA,     &hm RALT DOT, &kp FSLH,
 X_NP,         X_NP,         &lt MEDR ESC, &lt NAVR SPC, &lt MOUR TAB, &lt NSSL RET, &lt NSL BKSP, &lt FUNL DEL, X_NP,         X_NP
-          )
+        )
 #elif defined MIRYOKU_ALPHAS_COLEMAKDH
-          MIRYOKU_SUBMAP(
+        MIRYOKU_SUBMAP(
 &kp Q,        &kp W,        &kp F,        &kp P,        &kp B,        &kp J,        &kp L,        &kp U,        &kp Y,        &kp QUOT,
 &hm LGUI A,   &hm LALT R,   &hm LCTL S,   &hm LSFT T,   &kp G,        &kp K,        &hm LSFT N,   &hm LCTL E,   &hm LALT I,   &hm LGUI O,
 &kp Z,        &hm RALT X,   &kp C,        &kp D,        &kp V,        &kp M,        &kp H,        &kp CMMA,     &hm RALT DOT, &kp FSLH,
 X_NP,         X_NP,         &lt MEDR ESC, &lt NAVR SPC, &lt MOUR TAB, &lt NSSL RET, &lt NSL BKSP, &lt FUNL DEL, X_NP,         X_NP
-          )
+        )
 #elif defined MIRYOKU_ALPHAS_DVORAK
-          MIRYOKU_SUBMAP(
+        MIRYOKU_SUBMAP(
 &kp QUOT,     &kp CMMA,     &kp DOT,      &kp P,        &kp Y,        &kp F,        &kp G,        &kp C,        &kp R,        &kp L,
 &hm LGUI A,   &hm LALT O,   &hm LCTL E,   &hm LSFT U,   &kp I,        &kp D,        &hm LSFT H,   &hm LCTL T,   &hm LALT N,   &hm LGUI S,
 &kp FSLH,     &hm RALT Q,   &kp J,        &kp K,        &kp X,        &kp B,        &kp M,        &kp W,        &hm RALT V,   &kp Z,
 X_NP,         X_NP,         &lt MEDR ESC, &lt NAVR SPC, &lt MOUR TAB, &lt NSSL RET, &lt NSL BKSP, &lt FUNL DEL, X_NP,         X_NP
-          )
+        )
 #elif defined MIRYOKU_ALPHAS_HALMAK
-          MIRYOKU_SUBMAP(
+        MIRYOKU_SUBMAP(
 &kp W,        &kp L,        &kp R,        &kp B,        &kp Z,        &kp QUOT,     &kp Q,        &kp U,        &kp D,        &kp J,
 &hm LGUI S,   &hm LALT H,   &hm LCTL N,   &hm LSFT T,   &kp CMMA,     &kp DOT,      &hm LSFT A,   &hm LCTL E,   &hm LALT O,   &hm LGUI I,
 &kp F,        &hm RALT M,   &kp V,        &kp C,        &kp FSLH,     &kp G,        &kp P,        &kp X,        &hm RALT K,   &kp Y,
 X_NP,         X_NP,         &lt MEDR ESC, &lt NAVR SPC, &lt MOUR TAB, &lt NSSL RET, &lt NSL BKSP, &lt FUNL DEL, X_NP,         X_NP
-          )
+        )
 #elif defined MIRYOKU_ALPHAS_WORKMAN
-          MIRYOKU_SUBMAP(
+        MIRYOKU_SUBMAP(
 &kp Q,        &kp D,        &kp R,        &kp W,        &kp B,        &kp J,        &kp F,        &kp U,        &kp P,        &kp QUOT,
 &hm LGUI A,   &hm LALT S,   &hm LCTL H,   &hm LSFT T,   &kp G,        &kp Y,        &hm LSFT N,   &hm LCTL E,   &hm LALT O,   &hm LGUI I,
 &kp Z,        &hm RALT X,   &kp M,        &kp C,        &kp V,        &kp K,        &kp L,        &kp CMMA,     &hm RALT DOT, &kp FSLH,
 X_NP,         X_NP,         &lt MEDR ESC, &lt NAVR SPC, &lt MOUR TAB, &lt NSSL RET, &lt NSL BKSP, &lt FUNL DEL, X_NP,         X_NP
-          )
+        )
 #elif defined MIRYOKU_ALPHAS_QWERTY
-          MIRYOKU_SUBMAP(
+        MIRYOKU_SUBMAP(
 &kp Q,        &kp W,        &kp E,        &kp R,        &kp T,        &kp Y,        &kp U,        &kp I,        &kp O,        &kp P,
 &hm LGUI A,   &hm LALT S,   &hm LCTL D,   &hm LSFT F,   &kp G,        &kp H,        &hm LSFT J,   &hm LCTL K,   &hm LALT L,   &hm LGUI QUOT,
 &kp Z,        &hm RALT X,   &kp C,        &kp V,        &kp B,        &kp N,        &kp M,        &kp CMMA,     &hm RALT DOT, &kp FSLH,
 X_NP,         X_NP,         &lt MEDR ESC, &lt NAVR SPC, &lt MOUR TAB, &lt NSSL RET, &lt NSL BKSP, &lt FUNL DEL, X_NP,         X_NP
-          )
+        )
 #else
-          MIRYOKU_SUBMAP(
+        MIRYOKU_SUBMAP(
 &kp Q,        &kp W,        &kp F,        &kp P,        &kp B,        &kp J,        &kp L,        &kp U,        &kp Y,        &kp QUOT,
 &hm LGUI A,   &hm LALT R,   &hm LCTL S,   &hm LSFT T,   &kp G,        &kp M,        &hm LSFT N,   &hm LCTL E,   &hm LALT I,   &hm LGUI O,
 &kp Z,        &hm RALT X,   &kp C,        &kp D,        &kp V,        &kp K,        &kp H,        &kp CMMA,     &hm RALT DOT, &kp FSLH,
 X_NP,         X_NP,         &lt MEDR ESC, &lt NAVR SPC, &lt MOUR TAB, &lt NSSL RET, &lt NSL BKSP, &lt FUNL DEL, X_NP,         X_NP
-          )
+        )
 #endif
-        >;
-      };
-      TAP_layer {
-        bindings = <
+      >;
+    };
+    TAP_layer {
+      bindings = <
 #if defined MIRYOKU_ALPHAS_COLEMAK
-          MIRYOKU_SUPERMAP(
+        MIRYOKU_SUPERMAP(
 &kp Q,    &kp W,    &kp F,    &kp P,    &kp G,    &kp J,    &kp L,    &kp U,    &kp Y,    &kp QUOT,
 &kp A,    &kp R,    &kp S,    &kp T,    &kp D,    &kp H,    &kp N,    &kp E,    &kp I,    &kp O,
 &kp Z,    &kp X,    &kp C,    &kp V,    &kp B,    &kp K,    &kp M,    &kp CMMA, &kp DOT,  &kp FSLH,
 X_NP,     X_NP,     &kp ESC,  &kp SPC,  &kp TAB,  &kp RET,  &kp BKSP, &kp DEL,  X_NP,     X_NP
-          )
+        )
 #elif defined MIRYOKU_ALPHAS_COLEMAKDH
-          MIRYOKU_SUPERMAP(
+        MIRYOKU_SUPERMAP(
 &kp Q,    &kp W,    &kp F,    &kp P,    &kp B,    &kp J,    &kp L,    &kp U,    &kp Y,    &kp QUOT,
 &kp A,    &kp R,    &kp S,    &kp T,    &kp G,    &kp K,    &kp N,    &kp E,    &kp I,    &kp O,
 &kp Z,    &kp X,    &kp C,    &kp D,    &kp V,    &kp M,    &kp H,    &kp CMMA, &kp DOT,  &kp FSLH,
 X_NP,     X_NP,     &kp ESC,  &kp SPC,  &kp TAB,  &kp RET,  &kp BKSP, &kp DEL,  X_NP,     X_NP
-          )
+        )
 #elif defined MIRYOKU_ALPHAS_DVORAK
-          MIRYOKU_SUPERMAP(
+         MIRYOKU_SUPERMAP(
 &kp QUOT, &kp CMMA, &kp DOT,  &kp P,    &kp Y,    &kp F,    &kp G,    &kp C,    &kp R,    &kp L,
 &kp A,    &kp O,    &kp E,    &kp U,    &kp I,    &kp D,    &kp H,    &kp T,    &kp N,    &kp S,
 &kp FSLH, &kp Q,    &kp J,    &kp K,    &kp X,    &kp B,    &kp M,    &kp W,    &kp V,    &kp Z,
 X_NP,     X_NP,     &kp ESC,  &kp SPC,  &kp TAB,  &kp RET,  &kp BKSP, &kp DEL,  X_NP,     X_NP
-          )
+        )
 #elif defined MIRYOKU_ALPHAS_HALMAK
-          MIRYOKU_SUPERMAP(
+        MIRYOKU_SUPERMAP(
 &kp W,    &kp L,    &kp R,    &kp B,    &kp Z,    &kp QUOT, &kp Q,    &kp U,    &kp D,    &kp J,
 &kp S,    &kp H,    &kp N,    &kp T,    &kp CMMA, &kp DOT,  &kp A,    &kp E,    &kp O,    &kp I,
 &kp F,    &kp M,    &kp V,    &kp C,    &kp FSLH, &kp G,    &kp P,    &kp X,    &kp K,    &kp Y,
 X_NP,     X_NP,     &kp ESC,  &kp SPC,  &kp TAB,  &kp RET,  &kp BKSP, &kp DEL,  X_NP,     X_NP
-          )
+        )
 #elif defined MIRYOKU_ALPHAS_WORKMAN
-          MIRYOKU_SUPERMAP(
+        MIRYOKU_SUPERMAP(
 &kp Q,    &kp D,    &kp R,    &kp W,    &kp B,    &kp J,    &kp F,    &kp U,    &kp P,    &kp QUOT,
 &kp A,    &kp S,    &kp H,    &kp T,    &kp G,    &kp Y,    &kp N,    &kp E,    &kp O,    &kp I,
 &kp Z,    &kp X,    &kp M,    &kp C,    &kp V,    &kp K,    &kp L,    &kp CMMA, &kp DOT,  &kp FSLH,
 X_NP,     X_NP,     &kp ESC,  &kp SPC,  &kp TAB,  &kp RET,  &kp BKSP, &kp DEL,  X_NP,     X_NP
-          )
+        )
 #elif defined MIRYOKU_ALPHAS_QWERTY
-          MIRYOKU_SUPERMAP(
+        MIRYOKU_SUPERMAP(
 &kp Q,    &kp W,    &kp E,    &kp R,    &kp T,    &kp Y,    &kp U,    &kp I,    &kp O,    &kp P,
 &kp A,    &kp S,    &kp D,    &kp F,    &kp G,    &kp H,    &kp J,    &kp K,    &kp L,    &kp QUOT,
 &kp Z,    &kp X,    &kp C,    &kp V,    &kp B,    &kp N,    &kp M,    &kp CMMA, &kp DOT,  &kp FSLH,
 X_NP,     X_NP,     &kp ESC,  &kp SPC,  &kp TAB,  &kp RET,  &kp BKSP, &kp DEL,  X_NP,     X_NP
-          )
+        )
 #else
-          MIRYOKU_SUPERMAP(
+        MIRYOKU_SUPERMAP(
 &kp Q,    &kp W,    &kp F,    &kp P,    &kp B,    &kp J,    &kp L,    &kp U,    &kp Y,    &kp QUOT,
 &kp A,    &kp R,    &kp S,    &kp T,    &kp G,    &kp M,    &kp N,    &kp E,    &kp I,    &kp O,
 &kp Z,    &kp X,    &kp C,    &kp D,    &kp V,    &kp K,    &kp H,    &kp CMMA, &kp DOT,  &kp FSLH,
 X_NP,     X_NP,     &kp ESC,  &kp SPC,  &kp TAB,  &kp RET,  &kp BKSP, &kp DEL,  X_NP,     X_NP
-          )
+        )
 #endif
-        >;
-      };
-      MBO_layer {
-        bindings = <
-          MIRYOKU_SUBMAP(
+      >;
+    };
+    MBO_layer {
+      bindings = <
+        MIRYOKU_SUBMAP(
 &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,
-X_NP,     X_NP,     &trans,   &trans,   &trans,   X_NU,     X_NU,     X_NU,     X_NP,     X_NP
-          )
-        >;
-      };
-      NAVR_layer {
-        bindings = <
+X_NP,     X_NP,     &trans,   &trans,   &trans,   &kp A,    X_NU,     X_NU,     X_NP,     X_NP
+        )
+      >;
+    };
+    NAVR_layer {
+      bindings = <
 #if defined MIRYOKU_NAV_VI
-          MIRYOKU_SUBMAP(
+        MIRYOKU_SUBMAP(
 &bootloader, X_NA,        X_NA,        X_NA,        X_NA,        X_NU,        &kp UNDO,    &kp CUT,     &kp COPY,    &kp PSTE,
 &kp LGUI,    &kp LALT,    &kp LCTL,    &kp LSFT,    X_NA,        &kp LARW,    &kp DARW,    &kp UARW,    &kp RARW,    &kp CLCK,
 X_NA,        &kp RALT,    X_NA,        X_NA,        X_NA,        &kp HOME,    &kp PGDN,    &kp PGUP,    &kp END,     &kp INS,
 X_NP,        X_NP,        X_NA,        X_NA,        X_NA,        &kp RET,     &kp BKSP,    &kp DEL,     X_NP,        X_NP
-          )
+        )
 #else
-          MIRYOKU_SUBMAP(
+        MIRYOKU_SUBMAP(
 &bootloader, X_NA,        X_NA,        X_NA,        X_NA,        X_NU,        &kp UNDO,    &kp CUT,     &kp COPY,    &kp PSTE,
 &kp LGUI,    &kp LALT,    &kp LCTL,    &kp LSFT,    X_NA,        &kp CLCK,    &kp LARW,    &kp DARW,    &kp UARW,    &kp RARW,
 X_NA,        &kp RALT,    X_NA,        X_NA,        X_NA,        &kp INS,     &kp HOME,    &kp PGDN,    &kp PGUP,    &kp END,
 X_NP,        X_NP,        X_NA,        X_NA,        X_NA,        &kp RET,     &kp BKSP,    &kp DEL,     X_NP,        X_NP
-          )
+        )
 #endif
-        >;
-      };
-      MOUR_layer {
-        bindings = <
+      >;
+    };
+    MOUR_layer {
+      bindings = <
 #if defined MIRYOKU_NAV_VI
-          MIRYOKU_SUBMAP(
+        MIRYOKU_SUBMAP(
 &bootloader, X_NA,        X_NA,        X_NA,        X_NA,        X_NU,        X_NU,        X_NU,        X_NU,        X_NU,
 &kp LGUI,    &kp LALT,    &kp LCTL,    &kp LSFT,    X_NA,        X_NU,        X_NU,        X_NU,        X_NU,        X_NU,
 X_NA,        &kp RALT,    X_NA,        X_NA,        X_NA,        X_NU,        X_NU,        X_NU,        X_NU,        X_NU,
-X_NP,        X_NP,        X_NA,        X_NA,        X_NA,        X_NU,        X_NU,        X_NU,        X_NP,        X_NP
-          )
+X_NP,        X_NP,        X_NA,        X_NA,        X_NA,        &kp A,       X_NU,        X_NU,        X_NP,        X_NP
+        )
 #else
-          MIRYOKU_SUBMAP(
+        MIRYOKU_SUBMAP(
 &bootloader, X_NA,        X_NA,        X_NA,        X_NA,        X_NU,        X_NU,        X_NU,        X_NU,        X_NU,
 &kp LGUI,    &kp LALT,    &kp LCTL,    &kp LSFT,    X_NA,        X_NU,        X_NU,        X_NU,        X_NU,        X_NU,
 X_NA,        &kp RALT,    X_NA,        X_NA,        X_NA,        X_NU,        X_NU,        X_NU,        X_NU,        X_NU,
-X_NP,        X_NP,        X_NA,        X_NA,        X_NA,        X_NU,        X_NU,        X_NU,        X_NP,        X_NP
-          )
+X_NP,        X_NP,        X_NA,        X_NA,        X_NA,        &kp A,       X_NU,        X_NU,        X_NP,        X_NP
+        )
 #endif
-        >;
-      };
-      MEDR_layer {
-        bindings = <
+      >;
+    };
+    MEDR_layer {
+      bindings = <
 #if defined MIRYOKU_NAV_VI
-          MIRYOKU_SUBMAP(
+        MIRYOKU_SUBMAP(
 &bootloader, X_NA,        X_NA,        X_NA,        X_NA,        X_NU,        X_NU,        X_NU,        X_NU,        X_NU,
 &kp LGUI,    &kp LALT,    &kp LCTL,    &kp LSFT,    X_NA,        &kp M_PREV,  &kp VOLD,    &kp VOLU,    &kp M_NEXT,  X_NU,
 X_NA,        &kp RALT,    X_NA,        X_NA,        X_NA,        X_NU,        X_NU,        X_NU,        X_NU,        X_NU,
 X_NP,        X_NP,        X_NA,        X_NA,        X_NA,        &kp M_STOP,  &kp M_PLAY,  &kp M_MUTE,  X_NP,        X_NP
-          )
+        )
 #else
-          MIRYOKU_SUBMAP(
+        MIRYOKU_SUBMAP(
 &bootloader, X_NA,        X_NA,        X_NA,        X_NA,        X_NU,        X_NU,        X_NU,        X_NU,        X_NU,
 &kp LGUI,    &kp LALT,    &kp LCTL,    &kp LSFT,    X_NA,        X_NU,        &kp M_PREV,  &kp VOLD,    &kp VOLU,    &kp M_NEXT,
 X_NA,        &kp RALT,    X_NA,        X_NA,        X_NA,        X_NU,        X_NU,        X_NU,        X_NU,        X_NU,
 X_NP,        X_NP,        X_NA,        X_NA,        X_NA,        &kp M_STOP,  &kp M_PLAY,  &kp M_MUTE,  X_NP,        X_NP
-          )
+        )
 #endif
-        >;
-      };
-      NSL_layer {
-        bindings = <
-          MIRYOKU_SUBMAP(
+      >;
+    };
+    NSL_layer {
+      bindings = <
+        MIRYOKU_SUBMAP(
 &kp LBKT,    &kp NUM_7,   &kp NUM_8,   &kp NUM_9,   &kp RBKT,    X_NA,        X_NA,        X_NA,        X_NA,        &bootloader,
 &kp SCLN,    &kp NUM_4,   &kp NUM_5,   &kp NUM_6,   &kp EQL,     X_NA,        &kp LSFT,    &kp LCTL,    &kp LALT,    &kp LGUI,
 &kp GRAV,    &kp NUM_1,   &kp NUM_2,   &kp NUM_3,   &kp BSLH,    X_NA,        X_NA,        X_NA,        &kp RALT,    X_NA,
 X_NP,        X_NP,        &kp DOT,     &kp NUM_0,   &kp MINUS,   X_NA,        X_NA,        X_NA,        X_NP,        X_NP
-          )
-        >;
-      };
-      NSSL_layer {
-        bindings = <
-          MIRYOKU_SUBMAP(
+        )
+      >;
+    };
+    NSSL_layer {
+      bindings = <
+        MIRYOKU_SUBMAP(
 X_NU,        X_NU,        X_NU,        X_NU,        X_NU,        X_NA,        X_NA,        X_NA,        X_NA,        &bootloader,
 X_NU,        X_NU,        X_NU,        X_NU,        X_NU,        X_NA,        &kp LSFT,    &kp LCTL,    &kp LALT,    &kp LGUI,
 X_NU,        X_NU,        X_NU,        X_NU,        X_NU,        X_NA,        X_NA,        X_NA,        &kp RALT,    X_NA,
 X_NP,        X_NP,        X_NU,        X_NU,        X_NU,        X_NA,        X_NA,        X_NA,        X_NP,        X_NP
-          )
-        >;
-      };
-      FUNL_layer {
-        bindings = <
-          MIRYOKU_SUBMAP(
+        )
+      >;
+    };
+    FUNL_layer {
+      bindings = <
+        MIRYOKU_SUBMAP(
 &kp F12,     &kp F7,      &kp F8,      &kp F9,      &kp PRSC,    X_NA,        X_NA,        X_NA,        X_NA,        &bootloader,
 &kp F11,     &kp F4,      &kp F5,      &kp F6,      &kp SCLK,    X_NA,        &kp LSFT,    &kp LCTL,    &kp LALT,    &kp LGUI,
 &kp F10,     &kp F1,      &kp F2,      &kp F3,      &kp PAUS,    X_NA,        X_NA,        X_NA,        &kp RALT,    X_NA,
 X_NP,        X_NP,        X_NU,        &kp SPC,     &kp TAB,     X_NA,        X_NA,        X_NA,        X_NP,        X_NP
-          )
-        >;
-      };
+        )
+      >;
     };
   };
 };