7 files changed, 91 insertions, 30 deletions
diff --git a/layouts/community/60_ansi/stanrc85-ansi/config.h b/layouts/community/60_ansi/stanrc85-ansi/config.h
deleted file mode 100644
index 904a7f524e..0000000000
--- a/layouts/community/60_ansi/stanrc85-ansi/config.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#pragma once
-
-#define TAPPING_TERM 200
-#define RETRO_TAPPING
diff --git a/layouts/community/60_ansi/stanrc85-ansi/keymap.c b/layouts/community/60_ansi/stanrc85-ansi/keymap.c
index d8d79a581c..d3b4d4e55f 100644
--- a/layouts/community/60_ansi/stanrc85-ansi/keymap.c
+++ b/layouts/community/60_ansi/stanrc85-ansi/keymap.c
@@ -14,21 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #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   //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 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)
+#include "stanrc85.h"
 
 //Tap Dance Declarations
 enum {
@@ -66,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[3] = LAYOUT_60_ansi(
 		_______, RGB_TOG, RGB_MOD, RGB_VAD, RGB_VAI, RGB_SAI, RGB_HUD, RGB_HUI, _______, _______, _______, _______, _______, _______,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,
-		_______, _______, _______, TG(1),   _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		TG(1),   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 		_______, _______, _______,                   _______,                   _______, _______, _______, _______)
 };
diff --git a/layouts/community/60_ansi/stanrc85-ansi/rules.mk b/layouts/community/60_ansi/stanrc85-ansi/rules.mk
index 324e52674d..89d03e8c1f 100644
--- a/layouts/community/60_ansi/stanrc85-ansi/rules.mk
+++ b/layouts/community/60_ansi/stanrc85-ansi/rules.mk
@@ -1,10 +1 @@
-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
+USER_NAME := stanrc85
diff --git a/users/stanrc85/config.h b/users/stanrc85/config.h
new file mode 100644
index 0000000000..628ec994b0
--- /dev/null
+++ b/users/stanrc85/config.h
@@ -0,0 +1,8 @@
+#pragma once
+
+#define TAPPING_TERM 200
+#define RETRO_TAPPING
+
+#ifdef RGBLIGHT_ENABLE
+#define RGBLIGHT_SLEEP
+#endif // RGBLIGHT_ENABLE
diff --git a/users/stanrc85/readme.md b/users/stanrc85/readme.md
new file mode 100644
index 0000000000..9009a71d5f
--- /dev/null
+++ b/users/stanrc85/readme.md
@@ -0,0 +1,52 @@
+<!-- Copyright 2019 Stanrc85
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.-->
+
+# Stanrc85's Standard ANSI 60% Layout
+
+Shared keymap between two 60% PCB:
+- 1upkeyboards60HSE
+- DZ60 (hotswap)
+
+## Keymap Notes
+- Layer 0 is default QWERTY layout with additional custom features:
+    - SpaceFN to function layer 2 on `Space`
+    - `CTRL` when held and `ESC` when tapped on `CAPS LOCK`
+    - Tap Dance on `Fn1` for `CTRL+ALT+DEL` and `WIN+L`
+    - Tap Dance on `ESC` for `ESC` and  ` ` ` 
+
+![Base QWERTY Layer](https://imgur.com/lGcyLJx.png)
+
+- Layer 1 is default QWERTY with no custom features used mostly for gaming
+    - Enabled by `Fn2+CAPS` from base layer
+
+![Default ANSI Layer](https://imgur.com/M7T9PNT.png)
+
+- Layer 2 is Function layer:
+    - F keys
+    - Arrows
+    - Volume and Media controls
+    - AutoHotkey shortcuts based on [Speaker Control](https://github.com/stanrc85/Speaker-Control) script
+        - AHK Mic is used to mute/unmute microphone
+        - AHK Speaker switches audio output between headphones and speakers
+
+![Function Layer](https://imgur.com/YPl0JrU.png)
+
+- Layer 3 is RGB Underglow control and RESET
+    - `Fn2+CAPS` used to toggle Default QWERTY layer on and off
+
+![RGB and RESET Layer](https://imgur.com/PyB8z7k.png)
+
+### Build
+To build the firmware file associated with this keymap, simply run `make your_keyboard:stanrc85-ansi`.
diff --git a/users/stanrc85/rules.mk b/users/stanrc85/rules.mk
new file mode 100644
index 0000000000..324e52674d
--- /dev/null
+++ b/users/stanrc85/rules.mk
@@ -0,0 +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
diff --git a/users/stanrc85/stanrc85.h b/users/stanrc85/stanrc85.h
new file mode 100644
index 0000000000..7e581f993e
--- /dev/null
+++ b/users/stanrc85/stanrc85.h
@@ -0,0 +1,18 @@
+#pragma once
+
+#include "quantum.h"
+
+#define DEFAULT 0  //Custom ANSI
+#define LAYER1 1   //Default ANSI (enable with Fn2+CAPS)
+#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 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)