diff --git a/config/boardsource5x12.keymap b/config/boardsource5x12.keymap
index 9e164aa..3ad3200 100644
--- a/config/boardsource5x12.keymap
+++ b/config/boardsource5x12.keymap
@@ -3,4 +3,3 @@
 
 #include "../miryoku/mapping/60-preonic.h"
 #include "../miryoku/miryoku.dtsi"
-
diff --git a/config/contra.keymap b/config/contra.keymap
index c553151..a5eba21 100644
--- a/config/contra.keymap
+++ b/config/contra.keymap
@@ -3,4 +3,3 @@
 
 #include "../miryoku/mapping/48-planck.h"
 #include "../miryoku/miryoku.dtsi"
-
diff --git a/config/cradio.keymap b/config/cradio.keymap
index 620a1e6..33eb48e 100644
--- a/config/cradio.keymap
+++ b/config/cradio.keymap
@@ -1,3 +1,5 @@
+// Copyright 2021 Manna Harbour
+// https://github.com/manna-harbour/miryoku
 
 #include "../miryoku/mapping/34-ferris.h"
 #include "../miryoku/miryoku.dtsi"
diff --git a/config/cradioz.keymap b/config/cradioz.keymap
index 620a1e6..33eb48e 100644
--- a/config/cradioz.keymap
+++ b/config/cradioz.keymap
@@ -1,3 +1,5 @@
+// Copyright 2021 Manna Harbour
+// https://github.com/manna-harbour/miryoku
 
 #include "../miryoku/mapping/34-ferris.h"
 #include "../miryoku/miryoku.dtsi"
diff --git a/config/crbn.keymap b/config/crbn.keymap
index c553151..a5eba21 100644
--- a/config/crbn.keymap
+++ b/config/crbn.keymap
@@ -3,4 +3,3 @@
 
 #include "../miryoku/mapping/48-planck.h"
 #include "../miryoku/miryoku.dtsi"
-
diff --git a/config/ferris_rev02.keymap b/config/ferris_rev02.keymap
index 620a1e6..33eb48e 100644
--- a/config/ferris_rev02.keymap
+++ b/config/ferris_rev02.keymap
@@ -1,3 +1,5 @@
+// Copyright 2021 Manna Harbour
+// https://github.com/manna-harbour/miryoku
 
 #include "../miryoku/mapping/34-ferris.h"
 #include "../miryoku/miryoku.dtsi"
diff --git a/config/levinson.keymap b/config/levinson.keymap
index d917688..24b20dd 100644
--- a/config/levinson.keymap
+++ b/config/levinson.keymap
@@ -3,4 +3,3 @@
 
 #include "../miryoku/mapping/48-lets_split.h"
 #include "../miryoku/miryoku.dtsi"
-
diff --git a/config/naked60.keymap b/config/naked60.keymap
index b143de7..67c8b0c 100644
--- a/config/naked60.keymap
+++ b/config/naked60.keymap
@@ -3,4 +3,3 @@
 
 #include "../miryoku/mapping/60-naked.h"
 #include "../miryoku/miryoku.dtsi"
-
diff --git a/config/planck_rev6.keymap b/config/planck_rev6.keymap
index c553151..a5eba21 100644
--- a/config/planck_rev6.keymap
+++ b/config/planck_rev6.keymap
@@ -3,4 +3,3 @@
 
 #include "../miryoku/mapping/48-planck.h"
 #include "../miryoku/miryoku.dtsi"
-
diff --git a/config/pockettype.keymap b/config/pockettype.keymap
index c553151..a5eba21 100644
--- a/config/pockettype.keymap
+++ b/config/pockettype.keymap
@@ -3,4 +3,3 @@
 
 #include "../miryoku/mapping/48-planck.h"
 #include "../miryoku/miryoku.dtsi"
-
diff --git a/config/preonic_rev3.keymap b/config/preonic_rev3.keymap
index 9e164aa..3ad3200 100644
--- a/config/preonic_rev3.keymap
+++ b/config/preonic_rev3.keymap
@@ -3,4 +3,3 @@
 
 #include "../miryoku/mapping/60-preonic.h"
 #include "../miryoku/miryoku.dtsi"
-
diff --git a/config/rebound_v4.keymap b/config/rebound_v4.keymap
index ba91110..50dec8d 100644
--- a/config/rebound_v4.keymap
+++ b/config/rebound_v4.keymap
@@ -3,4 +3,3 @@
 
 #include "../miryoku/mapping/63-rebound.h"
 #include "../miryoku/miryoku.dtsi"
-
diff --git a/config/sweepv2.keymap b/config/sweepv2.keymap
index 620a1e6..33eb48e 100644
--- a/config/sweepv2.keymap
+++ b/config/sweepv2.keymap
@@ -1,3 +1,5 @@
+// Copyright 2021 Manna Harbour
+// https://github.com/manna-harbour/miryoku
 
 #include "../miryoku/mapping/34-ferris.h"
 #include "../miryoku/miryoku.dtsi"
diff --git a/config/viterbi.keymap b/config/viterbi.keymap
index f39cb74..e6563cd 100644
--- a/config/viterbi.keymap
+++ b/config/viterbi.keymap
@@ -3,4 +3,3 @@
 
 #include "../miryoku/mapping/70-viterbi.h"
 #include "../miryoku/miryoku.dtsi"
-
diff --git a/config/zaphod.keymap b/config/zaphod.keymap
index 620a1e6..33eb48e 100644
--- a/config/zaphod.keymap
+++ b/config/zaphod.keymap
@@ -1,3 +1,5 @@
+// Copyright 2021 Manna Harbour
+// https://github.com/manna-harbour/miryoku
 
 #include "../miryoku/mapping/34-ferris.h"
 #include "../miryoku/miryoku.dtsi"
diff --git a/miryoku/mapping/34-ble_chiffre.h b/miryoku/mapping/34-ble_chiffre.h
index 5341670..e2b13a9 100644
--- a/miryoku/mapping/34-ble_chiffre.h
+++ b/miryoku/mapping/34-ble_chiffre.h
@@ -12,8 +12,6 @@ K10  K11  K12  K13  K14       K15  K16  K17  K18  K19 \
 K20  K21  K22  K23  K24       K25  K26  K27  K28  K29 \
           K34  K33                 K36  K35
 
-#define MIRYOKU_MAPPING_TAP MIRYOKU_MAPPING
-
 #define MIRYOKU_COMBO_TPSL 30 31
 #define MIRYOKU_COMBO_TPSR 32 33
 
diff --git a/miryoku/mapping/34-ferris.h b/miryoku/mapping/34-ferris.h
index 17f1044..9b694e1 100644
--- a/miryoku/mapping/34-ferris.h
+++ b/miryoku/mapping/34-ferris.h
@@ -1,8 +1,6 @@
 // Copyright 2021 Manna Harbour
 // https://github.com/manna-harbour/miryoku
 
-#define XXX &none
-
 #define MIRYOKU_MAPPING( \
 K00, K01, K02, K03, K04,      K05, K06, K07, K08, K09, \
 K10, K11, K12, K13, K14,      K15, K16, K17, K18, K19, \
@@ -14,8 +12,6 @@ K10  K11  K12  K13  K14       K15  K16  K17  K18  K19 \
 K20  K21  K22  K23  K24       K25  K26  K27  K28  K29 \
                K33  K34       K35  K36
 
-#define MIRYOKU_MAPPING_TAP MIRYOKU_MAPPING
-
 #define MIRYOKU_COMBO_TPSL 30 31
 #define MIRYOKU_COMBO_TPSR 32 33
 
diff --git a/miryoku/mapping/36-minidox.h b/miryoku/mapping/36-minidox.h
index 6087fdf..1219601 100644
--- a/miryoku/mapping/36-minidox.h
+++ b/miryoku/mapping/36-minidox.h
@@ -1,8 +1,6 @@
 // Copyright 2021 Manna Harbour
 // https://github.com/manna-harbour/miryoku
 
-#define XXX &none
-
 #define MIRYOKU_MAPPING( \
 K00, K01, K02, K03, K04,      K05, K06, K07, K08, K09, \
 K10, K11, K12, K13, K14,      K15, K16, K17, K18, K19, \
@@ -14,7 +12,5 @@ K10  K11  K12  K13  K14       K15  K16  K17  K18  K19 \
 K20  K21  K22  K23  K24       K25  K26  K27  K28  K29 \
           K32  K33  K34       K35  K36  K37
 
-#define MIRYOKU_MAPPING_TAP MIRYOKU_MAPPING
-
 #define MIRYOKU_COMBO_TPSL 33 34
 #define MIRYOKU_COMBO_TPSR 35 36
diff --git a/miryoku/mapping/39-reviung.h b/miryoku/mapping/39-reviung.h
index a7ce190..190b771 100644
--- a/miryoku/mapping/39-reviung.h
+++ b/miryoku/mapping/39-reviung.h
@@ -13,5 +13,3 @@ K32  K00  K01  K02  K03  K04       K05  K06  K07  K08  K09  XXX \
 K34  K10  K11  K12  K13  K14       K15  K16  K17  K18  K19  K37 \
 K32  K20  K21  K22  K23  K24       K25  K26  K27  K28  K29  XXX \
                          K33  K35  K36
-
-#define MIRYOKU_MAPPING_TAP MIRYOKU_MAPPING // todo
diff --git a/miryoku/mapping/41-reviung.h b/miryoku/mapping/41-reviung.h
index eaf5d3c..3683935 100644
--- a/miryoku/mapping/41-reviung.h
+++ b/miryoku/mapping/41-reviung.h
@@ -13,5 +13,3 @@ XXX  K00  K01  K02  K03  K04       K05  K06  K07  K08  K09  XXX \
 K34  K10  K11  K12  K13  K14       K15  K16  K17  K18  K19  XXX \
 XXX  K20  K21  K22  K23  K24       K25  K26  K27  K28  K29  XXX \
                     K32  K33  K35  K36  K37
-
-#define MIRYOKU_MAPPING_TAP MIRYOKU_MAPPING // todo
diff --git a/miryoku/mapping/42-corne.h b/miryoku/mapping/42-corne.h
index fe268dc..bafd154 100644
--- a/miryoku/mapping/42-corne.h
+++ b/miryoku/mapping/42-corne.h
@@ -14,16 +14,5 @@ XXX  K10  K11  K12  K13  K14       K15  K16  K17  K18  K19  XXX \
 XXX  K20  K21  K22  K23  K24       K25  K26  K27  K28  K29  XXX \
                K32  K33  K34       K35  K36  K37
 
-#define MIRYOKU_MAPPING_TAP( \
-          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 \
-) \
-&kp LALT  K00  K01  K02  K03  K04       K05  K06  K07  K08  K09 &kp LGUI \
-&kp LCTRL K10  K11  K12  K13  K14       K15  K16  K17  K18  K19 &kp RCTRL \
-&kp LSHFT K20  K21  K22  K23  K24       K25  K26  K27  K28  K29 &kp RSHFT \
-                    K32  K33  K34       K35  K36  K37
-
 #define MIRYOKU_COMBO_TPSL 37 38
 #define MIRYOKU_COMBO_TPSR 39 40
diff --git a/miryoku/mapping/44-jian.h b/miryoku/mapping/44-jian.h
index fd48dd4..4e7ecca 100644
--- a/miryoku/mapping/44-jian.h
+++ b/miryoku/mapping/44-jian.h
@@ -14,7 +14,5 @@ XXX  XXX  K00  K01  K02  K03  K04       K05  K06  K07  K08  K09  XXX  XXX \
      XXX  K20  K21  K22  K23  K24       K25  K26  K27  K28  K29  XXX \
                     K32  K33  K34       K35  K36  K37
 
-#define MIRYOKU_MAPPING_TAP  MIRYOKU_MAPPING
-
 #define MIRYOKU_COMBO_TPSL 39 40
 #define MIRYOKU_COMBO_TPSR 41 42
diff --git a/miryoku/mapping/48-lets_split.h b/miryoku/mapping/48-lets_split.h
index 95fdfc5..d188a2a 100644
--- a/miryoku/mapping/48-lets_split.h
+++ b/miryoku/mapping/48-lets_split.h
@@ -26,5 +26,3 @@ K10  K11  K12  K13  K14  XXX  XXX  K15  K16  K17  K18  K19 \
 K20  K21  K22  K23  K24  XXX  XXX  K25  K26  K27  K28  K29 \
 XXX  XXX  XXX  K32  K33  K34  K35  K36  K37  XXX  XXX  XXX
 #endif
-
-#define MIRYOKU_MAPPING_TAP MIRYOKU_MAPPING // todo
diff --git a/miryoku/mapping/48-planck.h b/miryoku/mapping/48-planck.h
index 1682bb0..65ee1a1 100644
--- a/miryoku/mapping/48-planck.h
+++ b/miryoku/mapping/48-planck.h
@@ -26,5 +26,3 @@ K10  K11  K12  K13  K14  XXX  XXX  K15  K16  K17  K18  K19 \
 K20  K21  K22  K23  K24  XXX  XXX  K25  K26  K27  K28  K29 \
 XXX  XXX  K32  K33  K34  XXX  XXX  K35  K36  K37  XXX  XXX
 #endif
-
-#define MIRYOKU_MAPPING_TAP MIRYOKU_MAPPING // todo
diff --git a/miryoku/mapping/50-kyria.h b/miryoku/mapping/50-kyria.h
index 45dfd2e..7abf9d9 100644
--- a/miryoku/mapping/50-kyria.h
+++ b/miryoku/mapping/50-kyria.h
@@ -30,6 +30,3 @@ XXX  K20  K21  K22  K23  K24  XXX  XXX       XXX  XXX  K25  K26  K27  K28  K29
 #define MIRYOKU_COMBO_TPSL 42 43
 #define MIRYOKU_COMBO_TPSR 46 47
 #endif
-
-#define MIRYOKU_MAPPING_TAP MIRYOKU_MAPPING // todo
-
diff --git a/miryoku/mapping/56-iris.h b/miryoku/mapping/56-iris.h
index 29b0121..009ffa7 100644
--- a/miryoku/mapping/56-iris.h
+++ b/miryoku/mapping/56-iris.h
@@ -15,8 +15,5 @@ XXX  K10  K11  K12  K13  K14                 K15  K16  K17  K18  K19  XXX \
 XXX  K20  K21  K22  K23  K24  XXX       XXX  K25  K26  K27  K28  K29  XXX \
                     K32  K33  K34       K35  K36  K37
 
-#define MIRYOKU_MAPPING_TAP MIRYOKU_MAPPING // todo
-
 #define MIRYOKU_COMBO_TPSL 51 52
 #define MIRYOKU_COMBO_TPSR 53 54
-
diff --git a/miryoku/mapping/58-bastyl.h b/miryoku/mapping/58-bastyl.h
index 0c23e14..4e8f827 100644
--- a/miryoku/mapping/58-bastyl.h
+++ b/miryoku/mapping/58-bastyl.h
@@ -16,8 +16,5 @@ XXX  K20  K21  K22  K23  K24                 K25  K26  K27  K28  K29  XXX \
                K32  K33  K34                 K35  K36  K37 \
                     XXX  XXX                 XXX  XXX
 
-#define MIRYOKU_MAPPING_TAP MIRYOKU_MAPPING // todo
-
 #define MIRYOKU_COMBO_TPSL 49 50
 #define MIRYOKU_COMBO_TPSR 51 52
-
diff --git a/miryoku/mapping/58-lily.h b/miryoku/mapping/58-lily.h
index 80971d3..0672a03 100644
--- a/miryoku/mapping/58-lily.h
+++ b/miryoku/mapping/58-lily.h
@@ -15,8 +15,5 @@ XXX  K10  K11  K12  K13  K14                 K15  K16  K17  K18  K19  XXX \
 XXX  K20  K21  K22  K23  K24  XXX       XXX  K25  K26  K27  K28  K29  XXX \
                XXX  K32  K33  K34       K35  K36  K37  XXX
 
-#define MIRYOKU_MAPPING_TAP MIRYOKU_MAPPING // todo
-
 #define MIRYOKU_COMBO_TPSL 52 53
 #define MIRYOKU_COMBO_TPSR 54 55
-
diff --git a/miryoku/mapping/60-naked.h b/miryoku/mapping/60-naked.h
index 344dcdc..5996448 100644
--- a/miryoku/mapping/60-naked.h
+++ b/miryoku/mapping/60-naked.h
@@ -28,5 +28,3 @@ XXX  K10  K11  K12  K13  K14            K15  K16  K17  K18  K19 XXX \
 XXX  K20  K21  K22  K23  K24            K25  K26  K27  K28  K29 XXX \
      XXX  XXX  K32  K33  K34  XXX  XXX  K35  K36  K37  XXX  XXX
 #endif
-
-#define MIRYOKU_MAPPING_TAP MIRYOKU_MAPPING // todo
diff --git a/miryoku/mapping/60-preonic.h b/miryoku/mapping/60-preonic.h
index 624ae52..b5a35e7 100644
--- a/miryoku/mapping/60-preonic.h
+++ b/miryoku/mapping/60-preonic.h
@@ -28,5 +28,3 @@ K10  K11  K12  K13  K14  XXX  XXX  K15  K16  K17  K18  K19 \
 K20  K21  K22  K23  K24  XXX  XXX  K25  K26  K27  K28  K29 \
 XXX  XXX  K32  K33  K34  XXX  XXX  K35  K36  K37  XXX  XXX
 #endif
-
-#define MIRYOKU_MAPPING_TAP MIRYOKU_MAPPING // todo
diff --git a/miryoku/mapping/60-sofle.h b/miryoku/mapping/60-sofle.h
index f67a3b4..33cca80 100644
--- a/miryoku/mapping/60-sofle.h
+++ b/miryoku/mapping/60-sofle.h
@@ -15,8 +15,5 @@ XXX  K10  K11  K12  K13  K14                 K15  K16  K17  K18  K19  XXX \
 XXX  K20  K21  K22  K23  K24  XXX       XXX  K25  K26  K27  K28  K29  XXX \
           XXX  XXX  K32  K33  K34       K35  K36  K37  XXX  XXX
 
-#define MIRYOKU_MAPPING_TAP MIRYOKU_MAPPING // todo
-
 #define MIRYOKU_COMBO_TPSL 53 54
 #define MIRYOKU_COMBO_TPSR 55 56
-
diff --git a/miryoku/mapping/62-atreus.h b/miryoku/mapping/62-atreus.h
index d84a0f9..3d62b2e 100644
--- a/miryoku/mapping/62-atreus.h
+++ b/miryoku/mapping/62-atreus.h
@@ -15,8 +15,5 @@ XXX  K10  K11  K12  K13  K14                 K15  K16  K17  K18  K19  XXX \
 XXX  K20  K21  K22  K23  K24                 K25  K26  K27  K28  K29  XXX \
 XXX  XXX  XXX  XXX  K32  K33  K34       K35  K36  K37  XXX  XXX  XXX  XXX
 
-#define MIRYOKU_MAPPING_TAP MIRYOKU_MAPPING // todo
-
 #define MIRYOKU_COMBO_TPSL 53 54
 #define MIRYOKU_COMBO_TPSR 55 56
-
diff --git a/miryoku/mapping/63-rebound.h b/miryoku/mapping/63-rebound.h
index d82bcaa..23a1303 100644
--- a/miryoku/mapping/63-rebound.h
+++ b/miryoku/mapping/63-rebound.h
@@ -14,5 +14,3 @@ K00  K01  K02  K03  K04  XXX       XXX  K05  K06  K07  K08  K09 \
 K10  K11  K12  K13  K14  XXX  XXX  XXX  K15  K16  K17  K18  K19 \
 K20  K21  K22  K23  K24  XXX  XXX  XXX  K25  K26  K27  K28  K29 \
 XXX  XXX  XXX  K32  K33  K34  XXX  K35  K36  K37  XXX  XXX  XXX
-
-#define MIRYOKU_MAPPING_TAP MIRYOKU_MAPPING // todo
diff --git a/miryoku/mapping/64-helix.h b/miryoku/mapping/64-helix.h
index c2b731a..88191b4 100644
--- a/miryoku/mapping/64-helix.h
+++ b/miryoku/mapping/64-helix.h
@@ -15,8 +15,5 @@ XXX  K10  K11  K12  K13  K14                 K15  K16  K17  K18  K19  XXX \
 XXX  K20  K21  K22  K23  K24  XXX       XXX  K25  K26  K27  K28  K29  XXX \
 XXX  XXX  XXX  XXX  K32  K33  K34       K35  K36  K37  XXX  XXX  XXX  XXX
 
-#define MIRYOKU_MAPPING_TAP MIRYOKU_MAPPING // todo
-
 #define MIRYOKU_COMBO_TPSL 55 56
 #define MIRYOKU_COMBO_TPSR 57 58
-
diff --git a/miryoku/mapping/70-ergodash.h b/miryoku/mapping/70-ergodash.h
index 52b3512..1fb4cd4 100644
--- a/miryoku/mapping/70-ergodash.h
+++ b/miryoku/mapping/70-ergodash.h
@@ -14,5 +14,3 @@ XXX  K00  K01  K02  K03  K04  XXX                 XXX  K05  K06  K07  K08  K09
 XXX  K10  K11  K12  K13  K14  XXX                 XXX  K15  K16  K17  K18  K19  XXX \
 XXX  K20  K21  K22  K23  K24       XXX       XXX       K25  K26  K27  K28  K29  XXX \
 XXX  XXX  XXX  XXX  K32       K33  K34       K35  K36       K37  XXX  XXX  XXX  XXX
-
-#define MIRYOKU_MAPPING_TAP MIRYOKU_MAPPING // todo
diff --git a/miryoku/mapping/70-viterbi.h b/miryoku/mapping/70-viterbi.h
index 1d8a406..244e1db 100644
--- a/miryoku/mapping/70-viterbi.h
+++ b/miryoku/mapping/70-viterbi.h
@@ -28,6 +28,3 @@ XXX  K10  K11  K12  K13  K14  XXX       XXX  K15  K16  K17  K18  K19  XXX \
 XXX  K20  K21  K22  K23  K24  XXX       XXX  K25  K26  K27  K28  K29  XXX \
 XXX  XXX  XXX  XXX  K32  K33  K34       K35  K36  K37  XXX  XXX  XXX  XXX
 #endif
-
-#define MIRYOKU_MAPPING_TAP MIRYOKU_MAPPING // todo
-
diff --git a/miryoku/miryoku-zmk-babel.org b/miryoku/miryoku-zmk-babel.org
index 3a14d8a..0192dcd 100644
--- a/miryoku/miryoku-zmk-babel.org
+++ b/miryoku/miryoku-zmk-babel.org
@@ -715,6 +715,9 @@ standard keycode to implementation equivalent
 <<table-keycode-mappings(table=clipboard)>>
 #endif
 
+#ifndef MIRYOKU_MAPPING_TAP
+  #define MIRYOKU_MAPPING_TAP MIRYOKU_MAPPING
+#endif
 
 / {
   behaviors {
diff --git a/miryoku/miryoku.dtsi b/miryoku/miryoku.dtsi
index 2a2387d..cc69ffc 100644
--- a/miryoku/miryoku.dtsi
+++ b/miryoku/miryoku.dtsi
@@ -49,6 +49,9 @@
 #define U_UND &kp K_UNDO
 #endif
 
+#ifndef MIRYOKU_MAPPING_TAP
+  #define MIRYOKU_MAPPING_TAP MIRYOKU_MAPPING
+#endif
 
 / {
   behaviors {