5 files changed, 8 insertions, 15 deletions
diff --git a/users/bbaserdem/bb-macro.c b/users/bbaserdem/bb-macro.c
index a84a7bbc21..6a722e6db1 100644
--- a/users/bbaserdem/bb-macro.c
+++ b/users/bbaserdem/bb-macro.c
@@ -80,7 +80,7 @@ const uint32_t PROGMEM unicode_map[] = {
 bool process_record_macro(uint16_t keycode, keyrecord_t *record) {
     switch (keycode) {
         // AltGr + Caps should change the oled layout variable
-        case KC_CAPSLOCK:
+        case KC_CAPS_LOCK:
             if (record->event.pressed) {
                 if (get_mods() & MOD_BIT(KC_RALT)) {
                     userspace_config.layout = (userspace_config.layout + 1) % 3;
diff --git a/users/bbaserdem/bb-rgb.c b/users/bbaserdem/bb-rgb.c
index bdb7f12bbd..49b91129ba 100644
--- a/users/bbaserdem/bb-rgb.c
+++ b/users/bbaserdem/bb-rgb.c
@@ -23,7 +23,7 @@
 
 // Allow hooking into the RGB matrix indications using keymap code
 
-// Modulates the brightness of indicator 
+// Modulates the brightness of indicator
 RGB helper_dimmer(uint8_t r, uint8_t g, uint8_t b) {
     RGB output;
     output.r = r / 2;
@@ -63,12 +63,12 @@ __attribute__ ((weak)) bool rgb_matrix_indicators_advanced_keymap(uint8_t led_mi
     return false;
 }
 // Set RGB state depending on layer
-void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
+bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
     uint8_t thisInd = 3;
     RGB thisCol;
     // Load keymap hooks
     if(rgb_matrix_indicators_advanced_keymap(led_min, led_max)) {
-        return;
+        return false;
     }
     // Grab color info
     switch (get_highest_layer(layer_state)) {
@@ -110,6 +110,7 @@ void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
             break;
     }
     helper_painter(led_min, led_max, thisCol, thisInd);
+    return false;
 }
 
 // Hook into shutdown code to make all perkey LED's red on hitting reset
@@ -120,11 +121,3 @@ void shutdown_rgb(void) {
     // Delay until this registers
     while(timer_elapsed(timer_start) < 250) {wait_ms(1);}
 }
-
-// Hook into suspend code
-void suspend_power_down_rgb(void) {
-    rgb_matrix_set_suspend_state(true);
-}
-void suspend_wakeup_init_rgb(void) {
-    rgb_matrix_set_suspend_state(false);
-}
diff --git a/users/bbaserdem/bb-rgb.h b/users/bbaserdem/bb-rgb.h
index 62b6da9f2f..3e96b997fe 100644
--- a/users/bbaserdem/bb-rgb.h
+++ b/users/bbaserdem/bb-rgb.h
@@ -21,7 +21,7 @@
  */
 
 // For custom indicators
-void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max);
+bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max);
 // Hook into shutdown code
 void shutdown_rgb(void);
 void suspend_wakeup_init_rgb(void);
diff --git a/users/bbaserdem/bbaserdem.h b/users/bbaserdem/bbaserdem.h
index 4792d5c2d7..bfa083b870 100644
--- a/users/bbaserdem/bbaserdem.h
+++ b/users/bbaserdem/bbaserdem.h
@@ -531,7 +531,7 @@ enum userspace_layers {
  *                   └─────┴─────┴─────┘
  */
 #define _FU1_5_ KC_F1,  KC_F2,  KC_F3,  KC_F4,  RESET
-#define _FU2_5_ KC_F5,  KC_F6,  KC_F7,  KC_F8,  EEP_RST
+#define _FU2_5_ KC_F5,  KC_F6,  KC_F7,  KC_F8,  EE_CLR
 #define _FU3_5_ KC_F9,  KC_F10, KC_F11, KC_F12, BB_GAME
 #define _FU4_3_ KC_DEL, KC_TAB, KC_SPC
 
diff --git a/users/bbaserdem/config.h b/users/bbaserdem/config.h
index 477378102b..3c467d5e7d 100644
--- a/users/bbaserdem/config.h
+++ b/users/bbaserdem/config.h
@@ -121,7 +121,7 @@
 // For perkey leds
 #ifdef RGB_MATRIX_ENABLE
 // This is not working
-//#   define RGB_DISABLE_TIMEOUT 1800000
+//#   define RGB_MATRIX_TIMEOUT 1800000
 #   define RGB_DISABLE_WHEN_USB_SUSPENDED true
     // Start using this mode
 #   define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_RAINBOW_BEACON