6 files changed, 10 insertions, 7 deletions
diff --git a/keyboards/junco/info.json b/keyboards/junco/info.json
index 72e0d5c92a..fb5c391d6a 100644
--- a/keyboards/junco/info.json
+++ b/keyboards/junco/info.json
@@ -8,6 +8,13 @@
         "pid": "0x4A13",
         "device_version": "1.0.0"
     },
+    "ws2812": {
+        "pin": "GP15",
+        "driver": "vendor"
+    },
+    "rgb_matrix": {
+        "driver": "WS2812"
+    },
     "processor": "RP2040",
     "bootloader": "rp2040",
     "layouts": {
diff --git a/keyboards/junco/keymaps/default/keymap.c b/keyboards/junco/keymaps/default/keymap.c
index dc607477e2..8ff3513891 100644
--- a/keyboards/junco/keymaps/default/keymap.c
+++ b/keyboards/junco/keymaps/default/keymap.c
@@ -143,7 +143,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 #ifdef ENCODER_MAP_ENABLE
 // clang-format off
 
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
     // Base layer encoder mappings:
     //                index 0: mouse wheel up (CCW)/down (CW)     index 1: volume down/up           index 2: mouse wheel up/down                index 3: mouse wheel left/right
     [_QWERTY] =     { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN), ENCODER_CCW_CW(KC_WH_L, KC_WH_R) },
diff --git a/keyboards/junco/keymaps/deluxe/keymap.c b/keyboards/junco/keymaps/deluxe/keymap.c
index e4dcb97fae..42b6429b97 100644
--- a/keyboards/junco/keymaps/deluxe/keymap.c
+++ b/keyboards/junco/keymaps/deluxe/keymap.c
@@ -193,7 +193,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // clang-format off
 
 // Base layer encoder mappings:
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
     // Base layers
     //                index 0: mouse wheel up (CCW)/down (CW)     index 1: volume up/down           index 2: media prev/next          index 3: mouse wheel left/right
     [_QWERTY] =     { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_MPRV, KC_MNXT), ENCODER_CCW_CW(KC_WH_L, KC_WH_R) },
diff --git a/keyboards/junco/keymaps/via/keymap.c b/keyboards/junco/keymaps/via/keymap.c
index b50332be28..65fe2a67de 100644
--- a/keyboards/junco/keymaps/via/keymap.c
+++ b/keyboards/junco/keymaps/via/keymap.c
@@ -143,7 +143,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 #ifdef ENCODER_MAP_ENABLE
 // clang-format off
 
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
     // Base layer encoder mappings:
     //                index 0: mouse wheel up (CCW)/down (CW)     index 1: volume down/up           index 2: mouse wheel up/down                index 3: mouse wheel left/right
     [_QWERTY] =     { ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN), ENCODER_CCW_CW(KC_VOLD, KC_VOLU), ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN), ENCODER_CCW_CW(KC_WH_L, KC_WH_R) },
diff --git a/keyboards/junco/rev1/config.h b/keyboards/junco/rev1/config.h
index d9c0556cdf..95731fde01 100644
--- a/keyboards/junco/rev1/config.h
+++ b/keyboards/junco/rev1/config.h
@@ -19,7 +19,6 @@
 /* RGB Stuff */
 #ifdef RGB_MATRIX_ENABLE
 
-#    define RGB_DI_PIN GP15 // Pin for RGB logic
 #    define RGB_MATRIX_LED_COUNT 74
 #    define RGB_MATRIX_SPLIT \
         { 37, 37 } // 37 LEDs on each side
diff --git a/keyboards/junco/rev1/rules.mk b/keyboards/junco/rev1/rules.mk
index feb836dbe1..e69de29bb2 100644
--- a/keyboards/junco/rev1/rules.mk
+++ b/keyboards/junco/rev1/rules.mk
@@ -1,3 +0,0 @@
-# RGB Stuff
-RGB_MATRIX_DRIVER = WS2812
-WS2812_DRIVER = vendor