VIA Protocol 12 + fixes (#19916)

Co-authored-by: Wilba <wilba@wilba.tech>
Co-authored-by: zvecr <git@zvecr.com>

30 files changed, 84 insertions, 106 deletions

diff --git a/keyboards/wilba_tech/rama_works_kara/keymaps/default/keymap.c b/keyboards/wilba_tech/rama_works_kara/keymaps/default/keymap.c
index 27dc90f721..4bb827cf3a 100644
--- a/keyboards/wilba_tech/rama_works_kara/keymaps/default/keymap.c
+++ b/keyboards/wilba_tech/rama_works_kara/keymaps/default/keymap.c
@@ -23,8 +23,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		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_DEL,
 		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
 		KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
-		KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, FN_MO13,
-				KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, FN_MO23),
+		KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, TL_LOWR,
+				KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, TL_UPPR),
 
 	// Fn1 Layer
 	[1] = LAYOUT_60_hhkb(
diff --git a/keyboards/wilba_tech/rama_works_m50_a/keymaps/default/keymap.c b/keyboards/wilba_tech/rama_works_m50_a/keymaps/default/keymap.c
index 5316207f44..0bff6f5ee8 100644
--- a/keyboards/wilba_tech/rama_works_m50_a/keymaps/default/keymap.c
+++ b/keyboards/wilba_tech/rama_works_m50_a/keymaps/default/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, 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,
-    _______, _______, KC_LCTL, KC_LALT, KC_LGUI, FN_MO13, KC_SPC,           FN_MO23, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+    _______, _______, KC_LCTL, KC_LALT, KC_LGUI, TL_LOWR, KC_SPC,           TL_UPPR, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
 ),
 
 
diff --git a/keyboards/wilba_tech/rama_works_m50_ax/keymaps/default/keymap.c b/keyboards/wilba_tech/rama_works_m50_ax/keymaps/default/keymap.c
index 37f9bc94db..6a28f19f2a 100644
--- a/keyboards/wilba_tech/rama_works_m50_ax/keymaps/default/keymap.c
+++ b/keyboards/wilba_tech/rama_works_m50_ax/keymaps/default/keymap.c
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, 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,
-    _______, _______, KC_LCTL, KC_LALT, KC_LGUI, FN_MO13, KC_SPC,  KC_SPC,  FN_MO23, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+    _______, _______, KC_LCTL, KC_LALT, KC_LGUI, TL_LOWR, KC_SPC,  KC_SPC,  TL_UPPR, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
 ),
 
 
diff --git a/keyboards/wilba_tech/rama_works_m50_ax/rama_works_m50_ax.c b/keyboards/wilba_tech/rama_works_m50_ax/rama_works_m50_ax.c
index 16814efd7a..86d93b82a1 100644
--- a/keyboards/wilba_tech/rama_works_m50_ax/rama_works_m50_ax.c
+++ b/keyboards/wilba_tech/rama_works_m50_ax/rama_works_m50_ax.c
@@ -15,31 +15,3 @@
  */
 
 #include "rama_works_m50_ax.h"
-
-#ifndef VIA_ENABLE
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case FN_MO13:
-            if (record->event.pressed) {
-                layer_on(1);
-                update_tri_layer(1, 2, 3);
-            } else {
-                layer_off(1);
-                update_tri_layer(1, 2, 3);
-            }
-            return false;
-            break;
-        case FN_MO23:
-            if (record->event.pressed) {
-                layer_on(2);
-                update_tri_layer(1, 2, 3);
-            } else {
-                layer_off(2);
-                update_tri_layer(1, 2, 3);
-            }
-            return false;
-            break;
-    }
-    return process_record_user(keycode, record);
-}
-#endif // VIA_ENABLE
\ No newline at end of file
diff --git a/keyboards/wilba_tech/rama_works_m60_a/keymaps/default/keymap.c b/keyboards/wilba_tech/rama_works_m60_a/keymaps/default/keymap.c
index c3ff625388..e869a9a070 100644
--- a/keyboards/wilba_tech/rama_works_m60_a/keymaps/default/keymap.c
+++ b/keyboards/wilba_tech/rama_works_m60_a/keymaps/default/keymap.c
@@ -8,8 +8,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	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_DEL,
 	KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
 	KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
-	KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, FN_MO13,
-	         KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, FN_MO23),
+	KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, TL_LOWR,
+	         KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, TL_UPPR),
 
 // Fn1 Layer
 [1] = LAYOUT_60_hhkb(
diff --git a/keyboards/wilba_tech/rama_works_m60_a/keymaps/proto/keymap.c b/keyboards/wilba_tech/rama_works_m60_a/keymaps/proto/keymap.c
index c3ff625388..e869a9a070 100644
--- a/keyboards/wilba_tech/rama_works_m60_a/keymaps/proto/keymap.c
+++ b/keyboards/wilba_tech/rama_works_m60_a/keymaps/proto/keymap.c
@@ -8,8 +8,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	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_DEL,
 	KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
 	KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
-	KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, FN_MO13,
-	         KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, FN_MO23),
+	KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, TL_LOWR,
+	         KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, TL_UPPR),
 
 // Fn1 Layer
 [1] = LAYOUT_60_hhkb(
diff --git a/keyboards/wilba_tech/rama_works_m60_a/keymaps/via/keymap.c b/keyboards/wilba_tech/rama_works_m60_a/keymaps/via/keymap.c
index c3ff625388..e869a9a070 100644
--- a/keyboards/wilba_tech/rama_works_m60_a/keymaps/via/keymap.c
+++ b/keyboards/wilba_tech/rama_works_m60_a/keymaps/via/keymap.c
@@ -8,8 +8,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	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_DEL,
 	KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
 	KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
-	KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, FN_MO13,
-	         KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, FN_MO23),
+	KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, TL_LOWR,
+	         KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, TL_UPPR),
 
 // Fn1 Layer
 [1] = LAYOUT_60_hhkb(
diff --git a/keyboards/wilba_tech/rama_works_m60_a/keymaps/zyber/keymap.c b/keyboards/wilba_tech/rama_works_m60_a/keymaps/zyber/keymap.c
index c3a0886d8b..5b61116415 100644
--- a/keyboards/wilba_tech/rama_works_m60_a/keymaps/zyber/keymap.c
+++ b/keyboards/wilba_tech/rama_works_m60_a/keymaps/zyber/keymap.c
@@ -10,8 +10,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	KC_ESC,    KC_1,    KC_2,    KC_3,TD(SSHT),    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,  KC_EQL,  KC_BSLS, KC_DEL,
 	KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,     TD(LBRC), KC_RBRC, KC_BSPC,
 	CTRL_C_UP, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    TD(SCLN), TD(QUOT), KC_ENT,
-	KC_LSFT,   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT,  FN_MO13,
-	           KC_LALT, KC_LGUI,                            KC_SPC,                             KC_RALT,  FN_MO23),
+	KC_LSFT,   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT,  TL_LOWR,
+	           KC_LALT, KC_LGUI,                            KC_SPC,                             KC_RALT,  TL_UPPR),
 
 // Fn1 Layer
 [1] = LAYOUT_60_hhkb(
diff --git a/keyboards/wilba_tech/wt60_b/keymaps/default/keymap.c b/keyboards/wilba_tech/wt60_b/keymaps/default/keymap.c
index 53f63edd6c..c5517c8924 100644
--- a/keyboards/wilba_tech/wt60_b/keymaps/default/keymap.c
+++ b/keyboards/wilba_tech/wt60_b/keymaps/default/keymap.c
@@ -8,8 +8,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	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_DEL,
 	KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
 	KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
-	KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, FN_MO13,
-	KC_NO,   KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, FN_MO23, KC_NO),
+	KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, TL_LOWR,
+	KC_NO,   KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, TL_UPPR, KC_NO),
 
 // Fn1 Layer
 [1] = LAYOUT_all(
diff --git a/keyboards/wilba_tech/wt60_b/keymaps/via/keymap.c b/keyboards/wilba_tech/wt60_b/keymaps/via/keymap.c
index 53f63edd6c..c5517c8924 100644
--- a/keyboards/wilba_tech/wt60_b/keymaps/via/keymap.c
+++ b/keyboards/wilba_tech/wt60_b/keymaps/via/keymap.c
@@ -8,8 +8,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	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_DEL,
 	KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
 	KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
-	KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, FN_MO13,
-	KC_NO,   KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, FN_MO23, KC_NO),
+	KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, TL_LOWR,
+	KC_NO,   KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, TL_UPPR, KC_NO),
 
 // Fn1 Layer
 [1] = LAYOUT_all(
diff --git a/keyboards/wilba_tech/wt60_bx/keymaps/default/keymap.c b/keyboards/wilba_tech/wt60_bx/keymaps/default/keymap.c
index 7d43075b34..10b5ee1009 100644
--- a/keyboards/wilba_tech/wt60_bx/keymaps/default/keymap.c
+++ b/keyboards/wilba_tech/wt60_bx/keymaps/default/keymap.c
@@ -8,8 +8,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	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_DEL,
 	KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
 	KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
-	KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, FN_MO13,
-	KC_NO,   KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, FN_MO23, KC_NO),
+	KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, TL_LOWR,
+	KC_NO,   KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, TL_UPPR, KC_NO),
 
 // Fn1 Layer
 [1] = LAYOUT_all(
diff --git a/keyboards/wilba_tech/wt60_bx/keymaps/via/keymap.c b/keyboards/wilba_tech/wt60_bx/keymaps/via/keymap.c
index 7d43075b34..10b5ee1009 100644
--- a/keyboards/wilba_tech/wt60_bx/keymaps/via/keymap.c
+++ b/keyboards/wilba_tech/wt60_bx/keymaps/via/keymap.c
@@ -8,8 +8,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	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_DEL,
 	KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
 	KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
-	KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, FN_MO13,
-	KC_NO,   KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, FN_MO23, KC_NO),
+	KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, TL_LOWR,
+	KC_NO,   KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, TL_UPPR, KC_NO),
 
 // Fn1 Layer
 [1] = LAYOUT_all(
diff --git a/keyboards/wilba_tech/wt60_c/keymaps/default/keymap.c b/keyboards/wilba_tech/wt60_c/keymaps/default/keymap.c
index c1fdd18f35..5e598a763f 100644
--- a/keyboards/wilba_tech/wt60_c/keymaps/default/keymap.c
+++ b/keyboards/wilba_tech/wt60_c/keymaps/default/keymap.c
@@ -7,8 +7,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	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_BSPC, KC_BSPC,
 	KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
 	KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
-	KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, FN_MO13,
-	KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, FN_MO23, KC_RCTL),
+	KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, TL_LOWR,
+	KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, TL_UPPR, KC_RCTL),
 
 [1] = LAYOUT_all(
 	KC_GRV,  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_DEL,  KC_DEL,
diff --git a/keyboards/wilba_tech/wt60_c/keymaps/via/keymap.c b/keyboards/wilba_tech/wt60_c/keymaps/via/keymap.c
index c1fdd18f35..5e598a763f 100644
--- a/keyboards/wilba_tech/wt60_c/keymaps/via/keymap.c
+++ b/keyboards/wilba_tech/wt60_c/keymaps/via/keymap.c
@@ -7,8 +7,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	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_BSPC, KC_BSPC,
 	KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
 	KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
-	KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, FN_MO13,
-	KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, FN_MO23, KC_RCTL),
+	KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, TL_LOWR,
+	KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, TL_UPPR, KC_RCTL),
 
 [1] = LAYOUT_all(
 	KC_GRV,  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_DEL,  KC_DEL,
diff --git a/keyboards/wilba_tech/wt_main.c b/keyboards/wilba_tech/wt_main.c
index 3f89066a6c..92c43c794d 100644
--- a/keyboards/wilba_tech/wt_main.c
+++ b/keyboards/wilba_tech/wt_main.c
@@ -89,29 +89,6 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record)
     process_record_backlight(keycode, record);
 #endif // RGB_BACKLIGHT_ENABLED || MONO_BACKLIGHT_ENABLED
 
-    switch (keycode) {
-        case FN_MO13:
-            if (record->event.pressed) {
-                layer_on(1);
-                update_tri_layer(1, 2, 3);
-            } else {
-                layer_off(1);
-                update_tri_layer(1, 2, 3);
-            }
-            return false;
-            break;
-        case FN_MO23:
-            if (record->event.pressed) {
-                layer_on(2);
-                update_tri_layer(1, 2, 3);
-            } else {
-                layer_off(2);
-                update_tri_layer(1, 2, 3);
-            }
-            return false;
-            break;
-    }
-
     return process_record_user(keycode, record);
 }
 
@@ -173,6 +150,14 @@ void via_custom_value_command_kb(uint8_t *data, uint8_t length) {
 
     // DO NOT call raw_hid_send(data,length) here, let caller do this
 }
+
+void via_set_device_indication(uint8_t value)
+{
+#if RGB_BACKLIGHT_ENABLED || MONO_BACKLIGHT_ENABLED
+    backlight_device_indication(value);
+#endif // RGB_BACKLIGHT_ENABLED || MONO_BACKLIGHT_ENABLED
+}
+
 #endif // VIA_ENABLE
 
 //
diff --git a/keyboards/wilba_tech/wt_mono_backlight.c b/keyboards/wilba_tech/wt_mono_backlight.c
index 0fc6e346a1..c79fc02cd9 100644
--- a/keyboards/wilba_tech/wt_mono_backlight.c
+++ b/keyboards/wilba_tech/wt_mono_backlight.c
@@ -184,13 +184,13 @@ defined(MONO_BACKLIGHT_WT80_A)
         IS31FL3736_mono_set_brightness(16, 255);
     }
 #endif
-#if defined(MONO_BACKLIGHT_WT80_A) 
+#if defined(MONO_BACKLIGHT_WT80_A)
     if ( host_keyboard_led_state().scroll_lock ) {
         // SW7,CS7 = (6*8+6) = 54
         IS31FL3736_mono_set_brightness(54, 255);
     }
 #endif
-#if defined(MONO_BACKLIGHT_WT75_C) 
+#if defined(MONO_BACKLIGHT_WT75_C)
     if ( host_keyboard_led_state().scroll_lock ) {
         // SW7,CS8 = (6*8+7) = 55
         IS31FL3736_mono_set_brightness(55, 255);
@@ -471,3 +471,14 @@ void backlight_brightness_decrease(void)
     g_config.brightness = decrement( g_config.brightness, 8, 0, 255 );
     backlight_config_save();
 }
+
+void backlight_device_indication(uint8_t value)
+{
+    static uint8_t current_effect = 0;
+    static uint8_t alternate_effect = 0;
+    if ( value == 0 ) {
+        current_effect = g_config.effect;
+        alternate_effect = g_config.effect > 0 ? 0 : 1;
+    }
+    g_config.effect = value % 2 == 0 ? alternate_effect : current_effect;
+}
diff --git a/keyboards/wilba_tech/wt_mono_backlight.h b/keyboards/wilba_tech/wt_mono_backlight.h
index 88183fd847..9bf76b44bb 100644
--- a/keyboards/wilba_tech/wt_mono_backlight.h
+++ b/keyboards/wilba_tech/wt_mono_backlight.h
@@ -76,3 +76,4 @@ void backlight_effect_speed_decrease(void);
 void backlight_brightness_increase(void);
 void backlight_brightness_decrease(void);
 
+void backlight_device_indication(uint8_t value);
diff --git a/keyboards/wilba_tech/wt_rgb_backlight.c b/keyboards/wilba_tech/wt_rgb_backlight.c
index c82f86304c..1cd00ae41f 100644
--- a/keyboards/wilba_tech/wt_rgb_backlight.c
+++ b/keyboards/wilba_tech/wt_rgb_backlight.c
@@ -2554,9 +2554,7 @@ static void gpt_backlight_timer_task(GPTDriver *gptp)
 
     if ( ! suspend_backlight )
     {
-#if !defined(RGB_BACKLIGHT_M6_B) && !defined(RGB_BACKLIGHT_M10_C)
         backlight_effect_indicators();
-#endif
     }
 }
 
@@ -3426,3 +3424,14 @@ void backlight_debug_led( bool state )
     }
 }
 #endif // defined(RGB_DEBUGGING_ONLY)
+
+void backlight_device_indication(uint8_t value)
+{
+    static uint8_t current_effect = 0;
+    static uint8_t alternate_effect = 0;
+    if ( value == 0 ) {
+        current_effect = g_config.effect;
+        alternate_effect = g_config.effect > 0 ? 0 : 1;
+    }
+    g_config.effect = value % 2 == 0 ? alternate_effect : current_effect;
+}
diff --git a/keyboards/wilba_tech/wt_rgb_backlight.h b/keyboards/wilba_tech/wt_rgb_backlight.h
index 2114789213..6fb2ee2122 100644
--- a/keyboards/wilba_tech/wt_rgb_backlight.h
+++ b/keyboards/wilba_tech/wt_rgb_backlight.h
@@ -112,3 +112,4 @@ void backlight_color_2_sat_decrease(void);
 
 void backlight_test_led( uint8_t index, bool red, bool green, bool blue );
 void backlight_debug_led(bool state);
+void backlight_device_indication(uint8_t value);
diff --git a/keyboards/wilba_tech/wt_rgb_backlight_keycodes.h b/keyboards/wilba_tech/wt_rgb_backlight_keycodes.h
index 5a43649535..b8c23c4b07 100644
--- a/keyboards/wilba_tech/wt_rgb_backlight_keycodes.h
+++ b/keyboards/wilba_tech/wt_rgb_backlight_keycodes.h
@@ -15,20 +15,19 @@
  */
 #pragma once
 
-// This is hardcoded at 0x5F00 so it's well after keycode value SAFE_RANGE
 enum wt_rgb_backlight_keycodes {
-	BR_INC = 0x5F00,	// backlight brightness increase
-	BR_DEC, 			// backlight brightness decrease
-	EF_INC, 			// backlight effect increase
-	EF_DEC,  			// backlight effect decrease
-	ES_INC,
-	ES_DEC,
-	H1_INC,
-	H1_DEC,
-	S1_INC,
-	S1_DEC,
-	H2_INC,
-	H2_DEC,
-	S2_INC,
-	S2_DEC
+    BR_INC = QK_KB_0, // brightness increase
+    BR_DEC,             // brightness decrease
+    EF_INC,             // effect increase
+    EF_DEC,             // effect decrease
+    ES_INC,             // effect speed increase
+    ES_DEC,             // effect speed decrease
+    H1_INC,             // color 1 hue increase
+    H1_DEC,             // color 1 hue decrease
+    S1_INC,             // color 1 saturation increase
+    S1_DEC,             // color 1 saturation decrease
+    H2_INC,             // color 2 hue increase
+    H2_DEC,             // color 2 hue decrease
+    S2_INC,             // color 2 saturation increase
+    S2_DEC              // color 2 saturation decrease
 };
diff --git a/keyboards/wilba_tech/zeal60/keymaps/ansi_split_bs_rshift/keymap.c b/keyboards/wilba_tech/zeal60/keymaps/ansi_split_bs_rshift/keymap.c
index 6c290fcdeb..ad204d5c38 100644
--- a/keyboards/wilba_tech/zeal60/keymaps/ansi_split_bs_rshift/keymap.c
+++ b/keyboards/wilba_tech/zeal60/keymaps/ansi_split_bs_rshift/keymap.c
@@ -8,8 +8,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	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_DEL,
 	KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
 	KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
-	KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, FN_MO13,
-	KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, FN_MO23, KC_RCTL),
+	KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, TL_LOWR,
+	KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, TL_UPPR, KC_RCTL),
 
 // Fn1 Layer
 [1] = LAYOUT_60_ansi_split_bs_rshift(
diff --git a/keyboards/wilba_tech/zeal60/keymaps/default/keymap.c b/keyboards/wilba_tech/zeal60/keymaps/default/keymap.c
index f75fb4a57a..c7352fc469 100644
--- a/keyboards/wilba_tech/zeal60/keymaps/default/keymap.c
+++ b/keyboards/wilba_tech/zeal60/keymaps/default/keymap.c
@@ -9,7 +9,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
 	KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
 	KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-	KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, FN_MO13, FN_MO23, KC_RCTL),
+	KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, TL_LOWR, TL_UPPR, KC_RCTL),
 
 // Fn1 Layer
 [1] = LAYOUT_60_ansi(
diff --git a/keyboards/wilba_tech/zeal60/keymaps/hhkb/keymap.c b/keyboards/wilba_tech/zeal60/keymaps/hhkb/keymap.c
index 0bfc63911e..c45ebd98ec 100644
--- a/keyboards/wilba_tech/zeal60/keymaps/hhkb/keymap.c
+++ b/keyboards/wilba_tech/zeal60/keymaps/hhkb/keymap.c
@@ -8,8 +8,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	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,
 	KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
 	KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
-	KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, FN_MO13,
-			 KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, FN_MO23),
+	KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, TL_LOWR,
+			 KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, TL_UPPR),
 
 // Fn1 Layer
 [1] = LAYOUT_60_hhkb(
diff --git a/keyboards/wilba_tech/zeal60/keymaps/iso/keymap.c b/keyboards/wilba_tech/zeal60/keymaps/iso/keymap.c
index 9c4faeae48..292f248377 100644
--- a/keyboards/wilba_tech/zeal60/keymaps/iso/keymap.c
+++ b/keyboards/wilba_tech/zeal60/keymaps/iso/keymap.c
@@ -9,7 +9,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_ENT,
 	KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS,
 	KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-	KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, FN_MO13, FN_MO23, KC_RCTL),
+	KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, TL_LOWR, TL_UPPR, KC_RCTL),
 
 // Fn1 Layer
 [1] = LAYOUT_60_iso(
diff --git a/keyboards/wilba_tech/zeal60/keymaps/sethBarberee/keymap.c b/keyboards/wilba_tech/zeal60/keymaps/sethBarberee/keymap.c
index 4232225310..898d80eaee 100644
--- a/keyboards/wilba_tech/zeal60/keymaps/sethBarberee/keymap.c
+++ b/keyboards/wilba_tech/zeal60/keymaps/sethBarberee/keymap.c
@@ -16,7 +16,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	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,
 	KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
 	KC_CAFN, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENFN,
-	KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSUP, FN_MO13,
+	KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSUP, TL_LOWR,
 	KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_TRNS, KC_RGLT, KC_RGDN, KC_RCRT),
 
 // Fn1 Layer
diff --git a/keyboards/wilba_tech/zeal60/keymaps/via/keymap.c b/keyboards/wilba_tech/zeal60/keymaps/via/keymap.c
index 889f94ebe1..58e4dc679c 100644
--- a/keyboards/wilba_tech/zeal60/keymaps/via/keymap.c
+++ b/keyboards/wilba_tech/zeal60/keymaps/via/keymap.c
@@ -9,7 +9,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
 	KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
 	KC_LSFT, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_RSFT,
-	KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, FN_MO13, FN_MO23, KC_RCTL),
+	KC_LCTL, KC_LGUI, KC_LALT,