diff --git a/bin/build-pinkies-out.sh b/bin/build-pinkies-out.sh
index 6fcb7b3937..1e51f83758 100755
--- a/bin/build-pinkies-out.sh
+++ b/bin/build-pinkies-out.sh
@@ -10,3 +10,6 @@
 
 make fingerpunch/pinkiesout/rgbmatrix_oled:sadekbaroudi
 cp .build/fingerpunch_pinkiesout_rgbmatrix_oled_sadekbaroudi* /mnt/g/My\ Drive/qmk-keyboards/pinkiesout/rgbmatrix/
+
+make fingerpunch/pinkiesout/rgblight_oled:sadekbaroudi
+cp .build/fingerpunch_pinkiesout_rgblight_oled_sadekbaroudi* /mnt/g/My\ Drive/qmk-keyboards/pinkiesout/rgblight/
diff --git a/bin/build-rockon.sh b/bin/build-rockon.sh
index f6327d1dd7..f86220f156 100755
--- a/bin/build-rockon.sh
+++ b/bin/build-rockon.sh
@@ -3,4 +3,7 @@
 # TODO: consolidate all the build files into one
 
 make fingerpunch/rockon/rgbmatrix_oled:sadekbaroudi
-cp .build/fingerpunch_pinkiesout_rgbmatrix_oled_sadekbaroudi.hex /mnt/g/My\ Drive/qmk-keyboards/rock-on/rgbmatrix/fingerpunch_rock_on_rgbmatrix_oled_sadekbaroudih.hex
+cp .build/fingerpunch_rockon_rgbmatrix_oled_sadekbaroudi.hex /mnt/g/My\ Drive/qmk-keyboards/rock-on/rgbmatrix/fingerpunch_rockon_rgbmatrix_oled_sadekbaroudi.hex
+
+make fingerpunch/rockon/rgblight_oled:sadekbaroudi
+cp .build/fingerpunch_rockon_rgblight_oled_sadekbaroudi.hex /mnt/g/My\ Drive/qmk-keyboards/rock-on/rgblight/fingerpunch_rockon_rgblight_oled_sadekbaroudi.hex
diff --git a/keyboards/fingerpunch/pinkiesout/keymaps/sadekbaroudi/keymap.c b/keyboards/fingerpunch/pinkiesout/keymaps/sadekbaroudi/keymap.c
index b6e58dead8..b9d12e39b3 100644
--- a/keyboards/fingerpunch/pinkiesout/keymaps/sadekbaroudi/keymap.c
+++ b/keyboards/fingerpunch/pinkiesout/keymaps/sadekbaroudi/keymap.c
@@ -20,9 +20,6 @@
 // Uncomment to set up WPM
 //char wpm_as_str[8];
 
-#define _GAME 8
-#define _KICAD 9
-
 /*
  * The `LAYOUT_pinkiesout_base` macro is a template to allow the use of identical
  * modifiers for the default layouts (eg ALPHA_ALT, Alpha, Dvorak, etc), so
diff --git a/users/sadekbaroudi/rgb_stuff.c b/users/sadekbaroudi/rgb_stuff.c
index c6bba8c9f5..68a95066ff 100755
--- a/users/sadekbaroudi/rgb_stuff.c
+++ b/users/sadekbaroudi/rgb_stuff.c
@@ -101,7 +101,7 @@ layer_state_t layer_state_set_rgb_light(layer_state_t state) {
         switch (get_highest_layer(state|default_layer_state)) {
             case _ALPHA:
                 if (is_caps_lock_on) { // If caps lock is enabled, force this setting
-                    uint8_t caps_lock_rgb_hue = 0; // RED
+                    uint8_t caps_lock_rgb_hue = 180; // CYAN
                     uint8_t caps_lock_rgb_mode = mode;
                     #ifdef CAPS_LOCK_RGB_HUE
                     caps_lock_rgb_hue = CAPS_LOCK_RGB_HUE;
@@ -178,6 +178,18 @@ layer_state_t layer_state_set_rgb_light(layer_state_t state) {
                 #endif
                 rgblight_set_hsv_and_mode(10, 10, 255, mode); // near-white
                 break;
+            case _GAME:
+                #ifdef PIMORONI_TRACKBALL_ENABLE
+                trackball_set_rgbw(RGB_RED, 0x00);
+                #endif
+                rgblight_set_hsv_and_mode(HSV_RED, mode);
+                break;
+            case _KICAD:
+                #ifdef PIMORONI_TRACKBALL_ENABLE
+                trackball_set_rgbw(RGB_SPRINGGREEN, 0x00);
+                #endif
+                rgblight_set_hsv_and_mode(RGB_SPRINGGREEN, mode);
+                break;
             default:
                 #ifdef PIMORONI_TRACKBALL_ENABLE
                 trackball_set_rgbw(RGB_SPRINGGREEN, 0x00);
diff --git a/users/sadekbaroudi/rules.mk b/users/sadekbaroudi/rules.mk
index 831761fad1..e614f19ac9 100755
--- a/users/sadekbaroudi/rules.mk
+++ b/users/sadekbaroudi/rules.mk
@@ -10,7 +10,7 @@ NKRO_ENABLE      = no
 RAW_ENABLE       = no
 CASEMODES_ENABLE = yes
 COMBO_ENABLE     = yes
-#LTO_ENABLE       = yes
+LTO_ENABLE       = yes
 
 # UNCOMMENT TO DISABLE MACROS
 #EXTRAFLAGS     += -flto
diff --git a/users/sadekbaroudi/sadekbaroudi.h b/users/sadekbaroudi/sadekbaroudi.h
index ecda657a81..a838bb81dc 100755
--- a/users/sadekbaroudi/sadekbaroudi.h
+++ b/users/sadekbaroudi/sadekbaroudi.h
@@ -37,7 +37,9 @@ enum userspace_layers {
     _FUNCTION,
     _MEDIA,
     _MOUSE,
-    _WINNAV
+    _WINNAV,
+    _KICAD,
+    _GAME
 };
 
 void          press_super_alt_tab(bool shift);