]> git.donarmstrong.com Git - qmk_firmware.git/blobdiff - keyboards/ergodox_ez/keymaps/drashna-custom/keymap.c
make it easy to customize logo image
[qmk_firmware.git] / keyboards / ergodox_ez / keymaps / drashna-custom / keymap.c
index ed7aede1f9f885821d716a665222089fe984f112..bdc4eed486c70d17b300f851465c46dc7fe39948 100644 (file)
@@ -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"
 #include "keymap_nordic.h"
 
 // Define layer names 
-#define BASE 0
+#define QWERTY 0
 #define COLEMAK 1
 #define DVORAK 2
-#define SYMB 3
-#define OVERWATCH 4
-#define DIABLO 5
-#define MOUS 6
+#define WORKMAN 3
+#define SYMB 8
+#define OVERWATCH 9
+#define DIABLO 10
+#define MOUS 12
+
+//Leader Key stuff
+#ifdef LEADER_TIMEOUT
+#undef LEADER_TIMEOUT
+#endif
+#define LEADER_TIMEOUT 1500
 
 //define modifiers
 #define MODS_SHIFT_MASK  (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT))
 #define MODS_CTRL_MASK  (MOD_BIT(KC_LCTL)|MOD_BIT(KC_RCTRL))
 #define MODS_ALT_MASK  (MOD_BIT(KC_LALT)|MOD_BIT(KC_RALT))
-
-//define macro keycodes
-#define M_VERSION M(0)
-#define M_SYMM M(1)
-#define M_SALT M(2)
-#define M_HARD M(3)
-#define M_MAKE M(4)
-#define M_COVECUBE M(5)
-#define M_MORESALT M(6)
-#define M_DOOMFIST M(7)
-
-
 //define layer change stuff for underglow indicator
 bool skip_leds = false;
-bool has_layer_changed = false;
-static uint8_t current_layer;
 
-static uint16_t key_timer;
+#ifdef RGBLIGHT_ENABLE
+#define rgblight_set_blue        rgblight_sethsv (0xFF,  0xFF, 0xFF);
+#define rgblight_set_red         rgblight_sethsv (0x00,  0xFF, 0xFF);
+#define rgblight_set_green       rgblight_sethsv (0x78,  0xFF, 0xFF);
+#define rgblight_set_orange      rgblight_sethsv (0x1E,  0xFF, 0xFF);
+#define rgblight_set_teal        rgblight_sethsv (0xC3,  0xFF, 0xFF);
+#define rgblight_set_magenta     rgblight_sethsv (0x12C, 0xFF, 0xFF);
+#define rgblight_set_yellow      rgblight_sethsv (0x3C,  0xFF, 0xFF);
+#define rgblight_set_purple      rgblight_sethsv (0x10E, 0xFF, 0xFF);
+#endif
+
 //define diablo macro timer variables
 static uint16_t diablo_timer[4];
 static uint8_t diablo_times[] = {0, 1, 3, 5, 10, 30};
@@ -49,107 +69,84 @@ 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
-       EPRM,
-       VRSN,
-       RGB_SLD,
-       RGB_0000FF,
-       RGB_008000,
-       RGB_FF0000,
-       RGB_800080,
-       RGB_00FF90,
-    KC_DIABLO_CLEAR
+    PLACEHOLDER = SAFE_RANGE, // can always be here
+    EPRM,
+    VRSN,
+    RGB_SLD,
+    RGB_0000FF,
+    RGB_008000,
+    RGB_FF0000,
+    RGB_800080,
+    RGB_00FF90,
+    KC_DIABLO_CLEAR,
+    KC_QWERTY,
+    KC_COLEMAK,
+    KC_DVORAK,
+    KC_WORKMAN,
+    KC_MAKEQMK
 };
 
 #ifdef TAP_DANCE_ENABLE
 enum {
-       SFT_CAP = 0,
-       TD_DIABLO_J,
-       TD_CLN,
-       TD_EGG,
-       TD_FLSH,
-       TD_DIABLO_1,
-       TD_DIABLO_2,
-       TD_DIABLO_3,
-       TD_DIABLO_4
+    TD_FLSH = 0,
+    TD_DIABLO_1,
+    TD_DIABLO_2,
+    TD_DIABLO_3,
+    TD_DIABLO_4
 };
 
 
 
-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
+
 void dance_flsh_each(qk_tap_dance_state_t *state, void *user_data) {
-       if (!skip_leds) {
-               ergodox_board_led_off();
-               ergodox_right_led_1_off();
-               ergodox_right_led_2_off();
-               ergodox_right_led_3_off();
-               skip_leds = true;
-       }
-       switch (state->count) {
-               case 1:
-                       ergodox_right_led_3_on();
+    if (!skip_leds) {
+        ergodox_board_led_off();
+        ergodox_right_led_1_off();
+        ergodox_right_led_2_off();
+        ergodox_right_led_3_off();
+        skip_leds = true;
+    }
+    switch (state->count) {
+        case 1:
+            ergodox_right_led_1_on();
             break;
         case 2:
-                       ergodox_right_led_2_on();
-                       break;
-               case 3:
-                       ergodox_right_led_1_on();
-                       break;
-               case 4:
-                       ergodox_right_led_3_off();
-                       _delay_ms(50);
-                       ergodox_right_led_2_off();
-                       _delay_ms(50);
-                       ergodox_right_led_1_off();
-
-       }
+            ergodox_right_led_2_on();
+            break;
+        case 3:
+            ergodox_right_led_3_on();
+            break;
+        case 4:
+            ergodox_right_led_1_off();
+            _delay_ms(50);
+            ergodox_right_led_2_off();
+            _delay_ms(50);
+            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
+    if (state->count >= 4) {
+#ifdef RGBLIGHT_ENABLE
         rgblight_enable();
         rgblight_mode(1);
         rgblight_setrgb(0xff,0x00,0x00);
 #endif
-               reset_keyboard();
-               reset_tap_dance(state);
-       }
+        reset_tap_dance(state);
+        reset_keyboard();
+    }
 }
 
+// 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 +156,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);
 }
@@ -178,29 +177,21 @@ 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();
-       _delay_ms(200);
-       ergodox_right_led_2_off();
-       _delay_ms(200);
-       ergodox_right_led_3_off();
-       _delay_ms(500);
-       skip_leds = false;
+    _delay_ms(200);
+    ergodox_right_led_3_off();
+    _delay_ms(200);
+    ergodox_right_led_2_off();
+    _delay_ms(200);
+    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),
-    
+    //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 +211,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|
@@ -232,27 +223,27 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                 |      |      | End   |       | PgDn |       |      |
  *                                 `---------------------'       `---------------------'
  */
-  [BASE] = KEYMAP(
-                               KC_EQUAL,       KC_1,       KC_2,       KC_3,       KC_4,       KC_5,       TG(MOUS),
-                               KC_TAB,         KC_Q,       KC_W,       KC_E,       KC_R,       KC_T,       TG(DIABLO),
-                               KC_BSPACE,      KC_A,       KC_S,       KC_D,       KC_F,       KC_G,
-                KC_LSHIFT,      CTL_T(KC_Z),KC_X,       KC_C,       KC_V,       KC_B,       TG(OVERWATCH),
-                               LT(SYMB,KC_GRAVE),KC_QUOTE, KC_LGUI,    KC_LBRACKET,KC_RBRACKET,
+  [QWERTY] = KEYMAP(
+                KC_EQUAL,       KC_1,       KC_2,       KC_3,       KC_4,       KC_5,       TG(MOUS),
+                KC_TAB,         KC_Q,       KC_W,       KC_E,       KC_R,       KC_T,       TG(DIABLO),
+                KC_BSPACE,      KC_A,       KC_S,       KC_D,       KC_F,       KC_G,
+                KC_LSHIFT,      LCTL_T(KC_Z),KC_X,       KC_C,       KC_V,       KC_B,       TG(OVERWATCH),
+                LT(SYMB,KC_GRAVE),KC_QUOTE, KC_LGUI,    KC_LBRACKET,KC_RBRACKET,
                 
-                                                                       ALT_T(KC_APPLICATION),  KC_LGUI,
+                                    ALT_T(KC_APPLICATION),  KC_LGUI,
                                                             KC_HOME,
-                                                                       KC_SPACE,   KC_BSPACE,  KC_END,
-                                                                       
-                               TG(SYMB),       KC_6,       KC_7,       KC_8,       KC_9,       KC_0,           KC_MINUS,
-                               TG(DVORAK),     KC_Y,       KC_U,       KC_I,       KC_O,       KC_P,           KC_BSLASH,
+                                    KC_SPACE,   KC_BSPACE,  KC_END,
+                                    
+                TG(MOUS),       KC_6,       KC_7,       KC_8,       KC_9,       KC_0,           KC_MINUS,
+                TG(DIABLO),     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_LALT,    CTL_T(KC_ESCAPE),
-                               KC_PGUP,
-                               KC_PGDOWN,  KC_DELETE,  KC_ENTER
-                       ),
-/* Keymap 1: Basic layer
+                TG(OVERWATCH),  KC_N,       KC_M,       KC_COMMA,   KC_DOT,     RCTL_T(KC_SLASH),KC_RSHIFT,
+                                            KC_LEFT,    KC_DOWN,    KC_UP,      KC_RIGHT,       TT(SYMB),
+                KC_LEAD,    CTL_T(KC_ESCAPE),
+                KC_PGUP,
+                KC_PGDOWN,  KC_DELETE,  KC_ENTER
+            ),
+/* Keymap 0: Basic layer
  *
  * ,--------------------------------------------------.           ,--------------------------------------------------.
  * |   =    |   1  |   2  |   3  |   4  |   5  | LEFT |           | RIGHT|   6  |   7  |   8  |   9  |   0  |   -    |
@@ -278,24 +269,24 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [COLEMAK] = KEYMAP(  
         // left hand
         KC_EQL,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   TG(MOUS),
-        KC_DELT,        KC_Q,         KC_W,   KC_F,   KC_P,   KC_G,   TG(DIABLO),
+        KC_TAB,         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,
-                                              ALT_T(KC_APP),  KC_LGUI,
+        KC_LSFT,        LCTL_T(KC_Z),  KC_X,   KC_C,   KC_V,   KC_B,   TG(OVERWATCH),
+        LT(SYMB,KC_GRV),KC_QUOT,      KC_LGUI,    KC_LBRACKET,KC_RBRACKET,
+                                              ALT_T(KC_APP),  KC_LEAD,
                                                               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_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,
+             TG(MOUS),    KC_6,   KC_7,   KC_8,   KC_9,   KC_0,             KC_MINS,
+             TG(DIABLO),  KC_J,   KC_L,   KC_U,   KC_Y,   KC_SCLN,          KC_BSLS,
+                          KC_H,   KC_N,   KC_E,   KC_I,   KC_O,             GUI_T(KC_QUOTE),
+             TG(OVERWATCH),KC_K,  KC_M,   KC_COMM,KC_DOT, RCTL_T(KC_SLASH), KC_RSHIFT,
+                          KC_LEFT,    KC_DOWN,    KC_UP,      KC_RIGHT,       TT(SYMB),
              KC_LALT,        CTL_T(KC_ESC),
              KC_PGUP,
-             KC_PGDN,KC_TAB, KC_ENT
+             KC_PGDN,KC_DELETE, KC_ENT
     ),
-/* Keymap 2: Basic layer
+/* Keymap 0: Basic layer
  *
  * ,--------------------------------------------------.           ,--------------------------------------------------.
  * |   =    |   1  |   2  |   3  |   4  |   5  | LEFT |           | RIGHT|   6  |   7  |   8  |   9  |   0  |   \    |
@@ -321,22 +312,65 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [DVORAK] = KEYMAP(  
         // left hand
         KC_EQL,         KC_1,           KC_2,    KC_3,   KC_4,   KC_5,   TG(MOUS),
-        KC_DELT,        KC_QUOT,        KC_COMM, KC_DOT, KC_P,   KC_Y,   TG(DIABLO),
+        KC_TAB,        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,
-                                              ALT_T(KC_APP),  KC_LGUI,
+        KC_LSFT,        LCTL_T(KC_SCLN), KC_Q,    KC_J,   KC_K,   KC_X,   TG(OVERWATCH),
+        LT(SYMB,KC_GRV),KC_QUOT, KC_LGUI, KC_LBRACKET, KC_RBRACKET,
+                                              ALT_T(KC_APP),  KC_LEAD,
                                                               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_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,
+             TG(MOUS),     KC_6,   KC_7,   KC_8,   KC_9,   KC_0,        KC_BSLS,
+             TG(DIABLO),   KC_F,   KC_G,   KC_C,   KC_R,   KC_L,        KC_SLSH,
+                           KC_D,   KC_H,   KC_T,   KC_N,   KC_S,        KC_MINS,
+             TG(OVERWATCH),KC_B,   KC_M,   KC_W,   KC_V,   RCTL_T(KC_Z), KC_RSHIFT,
+                                   KC_LEFT,KC_DOWN,KC_UP,  KC_RIGHT,    TT(SYMB),
              KC_LALT,        CTL_T(KC_ESC),
              KC_PGUP,
-             KC_PGDN,KC_TAB, KC_ENT
+             KC_PGDN,KC_DELETE, KC_ENT
+    ),
+/* Keymap 0: Basic layer
+ *
+ * ,--------------------------------------------------.           ,--------------------------------------------------.
+ * |   =    |   1  |   2  |   3  |   4  |   5  | LEFT |           | RIGHT|   6  |   7  |   8  |   9  |   0  |   -    |
+ * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
+ * | Del    |   Q  |   W  |   F  |   P  |   G  |  L1  |           |  L1  |   J  |   L  |   U  |   Y  |   ;  |   \    |
+ * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
+ * | BkSp   |   A  |   R  |   S  |   T  |   D  |------|           |------|   H  |   N  |   E  |   I  |O / L2|   '    |
+ * |--------+------+------+------+------+------| OVER |           | Meh  |------+------+------+------+------+--------|
+ * | LShift |Z/Ctrl|   X  |   C  |   V  |   B  |      |           |      |   K  |   M  |   ,  |   .  |//Ctrl| RShift |
+ * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
+ *   |Grv/L1|  '"  |AltShf| Left | Right|                                       |  Up  | Down |   [  |   ]  | ~L1  |
+ *   `----------------------------------'                                       `----------------------------------'
+ *                                        ,-------------.       ,-------------.
+ *                                        | App  | LGui |       | Alt  |Ctrl/Esc|
+ *                                 ,------|------|------|       |------+--------+------.
+ *                                 |      |      | Home |       | PgUp |        |      |
+ *                                 | Space|Backsp|------|       |------|  Tab   |Enter |
+ *                                 |      |ace   | End  |       | PgDn |        |      |
+ *                                 `--------------------'       `----------------------'
+ */
+// If it accepts an argument (i.e, is a function), it doesn't need KC_.
+// Otherwise, it needs KC_*
+[WORKMAN] = KEYMAP(  
+        // left hand
+        KC_EQL,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   TG(MOUS),
+        KC_TAB,         KC_Q,         KC_D,   KC_R,   KC_W,   KC_B,   TG(DIABLO),
+        KC_BSPC,        KC_A,         KC_S,   KC_H,   KC_T,   KC_G,
+        KC_LSFT,        LCTL_T(KC_Z),  KC_X,   KC_M,   KC_C,   KC_V,   TG(OVERWATCH),
+        LT(SYMB,KC_GRV),KC_QUOT,      KC_LGUI,    KC_LBRACKET,KC_RBRACKET,
+                                              ALT_T(KC_APP),  KC_LEAD,
+                                                              KC_HOME,
+                                               KC_SPC,KC_BSPC,KC_END,
+        // right hand
+             TG(MOUS),    KC_6,   KC_7,   KC_8,   KC_9,   KC_0,             KC_MINS,
+             TG(DIABLO),  KC_J,   KC_F,   KC_U,   KC_P,   KC_SCLN,          KC_BSLS,
+                          KC_Y,   KC_N,   KC_E,   KC_O,   KC_I,             KC_QUOTE,
+             TG(OVERWATCH),KC_K,  KC_L,   KC_COMM,KC_DOT, RCTL_T(KC_SLASH), KC_RSHIFT,
+                          KC_LEFT,    KC_DOWN,    KC_UP,      KC_RIGHT,       TT(SYMB),
+             KC_LALT,        CTL_T(KC_ESC),
+             KC_PGUP,
+             KC_PGDN,KC_DELETE, KC_ENT
     ),
 
     /* Keymap 3: Symbol Layer
@@ -347,49 +381,49 @@ 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,
-                               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,
-                               KC_NO,          KC_AMPR,    KC_ASTR,    KC_COLN,    KC_SCOLON,
-                                        RGB_MOD,    RGB_0000FF,
-                                                    RGB_008000,
-                                                       RGB_VAD,    RGB_VAI,    RGB_FF0000,
-                               
-                               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_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,
-                               RGB_TOG,    RGB_SLD,
-                               RGB_HUI,
-                               RGB_HUD,    KC_KP_DOT,  KC_KP_0
-                       ),
+                KC_ESCAPE,      KC_F1,      KC_F2,      KC_F3,      KC_F4,      KC_F5,      KC_WORKMAN,
+                VRSN,           KC_EXLM,    KC_AT,      KC_LCBR,    KC_RCBR,    KC_PIPE,    KC_DVORAK,
+                KC_MAKEQMK,     KC_HASH,    KC_DLR,     KC_LPRN,    KC_RPRN,    KC_GRAVE,
+                TD(TD_FLSH),    KC_PERC,    KC_CIRC,    KC_LBRACKET,KC_RBRACKET,KC_TILD,    KC_COLEMAK,
+                KC_TRNS,          KC_AMPR,    KC_ASTR,    KC_COLN,    KC_SCOLON,
+                                                                  KC_TRNS, KC_TRNS,
+                                                                  KC_TRNS,
+                                                                  KC_TRNS, KC_TRNS, KC_TRNS,
+                
+                KC_QWERTY,   KC_F6,      KC_F7,      KC_F8,      KC_F9,      KC_F10,         KC_F11,
+                KC_DVORAK,   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_COLEMAK,  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,
+                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  |      |      |      |      |      |      |           |      |  F9  | F10  | F11  |  F12 |      |        |
  * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
  * |   F1   |  K   |  Q   |  W   |  E   |  R   |  T   |           |      |      |      |      |      |      |        |
  * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
  * |   TAB  |  G   |  A   |  S   |  D   |  F   |------|           |------|      |      |      |      |      |        |
  * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |  LCTR  | LSHFT|  Z   |  X   |  C   |  M   |      |           |      |      |      |      |      |      |        |
+ * |  LCTR  | LSHFT|  Z   |  X   |  C   |  V   |      |           |      |   N  |  M   |      |      |      |        |
  * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
  *   |   J  |  U   |  I   |  Y   |  T   |                                       |      |      |      |      |      |
  *   `----------------------------------'                                       `----------------------------------'
@@ -402,24 +436,24 @@ 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_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_G,           KC_U,       KC_I,       KC_Y,       KC_T,
+                KC_ESCAPE,      KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,    KC_TRNS,
+                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_V,       KC_TRNS,
+                KC_G,           KC_U,       KC_I,       KC_Y,       KC_T,
                                             KC_O,   KC_P,
                                                     KC_LGUI,
                                 KC_V,   KC_SPACE,   KC_H,
-                                                                       
-                               KC_NO,          KC_F9,      KC_F10,     KC_F11,     KC_F12,     KC_NO,      KC_NO,
-                               KC_NO,          KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,
-                               KC_NO,          KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,
-                               KC_NO, KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,
+                                    
+                KC_TRNS,        KC_F9,      KC_F10,     KC_F11,     KC_F12,     KC_NO,      KC_NO,
+                KC_NO,          KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,
+                                KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,
+                TG(OVERWATCH),  KC_N,       KC_M,       KC_NO,      KC_NO,      KC_NO,      KC_NO,
                                             KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,
-                               KC_NO,  KC_NO,
-                               KC_NO,
-                               KC_NO,  KC_NO,  KC_ENTER
-                       ),
+                KC_NO,          KC_NO,
+                KC_NO,
+                KC_PGDOWN,      KC_DELETE, KC_ENTER
+            ),
 
 /* Keymap 3:
  *
@@ -443,25 +477,26 @@ 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_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_ESCAPE,  KC_V,       KC_D,       KC_LALT,    KC_NO,      KC_NO,      KC_NO,
+                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_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,
-                                                                       
-                                                                       
-                               KC_NO, KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,
-                               KC_NO, KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,
-                               KC_NO,          KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,
-                               KC_NO, KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,
-                               KC_NO,          KC_NO,  KC_NO,  KC_NO,  KC_NO,
-                               KC_NO,  KC_NO,
-                               KC_NO,
-                               KC_NO,  KC_NO,  KC_NO
-                       ),
+                                    
+                                    
+                                    
+                KC_TRNS,        KC_F9,      KC_F10,     KC_F11,     KC_F12,     KC_NO,      KC_NO,
+                KC_TRNS,        KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,
+                                KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,
+                KC_NO,          KC_N,       KC_M,       KC_NO,      KC_NO,      KC_NO,      KC_NO,
+                                            KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,
+                KC_NO,          KC_NO,
+                KC_NO,
+                KC_PGDOWN,      KC_DELETE, KC_ENTER
+            ),
 
 /* Keymap 4: Media and mouse keys
  *
@@ -472,212 +507,129 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
  * |        |MsLeft|MsDown|MsRght|      |      |------|           |------|      |      | Acc0 | Acc1 | Acc2 |        |
  * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        | Acc0 | Acc1 | Acc2 |      |      |      |           |      | Play | Stop | Mute |VolDn |VolUp |        |
+ * |        | Acc0 | Acc1 | Acc2 |      |      |      |           |      |      | Mute |VolDn |VolUp |      |        |
  * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      |      |      |                                       |      |      |      |      |      |
+ *   |      |      |      |      |      |                                       | Play | Stop |      |      |      |
  *   `----------------------------------'                                       `----------------------------------'
  *                                        ,-------------.       ,-------------.
  *                                        |      |      |       |      |      |
  *                                 ,------|------|------|       |------+------+------.
  *                                 |      |      | MWUp |       |      |      |      |
- *                                 | Lclk | Rclk |------|       |------| MBn4 | MBn4 |
+ *                                 | Lclk | Rclk |------|       |------| MBn4 | MBn5 |
  *                                 |      |      | MWDn |       | Mclk |      |      |
  *                                 `--------------------'       `--------------------'
  */
   [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_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_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_TRNS,
+                KC_NO,      KC_NO,      KC_MS_U,    KC_NO,      KC_NO,      KC_NO,      KC_TRNS,
+                KC_NO,      KC_MS_L,    KC_MS_D,    KC_MS_R,    KC_NO,      KC_NO,
+                KC_NO,      KC_ACL0,    KC_ACL1,    KC_ACL2,    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_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_NO,KC_NO,KC_NO,KC_NO,KC_NO,
-                               KC_NO,KC_NO,
-                               KC_NO,
-                               KC_MS_BTN3,KC_MS_BTN4,KC_MS_BTN5
-                       ),
+                                                                            KC_NO,      KC_NO,
+                                                                                        KC_WH_U,
+                                                                KC_BTN1,    KC_BTN2,    KC_WH_D,
+                
+                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_ACL0,    KC_ACL1,    KC_ACL2,    KC_NO,      KC_NO,
+                KC_TRNS,    KC_NO,      KC_MUTE,    KC_VOLD,    KC_VOLU,    KC_NO,      KC_NO,
+                                        KC_NO,      KC_NO,      KC_NO,      KC_NO,      KC_NO,
+                KC_NO,KC_NO,
+                KC_NO,
+                KC_MS_BTN3,KC_MS_BTN4,KC_MS_BTN5
+            ),
 
 };
 
-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)
-{
-   
+void persistent_default_layer_set(uint16_t default_layer) {
+    eeconfig_update_default_layer(default_layer);
+    default_layer_set(default_layer);
 }
 
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-    switch(id) {
-        case 0:
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+#ifdef CONSOLE_ENABLE
+    xprintf("KL: row: %u, column: %u, pressed: %u\n", record->event.key.col, record->event.key.row, record->event.pressed);
+#endif
+    switch (keycode) {
+        // dynamically generate these.
+        case EPRM:
             if (record->event.pressed) {
-                // Output Keyboard Firmware info
-                SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
-                return false;
+                eeconfig_init();
             }
-        case 1:
+            return false;
+            break;
+        case VRSN:
             if (record->event.pressed) {
-                // Symmentra "Left Click to win" salt
-                return MACRO( I(50),  T(ENTER), I(5), D(LSFT), T(L), U(LSFT), T(E), T(F), T(T), T(SPACE), T(C), T(L), T(I), T(C), T(K), T(SPACE), T(T), T(O), T(SPACE), T(W), T(I), T(N), D(LSFT), T(1), U(LSFT), T(ENTER), END );
+                SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
             }
-        case 2:
+            return false;
+            break;
+        case RGB_SLD:
             if (record->event.pressed) {
-                //salt salt salt
-                return MACRO( I(50), T(ENTER), I(5), D(LSFT), T(S), U(LSFT), T(A), T(L), T(T), T(COMMA), T(SPACE), T(S), T(A), T(L), T(T), T(COMMA), T(SPACE), T(S), T(A), T(L), T(T), T(DOT), T(DOT), T(DOT), T(ENTER), END );
+#ifdef RGBLIGHT_ENABLE
+                rgblight_mode(1);
+#endif
             }
-        case 3:
+            return false;
+            break;
+
+        case RGB_0000FF:
             if (record->event.pressed) {
-                // your saltiness makes me hard
-                return MACRO( I(50),  T(ENTER), I(5), D(LSFT), T(Y), U(LSFT), T(O), T(U), T(R), T(SPACE), T(S), T(A), T(L), T(T), T(SPACE), T(O), T(N), T(L), T(Y), T(SPACE), T(M), T(A), T(K), T(E), T(S), T(SPACE), T(M), T(Y), T(SPACE), T(P), T(E), T(N), T(I), T(S), T(SPACE), T(T), T(H), T(A), T(T), T(SPACE), T(M), T(U), T(C), T(H), T(SPACE), T(H), T(A), T(R), T(D), T(E), T(R), T(COMMA), T(SPACE), T(A), T(N), T(D), T(SPACE), T(E), T(V), T(E), T(N), T(SPACE), T(M), T(O), T(R), T(E), T(SPACE), T(A), T(G), T(G), T(R), T(E), T(S), T(S), T(I), T(V), T(E), D(LSFT), T(1), U(LSFT), T(ENTER), END );
+                #ifdef RGBLIGHT_ENABLE
+                rgblight_enable();
+                rgblight_mode(1);
+                rgblight_setrgb(0x00,0x00,0xff);
+                #endif
             }
-        case 4:
+            return false;
+            break;
+
+        case RGB_008000:
             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 );
+                #ifdef RGBLIGHT_ENABLE
+                rgblight_enable();
+                rgblight_mode(1);
+                rgblight_setrgb(0x00,0x80,0x00);
+                #endif
             }
-        case 5:
+            return false;
+            break;
+
+        case RGB_FF0000:
             if (record->event.pressed) {
-                //super secret hash
-                SEND_STRING("supersecrethash");
-                return MACRO_NONE;
+                #ifdef RGBLIGHT_ENABLE
+                rgblight_enable();
+                rgblight_mode(1);
+                rgblight_setrgb(0xff,0x00,0x00);
+                #endif
             }
-        case 6:
+            return false;
+            break;
+
+        case RGB_800080:
             if (record->event.pressed) {
-                // Please sir, can I have some more salt
-                return MACRO( I(50), T(ENTER), I(5), D(LSFT), T(P), U(LSFT), T(L), T(E), T(A), T(S), T(E), T(SPACE), T(S), T(I), T(R), T(COMMA), T(SPACE), T(C), T(A), T(N), T(SPACE), D(LSFT), T(I), U(LSFT), T(SPACE), T(H), T(A), T(V), T(E), T(SPACE), T(S), T(O), T(M), T(E), T(SPACE), T(M), T(O), T(R), T(E), T(SPACE), T(S), T(A), T(L), T(T), D(LSFT), T(SLASH), U(LSFT), D(LSFT), T(1), U(LSFT), T(ENTER), END );
+                #ifdef RGBLIGHT_ENABLE
+                rgblight_enable();
+                rgblight_mode(1);
+                rgblight_setrgb(0x80,0x00,0x80);
+                #endif
             }
+            return false;
             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;
-    }
-    return MACRO_NONE;
-};
-
 
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-       switch (keycode) {
-               // dynamically generate these.
-               case EPRM:
-                       if (record->event.pressed) {
-                eeconfig_init();
-                       }
-                       return false;
-                       break;
-               case VRSN:
-                       if (record->event.pressed) {
-                               SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION);
-                       }
-                       return false;
-                       break;
-               case RGB_SLD:
-                       if (record->event.pressed) {
-                               rgblight_mode(1);
-                       }
-                       return false;
-                       break;
-
-               case RGB_0000FF:
-                       if (record->event.pressed) {
-                               #ifdef RGBLIGHT_ENABLE
-                               rgblight_enable();
-                               rgblight_mode(1);
-                               rgblight_setrgb(0x00,0x00,0xff);
-                               #endif
-                       }
-                       return false;
-                       break;
-
-               case RGB_008000:
-                       if (record->event.pressed) {
-                               #ifdef RGBLIGHT_ENABLE
-                               rgblight_enable();
-                               rgblight_mode(1);
-                               rgblight_setrgb(0x00,0x80,0x00);
-                               #endif
-                       }
-                       return false;
-                       break;
-
-               case RGB_FF0000:
-                       if (record->event.pressed) {
-                               #ifdef RGBLIGHT_ENABLE
-                               rgblight_enable();
-                               rgblight_mode(1);
-                               rgblight_setrgb(0xff,0x00,0x00);
-                               #endif
-                       }
-                       return false;
-                       break;
-
-               case RGB_800080:
-                       if (record->event.pressed) {
-                               #ifdef RGBLIGHT_ENABLE
-                               rgblight_enable();
-                               rgblight_mode(1);
-                               rgblight_setrgb(0x80,0x00,0x80);
-                               #endif
-                       }
-                       return false;
-                       break;
-
-               case RGB_00FF90:
-                       if (record->event.pressed) {
-                               #ifdef RGBLIGHT_ENABLE
-                               rgblight_enable();
-                               rgblight_mode(1);
-                               rgblight_setrgb(0x00,0xff,0x90);
-                               #endif
-                       }
-                       return false;
-                       break;
-        case KC_DIABLO_CLEAR:
+        case RGB_00FF90:
+            if (record->event.pressed) {
+                #ifdef RGBLIGHT_ENABLE
+                rgblight_enable();
+                rgblight_mode(1);
+                rgblight_setrgb(0x00,0xff,0x90);
+                #endif
+            }
+            return false;
+            break;
+        case KC_DIABLO_CLEAR:  // reset all Diable timers, disabling them
             if (record->event.pressed) {
                 uint8_t dtime;
                 
@@ -687,13 +639,46 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             }
             return false;
             break;
-            
-       }
-       return true;
+        case KC_QWERTY:
+            if (record->event.pressed) {
+                persistent_default_layer_set(1UL << QWERTY);
+            }
+            return false;
+            break;
+        case KC_COLEMAK:
+            if (record->event.pressed) {
+                persistent_default_layer_set(1UL << COLEMAK);
+            }
+            return false;
+            break;
+        case KC_DVORAK:
+            if (record->event.pressed) {
+                persistent_default_layer_set(1UL << DVORAK);
+            }
+            return false;
+            break;
+        case KC_WORKMAN:
+            if (record->event.pressed) {
+                persistent_default_layer_set(1UL << WORKMAN);
+            }
+            return false;
+            break;
+        case KC_MAKEQMK:
+            if (!record->event.pressed) {
+                SEND_STRING("make " QMK_KEYBOARD ":" QMK_KEYMAP ":teensy"SS_TAP(X_ENTER));
+            }
+            return false;
+            break;
+
+    }
+    return true;
 }
 
+#ifdef TAP_DANCE_ENABLE
+
+// 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) {
+    if (biton32(layer_state) == DIABLO) {
         switch (diablo_key) {
             case 0:
                 SEND_STRING("1");
@@ -711,6 +696,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;
     
@@ -723,145 +710,123 @@ void run_diablo_macro_check(void) {
     
 }
 
+#endif
+
+
 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 RGBLIGHT_ENABLE
+    uint8_t default_layer = eeconfig_read_default_layer();
 
-    
-#ifdef LAYER_UNDERGLOW_LIGHTING
-       rgblight_enable();
-       rgblight_sethsv(195,255,255);
-#endif 
-    has_layer_changed = false;
-    
-    
-    
+    rgblight_enable();
+    if (default_layer & (1UL << COLEMAK)) {
+        rgblight_set_magenta;
+    }
+    else if (default_layer & (1UL << DVORAK)) {
+        rgblight_set_green;
+    }
+    else if (default_layer & (1UL << WORKMAN)) {
+        rgblight_set_purple;
+    }
+    else {
+        rgblight_set_teal;
+    }
+#endif
 };
 
-
+LEADER_EXTERNS();
 
 void matrix_scan_user(void) {  // runs frequently to update info
     uint8_t modifiders = get_mods();
-    uint8_t layer = biton32(layer_state);
-       
-       if (!skip_leds) {
-               ergodox_board_led_off();
-               ergodox_right_led_1_off();
-               ergodox_right_led_2_off();
-               ergodox_right_led_3_off();
+
+    if (!skip_leds) {
+        ergodox_board_led_off();
+        ergodox_right_led_1_off();
+        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();
+            ergodox_right_led_2_on();
         }
         if ( modifiders & MODS_CTRL_MASK) {
-                ergodox_right_led_2_on();
+            ergodox_right_led_1_on();
         }
         if ( modifiders & MODS_ALT_MASK) {
-                ergodox_right_led_3_on();
+            ergodox_right_led_3_on();
         }
         
     }
-        
-    switch (layer) {
+
+    // Run Diablo 3 macro checking code.
+#ifdef TAP_DANCE_ENABLE
+    run_diablo_macro_check();
+#endif
+    LEADER_DICTIONARY() {
+        leading = false;
+        leader_end();
+        SEQ_ONE_KEY(KC_C) {
+            SEND_STRING("Covecube");
+        }
+        SEQ_ONE_KEY(KC_D) {
+            SEND_STRING("StableBit CloudDrive");
+        }
+        SEQ_ONE_KEY(KC_L) {
+            register_code(KC_LGUI);
+            register_code(KC_L);
+            unregister_code(KC_L);
+            unregister_code(KC_LGUI);
+        }
+        SEQ_TWO_KEYS(KC_S, KC_D) {
+            SEND_STRING("StableBit DrivePool");
+        }
+        SEQ_TWO_KEYS(KC_S, KC_C) {
+            SEND_STRING("StableBit Scanner");
+        }
+        SEQ_TWO_KEYS(KC_S, KC_T) {
+            SEND_STRING("StableBit Troubleshooter");
+        }
+    }
+};
+
+uint32_t layer_state_set_kb(uint32_t state) {
+#ifdef RGBLIGHT_ENABLE
+    uint8_t default_layer = eeconfig_read_default_layer();
+
+    switch (biton32(state)) {
         case SYMB:
-            #ifdef LAYER_UNDERGLOW_LIGHTING
-            if (has_layer_changed) {
-                rgblight_sethsv (240,255,255);
-            }
-            #else
-            ergodox_right_led_3_on();
-            #endif
+            rgblight_set_blue;
+            rgblight_mode(2);
             break;
         case OVERWATCH:
-            #ifdef LAYER_UNDERGLOW_LIGHTING
-            if (has_layer_changed) {
-                rgblight_sethsv (30,255,255);
-            }
-            #else
-            ergodox_right_led_2_on();
-            #endif
+            rgblight_set_orange;
+            rgblight_mode(17);
             break;
         case DIABLO:
-            #ifdef LAYER_UNDERGLOW_LIGHTING
-            if (has_layer_changed) {
-                rgblight_sethsv (0,255,255);
-            }
-            #else
-            ergodox_right_led_1_on();
-            #endif
+            rgblight_set_red;
+            rgblight_mode(5);
             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
+            rgblight_set_yellow;
+            rgblight_mode(1);
             break;
-        case COLEMAK:
-            #ifdef LAYER_UNDERGLOW_LIGHTING
-            if (has_layer_changed) {
-                rgblight_sethsv (300,255,255);
+        default:
+            if (default_layer & (1UL << COLEMAK)) {
+                rgblight_set_green;
             }
-            #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 if (default_layer & (1UL << DVORAK)) {
+                rgblight_set_magenta;
             }
-            #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 if (default_layer & (1UL << WORKMAN)) {
+                rgblight_set_purple;
             }
-            #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);
+            else {
+                rgblight_set_teal;
             }
-            #endif
+            rgblight_mode(1);
             break;
     }
-        
-    if (current_layer == layer) {
-        has_layer_changed = false;
-    } else {
-        has_layer_changed = true;
-        current_layer = layer;
-    }
-    run_diablo_macro_check();
-};
-
-
+#endif
+   return state;
+}