diff --git a/public/keymaps/b/boardsource_technik_o_default.json b/public/keymaps/b/boardsource_technik_o_default.json
index fcd433c787..f3a1914694 100644
--- a/public/keymaps/b/boardsource_technik_o_default.json
+++ b/public/keymaps/b/boardsource_technik_o_default.json
@@ -8,7 +8,7 @@
       "KC_TAB",  "KC_Q",    "KC_W",    "KC_E",    "KC_R",    "KC_T",    "KC_Y",    "KC_U",    "KC_I",    "KC_O",    "KC_P",    "KC_BSPC",
       "KC_ESC",  "KC_A",    "KC_S",    "KC_D",    "KC_F",    "KC_G",    "KC_H",    "KC_J",    "KC_K",    "KC_L",    "KC_SCLN", "KC_QUOT",
       "KC_LSFT", "KC_Z",    "KC_X",    "KC_C",    "KC_V",    "KC_B",    "KC_N",    "KC_M",    "KC_COMM", "KC_DOT",  "KC_SLSH", "KC_ENT" ,
-      "RM_TOGG", "KC_LCTL", "KC_LALT", "KC_LGUI", "LOWER",   "KC_SPC",  "KC_SPC",  "RAISE",   "KC_LEFT", "KC_DOWN", "KC_UP",   "KC_RGHT"
+      "RM_TOGG", "KC_LCTL", "KC_LALT", "KC_LGUI", "MO(2)",   "KC_SPC",  "KC_SPC",  "MO(1)",   "KC_LEFT", "KC_DOWN", "KC_UP",   "KC_RGHT"
     ],
     [
       "KC_TILD", "KC_EXLM", "KC_AT",   "KC_HASH", "KC_DLR",  "KC_PERC", "KC_CIRC", "KC_AMPR",    "KC_ASTR",    "KC_LPRN", "KC_RPRN", "KC_BSPC",
diff --git a/public/keymaps/j/jacky_studio_piggy60_rev1_hotswap_default.json b/public/keymaps/j/jacky_studio_piggy60_rev1_hotswap_default.json
index 44bf7476c7..b7df9e7e70 100644
--- a/public/keymaps/j/jacky_studio_piggy60_rev1_hotswap_default.json
+++ b/public/keymaps/j/jacky_studio_piggy60_rev1_hotswap_default.json
@@ -2,7 +2,7 @@
   "keyboard": "jacky_studio/piggy60/rev1/hotswap",
   "keymap": "default",
   "commit": "f3bae5680843dae8a59cf90b5ac6535da632f42c",
-  "layout": "*CheckthelistofsupportedLAYOUTS",
+  "layout": "LAYOUT_60_ansi_tsangan_split_bs_rshift",
   "layers": [
     [
       "KC_ESC",        "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_BSLS",       "KC_GRV",
diff --git a/public/keymaps/j/jacky_studio_piggy60_rev1_solder_default.json b/public/keymaps/j/jacky_studio_piggy60_rev1_solder_default.json
index d363bdace0..432b8b2748 100644
--- a/public/keymaps/j/jacky_studio_piggy60_rev1_solder_default.json
+++ b/public/keymaps/j/jacky_studio_piggy60_rev1_solder_default.json
@@ -2,7 +2,7 @@
   "keyboard": "jacky_studio/piggy60/rev1/solder",
   "keymap": "default",
   "commit": "f3bae5680843dae8a59cf90b5ac6535da632f42c",
-  "layout": "*CheckthelistofsupportedLAYOUTS",
+  "layout": "LAYOUT_60_ansi_tsangan_split_bs_rshift",
   "layers": [
     [
       "KC_ESC",        "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_BSLS",       "KC_GRV",
diff --git a/public/keymaps/j/jukaie_jk01_default.json b/public/keymaps/j/jukaie_jk01_default.json
index 539e4aeb53..b33f126865 100644
--- a/public/keymaps/j/jukaie_jk01_default.json
+++ b/public/keymaps/j/jukaie_jk01_default.json
@@ -23,17 +23,17 @@
     [
       "QK_BOOT", "KC_MYCM", "KC_MAIL", "KC_WSCH", "KC_WHOM", "KC_CALC", "KC_MSEL", "KC_MPRV", "KC_MPLY", "KC_MNXT", "KC_MUTE", "KC_VOLD", "KC_VOLU", "KC_TRNS", "RM_NEXT",
       "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "RM_HUEU",
-      "KC_TRNS", "KC_TRNS", "TO(Win)", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
+      "KC_TRNS", "KC_TRNS", "TO(0)",   "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
       "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",            "KC_TRNS", "KC_TRNS",
-      "KC_TRNS",            "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "TO(Mac)", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "RM_VALU", "KC_TRNS",
+      "KC_TRNS",            "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "TO(1)",   "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "RM_VALU", "KC_TRNS",
       "KC_TRNS", "GU_TOGG", "KC_TRNS",                                  "KC_TRNS",                       "KC_TRNS", "KC_TRNS", "KC_TRNS", "RM_SPDD", "RM_VALD", "RM_SPDU"
     ],
     [
       "QK_BOOT", "KC_F1",   "KC_F2",   "KC_F3",   "KC_F4",   "KC_TRNS", "KC_TRNS", "KC_F7",   "KC_F8",   "KC_F9",   "KC_F10",  "KC_F11",  "KC_F12",  "KC_TRNS", "RM_NEXT",
       "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "RM_HUEU",
-      "KC_TRNS", "KC_TRNS", "TO(Win)", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
+      "KC_TRNS", "KC_TRNS", "TO(0)",   "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",
       "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",            "KC_TRNS", "KC_TRNS",
-      "KC_TRNS",            "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "TO(Mac)", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "RM_VALU", "KC_TRNS",
+      "KC_TRNS",            "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "TO(1)",   "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "RM_VALU", "KC_TRNS",
       "KC_TRNS", "KC_TRNS", "KC_TRNS",                                  "KC_TRNS",                       "KC_TRNS", "KC_TRNS", "KC_TRNS", "RM_SPDD", "RM_VALD", "RM_SPDU"
     ]
   ]
diff --git a/public/keymaps/k/keyprez_bison_default.json b/public/keymaps/k/keyprez_bison_default.json
index b7cb53e334..deeb9d9074 100644
--- a/public/keymaps/k/keyprez_bison_default.json
+++ b/public/keymaps/k/keyprez_bison_default.json
@@ -27,7 +27,7 @@
     ],
     [
       "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______",                          "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______",
-      "_______", "_______", "_______", "KC_F1",   "KC_F2",   "KC_F3",   "KC_F4",   "_______",                          "_______", "_______", "KC_PRVWD", "KC_UP",   "KC_NXTWD", "_______", "_______", "_______",
+      "_______", "_______", "_______", "KC_F1",   "KC_F2",   "KC_F3",   "KC_F4",   "_______",                          "_______", "_______", "_______", "KC_UP",   "_______", "_______", "_______", "_______",
       "_______", "_______", "_______", "KC_F5",   "KC_F6",   "KC_F7",   "KC_F8",   "_______",                          "_______", "_______", "KC_LEFT", "KC_DOWN", "KC_RGHT", "_______", "_______", "_______",
       "_______", "_______", "_______", "KC_F9",   "KC_F10",  "KC_F11",  "KC_F12",  "_______", "_______",    "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______",
                                                   "_______", "_______", "_______", "_______",                          "_______", "_______", "_______", "_______"
diff --git a/public/keymaps/o/omkbd_runner3680_5x8_default.json b/public/keymaps/o/omkbd_runner3680_5x8_default.json
index 9c29adedef..f703b0b218 100644
--- a/public/keymaps/o/omkbd_runner3680_5x8_default.json
+++ b/public/keymaps/o/omkbd_runner3680_5x8_default.json
@@ -13,7 +13,7 @@
     ],
     [
       "_______", "_______", "_______", "KC_F1",   "KC_F2",   "KC_F3",   "KC_F4",   "KC_F5",      "KC_F6",   "KC_F7",   "KC_F8",   "KC_F9",   "KC_F10",  "KC_F11",  "KC_F12",  "_______",
-      "_______", "_______", "_______", "RGBRST",  "QK_BOOT", "_______", "_______", "_______",    "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______",
+      "_______", "_______", "_______", "_______", "QK_BOOT", "_______", "_______", "_______",    "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______",
       "_______", "_______", "_______", "UG_TOGG", "UG_HUEU", "UG_SATU", "UG_VALU", "_______",    "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______",
       "_______", "_______", "_______", "UG_NEXT", "UG_HUED", "UG_SATD", "UG_VALD", "_______",    "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______",
       "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______",    "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______"
diff --git a/public/keymaps/s/salicylic_acid3_naked48_rev1_default.json b/public/keymaps/s/salicylic_acid3_naked48_rev1_default.json
index 8f323667e8..75fbc038ec 100644
--- a/public/keymaps/s/salicylic_acid3_naked48_rev1_default.json
+++ b/public/keymaps/s/salicylic_acid3_naked48_rev1_default.json
@@ -23,7 +23,7 @@
                  "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______", "_______"
     ],
     [
-      "_______", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX",                       "RGB_RST", "XXXXXXX", "XXXXXXX", "XXXXXXX",     "XXXXXXX",    "_______",
+      "_______", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX",                       "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX",     "XXXXXXX",    "_______",
       "_______", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX",                       "UG_TOGG", "UG_NEXT", "XXXXXXX", "LCA(KC_DEL)", "A(KC_PSCR)", "KC_PSCR",
       "_______", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX",                       "UG_VALD", "UG_VALU", "UG_HUED", "UG_HUEU",     "UG_SATD",    "UG_SATU",
                  "_______", "_______", "_______", "_______", "_______", "QK_BOOT", "QK_BOOT", "_______", "_______", "_______", "_______",     "_______"
diff --git a/public/keymaps/s/salicylic_acid3_naked64_rev1_default.json b/public/keymaps/s/salicylic_acid3_naked64_rev1_default.json
index ce57b0f589..4dd9575ea1 100644
--- a/public/keymaps/s/salicylic_acid3_naked64_rev1_default.json
+++ b/public/keymaps/s/salicylic_acid3_naked64_rev1_default.json
@@ -34,7 +34,7 @@
     ],
     [
       "TG(1)",   "QK_BOOT", "KC_F1",   "KC_F2",   "KC_F3",   "KC_F4",   "KC_F5",      "KC_F6",   "KC_F7",   "KC_F8",   "KC_F9",       "KC_F10",     "KC_F11",  "KC_F12",
-      "_______", "_______", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX",    "RGB_RST", "XXXXXXX", "XXXXXXX", "XXXXXXX",     "XXXXXXX",    "XXXXXXX", "_______",
+      "_______", "_______", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX",    "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX",     "XXXXXXX",    "XXXXXXX", "_______",
                  "_______", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX",    "UG_TOGG", "UG_NEXT", "XXXXXXX", "LCA(KC_DEL)", "A(KC_PSCR)", "KC_PSCR", "XXXXXXX",
                  "_______", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX", "XXXXXXX",    "UG_VALD", "UG_VALU", "UG_HUED", "UG_HUEU",     "UG_SATD",    "UG_SATU", "XXXXXXX",
                  "_______",            "_______",            "_______", "_______",    "_______", "_______",            "_______",     "_______",    "_______", "_______"