Merge remote-tracking branch 'upstream/master'

8 years ago · 6df31120a1
parent cf795a6f93 213cb2c243
commit 6df31120a1
35 changed files with 2743 additions and 612 deletions
--- a/.gitignore
+++ b/.gitignore
@ -17,6 +17,7 @@ build/
 .build/
 *.bak
 .vagrant/
 quantum/version.h
 .idea/
 CMakeLists.txt
 .DS_STORE
@ -26,4 +27,4 @@ CMakeLists.txt
 .project
 .settings/
 .idea
-.browse.VC.db*
+.browse.VC.db*
--- a/.travis.yml
+++ b/.travis.yml
@ -10,7 +10,7 @@ env:
  global:
  - secure: vBTSL34BDPxDilKUuTXqU4CJ26Pv5hogD2nghatkxSQkI1/jbdnLj/DQdPUrMJFDIY6TK3AltsBx72MaMsLQ1JO/Ou24IeHINHXzUC1FlS9yQa48cpxnhX5kzXNyGs3oa0qaFbvnr7RgYRWtmD52n4bIZuSuW+xpBv05x2OCizdT2ZonH33nATaHGFasxROm4qYZ241VfzcUv766V6RVHgL4x9V08warugs+RENVkfzxxwhk3NmkrISabze0gSVJLHBPHxroZC6EUcf/ocobcuDrCwFqtEt90i7pNIAFUE7gZsN2uE75LmpzAWin21G7lLPcPL2k4FJVd8an1HiP2WmscJU6U89fOfMb2viObnKcCzebozBCmKGtHEuXZo9FcReOx49AnQSpmESJGs+q2dL/FApkTjQiyT4J6O5dJpoww0/r57Wx0cmmqjETKBb5rSgXM51Etk3wO09mvcPHsEwrT7qH8r9XWdyCDoEn7FCLX3/LYnf/D4SmZ633YPl5gv3v9XEwxR5+04akjgnvWDSNIaDbWBdxHNb7l4pMc+WR1bwCyMyA7KXj0RrftEGOrm9ZRLe6BkbT4cycA+j77nbPOMcyZChliV9pPQos+4TOJoTzcK2L8yWVoY409aDNVuAjdP6Yum0R2maBGl/etLmIMpJC35C5/lZ+dUNjJAM=
 script:
- make all-keyboards-quick AUTOGEN=true
+- make all-keyboards AUTOGEN=true
 addons:
  apt:
    packages:
--- a/30
+++ b/30
@ -5,8 +5,9 @@ endif
 .DEFAULT_GOAL := all
 space := $(subst ,, )
-starting_makefile := $(subst $(space),_SPACE_,$(abspath $(firstword $(MAKEFILE_LIST))))
+ESCAPED_ABS_PATH = $(subst $(space),_SPACE_,$(abspath $1))
-mkfile_path := $(subst $(space),_SPACE_,$(abspath $(lastword $(MAKEFILE_LIST))))
+starting_makefile := $(call ESCAPED_ABS_PATH,$(firstword $(MAKEFILE_LIST)))
 mkfile_path := $(call ESCAPED_ABS_PATH,$(lastword $(MAKEFILE_LIST))))
 abs_tmk_root := $(patsubst %/,%,$(dir $(mkfile_path)))
 ifneq (,$(findstring /keyboards/,$(starting_makefile)))
@ -83,10 +84,8 @@ endif
 ifneq ("$(wildcard $(KEYBOARD_PATH)/$(KEYBOARD).c)","")
 	KEYBOARD_FILE = keyboards/$(KEYBOARD)/$(KEYBOARD).c
-	ifndef ARCH
+	ifneq ($(call ESCAPED_ABS_PATH,$(KEYBOARD_PATH)/Makefile),$(starting_makefile))
-		ifneq ("$(wildcard $(KEYBOARD_PATH)/Makefile)","")
+		-include $(KEYBOARD_PATH)/Makefile
 			include $(KEYBOARD_PATH)/Makefile
 		endif
 	endif
 else 
 $(error "$(KEYBOARD_PATH)/$(KEYBOARD).c" does not exist)
@ -101,7 +100,9 @@ ifdef SUBPROJECT
 	ifneq ("$(wildcard $(SUBPROJECT_PATH)/$(SUBPROJECT).c)","")
 		OPT_DEFS += -DSUBPROJECT_$(SUBPROJECT)
 		SUBPROJECT_FILE = keyboards/$(KEYBOARD)/$(SUBPROJECT)/$(SUBPROJECT).c
-		-include $(SUBPROJECT_PATH)/Makefile
+		ifneq ($(call ESCAPED_ABS_PATH,$(SUBPROJECT_PATH)/Makefile),$(starting_makefile))
 			-include $(SUBPROJECT_PATH)/Makefile
 		endif
 	else 
 $(error "$(SUBPROJECT_PATH)/$(SUBPROJECT).c" does not exist)
 	endif
@ -119,14 +120,18 @@ endif
 KEYMAP_PATH = $(KEYBOARD_PATH)/keymaps/$(KEYMAP)
 ifneq ("$(wildcard $(KEYMAP_PATH)/keymap.c)","")
 	KEYMAP_FILE = keyboards/$(KEYBOARD)/keymaps/$(KEYMAP)/keymap.c
-	-include $(KEYMAP_PATH)/Makefile
+	ifneq ($(call ESCAPED_ABS_PATH,$(KEYMAP_PATH)/Makefile),$(starting_makefile))
 		-include $(KEYMAP_PATH)/Makefile
 	endif
 else 
 	ifeq ("$(wildcard $(SUBPROJECT_PATH)/keymaps/$(KEYMAP)/keymap.c)","")
 $(error "$(KEYMAP_PATH)/keymap.c" does not exist)
 	else
 		KEYMAP_PATH = $(SUBPROJECT_PATH)/keymaps/$(KEYMAP)
 		KEYMAP_FILE = keyboards/$(KEYBOARD)/$(SUBPROJECT)/keymaps/$(KEYMAP)/keymap.c
-		-include $(KEYMAP_PATH)/Makefile
+		ifneq ($(call ESCAPED_ABS_PATH,$(KEYMAP_PATH)/Makefile),$(starting_makefile))
 			-include $(KEYMAP_PATH)/Makefile
 		endif
 	endif
 endif
@ -135,7 +140,8 @@ ifdef SUBPROJECT
 else
 	TARGET ?= $(KEYBOARD)_$(KEYMAP)
 endif
-BUILD_DIR = .build
+
 BUILD_DIR = $(TOP_DIR)/.build
 # Object files directory
 #     To put object files in current directory, use a dot (.), do NOT make
@ -265,4 +271,6 @@ include $(TMK_PATH)/rules.mk
 GIT_VERSION := $(shell git describe --abbrev=6 --dirty --always --tags 2>/dev/null || date +"%Y-%m-%d-%H:%M:%S")
 BUILD_DATE := $(shell date +"%Y-%m-%d-%H:%M:%S")
 OPT_DEFS += -DQMK_KEYBOARD=\"$(KEYBOARD)\" -DQMK_KEYMAP=\"$(KEYMAP)\"
-OPT_DEFS += -DQMK_VERSION=\"$(GIT_VERSION)\" -DQMK_BUILDDATE=\"$(BUILD_DATE)\"
+
 $(shell echo '#define QMK_VERSION "$(GIT_VERSION)"' > $(QUANTUM_PATH)/version.h)
 $(shell echo '#define QMK_BUILDDATE "$(BUILD_DATE)"' >> $(QUANTUM_PATH)/version.h)
--- a/doc/basic_how_keyboards_work.md
+++ b/doc/basic_how_keyboards_work.md
@ -0,0 +1,96 @@
 # How keys are registered, and interpreted by computers
 In this file, you can will learn the concepts of how keyboards work over USB,
 and you'll be able to better understand what you can expect from changing your
 firmware directly.
 ## Schematic view
 Whenever you type on 1 particular key, here is the chain of actions taking
 place:
 ``` text
 +------+         +-----+       +----------+      +----------+     +----+
 | User |-------->| Key |------>| Firmware |----->| USB wire |---->| OS |
 +------+         +-----+       +----------+      +----------+     |----+
 ```
 This scheme is a very simple view of what's going on, and more details follow
 in the next sections.
 ## 1. You Press a Key
 Whenever you press a key, the firmware of your keyboard can register this event.
 It can register when the key is pressed, held and released.
 This usually happens with a [periodic scan of key presses with a frequency around 100 hz](https://github.com/benblazak/ergodox-firmware/blob/master/references.md#typical-keyboard-information).
 This speed often is limited by the mechanical key response time, the protocol
 to transfer those key presses (here USB HID), and by the software it is used in.
 ## 2. What the Firmware Sends
 The [HID specification](http://www.usb.org/developers/hidpage/Hut1_12v2.pdf)
 tells what a keyboard can actually send through USB to have a chance to be
 properly recognised. This includes a pre-defined list of keycodes which are
 simple numbers from `0x00` to `0xE7`. The firmware assigns a keycode to each
 key of the keyboard.
 The firmware does not send actually letters or characters, but only keycodes.
 Thus, by modifying the firmware, you only can modify what keycode is sent over
 USB for a given key.
 ## 3. What the Operating System Does
 Once the keycode reaches the operating system, a piece of software has to have
 it match an actual character thanks to a keyboard layout. For example, if your
 layout is set to QWERTY, a sample of the matching table is as follow:
 ``` text
 | keycode | character |
 |---------+-----------|
 |    0x04 | a/A       |
 |    0x05 | b/B       |
 |    0x06 | c/C       |
 |     ... | ...       |
 |    0x1C | y/Y       |
 |    0x1D | z/Z       |
 |     ... | ...       |
 |---------+-----------|
 ```
 ## Back to the firmware
 As the layout is generally fixed (unless you create your own), the firmware can
 actually call a keycode by its layout name directly to ease things for you.
 This is exactly what is done here with `KC_A` actually representing `0x04` in
 QWERTY. The full list can be found in `keycode.txt`.
 ## List of Characters You Can Send
 Putting aside shortcuts, having a limited set of keycodes mapped to a limited
 layout means that **the list of characters you can assign to a given key only
 is the ones present in the layout**.
 For example, this means that if you have a QWERTY US layout, and you want to
 assign 1 key to produce `€` (euro currency symbol), you are unable to do so,
 because the QWERTY US layout does not have such mapping. You could fix that by
 using a QWERTY UK layout, or a QWERTY US International.
 You may wonder why a keyboard layout containing all of Unicode is not devised
 then? The limited number of keycode available through USB simply disallow such
 a thing.
 ## How to (Maybe) Enter Unicode Characters
 You can have the firmware send *sequences of keys* to use the [software Unicode
 Input
 Method](https://en.wikipedia.org/wiki/Unicode_input#Hexadecimal_code_input) of
 the target operating system, thus effectively entering characters independently
 of the layout defined in the OS.
 Yet, it does come with multiple disadvantages:
 - Tied to a specific OS a a time (need recompilation when changing OS);
 - Within a given OS, does not work in all software;
 - Limited to a subset of Unicode on some systems.
--- a/keyboards/ergodox/keymaps/algernon/keymap.c
+++ b/keyboards/ergodox/keymaps/algernon/keymap.c
@ -12,6 +12,7 @@
 #include "keymap_plover.h"
 #include "eeconfig.h"
 #include "wait.h"
 #include "version.h"
 /* Layers */
--- a/keyboards/ergodox/keymaps/default/keymap.c
+++ b/keyboards/ergodox/keymaps/default/keymap.c
@ -1,6 +1,7 @@
 #include "ergodox.h"
 #include "debug.h"
 #include "action_layer.h"
 #include "version.h"
 #define BASE 0 // default layer
 #define SYMB 1 // symbols
--- a/keyboards/ergodox/keymaps/j3rn/keymap.c
+++ b/keyboards/ergodox/keymaps/j3rn/keymap.c
@ -14,18 +14,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
 * | Tab    |   Q  |   W  |   E  |   R  |   T  |  -   |           |  =   |   Y  |   U  |   I  |   O  |   P  |   \    |
 * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |Ctrl/Esc|A / L2|   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |   ;  |   '    |
+ * |Ctrl/Esc|   A  |   S  |   D  |   F  |   G  |------|           |------|   H  |   J  |   K  |   L  |   ;  |   '    |
 * |--------+------+------+------+------+------| Hyper|           | Meh  |------+------+------+------+------+--------|
 * | LShift |Z/Ctrl|   X  |   C  |   V  |   B  |      |           |      |   N  |   M  |   ,  |   .  |//Ctrl| RShift |
 * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   | ~L1  | ~L2  |AltShf| Left | Right|                                       |  Up  | Down |   [  |   ]  | ~L1  |
+ *   | ~L1  | Alt  |AltShf| Left | Right|                                       |  Up  | Down |   [  |   ]  | ~L1  |
 *   `----------------------------------'                                       `----------------------------------'
 *                                        ,-------------.       ,-------------.
 *                                        | App  | Home |       | PgUp |Ctrl/Esc|
 *                                 ,------|------|------|       |------+--------+------.
 *                                 |      |      | End  |       | PgDn |        |      |
 *                                 |Space | LGui |------|       |------|  Tab   |Enter |
- *                                 |      |      |Shift |       | Alt  |        |      |
+ *                                 |      |      | ~L2  |       | ~L1  |        |      |
 *                                 `--------------------'       `----------------------'
 */
 // If it accepts an argument (i.e, is a function), it doesn't need KC_.
@ -34,13 +34,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        // left hand
        KC_GRV,         KC_1,         KC_2,   KC_3,   KC_4,   KC_5,   KC_LBRC,
        KC_TAB,         KC_Q,         KC_W,   KC_E,   KC_R,   KC_T,   KC_MINS,
-        CTL_T(KC_ESC),  LT(MDIA, KC_A),KC_S,   KC_D,   KC_F,   KC_G,
+        CTL_T(KC_ESC),  KC_A,         KC_S,   KC_D,   KC_F,   KC_G,
        KC_LSFT,        CTL_T(KC_Z),  KC_X,   KC_C,   KC_V,   KC_B,   ALL_T(KC_NO),
-        KC_FN1,         KC_FN2,       LALT(KC_LSFT),  KC_LEFT,KC_RGHT,
+        KC_FN1,         KC_LALT,      LALT(KC_LSFT),  KC_LEFT,KC_RGHT,
                                              ALT_T(KC_APP),  KC_HOME,
                                                              KC_END,
-                                       KC_SPC,   KC_LGUI,     KC_LSHIFT,
+                                       KC_SPC,   KC_LGUI,     KC_FN2,
        // right hand
             KC_RBRC,     KC_6,   KC_7,   KC_8,   KC_9,   KC_0,             KC_BSPC,
             KC_EQL,      KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,             KC_BSLS,
@ -50,20 +50,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
             KC_PGUP, CTL_T(KC_ESC),
             KC_PGDN,
-             KC_LALT,    KC_TAB,     KC_ENT
+             KC_FN1,    KC_TAB,     KC_ENT
    ),
 /* Keymap 1: Symbol Layer
 *
 * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |  F1  |  F2  |  F3  |  F4  |  F5  |      |           |      |  F6  |  F7  |  F8  |  F9  |  F10 |   F11  |
+ * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
 * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |   !  |   @  |   {  |   }  |   |  |      |           |      |   Up |   7  |   8  |   9  |   *  |   F12  |
+ * |        |   !  |   @  |   {  |   }  |   |  |      |           |      |   Up |   7  |   8  |   9  |   *  |        |
 * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
 * |        |   #  |   $  |   (  |   )  |   `  |------|           |------| Down |   4  |   5  |   6  |   +  |        |
 * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
 * |        |   %  |   ^  |   [  |   ]  |   ~  |      |           |      |   &  |   1  |   2  |   3  |   \  |        |
 * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      |      |      |                                       |      |    . |   0  |   =  |      |
+ *   |      |      |      |      |      |                                       |   0  |   0  |   .  |   =  |      |
 *   `----------------------------------'                                       `----------------------------------'
 *                                        ,-------------.       ,-------------.
 *                                        |      |      |       |      |      |
@ -76,20 +76,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 // SYMBOLS
 [SYMB] = KEYMAP(
       // left hand
-       KC_TRNS,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
+       KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,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_TRNS,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,
       // right hand
-       KC_TRNS, KC_F6,   KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,
+       KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-       KC_TRNS, KC_UP,   KC_7,   KC_8,    KC_9,    KC_ASTR, KC_F12,
+       KC_TRNS, KC_UP,   KC_7,   KC_8,    KC_9,    KC_ASTR, KC_TRNS,
                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_TRNS,
-                         KC_TRNS,KC_DOT,  KC_0,    KC_EQL,  KC_TRNS,
+                         KC_0,   KC_0,    KC_DOT,  KC_EQL,  KC_TRNS,
       KC_TRNS, KC_TRNS,
       KC_TRNS,
       KC_TRNS, KC_TRNS, KC_TRNS
@ -97,9 +98,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* Keymap 2: Media and mouse keys
 *
 * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
+ * |        |  F1  |  F2  |  F3  |  F4  |  F5  |      |           |      |  F6  |  F7  |  F8  |  F9  |  F10 |   F11  |
 * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |           |      |      |      | Lclk | Rclk |      |        |
+ * |        |      |      |      |      |      |      |           |      |      |      | Lclk | Rclk |      |   F12  |
 * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
 * |        |      |      |      |      |      |------|           |------|MsLeft|MsDown| MsUp |MsRght|      |  Play  |
 * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
@ -117,7 +118,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 */
 // MEDIA AND MOUSE
 [MDIA] = KEYMAP(
-       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+       KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   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,
@ -126,8 +127,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                    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_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
-       KC_TRNS,  KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2, KC_TRNS, KC_TRNS,
+       KC_TRNS,  KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2, KC_TRNS, KC_F12,
                 KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_TRNS, KC_MPLY,
       KC_TRNS,  KC_TRNS, KC_TRNS, KC_MPRV, KC_MNXT, KC_TRNS, KC_TRNS,
                          KC_VOLU, KC_VOLD, KC_MUTE, KC_TRNS, KC_TRNS,
--- a/keyboards/ergodox/keymaps/j3rn/readme.md
+++ b/keyboards/ergodox/keymaps/j3rn/readme.md
@ -1,4 +1,4 @@
-# J3RN's Mac-centric ErgoDox EZ keymap
+# J3RN's Mac-Centric ErgoDox EZ keymap
 ## Motivation
@ -14,6 +14,7 @@ This layout more closely resembles that of the Mac keyboard, and has some other
 - **The key to the right of "0" is Backspace instead of "-"** (misleadingly labeled "delete" on the Mac's keyboard). There was no room to fit in "-" and "=" between "0" and Backspace, unfortunately.
 - **The key to the left of "Q" is Tab instead of Delete.**
 - **The rightmost big key on the left thumb is CMD (LGui) instead of Backspace.**
 - **The key to the left of Alt-Shift is an Alt key**. This is close to it's position on the Mac keyboard, though slightly further left.
 ### Other changes
@ -23,7 +24,9 @@ This layout more closely resembles that of the Mac keyboard, and has some other
 - **The Toggle L1 keys have been replaced by the otherwise displaced "-" and "=".** They are laid out, left-to-right, in the same order as on the Mac keyboard. Honestly, they are not terribly conveniently placed, and their placement might change in a later version. I found that I did not toggle L1 frequently at all, and found using the momentary keys to access L1 to fit my workflow better.
 - **The "~"/L1 key in the bottom-left is now just momentary L1.** The "~" key was moved to the top-left as mentioned before, and I like to keep my multi-use keys to a minimum due to the latency for them to switch from "press" to "hold."
 - **The Home and End buttons have been shifted up on the left thumb, and Shift inserted below them.** This makes doing Shift-5 and other such combinations less painful.
- **The Page Up and Page Down buttons have been shifted up on the right thumb, and Alt was moved from above them to below them.** I use Alt more than Page Up or Page Down (mostly in terminal applications), and thought that it deserved a more accessible location.
+- **The Page Up and Page Down buttons have been shifted up on the right thumb.** I don't use either of these keys often, and wanted to free up some real estate.
-
+- **The bottommost-inner keys on the left and right thumb are momentary L2 and momentary L1, respectively**. I have found that both modes are useful, and this seemed like a reasonably accessible place to put these.
 - **Traditional numpad layout.** The base of most numpads is a double-wide "0" key to the left of a "." key. This is reflected in my layout by having two "0" keys to the left of a "." key.
 - **The function keys (F1-F12) have been moved to L2.** They were in the way in L1.
 **I'm always open to feedback and/or suggestions!**
--- a/keyboards/ergodox/keymaps/josh/keymap.c
+++ b/keyboards/ergodox/keymaps/josh/keymap.c
@ -1,6 +1,7 @@
 #include "ergodox.h"
 #include "debug.h"
 #include "action_layer.h"
 #include "version.h"
 #define BASE 0 // default layer
 #define SYMB 1 // symbols
--- a/keyboards/ergodox/keymaps/sethbc/Makefile
+++ b/keyboards/ergodox/keymaps/sethbc/Makefile
@ -0,0 +1,14 @@
 BOOTMAGIC_ENABLE = no  # Virtual DIP switch configuration(+1000)
 MOUSEKEY_ENABLE  = yes # Mouse keys(+4700)
 EXTRAKEY_ENABLE  = yes # Audio control and System control(+450)
 CONSOLE_ENABLE   = no  # Console for debug(+400)
 COMMAND_ENABLE   = no  # Commands for debug and configuration
 CUSTOM_MATRIX    = yes # Custom matrix file for the ErgoDox EZ
 SLEEP_LED_ENABLE = yes # Breathing sleep LED during USB suspend
 NKRO_ENABLE      = yes # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
 MIDI_ENABLE      = no  # MIDI controls
 UNICODE_ENABLE   = yes # Unicode
 ifndef QUANTUM_DIR
 	include ../../../../Makefile
 endif
--- a/keyboards/ergodox/keymaps/sethbc/keymap.c
+++ b/keyboards/ergodox/keymaps/sethbc/keymap.c
@ -0,0 +1,102 @@
 #include "ergodox.h"
 #include "action_layer.h"
 #define BASE 0 // default layer
 #define FN1 1 // symbols
 #define FN2 2 // media keys
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [BASE] = KEYMAP(  // layer 0 : default
        // left hand
        KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_ESC,
        KC_BSLS, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    MO(FN2),
        KC_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,
        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    MO(FN1),
        KC_LGUI, KC_GRV,  KC_BSLS, KC_LEFT, KC_RGHT,
                                                     KC_LCTL, KC_LALT,
                                                              KC_HOME,
                                            KC_SPC,  KC_BSPC, KC_END,
        // right hand
        MO(FN2), KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
        KC_LBRC, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_RBRC,
                 KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
        MO(FN1), KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
                          KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_RGUI,
        KC_RALT, KC_RCTL,
        KC_PGUP,
        KC_PGDN, KC_ENT, KC_SPC
    ),
 // FN1
 [FN1] = KEYMAP(
       // left hand
       KC_TRNS,   KC_F1,  KC_F2,  KC_F3,   KC_F4,   KC_F5,   KC_F11,
       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_F12,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  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
 ),
 // FN2
 [FN2] = KEYMAP(
       RESET,   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_NLCK, KC_PSLS, KC_PAST, KC_PAST, KC_PMNS, KC_BSPC,
       KC_TRNS, KC_NO,   KC_P7,   KC_P8,   KC_P9,   KC_PMNS, KC_BSPC,
                KC_NO,   KC_P4,   KC_P5,   KC_P6,   KC_PPLS, KC_PENT,
       KC_TRNS, KC_NO,   KC_P1,   KC_P2,   KC_P3,   KC_PPLS, KC_PENT,
                         KC_P0,   KC_PDOT, KC_SLSH, KC_PENT, KC_PENT,
       KC_TRNS, KC_TRNS,
       KC_TRNS,
       KC_TRNS, KC_TRNS, KC_TRNS
 ),
 };
 const uint16_t PROGMEM fn_actions[] = {
 };
 // Runs just one time when the keyboard initializes.
 void matrix_init_user(void) {
 };
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
    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) {
      // TODO: Make this relevant to the ErgoDox EZ.
        case 1:
            ergodox_right_led_1_on();
            break;
        case 2:
            ergodox_right_led_2_on();
            break;
        default:
            // none
            break;
    }
 };
--- a/keyboards/ergodox/keymaps/sethbc/readme.md
+++ b/keyboards/ergodox/keymaps/sethbc/readme.md
@ -0,0 +1,3 @@
 # sethbc's Ergodox EZ keymap
 Largely based on the Ergodox Infinity default keymap
--- a/keyboards/ergodox/keymaps/zweihander-osx/keymap.c
+++ b/keyboards/ergodox/keymaps/zweihander-osx/keymap.c
@ -11,7 +11,7 @@
 #define BBED 2 // BBEdit
 #define TMNL 3 // Terminal
 #define SAFA 4 // Safari
-#define ALFRED_LEAD_TIME 100 // time, in milliseconds, to let Alfred come to the fore and accept keyboard input
+#define ALFRED_LEAD_TIME 250 // time, in milliseconds, to let Alfred come to the fore and accept keyboard input
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* Keymap 0: Basic layer
@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 *                                        |  `~  |  '"  |       |   ⎋  |    ⌫   |
 *                                 ,------|------|------|       |------+--------+------.
 *                                 |      |      | PgUp |       | PgDn |        |      |
- *                                 |      |   ⌫  |------|       |------|    ⇥   |Enter |
+ *                                 |      |   ⇥  |------|       |------|    ⇥   |Enter |
 *                                 |      |      |  L⌥  |       |  L⌃  |        |      |
 *                                 `--------------------'       `----------------------'
 */
@ -46,7 +46,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
        KC_LCTL,        KC_LALT,      KC_LGUI,KC_LEFT,KC_RGHT,
                                              KC_GRV, KC_QUOT,
                                                              KC_PGUP,
-                                               KC_SPC,KC_BSPC,KC_LALT,
+                                               KC_SPC,KC_TAB ,KC_LALT,
        // right hand
             TG(SYMB),  KC_6,   KC_7,   KC_8,   KC_9,   KC_0,             KC_MINS,
             MO(SYMB),  KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,             KC_BSLS,
@ -66,25 +66,25 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
 * |        |   <  |   >  |   (  |   )  |   '  |------|           |------|   -  |   4  |   5  |   6  |   +  |        |
 * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |      |      |      |      |      |           |      |   &  |   1  |   2  |   3  |   =  |        |
+ * |        |      |      |      |      |   =  |      |           |      |   :  |   1  |   2  |   3  |   =  |        |
 * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
 *   |      |      |      |      |      |                                       |   0  |   .  |   ←  |   →  |      |
 *   `----------------------------------'                                       `----------------------------------'
 *                                        ,-------------.       ,-------------.
 *                                        |      |      |       |      |      |
 *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       | Home |      |      |
+ *                                 |      |      |      |       |      |      |      |
 *                                 |      |      |------|       |------|      |      |
- *                                 |      |      |      |       | End  |      |      |
+ *                                 |      |      |      |       |      |      |      |
 *                                 `--------------------'       `--------------------'
 */
 // SYMBOLS
 [SYMB] = KEYMAP(
       // left hand
       KC_TRNS,KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_TRNS,
-       KC_TRNS,KC_LBRC,KC_RBRC,KC_LCBR,KC_RCBR,KC_DQUO,KC_TRNS,
+       KC_TRNS,KC_LBRC,KC_RBRC,KC_LCBR,KC_RCBR,KC_DQT ,KC_TRNS,
       KC_TRNS,KC_LABK,KC_RABK,KC_LPRN,KC_RPRN,KC_QUOT,
-       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_EQL ,KC_TRNS,
       KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
                                       KC_TRNS,KC_TRNS,
                                               KC_TRNS,
@ -93,11 +93,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_TRNS, KC_F6,   KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,
       KC_TRNS, KC_SLSH, KC_7,   KC_8,    KC_9,    KC_ASTR, KC_F12,
                KC_MINS, KC_4,   KC_5,    KC_6,    KC_PLUS, KC_TRNS,
-       KC_TRNS, KC_AMPR, KC_1,   KC_2,    KC_3,    KC_EQL,  KC_TRNS,
+       KC_TRNS, KC_COLN, KC_1,   KC_2,    KC_3,    KC_EQL,  KC_TRNS,
                         KC_0,   KC_DOT,  KC_LEFT, KC_RGHT, KC_TRNS,
       KC_TRNS, KC_TRNS,
-       KC_HOME,
+       KC_TRNS,
-       KC_END , KC_TRNS, KC_TRNS
+       KC_TRNS, KC_TRNS, KC_TRNS
 ),
 /* Keymap 2: Media keys
 *
@ -131,13 +131,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                                    KC_HOME,
                                  KC_TRNS, KC_TRNS, KC_TRNS,
    // right hand
-       LGUI(KC_Q),  LGUI(KC_W),     LGUI(LSFT(KC_GRV)), LGUI(KC_GRV),   KC_TRNS,                KC_TRNS,        KC_PWR,
+       LGUI(KC_Q),  LGUI(KC_W),     LGUI(LSFT(KC_GRV)), LGUI(KC_GRV),   KC_TRNS,                KC_TRNS,        KC_PWR ,
       KC_TRNS,     LGUI(KC_RBRC),  LGUI(LALT(KC_UP)),  KC_UP  ,        LGUI(LALT(KC_DOWN)),    KC_TRNS,        KC_TRNS,
                    LGUI(KC_LBRC),  KC_LEFT,            KC_DOWN,        KC_RGHT,                KC_TRNS,        KC_MPLY,
       KC_TRNS,     LSFT(KC_SPC),   KC_SPC ,            KC_MPRV,        KC_MNXT,                KC_TRNS,        KC_TRNS,
                                    KC_VOLU,            KC_VOLD,        KC_MUTE,                KC_TRNS,        KC_TRNS,
       KC_TRNS,     KC_TRNS,
-       KC_TRNS,
+       KC_END ,
       LGUI(KC_X),  LGUI(KC_C),     LGUI(KC_V)
 ),
 };
--- a/keyboards/ergodox/keymaps/zweihander-osx/makefile.mk
+++ b/keyboards/ergodox/keymaps/zweihander-osx/makefile.mk
@ -0,0 +1,2 @@
 # Don’t do a tricolor wave when the computer is shut down in Windows
 SLEEP_LED_ENABLE = no
--- a/keyboards/ergodox/keymaps/zweihander-osx/readme.markdown
+++ b/keyboards/ergodox/keymaps/zweihander-osx/readme.markdown
@ -42,4 +42,4 @@ I press C-a, C-e, and C-k all the time. It’s difficult to press these key comb
 ## use spreadsheets
-All the common spreadsheet operations (+-*/=) are now on the right side of the symbol layer.
+All the common spreadsheet operations (+-*/=) are now on the right side of the symbol layer. There’s also a colon there for entering times and maybe IPv6 addresses. Not that I expect people to type IPv6 addresses into a spreadsheet, but, y’know.
--- a/keyboards/ergodox/keymaps/zweihander-osx/zweihander-osx.hex
+++ b/keyboards/ergodox/keymaps/zweihander-osx/zweihander-osx.hex
@ -0,0 +1,1151 @@
 :100000000C94D3020C941A030C941A030C941A0344
 :100010000C941A030C941A030C941A030C941A03EC
 :100020000C941A030C941A030C94B71F0C94892097
 :100030000C941A030C941A030C941A030C941A03CC
 :100040000C941A030C94FC1A0C941A030C941A03C3
 :100050000C941A030C9414160C941A030C941A039F
 :100060000C941A030C941A030C941A030C941A039C
 :100070000C941A030C941A030C941A030C941A038C
 :100080000C941A030C941A030C941A030C941A037C
 :100090000C941A030C941A030C941A030C941A036C
 :1000A0000C941A030C941A030C941A03730C730C1B
 :1000B000A20CA20CD80CF80C290E290E030D290E47
 :1000C000B30DB30D1A0E290E290E230EC00DC00D4F
 :1000D000C00DC00DC00DC00DC00DC00DC00DC00DB8
 :1000E000C00DC00DC00DC00DC00DC00DD20DDF0D77
 :1000F000E60DED0DF70DF620182106221821062237
 :100100005D2180210622D521E821750A01E2012C1A
 :10011000022C02E274FA011602160104020401091B
 :1001200002090104020401150215010C020C012848
 :10013000022800750A01E2012C022C02E274FA0185
 :10014000170217010802080115021501100210011B
 :100150000C020C0111021101040204010F020F0133
 :1001600028022800750A01E2012C022C02E274FA2E
 :100170000105020501050205010802080107020741
 :10018000010C020C011702170128022800750A0150
 :10019000E30116021602E301E3012B022B02E30145
 :1001A000E30115021502E300750A01E301160216C8
 :1001B00002E301E3012B022B02E3000000F0A12E79
 :1001C000004C002A00E100E00000001E00140004C2
 :1001D000001D00E200E2001F001A0016001B00E3F1
 :1001E000002B00200008000700060050002C002112
 :1001F000001500090019004F004B00220017000AEB
 :1002000000050000003500015301510000E300002B
 :10021000003400015301510000E3000000290023D5
 :10022000001C000B00110000002A00240018000D23
 :1002300000100052004E0025000C000E0036005148
 :10024000002800260012000F0037002F002B002787
 :10025000001300334238613000E0002D00310034DB
 :1002600068E5002C00000001000100010001000110
 :100270000000003A002F0036020100010001003B9F
 :1002800000300037020100010001003C002F02266F
 :10029000020100010001003D0030022702010001BF
 :1002A0000001003E00340234002E00000001000175
 :1002B0000001000000010000000100010001000039
 :1002C000000100000001003F0038002D0033020053
 :1002D0000001004000240021001E00270001004111
 :1002E00000250022001F00370001004200260023E5
 :1002F00000200050000100430025022E022E004F76
 :10030000000100440045000100010001000000015F
 :10031000000100010001000100000069000100016E
 :10032000000100010001006A000100043001000129
 :1003300000010001004B004E00010001000100011E
 :100340000001300100010001004A000100033001FA
 :100350000002300000010001000100000001000067
 :100360000001001408010000000100000001001A53
 :100370000830082F082C0200000100350A520C50EA
 :10038000002C00A9004D00350852005100AC00AA15
 :100390000019080100510C4F00AB00A8000608012D
 :1003A0000001000100010001001B08A5000100AED2
 :1003B000000100010000000000000000000000003B
 :1003C0000000010204060A0F17202C3A4A5D7187CB
 :1003D0009DB3C7DAE9F5FCFFFCF5E9DAC7B39D8701
 :1003E000715D4A3A2C20170F0A0604020100000032
 :1003F0000000000000000016034500720067006F57
 :100400000044006F007800200045005A00000016EC
 :10041000034500720067006F0044006F0078002001
 :100420000045005A0000000403090409026D00049D
 :100430000100A0FA090400000103010100092111D3
 :100440000100012240000705810308000A09040198
 :10045000000103010200092111010001224D0007E2
 :1004600005820308000A09040200010300000009D4
 :1004700021110100012236000705830308000A0943
 :1004800004030001030000000921110100012239C9
 :10049000000705840310000112011001000000088C
 :1004A000EDFE071301000102000105010906A1018B
 :1004B000050719E029E71500250195087501810256
 :1004C0000508190129059505750191029501750326
 :1004D0009101050719002977150025019578750107
 :1004E0008102C005010980A101850216810026B79D
 :1004F000001A81002AB700751095018100C0050C13
 :100500000901A1018503160100269C021A01002A97
 :100510009C02751095018100C005010902A1010925
 :1005200001A1000509190129051500250195057589
 :100530000181029501750381010501093009311519
 :1005400081257F95027508810609381581257F95DB
 :100550000175088106050C0A38021581257F950171
 :1005600075088106C0C005010906A101050719E04B
 :1005700029E7150025019508750181029501750887
 :10058000810105081901290595057501910295015B
 :10059000750391010507190029FF150026FF009535
 :1005A0000675088100C011241FBECFEFDAE0DEBF60
 :1005B000CDBF04B603FE27C08091010290910202D4
 :1005C000A0910302B09104028730904BA740B04B3A
 :1005D000D1F41092010210920202109203021092C2
 :1005E000040214BE84B7877F84BF0FB6F894A89521
 :1005F00080916000886180936000109260000FBE5F
 :10060000E0E0FFE3099511E0A0E0B1E0E0EAF7E403
 :1006100002C005900D92A433B107D9F712E0A4E30C
 :10062000B1E001C01D92A130B107E1F70E94FC1CAE
 :100630000C94CE230C9400001092B9008AE08093B1
 :10064000B800089594EA9093BC009091BC0097FF85
 :10065000FCCF9091B900987F983021F0903111F043
 :1006600081E008958093BB0084E88093BC00809172
 :10067000BC0087FFFCCF8091B900887F883111F0E2
 :10068000803471F780E0089584E98093BC00809104
 :10069000BC0084FDFCCF08958093BB0084E8809368
 :1006A000BC008091BC0087FFFCCF9091B900987F7F
 :1006B00081E0983209F480E0089584E88093BC00DA
 :1006C0008091BC0087FFFCCF8091BB00089580B370
 :1006D0008C7080BB81B3836F81BB089580910101D1
 :1006E000811115C080E40E942203809301018111D1
 :1006F0000CC082E10E944C0380930101811105C06E
 :100700008FEF0E944C03809301010E94440384B147
 :10071000807F84B985B1807F85B98AB1837F8AB9AA
 :100720008BB1837F8BB93E98469808950C94E4046E
 :100730000E942509809301010E946E030E946703B5
 :10074000A5E3B1E0E3E4F1E08EE08E0F11921D929B
 :100750008E13FCCF0C940F090E9425098093010190
 :100760000E946E030E946703A5E3B1E0E3E4F1E0B9
 :100770008EE08E0F11921D928E13FCCF0895BF92C2
 :10078000CF92DF92EF92FF920F931F93CF93DF935D
 :1007900080910101882379F0809134018F5F8093EB
 :1007A0003401811108C00E94250980930101811143
 :1007B00002C00E94B70805E311E0C0E0D0E0EE24DB
 :1007C000E394F12CDD24D39495E0C92EC730D105F4
 :1007D00000F58091010181113CC080E40E94220358
 :1007E00080930101811112C082E10E944C03809329
 :1007F000010181110BC0C7010C2E01C0880F0A94A2
 :10080000EAF780950E944C03809301010E94440303
 :1008100020C0CA30A1F028F4C83059F0C93061F0C6
 :1008200005C0CC3089F070F0CD3089F0209A28983E
 :1008300010C0219A29980DC0229A2A980AC0239A9A
 :100840002B9807C0529A01C0539A5B9802C03E9AF7
 :10085000469880EA8A95F1F7C730D10518F580915E
 :100860000101811144C080E40E94220380930101B0
 :10087000882311F0B12C12C083E10E944C038093B5
 :1008800001018111F7CF81E40E94220380930101CD
 :100890008111F0CF0E945D03B82EB0940E944403F2
 :1008A0008B2D26C08FB181708D25799902C092E081
 :1008B00001C090E0892B7C9902C024E001C020E0B7
 :1008C000822B7D9902C028E001C020E0822B7E9916
 :1008D00002C090E101C090E0892B9FB19095991FD3
 :1008E0009927991F9295990F907E892B01C080E0DE
 :1008F000F8019081981719F08083C09200010E943E
 :100900006E0321960F5F1F4FCE30D10509F05ECFE9
 :10091000809100018823A1F08150809300018823F9
 :1009200029F0F5E0FA95F1F700000AC0A3E4B1E080
 :10093000E5E3F1E0CF01825F91919D938E13FCCFAF
 :100940000E94410681E0DF91CF911F910F91FF90AE
 :10095000EF90DF90CF90BF900895E82FF0E0ED5B2F
 :10096000FE4F808108950895FC016230B9F028F4AB
 :10097000662341F0613061F023C06330A9F0643038
 :10098000C9F01EC082818823D9F088EA91E00895D9
 :1009900082818823A9F08DE891E0089582818823DF
 :1009A00079F084E691E008958281882349F083E319
 :1009B00091E008958281882319F08AE091E00895FA
 :1009C00080E090E0089508956091B0017091B101C8
 :1009D0008091B2019091B3010E94081556985E98DB
 :1009E00025982D9826982E9827982F98813019F0C1
 :1009F000823021F00895259A2D9A0895269A2E9AEC
 :100A0000089581E0089581E008950C9403050E9403
 :100A1000940E2FEF84E39CE0215080409040E1F75A
 :100A200000C000000C9439160F931F93CF93DF93EF
 :100A30008C01FC01C081D181CE010E948D13BE01C9
 :100A40000E94D807EC01B8010E940505882309F42B
 :100A500012C1B801CE010E946808882309F40BC1B5
 :100A6000B801CE010E948109882309F404C1C43170
 :100A7000F0E7DF0708F0CDC0C23080E7D80708F400
 :100A8000A3C0F8018281882309F4AAC00E947215CC
 :100A9000811102C00E9458150E94851590E0909324
 :100AA000F3018093F201C230F0E7DF0721F4809177
 :100AB000F201816082C0C33080E7D80721F48091C1
 :100AC000F20182607AC0C430E0E7DE0721F4809151
 :100AD000F201846072C0C530F0E7DF0719F480913D
 :100AE000F20127C0C63080E7D80721F48091F201D7
 :100AF000806163C0C730E0E7DE0721F48091F20136
 :100B000080625BC0C830F0E7DF0721F48091F2011A
 :100B1000806453C0C93080E7D80721F48091F20186
 :100B200080684BC0CA30E0E7DE0729F48091F2010B
 :100B30008460886042C0CB30F0E7DF0721F4809109
 :100B4000F2018E7F3AC0CC3080E7D80721F4809143
 :100B5000F2018D7F32C0CD30E0E7DE0721F48091D5
 :100B6000F2018B7F2AC0CE30F0E7DF0719F48091C5
 :100B7000F20122C0CF3080E7D80721F48091F20142
 :100B80008F7E1BC0C031E0E7DE0721F48091F201C7
 :100B90008F7D13C0C131F0E7DF0721F48091F201AE
 :100BA0008F7B0BC0C231D04721F48091F2018F7747
 :100BB00004C08091F2018B7F877F8093F201809146
 :100BC000F2010E94891557C0C115E0E7DE0779F0F0
 :100BD000C130D047A1F081E0809351018093520150
 :100BE000C801DF91CF911F910F910C940105F8017D
 :100BF0008281882309F43FC00E9407053CC0F801A8
 :100C000082818823C1F18091CD0181608093CD01E3
 :100C100032C0CB3380E7D807A1F4F8018281882362
 :100C200021F01092510182E016C080915101811192
 :100C300006C086E20E940C0B86E20E94DF0B82E077
 :100C400018C0CC33D04739F6F8018281882331F0BF
 :100C50001092520180E20E942E0C0DC08091520130
 :100C6000811106C087E20E940C0B87E20E94DF0B15
 :100C700080E20E94350C80E0DF91CF911F910F91AF
 :100C800008950C94960308950C9443060C9444061E
 :100C900026E0729FF001112444E5849FE00DF11DD0
 :100CA0001124E60FF11DEE0FFF1FE154FE4F859159
 :100CB00094910E94EA07811560E49607B0F58115CA
 :100CC00070E3970708F0E6C0803E9105D8F4803CB9
 :100CD000910508F06CC0883A910578F4853A910541
 :100CE00008F06BC08130910509F460C108F417C1A8
 :100CF0008430910508F05AC112C18D3B910508F46A
 :100D000067C00DC18F3F910509F048F4803F910500
 :100D100008F0B5C0883E910508F448C100C18115AE
 :100D200020E2920708F0ADC00895811543E59407CD
 :100D300090F4811562E5960708F0D0C0811571E541
 :100D4000970708F0C6C0811520E5920708F0A5C0F6
 :100D50009F70906A0895811545E59407D8F4811530
 :100D600064E5960708F0D0C0482F4695469570E296
 :100D7000479FA00111248370992721E030E0B90139
 :100D800002C0660F771F8A95E2F7CB01842B952B63
 :100D90009A680895811576E5970708F4BAC09C0112
 :100DA00030562115304108F0BAC09F70B6C0FC0122
 :100DB000EE0FFF1FE55CFF4F6AC0853A910509F40D
 :100DC000B1C0863A910509F0B0C082E890E4089578
 :100DD000883A910509F4ACC0893A910509F4ABC091
 :100DE0008A3A910509F4AAC08B3A910509F4A9C081
 :100DF0008C3A910509F4A8C08B3B910509F4A7C072
 :100E00008C3B910509F4A6C08D3A910509F4A5C063
 :100E1000803B910509F4A4C08E3A910509F4A3C062
 :100E20008F3A910509F4A2C0813B910509F4A1C054
 :100E3000823B910509F4A0C0833B910509F49FC052
 :100E4000843B910509F49EC0853B910509F49DC042
 :100E5000863B910509F49CC0873B910509F49BC032
 :100E6000883B910509F49AC0893B910509F499C022
 :100E70008A3B910509F498C080E094E40895906558
 :100E80000895FC01FF70EE0FFF1FE554FE4F8591A2
 :100E9000949108959927906C0895482F437021E00C
 :100EA00030E002C0220F331F4A95E2F73C68AC01E4
 :100EB00064E0569547956A95E1F74370342B8F703F
 :100EC0008695869560E2869FC0011124822B932B24
 :100ED0000895982F8827816F906A0895482F469526
 :100EE000469570E2479FA00111248370992721E065
 :100EF00030E0B90102C0660F771F8A95E2F7CB0197
 :100F0000842B952B9C680895982F8827846F906A6E
 :100F100008958F719927982F88279062089580E00F
 :100F200090E0089581E890E4089583E890E40895BE
 :100F300082EE94E4089589EE94E408958AEE94E4B0
 :100F4000089585EB94E4089586EB94E4089583EB8B
 :100F500094E4089584EB94E4089587EB94E4089571
 :100F60008CEC94E408958DEC94E4089583E895E482
 :100F700008958AE895E4089582E995E4089584E95E
 :100F800095E4089581E296E4089583E296E4089555
 :100F900084E296E4089585E296E4089586E296E474
 :100FA000089587E296E408958AE296E40895089504
 :100FB00096E0799FF001112494E5899FE00DF11DE1
 :100FC0001124E60FF11DEE0FFF1FE154FE4F859136
 :100FD000949108958238910549F1B0F481339105D7
 :100FE00009F458C048F48932910509F44EC08A3298
 :100FF000910509F454C008958533910509F440C062
 :101000008933910599F00895833E910529F138F4CB
 :10101000803E910591F0823E9105A1F00895863EB3
 :101020009105F9F0873E910531F108952091F20183
 :1010300020FD3AC021FD38C008958091F20180FD65
 :1010400035C032C08091F20182FF32C08091F2013E
 :1010500084FD30C083EE39C08091F20182FD28C04A
 :10106000F5CF8091F20183FF27C08091F20184FDCA
 :1010700021C087EE2AC08091F20183FD1DC0F5CF0B
 :101080008091F20185FD1AC01BC08091F20185FD9F
 :1010900017C014C08091F20186FD14C015C0809164
 :1010A000F20186FD11C00EC080EE0FC089E30DC0B5
 :1010B00082EE0BC080E009C086EE07C089E205C061
 :1010C00085E303C08AE201C081E390E008950895BA
 :1010D0000F931F93CF93FB012281211102C0C1E026
 :1010E00041C08C01C0916001C11125C0843190477D
 :1010F000B1F70E94670881E0809360010E94DE15CD
 :1011000090935F0180935E011092530110925501FC
 :1011100010925401109257011092560110925901E9
 :101120001092580110925B0110925A0110925D01C9
 :1011300010925C0117C080915E0190915F010E9446
 :10114000EA15883C910558F690915301E92FF0E09B
 :10115000EE0FFF1FEC5AFE4F118300839F5F9093A9
 :101160005301C0E08C2FCF911F910F910895569895
 :101170005E9825982D9826982E9827982F988FEF6F
 :1011800090E0909389008093880090938B008093E7
 :101190008A0090938D0080938C00259A2D9A2FEFD2
 :1011A00080E792E0215080409040E1F700C00000CD
 :1011B000269A2E9A2FEF80E792E0215080409040AF
 :1011C000E1F700C00000279A2F9A2FEF80E792E006
 :1011D000215080409040E1F700C0000025982D98F4
 :1011E0002FEF80E792E0215080409040E1F700C06F
 :1011F000000026982E982FEF80E792E02150804043
 :101200009040E1F700C0000027982F9856985E980C
 :1012100025982D9826982E9827982F98089589EA32
 :101220008093800089E08093810024982C983F98D7
 :101230008AB18F748AB96E98479A8BB1806B8BB9DB
 :10124000769A0E94B7080C94E30480E2809301012F
 :101250008091610181110EC00E941C0381E0809386
 :1012600061012FEF83ED90E3215080409040E1F742
 :1012700000C0000080E40E942203809301018111DC
 :101280002EC00E944C0380930101811128C00E944E
 :101290004C0380930101811122C08FE30E944C0313
 :1012A0008093010181111BC00E94440380E40E94CD
 :1012B000220380930101811112C08CE00E944C0333
 :1012C0008093010181110BC00E944C0380930101A6
 :1012D000811105C08FE30E944C03809301010E949D
 :1012E0004403809101010895282F882339F090E06C
 :1012F0002A3010F44D9608950697089587E290E0FD
 :101300000895FF920F931F93CF93DF93813020E8CE
 :10131000920708F44DC0FB012281222309F448C042
 :10132000EC01DF7780916201813079F050F08230FA
 :10133000C1F482EE0E940C0B87E50E940C0B87E53E
 :101340000EC082EE0E940C0B0CC080EE0E940C0BB3
 :1013500081EE0E940C0B88E10E940C0B88E10E9438
 :10136000DF0B0CE010E0CE01002E02C096958795B1
 :101370000A94E2F78F700E947409F82E0E940C0BF9
 :101380008F2D0E94DF0B045011090C3FFFEF1F0748
 :1013900051F780916201813029F010F0823041F4E0
 :1013A00082EE04C080EE0E94DF0B81EE0E94DF0B14
 :1013B00081E0DF91CF911F910F91FF90089590935D
 :1013C0006801809367010895E0916701F0916801D9
 :1013D000309721F00190F081E02D099480E008958C
 :1013E000E0916701F0916801309721F00280F3816C
 :1013F000E02D09940895E0916701F091680130971C
 :1014000021F00480F581E02D099408952091650173
 :10141000309166018217930771F090936601809373
 :101420006501E0916701F0916801309721F0068035
 :10143000F781E02D099408952091630130916401B2
 :101440008217930771F09093640180936301E09198
 :101450006701F0916801309721F00084F185E02D5B
 :101460000994089508950C94320A0E94D5150E949B
 :1014700098030C945B16CF92DF92EF92FF920F933A
 :101480001F93CF93DF93CDB7DEB72B970FB6F894AA
 :10149000DEBF0FBECDBF0E94BF038AE6C82E81E02B
 :1014A000D82E00E010E0E02E802F0E94AD04F6015F
 :1014B00041916F01F42EF826B1F40F5F1F4F0E30EB
 :1014C000110589F78FEF89838A831B820E94DE15BD
 :1014D0008160782F9D838C8349815A816B818D81B6
 :1014E0000E94DE0A40C09091CD0191FF04C08B871D
 :1014F0000E94B3048B8520E030E04F2D50E0922F06
 :10150000BA01022E02C0759567950A94E2F760FF52
 :1015100024C02E83EF8221E030E0690102C0CC0CB0
 :10152000DD1C9A95E2F790E08C219D21892B09F42E
 :1015300020E028870E94DE158160782F9A878987AE
 :101540004E815F8168858A850E94DE0AF801E6592E
 :10155000FE4F8081C826C08206C02F5F3F4F2630D5
 :10156000310569F6AACF0E94F317109169010E9414
 :10157000E4091817A1F00E94E409809369012B96F1
 :101580000FB6F894DEBF0FBECDBFDF91CF911F9194
 :101590000F91FF90EF90DF90CF900C9446062B9622
 :1015A0000FB6F894DEBF0FBECDBFDF91CF911F9174
 :1015B0000F91FF90EF90DF90CF900895CF93DF933E
 :1015C000CDB7DEB72B970FB6F894DEBF0FBECDBFF9
 :1015D0004F83588769877A878B87DE01119686E06B
 :1015E000FD0111928A95E9F785E0FE013796019099
 :1015F0000D928A95E1F749815A816B817C818D81B9
 :101600009E810E9432112B960FB6F894DEBF0FBE5A
 :10161000CDBFDF91CF910895CF93882309F4CDC03A
 :10162000C82F823859F40E94E40981FDC6C089E3BD
 :101630000E940C140E94D91489E30CC0833879F4F9
 :101640000E94E40980FDB9C083E50E940C140E9449
 :10165000D91483E50E944E14CF910C94D914843888
 :1016600059F40E94E40982FDA8C087E40E940C148A
 :101670000E94D91487E4EECF8CEF8C0F813A48F4A6
 :101680008C2F0E943D1A811198C08C2F0E940C143F
 :10169000E3CF80E28C0F883048F4C77081E001C04E
 :1016A000880FCA95EAF70E949214D6CF8BE58C0F6B
 :1016B000833078F4C53A29F0C63A31F083E890E0F7
 :1016C00005C081E890E002C082E890E0CF910C94E0
 :1016D000060A88E58C0F853108F06FC0C83A61F1C1
 :1016E000C93A69F1CA3A71F1CB3A79F1CC3A81F150
 :1016F000CB3B89F1CC3B91F1CD3A99F1C03BA1F1C3
 :10170000CE3AA9F1CF3AB1F1C13BB9F1C23BC1F137
 :10171000C33BC9F1C43BD1F1C53BD9F1C63BE1F1B3
 :10172000C73BE9F1C83BF1F1C93BF9F1CA3B09F408
 :101730003FC080E090E03EC082EE90E03BC089EE8A
 :1017400090E038C08AEE90E035C085EB90E032C082
 :1017500086EB90E02FC083EB90E02CC084EB90E010
 :1017600029C087EB90E026C08CEC90E023C08DEC84
 :1017700090E020C083E891E01DC08AE891E01AC0A3
 :1017800082E991E017C084E991E014C081E292E01F
 :1017900011C083E292E00EC084E292E00BC085E2C9
 :1017A00092E008C086E292E005C087E292E002C0C3
 :1017B0008AE292E0CF910C941C0ACF91089588237D
 :1017C00009F44BC0823859F40E94E40981FF45C0F6
 :1017D00089E30E940C140E94D91489E30CC0833859
 :1017E00071F40E94E40980FF38C083E50E940C1464
 :1017F0000E94D91483E50E944E140C94D9148438A5
 :1018000059F40E94E40982FF28C087E40E940C1466
 :101810000E94D91487E4EFCF9CEF980F913A58F3C8
 :1018200090E2980F983050F4877091E001C0990FC2
 :101830008A95EAF7892F0E949814DFCF9BE5980FCD
 :10184000933020F480E090E00C94060A885A8531A9
 :1018500020F480E090E00C941C0A0895882321F085
 :101860000E9492140C94D9140895882321F00E94A8
 :1018700098140C94D91408957F928F929F92AF92EE
 :10188000BF92CF92DF92EF92FF920F931F93CF936D
 :10189000DF931F92CDB7DEB77C01C62E772EFC01F9
 :1018A000058102950F70128111110E94AF140E94E0
 :1018B0000514882379F0112369F080E28C0D8830BB
 :1018C00048F082E00E94EE130E94051491E0D82EA9
 :1018D000D92601C0D12CE72DE295EF70F0E0EA5A4D
 :1018E000FF4F0C947F23872D807F072D0F70882357
 :1018F00011F00295007F112389F0002309F490C1B3
 :1019000080E28C0D883020F4802F0E94921403C056
 :10191000802F0E94A2140E94D91482C18C2D0E9493
 :10192000DF0B002309F495C180E28C0D883020F490
 :10193000802F0E94981403C0802F0E94A8140E9438
 :10194000D91487C1972D907F872D8F70903211F019
 :101950008295807FCC2021F0F1E0CF16B1F01EC03F
 :10196000112349F0002309F414C1013009F011C119
 :101970000E94C2146EC1002319F0013009F469C13C
 :1019800089830E94C51489810AC1112321F0023084
 :1019900008F05FC1FEC001115CC101C1112321F03B
 :1019A000002309F4F6C03CC1002309F4F8C03EC18D
 :1019B000872D86958695837090E0009719F00197A2
 :1019C00061F047C1112321F08C2D972D937002C037
 :1019D00080E090E00E94060A3CC1112321F08C2D8A
 :1019E000972D937002C080E090E00E941C0A31C1E4
 :1019F0008C2D112319F00E94FB1602C00E94631760
 :101A00000E94E81726C1872D837009F052C011117A
 :101A100020C18C2D829586958770880F880F9C2D0C
 :101A20009F70892E912CA12CB12C082E04C0880CFB
 :101A3000991CAA1CBB1C0A94D2F7C4FE14C00FE068
 :101A400010E020E030E0B901A80104C0440F551FA8
 :101A5000661F771F8A95D2F7CB01BA016095709502
 :101A60008095909503C060E070E0CB01272D26950E
 :101A70002695237030E02230310569F0233031059E
 :101A800089F0682979298A299B292130310571F04B
 :101A90000E947A12DEC0682979298A299B290E942E
 :101AA0009612D7C00E947A12C501B4010E945E123C
 :101AB000D0C0112319F0872D817001C0869588232D
 :101AC00009F4C7C08C2D829586958770880F880F82
 :101AD0009C2D9F70892E912CA12CB12C082E04C016
 :101AE000880C991CAA1CBB1C0A94D2F7C4FE14C013
 :101AF0000FE010E020E030E0B901A80104C0440F7D
 :101B0000551F661F771F8A95D2F7CB01BA016095E2
 :101B100070958095909503C060E070E0CB01272D13
 :101B2000269526952370422F50E04230510569F0EA
 :101B30004330510589F0682979298A299B29413048
 :101B4000510571F00E94541384C0682979298A29AB
 :101B50009B290E9470137DC00E945413C501B401DB
 :101B60000E94381376C08C2D90E0FC01E05EF109F4
 :101B7000E531F10508F050C0EA59FF4F0C947F237E
 :101B80000C2D0F70872D8F71112331F00E94D1120F
 :101B9000802F0E942E0C5DC00E94F212802F0E94A6
 :101BA000350C57C0112339F0011153C0872D8F71A7
 :101BB0000E9417134EC0023008F04BC0F7CF11231C
 :101BC00039F0872D8F710E94D11243C01123C9F3C0
 :101BD000872D8F710E94F2123CC0112329F0872DAE
 :101BE0008F710E94BC1235C00E94B21232C0112304
 :101BF00051F0172D1F71812F0E94D11263E0812FA8
 :101C00000E94E51326C081E00E94EE13023008F125
 :101C100082E00E94EE131DC0112331F0002389F2EF
 :101C20008C2D0E940C0B15C0002391F28C2D0E946C
 :101C3000DF0B0FC0472D4F706C2DC7010E94B404FD
 :101C40000E94D61106C0472D4F706C2DC7010E940F
 :101C5000D707DD20F9F00E94E11380FD1BC0F701DA
 :101C600012820E94DB130E94D112C7010E94590EFA
 :101C70000E94DB130F90DF91CF911F910F91FF9086
 :101C8000EF90DF90CF90BF90AF909F908F907F901C
 :101C90000C94F2120F90DF91CF911F910F91FF9052
 :101CA000EF90DF90CF90BF90AF909F908F907F90FC
 :101CB00008950F931F93CF93DF93EC01888199814F
 :101CC0002B813C81232BB9F09F3F11F48F3F99F07A
 :101CD000CE010E941405882371F0688179818A8180
 :101CE0000E94D7138C010E948C130E945312B801DA
 :101CF000CE010E943C0CDF91CF911F910F9108956E
 :101D00000E94AF140E94BF140E9484140E94D91430
 :101D10000E9499180E94E81780E090E00E94060A4D
 :101D200080E090E00C941C0A0E949F140C94800E9A
 :101D30000E94CC13292F22952F7030E02C303105D2
 :101D40004CF42A3031056CF422503109223031052F
 :101D5000A8F407C02C30310569F02F30310551F05F
 :101D60000DC0803F69F018F4803E40F409C0843F04
 :101D700029F406C093FB882780F9089580E0089530
 :101D800081E00895CF93DF9300D000D01F92CDB7AC
 :101D9000DEB70F900F900F900F900F90DF91CF91C3
 :101DA0000895CF93DF9300D000D000D0CDB7DEB739
 :101DB00026960FB6F894DEBF0FBECDBFDF91CF9150
 :101DC00008951F93CF93DF93C091780116E080911F
 :101DD0007901C81799F0D0E01C9FF0011D9FF00D0C
 :101DE0001124E658FE4F40815181628173818481C4
 :101DF00095810E94D10E2196C770E9CFDF91CF91D6
 :101E00001F9108954091AA015091AB016091AC01DE
 :101E10007091AD018091AE019091AF010C94D10E03
 :101E20008091AF0182958F7009F054C08091AC0110
 :101E3000882309F44FC080917801A09179016091C5
 :101E4000AA017091AB014091AD015091AE01B6E095
 :101E50008A1709F43FC090E041155105C1F17F3F59
 :101E600011F46F3FA1F1B89FF001B99FF00D11245B
 :101E7000E658FE4F218172132AC02081621327C0C9
 :101E80002281211124C0238134812417350710F4C5
 :101E900021503109241B350B283C3105C0F4209119
 :101EA000AF012F7020612093AF0126E0289FF00141
 :101EB000299FF00D1124E158FE4F80818F708061C1
 :101EC00080838AEA91E00E94590E0C94E10E0196FB
 :101ED0008770BECF0895CF92DF92EF92FF920F935B
 :101EE0001F93CF93DF93CDB7DEB762970FB6F89409
 :101EF000DEBF0FBECDBF8C0185E0F801DE011D966F
 :101F000001900D928A95E1F7D8014C9111965C9160
 :101F1000119712966C9112971396CD90DC901497AE
 :101F20003091AA017091AB018091AD019091AE0109
 :101F3000009709F46BC17F3F19F43F3F09F466C174
 :101F4000E090AC01EE2009F4C0C02091AF01C816AA
 :101F5000D90628F0F601E81BF90BCF0104C08095E3
 :101F600090958C0D9D1DFF24F394883C910578F08D
 :101F7000F12C207F09F0C6C07C2DD98AC88A8989B6
 :101F80000E94C20E8AEA91E00E94590EB1C0822FCF
 :101F9000807F09F046C0751314C0341312C061115C
 :101FA00010C02F7020612093AF010E94020F8AEAB7
 :101FB00091E00E94590E8091AF01D80115968C9343
 :101FC0002EC0CD2819F15F3F11F44F3FF9F0F62EE6
 :101FD00061111CC0809178012091790136E082174F
 :101FE00009F45AC090E0389FF001399FF00D112498
 :101FF000E658FE4F7181571306C07081471303C026
 :102000007281711103C001968770E9CFF62E6623A5
 :1020100009F418C18091AF0181608093AF01F12C68
 :1020200011C1751308C0341306C0611104C080913A
 :10203000AF01D801C3C04D875E878D859E856A8BB1
 :102040000E94980E6A898823E1F16623D1F12091DC
 :10205000AF01822F82958F7090E0029774F080918B
 :10206000AA019091AB0198878F831986DB86CA8677
 :102070002C87CE0107960E94590E86E0F801AAEA45
 :10208000B1E001900D928A95E1F70E94100F0E9435
 :10209000020FFF24F394D6C04D875E878D859E8501
 :1020A0000E94CC13292F22952F7030E02230310569
 :1020B0000CF0BCC09F7009F0B6C0805E883008F498
 :1020C000C1C0C8010E94590EE4CFC816D90608F451
 :1020D00053C0F601E81BF90BCF01883C910508F4C9
 :1020E00050C0F12C7C2DD98AC88A89890E94C20EE1
 :1020F000EAEAF1E086E0DF011D928A95E9F70E94A5
 :10210000020FA0C0751314C0341312C0611110C0A7
 :102110008091AF01F8018583C8010E94590E86E0C5
 :10212000EAEAF1E0DF011D928A95E9F7FE2C8AC008
 :102130004D875E878D859E856A8B0E94980E6A8981
 :10214000882309F4BECF662309F4BBCF2091AF01E9
 :10215000822F82958F7090E002970CF48ECF809141
 :10216000AA019091AB019A8389831B82DD82CC8284
 :102170002E83CE0101967FCF809590958C0D9D1D6D
 :10218000ACCFF62E662309F49CCF75132EC0341302
 :102190002CC02091AF0120FD1FC0822F82958F702F
 :1021A000D9F0D80115962C9315978F3049F08F5F91
 :1021B000982F9295907F822F8F70892B15968C93F4
 :1021C000C8010E94590E86E0F801AAEAB1E0019028
 :1021D0000D928A95E1F793CF86E0F801AAEAB1E083
 :1021E00001900D928A95E1F72DC04D875E878D8510
 :1021F0009E850E94980E811140CF8091AF01816031
 :102200008093AF01C8010E94590E1CC0662309F4D7
 :1022100058CF4D875E878D859E850E94980E8823B6
 :1022200009F44FCF2ACF811148CF0CC0243031059B
 :102230000CF047CF9F7009F440CFF8019581907F53
 :1022400009F03BCF8F2D62960FB6F894DEBF0FBE1C
 :10225000CDBFDF91CF911F910F91FF90EF90DF9055
 :10226000CF9008951F93CF93DF93CDB7DEB72C9710
 :102270000FB6F894DEBF0FBECDBF4F835887698776
 :102280007A878B879C87CE0107960E946B0F8823E5
 :1022900069F08F8198852A853B85232BF1F19F3F3B
 :1022A00009F063C08F3F09F060C037C086E0FE01CF
 :1022B0003796DE01119601900D928A95E1F76F81B4
 :1022C0007885EA85FB85309741F17F3F11F46F3FB8
 :1022D00021F12091790130E0C90101968770992799
 :1022E0004091780150E08417950709F447C069834D
 :1022F0007A83FD83EC8396E0929FD001939FB00D8B
 :102300001124A658BE4FFE01319601900D929A9568
 :10231000E1F7809379010E94E10E16E08091780147
 :10232000909179018917C1F1189FC0011124865835
 :102330009E4F0E946B0F882379F1E09178011E9FD8
 :10234000F0011124E658FE4F408151816281738172
 :10235000848195810E94D10E8091780190E0019650
 :102360008770992780937801D9CF4F8158856985E7
 :102370007A858B859C850E94D10ECFCF0E94940ECA
 :102380001092790110927801EAEAF1E086E0DF012B
 :102390001D928A95E9F7C1CF2C960FB6F894DEBF4F
 :1023A0000FBECDBFDF91CF911F910895EF92FF92A5
 :1023B0000F931F93CF93DF938C01892B09F46CC08B
 :1023C000F12CEE24E394E8012196F80184918437FE
 :1023D00040F4843008F051C0813081F0823019F12E
 :1023E0005BC0853709F444C0A8F19CE7980F90378B
 :1023F00008F052C08F770E94DF0B41C00E5F1F4F65
 :10240000FE01C49180E28C0F883048F4C7708E2D95
 :1024100001C0880FCA95EAF70E94B21414C08C2F2D
 :102420000E940C0B2DC00E5F1F4FFE01C49180E275
 :102430008C0F883058F4C7708E2D01C0880FCA9554
 :10244000EAF70E94B8140E94D9141AC08C2F0E9477
 :10245000DF0B16C00E5F1F4FFE01C491CC2381F02D
 :102460008FE99FE00197F1F700C00000C150F6CF5F
 :102470000E5F1F4FFE01F49003C00E940C0B8E01F3
 :102480008F2D882309F49FCFEFE9FFE03197F1F713
 :1024900000C000008150F5CFDF91CF911F910F91C7
 :1024A000FF90EF90089508956093B4017093B50183
 :1024B0008093B6019093B7010C94800E0F931F93F5
 :1024C0000091B4011091B5012091B6013091B7018E
 :1024D000DC01CB01802B912BA22BB32B8093B40179
 :1024E0009093B501A093B601B093B7011F910F91DE
 :1024F0000C94800E0F931F930091B4011091B501BD
 :102500002091B6013091B701DC01CB0180239123EA
 :10251000A223B3238093B4019093B501A093B60195
 :10252000B093B7011F910F910C94800E0F931F93DE
 :102530000091B4011091B5012091B6013091B7011D
 :10254000DC01CB0180279127A227B3278093B40118
 :102550009093B501A093B601B093B7011F910F916D
 :102560000C94800E1092B0011092B1011092B20141
 :102570001092B3010C94800E41E050E060E070E0F6
 :1025800004C0440F551F661F771F8A95D2F74093EA
 :10259000B0015093B1016093B2017093B3010C94F8
 :1025A000800E41E050E060E070E004C0440F551F31
 :1025B000661F771F8A95D2F78091B0019091B10183
 :1025C000A091B201B091B301482B592B6A2B7B2B00
 :1025D0004093B0015093B1016093B2017093B30185
 :1025E0000C94800E41E050E060E070E004C0440FC5
 :1025F000551F661F771F8A95D2F7409550956095B5
 :1026000070958091B0019091B101A091B201B0910B
 :10261000B301482359236A237B234093B00150938D
 :10262000B1016093B2017093B3010C94800E41E04C
 :1026300050E060E070E004C0440F551F661F771F34
 :102640008A95D2F78091B0019091B101A091B20129
 :10265000B091B301482759276A277B274093B001DF
 :102660005093B1016093B2017093B3010C94800E4A
 :102670000F931F930091B0011091B1012091B2010D
 :102680003091B301DC01CB01802B912BA22BB32B1A
 :102690008093B0019093B101A093B201B093B301C4
 :1026A0001F910F910C94800E0F931F930091B00116
 :1026B0001091B1012091B2013091B301DC01CB0145
 :1026C00080239123A223B3238093B0019093B1017F
 :1026D000A093B201B093B3011F910F910C94800E9F
 :1026E0000F931F930091B0011091B1012091B2019D
 :1026F0003091B301DC01CB0180279127A227B327BA
 :102700008093B0019093B101A093B201B093B30153
 :102710001F910F910C94800E0895CF92DF92EF924B
 :10272000FF920F931F93CF93DF938C01C090B4015E
 :10273000D090B501E090B601F090B7018091B00162
 :102740009091B101A091B201B091B301C82AD92AE8
 :10275000EA2AFB2ACFE1D0E0D701C6010C2E04C043
 :10276000B695A795979587950A94D2F780FF06C0EE
 :10277000B8018C2F0E944806019721F4219760F739
 :1027800080E001C08C2FDF91CF911F910F91FF90BE
 :10279000EF90DF90CF900895CF93DF93EC010E94EC
 :1027A0008D13BE010E944806DF91CF910895CB01A1
 :1027B0000E94CC1308958091B801859585958595E3
 :1027C00008958091B8018770089598E0899F9001DD
 :1027D0001124262B2093B8010C94D1122091B8011A
 :1027E000809582238093B801982F977069F430E028
 :1027F000482F552747FD50952417350729F0859513
 :10280000859585950C94F21208959091B801977072
 :1028100081E009F480E0089590911501992321F059
 :1028200090910201911109C020910301309104019E
 :10283000F90132969FEF40E01FC0982F969596952C
 :1028400096959F3050F5E0910301F0910401E90F56
 :10285000F11D877021E030E0A90102C0440F551F2F
 :102860008A95E2F7CA019181892B818308959F3F60
 :1028700039F04F5F4E3041F051915813F8CF0DC0F1
 :102880005111F7CF942FF5CF9F3F39F0F901E90FA0
 :10289000F11D97FDFA958283089508959091150191
 :1028A000992321F090910201911109C02091030117
 :1028B00030910401F9013296205F3F4F1FC0982FDD
 :1028C0009695969596959F30F0F4E0910301F091DE
 :1028D0000401E90FF11D877021E030E0A90102C079
 :1028E000440F551F8A95E2F7CA018095918189238B
 :1028F000818308953196E217F30729F090819813A8
 :10290000F9CF1082F7CF089581E090E0E0910301C4
 :10291000F0910401E80FF91F1082019680319105B2
 :10292000A9F708959091CC01892B8093CC0108954B
 :1029300080959091CC0189238093CC0108951092C9
 :10294000CC0108959091CB01892B8093CB01089500
 :1029500080959091CB0189238093CB0108951092AB
 :10296000CB0108959091CA01892B8093CA010895E3
 :1029700080959091CA0189238093CA01089510928D
 :10298000CA0108958093B90108951092B90108957C
 :102990008091030190910401FC0131969C01205F1C
 :1029A0003F4F80E0919191118F5FE217F307D1F7CC
 :1029B0000895E0910301F09104018091CC0180839E
 :1029C000E0910301F091040190818091CB01892B6A
 :1029D0008083E0910301F091040190818091CA010C
 :1029E000892B80838091B901882361F0E0910301F4
 :1029F000F09104019081892B80830E94C814811179
 :102A00001092B90180910301909104010C94F00996
 :102A1000CF92DF92EF92FF926C01EE24FF24C1145B
 :102A2000D104E104F10421F0C701B60120E101C0A5
 :102A300020E0C72ED82EE92EFF24C114D104E104D2
 :102A4000F10419F0285FC701B6016B017C0154E065
 :102A5000F694E794D794C7945A95D1F7C114D1044A
 :102A6000E104F10419F02C5FC701B6016B017C0190
 :102A700042E0F694E794D794C7944A95D1F7C114ED
 :102A8000D104E104F10419F02E5FC701B601DC01A5
 :102A9000CB01B695A79597958795892B8A2B8B2B7C
 :102AA00009F02F5F822FFF90EF90DF90CF90089575
 :102AB0006DEE7EEF80E090E00E94B82360E082E05F
 :102AC00090E00E94A72360E083E090E00E94A723AB
 :102AD00060E084E090E00E94A72360E085E090E061
 :102AE0000C94A72380E090E00E94A12321E08D3E7A
 :102AF0009E4F09F020E0822F089582E090E00C9430
 :102B0000992383E090E00C94992384E090E00C9466
 :102B10009923682F84E090E00C94A7238091F8011A
 :102B2000843039F11092CE0120E488E190E00FB6B4
 :102B3000F894A895809360000FBE2093600080E019
 :102B40000E94460683B7817F846083BF83B781601C
 :102B500083BF7894889583B78E7F83BF0FB6F89430
 :102B6000A895809160008861809360001092600059
 :102B70000FBE08950895CF930E94AC030E94BF0337
 :102B80000E94BA15C0E08C2F0E94AD04811104C0D0
 :102B9000CF5FCE30C1F701C081E0CF9108950E9490
 :102BA000940E0E94E4090C94460682E084BD93E0F2
 :102BB00095BD9AEF97BD80936E0008952FB7F89456
 :102BC0008091CF019091D001A091D101B091D2011B
 :102BD0002FBF0895CF92DF92EF92FF920F931F9332
 :102BE0002FB7F8944091CF015091D0016091D1015D
 :102BF0007091D2012FBF6A017B01EE24FF248C016A
 :102C000020E030E0C016D106E206F30610F4415091
 :102C100051099A01281B390BC9011F910F91FF908F
 :102C2000EF90DF90CF9008951F920F920FB60F9202
 :102C300011248F939F93AF93BF938091CF01909175
 :102C4000D001A091D101B091D2010196A11DB11D79
 :102C50008093CF019093D001A093D101B093D20182
 :102C6000BF91AF919F918F910F900FBE0F901F90CA
 :102C700018950E943C1FF8942FEF87EA91E62150A7
 :102C800080409040E1F700C0000087E090EBDC015D
 :102C90008093010290930202A0930302B093040276
 :102CA0009CE088E10FB6F894A895809360000FBE71
 :102CB00090936000FFCF0E947215811102C00E94A4
 :102CC00058150E947D158093CD010E94851590E0D6
 :102CD0009093F3018093F20187FB882780F980931A
 :102CE00002010E948115682F70E080E090E00C9452
 :102CF00054128091D50180FF0BC06091080185E0DE
 :102D0000689FB001112475956795759567952BC0DF
 :102D100081FF09C06091080185E0689FB00111241E
 :102D20007595679520C082FF07C06091080185E016
 :102D3000689FB001112417C09091D6019923D1F05A
 :102D400060910701961788F72091080185E0289F78
 :102D500090011124929FA001939F500D112470E0C7
 :102D6000CA010E946B236038710540F4611571053A
 :102D700039F002C065E070E0862F08958FE708956E
 :102D800081E008958091D50180FF08C0609106011F
 :102D900070E0759567957595679521C081FF06C0B0
 :102DA0006091060170E07595679519C082FF04C0B7
 :102DB0006091060170E010C09091D6019923C1F096
 :102DC000609105019617A0F780910601899FC001C7
 :102DD000112470E00E946B236038710528F461159E
 :102DE000710521F0862F08958FE7089581E00895F9
 :102DF00061E070E0F4CF803F21F40E947916819564
 :102E000004C0813F29F40E9479168093D901089566
 :102E1000823F21F40E947916819504C0833F29F4F2
 :102E20000E9479168093D8010895893F19F40E9471
 :102E3000C21605C08A3F31F40E94C2168195809364
 :102E4000DA0108958B3F21F40E94C216819504C0D7
 :102E50008C3F29F40E94C2168093DB010895843FC1
 :102E600021F48091D701816017C0853F21F48091C2
 :102E7000D701826011C0863F21F48091D701846020
 :102E80000BC0873F21F48091D701886005C0883F3F
 :102E900031F48091D70180618093D70108958D3FEF
 :102EA00021F48091D50181600BC08E3F21F4809187
 :102EB000D501826005C08F3F29F48091D5018460DF
 :102EC0008093D5010895803F39F48091D90187FF1F
 :102ED0006CC01092D90169C0813F29F48091D90159
 :102EE0001816BCF362C09091D801823F29F497FF75
 :102EF0005CC01092D80159C0833F19F41916CCF365
 :102F000054C0893F41F48091DA0118160CF04DC08D
 :102F10001092DA014AC08A3F29F48091DA0187FFD2
 :102F200044C0F6CF8B3F39F48091DB0187FF3DC071
 :102F30001092DB013AC08C3F29F48091DB01181616
 :102F4000BCF333C0843F21F48091D7018E7F17C03A
 :102F5000853F21F48091D7018D7F11C0863F21F4F8
 :102F60008091D7018B7F0BC0873F21F48091D701DF
 :102F7000877F05C0883F31F48091D7018F7E809391
 :102F8000D70113C08D3F21F48091D5018E7F0BC0F6
 :102F90008E3F21F48091D5018D7F05C08F3F29F4AC
 :102FA0008091D5018B7F8093D5018091D8018111CB
 :102FB0000EC08091D90181110AC08091DA0181117E
 :102FC00006C08091DB01811102C01092D6010895E4
 :102FD00087ED91E00E94FB090E94DE159093D401D9
 :102FE0008093D30108951F93CF93DF938091D301F2
 :102FF0009091D4010E94EA15AC019091D6019923D9
 :1030000021F02091090130E006C020910A018AE0F8
 :10301000289F900111244217530708F486C080911D
 :10302000D801C091D901D091DA011091DB01811151
 :1030300007C0C11176C0D11174C0111172C075C022
 :103040009F3F19F09F5F9093D601181624F40E94B9
 :1030500079168093D8018091D80187FF05C00E941E
 :10306000791681958093D8011C1624F40E94791654
 :103070008093D9018091D90187FF05C00E947916FC
 :1030800081958093D9016091D801662339F1C0916F
 :10309000D901CC2319F1772767FD7095872F972FDA
 :1030A0000E94722223E333E343E35FE30E94D622CC
 :1030B0000E943A226093D8016C2F772767FD7095A4
 :1030C000872F972F0E94722223E333E343E35FE3CA
 :1030D0000E94D6220E943A226093D9011D1624F440
 :1030E0000E94C2168093DA018091DA0187FF05C041
 :1030F0000E94C21681958093DA01111624F40E9471
 :10310000C2168093DB018091DB0187FF05C00E941E
 :10311000C21681958093DB01DF91CF911F910C94B2
 :10312000E8179F3F09F08ECF96CFDF91CF911F9187
 :103130000895E7EDF1E085E0DF011D928A95E9F75A
 :103140001092D6011092D5010895833081F128F4B0
 :10315000813059F08230D1F00895853009F449C0AA
 :10316000B8F1863009F456C0089580910A01262FDF
 :1031700030E0280F311D2F3F310524F4680F609394
 :103180000A0108958FEF80930A0108958091090143
 :10319000262F30E0280F311D2F3F310524F4680F12
 :1031A0006093090108958FEF80930901089580913C
 :1031B0000801262F30E0280F311D2F3F310524F460
 :1031C000680F6093080108958FEF809308010895B8
 :1031D00080910701262F30E0280F311D2F3F310548
 :1031E00024F4680F6093070108958FEF809307011F
 :1031F000089580910601262F30E0280F311D2F3FC2
 :10320000310524F4680F6093060108958FEF8093D1
 :103210000601089580910501262F30E0280F311D09
 :103220002F3F310524F4680F6093050108958FEF57
 :10323000809305010895833011F128F4813049F01D
 :10324000823091F00895853081F120F18630C1F10E
 :10325000089580910A01681720F4861B80930A0163
 :10326000089510920A01089580910901681720F4C9
 :10327000861B809309010895109209010895809199
 :103280000801681720F4861B8093080108951092A6
 :103290000801089580910701681720F4861B809328
 :1032A000070108951092070108958091060168179B
 :1032B00020F4861B8093060108951092060108955C
 :1032C00080910501681720F4861B809305010895FD
 :1032D0001092050108950F931F938D3109F471C069
 :1032E00008F045C0803109F485C008F5873009F43D
 :1032F0006FC068F4863009F0ADC08091CD01817F48
 :103300008E7F8093CD0181E08093DD01A4C08B305E
 :1033100009F49EC08E3009F09DC08091CD0182FBE2
 :10332000222720F991E0922790FB82F96CC0863128
 :1033300009F48EC060F4813109F08CC00E94940EB3
 :103340009091020181E089278093020181C0893137
 :1033500009F47EC08B3109F07DC08091CD0181FBE5
 :10336000222720F991E0922790FB81F94CC0853308
 :1033700009F466C048F4873209F462C008F44FC00B
 :10338000893209F45DC066C0833438F48A3308F0AA
 :1033900044C0883309F45CC05DC0833409F450C074
 :1033A000883409F057C00E94940E0FEF13ED20E30C
 :1033B000015010402040E1F700C000000E94391683
 :1033C00047C00E94F51A0E94E4090E94460640C0C8
 :1033D0009091CD01892F8095817080FB90F929F023
 :1033E000966098609093CD0136C0997F977F9093B7
 :1033F000CD012EC08091CD0183FB222720F991E0E1
 :10340000922790FB83F98093CD01992309F1809154
 :10341000CD0181608093CD011BC0895301C08D51C6
 :1034200041E050E060E070E08A019B0104C0000FC1
 :10343000111F221F331F8A95D2F7C901B80104C09A
 :1034400061E070E080E090E00E9454120E94940ECF
 :1034500081E001C080E01F910F91089580E0089500
 :1034600080E008958E518A3030F4E82FF0E0EA5E73
 :10347000FE4F8081089580E00895CF93C82F8091FA
 :10348000DD01813079F018F08230E9F186C0E091F9
 :103490000301F09104018081813169F0823209F0E9
 :1034A0007EC009C0E0910301F09104018081813167
 :1034B00011F0823261F48C2F0E942E1A811104C007
 :1034C0008C2F0E946B191DC081E090E01AC08C2FD8
 :1034D0000E94301A811114C0C43179F048F4CB3005
 :1034E00079F0C03109F05FC082E08093DD0108C04F
 :1034F000C93219F0C83321F056C01092DD0153C013
 :1035000081E0817052C0C93281F110F5C43169F196
 :10351000A8F4C73009F045C08AE080930A0194E11D
 :103520009093090193E0909308018093070188E04C
 :103530008093060188E28093050133C082EE8C0FF0
 :10354000863078F58C2F0E94321A8093DC0129C0D6
 :10355000CE34E9F020F4CB3421F56AE013C0C13554
 :1035600079F0C235F1F461E00DC08091DC0188236F
 :1035700019F01092DC0115C081E08093DD0115C0C7
 :1035800061E006C08091DC010E94A5180AC06AE0D3
 :103590008091DC010E941B1904C01092DD0180E0C3
 :1035A00004C081E002C080E0ACCFCF910895E1E893
 :1035B000F0E08081886080838081816080838FB724
 :1035C000F89493E09093890090ED909388008FBFDA
 :1035D0000895EFE6F0E08081826080830895EFE651
 :1035E000F0E080818D7F80830895EFE6F0E09081A8
 :1035F00082E08927808308951F920F920FB60F9261
 :1036000011242F933F934F935F936F937F938F93E7
 :103610009F93AF93BF93EF93FF938091DE019091BF
 :10362000DF0101969093DF018093DE01811103C0D9
 :1036300082E00E944606E091DF01E695E695F0E023
 :10364000E954FC4FE4918091DE018E1303C080E0C9
 :103650000E944606FF91EF91BF91AF919F918F918C
 :103660007F916F915F914F913F912F910F900FBE7E
 :103670000F901F9018958091F0010895CF93DF93DC
 :1036800000D01F92CDB7DEB79C018091F801843045
 :1036900019F593E099833B832A839093E9008FEF98
 :1036A0009091E800815095FD06C095ED9A95F1F74F
 :1036B00000008111F5CF8091E80085FF0DC040E04A
 :1036C00050E063E070E0CE0101960E94A71D80915A
 :1036D000E8008E778093E8000F900F900F90DF91B5
 :1036E000CF910895CF93DF9300D01F92CDB7DEB76F
 :1036F0002091F801243021F522E029839B838A83DD
 :1037000083E08093E9008FEF9091E800815095FD70
 :1037100006C095ED9A95F1F700008111F5CF8091E3
 :10372000E80085FF0DC040E050E063E070E0CE01AE
 :1037300001960E94A71D8091E8008E778093E80093
 :103740000F900F900F90DF91CF9108952091F80185
 :103750002430F1F422E02093E9002FEF3091E800CB
 :10376000215035FD06C035ED3A95F1F700002111E5
 :10377000F5CF2091E80025FF0BC040E050E065E068
 :1037800070E00E94A71D8091E8008E778093E8008A
 :103790000895CF93DF93EC019091F801943009F0F4
 :1037A00046C0809115018823D9F0809102018823B9
 :1037B000B9F09093E9008FEF9091E800815095FD6A
 :1037C00006C095E19A95F1F700008111F5CF80913F
 :1037D000E80085FF2CC040E050E060E170E017C0D9
 :1037E00081E08093E9008FEF9091E800815095FD92
 :1037F00006C095ED9A95F1F700008111F5CF809103
 :10380000E80085FF14C040E050E068E070E0CE01C1
 :103810000E94A71D8091E8008E778093E80080E1E8
 :10382000FE01A0EEB1E001900D928A95E1F7DF91E3
 :10383000CF9108958091F701811109C00E943C1F2A
 :103840000E94991F8091E20084608093E2000895B5
 :103850001092F701089508950C94E91A0E94CF156B
 :103860000E94EF1A0E94E4090C94460642E061ECC3
 :1038700081E00E94B61E42E061EC82E00E94B61E2A
 :1038800042E061EC83E00E94B61E42E161EC84E01C
 :103890000C94B61E8091FA01833009F455C030F4BF
 :1038A000813071F0823009F48EC008958A3009F4B5
 :1038B0007AC08B3009F460C0893009F09CC020C008
 :1038C0008091F901813A09F096C08091E800877FE4
 :1038D0008093E8008091FD019091FE01892B21F4F5
 :1038E00060E180EE91E003C060E080E090E070E095
 :1038F0000E94F21D8091E8008B778093E800089584
 :103900008091F901813209F076C08091FD0190919A
 :10391000FE01009719F0039709F06DC08091E8004F
 :10392000877F8093E8008091E80082FD05C0809148
 :10393000F8018111F8CF5FC08091F1008093F00110
 :103940008091E8008B7753C08091F901813A09F0AA
 :1039500052C08091FD019091FE01892B09F04BC06E
 :103960008091E800877F8093E8008091E80080FFE5
 :10397000FCCF8091150136C08091F9018132D9F5D3
 :103980008091FD019091FE01892BA9F58091E800BD
 :10399000877F8093E8000E94EB1E8091FB0180935B
 :1039A00015010C94940E8091F901813221F58091DA
 :1039B000E800877F8093E8000E94EB1E8091FC0165
 :1039C0008093F10108958091F901813AA1F48091E9
 :1039D000E800877F8093E8008091E80080FFFCCFBB
 :1039E0008091F1018093F1008091E8008E778093BF
 :1039F000E8000C94EB1E089584B7877F84BF0FB650
 :103A0000F894A8958091600088618093600010927E
 :103A100060000FBE80E880936100109261000E94F8
 :103A2000330A0E943C1F0E94991F8091E20084602B
 :103A30008093E20078940E941F220E94350A8BE056
 :103A400091E00E94DF090E94D71A8091F801853029
 :103A500069F40E948E158091F6018823B1F30E94CB
 :103A6000BB15882391F30E94911DEFCF0E943B0A62
 :103A7000ECCF292F332723303105C9F064F42130EE
 :103A8000310581F02230310509F043C08DE690E028
 :103A90002BE234E042C021323105F1F0223231050F
 :103AA00041F137C082E190E028E934E036C099273F
 :103AB0008130910541F08230910541F0892B49F523
 :103AC000E7E2F4E005C0EFE0F4E002C0E7EFF3E086
 :103AD000849190E09F0121C06430D8F4E62FF0E09B
 :103AE000EE0FFF1FE45DFE4F2081318189E090E001
 :103AF00014C0643070F470E0FB01EE0FFF1FEC5D4A
 :103B0000FE4F20813181FB01E05EFE4F808190E01D
 :103B100004C080E090E020E030E0FA0131832083AF
 :103B2000089580E189BD82E189BD09B400FEFDCF21
 :103B30008091D8008F7D8093D8008091E0008260D2
 :103B40008093E0008091E00081FDFCCF0895CF924A
 :103B5000DF92EF92FF920F931F93CF93DF93EC01CD
 :103B60008B016A010E940A1F811133C0C114D10464
 :103B700039F0F60180819181081B190BC80FD91FFC
 :103B8000E12CF12C0115110519F18091E80085FD5A
 :103B900016C08091E8008E778093E800C114D104AC
 :103BA00049F0F60180819181E80EF91EF182E082F0
 :103BB00085E00FC00E940A1F882321F30AC0899163
 :103BC0008093F10001501109FFEFEF1AFF0ADACFDD
 :103BD00080E0DF91CF911F910F91FF90EF90DF90E8
 :103BE000CF9008952091FF013091000226173707EA
 :103BF00048F06115710539F42091E8002E77209383
 :103C0000E80001C0B90140E061157105A9F12091FA
 :103C1000F801222309F443C0253009F442C0209161
 :103C2000E80023FD40C02091E80022FD32C0209131
 :103C3000E80020FFE9CF4091F3002091F20030E04E
 :103C4000342BFC01CF016115710559F02830310585
 :103C500040F481918093F100615071092F5F3F4FD3
 :103C6000F1CF41E02830310509F040E02091E80033
 :103C70002E772093E800C8CF4111C9CF0AC08091A8
 :103C8000F801882361F0853061F08091E80083FDC0
 :103C90000AC08091E80082FFF2CF80E0089582E0C0
 :103CA000089583E0089581E008952091FF01309107
 :103CB00000022617370748F06115710539F4209185
 :103CC000E8002E772093E80001C0B901FC0120E054
 :103CD0006115710591F18091F801882309F440C0C4
 :103CE000853009F43FC08091E80083FD3DC080919C
 :103CF000E80082FD2FC08091E80080FFE9CF20918D
 :103D0000F3008091F20090E0922B6115710559F05B
 :103D10008830910540F424912093F1003196615050
 :103D200071090196F2CF21E0089709F020E0809117
 :103D3000E8008E778093E800CBCF2111CCCF0AC06A
 :103D40008091F801882361F0853061F08091E8006E
 :103D500083FD0AC08091E80082FFF2CF80E00895E1
 :103D600082E0089583E0089581E00895982F9730C8
 :103D700058F59093E900981739F07091EC00209174
 :103D8000ED005091F00003C0242F762F50E021FF6A
 :103D900019C03091EB003E7F3093EB003091ED0085
 :103DA0003D7F3093ED003091EB0031603093EB00BC
 :103DB0007093EC002093ED005093F0002091EE0002
 :103DC00027FF07C09F5FD3CF8F708093E90081E00A
 :103DD000089580E008958091F90187FF11C08091D6
 :103DE000E80082FD05C08091F8018111F8CF11C073
 :103DF0008091E8008B770BC08091F801882349F00F
 :103E00008091E80080FFF8CF8091E8008E77809362
 :103E1000E80008952091E4003091E50095E6409196
 :103E2000EC00842F817040FF22C08091E80080FD6B
 :103E30001CC08091F801882391F0853091F0809129
 :103E4000EB0085FD10C04091E4005091E500421761
 :103E5000530729F39A01915011F784E0089582E005
 :103E6000089583E0089581E0089580E008954091E9
 :103E7000E80042FFDECF08950E94AA1F0E94B21FF1
 :103E8000E0EEF0E0808181608083E8EDF0E0808109
 :103E90008F77808319BCA7EDB0E08C918E7F8C93D7
 :103EA00080818F7E80831092F70108950F931F9376
 :103EB000CF93DF930E94AA1F0E94B21FC8EDD0E0EB
 :103EC00088818F77888388818068888388818F7DC7
 :103ED000888319BC1092F8011092F4011092F60137
 :103EE0001092F50100EE10E0F80180818B7F808355
 :103EF00088818160888342E060E080E00E94B61E95
 :103F0000E1EEF0E080818E7F8083E2EEF0E0808160
 :103F100081608083808188608083F80180818E7FCA
 :103F20008083888180618883DF91CF911F910F9179
 :103F30000895E8EDF0E080818F7E8083E7EDF0E08A
 :103F400080818160808384E082BF81E08093F7017B
 :103F50000C94561FE8EDF0E080818E7F80831092F4
 :103F6000E20008951092DA001092E10008951F9285
 :103F70000F920FB60F9211242F933F934F935F939D
 :103F80006F937F938F939F93AF93BF93EF93FF9321
 :103F90008091E10082FF0BC08091E20082FF07C0A8
 :103FA0008091E1008B7F8093E1000E941E2280912E
 :103FB000DA0080FF1FC08091D80080FF1BC0809175
 :103FC000DA008E7F8093DA008091D90080FF0DC0E7
 :103FD00080E189BD82E189BD09B400FEFDCF81E0A9
 :103FE0008093F8010E941A1C05C019BC1092F801B8
 :103FF0000E94281C8091E10080FF19C08091E2009E
 :1040000080FF15C08091E2008E7F8093E200809156
 :10401000E20080618093E2008091D800806280930A
 :10402000D80019BC85E08093F8010E942C1C809177
 :10403000E10084FF30C08091E20084FF2CC080E169
 :1040400089BD82E189BD09B400FEFDCF8091D80011
 :104050008F7D8093D8008091E1008F7E8093E10076
 :104060008091E2008F7E8093E2008091E200816087
 :104070008093E2008091F401882311F084E007C06E
 :104080008091E30087FD02C081E001C083E080935E
 :10409000F8010E942E1C8091E10083FF29C08091CD
 :1040A000E20083FF25C08091E100877F8093E100DB
 :1040B00082E08093F8011092F4018091E1008E7FFC
 :1040C0008093E1008091E2008E7F8093E2008091F6
 :1040D000E20080618093E20042E060E080E00E94C4
 :1040E000B61E8091F00088608093F0000E942B1C27
 :1040F000FF91EF91BF91AF919F918F917F916F91C0
 :104100005F914F913F912F910F900FBE0F901F9095
 :1041100018951F920F920FB60F9211242F933F9371
 :104120004F935F936F937F938F939F93AF93BF93BF
 :10413000CF93DF93EF93FF93C091E900CF7080910D
 :10414000EC00D82FD17080FDD0E81092E90080916A
 :10415000F000877F8093F00078940E94CD20109229
 :10416000E9008091F00088608093F000CD2BCF7043
 :10417000C093E900FF91EF91DF91CF91BF91AF9193
 :104180009F918F917F916F915F914F913F912F916F
 :104190000F900FBE0F901F9018951F93CF93DF9332
 :1041A000CDB7DEB7AA970FB6F894DEBF0FBECDBF6E
 :1041B000E9EFF1E088E08E0F9091F10091938E137A
 :1041C000FBCF0E944A1C8091E80083FF1FC18091B1
 :1041D000F9019091FA01492F50E04A30510508F059
 :1041E00015C1FA01E558FF4F0C947F23803881F008
 :1041F000823809F00BC18091FD018F708093E90036
 :104200008091EB0085FB882780F91092E90006C0B9
 :104210008091F5019091F601911182609091E800F2
 :10422000977F9093E8008093F1001092F100C8C04E
 :10423000282F2D7F09F0EAC0882319F0823061F021
 :10424000E5C08091FB01813009F0E0C0933009F0B6
 :1042500080E08093F6012BC08091FB01811127C083
 :104260008091FD018F7009F4D1C08093E900209105
 :10427000EB0020FF1CC0933021F48091EB008062A2
 :1042800014C09091EB0090619093EB0021E030E03E
 :10429000A90102C0440F551F8A95E2F74093EA0036
 :1042A0001092EA008091EB0088608093EB001092FE
 :1042B000E9008091E800877F86C08111A7C0109136
 :1042C000FB011F778091E3008078812B8093E300CE
 :1042D0008091E800877F8093E8000E94EB1E809128
 :1042E000E80080FFFCCF8091E30080688093E300CA
 :1042F000111102C082E001C083E08093F80186C002
 :104300008058823008F082C08091FB019091FC01BE
 :104310008C3D53E0950779F583E08A838AE28983AF
 :104320004FB7F894DE01139620E03EE051E2E32F10
 :10433000F0E050935700E49120FF03C0E295EF7046
 :104340003F5FEF708E2F90E0EA3010F0C79601C00B
 :10435000C0968D939D932F5F243149F74FBF809175
 :10436000E800877F8093E8006AE270E0CE01019662
 :104370000E94F21D14C0AE014F5F5F4F6091FD01BE
 :104380000E94391DBC01892B09F440C09091E800BE
 :10439000977F9093E80089819A810E94551E8091B1
 :1043A000E8008B778093E80031C0803879F5809100
 :1043B000E800877F8093E8008091F4018093F1000A
 :1043C0008091E8008E778093E8000E94EB1E1EC06B
 :1043D00081111CC09091FB019230C0F48091E800E3
 :1043E000877F8093E8009093F4010E94EB1E8091F8
 :1043F000F401811106C08091E30087FD02C081E0D5
 :1044000001C084E08093F8010E94361C8091E8008E
 :1044100083FF0AC08091E800877F8093E800809145
 :10442000EB0080628093EB00AA960FB6F894DEBF93
 :104430000FBECDBFDF91CF911F9108950895CF9307
 :104440008091F8018823A1F0C091E900CF7090918C
 :10445000EC00892F817090FD80E8C82B1092E90054
 :104460008091E80083FD0E94CD20CF70C093E900C9
 :10447000CF9108950E9441226894B1110C94D022EA
 :1044800008950E94B52288F09F5798F0B92F992778
 :10449000B751B0F0E1F0660F771F881F991F1AF02F
 :1044A000BA95C9F714C0B13091F00E94CF22B1E0A3
 :1044B00008950C94CF22672F782F8827B85F39F0A2
 :1044C000B93FCCF3869577956795B395D9F73EF4C8
 :1044D00090958095709561957F4F8F4F9F4F089570
 :1044E000E89409C097FB3EF490958095709561958E
 :1044F0007F4F8F4F9F4F9923A9F0F92F96E9BB2744
 :104500009395F695879577956795B795F111F8CFBF
 :10451000FAF4BB0F11F460FF1BC06F5F7F4F8F4F2A
 :104520009F4F16C0882311F096E911C0772321F020
 :104530009EE8872F762F05C0662371F096E8862FB8
 :1045400070E060E02AF09A95660F771F881FDAF70F
 :10455000880F9695879597F9089557FD9058440FC1
 :10456000551F59F05F3F71F04795880F97FB991FD2
 :1045700061F09F3F79F0879508951216130614068F
 :10458000551FF2CF4695F1DF08C01616170618061C
 :10459000991FF1CF86957105610508940895E894F7
 :1045A000BB2766277727CB0197F908950E94E92258
 :1045B0000C945A230E944C2338F00E94532320F07D
 :1045C000952311F00C9443230C94492311240C944B
 :1045D000D0220E94AD2270F3959FC1F3950F50E059
 :1045E000551F629FF001729FBB27F00DB11D639FA5
 :1045F000AA27F00DB11DAA1F649F6627B00DA11D4B
 :10460000661F829F2227B00DA11D621F739FB00DF0
 :10461000A11D621F839FA00D611D221F749F332760
 :10462000A00D611D231F849F600D211D822F762FF9
 :104630006A2F11249F5750409AF0F1F088234AF0D6
 :10464000EE0FFF1FBB1F661F771F881F9150504042
 :10465000A9F79E3F510580F00C9443230C94D0227F
 :104660005F3FE4F3983ED4F3869577956795B795C9
 :10467000F795E7959F5FC1F7FE2B880F911D9695E3
 :10468000879597F9089597F99F6780E870E060E053
 :1046900008959FEF80EC089500240A9416161706DB
 :1046A00018060906089500240A9412161306140623
 :1046B00005060895092E0394000C11F4882352F086
 :1046C000BB0F40F4BF2B11F460FF04C06F5F7F4F3E
 :1046D0008F4F9F4F089597FB072E16F4009407D035
 :1046E00077FD09D00E94852307FC05D03EF4909504
 :1046F00081959F4F0895709561957F4F0895EE0FB6
 :10470000FF1F0590F491E02D0994AA1BBB1B51E1FA
 :1047100007C0AA1FBB1FA617B70710F0A61BB70B31
 :10472000881F991F5A95A9F780959095BC01CD01D6
 :104730000895F999FECF92BD81BDF89A992780B569
 :104740000895A8E1B0E042E050E00C94C023262F89
 :10475000F999FECF92BD81BDF89A019700B4021677
 :1047600031F020BD0FB6F894FA9AF99A0FBE089569
 :104770000196272F0E94A8230C94A723DC01CB01CC
 :10478000FC01F999FECF06C0F2BDE1BDF89A319661
 :1047900000B40D9241505040B8F70895F894FFCFFF
 :1047A000052001BA0128080A03140A3B1BC91BA6ED
 :1047B0001B721B3E1B0101020304050607080900CA
 :1047C000404D363966051905E304AA043D04560434
 :0447D0006F048804E6
 :00000001FF
--- a/keyboards/ergodox/readme.md
+++ b/keyboards/ergodox/readme.md
@ -2,24 +2,21 @@
 There are two main ways you could customize the ErgoDox (EZ and Infinity)
-## The Easy Way: Use an existing firmware file and just flash it
+## The Easy Way: Use an existing firmware file and just flash it (ErgoDox EZ only)
 This does not work for Infinity ErgoDox yet, you need to compile the firmware according to the instructions below
 1. Download and install the [Teensy Loader](https://www.pjrc.com/teensy/loader.html). Some Linux distributions already provide a binary (may be called `teensy-loader-cli`), so you may prefer to use this.
-2. Find a firmware file you like. You can find a few of these in the keymaps subdirectory right here. The file you need ends with .hex, and you can look at its .c counterpart (or its PNG image) to see what you'll be getting. You can also use the [Massdrop configurator](https://keyboard-configurator.massdrop.com/ext/ergodox) to create a firmware Hex file you like.
+2. Find a firmware file you like. There are [dozens of community-contributed keymaps](http://qmk.fm/keyboards/ergodox/) you can browse and download. You can also use the [Massdrop configurator](https://keyboard-configurator.massdrop.com/ext/ergodox) to create a firmware Hex file you like.
 3. Download the firmware file
 4. Connect the keyboard, press its Reset button (gently insert a paperclip into the hole in the top-right corner) and flash it using the Teensy loader you installed on step 1 and the firmware you downloaded.
 ## More technical: compile an existing keymap, or create your own totally custom firmware by editing the source files.
-This requires a little bit of familiarity with coding. 
+This requires a little bit of familiarity with coding.
 If you are just compiling an existing keymap and don't want to create your own, you can skip step 4, 5 and 8.
 1. Go to https://github.com/jackhumbert/qmk_firmware and read the readme at the base of this repository, top to bottom. Then come back here :)
 2. Clone the repository (download it)
-3. Set up a build environment as per [the build guide](/doc/BUILD_GUIDE.md) 
+3. Set up a build environment as per the readme.
    - Using a Mac and have homebrew? just run `brew tap osx-cross/avr && brew install avr-libc`
 4. Copy `keyboards/ergodox/keymaps/default/keymap.c` into `keymaps/your_name/keymap.c` (for example, `keymaps/german/keymap.c`)
 5. Edit this file, changing keycodes to your liking (see "Finding the keycodes you need" below). Try to edit the comments as well, so the "text graphics" represent your layout correctly. See below for more tips on sharing your work.
 6. Compile your firmware by running `make keymap=keymap_name`. For example, `make keymap=german`. This will result in a hex file, which will be called `ergodox_ez_keymap_name.hex`, e.g. `ergodox_ez_german.hex`. For **Infinity ErgoDox** you need to add `subproject=infinity` to the make command.
@ -32,12 +29,12 @@ Good luck! :)
 ## Contributing your keymap
-The ErgoDox firmware is open-source, so it would be wonderful to have your contribution! Within a very short time after launching we already amassed almost 20 user-contributed keymaps, with all sorts of creative improvements and tweaks. This is very valuable for people who aren't comfortable coding, but do want to customize their ErgoDox. To make it easy for these people to use your layout, I recommend submitting your PR in the following format. 
+The QMK firmware is open-source, so it would be wonderful to have your contribution! Within a very short time after launching we already amassed dozens of user-contributed keymaps, with all sorts of creative improvements and tweaks. This is very valuable for people who aren't comfortable coding, but do want to customize their ErgoDox. To make it easy for these people to use your layout, I recommend submitting your PR in the following format.
 1. All work goes inside your keymap subdirectory (`keymaps/german` in this example).
 2. `keymap.c` - this is your actual keymap file; please update the ASCII comments in the file so they correspond with what you did.
 3. `readme.md` - a readme file, which GitHub would display by default when people go to your directory. Explain what's different about your keymap, what you tweaked or how it works. No specific format to follow, just communicate what you did. :)
-4. Any graphics you wish to add. This is absolutely not a must. If you feel like it, you can use [Keyboard Layout Editor](http://keyboard-layout-editor.com) to make something and grab a screenshot, but it's really not a must. If you do have graphics, your readme can just embed the graphic as a link, just like I did with the default layout. 
+4. Any graphics you wish to add. This is absolutely not a must. If you feel like it, you can use [Keyboard Layout Editor](http://keyboard-layout-editor.com) to make something and grab a screenshot, but it's really not a must. If you do have graphics, your readme can just embed the graphic as a link, just like I did with the default layout.
 ## Finding the keycodes you need
--- a/keyboards/infinity_chibios/config.h
+++ b/keyboards/infinity_chibios/config.h
@ -18,6 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef CONFIG_H
 #define CONFIG_H
 #define PREVENT_STUCK_MODIFIERS
 /* USB Device descriptor parameter */
 #define VENDOR_ID       0xFEED
@ -50,9 +51,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
 )
-/* Keymap for Infiity prototype */
+/* Keymap for Infinity prototype */
-#define INFINITY_PROTOTYPE
+//#define INFINITY_PROTOTYPE
 /* Keymap for Infinity 1.1a (first revision with LED support) */
 //#define INFINITY_LED
 /*
 * Feature disable options
--- a/keyboards/infinity_chibios/infinity_chibios.h
+++ b/keyboards/infinity_chibios/infinity_chibios.h
@ -29,15 +29,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    K54, K64, K74, K84, K05, K15, K25, K35, K45, K55, K65, K75, K85, \
    K06, K16, K26,           K36,                K46, K56, K66, K76 \
 ) { \
-    { KC_##K00, KC_##K01, KC_##K02, KC_##K03, KC_##K04, KC_##K05, KC_##K06 }, \
+    { K00, K01, K02, K03, K04, K05, K06 }, \
-    { KC_##K10, KC_##K11, KC_##K12, KC_##K13, KC_##K14, KC_##K15, KC_##K16 }, \
+    { K10, K11, K12, K13, K14, K15, K16 }, \
-    { KC_##K20, KC_##K21, KC_##K22, KC_##K23, KC_##K24, KC_##K25, KC_##K26 }, \
+    { K20, K21, K22, K23, K24, K25, K26 }, \
-    { KC_##K30, KC_##K31, KC_##K32, KC_##K33, KC_##K34, KC_##K35, KC_##K36 }, \
+    { K30, K31, K32, K33, K34, K35, K36 }, \
-    { KC_##K40, KC_##K41, KC_##K42, KC_##K43, KC_##K44, KC_##K45, KC_##K46 }, \
+    { K40, K41, K42, K43, K44, K45, K46 }, \
-    { KC_##K50, KC_##K51, KC_##K52, KC_##K53, KC_##K54, KC_##K55, KC_##K56 }, \
+    { K50, K51, K52, K53, K54, K55, K56 }, \
-    { KC_##K60, KC_##K61, KC_##K62, KC_##K63, KC_##K64, KC_##K65, KC_##K66 }, \
+    { K60, K61, K62, K63, K64, K65, K66 }, \
-    { KC_##K70, KC_##K71, KC_##K72, KC_##K73, KC_##K74, KC_##K75, KC_##K76 }, \
+    { K70, K71, K72, K73, K74, K75, K76 }, \
-    { KC_##K80, KC_##K81, KC_##K82, KC_##K83, KC_##K84, KC_##K85, KC_##K86 }  \
+    { K80, K81, K82, K83, K84, K85, K86 }  \
 }
 #else
@ -50,15 +50,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
    K64, K74, K84, K05, K15, K25, K35, K45, K55, K65, K75, K85, K06, \
    K16, K26, K36,           K46,                K56, K66, K76, K86 \
 ) { \
-    { KC_##K00, KC_##K01, KC_##K02, KC_##K03, KC_##K04, KC_##K05, KC_##K06 }, \
+    { K00, K01, K02, K03, K04, K05, K06 }, \
-    { KC_##K10, KC_##K11, KC_##K12, KC_##K13, KC_##K14, KC_##K15, KC_##K16 }, \
+    { K10, K11, K12, K13, K14, K15, K16 }, \
-    { KC_##K20, KC_##K21, KC_##K22, KC_##K23, KC_##K24, KC_##K25, KC_##K26 }, \
+    { K20, K21, K22, K23, K24, K25, K26 }, \
-    { KC_##K30, KC_##K31, KC_##K32, KC_##K33, KC_##K34, KC_##K35, KC_##K36 }, \
+    { K30, K31, K32, K33, K34, K35, K36 }, \
-    { KC_##K40, KC_##K41, KC_##K42, KC_##K43, KC_##K44, KC_##K45, KC_##K46 }, \
+    { K40, K41, K42, K43, K44, K45, K46 }, \
-    { KC_##K50, KC_##K51, KC_##K52, KC_##K53, KC_##K54, KC_##K55, KC_##K56 }, \
+    { K50, K51, K52, K53, K54, K55, K56 }, \
-    { KC_##K60, KC_##K61, KC_##K62, KC_##K63, KC_##K64, KC_##K65, KC_##K66 }, \
+    { K60, K61, K62, K63, K64, K65, K66 }, \
-    { KC_##K70, KC_##K71, KC_##K72, KC_##K73, KC_##K74, KC_##K75, KC_##K76 }, \
+    { K70, K71, K72, K73, K74, K75, K76 }, \
-    { KC_##K80, KC_##K81, KC_##K82, KC_##K83, KC_##K84, KC_##K85, KC_##K86 }  \
+    { K80, K81, K82, K83, K84, K85, K86 }  \
 }
 #endif
--- a/keyboards/infinity_chibios/keymaps/default/keymap.c
+++ b/keyboards/infinity_chibios/keymaps/default/keymap.c
@ -14,12 +14,12 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     * |     |Gui|Alt  |         Space         |Alt  |Gui|   |     |
     * `-----------------------------------------------------------'
     */
-    [0] =
+    [0] = KEYMAP(
-    KEYMAP(ESC, 1,   2,   3,   4,   5,   6,   7,   8,   9,   0,   MINS,EQL, BSLS, GRV, \
+      KC_ESC, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL, KC_BSLS, KC_GRV, \
-           TAB, Q,   W,   E,   R,   T,   Y,   U,   I,   O,   P,   LBRC,RBRC,BSPC, \
+      KC_TAB, KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC,KC_RBRC,KC_BSPC, \
-           LCTL,A,   S,   D,   F,   G,   H,   J,   K,   L,   SCLN,QUOT,ENT,  \
+      KC_LCTL,KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,KC_ENT,  \
-           LSFT,Z,   X,   C,   V,   B,   N,   M,   COMM,DOT, SLSH,RSFT,FN0, \
+      KC_LSFT,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,KC_RSFT,MO(1), \
-           NO,  LGUI,LALT,          SPC,                RALT,RGUI,NO, NO),
+      KC_NO,  KC_LGUI,KC_LALT,          KC_SPC,                KC_RALT,KC_RGUI,KC_NO, KC_NO),
    /* Layer 1: HHKB mode (HHKB Fn)
     * ,-----------------------------------------------------------.
@ -34,15 +34,15 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     * |     |Gui|Alt  |         Space         |Alt  |Gui|   |     |
     * `-----------------------------------------------------------'
     */ 
-    [1] = 
+    [1] = KEYMAP(
-    KEYMAP(PWR, F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9,  F10, F11, F12, INS, DEL,   \
+      KC_PWR, KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL,   \
-           CAPS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,PSCR,SLCK,PAUS, UP, TRNS, BSPC,      \
+      KC_CAPS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_PSCR,KC_SLCK,KC_PAUS, KC_UP, KC_TRNS, KC_BSPC,      \
-           TRNS,VOLD,VOLU,MUTE,TRNS,TRNS,PAST,PSLS,HOME,PGUP,LEFT,RGHT,PENT,            \
+      KC_TRNS,KC_VOLD,KC_VOLU,KC_MUTE,KC_TRNS,KC_TRNS,KC_PAST,KC_PSLS,KC_HOME,KC_PGUP,KC_LEFT,KC_RGHT,KC_PENT,            \
-           TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,PPLS,PMNS,END, PGDN,DOWN,TRNS,TRNS,            \
+      KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_PPLS,KC_PMNS,KC_END, KC_PGDN,KC_DOWN,KC_TRNS,KC_TRNS,            \
-           TRNS,TRNS,TRNS,          TRNS,               TRNS,TRNS,TRNS,TRNS),
+      KC_TRNS,KC_TRNS,KC_TRNS,          KC_TRNS,               KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS),
 };
 const uint16_t fn_actions[] = {
-    [0] = ACTION_LAYER_MOMENTARY(1),
+    
 };
--- a/keyboards/infinity_chibios/keymaps/depariel/keymap.c
+++ b/keyboards/infinity_chibios/keymaps/depariel/keymap.c
@ -0,0 +1,82 @@
 #include "infinity_chibios.h"
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    /* Layer 0: Default Layer
     * ,-----------------------------------------------------------.
     * |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|  \|  `|
     * |-----------------------------------------------------------|
     * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]| Bksp|
     * |-----------------------------------------------------------|
     * |Contro|  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Enter   |
     * |-----------------------------------------------------------|
     * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift |Fn2|
     * |-----------------------------------------------------------'
     * |Fn2 |Gui |Alt |         Space           |RAlt|Prv|PlPs|Next|
     * `-----------------------------------------------------------'
     */
    [0] = KEYMAP(
        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,            KC_BSLS,  KC_GRV, \
        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,           KC_BSPC, \
        KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, LT(5, KC_ENT),  \
        KC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC, MO(4), \
        MO(4),   KC_LGUI, KC_LALT,               LT(3, KC_SPC),                 KC_RALT, KC_MPRV, KC_MPLY, KC_MNXT),
    /* Layer 1: "Toggle" off SpaceFn for League of Legends
     */
    [1] = KEYMAP(
        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS,  KC_GRV, \
        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC, \
        KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  \
        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(4), \
        MO(4),   KC_LGUI, KC_LALT,                   KC_SPC,                    KC_RALT, KC_MPRV, KC_MPLY, KC_MNXT),
    /* Layer 2: "Toggle" off SpaceFn for MapleRoyals
     */
    [2] = KEYMAP(
        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS,  KC_GRV, \
        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC, \
        KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  \
        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_UP,   KC_LSFT, \
        MO(4),   KC_LGUI, KC_LALT,                   KC_SPC,                    KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT),
    /* Layer 3: FN layer 1
     */ 
    [3] = KEYMAP(
        KC_NO,           KC_F1,   KC_F2,   KC_F3,   KC_F4,          KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NO,   KC_NO,   \
        KC_NO,           KC_BTN1, KC_MS_U, KC_BTN2, LALT(KC_F4),    KC_HOME, KC_PGUP, KC_PSCR, KC_SLCK, KC_UP,   KC_NO,   KC_LPRN, KC_RPRN, KC_DEL,      \
        MO(6),           KC_MS_L, KC_MS_D, KC_MS_R, KC_NO,          KC_END,  KC_PGDN, KC_TILD, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO,   KC_NO,           \
        LGUI(KC_SPC),    KC_NO,   KC_NO,   KC_NO,   KC_NO,          KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_CALC, KC_MENU, KC_TRNS, TG(4),           \
        KC_TRNS,         KC_TRNS, KC_TRNS,                       LT(3, KC_SPC),                KC_TRNS, KC_VOLD, KC_MUTE, KC_VOLU),
    /* Layer 4: FN layer 2
     */ 
    [4] = KEYMAP(
        KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_PMNS, KC_PPLS, KC_PSLS, TG(2),   \
        KC_CAPS, KC_NO,   KC_UP,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_PSCR, KC_NO,   KC_P7,   KC_P8,   KC_P9,   KC_PAST, KC_BSPC,      \
        KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_P4,   KC_P5,   KC_P6,   KC_PENT,           \
        KC_LSFT, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_P1,   KC_P2,   KC_P3,   KC_RSFT, MO(4),           \
        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                   KC_P0,   KC_PDOT, KC_NO,   TG(1)),
    /* Layer 5: FN layer 3
     */ 
    [5] = KEYMAP(
        KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,            KC_NO,   KC_NO,   \
        KC_TAB , KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_NO,            KC_TRNS,      \
        KC_TRNS, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_F17,  KC_F18,  KC_F19,  KC_F20,  LT(5, KC_ENT),           \
        KC_TRNS, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_F21,  KC_F22,  KC_F23,  KC_F24,  KC_TRNS, KC_TRNS,           \
        KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                   KC_RALT, KC_NO,   KC_NO,  KC_NO),
    /* Layer 6: FN layer 4
     */ 
    [6] = KEYMAP(
        KC_NO,                 KC_NO,            KC_NO,          KC_NO,            KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   \
        LCTL(LSFT(KC_TAB)),    KC_NO,            LGUI(KC_UP),    KC_NO,            KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,      \
        MO(6),                 LGUI(KC_LEFT),    LGUI(KC_DOWN),  LGUI(KC_RGHT),    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,       \
        KC_TRNS,               KC_NO,            KC_NO,          KC_NO,            KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_TRNS, KC_TRNS,           \
        KC_TRNS,               KC_TRNS,          KC_TRNS,                   KC_TRNS,                 KC_TRNS, KC_NO,   KC_NO,   KC_NO),
 };
 const uint16_t PROGMEM fn_actions[] = {
 };
--- a/keyboards/infinity_chibios/keymaps/hasu/keymap.c
+++ b/keyboards/infinity_chibios/keymaps/hasu/keymap.c
@ -14,12 +14,12 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     * |     |Gui|Alt  |         Space         |Alt  |Gui|   |     |
     * `-----------------------------------------------------------'
     */
-    [0] =
+    [0] = KEYMAP(
-    KEYMAP(ESC, 1,   2,   3,   4,   5,   6,   7,   8,   9,   0,   MINS,EQL, BSLS,GRV, \
+        KC_ESC,    KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,           KC_MINS,KC_EQL, KC_BSLS,KC_GRV, \
-           TAB, Q,   W,   E,   R,   T,   Y,   U,   I,   O,   P,   LBRC,RBRC,BSPC, \
+        KC_TAB,    KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,           KC_LBRC,KC_RBRC,KC_BSPC, \
-           LCTL,A,   S,   D,   F,   G,   H,   J,   K,   L,   FN3, QUOT,FN6, \
+        KC_LCTL,   KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   LT(3, KC_SCLN), KC_QUOT,MT(KC_RCTL, KC_ENT), \
-           FN7, Z,   X,   C,   V,   B,   N,   M,   COMM,DOT, FN2, RSFT,FN1, \
+        OSM(MOD_LSFT), KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, LT(2, KC_SLSH), KC_RSFT,TG(1), \
-           NO,  LGUI,LALT,          FN4,                FN5, RGUI,NO, NO),
+        KC_NO,     KC_LGUI,KC_LALT,         LT(4, KC_SPC),                 MO(4),  KC_RGUI,KC_NO,          KC_NO),
    /* Layer 1: HHKB mode (HHKB Fn)
     * ,-----------------------------------------------------------.
@ -34,12 +34,12 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     * |     |Gui|Alt  |         Space         |Alt  |Gui|   |     |
     * `-----------------------------------------------------------'
     */ 
-    [1] = 
+    [1] = KEYMAP(
-    KEYMAP(PWR, F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9,  F10, F11, F12, INS, DEL, \
+        KC_PWR, KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL, \
-           CAPS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,PSCR,SLCK,PAUS, UP,  TRNS,BSPC, \
+        KC_CAPS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_PSCR,KC_SLCK,KC_PAUS, KC_UP,  KC_TRNS,KC_BSPC, \
-           LCTL,VOLD,VOLU,MUTE,TRNS,TRNS,PAST,PSLS,HOME,PGUP,LEFT,RGHT,ENT, \
+        KC_LCTL,KC_VOLD,KC_VOLU,KC_MUTE,KC_TRNS,KC_TRNS,KC_PAST,KC_PSLS,KC_HOME,KC_PGUP,KC_LEFT,KC_RGHT,KC_ENT, \
-           LSFT,TRNS,TRNS,TRNS,TRNS,TRNS,PPLS,PMNS,END, PGDN,DOWN,RSFT,TRNS, \
+        KC_LSFT,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_PPLS,KC_PMNS,KC_END, KC_PGDN,KC_DOWN,KC_RSFT,KC_TRNS, \
-           TRNS,LGUI,LALT,          TRNS,               RALT,RGUI,TRNS,TRNS),
+        KC_TRNS,KC_LGUI,KC_LALT,          KC_TRNS,                      KC_RALT,KC_RGUI,KC_TRNS,KC_TRNS),
    /* Layer 2: Vi mode[Slash]
     * ,-----------------------------------------------------------.
@ -54,12 +54,12 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     *       |Gui|Alt  |          Space        |Alt  |Gui|
     *       `-------------------------------------------'
     */
-    [2] = \
+    [2] = KEYMAP(
-    KEYMAP(GRV, F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9,  F10, F11, F12, INS, DEL, \
+        KC_GRV, KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10,         KC_F11, KC_F12, KC_INS, KC_DEL, \
-           TAB, HOME,PGDN,UP,  PGUP,END, HOME,PGDN,PGUP,END, NO,  NO,  NO,  BSPC, \
+        KC_TAB, KC_HOME,KC_PGDN,KC_UP,  KC_PGUP,KC_END, KC_HOME,KC_PGDN,KC_PGUP,KC_END, KC_NO,          KC_NO,  KC_NO,  KC_BSPC, \
-           LCTL,NO,  LEFT,DOWN,RGHT,NO,  LEFT,DOWN,UP,  RGHT,NO,  NO,  ENT, \
+        KC_LCTL,KC_NO,  KC_LEFT,KC_DOWN,KC_RGHT,KC_NO,  KC_LEFT,KC_DOWN,KC_UP,  KC_RGHT,KC_NO,          KC_NO,  KC_ENT, \
-           LSFT,NO,  NO,  NO,  NO,  NO,  HOME,PGDN,PGUP,END, FN2, RSFT,TRNS, \
+        KC_LSFT,KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_HOME,KC_PGDN,KC_PGUP,KC_END, LT(2, KC_SLSH), KC_RSFT,KC_TRNS, \
-           TRNS,LGUI,LALT,          SPC,                RALT,RGUI,TRNS,TRNS),
+        KC_TRNS,KC_LGUI,KC_LALT,          KC_SPC,                       KC_RALT,KC_RGUI,KC_TRNS,        KC_TRNS),
    /* Layer 3: Mouse mode(IJKL)[Semicolon]
     * ,-----------------------------------------------------------.
@ -75,12 +75,12 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     *      `--------------------------------------------'
     * Mc: Mouse Cursor / Mb: Mouse Button / Mw: Mouse Wheel
     */
-    [3] = \
+    [3] = KEYMAP(
-    KEYMAP(GRV, F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9,  F10, F11, F12, INS, DEL, \
+        KC_GRV,       KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,          KC_F9,          KC_F10,         KC_F11,         KC_F12,        KC_INS, KC_DEL, \
-           FN8, NO,  NO,  NO,  NO,  NO,  WH_L,WH_D,MS_U,WH_U,WH_R,FN9, FN10,FN8, \
+        LALT(KC_TAB), KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_WH_L,KC_WH_D,KC_MS_U,        KC_WH_U,        KC_WH_R,        ALT_T(KC_LEFT), ALT_T(KC_RGHT),LALT(KC_TAB), \
-           LCTL,ACL0,ACL1,ACL2,ACL2,NO,  NO,  MS_L,MS_D,MS_R,FN3, NO,  ENT, \
+        KC_LCTL,      KC_ACL0,KC_ACL1,KC_ACL2,KC_ACL2,KC_NO,  KC_NO,  KC_MS_L,KC_MS_D,        KC_MS_R,        LT(3, KC_SCLN), KC_NO,          KC_ENT, \
-           LSFT,NO,  NO,  NO,  NO,  BTN3,BTN2,BTN1,FN9, FN10,NO,  RSFT,TRNS, \
+        KC_LSFT,      KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_BTN3,KC_BTN2,KC_BTN1,ALT_T(KC_LEFT), ALT_T(KC_RGHT), KC_NO,          KC_RSFT,        KC_TRNS, \
-           TRNS,LGUI,LALT,          BTN1,               TRNS,TRNS,TRNS,TRNS),
+        KC_TRNS,      KC_LGUI,KC_LALT,          KC_BTN1,                      KC_TRNS,        KC_TRNS,        KC_TRNS,        KC_TRNS),
    /* Layer 4: Mouse mode(IJKL)[Space]
     * ,-----------------------------------------------------------.
@ -96,104 +96,18 @@ const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     *      `--------------------------------------------'
     * Mc: Mouse Cursor / Mb: Mouse Button / Mw: Mouse Wheel
     */
-    [4] = \
+    [4] = KEYMAP(
-    KEYMAP(GRV, F1,  F2,  F3,  F4,  F5,  F6,  F7,  F8,  F9,  F10, F11, F12, INS, DEL, \
+        KC_GRV,       KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,         KC_F9,         KC_F10, KC_F11, KC_F12, KC_INS,       KC_DEL, \
-           FN8, NO,  NO,  NO,  NO,  NO,  WH_L,WH_D,MS_U,WH_U,WH_R,BTN4,BTN5,FN8, \
+        LALT(KC_TAB), KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_WH_L,KC_WH_D,KC_MS_U,       KC_WH_U,       KC_WH_R,KC_BTN4,KC_BTN5,LALT(KC_TAB), \
-           LCTL,VOLD,VOLU,MUTE,NO,  NO,  NO,  MS_L,MS_D,MS_R,BTN1,NO,  ENT, \
+        KC_LCTL,      KC_VOLD,KC_VOLU,KC_MUTE,KC_NO,  KC_NO,  KC_NO,  KC_MS_L,KC_MS_D,       KC_MS_R,       KC_BTN1,KC_NO,  KC_ENT, \
-           LSFT,NO,  NO,  NO,  NO,  BTN3,BTN2,BTN1,FN9, FN10,NO,  RSFT,TRNS, \
+        KC_LSFT,      KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_BTN3,KC_BTN2,KC_BTN1,ALT_T(KC_LEFT),ALT_T(KC_RGHT),KC_NO,  KC_RSFT,KC_TRNS, \
-           TRNS,LGUI,LALT,          TRNS,               TRNS,TRNS,TRNS,TRNS),
+        KC_TRNS,      KC_LGUI,KC_LALT,          KC_TRNS,                      KC_TRNS,       KC_TRNS,       KC_TRNS,KC_TRNS),
 };
 /* id for user defined functions */
 enum function_id {
    LSHIFT_LPAREN,
 };
 enum macro_id {
    HELLO,
    VOLUP,
    ALT_TAB,
 };
 /*
 * Fn action definition
 */
 const uint16_t fn_actions[] = {
    [0] = ACTION_DEFAULT_LAYER_SET(0),                // Default layer(not used)
    [1] = ACTION_LAYER_TAP_TOGGLE(1),                 // HHKB layer(toggle with 5 taps)
    [2] = ACTION_LAYER_TAP_KEY(2, KC_SLASH),          // Cursor layer with Slash*
    [3] = ACTION_LAYER_TAP_KEY(3, KC_SCLN),           // Mousekey layer with Semicolon*
    [4] = ACTION_LAYER_TAP_KEY(4, KC_SPC),            // Mousekey layer with Space
    [5] = ACTION_LAYER_MOMENTARY(4),                  // Mousekey layer(IJKL)
    [6] = ACTION_MODS_TAP_KEY(MOD_RCTL, KC_ENT),      // RControl with tap Enter
    [7] = ACTION_MODS_ONESHOT(MOD_LSFT),              // Oneshot Shift
    [8] = ACTION_MACRO(ALT_TAB),                      // Application switching
    [9] = ACTION_MODS_KEY(MOD_LALT, KC_LEFT),
   [10] = ACTION_MODS_KEY(MOD_LALT, KC_RIGHT),
 };
 /*
 * Macro definition
 */
 const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
 {
    switch (id) {
        case HELLO:
            return (record->event.pressed ?
                    MACRO( I(0), T(H), T(E), T(L), T(L), W(255), T(O), END ) :
                    MACRO_NONE );
        case VOLUP:
            return (record->event.pressed ?
                    MACRO( D(VOLU), U(VOLU), END ) :
                    MACRO_NONE );
        case ALT_TAB:
            return (record->event.pressed ?
                    MACRO( D(LALT), D(TAB), END ) :
                    MACRO( U(TAB), END ));
    }
    return MACRO_NONE;
 }
-
+};
 /*
 * user defined action function
 */
 void action_function(keyrecord_t *record, uint8_t id, uint8_t opt)
 {
    if (record->event.pressed) dprint("P"); else dprint("R");
    dprintf("%d", record->tap.count);
    if (record->tap.interrupted) dprint("i");
    dprint("\n");
    switch (id) {
        case LSHIFT_LPAREN:
            // Shift parentheses example: LShft + tap '('
            // http://stevelosh.com/blog/2012/10/a-modern-space-cadet/#shift-parentheses
            // http://geekhack.org/index.php?topic=41989.msg1304899#msg1304899
            if (record->event.pressed) {
                if (record->tap.count > 0 && !record->tap.interrupted) {
                    if (record->tap.interrupted) {
                        dprint("tap interrupted\n");
                        register_mods(MOD_BIT(KC_LSHIFT));
                    }
                } else {
                    register_mods(MOD_BIT(KC_LSHIFT));
                }
            } else {
                if (record->tap.count > 0 && !(record->tap.interrupted)) {
                    add_weak_mods(MOD_BIT(KC_LSHIFT));
                    send_keyboard_report();
                    register_code(KC_9);
                    unregister_code(KC_9);
                    del_weak_mods(MOD_BIT(KC_LSHIFT));
                    send_keyboard_report();
                    record->tap.count = 0;  // ad hoc: cancel tap
                } else {
                    unregister_mods(MOD_BIT(KC_LSHIFT));
                }
            }
            break;
    }
 }
--- a/keyboards/infinity_chibios/matrix.c
+++ b/keyboards/infinity_chibios/matrix.c
@ -12,9 +12,12 @@
 * Infinity Pinusage:
 * Column pins are input with internal pull-down. Row pins are output and strobe with high.
 * Key is high or 1 when it turns on.
- *
+ *  INFINITY PRODUCTION (NO LED)
 *     col: { PTD1, PTD2, PTD3, PTD4, PTD5, PTD6, PTD7 }
 *     row: { PTB0, PTB1, PTB2, PTB3, PTB16, PTB17, PTC4, PTC5, PTD0 }
 *  INFINITY PRODUCTION (WITH LED)
 *     col: { PTD1, PTD2, PTD3, PTD4, PTD5, PTD6, PTD7 }
 *     row: { PTC0, PTC1, PTC2, PTC3, PTC4, PTC5, PTC6, PTC7, PTD0 }
 */
 /* matrix state(1:on, 0:off) */
 static matrix_row_t matrix[MATRIX_ROWS];
@ -34,6 +37,18 @@ void matrix_init(void)
    palSetPadMode(GPIOD, 6,  PAL_MODE_INPUT_PULLDOWN);
    palSetPadMode(GPIOD, 7,  PAL_MODE_INPUT_PULLDOWN);
 #ifdef INFINITY_LED
    /* Row(strobe) */
    palSetPadMode(GPIOC, 0,  PAL_MODE_OUTPUT_PUSHPULL);
    palSetPadMode(GPIOC, 1,  PAL_MODE_OUTPUT_PUSHPULL);
    palSetPadMode(GPIOC, 2,  PAL_MODE_OUTPUT_PUSHPULL);
    palSetPadMode(GPIOC, 3,  PAL_MODE_OUTPUT_PUSHPULL);
    palSetPadMode(GPIOC, 4,  PAL_MODE_OUTPUT_PUSHPULL);
    palSetPadMode(GPIOC, 5,  PAL_MODE_OUTPUT_PUSHPULL);
    palSetPadMode(GPIOC, 6,  PAL_MODE_OUTPUT_PUSHPULL);
    palSetPadMode(GPIOC, 7,  PAL_MODE_OUTPUT_PUSHPULL);
    palSetPadMode(GPIOD, 0,  PAL_MODE_OUTPUT_PUSHPULL);
 #else
    /* Row(strobe) */
    palSetPadMode(GPIOB, 0,  PAL_MODE_OUTPUT_PUSHPULL);
    palSetPadMode(GPIOB, 1,  PAL_MODE_OUTPUT_PUSHPULL);
@ -44,7 +59,7 @@ void matrix_init(void)
    palSetPadMode(GPIOC, 4,  PAL_MODE_OUTPUT_PUSHPULL);
    palSetPadMode(GPIOC, 5,  PAL_MODE_OUTPUT_PUSHPULL);
    palSetPadMode(GPIOD, 0,  PAL_MODE_OUTPUT_PUSHPULL);
-
+#endif
    memset(matrix, 0, MATRIX_ROWS);
    memset(matrix_debouncing, 0, MATRIX_ROWS);
 }
@ -53,7 +68,20 @@ uint8_t matrix_scan(void)
 {
    for (int row = 0; row < MATRIX_ROWS; row++) {
        matrix_row_t data = 0;
-
+    #ifdef INFINITY_LED
        // strobe row
        switch (row) {
            case 0: palSetPad(GPIOC, 0);    break;
            case 1: palSetPad(GPIOC, 1);    break;
            case 2: palSetPad(GPIOC, 2);    break;
            case 3: palSetPad(GPIOC, 3);    break;
            case 4: palSetPad(GPIOC, 4);    break;
            case 5: palSetPad(GPIOC, 5);    break;
            case 6: palSetPad(GPIOC, 6);    break;
            case 7: palSetPad(GPIOC, 7);    break;
            case 8: palSetPad(GPIOD, 0);    break;
        }
    #else
        // strobe row
        switch (row) {
            case 0: palSetPad(GPIOB, 0);    break;
@ -66,12 +94,26 @@ uint8_t matrix_scan(void)
            case 7: palSetPad(GPIOC, 5);    break;
            case 8: palSetPad(GPIOD, 0);    break;
        }
    #endif
        wait_us(1); // need wait to settle pin state
        // read col data
        data = (palReadPort(GPIOD)>>1);
-
+    #ifdef INFINITY_LED
        // un-strobe row
        switch (row) {
            case 0: palClearPad(GPIOC, 0);    break;
            case 1: palClearPad(GPIOC, 1);    break;
            case 2: palClearPad(GPIOC, 2);    break;
            case 3: palClearPad(GPIOC, 3);    break;
            case 4: palClearPad(GPIOC, 4);    break;
            case 5: palClearPad(GPIOC, 5);    break;
            case 6: palClearPad(GPIOC, 6);    break;
            case 7: palClearPad(GPIOC, 7);    break;
            case 8: palClearPad(GPIOD, 0);    break;
        }
    #else
        // un-strobe row
        switch (row) {
            case 0: palClearPad(GPIOB, 0);    break;
@ -84,6 +126,7 @@ uint8_t matrix_scan(void)
            case 7: palClearPad(GPIOC, 5);    break;
            case 8: palClearPad(GPIOD, 0);    break;
        }
    #endif
        if (matrix_debouncing[row] != data) {
            matrix_debouncing[row] = data;
--- a/keyboards/planck/keymaps/cbbrowne/keymap.c
+++ b/keyboards/planck/keymaps/cbbrowne/keymap.c
@ -4,6 +4,7 @@
 #endif
 #include "config.h"
 #include "quantum.h"
 #include "version.h"
 /* Each layer is given a name to aid in readability, which is then
   used in the keymap matrix below.  The underscores do not denote 
--- a/keyboards/planck/keymaps/experimental/keymap.c
+++ b/keyboards/planck/keymaps/experimental/keymap.c
@ -8,6 +8,7 @@
 #endif
 #include "eeconfig.h"
 #include "version.h"
 extern keymap_config_t keymap_config;
--- a/keyboards/planck/keymaps/jeebak/Makefile
+++ b/keyboards/planck/keymaps/jeebak/Makefile
@ -0,0 +1,25 @@
 # Build Options
 #   change to "no" to disable the options, or define them in the Makefile in 
 #   the appropriate keymap folder that will get included automatically
 #
 BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration(+1000)
 MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
 EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
 CONSOLE_ENABLE = no         # Console for debug(+400)
 COMMAND_ENABLE = yes        # Commands for debug and configuration
 NKRO_ENABLE = yes            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
 BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 MIDI_ENABLE = no            # MIDI controls
 AUDIO_ENABLE = yes           # Audio output on port C6
 UNICODE_ENABLE = no         # Unicode
 BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time.
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
 ifndef QUANTUM_DIR
 	include ../../../../Makefile
 endif
--- a/keyboards/planck/keymaps/jeebak/keymap.c
+++ b/keyboards/planck/keymaps/jeebak/keymap.c
@ -0,0 +1,364 @@
 // This is the canonical layout file for the Quantum project. If you want to add another keyboard,
 // this is the style you want to emulate.
 #include "planck.h"
 #include "action_layer.h"
 #ifdef AUDIO_ENABLE
  #include "audio.h"
 #endif
 #include "eeconfig.h"
 extern keymap_config_t keymap_config;
 // Each layer gets a name for readability, which is then used in the keymap matrix below.
 // The underscores don't mean anything - you can have a layer called STUFF or any other name.
 // Layer names don't all need to be of the same length, obviously, and you can also skip them
 // entirely and just use numbers.
 #define _QWERTY 0
 #define _COLEMAK 1
 #define _DVORAK 2
 #define _LOWER 3
 #define _RAISE 4
 #define _PLOVER 5
 #define _TOUCHCURSOR 6
 #define _MOUSE 7
 #define _ADJUST 16
 enum planck_keycodes {
  QWERTY = SAFE_RANGE,
  COLEMAK,
  DVORAK,
  PLOVER,
  LOWER,
  RAISE,
  BACKLIT,
  EXT_PLV
 };
 // Fillers to make layering more clear
 #define _______ KC_TRNS
 #define XXXXXXX KC_NO
 // Custom macros
 #define CTL_ESC     CTL_T(KC_ESC)               // Tap for Esc, hold for Ctrl
 #define LT_TC       LT(_TOUCHCURSOR, KC_SPC)    // L-ayer T-ap T-ouch C-ursor
 //                  ^-- Requires KC_TRNS / _______ for the trigger key in the destination layer
 #define SFT_ENT     SFT_T(KC_ENT)               // Tap for Enter, hold for Shift
 #define LT_ML       LT(_MOUSE, KC_A)            // L-ayer T-ap M-ouse C-ursor (on A)
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* Qwerty
 * ,-----------------------------------------------------------------------------------------.
 * | Tab      |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  |  Bksp  |
 * |----------+------+------+------+------+-------------+------+------+------+------+--------|
 * | Ctrl/Esc | ML/A |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |   "    |
 * |----------+------+------+------+------+------|------+------+------+------+------+--------|
 * | Shift    |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Sft/Ent |
 * |----------+------+------+------+------+------+------+------+------+------+------+--------|
 * | PrntScrn | RGUI | Alt  | GUI  |Lower |  TC/Space   |Raise | Next | Vol- | Vol+ |  Play  |
 * `-----------------------------------------------------------------------------------------'
 */
 [_QWERTY] = {
  {KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC},
  {CTL_ESC, LT_ML,   KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT},
  {KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SFT_ENT},
  {KC_PSCR, KC_RGUI, KC_LALT, KC_LGUI, LOWER,   LT_TC,   LT_TC,   RAISE,   KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY}
 },
 /* Colemak
 * ,-----------------------------------------------------------------------------------------.
 * | Tab      |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  |  Bksp  |
 * |----------+------+------+------+------+-------------+------+------+------+------+--------|
 * | Ctrl/Esc | ML/A |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |   "    |
 * |----------+------+------+------+------+------|------+------+------+------+------+--------|
 * | Shift    |   Z  |   X  |   C  |   V  |   B  |   K  |   M  |   ,  |   .  |   /  |Sft/Ent |
 * |----------+------+------+------+------+------+------+------+------+------+------+--------|
 * | PrntScrn | RGUI | Alt  | GUI  |Lower |  TC/Space   |Raise | Next | Vol- | Vol+ |  Play  |
 * `-----------------------------------------------------------------------------------------'
 */
 [_COLEMAK] = {
  {KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC},
  {CTL_ESC, LT_ML,   KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT},
  {KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SFT_ENT},
  {KC_PSCR, KC_RGUI, KC_LALT, KC_LGUI, LOWER,   LT_TC,   LT_TC,   RAISE,   KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY}
 },
 /* Dvorak
 * ,-----------------------------------------------------------------------------------------.
 * | Tab      |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  |  Bksp  |
 * |----------+------+------+------+------+-------------+------+------+------+------+--------|
 * | Ctrl/Esc | ML/A |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |   /    |
 * |----------+------+------+------+------+------|------+------+------+------+------+--------|
 * | Shift    |   ;  |   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |Sft/Ent |
 * |----------+------+------+------+------+------+------+------+------+------+------+--------|
 * | PrntScrn | RGUI | Alt  | GUI  |Lower |  TC/Space   |Raise | Next | Vol- | Vol+ |  Play  |
 * `-----------------------------------------------------------------------------------------'
 */
 [_DVORAK] = {
  {KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC},
  {CTL_ESC, LT_ML,   KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH},
  {KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    SFT_ENT},
  {KC_PSCR, KC_RGUI, KC_LALT, KC_LGUI, LOWER,   LT_TC,   LT_TC,   RAISE,   KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY}
 },
 /* Lower
 * ,-----------------------------------------------------------------------------------.
 * |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
 * |------+------+------+------+------+-------------+------+------+------+------+------|
 * |   [  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
 * |------+------+------+------+------+------|------+------+------+------+------+------|
 * |   ]  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |   -  |   =  |   [  |   ]  |  \   |
 * |------+------+------+------+------+------+------+------+------+------+------+------|
 * |Brite |      |      |      |      |             |      | Prev | Stop | Slct | Mute |
 * `-----------------------------------------------------------------------------------'
 */
 [_LOWER] = {
  {KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC},
  {KC_LBRC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE},
  {KC_RBRC, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS},
  {BACKLIT, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MSTP, KC_MSEL, KC_MUTE}
 },
 /* Raise
 * ,-----------------------------------------------------------------------------------.
 * |   0  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
 * |------+------+------+------+------+-------------+------+------+------+------+------|
 * |   $  |   4  |   5  |   6  |   .  |   +  |   *  |   4  |   5  |   6  |   -  |  |   |
 * |------+------+------+------+------+------|------+------+------+------+------+------|
 * |   =  |   7  |   8  |   9  |   0  |   -  |   /  |   1  |   2  |   3  |   .  |  \   |
 * |------+------+------+------+------+------+------+------+------+------+------+------|
 * |Brite |      |      |      |      |             |      | Prev | Stop | Slct | Mute |
 * `-----------------------------------------------------------------------------------'
 */
 [_RAISE] = {
  {KC_0,    KC_1,    KC_2,    KC_3,    KC_4,   KC_5,     KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC},
  {KC_DLR,  KC_4,    KC_5,    KC_6,    KC_DOT, KC_PLUS,  KC_ASTR, KC_4,    KC_5,    KC_6,    KC_MINS, KC_PIPE},
  {KC_EQL,  KC_7,    KC_8,    KC_9,    KC_0,   KC_MINS,  KC_SLSH, KC_1,    KC_2,    KC_3,    KC_DOT,  KC_BSLS},
  {BACKLIT, _______, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MSTP, KC_MSEL, KC_MUTE}
 },
 /* TouchCursor layer (http://martin-stone.github.io/touchcursor/) plus personal customizations
 * ,-----------------------------------------------------------------------------------.
 * |      |      |      |Shift | GUI  |  ~   |Insert| Home |  Up  | End  | Bksp |      |
 * |------+------+------+------+------+-------------+------+------+------+------+------|
 * |      | Alt  |Space |      | Find |Again | PgUp | Left | Down |Right |      |      |
 * |------+------+------+------+------+------|------+------+------+------+------+------|
 * |      | Undo | Cut  | Copy |Paste |  `   | PgDn | Del  |      |      |      |      |
 * |------+------+------+------+------+------+------+------+------+------+------+------|
 * |      |      |      |      |      |             |      |      |      |      |      |
 * `-----------------------------------------------------------------------------------'
 *
 * The KC_UNDO, KC_CUT, KC_COPY, KC_PASTE, KC_FIND, and KC_AGAIN keycodes don't
 * seem to work on Mac. Presumably they'll work under Windows.
 */
 [_TOUCHCURSOR] = {
  {_______, _______, _______, KC_LSFT, KC_LGUI, KC_TILD, KC_INS,  KC_HOME, KC_UP,   KC_END,  KC_BSPC, _______},
  {_______, KC_LALT, KC_SPC,  _______, KC_FIND,KC_AGAIN, KC_PGUP, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______},
  {_______, KC_UNDO, KC_CUT,  KC_COPY, KC_PASTE,KC_GRV,  KC_PGDN, KC_DEL,  _______, _______, _______, _______},
  {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______}
 },
 /* Mouse Layer
 * ,-----------------------------------------------------------------------------------.
 * |      |      |ACCL0 |ACCL1 |ACCL2 |ACCL2 |      |WHL_L |  Up  |WHL_R | BTN2 |      |
 * |------+------+------+------+------+-------------+------+------+------+------+------|
 * |      |      |      | BTN3 | BTN1 | BTN4 |WHL_Up| Left | Down |Right |      |      |
 * |------+------+------+------+------+------|------+------+------+------+------+------|
 * |      |      |      |      | BTN2 | BTN5 |WHL_Dn| BTN1 |      |      |      |      |
 * |------+------+------+------+------+------+------+------+------+------+------+------|
 * |      |      |      |      |      |             |      |      |      |      |      |
 * `-----------------------------------------------------------------------------------'
 */
 [_MOUSE] = {
  {_______, _______, KC_ACL0, KC_ACL1, KC_ACL2, KC_ACL2, _______, KC_WH_L, KC_MS_U, KC_WH_R, KC_BTN2, _______},
  {_______, _______, _______, KC_BTN3, KC_BTN1, KC_BTN4, KC_WH_U, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______},
  {_______, _______, _______, _______, KC_BTN2, KC_BTN5, KC_WH_D, KC_BTN1, _______, _______, _______, _______},
  {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______}
 },
 /* Plover layer (http://opensteno.org)
 * ,-----------------------------------------------------------------------------------.
 * |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
 * |------+------+------+------+------+-------------+------+------+------+------+------|
 * |      |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
 * |------+------+------+------+------+------|------+------+------+------+------+------|
 * |TogOut|   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
 * |------+------+------+------+------+------+------+------+------+------+------+------|
 * | Exit |      |      |   A  |   O  |             |   E  |   U  |      |      |      |
 * `-----------------------------------------------------------------------------------'
 */
 [_PLOVER] = {
  {KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1   },
  {XXXXXXX, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC},
  {XXXXXXX, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT},
  {EXT_PLV, XXXXXXX, XXXXXXX, KC_C,    KC_V,    XXXXXXX, XXXXXXX, KC_N,    KC_M,    XXXXXXX, XXXXXXX, XXXXXXX}
 },
 /* Adjust (Lower + Raise)
 * ,-----------------------------------------------------------------------------------.
 * |      |      |      |      |      |      |      |      |      |      |      |  Del |
 * |------+------+------+------+------+-------------+------+------+------+------+------|
 * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|Colemk|Dvorak|Plover|      |
 * |------+------+------+------+------+------|------+------+------+------+------+------|
 * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
 * |------+------+------+------+------+------+------+------+------+------+------+------|
 * |      |      |      |      |      |             |      |      |      |      |Reset |
 * `-----------------------------------------------------------------------------------'
 */
 [_ADJUST] = {
  {_______, _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL},
  {_______, _______, _______, AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______},
  {_______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  _______, _______, _______, _______, _______},
  {_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   RESET}
 }
 };
 #ifdef AUDIO_ENABLE
 float tone_startup[][2]    = SONG(STARTUP_SOUND);
 float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
 float tone_dvorak[][2]     = SONG(DVORAK_SOUND);
 float tone_colemak[][2]    = SONG(COLEMAK_SOUND);
 float tone_plover[][2]     = SONG(PLOVER_SOUND);
 float tone_plover_gb[][2]  = SONG(PLOVER_GOODBYE_SOUND);
 float music_scale[][2]     = SONG(MUSIC_SCALE_SOUND);
 float tone_goodbye[][2] = SONG(GOODBYE_SOUND);
 #endif
 void persistant_default_layer_set(uint16_t default_layer) {
  eeconfig_update_default_layer(default_layer);
  default_layer_set(default_layer);
 }
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  switch (keycode) {
    case QWERTY:
      if (record->event.pressed) {
        #ifdef AUDIO_ENABLE
          PLAY_NOTE_ARRAY(tone_qwerty, false, 0);
        #endif
        default_layer_set(1UL<<_QWERTY);
      }
      return false;
      break;
    case COLEMAK:
      if (record->event.pressed) {
        #ifdef AUDIO_ENABLE
          PLAY_NOTE_ARRAY(tone_colemak, false, 0);
        #endif
        default_layer_set(1UL<<_COLEMAK);
      }
      return false;
      break;
    case DVORAK:
      if (record->event.pressed) {
        #ifdef AUDIO_ENABLE
          PLAY_NOTE_ARRAY(tone_dvorak, false, 0);
        #endif
        default_layer_set(1UL<<_DVORAK);
      }
      return false;
      break;
    case LOWER:
      if (record->event.pressed) {
        layer_on(_LOWER);
        update_tri_layer(_LOWER, _RAISE, _ADJUST);
      } else {
        layer_off(_LOWER);
        update_tri_layer(_LOWER, _RAISE, _ADJUST);
      }
      return false;
      break;
    case RAISE:
      if (record->event.pressed) {
        layer_on(_RAISE);
        update_tri_layer(_LOWER, _RAISE, _ADJUST);
      } else {
        layer_off(_RAISE);
        update_tri_layer(_LOWER, _RAISE, _ADJUST);
      }
      return false;
      break;
    case BACKLIT:
      if (record->event.pressed) {
        register_code(KC_RSFT);
        #ifdef BACKLIGHT_ENABLE
          backlight_step();
        #endif
      } else {
        unregister_code(KC_RSFT);
      }
      return false;
      break;
    case PLOVER:
      if (record->event.pressed) {
        #ifdef AUDIO_ENABLE
          stop_all_notes();
          PLAY_NOTE_ARRAY(tone_plover, false, 0);
        #endif
        layer_off(_RAISE);
        layer_off(_LOWER);
        layer_off(_ADJUST);
        layer_on(_PLOVER);
        if (!eeconfig_is_enabled()) {
            eeconfig_init();
        }
        keymap_config.raw = eeconfig_read_keymap();
        keymap_config.nkro = 1;
        eeconfig_update_keymap(keymap_config.raw);
      }
      return false;
      break;
    case EXT_PLV:
      if (record->event.pressed) {
        #ifdef AUDIO_ENABLE
          PLAY_NOTE_ARRAY(tone_plover_gb, false, 0);
        #endif
        layer_off(_PLOVER);
      }
      return false;
      break;
  }
  return true;
 }
 void matrix_init_user(void) {
    #ifdef AUDIO_ENABLE
        startup_user();
    #endif
 }
 #ifdef AUDIO_ENABLE
 void startup_user()
 {
    _delay_ms(20); // gets rid of tick
    PLAY_NOTE_ARRAY(tone_startup, false, 0);
 }
 void shutdown_user()
 {
    PLAY_NOTE_ARRAY(tone_goodbye, false, 0);
    _delay_ms(150);
    stop_all_notes();
 }
 void music_on_user(void)
 {
    music_scale_user();
 }
 void music_scale_user(void)
 {
    PLAY_NOTE_ARRAY(music_scale, false, 0);
 }
 #endif
--- a/keyboards/planck/keymaps/jeebak/readme.md
+++ b/keyboards/planck/keymaps/jeebak/readme.md
@ -0,0 +1,107 @@
 jeebak's layout
 =======================
 This WIP keymap attempts to minimize fingers straying away from the home row.
 To aid in this endeavor, when additional modifyer keys to switch layers are
 needed, they will be mapped to home row keys. The `keymap.c` file will contain
 the exact changes. The diagrams in this README shows the highlights of the
 changes from the default mappings.
 I also decided to change all calls to `persistant_default_layer_set()` to
 `update_tri_layer()` since this is my personal perference.
 ## Base Layers (Qwerty/Colemak/Dvorak)
 These base layers are mostly the same as the default mappings. The interesting
 changes are shown below. The `Ctrl/Esc`, mapped using `CTL_T(KC_ESC)` will emit
 an `Escape` when tapped, and act as a `Control` key when held. A `TODO` item is
 to see if it can also act as a `CapsLock` when double-tapped. The right shift
 key acts as `Enter` when tapped, and as a `Shift` key when held. The arrow
 keys, which have been moved to the
 [TouchCursor](http://martin-stone.github.io/touchcursor/) layer, have been
 replaced with the Media keys as shown. The `ML/A` key activates the Mouse layer
 when held, and emits an `A` when tapped.
 ```
  ,-----------------------------------------------------------------------------------------.
  |          |      |      |      |      |      |      |      |      |      |      |        |
  |----------+------+------+------+------+-------------+------+------+------+------+--------|
  | Ctrl/Esc | ML/A |      |      |      |      |      |      |      |      |      |        |
  |----------+------+------+------+------+------|------+------+------+------+------+--------|
  |          |      |      |      |      |      |      |      |      |      |      |Sft/Ent |
  |----------+------+------+------+------+------+------+------+------+------+------+--------|
  | PrntScrn | RGUI | Alt  | GUI  |Lower |  TC/Space   |Raise | Next | Vol- | Vol+ |  Play  |
  `-----------------------------------------------------------------------------------------'
 ``` 
 ## Lower Layer (Symbols and Function Keys)
 The symbols and functions keys are essentially the same as the default mapping.
 The most notable changes are that the symbol keys from the `RAISE` layer have
 been moved here. The remaining Media keys replace those that are now on the
 base layers. The `BACKLIT` key has also been moved here.
 ``` 
  ,-----------------------------------------------------------------------------------.
  |   ~  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Bksp |
  |------+------+------+------+------+-------------+------+------+------+------+------|
  |   [  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |  |   |
  |------+------+------+------+------+------|------+------+------+------+------+------|
  |   ]  |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |   -  |   =  |   [  |   ]  |  \   |
  |------+------+------+------+------+------+------+------+------+------+------+------|
  |Brite |      |      |      |      |             |      | Prev | Stop | Slct | Mute |
  `-----------------------------------------------------------------------------------'
 ``` 
 ## Raise Layer (Numbers and Arithmetic Operators)
 All of the numbers and arithmetic operators are available on this layer. Some
 keys are duplicated for the convenience of their positions. The `0` and `$`
 keys at the far left are for quick access to beginning and end of line in vim.
 ``` 
  ,-----------------------------------------------------------------------------------.
  |   0  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
  |------+------+------+------+------+-------------+------+------+------+------+------|
  |   $  |   4  |   5  |   6  |   .  |   +  |   *  |   4  |   5  |   6  |   -  |  |   |
  |------+------+------+------+------+------|------+------+------+------+------+------|
  |   =  |   7  |   8  |   9  |   0  |   -  |   /  |   1  |   2  |   3  |   .  |  \   |
  |------+------+------+------+------+------+------+------+------+------+------+------|
  |Brite |      |      |      |      |             |      | Prev | Stop | Slct | Mute |
  `-----------------------------------------------------------------------------------'
 ``` 
 ## TouchCursor layer plus personal customizations
 [TouchCursor](http://martin-stone.github.io/touchcursor/) uses the `Space` key
 as the modifier, with the `IJKL` home row keys representing the inverted-T of
 the arrow keys. All of the default TouchCursor keymappings for the right hand
 are represented below. My personalizations include all of the keys shown for
 the left hand. Having the `Alt` and `Shift` keys readily accessible from the
 home row allows quick word jumps and highlighting when used in conjunction with
 the arrow keys. The `KC_UNDO, KC_CUT, KC_COPY, KC_PASTE, KC_FIND,` and
 `KC_AGAIN` keycodes have been mapped but they don't seem to work on Mac.
 Presumably they'll work under Windows.
 ``` 
  ,-----------------------------------------------------------------------------------.
  |      |      |      |Shift | GUI  |  ~   |Insert| Home |  Up  | End  | Bksp |      |
  |------+------+------+------+------+-------------+------+------+------+------+------|
  |      | Alt  |Space |      | Find |Again | PgUp | Left | Down |Right |      |      |
  |------+------+------+------+------+------|------+------+------+------+------+------|
  |      | Undo | Cut  | Copy |Paste |  `   | PgDn | Del  |      |      |      |      |
  |------+------+------+------+------+------+------+------+------+------+------+------|
  |      |      |      |      |      |             |      |      |      |      |      |
  `-----------------------------------------------------------------------------------'
 ``` 
 ## Mouse Layer
 The Mouse layer, closely mimics the layout/behaviour of the TouchCursor layer.
 The `A` key is used to activate this layer. All 16 keycodes for the mouse from
 the `doc/keycode.txt` file are represented, and logically located, IMHO. The
 left and right click buttons are duplicated; on the right hand side, for a
 quick click here and there, and again on the left hand side for when the
 buttons need to be held for dragging things or highlighting text, thus allowing
 the right hand to be free to use the up/down/left/right actions.
 ``` 
  ,-----------------------------------------------------------------------------------.
  |      |      |ACCL0 |ACCL1 |ACCL2 |ACCL2 |      |WHL_L |  Up  |WHL_R | BTN2 |      |
  |------+------+------+------+------+-------------+------+------+------+------+------|
  |      |      |      | BTN3 | BTN1 | BTN4 |WHL_Up| Left | Down |Right |      |      |
  |------+------+------+------+------+------|------+------+------+------+------+------|
  |      |      |      |      | BTN2 | BTN5 |WHL_Dn| BTN1 |      |      |      |      |
  |------+------+------+------+------+------+------+------+------+------+------+------|
  |      |      |      |      |      |             |      |      |      |      |      |
  `-----------------------------------------------------------------------------------'
 ``` 
--- a/quantum/audio/song_list.h
+++ b/quantum/audio/song_list.h
@ -28,6 +28,14 @@
 	Q__NOTE(_E4), Q__NOTE(_C4), \
 	Q__NOTE(_E4),
 /* Requires: PLAY_NOTE_ARRAY(..., ..., STACCATO); */
 #define IN_LIKE_FLINT \
    E__NOTE(_AS4), E__NOTE(_AS4), QD_NOTE(_B4),  \
    E__NOTE(_AS4), E__NOTE(_B4),  QD_NOTE(_CS4), \
    E__NOTE(_B4),  E__NOTE(_CS4), QD_NOTE(_DS4), \
    E__NOTE(_CS4), E__NOTE(_B4),  QD_NOTE(_AS4), \
    E__NOTE(_AS4), E__NOTE(_AS4), QD_NOTE(_B4),
 #define GOODBYE_SOUND \
    E__NOTE(_E7),     \
    E__NOTE(_A6),     \
--- a/quantum/keymap_extras/keymap_cyrillic.h
+++ b/quantum/keymap_extras/keymap_cyrillic.h
@ -0,0 +1,161 @@
 #ifndef KEYMAP_CYRILLIC_H
 #define KEYMAP_CYRILLIC_H
 #include "keymap.h"
 /*
 * This is based off of
 * https://en.wikipedia.org/wiki/Cyrillic_script
 */
 // Capital                   Char russian/ukrainian/bulgarian
 #define CY_A     UC(0x0410) // А  rus ukr bul
 #define CY_BE    UC(0x0411) // Б  rus ukr bul
 #define CY_VE    UC(0x0412) // В  rus ukr bul
 #define CY_GHE   UC(0x0413) // Г  rus ukr bul
 #define CY_GHEUP UC(0x0490) // Ґ      ukr
 #define CY_DE    UC(0x0414) // Д  rus ukr bul
 #define CY_DJE   UC(0x0402) // Ђ
 #define CY_GJE   UC(0x0403) // Ѓ
 #define CY_IE    UC(0x0415) // Е  rus ukr bul
 #define CY_IO    UC(0x0401) // Ё  rus
 #define CY_UIE   UC(0x0404) // Є      ukr
 #define CY_ZHE   UC(0x0416) // Ж  rus ukr bul
 #define CY_ZE    UC(0x0417) // З  rus ukr bul
 #define CY_DZE   UC(0x0405) // Ѕ
 #define CY_I     UC(0x0418) // И  rus ukr bul
 #define CY_B_U_I UC(0x0406) // І      ukr
 #define CY_YI    UC(0x0407) // Ї      ukr
 #define CY_SRT_I UC(0x0419) // Й  rus ukr bul
 #define CY_JE    UC(0x0408) // Ј
 #define CY_KA    UC(0x041a) // К  rus ukr bul
 #define CY_EL    UC(0x041b) // Л  rus ukr bul
 #define CY_LJE   UC(0x0409) // Љ
 #define CY_EM    UC(0x041c) // М  rus ukr bul
 #define CY_EN    UC(0x041d) // Н  rus ukr bul
 #define CY_NJE   UC(0x040a) // Њ
 #define CY_O     UC(0x041e) // О  rus ukr bul
 #define CY_PE    UC(0x041f) // П  rus ukr bul
 #define CY_ER    UC(0x0420) // Р  rus ukr bul
 #define CY_ES    UC(0x0421) // С  rus ukr bul
 #define CY_TE    UC(0x0422) // Т  rus ukr bul
 #define CY_TSHE  UC(0x040b) // Ћ
 #define CY_KJE   UC(0x040c) // Ќ
 #define CY_U     UC(0x0423) // У  rus ukr bul
 #define CY_SRT_U UC(0x040e) // Ў
 #define CY_EF    UC(0x0424) // Ф  rus ukr bul
 #define CY_HA    UC(0x0425) // Х  rus     bul
 #define CY_TSE   UC(0x0426) // Ц  rus ukr bul
 #define CY_CHE   UC(0x0427) // Ч  rus ukr bul
 #define CY_DZHE  UC(0x040f) // Џ
 #define CY_SHA   UC(0x0428) // Ш  rus ukr bul
 #define CY_SHCHA UC(0x0429) // Щ  rus ukr bul
 #define CY_HSIGN UC(0x042a) // Ъ  rus     bul
 #define CY_YERU  UC(0x042b) // Ы  rus
 #define CY_SSIGN UC(0x042c) // Ь  rus ukr bul
 #define CY_E     UC(0x042d) // Э  rus
 #define CY_YU    UC(0x042e) // Ю  rus ukr bul
 #define CY_YA    UC(0x042f) // Я  rus ukr bul
 // Important Cyrillic non-Slavic letters
 #define CY_PALOCHKA UC(0x04c0) // Ӏ
 #define CY_SCHWA UC(0x04d8) // Ә
 #define CY_GHE_S UC(0x0492) // Ғ
 #define CY_ZE_D  UC(0x0498) // Ҙ
 #define CY_ES_D  UC(0x04aa) // Ҫ
 #define CY_BR_KA UC(0x04a0) // Ҡ
 #define CY_ZHE_D UC(0x0496) // Җ
 #define CY_KA_D  UC(0x049a) // Қ
 #define CY_EN_D  UC(0x04a2) // Ң
 #define CY_ENGHE UC(0x04a4) // Ҥ
 #define CY_BRD_O UC(0x04e8) // Ө
 #define CY_STR_U UC(0x04ae) // Ү
 #define CY_S_U_S UC(0x04b0) // Ұ
 #define CY_SHHA  UC(0x04ba) // Һ
 #define CY_HA_D  UC(0x04b2) // Ҳ
 // Small
 #define CY_a     UC(0x0430) // a  rus ukr bul
 #define CY_be    UC(0x0431) // б  rus ukr bul
 #define CY_ve    UC(0x0432) // в  rus ukr bul
 #define CY_ghe   UC(0x0433) // г  rus ukr bul
 #define CY_gheup UC(0x0491) // ґ      ukr
 #define CY_de    UC(0x0434) // д  rus ukr bul
 #define CY_dje   UC(0x0452) // ђ
 #define CY_gje   UC(0x0453) // ѓ
 #define CY_ie    UC(0x0435) // е  rus ukr bul
 #define CY_io    UC(0x0451) // ё  rus
 #define CY_uie   UC(0x0454) // є      ukr
 #define CY_zhe   UC(0x0436) // ж  rus ukr bul
 #define CY_ze    UC(0x0437) // з  rus ukr bul
 #define CY_dze   UC(0x0455) // ѕ
 #define CY_i     UC(0x0438) // и  rus ukr bul
 #define CY_b_u_i UC(0x0456) // і      ukr
 #define CY_yi    UC(0x0457) // ї      ukr
 #define CY_srt_i UC(0x0439) // й  rus ukr bul
 #define CY_je    UC(0x0458) // ј
 #define CY_ka    UC(0x043a) // к  rus ukr bul
 #define CY_el    UC(0x043b) // л  rus ukr bul
 #define CY_lje   UC(0x0459) // љ
 #define CY_em    UC(0x043c) // м  rus ukr bul
 #define CY_en    UC(0x043d) // н  rus ukr bul
 #define CY_nje   UC(0x045a) // њ
 #define CY_o     UC(0x043e) // о  rus ukr bul
 #define CY_pe    UC(0x043f) // п  rus ukr bul
 #define CY_er    UC(0x0440) // р  rus ukr bul
 #define CY_es    UC(0x0441) // с  rus ukr bul
 #define CY_te    UC(0x0442) // т  rus ukr bul
 #define CY_tshe  UC(0x045b) // ћ
 #define CY_kje   UC(0x045c) // ќ
 #define CY_u     UC(0x0443) // у  rus ukr bul
 #define CY_srt_u UC(0x045e) // ў
 #define CY_ef    UC(0x0444) // ф  rus ukr bul
 #define CY_ha    UC(0x0445) // х  rus ukr bul
 #define CY_tse   UC(0x0446) // ц  rus ukr bul
 #define CY_che   UC(0x0447) // ч  rus ukr bul
 #define CY_dzhe  UC(0x045f) // џ
 #define CY_sha   UC(0x0448) // ш  rus ukr bul
 #define CY_shcha UC(0x0449) // щ  rus ukr bul
 #define CY_hsign UC(0x044a) // ъ  rus     bul
 #define CY_yeru  UC(0x044b) // ы  rus
 #define CY_ssign UC(0x044c) // ь  rus ukr bul
 #define CY_e     UC(0x044d) // э  rus
 #define CY_yu    UC(0x044e) // ю  rus ukr bul
 #define CY_ya    UC(0x044f) // я  rus ukr bul
 // Important Cyrillic non-Slavic letters
 #define CY_palochka UC(0x04cf) // ӏ
 #define CY_schwa UC(0x04d9) // ә
 #define CY_ghe_s UC(0x0493) // ғ
 #define CY_ze_d  UC(0x0499) // ҙ
 #define CY_es_d  UC(0x04ab) // ҫ
 #define CY_br_ka UC(0x04a1) // ҡ
 #define CY_zhe_d UC(0x0497) // җ
 #define CY_ka_d  UC(0x049b) // қ
 #define CY_en_d  UC(0x04a3) // ң
 #define CY_enghe UC(0x04a5) // ҥ
 #define CY_brd_o UC(0x04e9) // ө
 #define CY_str_u UC(0x04af) // ү
 #define CY_s_u_s UC(0x04b1) // ұ
 #define CY_shha  UC(0x04bb) // һ
 #define CY_ha_d  UC(0x04b3) // ҳ
 // Extra
 #define CY_slr_ve UC(0x1c80) // ᲀ CYRILLIC SMALL LETTER ROUNDED VE
 #define CY_ll_de  UC(0x1c81) // ᲁ CYRILLIC SMALL LETTER LONG-LEGGED DE
 #define CY_ZEMLYA UC(0xa640) // Ꙁ CYRILLIC CAPITAL LETTER ZEMLYA
 #define CY_zemlya UC(0xa641) // ꙁ CYRILLIC SMALL LETTER ZEMLYA
 #define CY_RV_DZE UC(0xa644) // Ꙅ CYRILLIC CAPITAL LETTER REVERSED DZE
 #define CY_rv_DZE UC(0xa645) // ꙅ CYRILLIC SMALL LETTER REVERSED DZE
 #define CY_slw_es UC(0x1c83) // ᲃ CYRILLIC SMALL LETTER WIDE ES
 #define CY_st_te  UC(0x1c84) // ᲄ CYRILLIC SMALL LETTER TALL TE
 #define CY_3l_te  UC(0x1c85) // ᲅ CYRILLIC SMALL LETTER THREE-LEGGED TE
 #define CY_thsign UC(0x1c86) // ᲆ CYRILLIC SMALL LETTER TALL HARD SIGN
 #define CY_YERUBY UC(0xa650) // Ꙑ CYRILLIC CAPITAL LETTER YERU WITH BACK YER
 #define CY_yeruby UC(0xa651) // ꙑ CYRILLIC SMALL LETTER YERU WITH BACK YER
 #define CY_RUBLE  UC(0x20bd) // ₽
 #define CY_NUMERO UC(0x2116) // №
 // The letters Zje and Sje are made for other letters and accent marks
 #endif
--- a/quantum/rgblight.c
+++ b/quantum/rgblight.c
@ -7,24 +7,41 @@
 #include "debug.h"
 const uint8_t DIM_CURVE[] PROGMEM = {
-	0, 1, 1, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3,
+  0, 1, 1, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3,
-	3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+  3, 3, 3, 3, 3, 3, 3, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-	4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6,
+  4, 4, 4, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6,
-	6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8,
+  6, 6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 8, 8, 8, 8,
-	8, 8, 9, 9, 9, 9, 9, 9, 10, 10, 10, 10, 10, 11, 11, 11,
+  8, 8, 9, 9, 9, 9, 9, 9, 10, 10, 10, 10, 10, 11, 11, 11,
-	11, 11, 12, 12, 12, 12, 12, 13, 13, 13, 13, 14, 14, 14, 14, 15,
+  11, 11, 12, 12, 12, 12, 12, 13, 13, 13, 13, 14, 14, 14, 14, 15,
-	15, 15, 16, 16, 16, 16, 17, 17, 17, 18, 18, 18, 19, 19, 19, 20,
+  15, 15, 16, 16, 16, 16, 17, 17, 17, 18, 18, 18, 19, 19, 19, 20,
-	20, 20, 21, 21, 22, 22, 22, 23, 23, 24, 24, 25, 25, 25, 26, 26,
+  20, 20, 21, 21, 22, 22, 22, 23, 23, 24, 24, 25, 25, 25, 26, 26,
-	27, 27, 28, 28, 29, 29, 30, 30, 31, 32, 32, 33, 33, 34, 35, 35,
+  27, 27, 28, 28, 29, 29, 30, 30, 31, 32, 32, 33, 33, 34, 35, 35,
-	36, 36, 37, 38, 38, 39, 40, 40, 41, 42, 43, 43, 44, 45, 46, 47,
+  36, 36, 37, 38, 38, 39, 40, 40, 41, 42, 43, 43, 44, 45, 46, 47,
-	48, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62,
+  48, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62,
-	63, 64, 65, 66, 68, 69, 70, 71, 73, 74, 75, 76, 78, 79, 81, 82,
+  63, 64, 65, 66, 68, 69, 70, 71, 73, 74, 75, 76, 78, 79, 81, 82,
-	83, 85, 86, 88, 90, 91, 93, 94, 96, 98, 99, 101, 103, 105, 107, 109,
+  83, 85, 86, 88, 90, 91, 93, 94, 96, 98, 99, 101, 103, 105, 107, 109,
-	110, 112, 114, 116, 118, 121, 123, 125, 127, 129, 132, 134, 136, 139, 141, 144,
+  110, 112, 114, 116, 118, 121, 123, 125, 127, 129, 132, 134, 136, 139, 141, 144,
-	146, 149, 151, 154, 157, 159, 162, 165, 168, 171, 174, 177, 180, 183, 186, 190,
+  146, 149, 151, 154, 157, 159, 162, 165, 168, 171, 174, 177, 180, 183, 186, 190,
-	193, 196, 200, 203, 207, 211, 214, 218, 222, 226, 230, 234, 238, 242, 248, 255,
+  193, 196, 200, 203, 207, 211, 214, 218, 222, 226, 230, 234, 238, 242, 248, 255
 };
 const uint8_t RGBLED_BREATHING_TABLE[] PROGMEM = {
  0, 0, 0, 0, 1, 1, 1, 2, 2, 3, 4, 5, 5, 6, 7, 9,
  10, 11, 12, 14, 15, 17, 18, 20, 21, 23, 25, 27, 29, 31, 33, 35,
  37, 40, 42, 44, 47, 49, 52, 54, 57, 59, 62, 65, 67, 70, 73, 76,
  79, 82, 85, 88, 90, 93, 97, 100, 103, 106, 109, 112, 115, 118, 121, 124,
  127, 131, 134, 137, 140, 143, 146, 149, 152, 155, 158, 162, 165, 167, 170, 173,
  176, 179, 182, 185, 188, 190, 193, 196, 198, 201, 203, 206, 208, 211, 213, 215,
  218, 220, 222, 224, 226, 228, 230, 232, 234, 235, 237, 238, 240, 241, 243, 244,
  245, 246, 248, 249, 250, 250, 251, 252, 253, 253, 254, 254, 254, 255, 255, 255,
  255, 255, 255, 255, 254, 254, 254, 253, 253, 252, 251, 250, 250, 249, 248, 246,
  245, 244, 243, 241, 240, 238, 237, 235, 234, 232, 230, 228, 226, 224, 222, 220,
  218, 215, 213, 211, 208, 206, 203, 201, 198, 196, 193, 190, 188, 185, 182, 179,
  176, 173, 170, 167, 165, 162, 158, 155, 152, 149, 146, 143, 140, 137, 134, 131,
  128, 124, 121, 118, 115, 112, 109, 106, 103, 100, 97, 93, 90, 88, 85, 82,
  79, 76, 73, 70, 67, 65, 62, 59, 57, 54, 52, 49, 47, 44, 42, 40,
  37, 35, 33, 31, 29, 27, 25, 23, 21, 20, 18, 17, 15, 14, 12, 11,
  10, 9, 7, 6, 5, 5, 4, 3, 2, 2, 1, 1, 1, 0, 0, 0
 };
 const uint8_t RGBLED_BREATHING_TABLE[] PROGMEM = {0,0,0,0,1,1,1,2,2,3,4,5,5,6,7,9,10,11,12,14,15,17,18,20,21,23,25,27,29,31,33,35,37,40,42,44,47,49,52,54,57,59,62,65,67,70,73,76,79,82,85,88,90,93,97,100,103,106,109,112,115,118,121,124,127,131,134,137,140,143,146,149,152,155,158,162,165,167,170,173,176,179,182,185,188,190,193,196,198,201,203,206,208,211,213,215,218,220,222,224,226,228,230,232,234,235,237,238,240,241,243,244,245,246,248,249,250,250,251,252,253,253,254,254,254,255,255,255,255,255,255,255,254,254,254,253,253,252,251,250,250,249,248,246,245,244,243,241,240,238,237,235,234,232,230,228,226,224,222,220,218,215,213,211,208,206,203,201,198,196,193,190,188,185,182,179,176,173,170,167,165,162,158,155,152,149,146,143,140,137,134,131,128,124,121,118,115,112,109,106,103,100,97,93,90,88,85,82,79,76,73,70,67,65,62,59,57,54,52,49,47,44,42,40,37,35,33,31,29,27,25,23,21,20,18,17,15,14,12,11,10,9,7,6,5,5,4,3,2,2,1,1,1,0,0,0};
 const uint8_t RGBLED_BREATHING_INTERVALS[] PROGMEM = {30, 20, 10, 5};
 const uint8_t RGBLED_RAINBOW_MOOD_INTERVALS[] PROGMEM = {120, 60, 30};
 const uint8_t RGBLED_RAINBOW_SWIRL_INTERVALS[] PROGMEM = {100, 50, 20};
@ -38,63 +55,56 @@ uint8_t rgblight_inited = 0;
 void sethsv(uint16_t hue, uint8_t sat, uint8_t val, struct cRGB *led1) {
-	/* convert hue, saturation and brightness ( HSB/HSV ) to RGB
+  // Convert hue, saturation, and value (HSV/HSB) to RGB. DIM_CURVE is used only
-	The DIM_CURVE is used only on brightness/value and on saturation (inverted).
+  // on value and saturation (inverted). This looks the most natural.
-	This looks the most natural.
+  uint8_t r = 0, g = 0, b = 0, base, color;
 	*/
  uint8_t r = 0, g = 0, b = 0;
  val = pgm_read_byte(&DIM_CURVE[val]);
-	sat = 255 - pgm_read_byte(&DIM_CURVE[255 - sat]);
+  sat = 255 - pgm_read_byte(&DIM_CURVE[255 - sat]);
-
+
-	uint8_t base;
+  if (sat == 0) { // Acromatic color (gray). Hue doesn't mind.
-
+    r = val;
-	if (sat == 0) { // Acromatic color (gray). Hue doesn't mind.
+    g = val;
-		r = val;
+    b = val;
-		g = val;
+  } else {
-		b = val;
+    base = ((255 - sat) * val) >> 8;
-	} else  {
+    color = (val - base) * (hue % 60) / 60;
-		base = ((255 - sat) * val) >> 8;
+
-
+    switch (hue / 60) {
-		switch (hue / 60) {
+      case 0:
-		case 0:
+        r = val;
-			r = val;
+        g = base + color;
-			g = (((val - base)*hue) / 60) + base;
+        b = base;
-			b = base;
+        break;
-			break;
+      case 1:
-
+        r = val - color;
-		case 1:
+        g = val;
-			r = (((val - base)*(60 - (hue % 60))) / 60) + base;
+        b = base;
-			g = val;
+        break;
-			b = base;
+      case 2:
-			break;
+        r = base;
-
+        g = val;
-		case 2:
+        b = base + color;
-			r = base;
+        break;
-			g = val;
+      case 3:
-			b = (((val - base)*(hue % 60)) / 60) + base;
+        r = base;
-			break;
+        g = val - color;
-
+        b = val;
-		case 3:
+        break;
-			r = base;
+      case 4:
-			g = (((val - base)*(60 - (hue % 60))) / 60) + base;
+        r = base + color;
-			b = val;
+        g = base;
-			break;
+        b = val;
-
+        break;
-		case 4:
+      case 5:
-			r = (((val - base)*(hue % 60)) / 60) + base;
+        r = val;
-			g = base;
+        g = base;
-			b = val;
+        b = val - color;
-			break;
+        break;
-
+    }
-		case 5:
+  }
-			r = val;
+
-			g = base;
+  setrgb(r, g, b, led1);
 			b = (((val - base)*(60 - (hue % 60))) / 60) + base;
 			break;
 		}
 	}
  setrgb(r,g,b, led1);
 }
 void setrgb(uint8_t r, uint8_t g, uint8_t b, struct cRGB *led1) {
@ -111,44 +121,44 @@ void eeconfig_update_rgblight(uint32_t val) {
  eeprom_update_dword(EECONFIG_RGBLIGHT, val);
 }
 void eeconfig_update_rgblight_default(void) {
-	dprintf("eeconfig_update_rgblight_default\n");
+  dprintf("eeconfig_update_rgblight_default\n");
-	rgblight_config.enable = 1;
+  rgblight_config.enable = 1;
-	rgblight_config.mode = 1;
+  rgblight_config.mode = 1;
-	rgblight_config.hue = 200;
+  rgblight_config.hue = 200;
-	rgblight_config.sat = 204;
+  rgblight_config.sat = 204;
-	rgblight_config.val = 204;
+  rgblight_config.val = 204;
-	eeconfig_update_rgblight(rgblight_config.raw);
+  eeconfig_update_rgblight(rgblight_config.raw);
 }
 void eeconfig_debug_rgblight(void) {
-	dprintf("rgblight_config eprom\n");
+  dprintf("rgblight_config eprom\n");
-	dprintf("rgblight_config.enable = %d\n", rgblight_config.enable);
+  dprintf("rgblight_config.enable = %d\n", rgblight_config.enable);
-	dprintf("rghlight_config.mode = %d\n", rgblight_config.mode);
+  dprintf("rghlight_config.mode = %d\n", rgblight_config.mode);
-	dprintf("rgblight_config.hue = %d\n", rgblight_config.hue);
+  dprintf("rgblight_config.hue = %d\n", rgblight_config.hue);
-	dprintf("rgblight_config.sat = %d\n", rgblight_config.sat);
+  dprintf("rgblight_config.sat = %d\n", rgblight_config.sat);
-	dprintf("rgblight_config.val = %d\n", rgblight_config.val);
+  dprintf("rgblight_config.val = %d\n", rgblight_config.val);
 }
 void rgblight_init(void) {
  debug_enable = 1; // Debug ON!
-	dprintf("rgblight_init called.\n");
+  dprintf("rgblight_init called.\n");
  rgblight_inited = 1;
-	dprintf("rgblight_init start!\n");
+  dprintf("rgblight_init start!\n");
  if (!eeconfig_is_enabled()) {
-		dprintf("rgblight_init eeconfig is not enabled.\n");
+    dprintf("rgblight_init eeconfig is not enabled.\n");
    eeconfig_init();
-		eeconfig_update_rgblight_default();
+    eeconfig_update_rgblight_default();
  }
  rgblight_config.raw = eeconfig_read_rgblight();
-	if (!rgblight_config.mode) {
+  if (!rgblight_config.mode) {
-		dprintf("rgblight_init rgblight_config.mode = 0. Write default values to EEPROM.\n");
+    dprintf("rgblight_init rgblight_config.mode = 0. Write default values to EEPROM.\n");
-		eeconfig_update_rgblight_default();
+    eeconfig_update_rgblight_default();
-		rgblight_config.raw = eeconfig_read_rgblight();
+    rgblight_config.raw = eeconfig_read_rgblight();
-	}
+  }
-	eeconfig_debug_rgblight(); // display current eeprom values
+  eeconfig_debug_rgblight(); // display current eeprom values
-	#if !defined(AUDIO_ENABLE) && defined(RGBLIGHT_TIMER)
+  #if !defined(AUDIO_ENABLE) && defined(RGBLIGHT_TIMER)
-		rgblight_timer_init(); // setup the timer
+    rgblight_timer_init(); // setup the timer
-	#endif
+  #endif
  if (rgblight_config.enable) {
    rgblight_mode(rgblight_config.mode);
@ -156,58 +166,57 @@ void rgblight_init(void) {
 }
 void rgblight_increase(void) {
-	uint8_t mode = 0;
+  uint8_t mode = 0;
  if (rgblight_config.mode < RGBLIGHT_MODES) {
    mode = rgblight_config.mode + 1;
  }
-	rgblight_mode(mode);
+  rgblight_mode(mode);
 }
 void rgblight_decrease(void) {
-	uint8_t mode = 0;
+  uint8_t mode = 0;
-  if (rgblight_config.mode > 1) { //mode will never < 1, if mode is less than 1, eeprom need to be initialized.
+  // Mode will never be < 1. If it ever is, eeprom needs to be initialized.
-    mode = rgblight_config.mode-1;
+  if (rgblight_config.mode > 1) {
    mode = rgblight_config.mode - 1;
  }
-	rgblight_mode(mode);
+  rgblight_mode(mode);
 }
 void rgblight_step(void) {
-	uint8_t mode = 0;
+  uint8_t mode = 0;
  mode = rgblight_config.mode + 1;
  if (mode > RGBLIGHT_MODES) {
    mode = 1;
  }
-	rgblight_mode(mode);
+  rgblight_mode(mode);
 }
 void rgblight_mode(uint8_t mode) {
-	if (!rgblight_config.enable) {
+  if (!rgblight_config.enable) {
-		return;
+    return;
-	}
+  }
-  if (mode<1) {
+  if (mode < 1) {
-		rgblight_config.mode = 1;
+    rgblight_config.mode = 1;
-	} else if (mode > RGBLIGHT_MODES) {
+  } else if (mode > RGBLIGHT_MODES) {
-		rgblight_config.mode = RGBLIGHT_MODES;
+    rgblight_config.mode = RGBLIGHT_MODES;
-	} else {
+  } else {
-		rgblight_config.mode = mode;
+    rgblight_config.mode = mode;
-	}
+  }
  eeconfig_update_rgblight(rgblight_config.raw);
  xprintf("rgblight mode: %u\n", rgblight_config.mode);
-	if (rgblight_config.mode == 1) {
+  if (rgblight_config.mode == 1) {
-		#if !defined(AUDIO_ENABLE) && defined(RGBLIGHT_TIMER)
+    #if !defined(AUDIO_ENABLE) && defined(RGBLIGHT_TIMER)
-			rgblight_timer_disable();
+      rgblight_timer_disable();
-		#endif
+    #endif
-	} else if (rgblight_config.mode >=2 && rgblight_config.mode <=23) {
+  } else if (rgblight_config.mode >= 2 && rgblight_config.mode <= 23) {
-		// MODE 2-5, breathing
+    // MODE 2-5, breathing
-		// MODE 6-8, rainbow mood
+    // MODE 6-8, rainbow mood
-		// MODE 9-14, rainbow swirl
+    // MODE 9-14, rainbow swirl
-		// MODE 15-20, snake
+    // MODE 15-20, snake
-		// MODE 21-23, knight
+    // MODE 21-23, knight
-
+
-		#if !defined(AUDIO_ENABLE) && defined(RGBLIGHT_TIMER)
+    #if !defined(AUDIO_ENABLE) && defined(RGBLIGHT_TIMER)
-			rgblight_timer_enable();
+      rgblight_timer_enable();
-		#endif
+    #endif
-	}
+  }
  rgblight_sethsv(rgblight_config.hue, rgblight_config.sat, rgblight_config.val);
 }
@ -215,306 +224,318 @@ void rgblight_toggle(void) {
  rgblight_config.enable ^= 1;
  eeconfig_update_rgblight(rgblight_config.raw);
  xprintf("rgblight toggle: rgblight_config.enable = %u\n", rgblight_config.enable);
-	if (rgblight_config.enable) {
+  if (rgblight_config.enable) {
-		rgblight_mode(rgblight_config.mode);
+    rgblight_mode(rgblight_config.mode);
-	} else {
+  } else {
-
+    #if !defined(AUDIO_ENABLE) && defined(RGBLIGHT_TIMER)
-		#if !defined(AUDIO_ENABLE) && defined(RGBLIGHT_TIMER)
+      rgblight_timer_disable();
-			rgblight_timer_disable();
+    #endif
-		#endif
+    _delay_ms(50);
-		_delay_ms(50);
+    rgblight_set();
-		rgblight_set();
+  }
 	}
 }
-void rgblight_increase_hue(void){
+void rgblight_increase_hue(void) {
-	uint16_t hue;
+  uint16_t hue;
  hue = (rgblight_config.hue+RGBLIGHT_HUE_STEP) % 360;
  rgblight_sethsv(hue, rgblight_config.sat, rgblight_config.val);
 }
-void rgblight_decrease_hue(void){
+void rgblight_decrease_hue(void) {
-	uint16_t hue;
+  uint16_t hue;
-	if (rgblight_config.hue-RGBLIGHT_HUE_STEP <0 ) {
+  if (rgblight_config.hue-RGBLIGHT_HUE_STEP < 0) {
-		hue = (rgblight_config.hue+360-RGBLIGHT_HUE_STEP) % 360;
+    hue = (rgblight_config.hue + 360 - RGBLIGHT_HUE_STEP) % 360;
-	} else {
+  } else {
-		hue = (rgblight_config.hue-RGBLIGHT_HUE_STEP) % 360;
+    hue = (rgblight_config.hue - RGBLIGHT_HUE_STEP) % 360;
-	}
+  }
  rgblight_sethsv(hue, rgblight_config.sat, rgblight_config.val);
 }
 void rgblight_increase_sat(void) {
-	uint8_t sat;
+  uint8_t sat;
  if (rgblight_config.sat + RGBLIGHT_SAT_STEP > 255) {
    sat = 255;
  } else {
-    sat = rgblight_config.sat+RGBLIGHT_SAT_STEP;
+    sat = rgblight_config.sat + RGBLIGHT_SAT_STEP;
  }
  rgblight_sethsv(rgblight_config.hue, sat, rgblight_config.val);
 }
-void rgblight_decrease_sat(void){
+void rgblight_decrease_sat(void) {
-	uint8_t sat;
+  uint8_t sat;
  if (rgblight_config.sat - RGBLIGHT_SAT_STEP < 0) {
    sat = 0;
  } else {
-    sat = rgblight_config.sat-RGBLIGHT_SAT_STEP;
+    sat = rgblight_config.sat - RGBLIGHT_SAT_STEP;
  }
  rgblight_sethsv(rgblight_config.hue, sat, rgblight_config.val);
 }
-void rgblight_increase_val(void){
+void rgblight_increase_val(void) {
-	uint8_t val;
+  uint8_t val;
  if (rgblight_config.val + RGBLIGHT_VAL_STEP > 255) {
    val = 255;
  } else {
-    val = rgblight_config.val+RGBLIGHT_VAL_STEP;
+    val = rgblight_config.val + RGBLIGHT_VAL_STEP;
  }
  rgblight_sethsv(rgblight_config.hue, rgblight_config.sat, val);
 }
 void rgblight_decrease_val(void) {
-	uint8_t val;
+  uint8_t val;
  if (rgblight_config.val - RGBLIGHT_VAL_STEP < 0) {
    val = 0;
  } else {
-    val = rgblight_config.val-RGBLIGHT_VAL_STEP;
+    val = rgblight_config.val - RGBLIGHT_VAL_STEP;
  }
  rgblight_sethsv(rgblight_config.hue, rgblight_config.sat, val);
 }
-void rgblight_sethsv_noeeprom(uint16_t hue, uint8_t sat, uint8_t val){
+void rgblight_sethsv_noeeprom(uint16_t hue, uint8_t sat, uint8_t val) {
-	inmem_config.raw = rgblight_config.raw;
+  inmem_config.raw = rgblight_config.raw;
  if (rgblight_config.enable) {
    struct cRGB tmp_led;
    sethsv(hue, sat, val, &tmp_led);
-		inmem_config.hue = hue;
+    inmem_config.hue = hue;
-		inmem_config.sat = sat;
+    inmem_config.sat = sat;
-		inmem_config.val = val;
+    inmem_config.val = val;
    // dprintf("rgblight set hue [MEMORY]: %u,%u,%u\n", inmem_config.hue, inmem_config.sat, inmem_config.val);
    rgblight_setrgb(tmp_led.r, tmp_led.g, tmp_led.b);
  }
 }
-void rgblight_sethsv(uint16_t hue, uint8_t sat, uint8_t val){
+void rgblight_sethsv(uint16_t hue, uint8_t sat, uint8_t val) {
  if (rgblight_config.enable) {
-		if (rgblight_config.mode == 1) {
+    if (rgblight_config.mode == 1) {
-			// same static color
+      // same static color
-			rgblight_sethsv_noeeprom(hue, sat, val);
+      rgblight_sethsv_noeeprom(hue, sat, val);
-		} else {
+    } else {
-			// all LEDs in same color
+      // all LEDs in same color
-			if (rgblight_config.mode >= 2 && rgblight_config.mode <= 5) {
+      if (rgblight_config.mode >= 2 && rgblight_config.mode <= 5) {
-				// breathing mode, ignore the change of val, use in memory value instead
+        // breathing mode, ignore the change of val, use in memory value instead
-				val = rgblight_config.val;
+        val = rgblight_config.val;
-			} else if (rgblight_config.mode >= 6 && rgblight_config.mode <= 14) {
+      } else if (rgblight_config.mode >= 6 && rgblight_config.mode <= 14) {
-				// rainbow mood and rainbow swirl, ignore the change of hue
+        // rainbow mood and rainbow swirl, ignore the change of hue
-				hue = rgblight_config.hue;
+        hue = rgblight_config.hue;
-			}
+      }
-		}
+    }
-		rgblight_config.hue = hue;
+    rgblight_config.hue = hue;
-		rgblight_config.sat = sat;
+    rgblight_config.sat = sat;
-		rgblight_config.val = val;
+    rgblight_config.val = val;
-		eeconfig_update_rgblight(rgblight_config.raw);
+    eeconfig_update_rgblight(rgblight_config.raw);
-		xprintf("rgblight set hsv [EEPROM]: %u,%u,%u\n", rgblight_config.hue, rgblight_config.sat, rgblight_config.val);
+    xprintf("rgblight set hsv [EEPROM]: %u,%u,%u\n", rgblight_config.hue, rgblight_config.sat, rgblight_config.val);
-  }
+  }
-}
+}
-
+
-void rgblight_setrgb(uint8_t r, uint8_t g, uint8_t b){
+void rgblight_setrgb(uint8_t r, uint8_t g, uint8_t b) {
  // dprintf("rgblight set rgb: %u,%u,%u\n", r,g,b);
-  for (uint8_t i=0;i<RGBLED_NUM;i++) {
+  for (uint8_t i = 0; i < RGBLED_NUM; i++) {
    led[i].r = r;
    led[i].g = g;
    led[i].b = b;
  }
  rgblight_set();
 }
 void rgblight_set(void) {
-	if (rgblight_config.enable) {
+  if (rgblight_config.enable) {
-		ws2812_setleds(led, RGBLED_NUM);
+    ws2812_setleds(led, RGBLED_NUM);
-	} else {
+  } else {
-		for (uint8_t i=0;i<RGBLED_NUM;i++) {
+    for (uint8_t i = 0; i < RGBLED_NUM; i++) {
-	    led[i].r = 0;
+      led[i].r = 0;
-	    led[i].g = 0;
+      led[i].g = 0;
-	    led[i].b = 0;
+      led[i].b = 0;
-	  }
+    }
-		ws2812_setleds(led, RGBLED_NUM);
+    ws2812_setleds(led, RGBLED_NUM);
-	}
+  }
 }
 #if !defined(AUDIO_ENABLE) && defined(RGBLIGHT_TIMER)
 // Animation timer -- AVR Timer3
 void rgblight_timer_init(void) {
-	static uint8_t rgblight_timer_is_init = 0;
+  static uint8_t rgblight_timer_is_init = 0;
-	if (rgblight_timer_is_init) {
+  if (rgblight_timer_is_init) {
-		return;
+    return;
-	}
+  }
-	rgblight_timer_is_init = 1;
+  rgblight_timer_is_init = 1;
-	/* Timer 3 setup */
+  /* Timer 3 setup */
-	TCCR3B = _BV(WGM32) //CTC mode OCR3A as TOP
+  TCCR3B = _BV(WGM32) //CTC mode OCR3A as TOP
-	      | _BV(CS30); //Clock selelct: clk/1
+        | _BV(CS30); //Clock selelct: clk/1
-	/* Set TOP value */
+  /* Set TOP value */
-	uint8_t sreg = SREG;
+  uint8_t sreg = SREG;
-	cli();
+  cli();
-	OCR3AH = (RGBLED_TIMER_TOP>>8)&0xff;
+  OCR3AH = (RGBLED_TIMER_TOP >> 8) & 0xff;
-	OCR3AL = RGBLED_TIMER_TOP&0xff;
+  OCR3AL = RGBLED_TIMER_TOP & 0xff;
-	SREG = sreg;
+  SREG = sreg;
 }
 void rgblight_timer_enable(void) {
-	TIMSK3 |= _BV(OCIE3A);
+  TIMSK3 |= _BV(OCIE3A);
-	dprintf("TIMER3 enabled.\n");
+  dprintf("TIMER3 enabled.\n");
 }
 void rgblight_timer_disable(void) {
-	TIMSK3 &= ~_BV(OCIE3A);
+  TIMSK3 &= ~_BV(OCIE3A);
-	dprintf("TIMER3 disabled.\n");
+  dprintf("TIMER3 disabled.\n");
 }
 void rgblight_timer_toggle(void) {
-	TIMSK3 ^= _BV(OCIE3A);
+  TIMSK3 ^= _BV(OCIE3A);
-	dprintf("TIMER3 toggled.\n");
+  dprintf("TIMER3 toggled.\n");
 }
 ISR(TIMER3_COMPA_vect) {
-	// Mode = 1, static light, do nothing here
+  // mode = 1, static light, do nothing here
-	if (rgblight_config.mode>=2 && rgblight_config.mode<=5) {
+  if (rgblight_config.mode >= 2 && rgblight_config.mode <= 5) {
-		// mode = 2 to 5, breathing mode
+    // mode = 2 to 5, breathing mode
-		rgblight_effect_breathing(rgblight_config.mode-2);
+    rgblight_effect_breathing(rgblight_config.mode - 2);
-
+  } else if (rgblight_config.mode >= 6 && rgblight_config.mode <= 8) {
-	} else if (rgblight_config.mode>=6 && rgblight_config.mode<=8) {
+    // mode = 6 to 8, rainbow mood mod
-		rgblight_effect_rainbow_mood(rgblight_config.mode-6);
+    rgblight_effect_rainbow_mood(rgblight_config.mode - 6);
-	} else if (rgblight_config.mode>=9 && rgblight_config.mode<=14) {
+  } else if (rgblight_config.mode >= 9 && rgblight_config.mode <= 14) {
-		rgblight_effect_rainbow_swirl(rgblight_config.mode-9);
+    // mode = 9 to 14, rainbow swirl mode
-	} else if (rgblight_config.mode>=15 && rgblight_config.mode<=20) {
+    rgblight_effect_rainbow_swirl(rgblight_config.mode - 9);
-		rgblight_effect_snake(rgblight_config.mode-15);
+  } else if (rgblight_config.mode >= 15 && rgblight_config.mode <= 20) {
-	} else if (rgblight_config.mode>=21 && rgblight_config.mode<=23) {
+    // mode = 15 to 20, snake mode
-		rgblight_effect_knight(rgblight_config.mode-21);
+    rgblight_effect_snake(rgblight_config.mode - 15);
-	}
+  } else if (rgblight_config.mode >= 21 && rgblight_config.mode <= 23) {
-}
+    // mode = 21 to 23, knight mode
-
+    rgblight_effect_knight(rgblight_config.mode - 21);
-// effects
+  }
 }
 // Effects
 void rgblight_effect_breathing(uint8_t interval) {
-	static uint8_t pos = 0;
+  static uint8_t pos = 0;
-	static uint16_t last_timer = 0;
+  static uint16_t last_timer = 0;
-	if (timer_elapsed(last_timer)<pgm_read_byte(&RGBLED_BREATHING_INTERVALS[interval])) return;
+  if (timer_elapsed(last_timer) < pgm_read_byte(&RGBLED_BREATHING_INTERVALS[interval])) {
-	last_timer = timer_read();
+    return;
  }
  last_timer = timer_read();
-	rgblight_sethsv_noeeprom(rgblight_config.hue, rgblight_config.sat, pgm_read_byte(&RGBLED_BREATHING_TABLE[pos]));
+  rgblight_sethsv_noeeprom(rgblight_config.hue, rgblight_config.sat, pgm_read_byte(&RGBLED_BREATHING_TABLE[pos]));
-	pos = (pos+1) % 256;
+  pos = (pos + 1) % 256;
 }
 void rgblight_effect_rainbow_mood(uint8_t interval) {
-	static uint16_t current_hue=0;
+  static uint16_t current_hue = 0;
-	static uint16_t last_timer = 0;
+  static uint16_t last_timer = 0;
-	if (timer_elapsed(last_timer)<pgm_read_byte(&RGBLED_RAINBOW_MOOD_INTERVALS[interval])) return;
+  if (timer_elapsed(last_timer) < pgm_read_byte(&RGBLED_RAINBOW_MOOD_INTERVALS[interval])) {
-	last_timer = timer_read();
+    return;
-	rgblight_sethsv_noeeprom(current_hue, rgblight_config.sat, rgblight_config.val);
+  }
-	current_hue = (current_hue+1) % 360;
+  last_timer = timer_read();
  rgblight_sethsv_noeeprom(current_hue, rgblight_config.sat, rgblight_config.val);
  current_hue = (current_hue + 1) % 360;
 }
 void rgblight_effect_rainbow_swirl(uint8_t interval) {
-	static uint16_t current_hue=0;
+  static uint16_t current_hue = 0;
-	static uint16_t last_timer = 0;
+  static uint16_t last_timer = 0;
-	uint16_t hue;
+  uint16_t hue;
-	uint8_t i;
+  uint8_t i;
-	if (timer_elapsed(last_timer)<pgm_read_byte(&RGBLED_RAINBOW_MOOD_INTERVALS[interval/2])) return;
+  if (timer_elapsed(last_timer) < pgm_read_byte(&RGBLED_RAINBOW_MOOD_INTERVALS[interval / 2])) {
-	last_timer = timer_read();
+    return;
-	for (i=0; i<RGBLED_NUM; i++) {
+  }
-		hue = (360/RGBLED_NUM*i+current_hue)%360;
+  last_timer = timer_read();
-		sethsv(hue, rgblight_config.sat, rgblight_config.val, &led[i]);
+  for (i = 0; i < RGBLED_NUM; i++) {
-	}
+    hue = (360 / RGBLED_NUM * i + current_hue) % 360;
-	rgblight_set();
+    sethsv(hue, rgblight_config.sat, rgblight_config.val, &led[i]);
-
+  }
-	if (interval % 2) {
+  rgblight_set();
-		current_hue = (current_hue+1) % 360;
+
-	} else {
+  if (interval % 2) {
-		if (current_hue -1 < 0) {
+    current_hue = (current_hue + 1) % 360;
-			current_hue = 359;
+  } else {
-		} else {
+    if (current_hue - 1 < 0) {
-			current_hue = current_hue - 1;
+      current_hue = 359;
-		}
+    } else {
-
+      current_hue = current_hue - 1;
-	}
+    }
  }
 }
 void rgblight_effect_snake(uint8_t interval) {
-	static uint8_t pos=0;
+  static uint8_t pos = 0;
-	static uint16_t last_timer = 0;
+  static uint16_t last_timer = 0;
-	uint8_t i,j;
+  uint8_t i, j;
-	int8_t k;
+  int8_t k;
-	int8_t increament = 1;
+  int8_t increment = 1;
-	if (interval%2) increament = -1;
+  if (interval % 2) {
-	if (timer_elapsed(last_timer)<pgm_read_byte(&RGBLED_SNAKE_INTERVALS[interval/2])) return;
+    increment = -1;
-	last_timer = timer_read();
+  }
-	for (i=0;i<RGBLED_NUM;i++) {
+  if (timer_elapsed(last_timer) < pgm_read_byte(&RGBLED_SNAKE_INTERVALS[interval / 2])) {
-		led[i].r=0;
+    return;
-		led[i].g=0;
+  }
-		led[i].b=0;
+  last_timer = timer_read();
-		for (j=0;j<RGBLIGHT_EFFECT_SNAKE_LENGTH;j++) {
+  for (i = 0; i < RGBLED_NUM; i++) {
-			k = pos+j*increament;
+    led[i].r = 0;
-			if (k<0) k = k+RGBLED_NUM;
+    led[i].g = 0;
-			if (i==k) {
+    led[i].b = 0;
-				sethsv(rgblight_config.hue, rgblight_config.sat, (uint8_t)(rgblight_config.val*(RGBLIGHT_EFFECT_SNAKE_LENGTH-j)/RGBLIGHT_EFFECT_SNAKE_LENGTH), &led[i]);
+    for (j = 0; j < RGBLIGHT_EFFECT_SNAKE_LENGTH; j++) {
-			}
+      k = pos + j * increment;
-		}
+      if (k < 0) {
-	}
+        k = k + RGBLED_NUM;
-	rgblight_set();
+      }
-	if (increament == 1) {
+      if (i == k) {
-		if (pos - 1 < 0) {
+        sethsv(rgblight_config.hue, rgblight_config.sat, (uint8_t)(rgblight_config.val*(RGBLIGHT_EFFECT_SNAKE_LENGTH-j)/RGBLIGHT_EFFECT_SNAKE_LENGTH), &led[i]);
-			pos = RGBLED_NUM-1;
+      }
-		} else {
+    }
-			pos -= 1;
+  }
-		}
+  rgblight_set();
-	} else {
+  if (increment == 1) {
-		pos = (pos+1)%RGBLED_NUM;
+    if (pos - 1 < 0) {
-	}
+      pos = RGBLED_NUM - 1;
-
+    } else {
      pos -= 1;
    }
  } else {
    pos = (pos + 1) % RGBLED_NUM;
  }
 }
 void rgblight_effect_knight(uint8_t interval) {
-	static int8_t pos=0;
+  static int8_t pos = 0;
-	static uint16_t last_timer = 0;
+  static uint16_t last_timer = 0;
-	uint8_t i,j,cur;
+  uint8_t i, j, cur;
-	int8_t k;
+  int8_t k;
-	struct cRGB preled[RGBLED_NUM];
+  struct cRGB preled[RGBLED_NUM];
-	static int8_t increament = -1;
+  static int8_t increment = -1;
-	if (timer_elapsed(last_timer)<pgm_read_byte(&RGBLED_KNIGHT_INTERVALS[interval])) return;
+  if (timer_elapsed(last_timer) < pgm_read_byte(&RGBLED_KNIGHT_INTERVALS[interval])) {
-	last_timer = timer_read();
+    return;
-	for (i=0;i<RGBLED_NUM;i++) {
+  }
-		preled[i].r=0;
+  last_timer = timer_read();
-		preled[i].g=0;
+  for (i = 0; i < RGBLED_NUM; i++) {
-		preled[i].b=0;
+    preled[i].r = 0;
-		for (j=0;j<RGBLIGHT_EFFECT_KNIGHT_LENGTH;j++) {
+    preled[i].g = 0;
-			k = pos+j*increament;
+    preled[i].b = 0;
-			if (k<0) k = 0;
+    for (j = 0; j < RGBLIGHT_EFFECT_KNIGHT_LENGTH; j++) {
-			if (k>=RGBLED_NUM) k=RGBLED_NUM-1;
+      k = pos + j * increment;
-			if (i==k) {
+      if (k < 0) {
-				sethsv(rgblight_config.hue, rgblight_config.sat, rgblight_config.val, &preled[i]);
+        k = 0;
-			}
+      }
-		}
+      if (k >= RGBLED_NUM) {
-	}
+        k = RGBLED_NUM - 1;
-	if (RGBLIGHT_EFFECT_KNIGHT_OFFSET) {
+      }
-		for (i=0;i<RGBLED_NUM;i++) {
+      if (i == k) {
-			cur = (i+RGBLIGHT_EFFECT_KNIGHT_OFFSET) % RGBLED_NUM;
+        sethsv(rgblight_config.hue, rgblight_config.sat, rgblight_config.val, &preled[i]);
-			led[i].r = preled[cur].r;
+      }
-			led[i].g = preled[cur].g;
+    }
-			led[i].b = preled[cur].b;
+  }
-		}
+  if (RGBLIGHT_EFFECT_KNIGHT_OFFSET) {
-	}
+    for (i = 0; i < RGBLED_NUM; i++) {
-	rgblight_set();
+      cur = (i + RGBLIGHT_EFFECT_KNIGHT_OFFSET) % RGBLED_NUM;
-	if (increament == 1) {
+      led[i].r = preled[cur].r;
-		if (pos - 1 < 0 - RGBLIGHT_EFFECT_KNIGHT_LENGTH) {
+      led[i].g = preled[cur].g;
-			pos = 0- RGBLIGHT_EFFECT_KNIGHT_LENGTH;
+      led[i].b = preled[cur].b;
-			increament = -1;
+    }
-		} else {
+  }
-			pos -= 1;
+  rgblight_set();
-		}
+  if (increment == 1) {
-	} else {
+    if (pos - 1 < 0 - RGBLIGHT_EFFECT_KNIGHT_LENGTH) {
-		if (pos+1>RGBLED_NUM+RGBLIGHT_EFFECT_KNIGHT_LENGTH) {
+      pos = 0 - RGBLIGHT_EFFECT_KNIGHT_LENGTH;
-			pos = RGBLED_NUM+RGBLIGHT_EFFECT_KNIGHT_LENGTH-1;
+      increment = -1;
-			increament = 1;
+    } else {
-		} else {
+      pos -= 1;
-			pos += 1;
+    }
-		}
+  } else {
-	}
+    if (pos + 1 > RGBLED_NUM + RGBLIGHT_EFFECT_KNIGHT_LENGTH) {
-
+      pos = RGBLED_NUM + RGBLIGHT_EFFECT_KNIGHT_LENGTH - 1;
-}
+      increment = 1;
-
+    } else {
-#endif
+      pos += 1;
    }
  }
 }
 #endif
--- a/readme.md
+++ b/readme.md
@ -122,17 +122,16 @@ Below are some definitions that will be useful:
 Below is a list of the useful `make` commands in QMK:
-* `make` - cleans automatically and builds your keyboard and keymap depending on which folder you're in. This defaults to the "default" layout (unless in a keymap folder), and Planck keyboard in the root folder
+* `make` - builds your keyboard and keymap depending on which folder you're in. This defaults to the "default" layout (unless in a keymap folder), and Planck keyboard in the root folder
  * `make keyboard=<keyboard>` - specifies the keyboard (only to be used in root)
  * `make keymap=<keymap>` - specifies the keymap (only to be used in root and keyboard folder - not needed when in keymap folder)
-* `make quick` - skips the clean step (cannot be used immediately after modifying config.h or Makefiles)
+* `make clean` - cleans the `.build` folder, ensuring that everything is re-built
 * `make dfu` - (requires dfu-programmer) builds and flashes the keymap to your keyboard once placed in reset/dfu mode (button or press `KC_RESET`). This does not work for Teensy-based keyboards like the ErgoDox EZ.
  * `keyboard=` and `keymap=` are compatible with this
 * `make all-keyboards` - builds all keymaps for all keyboards and outputs status of each (use in root)
 * `make all-keyboards-default` - builds all default keymaps for all keyboards and outputs status of each (use in root)
 * `make all-keymaps [keyboard=<keyboard>]` - builds all of the keymaps for whatever keyboard folder you're in, or specified by `<keyboard>`
-* `make all-keyboards-quick`, `make all-keyboards-default-quick` and `make all-keymaps-quick [keyboard=<keyboard>]` - like the normal "make-all-*" commands, but they skip the clean steps
+* `make all-keyboards-*`, `make all-keyboards-default-*` and `make all-keymaps-* [keyboard=<keyboard>]` - like the normal "make-all-*" commands, but the last string aftter the `-` (for example clean) is passed to the keyboard make command.
 Other, less useful functionality:
 * `make COLOR=false` - turns off color output
--- a/tmk_core/rules.mk
+++ b/tmk_core/rules.mk
@ -15,6 +15,16 @@
 # Carlos Lamas
 #
 # Enable vpath seraching for source files only
 # Without this, output files, could be read from the wrong .build directories
 VPATH_SRC := $(VPATH)
 vpath %.c $(VPATH_SRC)
 vpath %.h $(VPATH_SRC)
 vpath %.cpp $(VPATH_SRC)
 vpath %.hpp $(VPATH_SRC)
 vpath %.S $(VPATH_SRC)
 VPATH :=
 # Output format. (can be srec, ihex, binary)
 FORMAT = ihex
@ -35,11 +45,6 @@ ifeq ($(COLOR),true)
 	BOLD=\033[1m
 endif
 ifdef quick
 	QUICK = $(quick)
 endif
 QUICK ?= false
 AUTOGEN ?= false
 ifneq ($(shell awk --version 2>/dev/null),)
@ -71,7 +76,7 @@ BUILD_CMD = LOG=$$($(CMD) 2>&1) ; if [ $$? -gt 0 ]; then $(PRINT_ERROR); elif [
 #     Each directory must be seperated by a space.
 #     Use forward slashes for directory separators.
 #     For a directory that has spaces, enclose it in quotes.
-EXTRAINCDIRS += $(subst :, ,$(VPATH))
+EXTRAINCDIRS += $(subst :, ,$(VPATH_SRC))
 # Compiler flag to set the C Standard level.
@ -268,22 +273,21 @@ LST = $(patsubst %.c,$(OBJDIR)/%.lst,$(patsubst %.cpp,$(OBJDIR)/%.lst,$(patsubst
 # Compiler flags to generate dependency files.
 #GENDEPFLAGS = -MMD -MP -MF .dep/$(@F).d
-GENDEPFLAGS = -MMD -MP -MF $(BUILD_DIR)/.dep/$(subst /,_,$(subst $(BUILD_DIR)/,,$@)).d
+GENDEPFLAGS = -MMD -MP -MF $(patsubst %.o,%.td,$@)
 # Combine all necessary flags and optional flags.
 # Add target processor to flags.
 # You can give extra flags at 'make' command line like: make EXTRAFLAGS=-DFOO=bar
-ALL_CFLAGS = $(MCUFLAGS) $(CFLAGS) $(GENDEPFLAGS) $(EXTRAFLAGS)
+ALL_CFLAGS = $(MCUFLAGS) $(CFLAGS) $(EXTRAFLAGS)
-ALL_CPPFLAGS = $(MCUFLAGS) -x c++ $(CPPFLAGS) $(GENDEPFLAGS) $(EXTRAFLAGS)
+ALL_CPPFLAGS = $(MCUFLAGS) -x c++ $(CPPFLAGS) $(EXTRAFLAGS)
 ALL_ASFLAGS = $(MCUFLAGS) -x assembler-with-cpp $(ASFLAGS) $(EXTRAFLAGS)
 MOVE_DEP = mv -f $(patsubst %.o,%.td,$@) $(patsubst %.o,%.d,$@)
 # Default target.
 all: build sizeafter
 # Quick make that doesn't clean
 quick: build sizeafter
 # Change the build target to build a HEX file or a library.
 build: elf hex
 #build: elf hex eep lss sym
@ -373,35 +377,62 @@ BEGIN = gccversion check_submodule sizebefore
 # Link: create ELF output file from object files.
 .SECONDARY : $(BUILD_DIR)/$(TARGET).elf
 .PRECIOUS : $(OBJ)
-%.elf: $(OBJ) | $(BEGIN)
+# Note the obj.txt depeendency is there to force linking if a source file is deleted
 %.elf: $(OBJ) $(OBJDIR)/cflags.txt $(OBJDIR)/ldflags.txt $(OBJDIR)/obj.txt | $(BEGIN)
 	@$(SILENT) || printf "$(MSG_LINKING) $@" | $(AWK_CMD)
-	$(eval CMD=$(CC) $(ALL_CFLAGS) $^ --output $@ $(LDFLAGS))
+	$(eval CMD=$(CC) $(ALL_CFLAGS) $(filter-out %.txt,$^) --output $@ $(LDFLAGS))
 	@$(BUILD_CMD)
 define GEN_OBJRULE
 # Compile: create object files from C source files.
-$1/%.o : %.c | $(BEGIN)
+$1/%.o : %.c $1/%.d $1/cflags.txt $1/compiler.txt | $(BEGIN)
 	@mkdir -p $$(@D)
 	@$$(SILENT) || printf "$$(MSG_COMPILING) $$<" | $$(AWK_CMD)
-	$$(eval CMD=$$(CC) -c $$(ALL_CFLAGS) $$< -o $$@)
+	$$(eval CMD=$$(CC) -c $$(ALL_CFLAGS) $$(GENDEPFLAGS) $$< -o $$@ && $$(MOVE_DEP))
 	@$$(BUILD_CMD)
 # Compile: create object files from C++ source files.
-$1/%.o : %.cpp | $(BEGIN)
+$1/%.o : %.cpp $1/%.d $1/cppflags.txt $1/compiler.txt | $(BEGIN)
 	@mkdir -p $$(@D)
 	@$$(SILENT) || printf "$$(MSG_COMPILING_CPP) $$<" | $$(AWK_CMD)
-	$$(eval CMD=$$(CC) -c $$(ALL_CPPFLAGS) $$< -o $$@)
+	$$(eval CMD=$$(CC) -c $$(ALL_CPPFLAGS) $$(GENDEPFLAGS) $$< -o $$@ && $$(MOVE_DEP))
 	@$(BUILD_CMD)
 # Assemble: create object files from assembler source files.
-$1/%.o : %.S | $(BEGIN)
+$1/%.o : %.S $1/asflags.txt $1/compiler.txt | $(BEGIN)
 	@mkdir -p $$(@D)
 	@$(SILENT) || printf "$$(MSG_ASSEMBLING) $$<" | $$(AWK_CMD)
 	$$(eval CMD=$$(CC) -c $$(ALL_ASFLAGS) $$< -o $$@)
 	@$$(BUILD_CMD)
 $1/force:
 $1/cflags.txt: $1/force
 	echo '$$(ALL_CFLAGS)' | cmp -s - $$@ || echo '$$(ALL_CFLAGS)' > $$@
 $1/cppflags.txt: $1/force
 	echo '$$(ALL_CPPFLAGS)' | cmp -s - $$@ || echo '$$(ALL_CPPFLAGS)' > $$@
 $1/asflags.txt: $1/force
 	echo '$$(ALL_ASFLAGS)' | cmp -s - $$@ || echo '$$(ALL_ASFLAGS)' > $$@
 $1/ldflags.txt: $1/force
 	echo '$$(LDFLAGS)' | cmp -s - $$@ || echo '$$(LDFLAGS)' > $$@
 $1/obj.txt: $1/force
 	echo '$$(OBJ)' | cmp -s - $$@ || echo '$$(OBJ)' > $$@
 $1/compiler.txt: $1/force
 	$$(CC) --version | cmp -s - $$@ || $$(CC) --version > $$@
 endef
 # We have to use static rules for the .d files for some reason
 DEPS = $(patsubst %.o,%.d,$(OBJ))
 # Keep the .d files
 .PRECIOUS: $(DEPS)
 # Empty rule to force recompilation if the .d file is missing
 $(DEPS):
 # Since the object files could be in two different folders, generate
 # separate rules for them, rather than having too generic rules
 $(eval $(call GEN_OBJRULE,$(OBJDIR)))
@ -424,7 +455,10 @@ $(eval $(call GEN_OBJRULE,$(KBOBJDIR)))
 	$(CC) -E -mmcu=$(MCU) $(CFLAGS) $< -o $@
 # Target: clean project.
-clean: 
+clean:
 	$(REMOVE) -r $(OBJDIR) 2>/dev/null
 	$(REMOVE) -r $(KBOBJDIR) 2>/dev/null
 	$(REMOVE) $(BUILD_DIR)/$(TARGET).*
 show_path:
 	@echo VPATH=$(VPATH)
@ -444,7 +478,6 @@ all-keyboards-defaults: all-keyboards-defaults-all
 KEYBOARDS := $(SUBDIRS:$(TOP_DIR)/keyboards/%/=/keyboards/%)
 all-keyboards-all: $(addsuffix -all,$(KEYBOARDS))
 all-keyboards-quick: $(addsuffix -quick,$(KEYBOARDS))
 all-keyboards-clean: $(addsuffix -clean,$(KEYBOARDS))
 all-keyboards: all-keyboards-all
@ -461,12 +494,10 @@ done
 endef
 define make_keyboard_helper
-# Just remove the -quick, -all and so on from the first argument and pass it forward
+# Just remove the -all and so on from the first argument and pass it forward
 $(call make_keyboard,$(subst -$2,,$1),$2)
 endef
 /keyboards/%-quick:
 	$(call make_keyboard_helper,$@,quick)
 /keyboards/%-all:
 	$(call make_keyboard_helper,$@,all)
 /keyboards/%-clean:
@ -484,19 +515,6 @@ all-keymaps-%:
 all-keymaps: all-keymaps-all
 GOAL=$(MAKECMDGOALS)
 ifeq ($(MAKECMDGOALS),)
 GOAL = all
 endif
 CLEANING_GOALS=clean clean_list all
 ifneq ($(findstring $(GOAL),$(CLEANING_GOALS)),)
 $(shell $(REMOVE) -r $(BUILD_DIR) 2>/dev/null)
 $(shell $(REMOVE) -r $(TOP_DIR)/$(BUILD_DIR))
 $(shell $(REMOVE) -r $(KEYBOARD_PATH)/$(BUILD_DIR))
 $(shell if $$SUBPROJECT; then $(REMOVE) -r $(SUBPROJECT_PATH)/$(BUILD_DIR); fi)
 $(shell $(REMOVE) -r $(KEYMAP_PATH)/$(BUILD_DIR))
 endif
 # Create build directory
 $(shell mkdir $(BUILD_DIR) 2>/dev/null)
@ -505,11 +523,11 @@ $(shell mkdir $(OBJDIR) 2>/dev/null)
 $(shell mkdir $(KBOBJDIR) 2>/dev/null)
 # Include the dependency files.
-include $(shell mkdir $(BUILD_DIR)/.dep 2>/dev/null) $(wildcard $(BUILD_DIR)/.dep/*)
+-include $(patsubst %.o,%.d,$(OBJ))
 # Listing of phony targets.
-.PHONY : all quick finish sizebefore sizeafter gccversion \
+.PHONY : all finish sizebefore sizeafter gccversion \
 build elf hex eep lss sym coff extcoff check_submodule \
 clean clean_list debug gdb-config show_path \
 program teensy dfu flip dfu-ee flip-ee dfu-start \
--- a/util/ergodox_ez.html
+++ b/util/ergodox_ez.html
@ -0,0 +1 @@
 <html><head><meta http-equiv="refresh" content="0; url=http://qmk.fm/keyboards/ergodox/" /></head></html>
--- a/util/travis_compiled_push.sh
+++ b/util/travis_compiled_push.sh
@ -15,6 +15,8 @@ git submodule update --init --recursive
 rm -rf keyboard
 rm -rf keyboards
 cp -r ../qmk_firmware/keyboards .
 mkdir keyboards/ergodox_ez/
 cp ../qmk_firmware/util/ergodox_ez.html keyboards/ergodox_ez/index.html
 cp ../qmk_firmware/readme.md qmk_readme.md
 ./generate.sh
		`@ -0,0 +1,3 @@`
							`# sethbc's Ergodox EZ keymap`

							`Largely based on the Ergodox Infinity default keymap`
		`@ -0,0 +1,2 @@`
							`# Don’t do a tricolor wave when the computer is shut down in Windows`
							`SLEEP_LED_ENABLE = no`
`@ -42,4 +42,4 @@ I press C-a, C-e, and C-k all the time. It’s difficult to press these key comb`

	`## use spreadsheets`	`## use spreadsheets`

	`All the common spreadsheet operations (+-*/=) are now on the right side of the symbol layer.`	`All the common spreadsheet operations (+-*/=) are now on the right side of the symbol layer. There’s also a colon there for entering times and maybe IPv6 addresses. Not that I expect people to type IPv6 addresses into a spreadsheet, but, y’know.`
		`@ -0,0 +1 @@`
							`<html><head><meta http-equiv="refresh" content="0; url=http://qmk.fm/keyboards/ergodox/" /></head></html>`