diff --git a/betalupi_ergodox.c b/betalupi_ergodox.c
index 367f383..098d888 100644
--- a/betalupi_ergodox.c
+++ b/betalupi_ergodox.c
@@ -337,8 +337,134 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
 				eeconfig_update_kb(keyboard_config.raw);
 			}
 			return false;
+#endif
+
+// Custom RGBLIGHT macros
+#ifdef RGBLIGHT_ENABLE
+#ifdef RGBLIGHT_NO_EEPROM
+		case LIGHT_TOG:
+			if (record->event.pressed) {
+				rgblight_toggle_noeeprom();
+			}
+			break;
+
+		case LIGHT_MOD:
+			if (record->event.pressed) {
+				rgblight_step_noeeprom();
+			}
+			break;
+
+		case LIGHT_HUI:
+			if (record->event.pressed) {
+				rgblight_increase_hue_noeeprom();
+			}
+			break;
+
+		case LIGHT_HUD:
+			if (record->event.pressed) {
+				rgblight_decrease_hue_noeeprom();
+			}
+			break;
+
+		case LIGHT_SAI:
+			if (record->event.pressed) {
+				rgblight_increase_sat_noeeprom();
+			}
+			break;
+
+		case LIGHT_SAD:
+			if (record->event.pressed) {
+				rgblight_decrease_sat_noeeprom();
+			}
+			break;
+
+		case LIGHT_VAI:
+			if (record->event.pressed) {
+				rgblight_increase_val_noeeprom();
+			}
+			break;
+
+		case LIGHT_VAD:
+			if (record->event.pressed) {
+				rgblight_decrease_val_noeeprom();
+			}
+			break;
+
+		case LIGHT_SPI:
+			if (record->event.pressed) {
+				rgblight_increase_speed_noeeprom();
+			}
+			break;
+
+		case LIGHT_SPD:
+			if (record->event.pressed) {
+				rgblight_decrease_speed_noeeprom();
+			}
+			break;
+#else
+		case LIGHT_TOG:
+			if (record->event.pressed) {
+				rgblight_toggle();
+			}
+			break;
+
+		case LIGHT_MOD:
+			if (record->event.pressed) {
+				rgblight_step();
+			}
+			break;
+
+		case LIGHT_HUI:
+			if (record->event.pressed) {
+				rgblight_increase_hue();
+			}
+			break;
+
+		case LIGHT_HUD:
+			if (record->event.pressed) {
+				rgblight_decrease_hue();
+			}
+			break;
+
+		case LIGHT_SAI:
+			if (record->event.pressed) {
+				rgblight_increase_sat();
+			}
+			break;
+
+		case LIGHT_SAD:
+			if (record->event.pressed) {
+				rgblight_decrease_sat();
+			}
+			break;
+
+		case LIGHT_VAI:
+			if (record->event.pressed) {
+				rgblight_increase_val();
+			}
+			break;
+
+		case LIGHT_VAD:
+			if (record->event.pressed) {
+				rgblight_decrease_val();
+			}
+			break;
+
+		case LIGHT_SPI:
+			if (record->event.pressed) {
+				rgblight_increase_speed();
+			}
+			break;
+
+		case LIGHT_SPD:
+			if (record->event.pressed) {
+				rgblight_decrease_speed();
+			}
+			break;
+#endif
 #endif
 	}
+
 	return process_record_user(keycode, record);
 }
 
diff --git a/betalupi_ergodox.h b/betalupi_ergodox.h
index 761d5d9..b17e69c 100644
--- a/betalupi_ergodox.h
+++ b/betalupi_ergodox.h
@@ -98,7 +98,18 @@ inline void ergodox_led_all_set(uint8_t n) {
 enum ergodox_ez_keycodes {
 	LED_LEVEL = SAFE_RANGE,
 	TOGGLE_LAYER_COLOR,
-	EZ_SAFE_RANGE,
+	// Custom RGBLIGHT macros
+	LIGHT_TOG, // Toggle backlight
+	LIGHT_HUI, // Increase backlight hue
+	LIGHT_HUD, // Decrease backlight hue
+	LIGHT_SAI, // Increase backlight sat
+	LIGHT_SAD, // Decrease backlight sat
+	LIGHT_VAI, // Increase backlight val
+	LIGHT_VAD, // Decrease backlight val
+	LIGHT_SPI, // Increase backlight speed
+	LIGHT_SPD, // Decrease backlight speed
+	LIGHT_MOD, // Change backlight animation mode
+	BETA_SAFE_RANGE
 };
 
 typedef union {
diff --git a/config.h b/config.h
index ec1463a..ffebbf6 100644
--- a/config.h
+++ b/config.h
@@ -85,7 +85,8 @@
 //#define RGBLIGHT_NO_EEPROM
 
 // Prevents RGB keycodes from affecting underglow.
-// This allows us to control RGBMatrix and RGBLight seperately.
+// This allows us to control RGBMatrix and RGBLight seperately
+// with custom macros defined in betalupi_ergodox.c
 #define RGBLIGHT_DISABLE_KEYCODES
 
 // The underglow LEDs I used for the backlight mod aren't RGBW,
diff --git a/keymaps/default/keymap.c b/keymaps/default/keymap.c
index cf1682b..59e1124 100644
--- a/keymaps/default/keymap.c
+++ b/keymaps/default/keymap.c
@@ -6,23 +6,12 @@
 // Define custom keys
 // (Must be done BEFORE keymaps)
 enum custom_keycodes {
-	M_SHUTDOWN = EZ_SAFE_RANGE,
+	M_SHUTDOWN = BETA_SAFE_RANGE,
 	M_RESETWM,
 	RU_LAYER,
 	EN_LAYER,
 	M_RU_CTRL,
-	M_RU_ALT,
-	// Custom RGBLIGHT macros
-	LIGHT_TOG, // Toggle backlight
-	LIGHT_HUI, // Increase backlight hue
-	LIGHT_HUD, // Decrease backlight hue
-	LIGHT_SAI, // Increase backlight sat
-	LIGHT_SAD, // Decrease backlight sat
-	LIGHT_VAI, // Increase backlight val
-	LIGHT_VAD, // Decrease backlight val
-	LIGHT_SPI, // Increase backlight speed
-	LIGHT_SPD, // Decrease backlight speed
-	LIGHT_MOD, // Change backlight animation mode
+	M_RU_ALT
 };
 
 enum tap_dance_codes {
@@ -129,11 +118,9 @@ void rgb_matrix_indicators_user(void) {
 			break;
 		case LAYER_SYMBOLS_IDX:
 			set_layer_color(LAYER_SYMBOLS_LEDS_IDX);
-			//rgblight_setrgb(255, 255, 0);
 			break;
 		case LAYER_ARROWS_IDX:
 			set_layer_color(LAYER_ARROWS_LEDS_IDX);
-			//rgblight_setrgb(255, 0, 0);
 			break;
 		case LAYER_FKEYS_IDX:
 			set_layer_color(LAYER_FKEYS_LEDS_IDX);
@@ -147,7 +134,6 @@ void rgb_matrix_indicators_user(void) {
 		default:
 			if (rgb_matrix_get_flags() == LED_FLAG_NONE) {
 				rgb_matrix_set_color_all(0, 0, 0);
-				//rgblight_setrgb(0, 0, 0);
 			}
 			break;
 	}
@@ -219,130 +205,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 				}
 			}
 			break;
-
-		// Custom RGBLIGHT macros
-
-		#ifdef RGBLIGHT_NO_EEPROM
-			case LIGHT_TOG:
-				if (record->event.pressed) {
-					rgblight_toggle_noeeprom();
-				}
-				break;
-
-			case LIGHT_MOD:
-				if (record->event.pressed) {
-					rgblight_step_noeeprom();
-				}
-				break;
-
-			case LIGHT_HUI:
-				if (record->event.pressed) {
-					rgblight_increase_hue_noeeprom();
-				}
-				break;
-
-			case LIGHT_HUD:
-				if (record->event.pressed) {
-					rgblight_decrease_hue_noeeprom();
-				}
-				break;
-
-			case LIGHT_SAI:
-				if (record->event.pressed) {
-					rgblight_increase_sat_noeeprom();
-				}
-				break;
-
-			case LIGHT_SAD:
-				if (record->event.pressed) {
-					rgblight_decrease_sat_noeeprom();
-				}
-				break;
-
-			case LIGHT_VAI:
-				if (record->event.pressed) {
-					rgblight_increase_val_noeeprom();
-				}
-				break;
-
-			case LIGHT_VAD:
-				if (record->event.pressed) {
-					rgblight_decrease_val_noeeprom();
-				}
-				break;
-
-			case LIGHT_SPI:
-				if (record->event.pressed) {
-					rgblight_increase_speed_noeeprom();
-				}
-				break;
-
-			case LIGHT_SPD:
-				if (record->event.pressed) {
-					rgblight_decrease_speed_noeeprom();
-				}
-				break;
-		#else
-			case LIGHT_TOG:
-				if (record->event.pressed) {
-					rgblight_toggle();
-				}
-				break;
-
-			case LIGHT_MOD:
-				if (record->event.pressed) {
-					rgblight_step();
-				}
-				break;
-
-			case LIGHT_HUI:
-				if (record->event.pressed) {
-					rgblight_increase_hue();
-				}
-				break;
-
-			case LIGHT_HUD:
-				if (record->event.pressed) {
-					rgblight_decrease_hue();
-				}
-				break;
-
-			case LIGHT_SAI:
-				if (record->event.pressed) {
-					rgblight_increase_sat();
-				}
-				break;
-
-			case LIGHT_SAD:
-				if (record->event.pressed) {
-					rgblight_decrease_sat();
-				}
-				break;
-
-			case LIGHT_VAI:
-				if (record->event.pressed) {
-					rgblight_increase_val();
-				}
-				break;
-
-			case LIGHT_VAD:
-				if (record->event.pressed) {
-					rgblight_decrease_val();
-				}
-				break;
-
-			case LIGHT_SPI:
-				if (record->event.pressed) {
-					rgblight_increase_speed();
-				}
-				break;
-
-			case LIGHT_SPD:
-				if (record->event.pressed) {
-					rgblight_decrease_speed();
-				}
-				break;
-		#endif
 	}
 	return true;
 }
diff --git a/readme.md b/readme.md
index aad4d01..c324705 100644
--- a/readme.md
+++ b/readme.md
@@ -19,7 +19,24 @@ If you get array-bounds errors on build, you may have a bad avr-gcc version. Rea
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
 
+--------------------------------------------------------------------------------
+# Notes
 
+Custom keycodes (betalupi_keyboard.c)
+
+```
+// Custom RGBLIGHT macros
+LIGHT_TOG, // Toggle backlight
+LIGHT_HUI, // Increase backlight hue
+LIGHT_HUD, // Decrease backlight hue
+LIGHT_SAI, // Increase backlight sat
+LIGHT_SAD, // Decrease backlight sat
+LIGHT_VAI, // Increase backlight val
+LIGHT_VAD, // Decrease backlight val
+LIGHT_SPI, // Increase backlight speed
+LIGHT_SPD, // Decrease backlight speed
+LIGHT_MOD, // Change backlight animation mode
+```
 
 --------------------------------------------------------------------------------
 # Notes from ZSA