re-created all layouts using ErgodoxLayoutGenerator

3 files changed, 1312 insertions, 1352 deletions

diff --git a/keyboard/ergodox_ez/keymaps/osx_de_adnw_koy/keymap.c b/keyboard/ergodox_ez/keymaps/osx_de_adnw_koy/keymap.c
index 70ac8f01f2..72ed195eb7 100644
--- a/keyboard/ergodox_ez/keymaps/osx_de_adnw_koy/keymap.c
+++ b/keyboard/ergodox_ez/keymaps/osx_de_adnw_koy/keymap.c
@@ -1,229 +1,153 @@
-// Netable differences vs. the default firmware for the ErgoDox EZ:
-// 1. The Cmd key is now on the right side, making Cmd+Space easier.
-// 2. The media keys work on OSX (But not on Windows).
 #include "ergodox_ez.h"
 #include "debug.h"
 #include "action_layer.h"
+#include "keymap_extras/keymap_french.h"
+#include "keymap_extras/keymap_neo2.h"
+#include "keymap_extras/keymap_uk.h"
+#include "keymap_extras/keymap_colemak.h"
+#include "keymap_extras/keymap_french_osx.h"
+#include "keymap_extras/keymap_nordic.h"
+#include "keymap_extras/keymap_dvorak.h"
 #include "keymap_extras/keymap_german.h"
+#include "keymap_extras/keymap_norwegian.c"
+#include "keymap_extras/keymap_fr_ch.h"
+#include "keymap_extras/keymap_german_osx.h"
+#include "keymap_extras/keymap_spanish.h"
+#include "keymap_extras/keymap_bepo.h"
 
-#define BASE 0 // default layer
-#define SYMB 1 // symbols
-#define MDIA 2 // media keys
-#define ADNW 3 // media keys
-#define NUMB 4 // number keys
-
+#define BASE 0
+#define SYMB 1
+#define MDIA 2
+#define QWERTZ 3
+#define NUMB 4
 
+#define UNUSED 0
 
+//Layout keymap.c generated with ErgodoxLayoutGenerator V1.0BETA1
 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_*
-
-/* Keymap 0: ADNW-Koy layer
- * ADNW-Koy is a special layout designed to be ergonomic. Was created using software to determine the most ergonomic way to type German and English texts.
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |  ESC   |   1  |   2  |   3  |   4  |   5  |Lctrl |           |Rctrl |   6  |   7  |   8  |   9  |   0  |   -    |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |  TAB   |   K  |   .  |   O  |   ,  |   Y  | CMD  |           | CMD  |   V  |   G  |   C  |   L  |   ß  |   Z    |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |  ADNW  |   H  |   A  |   E  |   I  |   U  |------|           |------|   D  |   T  |   R  |   N |   S  |  F/L2  |
- * |--------+------+------+------+------+------| LALT |           | RALT |------+------+------+------+------+--------|
- * | LShift |X/Ctrl|   Q  |   Ä  |   Ü  |   Ö  |      |           |      |   B  |   P  |   W  |   M  |J/Ctrl| RShift |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |</L1|  ^  |AltShf| Left | Right|                                       |  Up | Down | CMD-SHIFT |  ´  | //L1 |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        | L1 | LGui |       | Alt  |Ctrl/Esc|
- *                                 ,------|------|------|       |------+--------+------.
- *                                 |      |      | Home |       | PgUp |        |      |
- *                                 | Space|Backsp|------|       |------|  Enter | Space|
- *                                 |      |ace   | End  |       | PgDn |        |      |
- *                                 `--------------------'       `----------------------'
- */
-KEYMAP(
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_K,    KC_DOT,  KC_O,    KC_COMM, KC_Z,    KC_TRNS,
-       KC_TRNS, KC_H,    KC_A,    KC_E,    KC_I,    KC_U,
-       KC_TRNS, CTL_T(KC_X),KC_Q,    DE_AE,   DE_UE,   DE_OE,   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_SLSH,
-       KC_TRNS,  KC_V,    KC_G,    KC_C,    KC_L,    KC_MINS, KC_Y,
-                 KC_D,    KC_T,    KC_R,    KC_N,    KC_S, LT(MDIA,KC_F),
-       KC_TRNS,  KC_B,    KC_P,    KC_W,    KC_M,    CTL_T(KC_J), 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 1: Symbol Layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |  F1  |  F2  |  F3  |  F4  |  F5  |      |           |      |  F6  |  F7  |  F8  |  F9  |  F10 |   F11  |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |      |      |   !  |  ?   |      |      |           |      |   \  |   [  |   ]  |   |  |   #  |   F12  |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |   #  |   $  |   \  |   /  |   .  |------|           |------|   /  |   (  |   )  |   {  |   }  |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |   ^  |   %  |   |  |   ~  |      |           |      |   &  |   <  |   >  |   "  |   '  |    ?   |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      |      |      |                                       |      |      |   .  |   !  |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |      |
- *                                 |      |      |------|       |------|      |      |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-// SYMBOLS
-[SYMB] = KEYMAP(
-       // left hand
-       KC_TRNS,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
-       KC_TRNS,KC_GRV,LSFT(KC_GRV),DE_EXLM,DE_QST,KC_TRNS,KC_TRNS,
-       KC_TRNS,DE_HASH,DE_DLR, LALT(LSFT(KC_7)),DE_SLSH,KC_DOT,
-       KC_TRNS,KC_TRNS,DE_LESS,DE_PERC,LALT(KC_7),LALT(KC_N),KC_TRNS,
-       KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
-                                       KC_TRNS,KC_TRNS,
-                                               KC_TRNS,
-                               KC_TRNS,KC_DEL,KC_TRNS,
-       // right hand
-       KC_TRNS, KC_F6,   KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,
-       KC_TRNS, LALT(LSFT(KC_7)),   LALT(KC_5),   LALT(KC_6),    LALT(KC_7),    DE_HASH, KC_F12,
-                DE_SLSH,   DE_LPRN,   DE_RPRN,    LALT(KC_8),    LALT(KC_9), KC_TRNS,
-       KC_TRNS, DE_AMPR, KC_GRV,   LSFT(KC_GRV),    DE_DQOT,    DE_QUOT, DE_QST,
-                         KC_TRNS,KC_DOT,  KC_EXLM,    KC_TRNS,  KC_TRNS,
-       KC_TRNS, KC_TRNS,
-       KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS
-),
-/* Keymap 2: Media and mouse keys
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |  Play  |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |      |      | MsUp |      |      |      |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |MsLeft|MsDown|MsRght|      |------|           |------|      |      |      |      |      |        |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |           |      |      |      | Prev | Next |      |        |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      | Lclk | Rclk |                                       |VolUp |VolDn | Mute |      |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |Brwser|
- *                                 |      |      |------|       |------|      |Back  |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-// MEDIA AND MOUSE
-KEYMAP(
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
-       KC_TRNS, KC_WH_L, KC_WH_U, KC_WH_D, KC_WH_R, KC_BTN3, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2,
-                                           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_MPLY,
-       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_MUTE, KC_MPRV, KC_MNXT, KC_UP,   KC_TRNS,
-                          KC_VOLU, KC_VOLD, KC_LEFT, KC_DOWN, KC_RIGHT,
-       KC_TRNS, KC_TRNS,
-       KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_WBAK
-),
-/* Keymap 3: qwertz layer
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |  ESC   |   1  |   2  |   3  |   4  |   5  |CMD-V |           |CMD-C |   6  |   7  |   8  |   9  |   0  |   ß    |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |  TAB   |   Q  |   W  |   E  |   R  |   T  | CMD  |           | CMD  |   Z  |   U  |   I  |   O  |   P  |   ü    |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |  ADNW  |   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |   ö  |  ä/L2  |
- * |--------+------+------+------+------+------| LALT |           | RALT |------+------+------+------+------+--------|
- * | LShift |Y/Ctrl|   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |   ,  |   .  |-/Ctrl| RShift |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |</L1|  ^°  |AltShf| Left | Right|                                       |  Up  | Down | CMD-SHIFT |  +  | #/L1 |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,---------------.
- *                                        | MDIA | Meh  |       | Hyper|  NUM   |
- *                                 ,------|------|------|       |------+--------+------.
- *                                 |      |      | Home |       | PgUp |        |      |
- *                                 | Back-|  Del |------|       |------|  Enter | Space|
- *                                 | Space|      | End  |       | PgDn |        |      |
- *                                 `--------------------'       `----------------------'
- */
-
-[BASE] = KEYMAP(  // layer 3 : default qwertz layout
-        // left hand
-        KC_ESC,                  KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   LGUI(KC_V),
-        KC_TAB,                  KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   KC_LGUI,
-        TG(3),                   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_LALT,
-        LT(SYMB,KC_GRV),         DE_LESS,      LALT(KC_LSFT),  KC_LEFT,KC_RGHT,
-                                               TG(2),  MEH_T(LSFT(DE_ACUT)),
-                                                              KC_HOME,
-                                               KC_BSPC,KC_DEL,KC_END,
-        // right hand
-             LGUI(KC_C),     KC_6,   KC_7,   KC_8,   KC_9,   KC_0,             KC_MINS,
-             KC_RGUI,     KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,             DE_UE,
-                          KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,LT(MDIA,DE_AE),
-             KC_RALT,KC_N,   KC_M,   KC_COMM,KC_DOT, CTL_T(KC_SLSH),   KC_RSFT,
-                                  KC_UP,  KC_DOWN,LGUI(KC_LSFT),KC_RBRC,          LT(SYMB,KC_BSLS),
-             ALL_T(DE_ACUT),        TG(4),
-             KC_PGUP,
-             KC_PGDN,KC_ENT, KC_SPC
-    ),
-//numblock
-KEYMAP(
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, 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_F6,   KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,
-       KC_TRNS, KC_UP,   KC_7,   KC_8,    KC_9,    LSFT(KC_RBRC), KC_F12,
-                KC_DOWN, KC_4,   KC_5,    KC_6,    KC_RBRC, KC_TRNS,
-       KC_TRNS, LSFT(KC_6), KC_1,   KC_2,    KC_3,    LSFT(KC_7), KC_TRNS,
-                         KC_0,KC_DOT,  KC_0,    KC_EQL,  KC_TRNS,
-       KC_TRNS, KC_TRNS,
-       KC_TRNS,
-       KC_TRNS, KC_TRNS, KC_TRNS
-),
+[BASE]=KEYMAP(
+//left half
+    KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_LCTL, 
+    KC_TAB, KC_K, KC_DOT, KC_O, KC_COMM, KC_Z, KC_LGUI, 
+    TG(QWERTZ), KC_H, KC_A, KC_E, KC_I, KC_U, 
+    KC_LSFT, CTL_T(KC_X), KC_Q, DE_AE, DE_UE, DE_OE, KC_LALT, 
+                  LT(SYMB,KC_GRV), DE_LESS, LALT(KC_LSFT), KC_LEFT, KC_RGHT, 
+                                              TG(MDIA), MEH_T(LSFT(DE_ACUT)), 
+                                                     KC_HOME, 
+                                       KC_BSPC, KC_DEL, KC_END, 
+    //right half
+    KC_RCTL, KC_6, KC_7, KC_8, KC_9, KC_0, DE_OSX_MINS, 
+    KC_RGUI, KC_V, KC_G, KC_C, KC_L, KC_MINS, KC_Y, 
+           KC_D, KC_T, KC_R, KC_N, KC_S, LT(MDIA,KC_F), 
+    KC_RALT, KC_B, KC_P, KC_W, KC_M, CTL_T(KC_J), KC_RSFT, 
+                         KC_UP, KC_DOWN, LGUI(KC_LSFT), KC_RBRC, LT(SYMB,KC_BSLS), 
+    ALL_T(DE_ACUT), TG(NUMB), 
+    KC_PGUP, 
+    KC_PGDN, KC_ENT, KC_SPC),
+[SYMB]=KEYMAP(
+//left half
+    KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_TRNS, 
+    KC_TRNS, KC_GRV, LSFT(KC_GRV), DE_EXLM, DE_QST, KC_TRNS, KC_TRNS, 
+    KC_TRNS, DE_HASH, DE_DLR, LALT(LSFT(KC_7)), DE_SLSH, KC_DOT, 
+    KC_TRNS, KC_TRNS, DE_LESS, DE_PERC, LALT(KC_7), LALT(KC_N), KC_TRNS, 
+                  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+                                              KC_TRNS, KC_TRNS, 
+                                                     KC_TRNS, 
+                                       KC_TRNS, KC_DEL, KC_TRNS, 
+    //right half
+    KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, 
+    KC_TRNS, LALT(LSFT(KC_7)), LALT(KC_5), LALT(KC_6), LALT(KC_7), DE_HASH, KC_F12, 
+           DE_SLSH, DE_LPRN, DE_RPRN, LALT(KC_8), LALT(KC_9), KC_TRNS, 
+    KC_TRNS, DE_AMPR, KC_GRV, LSFT(KC_GRV), DE_DQOT, DE_QUOT, DE_QST, 
+                         KC_TRNS, KC_DOT, KC_EXLM, KC_TRNS, KC_TRNS, 
+    KC_TRNS, KC_TRNS, 
+    KC_TRNS, 
+    KC_TRNS, KC_TRNS, KC_TRNS),
+[MDIA]=KEYMAP(
+//left half
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS, 
+    KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, 
+    KC_TRNS, KC_WH_L, KC_WH_U, KC_WH_D, KC_WH_R, KC_BTN3, KC_TRNS, 
+                  KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2, 
+                                              KC_TRNS, KC_TRNS, 
+                                                     KC_TRNS, 
+                                       KC_TRNS, KC_TRNS, KC_TRNS, 
+    //right half
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPLY, 
+    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_MUTE, KC_MPRV, KC_MNXT, KC_UP, KC_TRNS, 
+                         KC_VOLU, KC_VOLD, KC_LEFT, KC_DOWN, KC_RIGHT, 
+    KC_TRNS, KC_TRNS, 
+    KC_TRNS, 
+    KC_TRNS, KC_TRNS, KC_WBAK),
+[QWERTZ]=KEYMAP(
+//left half
+    KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, LGUI(KC_V), 
+    KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LGUI, 
+    KC_TRNS, 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_LALT, 
+                  LT(SYMB,KC_GRV), DE_LESS, LALT(KC_LSFT), KC_LEFT, KC_RGHT, 
+                                              KC_TRNS, MEH_T(LSFT(DE_ACUT)), 
+                                                     KC_HOME, 
+                                       KC_BSPC, KC_DEL, KC_END, 
+    //right half
+    LGUI(KC_C), KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, 
+    KC_RGUI, KC_Y, KC_U, KC_I, KC_O, KC_P, DE_UE, 
+           KC_H, KC_J, KC_K, KC_L, KC_SCLN, LT(MDIA,DE_AE), 
+    KC_RALT, KC_N, KC_M, KC_COMM, KC_DOT, CTL_T(KC_SLSH), KC_RSFT, 
+                         KC_UP, KC_DOWN, LGUI(KC_LSFT), KC_RBRC, LT(SYMB,KC_BSLS), 
+    ALL_T(DE_ACUT), KC_TRNS, 
+    KC_PGUP, 
+    KC_PGDN, KC_ENT, KC_SPC),
+[NUMB]=KEYMAP(
+//left half
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, 
+    KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, 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 half
+    KC_TRNS, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, 
+    KC_TRNS, KC_UP, KC_7, KC_8, KC_9, LSFT(KC_RBRC), KC_F12, 
+           KC_DOWN, KC_4, KC_5, KC_6, KC_RBRC, KC_TRNS, 
+    KC_TRNS, LSFT(KC_6), KC_1, KC_2, KC_3, LSFT(KC_7), KC_TRNS, 
+                         KC_0, KC_DOT, KC_0, KC_EQL, KC_TRNS, 
+    KC_TRNS, KC_TRNS, 
+    KC_TRNS, 
+    KC_TRNS, KC_TRNS, KC_TRNS),
 };
 
 const uint16_t PROGMEM fn_actions[] = {
-    [1] = ACTION_LAYER_TAP_TOGGLE(SYMB),                // FN1 - Momentary Layer 1 (Symbols)
-    [2] = ACTION_LAYER_TAP_TOGGLE(ADNW)                // FN2 - Momentary Layer 2 (ADNW)
+
 };
 
 const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
 {
-  // MACRODOWN only works in this function
-      switch(id) {
-        case 0:
+static uint16_t start;
+switch(id) {
+case UNUSED:
+//Macro: UNUSED//-----------------------
+
+
+
+
+
         if (record->event.pressed) {
           register_code(KC_RSFT);
         } else {
           unregister_code(KC_RSFT);
         }
-        break;
-      }
-    return MACRO_NONE;
+        
+
+
+break;
+}
+return MACRO_NONE;
 };
 
 // Runs just one time when the keyboard initializes.
@@ -234,31 +158,18 @@ 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);
+
+ergodox_board_led_off();
+ergodox_right_led_1_off();
+ergodox_right_led_2_off();
+ergodox_right_led_3_off();
+switch (layer) {
 
-    ergodox_board_led_off();
-    ergodox_right_led_1_off();
-    ergodox_right_led_2_off();
-    ergodox_right_led_3_off();
-    switch (layer) {
-      // TODO: Make this relevant to the ErgoDox EZ.
-        case 1:
-            ergodox_right_led_1_on();
-            break;
-        case 2:
-            ergodox_right_led_2_on();
-	    break;
-        case 3:
-            ergodox_right_led_3_on();
-            break;
-        case 4:
-	    ergodox_right_led_1_on();
-            ergodox_right_led_3_on();
-	    //ergodox_board_led_on();
-            break;
-        default:
-            // none
-            break;
-    }
+default:
+// none
+break;
+}
 
 };
+
diff --git a/keyboard/ergodox_ez/keymaps/osx_de_adnw_koy/osx_de_adnw_koy.hex b/keyboard/ergodox_ez/keymaps/osx_de_adnw_koy/osx_de_adnw_koy.hex
index 56448283d2..f574150e34 100644
--- a/keyboard/ergodox_ez/keymaps/osx_de_adnw_koy/osx_de_adnw_koy.hex
+++ b/keyboard/ergodox_ez/keymaps/osx_de_adnw_koy/osx_de_adnw_koy.hex
@@ -1,1122 +1,1171 @@
-:100000000C9466020C94AD020C94AD020C94AD02FB

-:100010000C94AD020C94AD020C94AD020C94AD02A4

-:100020000C94AD020C94AD020C94CF0B0C94A10C6B

-:100030000C94AD020C94AD020C94AD020C94AD0284

-:100040000C94AD020C9415210C94AD020C94AD02ED

-:100050000C94AD020C94A71A0C94AD020C94AD0252

-:100060000C94AD020C94AD020C94AD020C94AD0254

-:100070000C94AD020C94AD020C94AD020C94AD0244

-:100080000C94AD020C94AD020C94AD020C94AD0234

-:100090000C94AD020C94AD020C94AD020C94AD0224

-:1000A0000C94AD020C94AD020C94AD020E0D300D0B

-:1000B000230E300D230E750D980D230EED0D000E41

-:1000C000EA10EA10191119115C119611A313A31368

-:1000D000AF11A313A412A4127713A313A3138E13A7

-:1000E0000000F0A1F0A329002B000354E1003581AA

-:1000F00000001E00140004001D7164004D001F006C

-:100100001A0016001B00E1044C0020000800070044

-:10011000060050002A0021001500090019004F00B8

-:100120004A00220017000A000500000002541908C6

-:10013000E3000000E20000002E770608E700000060

-:10014000E60000002E7F23001C000B0011000000C1

-:100150000454240018000D00100052004B0025002C

-:100160000C000E00360051002C00260012000F007B

-:100170003700E108280027001300330038713000F1

-:100180004E002D002F003482E50031810000010077

-:100190000100010001000100000001000100010058

-:1001A00001000100010001000100500001000100F8

-:1001B0000100010052005100010001000100010096

-:1001C00001004F00010001000100010001000100D9

-:1001D000010000000100010001000000010000001A

-:1001E00001000100010000000100000001003F00CB

-:1001F00052005100230200000100400024002100B1

-:100200001E00270001004100250022001F003700CA

-:1002100001004200260023002000270001004300C7

-:100220003002300024022E0001004400450001008D

-:1002300001000100000001000100010001000100B7

-:100240000000010001000100FB00010001000100AD

-:100250000100F200F900010001000100F000F100CE

-:10026000FA00F400010001000100F300FC00F500B9

-:100270000100010001000100F60000000100010082

-:100280000100000001000000010001000100000069

-:100290000100000001000100010001000100000058

-:1002A0000100010001000100A800A90001000100F7

-:1002B00001000100AC00AA00B6000100010001002D

-:1002C000AB0050000100010001000100520051008C

-:1002D0000100AE000100010001004F000000160304

-:1002E0004500720067006F0044006F007800200036

-:1002F00045005A00000016034500720067006F00B9

-:1003000044006F007800200045005A0000000403FC

-:10031000090409026D00040100A0FA0904000001AB

-:1003200003010100092111010001223F000705819D

-:100330000308000A09040100010301020009211158

-:10034000010001224D000705820308000A0904028A

-:1003500000010300000009211101000122360007FD

-:1003600005830308000A09040300010300000009D3

-:100370002111010001223900070584031000011238

-:1003800001100100000008EDFE071301000102004A

-:100390000105010906A101050719E029E715002556

-:1003A0000195087501810205081901290595057552

-:1003B000019102950175039101050719002977152F

-:1003C000002501957875018102C005010980A10110

-:1003D000850216010026B7001A01002AB700751021

-:1003E00095018100C0050C0901A1018503160100DA

-:1003F000269C021A01002A9C02751095018100C0FA

-:1004000005010902A1010901A10005091901290538

-:10041000150025019505750181029501750381017E

-:100420000501093009311581257F9502750881067E

-:1004300009381581257F950175088106050C0A3854

-:10044000021581257F950175088106C0C005010947

-:1004500006A101050719E029E71500250195087592

-:100460000181029501750881010508190129059589

-:100470000575019102950175039101050719002980

-:10048000FF150025FF950675088100C000000000DB

-:1004900000000000000000010204060A0F17202CD3

-:1004A0003A4A5D71879DB3C7DAE9F5FCFFFCF5E9CF

-:1004B000DAC7B39D87715D4A3A2C20170F0A0604EC

-:1004C00002010000000000000000000011241FBE17

-:1004D000CFEFDAE0DEBFCDBF04B603FE27C08091C8

-:1004E000ED019091EE01A091EF01B091F001873004

-:1004F000904BA740B04BD1F41092ED011092EE0159

-:100500001092EF011092F00114BE84B7877F84BF70

-:100510000FB6F894A8958091600088618093600080

-:10052000109260000FBEE0E0FFE3099511E0A0E04B

-:10053000B1E0ECECF5E402C005900D92A433B107F4

-:10054000D9F721E0A4E3B1E001C01D92AD3EB207AE

-:10055000E1F70E9416090C94E4220C94000061114A

-:100560000BC0FC018281882321F085EE0E94840F5C

-:1005700003C085EE0E944C1080E090E0089508953D

-:100580006091B1017091B2018091B3019091B40179

-:100590000E94D41956985E9825982D9826982E98E2

-:1005A00027982F98823061F018F4813031F0089547

-:1005B000833059F0843039F00895259A2D9A0895A2

-:1005C000269A2E9A0895259A2D9A279A2F9A089559

-:1005D0000C94C00256985E9825982D9826982E98CF

-:1005E00027982F988FEF90E0909389008093880050

-:1005F00090938B0080938A0090938D0080938C0061

-:10060000259A2D9A2FEF80E792E02150804090406C

-:10061000E1F700C00000269A2E9A2FEF80E792E0C3

-:10062000215080409040E1F700C00000279A2F9AA7

-:100630002FEF80E792E0215080409040E1F700C02A

-:10064000000025982D982FEF80E792E02150804000

-:100650009040E1F700C0000026982E982FEF80E729

-:1006600092E0215080409040E1F700C000002798C0

-:100670002F9856985E9825982D9826982E9827980A

-:100680002F98089589EA8093800089E08093810003

-:1006900024982C983F988AB18F748AB96E98479A9B

-:1006A0008BB1806B8BB9769A0E94EA020C94BF02E0

-:1006B00080E2809300018091340181110EC00E947C

-:1006C000A70381E0809334012FEF83ED90E3215065

-:1006D00080409040E1F700C0000080E40E94AD033C

-:1006E0008093000181112EC00E94D70380930001E6

-:1006F000811128C00E94D70380930001811122C07C

-:100700008FE30E94D7038093000181111BC00E94D8

-:10071000CF0380E40E94AD0380930001811112C0D9

-:100720008CE00E94D7038093000181110BC00E94CE

-:10073000D70380930001811105C08FE30E94D70386

-:10074000809300010E94CF038091000108951092D0

-:10075000B9008AE08093B800089594EA9093BC00B1

-:100760009091BC0097FFFCCF9091B900987F983092

-:1007700021F0903111F081E008958093BB0084E86E

-:100780008093BC008091BC0087FFFCCF8091B900B2

-:10079000887F883111F0803471F780E0089584E912

-:1007A0008093BC008091BC0084FDFCCF08958093B1

-:1007B000BB0084E88093BC008091BC0087FFFCCF25

-:1007C0009091B900987F81E0983209F480E0089513

-:1007D00084E88093BC008091BC0087FFFCCF8091AF

-:1007E000BB00089580910001811115C080E40E9432

-:1007F000AD038093000181110CC082E10E94D703F8

-:1008000080930001811105C08FEF0E94D703809370

-:1008100000010E94CF0384B1807F84B985B1807FBD

-:1008200085B98AB1837F8AB98BB1837F8BB93E98B2

-:10083000469808950E945803809300010E94F20395

-:1008400080B38C7080BB81B3836F81BBE4E4F1E043

-:10085000A6E3B1E011921D9281E0E235F807D1F7ED

-:100860000C9442039F92AF92BF92CF92DF92EF928D

-:10087000FF920F931F93CF93DF9380910001882302

-:1008800079F0809135018F5F80933501811108C027

-:100890000E94580380930001811102C00E94EA0265

-:1008A00086E3E82E81E0F82E8701C0E0D0E0BB248B

-:1008B000B39492E0A92ECC24C394D12CC730D10597

-:1008C00000F580910001811164C080E40E94AD03B5

-:1008D00080930001811112C082E10E94D7038093AE

-:1008E000000181110BC0C6010C2E01C0880F0A94B3

-:1008F000EAF780950E94D703809300010E94CF03FE

-:1009000048C0CA30A1F028F4C83059F0C93061F0AD

-:1009100005C0CC3089F070F0CD3089F0209A28984D

-:1009200010C0219A29980DC0229A2A980AC0239AA9

-:100930002B9807C0529A01C0539A5B9802C03E9A06

-:100940004698E0EAEA95F1F78FB181708B257999A5

-:1009500002C032E001C030E0832B7C9902C034E059

-:1009600001C030E0832B7D9902C028E001C020E067

-:10097000822B7E9902C090E101C090E0892B9FB14B

-:100980009095991F9927991F9295990F907E892B81

-:100990000FC08091000181114AC080E40E94AD0324

-:1009A00080930001882381F1912C0E94CF03892D2F

-:1009B000D8019C91981719F08C93A09201010E9484

-:1009C000F20321960F5F1F4FCE30D10509F076CF8D

-:1009D00080910101882369F181508093010188236E

-:1009E00039F0EFE9FFE03197F1F700C0000021C0D6

-:1009F000E4E4F1E0D7018D917D018193B4E4EB163D

-:100A0000B1E0FB06B9F715C083E10E94D7038093DC

-:100A100000018111C9CF81E40E94AD0380930001E0

-:100A20008111C2CF0E94E803982E9094BECF80E03F

-:100A3000BFCF0E94E80281E0DF91CF911F910F911B

-:100A4000FF90EF90DF90CF90BF90AF909F90089570

-:100A5000E82FF0E0EC5BFE4F8081089508958B3B1A

-:100A6000910580F4883A910548F5853A9105D8F4C6

-:100A70008430910508F0B2C0019709F06EC081E0A2

-:100A800090E00895803E910508F467C0883E910586

-:100A900008F4A4C09C01205F31092031310508F021

-:100AA0005CC090650895853A910509F459C0863A6D

-:100AB000910509F058C082E890E40895883A9105BC

-:100AC00009F454C0893A910509F453C08A3A910552

-:100AD00009F452C08B3A910509F451C08C3A910542

-:100AE00009F450C08D3A910509F44FC0803B91053F

-:100AF00009F44EC08E3A910509F44DC08F3A910524

-:100B000009F44CC0813B910509F44BC0823B91052F

-:100B100009F44AC0833B910509F449C0843B91051F

-:100B200009F448C0853B910509F447C0863B91050F

-:100B300009F446C0873B910509F445C0883B9105FF

-:100B400009F444C0893B910509F443C08A3B9105EF

-:100B500009F442C080E094E4089580E090E00895B4

-:100B600081E890E4089583E890E4089582EE94E4A7

-:100B7000089589EE94E408958AEE94E4089585EB4F

-:100B800094E4089586EB94E4089587EB94E4089543

-:100B90008CEC94E408958DEC94E4089583E895E456

-:100BA00008958AE895E4089582E995E4089584E932

-:100BB00095E4089581E296E4089583E296E4089529

-:100BC00084E296E4089585E296E4089586E296E448

-:100BD000089587E296E408958AE296E408950895D8

-:100BE00024E5829FC0011124FC0126E0729FE00DE4

-:100BF000F11D1124E60FF11DEE0FFF1FEA51FF4F0B

-:100C0000859194910895880F991FFC01E05AF04056

-:100C1000859194910895880F991FFC01E052FF4F30

-:100C200085919491089524E5829FC0011124FC01CF

-:100C300046E0749FE00DF11D1124E60FF11DEE0F4B

-:100C4000FF1FEA51FF4F859194919C013A95211520

-:100C50004FE1340708F425C13F512115304120F4FC

-:100C60009F700E940B0608959C013053211530415E

-:100C700018F49927906C0895811520E5920769F47E

-:100C80000E94C5134FEF84E39CE0415080409040A8

-:100C9000E1F700C000000C94CC1A813020E59207E7

-:100CA00031F48091CC0181608093CC0108959C0146

-:100CB00030552115304108F05CC0292F33272F70A3

-:100CC000332721303105E9F4AC0164E0440F551FAE

-:100CD0006A95E1F744275370BC016370772702C01F

-:100CE000220F331F6A95E2F73C68242B352B73E003

-:100CF000880F991F7A95E1F780769927822B932B9D

-:100D000008952230310529F4982F8827816F906A41

-:100D1000089523303105A1F4AC0133E0440F551F91

-:100D20003A95E1F7407E57708370992721E030E0D3

-:100D300002C0220F331F8A95E2F7C9019C6816C0D2

-:100D40002430310531F5AC0123E0440F551F2A95BD

-:100D5000E1F7407E57708370992721E030E002C0B0

-:100D6000220F331F8A95E2F7C9019A68842B952BCD

-:100D700008959C0130572115304118F49F709062FE

-:100D800008959C0130582115304118F49F70906AE5

-:100D90000895803E9105E0F4803C910558F581333B

-:100DA000910509F46FC048F48932910509F463C0D4

-:100DB0008A32910509F46DC072C089339105E9F05A

-:100DC00082389105D1F08533910509F44DC067C093

-:100DD000833E910581F138F4803E9105B9F0823E61

-:100DE0009105D9F05CC0863E910561F1873E910581

-:100DF000A1F155C00E94030608952091DE0120FD57

-:100E000002C021FF4CC080EE90E049C08091DE011D

-:100E100080FFF9CF89E390E042C08091DE0182FF3C

-:100E20000EC08091DE0184FF03C080E090E037C0F7

-:100E300083EE90E034C08091DE0182FFF2CF82EE3B

-:100E400090E02DC08091DE0183FF0BC08091DE0118

-:100E500084FDEBCF87EE90E022C08091DE0183FF1E

-:100E6000F5CF86EE90E01BC08091DE0185FF07C0C4

-:100E700089E290E014C08091DE0185FFF9CF85E31F

-:100E800090E00DC08091DE0186FF07C08AE290E00D

-:100E900006C08091DE0186FFF9CF81E390E00E94D9

-:100EA0002F0508950895809162010895CF93DF93EF

-:100EB00000D01F92CDB7DEB79C018091E401843051

-:100EC00019F593E099833B832A839093E9008FEF90

-:100ED0009091E800815095FD06C095ED9A95F1F747

-:100EE00000008111F5CF8091E80085FF0DC040E042

-:100EF00050E063E070E0CE0101960E94C30980914A

-:100F0000E8008E778093E8000F900F900F90DF91AC

-:100F1000CF910895CF93DF9300D01F92CDB7DEB766

-:100F20002091E401243021F522E029839B838A83E8

-:100F300083E08093E9008FEF9091E800815095FD68

-:100F400006C095ED9A95F1F700008111F5CF8091DB

-:100F5000E80085FF0DC040E050E063E070E0CE01A6

-:100F600001960E94C3098091E8008E778093E80083

-:100F70000F900F900F90DF91CF9108959C01809179

-:100F8000E4018430F9F482E08093E9009FEF8091DE

-:100F9000E800915085FD06C085ED8A95F1F70000C7

-:100FA0009111F5CF8091E80085FF0CC040E050E042

-:100FB00065E070E0C9010E94C3098091E8008E7766

-:100FC0008093E8000895CF93DF93EC018091E401D2

-:100FD000843009F046C090910C019923D9F090918A

-:100FE0000D019923B9F08093E9008FEF9091E8000B

-:100FF000815095FD06C095E19A95F1F700008111A9

-:10100000F5CF8091E80085FF2CC040E050E060E122

-:1010100070E017C081E08093E9008FEF9091E800C5

-:10102000815095FD06C095ED9A95F1F7000081116C

-:10103000F5CF8091E80085FF14C040E050E068E003

-:1010400070E0CE010E94C3098091E8008E77809302

-:10105000E80080E1FE01A2E5B1E001900D928A95E1

-:10106000E1F7DF91CF9108958091E301811109C0EB

-:101070000E94540B0E94B10B8091E2008460809327

-:10108000E20008951092E301089508950C9402215E

-:101090000E94621A0E9408210E945C0E0C94520762

-:1010A00042E061EC81E00E94CD0A42E061EC82E026

-:1010B0000E94CD0A42E061EC83E00E94CD0A42E149

-:1010C00061EC84E00C94CD0A8091E601833009F450

-:1010D00055C030F4813071F0823009F48EC008952B

-:1010E0008A3009F47AC08B3009F460C0893009F085

-:1010F0009CC020C08091E501813A09F096C08091A2

-:10110000E800877F8093E8008091E9019091EA01EF

-:10111000892B21F460E182E591E003C060E080E08A

-:1011200090E070E00E940E0A8091E8008B77809337

-:10113000E80008958091E501813209F076C0809140

-:10114000E9019091EA01009719F0039709F06DC049

-:101150008091E800877F8093E8008091E80082FD1D

-:1011600005C08091E4018111F8CF5FC08091F1004A

-:10117000809362018091E8008B7753C08091E501F4

-:10118000813A09F052C08091E9019091EA01892BDE

-:1011900009F04BC08091E800877F8093E800809140

-:1011A000E80080FFFCCF80910C0136C08091E50102

-:1011B0008132D9F58091E9019091EA01892BA9F555

-:1011C0008091E800877F8093E8000E94020B809165

-:1011D000E70180930C010C94C5138091E5018132E5

-:1011E00021F58091E800877F8093E8000E94020B40

-:1011F0008091E8018093630108958091E501813A2F

-:10120000A1F48091E800877F8093E8008091E80056

-:1012100080FFFCCF809163018093F1008091E80012

-:101220008E778093E8000C94020B089584B7877F33

-:1012300084BF0FB6F894A895809160008861809370

-:101240006000109260000FBE90E080E80FB6F89446

-:1012500080936100909361000FBE0E94AB0E0E94CC

-:10126000540B0E94B10B8091E20084608093E200F5

-:1012700078940E943C0E0E94AD0E82E091E00E94A4

-:10128000570E0E94F0208091E401853069F40E949D

-:10129000241A8091E2018823B1F30E944E1A882318

-:1012A00091F30E94AD09EFCF0E94B30EECCF292F2E

-:1012B000332723303105C9F060F42130310581F046

-:1012C0002230310509F041C08DE690E022E133E0A3

-:1012D00040C021323105E1F02232310531F135C013

-:1012E00082E190E02FE733E034C099278130910507

-:1012F00049F028F0029749F5EEEDF2E005C0EEE086

-:10130000F3E002C0E6EFF2E0849190E09F0121C09B

-:101310006430D8F4E62FF0E0EE0FFF1FEE5DFE4FD5

-:101320002081318189E090E014C0643070F470E075

-:10133000FB01EE0FFF1FE65EFE4F20813181FB01B6

-:10134000EA5EFE4F808190E004C080E090E020E003

-:1013500030E0FA0131832083089580E189BD82E184

-:1013600089BD09B400FEFDCF8091D8008F7D8093A8

-:10137000D8008091E00082608093E0008091E000DE

-:1013800081FDFCCF0895CF92DF92EF92FF920F93F1

-:101390001F93CF93DF93EC018B016A010E94210B15

-:1013A000811133C0C114D10439F0F60180819181DB

-:1013B000081B190BC80FD91FE12CF12C01151105C1

-:1013C00019F18091E80085FD16C08091E8008E77C4

-:1013D0008093E800C114D10449F0F6018081918125

-:1013E000E80EF91EF182E08285E00FC00E94210B19

-:1013F000882321F30AC089918093F10001501109DB

-:10140000FFEFEF1AFF0ADACF80E0DF91CF911F9153

-:101410000F91FF90EF90DF90CF9008952091EB0116

-:101420003091EC012617370748F06115710539F442

-:101430002091E8002E772093E80001C0B901FC015B

-:1014400020E06115710579F18091E4018823F1F1C3

-:101450008530F1F18091E80083FD3CC08091E80087

-:1014600082FD2EC08091E80080FFEBCF2091F30039

-:101470008091F20090E0922B6115710551F0883057

-:10148000910538F421912093F10061507109019682

-:10149000F3CF21E0089709F020E08091E8008E77F3

-:1014A0008093E800CECF2111CFCF0AC08091E40114

-:1014B000882361F0853061F08091E80083FD0AC0E7

-:1014C0008091E80082FFF2CF80E0089582E00895E5

-:1014D00083E0089581E008952091EB013091EC01C3

-:1014E0002617370748F06115710539F42091E80097

-:1014F0002E772093E80001C0B901FC0120E06115BE

-:10150000710591F18091E401882309F440C0853090

-:1015100009F43FC08091E80083FD3DC08091E80060

-:1015200082FD2FC08091E80080FFE9CF2091F30079

-:101530008091F20090E0922B6115710559F088308E

-:10154000910540F424912093F10031966150710986

-:101550000196F2CF21E0089709F020E08091E800A1

-:101560008E778093E800CBCF2111CCCF0AC0809139

-:10157000E401882361F0853061F08091E80083FD0B

-:101580000AC08091E80082FFF2CF80E0089582E0F7

-:10159000089583E0089581E00895982F973068F5C5

-:1015A0009093E900981739F07091EC002091ED00CC

-:1015B0005091F00003C0242F762F50E021FD02C08F

-:1015C0009F5FECCF3091EB003E7F3093EB0030918A

-:1015D000ED003D7F3093ED003091EB0031603093B2

-:1015E000EB007093EC002093ED005093F0002091FD

-:1015F000EE0027FDE5CF80E008958F708093E9002D

-:1016000081E008958091E50187FF11C08091E80095

-:1016100082FD05C08091E4018111F8CF11C0809155

-:10162000E8008B770BC08091E401882349F080911A

-:10163000E80080FFF8CF8091E8008E778093E80083

-:1016400008952091E4003091E50095E64091EC008A

-:10165000842F817040FF23C08091E80080FD1DC071

-:101660008091E401882399F0853099F08091EB0016

-:1016700085FD11C04091E4005091E5002417350725

-:1016800029F3915011F09A01E1CF84E0089582E0AE

-:10169000089583E0089581E0089580E008954091E1

-:1016A000E80042FFDDCF08950E94C20B0E94CA0BE2

-:1016B000E0EEF0E0808181608083E8EDF0E0808101

-:1016C0008F77808319BCA7EDB0E08C918E7F8C93CF

-:1016D00080818F7E80831092E30108950F931F9382

-:1016E000CF93DF930E94C20B0E94CA0BC8EDD0E0DB

-:1016F00088818F77888388818068888388818F7DBF

-:10170000888319BC1092E4011092E0011092E2016A

-:101710001092E10100EE10E0F80180818B7F808360

-:1017200088818160888342E060E080E00E94CD0A89

-:10173000E1EEF0E080818E7F8083E2EEF0E0808158

-:1017400081608083808188608083F80180818E7FC2

-:101750008083888180618883DF91CF911F910F9171

-:101760000895E8EDF0E080818F7E8083E7EDF0E082

-:1017700080818160808384E082BF81E08093E30187

-:101780000C946E0BE8EDF0E080818E7F80831092E8

-:10179000E20008951092DA001092E10008951F927D

-:1017A0000F920FB60F9211242F933F934F935F9395

-:1017B0006F937F938F939F93AF93BF93EF93FF9319

-:1017C0008091E10082FF0BC08091E20082FF07C0A0

-:1017D0008091E1008B7F8093E1000E943B0E80911D

-:1017E000DA0080FF1FC08091D80080FF1BC080916D

-:1017F000DA008E7F8093DA008091D90080FF0DC0DF

-:1018000080E189BD82E189BD09B400FEFDCF81E0A0

-:101810008093E4010E94340805C019BC1092E401D1

-:101820000E9442088091E10080FF19C0809