Update drashna's keymap (#1649)

* initial commit for my custom layout

* fix switching into and out of numfun layer

* enable tap dance to lock layers

* enable layer indicator LEDs

* remove Colemak2 layer because it was dumb

* remove handler for nonexistent keycode

* add new movement keys to lower layer

* standardize indentation because I'm not a monster

* add Woodpad keyboard with Michael's Tryggve layout

* Add dvorak/colemak layers

* add hash

* Update keymap.c

* Fixed OSL Symbol layer layout issue

* Minor later tweak

* Clean up actions

* Diablo 3 macro keys remove

* Fixed numbad issues

* Remove Underglow toggle

* Fix layer consistency

* cleanup of code

* line feed

* small fixes

* Major merge

* Merge cleanup on my keymap

* Cleanup

* Update compile command

* Swapped arrows

* Additional cleanup

* Revert "Woodpad"

* update

* minor update

* staging for pull request

* Finish removing layer underglow toggles

3 files changed, 103 insertions, 205 deletions

diff --git a/keyboards/ergodox_ez/keymaps/drashna-custom/Makefile b/keyboards/ergodox_ez/keymaps/drashna-custom/Makefile
index 21da248f0..96590e7f7 100644
--- a/keyboards/ergodox_ez/keymaps/drashna-custom/Makefile
+++ b/keyboards/ergodox_ez/keymaps/drashna-custom/Makefile
@@ -1,5 +1,4 @@
 TAP_DANCE_ENABLE = yes
-LAYER_UNDERGLOW_LIGHTING = yes
 SLEEP_LED_ENABLE = yes  # Breathing sleep LED during USB suspend
 COMMAND_ENABLE   = no  # Commands for debug and configuration
 RGBLIGHT_ENABLE = yes
diff --git a/keyboards/ergodox_ez/keymaps/drashna-custom/config.h b/keyboards/ergodox_ez/keymaps/drashna-custom/config.h
index fe33552e1..0b6a09934 100644
--- a/keyboards/ergodox_ez/keymaps/drashna-custom/config.h
+++ b/keyboards/ergodox_ez/keymaps/drashna-custom/config.h
@@ -4,5 +4,3 @@
 
 #define TAPPING_TERM 200
 
-
-#define LAYER_UNDERGLOW_LIGHTING
diff --git a/keyboards/ergodox_ez/keymaps/drashna-custom/keymap.c b/keyboards/ergodox_ez/keymaps/drashna-custom/keymap.c
index ed7aede1f..a56a88e58 100644
--- a/keyboards/ergodox_ez/keymaps/drashna-custom/keymap.c
+++ b/keyboards/ergodox_ez/keymaps/drashna-custom/keymap.c
@@ -1,3 +1,19 @@
+/*
+This is the keymap for the keyboard
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+Copyright 2015 Jack Humbert
+Copyright 2017 Art Ortenburger
+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/>.
+*/
 #include QMK_KEYBOARD_H
 #include "debug.h"
 #include "action_layer.h"
@@ -28,17 +44,18 @@
 #define M_SALT M(2)
 #define M_HARD M(3)
 #define M_MAKE M(4)
-#define M_COVECUBE M(5)
+#define M_GOODGAME M(5)
 #define M_MORESALT M(6)
 #define M_DOOMFIST M(7)
 
 
 //define layer change stuff for underglow indicator
 bool skip_leds = false;
+
+//This is both for underglow, and Diablo 3 macros
 bool has_layer_changed = false;
 static uint8_t current_layer;
 
-static uint16_t key_timer;
 //define diablo macro timer variables
 static uint16_t diablo_timer[4];
 static uint8_t diablo_times[] = {0, 1, 3, 5, 10, 30};
@@ -49,10 +66,6 @@ bool check_dtimer(uint8_t dtimer) {
     return (timer_elapsed(diablo_timer[dtimer]) < ( diablo_key_time[dtimer] * 1000 ) ) ? false : true;
 };
 
-bool checktime(void){
-    return (timer_elapsed(key_timer) < 150) ? true : false;
-};
-
 
 enum custom_keycodes {
 	PLACEHOLDER = SAFE_RANGE, // can always be here
@@ -69,11 +82,7 @@ enum custom_keycodes {
 
 #ifdef TAP_DANCE_ENABLE
 enum {
-	SFT_CAP = 0,
-	TD_DIABLO_J,
-	TD_CLN,
-	TD_EGG,
-	TD_FLSH,
+	TD_FLSH = 0,
 	TD_DIABLO_1,
 	TD_DIABLO_2,
 	TD_DIABLO_3,
@@ -82,33 +91,10 @@ enum {
 
 
 
-void dance_cln_finished (qk_tap_dance_state_t *state, void *user_data) {
-	if (state->count == 1) {
-		register_code (KC_RSFT);
-		register_code (KC_SCLN);
-	} else {
-		register_code (KC_SCLN);
-	}
-}
-
-void dance_cln_reset (qk_tap_dance_state_t *state, void *user_data) {
-	if (state->count == 1) {
-		unregister_code (KC_RSFT);
-		unregister_code (KC_SCLN);
-	} else {
-		unregister_code (KC_SCLN);
-	}
-}
-
-void dance_egg (qk_tap_dance_state_t *state, void *user_data) {
-	if (state->count >= 10) {
-		SEND_STRING ("Safety dance!");
-		reset_tap_dance (state);
-	}
-}
 
 // on each tap, light up one led, from right to left
-// on the forth tap, turn them off from right to left
+// on the forth tap, turn them off from right to leftmake ergodox-ez-drashna-custom-teensy
+
 void dance_flsh_each(qk_tap_dance_state_t *state, void *user_data) {
 	if (!skip_leds) {
 		ergodox_board_led_off();
@@ -119,37 +105,38 @@ void dance_flsh_each(qk_tap_dance_state_t *state, void *user_data) {
 	}
 	switch (state->count) {
 		case 1:
-			ergodox_right_led_3_on();
+			ergodox_right_led_1_on();
             break;
         case 2:
 			ergodox_right_led_2_on();
 			break;
 		case 3:
-			ergodox_right_led_1_on();
+			ergodox_right_led_3_on();
 			break;
 		case 4:
-			ergodox_right_led_3_off();
+			ergodox_right_led_1_off();
 			_delay_ms(50);
 			ergodox_right_led_2_off();
 			_delay_ms(50);
-			ergodox_right_led_1_off();
+			ergodox_right_led_3_off();
 
 	}
 }
 
 // on the fourth tap, set the keyboard on flash state
+// and set the underglow to red, because red == bad
 void dance_flsh_finished(qk_tap_dance_state_t *state, void *user_data) {
 	if (state->count >= 4) {
-#ifdef LAYER_UNDERGLOW_LIGHTING
         rgblight_enable();
         rgblight_mode(1);
         rgblight_setrgb(0xff,0x00,0x00);
-#endif
 		reset_keyboard();
 		reset_tap_dance(state);
 	}
 }
 
+// Cycle through the times for the macro, starting at 0, for disabled.
+// Max of six values, so don't exceed
 void diablo_tapdance_master (qk_tap_dance_state_t *state, void *user_data, uint8_t diablo_key) {
     if (state->count >= 7) {
         diablo_key_time[diablo_key] = diablo_times[0];
@@ -159,6 +146,8 @@ void diablo_tapdance_master (qk_tap_dance_state_t *state, void *user_data, uint8
     }
 }
 
+
+// Would rather have one function for all of this, but no idea how to do that...
 void diablo_tapdance1 (qk_tap_dance_state_t *state, void *user_data) {
     diablo_tapdance_master (state, user_data, 0);
 }
@@ -179,28 +168,20 @@ void diablo_tapdance4 (qk_tap_dance_state_t *state, void *user_data) {
 // if the flash state didnt happen, then turn off leds, left to right
 void dance_flsh_reset(qk_tap_dance_state_t *state, void *user_data) {
 	_delay_ms(200);
-	ergodox_right_led_1_off();
+	ergodox_right_led_3_off();
 	_delay_ms(200);
 	ergodox_right_led_2_off();
 	_delay_ms(200);
-	ergodox_right_led_3_off();
+	ergodox_right_led_1_off();
 	_delay_ms(500);
 	skip_leds = false;
 }
 
 //Tap Dance Definitions
 qk_tap_dance_action_t tap_dance_actions[] = {
-	//Tap one for Space, and twice for Enter
-	[SFT_CAP]     = ACTION_TAP_DANCE_DOUBLE(KC_LSHIFT, KC_CAPS),
-	// Special Z
-	[TD_DIABLO_J]  = ACTION_TAP_DANCE_DOUBLE(KC_J, S(KC_J)),
-	// Once for colin, twice for semi-colin
-	[TD_CLN] = ACTION_TAP_DANCE_FN_ADVANCED (NULL, dance_cln_finished, dance_cln_reset),
-	// Tap until you get a surprise
-	[TD_EGG] = ACTION_TAP_DANCE_FN (dance_egg),
 	//Once for Blue, Twice for Green, Thrice for Red, and four to flash
 	[TD_FLSH] = ACTION_TAP_DANCE_FN_ADVANCED (dance_flsh_each, dance_flsh_finished, dance_flsh_reset),
-    
+    // tap once to disable, and more to enable timed micros
     [TD_DIABLO_1] = ACTION_TAP_DANCE_FN(diablo_tapdance1),
     [TD_DIABLO_2] = ACTION_TAP_DANCE_FN(diablo_tapdance2),
     [TD_DIABLO_3] = ACTION_TAP_DANCE_FN(diablo_tapdance3),
@@ -220,9 +201,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
  * |  Bksp  |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |   ;  |  ' "   |
  * |--------+------+------+------+------+------| TG(2)|           | TG(2)|------+------+------+------+------+--------|
- * | Shift  |   Z  |   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |  , < |  . > |  UP  | Shift  |
+ * | Shift  |   Z  |   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |  , < |  . > |  ? / | Shift  |
  * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   | `/SYM|  ' " | LGUI |  [ { | ] }  |                                       | SYMB |  ? / | LEFT | DOWN |RIGHT |
+ *   | `/SYM|  ' " | LGUI |  [ { | ] }  |                                       | LEFT | DOWN |  UP  |RIGHT | SYMB |
  *   `----------------------------------'                                       `----------------------------------'
  *                                        ,--------------.       ,--------------.
  *                                        |Alt/Ap|  Win  |       | Alt  |Ctl/Esc|
@@ -247,7 +228,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 				TG(DVORAK),     KC_Y,       KC_U,       KC_I,       KC_O,       KC_P,           KC_BSLASH,
                                 KC_H,       KC_J,       KC_K,       KC_L,       KC_SCOLON,      GUI_T(KC_QUOTE),
 				TG(COLEMAK),    KC_N,       KC_M,       KC_COMMA,   KC_DOT,     CTL_T(KC_SLASH),KC_RSHIFT,
-                                            KC_FN1,     KC_LEFT,    KC_UP,      KC_DOWN,       KC_RIGHT,
+                                            KC_LEFT,    KC_DOWN,    KC_UP,      KC_RIGHT,       KC_FN1,
 				KC_LALT,    CTL_T(KC_ESCAPE),
 				KC_PGUP,
 				KC_PGDOWN,  KC_DELETE,  KC_ENTER
@@ -281,16 +262,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_DELT,        KC_Q,         KC_W,   KC_F,   KC_P,   KC_G,   TG(DIABLO),
         KC_BSPC,        KC_A,         KC_R,   KC_S,   KC_T,   KC_D,
         KC_LSFT,        CTL_T(KC_Z),  KC_X,   KC_C,   KC_V,   KC_B,   TG(OVERWATCH),
-        LT(SYMB,KC_GRV),KC_QUOT,      LALT(KC_LSFT),  KC_LBRACKET,KC_RBRACKET,
+        LT(SYMB,KC_GRV),KC_QUOT,      KC_LGUI,    KC_LBRACKET,KC_RBRACKET,
                                               ALT_T(KC_APP),  KC_LGUI,
                                                               KC_HOME,
                                                KC_SPC,KC_BSPC,KC_END,
         // right hand
-             KC_TRANSPARENT,     KC_6,   KC_7,   KC_8,   KC_9,   KC_0,             KC_MINS,
-             KC_NO,    KC_J,   KC_L,   KC_U,   KC_Y,   KC_SCLN,          KC_BSLS,
+             KC_TRNS,     KC_6,   KC_7,   KC_8,   KC_9,   KC_0,             KC_MINS,
+             KC_NO,       KC_J,   KC_L,   KC_U,   KC_Y,   KC_SCLN,          KC_BSLS,
                           KC_H,   KC_N,   KC_E,   KC_I,   LT(MOUS, KC_O),   KC_QUOTE,
-             KC_TRANSPARENT,KC_K,   KC_M,   KC_COMM,KC_DOT, CTL_T(KC_SLASH),KC_RSHIFT,
-                                            KC_FN1,     KC_LEFT,    KC_UP,      KC_DOWN,       KC_RIGHT,
+             KC_TRNS,KC_K,KC_M,   KC_COMM,KC_DOT, CTL_T(KC_SLASH),KC_RSHIFT,
+						  KC_LEFT,    KC_DOWN,    KC_UP,      KC_RIGHT,       KC_FN1,
              KC_LALT,        CTL_T(KC_ESC),
              KC_PGUP,
              KC_PGDN,KC_TAB, KC_ENT
@@ -324,16 +305,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_DELT,        KC_QUOT,        KC_COMM, KC_DOT, KC_P,   KC_Y,   TG(DIABLO),
         KC_BSPC,        KC_A,           KC_O,    KC_E,   KC_U,   KC_I,
         KC_LSFT,        CTL_T(KC_SCLN), KC_Q,    KC_J,   KC_K,   KC_X,   TG(OVERWATCH),
-        LT(SYMB,KC_GRV),KC_QUOT,      LALT(KC_LSFT),  KC_LBRACKET,KC_RBRACKET,
+        LT(SYMB,KC_GRV),KC_QUOT, KC_LGUI, KC_LBRACKET, KC_RBRACKET,
                                               ALT_T(KC_APP),  KC_LGUI,
                                                               KC_HOME,
                                                KC_SPC,KC_BSPC,KC_END,
         // right hand
-             KC_TRANSPARENT,     KC_6,   KC_7,   KC_8,   KC_9,   KC_0,             KC_BSLS,
-             KC_TRANSPARENT,       KC_F,   KC_G,   KC_C,   KC_R,   KC_L,             KC_SLSH,
+             KC_TRNS,     KC_6,   KC_7,   KC_8,   KC_9,   KC_0,             KC_BSLS,
+             KC_TRNS,       KC_F,   KC_G,   KC_C,   KC_R,   KC_L,             KC_SLSH,
                           KC_D,   KC_H,   KC_T,   KC_N,   LT(MOUS, KC_S),   KC_MINS,
              KC_NO,KC_B,   KC_M,   KC_W,   KC_V,   CTL_T(KC_Z),      KC_RSHIFT,
-                                            KC_FN1,     KC_LEFT,    KC_UP,      KC_DOWN,       KC_RIGHT,
+	                       KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, KC_FN1,
              KC_LALT,        CTL_T(KC_ESC),
              KC_PGUP,
              KC_PGDN,KC_TAB, KC_ENT
@@ -347,43 +328,43 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 * | VERSION|   !  |   @  |  {   |   }  |  |   |      |           |      |  +   |   7  |   8  |   9  |  *   |   F12  |
 * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
 * |  MAKE  |   #  |   $  |  (   |   )  |  `   |------|           |------|  -   |   4  |   5  |   6  |  /   | PrtSc  |
-* |--------+------+------+------+------+------| COVE |           |      |------+------+------+------+------+--------|
-* |  RESET |   %  |   ^  |  [   |   ]  |  ~   | CUBE |           |      | NUM  |   1  |   2  |   3  |  =   |  PAUSE |
+* |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
+* |  RESET |   %  |   ^  |  [   |   ]  |  ~   |      |           |      | NUM  |   1  |   2  |   3  |  =   |  PAUSE |
 * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
-*   |  LT0 |   &  |   *  |  :   |   ;  |                                       |   0  |   0  | NUM. | ENT  |  ENT |
+*   |  LT0 |   &  |   *  |  :   |   ;  |                                       |      |   0  | NUM. | ENT  |  ENT |
 *   `----------------------------------'                                       `----------------------------------'
 *                                        ,-------------.       ,-------------.
 *                                        | RGBM | RED  |       | OFF  | SOLID|
 *                                 ,------|------|------|       |------+------+------.
 *                                 |      |      | GREEN|       |      |      |      |
-*                                 | RGB  | RGB  |------|       |------| NUM. | NUM0 |
+*                                 | RGB  | RGB  |------|       |------| NUM0 | NUME |
 *                                 | DARK |BRITE | BLUE |       |      |      |      |
 *                                 `--------------------'       `--------------------'
 */
   [SYMB] = KEYMAP(
-				KC_ESCAPE,KC_F1,      KC_F2,      KC_F3,      KC_F4,      KC_F5,      KC_TRANSPARENT,
-				M_VERSION,      KC_EXLM,    KC_AT,      KC_LCBR,    KC_RCBR,    KC_PIPE,    KC_TRANSPARENT,
+				KC_ESCAPE,KC_F1,      KC_F2,      KC_F3,      KC_F4,      KC_F5,      KC_TRNS,
+				M_VERSION,      KC_EXLM,    KC_AT,      KC_LCBR,    KC_RCBR,    KC_PIPE,    KC_TRNS,
 				M_MAKE,         KC_HASH,    KC_DLR,     KC_LPRN,    KC_RPRN,    KC_GRAVE,
-				TD(TD_FLSH),    KC_PERC,    KC_CIRC,    KC_LBRACKET,KC_RBRACKET,KC_TILD,    M_COVECUBE,
+				TD(TD_FLSH),    KC_PERC,    KC_CIRC,    KC_LBRACKET,KC_RBRACKET,KC_TILD,    KC_TRNS,
 				KC_NO,          KC_AMPR,    KC_ASTR,    KC_COLN,    KC_SCOLON,
-                                        RGB_MOD,    RGB_0000FF,
-                                                    RGB_008000,
-							RGB_VAD,    RGB_VAI,    RGB_FF0000,
+	                                                              KC_TRNS, KC_TRNS,
+	                                                              KC_TRNS,
+	                                                              KC_TRNS, KC_TRNS, KC_TRNS,
 				
-				KC_TRANSPARENT, KC_F6,      KC_F7,      KC_F8,      KC_F9,      KC_F10,         KC_F11,
-				KC_TRANSPARENT, KC_KP_PLUS, KC_KP_7,    KC_KP_8,    KC_KP_9,    KC_KP_ASTERISK, KC_F12,
+				KC_TRNS, KC_F6,      KC_F7,      KC_F8,      KC_F9,      KC_F10,         KC_F11,
+				KC_TRNS, KC_KP_PLUS, KC_KP_7,    KC_KP_8,    KC_KP_9,    KC_KP_ASTERISK, KC_F12,
 				KC_KP_MINUS,    KC_KP_4,    KC_KP_5,    KC_KP_6,    KC_KP_SLASH,KC_PSCREEN,
-				KC_TRANSPARENT, KC_NUMLOCK, KC_KP_1,    KC_KP_2,    KC_KP_3,    KC_EQUAL,       KC_PAUSE,
-                                            KC_KP_0,    KC_KP_0,    KC_KP_DOT,  KC_KP_ENTER,    KC_KP_ENTER,
+				KC_TRNS, KC_NUMLOCK, KC_KP_1,    KC_KP_2,    KC_KP_3,    KC_EQUAL,       KC_PAUSE,
+	                                 KC_KP_0,    KC_KP_0,    KC_KP_DOT,  KC_KP_ENTER,    KC_TRNS,
 				RGB_TOG,    RGB_SLD,
-				RGB_HUI,
-				RGB_HUD,    KC_KP_DOT,  KC_KP_0
+				KC_NO,
+				KC_KP_DOT, KC_KP_0, KC_KP_ENTER
 			),
 
 /* Keymap 4: Customized Overwatch Layout
  *
  * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |   ESC  | SALT | SYMM | MORE | DOOM |      |      |           |      |  F9  | F10  | F11  |  F12 |      |        |
+ * |   ESC  | SALT | MORE |  GG  | SYMM | DOOM | HARD |           |      |  F9  | F10  | F11  |  F12 |      |        |
  * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
  * |   F1   |  K   |  Q   |  W   |  E   |  R   |  T   |           |      |      |      |      |      |      |        |
  * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
@@ -402,10 +383,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
   [OVERWATCH] = KEYMAP(
-				KC_ESCAPE,      M_SALT,     M_SYMM,     M_MORESALT, M_DOOMFIST, KC_NO,      KC_NO,
+				KC_ESCAPE,      M_SALT,		M_MORESALT, M_GOODGAME, M_SYMM,     M_DOOMFIST, M_HARD,
 				KC_F1,          KC_K,       KC_Q,       KC_W,       KC_E,       KC_R,       KC_T,
 				KC_TAB,         KC_G,       KC_A,       KC_S,       KC_D,       KC_F,
-				KC_LCTL,        KC_LSHIFT,    KC_Z,       KC_X,       KC_C,       KC_M,       KC_TRANSPARENT,
+				KC_LCTL,        KC_LSHIFT,    KC_Z,       KC_X,       KC_C,       KC_M,       KC_TRNS,
 				KC_G,           KC_U,       KC_I,       KC_Y,       KC_T,
                                             KC_O,   KC_P,
                                                     KC_LGUI,
@@ -444,10 +425,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
   [DIABLO] = KEYMAP(
 				KC_ESCAPE,  KC_V,       KC_D,       KC_LALT,    KC_NO,      KC_NO,      KC_NO,
-				KC_TAB,     KC_S,       KC_I,       KC_F,       KC_M,       KC_T,       KC_TRANSPARENT,
+				KC_TAB,     KC_S,       KC_F,       KC_I,       KC_M,       KC_T,       KC_TRNS,
 				KC_Q,       KC_1,       KC_2,       KC_3,       KC_4,       KC_G,
-				KC_NUMLOCK, KC_KP_1,    KC_KP_2,    KC_KP_3,    KC_KP_4,    KC_Z,       KC_NO,
-				KC_LCTL,    TD(TD_DIABLO_1),    TD(TD_DIABLO_2),    TD(TD_DIABLO_3),    TD(TD_DIABLO_4),
+				KC_LCTL, TD(TD_DIABLO_1), TD(TD_DIABLO_2), TD(TD_DIABLO_3), TD(TD_DIABLO_4), KC_Z,       KC_NO,
+				KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
                                                 KC_L,   KC_J,
                                                         KC_F,
                     SFT_T(KC_SPACE),    ALT_T(KC_Q),    KC_DIABLO_CLEAR,
@@ -485,19 +466,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 `--------------------'       `--------------------'
  */
   [MOUS] = KEYMAP(
-				KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_TRANSPARENT,
-				KC_NO,      KC_NO,      KC_MS_UP,   KC_NO,      KC_NO,      KC_NO,      KC_TRANSPARENT,
+				KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_TRNS,
+				KC_NO,      KC_NO,      KC_MS_UP,   KC_NO,      KC_NO,      KC_NO,      KC_TRNS,
 				KC_NO,      KC_MS_LEFT, KC_MS_DOWN, KC_MS_RIGHT,KC_NO,      KC_NO,
-				KC_NO,      KC_MS_ACCEL0,KC_MS_ACCEL1,KC_MS_ACCEL2,KC_NO,   KC_NO,      KC_TRANSPARENT,
+				KC_NO,      KC_MS_ACCEL0,KC_MS_ACCEL1,KC_MS_ACCEL2,KC_NO,   KC_NO,      KC_TRNS,
                 KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,
 									KC_NO,KC_NO,
 									KC_MS_WH_UP,
 									KC_MS_BTN1,KC_MS_BTN2,KC_MS_WH_DOWN,
 				
-				KC_TRANSPARENT,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,
-				KC_TRANSPARENT,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,
+				KC_TRNS,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,
+				KC_TRNS,KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,
 				KC_NO,KC_NO,KC_MS_ACCEL0,KC_MS_ACCEL1,KC_MS_ACCEL2,KC_NO,KC_NO,
-				KC_TRANSPARENT,KC_MEDIA_PLAY_PAUSE,KC_MEDIA_STOP,KC_AUDIO_MUTE,KC_AUDIO_VOL_DOWN,KC_AUDIO_VOL_UP,KC_NO,
+				KC_TRNS,KC_MEDIA_PLAY_PAUSE,KC_MEDIA_STOP,KC_AUDIO_MUTE,KC_AUDIO_VOL_DOWN,KC_AUDIO_VOL_UP,KC_NO,
 				KC_NO,KC_NO,KC_NO,KC_NO,KC_NO,
 				KC_NO,KC_NO,
 				KC_NO,
@@ -509,10 +490,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 const uint16_t PROGMEM fn_actions[] = {
     [1] = ACTION_LAYER_TAP_TOGGLE(SYMB),
     // FN1 - Momentary Layer 1 (Symbols)
-    [2] = ACTION_MODS_TAP_KEY(MOD_RCTL, KC_UP),
-    [3] = ACTION_MODS_TAP_KEY(MOD_RGUI, KC_LEFT),
-    [4] = ACTION_MODS_TAP_KEY(MOD_RALT, KC_DOWN),
-    [5] = ACTION_MODS_TAP_KEY(MOD_RSFT, KC_RIGHT),  
 };
 
 void action_function(keyrecord_t *event, uint8_t id, uint8_t opt)
@@ -547,13 +524,12 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
         case 4:
             if (record->event.pressed) {
                 // make ergodox-ez-drashna-custom-teensy
-                return MACRO( I(5), T(M), T(A), T(K), T(E), T(SPACE), T(E), T(R), T(G), T(O), T(D), T(O), T(X), T(MINUS), T(E), T(Z), T(MINUS), T(D), T(R), T(A), T(S), T(H), T(N), T(A), T(MINUS), T(C), T(U), T(S), T(T), T(O), T(M), T(MINUS), T(T), T(E), T(E), T(N), T(S), T(Y), T(ENTER), END );
+                return MACRO(I(5), T(M), T(A), T(K), T(E), T(SPACE), T(E), T(R), T(G), T(O), T(D), T(O), T(X), D(LSFT), T(MINUS), U(LSFT), T(E), T(Z), T(MINUS), T(D), T(R), T(A), T(S), T(H), T(N), T(A), T(MINUS), T(C), T(U), T(S), T(T), T(O), T(M), T(MINUS), T(T), T(E), T(E), T(N), T(S), T(Y), T(ENTER), END);
             }
         case 5:
             if (record->event.pressed) {
-                //super secret hash
-                SEND_STRING("supersecrethash");
-                return MACRO_NONE;
+                //gg
+                return MACRO(I(50), T(ENTER), I(5), T(G), T(G), T(ENTER), END);
             }
         case 6:
             if (record->event.pressed) {
@@ -562,40 +538,15 @@ const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
             }
             break;
         case 7:
-        if (record->event.pressed) {
-                // DoomFisted
-                // Hey, look at me.  I'm Doomfist, and I'm overpowered!  
-                // All I do is spam punches all day!   I'm DPS, tank and 
-                // defense, rolled into one! All I need is team healing to be complete!
-                return MACRO( I(50), T(ENTER), I(5), D(LSFT), T(H), U(LSFT), T(E), T(Y), T(COMMA), T(SPACE), T(L), T(O), T(O), T(K), T(SPACE), T(A), T(T), T(SPACE), T(M), T(E), T(DOT), T(SPACE), T(SPACE), D(LSFT), T(I), U(LSFT), T(QUOTE), T(M), T(SPACE), D(LSFT), T(D), U(LSFT), T(O), T(O), T(M), T(F), T(I), T(S), T(T), T(COMMA), T(SPACE), T(A), T(N), T(D), T(SPACE), D(LSFT), T(I), U(LSFT), T(QUOTE), T(M), T(SPACE), T(O), T(V), T(E), T(R), T(P), T(O), T(W), T(E), T(R), T(E), T(D), D(LSFT), T(1), U(LSFT), T(SPACE), T(SPACE), D(LSFT), T(A), U(LSFT), T(L), T(L), T(SPACE), D(LSFT), T(I), U(LSFT), T(SPACE), T(D), T(O), T(SPACE), T(I), T(S), T(SPACE), T(S), T(P), T(A), T(M), T(SPACE), T(P), T(U), T(N), T(C), T(H), T(E), T(S), T(SPACE), T(A), T(L), T(L), T(SPACE), T(D), T(A), T(Y), D(LSFT), T(1), U(LSFT), T(SPACE), T(SPACE), T(SPACE), D(LSFT), T(I), U(LSFT), T(QUOTE), T(M), T(SPACE), D(LSFT), T(D), U(LSFT), D(LSFT), T(P), U(LSFT), D(LSFT), T(S), U(LSFT), T(COMMA), T(SPACE), T(T), T(A), T(N), T(K), T(SPACE), T(A), T(N), T(D), T(SPACE), T(D), T(E), T(F), T(E), T(N), T(S), T(E), T(COMMA), T(SPACE), T(R), T(O), T(L), T(L), T(E), T(D), T(SPACE), T(I), T(N), T(T), T(O), T(SPACE), T(O), T(N), T(E), D(LSFT), T(1), U(LSFT), T(SPACE), D(LSFT), T(A), U(LSFT), T(L), T(L), T(SPACE), D(LSFT), T(I), U(LSFT), T(SPACE), T(N), T(E), T(E), T(D), T(SPACE), T(I), T(S), T(SPACE), T(T), T(E), T(A), T(M), T(SPACE), T(H), T(E), T(A), T(L), T(I), T(N), T(G), T(SPACE), T(T), T(O), T(SPACE), T(B), T(E), T(SPACE), T(C), T(O), T(M), T(P), T(L), T(E), T(T), T(E), D(LSFT), T(1), U(LSFT), T(ENTER), END );
-            }
-        case 8: //MAC1 - Hold for rshift and } on tap
-            if (record->event.pressed) {
-                key_timer = timer_read();
-                return MACRO(D(LSFT), END );
-            } else {
-                return checktime() ? MACRO(U(LSFT),D(RALT),T(7),U(RALT),END): MACRO(U(LSFT),END);
-            }; break;
-        case 9:	//MAC1 - Hold for rshift and } on tap
-            if (record->event.pressed) {
-                key_timer = timer_read();
-                return MACRO(D(RSFT), END );
-            } else {
-                return checktime()  ? MACRO(U(RSFT),D(RALT),T(0),U(RALT),END): MACRO(U(RSFT),END);
-            }; break;
-        case 10: //MAC2 - Hold for lctrl and [ on tap
-            if (record->event.pressed) {
-                key_timer = timer_read();
-                return MACRO(D(LCTL), END );
-            } else {return checktime() ? MACRO(U(LCTL),D(RALT),T(8),U(RALT),END):MACRO(U(LCTL),END);
-            }; break;
-        case 11: //MAC3 - Hold for rctrl and ] on tap
-            if (record->event.pressed) {
-                key_timer = timer_read();
-                return MACRO(D(RCTL), END );
-            } else {
-                return checktime() ? MACRO(U(RCTL),D(RALT),T(9),U(RALT),END):MACRO(U(RCTL),END);
-            }; break;
+			if (record->event.pressed) {
+				// DoomFisted
+				// Hey, look at me.  I'm Doomfist, and I'm overpowered!  
+				// All I do is spam punches all day!   I'm DPS, tank and 
+				// defense, rolled into one! All I need is team healing to be complete!
+				return MACRO( I(50), T(ENTER), I(5), D(LSFT), T(H), U(LSFT), T(E), T(Y), T(COMMA), T(SPACE), T(L), T(O), T(O), T(K), T(SPACE), T(A), T(T), T(SPACE), T(M), T(E), T(DOT), T(SPACE), T(SPACE), D(LSFT), T(I), U(LSFT), T(QUOTE), T(M), T(SPACE), D(LSFT), T(D), U(LSFT), T(O), T(O), T(M), T(F), T(I), T(S), T(T), T(COMMA), T(SPACE), T(A), T(N), T(D), T(SPACE), D(LSFT), T(I), U(LSFT), T(QUOTE), T(M), T(SPACE), T(O), T(V), T(E), T(R), T(P), T(O), T(W), T(E), T(R), T(E), T(D), D(LSFT), T(1), U(LSFT), T(SPACE), T(SPACE), D(LSFT), T(A), U(LSFT), T(L), T(L), T(SPACE), D(LSFT), T(I), U(LSFT), T(SPACE), T(D), T(O), T(SPACE), T(I), T(S), T(SPACE), T(S), T(P), T(A), T(M), T(SPACE), T(P), T(U), T(N), T(C), T(H), T(E), T(S), T(SPACE), T(A), T(L), T(L), T(SPACE), T(D), T(A), T(Y), D(LSFT), T(1), U(LSFT), T(SPACE), T(SPACE), T(SPACE), D(LSFT), T(I), U(LSFT), T(QUOTE), T(M), T(SPACE), D(LSFT), T(D), U(LSFT), D(LSFT), T(P), U(LSFT), D(LSFT), T(S), U(LSFT), T(COMMA), T(SPACE), T(T), T(A), T(N), T(K), T(SPACE), T(A), T(N), T(D), T(SPACE), T(D), T(E), T(F), T(E), T(N), T(S), T(E), T(COMMA), T(SPACE), T(R), T(O), T(L), T(L), T(E), T(D), T(SPACE), T(I), T(N), T(T), T(O), T(SPACE), T(O), T(N), T(E), D(LSFT), T(1), U(LSFT), T(SPACE), D(LSFT), T(A), U(LSFT), T(L), T(L), T(SPACE), D(LSFT), T(I), U(LSFT), T(SPACE), T(N), T(E), T(E), T(D), T(SPACE), T(I), T(S), T(SPACE), T(T), T(E), T(A), T(M), T(SPACE), T(H), T(E), T(A), T(L), T(I), T(N), T(G), T(SPACE), T(T), T(O), T(SPACE), T(B), T(E), T(SPACE), T(C), T(O), T(M), T(P), T(L), T(E), T(T), T(E), D(LSFT), T(1), U(LSFT), T(ENTER), END );
+			}
+			break;
+				
     }
     return MACRO_NONE;
 };
@@ -677,7 +628,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 			}
 			return false;
 			break;
-        case KC_DIABLO_CLEAR:
+        case KC_DIABLO_CLEAR:  // reset all Diable timers, disabling them
             if (record->event.pressed) {
                 uint8_t dtime;
                 
@@ -692,6 +643,8 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 	return true;
 }
 
+
+// Sends the key press to system, but only if on the Diablo layer
 void send_diablo_keystroke (uint8_t diablo_key) {
     if (current_layer == DIABLO) {
         switch (diablo_key) {
@@ -711,6 +664,8 @@ void send_diablo_keystroke (uint8_t diablo_key) {
     }
 }
 
+// Checks each of the 4 timers/keys to see if enough time has elapsed
+// Runs the "send string" command if enough time has passed, and resets the timer.
 void run_diablo_macro_check(void) {
     uint8_t dtime;
     
@@ -724,32 +679,7 @@ void run_diablo_macro_check(void) {
 }
 
 void matrix_init_user(void) { // Runs boot tasks for keyboard
-    wait_ms(500);
-    ergodox_board_led_on();
-    wait_ms(200);
-    ergodox_right_led_1_on();
-    wait_ms(200);
-    ergodox_right_led_2_on();
-    wait_ms(200);
-    ergodox_right_led_3_on();
-    wait_ms(200);
-    ergodox_board_led_off();
-    wait_ms(200);
-    ergodox_right_led_1_off();
-    wait_ms(200);
-    ergodox_right_led_2_off();
-    wait_ms(200);
-    ergodox_right_led_3_off();
-
-    
-#ifdef LAYER_UNDERGLOW_LIGHTING
-	rgblight_enable();
-	rgblight_sethsv(195,255,255);
-#endif 
-    has_layer_changed = false;
-    
-    
-    
+    has_layer_changed = true;
 };
 
 
@@ -764,6 +694,9 @@ void matrix_scan_user(void) {  // runs frequently to update info
 		ergodox_right_led_2_off();
 		ergodox_right_led_3_off();
         
+		// Since we're not using the LEDs here for layer indication anymore,
+		// then lets use them for modifier indicators.  Shame we don't have 4...
+		// Also, no "else", since we want to know each, independantly. 
         if ( modifiders & MODS_SHIFT_MASK) {
                 ergodox_right_led_1_on();
         }
@@ -775,93 +708,61 @@ void matrix_scan_user(void) {  // runs frequently to update info
         }
         
     }
-        
+    // Check layer, and apply color if its changed since last check
     switch (layer) {
         case SYMB:
-            #ifdef LAYER_UNDERGLOW_LIGHTING
             if (has_layer_changed) {
-                rgblight_sethsv (240,255,255);
+                rgblight_sethsv (255,255,255);
             }
-            #else
-            ergodox_right_led_3_on();
-            #endif
             break;
         case OVERWATCH:
-            #ifdef LAYER_UNDERGLOW_LIGHTING
             if (has_layer_changed) {
                 rgblight_sethsv (30,255,255);
             }
-            #else
-            ergodox_right_led_2_on();
-            #endif
             break;
         case DIABLO:
-            #ifdef LAYER_UNDERGLOW_LIGHTING
             if (has_layer_changed) {
                 rgblight_sethsv (0,255,255);
             }
-            #else
-            ergodox_right_led_1_on();
-            #endif
             break;
         case MOUS:
-            #ifdef LAYER_UNDERGLOW_LIGHTING
             if (has_layer_changed) {
                 rgblight_sethsv (60,255,255);
             }
-            #else
-            ergodox_right_led_3_on();
-            ergodox_right_led_2_on();
-            #endif
             break;
         case COLEMAK:
-            #ifdef LAYER_UNDERGLOW_LIGHTING
             if (has_layer_changed) {
                 rgblight_sethsv (300,255,255);
             }
-            #else
-            ergodox_right_led_1_on();
-            ergodox_right_led_3_on();
-            #endif
             break;
         case DVORAK:
-            #ifdef LAYER_UNDERGLOW_LIGHTING
             if (has_layer_changed) {
                 rgblight_sethsv (120,255,255);
             }
-            #else
-            ergodox_right_led_2_on();
-            ergodox_right_led_1_on();
-            #endif
             break;
         case 7:
-            #ifdef LAYER_UNDERGLOW_LIGHTING
             if (has_layer_changed) {
                 rgblight_sethsv (255,255,255);
             }
-            #else
-            ergodox_right_led_1_on();
-            ergodox_right_led_2_on();
-            ergodox_right_led_3_on();
-            #endif
             break;
         default:
-            // Do not add anything here, as this will be ran EVERY check, and can cause a significant slowdown
-            #ifdef LAYER_UNDERGLOW_LIGHTING
             if (has_layer_changed) {
                 rgblight_sethsv (195,255,255);
             }
-            #endif
             break;
     }
-        
+    
+	// Update layer status at the end, so this sets the default color
+	// rather than relying on the init, which was unreliably...
+	// Probably due to a timing issue, but this requires no additional code
     if (current_layer == layer) {
         has_layer_changed = false;
     } else {
         has_layer_changed = true;
         current_layer = layer;
     }
+
+	// Run Diablo 3 macro checking code.
     run_diablo_macro_check();
 };
 
-