diff --git a/keyboards/converter/c3_maestro/info.json b/keyboards/converter/c3_maestro/info.json
index 1697e0e4121d..82796e294b20 100644
--- a/keyboards/converter/c3_maestro/info.json
+++ b/keyboards/converter/c3_maestro/info.json
@@ -25,7 +25,7 @@
     "vid": "0xFEED"
   },
   "layouts": {
-    "LAYOUT_K1": {
+    "LAYOUT": {
       "layout": [
         { "label":"ESC", "x":0, "y":0 },
         { "label":"F1", "x":2, "y":0 },
diff --git a/keyboards/converter/c3_maestro/rules.mk b/keyboards/converter/c3_maestro/rules.mk
index 59319c29b996..5fe9b51888d2 100644
--- a/keyboards/converter/c3_maestro/rules.mk
+++ b/keyboards/converter/c3_maestro/rules.mk
@@ -1,5 +1,6 @@
 # Teensy 3.2
 MCU = MK20DX256
+BOOTLOADER = halfkay
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/converter/convergent/convergent.h b/keyboards/converter/convergent/convergent.h
index 45bdd83f715d..143ed9f0bfbd 100644
--- a/keyboards/converter/convergent/convergent.h
+++ b/keyboards/converter/convergent/convergent.h
@@ -25,7 +25,7 @@
  *                       +----+-----------------------+----+
  *
  */
-#define LAYOUT_K1( \
+#define LAYOUT_k1( \
     K0C, K11, K02, K01, K03, \
     K05, K13, K15, K16, K17, K18, K19, K1A, K1C, K1D, K1E, K1F, K0E, K0B, K0F, \
     K07, K12, K5E, K31, K32, K33, K34, K35, K36, K37, K38, K39, K30, K2D, K2B, K08, K5C, K7C, K21, K1B, \
diff --git a/keyboards/converter/convergent/info.json b/keyboards/converter/convergent/info.json
index 475fc8decd98..25928b3f6274 100644
--- a/keyboards/converter/convergent/info.json
+++ b/keyboards/converter/convergent/info.json
@@ -25,7 +25,7 @@
     "vid": "0xFEED"
   },
   "layouts": {
-    "LAYOUT_K1": {
+    "LAYOUT_k1": {
       "layout": [
         { "label":"NEXT PAGE", "x":0, "y":0 },
         { "label":"SCROLL UP", "x":1, "y":0 },
@@ -123,7 +123,7 @@
         { "label":"0", "x":18, "y":4, "w":2 },
         { "label":".", "x":20, "y":4 },
         { "label":"CODE", "x":5.75, "y":6, "w":1.25 },
-        { "x":7, "y":6, "w":6}
+        { "x":7, "y":6, "w":6},
         { "label":"CODE", "x":13, "y":6, "w":1.25 }
       ]
     }
diff --git a/keyboards/converter/convergent/keymaps/default/keymap.c b/keyboards/converter/convergent/keymaps/default/keymap.c
index e9905f99ab83..a29a30639e87 100644
--- a/keyboards/converter/convergent/keymaps/default/keymap.c
+++ b/keyboards/converter/convergent/keymaps/default/keymap.c
@@ -23,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *
  */
      
-  [0] = LAYOUT_K1(
+  [0] = LAYOUT_k1(
     KC_END, KC_PGUP, KC_PSCR, KC_UP, KC_PAUS, \
     KC_HOME, KC_PGDN, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_LEFT, KC_DOWN, KC_RIGHT, \
     KC_ESC, KC_COPY, KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_P7, KC_P8, KC_P9, KC_EXEC, \
diff --git a/keyboards/converter/convergent/teensy_32/rules.mk b/keyboards/converter/convergent/teensy_32/rules.mk
index 0ff316a401b4..19ae24e35959 100644
--- a/keyboards/converter/convergent/teensy_32/rules.mk
+++ b/keyboards/converter/convergent/teensy_32/rules.mk
@@ -1,5 +1,6 @@
 # Teensy 3.2
 MCU = MK20DX256
+BOOTLOADER = halfkay
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/converter/ctm/teensy_32/rules.mk b/keyboards/converter/ctm/teensy_32/rules.mk
index 0ff316a401b4..19ae24e35959 100644
--- a/keyboards/converter/ctm/teensy_32/rules.mk
+++ b/keyboards/converter/ctm/teensy_32/rules.mk
@@ -1,5 +1,6 @@
 # Teensy 3.2
 MCU = MK20DX256
+BOOTLOADER = halfkay
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/converter/hp_262x/hp_262x.h b/keyboards/converter/hp_262x/hp_262x.h
index 0c52668f0023..e6e0e16de127 100644
--- a/keyboards/converter/hp_262x/hp_262x.h
+++ b/keyboards/converter/hp_262x/hp_262x.h
@@ -22,7 +22,7 @@
  *           +---+-------------------------------+---+
  */
 
-#define LAYOUT_STANDARD( \
+#define LAYOUT_standard( \
     K00, K01, K02, K03, K04, K05, K06, K07, \
     K33, K30, K17, K16, K27, K26, K57, K56, K55, K52, K67, K66, K46, K43, K47, \
     K35, K34, K15, K14, K25, K24, K54, K75, K76, K77, K65, K64, K44, K45, K40, \
@@ -62,7 +62,7 @@
  *               +-------------------------------+     
  */
 
-#define LAYOUT_EXTENDED( \
+#define LAYOUT_extended( \
     K68, K69, K6A, K6B, K6C, K6D, K6E, K6F, K5E, K5F, K54, K57, \
     K60, K61, K62, K64, K65, K63, K66, K67, K58, K59, K5A, K5B, K5C, K5D, K56, K55, \
     K44, K18, K0F, K0E, K17, K16, K2F, K2E, K2D, K2A, K37, K36, K26, K23, K27, K46, K47, K50, K51, \
diff --git a/keyboards/converter/hp_262x/info.json b/keyboards/converter/hp_262x/info.json
index 288add0ebe8f..2a8425369f82 100644
--- a/keyboards/converter/hp_262x/info.json
+++ b/keyboards/converter/hp_262x/info.json
@@ -23,7 +23,7 @@
     "vid": "0xFEED"
   },
   "layouts": {
-    "LAYOUT_STANDARD": {
+    "LAYOUT_standard": {
       "layout": [
         { "label":"up left", "x":0.5, "y":0, "w":1.5 },
         { "label":"down left", "x":1.5, "y":0, "w":1.5 },
diff --git a/keyboards/converter/hp_262x/keymaps/extended/keymap.c b/keyboards/converter/hp_262x/keymaps/extended/keymap.c
index f035a39edf3b..781e64fa956f 100644
--- a/keyboards/converter/hp_262x/keymaps/extended/keymap.c
+++ b/keyboards/converter/hp_262x/keymaps/extended/keymap.c
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *               +-------------------------------+     
  */
 
-  [0] = LAYOUT_EXTENDED(
+  [0] = LAYOUT_extended(
     KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_NUMLOCK, KC_SCROLLLOCK, KC_PAUSE, KC_SYSREQ, \
     KC_HELP, KC_MENU, KC_NO, KC_PGDOWN, KC_PGUP, KC_HOME, KC_UP, KC_LEFT, KC_RIGHT, KC_DOWN, KC_END, KC_NO, KC_INS, KC_DEL, KC_NO, KC_PSCREEN, \
     KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, KC_EQUAL, KC_BSPACE, KC_GRAVE, KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_MINUS, \
diff --git a/keyboards/converter/hp_262x/keymaps/standard/keymap.c b/keyboards/converter/hp_262x/keymaps/standard/keymap.c
index 65eeec50816f..f4025db549bc 100644
--- a/keyboards/converter/hp_262x/keymaps/standard/keymap.c
+++ b/keyboards/converter/hp_262x/keymaps/standard/keymap.c
@@ -19,7 +19,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *           +---+-------------------------------+---+
  */
 
-  [0] = LAYOUT_STANDARD(
+  [0] = LAYOUT_standard(
     KC_HOME, KC_END, KC_PGDOWN, KC_PGUP, KC_UP, KC_LEFT, KC_RIGHT, KC_DOWN, \
     KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, KC_EQUAL, KC_BSPACE, KC_GRAVE, \
     KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRACKET, KC_RBRACKET, KC_BSLASH, KC_DEL, \
diff --git a/keyboards/converter/ibm_lpfk/teensy_lc/rules.mk b/keyboards/converter/ibm_lpfk/teensy_lc/rules.mk
index bd7f8306ba7c..7f106341d46e 100644
--- a/keyboards/converter/ibm_lpfk/teensy_lc/rules.mk
+++ b/keyboards/converter/ibm_lpfk/teensy_lc/rules.mk
@@ -1,5 +1,6 @@
 # Teensy LC
 MCU = MKL26Z64
+BOOTLOADER = halfkay
 USE_CHIBIOS_CONTRIB = yes
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
diff --git a/keyboards/converter/ibm_pcjr/ibm_pcjr.h b/keyboards/converter/ibm_pcjr/ibm_pcjr.h
index 4284ae2b358e..51eae20e571e 100644
--- a/keyboards/converter/ibm_pcjr/ibm_pcjr.h
+++ b/keyboards/converter/ibm_pcjr/ibm_pcjr.h
@@ -51,7 +51,7 @@
  * +---+---+---+-----------------------------------+---+---+---+
  */
 
-#define LAYOUT_DATAVUE( \
+#define LAYOUT_datavue( \
     K29, K45, K46, K0C, K47, K48, K49, K4A, \
     K3B, K3C, K3D, K3E, K3F, K40, K41, K42, K43, K44, K0D, K4B, K4C, K4D, K4E, \
     K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K4F, K50, K51, K0E, \
diff --git a/keyboards/converter/ibm_pcjr/keymaps/datavue/keymap.c b/keyboards/converter/ibm_pcjr/keymaps/datavue/keymap.c
index 14cb8a597ad6..b676d5030cf0 100644
--- a/keyboards/converter/ibm_pcjr/keymaps/datavue/keymap.c
+++ b/keyboards/converter/ibm_pcjr/keymaps/datavue/keymap.c
@@ -21,7 +21,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * +---+---+---+-----------------------------------+---+---+---+
  */
 
-  [0] = LAYOUT_DATAVUE(
+  [0] = LAYOUT_datavue(
     KC_GRAVE, KC_NUMLOCK, KC_SCROLLLOCK, KC_MINUS, KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_MINUS, \
     KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_EQUAL, KC_KP_4, KC_KP_5, KC_KP_6, KC_KP_PLUS, \
     KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_KP_1, KC_KP_2, KC_KP_3, KC_BSPACE, \
diff --git a/keyboards/converter/lk201/keymaps/ms_7004/keymap.c b/keyboards/converter/lk201/keymaps/ms_7004/keymap.c
index 681573344f67..3e30987ddd55 100644
--- a/keyboards/converter/lk201/keymaps/ms_7004/keymap.c
+++ b/keyboards/converter/lk201/keymaps/ms_7004/keymap.c
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *           +---+-----------------------------------+                                 +-------+-------+
  */
      
-  [0] = LAYOUT_MS_7004(
+  [0] = LAYOUT_ms_7004(
     KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_F14, KC_F15, KC_F16, KC_F17, KC_F18, KC_F19, KC_F20, \
     KC_BSLASH, KC_SCOLON, RU_1, RU_2, RU_3, RU_4, RU_5, RU_6, RU_7, RU_8, RU_9, RU_0, RU_MINS, KC_PLUS, KC_ESC, KC_BSPACE, KC_FIND, KC_INSERT, KC_DELETE, KC_F21, KC_F22, KC_F23, KC_F24, \
     KC_TAB, RU_SHTI, RU_TSE, RU_U, RU_KA, RU_IE, RU_EN, RU_GHE, RU_SHA, RU_SHCH, RU_ZE, RU_HA, KC_COLON, KC_GRAVE, KC_ENTER, KC_SELECT, KC_PGUP, KC_PGDOWN, KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_COMMA, \
diff --git a/keyboards/converter/lk201/lk201.h b/keyboards/converter/lk201/lk201.h
index 0c57377aa3c5..b62d09e9b376 100644
--- a/keyboards/converter/lk201/lk201.h
+++ b/keyboards/converter/lk201/lk201.h
@@ -60,7 +60,7 @@
  *           |B1 |D4                                 |                                 |92     |95     |
  *           +---+-----------------------------------+                                 +-------+-------+
  */
-#define LAYOUT_MS_7004( \
+#define LAYOUT_ms_7004( \
     K56, K57, K58, K59, K5A, K64, K65, K66, K67, K68, K71, K72, K73, K74, K7C, K7D, K80, K81, K82, K83, \
     KFC, KBF, KC0, KC5, KCB, KD0, KD6, KDB, KE0, KE5, KEA, KEF, KF9, KF5, KC9, KBC, K8A, K8B, K8C, KA1, KA2, KA3, KA4, \
     KBE, KC1, KC6, KCC, KD1, KD7, KDC, KE1, KE6, KEB, KF0, KFA, KF6, KC4, KBD, K8D, K8E, K8F, K9D, K9E, K9F, KA0, \
diff --git a/keyboards/converter/lk201/teensy_32/rules.mk b/keyboards/converter/lk201/teensy_32/rules.mk
index 0ff316a401b4..19ae24e35959 100644
--- a/keyboards/converter/lk201/teensy_32/rules.mk
+++ b/keyboards/converter/lk201/teensy_32/rules.mk
@@ -1,5 +1,6 @@
 # Teensy 3.2
 MCU = MK20DX256
+BOOTLOADER = halfkay
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/converter/lk201/teensy_lc/rules.mk b/keyboards/converter/lk201/teensy_lc/rules.mk
index 9dbebe11249a..69a8af0e8bfb 100644
--- a/keyboards/converter/lk201/teensy_lc/rules.mk
+++ b/keyboards/converter/lk201/teensy_lc/rules.mk
@@ -1,5 +1,6 @@
 # Teensy LC
 MCU = MKL26Z64
+BOOTLOADER = halfkay
 USE_CHIBIOS_CONTRIB = yes
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
diff --git a/keyboards/converter/nec_pc_8801/info.json b/keyboards/converter/nec_pc_8801/info.json
index 781164d6210a..831a66c6f54e 100644
--- a/keyboards/converter/nec_pc_8801/info.json
+++ b/keyboards/converter/nec_pc_8801/info.json
@@ -115,7 +115,7 @@
         { "label":"⏎", "x":19.25, "y":5 }
       ]
     },
-    "LAYOUT_8801mkII": {
+    "LAYOUT_8801mkii": {
       "layout": [
         { "label":"STOP", "x":0, "y":0 },
         { "label":"COPY", "x":1, "y":0 },
diff --git a/keyboards/converter/nec_pc_8801/nec_pc_8801.h b/keyboards/converter/nec_pc_8801/nec_pc_8801.h
index c5333e9c399c..97bc9ba3363a 100644
--- a/keyboards/converter/nec_pc_8801/nec_pc_8801.h
+++ b/keyboards/converter/nec_pc_8801/nec_pc_8801.h
@@ -64,7 +64,7 @@
  * 
  */
 
-#define LAYOUT_8801mkII( \
+#define LAYOUT_8801mkii( \
     K90, KA4, K91, K92, K93, K94, K95, KB0, KB1,                               K81, KA1, KA2, K82, \
     K97, K61, K62, K63, K64, K65, K66, K67, K70, K71, K60, K57, K56, K54, K83, K80, KA3, KA5, KA6, \
     KA0, K41, K47, K25, K42, K44, K51, K45, K31, K37, K40, K20, K53, K17,      K07, K10, K11, K12, \
diff --git a/keyboards/converter/nmb_tvi/keymaps/nmb_116535/keymap.c b/keyboards/converter/nmb_tvi/keymaps/nmb_116535/keymap.c
index d0fe5340a184..2817f222ab1a 100644
--- a/keyboards/converter/nmb_tvi/keymaps/nmb_116535/keymap.c
+++ b/keyboards/converter/nmb_tvi/keymaps/nmb_116535/keymap.c
@@ -20,7 +20,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * +---+---+---------------------------------------+---+---+---+---+    +---+-------+---+---+
  */
      
-  [0] = LAYOUT_116535_RAW(
+  [0] = LAYOUT_116535_raw(
     KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_F13, KC_F14, KC_F15, KC_F16, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \
     KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, KC_EQUAL, KC_GRAVE, KC_BSLASH, KC_BSPACE, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \
     KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRACKET, KC_RBRACKET, KC_ENTER, KC_NO, KC_TAB, KC_KP_7, KC_KP_8, KC_KP_9, KC_KP_MINUS, \
diff --git a/keyboards/converter/nmb_tvi/nmb_tvi.h b/keyboards/converter/nmb_tvi/nmb_tvi.h
index 85d8bfe5fded..b8ac3cd97330 100644
--- a/keyboards/converter/nmb_tvi/nmb_tvi.h
+++ b/keyboards/converter/nmb_tvi/nmb_tvi.h
@@ -259,7 +259,7 @@
     { KF0, KC_NO, KF2, KC_NO, KF4, KC_NO, KF6, KC_NO, KF8, KC_NO, KFA, KFB, KC_NO, KFD, KC_NO, KC_NO } \
 }
 
-#define LAYOUT_116535_RAW( \
+#define LAYOUT_116535_raw( \
     K3B, K3C, K3D, K3E, K3F, K40, K41, K42, K43, K44, K57, K58, K59, K5A, K5B, K5C, K6D, K79, K6C, K75, K63, \
     K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K29, K2B, K0E, K6E, K7A, K77, K62, K66, \
     K0F, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K74, K73, K47, K48, K49, K4A, \
diff --git a/keyboards/converter/oasys/info.json b/keyboards/converter/oasys/info.json
index dcee5c522659..617663914995 100644
--- a/keyboards/converter/oasys/info.json
+++ b/keyboards/converter/oasys/info.json
@@ -27,7 +27,7 @@
     "vid": "0xFEED"
   },
   "layouts": {
-    "LAYOUT_FMT": {
+    "LAYOUT_fmt": {
       "layout": [
         { "label":"BREAK", "x":0, "y":0 },
         { "label":"COPY", "x":1.25, "y":0 },
@@ -167,7 +167,7 @@
         { "label":"000", "x":21, "y":6.75 }
       ]
     },
-    "LAYOUT_FMT_JIS": {
+    "LAYOUT_fmt_jis": {
       "layout": [
         { "label":"BREAK", "x":0, "y":0 },
         { "label":"COPY", "x":1.25, "y":0 },
diff --git a/keyboards/converter/oasys/oasys.h b/keyboards/converter/oasys/oasys.h
index 90ca1adb63c6..064312ad4026 100644
--- a/keyboards/converter/oasys/oasys.h
+++ b/keyboards/converter/oasys/oasys.h
@@ -25,7 +25,7 @@
  *                     +----+----+                           +-----------+
  */
 
-#define LAYOUT_OASYS( \
+#define LAYOUT_oasys( \
     K7C,     K7D, K5D, K5E, K5F, K60,     K61, K62, K63,     K64, K65,     K6B, K6C, K6D, K3D, K74, K75, K76, K77, \
                                                                            K6E, K4E, K70, K47, K78, K79, K45, K7A, \
     K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K5B,       K71, K4B, K48, \
@@ -66,7 +66,7 @@
  *                       +----+----+                             +-----------+ +-------+---+---+
  */
 
-#define LAYOUT_FMT( \
+#define LAYOUT_fmt( \
     K7C, K7D, K5D, K5E, K5F, K60, K61, K62, K63, K64, K65, K66, K69, K5B,      K6B, K6C, K6D, K74, K75, K76, K77, \
                                                                                K6E, K4E, K70, K78, K79, K7A, K7B, \
     K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K29, K71, K4B, K48, \
@@ -107,7 +107,7 @@
  *                       +----+----+                             +-----------+ +-------+---+---+
  */
 
-#define LAYOUT_FMT_JIS( \
+#define LAYOUT_fmt_jis( \
     K7C, K7D, K5D, K5E, K5F, K60, K61, K62, K63, K64, K65, K66, K69, K5B,      K6B, K6C, K6D, K74, K75, K76, K77, \
                                                                                K6E, K4E, K70, K78, K79, K7A, K7B, \
     K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K71, K4B, K48, \
diff --git a/keyboards/converter/pericom/teensy_32/rules.mk b/keyboards/converter/pericom/teensy_32/rules.mk
index 0ff316a401b4..19ae24e35959 100644
--- a/keyboards/converter/pericom/teensy_32/rules.mk
+++ b/keyboards/converter/pericom/teensy_32/rules.mk
@@ -1,5 +1,6 @@
 # Teensy 3.2
 MCU = MK20DX256
+BOOTLOADER = halfkay
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/converter/sgi/teensy_32/rules.mk b/keyboards/converter/sgi/teensy_32/rules.mk
index e2751b2682ba..28fc567d6077 100644
--- a/keyboards/converter/sgi/teensy_32/rules.mk
+++ b/keyboards/converter/sgi/teensy_32/rules.mk
@@ -1,5 +1,6 @@
 # Teensy 3.2
 MCU = MK20DX256
+BOOTLOADER = halfkay
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/converter/sgi/teensy_lc/rules.mk b/keyboards/converter/sgi/teensy_lc/rules.mk
index 3e8078fe6a0c..41acc7c81401 100644
--- a/keyboards/converter/sgi/teensy_lc/rules.mk
+++ b/keyboards/converter/sgi/teensy_lc/rules.mk
@@ -1,5 +1,6 @@
 # Teensy LC
 MCU = MKL26Z64
+BOOTLOADER = halfkay
 USE_CHIBIOS_CONTRIB = yes
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
diff --git a/keyboards/converter/standard_IIe_tender_keypad/rules.mk b/keyboards/converter/standard_IIe_tender_keypad/rules.mk
index bd7f8306ba7c..7f106341d46e 100644
--- a/keyboards/converter/standard_IIe_tender_keypad/rules.mk
+++ b/keyboards/converter/standard_IIe_tender_keypad/rules.mk
@@ -1,5 +1,6 @@
 # Teensy LC
 MCU = MKL26Z64
+BOOTLOADER = halfkay
 USE_CHIBIOS_CONTRIB = yes
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
diff --git a/keyboards/converter/teleray_20he/teensy_32/rules.mk b/keyboards/converter/teleray_20he/teensy_32/rules.mk
index 0ff316a401b4..19ae24e35959 100644
--- a/keyboards/converter/teleray_20he/teensy_32/rules.mk
+++ b/keyboards/converter/teleray_20he/teensy_32/rules.mk
@@ -1,5 +1,6 @@
 # Teensy 3.2
 MCU = MK20DX256
+BOOTLOADER = halfkay
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/paladinpad/keymaps/mmcm/keymap.c b/keyboards/kapcave/paladinpad/keymaps/mmcm/keymap.c
similarity index 54%
rename from keyboards/paladinpad/keymaps/mmcm/keymap.c
rename to keyboards/kapcave/paladinpad/keymaps/mmcm/keymap.c
index 34e2877a6e23..bfe2a90db978 100644
--- a/keyboards/paladinpad/keymaps/mmcm/keymap.c
+++ b/keyboards/kapcave/paladinpad/keymaps/mmcm/keymap.c
@@ -1,10 +1,9 @@
-#include "paladinpad.h"
+#include QMK_KEYBOARD_H
 
-const uint16_t PROGMEM fn_actions[] = {};
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     /* DEFAULT */
-	LAYOUT(
+	LAYOUT_ortho_5x4(
                 MO(1), KC_PSLS, KC_PAST, KC_PMNS,
 		KC_P7, KC_P8, KC_P9, KC_NO,
 		KC_P4, KC_P5, KC_P6, KC_PPLS,
@@ -12,31 +11,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		KC_P0, KC_DOT, KC_NO, KC_PENT),
 
     /* FUNCTION */
-	LAYOUT(
+	LAYOUT_ortho_5x4(
 		KC_TRNS, RGB_TOG, RGB_MOD, KC_TRNS,
         RGB_HUI, RGB_SAI, RGB_VAI, KC_TRNS,
         RGB_HUD, RGB_SAD, RGB_VAD, KC_TRNS,
 		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 		KC_TRNS, RESET, KC_TRNS, KC_NLCK)
 };
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
-	// keyevent_t event = record->event;
-
-	switch (id) {
-
-	}
-	return MACRO_NONE;
-}
-
-void matrix_init_user(void) {
-}
-
-void matrix_scan_user(void) {
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-	return true;
-}
-
-
diff --git a/keyboards/ivy/keymaps/mmcm/keymap.c b/keyboards/maple_computing/ivy/keymaps/mmcm/keymap.c
similarity index 100%
rename from keyboards/ivy/keymaps/mmcm/keymap.c
rename to keyboards/maple_computing/ivy/keymaps/mmcm/keymap.c
diff --git a/keyboards/ivy/keymaps/mmcm/rules.mk b/keyboards/maple_computing/ivy/keymaps/mmcm/rules.mk
similarity index 100%
rename from keyboards/ivy/keymaps/mmcm/rules.mk
rename to keyboards/maple_computing/ivy/keymaps/mmcm/rules.mk
diff --git a/keyboards/nmb_111262/info.json b/keyboards/nmb_111262/info.json
index 560f1ddb45c9..f16090dbb5a1 100644
--- a/keyboards/nmb_111262/info.json
+++ b/keyboards/nmb_111262/info.json
@@ -27,7 +27,7 @@
   "processor": "atmega32u4",
   "url": "https://deskthority.net/viewtopic.php?f=7&t=22922",
   "usb": {
-    "device_ver": "0x000A",
+    "device_ver": "0x0001",
     "pid": "0x0000",
     "vid": "0xFEED"
   },
diff --git a/keyboards/omron_turbo/rules.mk b/keyboards/omron_turbo/rules.mk
index 17b8c6850d7b..e107ba9ca2a4 100644
--- a/keyboards/omron_turbo/rules.mk
+++ b/keyboards/omron_turbo/rules.mk
@@ -1,4 +1,5 @@
 MCU = MKL26Z64
+BOOTLOADER = halfkay
 USE_CHIBIOS_CONTRIB = yes
 
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/keyboards/paladinpad/keymaps/mmcm/rules.mk b/keyboards/paladinpad/keymaps/mmcm/rules.mk
deleted file mode 100644
index 12ac6aa59f81..000000000000
--- a/keyboards/paladinpad/keymaps/mmcm/rules.mk
+++ /dev/null
@@ -1,4 +0,0 @@
-
-BOOTMAGIC_ENABLE = no
-EXTRAKEY_ENABLE = no
-NKRO_ENABLE = no
diff --git a/keyboards/yd60mq/keymaps/mmcm/keymap.c b/keyboards/ymdk/yd60mq/keymaps/mmcm/keymap.c
similarity index 100%
rename from keyboards/yd60mq/keymaps/mmcm/keymap.c
rename to keyboards/ymdk/yd60mq/keymaps/mmcm/keymap.c
diff --git a/users/mmcm/mmcm.sh b/users/mmcm/mmcm.sh
index a1545b2ab68f..b0df247b60f7 100755
--- a/users/mmcm/mmcm.sh
+++ b/users/mmcm/mmcm.sh
@@ -7,9 +7,9 @@ make converter/apple_lisa SILENT=true &&
 make converter/amtelco_kb163 SILENT=true &&
 make converter/hp_2645a SILENT=true &&
 make alpha:mmcm SILENT=true &&
-make ivy:mmcm SILENT=true &&
+make maple_computing/ivy:mmcm SILENT=true &&
 make converter/vt100 SILENT=true &&
-make paladinpad:mmcm SILENT=true &&
+make kapcave/paladinpad:mmcm SILENT=true &&
 make converter/k1780 SILENT=true &&
 make handwired/onekey:mmcm SILENT=true &&
 make converter/convergent SILENT=true &&