Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware

10 files changed, 1232 insertions, 1147 deletions

diff --git a/keyboard/ergodox_ez/keymaps/ordinary/keymap.c b/keyboard/ergodox_ez/keymaps/ordinary/keymap.c
index 3343c22963..4dd6d883ca 100644
--- a/keyboard/ergodox_ez/keymaps/ordinary/keymap.c
+++ b/keyboard/ergodox_ez/keymaps/ordinary/keymap.c
@@ -7,7 +7,7 @@
 #define MDIA 2 // media keys
 
 /*
- * Ordinary Ergodox EZ keyboard layout, v1
+ * Ordinary Ergodox EZ keyboard layout, v2
  * modifications from default by Nicholas Keene ergodoxez@nicholaskeene.com
  * Details: http://nicholas.rinard.us/2016/03/ergodox-ez-layout.html
  */
@@ -16,13 +16,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* Keymap 0: Basic layer
  *
  * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |  Grv   |   1  |   2  |   3  |   4  |   5  | ESC  |           |  =   |   6  |   7  |   8  |   9  |   0  |   -    |
+ * |  Grv   |   1  |   2  |   3  |   4  |   5  | ESC  |           |  -   |   6  |   7  |   8  |   9  |   0  |   =    |
  * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * | Tab    |   Q  |   W  |   E  |   R  |   T  |   \  |           |   /  |   Y  |   U  |   I  |   O  |   P  |  ~L2   |
+ * | Tab    |   Q  |   W  |   E  |   R  |   T  |   [  |           |  ]   |   Y  |   U  |   I  |   O  |   P  | MDIA \ |
  * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * | ~L1    |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |; / L2|  ~L1   |
- * |--------+------+------+------+------+------|  [   |           |  ]   |------+------+------+------+------+--------|
- * | LShift |Z/Ctrl|   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |   ,  |   .  |'/Ctrl| RShift |
+ * | SYMB   |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |  ;   | SYMB ' |
+ * |--------+------+------+------+------+------|Shift |           | Tab  |------+------+------+------+------+--------|
+ * | LShift |   Z  |   X  |   C  |   V  |   B  | -Tab |           |      |   N  |   M  |   ,  |   .  |  /   | RShift |
  * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
  *   |LCtrl | Meh  |Hyper | LAlt | LGui |                                       | RGui | RAlt | Hyper|  Meh |RCtrl |
  *   `----------------------------------'                                       `----------------------------------'
@@ -37,20 +37,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // If it accepts an argument (i.e, is a function), it doesn't need KC_.
 // Otherwise, it needs KC_*
 [BASE] = KEYMAP(  // layer 0 : default
-        // left hand
-        KC_GRV, KC_1,        KC_2,  KC_3, KC_4, KC_5, KC_ESC,
-        KC_TAB, KC_Q,        KC_W,  KC_E, KC_R, KC_T, KC_BSLS,
-        KC_FN1, KC_A,        KC_S,  KC_D, KC_F, KC_G,
-        KC_LSFT,CTL_T(KC_Z), KC_X,  KC_C, KC_V, KC_B, KC_LBRC,
-        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,
+   // left hand
+   KC_GRV,   KC_1,        KC_2,  KC_3, KC_4,   KC_5, KC_ESC,
+   KC_TAB,   KC_Q,        KC_W,  KC_E, KC_R,   KC_T, KC_LBRC,
+   MO(SYMB), KC_A,        KC_S,  KC_D, KC_F,   KC_G,
+   KC_LSFT,  CTL_T(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,
+
                                                                 // right hand
-                                                                KC_EQL,  KC_6, KC_7,    KC_8,    KC_9,        KC_0,          KC_MINS,
-                                                                KC_SLSH, KC_Y, KC_U,    KC_I,    KC_O,        KC_P,          LT(MDIA, KC_SLSH),
-                                                                         KC_H, KC_J,    KC_K,    KC_L,        KC_SCLN,       KC_FN1,
-                                                                KC_RBRC, KC_N, KC_M,    KC_COMM, KC_DOT,      CTL_T(KC_QUOT),KC_RSFT,
+                                                                KC_MINS, KC_6, KC_7,    KC_8,    KC_9,        KC_0,          KC_EQL,
+                                                                KC_RBRC, KC_Y, KC_U,    KC_I,    KC_O,        KC_P,          LT(MDIA, KC_BSLS),
+                                                                         KC_H, KC_J,    KC_K,    KC_L,        KC_SCLN,       LT(SYMB, KC_QUOT),
+                                                                KC_TAB,  KC_N, KC_M,    KC_COMM, KC_DOT,      CTL_T(KC_SLSH),KC_RSFT,
                                                                                KC_RGUI, KC_RALT, ALL_T(KC_NO),MEH_T(KC_NO),  KC_RCTL,
                                                                 KC_LEFT, KC_RGHT,
                                                                 KC_UP,
@@ -59,82 +60,82 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* Keymap 1: Symbol Layer
  *
  * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |  F1  |  F2  |  F3  |  F4  |  F5  |      |           |      |  F6  |  F7  |  F8  |  F9  |  F10 |   F11  |
+ * |  Esc   |  F1  |  F2  |  F3  |  F4  |  F5  |      |           |      |  F6  |  F7  |  F8  |  F9  |  F10 |   F11  |
  * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |   !  |   @  |   {  |   }  |   |  |      |           |      |   Up |   7  |   8  |   9  |   *  |   F12  |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |   #  |   $  |   (  |   )  |   `  |------|           |------| Down |   4  |   5  |   6  |   +  |        |
+ * |  MDIA  |   !  |   @  |   {  |   }  |   &  |  <   |           |  >   |   |  |   7  |   8  |   9  |   /  |   F12  |
  * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * | CAPS   |   %  |   ^  |   [  |   ]  |   ~  |      |           |      |   &  |   1  |   2  |   3  |   \  |  CAPS  |
+ * |        |   #  |   $  |   (  |   )  |   `  |------|           |------|   /  |   4  |   5  |   6  |   *  |        |
+ * |--------+------+------+------+------+------| Tab  |           | Shift|------+------+------+------+------+--------|
+ * |        |   %  |   ^  |   [  |   ]  |   ~  |      |           |  -Tab|   \  |   1  |   2  |   3  |   -  |  CAPS  |
  * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      |      |      |                                       |      |    . |   0  |   =  |      |
+ *   |      |      |      |      |      |                                       |   0  |    . |   =  |   +  |      |
  *   `----------------------------------'                                       `----------------------------------'
  *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
+ *                                        | Left | Right|       | Home | End  |
  *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |      |
- *                                 |      |      |------|       |------|      |      |
- *                                 |      |      |      |       |      |      |      |
+ *                                 |      |      |  Up  |       | PgUp |      |      |
+ *                                 |Space |Enter |------|       |------|BackSp| Del  |
+ *                                 |      |      | Down |       | PgDn |      |      |
  *                                 `--------------------'       `--------------------'
  */
 // SYMBOLS
 [SYMB] = KEYMAP(
        // left hand
-       KC_TRNS,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
-       KC_TRNS,KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_PIPE,KC_TRNS,
-       KC_TRNS,KC_HASH,KC_DLR, KC_LPRN,KC_RPRN,KC_GRV,
-       KC_CAPS,KC_PERC,KC_CIRC,KC_LBRC,KC_RBRC,KC_TILD,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_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
+       MO(MDIA),         KC_EXLM,KC_AT,  KC_LCBR,KC_RCBR,KC_AMPR,LSFT(KC_COMM),
+       KC_TRNS,          KC_HASH,KC_DLR, KC_LPRN,KC_RPRN,KC_GRV,
+       KC_TRNS,          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,  KC_F11,
-                                                                     KC_TRNS, KC_UP,   KC_7,   KC_8,    KC_9,    KC_ASTR, KC_F12,
-                                                                              KC_DOWN, KC_4,   KC_5,    KC_6,    KC_PLUS, KC_TRNS,
-                                                                     KC_TRNS, KC_AMPR, KC_1,   KC_2,    KC_3,    KC_BSLS, KC_CAPS,
-                                                                                       KC_TRNS,KC_DOT,  KC_0,    KC_EQL,  KC_TRNS,
-                                                                     KC_TRNS, KC_TRNS,
-                                                                     KC_TRNS,
-                                                                     KC_TRNS, KC_TRNS, KC_TRNS
+                                                                     KC_TRNS,      KC_F6,   KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,
+                                                                     LSFT(KC_DOT), KC_PIPE, KC_P7,  KC_P8,   KC_P9,   KC_PSLS, KC_F12,
+                                                                                   KC_SLSH, KC_P4,  KC_P5,   KC_P6,   KC_PAST, KC_TRNS,
+                                                                     LSFT(KC_TAB), KC_BSLS, KC_P1,  KC_P2,   KC_P3,   KC_PMNS, KC_CAPS,
+                                                                                            KC_P0,  KC_DOT,  KC_PEQL, KC_PPLS, KC_PENT,
+                                                                     KC_HOME,      KC_END,
+                                                                     KC_PGUP,
+                                                                     KC_PGDN,      KC_BSPC, KC_DEL
 ),
 /* Keymap 2: Media and mouse keys
  *
  * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |      |      |      |      |      | Sleep|           |      |      |      |      |MyComp| Mail |        |
+ * |  Esc   |ShutDn| Sleep| Mute |Vol Dn|Vol Up|      |           |      |      |PrtSc | PgUp |MyComp| Mail |        |
  * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |      |      | MsUp |ScrlUp|      |ScrlUp|           |ScrlUp|      |      |      |      | Mute |        |
+ * |        |      |      | MsUp |ScrlUp|      |ScrlUp|           |ScrlUp|      |ScrlUp|  Up  |      |      |        |
  * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |MsLeft|MsDown|MsRght|      |------|           |------|      |      |      |      |      |        |
+ * |        |      |MsLeft|MsDown|MsRght|      |------|           |------| Home | Left | Down | Right| End  |        |
  * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |      |MsDown|ScrlDn|      |ScrlDn|           |ScrlDn|      |      |      |      |      |        |
+ * |        |      |      |MsDown|ScrlDn|      |ScrlDn|           |ScrlDn|      |ScrlDn| Down |      |      |        |
  * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      | Lclk | Rclk |                                       |      |      |      |      |      |
+ *   |      |      |      | Lclk | Rclk |                                       |      | PgDn |      |      |      |
  *   `----------------------------------'                                       `----------------------------------'
  *                                        ,-------------.       ,-------------.
  *                                        | Stop |Refrsh|       | Prev | Next |
  *                                 ,------|------|------|       |------+------+------.
- *                                 |Brwser|Brwser| Home |       |VolUp |      |      |
- *                                 |Back  | Fwd  |------|       |------| Stop | Play |
- *                                 |      |      |Search|       |VolDn |      |      |
+ *                                 |Brwser|Brwser|Search|       |VolUp |      |      |
+ *                                 |Back  | Fwd  |------|       |------| Stop | Play-|
+ *                                 |      |      | Home |       |VolDn |      | Pause|
  *                                 `--------------------'       `--------------------'
  */
 // MEDIA AND MOUSE
 [MDIA] = KEYMAP(
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_SLEP,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_WH_U, KC_TRNS, KC_WH_U,
+       KC_ESC,  KC_PWR,  KC_SLEP, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS,
+       MO(MDIA), KC_TRNS, KC_TRNS, KC_MS_U, KC_WH_U, KC_TRNS, KC_WH_U,
        KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_D, KC_TRNS, KC_TRNS, KC_WH_D,
        KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_WH_D,
                                                     KC_WSTP, KC_WREF,
-                                                             KC_WHOM,
-                                           KC_WBAK, KC_TRNS, KC_WSCH,
+                                                             KC_WSCH,
+                                           KC_WBAK, KC_TRNS, KC_WHOM,
                                                                      // right hand
-                                                                     KC_WSCH,  KC_TRNS, KC_TRNS, KC_TRNS, KC_MYCM, KC_MAIL, KC_TRNS,
-                                                                     KC_WH_U,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE, KC_TRNS,
-                                                                               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-                                                                     KC_WH_D,  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_PSCR, KC_PGUP, KC_MYCM, KC_MAIL, KC_TRNS,
+                                                                     KC_WH_U,  KC_TRNS, KC_WH_U, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS,
+                                                                               KC_HOME, KC_LEFT, KC_DOWN, KC_RIGHT,KC_END, KC_TRNS,
+                                                                     KC_WH_D,  KC_TRNS, KC_WH_D, KC_DOWN, KC_TRNS, KC_TRNS, KC_TRNS,
+                                                                                        KC_TRNS, KC_PGDN, KC_TRNS,KC_TRNS, KC_TRNS,
                                                                      KC_MPRV, KC_MNXT,
                                                                      KC_VOLU,
                                                                      KC_VOLD, KC_MSTP, KC_MPLY
@@ -188,3 +189,4 @@ void matrix_scan_user(void) {
     }
 
 };
+
diff --git a/keyboard/ergodox_ez/keymaps/ordinary/ordinary-base.png b/keyboard/ergodox_ez/keymaps/ordinary/ordinary-base.png
new file mode 100644
index 0000000000..b32b95533c
--- /dev/null
+++ b/keyboard/ergodox_ez/keymaps/ordinary/ordinary-base.png
diff --git a/keyboard/ergodox_ez/keymaps/ordinary/ordinary-base.txt b/keyboard/ergodox_ez/keymaps/ordinary/ordinary-base.txt
new file mode 100644
index 0000000000..727775ea2c
--- /dev/null
+++ b/keyboard/ergodox_ez/keymaps/ordinary/ordinary-base.txt
@@ -0,0 +1,27 @@
+[{x:3.5},"#\n3",{x:10.5},"*\n8"],
+[{y:-0.875,x:2.5},"@\n2",{x:1},"$\n4",{x:8.5},"&\n7",{x:1},"(\n9"],
+[{y:-0.875,x:5.5},"%\n5",{c:"#ff4444"},"Esc",{x:4.5,c:"#cccccc"},"_\n\n\n\n\n\n-","^\n6"],
+[{y:-0.875,c:"#73ab6a",w:1.5},"~\n\n\n\n\n\n`",{c:"#cccccc"},"!\n1",{x:14.5},")\n0",{t:"#000000\n\n\n\n#0000ff",w:1.5},"+\n\n\n\n\n\n="],
+[{y:-0.375,x:3.5,t:"#000000"},"E",{x:10.5},"I"],
+[{y:-0.875,x:2.5},"W",{x:1},"R",{x:8.5},"U",{x:1},"O"],
+[{y:-0.875,x:5.5},"T",{h:1.5},"{\n\n\n\n\n\n[",{x:4.5,h:1.5},"}\n\n\n\n\n\n]","Y"],
+[{y:-0.875,c:"#73ab6a",w:1.5},"Tab",{c:"#cccccc"},"Q",{x:14.5},"P",{c:"#2277ff",fa:[0,0,0,1],w:1.5},"|\n\\\nMedia\nL2"],
+[{y:-0.375,x:3.5,c:"#cccccc"},"D",{x:10.5},"K"],
+[{y:-0.875,x:2.5},"S",{x:1},"F",{x:8.5},"J",{x:1},"L"],
+[{y:-0.875,x:5.5},"G",{x:6.5},"H"],
+[{y:-0.875,c:"#2277ff",w:1.5},"Symbols\n\n\nL1",{c:"#cccccc"},"A",{x:14.5},":\n;",{c:"#2277ff",w:1.5},"\"\n'\nSymbols\nL1"],
+[{y:-0.625,x:6.5,c:"#bfbf67",h:1.5},"< Tab\n\n\nShift Tab",{x:4.5,h:1.5},"Tab >\n\n\nTab"],
+[{y:-0.75,x:3.5,c:"#cccccc"},"C",{x:10.5},"<\n,"],
+[{y:-0.875,x:2.5},"X",{x:1},"V",{x:8.5},"M",{x:1},">\n."],
+[{y:-0.875,x:5.5},"B",{x:6.5},"N"],
+[{y:-0.875,c:"#2277ff",w:1.5},"Capitals\n\n\nShift",{c:"#cccccc"},"Z\n\nCtrl",{x:14.5},"?\n/\nCtrl",{c:"#2277ff",w:1.5},"\n\nCapitals\nShift"],
+[{y:-0.375,x:3.5,c:"#77aaff"},"Option\n\n\nLAlt",{x:10.5},"Option\n\n\nRAlt"],
+[{y:-0.875,x:2.5},"Hyper",{x:1},"Cmd\n\n\nSuper",{x:8.5},"Cmd\n\n\nSuper",{x:1},"Hyper"],
+[{y:-0.75,x:0.5},"Ctrl\n\n\nLCtrl","Meh",{x:14.5},"Meh","Ctrl\n\n\nRCtrl"],
+[{r:30,rx:6.5,ry:4.25,y:-1,x:1,c:"#bfbf67"},"Home","End"],
+[{h:2},"< Del\n\n\nBackspace",{h:2},"Del >\n\n\nDelete","Page\n\n\n\n\n\nUp"],
+[{x:2},"Page\n\n\n\n\n\nDown"],
+[{r:-30,rx:13,y:-1,x:-3},"Left","Right"],
+[{x:-3},"Up",{h:2},"Enter",{h:2},"Space"],
+[{x:-3},"Down"]
+
diff --git a/keyboard/ergodox_ez/keymaps/ordinary/ordinary-media.png b/keyboard/ergodox_ez/keymaps/ordinary/ordinary-media.png
new file mode 100644
index 0000000000..89d15e4506
--- /dev/null
+++ b/keyboard/ergodox_ez/keymaps/ordinary/ordinary-media.png
diff --git a/keyboard/ergodox_ez/keymaps/ordinary/ordinary-media.txt b/keyboard/ergodox_ez/keymaps/ordinary/ordinary-media.txt
new file mode 100644
index 0000000000..4237f08201
--- /dev/null
+++ b/keyboard/ergodox_ez/keymaps/ordinary/ordinary-media.txt
@@ -0,0 +1,27 @@
+[{x:3.5,c:"#9988bb"},"Vol\n\n\n\n\n\nMute",{x:10.5,c:"#ccffff"},"Page\n\n\n\n\n\nUp"],
+[{y:-0.875,x:2.5,c:"#9988bb"},"Sleep",{x:1},"Vol\n\n\n\n\n\nDown",{x:8.5},"Print\n\n\n\n\n\nScreen",{x:1},"Home\n\n\n\n\n\nDir"],
+[{y:-0.875,x:5.5},"Vol\n\n\n\n\n\nUp",{c:"#ff4444"},"Esc",{x:4.5,c:"#cccccc",a:7},"",""],
+[{y:-0.875,c:"#ff4444",a:4,w:1.5},"Esc",{c:"#9988bb"},"Shut\n\n\n\n\n\nDown",{x:14.5},"Email",{c:"#cccccc",a:7,w:1.5},""],
+[{y:-0.375,x:3.5,c:"#ccffff",a:4},"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:"#99ffff",a:4},"Scroll\n\n\n\n\n\nUp",{x:8.5},"Scroll\n\n\n\n\n\nUp",{x:1,c:"#cccccc",a:7},""],
+[{y:-0.875,x:5.5},"",{c:"#99ffff",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:"#cccccc",a:7},""],
+[{y:-0.875,c:"#000000",t:"#ff0000",a:4,fa:[0,0,0,1],w:1.5},"Media\n\n\nL2",{c:"#cccccc",t:"#000000",a:7},"",{x:14.5},"",{c:"#000000",t:"#ff0000",a:4,w:1.5},"\n\nMedia\nL2"],
+[{y:-0.375,x:3.5,c:"#ccffff",t:"#000000"},"Mouse\n\n\n\n\n\nDown",{x:10.5},"Cursor\n\n\n\n\n\nDown"],
+[{y:-0.875,x:2.5},"Mouse\n\n\n\n\n\nLeft",{x:1},"Mouse\n\n\n\n\n\nRight",{x:8.5},"Cursor\n\n\n\n\n\nLeft",{x:1},"Cursor\n\n\n\n\n\nRight"],
+[{y:-0.875,x:5.5,c:"#cccccc",a:7},"",{x:6.5,c:"#ccffff",a:4},"Home"],
+[{y:-0.875,c:"#000000",t:"#ff0000",w:1.5},"Symbols\n\n\nL1",{c:"#cccccc",t:"#000000",a:7},"",{x:14.5,c:"#ccffff",a:4},"End",{c:"#cccccc",a:7,w:1.5},""],
+[{y:-0.625,x:6.5,c:"#99ffff",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:"#ccffff"},"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:"#99ffff",a:4},"Scroll\n\n\n\n\n\nDown",{x:8.5},"Scroll\n\n\n\n\n\nDown",{x:1,c:"#cccccc",a:7},""],
+[{y:-0.875,x:5.5},"",{x:6.5},""],
+[{y:-0.875,w:1.5},"","",{x:14.5},"",{w:1.5},""],
+[{y:-0.375,x:3.5,c:"#ccffff",a:4},"Left\n\n\n\n\n\nClick",{x:10.5},"Page\n\n\n\n\n\nDown"],
+[{y:-0.875,x:2.5,c:"#cccccc",a:7},"",{x:1,c:"#ccffff",a:4},"Right\n\n\n\n\n\nClick",{x:8.5,c:"#cccccc",a:7},"",{x:1},""],
+[{y:-0.75,x:0.5},"","",{x:14.5},"",""],
+[{r:30,rx:6.5,ry:4.25,y:-1,x:1,c:"#bbaacc",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:"#9988bb"},"Vol\n\n\n\n\n\nUp",{c:"#bbaacc",h:2},"Stop\n\n\nAudio",{h:2},"Play\n\n\nAudio\n\n\nPause"],
+[{x:-3,c:"#9988bb"},"Vol\n\n\n\n\n\nDown"]
+
diff --git a/keyboard/ergodox_ez/keymaps/ordinary/ordinary-symbol.png b/keyboard/ergodox_ez/keymaps/ordinary/ordinary-symbol.png
new file mode 100644
index 0000000000..7522af3330
--- /dev/null
+++ b/keyboard/ergodox_ez/keymaps/ordinary/ordinary-symbol.png
diff --git a/keyboard/ergodox_ez/keymaps/ordinary/ordinary-symbol.txt b/keyboard/ergodox_ez/keymaps/ordinary/ordinary-symbol.txt
new file mode 100644
index 0000000000..dda15f71be
--- /dev/null
+++ b/keyboard/ergodox_ez/keymaps/ordinary/ordinary-symbol.txt
@@ -0,0 +1,27 @@
+[{x:3.5,c:"#a3a3a3"},"F3",{x:10.5},"F8"],
+[{y:-0.875,x:2.5},"F2",{x:1},"F4",{x:8.5},"F7",{x:1},"F9"],
+[{y:-0.875,x:5.5},"F5",{c:"#ff4444"},"Esc",{x:4.5,c:"#cccccc",a:7},"",{c:"#a3a3a3",a:4},"F6"],
+[{y:-0.875,c:"#ff4444",w:1.5},"Esc",{c:"#a3a3a3"},"F1",{x:14.5},"F10",{w:1.5},"F11"],
+[{y:-0.375,x:3.5,c:"#bbc6ed"},"{",{x:10.5,c:"#bed4ba"},"8"],
+[{y:-0.875,x:2.5,c:"#bbc6ed"},"@",{x:1},"}",{x:8.5,c:"#bed4ba"},"7",{x:1},"9"],
+[{y:-0.875,x:5.5,c:"#bbc6ed"},"&",{h:1.5},"<",{x:4.5,h:1.5},">","|"],
+[{y:-0.875,c:"#2277ff",fa:[0,0,0,1],w:1.5},"Media\n\n\nL2",{c:"#bbc6ed"},"!",{x:14.5,c:"#bed4ba"},"/",{c:"#a3a3a3",w:1.5},"F12"],
+[{y:-0.375,x:3.5,c:"#bbc6ed"},"(",{x:10.5,c:"#bed4ba"},"5"],
+[{y:-0.875,x:2.5,c:"#bbc6ed"},"$",{x:1},")",{x:8.5,c:"#bed4ba"},"4",{x:1},"6"],
+[{y:-0.875,x:5.5,c:"#bbc6ed"},"`",{x:6.5},"/"],
+[{y:-0.875,c:"#000000",t:"#ff0000",w:1.5},"Symbols\n\n\nL1",{c:"#bbc6ed",t:"#000000"},"#",{x:14.5,c:"#bed4ba"},"*",{c:"#000000",t:"#ff0000",w:1.5},"\n\nSymbols\nL1"],
+[{y:-0.625,x:6.5,c:"#bfbf67",t:"#000000",h:1.5},"Tab >\n\n\nTab",{x:4.5,h:1.5},"< Tab\n\n\nShift Tab"],
+[{y:-0.75,x:3.5,c:"#bbc6ed"},"[",{x:10.5,c:"#bed4ba"},"2"],
+[{y:-0.875,x:2.5,c:"#bbc6ed"},"^",{x:1},"]",{x:8.5,c:"#bed4ba"},"1",{x:1},"3"],
+[{y:-0.875,x:5.5,c:"#bbc6ed"},"~",{x:6.5},"\\"],
+[{y:-0.875,c:"#cccccc",a:7,w:1.5},"",{c:"#bbc6ed",a:4},"%",{x:14.5,c:"#bed4ba"},"-",{c:"#2277ff",w:1.5},"\n\nCaps Lock"],
+[{y:-0.375,x:3.5,c:"#cccccc",a:7},"",{x:10.5,c:"#bed4ba",a:4},"."],
+[{y:-0.875,x:2.5,c:"#cccccc",a:7},"",{x:1},"",{x:8.5,c:"#bed4ba",a:4},"0",{x:1},"="],
+[{y:-0.75,x:0.5,c:"#cccccc",a:7},"","",{x:14.5,c:"#bed4ba",a:4},"+","Enter"],
+[{r:30,rx:6.5,ry:4.25,y:-1,x:1,c:"#bfbf67"},"Left","Right"],
+[{h:2},"Space",{h:2},"Enter","Up"],
+[{x:2},"Down"],
+[{r:-30,rx:13,y:-1,x:-3},"Home","End"],
+[{x:-3},"Page\n\n\n\n\n\nUp",{h:2},"< Del\n\n\nBackspace",{h:2},"Del >\n\n\nDelete"],
+[{x:-3},"Page\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 5a847aa6e7..1a08598465 100644
--- a/keyboard/ergodox_ez/keymaps/ordinary/ordinary.hex
+++ b/keyboard/ergodox_ez/keymaps/ordinary/ordinary.hex
@@ -1,48 +1,48 @@
-:100000000C9465020C94AC020C94AC020C94AC02FF

-:100010000C94AC020C94AC020C94AC020C94AC02A8

-:100020000C94AC020C94AC020C94C30B0C94950C85

-:100030000C94AC020C94AC020C94AC020C94AC0288

-:100040000C94AC020C9409210C94AC020C94AC02FC

-:100050000C94AC020C949B1A0C94AC020C94AC0261

-:100060000C94AC020C94AC020C94AC020C94AC0258

-:100070000C94AC020C94AC020C94AC020C94AC0248

-:100080000C94AC020C94AC020C94AC020C94AC0238

-:100090000C94AC020C94AC020C94AC020C94AC0228

-:1000A0000C94AC020C94AC020C94AC02020D240D26

-:1000B000170E240D170E690D8C0D170EE10DF40DA2

-:1000C000DE10DE100D110D1150118A1197139713C8

-:1000D000A3119713981298126B1397139713821307

-:1000E0000000F0A135002B00C100E100E00000009D

+:100000000C9465020C94A9020C94A9020C94A90208

+:100010000C94A9020C94A9020C94A9020C94A902B4

+:100020000C94A9020C94A9020C94B00B0C94820CB1

+:100030000C94A9020C94A9020C94A9020C94A90294

+:100040000C94A9020C940B210C94A9020C94A90203

+:100050000C94A9020C94AD1A0C94A9020C94A90258

+:100060000C94A9020C94A9020C94A9020C94A90264

+:100070000C94A9020C94A9020C94A9020C94A90254

+:100080000C94A9020C94A9020C94A9020C94A90244

+:100090000C94A9020C94A9020C94A9020C94A90234

+:1000A0000C94A9020C94A9020C94A902E70C090D66

+:1000B000F40D090DF40D4B0D6E0DF40DC30DD60DA1

+:1000C000C310C310F110F11033116F116F136F13C0

+:1000D00087116F137E127E1249136F136F135D1316

+:1000E0000000F0A135002B000152E100E00000000B

 :1000F0001E00140004001D7100774E001F001A003E

 :1001000016001B00007F4C002000080007000600BE

 :10011000E2002A002100150009001900E3004B004D

-:10012000220017000A00050000004A0029003100E3

-:1001300000002F0000004D002E00380000003000AD

+:10012000220017000A00050000004A0029002F00E5

+:1001300000002B0200004D002D00300000002B00BD

 :100140000000500023001C000B00110000004F00B5

 :10015000240018000D001000E700520025000C00DC

 :100160000E003600E6002C00260012000F003700BB

-:10017000007F2800270013003300347100775100FE

-:100180002D003882C100E500E400000001000100FC

-:1001900001003900010000003A001E022002220284

-:1001A000010001003B001F022102230201000100A7

-:1001B0003C002F0226022F00010001003D0030020A

-:1001C00027023000010001003E00310235003502F7

-:1001D000000001000100010000000100000001001A

-:1001E0000100010000000100000001003F0052007A

-:1001F00051002402000001004000240021001E00E4

-:10020000010001004100250022001F00370001000D

-:1002100042002600230020002700010043002502A1

-:100220002E0231002E00010044004500010039007B

-:1002300001000000010001000100010001000000B8

-:1002400001000100010001000100B40001000100F3

-:10025000F2000100010001000100F000F100F100D6

-:10026000F400B6000100F900F3000100FA00B50047

-:1002700001000100010001000000B800A600F90023

-:100280000000FA000000B900B400F9000000FA0014

-:100290000000AC0001000100010001000000AB0003

-:1002A00001000100010001000100A900010001009E

-:1002B000010001000100AE00B300010001000100D7

-:1002C0000100AD00B100A800010001000100AA007A

+:10017000007F2800270013003300387100775100FA

+:100180002E0031823481E500E40000002900025293

+:1001900001000100010000003A001E0220022202BC

+:1001A000010051003B001F02210223020100280030

+:1001B0003C002F0226022F0001002C003D003002DF

+:1001C00027023000010052003E00240235003502B3

+:1001D000000050000100360200002B0000004F001C

+:1001E0000100370200002B0200004A003F003102EC

+:1001F0003800310000004D0040005F005C005900F5

+:1002000062004B00410060005D005A0037004C0066

+:10021000420061005E005B0067002A00430054005A

+:100220005500560057004E004400450001003900BB

+:1002300058000000290002520100010001000000E6

+:10024000A5000100010001000100B500A6000100A9

+:10025000F200010001000100A800F000F100F1002F

+:10026000F400B600AA00F900F3000100FA00B4009F

+:10027000A9000100010001000000B8000100F90020

+:100280000000FA000000B9000100F9000000FA00C7

+:100290000000AC00010001004A0001000000AB00BA

+:1002A0004600F9005000FA000100A9004B0052007E

+:1002B000510051004E00AE00B30001004F0001009C

+:1002C0000100AD00B10001004D0001000100AA00D5

 :1002D00001000100010001000100000016034500BB

 :1002E000720067006F0044006F0078002000450036

 :1002F0005A00000016034500720067006F004400BA

@@ -75,1047 +75,1045 @@
 :1004A0005D71879DB3C7DAE9F5FCFFFCF5E9DAC7B2

 :1004B000B39D87715D4A3A2C20170F0A060402018A

 :1004C0000000000000000000000011241FBECFEF5C

-:1004D000DAE0DEBFCDBF04B603FE27C08091ED0198

-:1004E0009091EE01A091EF01B091F0018730904B17

-:1004F000A740B04BD1F41092ED011092EE01109292

-:10050000EF011092F00114BE84B7877F84BF0FB64D

-:10051000F894A895809160008861809360001092A3

-:1005200060000FBEE0E0FFE3099511E0A0E0B1E05C

-:10053000E4EBF5E402C005900D92A433B107D9F7BE

-:1005400021E0A4E3B1E001C01D92AD3EB207E1F7A6

-:100550000E940A090C94D8220C94000061110BC06F

-:10056000FC018281882321F085EE0E94780F03C070

-:1005700085EE0E94401080E090E00895089560911B

-:10058000B1017091B2018091B3019091B4010E94C8

-:10059000C81956985E9825982D9826982E982798D1

-:1005A0002F98813019F0823021F00895259A2D9AE4

-:1005B0000895269A2E9A08950C94BF0256985E9834

-:1005C00025982D9826982E9827982F988FEF90E0B1

-:1005D000909389008093880090938B0080938A0089

-:1005E00090938D0080938C00259A2D9A2FEF80E7B1

-:1005F00092E0215080409040E1F700C00000269A30

-:100600002E9A2FEF80E792E0215080409040E1F752

-:1006100000C00000279A2F9A2FEF80E792E0215028

-:1006200080409040E1F700C0000025982D982FEF02

-:1006300080E792E0215080409040E1F700C0000048

-:1006400026982E982FEF80E792E02150804090402E

-:10065000E1F700C0000027982F9856985E982598DB

-:100660002D9826982E9827982F98089589EA809398

-:10067000800089E08093810024982C983F988AB16B

-:100680008F748AB96E98479A8BB1806B8BB9769AC2

-:100690000E94DE020C94BE0280E2809300018091F1

-:1006A000340181110EC00E949B0381E080933401CC

-:1006B0002FEF83ED90E3215080409040E1F700C0A0

-:1006C000000080E40E94A1038093000181112EC0EC

-:1006D0000E94CB0380930001811128C00E94CB03AC

-:1006E00080930001811122C08FE30E94CB0380938D

-:1006F000000181111BC00E94C30380E40E94A1037A

-:1007000080930001811112C08CE00E94CB03809382

-:10071000000181110BC00E94CB0380930001811165

-:1007200005C08FE30E94CB03809300010E94C303A6

-:100730008091000108951092B9008AE08093B8007A

-:10074000089594EA9093BC009091BC0097FFFCCF71

-:100750009091B900987F983021F0903111F081E0AC

-:1007600008958093BB0084E88093BC008091BC0016

-:1007700087FFFCCF8091B900887F883111F08034E9

-:1007800071F780E0089584E98093BC008091BC00FB

-:1007900084FDFCCF08958093BB0084E88093BC0067

-:1007A0008091BC0087FFFCCF9091B900987F81E0D9

-:1007B000983209F480E0089584E88093BC00809129

-:1007C000BC0087FFFCCF8091BB00089580910001A1

-:1007D000811115C080E40E94A10380930001811162

-:1007E0000CC082E10E94CB0380930001811105C0FF

-:1007F0008FEF0E94CB03809300010E94C30384B15A

-:10080000807F84B985B1807F85B98AB1837F8AB9B9

-:100810008BB1837F8BB93E98469808950E944C0314

-:10082000809300010E94E60380B38C7080BB81B38B

-:10083000836F81BBE4E4F1E0A6E3B1E011921D9285

-:1008400081E0E235F807D1F70C9436039F92AF921E

-:10085000BF92CF92DF92EF92FF920F931F93CF93AD

-:10086000DF9380910001882379F0809135018F5FBB

-:1008700080933501811108C00E944C0380930001D0

-:10088000811102C00E94DE0286E3E82E81E0F82E8C

-:100890008701C0E0D0E0BB24B39492E0A92ECC2421

-:1008A000C394D12CC730D10500F58091000181118E

-:1008B00064C080E40E94A10380930001811112C0F2

-:1008C00082E10E94CB038093000181110BC0C6011D

-:1008D0000C2E01C0880F0A94EAF780950E94CB0382

-:1008E000809300010E94C30348C0CA30A1F028F4DD

-:1008F000C83059F0C93061F005C0CC3089F070F0D3

-:10090000CD3089F0209A289810C0219A29980DC0DE

-:10091000229A2A980AC0239A2B9807C0529A01C09B

-:10092000539A5B9802C03E9A4698E0EAEA95F1F73E

-:100930008FB181708B25799902C032E001C030E01F

-:10094000832B7C9902C034E001C030E0832B7D9979

-:1009500002C028E001C020E0822B7E9902C090E115

-:1009600001C090E0892B9FB19095991F9927991FFD

-:100970009295990F907E892B0FC080910001811173

-:100980004AC080E40E94A10380930001882381F182

-:10099000912C0E94C303892DD8019C91981719F0BE

-:1009A0008C93A09201010E94E60321960F5F1F4FD6

-:1009B000CE30D10509F076CF80910101882369F10D

-:1009C000815080930101882339F0EFE9FFE03197EE

-:1009D000F1F700C0000021C0E4E4F1E0D7018D91FF

-:1009E0007D018193B4E4EB16B1E0FB06B9F715C0C5

-:1009F00083E10E94CB03809300018111C9CF81E480

-:100A00000E94A103809300018111C2CF0E94DC03E8

-:100A1000982E9094BECF80E0BFCF0E94DC0281E090

-:100A2000DF91CF911F910F91FF90EF90DF90CF90CA

-:100A3000BF90AF909F900895E82FF0E0EC5BFE4FE1

-:100A40008081089508958B3B910580F4883A910543

-:100A500048F5853A9105D8F48430910508F0B2C084

-:100A6000019709F06EC081E090E00895803E910505

-:100A700008F467C0883E910508F4A4C09C01205F7B

-:100A800031092031310508F05CC090650895853A40

-:100A9000910509F459C0863A910509F058C082E8D9

-:100AA00090E40895883A910509F454C0893A910573

-:100AB00009F453C08A3A910509F452C08B3A910562

-:100AC00009F451C08C3A910509F450C08D3A910552

-:100AD00009F44FC0803B910509F44EC08E3A910550

-:100AE00009F44DC08F3A910509F44CC0813B910542

-:100AF00009F44BC0823B910509F44AC0833B910540

-:100B000009F449C0843B910509F448C0853B91052F

-:100B100009F447C0863B910509F446C0873B91051F

-:100B200009F445C0883B910509F444C0893B91050F

-:100B300009F443C08A3B910509F442C080E094E483

-:100B4000089580E090E0089581E890E4089583E8B6

-:100B500090E4089582EE94E4089589EE94E4089573

-:100B60008AEE94E4089585EB94E4089586EB94E48A

-:100B7000089587EB94E408958CEC94E408958DEC4B

-:100B800094E4089583E895E408958AE895E4089547

-:100B900082E995E4089584E995E4089581E296E474

-:100BA000089583E296E4089584E296E4089585E248

-:100BB00096E4089586E296E4089587E296E408951F

-:100BC0008AE296E40895089524E5829FC0011124E5

-:100BD000FC0126E0729FE00DF11D1124E60FF11DCE

-:100BE000EE0FFF1FEC51FF4F859194910895880FF0

-:100BF000991FFC01E05AF040859194910895880F67

-:100C0000991FFC01E052FF4F85919491089524E5CE

-:100C1000829FC0011124FC0146E0749FE00DF11D8C

-:100C20001124E60FF11DEE0FFF1FEC51FF4F8591D0

-:100C300094919C013A9521154FE1340708F425C1A0

-:100C40003F512115304120F49F700E94FF05089507

-:100C50009C0130532115304118F49927906C089568

-:100C6000811520E5920769F40E94B9134FEF84E3E0

-:100C70009CE0415080409040E1F700C000000C949F

-:100C8000C01A813020E5920731F48091CC01816057

-:100C90008093CC0108959C0130552115304108F016

-:100CA0005CC0292F33272F70332721303105E9F419

-:100CB000AC0164E0440F551F6A95E1F74427537077

-:100CC000BC016370772702C0220F331F6A95E2F7D9

-:100CD0003C68242B352B73E0880F991F7A95E1F738

-:100CE00080769927822B932B08952230310529F4A1

-:100CF000982F8827816F906A089523303105A1F4D9

-:100D0000AC0133E0440F551F3A95E1F7407E577030

-:100D10008370992721E030E002C0220F331F8A95AB

-:100D2000E2F7C9019C6816C02430310531F5AC01E9

-:100D300023E0440F551F2A95E1F7407E57708370DA

-:100D4000992721E030E002C0220F331F8A95E2F795

-:100D5000C9019A68842B952B08959C013057211561

-:100D6000304118F49F70906208959C01305821150D

-:100D7000304118F49F70906A0895803E9105E0F428

-:100D8000803C910558F58133910509F46FC048F412

-:100D90008932910509F463C08A32910509F46DC066

-:100DA00072C089339105E9F082389105D1F085331D

-:100DB000910509F44DC067C0833E910581F138F477

-:100DC000803E9105B9F0823E9105D9F05CC0863E27

-:100DD000910561F1873E9105A1F155C00E94F7058B

-:100DE00008952091DE0120FD02C021FF4CC080EE5D

-:100DF00090E049C08091DE0180FFF9CF89E390E067

-:100E000042C08091DE0182FF0EC08091DE0184FF2E

-:100E100003C080E090E037C083EE90E034C0809162

-:100E2000DE0182FFF2CF82EE90E02DC08091DE01E4

-:100E300083FF0BC08091DE0184FDEBCF87EE90E055

-:100E400022C08091DE0183FFF5CF86EE90E01BC0CB

-:100E50008091DE0185FF07C089E290E014C0809197

-:100E6000DE0185FFF9CF85E390E00DC08091DE01C2

-:100E700086FF07C08AE290E006C08091DE0186FF0F

-:100E8000F9CF81E390E00E942305089508958091B1

-:100E900062010895CF93DF9300D01F92CDB7DEB7E4

-:100EA0009C018091E401843019F593E099833B83A0

-:100EB0002A839093E9008FEF9091E800815095FD8F

-:100EC00006C095ED9A95F1F700008111F5CF80915C

-:100ED000E80085FF0DC040E050E063E070E0CE0127

-:100EE00001960E94B7098091E8008E778093E80010

-:100EF0000F900F900F90DF91CF910895CF93DF93D4

-:100F000000D01F92CDB7DEB72091E401243021F547

-:100F100022E029839B838A8383E08093E9008FEF1B

-:100F20009091E800815095FD06C095ED9A95F1F7F6

-:100F300000008111F5CF8091E80085FF0DC040E0F1

-:100F400050E063E070E0CE0101960E94B709809105

-:100F5000E8008E778093E8000F900F900F90DF915C

-:100F6000CF9108959C018091E4018430F9F482E0EE

-:100F70008093E9009FEF8091E800915085FD06C0C5

-:100F800085ED8A95F1F700009111F5CF8091E80089

-:100F900085FF0CC040E050E065E070E0C9010E94B0

-:100FA000B7098091E8008E778093E8000895CF9389

-:100FB000DF93EC018091E401843009F046C0909108

-:100FC0000C019923D9F090910D019923B9F08093E8

-:100FD000E9008FEF9091E800815095FD06C095E102

-:100FE0009A95F1F700008111F5CF8091E80085FF17

-:100FF0002CC040E050E060E170E017C081E08093D9

-:10100000E9008FEF9091E800815095FD06C095EDC5

-:101010009A95F1F700008111F5CF8091E80085FFE6

-:1010200014C040E050E068E070E0CE010E94B709D3

-:101030008091E8008E778093E80080E1FE01A2E5D0

-:10104000B1E001900D928A95E1F7DF91CF9108957B

-:101050008091E301811109C00E94480B0E94A50BF9

-:101060008091E20084608093E20008951092E30191

-:10107000089508950C94F6200E94561A0E94FC20B0

-:101080000E94500E0C94460742E061EC81E00E9401

-:10109000C10A42E061EC82E00E94C10A42E061ECD8

-:1010A00083E00E94C10A42E161EC84E00C94C10A31

-:1010B0008091E601833009F455C030F4813071F03D

-:1010C000823009F48EC008958A3009F47AC08B30DA

-:1010D00009F460C0893009F09CC020C08091E5010E

-:1010E000813A09F096C08091E800877F8093E800FC

-:1010F0008091E9019091EA01892B21F460E182E578

-:1011000091E003C060E080E090E070E00E94020A9D

-:101110008091E8008B778093E80008958091E50145

-:10112000813209F076C08091E9019091EA0100973F

-:1011300019F0039709F06DC08091E800877F8093D4

-:10114000E8008091E80082FD05C08091E4018111F2

-:10115000F8CF5FC08091F100809362018091E80038

-:101160008B7753C08091E501813A09F052C080919C

-:10117000E9019091EA01892B09F04BC08091E800C8

-:10118000877F8093E8008091E80080FFFCCF80910A

-:101190000C0136C08091E5018132D9F58091E901D9

-:1011A0009091EA01892BA9F58091E800877F8093CF

-:1011B000E8000E94F60A8091E70180930C010C94EC

-:1011C000B9138091E501813221F58091E800877F94

-:1011D0008093E8000E94F60A8091E8018093630101

-:1011E00008958091E501813AA1F48091E800877F1C

-:1011F0008093E8008091E80080FFFCCF809163013C

-:101200008093F1008091E8008E778093E8000C9441

-:10121000F60A089584B7877F84BF0FB6F894A8951F

-:1012200080916000886180936000109260000FBE22

-:1012300090E080E80FB6F89480936100909361008D

-:101240000FBE0E949F0E0E94480B0E94A50B80912A

-:10125000E20084608093E20078940E94300E0E9445

-:10126000A10E82E091E00E944B0E0E94E42080914A

-:10127000E401853069F40E94181A8091E201882304

-:10128000B1F30E94421A882391F30E94A109EFCF83

-:101290000E94A70EECCF292F332723303105C9F048

-:1012A00060F42130310581F02230310509F041C070

-:1012B0008DE690E020E133E040C021323105E1F0DD

-:1012C0002232310531F135C082E190E02DE733E083

-:1012D00034C099278130910549F028F0029749F5EB

-:1012E000ECEDF2E005C0ECE0F3E002C0E4EFF2E088

-:1012F000849190E09F0121C06430D8F4E62FF0E0A3

-:10130000EE0FFF1FEE5DFE4F2081318189E090E0FE

-:1013100014C0643070F470E0FB01EE0FFF1FE65E56

-:10132000FE4F20813181FB01EA5EFE4F808190E01B

-:1013300004C080E090E020E030E0FA0131832083B7