225 files changed, 1651 insertions, 1795 deletions

diff --git a/keyboards/ergodox/Makefile b/keyboards/ergodox/Makefile
new file mode 100644
index 000000000..05fb588d1
--- /dev/null
+++ b/keyboards/ergodox/Makefile
@@ -0,0 +1,34 @@
+#----------------------------------------------------------------------------
+# On command line:
+#
+# make = Make software.
+#
+# make clean = Clean out built project files.
+#
+# That's pretty much all you need. To compile, always go make clean, 
+# followed by make.
+#
+# For advanced users only:
+# make teensy = Download the hex file to the device, using teensy_loader_cli.
+#               (must have teensy_loader_cli installed).
+#
+#----------------------------------------------------------------------------
+SUBPROJECT_DEFAULT = ez
+
+# Build Options
+#   comment out to disable the options.
+#
+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
+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
diff --git a/keyboards/ergodox/config.h b/keyboards/ergodox/config.h
new file mode 100644
index 000000000..edc60caae
--- /dev/null
+++ b/keyboards/ergodox/config.h
@@ -0,0 +1,36 @@
+#ifndef KEYBOARDS_ERGODOX_CONFIG_H_
+#define KEYBOARDS_ERGODOX_CONFIG_H_
+
+#define MOUSEKEY_DELAY          100
+#define MOUSEKEY_INTERVAL       20
+#define MOUSEKEY_MAX_SPEED      3
+#define MOUSEKEY_TIME_TO_MAX    10
+
+#define TAPPING_TOGGLE  1
+
+/* define if matrix has ghost */
+//#define MATRIX_HAS_GHOST
+
+#define TAPPING_TERM    200
+#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+/* key combination for command */
+#define IS_COMMAND() ( \
+    keyboard_report->mods == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \
+    keyboard_report->mods == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) \
+)
+
+#ifdef SUBPROJECT_ez
+    #include "ez/config.h"
+#endif
+#ifdef SUBPROJECT_infinity
+    #include "infinity/config.h"
+#endif
+
+
+#endif /* KEYBOARDS_ERGODOX_CONFIG_H_ */
diff --git a/keyboards/ergodox/ergodox.c b/keyboards/ergodox/ergodox.c
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/keyboards/ergodox/ergodox.c
diff --git a/keyboards/ergodox/ergodox.h b/keyboards/ergodox/ergodox.h
new file mode 100644
index 000000000..f8ec8b5bf
--- /dev/null
+++ b/keyboards/ergodox/ergodox.h
@@ -0,0 +1,10 @@
+#ifndef KEYBOARDS_ERGODOX_ERGODOX_H_
+#define KEYBOARDS_ERGODOX_ERGODOX_H_
+#ifdef SUBPROJECT_ez
+    #include "ez.h"
+#endif
+#ifdef SUBPROJECT_infinity
+    #include "infinity.h"
+#endif
+
+#endif /* KEYBOARDS_ERGODOX_ERGODOX_H_ */
diff --git a/keyboards/ergodox_ez/190hotfix.sh b/keyboards/ergodox/ez/190hotfix.sh
index bdc3adce2..bdc3adce2 100755
--- a/keyboards/ergodox_ez/190hotfix.sh
+++ b/keyboards/ergodox/ez/190hotfix.sh
diff --git a/keyboards/ergodox_ez/Makefile b/keyboards/ergodox/ez/Makefile
index 54edaed6d..37e554b30 100644
--- a/keyboards/ergodox_ez/Makefile
+++ b/keyboards/ergodox/ez/Makefile
@@ -70,17 +70,7 @@ OPT_DEFS += -DBOOTLOADER_SIZE=512
 # Build Options
 #   comment out to disable the options.
 #
-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
-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
+	include ../../../Makefile
 endif
diff --git a/keyboards/ergodox_ez/config.h b/keyboards/ergodox/ez/config.h
index 2bb56731b..084a044ee 100644
--- a/keyboards/ergodox_ez/config.h
+++ b/keyboards/ergodox/ez/config.h
@@ -16,10 +16,10 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef CONFIG_H
-#define CONFIG_H
+#ifndef ERGODOX_EZ_CONFIG_H
+#define ERGODOX_EZ_CONFIG_H
 
-#include "config_common.h"
+#include "../config.h"
 
 /* USB Device descriptor parameter */
 #define VENDOR_ID       0xFEED
@@ -33,34 +33,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROWS 14
 #define MATRIX_COLS 6
 
-#define MOUSEKEY_DELAY          100
-#define MOUSEKEY_INTERVAL       20
-#define MOUSEKEY_MAX_SPEED      3
-#define MOUSEKEY_TIME_TO_MAX    10
-
-#define TAPPING_TOGGLE  1
-
-/* define if matrix has ghost */
-//#define MATRIX_HAS_GHOST
-
 /* number of backlight levels */
 #define BACKLIGHT_LEVELS 3
 
+#define LED_BRIGHTNESS_LO       15
+#define LED_BRIGHTNESS_HI       255
+
+
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE    5
-#define TAPPING_TERM    200
-#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/* key combination for command */
-#define IS_COMMAND() ( \
-    keyboard_report->mods == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \
-    keyboard_report->mods == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) \
-)
 
 /*
  * Feature disable options
diff --git a/keyboards/ergodox_ez/ergodox_ez.c b/keyboards/ergodox/ez/ez.c
index f0558d9f2..e7afc9859 100644
--- a/keyboards/ergodox_ez/ergodox_ez.c
+++ b/keyboards/ergodox/ez/ez.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ez.h"
 #include "i2cmaster.h"
 
 bool i2c_initialized = 0;
diff --git a/keyboards/ergodox_ez/ergodox_ez.h b/keyboards/ergodox/ez/ez.h
index db4ec867b..db4ec867b 100644
--- a/keyboards/ergodox_ez/ergodox_ez.h
+++ b/keyboards/ergodox/ez/ez.h
diff --git a/keyboards/ergodox_ez/i2cmaster.h b/keyboards/ergodox/ez/i2cmaster.h
index 3917b9e6c..3917b9e6c 100644
--- a/keyboards/ergodox_ez/i2cmaster.h
+++ b/keyboards/ergodox/ez/i2cmaster.h
diff --git a/keyboards/ergodox_ez/matrix.c b/keyboards/ergodox/ez/matrix.c
index dc29cf5cd..a19bab90b 100644
--- a/keyboards/ergodox_ez/matrix.c
+++ b/keyboards/ergodox/ez/matrix.c
@@ -33,7 +33,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "debug.h"
 #include "util.h"
 #include "matrix.h"
-#include "ergodox_ez.h"
+#include "ez.h"
 #include "i2cmaster.h"
 #ifdef DEBUG_MATRIX_SCAN_RATE
 #include  "timer.h"
diff --git a/keyboards/ergodox_ez/twimaster.c b/keyboards/ergodox/ez/twimaster.c
index f91c08e6e..f91c08e6e 100644
--- a/keyboards/ergodox_ez/twimaster.c
+++ b/keyboards/ergodox/ez/twimaster.c
diff --git a/keyboards/ergodox_ez/keymaps/german-manuneo/compile_keymap.py b/keyboards/ergodox/ez/util/compile_keymap.py
index 7076a6ecb..7076a6ecb 100644
--- a/keyboards/ergodox_ez/keymaps/german-manuneo/compile_keymap.py
+++ b/keyboards/ergodox/ez/util/compile_keymap.py
diff --git a/keyboards/ergodox_ez/util/readme.md b/keyboards/ergodox/ez/util/readme.md
index 26c5e5d99..26c5e5d99 100644
--- a/keyboards/ergodox_ez/util/readme.md
+++ b/keyboards/ergodox/ez/util/readme.md
diff --git a/keyboards/infinity_ergodox/MEMO.txt b/keyboards/ergodox/infinity/MEMO.txt
index e2886aa00..e2886aa00 100644
--- a/keyboards/infinity_ergodox/MEMO.txt
+++ b/keyboards/ergodox/infinity/MEMO.txt
diff --git a/keyboards/infinity_ergodox/Makefile b/keyboards/ergodox/infinity/Makefile
index 7edc03d8c..ccb735a48 100644
--- a/keyboards/infinity_ergodox/Makefile
+++ b/keyboards/ergodox/infinity/Makefile
@@ -52,34 +52,26 @@ ARMV = 7
 # Vector table for application
 # 0x00000000-0x00001000 area is occupied by bootlaoder.*/
 # The CORTEX_VTOR... is needed only for MCHCK/Infinity KB
-OPT_DEFS = -DCORTEX_VTOR_INIT=0x00002000
+OPT_DEFS += -DCORTEX_VTOR_INIT=0x00002000
 
 # Build Options
 #   comment out to disable the options.
 #
-BOOTMAGIC_ENABLE ?= yes	# Virtual DIP switch configuration
-## (Note that for BOOTMAGIC on Teensy LC you have to use a custom .ld script.)
-MOUSEKEY_ENABLE ?= yes	# Mouse keys
-EXTRAKEY_ENABLE ?= yes	# Audio control and System control
-CONSOLE_ENABLE ?= yes	# Console for debug
-COMMAND_ENABLE ?= yes    # Commands for debug and configuration
-SLEEP_LED_ENABLE ?= yes  # Breathing sleep LED during USB suspend
-NKRO_ENABLE ?= yes	    # USB Nkey Rollover
 CUSTOM_MATRIX ?= yes # Custom matrix file
 SERIAL_LINK_ENABLE = yes
-VISUALIZER_ENABLE ?= yes
+VISUALIZER_ENABLE ?= no #temporarily disabled to make everything compile
 LCD_ENABLE ?= yes
 LED_ENABLE ?= yes
 LCD_BACKLIGHT_ENABLE ?= yes
 
+ifndef QUANTUM_DIR
+	include ../../../Makefile
+endif
+
 ifdef LCD_ENABLE
-include drivers/gdisp/st7565ergodox/driver.mk
+include $(SUBPROJECT_PATH)/drivers/gdisp/st7565ergodox/driver.mk
 endif
 
 ifdef LED_ENABLE
-include drivers/gdisp/IS31FL3731C/driver.mk
+include $(SUBPROJECT_PATH)/drivers/gdisp/IS31FL3731C/driver.mk
 endif
-
-ifndef QUANTUM_DIR
-	include ../../Makefile
-endif
\ No newline at end of file
diff --git a/keyboards/infinity_ergodox/bootloader_defs.h b/keyboards/ergodox/infinity/bootloader_defs.h
index c67153be6..c67153be6 100644
--- a/keyboards/infinity_ergodox/bootloader_defs.h
+++ b/keyboards/ergodox/infinity/bootloader_defs.h
diff --git a/keyboards/infinity_ergodox/chconf.h b/keyboards/ergodox/infinity/chconf.h
index d59c35eb6..d59c35eb6 100644
--- a/keyboards/infinity_ergodox/chconf.h
+++ b/keyboards/ergodox/infinity/chconf.h
diff --git a/keyboards/infinity_ergodox/config.h b/keyboards/ergodox/infinity/config.h
index d24ee0f05..9e264083b 100644
--- a/keyboards/infinity_ergodox/config.h
+++ b/keyboards/ergodox/infinity/config.h
@@ -15,8 +15,10 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef CONFIG_H
-#define CONFIG_H
+#ifndef INFINITY_ERGODOX_CONFIG_H
+#define INFINITY_ERGODOX_CONFIG_H
+
+#include "../config.h"
 
 
 /* USB Device descriptor parameter */
@@ -35,25 +37,18 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COLS 5
 #define LOCAL_MATRIX_ROWS 9
 
+/* number of backlight levels */
+#define BACKLIGHT_LEVELS 3
+
+#define LED_BRIGHTNESS_LO       15
+#define LED_BRIGHTNESS_HI       255
+
 /* define if matrix has ghost */
 //#define MATRIX_HAS_GHOST
 
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE    5
 
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-//#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-//#define LOCKING_RESYNC_ENABLE
-
-/* key combination for command */
-#define IS_COMMAND() ( \
-    keyboard_report->mods == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)) \
-)
-
-/* Keymap for Infiity prototype */
-#define INFINITY_PROTOTYPE
-
 #define SERIAL_LINK_BAUD 562500
 #define SERIAL_LINK_THREAD_PRIORITY (NORMALPRIO - 1)
 // The visualizer needs gfx thread priorities
diff --git a/keyboards/infinity_ergodox/drivers/gdisp/IS31FL3731C/board_IS31FL3731C.h b/keyboards/ergodox/infinity/drivers/gdisp/IS31FL3731C/board_IS31FL3731C.h
index 2ea73f1fb..2ea73f1fb 100644
--- a/keyboards/infinity_ergodox/drivers/gdisp/IS31FL3731C/board_IS31FL3731C.h
+++ b/keyboards/ergodox/infinity/drivers/gdisp/IS31FL3731C/board_IS31FL3731C.h
diff --git a/keyboards/infinity_ergodox/drivers/gdisp/IS31FL3731C/driver.mk b/keyboards/ergodox/infinity/drivers/gdisp/IS31FL3731C/driver.mk
index f32d0d868..f32d0d868 100644
--- a/keyboards/infinity_ergodox/drivers/gdisp/IS31FL3731C/driver.mk
+++ b/keyboards/ergodox/infinity/drivers/gdisp/IS31FL3731C/driver.mk
diff --git a/keyboards/infinity_ergodox/drivers/gdisp/IS31FL3731C/gdisp_IS31FL3731C.c b/keyboards/ergodox/infinity/drivers/gdisp/IS31FL3731C/gdisp_IS31FL3731C.c
index 1d21f0c49..1d21f0c49 100644
--- a/keyboards/infinity_ergodox/drivers/gdisp/IS31FL3731C/gdisp_IS31FL3731C.c
+++ b/keyboards/ergodox/infinity/drivers/gdisp/IS31FL3731C/gdisp_IS31FL3731C.c
diff --git a/keyboards/infinity_ergodox/drivers/gdisp/IS31FL3731C/gdisp_lld_config.h b/keyboards/ergodox/infinity/drivers/gdisp/IS31FL3731C/gdisp_lld_config.h
index bb28ad775..bb28ad775 100644
--- a/keyboards/infinity_ergodox/drivers/gdisp/IS31FL3731C/gdisp_lld_config.h
+++ b/keyboards/ergodox/infinity/drivers/gdisp/IS31FL3731C/gdisp_lld_config.h
diff --git a/keyboards/infinity_ergodox/drivers/gdisp/emulator_lcd/driver.mk b/keyboards/ergodox/infinity/drivers/gdisp/emulator_lcd/driver.mk
index 16c3f80f5..16c3f80f5 100644
--- a/keyboards/infinity_ergodox/drivers/gdisp/emulator_lcd/driver.mk
+++ b/keyboards/ergodox/infinity/drivers/gdisp/emulator_lcd/driver.mk
diff --git a/keyboards/infinity_ergodox/drivers/gdisp/emulator_lcd/emulator_lcd.c b/keyboards/ergodox/infinity/drivers/gdisp/emulator_lcd/emulator_lcd.c
index babfe2b36..babfe2b36 100644
--- a/keyboards/infinity_ergodox/drivers/gdisp/emulator_lcd/emulator_lcd.c
+++ b/keyboards/ergodox/infinity/drivers/gdisp/emulator_lcd/emulator_lcd.c
diff --git a/keyboards/infinity_ergodox/drivers/gdisp/emulator_led/driver.mk b/keyboards/ergodox/infinity/drivers/gdisp/emulator_led/driver.mk
index 255434432..255434432 100644
--- a/keyboards/infinity_ergodox/drivers/gdisp/emulator_led/driver.mk
+++ b/keyboards/ergodox/infinity/drivers/gdisp/emulator_led/driver.mk
diff --git a/keyboards/infinity_ergodox/drivers/gdisp/emulator_led/emulator_led.c b/keyboards/ergodox/infinity/drivers/gdisp/emulator_led/emulator_led.c
index b0ebcdc47..b0ebcdc47 100644
--- a/keyboards/infinity_ergodox/drivers/gdisp/emulator_led/emulator_led.c
+++ b/keyboards/ergodox/infinity/drivers/gdisp/emulator_led/emulator_led.c
diff --git a/keyboards/infinity_ergodox/drivers/gdisp/st7565ergodox/board_ST7565.h b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/board_ST7565.h
index 290571ce5..290571ce5 100644
--- a/keyboards/infinity_ergodox/drivers/gdisp/st7565ergodox/board_ST7565.h
+++ b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/board_ST7565.h
diff --git a/keyboards/infinity_ergodox/drivers/gdisp/st7565ergodox/driver.mk b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/driver.mk
index 889a1a031..889a1a031 100644
--- a/keyboards/infinity_ergodox/drivers/gdisp/st7565ergodox/driver.mk
+++ b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/driver.mk
diff --git a/keyboards/infinity_ergodox/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c
index c33aea81a..c33aea81a 100644
--- a/keyboards/infinity_ergodox/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c
+++ b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_ST7565.c
diff --git a/keyboards/infinity_ergodox/drivers/gdisp/st7565ergodox/gdisp_lld_config.h b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_config.h
index 48587b9e1..48587b9e1 100644
--- a/keyboards/infinity_ergodox/drivers/gdisp/st7565ergodox/gdisp_lld_config.h
+++ b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/gdisp_lld_config.h
diff --git a/keyboards/infinity_ergodox/drivers/gdisp/st7565ergodox/st7565.h b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/st7565.h
index 48636b33d..48636b33d 100644
--- a/keyboards/infinity_ergodox/drivers/gdisp/st7565ergodox/st7565.h
+++ b/keyboards/ergodox/infinity/drivers/gdisp/st7565ergodox/st7565.h
diff --git a/keyboards/infinity_ergodox/gfxconf.h b/keyboards/ergodox/infinity/gfxconf.h
index 8caa577b7..8caa577b7 100644
--- a/keyboards/infinity_ergodox/gfxconf.h
+++ b/keyboards/ergodox/infinity/gfxconf.h
diff --git a/keyboards/infinity_ergodox/halconf.h b/keyboards/ergodox/infinity/halconf.h
index 55dd5e88d..55dd5e88d 100644
--- a/keyboards/infinity_ergodox/halconf.h
+++ b/keyboards/ergodox/infinity/halconf.h
diff --git a/keyboards/infinity_ergodox/infinity_ergodox.c b/keyboards/ergodox/infinity/infinity.c
index 87ed40fab..f89e046d0 100644
--- a/keyboards/infinity_ergodox/infinity_ergodox.c
+++ b/keyboards/ergodox/infinity/infinity.c
@@ -1,8 +1,10 @@
-#include "infinity_ergodox.h"
+#include "infinity.h"
 #include "ch.h"
 #include "hal.h"
 #include "serial_link/system/serial_link.h"
+#ifdef VISUALIZER_ENABLE
 #include "lcd_backlight.h"
+#endif
 
 void init_serial_link_hal(void) {
     PORTA->PCR[1] = PORTx_PCRn_PE | PORTx_PCRn_PS | PORTx_PCRn_PFE | PORTx_PCRn_MUX(2);
@@ -36,7 +38,7 @@ void init_serial_link_hal(void) {
 // Using a higher pre-scalar without flicker is possible but FTM0_MOD will need to be reduced
 // Which will reduce the brightness range
 #define PRESCALAR_DEFINE 0
-
+#ifdef VISUALIZER_ENABLE
 void lcd_backlight_hal_init(void) {
 	// Setup Backlight
     SIM->SCGC6 |= SIM_SCGC6_FTM0;
@@ -74,3 +76,57 @@ void lcd_backlight_hal_color(uint16_t r, uint16_t g, uint16_t b) {
 	CHANNEL_GREEN.CnV = g;
 	CHANNEL_BLUE.CnV = b;
 }
+#endif
+
+__attribute__ ((weak))
+void matrix_init_user(void) {
+}
+
+__attribute__ ((weak))
+void matrix_scan_user(void) {
+}
+
+
+void matrix_init_kb(void) {
+	// put your keyboard start-up code here
+	// runs once when the firmware starts up
+
+	matrix_init_user();
+}
+
+void matrix_scan_kb(void) {
+	// put your looping keyboard code here
+	// runs every cycle (a lot)
+
+	matrix_scan_user();
+}
+
+void ergodox_board_led_on(void){
+}
+
+void ergodox_right_led_1_on(void){
+}
+
+void ergodox_right_led_2_on(void){
+}
+
+void ergodox_right_led_3_on(void){
+}
+
+void ergodox_right_led_on(uint8_t led){
+}
+
+void ergodox_board_led_off(void){
+}
+
+void ergodox_right_led_1_off(void){
+}
+
+void ergodox_right_led_2_off(void){
+}
+
+void ergodox_right_led_3_off(void){
+}
+
+void ergodox_right_led_off(uint8_t led){
+}
diff --git a/keyboards/ergodox/infinity/infinity.h b/keyboards/ergodox/infinity/infinity.h
new file mode 100644
index 000000000..fec9e565c
--- /dev/null
+++ b/keyboards/ergodox/infinity/infinity.h
@@ -0,0 +1,110 @@
+#ifndef KEYBOARDS_ERGODOX_INFINITY_INFINITY_H_
+#define KEYBOARDS_ERGODOX_INFINITY_INFINITY_H_
+
+#include "quantum.h"
+
+void ergodox_board_led_on(void);
+void ergodox_right_led_1_on(void);
+void ergodox_right_led_2_on(void);
+void ergodox_right_led_3_on(void);
+void ergodox_right_led_on(uint8_t led);
+
+void ergodox_board_led_off(void);
+void ergodox_right_led_1_off(void);
+void ergodox_right_led_2_off(void);
+void ergodox_right_led_3_off(void);
+void ergodox_right_led_off(uint8_t led);
+
+inline void ergodox_led_all_on(void)
+{
+    ergodox_board_led_on();
+    ergodox_right_led_1_on();
+    ergodox_right_led_2_on();
+    ergodox_right_led_3_on();
+}
+
+inline void ergodox_led_all_off(void)
+{
+    ergodox_board_led_off();
+    ergodox_right_led_1_off();
+    ergodox_right_led_2_off();
+    ergodox_right_led_3_off();
+}
+
+inline void ergodox_right_led_1_set(uint8_t n){
+	if (n) {
+		ergodox_right_led_1_on();
+	} else {
+		ergodox_right_led_1_off();
+	}
+}
+
+inline void ergodox_right_led_2_set(uint8_t n){
+	if (n) {
+		ergodox_right_led_2_on();
+	} else {
+		ergodox_right_led_2_off();
+	}
+}
+
+inline void ergodox_right_led_3_set(uint8_t n){
+	if (n) {
+		ergodox_right_led_3_on();
+	} else {
+		ergodox_right_led_3_off();
+	}
+}
+
+inline void ergodox_right_led_set(uint8_t led, uint8_t n){
+	if (n) {
+		ergodox_right_led_on(led);
+	} else {
+		ergodox_right_led_off(led);
+	}
+}
+
+inline void ergodox_led_all_set(uint8_t n) {
+    ergodox_right_led_1_set(n);
+    ergodox_right_led_2_set(n);
+    ergodox_right_led_3_set(n);
+}
+
+#define KEYMAP( \
+    A80, A70, A60, A50, A40, A30, A20,  \
+    A81, A71, A61, A51, A41, A31, A21,  \
+    A82, A72, A62, A52, A42, A32,       \
+    A83, A73, A63, A53, A43, A33, A23,  \
+    A84, A74, A64, A54, A44,            \
+                                  A13, A03, \
+                                       A04, \
+                             A34, A24, A14, \
+         B20, B30, B40, B50, B60, B70, B80, \
+         B21, B31, B41, B51, B61, B71, B81, \
+              B32, B42, B52, B62, B72, B82, \
+         B23, B33, B43, B53, B63, B73, B83, \
+                   B44, B54, B64, B74, B84, \
+    B03, B13,     \
+    B04,          \
+    B14, B24, B34 \
+) { \
+    { KC_NO, KC_NO, KC_NO, A03,   A04 }, \
+    { KC_NO, KC_NO, KC_NO, A13,   A14 }, \
+    { A20,   A21,   KC_NO, A23,   A24 }, \
+    { A30,   A31,   A32,   A33,   A34 }, \
+    { A40,   A41,   A42,   A43,   A44 }, \
+    { A50,   A51,   A52,   A53,   A54 }, \
+    { A60,   A61,   A62,   A63,   A64 }, \
+    { A70,   A71,   A72,   A73,   A74 }, \
+    { A80,   A81,   A82,   A83,   A84 }, \
+    { KC_NO, KC_NO, KC_NO, B03,   B04 }, \
+    { KC_NO, KC_NO, KC_NO, B13,   B14 }, \
+    { B20,   B21,   KC_NO, B23,   B24 }, \
+    { B30,   B31,   B32,   B33,   B34 }, \
+    { B40,   B41,   B42,   B43,   B44 }, \
+    { B50,   B51,   B52,   B53,   B54 }, \
+    { B60,   B61,   B62,   B63,   B64 }, \
+    { B70,   B71,   B72,   B73,   B74 }, \
+    { B80,   B81,   B82,   B83,   B84 }  \
+}
+
+#endif /* KEYBOARDS_ERGODOX_INFINITY_INFINITY_H_ */
diff --git a/keyboards/infinity_ergodox/led.c b/keyboards/ergodox/infinity/led.c
index 77195bb35..77195bb35 100644
--- a/keyboards/infinity_ergodox/led.c
+++ b/keyboards/ergodox/infinity/led.c
diff --git a/keyboards/infinity_ergodox/matrix.c b/keyboards/ergodox/infinity/matrix.c
index 2b806cd64..1fda90484 100644
--- a/keyboards/infinity_ergodox/matrix.c
+++ b/keyboards/ergodox/infinity/matrix.c
@@ -63,6 +63,8 @@ void matrix_init(void)
 
     memset(matrix, 0, MATRIX_ROWS);
     memset(matrix_debouncing, 0, LOCAL_MATRIX_ROWS);
+
+    matrix_init_quantum();
 }
 
 uint8_t matrix_scan(void)
@@ -127,6 +129,7 @@ uint8_t matrix_scan(void)
         }
         debouncing = false;
     }
+    matrix_scan_quantum();
     return 1;
 }
 
diff --git a/keyboards/infinity_ergodox/mcuconf.h b/keyboards/ergodox/infinity/mcuconf.h
index f6730b99c..f6730b99c 100644
--- a/keyboards/infinity_ergodox/mcuconf.h
+++ b/keyboards/ergodox/infinity/mcuconf.h
diff --git a/keyboards/ergodox_ez/keymaps/ab/Makefile b/keyboards/ergodox/keymaps/ab/Makefile
index b673c5ce5..b673c5ce5 100644
--- a/keyboards/ergodox_ez/keymaps/ab/Makefile
+++ b/keyboards/ergodox/keymaps/ab/Makefile
diff --git a/keyboards/ergodox_ez/keymaps/ab/keyboard-layout.json b/keyboards/ergodox/keymaps/ab/keyboard-layout.json
index e2badad4d..e2badad4d 100644
--- a/keyboards/ergodox_ez/keymaps/ab/keyboard-layout.json
+++ b/keyboards/ergodox/keymaps/ab/keyboard-layout.json
diff --git a/keyboards/ergodox_ez/keymaps/ab/keyboard-layout.png b/keyboards/ergodox/keymaps/ab/keyboard-layout.png
index 740684461..740684461 100644
--- a/keyboards/ergodox_ez/keymaps/ab/keyboard-layout.png
+++ b/keyboards/ergodox/keymaps/ab/keyboard-layout.png
diff --git a/keyboards/ergodox_ez/keymaps/ab/keymap.c b/keyboards/ergodox/keymaps/ab/keymap.c
index df6f33460..7938c9da3 100644
--- a/keyboards/ergodox_ez/keymaps/ab/keymap.c
+++ b/keyboards/ergodox/keymaps/ab/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
 #include "debug.h"
 #include "action_layer.h"
 
diff --git a/keyboards/ergodox_ez/keymaps/ab/readme.md b/keyboards/ergodox/keymaps/ab/readme.md
index 6b1ac2be3..6b1ac2be3 100644
--- a/keyboards/ergodox_ez/keymaps/ab/readme.md
+++ b/keyboards/ergodox/keymaps/ab/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/adnw_k_o_y/keymap.c b/keyboards/ergodox/keymaps/adnw_k_o_y/keymap.c
index 052517d70..31ae4262b 100644
--- a/keyboards/ergodox_ez/keymaps/adnw_k_o_y/keymap.c
+++ b/keyboards/ergodox/keymaps/adnw_k_o_y/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
 #include "debug.h"
 #include "action_layer.h"
 #include "keymap_german.h"
diff --git a/keyboards/ergodox_ez/keymaps/adnw_k_o_y/readme.md b/keyboards/ergodox/keymaps/adnw_k_o_y/readme.md
index f0dd3815c..f0dd3815c 100644
--- a/keyboards/ergodox_ez/keymaps/adnw_k_o_y/readme.md
+++ b/keyboards/ergodox/keymaps/adnw_k_o_y/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/alexjj/keymap.c b/keyboards/ergodox/keymaps/alexjj/keymap.c
index 448f62da0..ac954ba5b 100644
--- a/keyboards/ergodox_ez/keymaps/alexjj/keymap.c
+++ b/keyboards/ergodox/keymaps/alexjj/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
 #include "debug.h"
 #include "action_layer.h"
 
diff --git a/keyboards/ergodox_ez/keymaps/alexjj/readme.md b/keyboards/ergodox/keymaps/alexjj/readme.md
index 239e32d39..239e32d39 100644
--- a/keyboards/ergodox_ez/keymaps/alexjj/readme.md
+++ b/keyboards/ergodox/keymaps/alexjj/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/alexjj/rl-layout.jpg b/keyboards/ergodox/keymaps/alexjj/rl-layout.jpg
index e4e92bf46..e4e92bf46 100644
--- a/keyboards/ergodox_ez/keymaps/alexjj/rl-layout.jpg
+++ b/keyboards/ergodox/keymaps/alexjj/rl-layout.jpg
diff --git a/keyboards/ergodox_ez/keymaps/algernon/COPYING b/keyboards/ergodox/keymaps/algernon/COPYING
index 94a9ed024..94a9ed024 100644
--- a/keyboards/ergodox_ez/keymaps/algernon/COPYING
+++ b/keyboards/ergodox/keymaps/algernon/COPYING
diff --git a/keyboards/ergodox_ez/keymaps/algernon/Makefile b/keyboards/ergodox/keymaps/algernon/Makefile
index 6bf3976b9..6bf3976b9 100644
--- a/keyboards/ergodox_ez/keymaps/algernon/Makefile
+++ b/keyboards/ergodox/keymaps/algernon/Makefile
diff --git a/keyboards/ergodox_ez/keymaps/algernon/config.h b/keyboards/ergodox/keymaps/algernon/config.h
index 9bb1025be..9bb1025be 100644
--- a/keyboards/ergodox_ez/keymaps/algernon/config.h
+++ b/keyboards/ergodox/keymaps/algernon/config.h
diff --git a/keyboards/ergodox_ez/keymaps/algernon/images/adore-layer.png b/keyboards/ergodox/keymaps/algernon/images/adore-layer.png
index 3df68ea53..3df68ea53 100644
--- a/keyboards/ergodox_ez/keymaps/algernon/images/adore-layer.png
+++ b/keyboards/ergodox/keymaps/algernon/images/adore-layer.png
diff --git a/keyboards/ergodox_ez/keymaps/algernon/images/base-layer.png b/keyboards/ergodox/keymaps/algernon/images/base-layer.png
index 7b25a05b3..7b25a05b3 100644
--- a/keyboards/ergodox_ez/keymaps/algernon/images/base-layer.png
+++ b/keyboards/ergodox/keymaps/algernon/images/base-layer.png
diff --git a/keyboards/ergodox_ez/keymaps/algernon/images/heatmap.png b/keyboards/ergodox/keymaps/algernon/images/heatmap.png
index 356035e0a..356035e0a 100644
--- a/keyboards/ergodox_ez/keymaps/algernon/images/heatmap.png
+++ b/keyboards/ergodox/keymaps/algernon/images/heatmap.png
diff --git a/keyboards/ergodox_ez/keymaps/algernon/images/hun-layer.png b/keyboards/ergodox/keymaps/algernon/images/hun-layer.png
index 104a9544d..104a9544d 100644
--- a/keyboards/ergodox_ez/keymaps/algernon/images/hun-layer.png
+++ b/keyboards/ergodox/keymaps/algernon/images/hun-layer.png
diff --git a/keyboards/ergodox_ez/keymaps/algernon/images/nav-n-media-layer.png b/keyboards/ergodox/keymaps/algernon/images/nav-n-media-layer.png
index 16d29e124..16d29e124 100644
--- a/keyboards/ergodox_ez/keymaps/algernon/images/nav-n-media-layer.png
+++ b/keyboards/ergodox/keymaps/algernon/images/nav-n-media-layer.png
diff --git a/keyboards/ergodox_ez/keymaps/algernon/images/one-handed-layer.png b/keyboards/ergodox/keymaps/algernon/images/one-handed-layer.png
index 698d11e5f..698d11e5f 100644
--- a/keyboards/ergodox_ez/keymaps/algernon/images/one-handed-layer.png
+++ b/keyboards/ergodox/keymaps/algernon/images/one-handed-layer.png
diff --git a/keyboards/ergodox_ez/keymaps/algernon/images/steno-layer.png b/keyboards/ergodox/keymaps/algernon/images/steno-layer.png
index fe3c03c93..fe3c03c93 100644
--- a/keyboards/ergodox_ez/keymaps/algernon/images/steno-layer.png
+++ b/keyboards/ergodox/keymaps/algernon/images/steno-layer.png
diff --git a/keyboards/ergodox_ez/keymaps/algernon/keymap.c b/keyboards/ergodox/keymaps/algernon/keymap.c
index c12087292..6a14ef467 100644
--- a/keyboards/ergodox_ez/keymaps/algernon/keymap.c
+++ b/keyboards/ergodox/keymaps/algernon/keymap.c
@@ -1,1216 +1,1217 @@
-/*
- * algernon's ErgoDox EZ layout, please see the readme.md file!
- */
-
-#include "ergodox_ez.h"
-#include "led.h"
-#include "debug.h"
-#include "action_layer.h"
-#include "action_util.h"
-#include "mousekey.h"
-#include "timer.h"
-#include "keymap_plover.h"
-#include "eeconfig.h"
-
-/* Layers */
-
-enum {
-  BASE = 0,
-  ADORE,
-  ARRW,
-  APPSEL,
-  HUN,
-  NMDIA,
-  OHLFT,
-  OHRGT,
-  PLVR,
-};
-
-/* Macros */
-
-enum {
-  NONE = 0,
-  // Buttons that do extra stuff
-  A_GUI,
-  A_PLVR,
-  A_ESC,
-  A_MPN,
-
-  // Function / number keys
-  KF_1, // 1, F1
-  KF_2, // 2, F2
-  KF_3, // ...
-  KF_4,
-  KF_5,
-  KF_6,
-  KF_7,
-  KF_8,
-  KF_9,
-  KF_10,
-  KF_11, // =, F11
-
-  // Application select keys
-  APP_SLK, // Slack
-  APP_EMCS, // Emacs
-  APP_TERM, // Terminal
-  APP_CHRM, // Chrome
-  APP_MSIC, // Music
-
-  // Diagonal mouse movement
-  A_MUL,
-  A_MUR,
-  A_MDL,
-  A_MDR,
-
-  // Hungarian layer keys
-  HU_AA, // Á
-  HU_OO, // Ó
-  HU_EE, // É
-  HU_UU, // Ú
-  HU_II, // Í
-  HU_OE, // Ö
-  HU_UE, // Ü
-  HU_OEE, // Ő
-  HU_UEE, // Ű
-
-  // One-handed layout specials
-  OH_BSSPC,
-  OH_ENTSFT,
-  OH_BASE,
-  OH_LEFT,
-  OH_RIGHT,
-};
-
-/* Fn keys */
-
-enum {
-  F_BSE = 0,
-  F_HUN,
-  F_GUI,
-  F_SFT,
-  F_ALT,
-  F_CTRL
-};
-
-/* Custom keycodes */
-
-enum {
-  CT_CLN = 0,
-  CT_MNS,
-  CT_TA,
-};
-
-/* States & timers */
-
-uint16_t gui_timer = 0;
-
-uint16_t kf_timers[12];
-
-uint16_t oh_base_timer = 0;
-uint16_t oh_bsspc_timer = 0;
-uint16_t oh_entsft_timer = 0;
-
-#define OH_BLINK_INTERVAL 500
-
-uint8_t oh_left_blink = 0;
-uint16_t oh_left_blink_timer = 0;
-uint8_t oh_right_blink = 0;
-uint16_t oh_right_blink_timer = 0;
-
-#if KEYLOGGER_ENABLE
-bool log_enable = false;
-#endif
-
-bool time_travel = false;
-
-/* The Keymap */
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/* Keymap 0: Base Layer
- *
- * ,-----------------------------------------------------.           ,-----------------------------------------------------.
- * |        `~ | 1 F1 | 2 F2 | 3 F3 | 4 F4 | 5 F5 | Plvr |           | Apps | 6 F6 | 7 F7 | 8 F8 | 9 F9 | 0 F10|       F11 |
- * |-----------+------+------+------+------+-------------|           |------+------+------+------+------+------+-----------|
- * | Next/Prev |   '  |   ,  |   .  |   P  |   Y  |   [  |           |  ]   |   F  |   G  |   C  |   R  |  L   | \         |
- * |-----------+------+------+------+------+------|      |           |      |------+------+------+------+------+-----------|
- * | Tab/ARROW |   A  |   O  |   E  |   U  |   I  |------|           |------|   D  |   H  |   T  |   N  |  S   | = / Arrow |
- * |-----------+------+------+------+------+------|   (  |           |  )   |------+------+------+------+------+-----------|
- * | Play/Pause|   /  |   Q  |   J  |   K  |   X  |      |           |      |   B  |   M  |   W  |   V  |  Z   |      Stop |
- * `-----------+------+------+------+------+-------------'           `-------------+------+------+------+------+-----------'
- *     |       |      |      |      |   :  |                                       |   -  |      |      |      |       |
- *     `-----------------------------------'                                       `-----------------------------------'
- *                                         ,-------------.           ,-------------.
- *                                         | LAlt | GUI  |           | MDIA | 1HND |
- *                                  ,------|------|------|           |------+------+------.
- *                                  |      |      | Ctrl |           | LEAD |      |      |
- *                                  |Backsp|LShift|------|           |------| Enter| Space|
- *                                  |      |      | ESC  |           | HUN  |      |      |
- *                                  `--------------------'           `--------------------'
- */
-[BASE] = KEYMAP(
-// left hand
- KC_GRV             ,M(KF_1)     ,M(KF_2)     ,M(KF_3),M(KF_4),M(KF_5),M(A_PLVR)
-,M(A_MPN)           ,KC_QUOT     ,KC_COMM     ,KC_DOT ,KC_P   ,KC_Y   ,KC_LBRC
-,TD(CT_TA)          ,KC_A        ,KC_O        ,KC_E   ,KC_U   ,KC_I
-,KC_MPLY            ,KC_SLSH     ,KC_Q        ,KC_J   ,KC_K   ,KC_X   ,KC_LPRN
-,KC_NO              ,KC_NO       ,KC_NO       ,KC_NO  ,TD(CT_CLN)
-
-                                                            ,F(F_ALT),F(F_GUI)
-                                                                     ,F(F_CTRL)
-                                                    ,KC_BSPC,F(F_SFT),M(A_ESC)
-
-                                                                // right hand
-                                                               ,KC_APP    ,M(KF_6),M(KF_7)   ,M(KF_8),M(KF_9) ,M(KF_10) ,KC_F11
-                                                               ,KC_RBRC   ,KC_F   ,KC_G      ,KC_C   ,KC_R    ,KC_L     ,KC_BSLS
-                                                                          ,KC_D   ,KC_H      ,KC_T   ,KC_N    ,KC_S     ,KC_EQL
-                                                               ,KC_RPRN   ,KC_B   ,KC_M      ,KC_W   ,KC_V    ,KC_Z     ,KC_MSTP
-                                                                                  ,TD(CT_MNS),KC_NO  ,KC_NO   ,KC_NO    ,KC_NO
-
-                                                               ,OSL(NMDIA),M(OH_LEFT)
-                                                               ,KC_LEAD
-                                                               ,F(F_HUN)  ,KC_ENT ,KC_SPC
-    ),
-
-/* Keymap 1: Adore layer
- *
- * ,-----------------------------------------------------.           ,-----------------------------------------------------.
- * |        `~ | 1 F1 | 2 F2 | 3 F3 | 4 F4 | 5 F5 | Plvr |           | Apps | 6 F6 | 7 F7 | 8 F8 | 9 F9 | 0 F10|       F11 |
- * |-----------+------+------+------+------+-------------|           |------+------+------+------+------+------+-----------|
- * | Next/Prev |   ,  |   .  |   L  |   W  |   M  |   [  |           |  ]   |   F  |   H  |   C  |   P  |  Y   | \         |
- * |-----------+------+------+------+------+------|      |           |      |------+------+------+------+------+-----------|
- * | Tab/Arrow |   A  |   O  |   E  |   I  |   U  |------|           |------|   D  |   R  |   T  |   N  |  S   | = / Arrow |
- * |-----------+------+------+------+------+------|   (  |           |  )   |------+------+------+------+------+-----------|
- * | Play/Pause|   /  |   Z  |   '  |   K  |   X  |      |           |      |   B  |   G  |   V  |   J  |  Q   |      Stop |
- * `-----------+------+------+------+------+-------------'           `-------------+------+------+------+------+-----------'
- *     |       |      |      |      |   :  |                                       |   -  |      |      |      |       |
- *     `-----------------------------------'                                       `-----------------------------------'
- *                                         ,-------------.           ,-------------.
- *                                         | LAlt | GUI  |           | MDIA | 1HND |
- *                                  ,------|------|------|           |------+------+------.
- *                                  |      |      | Ctrl |           | LEAD |      |      |
- *                                  |Backsp|LShift|------|           |------| Enter| Space|
- *                                  |      |      | ESC  |           | HUN  |      |      |
- *                                  `--------------------'           `--------------------'
- */
-[ADORE] = KEYMAP(
-// left hand
- KC_GRV             ,M(KF_1)     ,M(KF_2)     ,M(KF_3),M(KF_4),M(KF_5),M(A_PLVR)
-,M(A_MPN)           ,KC_COMM     ,KC_DOT      ,KC_L   ,KC_W   ,KC_M   ,KC_LBRC
-,TD(CT_TA)          ,KC_A        ,KC_O        ,KC_E   ,KC_I   ,KC_U
-,KC_MPLY            ,KC_SLSH     ,KC_Z        ,KC_QUOT,KC_K   ,KC_X   ,KC_LPRN
-,KC_NO              ,KC_NO       ,KC_NO       ,KC_NO  ,TD(CT_CLN)
-
-                                                            ,F(F_ALT),F(F_GUI)
-                                                                     ,F(F_CTRL)
-                                                    ,KC_BSPC,F(F_SFT),M(A_ESC)
-
-                                                                // right hand
-                                                               ,KC_APP    ,M(KF_6),M(KF_7)   ,M(KF_8),M(KF_9) ,M(KF_10) ,KC_F11
-                                                               ,KC_RBRC   ,KC_F   ,KC_H      ,KC_C   ,KC_P    ,KC_Y     ,KC_BSLS
-                                                                          ,KC_D   ,KC_R      ,KC_T   ,KC_N    ,KC_S     ,KC_EQL
-                                                               ,KC_RPRN   ,KC_B   ,KC_G      ,KC_V   ,KC_J    ,KC_Q     ,KC_MSTP
-                                                                                  ,TD(CT_MNS),KC_NO  ,KC_NO   ,KC_NO    ,KC_NO
-
-                                                               ,OSL(NMDIA),M(OH_LEFT)
-                                                               ,KC_LEAD
-                                                               ,F(F_HUN)  ,KC_ENT ,KC_SPC
-    ),
-
-/* Keymap 2: Arrow layer
- *
- * ,-----------------------------------------------------.           ,-----------------------------------------------------.
- * |           |      |      |      |      |      |      |           |      |      |      |      |      |      |           |
- * |-----------+------+------+------+------+-------------|           |------+------+------+------+------+------+-----------|
- * |           |      |      |      |      |      |      |           |      |      | Home |  Up  |  End |      |           |
- * |-----------+------+------+------+------+------|      |           |      |------+------+------+------+------+-----------|
- * |           |      |      |      |      |      |------|           |------|      | Left | Down | Rght |      |           |
- * |-----------+------+------+------+------+------|      |           |      |------+------+------+------+------+-----------|
- * |           |      |      |      |      |      |      |           |      |      |      |      |      |      |           |
- * `-----------+------+------+------+------+-------------'           `-------------+------+------+------+------+-----------'
- *      |      |      |      |      |      |                                       |      |      |      |      |      |
- *      `----------------------------------'                                       `----------------------------------'
- *                                         ,-------------.           ,-------------.
- *                                         |      |      |           |      |      |
- *                                  ,------|------|------|           |------+------+------.
- *                                  |      |      |      |           |      |      |      |
- *                                  |      |      |------|           |------| PgUp | PgDn |
- *                                  |      |      |      |           |      |      |      |
- *                                  `--------------------'           `--------------------'
- */
-
-[ARRW] = KEYMAP(
-// left hand
- KC_TRNS ,KC_TRNS    ,KC_TRNS   ,KC_TRNS    ,KC_TRNS    ,KC_TRNS    ,KC_TRNS
-,KC_TRNS ,KC_TRNS    ,KC_TRNS   ,KC_TRNS    ,KC_TRNS    ,KC_TRNS    ,KC_TRNS
-,KC_TRNS ,KC_TRNS    ,KC_TRNS   ,KC_TRNS    ,KC_TRNS    ,KC_TRNS
-,KC_TRNS ,KC_TRNS    ,KC_TRNS   ,KC_TRNS    ,KC_TRNS    ,KC_TRNS    ,KC_TRNS
-,KC_TRNS ,KC_TRNS    ,KC_TRNS   ,KC_TRNS    ,KC_TRNS
-
-                                             ,KC_TRNS ,KC_TRNS
-                                                      ,KC_TRNS
-                                    ,KC_TRNS ,KC_TRNS ,KC_TRNS
-
-                                                                // right hand
-                                                               ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS
-                                                               ,KC_TRNS ,KC_TRNS ,KC_HOME ,KC_UP   ,KC_END  ,KC_TRNS ,KC_TRNS
-                                                                        ,KC_TRNS ,KC_LEFT ,KC_DOWN ,KC_RGHT ,KC_TRNS ,KC_TRNS
-                                                               ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS
-                                                                                 ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS
-
-                                                               ,KC_TRNS ,KC_TRNS
-                                                               ,KC_TRNS
-                                                               ,KC_TRNS ,KC_PGUP ,KC_PGDN
-    ),
-
-/* Keymap 3: Application select layer
- *
- * ,-----------------------------------------------------.           ,-----------------------------------------------------.
- * |           |Music |Slack |Emacs |Term  |Chrome|      |           |      |      |      |      |      |      |           |
- * |-----------+------+------+------+------+-------------|           |------+------+------+------+------+------+-----------|
- * |           |      |      |      |      |      |      |           |      |      |      |      |      |      |           |
- * |-----------+------+------+------+------+------|      |           |      |------+------+------+------+------+-----------|
- * |           |      |      |      |      |      |------|           |------|      |      |      |      |      |           |
- * |-----------+------+------+------+------+------|      |           |      |------+------+------+------+------+-----------|
- * |           |      |      |      |      |      |      |           |      |      |      |      |      |      |           |
- * `-----------+------+------+------+------+-------------'           `-------------+------+------+------+------+-----------'
- *      |      |      |      |      |      |                                       |      |      |      |      |      |
- *      `----------------------------------'                                       `----------------------------------'
- *                                         ,-------------.           ,-------------.
- *                                         |      |      |           |      |      |
- *                                  ,------|------|------|           |------+------+------.
- *                                  |      |      |      |           |      |      |      |
- *                                  |      |      |------|           |------|      |      |
- *                                  |      |      |      |           |      |      |      |
- *                                  `--------------------'           `--------------------'
- */
-
-[APPSEL] = KEYMAP(
-// left hand
- KC_TRNS ,M(APP_MSIC),M(APP_SLK),M(APP_EMCS),M(APP_TERM),M(APP_CHRM),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_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,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
-    ),
-
-
-/* Keymap 4: Hungarian Layer
- *
- * ,-----------------------------------------------------.           ,-----------------------------------------------------.
- * |           |      |      |      |      |      |      |           |      |      |      |      |      |      |           |
- * |-----------+------+------+------+------+-------------|           |------+------+------+------+------+------+-----------|
- * |           |      |  Ő   |      |  Ű   |      |      |           |      |      |      |      |      |      |           |
- * |-----------+------+------+------+------+------|      |           |      |------+------+------+------+------+-----------|
- * |           |   Á  |  Ó   |  É   |  Ú   |  Í   |------|           |------|      |      |      |      |      |           |
- * |-----------+------+------+------+------+------|      |           |      |------+------+------+------+------+-----------|
- * |           |      |  Ö   |      |  Ü   |      |      |           |      |      |      |      |      |      |           |
- * `-----------+------+------+------+------+-------------'           `-------------+------+------+------+------+-----------'
- *      |      |      |      |      |      |                                       |      |      |      |      |      |
- *      `----------------------------------'                                       `----------------------------------'
- *                                         ,-------------.           ,-------------.
- *                                         |      |      |           |      |      |
- *                                  ,------|------|------|           |------+------+------.
- *                                  |      |      |      |           |      |      |      |
- *                                  |      |      |------|           |------|      |      |
- *                                  |      |      |      |           | BASE |      |      |
- *                                  `--------------------'           `--------------------'
- */
-
-[HUN] = KEYMAP(
-// left hand
- KC_NO   ,KC_NO   ,KC_NO    ,KC_NO   ,KC_NO    ,KC_NO   ,KC_NO
-,KC_NO   ,KC_NO   ,M(HU_OEE),KC_NO   ,M(HU_UEE),KC_NO   ,KC_NO
-,KC_NO   ,M(HU_AA),M(HU_OO) ,M(HU_EE),M(HU_UU) ,M(HU_II)
-,KC_NO   ,KC_NO   ,M(HU_OE) ,KC_NO   ,M(HU_UE) ,KC_NO   ,KC_NO
-,KC_NO   ,KC_NO   ,KC_NO    ,KC_NO   ,KC_NO
-
-                                             ,KC_NO   ,KC_NO
-                                                      ,KC_NO
-                                    ,KC_NO   ,KC_TRNS ,KC_TRNS
-
-                                                                // right hand
-                                                               ,KC_TRNS ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO
-                                                               ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO
-                                                                        ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO
-                                                               ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO
-                                                                                 ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO
-
-                                                               ,KC_NO   ,KC_NO
-                                                               ,KC_NO
-                                                               ,F(F_BSE),KC_TRNS  ,KC_TRNS
-    ),
-
-/* Keymap 5: Navigation & Media layer
- *
- * ,-----------------------------------------------------.           ,-----------------------------------------------------.
- * | MS Slow   |      |      |      |      |      |ScrLCK|           |ScrLCK|      |      |      |      |      |           |
- * |-----------+------+------+------+------+-------------|           |------+------+------+------+------+------+-----------|
- * | MS Normal |      | Home |  Up  | PgUp |      |      |           |Scroll|      |MsUpL | MsUp |MsUpR |      |PrintScreen|
- * |-----------+------+------+------+------+------|      |           |  Up  |------+------+------+------+------+-----------|
- * | MS Fast   |      | Left | Down | Right|      |------|           |------|      |MsLeft| MsDn |MsRght|      |           |
- * |-----------+------+------+------+------+------|      |           |Scroll|------+------+------+------+------+-----------|
- * | Play/Pause|      | End  | Down | PgDn |      |      |           | Down |      |MsDnL | MsDn |MsDnR |      |      Stop |
- * `-----------+------+------+------+------+-------------'           `-------------+------+------+------+------+-----------'
- *      |      |      |      |      |      |                                       |      |      |      |      |      |
- *      `----------------------------------'                                       `----------------------------------'
- *                                         ,-------------.           ,-------------.
- *                                         | Mute | VlUp |           | BASE | MClk |
- *                                  ,------|------|------|           |------+------+------.
- *                                  |      |      | VlDn |           | Prev |Left  |Right |
- *                                  |  SPC | Enter|------|           |------| Click| Click|
- *                                  |      |      | ESC  |           | Next |      |      |
- *                                  `--------------------'           `--------------------'
- */
-[NMDIA] = KEYMAP(
-// left hand
- KC_ACL0    ,KC_NO       ,KC_NO      ,KC_NO   ,KC_NO   ,KC_NO   ,LGUI(KC_L)
-,KC_ACL1    ,KC_NO       ,KC_HOME    ,KC_UP   ,KC_PGUP ,KC_NO   ,KC_NO
-,KC_ACL2    ,KC_NO       ,KC_LEFT    ,KC_DOWN ,KC_RIGHT,KC_NO
-,KC_MPLY    ,KC_NO       ,KC_END     ,KC_DOWN ,KC_PGDN ,KC_NO   ,KC_NO
-,KC_NO      ,KC_NO       ,KC_NO      ,KC_NO   ,KC_NO
-                                                        ,KC_MUTE ,KC_VOLU
-                                                                 ,KC_VOLD
-                                                 ,KC_SPC,KC_ENTER,M(A_ESC)
-
-                                                                     // right hand
-                                                                     ,LGUI(KC_L),KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO    ,KC_NO
-                                                                     ,KC_WH_U   ,KC_NO   ,M(A_MUL),KC_MS_U ,M(A_MUR),KC_NO    ,KC_PSCR
-                                                                                ,KC_NO   ,KC_MS_L ,KC_MS_D ,KC_MS_R ,KC_NO    ,KC_NO
-                                                                     ,KC_WH_D   ,KC_NO   ,M(A_MDL),KC_MS_D ,M(A_MDR),KC_NO    ,KC_MSTP
-                                                                                         ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO    ,KC_NO
-
-                                                                     ,KC_TRNS   ,KC_MS_BTN3
-                                                                     ,KC_MPRV
-                                                                     ,KC_MNXT   ,KC_BTN1 ,KC_BTN2
-    ),
-
-/* Keymap 6: One-handed, left side
- *
- * ,-----------------------------------------------------.
- * |        `~ | 1 F1 | 2 F2 | 3 F3 | 4 F4 | 5 F5 |A  BSE|
- * |-----------+------+------+------+------+-------------|
- * |       Tab |   '  |   ,  |   .  |   P  |   Y  |   [  |
- * |-----------+------+------+------+------+------|      |
- * |         - |   A  |   O  |   E  |   U  |   I  |------|
- * |-----------+------+------+------+------+------|   (  |
- * | Play/Pause|   ;  |   Q  |   J  |   K  |   X  |      |
- * `-----------+------+------+------+------+-------------'
- *     |  Home | End  | Down |  Up  | ESC  |
- *     `-----------------------------------'
- *                                         ,-------------.
- *                                         | LAlt | GUI  |
- *                                  ,------|------|------|
- *                                  |BackSp|LShift| Ctrl |
- *                                  |      |      |------|
- *                                  |Space |Enter |OTHER |
- *                                  `--------------------'
- */
-[OHLFT] = KEYMAP(
-// left hand
- KC_GRV     ,M(KF_1)     ,M(KF_2)     ,M(KF_3)   ,M(KF_4)    ,M(KF_5) ,M(OH_BASE)
-,KC_TAB     ,KC_QUOT     ,KC_COMM     ,KC_DOT    ,KC_P       ,KC_Y    ,KC_LBRC
-,KC_MINS    ,KC_A        ,KC_O        ,KC_E      ,KC_U       ,KC_I
-,KC_MPLY    ,KC_SCLN     ,KC_Q        ,KC_J      ,KC_K       ,KC_X    ,KC_LPRN
-,KC_HOME    ,KC_END      ,KC_DOWN     ,KC_UP     ,M(A_ESC)
-
-                                                                ,KC_TRNS     ,KC_TRNS
-                                                                             ,KC_TRNS
-                                                    ,M(OH_BSSPC),M(OH_ENTSFT),M(OH_RIGHT)
-
-                                                                // right hand
-                                                               ,KC_NO   ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO       ,KC_NO       ,KC_NO
-                                                               ,KC_NO   ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO       ,KC_NO       ,KC_NO
-                                                                        ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO       ,KC_NO       ,KC_NO
-                                                               ,KC_NO   ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO       ,KC_NO       ,KC_NO
-                                                                                ,KC_NO  ,KC_NO  ,KC_NO       ,KC_NO       ,KC_NO
-
-                                                               ,KC_NO   ,KC_NO
-                                                               ,KC_NO
-                                                               ,KC_NO   ,KC_NO  ,KC_NO
-    ),
-
-/* Keymap 7: One-handed, right side
- *
- * ,-----------------------------------------------------.
- * | =     F11 | 0 F10| 9 F9 | 8 F8 | 7 F7 | 6 F6 |A  BSE|
- * |-----------+------+------+------+------+-------------|
- * |         / |   L  |   R  |   C  |   G  |   F  |   ]  |
- * |-----------+------+------+------+------+------|      |
- * |         \ |   S  |   N  |   T  |   H  |   D  |------|
- * |-----------+------+------+------+------+------|   )  |
- * |      Stop |   Z  |   V  |   W  |   M  |   B  |      |
- * `-----------+------+------+------+------+-------------'
- *     |  PgDn | PgUp | Right| Left | ESC  |
- *     `-----------------------------------'
- *                                         ,-------------.
- *                                         | LAlt | GUI  |
- *                                  ,------|------|------|
- *                                  |BackSp|LShift| Ctrl |
- *                                  |      |      |------|
- *                                  |Space |Enter |OTHER |
- *                                  `--------------------'
- */
-[OHRGT] = KEYMAP(
-// left hand
- M(KF_11)   ,M(KF_10)    ,M(KF_9)     ,M(KF_8)   ,M(KF_7)    ,M(KF_6) ,M(OH_BASE)
-,KC_SLSH    ,KC_L        ,KC_R        ,KC_C      ,KC_G       ,KC_F    ,KC_RBRC
-,KC_BSLS    ,KC_S        ,KC_N        ,KC_T      ,KC_H       ,KC_D
-,KC_MSTP    ,KC_Z        ,KC_V        ,KC_W      ,KC_M       ,KC_B    ,KC_RPRN
-,KC_PGDN    ,KC_PGUP     ,KC_RGHT     ,KC_LEFT   ,M(A_ESC)
-
-                                                                ,KC_TRNS     ,KC_TRNS
-                                                                             ,KC_TRNS
-                                                    ,M(OH_BSSPC),M(OH_ENTSFT),M(OH_LEFT)
-
-                                                                // right hand
-                                                               ,KC_NO   ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO       ,KC_NO       ,KC_NO
-                                                               ,KC_NO   ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO       ,KC_NO       ,KC_NO
-                                                                        ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO       ,KC_NO       ,KC_NO
-                                                               ,KC_NO   ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO       ,KC_NO       ,KC_NO
-                                                                                ,KC_NO  ,KC_NO  ,KC_NO       ,KC_NO       ,KC_NO
-
-                                                               ,KC_NO   ,KC_NO
-                                                               ,KC_NO
-                                                               ,KC_NO   ,KC_NO  ,KC_NO
-    ),
-
-/* Keymap 8: Steno for Plover
- *
- * ,--------------------------------------------------.           ,--------------------------------------------------.
- * |        |      |      |      |      |      | BASE |           |      |      |      |      |      |      |        |
- * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|
- * |        |   #  |   #  |   #  |   #  |   #  |   #  |           |  #   |  #   |  #   |   #  |   #  |  #   |   #    |
- * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|
- * |        |      |   T  |   P  |   H  |      |------|           |------|      |  F   |   P  |   L  |  T   |   D    |
- * |--------+   S  +------+------+------+   *  |   *  |           |  *   |  *   +------+------+------+------+--------|
- * |        |      |   K  |   W  |   R  |      |      |           |      |      |  R   |   B  |   G  |  S   |   Z    |
- * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
- *   |      |      |      |      |      |                                       |      |      |      |      |      |
- *   `----------------------------------'                                       `----------------------------------'
- *                                        ,-------------.       ,-------------.
- *                                        |      |      |       |      |      |
- *                                 ,------|------|------|       |------+------+------.
- *                                 |      |      |      |       |      |      |      |
- *                                 |   A  |   O  |------|       |------|  E   |  U   |
- *                                 |      |      |      |       |      |      |      |
- *                                 `--------------------'       `--------------------'
- */
-
-[PLVR] = KEYMAP(
-// left hand
-KC_NO,  KC_NO,  KC_NO,  KC_NO,   KC_NO,  KC_NO,   M(A_PLVR),
-KC_NO,  PV_NUM, PV_NUM, PV_NUM,  PV_NUM, PV_NUM,  PV_NUM,
-KC_NO,  PV_LS,  PV_LT,  PV_LP,   PV_LH,  PV_STAR,
-KC_NO,  PV_LS,  PV_LK,  PV_LW,   PV_LR,  PV_STAR, PV_STAR,
-KC_NO,  KC_NO,  KC_NO,  KC_NO,   KC_NO,
-                                           KC_NO, KC_NO,
-                                           KC_NO,
-                                           PV_A,  PV_O,  KC_NO,
-
-                                                 // right hand
-                                                 KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
-                                                 PV_NUM,  PV_NUM,  PV_NUM,  PV_NUM,  PV_NUM,  PV_NUM,  PV_NUM,
-                                                          PV_STAR, PV_RF,   PV_RP,   PV_RL,   PV_RT,   PV_RD,
-                                                 PV_STAR, PV_STAR, PV_RR,   PV_RB,   PV_RG,   PV_RS,   PV_RZ,
-                                                                   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
-                                           KC_NO,      KC_NO,
-                                           KC_NO,
-                                           KC_NO,PV_E, PV_U
- ),
-
-};
-
-const uint16_t PROGMEM fn_actions[] = {
-   [F_BSE]  = ACTION_LAYER_CLEAR(ON_PRESS)
-  ,[F_HUN]  = ACTION_LAYER_INVERT(HUN, ON_PRESS)
-  ,[F_GUI]  = ACTION_MACRO_TAP(A_GUI)
-  ,[F_SFT]  = ACTION_MODS_ONESHOT (MOD_LSFT)
-  ,[F_ALT]  = ACTION_MODS_ONESHOT (MOD_LALT)
-  ,[F_CTRL] = ACTION_MODS_ONESHOT (MOD_LCTL)
-};
-
-void toggle_steno(int pressed)
-{
-  uint8_t layer = biton32(layer_state);
-
-  if (pressed) {
-    if (layer != PLVR) layer_on(PLVR); else layer_off(PLVR);
-
-    register_code(PV_LP);
-    register_code(PV_LH);
-    register_code(PV_LR);
-    register_code(PV_O);
-    register_code(PV_RL);
-    register_code(PV_RG);
-  } else {
-    unregister_code(PV_LP);
-    unregister_code(PV_LH);
-    unregister_code(PV_LR);
-    unregister_code(PV_O);
-    unregister_code(PV_RL);
-    unregister_code(PV_RG);
-  }
-}
-
-macro_t *ang_do_hun (keyrecord_t *record, uint16_t accent, uint16_t hun_char)
-{
-  uint8_t need_shift = 0;
-  uint8_t hold_shift = 0;
-
-  if (!record->event.pressed)
-    return MACRO_NONE;
-
-  layer_off (HUN);
-
-  if (keyboard_report->mods & MOD_BIT (KC_LSFT)) {
-    hold_shift = 1;
-    need_shift = 1;
-    unregister_code (KC_LSFT);
-  }
-  if ((get_oneshot_mods () & MOD_BIT(KC_LSFT)) && !has_oneshot_mods_timed_out ()) {
-    need_shift = 1;
-    hold_shift = 0;
-    unregister_code (KC_LSFT);
-  }
-
-  clear_oneshot_mods ();
-
-  register_code (KC_RALT);
-  unregister_code (KC_RALT);
-  if (accent == (KC_DQT)) {
-    register_code (KC_RSFT);
-  }
-  register_code (accent);
-  unregister_code (accent);
-  if (need_shift && accent != (KC_DQT)) {
-    register_code (KC_RSFT);
-  } else if (accent == (KC_DQT) && !need_shift) {
-    unregister_code (KC_RSFT);
-  }
-  register_code (hun_char);
-  unregister_code (hun_char);
-  if (need_shift || accent == (KC_DQT))
-    unregister_code (KC_RSFT);
-  if (hold_shift)
-    register_code (KC_LSFT);
-
-  return MACRO_NONE;
-}
-
-void ang_handle_kf (keyrecord_t *record, uint8_t id)
-{
-  uint8_t code = id - KF_1;
-
-  if (record->event.pressed) {
-    kf_timers[code] = timer_read ();
-  } else {
-    uint8_t kc;
-
-    if (timer_elapsed (kf_timers[code]) > TAPPING_TERM) {
-      // Long press
-      kc = KC_F1 + code;
-    } else {
-      if (id == KF_11)
-        kc = KC_EQL;
-      else
-        kc = KC_1 + code;
-    }
-
-    register_code (kc);
-    unregister_code (kc);
-  }
-}
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-      switch(id) {
-      case A_ESC:
-        if (record->event.pressed) {
-          if ((get_oneshot_mods ()) && !has_oneshot_mods_timed_out ()) {
-            clear_oneshot_mods ();
-          } else {
-            register_code (KC_ESC);
-          }
-          layer_off (HUN);
-        } else {
-          unregister_code (KC_ESC);
-        }
-        break;
-
-      case A_MPN:
-        if (record->event.pressed) {
-          if (keyboard_report->mods & MOD_BIT(KC_LSFT) ||
-              ((get_oneshot_mods() & MOD_BIT(KC_LSFT)) && !has_oneshot_mods_timed_out())) {
-            int oneshot = ((get_oneshot_mods() & MOD_BIT(KC_LSFT)) && !has_oneshot_mods_timed_out());
-
-            if (oneshot)
-              clear_oneshot_mods ();
-            unregister_code (KC_LSFT);
-
-            register_code (KC_MPRV);
-            unregister_code (KC_MPRV);
-
-            if (!oneshot)
-              register_code (KC_LSFT);
-          } else {
-            return MACRO (T(MNXT), END);
-          }
-        }
-        break;
-
-        /* Hungarian layer */
-      case HU_AA:
-        return ang_do_hun (record, KC_QUOT, KC_A);
-      case HU_OO:
-        return ang_do_hun (record, KC_QUOT, KC_O);
-      case HU_EE:
-        return ang_do_hun (record, KC_QUOT, KC_E);
-      case HU_UU:
-        return ang_do_hun (record, KC_QUOT, KC_U);
-      case HU_II:
-        return ang_do_hun (record, KC_QUOT, KC_I);
-      case HU_OE:
-        return ang_do_hun (record, KC_DQT, KC_O);
-      case HU_UE:
-        return ang_do_hun (record, KC_DQT, KC_U);
-      case HU_OEE:
-        return ang_do_hun (record, KC_EQL, KC_O);
-      case HU_UEE:
-        return ang_do_hun (record, KC_EQL, KC_U);
-
-        /* Mouse movement */
-      case A_MUL:
-        if (record->event.pressed) {
-          mousekey_on(KC_MS_UP);
-          mousekey_on(KC_MS_LEFT);
-        } else {
-          mousekey_off(KC_MS_UP);
-          mousekey_off(KC_MS_LEFT);
-        }
-        mousekey_send();
-        break;
-
-      case A_MUR:
-        if (record->event.pressed) {
-          mousekey_on(KC_MS_UP);
-          mousekey_on(KC_MS_RIGHT);
-        } else {
-          mousekey_off(KC_MS_UP);
-          mousekey_off(KC_MS_RIGHT);
-        }
-        mousekey_send();
-        break;
-
-      case A_MDL:
-        if (record->event.pressed) {
-          mousekey_on(KC_MS_DOWN);
-          mousekey_on(KC_MS_LEFT);
-        } else {
-          mousekey_off(KC_MS_DOWN);
-          mousekey_off(KC_MS_LEFT);
-        }
-        mousekey_send();
-        break;
-
-      case A_MDR:
-        if (record->event.pressed) {
-          mousekey_on(KC_MS_DOWN);
-          mousekey_on(KC_MS_RIGHT);
-        } else {
-          mousekey_off(KC_MS_DOWN);
-          mousekey_off(KC_MS_RIGHT);
-        }
-        mousekey_send();
-        break;
-
-        /* Plover base */
-      case A_PLVR:
-        toggle_steno(record->event.pressed);
-        break;
-
-        /* GUI & AppSel */
-      case A_GUI:
-        if (record->event.pressed) {
-          register_code (KC_LGUI);
-          if (record->tap.count && !record->tap.interrupted) {
-            if (record->tap.count >= 2) {
-              register_code (KC_W);
-              layer_on (APPSEL);
-              set_oneshot_layer (APPSEL, ONESHOT_START);
-            }
-          } else {
-            record->tap.count = 0;
-          }
-          gui_timer = 0;
-        } else {
-          if (record->tap.count >= 2)
-            {
-              unregister_code (KC_W);
-              clear_oneshot_layer_state (ONESHOT_PRESSED);
-            }
-          gui_timer = timer_read ();
-        }
-        break;
-
-      case APP_SLK:
-        return MACRODOWN(T(S), T(L), T(A), T(C), T(K), T(ENT), END);
-
-      case APP_EMCS:
-        return MACRODOWN(T(E), T(M), T(A), T(C), T(S), T(ENT), END);
-
-      case APP_TERM:
-        return MACRODOWN(T(T), T(E), T(R), T(M), T(ENT), END);
-
-      case APP_CHRM:
-        return MACRODOWN(T(C), T(H), T(R), T(O), T(M), T(ENT), END);
-
-      case APP_MSIC:
-        return MACRODOWN(T(R), T(H), T(Y), T(T), T(H), T(M), T(B), T(O), T(X), T(ENT), END);
-
-        /* Function keys */
-      case KF_1 ... KF_11:
-        ang_handle_kf (record, id);
-        break;
-
-        /* 1HAND layout */
-      case OH_BASE:
-        if (record->event.pressed) {
-          oh_base_timer = timer_read ();
-        } else {
-          if (timer_elapsed (oh_base_timer) > TAPPING_TERM) {
-            layer_clear ();
-          } else {
-            return MACRO (T(APP), END);
-          }
-        }
-        break;
-
-      case OH_BSSPC:
-        if (record->event.pressed) {
-          oh_bsspc_timer = timer_read ();
-        } else {
-          if (timer_elapsed (oh_bsspc_timer) > TAPPING_TERM) {
-            return MACRO (T(BSPC), END);
-          } else {
-            return MACRO (T(SPC), END);
-          }
-        }
-        break;
-
-      case OH_ENTSFT:
-        if (record->event.pressed) {
-          oh_entsft_timer = timer_read ();
-        } else {
-          if (timer_elapsed (oh_entsft_timer) > TAPPING_TERM) {
-            if (keyboard_report->mods & MOD_BIT(KC_LSFT))
-              unregister_code (KC_LSFT);
-            else
-              register_code (KC_LSFT);
-          } else {
-            return MACRO (T(ENT), END);
-          }
-        }
-        break;
-
-      case OH_LEFT:
-        if (record->event.pressed) {
-          layer_move (OHLFT);
-          oh_left_blink = 1;
-          oh_left_blink_timer = timer_read ();
-          ergodox_right_led_1_on ();
-        }
-        break;
-
-      case OH_RIGHT:
-        if (record->event.pressed) {
-          layer_move (OHRGT);
-          oh_right_blink = 1;
-          oh_right_blink_timer = timer_read ();
-          ergodox_right_led_3_on ();
-        }
-        break;
-      }
-      return MACRO_NONE;
-};
-
-uint8_t is_adore = 0;
-
-// Runs just one time when the keyboard initializes.
-void matrix_init_user(void) {
-  uint8_t dl;
-
-  ergodox_led_all_on();
-  for (int i = LED_BRIGHTNESS_HI; i > LED_BRIGHTNESS_LO; i--) {
-    ergodox_led_all_set (i);
-    _delay_ms (5);
-  }
-  _delay_ms(1000);
-  for (int i = LED_BRIGHTNESS_LO; i > 0; i--) {
-    ergodox_led_all_set (i);
-    _delay_ms (10);
-  }
-  ergodox_led_all_off();
-
-  if (!eeconfig_is_enabled())
-    eeconfig_init();
-  dl = eeconfig_read_default_layer ();
-  if (dl == (1UL << ADORE))
-    is_adore = 1;
-};
-
-LEADER_EXTERNS();
-
-void ang_do_unicode (void) {
-  register_code (KC_RCTL);
-  register_code (KC_RSFT);
-  register_code (KC_U);
-  unregister_code (KC_U);
-  unregister_code (KC_RSFT);
-  unregister_code (KC_RCTL);
-  _delay_ms (100);
-}
-
-void ang_tap (uint16_t codes[]) {
-  for (int i = 0; codes[i] != 0; i++) {
-    register_code (codes[i]);
-    unregister_code (codes[i]);
-    _delay_ms (50);
-  }
-}
-
-#define TAP_ONCE(code) \
-  register_code (code); \
-  unregister_code (code)
-
-void ang_tap_dance_cln_finished (qk_tap_dance_state_t *state, void *user_data) {
-  if (state->count == 1) {
-    register_code (KC_RSFT);
-    register_code (KC_SCLN);
-  } else if (state->count == 2) {
-    register_code (KC_SCLN);
-  }
-}
-
-void ang_tap_dance_cln_reset (qk_tap_dance_state_t *state, void *user_data) {
-  if (state->count == 1) {
-    unregister_code (KC_SCLN);
-    unregister_code (KC_RSFT);
-  } else if (state->count == 2) {
-    unregister_code (KC_SCLN);
-  }
-}
-
-void ang_tap_dance_mns_finished (qk_tap_dance_state_t *state, void *user_data) {
-  if (state->count == 1) {
-    register_code (KC_MINS);
-  } else if (state->count == 2) {
-    register_code (KC_RSFT);
-    register_code (KC_MINS);
-  }
-}
-
-void ang_tap_dance_mns_reset (qk_tap_dance_state_t *state, void *user_data) {
-  if (state->count == 1) {
-    unregister_code (KC_MINS);
-  } else if (state->count == 2) {
-    unregister_code (KC_RSFT);
-    unregister_code (KC_MINS);
-  }
-}
-
-typedef struct {
-  bool layer_toggle;
-  bool sticky;
-  bool finished_once;
-} td_ta_state_t;
-
-void ang_tap_dance_ta_finished (qk_tap_dance_state_t *state, void *user_data) {
-  td_ta_state_t *td_ta = (td_ta_state_t *) user_data;
-
-  if (td_ta->finished_once) {
-    return;
-  }
-
-  if (td_ta->sticky) {
-    td_ta->sticky = false;
-    td_ta->layer_toggle = false;
-    layer_off (ARRW);
-    return;
-  }
-
-  td_ta->finished_once = true;
-  if (state->count == 1 && !state->pressed) {
-    register_code (KC_TAB);
-    td_ta->sticky = false;
-    td_ta->layer_toggle = false;
-  } else {
-    td_ta->layer_toggle = true;
-    layer_on (ARRW);
-    td_ta->sticky = (state->count == 2);
-  }
-}
-
-void ang_tap_dance_ta_reset (qk_tap_dance_state_t *state, void *user_data) {
-  td_ta_state_t *td_ta = (td_ta_state_t *) user_data;
-
-  if (!td_ta->layer_toggle)
-    unregister_code (KC_TAB);
-  if (!td_ta->sticky)
-    layer_off (ARRW);
-
-  td_ta->finished_once = false;
-}
-
-const qk_tap_dance_action_t tap_dance_actions[] = {
-   [CT_CLN] = ACTION_TAP_DANCE_FN_ADVANCED (NULL, ang_tap_dance_cln_finished, ang_tap_dance_cln_reset)
-  ,[CT_MNS] = ACTION_TAP_DANCE_FN_ADVANCED (NULL, ang_tap_dance_mns_finished, ang_tap_dance_mns_reset)
-  ,[CT_TA]  = {
-     .fn = { NULL, ang_tap_dance_ta_finished, ang_tap_dance_ta_reset },
-     .user_data = (void *)&((td_ta_state_t) { false, false, false })
-   }
-};
-
-// Runs constantly in the background, in a loop.
-void matrix_scan_user(void) {
-  uint8_t layer = biton32(layer_state);
-
-  if (gui_timer && timer_elapsed (gui_timer) > TAPPING_TERM)
-    unregister_code (KC_LGUI);
-
-  if (layer != OHLFT)
-    oh_left_blink = 0;
-  if (layer != OHRGT)
-    oh_right_blink = 0;
-
-  if (layer == HUN) {
-    ergodox_right_led_2_on();
-    ergodox_right_led_3_on();
-  } else if (layer == NMDIA) {
-    ergodox_right_led_1_on();
-    ergodox_right_led_2_on();
-  } else if (layer == PLVR) {
-    ergodox_right_led_1_on ();
-    ergodox_right_led_2_on ();
-    ergodox_right_led_3_on ();
-  } else if (layer == ADORE) {
-    ergodox_right_led_1_on ();
-    ergodox_right_led_2_on ();
-    ergodox_right_led_3_on ();
-
-    ergodox_right_led_2_set (LED_BRIGHTNESS_HI);
-  }
-
-  if (layer == OHLFT || layer == OHRGT) {
-    ergodox_right_led_2_on();
-
-    if (oh_left_blink) {
-      if (timer_elapsed (oh_left_blink_timer) > OH_BLINK_INTERVAL) {
-        if ((keyboard_report->mods & MOD_BIT(KC_LSFT)) == 0)
-          ergodox_right_led_1_off ();
-      }
-      if (timer_elapsed (oh_left_blink_timer) > OH_BLINK_INTERVAL * 2) {
-        ergodox_right_led_1_on ();
-        oh_left_blink_timer = timer_read ();
-      }
-    }
-
-    if (oh_right_blink) {
-      if (timer_elapsed (oh_right_blink_timer) > OH_BLINK_INTERVAL) {
-        if ((keyboard_report->mods & MOD_BIT(KC_LCTRL)) == 0)
-          ergodox_right_led_3_off ();
-      }
-      if (timer_elapsed (oh_right_blink_timer) > OH_BLINK_INTERVAL * 2) {
-        ergodox_right_led_3_on ();
-        oh_right_blink_timer = timer_read ();
-      }
-    }
-  }
-
-  if (keyboard_report->mods & MOD_BIT(KC_LSFT) ||
-      ((get_oneshot_mods() & MOD_BIT(KC_LSFT)) && !has_oneshot_mods_timed_out())) {
-    ergodox_right_led_1_set (LED_BRIGHTNESS_HI);
-    ergodox_right_led_1_on ();
-  } else {
-    ergodox_right_led_1_set (LED_BRIGHTNESS_LO);
-    if (layer != OHLFT && layer != NMDIA && layer != PLVR && layer != ADORE)
-      ergodox_right_led_1_off ();
-  }
-
-  if (keyboard_report->mods & MOD_BIT(KC_LALT) ||
-      ((get_oneshot_mods() & MOD_BIT(KC_LALT)) && !has_oneshot_mods_timed_out())) {
-    ergodox_right_led_2_set (LED_BRIGHTNESS_HI);
-    ergodox_right_led_2_on ();
-  } else {
-    ergodox_right_led_2_set (LED_BRIGHTNESS_LO);
-    if (layer != OHRGT && layer != HUN && layer != OHLFT && layer != NMDIA && layer != PLVR && layer != ADORE)
-      ergodox_right_led_2_off ();
-  }
-
-  if (keyboard_report->mods & MOD_BIT(KC_LCTRL) ||
-      ((get_oneshot_mods() & MOD_BIT(KC_LCTRL)) && !has_oneshot_mods_timed_out())) {
-    ergodox_right_led_3_set (LED_BRIGHTNESS_HI);
-    ergodox_right_led_3_on ();
-  } else {
-    ergodox_right_led_3_set (LED_BRIGHTNESS_LO);
-    if (layer != OHRGT && layer != HUN && layer != PLVR && layer != ADORE)
-      ergodox_right_led_3_off ();
-  }
-
-  LEADER_DICTIONARY() {
-    leading = false;
-    leader_end ();
-
-#if KEYLOGGER_ENABLE
-    SEQ_ONE_KEY (KC_D) {
-      ergodox_led_all_on();
-      _delay_ms(100);
-      ergodox_led_all_off();
-      log_enable = !log_enable;
-    }
-#endif
-
-    SEQ_ONE_KEY (KC_T) {
-      time_travel = !time_travel;
-    }
-
-    SEQ_ONE_KEY (KC_U) {
-      ang_do_unicode ();
-    }
-
-    SEQ_ONE_KEY (KC_V) {
-      SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ (" QMK_VERSION "/" KEYMAP_VERSION ")");
-    }
-
-    SEQ_ONE_KEY (KC_L) {
-      /* λ */
-      ang_do_unicode ();
-
-      uint16_t codes[] = {KC_0, KC_3, KC_B, KC_B, KC_ENT, 0};
-      ang_tap (codes);
-    }
-
-    SEQ_ONE_KEY (KC_Y) {
-      uint16_t codes[] = {KC_BSLS, KC_O, KC_SLSH, 0};
-      ang_tap (codes);
-    }
-
-    SEQ_ONE_KEY (KC_S) {
-      ang_do_unicode (); TAP_ONCE (KC_A); TAP_ONCE (KC_F); TAP_ONCE (KC_SPC);
-      TAP_ONCE (KC_BSLS);
-      register_code (KC_RSFT); TAP_ONCE (KC_MINS); TAP_ONCE (KC_9); unregister_code (KC_RSFT);
-      ang_do_unicode (); TAP_ONCE (KC_3); TAP_ONCE (KC_0); TAP_ONCE (KC_C); TAP_ONCE (KC_4); TAP_ONCE (KC_SPC);
-      register_code (KC_RSFT); TAP_ONCE (KC_0); TAP_ONCE (KC_MINS); unregister_code (KC_RSFT);
-      TAP_ONCE (KC_SLSH);
-      ang_do_unicode (); TAP_ONCE (KC_A); TAP_ONCE (KC_F); TAP_ONCE (KC_SPC);
-    }
-
-    SEQ_TWO_KEYS (KC_W, KC_M) {
-      register_code (KC_LALT);
-      register_code (KC_F2);
-      unregister_code (KC_F2);
-      unregister_code (KC_LALT);
-
-      _delay_ms (1000);
-
-      uint16_t codes[] = {KC_M, KC_A, KC_X, KC_MINS, KC_F, KC_O, KC_C, KC_U, KC_S, KC_E, KC_D, KC_ENT, 0};
-      ang_tap (codes);
-      register_code (KC_LGUI);
-      register_code (KC_UP);
-      unregister_code (KC_UP);
-      unregister_code (KC_LGUI);
-    }
-
-    SEQ_ONE_KEY (KC_A) {
-      if (is_adore == 0) {
-        default_layer_and (0);
-        default_layer_or ((1UL << ADORE));
-        eeconfig_update_default_layer ((1UL << ADORE));
-        is_adore = 1;
-
-        ergodox_led_all_off ();
-        ergodox_right_led_3_on ();
-        _delay_ms (100);
-        ergodox_right_led_2_on ();
-        _delay_ms (100);
-        ergodox_right_led_3_off ();
-        ergodox_right_led_1_on ();
-        _delay_ms (100);
-        ergodox_right_led_2_off ();
-        _delay_ms (100);
-        ergodox_right_led_1_off ();
-      } else {
-        is_adore = 0;
-        default_layer_and (0);
-        default_layer_or (1UL << BASE);
-        eeconfig_update_default_layer ((1UL << BASE));
-
-        ergodox_led_all_off ();
-        ergodox_right_led_1_on ();
-        _delay_ms (100);
-        ergodox_right_led_2_on ();
-        _delay_ms (100);
-        ergodox_right_led_1_off ();
-        ergodox_right_led_3_on ();
-        _delay_ms (100);
-        ergodox_right_led_2_off ();
-        _delay_ms (100);
-        ergodox_right_led_3_off ();
-      }
-    }
-  }
-}
-
-static uint16_t last4[4];
-
-bool process_record_user (uint16_t keycode, keyrecord_t *record) {
-#if KEYLOGGER_ENABLE
-  uint8_t layer = biton32(layer_state);
-
-  if (log_enable && layer == BASE) {
-    xprintf ("KL: col=%d, row=%d\n", record->event.key.col,
-             record->event.key.row);
-  }
-#endif
-
-  if (time_travel && !record->event.pressed) {
-    uint8_t p;
-
-    // shift cache one to the left
-    for (p = 0; p < 3; p++) {
-      last4[p] = last4[p + 1];
-    }
-    last4[3] = keycode;
-
-    if (last4[0] == KC_D && last4[1] == KC_A && last4[2] == KC_T && last4[3] == KC_E) {
-      uint16_t codes[] = {KC_E, KC_SPC, KC_MINS, KC_D, KC_SPC, KC_QUOT, 0};
-      ang_tap (codes);
-      register_code (KC_RSFT);
-      register_code (KC_EQL);
-      unregister_code (KC_EQL);
-      unregister_code (KC_RSFT);
-
-      uint16_t codes2[] = {KC_4, KC_SPC, KC_D, KC_A, KC_Y, KC_S, KC_QUOT, 0};
-      ang_tap (codes2);
-
-      return false;
-    }
-  }
-
-  return true;
-}
+/*

+ * algernon's ErgoDox EZ layout, please see the readme.md file!

+ */

+

+#include "ergodox.h"

+#include "led.h"

+#include "debug.h"

+#include "action_layer.h"

+#include "action_util.h"

+#include "mousekey.h"

+#include "timer.h"

+#include "keymap_plover.h"

+#include "eeconfig.h"

+#include "wait.h"

+

+/* Layers */

+

+enum {

+  BASE = 0,

+  ADORE,

+  ARRW,

+  APPSEL,

+  HUN,

+  NMDIA,

+  OHLFT,

+  OHRGT,

+  PLVR,

+};

+

+/* Macros */

+

+enum {

+  NONE = 0,

+  // Buttons that do extra stuff

+  A_GUI,

+  A_PLVR,

+  A_ESC,

+  A_MPN,

+

+  // Function / number keys

+  KF_1, // 1, F1

+  KF_2, // 2, F2

+  KF_3, // ...

+  KF_4,

+  KF_5,

+  KF_6,

+  KF_7,

+  KF_8,

+  KF_9,

+  KF_10,

+  KF_11, // =, F11

+

+  // Application select keys

+  APP_SLK, // Slack

+  APP_EMCS, // Emacs

+  APP_TERM, // Terminal

+  APP_CHRM, // Chrome

+  APP_MSIC, // Music

+

+  // Diagonal mouse movement

+  A_MUL,

+  A_MUR,

+  A_MDL,

+  A_MDR,

+

+  // Hungarian layer keys

+  HU_AA, // Á

+  HU_OO, // Ó

+  HU_EE, // É

+  HU_UU, // Ú

+  HU_II, // Í

+  HU_OE, // Ö

+  HU_UE, // Ü

+  HU_OEE, // Ő

+  HU_UEE, // Ű

+

+  // One-handed layout specials

+  OH_BSSPC,

+  OH_ENTSFT,

+  OH_BASE,

+  OH_LEFT,

+  OH_RIGHT,

+};

+

+/* Fn keys */

+

+enum {

+  F_BSE = 0,

+  F_HUN,

+  F_GUI,

+  F_SFT,

+  F_ALT,

+  F_CTRL

+};

+

+/* Custom keycodes */

+

+enum {

+  CT_CLN = 0,

+  CT_MNS,

+  CT_TA,

+};

+

+/* States & timers */

+

+uint16_t gui_timer = 0;

+

+uint16_t kf_timers[12];

+

+uint16_t oh_base_timer = 0;

+uint16_t oh_bsspc_timer = 0;

+uint16_t oh_entsft_timer = 0;

+

+#define OH_BLINK_INTERVAL 500

+

+uint8_t oh_left_blink = 0;

+uint16_t oh_left_blink_timer = 0;

+uint8_t oh_right_blink = 0;

+uint16_t oh_right_blink_timer = 0;

+

+#if KEYLOGGER_ENABLE

+bool log_enable = false;

+#endif

+

+bool time_travel = false;

+

+/* The Keymap */

+

+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

+

+/* Keymap 0: Base Layer

+ *

+ * ,-----------------------------------------------------.           ,-----------------------------------------------------.

+ * |        `~ | 1 F1 | 2 F2 | 3 F3 | 4 F4 | 5 F5 | Plvr |           | Apps | 6 F6 | 7 F7 | 8 F8 | 9 F9 | 0 F10|       F11 |

+ * |-----------+------+------+------+------+-------------|           |------+------+------+------+------+------+-----------|

+ * | Next/Prev |   '  |   ,  |   .  |   P  |   Y  |   [  |           |  ]   |   F  |   G  |   C  |   R  |  L   | \         |

+ * |-----------+------+------+------+------+------|      |           |      |------+------+------+------+------+-----------|

+ * | Tab/ARROW |   A  |   O  |   E  |   U  |   I  |------|           |------|   D  |   H  |   T  |   N  |  S   | = / Arrow |

+ * |-----------+------+------+------+------+------|   (  |           |  )   |------+------+------+------+------+-----------|

+ * | Play/Pause|   /  |   Q  |   J  |   K  |   X  |      |           |      |   B  |   M  |   W  |   V  |  Z   |      Stop |

+ * `-----------+------+------+------+------+-------------'           `-------------+------+------+------+------+-----------'

+ *     |       |      |      |      |   :  |                                       |   -  |      |      |      |       |

+ *     `-----------------------------------'                                       `-----------------------------------'

+ *                                         ,-------------.           ,-------------.

+ *                                         | LAlt | GUI  |           | MDIA | 1HND |

+ *                                  ,------|------|------|           |------+------+------.

+ *                                  |      |      | Ctrl |           | LEAD |      |      |

+ *                                  |Backsp|LShift|------|           |------| Enter| Space|

+ *                                  |      |      | ESC  |           | HUN  |      |      |

+ *                                  `--------------------'           `--------------------'

+ */

+[BASE] = KEYMAP(

+// left hand

+ KC_GRV             ,M(KF_1)     ,M(KF_2)     ,M(KF_3),M(KF_4),M(KF_5),M(A_PLVR)

+,M(A_MPN)           ,KC_QUOT     ,KC_COMM     ,KC_DOT ,KC_P   ,KC_Y   ,KC_LBRC

+,TD(CT_TA)          ,KC_A        ,KC_O        ,KC_E   ,KC_U   ,KC_I

+,KC_MPLY            ,KC_SLSH     ,KC_Q        ,KC_J   ,KC_K   ,KC_X   ,KC_LPRN

+,KC_NO              ,KC_NO       ,KC_NO       ,KC_NO  ,TD(CT_CLN)

+

+                                                            ,F(F_ALT),F(F_GUI)

+                                                                     ,F(F_CTRL)

+                                                    ,KC_BSPC,F(F_SFT),M(A_ESC)

+

+                                                                // right hand

+                                                               ,KC_APP    ,M(KF_6),M(KF_7)   ,M(KF_8),M(KF_9) ,M(KF_10) ,KC_F11

+                                                               ,KC_RBRC   ,KC_F   ,KC_G      ,KC_C   ,KC_R    ,KC_L     ,KC_BSLS

+                                                                          ,KC_D   ,KC_H      ,KC_T   ,KC_N    ,KC_S     ,KC_EQL

+                                                               ,KC_RPRN   ,KC_B   ,KC_M      ,KC_W   ,KC_V    ,KC_Z     ,KC_MSTP

+                                                                                  ,TD(CT_MNS),KC_NO  ,KC_NO   ,KC_NO    ,KC_NO

+

+                                                               ,OSL(NMDIA),M(OH_LEFT)

+                                                               ,KC_LEAD

+                                                               ,F(F_HUN)  ,KC_ENT ,KC_SPC

+    ),

+

+/* Keymap 1: Adore layer

+ *

+ * ,-----------------------------------------------------.           ,-----------------------------------------------------.

+ * |        `~ | 1 F1 | 2 F2 | 3 F3 | 4 F4 | 5 F5 | Plvr |           | Apps | 6 F6 | 7 F7 | 8 F8 | 9 F9 | 0 F10|       F11 |

+ * |-----------+------+------+------+------+-------------|           |------+------+------+------+------+------+-----------|

+ * | Next/Prev |   ,  |   .  |   L  |   W  |   M  |   [  |           |  ]   |   F  |   H  |   C  |   P  |  Y   | \         |

+ * |-----------+------+------+------+------+------|      |           |      |------+------+------+------+------+-----------|

+ * | Tab/Arrow |   A  |   O  |   E  |   I  |   U  |------|           |------|   D  |   R  |   T  |   N  |  S   | = / Arrow |

+ * |-----------+------+------+------+------+------|   (  |           |  )   |------+------+------+------+------+-----------|

+ * | Play/Pause|   /  |   Z  |   '  |   K  |   X  |      |           |      |   B  |   G  |   V  |   J  |  Q   |      Stop |

+ * `-----------+------+------+------+------+-------------'           `-------------+------+------+------+------+-----------'

+ *     |       |      |      |      |   :  |                                       |   -  |      |      |      |       |

+ *     `-----------------------------------'                                       `-----------------------------------'

+ *                                         ,-------------.           ,-------------.

+ *                                         | LAlt | GUI  |           | MDIA | 1HND |

+ *                                  ,------|------|------|           |------+------+------.

+ *                                  |      |      | Ctrl |           | LEAD |      |      |

+ *                                  |Backsp|LShift|------|           |------| Enter| Space|

+ *                                  |      |      | ESC  |           | HUN  |      |      |

+ *                                  `--------------------'           `--------------------'

+ */

+[ADORE] = KEYMAP(

+// left hand

+ KC_GRV             ,M(KF_1)     ,M(KF_2)     ,M(KF_3),M(KF_4),M(KF_5),M(A_PLVR)

+,M(A_MPN)           ,KC_COMM     ,KC_DOT      ,KC_L   ,KC_W   ,KC_M   ,KC_LBRC

+,TD(CT_TA)          ,KC_A        ,KC_O        ,KC_E   ,KC_I   ,KC_U

+,KC_MPLY            ,KC_SLSH     ,KC_Z        ,KC_QUOT,KC_K   ,KC_X   ,KC_LPRN

+,KC_NO              ,KC_NO       ,KC_NO       ,KC_NO  ,TD(CT_CLN)

+

+                                                            ,F(F_ALT),F(F_GUI)

+                                                                     ,F(F_CTRL)

+                                                    ,KC_BSPC,F(F_SFT),M(A_ESC)

+

+                                                                // right hand

+                                                               ,KC_APP    ,M(KF_6),M(KF_7)   ,M(KF_8),M(KF_9) ,M(KF_10) ,KC_F11

+                                                               ,KC_RBRC   ,KC_F   ,KC_H      ,KC_C   ,KC_P    ,KC_Y     ,KC_BSLS

+                                                                          ,KC_D   ,KC_R      ,KC_T   ,KC_N    ,KC_S     ,KC_EQL

+                                                               ,KC_RPRN   ,KC_B   ,KC_G      ,KC_V   ,KC_J    ,KC_Q     ,KC_MSTP

+                                                                                  ,TD(CT_MNS),KC_NO  ,KC_NO   ,KC_NO    ,KC_NO

+

+                                                               ,OSL(NMDIA),M(OH_LEFT)

+                                                               ,KC_LEAD

+                                                               ,F(F_HUN)  ,KC_ENT ,KC_SPC

+    ),

+

+/* Keymap 2: Arrow layer

+ *

+ * ,-----------------------------------------------------.           ,-----------------------------------------------------.

+ * |           |      |      |      |      |      |      |           |      |      |      |      |      |      |           |

+ * |-----------+------+------+------+------+-------------|           |------+------+------+------+------+------+-----------|

+ * |           |      |      |      |      |      |      |           |      |      | Home |  Up  |  End |      |           |

+ * |-----------+------+------+------+------+------|      |           |      |------+------+------+------+------+-----------|

+ * |           |      |      |      |      |      |------|           |------|      | Left | Down | Rght |      |           |

+ * |-----------+------+------+------+------+------|      |           |      |------+------+------+------+------+-----------|

+ * |           |      |      |      |      |      |      |           |      |      |      |      |      |      |           |

+ * `-----------+------+------+------+------+-------------'           `-------------+------+------+------+------+-----------'

+ *      |      |      |      |      |      |                                       |      |      |      |      |      |

+ *      `----------------------------------'                                       `----------------------------------'

+ *                                         ,-------------.           ,-------------.

+ *                                         |      |      |           |      |      |

+ *                                  ,------|------|------|           |------+------+------.

+ *                                  |      |      |      |           |      |      |      |

+ *                                  |      |      |------|           |------| PgUp | PgDn |

+ *                                  |      |      |      |           |      |      |      |

+ *                                  `--------------------'           `--------------------'

+ */

+

+[ARRW] = KEYMAP(

+// left hand

+ KC_TRNS ,KC_TRNS    ,KC_TRNS   ,KC_TRNS    ,KC_TRNS    ,KC_TRNS    ,KC_TRNS

+,KC_TRNS ,KC_TRNS    ,KC_TRNS   ,KC_TRNS    ,KC_TRNS    ,KC_TRNS    ,KC_TRNS

+,KC_TRNS ,KC_TRNS    ,KC_TRNS   ,KC_TRNS    ,KC_TRNS    ,KC_TRNS

+,KC_TRNS ,KC_TRNS    ,KC_TRNS   ,KC_TRNS    ,KC_TRNS    ,KC_TRNS    ,KC_TRNS

+,KC_TRNS ,KC_TRNS    ,KC_TRNS   ,KC_TRNS    ,KC_TRNS

+

+                                             ,KC_TRNS ,KC_TRNS

+                                                      ,KC_TRNS

+                                    ,KC_TRNS ,KC_TRNS ,KC_TRNS

+

+                                                                // right hand

+                                                               ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS

+                                                               ,KC_TRNS ,KC_TRNS ,KC_HOME ,KC_UP   ,KC_END  ,KC_TRNS ,KC_TRNS

+                                                                        ,KC_TRNS ,KC_LEFT ,KC_DOWN ,KC_RGHT ,KC_TRNS ,KC_TRNS

+                                                               ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS

+                                                                                 ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS ,KC_TRNS

+

+                                                               ,KC_TRNS ,KC_TRNS

+                                                               ,KC_TRNS

+                                                               ,KC_TRNS ,KC_PGUP ,KC_PGDN

+    ),

+

+/* Keymap 3: Application select layer

+ *

+ * ,-----------------------------------------------------.           ,-----------------------------------------------------.

+ * |           |Music |Slack |Emacs |Term  |Chrome|      |           |      |      |      |      |      |      |           |

+ * |-----------+------+------+------+------+-------------|           |------+------+------+------+------+------+-----------|

+ * |           |      |      |      |      |      |      |           |      |      |      |      |      |      |           |

+ * |-----------+------+------+------+------+------|      |           |      |------+------+------+------+------+-----------|

+ * |           |      |      |      |      |      |------|           |------|      |      |      |      |      |           |

+ * |-----------+------+------+------+------+------|      |           |      |------+------+------+------+------+-----------|

+ * |           |      |      |      |      |      |      |           |      |      |      |      |      |      |           |

+ * `-----------+------+------+------+------+-------------'           `-------------+------+------+------+------+-----------'

+ *      |      |      |      |      |      |                                       |      |      |      |      |      |

+ *      `----------------------------------'                                       `----------------------------------'

+ *                                         ,-------------.           ,-------------.

+ *                                         |      |      |           |      |      |

+ *                                  ,------|------|------|           |------+------+------.

+ *                                  |      |      |      |           |      |      |      |

+ *                                  |      |      |------|           |------|      |      |

+ *                                  |      |      |      |           |      |      |      |

+ *                                  `--------------------'           `--------------------'

+ */

+

+[APPSEL] = KEYMAP(

+// left hand

+ KC_TRNS ,M(APP_MSIC),M(APP_SLK),M(APP_EMCS),M(APP_TERM),M(APP_CHRM),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_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,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

+    ),

+

+

+/* Keymap 4: Hungarian Layer

+ *

+ * ,-----------------------------------------------------.           ,-----------------------------------------------------.

+ * |           |      |      |      |      |      |      |           |      |      |      |      |      |      |           |

+ * |-----------+------+------+------+------+-------------|           |------+------+------+------+------+------+-----------|

+ * |           |      |  Ő   |      |  Ű   |      |      |           |      |      |      |      |      |      |           |

+ * |-----------+------+------+------+------+------|      |           |      |------+------+------+------+------+-----------|

+ * |           |   Á  |  Ó   |  É   |  Ú   |  Í   |------|           |------|      |      |      |      |      |           |

+ * |-----------+------+------+------+------+------|      |           |      |------+------+------+------+------+-----------|

+ * |           |      |  Ö   |      |  Ü   |      |      |           |      |      |      |      |      |      |           |

+ * `-----------+------+------+------+------+-------------'           `-------------+------+------+------+------+-----------'

+ *      |      |      |      |      |      |                                       |      |      |      |      |      |

+ *      `----------------------------------'                                       `----------------------------------'

+ *                                         ,-------------.           ,-------------.

+ *                                         |      |      |           |      |      |

+ *                                  ,------|------|------|           |------+------+------.

+ *                                  |      |      |      |           |      |      |      |

+ *                                  |      |      |------|           |------|      |      |

+ *                                  |      |      |      |           | BASE |      |      |

+ *                                  `--------------------'           `--------------------'

+ */

+

+[HUN] = KEYMAP(

+// left hand

+ KC_NO   ,KC_NO   ,KC_NO    ,KC_NO   ,KC_NO    ,KC_NO   ,KC_NO

+,KC_NO   ,KC_NO   ,M(HU_OEE),KC_NO   ,M(HU_UEE),KC_NO   ,KC_NO

+,KC_NO   ,M(HU_AA),M(HU_OO) ,M(HU_EE),M(HU_UU) ,M(HU_II)

+,KC_NO   ,KC_NO   ,M(HU_OE) ,KC_NO   ,M(HU_UE) ,KC_NO   ,KC_NO

+,KC_NO   ,KC_NO   ,KC_NO    ,KC_NO   ,KC_NO

+

+                                             ,KC_NO   ,KC_NO

+                                                      ,KC_NO

+                                    ,KC_NO   ,KC_TRNS ,KC_TRNS

+

+                                                                // right hand

+                                                               ,KC_TRNS ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO

+                                                               ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO

+                                                                        ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO

+                                                               ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO

+                                                                                 ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO

+

+                                                               ,KC_NO   ,KC_NO

+                                                               ,KC_NO

+                                                               ,F(F_BSE),KC_TRNS  ,KC_TRNS

+    ),

+

+/* Keymap 5: Navigation & Media layer

+ *

+ * ,-----------------------------------------------------.           ,-----------------------------------------------------.

+ * | MS Slow   |      |      |      |      |      |ScrLCK|           |ScrLCK|      |      |      |      |      |           |

+ * |-----------+------+------+------+------+-------------|           |------+------+------+------+------+------+-----------|

+ * | MS Normal |      | Home |  Up  | PgUp |      |      |           |Scroll|      |MsUpL | MsUp |MsUpR |      |PrintScreen|

+ * |-----------+------+------+------+------+------|      |           |  Up  |------+------+------+------+------+-----------|

+ * | MS Fast   |      | Left | Down | Right|      |------|           |------|      |MsLeft| MsDn |MsRght|      |           |

+ * |-----------+------+------+------+------+------|      |           |Scroll|------+------+------+------+------+-----------|

+ * | Play/Pause|      | End  | Down | PgDn |      |      |           | Down |      |MsDnL | MsDn |MsDnR |      |      Stop |

+ * `-----------+------+------+------+------+-------------'           `-------------+------+------+------+------+-----------'

+ *      |      |      |      |      |      |                                       |      |      |      |      |      |

+ *      `----------------------------------'                                       `----------------------------------'

+ *                                         ,-------------.           ,-------------.

+ *                                         | Mute | VlUp |           | BASE | MClk |

+ *                                  ,------|------|------|           |------+------+------.

+ *                                  |      |      | VlDn |           | Prev |Left  |Right |

+ *                                  |  SPC | Enter|------|           |------| Click| Click|

+ *                                  |      |      | ESC  |           | Next |      |      |

+ *                                  `--------------------'           `--------------------'

+ */

+[NMDIA] = KEYMAP(

+// left hand

+ KC_ACL0    ,KC_NO       ,KC_NO      ,KC_NO   ,KC_NO   ,KC_NO   ,LGUI(KC_L)

+,KC_ACL1    ,KC_NO       ,KC_HOME    ,KC_UP   ,KC_PGUP ,KC_NO   ,KC_NO

+,KC_ACL2    ,KC_NO       ,KC_LEFT    ,KC_DOWN ,KC_RIGHT,KC_NO

+,KC_MPLY    ,KC_NO       ,KC_END     ,KC_DOWN ,KC_PGDN ,KC_NO   ,KC_NO

+,KC_NO      ,KC_NO       ,KC_NO      ,KC_NO   ,KC_NO

+                                                        ,KC_MUTE ,KC_VOLU

+                                                                 ,KC_VOLD

+                                                 ,KC_SPC,KC_ENTER,M(A_ESC)

+

+                                                                     // right hand

+                                                                     ,LGUI(KC_L),KC_NO   ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO    ,KC_NO

+                                                                     ,KC_WH_U   ,KC_NO   ,M(A_MUL),KC_MS_U ,M(A_MUR),KC_NO    ,KC_PSCR

+                                                                                ,KC_NO   ,KC_MS_L ,KC_MS_D ,KC_MS_R ,KC_NO    ,KC_NO

+                                                                     ,KC_WH_D   ,KC_NO   ,M(A_MDL),KC_MS_D ,M(A_MDR),KC_NO    ,KC_MSTP

+                                                                                         ,KC_NO   ,KC_NO   ,KC_NO   ,KC_NO    ,KC_NO

+

+                                                                     ,KC_TRNS   ,KC_MS_BTN3

+                                                                     ,KC_MPRV

+                                                                     ,KC_MNXT   ,KC_BTN1 ,KC_BTN2

+    ),

+

+/* Keymap 6: One-handed, left side

+ *

+ * ,-----------------------------------------------------.

+ * |        `~ | 1 F1 | 2 F2 | 3 F3 | 4 F4 | 5 F5 |A  BSE|

+ * |-----------+------+------+------+------+-------------|

+ * |       Tab |   '  |   ,  |   .  |   P  |   Y  |   [  |

+ * |-----------+------+------+------+------+------|      |

+ * |         - |   A  |   O  |   E  |   U  |   I  |------|

+ * |-----------+------+------+------+------+------|   (  |

+ * | Play/Pause|   ;  |   Q  |   J  |   K  |   X  |      |

+ * `-----------+------+------+------+------+-------------'

+ *     |  Home | End  | Down |  Up  | ESC  |

+ *     `-----------------------------------'

+ *                                         ,-------------.

+ *                                         | LAlt | GUI  |

+ *                                  ,------|------|------|

+ *                                  |BackSp|LShift| Ctrl |

+ *                                  |      |      |------|

+ *                                  |Space |Enter |OTHER |

+ *                                  `--------------------'

+ */

+[OHLFT] = KEYMAP(

+// left hand

+ KC_GRV     ,M(KF_1)     ,M(KF_2)     ,M(KF_3)   ,M(KF_4)    ,M(KF_5) ,M(OH_BASE)

+,KC_TAB     ,KC_QUOT     ,KC_COMM     ,KC_DOT    ,KC_P       ,KC_Y    ,KC_LBRC

+,KC_MINS    ,KC_A        ,KC_O        ,KC_E      ,KC_U       ,KC_I

+,KC_MPLY    ,KC_SCLN     ,KC_Q        ,KC_J      ,KC_K       ,KC_X    ,KC_LPRN

+,KC_HOME    ,KC_END      ,KC_DOWN     ,KC_UP     ,M(A_ESC)

+

+                                                                ,KC_TRNS     ,KC_TRNS

+                                                                             ,KC_TRNS

+                                                    ,M(OH_BSSPC),M(OH_ENTSFT),M(OH_RIGHT)

+

+                                                                // right hand

+                                                               ,KC_NO   ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO       ,KC_NO       ,KC_NO

+                                                               ,KC_NO   ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO       ,KC_NO       ,KC_NO

+                                                                        ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO       ,KC_NO       ,KC_NO

+                                                               ,KC_NO   ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO       ,KC_NO       ,KC_NO

+                                                                                ,KC_NO  ,KC_NO  ,KC_NO       ,KC_NO       ,KC_NO

+

+                                                               ,KC_NO   ,KC_NO

+                                                               ,KC_NO

+                                                               ,KC_NO   ,KC_NO  ,KC_NO

+    ),

+

+/* Keymap 7: One-handed, right side

+ *

+ * ,-----------------------------------------------------.

+ * | =     F11 | 0 F10| 9 F9 | 8 F8 | 7 F7 | 6 F6 |A  BSE|

+ * |-----------+------+------+------+------+-------------|

+ * |         / |   L  |   R  |   C  |   G  |   F  |   ]  |

+ * |-----------+------+------+------+------+------|      |

+ * |         \ |   S  |   N  |   T  |   H  |   D  |------|

+ * |-----------+------+------+------+------+------|   )  |

+ * |      Stop |   Z  |   V  |   W  |   M  |   B  |      |

+ * `-----------+------+------+------+------+-------------'

+ *     |  PgDn | PgUp | Right| Left | ESC  |

+ *     `-----------------------------------'

+ *                                         ,-------------.

+ *                                         | LAlt | GUI  |

+ *                                  ,------|------|------|

+ *                                  |BackSp|LShift| Ctrl |

+ *                                  |      |      |------|

+ *                                  |Space |Enter |OTHER |

+ *                                  `--------------------'

+ */

+[OHRGT] = KEYMAP(

+// left hand

+ M(KF_11)   ,M(KF_10)    ,M(KF_9)     ,M(KF_8)   ,M(KF_7)    ,M(KF_6) ,M(OH_BASE)

+,KC_SLSH    ,KC_L        ,KC_R        ,KC_C      ,KC_G       ,KC_F    ,KC_RBRC

+,KC_BSLS    ,KC_S        ,KC_N        ,KC_T      ,KC_H       ,KC_D

+,KC_MSTP    ,KC_Z        ,KC_V        ,KC_W      ,KC_M       ,KC_B    ,KC_RPRN

+,KC_PGDN    ,KC_PGUP     ,KC_RGHT     ,KC_LEFT   ,M(A_ESC)

+

+                                                                ,KC_TRNS     ,KC_TRNS

+                                                                             ,KC_TRNS

+                                                    ,M(OH_BSSPC),M(OH_ENTSFT),M(OH_LEFT)

+

+                                                                // right hand

+                                                               ,KC_NO   ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO       ,KC_NO       ,KC_NO

+                                                               ,KC_NO   ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO       ,KC_NO       ,KC_NO

+                                                                        ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO       ,KC_NO       ,KC_NO

+                                                               ,KC_NO   ,KC_NO  ,KC_NO  ,KC_NO  ,KC_NO       ,KC_NO       ,KC_NO

+                                                                                ,KC_NO  ,KC_NO  ,KC_NO       ,KC_NO       ,KC_NO

+

+                                                               ,KC_NO   ,KC_NO

+                                                               ,KC_NO

+                                                               ,KC_NO   ,KC_NO  ,KC_NO

+    ),

+

+/* Keymap 8: Steno for Plover

+ *

+ * ,--------------------------------------------------.           ,--------------------------------------------------.

+ * |        |      |      |      |      |      | BASE |           |      |      |      |      |      |      |        |

+ * |--------+------+------+------+------+-------------|           |------+------+------+------+------+------+--------|

+ * |        |   #  |   #  |   #  |   #  |   #  |   #  |           |  #   |  #   |  #   |   #  |   #  |  #   |   #    |

+ * |--------+------+------+------+------+------|      |           |      |------+------+------+------+------+--------|

+ * |        |      |   T  |   P  |   H  |      |------|           |------|      |  F   |   P  |   L  |  T   |   D    |

+ * |--------+   S  +------+------+------+   *  |   *  |           |  *   |  *   +------+------+------+------+--------|

+ * |        |      |   K  |   W  |   R  |      |      |           |      |      |  R   |   B  |   G  |  S   |   Z    |

+ * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'

+ *   |      |      |      |      |      |                                       |      |      |      |      |      |

+ *   `----------------------------------'                                       `----------------------------------'

+ *                                        ,-------------.       ,-------------.

+ *                                        |      |      |       |      |      |

+ *                                 ,------|------|------|       |------+------+------.

+ *                                 |      |      |      |       |      |      |      |

+ *                                 |   A  |   O  |------|       |------|  E   |  U   |

+ *                                 |      |      |      |       |      |      |      |

+ *                                 `--------------------'       `--------------------'

+ */

+

+[PLVR] = KEYMAP(

+// left hand

+KC_NO,  KC_NO,  KC_NO,  KC_NO,   KC_NO,  KC_NO,   M(A_PLVR),

+KC_NO,  PV_NUM, PV_NUM, PV_NUM,  PV_NUM, PV_NUM,  PV_NUM,

+KC_NO,  PV_LS,  PV_LT,  PV_LP,   PV_LH,  PV_STAR,

+KC_NO,  PV_LS,  PV_LK,  PV_LW,   PV_LR,  PV_STAR, PV_STAR,

+KC_NO,  KC_NO,  KC_NO,  KC_NO,   KC_NO,

+                                           KC_NO, KC_NO,

+                                           KC_NO,

+                                           PV_A,  PV_O,  KC_NO,

+

+                                                 // right hand

+                                                 KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,

+                                                 PV_NUM,  PV_NUM,  PV_NUM,  PV_NUM,  PV_NUM,  PV_NUM,  PV_NUM,

+                                                          PV_STAR, PV_RF,   PV_RP,   PV_RL,   PV_RT,   PV_RD,

+                                                 PV_STAR, PV_STAR, PV_RR,   PV_RB,   PV_RG,   PV_RS,   PV_RZ,

+                                                                   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,

+                                           KC_NO,      KC_NO,

+                                           KC_NO,

+                                           KC_NO,PV_E, PV_U

+ ),

+

+};

+

+const uint16_t PROGMEM fn_actions[] = {

+   [F_BSE]  = ACTION_LAYER_CLEAR(ON_PRESS)

+  ,[F_HUN]  = ACTION_LAYER_INVERT(HUN, ON_PRESS)

+  ,[F_GUI]  = ACTION_MACRO_TAP(A_GUI)

+  ,[F_SFT]  = ACTION_MODS_ONESHOT (MOD_LSFT)

+  ,[F_ALT]  = ACTION_MODS_ONESHOT (MOD_LALT)

+  ,[F_CTRL] = ACTION_MODS_ONESHOT (MOD_LCTL)

+};

+

+void toggle_steno(int pressed)

+{

+  uint8_t layer = biton32(layer_state);

+

+  if (pressed) {

+    if (layer != PLVR) layer_on(PLVR); else layer_off(PLVR);

+

+    register_code(PV_LP);

+    register_code(PV_LH);

+    register_code(PV_LR);

+    register_code(PV_O);

+    register_code(PV_RL);

+    register_code(PV_RG);

+  } else {

+    unregister_code(PV_LP);

+    unregister_code(PV_LH);

+    unregister_code(PV_LR);

+    unregister_code(PV_O);

+    unregister_code(PV_RL);

+    unregister_code(PV_RG);

+  }

+}

+

+macro_t *ang_do_hun (keyrecord_t *record, uint16_t accent, uint16_t hun_char)

+{

+  uint8_t need_shift = 0;

+  uint8_t hold_shift = 0;

+

+  if (!record->event.pressed)

+    return MACRO_NONE;

+

+  layer_off (HUN);

+

+  if (keyboard_report->mods & MOD_BIT (KC_LSFT)) {

+    hold_shift = 1;

+    need_shift = 1;

+    unregister_code (KC_LSFT);

+  }

+  if ((get_oneshot_mods () & MOD_BIT(KC_LSFT)) && !has_oneshot_mods_timed_out ()) {

+    need_shift = 1;

+    hold_shift = 0;

+    unregister_code (KC_LSFT);

+  }

+

+  clear_oneshot_mods ();

+

+  register_code (KC_RALT);

+  unregister_code (KC_RALT);

+  if (accent == (KC_DQT)) {

+    register_code (KC_RSFT);

+  }

+  register_code (accent);

+  unregister_code (accent);

+  if (need_shift && accent != (KC_DQT)) {

+    register_code (KC_RSFT);

+  } else if (accent == (KC_DQT) && !need_shift) {

+    unregister_code (KC_RSFT);

+  }

+  register_code (hun_char);

+  unregister_code (hun_char);

+  if (need_shift || accent == (KC_DQT))

+    unregister_code (KC_RSFT);

+  if (hold_shift)

+    register_code (KC_LSFT);

+

+  return MACRO_NONE;

+}

+

+void ang_handle_kf (keyrecord_t *record, uint8_t id)

+{

+  uint8_t code = id - KF_1;

+

+  if (record->event.pressed) {

+    kf_timers[code] = timer_read ();

+  } else {

+    uint8_t kc;

+

+    if (timer_elapsed (kf_timers[code]) > TAPPING_TERM) {

+      // Long press

+      kc = KC_F1 + code;

+    } else {

+      if (id == KF_11)

+        kc = KC_EQL;

+      else

+        kc = KC_1 + code;

+    }

+

+    register_code (kc);

+    unregister_code (kc);

+  }

+}

+

+const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)

+{

+      switch(id) {

+      case A_ESC:

+        if (record->event.pressed) {

+          if ((get_oneshot_mods ()) && !has_oneshot_mods_timed_out ()) {

+            clear_oneshot_mods ();

+          } else {

+            register_code (KC_ESC);

+          }

+          layer_off (HUN);

+        } else {

+          unregister_code (KC_ESC);

+        }

+        break;

+

+      case A_MPN:

+        if (record->event.pressed) {

+          if (keyboard_report->mods & MOD_BIT(KC_LSFT) ||

+              ((get_oneshot_mods() & MOD_BIT(KC_LSFT)) && !has_oneshot_mods_timed_out())) {

+            int oneshot = ((get_oneshot_mods() & MOD_BIT(KC_LSFT)) && !has_oneshot_mods_timed_out());

+

+            if (oneshot)

+              clear_oneshot_mods ();

+            unregister_code (KC_LSFT);

+

+            register_code (KC_MPRV);

+            unregister_code (KC_MPRV);

+

+            if (!oneshot)

+              register_code (KC_LSFT);

+          } else {

+            return MACRO (T(MNXT), END);

+          }

+        }

+        break;

+

+        /* Hungarian layer */

+      case HU_AA:

+        return ang_do_hun (record, KC_QUOT, KC_A);

+      case HU_OO:

+        return ang_do_hun (record, KC_QUOT, KC_O);

+      case HU_EE:

+        return ang_do_hun (record, KC_QUOT, KC_E);

+      case HU_UU:

+        return ang_do_hun (record, KC_QUOT, KC_U);

+      case HU_II:

+        return ang_do_hun (record, KC_QUOT, KC_I);

+      case HU_OE:

+        return ang_do_hun (record, KC_DQT, KC_O);

+      case HU_UE:

+        return ang_do_hun (record, KC_DQT, KC_U);

+      case HU_OEE:

+        return ang_do_hun (record, KC_EQL, KC_O);

+      case HU_UEE:

+        return ang_do_hun (record, KC_EQL, KC_U);

+

+        /* Mouse movement */

+      case A_MUL:

+        if (record->event.pressed) {

+          mousekey_on(KC_MS_UP);

+          mousekey_on(KC_MS_LEFT);

+        } else {

+          mousekey_off(KC_MS_UP);

+          mousekey_off(KC_MS_LEFT);

+        }

+        mousekey_send();

+        break;

+

+      case A_MUR:

+        if (record->event.pressed) {

+          mousekey_on(KC_MS_UP);

+          mousekey_on(KC_MS_RIGHT);

+        } else {

+          mousekey_off(KC_MS_UP);

+          mousekey_off(KC_MS_RIGHT);

+        }

+        mousekey_send();

+        break;

+

+      case A_MDL:

+        if (record->event.pressed) {

+          mousekey_on(KC_MS_DOWN);

+          mousekey_on(KC_MS_LEFT);

+        } else {

+          mousekey_off(KC_MS_DOWN);

+          mousekey_off(KC_MS_LEFT);

+        }

+        mousekey_send();

+        break;

+

+      case A_MDR:

+        if (record->event.pressed) {

+          mousekey_on(KC_MS_DOWN);

+          mousekey_on(KC_MS_RIGHT);

+        } else {

+          mousekey_off(KC_MS_DOWN);

+          mousekey_off(KC_MS_RIGHT);

+        }

+        mousekey_send();

+        break;

+

+        /* Plover base */

+      case A_PLVR:

+        toggle_steno(record->event.pressed);

+        break;

+

+        /* GUI & AppSel */

+      case A_GUI:

+        if (record->event.pressed) {

+          register_code (KC_LGUI);

+          if (record->tap.count && !record->tap.interrupted) {

+            if (record->tap.count >= 2) {

+              register_code (KC_W);

+              layer_on (APPSEL);

+              set_oneshot_layer (APPSEL, ONESHOT_START);

+            }

+          } else {

+            record->tap.count = 0;

+          }

+          gui_timer = 0;

+        } else {

+          if (record->tap.count >= 2)

+            {

+              unregister_code (KC_W);

+              clear_oneshot_layer_state (ONESHOT_PRESSED);

+            }

+          gui_timer = timer_read ();

+        }

+        break;

+

+      case APP_SLK:

+        return MACRODOWN(T(S), T(L), T(A), T(C), T(K), T(ENT), END);

+

+      case APP_EMCS:

+        return MACRODOWN(T(E), T(M), T(A), T(C), T(S), T(ENT), END);

+

+      case APP_TERM:

+        return MACRODOWN(T(T), T(E), T(R), T(M), T(ENT), END);

+

+      case APP_CHRM:

+        return MACRODOWN(T(C), T(H), T(R), T(O), T(M), T(ENT), END);

+

+      case APP_MSIC:

+        return MACRODOWN(T(R), T(H), T(Y), T(T), T(H), T(M), T(B), T(O), T(X), T(ENT), END);

+

+        /* Function keys */

+      case KF_1 ... KF_11:

+        ang_handle_kf (record, id);

+        break;

+

+        /* 1HAND layout */

+      case OH_BASE:

+        if (record->event.pressed) {

+          oh_base_timer = timer_read ();

+        } else {

+          if (timer_elapsed (oh_base_timer) > TAPPING_TERM) {

+            layer_clear ();

+          } else {

+            return MACRO (T(APP), END);

+          }

+        }

+        break;

+

+      case OH_BSSPC:

+        if (record->event.pressed) {

+          oh_bsspc_timer = timer_read ();

+        } else {

+          if (timer_elapsed (oh_bsspc_timer) > TAPPING_TERM) {

+            return MACRO (T(BSPC), END);

+          } else {

+            return MACRO (T(SPC), END);

+          }

+        }

+        break;

+

+      case OH_ENTSFT:

+        if (record->event.pressed) {

+          oh_entsft_timer = timer_read ();

+        } else {

+          if (timer_elapsed (oh_entsft_timer) > TAPPING_TERM) {

+            if (keyboard_report->mods & MOD_BIT(KC_LSFT))

+              unregister_code (KC_LSFT);

+            else

+              register_code (KC_LSFT);

+          } else {

+            return MACRO (T(ENT), END);

+          }

+        }

+        break;

+

+      case OH_LEFT:

+        if (record->event.pressed) {

+          layer_move (OHLFT);

+          oh_left_blink = 1;

+          oh_left_blink_timer = timer_read ();

+          ergodox_right_led_1_on ();

+        }

+        break;

+

+      case OH_RIGHT:

+        if (record->event.pressed) {

+          layer_move (OHRGT);

+          oh_right_blink = 1;

+          oh_right_blink_timer = timer_read ();

+          ergodox_right_led_3_on ();

+        }

+        break;

+      }

+      return MACRO_NONE;

+};

+

+uint8_t is_adore = 0;

+

+// Runs just one time when the keyboard initializes.

+void matrix_init_user(void) {

+  uint8_t dl;

+

+  ergodox_led_all_on();

+  for (int i = LED_BRIGHTNESS_HI; i > LED_BRIGHTNESS_LO; i--) {

+    ergodox_led_all_set (i);

+    wait_ms (5);

+  }

+  wait_ms(1000);

+  for (int i = LED_BRIGHTNESS_LO; i > 0; i--) {

+    ergodox_led_all_set (i);

+    wait_ms (10);

+  }

+  ergodox_led_all_off();

+

+  if (!eeconfig_is_enabled())

+    eeconfig_init();

+  dl = eeconfig_read_default_layer ();

+  if (dl == (1UL << ADORE))

+    is_adore = 1;

+};

+

+LEADER_EXTERNS();

+

+void ang_do_unicode (void) {

+  register_code (KC_RCTL);

+  register_code (KC_RSFT);

+  register_code (KC_U);

+  unregister_code (KC_U);

+  unregister_code (KC_RSFT);

+  unregister_code (KC_RCTL);

+  wait_ms (100);

+}

+

+void ang_tap (uint16_t codes[]) {

+  for (int i = 0; codes[i] != 0; i++) {

+    register_code (codes[i]);

+    unregister_code (codes[i]);

+    wait_ms (50);

+  }

+}

+

+#define TAP_ONCE(code) \

+  register_code (code); \

+  unregister_code (code)

+

+void ang_tap_dance_cln_finished (qk_tap_dance_state_t *state, void *user_data) {

+  if (state->count == 1) {

+    register_code (KC_RSFT);

+    register_code (KC_SCLN);

+  } else if (state->count == 2) {

+    register_code (KC_SCLN);

+  }

+}

+

+void ang_tap_dance_cln_reset (qk_tap_dance_state_t *state, void *user_data) {

+  if (state->count == 1) {

+    unregister_code (KC_SCLN);

+    unregister_code (KC_RSFT);

+  } else if (state->count == 2) {

+    unregister_code (KC_SCLN);

+  }

+}

+

+void ang_tap_dance_mns_finished (qk_tap_dance_state_t *state, void *user_data) {

+  if (state->count == 1) {

+    register_code (KC_MINS);

+  } else if (state->count == 2) {

+    register_code (KC_RSFT);

+    register_code (KC_MINS);

+  }

+}

+

+void ang_tap_dance_mns_reset (qk_tap_dance_state_t *state, void *user_data) {

+  if (state->count == 1) {

+    unregister_code (KC_MINS);

+  } else if (state->count == 2) {

+    unregister_code (KC_RSFT);

+    unregister_code (KC_MINS);

+  }

+}

+

+typedef struct {

+  bool layer_toggle;

+  bool sticky;

+  bool finished_once;

+} td_ta_state_t;

+

+void ang_tap_dance_ta_finished (qk_tap_dance_state_t *state, void *user_data) {

+  td_ta_state_t *td_ta = (td_ta_state_t *) user_data;

+

+  if (td_ta->finished_once) {

+    return;

+  }

+

+  if (td_ta->sticky) {

+    td_ta->sticky = false;

+    td_ta->layer_toggle = false;

+    layer_off (ARRW);

+    return;

+  }

+

+  td_ta->finished_once = true;

+  if (state->count == 1 && !state->pressed) {

+    register_code (KC_TAB);

+    td_ta->sticky = false;

+    td_ta->layer_toggle = false;

+  } else {

+    td_ta->layer_toggle = true;

+    layer_on (ARRW);

+    td_ta->sticky = (state->count == 2);

+  }

+}

+

+void ang_tap_dance_ta_reset (qk_tap_dance_state_t *state, void *user_data) {

+  td_ta_state_t *td_ta = (td_ta_state_t *) user_data;

+

+  if (!td_ta->layer_toggle)

+    unregister_code (KC_TAB);

+  if (!td_ta->sticky)

+    layer_off (ARRW);

+

+  td_ta->finished_once = false;

+}

+

+const qk_tap_dance_action_t tap_dance_actions[] = {

+   [CT_CLN] = ACTION_TAP_DANCE_FN_ADVANCED (NULL, ang_tap_dance_cln_finished, ang_tap_dance_cln_reset)

+  ,[CT_MNS] = ACTION_TAP_DANCE_FN_ADVANCED (NULL, ang_tap_dance_mns_finished, ang_tap_dance_mns_reset)

+  ,[CT_TA]  = {

+     .fn = { NULL, ang_tap_dance_ta_finished, ang_tap_dance_ta_reset },

+     .user_data = (void *)&((td_ta_state_t) { false, false, false })

+   }

+};

+

+// Runs constantly in the background, in a loop.

+void matrix_scan_user(void) {

+  uint8_t layer = biton32(layer_state);

+

+  if (gui_timer && timer_elapsed (gui_timer) > TAPPING_TERM)

+    unregister_code (KC_LGUI);

+

+  if (layer != OHLFT)

+    oh_left_blink = 0;

+  if (layer != OHRGT)

+    oh_right_blink = 0;

+

+  if (layer == HUN) {

+    ergodox_right_led_2_on();

+    ergodox_right_led_3_on();

+  } else if (layer == NMDIA) {

+    ergodox_right_led_1_on();

+    ergodox_right_led_2_on();

+  } else if (layer == PLVR) {

+    ergodox_right_led_1_on ();

+    ergodox_right_led_2_on ();

+    ergodox_right_led_3_on ();

+  } else if (layer == ADORE) {

+    ergodox_right_led_1_on ();

+    ergodox_right_led_2_on ();

+    ergodox_right_led_3_on ();

+

+    ergodox_right_led_2_set (LED_BRIGHTNESS_HI);

+  }

+

+  if (layer == OHLFT || layer == OHRGT) {

+    ergodox_right_led_2_on();

+

+    if (oh_left_blink) {

+      if (timer_elapsed (oh_left_blink_timer) > OH_BLINK_INTERVAL) {

+        if ((keyboard_report->mods & MOD_BIT(KC_LSFT)) == 0)

+          ergodox_right_led_1_off ();

+      }

+      if (timer_elapsed (oh_left_blink_timer) > OH_BLINK_INTERVAL * 2) {

+        ergodox_right_led_1_on ();

+        oh_left_blink_timer = timer_read ();

+      }

+    }

+

+    if (oh_right_blink) {

+      if (timer_elapsed (oh_right_blink_timer) > OH_BLINK_INTERVAL) {

+        if ((keyboard_report->mods & MOD_BIT(KC_LCTRL)) == 0)

+          ergodox_right_led_3_off ();

+      }

+      if (timer_elapsed (oh_right_blink_timer) > OH_BLINK_INTERVAL * 2) {

+        ergodox_right_led_3_on ();

+        oh_right_blink_timer = timer_read ();

+      }

+    }

+  }

+

+  if (keyboard_report->mods & MOD_BIT(KC_LSFT) ||

+      ((get_oneshot_mods() & MOD_BIT(KC_LSFT)) && !has_oneshot_mods_timed_out())) {

+    ergodox_right_led_1_set (LED_BRIGHTNESS_HI);

+    ergodox_right_led_1_on ();

+  } else {

+    ergodox_right_led_1_set (LED_BRIGHTNESS_LO);

+    if (layer != OHLFT && layer != NMDIA && layer != PLVR && layer != ADORE)

+      ergodox_right_led_1_off ();

+  }

+

+  if (keyboard_report->mods & MOD_BIT(KC_LALT) ||

+      ((get_oneshot_mods() & MOD_BIT(KC_LALT)) && !has_oneshot_mods_timed_out())) {

+    ergodox_right_led_2_set (LED_BRIGHTNESS_HI);

+    ergodox_right_led_2_on ();

+  } else {

+    ergodox_right_led_2_set (LED_BRIGHTNESS_LO);

+    if (layer != OHRGT && layer != HUN && layer != OHLFT && layer != NMDIA && layer != PLVR && layer != ADORE)

+      ergodox_right_led_2_off ();

+  }

+

+  if (keyboard_report->mods & MOD_BIT(KC_LCTRL) ||

+      ((get_oneshot_mods() & MOD_BIT(KC_LCTRL)) && !has_oneshot_mods_timed_out())) {

+    ergodox_right_led_3_set (LED_BRIGHTNESS_HI);

+    ergodox_right_led_3_on ();

+  } else {

+    ergodox_right_led_3_set (LED_BRIGHTNESS_LO);

+    if (layer != OHRGT && layer != HUN && layer != PLVR && layer != ADORE)

+      ergodox_right_led_3_off ();

+  }

+

+  LEADER_DICTIONARY() {

+    leading = false;

+    leader_end ();

+

+#if KEYLOGGER_ENABLE

+    SEQ_ONE_KEY (KC_D) {

+      ergodox_led_all_on();

+      wait_ms(100);

+      ergodox_led_all_off();

+      log_enable = !log_enable;

+    }

+#endif

+

+    SEQ_ONE_KEY (KC_T) {

+      time_travel = !time_travel;

+    }

+

+    SEQ_ONE_KEY (KC_U) {

+      ang_do_unicode ();

+    }

+

+    SEQ_ONE_KEY (KC_V) {

+      SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ (" QMK_VERSION "/" KEYMAP_VERSION ")");

+    }

+

+    SEQ_ONE_KEY (KC_L) {

+      /* λ */

+      ang_do_unicode ();

+

+      uint16_t codes[] = {KC_0, KC_3, KC_B, KC_B, KC_ENT, 0};

+      ang_tap (codes);

+    }

+

+    SEQ_ONE_KEY (KC_Y) {

+      uint16_t codes[] = {KC_BSLS, KC_O, KC_SLSH, 0};

+      ang_tap (codes);

+    }

+

+    SEQ_ONE_KEY (KC_S) {

+      ang_do_unicode (); TAP_ONCE (KC_A); TAP_ONCE (KC_F); TAP_ONCE (KC_SPC);

+      TAP_ONCE (KC_BSLS);

+      register_code (KC_RSFT); TAP_ONCE (KC_MINS); TAP_ONCE (KC_9); unregister_code (KC_RSFT);

+      ang_do_unicode (); TAP_ONCE (KC_3); TAP_ONCE (KC_0); TAP_ONCE (KC_C); TAP_ONCE (KC_4); TAP_ONCE (KC_SPC);

+      register_code (KC_RSFT); TAP_ONCE (KC_0); TAP_ONCE (KC_MINS); unregister_code (KC_RSFT);

+      TAP_ONCE (KC_SLSH);

+      ang_do_unicode (); TAP_ONCE (KC_A); TAP_ONCE (KC_F); TAP_ONCE (KC_SPC);

+    }

+

+    SEQ_TWO_KEYS (KC_W, KC_M) {

+      register_code (KC_LALT);

+      register_code (KC_F2);

+      unregister_code (KC_F2);

+      unregister_code (KC_LALT);

+

+      wait_ms (1000);

+

+      uint16_t codes[] = {KC_M, KC_A, KC_X, KC_MINS, KC_F, KC_O, KC_C, KC_U, KC_S, KC_E, KC_D, KC_ENT, 0};

+      ang_tap (codes);

+      register_code (KC_LGUI);

+      register_code (KC_UP);

+      unregister_code (KC_UP);

+      unregister_code (KC_LGUI);

+    }

+

+    SEQ_ONE_KEY (KC_A) {

+      if (is_adore == 0) {

+        default_layer_and (0);

+        default_layer_or ((1UL << ADORE));

+        eeconfig_update_default_layer ((1UL << ADORE));

+        is_adore = 1;

+

+        ergodox_led_all_off ();

+        ergodox_right_led_3_on ();

+        wait_ms (100);

+        ergodox_right_led_2_on ();

+        wait_ms (100);

+        ergodox_right_led_3_off ();

+        ergodox_right_led_1_on ();

+        wait_ms (100);

+        ergodox_right_led_2_off ();

+        wait_ms (100);

+        ergodox_right_led_1_off ();

+      } else {

+        is_adore = 0;

+        default_layer_and (0);

+        default_layer_or (1UL << BASE);

+        eeconfig_update_default_layer ((1UL << BASE));

+

+        ergodox_led_all_off ();

+        ergodox_right_led_1_on ();

+        wait_ms (100);

+        ergodox_right_led_2_on ();

+        wait_ms (100);

+        ergodox_right_led_1_off ();

+        ergodox_right_led_3_on ();

+        wait_ms (100);

+        ergodox_right_led_2_off ();

+        wait_ms (100);

+        ergodox_right_led_3_off ();

+      }

+    }

+  }

+}

+

+static uint16_t last4[4];

+

+bool process_record_user (uint16_t keycode, keyrecord_t *record) {

+#if KEYLOGGER_ENABLE

+  uint8_t layer = biton32(layer_state);

+

+  if (log_enable && layer == BASE) {

+    xprintf ("KL: col=%d, row=%d\n", record->event.key.col,

+             record->event.key.row);

+  }

+#endif

+

+  if (time_travel && !record->event.pressed) {

+    uint8_t p;

+

+    // shift cache one to the left

+    for (p = 0; p < 3; p++) {

+      last4[p] = last4[p + 1];

+    }

+    last4[3] = keycode;

+

+    if (last4[0] == KC_D && last4[1] == KC_A && last4[2] == KC_T && last4[3] == KC_E) {

+      uint16_t codes[] = {KC_E, KC_SPC, KC_MINS, KC_D, KC_SPC, KC_QUOT, 0};

+      ang_tap (codes);

+      register_code (KC_RSFT);

+      register_code (KC_EQL);

+      unregister_code (KC_EQL);

+      unregister_code (KC_RSFT);

+

+      uint16_t codes2[] = {KC_4, KC_SPC, KC_D, KC_A, KC_Y, KC_S, KC_QUOT, 0};

+      ang_tap (codes2);

+

+      return false;

+    }

+  }

+

+  return true;

+}

diff --git a/keyboards/ergodox_ez/keymaps/algernon/readme.md b/keyboards/ergodox/keymaps/algernon/readme.md
index 6fe177511..6fe177511 100644
--- a/keyboards/ergodox_ez/keymaps/algernon/readme.md
+++ b/keyboards/ergodox/keymaps/algernon/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/algernon/tools/heatmap-adore-layout.json b/keyboards/ergodox/keymaps/algernon/tools/heatmap-adore-layout.json
index 544f61ce8..544f61ce8 100644
--- a/keyboards/ergodox_ez/keymaps/algernon/tools/heatmap-adore-layout.json
+++ b/keyboards/ergodox/keymaps/algernon/tools/heatmap-adore-layout.json
diff --git a/keyboards/ergodox_ez/keymaps/algernon/tools/heatmap-base-layout.json b/keyboards/ergodox/keymaps/algernon/tools/heatmap-base-layout.json
index 148bb1f23..148bb1f23 100644
--- a/keyboards/ergodox_ez/keymaps/algernon/tools/heatmap-base-layout.json
+++ b/keyboards/ergodox/keymaps/algernon/tools/heatmap-base-layout.json
diff --git a/keyboards/ergodox_ez/keymaps/algernon/tools/log-to-heatmap.py b/keyboards/ergodox/keymaps/algernon/tools/log-to-heatmap.py
index a13d12e81..a13d12e81 100755
--- a/keyboards/ergodox_ez/keymaps/algernon/tools/log-to-heatmap.py
+++ b/keyboards/ergodox/keymaps/algernon/tools/log-to-heatmap.py
diff --git a/keyboards/ergodox_ez/keymaps/algernon/tools/max-focused b/keyboards/ergodox/keymaps/algernon/tools/max-focused
index 4d5220aa8..4d5220aa8 100755
--- a/keyboards/ergodox_ez/keymaps/algernon/tools/max-focused
+++ b/keyboards/ergodox/keymaps/algernon/tools/max-focused
diff --git a/keyboards/ergodox_ez/keymaps/andrew_osx/keymap.c b/keyboards/ergodox/keymaps/andrew_osx/keymap.c
index 48257d23a..750155d98 100644
--- a/keyboards/ergodox_ez/keymaps/andrew_osx/keymap.c
+++ b/keyboards/ergodox/keymaps/andrew_osx/keymap.c
@@ -1,7 +1,7 @@
 // Netable differences vs. the default firmware for the ErgoDox EZ:
 // 1. The Cmd key is now on the right side, making Cmd+Space easier.
 // 2. The media keys work on OSX (But not on Windows).
-#include "ergodox_ez.h"
+#include "ergodox.h"
 #include "debug.h"
 #include "action_layer.h"
 
diff --git a/keyboards/ergodox_ez/keymaps/bepo/bepo.png b/keyboards/ergodox/keymaps/bepo/bepo.png
index 3df7aa609..3df7aa609 100644
--- a/keyboards/ergodox_ez/keymaps/bepo/bepo.png
+++ b/keyboards/ergodox/keymaps/bepo/bepo.png
diff --git a/keyboards/ergodox_ez/keymaps/bepo/keymap.c b/keyboards/ergodox/keymaps/bepo/keymap.c
index 921a94d63..2d88fc10e 100644
--- a/keyboards/ergodox_ez/keymaps/bepo/keymap.c
+++ b/keyboards/ergodox/keymaps/bepo/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
 #include "debug.h"
 #include "action_layer.h"
 #include "keymap_bepo.h"
diff --git a/keyboards/ergodox_ez/keymaps/bepo/readme.md b/keyboards/ergodox/keymaps/bepo/readme.md
index 4a18cd80f..4a18cd80f 100644
--- a/keyboards/ergodox_ez/keymaps/bepo/readme.md
+++ b/keyboards/ergodox/keymaps/bepo/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/coderkun_neo2/Makefile b/keyboards/ergodox/keymaps/coderkun_neo2/Makefile
index 6c0a79b11..6c0a79b11 100644
--- a/keyboards/ergodox_ez/keymaps/coderkun_neo2/Makefile
+++ b/keyboards/ergodox/keymaps/coderkun_neo2/Makefile
diff --git a/keyboards/ergodox_ez/keymaps/coderkun_neo2/keymap.c b/keyboards/ergodox/keymaps/coderkun_neo2/keymap.c
index 8a2ba26d2..2ac06eef8 100644
--- a/keyboards/ergodox_ez/keymaps/coderkun_neo2/keymap.c
+++ b/keyboards/ergodox/keymaps/coderkun_neo2/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
 #include "debug.h"
 #include "action_layer.h"
 #include "led.h"
diff --git a/keyboards/ergodox_ez/keymaps/coderkun_neo2/readme.md b/keyboards/ergodox/keymaps/coderkun_neo2/readme.md
index 2a4d3a535..2a4d3a535 100644
--- a/keyboards/ergodox_ez/keymaps/coderkun_neo2/readme.md
+++ b/keyboards/ergodox/keymaps/coderkun_neo2/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/colemak/keymap.c b/keyboards/ergodox/keymaps/colemak/keymap.c
index 9601726f7..7ef81ab4b 100644
--- a/keyboards/ergodox_ez/keymaps/colemak/keymap.c
+++ b/keyboards/ergodox/keymaps/colemak/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
 #include "debug.h"
 #include "action_layer.h"
 
diff --git a/keyboards/ergodox_ez/keymaps/colemak/readme.md b/keyboards/ergodox/keymaps/colemak/readme.md
index e28b2f085..e28b2f085 100644
--- a/keyboards/ergodox_ez/keymaps/colemak/readme.md
+++ b/keyboards/ergodox/keymaps/colemak/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/colemak_osx_pc_no/keyboard-layout.png b/keyboards/ergodox/keymaps/colemak_osx_pc_no/keyboard-layout.png
index 57df5a1f9..57df5a1f9 100644
--- a/keyboards/ergodox_ez/keymaps/colemak_osx_pc_no/keyboard-layout.png
+++ b/keyboards/ergodox/keymaps/colemak_osx_pc_no/keyboard-layout.png
diff --git a/keyboards/ergodox_ez/keymaps/colemak_osx_pc_no/keymap.c b/keyboards/ergodox/keymaps/colemak_osx_pc_no/keymap.c
index a909ed3a4..eb0156c45 100644
--- a/keyboards/ergodox_ez/keymaps/colemak_osx_pc_no/keymap.c
+++ b/keyboards/ergodox/keymaps/colemak_osx_pc_no/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
 #include "debug.h"
 #include "action_layer.h"
 #include "keymap_norwegian.h"
diff --git a/keyboards/ergodox_ez/keymaps/colemak_osx_pc_no/readme.md b/keyboards/ergodox/keymaps/colemak_osx_pc_no/readme.md
index 48f095cae..48f095cae 100644
--- a/keyboards/ergodox_ez/keymaps/colemak_osx_pc_no/readme.md
+++ b/keyboards/ergodox/keymaps/colemak_osx_pc_no/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/csharp_dev/csharp_dev.png b/keyboards/ergodox/keymaps/csharp_dev/csharp_dev.png
index 6fba568fc..6fba568fc 100644
--- a/keyboards/ergodox_ez/keymaps/csharp_dev/csharp_dev.png
+++ b/keyboards/ergodox/keymaps/csharp_dev/csharp_dev.png
diff --git a/keyboards/ergodox_ez/keymaps/csharp_dev/csharp_dev_legend.png b/keyboards/ergodox/keymaps/csharp_dev/csharp_dev_legend.png
index b0a1c513c..b0a1c513c 100644
--- a/keyboards/ergodox_ez/keymaps/csharp_dev/csharp_dev_legend.png
+++ b/keyboards/ergodox/keymaps/csharp_dev/csharp_dev_legend.png
diff --git a/keyboards/ergodox_ez/keymaps/csharp_dev/keymap.c b/keyboards/ergodox/keymaps/csharp_dev/keymap.c
index e9648ede7..e0c66f487 100644
--- a/keyboards/ergodox_ez/keymaps/csharp_dev/keymap.c
+++ b/keyboards/ergodox/keymaps/csharp_dev/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
 #include "debug.h"
 #include "action_layer.h"
 
diff --git a/keyboards/ergodox_ez/keymaps/csharp_dev/readme.md b/keyboards/ergodox/keymaps/csharp_dev/readme.md
index 96af077ad..96af077ad 100644
--- a/keyboards/ergodox_ez/keymaps/csharp_dev/readme.md
+++ b/keyboards/ergodox/keymaps/csharp_dev/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/dave/keymap.c b/keyboards/ergodox/keymaps/dave/keymap.c
index e9480af3e..32c70097b 100644
--- a/keyboards/ergodox_ez/keymaps/dave/keymap.c
+++ b/keyboards/ergodox/keymaps/dave/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
 #include "debug.h"
 #include "action_layer.h"
 
diff --git a/keyboards/ergodox_ez/keymaps/dave/readme.md b/keyboards/ergodox/keymaps/dave/readme.md
index aa0f9bd19..aa0f9bd19 100644
--- a/keyboards/ergodox_ez/keymaps/dave/readme.md
+++ b/keyboards/ergodox/keymaps/dave/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/default/default.png b/keyboards/ergodox/keymaps/default/default.png
index 6575f7b5e..6575f7b5e 100644
--- a/keyboards/ergodox_ez/keymaps/default/default.png
+++ b/keyboards/ergodox/keymaps/default/default.png
diff --git a/keyboards/ergodox_ez/keymaps/default/default_highres.png b/keyboards/ergodox/keymaps/default/default_highres.png
index 7d9f045f4..7d9f045f4 100644
--- a/keyboards/ergodox_ez/keymaps/default/default_highres.png
+++ b/keyboards/ergodox/keymaps/default/default_highres.png
diff --git a/keyboards/ergodox_ez/keymaps/default/keymap.c b/keyboards/ergodox/keymaps/default/keymap.c
index b48a54a43..f1a83f4e7 100644
--- a/keyboards/ergodox_ez/keymaps/default/keymap.c
+++ b/keyboards/ergodox/keymaps/default/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
 #include "debug.h"
 #include "action_layer.h"
 
diff --git a/keyboards/ergodox_ez/keymaps/default/readme.md b/keyboards/ergodox/keymaps/default/readme.md
index 8f6dba45e..8f6dba45e 100644
--- a/keyboards/ergodox_ez/keymaps/default/readme.md
+++ b/keyboards/ergodox/keymaps/default/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/default_osx/default_osx_highres.png b/keyboards/ergodox/keymaps/default_osx/default_osx_highres.png
index 04f46bbd5..04f46bbd5 100644
--- a/keyboards/ergodox_ez/keymaps/default_osx/default_osx_highres.png
+++ b/keyboards/ergodox/keymaps/default_osx/default_osx_highres.png
diff --git a/keyboards/ergodox_ez/keymaps/default_osx/keymap.c b/keyboards/ergodox/keymaps/default_osx/keymap.c
index c57ffbb88..e9a242e07 100644
--- a/keyboards/ergodox_ez/keymaps/default_osx/keymap.c
+++ b/keyboards/ergodox/keymaps/default_osx/keymap.c
@@ -1,7 +1,7 @@
 // Netable differences vs. the default firmware for the ErgoDox EZ:
 // 1. The Cmd key is now on the right side, making Cmd+Space easier.
 // 2. The media keys work on OSX (But not on Windows).
-#include "ergodox_ez.h"
+#include "ergodox.h"
 #include "debug.h"
 #include "action_layer.h"
 
diff --git a/keyboards/ergodox_ez/keymaps/default_osx/readme.md b/keyboards/ergodox/keymaps/default_osx/readme.md
index aa749aac9..aa749aac9 100644
--- a/keyboards/ergodox_ez/keymaps/default_osx/readme.md
+++ b/keyboards/ergodox/keymaps/default_osx/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/dragon788/keymap.c b/keyboards/ergodox/keymaps/dragon788/keymap.c
index 3aec8c6cf..d33bc6a25 100644
--- a/keyboards/ergodox_ez/keymaps/dragon788/keymap.c
+++ b/keyboards/ergodox/keymaps/dragon788/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
 #include "debug.h"
 #include "action_layer.h"
 
diff --git a/keyboards/ergodox_ez/keymaps/dvorak/dvorak.png b/keyboards/ergodox/keymaps/dvorak/dvorak.png
index cb8316309..cb8316309 100644
--- a/keyboards/ergodox_ez/keymaps/dvorak/dvorak.png
+++ b/keyboards/ergodox/keymaps/dvorak/dvorak.png
diff --git a/keyboards/ergodox_ez/keymaps/dvorak/keymap.c b/keyboards/ergodox/keymaps/dvorak/keymap.c
index 22947327d..d3609c673 100644
--- a/keyboards/ergodox_ez/keymaps/dvorak/keymap.c
+++ b/keyboards/ergodox/keymaps/dvorak/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
 #include "debug.h"
 #include "action_layer.h"
 
diff --git a/keyboards/ergodox_ez/keymaps/dvorak_intl_squisher/keyboard-layout0.png b/keyboards/ergodox/keymaps/dvorak_intl_squisher/keyboard-layout0.png
index 6a36f9bfa..6a36f9bfa 100644
--- a/keyboards/ergodox_ez/keymaps/dvorak_intl_squisher/keyboard-layout0.png
+++ b/keyboards/ergodox/keymaps/dvorak_intl_squisher/keyboard-layout0.png
diff --git a/keyboards/ergodox_ez/keymaps/dvorak_intl_squisher/keyboard-layout1.png b/keyboards/ergodox/keymaps/dvorak_intl_squisher/keyboard-layout1.png
index c6e6d913c..c6e6d913c 100644
--- a/keyboards/ergodox_ez/keymaps/dvorak_intl_squisher/keyboard-layout1.png
+++ b/keyboards/ergodox/keymaps/dvorak_intl_squisher/keyboard-layout1.png
diff --git a/keyboards/ergodox_ez/keymaps/dvorak_intl_squisher/keyboard-layout2.png b/keyboards/ergodox/keymaps/dvorak_intl_squisher/keyboard-layout2.png
index 23f56ff4c..23f56ff4c 100644
--- a/keyboards/ergodox_ez/keymaps/dvorak_intl_squisher/keyboard-layout2.png
+++ b/keyboards/ergodox/keymaps/dvorak_intl_squisher/keyboard-layout2.png
diff --git a/keyboards/ergodox_ez/keymaps/dvorak_intl_squisher/keymap.c b/keyboards/ergodox/keymaps/dvorak_intl_squisher/keymap.c
index 82f55b4bc..89eae5208 100644
--- a/keyboards/ergodox_ez/keymaps/dvorak_intl_squisher/keymap.c
+++ b/keyboards/ergodox/keymaps/dvorak_intl_squisher/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
 #include "debug.h"
 #include "action_layer.h"
 
diff --git a/keyboards/ergodox_ez/keymaps/dvorak_intl_squisher/readme.md b/keyboards/ergodox/keymaps/dvorak_intl_squisher/readme.md
index 984106ff4..984106ff4 100644
--- a/keyboards/ergodox_ez/keymaps/dvorak_intl_squisher/readme.md
+++ b/keyboards/ergodox/keymaps/dvorak_intl_squisher/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/dvorak_spanish/keymap.c b/keyboards/ergodox/keymaps/dvorak_spanish/keymap.c
index 6eb864b44..6d7adf907 100755
--- a/keyboards/ergodox_ez/keymaps/dvorak_spanish/keymap.c
+++ b/keyboards/ergodox/keymaps/dvorak_spanish/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
 #include "debug.h"
 #include "action_layer.h"
 
diff --git a/keyboards/ergodox_ez/keymaps/dvorak_spanish/readme.md b/keyboards/ergodox/keymaps/dvorak_spanish/readme.md
index e075e3cd7..e075e3cd7 100644
--- a/keyboards/ergodox_ez/keymaps/dvorak_spanish/readme.md
+++ b/keyboards/ergodox/keymaps/dvorak_spanish/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/emacs_osx_dk/default_highres.png b/keyboards/ergodox/keymaps/emacs_osx_dk/default_highres.png
index 1d2583740..1d2583740 100644
--- a/keyboards/ergodox_ez/keymaps/emacs_osx_dk/default_highres.png
+++ b/keyboards/ergodox/keymaps/emacs_osx_dk/default_highres.png
diff --git a/keyboards/ergodox_ez/keymaps/emacs_osx_dk/keymap.c b/keyboards/ergodox/keymaps/emacs_osx_dk/keymap.c
index 1d8e66a08..e80f08d73 100644
--- a/keyboards/ergodox_ez/keymaps/emacs_osx_dk/keymap.c
+++ b/keyboards/ergodox/keymaps/emacs_osx_dk/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
 #include "debug.h"
 #include "action_layer.h"
 
diff --git a/keyboards/ergodox_ez/keymaps/emacs_osx_dk/readme.md b/keyboards/ergodox/keymaps/emacs_osx_dk/readme.md
index 4839988d9..4839988d9 100644
--- a/keyboards/ergodox_ez/keymaps/emacs_osx_dk/readme.md
+++ b/keyboards/ergodox/keymaps/emacs_osx_dk/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/erez_experimental/Makefile b/keyboards/ergodox/keymaps/erez_experimental/Makefile
index b673c5ce5..b673c5ce5 100644
--- a/keyboards/ergodox_ez/keymaps/erez_experimental/Makefile
+++ b/keyboards/ergodox/keymaps/erez_experimental/Makefile
diff --git a/keyboards/ergodox_ez/keymaps/erez_experimental/config.h b/keyboards/ergodox/keymaps/erez_experimental/config.h
index e5d7fe188..e5d7fe188 100644
--- a/keyboards/ergodox_ez/keymaps/erez_experimental/config.h
+++ b/keyboards/ergodox/keymaps/erez_experimental/config.h
diff --git a/keyboards/ergodox_ez/keymaps/erez_experimental/keymap.c b/keyboards/ergodox/keymaps/erez_experimental/keymap.c
index 04ad2a816..47e40aa55 100644
--- a/keyboards/ergodox_ez/keymaps/erez_experimental/keymap.c
+++ b/keyboards/ergodox/keymaps/erez_experimental/keymap.c
@@ -1,5 +1,5 @@
 #include <keymap_extras/keymap_colemak.h>
-#include "ergodox_ez.h"
+#include "ergodox.h"
 #include "debug.h"
 #include "action_layer.h"
 
diff --git a/keyboards/ergodox_ez/keymaps/erez_experimental/readme.md b/keyboards/ergodox/keymaps/erez_experimental/readme.md
index 66acfa187..66acfa187 100644
--- a/keyboards/ergodox_ez/keymaps/erez_experimental/readme.md
+++ b/keyboards/ergodox/keymaps/erez_experimental/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/german-kinergo/keymap.c b/keyboards/ergodox/keymaps/german-kinergo/keymap.c
index b1cecf0dd..971318d87 100644
--- a/keyboards/ergodox_ez/keymaps/german-kinergo/keymap.c
+++ b/keyboards/ergodox/keymaps/german-kinergo/keymap.c
@@ -1,7 +1,7 @@
 // German keymap derived from "german", but more closely resembling the German layout of the Kinesis Ergo Elan.
 //
 // chschmitz, 2016-01-27
-#include "ergodox_ez.h"
+#include "ergodox.h"
 #include "debug.h"
 #include "action_layer.h"
 #include "keymap_german.h"
diff --git a/keyboards/ergodox_ez/keymaps/german-kinergo/layout-code.png b/keyboards/ergodox/keymaps/german-kinergo/layout-code.png
index a0ef551e1..a0ef551e1 100644
--- a/keyboards/ergodox_ez/keymaps/german-kinergo/layout-code.png
+++ b/keyboards/ergodox/keymaps/german-kinergo/layout-code.png
diff --git a/keyboards/ergodox_ez/keymaps/german-kinergo/layout-media.png b/keyboards/ergodox/keymaps/german-kinergo/layout-media.png
index 56aea1dca..56aea1dca 100644
--- a/keyboards/ergodox_ez/keymaps/german-kinergo/layout-media.png
+++ b/keyboards/ergodox/keymaps/german-kinergo/layout-media.png
diff --git a/keyboards/ergodox_ez/keymaps/german-kinergo/layout.png b/keyboards/ergodox/keymaps/german-kinergo/layout.png
index 76a1aa5d7..76a1aa5d7 100644
--- a/keyboards/ergodox_ez/keymaps/german-kinergo/layout.png
+++ b/keyboards/ergodox/keymaps/german-kinergo/layout.png
diff --git a/keyboards/ergodox_ez/keymaps/german-kinergo/readme.md b/keyboards/ergodox/keymaps/german-kinergo/readme.md
index 557d85a8a..557d85a8a 100644
--- a/keyboards/ergodox_ez/keymaps/german-kinergo/readme.md
+++ b/keyboards/ergodox/keymaps/german-kinergo/readme.md
diff --git a/keyboards/ergodox_ez/util/compile_keymap.py b/keyboards/ergodox/keymaps/german-manuneo/compile_keymap.py
index 7076a6ecb..7076a6ecb 100644
--- a/keyboards/ergodox_ez/util/compile_keymap.py
+++ b/keyboards/ergodox/keymaps/german-manuneo/compile_keymap.py
diff --git a/keyboards/ergodox_ez/keymaps/german-manuneo/keymap.c b/keyboards/ergodox/keymaps/german-manuneo/keymap.c
index 5fcc14d51..16e92bc23 100644
--- a/keyboards/ergodox_ez/keymaps/german-manuneo/keymap.c
+++ b/keyboards/ergodox/keymaps/german-manuneo/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
 #include "action_layer.h"
 #include "keymap.h"
 #include "keymap_german.h"
diff --git a/keyboards/ergodox_ez/keymaps/german-manuneo/keymap.md b/keyboards/ergodox/keymaps/german-manuneo/keymap.md
index 2c9e0a837..837b25446 100644
--- a/keyboards/ergodox_ez/keymaps/german-manuneo/keymap.md
+++ b/keyboards/ergodox/keymaps/german-manuneo/keymap.md
@@ -12,7 +12,7 @@ Tested with python 2.7 and python 3.4
     {
         "layout": "ergodox_ez",
         "keymaps_includes": [
-            "ergodox_ez.h",
+            "ergodox.h",
             "action_layer.h",
             "keymap_common.h",
             "keymap_extras/keymap_german.h",
diff --git a/keyboards/ergodox_ez/keymaps/german/keymap.c b/keyboards/ergodox/keymaps/german/keymap.c
index 3eab51f0e..9b2f6ffa2 100644
--- a/keyboards/ergodox_ez/keymaps/german/keymap.c
+++ b/keyboards/ergodox/keymaps/german/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
 #include "debug.h"
 #include "action_layer.h"
 #include "keymap_german.h"
diff --git a/keyboards/ergodox_ez/keymaps/j3rn/keymap.c b/keyboards/ergodox/keymaps/j3rn/keymap.c
index 6e271321d..43c8f30a3 100644
--- a/keyboards/ergodox_ez/keymaps/j3rn/keymap.c
+++ b/keyboards/ergodox/keymaps/j3rn/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
 #include "debug.h"
 #include "action_layer.h"
 
diff --git a/keyboards/ergodox_ez/keymaps/j3rn/readme.md b/keyboards/ergodox/keymaps/j3rn/readme.md
index fc4b64042..fc4b64042 100644
--- a/keyboards/ergodox_ez/keymaps/j3rn/readme.md
+++ b/keyboards/ergodox/keymaps/j3rn/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/jack/keymap.c b/keyboards/ergodox/keymaps/jack/keymap.c
index 80bf9d535..dda253fa4 100644
--- a/keyboards/ergodox_ez/keymaps/jack/keymap.c
+++ b/keyboards/ergodox/keymaps/jack/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
 #include "debug.h"
 #include "action_layer.h"
 
diff --git a/keyboards/ergodox_ez/keymaps/jacobono/img/colemak-default-layer.png b/keyboards/ergodox/keymaps/jacobono/img/colemak-default-layer.png
index 06f63c496..06f63c496 100644
--- a/keyboards/ergodox_ez/keymaps/jacobono/img/colemak-default-layer.png
+++ b/keyboards/ergodox/keymaps/jacobono/img/colemak-default-layer.png
diff --git a/keyboards/ergodox_ez/keymaps/jacobono/img/number-dpad-layer.png b/keyboards/ergodox/keymaps/jacobono/img/number-dpad-layer.png
index 4dd718278..4dd718278 100644
--- a/keyboards/ergodox_ez/keymaps/jacobono/img/number-dpad-layer.png
+++ b/keyboards/ergodox/keymaps/jacobono/img/number-dpad-layer.png
diff --git a/keyboards/ergodox_ez/keymaps/jacobono/img/symbol-layer.png b/keyboards/ergodox/keymaps/jacobono/img/symbol-layer.png
index ee224cf0c..ee224cf0c 100644
--- a/keyboards/ergodox_ez/keymaps/jacobono/img/symbol-layer.png
+++ b/keyboards/ergodox/keymaps/jacobono/img/symbol-layer.png
diff --git a/keyboards/ergodox_ez/keymaps/jacobono/keymap.c b/keyboards/ergodox/keymaps/jacobono/keymap.c
index 6b19800af..dc7382bfe 100644
--- a/keyboards/ergodox_ez/keymaps/jacobono/keymap.c
+++ b/keyboards/ergodox/keymaps/jacobono/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
 #include "debug.h"
 #include "action_layer.h"
 
diff --git a/keyboards/ergodox_ez/keymaps/jacobono/readme.md b/keyboards/ergodox/keymaps/jacobono/readme.md
index 48de0509f..48de0509f 100644
--- a/keyboards/ergodox_ez/keymaps/jacobono/readme.md
+++ b/keyboards/ergodox/keymaps/jacobono/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/jgarr/keymap.c b/keyboards/ergodox/keymaps/jgarr/keymap.c
index a3ad2040f..42d58421d 100644
--- a/keyboards/ergodox_ez/keymaps/jgarr/keymap.c
+++ b/keyboards/ergodox/keymaps/jgarr/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
 #include "debug.h"
 #include "action_layer.h"
 
diff --git a/keyboards/ergodox_ez/keymaps/josh/keymap.c b/keyboards/ergodox/keymaps/josh/keymap.c
index de5664a25..488b21427 100644
--- a/keyboards/ergodox_ez/keymaps/josh/keymap.c
+++ b/keyboards/ergodox/keymaps/josh/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
 #include "debug.h"
 #include "action_layer.h"
 
diff --git a/keyboards/ergodox_ez/keymaps/josh/readme.md b/keyboards/ergodox/keymaps/josh/readme.md
index cee19d47e..cee19d47e 100644
--- a/keyboards/ergodox_ez/keymaps/josh/readme.md
+++ b/keyboards/ergodox/keymaps/josh/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/kastyle/keymap.c b/keyboards/ergodox/keymaps/kastyle/keymap.c
index 3982e0a19..a92085003 100644
--- a/keyboards/ergodox_ez/keymaps/kastyle/keymap.c
+++ b/keyboards/ergodox/keymaps/kastyle/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
 #include "debug.h"
 #include "action_layer.h"
 
diff --git a/keyboards/ergodox_ez/keymaps/kines-ish/keymap.c b/keyboards/ergodox/keymaps/kines-ish/keymap.c
index 5063c99f2..83f5b0e2b 100644
--- a/keyboards/ergodox_ez/keymaps/kines-ish/keymap.c
+++ b/keyboards/ergodox/keymaps/kines-ish/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
 #include "debug.h"
 #include "action_layer.h"
 
diff --git a/keyboards/ergodox_ez/keymaps/kines-ish/readme.md b/keyboards/ergodox/keymaps/kines-ish/readme.md
index 5d39a0590..5d39a0590 100644
--- a/keyboards/ergodox_ez/keymaps/kines-ish/readme.md
+++ b/keyboards/ergodox/keymaps/kines-ish/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/maz/keymap.c b/keyboards/ergodox/keymaps/maz/keymap.c
index 7b8f0df74..6378f874b 100644
--- a/keyboards/ergodox_ez/keymaps/maz/keymap.c
+++ b/keyboards/ergodox/keymaps/maz/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
 #include "debug.h"
 #include "action_layer.h"
 
diff --git a/keyboards/ergodox_ez/keymaps/maz/readme.md b/keyboards/ergodox/keymaps/maz/readme.md
index 000a8d000..000a8d000 100644
--- a/keyboards/ergodox_ez/keymaps/maz/readme.md
+++ b/keyboards/ergodox/keymaps/maz/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/mpiechotka/keymap.c b/keyboards/ergodox/keymaps/mpiechotka/keymap.c
index 5bfef5995..67aca4479 100644
--- a/keyboards/ergodox_ez/keymaps/mpiechotka/keymap.c
+++ b/keyboards/ergodox/keymaps/mpiechotka/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
 #include "debug.h"
 #include "action_layer.h"
 #include "keymap_colemak.h"
diff --git a/keyboards/ergodox_ez/keymaps/mpiechotka/readme.md b/keyboards/ergodox/keymaps/mpiechotka/readme.md
index 785400d1d..785400d1d 100644
--- a/keyboards/ergodox_ez/keymaps/mpiechotka/readme.md
+++ b/keyboards/ergodox/keymaps/mpiechotka/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/msc/img/code_layer.png b/keyboards/ergodox/keymaps/msc/img/code_layer.png
index 7b5efaae7..7b5efaae7 100644
--- a/keyboards/ergodox_ez/keymaps/msc/img/code_layer.png
+++ b/keyboards/ergodox/keymaps/msc/img/code_layer.png
diff --git a/keyboards/ergodox_ez/keymaps/msc/img/main_layer.png b/keyboards/ergodox/keymaps/msc/img/main_layer.png
index 65f92dda1..65f92dda1 100644
--- a/keyboards/ergodox_ez/keymaps/msc/img/main_layer.png
+++ b/keyboards/ergodox/keymaps/msc/img/main_layer.png
diff --git a/keyboards/ergodox_ez/keymaps/msc/img/media_layer.png b/keyboards/ergodox/keymaps/msc/img/media_layer.png
index a69799b07..a69799b07 100644
--- a/keyboards/ergodox_ez/keymaps/msc/img/media_layer.png
+++ b/keyboards/ergodox/keymaps/msc/img/media_layer.png
diff --git a/keyboards/ergodox_ez/keymaps/msc/keymap.c b/keyboards/ergodox/keymaps/msc/keymap.c
index e567e513f..c43aecf6b 100644
--- a/keyboards/ergodox_ez/keymaps/msc/keymap.c
+++ b/keyboards/ergodox/keymaps/msc/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
 #include "debug.h"
 #include "action_layer.h"
 
diff --git a/keyboards/ergodox_ez/keymaps/msc/readme.md b/keyboards/ergodox/keymaps/msc/readme.md
index 0d14fcbd2..0d14fcbd2 100644
--- a/keyboards/ergodox_ez/keymaps/msc/readme.md
+++ b/keyboards/ergodox/keymaps/msc/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/naps62/keymap.c b/keyboards/ergodox/keymaps/naps62/keymap.c
index d8c28423c..9064053fc 100644
--- a/keyboards/ergodox_ez/keymaps/naps62/keymap.c
+++ b/keyboards/ergodox/keymaps/naps62/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
 #include "debug.h"
 #include "action_layer.h"
 
diff --git a/keyboards/ergodox_ez/keymaps/naps62/readme.md b/keyboards/ergodox/keymaps/naps62/readme.md
index 14728e4cc..14728e4cc 100644
--- a/keyboards/ergodox_ez/keymaps/naps62/readme.md
+++ b/keyboards/ergodox/keymaps/naps62/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/ordinary/keymap.c b/keyboards/ergodox/keymaps/ordinary/keymap.c
index 778cbc63c..bf0574ea2 100644
--- a/keyboards/ergodox_ez/keymaps/ordinary/keymap.c
+++ b/keyboards/ergodox/keymaps/ordinary/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
 #include "led.h"
 #include "debug.h"
 #include "action_layer.h"
diff --git a/keyboards/ergodox_ez/keymaps/ordinary/ordinary-base.png b/keyboards/ergodox/keymaps/ordinary/ordinary-base.png
index 9c561a10a..9c561a10a 100644
--- a/keyboards/ergodox_ez/keymaps/ordinary/ordinary-base.png
+++ b/keyboards/ergodox/keymaps/ordinary/ordinary-base.png
diff --git a/keyboards/ergodox_ez/keymaps/ordinary/ordinary-base.txt b/keyboards/ergodox/keymaps/ordinary/ordinary-base.txt
index 25731ea2e..25731ea2e 100644
--- a/keyboards/ergodox_ez/keymaps/ordinary/ordinary-base.txt
+++ b/keyboards/ergodox/keymaps/ordinary/ordinary-base.txt
diff --git a/keyboards/ergodox_ez/keymaps/ordinary/ordinary-media.png b/keyboards/ergodox/keymaps/ordinary/ordinary-media.png
index 99e5ed80b..99e5ed80b 100644
--- a/keyboards/ergodox_ez/keymaps/ordinary/ordinary-media.png
+++ b/keyboards/ergodox/keymaps/ordinary/ordinary-media.png
diff --git a/keyboards/ergodox_ez/keymaps/ordinary/ordinary-media.txt b/keyboards/ergodox/keymaps/ordinary/ordinary-media.txt
index 4eccc9f35..4eccc9f35 100644
--- a/keyboards/ergodox_ez/keymaps/ordinary/ordinary-media.txt
+++ b/keyboards/ergodox/keymaps/ordinary/ordinary-media.txt
diff --git a/keyboards/ergodox_ez/keymaps/ordinary/ordinary-special.png b/keyboards/ergodox/keymaps/ordinary/ordinary-special.png
index 6eecf447e..6eecf447e 100644
--- a/keyboards/ergodox_ez/keymaps/ordinary/ordinary-special.png
+++ b/keyboards/ergodox/keymaps/ordinary/ordinary-special.png
diff --git a/keyboards/ergodox_ez/keymaps/ordinary/ordinary-special.txt b/keyboards/ergodox/keymaps/ordinary/ordinary-special.txt
index a08827c6d..a08827c6d 100644
--- a/keyboards/ergodox_ez/keymaps/ordinary/ordinary-special.txt
+++ b/keyboards/ergodox/keymaps/ordinary/ordinary-special.txt
diff --git a/keyboards/ergodox_ez/keymaps/ordinary/ordinary-symbol.png b/keyboards/ergodox/keymaps/ordinary/ordinary-symbol.png
index e4de64a96..e4de64a96 100644
--- a/keyboards/ergodox_ez/keymaps/ordinary/ordinary-symbol.png
+++ b/keyboards/ergodox/keymaps/ordinary/ordinary-symbol.png
diff --git a/keyboards/ergodox_ez/keymaps/ordinary/ordinary-symbol.txt b/keyboards/ergodox/keymaps/ordinary/ordinary-symbol.txt
index e199f5c59..e199f5c59 100644
--- a/keyboards/ergodox_ez/keymaps/ordinary/ordinary-symbol.txt
+++ b/keyboards/ergodox/keymaps/ordinary/ordinary-symbol.txt
diff --git a/keyboards/ergodox_ez/keymaps/ordinary/readme.md b/keyboards/ergodox/keymaps/ordinary/readme.md
index 6465cd79e..6465cd79e 100644
--- a/keyboards/ergodox_ez/keymaps/ordinary/readme.md
+++ b/keyboards/ergodox/keymaps/ordinary/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/osx_de/keymap.c b/keyboards/ergodox/keymaps/osx_de/keymap.c
index 554813d7e..e3b9e11f4 100644
--- a/keyboards/ergodox_ez/keymaps/osx_de/keymap.c
+++ b/keyboards/ergodox/keymaps/osx_de/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
 #include "debug.h"
 #include "action_layer.h"
 #include "keymap_german_osx.h"
diff --git a/keyboards/ergodox_ez/keymaps/osx_de/osx_de_highres.png b/keyboards/ergodox/keymaps/osx_de/osx_de_highres.png
index d442a992c..d442a992c 100644
--- a/keyboards/ergodox_ez/keymaps/osx_de/osx_de_highres.png
+++ b/keyboards/ergodox/keymaps/osx_de/osx_de_highres.png
diff --git a/keyboards/ergodox_ez/keymaps/osx_de/readme.md b/keyboards/ergodox/keymaps/osx_de/readme.md
index 5011a9dd6..5011a9dd6 100644
--- a/keyboards/ergodox_ez/keymaps/osx_de/readme.md
+++ b/keyboards/ergodox/keymaps/osx_de/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/osx_de_adnw_koy/keymap.c b/keyboards/ergodox/keymaps/osx_de_adnw_koy/keymap.c
index 687a5cb8b..6c4312a32 100644
--- a/keyboards/ergodox_ez/keymaps/osx_de_adnw_koy/keymap.c
+++ b/keyboards/ergodox/keymaps/osx_de_adnw_koy/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
 #include "debug.h"
 #include "action_layer.h"
 
diff --git a/keyboards/ergodox_ez/keymaps/osx_de_adnw_koy/osx_de_adnw_koy_highres.png b/keyboards/ergodox/keymaps/osx_de_adnw_koy/osx_de_adnw_koy_highres.png
index 193aa339e..193aa339e 100644
--- a/keyboards/ergodox_ez/keymaps/osx_de_adnw_koy/osx_de_adnw_koy_highres.png
+++ b/keyboards/ergodox/keymaps/osx_de_adnw_koy/osx_de_adnw_koy_highres.png
diff --git a/keyboards/ergodox_ez/keymaps/osx_de_experimental/keymap.c b/keyboards/ergodox/keymaps/osx_de_experimental/keymap.c
index 21d695894..61b6a4fdb 100644
--- a/keyboards/ergodox_ez/keymaps/osx_de_experimental/keymap.c
+++ b/keyboards/ergodox/keymaps/osx_de_experimental/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
 #include "debug.h"
 #include "action_layer.h"
 #include "keymap_neo2.h"
diff --git a/keyboards/ergodox_ez/keymaps/osx_de_experimental/osx_de_experimental_highres.png b/keyboards/ergodox/keymaps/osx_de_experimental/osx_de_experimental_highres.png
index 031d874a7..031d874a7 100644
--- a/keyboards/ergodox_ez/keymaps/osx_de_experimental/osx_de_experimental_highres.png
+++ b/keyboards/ergodox/keymaps/osx_de_experimental/osx_de_experimental_highres.png
diff --git a/keyboards/ergodox_ez/keymaps/osx_de_experimental/readme.md b/keyboards/ergodox/keymaps/osx_de_experimental/readme.md
index e6a101841..e6a101841 100644
--- a/keyboards/ergodox_ez/keymaps/osx_de_experimental/readme.md
+++ b/keyboards/ergodox/keymaps/osx_de_experimental/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/osx_fr/keymap.c b/keyboards/ergodox/keymaps/osx_fr/keymap.c
index de951666d..7dee284fa 100644
--- a/keyboards/ergodox_ez/keymaps/osx_fr/keymap.c
+++ b/keyboards/ergodox/keymaps/osx_fr/keymap.c
@@ -1,5 +1,5 @@
 // French AZERTY version of the default_osx file
-#include "ergodox_ez.h"
+#include "ergodox.h"
 #include "debug.h"
 #include "action_layer.h"
 #include "keymap_french_osx.h"
@@ -184,4 +184,4 @@ void matrix_scan_user(void) {
             break;
     }
 
-};
\ No newline at end of file
+};
diff --git a/keyboards/ergodox_ez/keymaps/osx_kinesis_pnut/keymap.c b/keyboards/ergodox/keymaps/osx_kinesis_pnut/keymap.c
index 1032be549..11281df8a 100644
--- a/keyboards/ergodox_ez/keymaps/osx_kinesis_pnut/keymap.c
+++ b/keyboards/ergodox/keymaps/osx_kinesis_pnut/keymap.c
@@ -5,7 +5,7 @@
 // Only default layer was remapped all others layers are standard Ergodox EZ
 // Very personal mapping of-course, but who knows a starting point for others.
 
-#include "ergodox_ez.h"
+#include "ergodox.h"
 #include "debug.h"
 #include "action_layer.h"
 
diff --git a/keyboards/ergodox_ez/keymaps/plover/keymap.c b/keyboards/ergodox/keymaps/plover/keymap.c
index 8a58a37f6..12b3aa212 100644
--- a/keyboards/ergodox_ez/keymaps/plover/keymap.c
+++ b/keyboards/ergodox/keymaps/plover/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
 #include "debug.h"
 #include "action_layer.h"
 
diff --git a/keyboards/ergodox_ez/keymaps/plums/keymap.c b/keyboards/ergodox/keymaps/plums/keymap.c
index 46eb2e42b..2853455e3 100644
--- a/keyboards/ergodox_ez/keymaps/plums/keymap.c
+++ b/keyboards/ergodox/keymaps/plums/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
 #include "debug.h"
 #include "action_layer.h"
 
diff --git a/keyboards/ergodox_ez/keymaps/plums/plums.png b/keyboards/ergodox/keymaps/plums/plums.png
index 2f127c4ca..2f127c4ca 100644
--- a/keyboards/ergodox_ez/keymaps/plums/plums.png
+++ b/keyboards/ergodox/keymaps/plums/plums.png
diff --git a/keyboards/ergodox_ez/keymaps/plums/readme.md b/keyboards/ergodox/keymaps/plums/readme.md
index b72329eef..b72329eef 100644
--- a/keyboards/ergodox_ez/keymaps/plums/readme.md
+++ b/keyboards/ergodox/keymaps/plums/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-osx/keymap.c b/keyboards/ergodox/keymaps/romanzolotarev-norman-osx/keymap.c
index a66971bef..24d0c4ecb 100644
--- a/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-osx/keymap.c
+++ b/keyboards/ergodox/keymaps/romanzolotarev-norman-osx/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
 #include "debug.h"
 #include "action_layer.h"
 
diff --git a/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-osx/readme.md b/keyboards/ergodox/keymaps/romanzolotarev-norman-osx/readme.md
index 80475ab21..80475ab21 100644
--- a/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-osx/readme.md
+++ b/keyboards/ergodox/keymaps/romanzolotarev-norman-osx/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-osx/romanzolotarev-norman-osx.png b/keyboards/ergodox/keymaps/romanzolotarev-norman-osx/romanzolotarev-norman-osx.png
index 4b9433be2..4b9433be2 100644
--- a/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-osx/romanzolotarev-norman-osx.png
+++ b/keyboards/ergodox/keymaps/romanzolotarev-norman-osx/romanzolotarev-norman-osx.png
diff --git a/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx-hjkl/keymap.c b/keyboards/ergodox/keymaps/romanzolotarev-norman-plover-osx-hjkl/keymap.c
index 7c9f67381..9f41e5189 100644
--- a/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx-hjkl/keymap.c
+++ b/keyboards/ergodox/keymaps/romanzolotarev-norman-plover-osx-hjkl/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
 #include "debug.h"
 #include "action_layer.h"
 
diff --git a/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx-hjkl/readme.md b/keyboards/ergodox/keymaps/romanzolotarev-norman-plover-osx-hjkl/readme.md
index 16cebd091..16cebd091 100644
--- a/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx-hjkl/readme.md
+++ b/keyboards/ergodox/keymaps/romanzolotarev-norman-plover-osx-hjkl/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx-hjkl/romanzolotarev-norman-plover-osx-hjkl.png b/keyboards/ergodox/keymaps/romanzolotarev-norman-plover-osx-hjkl/romanzolotarev-norman-plover-osx-hjkl.png
index cdc535f79..cdc535f79 100644
--- a/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx-hjkl/romanzolotarev-norman-plover-osx-hjkl.png
+++ b/keyboards/ergodox/keymaps/romanzolotarev-norman-plover-osx-hjkl/romanzolotarev-norman-plover-osx-hjkl.png
diff --git a/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keymap.c b/keyboards/ergodox/keymaps/romanzolotarev-norman-plover-osx/keymap.c
index 9971b834c..563e24872 100644
--- a/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/keymap.c
+++ b/keyboards/ergodox/keymaps/romanzolotarev-norman-plover-osx/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
 #include "debug.h"
 #include "action_layer.h"
 
diff --git a/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/readme.md b/keyboards/ergodox/keymaps/romanzolotarev-norman-plover-osx/readme.md
index 804c52a76..804c52a76 100644
--- a/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/readme.md
+++ b/keyboards/ergodox/keymaps/romanzolotarev-norman-plover-osx/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/romanzolotarev-norman-plover-osx.png b/keyboards/ergodox/keymaps/romanzolotarev-norman-plover-osx/romanzolotarev-norman-plover-osx.png
index 10b0752be..10b0752be 100644
--- a/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-plover-osx/romanzolotarev-norman-plover-osx.png
+++ b/keyboards/ergodox/keymaps/romanzolotarev-norman-plover-osx/romanzolotarev-norman-plover-osx.png
diff --git a/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-qwerty-osx/keymap.c b/keyboards/ergodox/keymaps/romanzolotarev-norman-qwerty-osx/keymap.c
index dedac694e..5569f5c74 100644
--- a/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-qwerty-osx/keymap.c
+++ b/keyboards/ergodox/keymaps/romanzolotarev-norman-qwerty-osx/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
 #include "debug.h"
 #include "action_layer.h"
 
diff --git a/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-qwerty-osx/readme.md b/keyboards/ergodox/keymaps/romanzolotarev-norman-qwerty-osx/readme.md
index 0e78c130b..0e78c130b 100644
--- a/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-qwerty-osx/readme.md
+++ b/keyboards/ergodox/keymaps/romanzolotarev-norman-qwerty-osx/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-qwerty-osx/romanzolotarev-norman-qwerty-osx.png b/keyboards/ergodox/keymaps/romanzolotarev-norman-qwerty-osx/romanzolotarev-norman-qwerty-osx.png
index 34762ecb7..34762ecb7 100644
--- a/keyboards/ergodox_ez/keymaps/romanzolotarev-norman-qwerty-osx/romanzolotarev-norman-qwerty-osx.png
+++ b/keyboards/ergodox/keymaps/romanzolotarev-norman-qwerty-osx/romanzolotarev-norman-qwerty-osx.png
diff --git a/keyboards/ergodox_ez/keymaps/sneako/keymap.c b/keyboards/ergodox/keymaps/sneako/keymap.c
index 0c6863102..08cadd685 100644
--- a/keyboards/ergodox_ez/keymaps/sneako/keymap.c
+++ b/keyboards/ergodox/keymaps/sneako/keymap.c
@@ -1,7 +1,7 @@
 // Based on `default_osx`
 // Replace left Bksp with Ctrl/Esc
 // Remove the Ctrl from Z and /
-#include "ergodox_ez.h"
+#include "ergodox.h"
 #include "debug.h"
 #include "action_layer.h"
 
diff --git a/keyboards/ergodox_ez/keymaps/sneako/readme.md b/keyboards/ergodox/keymaps/sneako/readme.md
index 8dd110ee6..8dd110ee6 100644
--- a/keyboards/ergodox_ez/keymaps/sneako/readme.md
+++ b/keyboards/ergodox/keymaps/sneako/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/software_neo2/keymap.c b/keyboards/ergodox/keymaps/software_neo2/keymap.c
index 2eaba0d7d..41ace403d 100644
--- a/keyboards/ergodox_ez/keymaps/software_neo2/keymap.c
+++ b/keyboards/ergodox/keymaps/software_neo2/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
 #include "debug.h"
 #include "action_layer.h"
 #include "keymap_neo2.h"
diff --git a/keyboards/ergodox_ez/keymaps/supercoder/config_user.h b/keyboards/ergodox/keymaps/supercoder/config.h
index 8da138372..2de3599f8 100644
--- a/keyboards/ergodox_ez/keymaps/supercoder/config_user.h
+++ b/keyboards/ergodox/keymaps/supercoder/config.h
@@ -1,7 +1,7 @@
 #ifndef CONFIG_USER_H
 #define CONFIG_USER_H 1
 
-#include "config.h"
+#include "../../config.h"
 
 #undef LOCKING_SUPPORT_ENABLE
 #undef LOCKING_RESYNC_ENABLE
diff --git a/keyboards/ergodox_ez/keymaps/supercoder/images/layout.png b/keyboards/ergodox/keymaps/supercoder/images/layout.png
index c72958c6e..c72958c6e 100644
--- a/keyboards/ergodox_ez/keymaps/supercoder/images/layout.png
+++ b/keyboards/ergodox/keymaps/supercoder/images/layout.png
diff --git a/keyboards/ergodox_ez/keymaps/supercoder/images/supercoder_2000.jpg b/keyboards/ergodox/keymaps/supercoder/images/supercoder_2000.jpg
index d690eaf02..d690eaf02 100644
--- a/keyboards/ergodox_ez/keymaps/supercoder/images/supercoder_2000.jpg
+++ b/keyboards/ergodox/keymaps/supercoder/images/supercoder_2000.jpg
diff --git a/keyboards/ergodox_ez/keymaps/supercoder/keymap.c b/keyboards/ergodox/keymaps/supercoder/keymap.c
index ca21d30fd..775acf2c9 100644
--- a/keyboards/ergodox_ez/keymaps/supercoder/keymap.c
+++ b/keyboards/ergodox/keymaps/supercoder/keymap.c
@@ -2,7 +2,7 @@
  * SuperCoder 2000 layout
  */
 
-#include "ergodox_ez.h"
+#include "ergodox.h"
 
 /* Layers */
 
diff --git a/keyboards/ergodox_ez/keymaps/supercoder/makefile.mk b/keyboards/ergodox/keymaps/supercoder/makefile.mk
index 41a195d9c..41a195d9c 100644
--- a/keyboards/ergodox_ez/keymaps/supercoder/makefile.mk
+++ b/keyboards/ergodox/keymaps/supercoder/makefile.mk
diff --git a/keyboards/ergodox_ez/keymaps/supercoder/readme.md b/keyboards/ergodox/keymaps/supercoder/readme.md
index 97bf7f583..97bf7f583 100644
--- a/keyboards/ergodox_ez/keymaps/supercoder/readme.md
+++ b/keyboards/ergodox/keymaps/supercoder/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/techtomas/keymap.c b/keyboards/ergodox/keymaps/techtomas/keymap.c
index 1ff6618b9..93d59d487 100644
--- a/keyboards/ergodox_ez/keymaps/techtomas/keymap.c
+++ b/keyboards/ergodox/keymaps/techtomas/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
 #include "debug.h"
 #include "action_layer.h"
 
diff --git a/keyboards/ergodox_ez/keymaps/techtomas/readme.md b/keyboards/ergodox/keymaps/techtomas/readme.md
index 36e0591a8..36e0591a8 100644
--- a/keyboards/ergodox_ez/keymaps/techtomas/readme.md
+++ b/keyboards/ergodox/keymaps/techtomas/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/teckinesis/keymap.c b/keyboards/ergodox/keymaps/teckinesis/keymap.c
index ec6ceb96b..2837874f7 100644
--- a/keyboards/ergodox_ez/keymaps/teckinesis/keymap.c
+++ b/keyboards/ergodox/keymaps/teckinesis/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
 #include "led.h"
 #include "debug.h"
 #include "action_layer.h"
diff --git a/keyboards/ergodox_ez/keymaps/teckinesis/ordinary-special.png b/keyboards/ergodox/keymaps/teckinesis/ordinary-special.png
index 6eecf447e..6eecf447e 100644
--- a/keyboards/ergodox_ez/keymaps/teckinesis/ordinary-special.png
+++ b/keyboards/ergodox/keymaps/teckinesis/ordinary-special.png
diff --git a/keyboards/ergodox_ez/keymaps/teckinesis/ordinary-special.txt b/keyboards/ergodox/keymaps/teckinesis/ordinary-special.txt
index a08827c6d..a08827c6d 100644
--- a/keyboards/ergodox_ez/keymaps/teckinesis/ordinary-special.txt
+++ b/keyboards/ergodox/keymaps/teckinesis/ordinary-special.txt
diff --git a/keyboards/ergodox_ez/keymaps/teckinesis/readme.md b/keyboards/ergodox/keymaps/teckinesis/readme.md
index 9494a4d4c..9494a4d4c 100644
--- a/keyboards/ergodox_ez/keymaps/teckinesis/readme.md
+++ b/keyboards/ergodox/keymaps/teckinesis/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/teckinesis/teckinesis-base.json b/keyboards/ergodox/keymaps/teckinesis/teckinesis-base.json
index 69fe28cf7..69fe28cf7 100644
--- a/keyboards/ergodox_ez/keymaps/teckinesis/teckinesis-base.json
+++ b/keyboards/ergodox/keymaps/teckinesis/teckinesis-base.json
diff --git a/keyboards/ergodox_ez/keymaps/teckinesis/teckinesis-base.png b/keyboards/ergodox/keymaps/teckinesis/teckinesis-base.png
index 7c4584e9f..7c4584e9f 100644
--- a/keyboards/ergodox_ez/keymaps/teckinesis/teckinesis-base.png
+++ b/keyboards/ergodox/keymaps/teckinesis/teckinesis-base.png
diff --git a/keyboards/ergodox_ez/keymaps/teckinesis/teckinesis-media.json b/keyboards/ergodox/keymaps/teckinesis/teckinesis-media.json
index 65fe394e8..65fe394e8 100644
--- a/keyboards/ergodox_ez/keymaps/teckinesis/teckinesis-media.json
+++ b/keyboards/ergodox/keymaps/teckinesis/teckinesis-media.json
diff --git a/keyboards/ergodox_ez/keymaps/teckinesis/teckinesis-media.png b/keyboards/ergodox/keymaps/teckinesis/teckinesis-media.png
index cc51605f9..cc51605f9 100644
--- a/keyboards/ergodox_ez/keymaps/teckinesis/teckinesis-media.png
+++ b/keyboards/ergodox/keymaps/teckinesis/teckinesis-media.png
diff --git a/keyboards/ergodox_ez/keymaps/teckinesis/teckinesis-symbol.json b/keyboards/ergodox/keymaps/teckinesis/teckinesis-symbol.json
index 439d0128e..439d0128e 100644
--- a/keyboards/ergodox_ez/keymaps/teckinesis/teckinesis-symbol.json
+++ b/keyboards/ergodox/keymaps/teckinesis/teckinesis-symbol.json
diff --git a/keyboards/ergodox_ez/keymaps/teckinesis/teckinesis-symbol.png b/keyboards/ergodox/keymaps/teckinesis/teckinesis-symbol.png
index 7ca86cf47..7ca86cf47 100644
--- a/keyboards/ergodox_ez/keymaps/teckinesis/teckinesis-symbol.png
+++ b/keyboards/ergodox/keymaps/teckinesis/teckinesis-symbol.png
diff --git a/keyboards/ergodox_ez/keymaps/tkuichooseyou/README.md b/keyboards/ergodox/keymaps/tkuichooseyou/README.md
index ab02fac2c..ab02fac2c 100644
--- a/keyboards/ergodox_ez/keymaps/tkuichooseyou/README.md
+++ b/keyboards/ergodox/keymaps/tkuichooseyou/README.md
diff --git a/keyboards/ergodox_ez/keymaps/tkuichooseyou/compiled.hex b/keyboards/ergodox/keymaps/tkuichooseyou/compiled.hex
index a8cf4527a..a8cf4527a 100644
--- a/keyboards/ergodox_ez/keymaps/tkuichooseyou/compiled.hex
+++ b/keyboards/ergodox/keymaps/tkuichooseyou/compiled.hex
diff --git a/keyboards/ergodox_ez/keymaps/tkuichooseyou/keymap.c b/keyboards/ergodox/keymaps/tkuichooseyou/keymap.c
index 87b77e42e..d1c779186 100644
--- a/keyboards/ergodox_ez/keymaps/tkuichooseyou/keymap.c
+++ b/keyboards/ergodox/keymaps/tkuichooseyou/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
 #include "debug.h"
 #include "action_layer.h"
 
diff --git a/keyboards/ergodox_ez/keymaps/tm2030/keymap.c b/keyboards/ergodox/keymaps/tm2030/keymap.c
index ca8075226..1d861ee7c 100644
--- a/keyboards/ergodox_ez/keymaps/tm2030/keymap.c
+++ b/keyboards/ergodox/keymaps/tm2030/keymap.c
@@ -1,5 +1,5 @@
 /* TypeMatrix-2030-like keymap  */
-#include "ergodox_ez.h"
+#include "ergodox.h"
 #include "debug.h"
 #include "action_layer.h"
 #include "led.h"
diff --git a/keyboards/ergodox_ez/keymaps/tm2030/readme.md b/keyboards/ergodox/keymaps/tm2030/readme.md
index 6cd794726..6cd794726 100644
--- a/keyboards/ergodox_ez/keymaps/tm2030/readme.md
+++ b/keyboards/ergodox/keymaps/tm2030/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/tonyabra_osx/keymap.c b/keyboards/ergodox/keymaps/tonyabra_osx/keymap.c
index 87b9fb676..2a15fcb8d 100644
--- a/keyboards/ergodox_ez/keymaps/tonyabra_osx/keymap.c
+++ b/keyboards/ergodox/keymaps/tonyabra_osx/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
 #include "debug.h"
 #include "action_layer.h"
 
diff --git a/keyboards/ergodox_ez/keymaps/tonyabra_osx/readme.md b/keyboards/ergodox/keymaps/tonyabra_osx/readme.md
index f9d76efc2..f9d76efc2 100644
--- a/keyboards/ergodox_ez/keymaps/tonyabra_osx/readme.md
+++ b/keyboards/ergodox/keymaps/tonyabra_osx/readme.md
diff --git a/keyboards/ergodox/keymaps/townk_osx/config.h b/keyboards/ergodox/keymaps/townk_osx/config.h
new file mode 100644
index 000000000..72d3e9670
--- /dev/null
+++ b/keyboards/ergodox/keymaps/townk_osx/config.h
@@ -0,0 +1,44 @@
+/*
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+Copyright 2013 Oleg Kostyuk <cub.uanic@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef CONFIG_H
+#define CONFIG_H
+
+#include "../../config.h"
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+// #define NO_DEBUG
+
+/* disable print */
+// #define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+//#define NO_ACTION_MACRO
+//#define NO_ACTION_FUNCTION
+//#define DEBUG_MATRIX_SCAN_RATE
+#define ONESHOT_TAP_TOGGLE 2
+#define ONESHOT_TIMEOUT 3000
+
+#endif
diff --git a/keyboards/ergodox_ez/keymaps/townk_osx/keymap.c b/keyboards/ergodox/keymaps/townk_osx/keymap.c
index 07e58a491..5043d49a0 100644
--- a/keyboards/ergodox_ez/keymaps/townk_osx/keymap.c
+++ b/keyboards/ergodox/keymaps/townk_osx/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
 #include "debug.h"
 #include "action_layer.h"
 #include "action_util.h"
diff --git a/keyboards/ergodox_ez/keymaps/townk_osx/makefile.mk b/keyboards/ergodox/keymaps/townk_osx/makefile.mk
index e757557bd..c06021b9f 100644
--- a/keyboards/ergodox_ez/keymaps/townk_osx/makefile.mk
+++ b/keyboards/ergodox/keymaps/townk_osx/makefile.mk
@@ -1,4 +1,2 @@
 # I don't want my keyboard blinking lights when is suppose to be asleep.
-SLEEP_LED_ENABLE = no
-
-CONFIG_H = keymaps/$(KEYMAP)/config.h
+SLEEP_LED_ENABLE = no
\ No newline at end of file
diff --git a/keyboards/ergodox_ez/keymaps/townk_osx/readme.md b/keyboards/ergodox/keymaps/townk_osx/readme.md
index c2853ca17..c2853ca17 100644
--- a/keyboards/ergodox_ez/keymaps/townk_osx/readme.md
+++ b/keyboards/ergodox/keymaps/townk_osx/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/townk_osx/townk_osx_base.png b/keyboards/ergodox/keymaps/townk_osx/townk_osx_base.png
index f9bc8b443..f9bc8b443 100644
--- a/keyboards/ergodox_ez/keymaps/townk_osx/townk_osx_base.png
+++ b/keyboards/ergodox/keymaps/townk_osx/townk_osx_base.png
diff --git a/keyboards/ergodox_ez/keymaps/townk_osx/townk_osx_fn.png b/keyboards/ergodox/keymaps/townk_osx/townk_osx_fn.png
index 983b72348..983b72348 100644
--- a/keyboards/ergodox_ez/keymaps/townk_osx/townk_osx_fn.png
+++ b/keyboards/ergodox/keymaps/townk_osx/townk_osx_fn.png
diff --git a/keyboards/ergodox_ez/keymaps/townk_osx/townk_osx_keypad.png b/keyboards/ergodox/keymaps/townk_osx/townk_osx_keypad.png
index 8f04b4327..8f04b4327 100644
--- a/keyboards/ergodox_ez/keymaps/townk_osx/townk_osx_keypad.png
+++ b/keyboards/ergodox/keymaps/townk_osx/townk_osx_keypad.png
diff --git a/keyboards/ergodox_ez/keymaps/twey/keymap.c b/keyboards/ergodox/keymaps/twey/keymap.c
index 019930f2a..5deacd63f 100644
--- a/keyboards/ergodox_ez/keymaps/twey/keymap.c
+++ b/keyboards/ergodox/keymaps/twey/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
 #include "debug.h"
 #include "action_layer.h"
 #include "keymap_plover.h"
diff --git a/keyboards/ergodox_ez/keymaps/twey/readme.md b/keyboards/ergodox/keymaps/twey/readme.md
index 979e4261e..979e4261e 100644
--- a/keyboards/ergodox_ez/keymaps/twey/readme.md
+++ b/keyboards/ergodox/keymaps/twey/readme.md
diff --git a/keyboards/ergodox_ez/keymaps/workman_osx_mdw/keymap.c b/keyboards/ergodox/keymaps/workman_osx_mdw/keymap.c
index 8effa53b2..c05a1018d 100644
--- a/keyboards/ergodox_ez/keymaps/workman_osx_mdw/keymap.c
+++ b/keyboards/ergodox/keymaps/workman_osx_mdw/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
 #include "debug.h"
 #include "action_layer.h"
 // readme
diff --git a/keyboards/ergodox_ez/keymaps/zweihander-osx/keymap.c b/keyboards/ergodox/keymaps/zweihander-osx/keymap.c
index 3444152bc..40b1d7d6d 100644
--- a/keyboards/ergodox_ez/keymaps/zweihander-osx/keymap.c
+++ b/keyboards/ergodox/keymaps/zweihander-osx/keymap.c
@@ -1,4 +1,4 @@
-#include "ergodox_ez.h"
+#include "ergodox.h"
 #include "debug.h"
 #include "action_layer.h"
 
diff --git a/keyboards/ergodox_ez/keymaps/zweihander-osx/readme.markdown b/keyboards/ergodox/keymaps/zweihander-osx/readme.markdown
index 7bce7c690..7bce7c690 100644
--- a/keyboards/ergodox_ez/keymaps/zweihander-osx/readme.markdown
+++ b/keyboards/ergodox/keymaps/zweihander-osx/readme.markdown
diff --git a/keyboards/ergodox_ez/readme.md b/keyboards/ergodox/readme.md
index 67a5fb095..9afa47410 100644
--- a/keyboards/ergodox_ez/readme.md
+++ b/keyboards/ergodox/readme.md
@@ -1,33 +1,38 @@
 # Getting started
 
-There are two main ways you could customize the ErgoDox EZ.
+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
 
+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 if 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. 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.
 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: create your own totally custom firmware by editing the source files. 
+## 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) 
     - Using a Mac and have homebrew? just run `brew tap osx-cross/avr && brew install avr-libc`
-4. Copy `keyboards/ergodox_ez/keymaps/default/keymap.c` into `keymaps/your_name/keymap.c` (for example, `keymaps/german/keymap.c`)
+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=your_name`. For example, `make keymap=german`. This will result in a hex file, which will be called `ergodox_ez_your_name.hex`, e.g. `ergodox_ez_german.hex`.
-6. Flash this hex file using the [Teensy loader](https://www.pjrc.com/teensy/loader.html) as described in step 4 in the "Easy Way" above. If you prefer you can automatically flash the hex file after successfull build by running `make teensy keymap=your_name`.
-7. Submit your work as a pull request to this repository, so others can also use it. :) See below on specifics.
+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.
+7. **ErgoDox EZ** - Flash this hex file using the [Teensy loader](https://www.pjrc.com/teensy/loader.html) as described in step 4 in the "Easy Way" above. If you prefer you can automatically flash the hex file after successful build by running `make teensy keymap=keymap_name`.
+
+   **Infinity ErgoDox** - Flash the firmware by running `make dfu-util keymap=keymap_name subproject=infinity`
+8. Submit your work as a pull request to this repository, so others can also use it. :) See below on specifics.
 
 Good luck! :)
 
 ## Contributing your keymap
 
-The ErgoDox EZ 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 EZ. To make it easy for these people to use your layout, I recommend submitting your PR in the following format. 
+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. 
 
 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.
diff --git a/keyboards/ergodox_ez/keymaps/townk_osx/config.h b/keyboards/ergodox_ez/keymaps/townk_osx/config.h
deleted file mode 100644
index 58ba690af..000000000
--- a/keyboards/ergodox_ez/keymaps/townk_osx/config.h
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2013 Oleg Kostyuk <cub.uanic@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef CONFIG_H
-#define CONFIG_H
-
-#include "config_common.h"
-
-/* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x1307
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    ErgoDox EZ
-#define PRODUCT         ErgoDox EZ
-#define DESCRIPTION     t.m.k. keyboard firmware for Ergodox
-
-/* key matrix size */
-#define MATRIX_ROWS 14
-#define MATRIX_COLS 6
-
-#define MOUSEKEY_DELAY          100
-#define MOUSEKEY_INTERVAL       20
-#define MOUSEKEY_MAX_SPEED      3
-#define MOUSEKEY_TIME_TO_MAX    10
-
-#define TAPPING_TOGGLE  1
-
-#define COLS (int []){ F1, F0, B0, C7, F4, F5, F6, F7, D4, D6, B4, D7 }
-#define ROWS (int []){ D0, D5, B5, B6 }
-
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION COL2ROW
-
-/* define if matrix has ghost */
-//#define MATRIX_HAS_GHOST
-
-/* number of backlight levels */
-#define BACKLIGHT_LEVELS 3
-
-/* Set 0 if debouncing isn't needed */
-#define DEBOUNCE    2
-#define TAPPING_TERM    200
-#define IGNORE_MOD_TAP_INTERRUPT // this makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.)
-
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
-/* key combination for command */
-#define IS_COMMAND() ( \
-    keyboard_report->mods == (MOD_BIT(KC_LCTL) | MOD_BIT(KC_RCTL)) || \
-    keyboard_report->mods == (MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT)) \
-)
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-// #define NO_DEBUG
-
-/* disable print */
-// #define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
-//#define DEBUG_MATRIX_SCAN_RATE
-#define ONESHOT_TAP_TOGGLE 2
-#define ONESHOT_TIMEOUT 3000
-
-#endif
diff --git a/keyboards/infinity_ergodox/infinity_ergodox.h b/keyboards/infinity_ergodox/infinity_ergodox.h
deleted file mode 100644
index de7267594..000000000
--- a/keyboards/infinity_ergodox/infinity_ergodox.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#ifndef KEYBOARDS_INFINITY_ERGODOX_INFINITY_ERGODOX_H_
-#define KEYBOARDS_INFINITY_ERGODOX_INFINITY_ERGODOX_H_
-
-#include "quantum.h"
-
-#define KEYMAP( \
-    A80, A70, A60, A50, A40, A30, A20,  \
-    A81, A71, A61, A51, A41, A31, A21,  \
-    A82, A72, A62, A52, A42, A32,       \
-    A83, A73, A63, A53, A43, A33, A23,  \
-    A84, A74, A64, A54, A44,            \
-                                  A13, A03, \
-                                       A04, \
-                             A34, A24, A14, \
-         B20, B30, B40, B50, B60, B70, B80, \
-         B21, B31, B41, B51, B61, B71, B81, \
-              B32, B42, B52, B62, B72, B82, \
-         B23, B33, B43, B53, B63, B73, B83, \
-                   B44, B54, B64, B74, B84, \
-    B03, B13,     \
-    B04,          \
-    B14, B24, B34 \
-) { \
-    { KC_NO,    KC_NO,    KC_NO,    KC_##A03, KC_##A04 }, \
-    { KC_NO,    KC_NO,    KC_NO,    KC_##A13, KC_##A14 }, \
-    { KC_##A20, KC_##A21, KC_NO,    KC_##A23, KC_##A24 }, \
-    { KC_##A30, KC_##A31, KC_##A32, KC_##A33, KC_##A34 }, \
-    { KC_##A40, KC_##A41, KC_##A42, KC_##A43, KC_##A44 }, \
-    { KC_##A50, KC_##A51, KC_##A52, KC_##A53, KC_##A54 }, \
-    { KC_##A60, KC_##A61, KC_##A62, KC_##A63, KC_##A64 }, \
-    { KC_##A70, KC_##A71, KC_##A72, KC_##A73, KC_##A74 }, \
-    { KC_##A80, KC_##A81, KC_##A82, KC_##A83, KC_##A84 }, \
-    { KC_NO,    KC_NO,    KC_NO,    KC_##B03, KC_##B04 }, \
-    { KC_NO,    KC_NO,    KC_NO,    KC_##B13, KC_##B14 }, \
-    { KC_##B20, KC_##B21, KC_NO,    KC_##B23, KC_##B24 }, \
-    { KC_##B30, KC_##B31, KC_##B32, KC_##B33, KC_##B34 }, \
-    { KC_##B40, KC_##B41, KC_##B42, KC_##B43, KC_##B44 }, \
-    { KC_##B50, KC_##B51, KC_##B52, KC_##B53, KC_##B54 }, \
-    { KC_##B60, KC_##B61, KC_##B62, KC_##B63, KC_##B64 }, \
-    { KC_##B70, KC_##B71, KC_##B72, KC_##B73, KC_##B74 }, \
-    { KC_##B80, KC_##B81, KC_##B82, KC_##B83, KC_##B84 }  \
-}
-
-#endif /* KEYBOARDS_INFINITY_ERGODOX_INFINITY_ERGODOX_H_ */
diff --git a/keyboards/infinity_ergodox/keymaps/default/keymap.c b/keyboards/infinity_ergodox/keymaps/default/keymap.c
deleted file mode 100644
index f1e6b1c8a..000000000
--- a/keyboards/infinity_ergodox/keymaps/default/keymap.c
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
-Copyright 2016 Fred Sundvik <fsundvik@gmail.com>
-Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "infinity_ergodox.h"
-
-// Workaround for old keymap format
-#define KC_RESET RESET
-
-const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    KEYMAP(  // layer 0 : default
-        // left hand
-        EQL, 1,   2,   3,   4,   5,   ESC,
-        BSLS,Q,   W,   E,   R,   T,   FN1,
-        TAB, A,   S,   D,   F,   G,
-        LSFT,Z,   X,   C,   V,   B,   FN0,
-        LGUI,GRV, BSLS,LEFT,RGHT,
-                                      LCTL,LALT,
-                                           HOME,
-                                 BSPC,DEL, END,
-        // right hand
-             FN2, 6,   7,   8,   9,   0,   MINS,
-             LBRC,Y,   U,   I,   O,   P,   RBRC,
-                  H,   J,   K,   L,   SCLN,QUOT,
-             FN0, N,   M,   COMM,DOT, SLSH,RSFT,
-                       LEFT,DOWN,UP,  RGHT,RGUI,
-        RALT,RCTL,
-        PGUP,
-        PGDN,ENT, SPC
-    ),
-
-    KEYMAP(  // layer 1 : function and symbol keys
-        // left hand
-        TRNS,F1,  F2,  F3,  F4,  F5,  F11,
-        TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,FN3,
-        TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,
-        TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,
-        TRNS,TRNS,TRNS,TRNS,TRNS,
-                                      TRNS,TRNS,
-                                           TRNS,
-                                 TRNS,TRNS,TRNS,
-        // right hand
-             F12, F6,  F7,  F8,  F9,  F10, TRNS,
-             TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,
-                  TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,
-             TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,
-                       TRNS,TRNS,TRNS,TRNS,TRNS,
-        TRNS,TRNS,
-        TRNS,
-        TRNS,TRNS,TRNS
-    ),
-
-    KEYMAP(  // layer 2 : keyboard functions
-        // left hand
-        RESET,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,
-        TRNS,TRNS,TRNS,TRNS,TRNS,TRNS, FN3,
-        TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,
-        TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,
-        TRNS,TRNS,TRNS,TRNS,TRNS,
-                                      TRNS,TRNS,
-                                           TRNS,
-                                 TRNS,TRNS,TRNS,
-        // right hand
-             TRNS, TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,
-             TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,
-                  TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,
-             TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,
-                       TRNS,TRNS,TRNS,TRNS,TRNS,
-        TRNS,TRNS,
-        TRNS,
-        TRNS,TRNS,TRNS
-    ),
-
-    KEYMAP(  // layer 3: numpad
-        // left hand
-        TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,
-        TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,
-        TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,
-        TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,TRNS,
-        TRNS,TRNS,TRNS,TRNS,TRNS,
-                                      TRNS,TRNS,
-                                           TRNS,
-                                 TRNS,TRNS,TRNS,
-        // right hand
-             TRNS,NLCK,PSLS,PAST,PAST,PMNS,BSPC,
-             TRNS,NO,  P7,  P8,  P9,  PMNS,BSPC,
-                  NO,  P4,  P5,  P6,  PPLS,PENT,
-             TRNS,NO,  P1,  P2,  P3,  PPLS,PENT,
-                       P0,  PDOT,SLSH,PENT,PENT,
-        TRNS,TRNS,
-        TRNS,
-        TRNS,TRNS,TRNS
-    ),
-};
-const uint16_t fn_actions[] = {
-    ACTION_LAYER_MOMENTARY(1),                      // FN0 - switch to Layer1
-    ACTION_LAYER_SET(2, ON_PRESS),                  // FN1 - set Layer2
-    ACTION_LAYER_TOGGLE(3),                         // FN2 - toggle Layer3 aka Numpad layer
-    ACTION_LAYER_SET(0, ON_PRESS),                  // FN3 - set Layer0
-};
diff --git a/keyboards/infinity_ergodox/keymaps/default/visualizer.c b/keyboards/infinity_ergodox/keymaps/default/visualizer.c
deleted file mode 100644
index c0d335ce6..000000000
--- a/keyboards/infinity_ergodox/keymaps/default/visualizer.c
+++ /dev/null
@@ -1,168 +0,0 @@
-/*
-Copyright 2016 Fred Sundvik <fsundvik@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-// Currently we are assuming that both the backlight and LCD are enabled
-// But it's entirely possible to write a custom visualizer that use only
-// one of them
-#ifndef LCD_BACKLIGHT_ENABLE
-#error This visualizer needs that LCD backlight is enabled
-#endif
-
-#ifndef LCD_ENABLE
-#error This visualizer needs that LCD is enabled
-#endif
-
-#include "visualizer.h"
-#include "led_test.h"
-
-static const char* welcome_text[] = {"TMK", "Infinity Ergodox"};
-
-// Just an example how to write custom keyframe functions, we could have moved
-// all this into the init function
-bool display_welcome(keyframe_animation_t* animation, visualizer_state_t* state) {
-    (void)animation;
-    // Read the uGFX documentation for information how to use the displays
-    // http://wiki.ugfx.org/index.php/Main_Page
-    gdispClear(White);
-    // You can use static variables for things that can't be found in the animation
-    // or state structs
-    gdispDrawString(0, 3, welcome_text[0], state->font_dejavusansbold12, Black);
-    gdispDrawString(0, 15, welcome_text[1], state->font_dejavusansbold12, Black);
-    // Always remember to flush the display
-    gdispFlush();
-    // you could set the backlight color as well, but we won't do it here, since
-    // it's part of the following animation
-    // lcd_backlight_color(hue, saturation, intensity);
-    // We don't need constant updates, just drawing the screen once is enough
-    return false;
-}
-
-// Feel free to modify the animations below, or even add new ones if needed
-
-// Don't worry, if the startup animation is long, you can use the keyboard like normal
-// during that time
-static keyframe_animation_t startup_animation = {
-    .num_frames = 4,
-    .loop = false,
-    .frame_lengths = {0, gfxMillisecondsToTicks(1000), gfxMillisecondsToTicks(5000), 0},
-    .frame_functions = {
-            display_welcome,
-            keyframe_animate_backlight_color,
-            keyframe_no_operation,
-            enable_visualization
-    },
-};
-
-// The color animation animates the LCD color when you change layers
-static keyframe_animation_t color_animation = {
-    .num_frames = 2,
-    .loop = false,
-    // Note that there's a 200 ms no-operation frame,
-    // this prevents the color from changing when activating the layer
-    // momentarily
-    .frame_lengths = {gfxMillisecondsToTicks(200), gfxMillisecondsToTicks(500)},
-    .frame_functions = {keyframe_no_operation, keyframe_animate_backlight_color},
-};
-
-// The LCD animation alternates between the layer name display and a
-// bitmap that displays all active layers
-static keyframe_animation_t lcd_animation = {
-    .num_frames = 2,
-    .loop = true,
-    .frame_lengths = {gfxMillisecondsToTicks(2000), gfxMillisecondsToTicks(2000)},
-    .frame_functions = {keyframe_display_layer_text, keyframe_display_layer_bitmap},
-};
-
-static keyframe_animation_t suspend_animation = {
-    .num_frames = 3,
-    .loop = false,
-    .frame_lengths = {0, gfxMillisecondsToTicks(1000), 0},
-    .frame_functions = {
-            keyframe_display_layer_text,
-            keyframe_animate_backlight_color,
-            keyframe_disable_lcd_and_backlight,
-    },
-};
-
-static keyframe_animation_t resume_animation = {
-    .num_frames = 5,
-    .loop = false,
-    .frame_lengths = {0, 0, gfxMillisecondsToTicks(1000), gfxMillisecondsToTicks(5000), 0},
-    .frame_functions = {
-            keyframe_enable_lcd_and_backlight,
-            display_welcome,
-            keyframe_animate_backlight_color,
-            keyframe_no_operation,
-            enable_visualization,
-    },
-};
-
-void initialize_user_visualizer(visualizer_state_t* state) {
-    // The brightness will be dynamically adjustable in the future
-    // But for now, change it here.
-    lcd_backlight_brightness(0x50);
-    state->current_lcd_color = LCD_COLOR(0x00, 0x00, 0xFF);
-    state->target_lcd_color = LCD_COLOR(0x10, 0xFF, 0xFF);
-    start_keyframe_animation(&startup_animation);
-    start_keyframe_animation(&led_test_animation);
-}
-
-void update_user_visualizer_state(visualizer_state_t* state) {
-    // Add more tests, change the colors and layer texts here
-    // Usually you want to check the high bits (higher layers first)
-    // because that's the order layers are processed for keypresses
-    // You can for check for example:
-    // state->status.layer
-    // state->status.default_layer
-    // state->status.leds (see led.h for available statuses)
-    if (state->status.layer & 0x8) {
-        state->target_lcd_color = LCD_COLOR(0xC0, 0xB0, 0xFF);
-        state->layer_text = "Numpad";
-    }
-    else if (state->status.layer & 0x4) {
-        state->target_lcd_color = LCD_COLOR(0, 0xB0, 0xFF);
-        state->layer_text = "KBD functions";
-    }
-    else if (state->status.layer & 0x2) {
-        state->target_lcd_color = LCD_COLOR(0x80, 0xB0, 0xFF);
-        state->layer_text = "Function keys";
-    }
-    else {
-        state->target_lcd_color = LCD_COLOR(0x40, 0xB0, 0xFF);
-        state->layer_text = "Default";
-    }
-    // You can also stop existing animations, and start your custom ones here
-    // remember that you should normally have only one animation for the LCD
-    // and one for the background. But you can also combine them if you want.
-    start_keyframe_animation(&lcd_animation);
-    start_keyframe_animation(&color_animation);
-}
-
-void user_visualizer_suspend(visualizer_state_t* state) {
-    state->layer_text = "Suspending...";
-    uint8_t hue = LCD_HUE(state->current_lcd_color);
-    uint8_t sat = LCD_SAT(state->current_lcd_color);
-    state->target_lcd_color = LCD_COLOR(hue, sat, 0);
-    start_keyframe_animation(&suspend_animation);
-}
-
-void user_visualizer_resume(visualizer_state_t* state) {
-    state->current_lcd_color = LCD_COLOR(0x00, 0x00, 0x00);
-    state->target_lcd_color = LCD_COLOR(0x10, 0xFF, 0xFF);
-    start_keyframe_animation(&resume_animation);
-    start_keyframe_animation(&led_test_animation);
-}
diff --git a/quantum/quantum.h b/quantum/quantum.h
index 7ebfb24e3..6e3fbcc79 100644
--- a/quantum/quantum.h
+++ b/quantum/quantum.h
@@ -25,6 +25,7 @@
 #include "led.h"
 #include "action_util.h"
 #include <stdlib.h>
+#include "print.h"
 
 
 extern uint32_t default_layer_state;
diff --git a/tmk_core/common/print.h b/tmk_core/common/print.h
index 0368bcd4a..a1352527f 100644
--- a/tmk_core/common/print.h
+++ b/tmk_core/common/print.h
@@ -29,7 +29,9 @@
 #include <stdbool.h>
 #include "util.h"
 
-
+#if defined(PROTOCOL_CHIBIOS)
+#define PSTR(x) x
+#endif
 
 
 #ifndef NO_PRINT
diff --git a/tmk_core/rules.mk b/tmk_core/rules.mk
index 2bf2a109f..c81fa6854 100644
--- a/tmk_core/rules.mk
+++ b/tmk_core/rules.mk
@@ -253,6 +253,14 @@ MSG_SUBMODULE_DIRTY = $(WARN_COLOR)WARNING:$(NO_COLOR)\n \
 
 # Define all object files.
 OBJ = $(patsubst %.c,$(OBJDIR)/%.o,$(patsubst %.cpp,$(OBJDIR)/%.o,$(patsubst %.S,$(OBJDIR)/%.o,$(SRC))))
+# The files in the lib folder are shared between all keymaps, so generate that folder name by removing
+# the keymap from the name
+KBOBJDIR=$(subst _$(KEYMAP),,$(OBJDIR))
+# And fixup the object files to match
+LIBOBJ = $(foreach v,$(OBJ),$(if $(findstring /lib/,$v),$v))
+NONLIBOBJ := $(filter-out $(LIBOBJ),$(OBJ))
+LIBOBJ := $(subst _$(KEYMAP)/,/,$(LIBOBJ))
+OBJ := $(LIBOBJ) $(NONLIBOBJ)
 
 # Define all listing files.
 LST = $(patsubst %.c,$(OBJDIR)/%.lst,$(patsubst %.cpp,$(OBJDIR)/%.lst,$(patsubst %.S,$(OBJDIR)/%.lst,$(SRC))))
@@ -370,20 +378,35 @@ BEGIN = gccversion check_submodule sizebefore
 	$(eval CMD=$(CC) $(ALL_CFLAGS) $^ --output $@ $(LDFLAGS))
 	@$(BUILD_CMD)
 
+define GEN_OBJRULE
 # Compile: create object files from C source files.
-$(OBJDIR)/%.o : %.c | $(BEGIN)
-	@mkdir -p $(@D)
-	@$(SILENT) || printf "$(MSG_COMPILING) $<" | $(AWK_CMD)
-	$(eval CMD=$(CC) -c $(ALL_CFLAGS) $< -o $@)
-	@$(BUILD_CMD)
+$1/%.o : %.c | $(BEGIN)
+	@mkdir -p $$(@D)
+	@$$(SILENT) || printf "$$(MSG_COMPILING) $$<" | $$(AWK_CMD)
+	$$(eval CMD=$$(CC) -c $$(ALL_CFLAGS) $$< -o $$@)
+	@$$(BUILD_CMD)
 
 # Compile: create object files from C++ source files.
-$(OBJDIR)/%.o : %.cpp | $(BEGIN)
-	@mkdir -p $(@D)
-	@$(SILENT) || printf "$(MSG_COMPILING_CPP) $<" | $(AWK_CMD)
-	$(eval CMD=$(CC) -c $(ALL_CPPFLAGS) $< -o $@)
+$1/%.o : %.cpp | $(BEGIN)
+	@mkdir -p $$(@D)
+	@$$(SILENT) || printf "$$(MSG_COMPILING_CPP) $$<" | $$(AWK_CMD)
+	$$(eval CMD=$$(CC) -c $$(ALL_CPPFLAGS) $$< -o $$@)
 	@$(BUILD_CMD)
 
+# Assemble: create object files from assembler source files.
+$1/%.o : %.S | $(BEGIN)
+	@mkdir -p $$(@D)
+	@$(SILENT) || printf "$$(MSG_ASSEMBLING) $$<" | $$(AWK_CMD)
+	$$(eval CMD=$$(CC) -c $$(ALL_ASFLAGS) $$< -o $$@)
+	@$$(BUILD_CMD)
+
+endef
+
+# 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)))
+$(eval $(call GEN_OBJRULE,$(KBOBJDIR)))
+
 # Compile: create assembler files from C source files.
 %.s : %.c | $(BEGIN)
 	@$(SILENT) || printf "$(MSG_ASSEMBLING) $<" | $(AWK_CMD)
@@ -396,13 +419,6 @@ $(OBJDIR)/%.o : %.cpp | $(BEGIN)
 	$(eval CMD=$(CC) -S $(ALL_CPPFLAGS) $< -o $@)
 	@$(BUILD_CMD)
 
-# Assemble: create object files from assembler source files.
-$(OBJDIR)/%.o : %.S | $(BEGIN)
-	@mkdir -p $(@D)
-	@$(SILENT) || printf "$(MSG_ASSEMBLING) $<" | $(AWK_CMD)
-	$(eval CMD=$(CC) -c $(ALL_ASFLAGS) $< -o $@)
-	@$(BUILD_CMD)
-
 # Create preprocessed source for use in sending a bug report.
 %.i : %.c | $(BEGIN)
 	$(CC) -E -mmcu=$(MCU) $(CFLAGS) $< -o $@
@@ -486,7 +502,7 @@ $(shell mkdir $(BUILD_DIR) 2>/dev/null)
 
 # Create object files directory
 $(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/*)