Merge remote-tracking branch 'origin/master' into develop

14 files changed, 515 insertions, 435 deletions

diff --git a/keyboards/mlego/m65/keymaps/default/keymap.c b/keyboards/mlego/m65/keymaps/default/keymap.c
index c8a6cfce2e..4b4b23ca6e 100644
--- a/keyboards/mlego/m65/keymaps/default/keymap.c
+++ b/keyboards/mlego/m65/keymaps/default/keymap.c
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include QMK_KEYBOARD_H
 
-enum layer_names {
-    _QW = 0,
-    _LWR,
-    _RSE,
-    _ADJ
-};
-
-#ifdef RGBLIGHT_ENABLE
-
-const rgblight_segment_t PROGMEM my_qwerty_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_PURPLE});
-const rgblight_segment_t PROGMEM my_lwr_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_CYAN});
-const rgblight_segment_t PROGMEM my_rse_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_RED});
-const rgblight_segment_t PROGMEM my_adj_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_GREEN});
-
-const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(my_qwerty_layer, my_lwr_layer, my_rse_layer, my_adj_layer);
-#endif
-
 // clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
@@ -68,24 +51,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 // clang-format on
 
-// let us assume we start with both layers off
-static bool toggle_lwr = false;
-static bool toggle_rse = false;
-
 bool led_update_user(led_t led_state) {
     // Disable the default LED update code, so that lock LEDs could be reused to show layer status.
     return false;
 }
 
 void matrix_scan_user(void) {
-    led_lwr(toggle_lwr);
-    led_rse(toggle_rse);
-    led_t led_state = host_keyboard_led_state();
-    led_caps(led_state.caps_lock);
-    if (layer_state_is(_ADJ)) {
-        led_lwr(true);
-        led_rse(true);
-    }
+
+    toggle_leds();
+
 }
 
 bool process_record_user(uint16_t keycode, keyrecord_t* record) {
@@ -93,13 +67,13 @@ bool process_record_user(uint16_t keycode, keyrecord_t* record) {
         case (TT(_LWR)):
             if (!record->event.pressed && record->tap.count == TAPPING_TOGGLE) {
                 // This runs before the TT() handler toggles the layer state, so the current layer state is the opposite of the final one after toggle.
-                toggle_lwr = !layer_state_is(_LWR);
+                set_led_toggle(_LWR, !layer_state_is(_LWR));
             }
             return true;
             break;
         case (TT(_RSE)):
             if (record->event.pressed && record->tap.count == TAPPING_TOGGLE) {
-                toggle_rse = !layer_state_is(_RSE);
+                set_led_toggle(_RSE, !layer_state_is(_RSE));
             }
             return true;
             break;
@@ -109,61 +83,37 @@ bool process_record_user(uint16_t keycode, keyrecord_t* record) {
 }
 
 layer_state_t layer_state_set_user(layer_state_t state) {
+
 #ifdef RGBLIGHT_ENABLE
 
-    rgblight_set_layer_state(0, layer_state_cmp(state, _QW));
-    rgblight_set_layer_state(1, layer_state_cmp(state, _LWR));
-    rgblight_set_layer_state(2, layer_state_cmp(state, _RSE));
-    rgblight_set_layer_state(3, layer_state_cmp(state, _ADJ));
+    set_rgb_layers(state);
 
 #endif
+
     return update_tri_layer_state(state, _LWR, _RSE, _ADJ);
 }
 
 #ifdef RGBLIGHT_ENABLE
 
 layer_state_t default_layer_state_set_user(layer_state_t state) {
-    rgblight_set_layer_state(0, layer_state_cmp(state, _QW));
+    set_default_rgb_layers(state);
     return state;
 }
 
-void keyboard_post_init_user(void) {
-    // Enable the LED layers
-    rgblight_layers = my_rgb_layers;
-}
 #endif
 
-#ifdef ENCODER_ENABLE
+void keyboard_post_init_user(void) {
 
-#    define MEDIA_KEY_DELAY 10
+#ifdef RGBLIGHT_ENABLE
 
-static inline void my_encoders(const uint8_t index, const bool clockwise) {
-    if (index == 0) { /* First encoder */
-        if (IS_LAYER_ON(_LWR)) {
-            if (clockwise) {
-                rgblight_decrease_val_noeeprom();
-            } else {
-                rgblight_increase_val_noeeprom();
-            }
-        } else if (IS_LAYER_ON(_RSE)) {
-            if (clockwise) {
-                rgblight_decrease_hue_noeeprom();
-            } else {
-                rgblight_increase_hue_noeeprom();
-            }
+    // Enable the LED layers
+    rgblight_layers = my_rgb();
 
-        } else {
-            if (clockwise) {
-                tap_code_delay(KC_VOLD, MEDIA_KEY_DELAY);
-            } else {
-                tap_code_delay(KC_VOLU, MEDIA_KEY_DELAY);
-            }
-        }
-    }
-}
+#endif
+
+#ifdef OLED_ENABLE
+
+    init_timer();
 
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    my_encoders(index, clockwise);
-    return true;
-}
 #endif
+}
diff --git a/keyboards/mlego/m65/keymaps/dk/keymap.c b/keyboards/mlego/m65/keymaps/dk/keymap.c
index 5461a354ba..e44bf2adf2 100644
--- a/keyboards/mlego/m65/keymaps/dk/keymap.c
+++ b/keyboards/mlego/m65/keymaps/dk/keymap.c
@@ -18,23 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include QMK_KEYBOARD_H
 #include "keymap_danish.h"
 
-enum layer_names {
-    _QW = 0,
-    _LWR,
-    _RSE,
-    _ADJ
-};
-
-#ifdef RGBLIGHT_ENABLE
-
-const rgblight_segment_t PROGMEM my_qwerty_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_PURPLE});
-const rgblight_segment_t PROGMEM my_lwr_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_CYAN});
-const rgblight_segment_t PROGMEM my_rse_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_RED});
-const rgblight_segment_t PROGMEM my_adj_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_GREEN});
-
-const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(my_qwerty_layer, my_lwr_layer, my_rse_layer, my_adj_layer);
-#endif
-
 // clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
@@ -61,7 +44,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [_ADJ] = LAYOUT_ortho_5x13(
       RGB_MOD,RGB_RMOD, A(KC_F2), _______, _______, _______, _______, _______, _______, _______, _______, RGB_M_T, RGB_M_SW ,
-      RGB_HUI, RGB_HUD, RGB_M_P , _______, RESET  , _______, _______, _______, _______, _______, _______, _______, RGB_M_SN ,
+      RGB_HUI, RGB_HUD, RGB_M_P , _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______, RGB_M_SN ,
       RGB_SAI, RGB_SAD, RGB_M_B , _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_M_K ,
       RGB_VAI, RGB_VAD, RGB_M_R , _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_M_X ,
       RGB_TOG, _______, _______ , _______, _______, _______, _______, _______, _______, _______, _______, RGB_M_TW, RGB_M_G),
@@ -69,24 +52,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 // clang-format on
 
-// let us assume we start with both layers off
-static bool toggle_lwr = false;
-static bool toggle_rse = false;
-
 bool led_update_user(led_t led_state) {
     // Disable the default LED update code, so that lock LEDs could be reused to show layer status.
     return false;
 }
 
 void matrix_scan_user(void) {
-    led_lwr(toggle_lwr);
-    led_rse(toggle_rse);
-    led_t led_state = host_keyboard_led_state();
-    led_caps(led_state.caps_lock);
-    if (layer_state_is(_ADJ)) {
-        led_lwr(true);
-        led_rse(true);
-    }
+
+    toggle_leds();
+
 }
 
 bool process_record_user(uint16_t keycode, keyrecord_t* record) {
@@ -94,13 +68,13 @@ bool process_record_user(uint16_t keycode, keyrecord_t* record) {
         case (TT(_LWR)):
             if (!record->event.pressed && record->tap.count == TAPPING_TOGGLE) {
                 // This runs before the TT() handler toggles the layer state, so the current layer state is the opposite of the final one after toggle.
-                toggle_lwr = !layer_state_is(_LWR);
+                set_led_toggle(_LWR, !layer_state_is(_LWR));
             }
             return true;
             break;
         case (TT(_RSE)):
             if (record->event.pressed && record->tap.count == TAPPING_TOGGLE) {
-                toggle_rse = !layer_state_is(_RSE);
+                set_led_toggle(_RSE, !layer_state_is(_RSE));
             }
             return true;
             break;
@@ -110,61 +84,38 @@ bool process_record_user(uint16_t keycode, keyrecord_t* record) {
 }
 
 layer_state_t layer_state_set_user(layer_state_t state) {
+
 #ifdef RGBLIGHT_ENABLE
 
-    rgblight_set_layer_state(0, layer_state_cmp(state, _QW));
-    rgblight_set_layer_state(1, layer_state_cmp(state, _LWR));
-    rgblight_set_layer_state(2, layer_state_cmp(state, _RSE));
-    rgblight_set_layer_state(3, layer_state_cmp(state, _ADJ));
+    set_rgb_layers(state);
 
 #endif
+
     return update_tri_layer_state(state, _LWR, _RSE, _ADJ);
 }
 
 #ifdef RGBLIGHT_ENABLE
 
 layer_state_t default_layer_state_set_user(layer_state_t state) {
-    rgblight_set_layer_state(0, layer_state_cmp(state, _QW));
+    set_default_rgb_layers(state);
     return state;
 }
 
+#endif
+
 void keyboard_post_init_user(void) {
+
+#ifdef RGBLIGHT_ENABLE
+
     // Enable the LED layers
-    rgblight_layers = my_rgb_layers;
-}
-#endif
+    rgblight_layers = my_rgb();
 
-#ifdef ENCODER_ENABLE
+#endif
 
-#    define MEDIA_KEY_DELAY 10
+#ifdef OLED_ENABLE
 
-static inline void my_encoders(const uint8_t index, const bool clockwise) {
-    if (index == 0) { /* First encoder */
-        if (IS_LAYER_ON(_LWR)) {
-            if (clockwise) {
-                rgblight_decrease_val_noeeprom();
-            } else {
-                rgblight_increase_val_noeeprom();
-            }
-        } else if (IS_LAYER_ON(_RSE)) {
-            if (clockwise) {
-                rgblight_decrease_hue_noeeprom();
-            } else {
-                rgblight_increase_hue_noeeprom();
-            }
+    init_timer();
 
-        } else {
-            if (clockwise) {
-                tap_code_delay(KC_VOLD, MEDIA_KEY_DELAY);
-            } else {
-                tap_code_delay(KC_VOLU, MEDIA_KEY_DELAY);
-            }
-        }
-    }
-}
+#endif
 
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    my_encoders(index, clockwise);
-    return true;
 }
-#endif
diff --git a/keyboards/mlego/m65/keymaps/uk/keymap.c b/keyboards/mlego/m65/keymaps/uk/keymap.c
index b140ca08c6..3a4c6a4bc3 100644
--- a/keyboards/mlego/m65/keymaps/uk/keymap.c
+++ b/keyboards/mlego/m65/keymaps/uk/keymap.c
@@ -18,40 +18,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include QMK_KEYBOARD_H
 #include "keymap_uk.h"
 
-enum layer_names {
-    _QW = 0,
-    _LWR,
-    _RSE,
-    _ADJ
-};
-
 #ifdef CONSOLE_ENABLE
 
 #include "print.h"
 
 #endif
 
-#ifdef OLED_ENABLE
-static uint32_t oled_logo_timer = 0;
-static bool clear_logo = true;
-static const char PROGMEM m65_logo[] = {
-    0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa5, 0xa5, 0xa5, 0xa5, 0xa5, 0xa5,
-    0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94,
-    0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4,
-    0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4,
-    0};
-#endif
-
-#ifdef RGBLIGHT_ENABLE
-
-const rgblight_segment_t PROGMEM my_qwerty_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_PURPLE});
-const rgblight_segment_t PROGMEM my_lwr_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_CYAN});
-const rgblight_segment_t PROGMEM my_rse_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_RED});
-const rgblight_segment_t PROGMEM my_adj_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_GREEN});
-
-const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(my_qwerty_layer, my_lwr_layer, my_rse_layer, my_adj_layer);
-#endif
-
 const uint32_t PROGMEM unicode_map[] = {
     [la]  = 0x03B1 , // α
     [lA]  = 0x0391 , // Α
@@ -254,7 +226,7 @@ raise layer shifted
       KC_ESC ,    KC_F1  ,   KC_F2  , KC_F3  ,  KC_F4  ,  KC_F5  , KC_F6  , KC_F7  ,  KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12  ,
       _______,XP(ra1,rA1),   _______, _______,  _______,XP(rt,rT), _______, _______,XP(ri,rI), _______, _______, _______, _______ ,
       KC_CAPS,  XP(ra,rA), XP(rs,rS), _______,  _______,  _______, _______, _______,  _______, _______, _______, _______, _______ ,
-      _______,    _______,   _______, _______,XP(rc,rC),  _______, _______, _______,  _______, _______, _______, KC_WH_U, _______ ,
+      _______,    KC_F20 ,   _______, _______,XP(rc,rC),  _______, _______, _______,  _______, _______, _______, KC_WH_U, _______ ,
       _______,    _______,   _______, _______,  _______,  _______, _______, _______,  _______, _______, KC_WH_L, KC_WH_D, KC_WH_R),
 /*
 adj layer
@@ -272,49 +244,43 @@ adj layer
 */
   [_ADJ] = LAYOUT_ortho_5x13(
       RGB_MOD, RGB_RMOD, A(KC_F2), _______, _______, _______, _______, _______, _______, _______, _______, RGB_M_T , RGB_M_SW,
-      RGB_HUI, RGB_HUD , RGB_M_P , _______, RESET  , _______, _______, _______, _______, _______, _______, _______ , RGB_M_SN,
+      RGB_HUI, RGB_HUD , RGB_M_P , _______, QK_BOOT, _______, _______, _______, _______, _______, _______, _______ , RGB_M_SN,
       RGB_SAI, RGB_SAD , RGB_M_B , _______, _______, _______, _______, _______, _______, _______, _______, _______ , RGB_M_K ,
       RGB_VAI, RGB_VAD , RGB_M_R , _______, _______, _______, _______, _______, _______, _______, _______, _______ , RGB_M_X ,
       RGB_TOG, _______ , _______ , _______, _______, _______, _______, _______, _______, _______, _______, RGB_M_TW, RGB_M_G),
 };
 // clang-format on
 
-// let us assume we start with both layers off
-static bool toggle_lwr = false;
-static bool toggle_rse = false;
-
 bool led_update_user(led_t led_state) {
     // Disable the default LED update code, so that lock LEDs could be reused to show layer status.
     return false;
 }
 
 void matrix_scan_user(void) {
-    led_lwr(toggle_lwr);
-    led_rse(toggle_rse);
-    led_t led_state = host_keyboard_led_state();
-    led_caps(led_state.caps_lock);
-    if (layer_state_is(_ADJ)) {
-        led_lwr(true);
-        led_rse(true);
-    }
+
+    toggle_leds();
+
 }
 
 bool process_record_user(uint16_t keycode, keyrecord_t* record) {
+
 #ifdef CONSOLE_ENABLE
+
     uprintf("KL: kc: 0x%04X, col: %u, row: %u, pressed: %b, time: %u, interrupt: %b, count: %u\n", keycode, record->event.key.col, record->event.key.row, record->event.pressed, record->event.time, record->tap.interrupted, record->tap.count);
+
 #endif
 
     switch (keycode) {
         case (TT(_LWR)):
             if (!record->event.pressed && record->tap.count == TAPPING_TOGGLE) {
                 // This runs before the TT() handler toggles the layer state, so the current layer state is the opposite of the final one after toggle.
-                toggle_lwr = !layer_state_is(_LWR);
+                set_led_toggle(_LWR, !layer_state_is(_LWR));
             }
             return true;
             break;
         case (TT(_RSE)):
             if (record->event.pressed && record->tap.count == TAPPING_TOGGLE) {
-                toggle_rse = !layer_state_is(_RSE);
+                set_led_toggle(_RSE, !layer_state_is(_RSE));
             }
             return true;
             break;
@@ -324,139 +290,45 @@ bool process_record_user(uint16_t keycode, keyrecord_t* record) {
 }
 
 layer_state_t layer_state_set_user(layer_state_t state) {
+
 #ifdef RGBLIGHT_ENABLE
 
-    rgblight_set_layer_state(0, layer_state_cmp(state, _QW));
-    rgblight_set_layer_state(1, layer_state_cmp(state, _LWR));
-    rgblight_set_layer_state(2, layer_state_cmp(state, _RSE));
-    rgblight_set_layer_state(3, layer_state_cmp(state, _ADJ));
+   set_rgb_layers(state);
 
 #endif
+
     return update_tri_layer_state(state, _LWR, _RSE, _ADJ);
 }
 
 #ifdef RGBLIGHT_ENABLE
 
 layer_state_t default_layer_state_set_user(layer_state_t state) {
-    rgblight_set_layer_state(0, layer_state_cmp(state, _QW));
+
+    set_default_rgb_layers(state);
     return state;
 }
 
-void keyboard_post_init_user(void) {
-    // Enable the LED layers
-    rgblight_layers = my_rgb_layers;
-#ifdef OLED_ENABLE
-    oled_logo_timer = timer_read32();
-#endif
-
-#ifdef CONSOLE_ENABLE
-
-    debug_enable   = true;
-    debug_matrix   = true;
-    debug_keyboard = true;
-#endif
-}
 #endif
 
-#ifdef ENCODER_ENABLE
-
-#    define MEDIA_KEY_DELAY 10
-
-static inline void my_encoders(const uint8_t index, const bool clockwise) {
-    if (index == 0) { /* First encoder */
-        if (IS_LAYER_ON(_LWR)) {
-            if (clockwise) {
-                rgblight_decrease_val_noeeprom();
-            } else {
-                rgblight_increase_val_noeeprom();
-            }
-        } else if (IS_LAYER_ON(_RSE)) {
-            if (clockwise) {
-                rgblight_decrease_hue_noeeprom();
-            } else {
-                rgblight_increase_hue_noeeprom();
-            }
+void keyboard_post_init_user(void) {
+#ifdef RGBLIGHT_ENABLE
 
-        } else {
-            if (clockwise) {
-                tap_code_delay(KC_VOLD, MEDIA_KEY_DELAY);
-            } else {
-                tap_code_delay(KC_VOLU, MEDIA_KEY_DELAY);
-            }
-        }
-    }
-}
+  // Enable the LED layers
+    rgblight_layers = my_rgb();
 
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    my_encoders(index, clockwise);
-    return true;
-}
 #endif
 
 #ifdef OLED_ENABLE
 
-static void render_logo(void) {
-    oled_write_P(m65_logo, false);
-}
-
-void user_oled_magic(void) {
-    // Host Keyboard Layer Status
-    oled_write_P(PSTR("Layer: "), false);
+    init_timer();
 
-    switch (get_highest_layer(layer_state)) {
-        case _QW:
-            oled_write_P(PSTR("Default\n"), false);
-            break;
-        case _LWR:
-            oled_write_P(PSTR("Lower\n"), false);
-            break;
-        case _RSE:
-            oled_write_P(PSTR("Raise\n"), false);
-            break;
-        case _ADJ:
-            oled_write_P(PSTR("ADJ\n"), false);
-            break;
-        default:
-            // Or use the write_ln shortcut over adding '\n' to the end of your string
-            oled_write_ln_P(PSTR("Undefined"), false);
-    }
-
-    // Host Keyboard LED Status
-    led_t led_state = host_keyboard_led_state();
-    oled_write_P(led_state.num_lock ? PSTR("Lower ") : PSTR("    "), false);
-    oled_write_P(led_state.scroll_lock ? PSTR("Raise ") : PSTR("    "), false);
-    oled_write_P(led_state.caps_lock ? PSTR("CapsLock ") : PSTR("    "), false);
-#ifdef WPM_ENABLE
-    oled_write_P(PSTR("\nwpm: "), false);
-    uint8_t wpm = get_current_wpm();
-    oled_write_P(wpm != 0 ? get_u8_str(wpm,' ') : PSTR("   "), false);
 #endif
-}
-
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    return OLED_ROTATION_180;
-}
 
-void clear_screen(void) {
-    if (clear_logo){
-      for (uint8_t i = 0; i < OLED_DISPLAY_HEIGHT; ++i) {
-        for (uint8_t j = 0; j < OLED_DISPLAY_WIDTH; ++j) {
-          oled_write_raw_byte(0x0, i*OLED_DISPLAY_WIDTH + j);
-        }
-      }
-      clear_logo = false;
-    }
-}
+#ifdef CONSOLE_ENABLE
 
-#    define SHOW_LOGO 5000
-bool oled_task_user(void) {
-    if ((timer_elapsed32(oled_logo_timer) < SHOW_LOGO)){
-        render_logo();
-    }else{
-      clear_screen();
-      user_oled_magic();
-    }
-    return false;
-}
+    debug_enable   = true;
+    debug_matrix   = true;
+    debug_keyboard = true;
 
 #endif
+}
diff --git a/keyboards/mlego/m65/keymaps/via/keymap.c b/keyboards/mlego/m65/keymaps/via/keymap.c
index 831a2a72e4..e88c9207e4 100644
--- a/keyboards/mlego/m65/keymaps/via/keymap.c
+++ b/keyboards/mlego/m65/keymaps/via/keymap.c
@@ -17,23 +17,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include QMK_KEYBOARD_H
 
-enum layer_names {
-    _QW = 0,
-    _LWR,
-    _RSE,
-    _ADJ
-};
-
-#ifdef RGBLIGHT_ENABLE
-
-const rgblight_segment_t PROGMEM my_qwerty_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_PURPLE});
-const rgblight_segment_t PROGMEM my_lwr_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_CYAN});
-const rgblight_segment_t PROGMEM my_rse_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_RED});
-const rgblight_segment_t PROGMEM my_adj_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_GREEN});
-
-const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(my_qwerty_layer, my_lwr_layer, my_rse_layer, my_adj_layer);
-#endif
-
 // clang-format off
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
@@ -67,24 +50,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 // clang-format on
 
-// let us assume we start with both layers off
-static bool toggle_lwr = false;
-static bool toggle_rse = false;
-
 bool led_update_user(led_t led_state) {
     // Disable the default LED update code, so that lock LEDs could be reused to show layer status.
     return false;
 }
 
 void matrix_scan_user(void) {
-    led_lwr(toggle_lwr);
-    led_rse(toggle_rse);
-    led_t led_state = host_keyboard_led_state();
-    led_caps(led_state.caps_lock);
-    if (layer_state_is(_ADJ)) {
-        led_lwr(true);
-        led_rse(true);
-    }
+
+    toggle_leds();
+
 }
 
 bool process_record_user(uint16_t keycode, keyrecord_t* record) {
@@ -92,13 +66,13 @@ bool process_record_user(uint16_t keycode, keyrecord_t* record) {
         case (TT(_LWR)):
             if (!record->event.pressed && record->tap.count == TAPPING_TOGGLE) {
                 // This runs before the TT() handler toggles the layer state, so the current layer state is the opposite of the final one after toggle.
-                toggle_lwr = !layer_state_is(_LWR);
+                set_led_toggle(_LWR, !layer_state_is(_LWR));
             }
             return true;
             break;
         case (TT(_RSE)):
             if (record->event.pressed && record->tap.count == TAPPING_TOGGLE) {
-                toggle_rse = !layer_state_is(_RSE);
+                set_led_toggle(_RSE, !layer_state_is(_RSE));
             }
             return true;
             break;
@@ -108,118 +82,37 @@ bool process_record_user(uint16_t keycode, keyrecord_t* record) {
 }
 
 layer_state_t layer_state_set_user(layer_state_t state) {
+
 #ifdef RGBLIGHT_ENABLE
 
-    rgblight_set_layer_state(0, layer_state_cmp(state, _QW));
-    rgblight_set_layer_state(1, layer_state_cmp(state, _LWR));
-    rgblight_set_layer_state(2, layer_state_cmp(state, _RSE));
-    rgblight_set_layer_state(3, layer_state_cmp(state, _ADJ));
+    set_rgb_layers(state);
 
 #endif
+
     return update_tri_layer_state(state, _LWR, _RSE, _ADJ);
 }
 
 #ifdef RGBLIGHT_ENABLE
 
 layer_state_t default_layer_state_set_user(layer_state_t state) {
-    rgblight_set_layer_state(0, layer_state_cmp(state, _QW));
+    set_default_rgb_layers(state);
     return state;
 }
 
-void keyboard_post_init_user(void) {
-    // Enable the LED layers
-    rgblight_layers = my_rgb_layers;
-}
 #endif
 
-#ifdef ENCODER_ENABLE
-
-#    define MEDIA_KEY_DELAY 10
+void keyboard_post_init_user(void) {
 
-static inline void my_encoders(const uint8_t index, const bool clockwise) {
-    if (index == 0) { /* First encoder */
-        if (IS_LAYER_ON(_LWR)) {
-            if (clockwise) {
-                rgblight_decrease_val_noeeprom();
-            } else {
-                rgblight_increase_val_noeeprom();
-            }
-        } else if (IS_LAYER_ON(_RSE)) {
-            if (clockwise) {
-                rgblight_decrease_hue_noeeprom();
-            } else {
-                rgblight_increase_hue_noeeprom();
-            }
+#ifdef RGBLIGHT_ENABLE
 
-        } else {
-            if (clockwise) {
-                tap_code_delay(KC_VOLD, MEDIA_KEY_DELAY);
-            } else {
-                tap_code_delay(KC_VOLU, MEDIA_KEY_DELAY);
-            }
-        }
-    }
-}
+    // Enable the LED layers
+    rgblight_layers = my_rgb();
 
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    my_encoders(index, clockwise);
-    return true;
-}
 #endif
 
 #ifdef OLED_ENABLE
 
-static void render_logo(void) {
-    static const char PROGMEM m65_logo[] = {
-// 'slon', 128x32px
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0xc0, 0xa0, 0xa0,
-0xa0, 0xd0, 0xf0, 0xe0, 0xe0, 0xe0, 0xe0, 0xc0, 0xc0, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x0c, 0xc3, 0x3c, 0x0f, 0x05, 0x14, 0x14,
-0x04, 0xfc, 0x9f, 0x88, 0x80, 0x81, 0xe7, 0xfc, 0x03, 0x03, 0x07, 0x05, 0x06, 0x06, 0x08, 0x0c,
-0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x04, 0x10, 0x18, 0x30, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0xe0, 0xde, 0xc1, 0xf0, 0x89, 0x0b, 0x18, 0x08, 0x04, 0x04,
-0x01, 0x1a, 0x0f, 0x00, 0x00, 0x80, 0xc0, 0x20, 0x20, 0x20, 0x60, 0x40, 0x40, 0x42, 0x40, 0x40,
-0x40, 0x40, 0x40, 0xe0, 0x60, 0x00, 0x00, 0x00, 0x00, 0x08, 0x13, 0x7c, 0xe0, 0xc0, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x06, 0x06, 0x06, 0x06, 0x07, 0x07, 0x07, 0x05,
-0x05, 0x05, 0x07, 0x05, 0x07, 0x07, 0x07, 0x07, 0x01, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x01,
-0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02,
-0x02, 0x02, 0x02, 0x03, 0x03, 0x03, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x02, 0x03, 0x03, 0x07,
-0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06, 0x06,
-0x04, 0x05, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-      0x00
-    };
-
-      oled_write_raw_P(m65_logo, sizeof(m65_logo));
-
-}
-
-
-oled_rotation_t oled_init_user(oled_rotation_t rotation) {
-    return rotation;
-}
-
-bool oled_task_user(void) {
-    //user_oled_magic();
-    render_logo();
-    return false;
-}
+    init_timer();
 
 #endif
+}
diff --git a/keyboards/mlego/m65/m65.c b/keyboards/mlego/m65/m65.c
index 153359f337..3f71a27790 100644
--- a/keyboards/mlego/m65/m65.c
+++ b/keyboards/mlego/m65/m65.c
@@ -16,3 +16,189 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "m65.h"
+
+// let us assume we start with both layers off
+static bool toggle_lwr = false;
+static bool toggle_rse = false;
+
+#ifdef RGBLIGHT_ENABLE
+
+const rgblight_segment_t PROGMEM my_qwerty_layer[] = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_PURPLE});
+const rgblight_segment_t PROGMEM my_lwr_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_CYAN});
+const rgblight_segment_t PROGMEM my_rse_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_RED});
+const rgblight_segment_t PROGMEM my_adj_layer[]    = RGBLIGHT_LAYER_SEGMENTS({0, RGBLED_NUM, HSV_GREEN});
+
+const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(my_qwerty_layer, my_lwr_layer, my_rse_layer, my_adj_layer);
+
+#endif
+
+#ifdef OLED_ENABLE
+
+static uint32_t oled_logo_timer = 0;
+static bool clear_logo = true;
+static const char PROGMEM m65_logo[] = {
+    0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98, 0x99, 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa5, 0xa5, 0xa5, 0xa5, 0xa5, 0xa5,
+    0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94,
+    0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4,
+    0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4,
+    0};
+
+#endif
+
+#ifdef RGBLIGHT_ENABLE
+
+void set_rgb_layers(layer_state_t state){
+
+    rgblight_set_layer_state(0, layer_state_cmp(state, _QW));
+    rgblight_set_layer_state(1, layer_state_cmp(state, _LWR));
+    rgblight_set_layer_state(2, layer_state_cmp(state, _RSE));
+    rgblight_set_layer_state(3, layer_state_cmp(state, _ADJ));
+
+}
+
+void set_default_rgb_layers(layer_state_t state){
+    rgblight_set_layer_state(0, layer_state_cmp(state, _QW));
+}
+
+const rgblight_segment_t * const* my_rgb(void){
+    return my_rgb_layers;
+}
+
+#endif
+
+void set_led_toggle(const uint8_t layer, const bool state){
+
+    switch (layer) {
+        case _LWR:
+          toggle_lwr = state;
+          break;
+        case _RSE:
+          toggle_rse = state;
+          break;
+        default:
+          break;
+    }
+}
+
+void toggle_leds(void){
+
+    led_lwr(toggle_lwr);
+    led_rse(toggle_rse);
+    led_t led_state = host_keyboard_led_state();
+    led_caps(led_state.caps_lock);
+    if (layer_state_is(_ADJ)) {
+        led_lwr(true);
+        led_rse(true);
+    }
+
+}
+
+#ifdef ENCODER_ENABLE
+
+#    define MEDIA_KEY_DELAY 10
+
+void my_encoders(const uint8_t index, const bool clockwise) {
+    if (index == 0) { /* First encoder */
+        if (IS_LAYER_ON(_LWR)) {
+            if (clockwise) {
+                rgblight_decrease_val_noeeprom();
+            } else {
+                rgblight_increase_val_noeeprom();
+            }
+        } else if (IS_LAYER_ON(_RSE)) {
+            if (clockwise) {
+                rgblight_decrease_hue_noeeprom();
+            } else {
+                rgblight_increase_hue_noeeprom();
+            }
+
+        } else {
+            if (clockwise) {
+                tap_code_delay(KC_VOLD, MEDIA_KEY_DELAY);
+            } else {
+                tap_code_delay(KC_VOLU, MEDIA_KEY_DELAY);
+            }
+        }
+    }
+}
+
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) { return false; }
+    my_encoders(index, clockwise);
+    return false;
+}
+
+#endif
+
+#ifdef OLED_ENABLE
+
+void init_timer(void){
+   oled_logo_timer = timer_read32();
+};
+
+void user_oled_magic(void) {
+    // Host Keyboard Layer Status
+    oled_write_P(PSTR("Layer: "), false);
+
+    switch (get_highest_layer(layer_state)) {
+        case _QW:
+            oled_write_P(PSTR("Default\n"), false);
+            break;
+        case _LWR:
+            oled_write_P(PSTR("Lower\n"), false);
+            break;
+        case _RSE:
+            oled_write_P(PSTR("Raise\n"), false);
+            break;
+        case _ADJ:
+            oled_write_P(PSTR("ADJ\n"), false);
+            break;
+        default:
+            // Or use the write_ln shortcut over adding '\n' to the end of your string
+            oled_write_ln_P(PSTR("Undefined"), false);
+    }
+
+    // Host Keyboard LED Status
+    led_t led_state = host_keyboard_led_state();
+    oled_write_P(led_state.num_lock ? PSTR("Lower ") : PSTR("    "), false);
+    oled_write_P(led_state.scroll_lock ? PSTR("Raise ") : PSTR("    "), false);
+    oled_write_P(led_state.caps_lock ? PSTR("CapsLock ") : PSTR("    "), false);
+#ifdef WPM_ENABLE
+    oled_write_P(PSTR("\nwpm: "), false);
+    uint8_t wpm = get_current_wpm();
+    oled_write_P(wpm != 0 ? get_u8_str(wpm,' ') : PSTR("   "), false);
+#endif
+}
+
+void render_logo(void) {
+    oled_write_P(m65_logo, false);
+}
+
+void clear_screen(void) {
+    if (clear_logo){
+      for (uint8_t i = 0; i < OLED_DISPLAY_HEIGHT; ++i) {
+        for (uint8_t j = 0; j < OLED_DISPLAY_WIDTH; ++j) {
+          oled_write_raw_byte(0x0, i*OLED_DISPLAY_WIDTH + j);
+        }
+      }
+      clear_logo = false;
+    }
+}
+
+oled_rotation_t oled_init_user(oled_rotation_t rotation) {
+    return OLED_ROTATION_180;
+}
+
+#    define SHOW_LOGO 5000
+bool oled_task_kb(void) {
+    if (!oled_task_user()) { return false; }
+    if ((timer_elapsed32(oled_logo_timer) < SHOW_LOGO)){
+        render_logo();
+    }else{
+      clear_screen();
+      user_oled_magic();
+    }
+    return false;
+}
+
+#endif
diff --git a/keyboards/mlego/m65/m65.h b/keyboards/mlego/m65/m65.h
index f5ffd519fa..9564b3d529 100644
--- a/keyboards/mlego/m65/m65.h
+++ b/keyboards/mlego/m65/m65.h
@@ -108,8 +108,44 @@ enum unicode_names {
     rS,
     rt,
     rT,
+    ro,
+    rO,
+    ra2,
+    rA2,
+    ra3,
+    rA3
 };
 
+
+enum layer_names {
+    _QW = 0,
+    _LWR,
+    _RSE,
+    _ADJ
+};
+
+#ifdef OLED_ENABLE
+void user_oled_magic(void);
+void render_logo(void);
+void clear_screen(void);
+void init_timer(void);
+#endif
+
+#ifdef ENCODER_ENABLE
+void my_encoders(const uint8_t, const bool);
+bool encoder_update_user(uint8_t, bool);
+#endif
+
+#ifdef RGBLIGHT_ENABLE
+void set_rgb_layers(layer_state_t);
+const rgblight_segment_t * const*  my_rgb(void);
+void set_default_rgb_layers(layer_state_t);
+#endif
+
+
+void toggle_leds(void);
+void set_led_toggle(const uint8_t, const bool);
+
 static inline void led_lwr(const bool on) {
 #ifdef LED_NUM_LOCK_PIN
     writePin(LED_NUM_LOCK_PIN, on);
@@ -123,11 +159,10 @@ static inline void led_rse(const bool on) {
 }
 static inline void led_caps(const bool on) {
 #ifdef LED_CAPS_LOCK_PIN
-    if ((DEVICE_VER == 0x0001) || (DEVICE_VER == 0x0003) || (DEVICE_VER == 0x0004)) {
-        writePin(LED_CAPS_LOCK_PIN, !on);
-    }
-    if (DEVICE_VER == 0x0002) {
+    if ((PRODUCT_ID == 0x6061) && (DEVICE_VER == 0x0002)) {
         writePin(LED_CAPS_LOCK_PIN, on);
+    } else {
+        writePin(LED_CAPS_LOCK_PIN, !on);
     }
 #endif
 }
diff --git a/keyboards/mlego/m65/rev1/config.h b/keyboards/mlego/m65/rev1/config.h
index e0a703c978..0e40ae2e3d 100644
--- a/keyboards/mlego/m65/rev1/config.h
+++ b/keyboards/mlego/m65/rev1/config.h
@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #define DEVICE_VER 0x0001
-#define PRODUCT_ID 0x6060
+#define PRODUCT_ID 0x6061
 
 #define LED_NUM_LOCK_PIN B12
 #define LED_SCROLL_LOCK_PIN B13
diff --git a/keyboards/mlego/m65/rev2/config.h b/keyboards/mlego/m65/rev2/config.h
index a548b01827..db13bbb2ad 100644
--- a/keyboards/mlego/m65/rev2/config.h
+++ b/keyboards/mlego/m65/rev2/config.h
@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #define DEVICE_VER 0x0002
-#define PRODUCT_ID 0x6060
+#define PRODUCT_ID 0x6061
 
 #define LED_NUM_LOCK_PIN B12
 #define LED_SCROLL_LOCK_PIN B13
diff --git a/keyboards/mlego/m65/rev3/config.h b/keyboards/mlego/m65/rev3/config.h
index 97992ee844..a4b1ba3343 100644
--- a/keyboards/mlego/m65/rev3/config.h
+++ b/keyboards/mlego/m65/rev3/config.h
@@ -17,8 +17,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define DEVICE_VER 0x0003
-#define PRODUCT_ID 0x6060
+#define DEVICE_VER 0x0001
+#define PRODUCT_ID 0x6062
 
 #define LED_NUM_LOCK_PIN B12
 #define LED_SCROLL_LOCK_PIN B13
@@ -31,18 +31,18 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COL_PINS \
     { A10, A15, B3, B4, B5, B9, B8, B7, A1, A2, A3, A4, B1 }
 
+#ifdef ENCODER_ENABLE
 #define ENCODERS_PAD_A \
     { A0 }
 #define ENCODERS_PAD_B \
     { B6 }
+#define ENCODER_RESOLUTION 4
+#endif
 
-#define RGB_DI_PIN B15
+#ifdef RGBLIGHT_ENABLE
 
-#define UNUSED_PINS
+#define RGB_DI_PIN B15
 #define RGBLIGHT_LAYERS
-
-#define ENCODER_RESOLUTION 4
-
 #undef RGBLED_NUM
 #define RGBLED_NUM 20
 #define RGBLIGHT_EFFECT_BREATHING
@@ -57,3 +57,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_EFFECT_TWINKLE
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
+#endif
+
+#define UNUSED_PINS
+// you want to comment this if using stm32-dfu as bootloader
+#define FEE_PAGE_BASE_ADDRESS 0x08008000
diff --git a/keyboards/mlego/m65/rev3/ld/STM32F401xE.ld b/keyboards/mlego/m65/rev3/ld/STM32F401xE.ld
new file mode 100644
index 0000000000..daec7d8583
--- /dev/null
+++ b/keyboards/mlego/m65/rev3/ld/STM32F401xE.ld
@@ -0,0 +1,88 @@
+/*
+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+/*
+ * STM32F401xE memory setup.
+ */
+MEMORY
+{
+    flash0 (rx) : org = 0x08000000, len = 16k /* tinyuf2 bootloader requires app to be located at 64k offset for this MCU */
+    flash1 (rx) : org = 0x08004000, len = 16k
+    flash2 (rx) : org = 0x08008000, len = 16k /* emulated eeprom */
+    flash3 (rx) : org = 0x0800C000, len = 16k
+    flash4 (rx) : org = 0x08010000, len = 512k - 64k
+    flash5 (rx) : org = 0x00000000, len = 0
+    flash6 (rx) : org = 0x00000000, len = 0
+    flash7 (rx) : org = 0x00000000, len = 0
+    ram0   (wx) : org = 0x20000000, len = 96k
+    ram1   (wx) : org = 0x00000000, len = 0
+    ram2   (wx) : org = 0x00000000, len = 0
+    ram3   (wx) : org = 0x00000000, len = 0
+    ram4   (wx) : org = 0x00000000, len = 0
+    ram5   (wx) : org = 0x00000000, len = 0
+    ram6   (wx) : org = 0x00000000, len = 0
+    ram7   (wx) : org = 0x00000000, len = 0
+}
+
+/* For each data/text section two region are defined, a virtual region
+   and a load region (_LMA suffix).*/
+
+/* Flash region to be used for exception vectors.*/
+REGION_ALIAS("VECTORS_FLASH", flash4);
+REGION_ALIAS("VECTORS_FLASH_LMA", flash4);
+
+/* Flash region to be used for constructors and destructors.*/
+REGION_ALIAS("XTORS_FLASH", flash4);
+REGION_ALIAS("XTORS_FLASH_LMA", flash4);
+
+/* Flash region to be used for code text.*/
+REGION_ALIAS("TEXT_FLASH", flash4);
+REGION_ALIAS("TEXT_FLASH_LMA", flash4);
+
+/* Flash region to be used for read only data.*/
+REGION_ALIAS("RODATA_FLASH", flash4);
+REGION_ALIAS("RODATA_FLASH_LMA", flash4);
+
+/* Flash region to be used for various.*/
+REGION_ALIAS("VARIOUS_FLASH", flash4);
+REGION_ALIAS("VARIOUS_FLASH_LMA", flash4);
+
+/* Flash region to be used for RAM(n) initialization data.*/
+REGION_ALIAS("RAM_INIT_FLASH_LMA", flash4);
+
+/* RAM region to be used for Main stack. This stack accommodates the processing
+   of all exceptions and interrupts.*/
+REGION_ALIAS("MAIN_STACK_RAM", ram0);
+
+/* RAM region to be used for the process stack. This is the stack used by
+   the main() function.*/
+REGION_ALIAS("PROCESS_STACK_RAM", ram0);
+
+/* RAM region to be used for data segment.*/
+REGION_ALIAS("DATA_RAM", ram0);
+REGION_ALIAS("DATA_RAM_LMA", flash4);
+
+/* RAM region to be used for BSS segment.*/
+REGION_ALIAS("BSS_RAM", ram0);
+
+/* RAM region to be used for the default heap.*/
+REGION_ALIAS("HEAP_RAM", ram0);
+
+/* Generic rules inclusion.*/
+INCLUDE rules.ld
+
+/* TinyUF2 bootloader reset support */
+_board_dfu_dbl_tap = ORIGIN(ram0) + 64k - 4; /* this is based off the linker file for tinyuf2 */
diff --git a/keyboards/mlego/m65/rev3/rules.mk b/keyboards/mlego/m65/rev3/rules.mk
index 25df19c15f..558accd5b1 100644
--- a/keyboards/mlego/m65/rev3/rules.mk
+++ b/keyboards/mlego/m65/rev3/rules.mk
@@ -2,7 +2,10 @@
 MCU = STM32F401
 
 # Bootloader selection
-BOOTLOADER = stm32-dfu
+BOOTLOADER = tinyuf2
+#BOOTLOADER = stm32-dfu
+MCU_LDSCRIPT = STM32F401xE
+EEPROM_DRIVER = vendor
 
 # Build Options
 #   change yes to no to disable
diff --git a/keyboards/mlego/m65/rev4/config.h b/keyboards/mlego/m65/rev4/config.h
index ee47061a91..07dd0fefaa 100644
--- a/keyboards/mlego/m65/rev4/config.h
+++ b/keyboards/mlego/m65/rev4/config.h
@@ -17,8 +17,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define DEVICE_VER 0x0004
-#define PRODUCT_ID 0x6060
+#define DEVICE_VER 0x0002
+#define PRODUCT_ID 0x6062
 
 #define LED_NUM_LOCK_PIN B12
 #define LED_SCROLL_LOCK_PIN B13
@@ -31,18 +31,18 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COL_PINS \
     { B14, A8, A10, A15, B3, B4, B5, B7, A1, A2, A3, A4, B1 }
 
+#ifdef ENCODER_ENABLE
 #define ENCODERS_PAD_A \
     { A0 }
 #define ENCODERS_PAD_B \
     { B6 }
+#define ENCODER_RESOLUTION 4
+#endif
 
-#define RGB_DI_PIN B15
+#ifdef RGBLIGHT_ENABLE
 
-#define UNUSED_PINS
+#define RGB_DI_PIN B15
 #define RGBLIGHT_LAYERS
-
-#define ENCODER_RESOLUTION 4
-
 #undef RGBLED_NUM
 #define RGBLED_NUM 20
 #define RGBLIGHT_EFFECT_BREATHING
@@ -58,6 +58,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 
+#endif
+
 #ifdef OLED_ENABLE
 #    define OLED_DISPLAY_128X32
 #define I2C1_SCL_PIN        B9
@@ -65,3 +67,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define OLED_BRIGHTNESS 128
 #define OLED_FONT_H "keyboards/mlego/m65/lib/glcdfont.c"
 #endif
+
+#define UNUSED_PINS
+// you want to comment this if using stm32-dfu as bootloader
+#define FEE_PAGE_BASE_ADDRESS 0x08008000
diff --git a/keyboards/mlego/m65/rev4/ld/STM32F401xE.ld b/keyboards/mlego/m65/rev4/ld/STM32F401xE.ld
new file mode 100644
index 0000000000..daec7d8583
--- /dev/null
+++ b/keyboards/mlego/m65/rev4/ld/STM32F401xE.ld
@@ -0,0 +1,88 @@
+/*
+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+/*
+ * STM32F401xE memory setup.
+ */
+MEMORY
+{
+    flash0 (rx) : org = 0x08000000, len = 16k /* tinyuf2 bootloader requires app to be located at 64k offset for this MCU */
+    flash1 (rx) : org = 0x08004000, len = 16k
+    flash2 (rx) : org = 0x08008000, len = 16k /* emulated eeprom */
+    flash3 (rx) : org = 0x0800C000, len = 16k
+    flash4 (rx) : org = 0x08010000, len = 512k - 64k
+    flash5 (rx) : org = 0x00000000, len = 0
+    flash6 (rx) : org = 0x00000000, len = 0
+    flash7 (rx) : org = 0x00000000, len = 0
+    ram0   (wx) : org = 0x20000000, len = 96k
+    ram1   (wx) : org = 0x00000000, len = 0
+    ram2   (wx) : org = 0x00000000, len = 0
+    ram3   (wx) : org = 0x00000000, len = 0
+    ram4   (wx) : org = 0x00000000, len = 0
+    ram5   (wx) : org = 0x00000000, len = 0
+    ram6   (wx) : org = 0x00000000, len = 0
+    ram7   (wx) : org = 0x00000000, len = 0
+}
+
+/* For each data/text section two region are defined, a virtual region
+   and a load region (_LMA suffix).*/
+
+/* Flash region to be used for exception vectors.*/
+REGION_ALIAS("VECTORS_FLASH", flash4);
+REGION_ALIAS("VECTORS_FLASH_LMA", flash4);
+
+/* Flash region to be used for constructors and destructors.*/
+REGION_ALIAS("XTORS_FLASH", flash4);
+REGION_ALIAS("XTORS_FLASH_LMA", flash4);
+
+/* Flash region to be used for code text.*/
+REGION_ALIAS("TEXT_FLASH", flash4);
+REGION_ALIAS("TEXT_FLASH_LMA", flash4);
+
+/* Flash region to be used for read only data.*/
+REGION_ALIAS("RODATA_FLASH", flash4);
+REGION_ALIAS("RODATA_FLASH_LMA", flash4);
+
+/* Flash region to be used for various.*/
+REGION_ALIAS("VARIOUS_FLASH", flash4);
+REGION_ALIAS("VARIOUS_FLASH_LMA", flash4);
+
+/* Flash region to be used for RAM(n) initialization data.*/
+REGION_ALIAS("RAM_INIT_FLASH_LMA", flash4);
+
+/* RAM region to be used for Main stack. This stack accommodates the processing
+   of all exceptions and interrupts.*/
+REGION_ALIAS("MAIN_STACK_RAM", ram0);
+
+/* RAM region to be used for the process stack. This is the stack used by
+   the main() function.*/
+REGION_ALIAS("PROCESS_STACK_RAM", ram0);
+
+/* RAM region to be used for data segment.*/
+REGION_ALIAS("DATA_RAM", ram0);
+REGION_ALIAS("DATA_RAM_LMA", flash4);
+
+/* RAM region to be used for BSS segment.*/
+REGION_ALIAS("BSS_RAM", ram0);
+
+/* RAM region to be used for the default heap.*/
+REGION_ALIAS("HEAP_RAM", ram0);
+
+/* Generic rules inclusion.*/
+INCLUDE rules.ld
+
+/* TinyUF2 bootloader reset support */
+_board_dfu_dbl_tap = ORIGIN(ram0) + 64k - 4; /* this is based off the linker file for tinyuf2 */
diff --git a/keyboards/mlego/m65/rev4/rules.mk b/keyboards/mlego/m65/rev4/rules.mk
index 9e1e0ab23b..bf4285383a 100644
--- a/keyboards/mlego/m65/rev4/rules.mk
+++ b/keyboards/mlego/m65/rev4/rules.mk
@@ -2,7 +2,10 @@
 MCU = STM32F401
 
 # Bootloader selection
-BOOTLOADER = stm32-dfu
+BOOTLOADER = tinyuf2
+#BOOTLOADER = stm32-dfu
+MCU_LDSCRIPT = STM32F401xE
+EEPROM_DRIVER = vendor
 
 # Build Options
 #   change yes to no to disable