3 files changed, 24 insertions, 16 deletions
diff --git a/layouts/community/60_ansi/stanrc85-ansi/keymap.c b/layouts/community/60_ansi/stanrc85-ansi/keymap.c
index f6a5f4c983..ddda4fcd8a 100644
--- a/layouts/community/60_ansi/stanrc85-ansi/keymap.c
+++ b/layouts/community/60_ansi/stanrc85-ansi/keymap.c
@@ -15,20 +15,20 @@
  */
 #include QMK_KEYBOARD_H
 
-#define DEFAULT 0 	//Custom ANSI
-#define LAYER1 1 	  //Default ANSI (enable with Fn2+D)
-#define LAYER2 2 	  //Function keys, arrows, custom shortcuts, volume control
-#define LAYER3 3 	  //Backlight controls and RESET
+#define DEFAULT 0  //Custom ANSI
+#define LAYER1 1   //Default ANSI (enable with Fn2+D)
+#define LAYER2 2   //Function keys, arrows, custom shortcuts, volume control
+#define LAYER3 3   //RGB Underglow controls and RESET
 
 //Aliases for longer keycodes
 #define KC_CAD	LALT(LCTL(KC_DEL))
 #define KC_LOCK	LGUI(KC_L)
 #define CA_QUOT LCA(KC_QUOT)
 #define CA_SCLN LCA(KC_SCLN)
-#define CA_ESC  LT(2, KC_ESC)
-#define CA_SPCF LT(2, KC_SPC)
-#define CA_TESC TD(TD_ESC)
-#define CA_TWIN TD(TD_WIN)
+#define KC_CTLE LCTL_T(KC_ESC)
+#define LT_SPCF LT(2, KC_SPC)
+#define TD_TESC TD(TD_ESC)
+#define TD_TWIN TD(TD_WIN)
 
 //Tap Dance Declarations
 enum {
@@ -43,11 +43,11 @@ qk_tap_dance_action_t tap_dance_actions[] = {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT_60_ansi(
-		CA_TESC, KC_1,    KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+		TD_TESC, KC_1,    KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
 		KC_TAB,  KC_Q,    KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
-		CA_ESC,  KC_A,    KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
+		KC_CTLE, KC_A,    KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
 		KC_LSFT, KC_Z,    KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-		KC_LCTL, KC_LGUI, KC_LALT,          CA_SPCF,          KC_RALT, CA_TWIN, MO(3),   KC_RCTL),
+		KC_LCTL, KC_LGUI, KC_LALT,          LT_SPCF,          KC_RALT, TD_TWIN, MO(3),   KC_RCTL),
 
 	[1] = LAYOUT_60_ansi(
 		KC_GRV,  KC_1,    KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8,    KC_9,   KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
@@ -64,10 +64,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 		_______, _______, _______,                   _______,                   _______, _______, _______, _______),
 
 	[3] = LAYOUT_60_ansi(
-		RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		_______, RGB_TOG, RGB_MOD, RGB_VAD, RGB_VAI, RGB_SAI, RGB_HUD, RGB_HUI, _______, _______, _______, _______, _______, _______,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,
-		KC_CAPS, _______, _______, TG(1),   _______, _______, BL_STEP, BL_DEC,  BL_INC,  BL_TOGG, _______, _______, _______,
-		_______, _______, _______, RGB_VAD, RGB_VAI, RGB_SAI, RGB_HUD, RGB_HUI, RGB_MOD, RGB_TOG, _______, _______,
+		_______, _______, _______, TG(1),   _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 		_______, _______, _______,                   _______,                   _______, _______, _______, _______)
 };
 
diff --git a/layouts/community/60_ansi/stanrc85-ansi/readme.md b/layouts/community/60_ansi/stanrc85-ansi/readme.md
index 620d0775a0..2df5588af7 100644
--- a/layouts/community/60_ansi/stanrc85-ansi/readme.md
+++ b/layouts/community/60_ansi/stanrc85-ansi/readme.md
@@ -5,10 +5,10 @@ Shared keymap between two 60% PCB:
 - DZ60 (hotswap)
 
 ## Keymap Notes
-- Layer 0 is custom ANSI layout with SpaceFN, EscFN on CAPS, Tap Dance on Fn1 key for CTRL+ALT+DEL and WIN+L
+- Layer 0 is custom ANSI layout with SpaceFN, CTRL/ESC on CAPS, Tap Dance on Fn1 key for CTRL+ALT+DEL and WIN+L
 - Layer 1 is default ANSI (enable with Fn2+D)
 - Layer 2 is F keys, arrows, volume controls and custom shortcuts for AHK
-- Layer 3 is backlight control and RESET
+- Layer 3 is RGB Underglow control and RESET
 
 ### Build
 To build the firmware file associated with this keymap, simply run `make your_keyboard:stanrc85-ansi`.
diff --git a/layouts/community/60_ansi/stanrc85-ansi/rules.mk b/layouts/community/60_ansi/stanrc85-ansi/rules.mk
index d58c21f2b9..324e52674d 100644
--- a/layouts/community/60_ansi/stanrc85-ansi/rules.mk
+++ b/layouts/community/60_ansi/stanrc85-ansi/rules.mk
@@ -1,2 +1,10 @@
 TAP_DANCE_ENABLE = yes
+EXTRAKEY_ENABLE = yes
+RGBLIGHT_ENABLE = yes
+BACKLIGHT_ENABLE = no
 COMMAND_ENABLE = no
+BOOTMAGIC_ENABLE = no
+MOUSEKEY_ENABLE = no
+AUDIO_ENABLE = no
+CONSOLE_ENABLE = no
+NKRO_ENABLE = no