diff --git a/miryoku-zmk.org b/miryoku-zmk.org
index 6c05782..9e99d3d 100644
--- a/miryoku-zmk.org
+++ b/miryoku-zmk.org
@@ -519,7 +519,7 @@ return results
 *** layers
 
 #+NAME: layers
-| BASE | MBO  | NAVR | MOUR | MEDR | NSL | NSSL | FUNL |
+| BASE | TAP  | MBO  | NAVR | MOUR | MEDR | NSL  | NSSL | FUNL |
 
 
 *** symbol-names
@@ -707,7 +707,7 @@ layout is mapped onto keyboards with different physical layouts as a subset.
 //#include <dt-bindings/zmk/keys.h>
 //#include <dt-bindings/zmk/bt.h>
 
-#define SUBMAP(\
+#define MIRYOKU_SUBMAP(\
       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,\
@@ -717,6 +717,16 @@ 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\
+)\
+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
 
 <<table-layer-defines()>>
 
@@ -740,39 +750,72 @@ layout is mapped onto keyboards with different physical layouts as a subset.
       BASE_layer {
         bindings = <
 #if defined MIRYOKU_ALPHAS_COLEMAK
-          SUBMAP(
+          MIRYOKU_SUBMAP(
 <<table-map-taphold(tap_table=colemak)>>
           )
 #elif defined MIRYOKU_ALPHAS_COLEMAKDH
-          SUBMAP(
+          MIRYOKU_SUBMAP(
 <<table-map-taphold(tap_table=colemakdh)>>
           )
 #elif defined MIRYOKU_ALPHAS_DVORAK
-          SUBMAP(
+          MIRYOKU_SUBMAP(
 <<table-map-taphold(tap_table=dvorak)>>
           )
 #elif defined MIRYOKU_ALPHAS_HALMAK
-          SUBMAP(
+          MIRYOKU_SUBMAP(
 <<table-map-taphold(tap_table=halmak)>>
           )
 #elif defined MIRYOKU_ALPHAS_WORKMAN
-          SUBMAP(
+          MIRYOKU_SUBMAP(
 <<table-map-taphold(tap_table=workman)>>
           )
 #elif defined MIRYOKU_ALPHAS_QWERTY
-          SUBMAP(
+          MIRYOKU_SUBMAP(
 <<table-map-taphold(tap_table=qwerty)>>
           )
 #else
-          SUBMAP(
+          MIRYOKU_SUBMAP(
 <<table-map-taphold(tap_table=colemakdhm)>>
           )
+#endif
+        >;
+      };
+      TAP_layer {
+        bindings = <
+#if defined MIRYOKU_ALPHAS_COLEMAK
+          MIRYOKU_SUPERMAP(
+<<table-map-full(table=colemak)>>
+          )
+#elif defined MIRYOKU_ALPHAS_COLEMAKDH
+          MIRYOKU_SUPERMAP(
+<<table-map-full(table=colemakdh)>>
+          )
+#elif defined MIRYOKU_ALPHAS_DVORAK
+          MIRYOKU_SUPERMAP(
+<<table-map-full(table=dvorak)>>
+          )
+#elif defined MIRYOKU_ALPHAS_HALMAK
+          MIRYOKU_SUPERMAP(
+<<table-map-full(table=halmak)>>
+          )
+#elif defined MIRYOKU_ALPHAS_WORKMAN
+          MIRYOKU_SUPERMAP(
+<<table-map-full(table=workman)>>
+          )
+#elif defined MIRYOKU_ALPHAS_QWERTY
+          MIRYOKU_SUPERMAP(
+<<table-map-full(table=qwerty)>>
+          )
+#else
+          MIRYOKU_SUPERMAP(
+<<table-map-full(table=colemakdhm)>>
+          )
 #endif
         >;
       };
       MBO_layer {
         bindings = <
-          SUBMAP(
+          MIRYOKU_SUBMAP(
 <<table-map-full(table=mbo)>>
           )
         >;
@@ -780,11 +823,11 @@ layout is mapped onto keyboards with different physical layouts as a subset.
       NAVR_layer {
         bindings = <
 #if defined MIRYOKU_NAV_VI
-          SUBMAP(
+          MIRYOKU_SUBMAP(
 <<table-map-half(mode="r", half_table=navr-vi)>>
           )
 #else
-          SUBMAP(
+          MIRYOKU_SUBMAP(
 <<table-map-half(mode="r", half_table=navr)>>
           )
 #endif
@@ -793,11 +836,11 @@ layout is mapped onto keyboards with different physical layouts as a subset.
       MOUR_layer {
         bindings = <
 #if defined MIRYOKU_NAV_VI
-          SUBMAP(
+          MIRYOKU_SUBMAP(
 <<table-map-half(mode="r", half_table=mour-vi)>>
           )
 #else
-          SUBMAP(
+          MIRYOKU_SUBMAP(
 <<table-map-half(mode="r", half_table=mour)>>
           )
 #endif
@@ -806,11 +849,11 @@ layout is mapped onto keyboards with different physical layouts as a subset.
       MEDR_layer {
         bindings = <
 #if defined MIRYOKU_NAV_VI
-          SUBMAP(
+          MIRYOKU_SUBMAP(
 <<table-map-half(mode="r", half_table=medr-vi)>>
           )
 #else
-          SUBMAP(
+          MIRYOKU_SUBMAP(
 <<table-map-half(mode="r", half_table=medr)>>
           )
 #endif
@@ -818,21 +861,21 @@ layout is mapped onto keyboards with different physical layouts as a subset.
       };
       NSL_layer {
         bindings = <
-          SUBMAP(
+          MIRYOKU_SUBMAP(
 <<table-map-half(mode="l", half_table=nsl)>>
           )
         >;
       };
       NSSL_layer {
         bindings = <
-          SUBMAP(
+          MIRYOKU_SUBMAP(
 <<table-map-half(mode="l", half_table=nssl)>>
           )
         >;
       };
       FUNL_layer {
         bindings = <
-          SUBMAP(
+          MIRYOKU_SUBMAP(
 <<table-map-half(mode="l", half_table=funl)>>
           )
         >;
diff --git a/miryoku.keymap b/miryoku.keymap
index f9f0e98..22e9af2 100644
--- a/miryoku.keymap
+++ b/miryoku.keymap
@@ -4,7 +4,7 @@
 //#include <dt-bindings/zmk/keys.h>
 //#include <dt-bindings/zmk/bt.h>
 
-#define SUBMAP(\
+#define MIRYOKU_SUBMAP(\
       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,\
@@ -14,15 +14,26 @@
 &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\
+)\
+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
 
 #define BASE 0
-#define MBO  1
-#define NAVR 2
-#define MOUR 3
-#define MEDR 4
-#define NSL  5
-#define NSSL 6
-#define FUNL 7
+#define TAP  1
+#define MBO  2
+#define NAVR 3
+#define MOUR 4
+#define MEDR 5
+#define NSL  6
+#define NSSL 7
+#define FUNL 8
 
 #define X_NP &none // key is not present
 #define X_NA &none // present but not available for use
@@ -44,60 +55,114 @@
       BASE_layer {
         bindings = <
 #if defined MIRYOKU_ALPHAS_COLEMAK
-          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
-          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
-          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
-          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
-          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
-          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
-          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 = <
+#if defined MIRYOKU_ALPHAS_COLEMAK
+          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(
+&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(
+&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(
+&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(
+&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(
+&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(
+&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 = <
-          SUBMAP(
+          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,
@@ -108,14 +173,14 @@ X_NP,     X_NP,     &trans,   &trans,   &trans,   X_NU,     X_NU,     X_NU,
       NAVR_layer {
         bindings = <
 #if defined MIRYOKU_NAV_VI
-          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
-          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,
@@ -127,14 +192,14 @@ X_NP,        X_NP,        X_NA,        X_NA,        X_NA,        &kp RET,     &k
       MOUR_layer {
         bindings = <
 #if defined MIRYOKU_NAV_VI
-          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
           )
 #else
-          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,
@@ -146,14 +211,14 @@ X_NP,        X_NP,        X_NA,        X_NA,        X_NA,        X_NU,        X_
       MEDR_layer {
         bindings = <
 #if defined MIRYOKU_NAV_VI
-          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
-          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,
@@ -164,7 +229,7 @@ X_NP,        X_NP,        X_NA,        X_NA,        X_NA,        &kp M_STOP,  &k
       };
       NSL_layer {
         bindings = <
-          SUBMAP(
+          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,
@@ -174,7 +239,7 @@ X_NP,        X_NP,        &kp DOT,     &kp NUM_0,   &kp MINUS,   X_NA,        X_
       };
       NSSL_layer {
         bindings = <
-          SUBMAP(
+          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,
@@ -184,7 +249,7 @@ X_NP,        X_NP,        X_NU,        X_NU,        X_NU,        X_NA,        X_
       };
       FUNL_layer {
         bindings = <
-          SUBMAP(
+          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,