8 files changed, 9 insertions, 10 deletions
diff --git a/keyboards/sofle/keymaps/bastien-baloup_fr/config.h b/keyboards/sofle/keymaps/bastien-baloup_fr/config.h
index f15cd7b8fb..dd3b6d8f5a 100644
--- a/keyboards/sofle/keymaps/bastien-baloup_fr/config.h
+++ b/keyboards/sofle/keymaps/bastien-baloup_fr/config.h
@@ -40,7 +40,7 @@
     #if defined(KEYBOARD_sofle_rev1)
 	    #define RGBLED_NUM 70
 	    // D3 for ws2812 RGB LED
-	    #define RGB_DI_PIN D3
+	    #define WS2812_DI_PIN D3
     #endif
 #endif
 
diff --git a/keyboards/sofle/keymaps/bastien-baloup_fr/keymap.c b/keyboards/sofle/keymaps/bastien-baloup_fr/keymap.c
index 8b97468376..ee207ae34e 100644
--- a/keyboards/sofle/keymaps/bastien-baloup_fr/keymap.c
+++ b/keyboards/sofle/keymaps/bastien-baloup_fr/keymap.c
@@ -166,7 +166,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 #if defined(ENCODER_ENABLE) && defined(ENCODER_MAP_ENABLE)
 // This section is like the keymap matrix, but for rotary encoders
 // My left encoder is currently not working, so I'm using Layers instead
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
     [0] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(KC_VOLU, KC_VOLD)},
     [1] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(KC_VOLU, KC_VOLD)},
     [2] = { ENCODER_CCW_CW(_______, _______), ENCODER_CCW_CW(KC_MNXT, KC_MPRV)},
diff --git a/keyboards/sofle/keymaps/devdev/config.h b/keyboards/sofle/keymaps/devdev/config.h
index 6564238bba..7d14c6e337 100644
--- a/keyboards/sofle/keymaps/devdev/config.h
+++ b/keyboards/sofle/keymaps/devdev/config.h
@@ -45,7 +45,7 @@
 #define RGBLIGHT_LAYERS
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN D3
+#define WS2812_DI_PIN D3
 
 
 #ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/sofle/keymaps/keyhive_via/encoder.c b/keyboards/sofle/keymaps/keyhive_via/encoder.c
index 0883c4a48a..7775cb7b86 100644
--- a/keyboards/sofle/keymaps/keyhive_via/encoder.c
+++ b/keyboards/sofle/keymaps/keyhive_via/encoder.c
@@ -26,7 +26,7 @@
     void encoder_action_unregister(void) {
         for (int index = 0; index < 2; ++index) {
             if (encoder_state[index]) {
-                keyevent_t encoder_event = (keyevent_t){.key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index], .pressed = false, .time = (timer_read() | 1)};
+                keyevent_t encoder_event = (keyevent_t){.key = encoder_state[index] >> 1 ? encoder_cw[index] : encoder_ccw[index], .pressed = false, .time = timer_read(), .type = KEY_EVENT};
                 encoder_state[index] = 0;
                 action_exec(encoder_event);
             }
@@ -34,7 +34,7 @@
     }
 
     void encoder_action_register(uint8_t index, bool clockwise) {
-        keyevent_t encoder_event = (keyevent_t){.key = clockwise ? encoder_cw[index] : encoder_ccw[index], .pressed = true, .time = (timer_read() | 1)};
+        keyevent_t encoder_event = (keyevent_t){.key = clockwise ? encoder_cw[index] : encoder_ccw[index], .pressed = true, .time = timer_read(), .type = KEY_EVENT};
         encoder_state[index] = (clockwise ^ 1) | (clockwise << 1);
         action_exec(encoder_event);
     }
@@ -46,4 +46,3 @@
         return false;
     };
 #endif
-
diff --git a/keyboards/sofle/keymaps/killmaster/config.h b/keyboards/sofle/keymaps/killmaster/config.h
index e4649cc5be..10c9ea450e 100644
--- a/keyboards/sofle/keymaps/killmaster/config.h
+++ b/keyboards/sofle/keymaps/killmaster/config.h
@@ -20,7 +20,7 @@ see https://docs.qmk.fm/#/feature_split_keyboard?id=setting-handedness
 for more options.
 */
 
-#define RGB_DI_PIN D3
+#define WS2812_DI_PIN D3
 
 #ifdef RGB_MATRIX_ENABLE
 
diff --git a/keyboards/sofle/keymaps/michal/keymap.c b/keyboards/sofle/keymaps/michal/keymap.c
index 49b70fd825..cbb0dc36ab 100644
--- a/keyboards/sofle/keymaps/michal/keymap.c
+++ b/keyboards/sofle/keymaps/michal/keymap.c
@@ -182,7 +182,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
 // This section is like the keymap matrix, but for rotary encoders
 // My left encoder is currently not working, so I'm using Layers to cope :')
-const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
+const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = {
     [_WORKMAN] = { ENCODER_CCW_CW(_______,     _______), ENCODER_CCW_CW(KC_VOLD,     KC_VOLU      )},
     [_QWERTY]  = { ENCODER_CCW_CW(_______,     _______), ENCODER_CCW_CW(KC_VOLD,     KC_VOLU      )},
     [_LOWER]   = { ENCODER_CCW_CW(_______,     _______), ENCODER_CCW_CW(KC_MS_WH_UP, KC_MS_WH_DOWN)},
diff --git a/keyboards/sofle/keymaps/rgb_default/config.h b/keyboards/sofle/keymaps/rgb_default/config.h
index 6564238bba..7d14c6e337 100644
--- a/keyboards/sofle/keymaps/rgb_default/config.h
+++ b/keyboards/sofle/keymaps/rgb_default/config.h
@@ -45,7 +45,7 @@
 #define RGBLIGHT_LAYERS
 
 /* ws2812 RGB LED */
-#define RGB_DI_PIN D3
+#define WS2812_DI_PIN D3
 
 
 #ifdef RGB_MATRIX_ENABLE
diff --git a/keyboards/sofle/keymaps/via/config.h b/keyboards/sofle/keymaps/via/config.h
index 2806b70b0f..d4bf95b710 100644
--- a/keyboards/sofle/keymaps/via/config.h
+++ b/keyboards/sofle/keymaps/via/config.h
@@ -24,7 +24,7 @@ for more options.
 
 #if defined(KEYBOARD_sofle_rev1)
 // Add RGB underglow and top facing lighting
-#    define RGB_DI_PIN D3
+#    define WS2812_DI_PIN D3
 #    define RGBLED_NUM 70
 #    define RGBLED_SPLIT \
         { 36, 36 }