From 63656ea34f656ba04bf38d45f0af9dc82d55549b Mon Sep 17 00:00:00 2001
From: Nicholas Keene <git@nicholaskeene.com>
Date: Thu, 14 Apr 2016 21:49:32 -0500
Subject: The Ordinary Layout is the layout you are looking for. Come and see.

---
 keyboard/ergodox_ez/keymaps/ordinary/keymap.c      |  405 ++--
 .../ergodox_ez/keymaps/ordinary/ordinary-media.png |  Bin 119139 -> 117975 bytes
 .../ergodox_ez/keymaps/ordinary/ordinary-media.txt |   10 +-
 keyboard/ergodox_ez/keymaps/ordinary/ordinary.hex  | 2137 ++++++++++----------
 keyboard/ergodox_ez/keymaps/ordinary/readme.md     |   15 +-
 5 files changed, 1289 insertions(+), 1278 deletions(-)

(limited to 'keyboard/ergodox_ez/keymaps/ordinary')

diff --git a/keyboard/ergodox_ez/keymaps/ordinary/keymap.c b/keyboard/ergodox_ez/keymaps/ordinary/keymap.c
index 3a999f2665..15b2d72c35 100644
--- a/keyboard/ergodox_ez/keymaps/ordinary/keymap.c
+++ b/keyboard/ergodox_ez/keymaps/ordinary/keymap.c
@@ -2,29 +2,31 @@
 #include "led.h"
 #include "debug.h"
 #include "action_layer.h"
-
-#define BASE 0    // default layer
-#define LOCK 1    // layer lock keys
-#define SYMB_MO 2 // symbols momentary layer
-#define SYMB_TG 3 // symbols lock layer
-#define SYMB_XX 4 // symbols exit layer
-#define MDIA_MO 5 // media momentary layer
-#define MDIA_TG 6 // media lock layer
-#define MDIA_XX 7 // media exit layer
-#define UNLOCK 8  // clear to base layer
+#include "action_util.h"
+
+#define BASE    0 // default layer
+#define LOCK    1 // shift-lock layer
+#define SYMB_SH 2 // symbols shift layer
+#define SYMB_LK 3 // symbols lock layer
+#define SYMB_UN 4 // symbols unlock layer
+#define MDIA_SH 5 // media shift layer
+#define MDIA_LK 6 // media lock layer
+#define MDIA_UN 7 // media unlock layer
+#define UNLOCK  8 // clear to base layer
 
 /*
- * Ordinary Ergodox EZ keyboard layout, v3
+ * Ordinary Ergodox EZ keyboard layout, v3.1
  * modifications from default by Nicholas Keene ergodoxez@nicholaskeene.com
- * Details: http://nicholas.rinard.us/2016/03/ergodox-ez-layout.html
+ * Details: readme.md
+ *          https://github.com/nrrkeene/qmk_firmware/tree/master/keyboard/ergodox_ez/keymaps/ordinary
  */
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-/* Keymap 0: Basic layer
+/* Keymap 0: Base Layer
  *
  * ,-----------------------------------------------------.           ,-----------------------------------------------------.
- * | LOCK  Grv |   1  |   2  |   3  |   4  |   5  | ESC  |           |  -   |   6  |   7  |   8  |   9  |   0  | =    LOCK |
+ * | LOCK   `~ |   1  |   2  |   3  |   4  |   5  | ESC  |           |  -   |   6  |   7  |   8  |   9  |   0  | =    LOCK |
  * |-----------+------+------+------+------+-------------|           |------+------+------+------+------+------+-----------|
  * | Media Tab |   Q  |   W  |   E  |   R  |   T  |   [  |           |  ]   |   Y  |   U  |   I  |   O  |   P  | \   Media |
  * |-----------+------+------+------+------+------|      |           |      |------+------+------+------+------+-----------|
@@ -32,8 +34,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |-----------+------+------+------+------+------|Shift |           | Tab  |------+------+------+------+------+-----------|
  * | LShift    |   Z  |   X  |   C  |   V  |   B  | -Tab |           |      |   N  |   M  |   ,  |   .  |  /   |    RShift |
  * `-----------+------+------+------+------+-------------'           `-------------+------+------+------+------+-----------'
- *      |LCtrl | Meh  |Hyper | LAlt | LGui |                                       | RGui | RAlt | Hyper|  Meh |RCtrl |
- *      `----------------------------------'                                       `----------------------------------'
+ *     | LCtrl | Meh  |Hyper | LAlt | LGui |                                       | RGui | RAlt | Hyper|  Meh | RCtrl |
+ *     `-----------------------------------'                                       `-----------------------------------'
  *                                         ,-------------.           ,-------------.
  *                                         | Home | End  |           | Left | Right|
  *                                  ,------|------|------|           |------+------+------.
@@ -44,20 +46,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [BASE] = KEYMAP(
 // left hand
- LT(LOCK, KC_GRV),KC_1        ,KC_2        ,KC_3   ,KC_4   ,KC_5   ,KC_ESC
-,LT(MDIA_MO, KC_TAB),KC_Q     ,KC_W        ,KC_E   ,KC_R   ,KC_T   ,KC_LBRC
-,MO(SYMB_MO)     ,KC_A        ,KC_S        ,KC_D   ,KC_F   ,KC_G
-,KC_LSFT         ,KC_Z        ,KC_X        ,KC_C   ,KC_V   ,KC_B   ,LSFT(KC_TAB)
+ LT(LOCK, KC_GRV),KC_1        ,KC_2        ,KC_3   ,KC_4  ,KC_5 ,KC_ESC
+,LT(MDIA_SH, KC_TAB),KC_Q     ,KC_W        ,KC_E   ,KC_R  ,KC_T ,KC_LBRC
+,MO(SYMB_SH)     ,KC_A        ,KC_S        ,KC_D   ,KC_F  ,KC_G
+,KC_LSFT         ,KC_Z        ,KC_X        ,KC_C   ,KC_V  ,KC_B ,LSFT(KC_TAB)
 ,KC_LCTL         ,MEH_T(KC_NO),ALL_T(KC_NO),KC_LALT,KC_LGUI
 
-                                                           ,KC_HOME,KC_END
-                                                                   ,KC_PGUP
-                                                   ,KC_BSPC,KC_DEL ,KC_PGDN
+                                                        ,KC_HOME,KC_END
+                                                                ,KC_PGUP
+                                                ,KC_BSPC,KC_DEL ,KC_PGDN
 
                                                                 // right hand
                                                                ,KC_MINS ,KC_6   ,KC_7   ,KC_8   ,KC_9        ,KC_0        ,LT(LOCK, KC_EQL)
-                                                               ,KC_RBRC ,KC_Y   ,KC_U   ,KC_I   ,KC_O        ,KC_P        ,LT(MDIA_MO, KC_BSLS)
-                                                                        ,KC_H   ,KC_J   ,KC_K   ,KC_L        ,KC_SCLN     ,LT(SYMB_MO, KC_QUOT)
+                                                               ,KC_RBRC ,KC_Y   ,KC_U   ,KC_I   ,KC_O        ,KC_P        ,LT(MDIA_SH, KC_BSLS)
+                                                                        ,KC_H   ,KC_J   ,KC_K   ,KC_L        ,KC_SCLN     ,LT(SYMB_SH, KC_QUOT)
                                                                ,KC_TAB  ,KC_N   ,KC_M   ,KC_COMM,KC_DOT      ,KC_SLSH     ,KC_RSFT
                                                                                 ,KC_RGUI,KC_RALT,ALL_T(KC_NO),MEH_T(KC_NO),KC_RCTL
 
@@ -68,59 +70,59 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 /* Keymap 1: Layer Lock Keys
  *
- * ,-----------------------------------------------------.           ,-----------------------------------------------------.
- * |           |  Esc |      |      |      |      |      |           |      |      |      |      |      |      |           |
- * |-----------+------+------+------+------+-------------|           |------+------+------+------+------+------+-----------|
- * | Media LOCK|      |      |      |      |      |      |           |      |      |      |      |      |      | Media LOCK|
- * |-----------+------+------+------+------+------|      |           |      |------+------+------+------+------+-----------|
- * |Symbol LOCK|      |      |      |      |      |------|           |------|      |      |      |      |      |Symbol LOCK|
- * |-----------+------+------+------+------+------|      |           |      |------+------+------+------+------+-----------|
- * |  Caps LOCK|      |      |      |      |      |      |           |      |      |      |      |      |      |  Caps LOCK|
- * `-----------+------+------+------+------+-------------'           `-------------+------+------+------+------+-----------'
- *      |      |      |      |      |      |                                       |      |      |      |      |      |
- *      `----------------------------------'                                       `----------------------------------'
- *                                         ,-------------.           ,-------------.
- *                                         |      |      |           |      |      |
- *                                  ,------|------|------|           |------+------+------.
- *                                  |      |      |      |           |      |      |      |
- *                                  |      |      |------|           |------|      |      |
- *                                  |      |      |      |           |      |      |      |
- *                                  `--------------------'           `--------------------'
+ * ,-------------------------------------------------------.           ,-------------------------------------------------------.
+ * |             |  Esc |      |      |      |      |      |           |      |      |      |      |      | Bspc |             |
+ * |-------------+------+------+------+------+-------------|           |------+------+------+------+------+------+-------------|
+ * | Media  LOCK |      |      |      |      |      |      |           |      |      |      |      |      |      | Media  LOCK |
+ * |-------------+------+------+------+------+------|      |           |      |------+------+------+------+------+-------------|
+ * | Symbol LOCK |      |      |      |      |      |------|           |------|      |      |      |      |      | Symbol LOCK |
+ * |-------------+------+------+------+------+------|      |           |      |------+------+------+------+------+-------------|
+ * | Caps   LOCK |      |      |      |      |      |      |           |      |      |      |      |      |      | Caps   LOCK |
+ * `-------------+------+------+------+------+-------------'           `-------------+------+------+------+------+-------------'
+ *      |        |      |      |      |      |                                       |      |      |      |      |        |
+ *      `------------------------------------'                                       `------------------------------------'
+ *                                           ,-------------.           ,-------------.
+ *                                           |      |      |           |      |      |
+ *                                    ,------|------|------|           |------+------+------.
+ *                                    |      |      |      |           |      |      |      |
+ *                                    |      |      |------|           |------|      |      |
+ *                                    |      |      |      |           |      |      |      |
+ *                                    `--------------------'           `--------------------'
  */
 [LOCK] = KEYMAP(
 // left hand
- KC_TRNS      ,KC_ESC    ,KC_TRNS   ,KC_TRNS   ,KC_TRNS ,KC_TRNS  ,KC_TRNS
-,KC_FN3       ,KC_TRNS   ,KC_TRNS   ,KC_TRNS   ,KC_TRNS ,KC_TRNS  ,KC_TRNS
-,KC_FN2       ,KC_TRNS   ,KC_TRNS   ,KC_TRNS   ,KC_TRNS ,KC_TRNS
-,KC_CAPS      ,KC_TRNS   ,KC_TRNS   ,KC_TRNS   ,KC_TRNS ,KC_TRNS  ,KC_TRNS
-,KC_TRNS      ,KC_TRNS   ,KC_TRNS   ,KC_TRNS   ,KC_TRNS
+ KC_TRNS ,KC_ESC  ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS
+,KC_FN3  ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS
+,KC_FN2  ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS
+,KC_CAPS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS
+,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS
 
-                                                        ,KC_TRNS  ,KC_TRNS
-                                                                  ,KC_TRNS
-                                                ,KC_TRNS,KC_TRNS  ,KC_TRNS
+                                             ,KC_TRNS ,KC_TRNS
+                                                      ,KC_TRNS
+                                     ,KC_TRNS,KC_TRNS ,KC_TRNS
 
                                                                 // right hand
-                                                               ,KC_TRNS ,KC_TRNS  ,KC_TRNS   ,KC_TRNS   ,KC_TRNS   ,KC_TRNS  ,KC_TRNS
-                                                               ,KC_TRNS ,KC_TRNS  ,KC_TRNS   ,KC_TRNS   ,KC_TRNS   ,KC_TRNS  ,KC_FN3
-                                                                        ,KC_TRNS  ,KC_TRNS   ,KC_TRNS   ,KC_TRNS   ,KC_TRNS  ,KC_FN2
-                                                               ,KC_TRNS ,KC_TRNS  ,KC_TRNS   ,KC_TRNS   ,KC_TRNS   ,KC_TRNS  ,KC_CAPS
-                                                                                  ,KC_TRNS   ,KC_TRNS   ,KC_TRNS   ,KC_TRNS  ,KC_TRNS
+                                                               ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_BSPC ,KC_TRNS
+                                                               ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_FN3
+                                                                        ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_FN2
+                                                               ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_CAPS
+                                                                                 ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS
 
                                                                ,KC_TRNS ,KC_TRNS
                                                                ,KC_TRNS
-                                                               ,KC_TRNS ,KC_TRNS  ,KC_TRNS
+                                                               ,KC_TRNS ,KC_TRNS ,KC_TRNS
     ),
 
-/* Keymap 2: Symbol Momentary Layer
+/* Keymap 2: Symbol Shift Layer
  *
  * ,-----------------------------------------------------.           ,-----------------------------------------------------.
- * |           |  F1  |  F2  |  F3  |  F4  |  F5  |      |           |      |  F6  |  F7  |  F8  |  F9  |  F10 |           |
+ * | LOCK      |  F1  |  F2  |  F3  |  F4  |  F5  |      |           |      |  F6  |  F7  |  F8  |  F9  |  F10 |      LOCK |
  * |-----------+------+------+------+------+-------------|           |------+------+------+------+------+------+-----------|
- * | Media     |   !  |   @  |   {  |   }  |   &  |  <   |           |  >   |   |  |   7  |   8  |   9  |   /  | Media     |
+ * | Media     |   !  |   @  |   {  |   }  |   &  |  <   |           |  >   |   |  |   7  |   8  |   9  |   /  |     Media |
  * |-----------+------+------+------+------+------|      |           |      |------+------+------+------+------+-----------|
- * | Symbol    |   #  |   $  |   (  |   )  |   `  |------|           |------|   /  |   4  |   5  |   6  |   *  | Symbol    |
+ * | Symbol    |   #  |   $  |   (  |   )  |   `  |------|           |------|   /  |   4  |   5  |   6  |   *  |    Symbol |
  * |-----------+------+------+------+------+------| Tab  |           | Shift|------+------+------+------+------+-----------|
- * | Shift     |   %  |   ^  |   [  |   ]  |   ~  |      |           |  -Tab|   \  |   1  |   2  |   3  |   -  | Shift     |
+ * | LShift    |   %  |   ^  |   [  |   ]  |   ~  |      |           |  -Tab|   \  |   1  |   2  |   3  |   -  |    RShift |
  * `-----------+------+------+------+------+-------------'           `------------+------+------+------+------+------------'
  *      |      |      |      |      |      |                                       |   0  |    . |   =  |   +  | Entr |
  *      `----------------------------------'                                       `----------------------------------'
@@ -132,11 +134,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                  |      |      | Down |           | PgDn |      |      |
  *                                  `--------------------'           `--------------------'
  */
-[SYMB_MO] = KEYMAP(
+[SYMB_SH] = KEYMAP(
 // left hand
  KC_FN2        ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,KC_TRNS
-,MO(MDIA_MO)   ,KC_EXLM ,KC_AT   ,KC_LCBR ,KC_RCBR ,KC_AMPR ,LSFT(KC_COMM)
-,MO(SYMB_MO)   ,KC_HASH ,KC_DLR  ,KC_LPRN ,KC_RPRN ,KC_GRV 
+,MO(MDIA_SH)   ,KC_EXLM ,KC_AT   ,KC_LCBR ,KC_RCBR ,KC_AMPR ,LSFT(KC_COMM)
+,MO(SYMB_SH)   ,KC_HASH ,KC_DLR  ,KC_LPRN ,KC_RPRN ,KC_GRV 
 ,KC_LSFT       ,KC_PERC ,KC_CIRC ,KC_LBRC ,KC_RBRC ,KC_TILD ,KC_TAB
 ,KC_TRNS       ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS
                                                    ,KC_LEFT ,KC_RGHT
@@ -144,8 +146,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                           ,KC_SPC  ,KC_ENT  ,KC_DOWN
                                                                     // right hand
                                                                     ,KC_TRNS     ,KC_F6   ,KC_F7 ,KC_F8  ,KC_F9 ,KC_F10  ,KC_FN2
-                                                                    ,LSFT(KC_DOT),KC_PIPE ,KC_7  ,KC_8   ,KC_9  ,KC_SLSH ,MO(MDIA_MO)
-                                                                                 ,KC_SLSH ,KC_4  ,KC_5   ,KC_6  ,KC_ASTR ,MO(SYMB_MO)
+                                                                    ,LSFT(KC_DOT),KC_PIPE ,KC_7  ,KC_8   ,KC_9  ,KC_SLSH ,MO(MDIA_SH)
+                                                                                 ,KC_SLSH ,KC_4  ,KC_5   ,KC_6  ,KC_ASTR ,MO(SYMB_SH)
                                                                     ,LSFT(KC_TAB),KC_BSLS ,KC_1  ,KC_2   ,KC_3  ,KC_MINS ,KC_RSFT
                                                                                           ,KC_0  ,KC_DOT ,KC_EQL,KC_PLUS ,KC_ENT
                                                                     ,KC_HOME     ,KC_END
@@ -156,13 +158,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* Keymap 3: Symbol Lock Layer
  *
  * ,-----------------------------------------------------.           ,-----------------------------------------------------.
- * | Lock      |  F1  |  F2  |  F3  |  F4  |  F5  |      |           |      |  F6  |  F7  |  F8  |  F9  |  F10 | Lock      |
+ * | LOCK      |  F1  |  F2  |  F3  |  F4  |  F5  |      |           |      |  F6  |  F7  |  F8  |  F9  |  F10 |      LOCK |
  * |-----------+------+------+------+------+-------------|           |------+------+------+------+------+------+-----------|
- * | Media     |   !  |   @  |   {  |   }  |   &  |  <   |           |  >   |   |  |   7  |   8  |   9  |   /  | Media     |
+ * | Media     |   !  |   @  |   {  |   }  |   &  |  <   |           |  >   |   |  |   7  |   8  |   9  |   /  |     Media |
  * |-----------+------+------+------+------+------|      |           |      |------+------+------+------+------+-----------|
- * |           |   #  |   $  |   (  |   )  |   `  |------|           |------|   /  |   4  |   5  |   6  |   *  |           |
+ * | Symbol    |   #  |   $  |   (  |   )  |   `  |------|           |------|   /  |   4  |   5  |   6  |   *  |    Symbol |
  * |-----------+------+------+------+------+------| Tab  |           | Shift|------+------+------+------+------+-----------|
- * | Shift     |   %  |   ^  |   [  |   ]  |   ~  |      |           |  -Tab|   \  |   1  |   2  |   3  |   -  | Shift     |
+ * | LShift    |   %  |   ^  |   [  |   ]  |   ~  |      |           |  -Tab|   \  |   1  |   2  |   3  |   -  |    RShift |
  * `-----------+------+------+------+------+-------------'           `------------+------+------+------+------+------------'
  *      |      |      |      |      |      |                                       |   0  |    . |   =  |   +  | Entr |
  *      `----------------------------------'                                       `----------------------------------'
@@ -174,19 +176,19 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                  |      |      | Down |           | PgDn |      |      |
  *                                  `--------------------'           `--------------------'
  */
-[SYMB_TG] = KEYMAP(  // layer 3 : return key for symbol lock layer
+[SYMB_LK] = KEYMAP(
 // left hand
- MO(SYMB_XX)  ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,KC_TRNS
-,MO(MDIA_MO)  ,KC_EXLM ,KC_AT   ,KC_LCBR ,KC_RCBR ,KC_AMPR ,LSFT(KC_COMM)
-,MO(UNLOCK)   ,KC_HASH ,KC_DLR  ,KC_LPRN ,KC_RPRN ,KC_GRV
-,KC_LSFT      ,KC_PERC ,KC_CIRC ,KC_LBRC ,KC_RBRC ,KC_TILD ,KC_TAB
-,KC_TRNS      ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS
-                                                  ,KC_LEFT ,KC_RGHT
-                                                           ,KC_UP
-                                         ,KC_SPC  ,KC_ENT  ,KC_DOWN
+ MO(SYMB_UN)  ,KC_F1   ,KC_F2   ,KC_F3   ,KC_F4   ,KC_F5   ,KC_TRNS
+,MO(MDIA_SH) ,KC_EXLM ,KC_AT   ,KC_LCBR ,KC_RCBR ,KC_AMPR ,LSFT(KC_COMM)
+,MO(UNLOCK)  ,KC_HASH ,KC_DLR  ,KC_LPRN ,KC_RPRN ,KC_GRV
+,KC_LSFT     ,KC_PERC ,KC_CIRC ,KC_LBRC ,KC_RBRC ,KC_TILD ,KC_TAB
+,KC_TRNS     ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS
+                                                 ,KC_LEFT ,KC_RGHT
+                                                          ,KC_UP
+                                        ,KC_SPC  ,KC_ENT  ,KC_DOWN
                                                                     // right hand
-                                                                    ,KC_TRNS     ,KC_F6   ,KC_F7 ,KC_F8  ,KC_F9 ,KC_F10  ,MO(SYMB_XX)
-                                                                    ,LSFT(KC_DOT),KC_PIPE ,KC_7  ,KC_8   ,KC_9  ,KC_SLSH ,MO(MDIA_MO)
+                                                                    ,KC_TRNS     ,KC_F6   ,KC_F7 ,KC_F8  ,KC_F9 ,KC_F10  ,MO(SYMB_UN)
+                                                                    ,LSFT(KC_DOT),KC_PIPE ,KC_7  ,KC_8   ,KC_9  ,KC_SLSH ,MO(MDIA_SH)
                                                                                  ,KC_SLSH ,KC_4  ,KC_5   ,KC_6  ,KC_ASTR ,MO(UNLOCK)
                                                                     ,LSFT(KC_TAB),KC_BSLS ,KC_1  ,KC_2   ,KC_3  ,KC_MINS ,KC_RSFT
                                                                                           ,KC_0  ,KC_DOT ,KC_EQL,KC_PLUS ,KC_ENT
@@ -197,56 +199,56 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 /* Keymap 4: Symbol Unlock Layer
  *
- * ,-----------------------------------------------------.           ,-----------------------------------------------------.
- * |           | Esc  |      |      |      |      |      |           |      |      |      |      |      |      |           |
- * |-----------+------+------+------+------+-------------|           |------+------+------+------+------+------+-----------|
- * | Unlock    |      |      |      |      |      |      |           |      |      |      |      |      |      |  Unlock   |
- * |-----------+------+------+------+------+------|      |           |      |------+------+------+------+------+-----------|
- * |           |      |      |      |      |      |------|           |------|      |      |      |      |      |           |
- * |-----------+------+------+------+------+------|      |           |      |------+------+------+------+------+-----------|
- * | Caps LOCK |      |      |      |      |      |      |           |      |      |      |      |      |      | Caps LOCK |
- * `-----------+------+------+------+------+-------------'           `-------------+------+------+------+------+-----------'
- *      |      |      |      |      |      |                                       |      |      |      |      |      |
- *      `----------------------------------'                                       `----------------------------------'
- *                                         ,-------------.           ,-------------.
- *                                         |      |      |           |      |      |
- *                                  ,------|------|------|           |------+------+------.
- *                                  |      |      |      |           |      |      |      |
- *                                  |      |      |------|           |------|      |      |
- *                                  |      |      |      |           |      |      |      |
- *                                  `--------------------'           `--------------------'
+ * ,------------------------------------------------------.           ,------------------------------------------------------.
+ * |            | Esc  |      |      |      |      |      |           |      |      |      |      |      | Bspc |            |
+ * |------------+------+------+------+------+-------------|           |------+------+------+------+------+------+------------|
+ * | Media LOCK |      |      |      |      |      |      |           |      |      |      |      |      |      | Media LOCK |
+ * |------------+------+------+------+------+------|      |           |      |------+------+------+------+------+------------|
+ * |     UNLOCK |      |      |      |      |      |------|           |------|      |      |      |      |      |     UNLOCK |
+ * |------------+------+------+------+------+------|      |           |      |------+------+------+------+------+------------|
+ * | Caps  LOCK |      |      |      |      |      |      |           |      |      |      |      |      |      | Caps  LOCK |
+ * `------------+------+------+------+------+-------------'           `-------------+------+------+------+------+------------'
+ *       |      |      |      |      |      |                                       |      |      |      |      |      |
+ *       `----------------------------------'                                       `----------------------------------'
+ *                                          ,-------------.           ,-------------.
+ *                                          |      |      |           |      |      |
+ *                                   ,------|------|------|           |------+------+------.
+ *                                   |      |      |      |           |      |      |      |
+ *                                   |      |      |------|           |------|      |      |
+ *                                   |      |      |      |           |      |      |      |
+ *                                   `--------------------'           `--------------------'
  */
-[SYMB_XX] = KEYMAP(
+[SYMB_UN] = KEYMAP(
 // left hand
- KC_TRNS      ,KC_ESC    ,KC_TRNS   ,KC_TRNS   ,KC_TRNS ,KC_TRNS  ,KC_TRNS
-,TG(MDIA_TG)  ,KC_TRNS   ,KC_TRNS   ,KC_TRNS   ,KC_TRNS ,KC_TRNS  ,KC_TRNS
-,KC_FN1       ,KC_TRNS   ,KC_TRNS   ,KC_TRNS   ,KC_TRNS ,KC_TRNS
-,KC_CAPS      ,KC_TRNS   ,KC_TRNS   ,KC_TRNS   ,KC_TRNS ,KC_TRNS  ,KC_TRNS
-,KC_TRNS      ,KC_TRNS   ,KC_TRNS   ,KC_TRNS   ,KC_TRNS
-							,KC_TRNS  ,KC_TRNS
-								  ,KC_TRNS
-						,KC_TRNS,KC_TRNS  ,KC_TRNS
-											// right hand
-									   ,KC_TRNS ,KC_TRNS  ,KC_TRNS   ,KC_TRNS   ,KC_TRNS   ,KC_TRNS  ,KC_TRNS
-									   ,KC_TRNS ,KC_TRNS  ,KC_TRNS   ,KC_TRNS   ,KC_TRNS   ,KC_TRNS  ,TG(MDIA_TG)
-										    ,KC_TRNS  ,KC_TRNS   ,KC_TRNS   ,KC_TRNS   ,KC_TRNS  ,KC_FN1
-									   ,KC_TRNS ,KC_TRNS  ,KC_TRNS   ,KC_TRNS   ,KC_TRNS   ,KC_TRNS  ,KC_CAPS
-									   ,KC_TRNS ,KC_TRNS  ,KC_TRNS   ,KC_TRNS   ,KC_TRNS
-									   ,KC_TRNS ,KC_TRNS
-									   ,KC_TRNS
-									   ,KC_TRNS ,KC_TRNS  ,KC_TRNS
-	),
-
-/* Keymap 5: Media Momentary Layer
+ KC_TRNS     ,KC_ESC  ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS
+,TG(MDIA_LK) ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS
+,KC_FN1      ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS
+,KC_CAPS     ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS
+,KC_TRNS     ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS
+                                                ,KC_TRNS  ,KC_TRNS
+                                                          ,KC_TRNS
+                                        ,KC_TRNS,KC_TRNS  ,KC_TRNS
+                                                                     // right hand
+                                                                     ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_BSPC ,KC_TRNS
+                                                                     ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,TG(MDIA_LK)
+                                                                              ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_FN1
+                                                                     ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_CAPS
+                                                                     ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS
+                                                                     ,KC_TRNS ,KC_TRNS
+                                                                     ,KC_TRNS
+                                                                     ,KC_TRNS ,KC_TRNS ,KC_TRNS
+),
+
+/* Keymap 5: Media Shift Layer
  *
  * ,-----------------------------------------------------.           ,-----------------------------------------------------.
- * |           | F11  | F12  | F13  | F14  | F15  |      |           |      | F16  | F17  | F18  | F19  | F20  |           |
+ * | LOCK      | F11  | F12  | F13  | F14  | F15  |      |           |      | F16  | F17  | F18  | F19  | F20  |      LOCK |
  * |-----------+------+------+------+------+-------------|           |------+------+------+------+------+------+-----------|
- * |           |ShutDn|      | MsUp |      |      |ScrlUp|           |ScrlUp|PrtScr| Home |  Up  | PgUp | Mail |           |
+ * | Media     |ShutDn|      | MsUp |      |      |ScrlUp|           |ScrlUp|PrtScr| Home |  Up  | PgUp | Mail |     Media |
  * |-----------+------+------+------+------+------|      |           |      |------+------+------+------+------+-----------|
- * |           | Sleep|MsLeft|MsDown|MsRght|      |------|           |------|NumLok| Left | Down | Right|MyComp|           |
+ * | Symbol    | Sleep|MsLeft|MsDown|MsRght|      |------|           |------|NumLok| Left | Down | Right|MyComp|    Symbol |
  * |-----------+------+------+------+------+------|      |           |      |------+------+------+------+------+-----------|
- * |           |      |      |MsDown|      |      |ScrlDn|           |ScrlDn|      | End  | Down | PgDn |      |           |
+ * | LShift    |      |      |MsDown|      |      |ScrlDn|           |ScrlDn|      | End  | Down | PgDn |      |    RShift |
  * `-----------+------+------+------+------+-------------'           `-------------+------+------+------+------+-----------'
  *      | Mute |Vol Dn|Vol Up| Lclk | Rclk |                                       |Insert|Delete|      |      |      |
  *      `----------------------------------'                                       `----------------------------------'
@@ -258,22 +260,22 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                  |      |      | Home |           |VolDn |      | Pause|
  *                                  `--------------------'           `--------------------'
  */
-[MDIA_MO] = KEYMAP(
+[MDIA_SH] = KEYMAP(
 // left hand
- KC_FN3        ,KC_F11  ,KC_F12  ,KC_F13  ,KC_F14  ,KC_F15  ,KC_TRNS
-,MO(MDIA_MO)   ,KC_POWER,KC_TRNS ,KC_MS_U ,KC_TRNS ,KC_TRNS ,KC_WH_U
-,MO(SYMB_MO)   ,KC_SLEP ,KC_MS_L ,KC_MS_D ,KC_MS_R ,KC_TRNS
-,KC_LSFT       ,KC_TRNS ,KC_TRNS ,KC_MS_D ,KC_TRNS ,KC_TRNS ,KC_WH_D
+ KC_FN3        ,KC_F11  ,KC_F12  ,KC_F13  ,KC_F14  ,KC_F15  ,KC_NO
+,MO(MDIA_SH)   ,KC_POWER,KC_NO   ,KC_MS_U ,KC_NO   ,KC_NO   ,KC_WH_U
+,MO(SYMB_SH)   ,KC_SLEP ,KC_MS_L ,KC_MS_D ,KC_MS_R ,KC_NO  
+,KC_LSFT       ,KC_NO   ,KC_NO   ,KC_MS_D ,KC_NO   ,KC_NO   ,KC_WH_D
 ,KC_MUTE       ,KC_VOLD ,KC_VOLU ,KC_BTN1 ,KC_BTN2
                                                    ,KC_WSTP ,KC_WREF
                                                             ,KC_WSCH
-                                          ,KC_WBAK ,KC_TRNS ,KC_WHOM
+                                          ,KC_WBAK ,KC_NO   ,KC_WHOM
                                                                      // right hand
-                                                                     ,KC_TRNS  ,KC_F16  ,KC_F17 ,KC_F18  ,KC_F19  ,KC_F20  ,KC_FN3
-                                                                     ,KC_WH_U  ,KC_PSCR ,KC_HOME,KC_UP   ,KC_PGUP ,KC_MAIL ,MO(MDIA_MO)
-                                                                               ,KC_NLCK ,KC_LEFT,KC_DOWN ,KC_RIGHT,KC_MYCM ,MO(SYMB_MO)
-                                                                     ,KC_WH_D  ,KC_TRNS ,KC_END ,KC_DOWN ,KC_PGDN ,KC_TRNS ,KC_RSFT
-                                                                                        ,KC_INS ,KC_DEL  ,KC_TRNS ,KC_TRNS ,KC_TRNS
+                                                                     ,KC_NO    ,KC_F16  ,KC_F17 ,KC_F18  ,KC_F19  ,KC_F20  ,KC_FN3
+                                                                     ,KC_WH_U  ,KC_PSCR ,KC_HOME,KC_UP   ,KC_PGUP ,KC_MAIL ,MO(MDIA_SH)
+                                                                               ,KC_NLCK ,KC_LEFT,KC_DOWN ,KC_RIGHT,KC_MYCM ,MO(SYMB_SH)
+                                                                     ,KC_WH_D  ,KC_NO   ,KC_END ,KC_DOWN ,KC_PGDN ,KC_NO   ,KC_RSFT
+                                                                                        ,KC_INS ,KC_DEL  ,KC_NO   ,KC_NO   ,KC_NO
                                                                      ,KC_MPRV  ,KC_MNXT
                                                                      ,KC_VOLU
                                                                      ,KC_VOLD  ,KC_MSTP ,KC_MPLY
@@ -282,13 +284,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* Keymap 6: Media Lock Layer
  *
  * ,-----------------------------------------------------.           ,-----------------------------------------------------.
- * |           | F11  | F12  | F13  | F14  | F15  |      |           |      | F16  | F17  | F18  | F19  | F20  |           |
+ * | LOCK      | F11  | F12  | F13  | F14  | F15  |      |           |      | F16  | F17  | F18  | F19  | F20  |      LOCK |
  * |-----------+------+------+------+------+-------------|           |------+------+------+------+------+------+-----------|
- * |           |ShutDn|      | MsUp |      |      |ScrlUp|           |ScrlUp|PrtScr| Home |  Up  | PgUp | Mail |           |
+ * | Media     |ShutDn|      | MsUp |      |      |ScrlUp|           |ScrlUp|PrtScr| Home |  Up  | PgUp | Mail |     Media |
  * |-----------+------+------+------+------+------|      |           |      |------+------+------+------+------+-----------|
  * |           | Sleep|MsLeft|MsDown|MsRght|      |------|           |------|NumLok| Left | Down | Right|MyComp|           |
  * |-----------+------+------+------+------+------|      |           |      |------+------+------+------+------+-----------|
- * |           |      |      |MsDown|      |      |ScrlDn|           |ScrlDn|      | End  | Down | PgDn |      |           |
+ * | LShift    |      |      |MsDown|      |      |ScrlDn|           |ScrlDn|      | End  | Down | PgDn |      |    RShift |
  * `-----------+------+------+------+------+-------------'           `-------------+------+------+------+------+-----------'
  *      | Mute |Vol Dn|Vol Up| Lclk | Rclk |                                       |Insert|Delete|      |      |      |
  *      `----------------------------------'                                       `----------------------------------'
@@ -300,22 +302,22 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                  |      |      | Home |           |VolDn |      | Pause|
  *                                  `--------------------'           `--------------------'
  */
-[MDIA_TG] = KEYMAP(
+[MDIA_LK] = KEYMAP(
 // left hand
- MO(MDIA_XX)  ,KC_F11  ,KC_F12  ,KC_F13  ,KC_F14  ,KC_F15  ,KC_TRNS
-,MO(UNLOCK)   ,KC_POWER,KC_TRNS ,KC_MS_U ,KC_TRNS ,KC_TRNS ,KC_WH_U
-,KC_NO        ,KC_SLEP ,KC_MS_L ,KC_MS_D ,KC_MS_R ,KC_TRNS
-,KC_LSFT      ,KC_TRNS ,KC_TRNS ,KC_MS_D ,KC_TRNS ,KC_TRNS ,KC_WH_D
+ MO(MDIA_UN)  ,KC_F11  ,KC_F12  ,KC_F13  ,KC_F14  ,KC_F15  ,KC_NO
+,MO(UNLOCK)   ,KC_POWER,KC_NO   ,KC_MS_U ,KC_NO   ,KC_NO   ,KC_WH_U
+,KC_NO        ,KC_SLEP ,KC_MS_L ,KC_MS_D ,KC_MS_R ,KC_NO  
+,KC_LSFT      ,KC_NO   ,KC_NO   ,KC_MS_D ,KC_NO   ,KC_NO   ,KC_WH_D
 ,KC_MUTE      ,KC_VOLD ,KC_VOLU ,KC_BTN1 ,KC_BTN2
-                                                    ,KC_WSTP ,KC_WREF
-                                                             ,KC_WSCH
-                                           ,KC_WBAK ,KC_TRNS ,KC_WHOM
+                                                  ,KC_WSTP ,KC_WREF
+                                                           ,KC_WSCH
+                                         ,KC_WBAK ,KC_NO   ,KC_WHOM
                                                                      // right hand
-                                                                     ,KC_TRNS  ,KC_F16  ,KC_F17 ,KC_F18  ,KC_F19  ,KC_F20  ,MO(MDIA_XX)
+                                                                     ,KC_NO    ,KC_F16  ,KC_F17 ,KC_F18  ,KC_F19  ,KC_F20  ,MO(MDIA_UN)
                                                                      ,KC_WH_U  ,KC_PSCR ,KC_HOME,KC_UP   ,KC_PGUP ,KC_MAIL ,MO(UNLOCK)
                                                                                ,KC_NLCK ,KC_LEFT,KC_DOWN ,KC_RIGHT,KC_MYCM ,KC_NO
-                                                                     ,KC_WH_D  ,KC_TRNS ,KC_END ,KC_DOWN ,KC_PGDN ,KC_TRNS ,KC_RSFT
-                                                                                        ,KC_INS ,KC_DEL  ,KC_TRNS ,KC_TRNS ,KC_TRNS
+                                                                     ,KC_WH_D  ,KC_NO   ,KC_END ,KC_DOWN ,KC_PGDN ,KC_NO   ,KC_RSFT
+                                                                                        ,KC_INS ,KC_DEL  ,KC_NO   ,KC_NO   ,KC_NO
                                                                      ,KC_MPRV  ,KC_MNXT
                                                                      ,KC_VOLU
                                                                      ,KC_VOLD  ,KC_MSTP ,KC_MPLY
@@ -324,9 +326,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* Keymap 7: Media Unlock Layer
  *
  * ,-----------------------------------------------------.           ,-----------------------------------------------------.
- * |           | Esc  |      |      |      |      |      |           |      |      |      |      |      |      |           |
+ * |           | Esc  |      |      |      |      |      |           |      |      |      |      |      | Bspc |           |
  * |-----------+------+------+------+------+-------------|           |------+------+------+------+------+------+-----------|
- * | Unlock    |      |      |      |      |      |      |           |      |      |      |      |      |      | Unlock    |
+ * |    UNLOCK |      |      |      |      |      |      |           |      |      |      |      |      |      |    UNLOCK |
  * |-----------+------+------+------+------+------|      |           |      |------+------+------+------+------+-----------|
  * |           |      |      |      |      |      |------|           |------|      |      |      |      |      |           |
  * |-----------+------+------+------+------+------|      |           |      |------+------+------+------+------+-----------|
@@ -342,34 +344,34 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  *                                  |      |      |      |           |      |      |      |
  *                                  `--------------------'           `--------------------'
  */
-[MDIA_XX] = KEYMAP(
+[MDIA_UN] = KEYMAP(
 // left hand
- KC_TRNS      ,KC_ESC    ,KC_TRNS   ,KC_TRNS   ,KC_TRNS ,KC_TRNS  ,KC_TRNS
-,KC_FN1       ,KC_TRNS   ,KC_TRNS   ,KC_TRNS   ,KC_TRNS ,KC_TRNS  ,KC_TRNS
-,KC_TRNS      ,KC_TRNS   ,KC_TRNS   ,KC_TRNS   ,KC_TRNS ,KC_TRNS
-,KC_CAPS      ,KC_TRNS   ,KC_TRNS   ,KC_TRNS   ,KC_TRNS ,KC_TRNS  ,KC_TRNS
-,KC_TRNS      ,KC_TRNS   ,KC_TRNS   ,KC_TRNS   ,KC_TRNS
+ KC_TRNS ,KC_ESC  ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS
+,KC_FN1  ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS
+,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS
+,KC_CAPS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS
+,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS
 
-                                                        ,KC_TRNS  ,KC_TRNS
-                                                                  ,KC_TRNS
-                                                ,KC_TRNS,KC_TRNS  ,KC_TRNS
+                                             ,KC_TRNS ,KC_TRNS
+                                                      ,KC_TRNS
+                                    ,KC_TRNS ,KC_TRNS ,KC_TRNS
 
                                                                 // right hand
-                                                               ,KC_TRNS ,KC_TRNS  ,KC_TRNS   ,KC_TRNS   ,KC_TRNS   ,KC_TRNS  ,KC_TRNS
-                                                               ,KC_TRNS ,KC_TRNS  ,KC_TRNS   ,KC_TRNS   ,KC_TRNS   ,KC_TRNS  ,KC_FN1
-                                                                        ,KC_TRNS  ,KC_TRNS   ,KC_TRNS   ,KC_TRNS   ,KC_TRNS  ,KC_TRNS
-                                                               ,KC_TRNS ,KC_TRNS  ,KC_TRNS   ,KC_TRNS   ,KC_TRNS   ,KC_TRNS  ,KC_CAPS
-                                                                                  ,KC_TRNS   ,KC_TRNS   ,KC_TRNS   ,KC_TRNS  ,KC_TRNS
+                                                               ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_BSPC ,KC_TRNS
+                                                               ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_FN1
+                                                                        ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS
+                                                               ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_CAPS
+                                                                                 ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS
 
                                                                ,KC_TRNS ,KC_TRNS
                                                                ,KC_TRNS
-                                                               ,KC_TRNS ,KC_TRNS  ,KC_TRNS
+                                                               ,KC_TRNS ,KC_TRNS ,KC_TRNS
     ),
 
 /* Keymap 8: Unlock Layer
  *
  * ,-----------------------------------------------------.           ,-----------------------------------------------------.
- * | Unlock    |      |      |      |      |      |      |           |      |      |      |      |      |      | Unlock    |
+ * | UNLOCK    |      |      |      |      |      |      |           |      |      |      |      |      |      |    UNLOCK |
  * |-----------+------+------+------+------+-------------|           |------+------+------+------+------+------+-----------|
  * |           |      |      |      |      |      |      |           |      |      |      |      |      |      |           |
  * |-----------+------+------+------+------+------|      |           |      |------+------+------+------+------+-----------|
@@ -389,22 +391,22 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 [UNLOCK] = KEYMAP(
 // left hand
- KC_FN1       ,KC_ESC    ,KC_TRNS   ,KC_TRNS   ,KC_TRNS ,KC_TRNS  ,KC_TRNS
-,KC_TRNS       ,KC_TRNS   ,KC_TRNS   ,KC_TRNS   ,KC_TRNS ,KC_TRNS  ,KC_TRNS
-,KC_TRNS      ,KC_TRNS   ,KC_TRNS   ,KC_TRNS   ,KC_TRNS ,KC_TRNS
-,KC_TRNS      ,KC_TRNS   ,KC_TRNS   ,KC_TRNS   ,KC_TRNS ,KC_TRNS  ,KC_TRNS
-,KC_TRNS      ,KC_TRNS   ,KC_TRNS   ,KC_TRNS   ,KC_TRNS
+ KC_FN1  ,KC_ESC  ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS
+,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS
+,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS
+,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS
+,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS
 
-                                                        ,KC_TRNS  ,KC_TRNS
-                                                                  ,KC_TRNS
-                                                ,KC_TRNS,KC_TRNS  ,KC_TRNS
+                                             ,KC_TRNS ,KC_TRNS
+                                                      ,KC_TRNS
+                                    ,KC_TRNS ,KC_TRNS ,KC_TRNS
 
                                                                 // right hand
-                                                               ,KC_TRNS ,KC_TRNS  ,KC_TRNS   ,KC_TRNS   ,KC_TRNS   ,KC_TRNS  ,KC_FN1
-                                                               ,KC_TRNS ,KC_TRNS  ,KC_TRNS   ,KC_TRNS   ,KC_TRNS   ,KC_TRNS  ,KC_TRNS
-                                                                        ,KC_TRNS  ,KC_TRNS   ,KC_TRNS   ,KC_TRNS   ,KC_TRNS  ,KC_TRNS
-                                                               ,KC_TRNS ,KC_TRNS  ,KC_TRNS   ,KC_TRNS   ,KC_TRNS   ,KC_TRNS  ,KC_TRNS
-                                                                                  ,KC_TRNS   ,KC_TRNS   ,KC_TRNS   ,KC_TRNS  ,KC_TRNS
+                                                               ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_FN1
+                                                               ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS
+                                                                        ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS
+                                                               ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS
+                                                                                 ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS
 
                                                                ,KC_TRNS ,KC_TRNS
                                                                ,KC_TRNS
@@ -413,9 +415,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 };
 
 const uint16_t PROGMEM fn_actions[] = {
-         [1] = ACTION_LAYER_CLEAR(ON_PRESS)                // FN1 - clear to base layer
-	,[2] = ACTION_LAYER_INVERT(SYMB_TG, ON_PRESS)      // FN2 - toggle to Symbols on press
-	,[3] = ACTION_LAYER_INVERT(MDIA_TG, ON_PRESS)      // FN3 - toggle to Media on press
+     [1] = ACTION_LAYER_CLEAR(ON_PRESS)           // FN1 - clear to base layer
+    ,[2] = ACTION_LAYER_INVERT(SYMB_LK, ON_PRESS) // FN2 - toggle to Symbols on press
+    ,[3] = ACTION_LAYER_INVERT(MDIA_LK, ON_PRESS) // FN3 - toggle to Media on press
 };
 
 const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
@@ -440,31 +442,34 @@ void matrix_init_user(void) {
 
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
-	uint8_t layer = biton32(layer_state);
+    uint8_t layer = biton32(layer_state);
 
-    // do not change lights for locking and unlocking
-    if(layer == UNLOCK || layer == LOCK || layer == SYMB_XX || layer == MDIA_XX) {
-        return;
+    // shift or caps lock turns on red light
+    if((keyboard_report->mods & (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT))) || (host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK))) {
+        ergodox_right_led_1_on();
+    } else {
+        ergodox_right_led_1_off();
     }
 
-    ergodox_board_led_off();
-    ergodox_right_led_1_off();
-    ergodox_right_led_2_off();
-    ergodox_right_led_3_off();
-
-    // caps lock turns on red light
-    if(host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK)) {
-        ergodox_right_led_1_on();
+    // do not change lights while locking and unlocking
+    if(layer == LOCK || layer == SYMB_UN || layer == MDIA_UN || layer == UNLOCK) {
+        return;
     }
 
-    // symbol lock turns on green light
-    if(layer == SYMB_MO || layer == SYMB_TG) {
+    //ergodox_board_led_off();
+
+    // symbol turns on green light
+    if(layer == SYMB_SH || layer == SYMB_LK) {
         ergodox_right_led_2_on();
+    } else {
+        ergodox_right_led_2_off();
     }
 
-    // media lock turns on blue light
-    if(layer == MDIA_MO || layer == MDIA_TG) {
+    // media turns on blue light
+    if(layer == MDIA_SH || layer == MDIA_LK) {
         ergodox_right_led_3_on();
+    } else {
+        ergodox_right_led_3_off();
     }
 };
 
diff --git a/keyboard/ergodox_ez/keymaps/ordinary/ordinary-media.png b/keyboard/ergodox_ez/keymaps/ordinary/ordinary-media.png
index 9c0e8bba39..6f7bbf80c9 100644
Binary files a/keyboard/ergodox_ez/keymaps/ordinary/ordinary-media.png and b/keyboard/ergodox_ez/keymaps/ordinary/ordinary-media.png differ
diff --git a/keyboard/ergodox_ez/keymaps/ordinary/ordinary-media.txt b/keyboard/ergodox_ez/keymaps/ordinary/ordinary-media.txt
index c7bd272eca..3f2143c9d7 100644
--- a/keyboard/ergodox_ez/keymaps/ordinary/ordinary-media.txt
+++ b/keyboard/ergodox_ez/keymaps/ordinary/ordinary-media.txt
@@ -3,7 +3,7 @@
 [{y:-0.875,x:5.5},"F15",{c:"#ff4444"},"Esc",{x:4.5,c:"#cccccc",a:7},"",{c:"#99de2a",a:4},"F16"],
 [{y:-0.875,c:"#2277ff",w:1.5},"Shift\n\n\n\n\n\nLock",{c:"#99de2a"},"F11",{x:14.5},"F20",{c:"#2277ff",w:1.5},"\n\nShift\n\n\n\n\nLock"],
 [{y:-0.375,x:3.5,c:"#ff8500"},"Mouse\n\n\n\n\n\nUp",{x:10.5},"Cursor\n\n\n\n\n\nUp"],
-[{y:-0.875,x:2.5,c:"#cccccc",a:7},"",{x:1,c:"#ffb063",a:4},"Scroll\n\n\n\n\n\nUp",{x:8.5},"Home",{x:1},"Page\n\n\n\n\n\nUp"],
+[{y:-0.875,x:2.5,c:"#cccccc",a:7},"",{x:1},"",{x:8.5,c:"#ffb063",a:4},"Home",{x:1},"Page\n\n\n\n\n\nUp"],
 [{y:-0.875,x:5.5,c:"#cccccc",a:7},"",{c:"#ffb063",a:4,h:1.5},"Scroll\n\n\n\n\n\nUp",{x:4.5,h:1.5},"Scroll\n\n\n\n\n\nUp",{c:"#e6e067"},"Print\n\n\n\n\n\nScreen"],
 [{y:-0.875,c:"#000000",t:"#ff0000",w:1.5},"Media\n\n\n\n\n\nShift",{c:"#e6e067",t:"#000000"},"Shut\n\n\n\n\n\nDown",{x:14.5},"Mail",{c:"#000000",t:"#ff0000",w:1.5},"\n\nMedia\n\n\n\n\nShift"],
 [{y:-0.375,x:3.5,c:"#ff8500",t:"#000000"},"Mouse\n\n\n\n\n\nDown",{x:10.5},"Cursor\n\n\n\n\n\nDown"],
@@ -12,16 +12,16 @@
 [{y:-0.875,c:"#cccccc",a:7,w:1.5},"",{c:"#e6e067",a:4},"Sleep",{x:14.5},"My\n\n\n\n\n\nComp",{c:"#cccccc",a:7,w:1.5},""],
 [{y:-0.625,x:6.5,c:"#ffb063",a:4,h:1.5},"Scroll\n\n\n\n\n\nDown",{x:4.5,h:1.5},"Scroll\n\n\n\n\n\nDown"],
 [{y:-0.75,x:3.5,c:"#ff8500"},"Mouse\n\n\n\n\n\nDown",{x:10.5},"Cursor\n\n\n\n\n\nDown"],
-[{y:-0.875,x:2.5,c:"#cccccc",a:7},"",{x:1,c:"#ffb063",a:4},"Scroll\n\n\n\n\n\nDown",{x:8.5},"End",{x:1},"Page\n\n\n\n\n\nDown"],
+[{y:-0.875,x:2.5,c:"#cccccc",a:7},"",{x:1},"",{x:8.5,c:"#ffb063",a:4},"End",{x:1},"Page\n\n\n\n\n\nDown"],
 [{y:-0.875,x:5.5,c:"#cccccc",a:7},"",{x:6.5},""],
-[{y:-0.875,c:"#2277ff",a:4,fa:[0,1,0,0,0,0,0],w:1.5},"Capitals\nShift\n\n\n\n\nShift",{c:"#cccccc",a:7},"",{x:14.5},"",{c:"#2277ff",a:4,fa:[0,1,0,1],w:1.5},"\n\nCapitals\nShift\n\n\n\nShift"],
+[{y:-0.875,c:"#2277ff",a:4,f2:1,w:1.5},"Capitals\nShift\n\n\n\n\nShift",{c:"#cccccc",a:7},"",{x:14.5},"",{c:"#2277ff",a:4,fa:[0,1,0,1],w:1.5},"\n\nCapitals\nShift\n\n\n\nShift"],
 [{y:-0.375,x:3.5,c:"#ff8500"},"Left\n\n\n\n\n\nClick",{x:10.5,c:"#ffb063"},"Delete"],
 [{y:-0.875,x:2.5,c:"#e6e067"},"Vol\n\n\n\n\n\nUp",{x:1,c:"#ff8500"},"Right\n\n\n\n\n\nClick",{x:8.5,c:"#ffb063"},"Insert",{x:1,c:"#cccccc",a:7},""],
 [{y:-0.75,x:0.5,c:"#e6e067",a:4},"Mute","Vol\n\n\n\n\n\nDown",{x:14.5,c:"#cccccc",a:7},"",""],
-[{r:30,rx:6.5,ry:4.25,y:-1,x:1,c:"#cfc82b",a:4},"Stop\n\n\nBrowser","Reload\n\n\nBrowser"],
+[{r:30,rx:6.5,ry:4.25,y:-1,x:1,c:"#b5ad04",a:4},"Stop\n\n\nBrowser","Reload\n\n\nBrowser"],
 [{h:2},"< Web\n\n\nBrowser",{h:2},"Web >\n\n\nBrowser","Search\n\n\nBrowser"],
 [{x:2},"Home\n\n\nBrowser"],
 [{r:-30,rx:13,y:-1,x:-3},"Prev\n\n\nAudio\n\n\nTrack","Next\n\n\nAudio\n\n\nTrack"],
-[{x:-3,c:"#e6e067"},"Vol\n\n\n\n\n\nUp",{c:"#cfc82b",h:2},"Stop\n\n\nAudio",{h:2},"Play\n\n\nAudio\n\n\nPause"],
+[{x:-3,c:"#e6e067"},"Vol\n\n\n\n\n\nUp",{c:"#b5ad04",h:2},"Stop\n\n\nAudio",{h:2},"Play\n\n\nAudio\n\n\nPause"],
 [{x:-3,c:"#e6e067"},"Vol\n\n\n\n\n\nDown"]
 
diff --git a/keyboard/ergodox_ez/keymaps/ordinary/ordinary.hex b/keyboard/ergodox_ez/keymaps/ordinary/ordinary.hex
index b726e5e92a..430d7f4a8d 100644
--- a/keyboard/ergodox_ez/keymaps/ordinary/ordinary.hex
+++ b/keyboard/ergodox_ez/keymaps/ordinary/ordinary.hex
@@ -1,17 +1,17 @@
 :100000000C945F040C94A3040C94A3040C94A30418
 :100010000C94A3040C94A3040C94A3040C94A304C4
-:100020000C94A3040C94A3040C94BC0D0C948E0E9D
+:100020000C94A3040C94A3040C94C40D0C94960E8D
 :100030000C94A3040C94A3040C94A3040C94A304A4
-:100040000C94A3040C9439230C94A3040C94A304DF
-:100050000C94A3040C94DB1C0C94A3040C94A30434
+:100040000C94A3040C9441230C94A3040C94A304D7
+:100050000C94A3040C94E31C0C94A3040C94A3042C
 :100060000C94A3040C94A3040C94A3040C94A30474
 :100070000C94A3040C94A3040C94A3040C94A30464
 :100080000C94A3040C94A3040C94A3040C94A30454
 :100090000C94A3040C94A3040C94A3040C94A30444
-:1000A0000C94A3040C94A3040C94A304F30E150F56
-:1000B0000010150F0010570F7A0F0010CF0FE20F2E
-:1000C000D612D61204130413461382138215821516
-:1000D0009A138215911491145C158215821570156E
+:1000A0000C94A3040C94A3040C94A304FB0E1D0F46
+:1000B00008101D0F08105F0F820F0810D70FEA0FEE
+:1000C000DE12DE120C130C134E138A138A158A15D6
+:1000D000A2138A159914991464158A158A1578152E
 :1000E000000000810889248935812B850252E100B6
 :1000F000E00000001E00140004001D0000774E0008
 :100100001F001A0016001B00007F4C002000080092
@@ -32,7 +32,7 @@
 :1001F00001000100010001000000010001000100F8
 :1002000001000100010001000100010001000100E6
 :1002100001000100010001000100010001000100D6
-:100220000100010001000100010001000100C30004
+:100220002A00010001000100010001000100C300DB
 :10023000C200390001000000C20005520252E10074
 :10024000010000003A001E022002220201005100BB
 :100250003B001F0221022302010028003C002F0264
@@ -63,29 +63,29 @@
 :1003E0000000010000000100010001000100010007
 :1003F00000000100010001000100010001000100F6
 :1004000001000100010001000100010001000100E4
-:1004100001000100010001000100010001000100D4
+:1004100001000100010001002A00010001000100AB
 :100420000100010001000654C10039000100000074
 :10043000C30005520252E100A8000000440066001B
-:10044000A6000100AA00B50045000100F20001006D
-:10045000A90001006800F000F100F100F400B6000E
-:1004600069000100F3000100F500B4006A0001001A
-:10047000010001000000B8000100F9000000FA00CE
-:100480000000B9000100F9000000FA000000AC0013
-:100490006B004600530001000000AB006C004A00F6
+:10044000A6000000AA00B50045000000F200000070
+:10045000A90000006800F000F100F100F400B6000F
+:1004600069000000F3000000F500B4006A0000001D
+:10047000000000000000B8000000F9000000FA00D1
+:100480000000B9000000F9000000FA000000AC0014
+:100490006B004600530000000000AB006C004A00F7
 :1004A00050004D004900A9006D005200510051005C
-:1004B0004C00AE006E004B004F004E000100AD003E
-:1004C0006F00B100B30001000100AA00C300055293
-:1004D0000252E50001000000075208520000E1004E
-:1004E000A800000044006600A6000100AA00B500B4
-:1004F00045000100F2000100A90001006800F000C1
-:10050000F100F100F400B60069000100F300010001
-:10051000F500B4006A000100010001000000B8000D
-:100520000100F9000000FA000000B9000100F90024
-:100530000000FA000000AC006B0046005300010010
+:1004B0004C00AE006E004B004F004E000000AD003F
+:1004C0006F00B100B30000000000AA00C300055295
+:1004D0000252E50000000000075208520000E1004F
+:1004E000A800000044006600A6000000AA00B500B5
+:1004F00045000000F2000000A90000006800F000C4
+:10050000F100F100F400B60069000000F300000003
+:10051000F500B4006A000000000000000000B80010
+:100520000000F9000000FA000000B9000000F90026
+:100530000000FA000000AC006B0046005300000011
 :100540000000AB006C004A0050004D004900A900BB
 :100550006D005200510051004C00AE006E004B0087
-:100560004F004E000100AD006F00B100B30001006C
-:100570000100AA00075208520000E5000100000037
+:100560004F004E000000AD006F00B100B30000006E
+:100570000000AA00075208520000E5000000000039
 :100580000100C10001003900010000002900010044
 :100590000100010001000100010001000100010053
 :1005A0000100010001000100010001000100010043
@@ -95,7 +95,7 @@
 :1005E0000100010001000100000001000100010004
 :1005F00001000100010001000100010001000100F3
 :1006000001000100010001000100010001000100E2
-:100610000100010001000100010001000100C10012
+:100610002A00010001000100010001000100C100E9
 :100620000100390001000000C100010001000100CB
 :10063000010000002900010001000100010001008B
 :1006400001000100010001000100010001000100A2
@@ -143,1047 +143,1048 @@
 :1008E0008730904BA740B04BB9F41092EF011092B3
 :1008F000F0011092F1011092F20114BE84B7877FCB
 :1009000084BF88E10FB6F894809360001092600075
-:100910000FBEE0E0FFE3099511E0A0E0B1E0E6EFF3
-:10092000F9E402C005900D92A433B107D9F721E094
+:100910000FBEE0E0FFE3099511E0A0E0B1E0E6E002
+:10092000FAE402C005900D92A433B107D9F721E093
 :10093000A4E3B1E001C01D92AF3EB207E1F70E940F
-:10094000020B0C94F9240C94000061110BC0FC0103
-:100950008281882321F085EE0E94631103C085EE19
-:100960000E942B1280E090E008950895CF9360914B
+:100940000A0B0C9401250C94000061110BC0FC01F2
+:100950008281882321F085EE0E946B1103C085EE11
+:100960000E94331280E090E008950895CF93609143
 :10097000B1017091B2018091B3019091B4010E94D4
-:10098000071CC82F8130F9F08430E9F089EF8C0F13
-:100990008230C8F056985E9825982D9826982E9803
-:1009A00027982F980E943B1081FF02C0259A2D9A0C
-:1009B0008EEF8C0F823010F4269A2E9AC550C230DA
-:1009C00010F4279A2F9ACF9108950C94B604569854
-:1009D0005E9825982D9826982E9827982F988FEF17
-:1009E00090E0909389008093880090938B0080938F
-:1009F0008A0090938D0080938C00259A2D9A2FEF7A
-:100A000080E792E0215080409040E1F700C0000074
-:100A1000269A2E9A2FEF80E792E021508040904056
-:100A2000E1F700C00000279A2F9A2FEF80E792E0AD
-:100A3000215080409040E1F700C0000025982D989B
-:100A40002FEF80E792E0215080409040E1F700C016
-:100A5000000026982E982FEF80E792E021508040EA
-:100A60009040E1F700C0000027982F9856985E98B4
-:100A700025982D9826982E9827982F98089589EADA
-:100A80008093800089E08093810024982C983F987F
-:100A90008AB18F748AB96E98479A8BB1806B8BB983
-:100AA000769A0E94E7040C94B50480E280930001DA
-:100AB0008091340181110EC00E94A40581E08093D1
-:100AC00034012FEF83ED90E3215080409040E1F717
-:100AD00000C0000080E40E94AA05809300018111FB
-:100AE0002EC00E94D40580930001811128C00E946D
-:100AF000D40580930001811122C08FE30E94D405A8
-:100B00008093000181111BC00E94CC0580E40E94EB
-:100B1000AA0580930001811112C08CE00E94D405C7
-:100B20008093000181110BC00E94D40580930001C5
-:100B3000811105C08FE30E94D405809300010E94BB
-:100B4000CC058091000108951092B9008AE080934D
-:100B5000B800089594EA9093BC009091BC0097FF70
-:100B6000FCCF9091B900987F983021F0903111F02E
-:100B700081E008958093BB0084E88093BC0080915D
-:100B8000BC0087FFFCCF8091B900887F883111F0CD
-:100B9000803471F780E0089584E98093BC008091EF
-:100BA000BC0084FDFCCF08958093BB0084E8809353
-:100BB000BC008091BC0087FFFCCF9091B900987F6A
-:100BC00081E0983209F480E0089584E88093BC00C5
-:100BD0008091BC0087FFFCCF8091BB00089580917D
-:100BE0000001811115C080E40E94AA0580930001D4
-:100BF00081110CC082E10E94D40580930001811113
-:100C000005C08FEF0E94D405809300010E94CC059F
-:100C100084B1807F84B985B1807F85B98AB1837FB3
-:100C20008AB98BB1837F8BB93E98469808950E940C
-:100C30005505809300010E94EF0580B38C7080BB46
-:100C400081B3836F81BBE4E4F1E0A6E3B1E01192EC
-:100C50001D9281E0E235F807D1F70C943F05BF9271
-:100C6000CF92DF92EF92FF920F931F93CF93DF9378
-:100C700080910001882379F0809135018F5F809306
-:100C80003501811108C00E94550580930001811132
-:100C900002C00E94E70406E311E0C0E0D0E0DD24DA
-:100CA000D39482E0C82EEE24E394F12CC73000F5F3
-:100CB00080910001811162C080E40E94AA058093A6
-:100CC0000001811112C082E10E94D40580930001CD
-:100CD00081110BC0C7010C2E01C0880F0A94EAF7DE
-:100CE00080950E94D405809300010E94CC0546C0E7
-:100CF000CA30A1F028F4C83059F0C93061F005C0FD
-:100D0000CC3089F070F0CD3089F0209A289810C04E
-:100D1000219A29980DC0229A2A980AC0239A2B98C2
-:100D200007C0529A01C0539A5B9802C03E9A4698F7
-:100D3000E0EAEA95F1F78FB179995AC092E08170B3
-:100D40008D25892B7C9B02C090E001C094E0892B0B
-:100D50007D9B02C090E001C098E0892B7E9B02C081
-:100D600090E001C090E1892B9FB19095991F992740
-:100D7000991F9295990F907E892B0FC08091000149
-:100D800081114BC080E40E94AA0580930001882352
-:100D900089F1B12C0E94CC058B2DF8019081981718
-:100DA00019F08083C09201010E94EF0521960F5F28
-:100DB0001F4FCE30D10509F079CF809101018823F2
-:100DC00071F1815080930101882339F08FE99FE010
-:100DD0000197F1F700C0000022C0A4E4B1E0E6E30F
-:100DE000F1E081918D9391E0E434F907D1F717C0D8
-:100DF00090E0A5CF83E10E94D4058093000181118A
-:100E0000C8CF81E40E94AA05809300018111C1CF5F
-:100E10000E94E505B82EB094BDCF80E0BECF0E9401
-:100E2000E50481E0DF91CF911F910F91FF90EF904A
-:100E3000DF90CF90BF900895E82FF0E0EC5BFE4F7D
-:100E40008081089508958B3B910578F4883A910547
-:100E500040F5853A9105D0F48430910508F0B1C091
-:100E60008130910509F4ADC06BC0803E910508F456
-:100E700067C0883E910508F4A4C09C01205F310939
-:100E80002031310508F05CC090650895853A9105E0
-:100E900009F459C0863A910509F458C083E890E4F2
-:100EA0000895883A910509F454C0893A910509F4E6
-:100EB00053C08A3A910509F452C08B3A910509F45E
-:100EC00051C08C3A910509F450C08D3A910509F44E
-:100ED0004FC0803B910509F44EC08E3A910509F44C
-:100EE0004DC08F3A910509F44CC0813B910509F43E
-:100EF0004BC0823B910509F44AC0833B910509F43C
-:100F000049C0843B910509F448C0853B910509F42B
-:100F100047C0863B910509F446C0873B910509F41B
-:100F200045C0883B910509F444C0893B910509F40B
-:100F300043C08A3B910509F042C08AE296E40895D5
-:100F400080E090E0089581E890E4089582E890E4DC
-:100F5000089582EE94E4089589EE94E408958AEE6B
-:100F600094E4089585EB94E4089586EB94E4089561
-:100F700087EB94E408958CEC94E408958DEC94E46C
-:100F8000089583E895E408958AE895E4089582E950
-:100F900095E4089584E995E4089581E296E408953E
-:100FA00083E296E4089584E296E4089585E296E467
-:100FB000089586E296E4089587E296E4089580E035
-:100FC00094E40895089596E0799FF001112494E542
-:100FD000899FE00DF11D1124E60FF11DEE0FFF1F9B
-:100FE000E851FF4F859194910895880F991F805A79
-:100FF0009040FC01859194910895880F991F80522B
-:101000009F4FFC0185919491089526E0729FF00115
-:10101000112444E5849FE00DF11D1124E60FF11D1C
-:10102000EE0FFF1FE851FF4F25913491C9019A95AA
-:1010300081159F4110F4C9010895C901905281158D
-:10104000904128F4C9019F700E94FD070895C901CD
-:1010500090538115904120F4C9019927906C08950F
-:10106000211580E5380769F40E94A5159FEF24E358
-:101070004CE0915020404040E1F700C000000C944B
-:10108000001D213080E5380731F48091CD01816069
-:101090008093CD010895C90190558115904108F0C4
-:1010A00050C0832F99278F70992781309105D9F4EB
-:1010B000A9014370552702C0880F991F4A95E2F78E
-:1010C0009C68A90164E0440F551F6A95E1F7442725
-:1010D0005370842B952B73E0220F331F7A95E1F721
-:1010E000207633271DC08230910529F4922F88275E
-:1010F000816F906A089583309105A9F4A901437026
-:10110000552781E090E002C0880F991F4A95E2F7C9
-:101110009C6843E0220F331F4A95E1F7207E377029
-:10112000822B932B08950497F1F4A901437055275E
-:1011300081E090E002C0880F991F4A95E2F79A6813
-:10114000E8CFC90190578115904120F4C9019F70E3
-:1011500090620895C90190588115904120F4C90109
-:101160009F70906A0895203E3105E0F4203C3105DF
-:1011700058F52133310509F470C048F4293231059E
-:1011800009F464C02A32310509F46EC074C02933F1
-:101190003105F1F022383105D9F02533310509F454
-:1011A0004EC069C0233E310589F138F4203E310537
-:1011B000C1F0223E3105E1F05EC0263E310569F105
-:1011C000273E3105A9F157C0C9010E94F5070895CE
-:1011D0008091E00180FD02C081FF4DC080EE90E073
-:1011E0004BC08091E00180FFF9CF89E390E044C0DB
-:1011F0008091E00182FF0EC08091E00184FF03C076
-:1012000080E090E039C083EE90E036C08091E0014C
-:1012100082FFF2CF82EE90E02FC08091E00183FF49
-:101220000BC08091E00184FDEBCF87EE90E024C0FD
-:101230008091E00183FFF5CF86EE90E01DC08091A4
-:10124000E00185FF07C089E290E016C08091E001CF
-:1012500085FFF9CF85E390E00FC08091E00186FF24
-:1012600007C08AE290E008C08091E00186FFF9CFD4
-:1012700081E390E001C0C9010E9423070895089509
-:101280000C943F09809162010895CF93DF9300D0C1
-:101290001F92CDB7DEB72091E601243019F523E087
-:1012A00029839B838A832093E9008FEF9091E80044
-:1012B000815095FD06C095ED9A95F1F700008111DA
-:1012C000F5CF8091E80085FF0DC040E050E063E07D
-:1012D00070E0CE0101960E94AF0B8091E8008E77FE
-:1012E0008093E8000F900F900F90DF91CF910895B9
-:1012F000CF93DF9300D01F92CDB7DEB72091E601E8
-:10130000243021F522E029839B838A8383E0809324
-:10131000E9008FEF9091E800815095FD06C095EDB2
-:101320009A95F1F700008111F5CF8091E80085FFD3
-:101330000DC040E050E063E070E0CE0101960E94F5
-:10134000AF0B8091E8008E778093E8000F900F90AC
-:101350000F90DF91CF9108952091E6012430F1F4B0
-:1013600022E02093E9002FEF3091E800215035FD75
-:1013700006C035ED3A95F1F700002111F5CF209127
-:10138000E80025FF0BC040E050E065E070E00E94FF
-:10139000AF0B8091E8008E778093E8000895CF939B
-:1013A000DF93EC018091E601843009F046C0909112
-:1013B0000C019923D9F090910D019923B9F08093F4
-:1013C000E9008FEF9091E800815095FD06C095E10E
-:1013D0009A95F1F700008111F5CF8091E80085FF23
-:1013E0002CC040E050E060E170E017C081E08093E5
-:1013F000E9008FEF9091E800815095FD06C095EDD2
-:101400009A95F1F700008111F5CF8091E80085FFF2
-:1014100014C040E050E068E070E0CE010E94AF0BE5
-:101420008091E8008E778093E80080E1FE01A2E5DC
-:10143000B1E001900D928A95E1F7DF91CF91089587
-:101440008091E50