[Keymap] Update Miryoku (#14827)

6 files changed, 483 insertions, 405 deletions

diff --git a/users/manna-harbour_miryoku/README.org b/users/manna-harbour_miryoku/README.org
deleted file mode 120000
index b6caaade16..0000000000
--- a/users/manna-harbour_miryoku/README.org
+++ /dev/null
@@ -1 +0,0 @@
-miryoku.org
\ No newline at end of file
diff --git a/users/manna-harbour_miryoku/config.h b/users/manna-harbour_miryoku/config.h
index 38d363299e..d24f52edae 100644
--- a/users/manna-harbour_miryoku/config.h
+++ b/users/manna-harbour_miryoku/config.h
@@ -1,6 +1,6 @@
 // Copyright 2019 Manna Harbour
 // https://github.com/manna-harbour/miryoku
-// generated from users/manna-harbour_miryoku/miryoku.org  -*- buffer-read-only: t -*-
+// generated -*- buffer-read-only: t -*-
 
 // This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
 
diff --git a/users/manna-harbour_miryoku/manna-harbour_miryoku.c b/users/manna-harbour_miryoku/manna-harbour_miryoku.c
index ff25b77934..6347183417 100644
--- a/users/manna-harbour_miryoku/manna-harbour_miryoku.c
+++ b/users/manna-harbour_miryoku/manna-harbour_miryoku.c
@@ -1,6 +1,6 @@
 // Copyright 2019 Manna Harbour
 // https://github.com/manna-harbour/miryoku
-// generated from users/manna-harbour_miryoku/miryoku.org  -*- buffer-read-only: t -*-
+// generated -*- buffer-read-only: t -*-
 
 // This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
 
@@ -9,40 +9,50 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 #if defined MIRYOKU_LAYERS_FLIP
   [BASE] = LAYOUT_miryoku(
-  #if defined MIRYOKU_ALPHAS_COLEMAK
+  #if defined MIRYOKU_ALPHAS_AZERTY
+    KC_A,              KC_Z,              KC_E,              KC_R,              KC_T,              KC_Y,              KC_U,              KC_I,              KC_O,              KC_P,
+    LGUI_T(KC_Q),      LALT_T(KC_S),      LCTL_T(KC_D),      LSFT_T(KC_F),      KC_G,              KC_H,              LSFT_T(KC_J),      LCTL_T(KC_K),      LALT_T(KC_L),      LGUI_T(KC_M),
+    LT(BUTTON, KC_W),  ALGR_T(KC_X),      KC_C,              KC_V,              KC_B,              KC_N,              KC_COMM,           KC_DOT,            ALGR_T(KC_SLSH),   LT(BUTTON, KC_QUOT),
+    U_NP,              U_NP,              LT(FUN, KC_DEL),   LT(NUM, KC_BSPC),  LT(SYM, KC_ENT),   LT(MOUSE, KC_TAB), LT(NAV, KC_SPC),   LT(MEDIA, KC_ESC), U_NP,              U_NP
+  #elif defined MIRYOKU_ALPHAS_COLEMAK
     KC_Q,              KC_W,              KC_F,              KC_P,              KC_G,              KC_J,              KC_L,              KC_U,              KC_Y,              KC_QUOT,
     LGUI_T(KC_A),      LALT_T(KC_R),      LCTL_T(KC_S),      LSFT_T(KC_T),      KC_D,              KC_H,              LSFT_T(KC_N),      LCTL_T(KC_E),      LALT_T(KC_I),      LGUI_T(KC_O),
-    KC_Z,              ALGR_T(KC_X),      KC_C,              KC_V,              KC_B,              KC_K,              KC_M,              KC_COMM,           ALGR_T(KC_DOT),    KC_SLSH,
+    LT(BUTTON, KC_Z),  ALGR_T(KC_X),      KC_C,              KC_V,              KC_B,              KC_K,              KC_M,              KC_COMM,           ALGR_T(KC_DOT),    LT(BUTTON, KC_SLSH),
     U_NP,              U_NP,              LT(FUN, KC_DEL),   LT(NUM, KC_BSPC),  LT(SYM, KC_ENT),   LT(MOUSE, KC_TAB), LT(NAV, KC_SPC),   LT(MEDIA, KC_ESC), U_NP,              U_NP
   #elif defined MIRYOKU_ALPHAS_COLEMAKDHK
     KC_Q,              KC_W,              KC_F,              KC_P,              KC_B,              KC_J,              KC_L,              KC_U,              KC_Y,              KC_QUOT,
     LGUI_T(KC_A),      LALT_T(KC_R),      LCTL_T(KC_S),      LSFT_T(KC_T),      KC_G,              KC_K,              LSFT_T(KC_N),      LCTL_T(KC_E),      LALT_T(KC_I),      LGUI_T(KC_O),
-    KC_Z,              ALGR_T(KC_X),      KC_C,              KC_D,              KC_V,              KC_M,              KC_H,              KC_COMM,           ALGR_T(KC_DOT),    KC_SLSH,
+    LT(BUTTON, KC_Z),  ALGR_T(KC_X),      KC_C,              KC_D,              KC_V,              KC_M,              KC_H,              KC_COMM,           ALGR_T(KC_DOT),    LT(BUTTON, KC_SLSH),
     U_NP,              U_NP,              LT(FUN, KC_DEL),   LT(NUM, KC_BSPC),  LT(SYM, KC_ENT),   LT(MOUSE, KC_TAB), LT(NAV, KC_SPC),   LT(MEDIA, KC_ESC), U_NP,              U_NP
   #elif defined MIRYOKU_ALPHAS_DVORAK
     KC_QUOT,           KC_COMM,           KC_DOT,            KC_P,              KC_Y,              KC_F,              KC_G,              KC_C,              KC_R,              KC_L,
     LGUI_T(KC_A),      LALT_T(KC_O),      LCTL_T(KC_E),      LSFT_T(KC_U),      KC_I,              KC_D,              LSFT_T(KC_H),      LCTL_T(KC_T),      LALT_T(KC_N),      LGUI_T(KC_S),
-    KC_SLSH,           ALGR_T(KC_Q),      KC_J,              KC_K,              KC_X,              KC_B,              KC_M,              KC_W,              ALGR_T(KC_V),      KC_Z,
+    LT(BUTTON, KC_SLSH), ALGR_T(KC_Q),      KC_J,              KC_K,              KC_X,              KC_B,              KC_M,              KC_W,              ALGR_T(KC_V),      LT(BUTTON, KC_Z),
     U_NP,              U_NP,              LT(FUN, KC_DEL),   LT(NUM, KC_BSPC),  LT(SYM, KC_ENT),   LT(MOUSE, KC_TAB), LT(NAV, KC_SPC),   LT(MEDIA, KC_ESC), U_NP,              U_NP
   #elif defined MIRYOKU_ALPHAS_HALMAK
     KC_W,              KC_L,              KC_R,              KC_B,              KC_Z,              KC_QUOT,           KC_Q,              KC_U,              KC_D,              KC_J,
     LGUI_T(KC_S),      LALT_T(KC_H),      LCTL_T(KC_N),      LSFT_T(KC_T),      KC_COMM,           KC_DOT,            LSFT_T(KC_A),      LCTL_T(KC_E),      LALT_T(KC_O),      LGUI_T(KC_I),
-    KC_F,              ALGR_T(KC_M),      KC_V,              KC_C,              KC_SLSH,           KC_G,              KC_P,              KC_X,              ALGR_T(KC_K),      KC_Y,
+    LT(BUTTON, KC_F),  ALGR_T(KC_M),      KC_V,              KC_C,              KC_SLSH,           KC_G,              KC_P,              KC_X,              ALGR_T(KC_K),      LT(BUTTON, KC_Y),
     U_NP,              U_NP,              LT(FUN, KC_DEL),   LT(NUM, KC_BSPC),  LT(SYM, KC_ENT),   LT(MOUSE, KC_TAB), LT(NAV, KC_SPC),   LT(MEDIA, KC_ESC), U_NP,              U_NP
   #elif defined MIRYOKU_ALPHAS_WORKMAN
     KC_Q,              KC_D,              KC_R,              KC_W,              KC_B,              KC_J,              KC_F,              KC_U,              KC_P,              KC_QUOT,
     LGUI_T(KC_A),      LALT_T(KC_S),      LCTL_T(KC_H),      LSFT_T(KC_T),      KC_G,              KC_Y,              LSFT_T(KC_N),      LCTL_T(KC_E),      LALT_T(KC_O),      LGUI_T(KC_I),
-    KC_Z,              ALGR_T(KC_X),      KC_M,              KC_C,              KC_V,              KC_K,              KC_L,              KC_COMM,           ALGR_T(KC_DOT),    KC_SLSH,
+    LT(BUTTON, KC_Z),  ALGR_T(KC_X),      KC_M,              KC_C,              KC_V,              KC_K,              KC_L,              KC_COMM,           ALGR_T(KC_DOT),    LT(BUTTON, KC_SLSH),
     U_NP,              U_NP,              LT(FUN, KC_DEL),   LT(NUM, KC_BSPC),  LT(SYM, KC_ENT),   LT(MOUSE, KC_TAB), LT(NAV, KC_SPC),   LT(MEDIA, KC_ESC), U_NP,              U_NP
   #elif defined MIRYOKU_ALPHAS_QWERTY
     KC_Q,              KC_W,              KC_E,              KC_R,              KC_T,              KC_Y,              KC_U,              KC_I,              KC_O,              KC_P,
     LGUI_T(KC_A),      LALT_T(KC_S),      LCTL_T(KC_D),      LSFT_T(KC_F),      KC_G,              KC_H,              LSFT_T(KC_J),      LCTL_T(KC_K),      LALT_T(KC_L),      LGUI_T(KC_QUOT),
-    KC_Z,              ALGR_T(KC_X),      KC_C,              KC_V,              KC_B,              KC_N,              KC_M,              KC_COMM,           ALGR_T(KC_DOT),    KC_SLSH,
+    LT(BUTTON, KC_Z),  ALGR_T(KC_X),      KC_C,              KC_V,              KC_B,              KC_N,              KC_M,              KC_COMM,           ALGR_T(KC_DOT),    LT(BUTTON, KC_SLSH),
+    U_NP,              U_NP,              LT(FUN, KC_DEL),   LT(NUM, KC_BSPC),  LT(SYM, KC_ENT),   LT(MOUSE, KC_TAB), LT(NAV, KC_SPC),   LT(MEDIA, KC_ESC), U_NP,              U_NP
+  #elif defined MIRYOKU_ALPHAS_QWERTZ
+    KC_Q,              KC_W,              KC_E,              KC_R,              KC_T,              KC_Z,              KC_U,              KC_I,              KC_O,              KC_P,
+    LGUI_T(KC_A),      LALT_T(KC_S),      LCTL_T(KC_D),      LSFT_T(KC_F),      KC_G,              KC_H,              LSFT_T(KC_J),      LCTL_T(KC_K),      LALT_T(KC_L),      LGUI_T(KC_QUOT),
+    LT(BUTTON, KC_Y),  ALGR_T(KC_X),      KC_C,              KC_V,              KC_B,              KC_N,              KC_M,              KC_COMM,           ALGR_T(KC_DOT),    LT(BUTTON, KC_SLSH),
     U_NP,              U_NP,              LT(FUN, KC_DEL),   LT(NUM, KC_BSPC),  LT(SYM, KC_ENT),   LT(MOUSE, KC_TAB), LT(NAV, KC_SPC),   LT(MEDIA, KC_ESC), U_NP,              U_NP
   #else
     KC_Q,              KC_W,              KC_F,              KC_P,              KC_B,              KC_J,              KC_L,              KC_U,              KC_Y,              KC_QUOT,
     LGUI_T(KC_A),      LALT_T(KC_R),      LCTL_T(KC_S),      LSFT_T(KC_T),      KC_G,              KC_M,              LSFT_T(KC_N),      LCTL_T(KC_E),      LALT_T(KC_I),      LGUI_T(KC_O),
-    KC_Z,              ALGR_T(KC_X),      KC_C,              KC_D,              KC_V,              KC_K,              KC_H,              KC_COMM,           ALGR_T(KC_DOT),    KC_SLSH,
+    LT(BUTTON, KC_Z),  ALGR_T(KC_X),      KC_C,              KC_D,              KC_V,              KC_K,              KC_H,              KC_COMM,           ALGR_T(KC_DOT),    LT(BUTTON, KC_SLSH),
     U_NP,              U_NP,              LT(FUN, KC_DEL),   LT(NUM, KC_BSPC),  LT(SYM, KC_ENT),   LT(MOUSE, KC_TAB), LT(NAV, KC_SPC),   LT(MEDIA, KC_ESC), U_NP,              U_NP
   #endif
   ),
@@ -85,12 +95,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     U_NP,    U_NP,    KC_MUTE, KC_MPLY, KC_MSTP, U_NA,    U_NA,    U_NA,    U_NP,    U_NP
   ),
   #endif
-  [MBO] = LAYOUT_miryoku(
-    U_RDO,   U_PST,   U_CPY,   U_CUT,   U_UND,   U_RDO,   U_PST,   U_CPY,   U_CUT,   U_UND,
-    KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, KC_TRNS, KC_TRNS, KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    U_NP,    U_NP,    KC_BTN2, KC_BTN3, KC_BTN1, KC_BTN1, KC_BTN3, KC_BTN2, U_NP,    U_NP
-  ),
   [NUM] = LAYOUT_miryoku(
     RESET,   U_NA,    U_NA,    U_NA,    U_NA,    KC_LBRC, KC_7,    KC_8,    KC_9,    KC_RBRC,
     KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, U_NA,    KC_EQL,  KC_4,    KC_5,    KC_6,    KC_SCLN,
@@ -108,44 +112,53 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, U_NA,    KC_SLCK, KC_F4,   KC_F5,   KC_F6,   KC_F11,
     U_NA,    KC_ALGR, U_NA,    U_NA,    U_NA,    KC_PAUS, KC_F1,   KC_F2,   KC_F3,   KC_F10,
     U_NP,    U_NP,    U_NA,    U_NA,    U_NA,    KC_TAB,  KC_SPC,  KC_APP,  U_NP,    U_NP
-  )
-,
+  ),
 #else
   [BASE] = LAYOUT_miryoku(
-  #if defined MIRYOKU_ALPHAS_COLEMAK
+  #if defined MIRYOKU_ALPHAS_AZERTY
+    KC_A,              KC_Z,              KC_E,              KC_R,              KC_T,              KC_Y,              KC_U,              KC_I,              KC_O,              KC_P,
+    LGUI_T(KC_Q),      LALT_T(KC_S),      LCTL_T(KC_D),      LSFT_T(KC_F),      KC_G,              KC_H,              LSFT_T(KC_J),      LCTL_T(KC_K),      LALT_T(KC_L),      LGUI_T(KC_M),
+    LT(BUTTON, KC_W),  ALGR_T(KC_X),      KC_C,              KC_V,              KC_B,              KC_N,              KC_COMM,           KC_DOT,            ALGR_T(KC_SLSH),   LT(BUTTON, KC_QUOT),
+    U_NP,              U_NP,              LT(MEDIA, KC_ESC), LT(NAV, KC_SPC),   LT(MOUSE, KC_TAB), LT(SYM, KC_ENT),   LT(NUM, KC_BSPC),  LT(FUN, KC_DEL),   U_NP,              U_NP
+  #elif defined MIRYOKU_ALPHAS_COLEMAK
     KC_Q,              KC_W,              KC_F,              KC_P,              KC_G,              KC_J,              KC_L,              KC_U,              KC_Y,              KC_QUOT,
     LGUI_T(KC_A),      LALT_T(KC_R),      LCTL_T(KC_S),      LSFT_T(KC_T),      KC_D,              KC_H,              LSFT_T(KC_N),      LCTL_T(KC_E),      LALT_T(KC_I),      LGUI_T(KC_O),
-    KC_Z,              ALGR_T(KC_X),      KC_C,              KC_V,              KC_B,              KC_K,              KC_M,              KC_COMM,           ALGR_T(KC_DOT),    KC_SLSH,
+    LT(BUTTON, KC_Z),  ALGR_T(KC_X),      KC_C,              KC_V,              KC_B,              KC_K,              KC_M,              KC_COMM,           ALGR_T(KC_DOT),    LT(BUTTON, KC_SLSH),
     U_NP,              U_NP,              LT(MEDIA, KC_ESC), LT(NAV, KC_SPC),   LT(MOUSE, KC_TAB), LT(SYM, KC_ENT),   LT(NUM, KC_BSPC),  LT(FUN, KC_DEL),   U_NP,              U_NP
   #elif defined MIRYOKU_ALPHAS_COLEMAKDHK
     KC_Q,              KC_W,              KC_F,              KC_P,              KC_B,              KC_J,              KC_L,              KC_U,              KC_Y,              KC_QUOT,
     LGUI_T(KC_A),      LALT_T(KC_R),      LCTL_T(KC_S),      LSFT_T(KC_T),      KC_G,              KC_K,              LSFT_T(KC_N),      LCTL_T(KC_E),      LALT_T(KC_I),      LGUI_T(KC_O),
-    KC_Z,              ALGR_T(KC_X),      KC_C,              KC_D,              KC_V,              KC_M,              KC_H,              KC_COMM,           ALGR_T(KC_DOT),    KC_SLSH,
+    LT(BUTTON, KC_Z),  ALGR_T(KC_X),      KC_C,              KC_D,              KC_V,              KC_M,              KC_H,              KC_COMM,           ALGR_T(KC_DOT),    LT(BUTTON, KC_SLSH),
     U_NP,              U_NP,              LT(MEDIA, KC_ESC), LT(NAV, KC_SPC),   LT(MOUSE, KC_TAB), LT(SYM, KC_ENT),   LT(NUM, KC_BSPC),  LT(FUN, KC_DEL),   U_NP,              U_NP
   #elif defined MIRYOKU_ALPHAS_DVORAK
     KC_QUOT,           KC_COMM,           KC_DOT,            KC_P,              KC_Y,              KC_F,              KC_G,              KC_C,              KC_R,              KC_L,
     LGUI_T(KC_A),      LALT_T(KC_O),      LCTL_T(KC_E),      LSFT_T(KC_U),      KC_I,              KC_D,              LSFT_T(KC_H),      LCTL_T(KC_T),      LALT_T(KC_N),      LGUI_T(KC_S),
-    KC_SLSH,           ALGR_T(KC_Q),      KC_J,              KC_K,              KC_X,              KC_B,              KC_M,              KC_W,              ALGR_T(KC_V),      KC_Z,
+    LT(BUTTON, KC_SLSH), ALGR_T(KC_Q),      KC_J,              KC_K,              KC_X,              KC_B,              KC_M,              KC_W,              ALGR_T(KC_V),      LT(BUTTON, KC_Z),
     U_NP,              U_NP,              LT(MEDIA, KC_ESC), LT(NAV, KC_SPC),   LT(MOUSE, KC_TAB), LT(SYM, KC_ENT),   LT(NUM, KC_BSPC),  LT(FUN, KC_DEL),   U_NP,              U_NP
   #elif defined MIRYOKU_ALPHAS_HALMAK
     KC_W,              KC_L,              KC_R,              KC_B,              KC_Z,              KC_QUOT,           KC_Q,              KC_U,              KC_D,              KC_J,
     LGUI_T(KC_S),      LALT_T(KC_H),      LCTL_T(KC_N),      LSFT_T(KC_T),      KC_COMM,           KC_DOT,            LSFT_T(KC_A),      LCTL_T(KC_E),      LALT_T(KC_O),      LGUI_T(KC_I),
-    KC_F,              ALGR_T(KC_M),      KC_V,              KC_C,              KC_SLSH,           KC_G,              KC_P,              KC_X,              ALGR_T(KC_K),      KC_Y,
+    LT(BUTTON, KC_F),  ALGR_T(KC_M),      KC_V,              KC_C,              KC_SLSH,           KC_G,              KC_P,              KC_X,              ALGR_T(KC_K),      LT(BUTTON, KC_Y),
     U_NP,              U_NP,              LT(MEDIA, KC_ESC), LT(NAV, KC_SPC),   LT(MOUSE, KC_TAB), LT(SYM, KC_ENT),   LT(NUM, KC_BSPC),  LT(FUN, KC_DEL),   U_NP,              U_NP
   #elif defined MIRYOKU_ALPHAS_WORKMAN
     KC_Q,              KC_D,              KC_R,              KC_W,              KC_B,              KC_J,              KC_F,              KC_U,              KC_P,              KC_QUOT,
     LGUI_T(KC_A),      LALT_T(KC_S),      LCTL_T(KC_H),      LSFT_T(KC_T),      KC_G,              KC_Y,              LSFT_T(KC_N),      LCTL_T(KC_E),      LALT_T(KC_O),      LGUI_T(KC_I),
-    KC_Z,              ALGR_T(KC_X),      KC_M,              KC_C,              KC_V,              KC_K,              KC_L,              KC_COMM,           ALGR_T(KC_DOT),    KC_SLSH,
+    LT(BUTTON, KC_Z),  ALGR_T(KC_X),      KC_M,              KC_C,              KC_V,              KC_K,              KC_L,              KC_COMM,           ALGR_T(KC_DOT),    LT(BUTTON, KC_SLSH),
     U_NP,              U_NP,              LT(MEDIA, KC_ESC), LT(NAV, KC_SPC),   LT(MOUSE, KC_TAB), LT(SYM, KC_ENT),   LT(NUM, KC_BSPC),  LT(FUN, KC_DEL),   U_NP,              U_NP
   #elif defined MIRYOKU_ALPHAS_QWERTY
     KC_Q,              KC_W,              KC_E,              KC_R,              KC_T,              KC_Y,              KC_U,              KC_I,              KC_O,              KC_P,
     LGUI_T(KC_A),      LALT_T(KC_S),      LCTL_T(KC_D),      LSFT_T(KC_F),      KC_G,              KC_H,              LSFT_T(KC_J),      LCTL_T(KC_K),      LALT_T(KC_L),      LGUI_T(KC_QUOT),
-    KC_Z,              ALGR_T(KC_X),      KC_C,              KC_V,              KC_B,              KC_N,              KC_M,              KC_COMM,           ALGR_T(KC_DOT),    KC_SLSH,
+    LT(BUTTON, KC_Z),  ALGR_T(KC_X),      KC_C,              KC_V,              KC_B,              KC_N,              KC_M,              KC_COMM,           ALGR_T(KC_DOT),    LT(BUTTON, KC_SLSH),
+    U_NP,              U_NP,              LT(MEDIA, KC_ESC), LT(NAV, KC_SPC),   LT(MOUSE, KC_TAB), LT(SYM, KC_ENT),   LT(NUM, KC_BSPC),  LT(FUN, KC_DEL),   U_NP,              U_NP
+  #elif defined MIRYOKU_ALPHAS_QWERTZ
+    KC_Q,              KC_W,              KC_E,              KC_R,              KC_T,              KC_Z,              KC_U,              KC_I,              KC_O,              KC_P,
+    LGUI_T(KC_A),      LALT_T(KC_S),      LCTL_T(KC_D),      LSFT_T(KC_F),      KC_G,              KC_H,              LSFT_T(KC_J),      LCTL_T(KC_K),      LALT_T(KC_L),      LGUI_T(KC_QUOT),
+    LT(BUTTON, KC_Y),  ALGR_T(KC_X),      KC_C,              KC_V,              KC_B,              KC_N,              KC_M,              KC_COMM,           ALGR_T(KC_DOT),    LT(BUTTON, KC_SLSH),
     U_NP,              U_NP,              LT(MEDIA, KC_ESC), LT(NAV, KC_SPC),   LT(MOUSE, KC_TAB), LT(SYM, KC_ENT),   LT(NUM, KC_BSPC),  LT(FUN, KC_DEL),   U_NP,              U_NP
   #else
     KC_Q,              KC_W,              KC_F,              KC_P,              KC_B,              KC_J,              KC_L,              KC_U,              KC_Y,              KC_QUOT,
     LGUI_T(KC_A),      LALT_T(KC_R),      LCTL_T(KC_S),      LSFT_T(KC_T),      KC_G,              KC_M,              LSFT_T(KC_N),      LCTL_T(KC_E),      LALT_T(KC_I),      LGUI_T(KC_O),
-    KC_Z,              ALGR_T(KC_X),      KC_C,              KC_D,              KC_V,              KC_K,              KC_H,              KC_COMM,           ALGR_T(KC_DOT),    KC_SLSH,
+    LT(BUTTON, KC_Z),  ALGR_T(KC_X),      KC_C,              KC_D,              KC_V,              KC_K,              KC_H,              KC_COMM,           ALGR_T(KC_DOT),    LT(BUTTON, KC_SLSH),
     U_NP,              U_NP,              LT(MEDIA, KC_ESC), LT(NAV, KC_SPC),   LT(MOUSE, KC_TAB), LT(SYM, KC_ENT),   LT(NUM, KC_BSPC),  LT(FUN, KC_DEL),   U_NP,              U_NP
   #endif
   ),
@@ -188,12 +201,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     U_NP,    U_NP,    U_NA,    U_NA,    U_NA,    KC_MSTP, KC_MPLY, KC_MUTE, U_NP,    U_NP
   ),
   #endif
-  [MBO] = LAYOUT_miryoku(
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, KC_TRNS, KC_TRNS, KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI,
-    U_RDO,   U_PST,   U_CPY,   U_CUT,   U_UND,   U_RDO,   U_PST,   U_CPY,   U_CUT,   U_UND,
-    U_NP,    U_NP,    KC_BTN2, KC_BTN3, KC_BTN1, KC_BTN1, KC_BTN3, KC_BTN2, U_NP,    U_NP
-  ),
   [NUM] = LAYOUT_miryoku(
     KC_LBRC, KC_7,    KC_8,    KC_9,    KC_RBRC, U_NA,    U_NA,    U_NA,    U_NA,    RESET,
     KC_SCLN, KC_4,    KC_5,    KC_6,    KC_EQL,  U_NA,    KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI,
@@ -211,6 +218,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_F11,  KC_F4,   KC_F5,   KC_F6,   KC_SLCK, U_NA,    KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI,
     KC_F10,  KC_F1,   KC_F2,   KC_F3,   KC_PAUS, U_NA,    U_NA,    U_NA,    KC_ALGR, U_NA,
     U_NP,    U_NP,    KC_APP,  KC_SPC,  KC_TAB,  U_NA,    U_NA,    U_NA,    U_NP,    U_NP
-  )
+  ),
 #endif
+  [BUTTON] = LAYOUT_miryoku(
+    U_UND,   U_CUT,   U_CPY,   U_PST,   U_RDO,   U_RDO,   U_PST,   U_CPY,   U_CUT,   U_UND,
+    KC_LGUI, KC_LALT, KC_LCTL, KC_LSFT, KC_TRNS, KC_TRNS, KC_LSFT, KC_LCTL, KC_LALT, KC_LGUI,
+    U_UND,   U_CUT,   U_CPY,   U_PST,   U_RDO,   U_RDO,   U_PST,   U_CPY,   U_CUT,   U_UND,
+    U_NP,    U_NP,    KC_BTN2, KC_BTN3, KC_BTN1, KC_BTN1, KC_BTN3, KC_BTN2, U_NP,    U_NP
+  )
 };
diff --git a/users/manna-harbour_miryoku/manna-harbour_miryoku.h b/users/manna-harbour_miryoku/manna-harbour_miryoku.h
index 4d62c17079..1d14f61710 100644
--- a/users/manna-harbour_miryoku/manna-harbour_miryoku.h
+++ b/users/manna-harbour_miryoku/manna-harbour_miryoku.h
@@ -1,6 +1,6 @@
 // Copyright 2019 Manna Harbour
 // https://github.com/manna-harbour/miryoku
-// generated from users/manna-harbour_miryoku/miryoku.org  -*- buffer-read-only: t -*-
+// generated -*- buffer-read-only: t -*-
 
 // This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 2 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with this program. If not, see <http://www.gnu.org/licenses/>.
 
@@ -12,7 +12,7 @@
 #define U_NA KC_NO // present but not available for use
 #define U_NU KC_NO // available but not used
 
-enum layers { BASE, MBO, MEDIA, NAV, MOUSE, SYM, NUM, FUN };
+enum layers { BASE, BUTTON, MEDIA, NAV, MOUSE, SYM, NUM, FUN };
 
 #if defined MIRYOKU_CLIPBOARD_FUN
 #define U_RDO KC_AGIN
diff --git a/users/manna-harbour_miryoku/miryoku.org b/users/manna-harbour_miryoku/readme.org
index 2f6b1d5a88..b904738a67 100644
--- a/users/manna-harbour_miryoku/miryoku.org
+++ b/users/manna-harbour_miryoku/readme.org
@@ -1,100 +1,41 @@
 # After making changes to code or tables call org-babel-tangle (C-c C-v t).
 
-#+Title: Miryoku [[https://raw.githubusercontent.com/manna-harbour/miryoku/master/data/logos/miryoku-roa-32.png]]
+* Miryoku QMK [[https://raw.githubusercontent.com/manna-harbour/miryoku/master/data/logos/miryoku-roa-32.png]]
 
 [[https://raw.githubusercontent.com/manna-harbour/miryoku/master/data/cover/miryoku-kle-cover.png]]
 
-Miryoku is an ergonomic, minimal, orthogonal layout for ergo or ortho keyboards,
-implemented as part of the QMK firmware.
+[[https://github.com/manna-harbour/miryoku/][Miryoku]] is an ergonomic, minimal, orthogonal, and universal keyboard layout.  This is the Miryoku implementation for [[https://qmk.fm][QMK]].
 
-The layout is maintained in emacs org-mode tables and converted to QMK keymap
-data structures using embedded python scripts.  It is mapped onto keyboards with
-different physical layouts as a subset without code duplication using the QMK
-userspace feature and C macros.
+** Branches
+
+
+*** QMK master
+
+Miryoku QMK is periodically merged upstream into QMK master and it is generally recommended to build directly from QMK master.
+
+QMK master is at https://github.com/qmk/qmk_firmware/tree/master, and the corresponding Miryoku QMK readme is at https://github.com/qmk/qmk_firmware/tree/master/users/manna-harbour_miryoku.
+
+
+*** Miryoku QMK development branch
+
+The Miryoku QMK development branch is ~miryoku~ and may contain new commits not yet merged into QMK master.
 
-Please see the [[https://github.com/manna-harbour/qmk_firmware/blob/miryoku/users/manna-harbour_miryoku/miryoku.org][development branch]] for any [[https://github.com/qmk/qmk_firmware/compare/master...manna-harbour:miryoku][updates not yet merged into QMK]].
+~miryoku~ is at https://github.com/manna-harbour/miryoku_qmk/tree/miryoku, and the corresponding Miryoku QMK readme is at https://github.com/manna-harbour/miryoku_qmk/tree/miryoku/users/manna-harbour_miryoku.
 
-To checkout the development branch in your existing QMK build environment:
+New commits can be seen at the top of the [[https://github.com/manna-harbour/miryoku_qmk/commits/miryoku][history]] with commit messages beginning ~[miryoku]~.  After the new commits are squashed and merged upstream into QMK master by pull request the ~miryoku~ branch is renamed and a new ~miryoku~ branch is created from QMK master.
+
+To checkout the ~miryoku~ branch in your existing QMK build environment:
 #+BEGIN_SRC sh :tangle no
-git remote add manna-harbour git@github.com:manna-harbour/qmk_firmware.git # ssh
-git remote add manna-harbour https://github.com/manna-harbour/qmk_firmware.git # https
-git fetch manna-harbour
-git checkout --track manna-harbour/miryoku
-#+END_SRC
-
-Additional implementations and visualisations are provided outside QMK in the
-[[https://github.com/manna-harbour/miryoku/blob/master/README.org][Miryoku (Extras) repository]].
-
-
-* Contents                                                              :TOC_3:
-- [[#layout][Layout]]
-  - [[#general-principles][General Principles]]
-  - [[#details][Details]]
-  - [[#layers][Layers]]
-    - [[#base][Base]]
-    - [[#nav][Nav]]
-    - [[#mouse][Mouse]]
-    - [[#mouse-buttons-overlay][Mouse Buttons Overlay]]
-    - [[#media][Media]]
-    - [[#num][Num]]
-    - [[#sym][Sym]]
-    - [[#fun][Fun]]
-    - [[#alternative-layouts][Alternative Layouts]]
-- [[#code-generation][Code Generation]]
-  - [[#table-conversion-scripts][Table Conversion Scripts]]
-    - [[#table-layout-taphold][table-layout-taphold]]
-    - [[#table-layout-half][table-layout-half]]
-    - [[#table-layout-full][table-layout-full]]
-    - [[#table-enums][table-enums]]
-    - [[#table-keycode-mappings][table-keycode-mappings]]
-  - [[#data][Data]]
-    - [[#symbol-names][symbol-names]]
-    - [[#mods][mods]]
-    - [[#nonkc][nonkc]]
-    - [[#header][header]]
-    - [[#license-qmk][license-qmk]]
-- [[#subset-mapping][Subset Mapping]]
-  - [[#userspace][Userspace]]
-    - [[#usersmanna-harbour_miryokurulesmk][users/manna-harbour_miryoku/rules.mk]]
-    - [[#usersmanna-harbour_miryokuconfigh][users/manna-harbour_miryoku/config.h]]
-    - [[#usersmanna-harbour_miryokumanna-harbour_miryokuh][users/manna-harbour_miryoku/manna-harbour_miryoku.h]]
-    - [[#usersmanna-harbour_miryokumanna-harbour_miryokuc][users/manna-harbour_miryoku/manna-harbour_miryoku.c]]
-  - [[#layouts][Layouts]]
-    - [[#60_ansi][60_ansi]]
-    - [[#ergodox][ergodox]]
-    - [[#ortho_4x10][ortho_4x10]]
-    - [[#ortho_4x12][ortho_4x12]]
-    - [[#ortho_5x12][ortho_5x12]]
-    - [[#ortho_5x15][ortho_5x15]]
-    - [[#planck_mit][planck_mit]]
-    - [[#split_3x5_3][split_3x5_3]]
-    - [[#split_3x6_3][split_3x6_3]]
-  - [[#keyboards][Keyboards]]
-    - [[#atreus][atreus]]
-    - [[#ergotravel][ergotravel]]
-    - [[#for_science][for_science]]
-    - [[#gergo][gergo]]
-    - [[#handwireddactyl_manuform4x5][handwired/dactyl_manuform/4x5]]
-    - [[#handwireddactyl_manuform5x6][handwired/dactyl_manuform/5x6]]
-    - [[#keebioiris][keebio/iris]]
-    - [[#keyboardioatreus][keyboardio/atreus]]
-    - [[#kyria][kyria]]
-    - [[#lily58][lily58]]
-    - [[#moonlander][moonlander]]
-    - [[#redox_w][redox_w]]
-    - [[#sofle][sofle]]
-    - [[#torn][torn]]
-  - [[#customisation][Customisation]]
-    - [[#examples][Examples]]
-- [[#experimental-features][Experimental Features]]
-  - [[#bilateral-combinations][Bilateral Combinations]]
-  - [[#retro-shift][Retro Shift]]
-- [[#documentation][Documentation]]
-- [[#contact][Contact]]
-
-* Layout
-
-** General Principles
+git remote add miryoku_qmk git@github.com:manna-harbour/miryoku_qmk.git # if using SSH
+git remote add miryoku_qmk https://github.com/manna-harbour/miryoku_qmk.git # if using HTTPS
+git fetch miryoku_qmk
+git checkout --track miryoku_qmk/miryoku
+#+END_SRC
+
+
+** Layout
+
+*** General Principles
 
 - Use layers instead of reaching.
 - Use both hands instead of contortions.
@@ -103,7 +44,7 @@ Additional implementations and visualisations are provided outside QMK in the
 - Avoid unnecessary complication.
 
 
-** Details
+*** Details
 
 - 5 columns, 3 rows, 3 thumb keys, 2 hands.
 - Can be used on almost any split or non-split ergo or ortho keyboard.
@@ -133,7 +74,7 @@ Additional implementations and visualisations are provided outside QMK in the
 - Auto Shift for numbers and symbols.
 
 
-** Layers
+*** Layers
 
 [[https://raw.githubusercontent.com/manna-harbour/miryoku/master/data/layers/miryoku-kle-reference.png]]
 
@@ -153,7 +94,7 @@ Mods (and reset) will be available on sub layers on the same hand as the layer
 change thumb key.  Unknown names are considered to be layer names.
 
 
-*** Base
+**** Base
 
 [[https://raw.githubusercontent.com/manna-harbour/miryoku/master/data/layers/miryoku-kle-base.png]]
 
@@ -164,10 +105,10 @@ backspace, enter, delete on the right and space, tab, escape on the left.
 Alternative alpha arrangements are also available.
 
 
-**** Tap
+***** Tap
 
 
-***** Alphas
+****** Alphas
 
 #+NAME: colemakdh
 | Q     | W     | F     | P     | B     | J     | L     | U     | Y     | '     |
@@ -175,22 +116,22 @@ Alternative alpha arrangements are also available.
 | Z     | X     | C     | D     | V     | K     | H     | ,     | DOT   | /     |
 
 
-***** Thumbs
+****** Thumbs
 
 #+NAME: thumbs
 | U_NP  | U_NP  | ESC   | SPC   | TAB   | ENT   | BSPC  | DEL   | U_NP  | U_NP  |
 
 
-**** Hold
+***** Hold
 
 #+NAME: hold
-| RESET |       |       |       |       |       |       |       |       | RESET |
-| LGUI  | LALT  | LCTL  | LSFT  |       |       | LSFT  | LCTL  | LALT  | LGUI  |
-|       | ALGR  |       |       |       |       |       |       | ALGR  |       |
-| U_NP  | U_NP  | MEDIA | NAV   | MOUSE | SYM   | NUM   | FUN   | U_NP  | U_NP  |
+| RESET  |        |        |        |        |        |        |        |        | RESET  |
+| LGUI   | LALT   | LCTL   | LSFT   |        |        | LSFT   | LCTL   | LALT   | LGUI   |
+| BUTTON | ALGR   |        |        |        |        |        |        | ALGR   | BUTTON |
+| U_NP   | U_NP   | MEDIA  | NAV    | MOUSE  | SYM    | NUM    | FUN    | U_NP   | U_NP   |
 
 
-*** Nav
+**** Nav
 
 [[https://raw.githubusercontent.com/manna-harbour/miryoku/master/data/layers/miryoku-kle-nav.png]]
 
@@ -209,7 +150,7 @@ available.
 | ENT   | BSPC  | DEL   | U_NP  | U_NP  |
 
 
-*** Mouse
+**** Mouse
 
 [[https://raw.githubusercontent.com/manna-harbour/miryoku/master/data/layers/miryoku-kle-mouse.png]]
 
@@ -226,19 +167,24 @@ layer.
 | BTN1  | BTN3  | BTN2  | U_NP  | U_NP  |
 
 
-*** Mouse Buttons Overlay
+**** Button
 
-Available for automatic activation depending on keyboard hardware and
-configuration.  Not activated manually.
+[[https://raw.githubusercontent.com/manna-harbour/miryoku/master/data/layers/miryoku-kle-button.png]]
 
-#+NAME: mbo
-| U_RDO | U_PST | U_CPY | U_CUT | U_UND | U_RDO | U_PST | U_CPY | U_CUT | U_UND |
+Provides mouse buttons, mods, and clipboard keys for use with integrated or
+external pointing devices, used with either hand.  The layer is available for
+automatic activation depending on hardware and configuration.  It can also be
+activated manually by holding a bottom row pinkie key (however GUI and Undo will
+be unavailable).
+
+#+NAME: button
+| U_UND | U_CUT | U_CPY | U_PST | U_RDO | U_RDO | U_PST | U_CPY | U_CUT | U_UND |
 | LGUI  | LALT  | LCTL  | LSFT  |       |       | LSFT  | LCTL  | LALT  | LGUI  |
-|       |       |       |       |       |       |       |       |       |       |
+| U_UND | U_CUT | U_CPY | U_PST | U_RDO | U_RDO | U_PST | U_CPY | U_CUT | U_UND |
 | U_NP  | U_NP  | BTN2  | BTN3  | BTN1  | BTN1  | BTN3  | BTN2  | U_NP  | U_NP  |
 
 
-*** Media
+**** Media
 
 [[https://raw.githubusercontent.com/manna-harbour/miryoku/master/data/layers/miryoku-kle-media.png]]
 
@@ -254,7 +200,7 @@ available for other related functions.
 | MSTP    | MPLY    | MUTE    | U_NP    | U_NP    |
 
 
-*** Num
+**** Num
 
 [[https://raw.githubusercontent.com/manna-harbour/miryoku/master/data/layers/miryoku-kle-num.png]]
 
@@ -269,7 +215,7 @@ Dot is duplicated from the base layer.
 | U_NP | U_NP | DOT  | 0    | MINS |
 
 
-*** Sym
+**** Sym
 
 [[https://raw.githubusercontent.com/manna-harbour/miryoku/master/data/layers/miryoku-kle-sym.png]]
 
@@ -284,7 +230,7 @@ next to close parenthesis.
 | U_NP | U_NP | (    | )    | _    |
 
 
-*** Fun
+**** Fun
 
 [[https://raw.githubusercontent.com/manna-harbour/miryoku/master/data/layers/miryoku-kle-fun.png]]
 
@@ -301,19 +247,29 @@ the base layer to enable auto-repeat.
 | U_NP | U_NP | APP  | SPC  | TAB  |
 
 
-*** Alternative Layouts
+**** Alternative Layouts
 
 The defaults are recommended, but alternative layouts are provided to
 accommodate existing muscle memory and platform differences.
 
 
-**** Alphas
+***** Alphas
 
 To select, append the corresponding option to the ~make~ command line when
 building, e.g. ~MIRYOKU_ALPHAS=QWERTY~.
 
 
-***** Colemak
+****** AZERTY
+
+~MIRYOKU_ALPHAS=AZERTY~
+
+#+NAME: azerty
+| A    | Z    | E    | R    | T    | Y    | U    | I    | O    | P    |
+| Q    | S    | D    | F    | G    | H    | J    | K    | L    | M    |
+| W    | X    | C    | V    | B    | N    | ,    | DOT  | /    | '    |
+
+
+****** Colemak
 
 ~MIRYOKU_ALPHAS=COLEMAK~
 
@@ -323,7 +279,7 @@ building, e.g. ~MIRYOKU_ALPHAS=QWERTY~.
 | Z    | X    | C    | V    | B    | K    | M    | ,    | DOT  | /    |
 
 
-***** Colemak Mod-DHk
+****** Colemak Mod-DHk
 
 ~MIRYOKU_ALPHAS=COLEMAKDHK~
 
@@ -333,7 +289,7 @@ building, e.g. ~MIRYOKU_ALPHAS=QWERTY~.
 | Z    | X    | C    | D    | V    | M    | H    | ,    | DOT  | /    |
 
 
-***** Dvorak
+****** Dvorak
 
 ~MIRYOKU_ALPHAS=DVORAK~
 
@@ -343,7 +299,7 @@ building, e.g. ~MIRYOKU_ALPHAS=QWERTY~.
 | /    | Q    | J    | K    | X    | B    | M    | W    | V    | Z    |
 
 
-***** Halmak
+****** Halmak
 
 ~MIRYOKU_ALPHAS=HALMAK~
 
@@ -353,7 +309,7 @@ building, e.g. ~MIRYOKU_ALPHAS=QWERTY~.
 | F    | M    | V    | C    | /    | G    | P    | X    | K    | Y    |
 
 
-***** Workman
+****** Workman
 
 ~MIRYOKU_ALPHAS=WORKMAN~
 
@@ -363,7 +319,7 @@ building, e.g. ~MIRYOKU_ALPHAS=QWERTY~.
 | Z    | X    | M    | C    | V    | K    | L    | ,    | DOT  | /    |
 
 
-***** QWERTY
+****** QWERTY
 
 ~MIRYOKU_ALPHAS=QWERTY~
 
@@ -373,16 +329,26 @@ building, e.g. ~MIRYOKU_ALPHAS=QWERTY~.
 | Z    | X    | C    | V    | B    | N    | M    | ,    | DOT  | /    |
 
 
-**** Nav
+****** QWERTZ
+
+~MIRYOKU_ALPHAS=QWERTZ~
+
+#+NAME: qwertz
+| Q    | W    | E    | R    | T    | Z    | U    | I    | O    | P    |
+| A    | S    | D    | F    | G    | H    | J    | K    | L    | '    |
+| Y    | X    | C    | V    | B    | N    | M    | ,    | DOT  | /    |
 
 
-***** vi-Style
+***** Nav
+
+
+****** vi-Style
 
 To select, append ~MIRYOKU_NAV=VI~ to the ~make~ command line when building.
 Not available with ~MIRYOKU_LAYERS=FLIP~.
 
 
-****** Nav
+******* Nav
 
 #+NAME: nav-r-vi
 | U_RDO | U_PST | U_CPY | U_CUT | U_UND |
@@ -391,7 +357,7 @@ Not available with ~MIRYOKU_LAYERS=FLIP~.
 | ENT   | BSPC  | DEL   | U_NP  | U_NP  |
 
 
-****** Mouse
+******* Mouse
 
 #+NAME: mouse-r-vi
 | U_RDO | U_PST | U_CPY | U_CUT | U_UND |
@@ -400,7 +366,7 @@ Not available with ~MIRYOKU_LAYERS=FLIP~.
 | BTN1  | BTN3  | BTN2  | U_NP  | U_NP  |
 
 
-****** Media
+******* Media
 
 #+NAME: media-r-vi
 | RGB_TOG | RGB_MOD | RGB_HUI | RGB_SAI | RGB_VAI |
@@ -409,7 +375,7 @@ Not available with ~MIRYOKU_LAYERS=FLIP~.
 | MSTP    | MPLY    | MUTE    | U_NP    | U_NP    |
 
 
-***** Inverted-T
+****** Inverted-T
 
 [[https://raw.githubusercontent.com/manna-harbour/miryoku/master/data/layers/miryoku-kle-reference-flip-invertedt.png]]
 
@@ -417,7 +383,7 @@ To select, append ~MIRYOKU_NAV=INVERTEDT~ to the ~make~ command line when
 building.  Only available with ~MIRYOKU_LAYERS=FLIP~.
 
 
-****** Nav
+******* Nav
 
 #+NAME: nav-l-invertedt
 | PGUP  | HOME  | UP    | END   | INS   |
@@ -426,7 +392,7 @@ building.  Only available with ~MIRYOKU_LAYERS=FLIP~.
 | U_NP  | U_NP  | DEL   | BSPC  | ENT   |
 
 
-****** Mouse
+******* Mouse
 
 #+NAME: mouse-l-invertedt
 | WH_U  | WH_L  | MS_U  | WH_R  |       |
@@ -435,7 +401,7 @@ building.  Only available with ~MIRYOKU_LAYERS=FLIP~.
 | U_NP  | U_NP  | BTN2  | BTN3  | BTN1  |
 
 
-****** Media
+******* Media
 
 #+NAME: media-l-invertedt
 |         |         | VOLU    |         |         |
@@ -444,7 +410,7 @@ building.  Only available with ~MIRYOKU_LAYERS=FLIP~.
 | U_NP    | U_NP    | MUTE    | MPLY    | MSTP    |
 
 
-**** Clipboard
+***** Clipboard
 
 Keycodes are translated according to the following tables.
 
@@ -457,7 +423,7 @@ To select, append the corresponding option to the ~make~ command line when
 building, e.g. ~MIRYOKU_CLIPBOARD=WIN~.
 
 
-***** Default
+****** Default
 
 #+NAME: clipboard
 | U_RDO | AGIN      |
@@ -467,7 +433,7 @@ building, e.g. ~MIRYOKU_CLIPBOARD=WIN~.
 | U_UND | UNDO   |
 
 
-***** Fun Cluster
+****** Fun Cluster
 
 ~MIRYOKU_CLIPBOARD=FUN~
 
@@ -479,7 +445,7 @@ building, e.g. ~MIRYOKU_CLIPBOARD=WIN~.
 | U_UND | UNDO |
 
 
-***** Mac
+****** Mac
 
 ~MIRYOKU_CLIPBOARD=MAC~
 
@@ -491,7 +457,7 @@ building, e.g. ~MIRYOKU_CLIPBOARD=WIN~.
 | U_UND | LCMD(KC_Z) |
 
 
-***** Windows
+****** Windows
 
 ~MIRYOKU_CLIPBOARD=WIN~
 
@@ -503,32 +469,32 @@ building, e.g. ~MIRYOKU_CLIPBOARD=WIN~.
 | U_UND | C(KC_Z) |
 
 
-**** Layers
+***** Layers
 
 
-***** Flip
+****** Flip
 
 Flip base layer thumb keys and sub layers between right and left hands.
 
 To select, append ~MIRYOKU_LAYERS=FLIP~ to the ~make~ command line when building.
 
 
-****** Thumbs
+******* Thumbs
 
 #+NAME: thumbs-flip
 | U_NP | U_NP | DEL  | BSPC | ENT  | TAB  | SPC  | ESC  | U_NP | U_NP |
 
 
-****** Hold
+******* Hold
 
 #+NAME: hold-flip
-| RESET |       |       |       |       |       |       |       |       | RESET |
-| LGUI  | LALT  | LCTL  | LSFT  |       |       | LSFT  | LCTL  | LALT  | LGUI  |
-|       | ALGR  |       |       |       |       |       |       | ALGR  |       |
-| U_NP  | U_NP  | FUN   | NUM   | SYM   | MOUSE | NAV   | MEDIA | U_NP  | U_NP  |
+| RESET  |        |        |        |        |        |        |        |        | RE