Merge remote-tracking branch 'upstream/master'

15 files changed, 471 insertions, 59 deletions

diff --git a/keyboards/lily58/config.h b/keyboards/lily58/config.h
index fb1cdf396..50bf2beb3 100644
--- a/keyboards/lily58/config.h
+++ b/keyboards/lily58/config.h
@@ -24,5 +24,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define USE_I2C
 #define USE_SERIAL
 
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
+#if !defined(NO_ACTION_MACRO)
+    #define NO_ACTION_MACRO
+#endif
+#if !defined(NO_ACTION_FUNCTION)
+    #define NO_ACTION_FUNCTION
+#endif
diff --git a/keyboards/lily58/keymaps/bcat/config.h b/keyboards/lily58/keymaps/bcat/config.h
new file mode 100644
index 000000000..180926204
--- /dev/null
+++ b/keyboards/lily58/keymaps/bcat/config.h
@@ -0,0 +1,3 @@
+#pragma once
+
+#define EE_HANDS
diff --git a/keyboards/lily58/keymaps/bcat/keymap.c b/keyboards/lily58/keymaps/bcat/keymap.c
new file mode 100644
index 000000000..9a85a55e1
--- /dev/null
+++ b/keyboards/lily58/keymaps/bcat/keymap.c
@@ -0,0 +1,55 @@
+#include QMK_KEYBOARD_H
+
+enum layer {
+    LAYER_DEFAULT,
+    LAYER_LOWER,
+    LAYER_RAISE,
+    LAYER_ADJUST,
+};
+
+#define LY_LWR MO(LAYER_LOWER)
+#define LY_RSE MO(LAYER_RAISE)
+
+#define KY_CESC LCTL_T(KC_ESC)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Default layer: http://www.keyboard-layout-editor.com/#/gists/e0eb3af65961e9fd612dcff3ddd88e4f */
+    [LAYER_DEFAULT] = LAYOUT(
+        KC_EQL,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,                         KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,                         KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_BSPC,
+        KY_CESC,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,                         KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,
+        KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_WBAK,  KC_WFWD,  KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,
+                                      KC_LCTL,  KC_LALT,  LY_LWR,   KC_SPC,   KC_ENT,   LY_RSE,   KC_RGUI,  KC_APP
+    ),
+
+    /* Lower layer: http://www.keyboard-layout-editor.com/#/gists/19ad0d3b5d745fbb2818db09740f5a11 */
+    [LAYER_LOWER] = LAYOUT(
+        _______,  _______,  _______,  _______,  _______,  _______,                      _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,   KC_PERC,                      KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_LPRN,  KC_RPRN,  _______,
+        _______,  _______,  _______,  KC_PIPE,  KC_TILD,  KC_DEL,                       _______,  KC_UNDS,  KC_PLUS,  KC_LCBR,  KC_RCBR,  _______,
+        _______,  _______,  _______,  KC_BSLS,  KC_GRV,   KC_INS,   _______,  _______,  _______,  KC_MINS,  KC_EQL,   KC_LBRC,  KC_RBRC,  _______,
+                                      _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______
+    ),
+
+    /* Raise layer: http://www.keyboard-layout-editor.com/#/gists/912be7955f781cdaf692cc4d4c0b5823 */
+    [LAYER_RAISE] = LAYOUT(
+        _______,  _______,  _______,  _______,  _______,  _______,                      _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  KC_1,     KC_2,     KC_3,     KC_4,     KC_5,                         KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     _______,
+        _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,                        KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  KC_HOME,  KC_PGUP,
+        _______,  KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   _______,  _______,  KC_F11,   KC_F12,   _______,  _______,  KC_END,   KC_PGDN,
+                                      _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______
+    ),
+
+    /* Adjust layer: http://www.keyboard-layout-editor.com/#/gists/8f6a3f08350a9bbe1d414b22bca4e6c7 */
+    [LAYER_ADJUST] = LAYOUT(
+        _______,  _______,  _______,  _______,  _______,  _______,                      _______,  _______,  _______,  _______,  _______,  _______,
+        KC_CAPS,  _______,  KC_MPLY,  KC_VOLU,  KC_MSTP,  _______,                      EEP_RST,  RESET,    KC_PSCR,  KC_SLCK,  KC_PAUS,  _______,
+        _______,  _______,  KC_MPRV,  KC_VOLD,  KC_MNXT,  _______,                      _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______,  KC_MUTE,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+                                      _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______
+    ),
+};
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+    return update_tri_layer_state(state, LAYER_LOWER, LAYER_RAISE, LAYER_ADJUST);
+}
diff --git a/keyboards/lily58/keymaps/bcat/readme.md b/keyboards/lily58/keymaps/bcat/readme.md
new file mode 100644
index 000000000..f90c5110b
--- /dev/null
+++ b/keyboards/lily58/keymaps/bcat/readme.md
@@ -0,0 +1,68 @@
+# bcat's Lily58 layout
+
+This split ergo layout is standard QWERTY on the default layer, with symbols on
+the lower layer, numbers/navigation on the raise layer, and media keys centered
+around the ESDF cluster in the adjust (raise + lower) layer. A few general
+principles went into this layout:
+
+* The number row is optional, as are the outermost bottom row keys and the
+"extra" keys on the innnermost columns below the controllers. This will enable
+easy translation to a Crkbd or similar 40% ortho if I go that route.
+
+* Space and Enter are on the big thumb keys so they're easy to press
+(particularly with G20 or other low-profile keycaps there).
+
+* There are two shift keys because really, Right Shift is important.
+
+* Arrow keys are on VIM-style HJKL keys.
+
+* Home/End and Page Up/Page Down are easy to reach and in a square kind of like
+on the HHKB.
+
+* Navigation should be usable with just the right hand, to enable left-handed
+mousing at the same time. Additionally, Web page scrolling (Space, Shift+Space)
+should be possible with just the left hand, for writing at the same time as
+scrolling.
+
+* Escape is easy to reach because Vim.
+
+* Since most of the modifiers are on the left half, keys frequently pressed
+together with mods (e.g., numbers, function keys, etc.) are on the Raise layer
+activated by the right thumb.
+
+* Every key on a TKL has a binding.
+
+* Backspace is bound in the same place on every layer to avoid having to let go
+of layer-shift keys to fix a mistake.
+
+* Likewise, the comma and period keys are not rebound on the raise layer to
+allow typing numbers with thousand separators and decimal points without
+releasing the layer key.
+
+* Brackets and braces are on or near the home row for quick access when coding.
+
+* Other than Right Shift (sorry), modifiers aren't rebound on layers.
+
+## Default layer
+
+![Default layer layout](https://i.imgur.com/wx1brJV.png)
+
+([KLE](http://www.keyboard-layout-editor.com/#/gists/e0eb3af65961e9fd612dcff3ddd88e4f))
+
+## Lower layer
+
+![Lower layer layout](https://i.imgur.com/ytNFySG.png)
+
+([KLE](http://www.keyboard-layout-editor.com/#/gists/19ad0d3b5d745fbb2818db09740f5a11))
+
+## Raise layer
+
+![Raise layer layout](https://i.imgur.com/S7S29G6.png)
+
+([KLE](http://www.keyboard-layout-editor.com/#/gists/912be7955f781cdaf692cc4d4c0b5823))
+
+## Adjust layer
+
+![Adjust layer layout](https://i.imgur.com/fCIySG2.png)
+
+([KLE](http://www.keyboard-layout-editor.com/#/gists/8f6a3f08350a9bbe1d414b22bca4e6c7))
diff --git a/keyboards/lily58/keymaps/bcat/rules.mk b/keyboards/lily58/keymaps/bcat/rules.mk
new file mode 100644
index 000000000..c87b447c1
--- /dev/null
+++ b/keyboards/lily58/keymaps/bcat/rules.mk
@@ -0,0 +1 @@
+BOOTLOADER = atmel-dfu  # Elite-C
diff --git a/keyboards/lily58/keymaps/default/keymap.c b/keyboards/lily58/keymaps/default/keymap.c
index b8dda17d5..f36248e12 100644
--- a/keyboards/lily58/keymaps/default/keymap.c
+++ b/keyboards/lily58/keymaps/default/keymap.c
@@ -9,7 +9,6 @@
 #endif
 
 
-extern keymap_config_t keymap_config;
 
 #ifdef RGBLIGHT_ENABLE
 //Following line allows macro to read current RGB settings
diff --git a/keyboards/lily58/keymaps/ninjonas/README.md b/keyboards/lily58/keymaps/ninjonas/README.md
new file mode 100644
index 000000000..862252840
--- /dev/null
+++ b/keyboards/lily58/keymaps/ninjonas/README.md
@@ -0,0 +1,134 @@
+# ninjonas Keymap for [Lily58 Pro](https://github.com/kata0510/Lily58)
+
+## Keymap
+This keymap is designed based off my typing habits and is subject to change. Information about custom user macros and tap dances can be found [here](../../../../users/ninjonas).
+
+More information about the Lily58 pro keyboard can be found [here](https://yuchi-kbd.hatenablog.com/entry/2018/12/23/214342)
+
+### QWERTY
+```c
+/* QWERTY
+ * ,-----------------------------------------.                    ,-----------------------------------------.
+ * |   `  |   1  |   2  |   3  |   4  |   5  |                    |   6  |   7  |   8  |   9  |   0  |  -   |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * | Tab  |   Q  |   W  |   E  |   R  |   T  |                    |   Y  |   U  |   I  |   O  |   P  |  \   |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * | ESC  |   A  |   S  |   D  |   F  |   G  |-------.    ,-------|   H  |   J  |   K  |   L  |   ;  |  '   |
+ * |------+------+------+------+------+------|   [   |    |    ]  |------+------+------+------+------+------|
+ * |LShift|   Z  |   X  |   C  |   V  |   B  |-------|    |-------|   N  |   M  |   ,  |   .  |   /  |   =  |
+ * `-----------------------------------------/       /     \      \-----------------------------------------'
+ *                   | Alt  |     | Ctrl | /Space  /       \Enter \  |BackSP| Del  |LOWER |
+ *                   |      |      |      |/       /         \      \ |      |      |      |
+ *                   `----------------------------'           '------''--------------------'
+ */
+```
+
+### DVORAK
+```c
+/* DVORAK
+ * ,-----------------------------------------.                    ,-----------------------------------------.
+ * |   `  |   1  |   2  |   3  |   4  |   5  |                    |   6  |   7  |   8  |   9  |   0  |  -   |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * | Tab  |   '  |   ,  |   .  |   P  |   Y  |                    |   F  |   G  |   C  |   R  |   L  |  \   |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * | ESC  |   A  |   O  |   E  |   U  |   I  |-------.    ,-------|   D  |   H  |   T  |   N  |   S  |  /   |
+ * |------+------+------+------+------+------|   [   |    |    ]  |------+------+------+------+------+------|
+ * |LShift|   ;  |   Q  |   J  |   K  |   X  |-------|    |-------|   B  |   M  |   W  |   V  |   Z  |   =  |
+ * `-----------------------------------------/       /     \      \-----------------------------------------'
+ *                   | Alt  |     | Ctrl | /Space  /       \Enter \  |BackSP| Del  |LOWER |
+ *                   |      |      |      |/       /         \      \ |      |      |      |
+ *                   `----------------------------'           '------''--------------------'
+ */
+```
+
+### COLEMAK
+```c
+/* COLEMAK
+ * ,-----------------------------------------.                    ,-----------------------------------------.
+ * |   `  |   1  |   2  |   3  |   4  |   5  |                    |   6  |   7  |   8  |   9  |   0  |  -   |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * | Tab  |   Q  |   W  |   F  |   P  |   G  |                    |   J  |   L  |   U  |   Y  |   ;  |  \   |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * | ESC  |   A  |   R  |   S  |   T  |   D  |-------.    ,-------|   H  |   N  |   E  |   I  |   O  |  '   |
+ * |------+------+------+------+------+------|   [   |    |    ]  |------+------+------+------+------+------|
+ * |LShift|   Z  |   X  |   C  |   V  |   B  |-------|    |-------|   K  |   M  |   ,  |   .  |   /  |   =  |
+ * `-----------------------------------------/       /     \      \-----------------------------------------'
+ *                   | Alt  |     | Ctrl | /Space  /       \Enter \  |BackSP| Del  |LOWER |
+ *                   |      |      |      |/       /         \      \ |      |      |      |
+ *                   `----------------------------'           '------''--------------------'
+ */
+```
+
+### LOWER
+```c
+/* LOWER
+ * ,------------------------------------------.                    ,------------------------------------------.
+ * | F11  |  F1  |  F2  |  F3   |  F4  |  F5  |                    |  F6  |  F7  |  F8  |  F9  |  F10  | F12  |
+ * |------+------+------+-------+------+------|                    |------+------+------+------+-------+------|
+ * |      |      |KC_BRIU| Play | Mute |      |                    | PgUp | Home |  Up  | End  |       |K_MDSH|
+ * |------+------+------+-------+------+------|                    |------+------+------+------+-------+------|
+ * |      |      |KC_BRID| Next |VolUp |      |-------.    ,-------| PgDn | Left | Down |Right |K_LOCK |      |
+ * |------+------+------+-------+------+------|       |    |       |------+------+------+------+-------+------|
+ * |M_SHFT|      |      | Prev  |VolDn |      |-------|    |-------|      |      |      |      |       |M_PYNV|
+ * `------------------------------------------/       /     \      \------------------------------------------'
+ *                    |      |      |      | /       /       \      \  |      |M_CODE|      |
+ *                    |      |      |      |/       /         \      \ |      |      |      |
+ *                    `----------------------------'           '------''--------------------'
+ */
+```
+
+### RAISE
+```c
+/* RAISE
+ * ,-----------------------------------------.                    ,-----------------------------------------.
+ * |      |      |      |      |K_CSCN|      |                    |      |      |      |      |      |      |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |      |      | MS_1 | MS_U | MS_2 | WH_U |                    |      |      |      |      |      |      |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |      |      | MS_L | MS_D | MS_R | WH_D |-------.    ,-------|      |      |      |      |      |      |
+ * |------+------+------+------+------+------|       |    |       |------+------+------+------+------+------|
+ * |      |      |      |      |      |      |-------|    |-------|      |      |      |      |      |      |
+ * `-----------------------------------------/       /     \      \-----------------------------------------'
+ *                   |      |      |      | /       /       \      \  |      |      |      |
+ *                   |      |      |      |/       /         \      \ |      |      |      |
+ *                   `----------------------------'           '------''--------------------'
+ */
+```
+
+### ADJUST
+```c
+/* ADJUST
+ * ,------------------------------------------.                    ,-----------------------------------------.
+ * |EEP_RST|      |      |      |      |      |                    |      |      |      |COLMAK|DVORAK|QWERTY|
+ * |-------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |M_MAKE |      |      |      |      |      |                    |      |      |      |      |      |      |
+ * |-------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |M_VRSN |      |      |      |      |      |-------.    ,-------|      |      |      |      |      |      |
+ * |-------+------+------+------+------+------|       |    |       |------+------+------+------+------+------|
+ * |M_FLSH |      |      |      |      |      |-------|    |-------|      |      |      |      |      |      |
+ * `------------------------------------------/       /     \      \-----------------------------------------'
+ *                   |      |      |      | /       /       \      \  |      |      |      |
+ *                   |      |      |      |/       /         \      \ |      |      |      |
+ *                   `----------------------------'           '------''--------------------'
+ */
+```
+
+<!--
+### TEMPLATE
+```c
+/* TEMPLATE
+ * ,-----------------------------------------.                    ,-----------------------------------------.
+ * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |      |      |      |      |      |      |-------.    ,-------|      |      |      |      |      |      |
+ * |------+------+------+------+------+------|       |    |       |------+------+------+------+------+------|
+ * |      |      |      |      |      |      |-------|    |-------|      |      |      |      |      |      |
+ * `-----------------------------------------/       /     \      \-----------------------------------------'
+ *                   |      |      |      | /       /       \      \  |      |      |      |
+ *                   |      |      |      |/       /         \      \ |      |      |      |
+ *                   `----------------------------'           '------''--------------------'
+ */
+```
+-->
\ No newline at end of file
diff --git a/keyboards/lily58/keymaps/ninjonas/config.h b/keyboards/lily58/keymaps/ninjonas/config.h
new file mode 100644
index 000000000..19fb5cd92
--- /dev/null
+++ b/keyboards/lily58/keymaps/ninjonas/config.h
@@ -0,0 +1,33 @@
+/*
+This is the c configuration file for the keymap
+
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+Copyright 2015 Jack Humbert
+
+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/>.
+*/
+
+#pragma once
+
+/* Select hand configuration */
+
+#define MASTER_LEFT
+// #define MASTER_RIGHT
+// #define EE_HANDS
+
+#define USE_SERIAL_PD2
+#define TAPPING_FORCE_HOLD
+
+#define OLED_FONT_H "keyboards/lily58/lib/glcdfont.c"
+#define OLED_DISABLE_TIMEOUT
\ No newline at end of file
diff --git a/keyboards/lily58/keymaps/ninjonas/keymap.c b/keyboards/lily58/keymaps/ninjonas/keymap.c
new file mode 100644
index 000000000..0ed197c14
--- /dev/null
+++ b/keyboards/lily58/keymaps/ninjonas/keymap.c
@@ -0,0 +1,152 @@
+/* Copyright 2019 @ninjonas
+ *
+ * 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 QMK_KEYBOARD_H
+#include "ninjonas.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/* QWERTY
+ * ,-----------------------------------------.                    ,-----------------------------------------.
+ * |   `  |   1  |   2  |   3  |   4  |   5  |                    |   6  |   7  |   8  |   9  |   0  |  -   |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * | Tab  |   Q  |   W  |   E  |   R  |   T  |                    |   Y  |   U  |   I  |   O  |   P  |  \   |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * | ESC  |   A  |   S  |   D  |   F  |   G  |-------.    ,-------|   H  |   J  |   K  |   L  |   ;  |  '   |
+ * |------+------+------+------+------+------|   [   |    |    ]  |------+------+------+------+------+------|
+ * |LShift|   Z  |   X  |   C  |   V  |   B  |-------|    |-------|   N  |   M  |   ,  |   .  |   /  |   =  |
+ * `-----------------------------------------/       /     \      \-----------------------------------------'
+ *                   | Alt  |     | Ctrl | /Space  /       \Enter \  |BackSP| Del  |LOWER |
+ *                   |      |      |      |/       /         \      \ |      |      |      |
+ *                   `----------------------------'           '------''--------------------'
+ */
+ [_QWERTY] = LAYOUT_wrapper(
+	_____________________NUM_LEFT_______________________,                 _____________________NUM_RIGHT______________________,  \
+	_____________________QWERTY_L1______________________,                 _____________________QWERTY_R1______________________,  \
+	_____________________QWERTY_L2______________________,                 _____________________QWERTY_R2______________________,  \
+	_____________________QWERTY_L3______________________, T_LBRC, T_RBRC, _____________________QWERTY_R3______________________,  \
+                               ________MOD_LEFT_________, LT_RAI,   LT_LOW, ________MOD_RIGHT________ \
+	),
+
+/* DVORAK
+ * ,-----------------------------------------.                    ,-----------------------------------------.
+ * |   `  |   1  |   2  |   3  |   4  |   5  |                    |   6  |   7  |   8  |   9  |   0  |  -   |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * | Tab  |   '  |   ,  |   .  |   P  |   Y  |                    |   F  |   G  |   C  |   R  |   L  |  \   |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * | ESC  |   A  |   O  |   E  |   U  |   I  |-------.    ,-------|   D  |   H  |   T  |   N  |   S  |  /   |
+ * |------+------+------+------+------+------|   [   |    |    ]  |------+------+------+------+------+------|
+ * |LShift|   ;  |   Q  |   J  |   K  |   X  |-------|    |-------|   B  |   M  |   W  |   V  |   Z  |   =  |
+ * `-----------------------------------------/       /     \      \-----------------------------------------'
+ *                   | Alt  |     | Ctrl | /Space  /       \Enter \  |BackSP| Del  |LOWER |
+ *                   |      |      |      |/       /         \      \ |      |      |      |
+ *                   `----------------------------'           '------''--------------------'
+ */
+ [_DVORAK] = LAYOUT_wrapper(
+	_____________________NUM_LEFT_______________________,                 _____________________NUM_RIGHT______________________,  \
+	_____________________DVORAK_L1______________________,                 _____________________DVORAK_R1______________________,  \
+	_____________________DVORAK_L2______________________,                 _____________________DVORAK_R2______________________,  \
+	_____________________DVORAK_L3______________________, T_LBRC, T_RBRC, _____________________DVORAK_R3______________________,  \
+                               ________MOD_LEFT_________, LT_RAI,  LT_LOW, ________MOD_RIGHT________ \
+	),
+
+/* COLEMAK
+ * ,-----------------------------------------.                    ,-----------------------------------------.
+ * |   `  |   1  |   2  |   3  |   4  |   5  |                    |   6  |   7  |   8  |   9  |   0  |  -   |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * | Tab  |   Q  |   W  |   F  |   P  |   G  |                    |   J  |   L  |   U  |   Y  |   ;  |  \   |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * | ESC  |   A  |   R  |   S  |   T  |   D  |-------.    ,-------|   H  |   N  |   E  |   I  |   O  |  '   |
+ * |------+------+------+------+------+------|   [   |    |    ]  |------+------+------+------+------+------|
+ * |LShift|   Z  |   X  |   C  |   V  |   B  |-------|    |-------|   K  |   M  |   ,  |   .  |   /  |   =  |
+ * `-----------------------------------------/       /     \      \-----------------------------------------'
+ *                   | Alt  |     | Ctrl | /Space  /       \Enter \  |BackSP| Del  |LOWER |
+ *                   |      |      |      |/       /         \      \ |      |      |      |
+ *                   `----------------------------'           '------''--------------------'
+ */
+ [_COLEMAK] = LAYOUT_wrapper(
+	_____________________NUM_LEFT_______________________,                 _____________________NUM_RIGHT______________________,  \
+	_____________________COLEMAK_L1_____________________,                 _____________________COLEMAK_R1_____________________,  \
+	_____________________COLEMAK_L2_____________________,                 _____________________COLEMAK_R2_____________________,  \
+	_____________________COLEMAK_L3_____________________, T_LBRC, T_RBRC, _____________________COLEMAK_R3_____________________,  \
+                               ________MOD_LEFT_________, LT_RAI,  LT_LOW, ________MOD_RIGHT________ \
+	),
+
+/* LOWER
+ * ,------------------------------------------.                    ,------------------------------------------.
+ * | F11  |  F1  |  F2  |  F3   |  F4  |  F5  |                    |  F6  |  F7  |  F8  |  F9  |  F10  | F12  |
+ * |------+------+------+-------+------+------|                    |------+------+------+------+-------+------|
+ * |      |      |KC_BRIU| Play | Mute |      |                    | PgUp | Home |  Up  | End  |       |K_MDSH|
+ * |------+------+------+-------+------+------|                    |------+------+------+------+-------+------|
+ * |      |      |KC_BRID| Next |VolUp |      |-------.    ,-------| PgDn | Left | Down |Right |K_LOCK |      |
+ * |------+------+------+-------+------+------|       |    |       |------+------+------+------+-------+------|
+ * |      |M_SHFT|      | Prev  |VolDn |      |-------|    |-------|      | M    |      |      |       |M_PYNV|
+ * `------------------------------------------/       /     \      \------------------------------------------'
+ *                    |      |      |      | /       /       \      \  |      |M_CODE|      |
+ *                    |      |      |      |/       /         \      \ |      |      |      |
+ *                    `----------------------------'           '------''--------------------'
+ */
+[_LOWER] = LAYOUT_wrapper( \
+	_____________________FUNC_LEFT______________________,                     _____________________FUNC_RIGHT_____________________, \
+	_____________________LOWER_L1_______________________,                     _____________________LOWER_R1_______________________, \
+	_____________________LOWER_L2_______________________,                     _____________________LOWER_R2_______________________, \
+	_____________________LOWER_L3_______________________, _______,   _______, _____________________LOWER_R3_______________________, \
+	                           __________________________________,   _______, _______, M_CODE,  _______ \
+	),
+
+/* RAISE
+ * ,-----------------------------------------.                    ,-----------------------------------------.
+ * |      |      |      |      |K_CSCN|      |                    |      |      |      |      |      |      |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |      |      | MS_1 | MS_U | MS_2 | WH_U |                    |      |      |      |      |      |      |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |      |      | MS_L | MS_D | MS_R | WH_D |-------.    ,-------|      |      |      |      |      |      |
+ * |------+------+------+------+------+------|       |    |       |------+------+------+------+------+------|
+ * |      |      |      |      |      |      |-------|    |-------|      |      |      |      |      |      |
+ * `-----------------------------------------/       /     \      \-----------------------------------------'
+ *                   |      |      |      | /       /       \      \  |      |      |      |
+ *                   |      |      |      |/       /         \      \ |      |      |      |
+ *                   `----------------------------'           '------''--------------------'
+ */
+[_RAISE] = LAYOUT_wrapper( \
+  XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
+  XXXXXXX,  XXXXXXX, _____________MOUSE_1______________,                        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
+  XXXXXXX,  XXXXXXX, _____________MOUSE_2______________,                        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
+  XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,\
+                             __________________________________,      __________________________________ \
+  ),
+
+/* ADJUST
+ * ,------------------------------------------.                    ,-----------------------------------------.
+ * |       |      |      |      |      |      |                    |      |      |      |      |      |      |
+ * |-------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |M_MAKE |EEPRST|      |      |      |      |                    |      |      |      |COLMAK|DVORAK|QWERTY|
+ * |-------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |M_VRSN |M_MALL|      |      |      |      |-------.    ,-------|      |      |      |      |      |      |
+ * |-------+------+------+------+------+------|       |    |       |------+------+------+------+------+------|
+ * |M_FLSH |      |      |      |      |      |-------|    |-------|      |      |      |      |      |      |
+ * `------------------------------------------/       /     \      \-----------------------------------------'
+ *                    |      |      |      | /       /       \      \  |      |      |      |
+ *                    |      |      |      |/       /         \      \ |      |      |      |
+ *                    `----------------------------'           '------''--------------------'
+ */
+[_ADJUST] = LAYOUT_wrapper( \
+  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
+  _____________________ADJUST_L1______________________,                        _____________________ADJUST_R1______________________, \
+  _____________________ADJUST_L2______________________,                        _____________________ADJUST_R2______________________, \
+  _____________________ADJUST_L3______________________, XXXXXXX,      XXXXXXX, _____________________ADJUST_R3______________________,\
+                             __________________________________,      __________________________________ \
+  ),
+};
\ No newline at end of file
diff --git a/keyboards/lily58/keymaps/ninjonas/rules.mk b/keyboards/lily58/keymaps/ninjonas/rules.mk
new file mode 100644
index 000000000..c58266213
--- /dev/null
+++ b/keyboards/lily58/keymaps/ninjonas/rules.mk
@@ -0,0 +1 @@
+OLED_DRIVER_ENABLE = yes
diff --git a/keyboards/lily58/rev1/config.h b/keyboards/lily58/rev1/config.h
index 8fd42070e..4e8e3a7c9 100644
--- a/keyboards/lily58/rev1/config.h
+++ b/keyboards/lily58/rev1/config.h
@@ -36,8 +36,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROW_PINS { C6, D7, E6, B4, B5 }
 #define MATRIX_COL_PINS { F6, F7, B1, B3, B2, B6 }
 
-#define CATERINA_BOOTLOADER
-
 /* define tapping term */
 #define TAPPING_TERM 100
 
@@ -72,4 +70,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
 //#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
\ No newline at end of file
+//#define NO_ACTION_FUNCTION
diff --git a/keyboards/lily58/rev1/rev1.h b/keyboards/lily58/rev1/rev1.h
index 4949bf537..aa9f5727c 100644
--- a/keyboards/lily58/rev1/rev1.h
+++ b/keyboards/lily58/rev1/rev1.h
@@ -2,7 +2,6 @@
 
 #include "lily58.h"
 
-//void promicro_bootloader_jmp(bool program);
 #include "quantum.h"
 
 #ifdef RGBLIGHT_ENABLE
@@ -18,8 +17,6 @@
 #endif
 #endif
 
-
-//void promicro_bootloader_jmp(bool program);
 #ifndef FLIP_HALF
 #define LAYOUT( \
 	L00, L01, L02, L03, L04, L05,           R00, R01, R02, R03, R04, R05,  \
@@ -62,4 +59,4 @@
 		{ R30, R31, R32, R33, R34, R35 }, \
         { KC_NO, R41, R42, R43, R44, R45 } \
 	}
-#endif
\ No newline at end of file
+#endif
diff --git a/keyboards/lily58/rev1/rules.mk b/keyboards/lily58/rev1/rules.mk
index 7fc101bf2..6028b5a5b 100644
--- a/keyboards/lily58/rev1/rules.mk
+++ b/keyboards/lily58/rev1/rules.mk
@@ -1,3 +1,3 @@
 SRC += rev1/matrix.c
 SRC += rev1/split_util.c
-SRC += rev1/split_scomm.c
\ No newline at end of file
+SRC += rev1/split_scomm.c
diff --git a/keyboards/lily58/rules.mk b/keyboards/lily58/rules.mk
index f2947c81c..af25531ec 100644
--- a/keyboards/lily58/rules.mk
+++ b/keyboards/lily58/rules.mk
@@ -1,55 +1,16 @@
-SRC += i2c.c
-SRC += serial.c
-SRC += ssd1306.c
-
-# if firmware size over limit, try this option
-# CFLAGS += -flto
-
 # MCU name
-#MCU = at90usb1287
 MCU = atmega32u4
 
-# Processor frequency.
-#     This will define a symbol, F_CPU, in all source code files equal to the
-#     processor frequency in Hz. You can then use this symbol in your source code to
-#     calculate timings. Do NOT tack on a 'UL' at the end, this will be done
-#     automatically to create a 32-bit value in your source code.
-#
-#     This will be an integer division of F_USB below, as it is sourced by
-#     F_USB after it has run through any CPU prescalers. Note that this value
-#     does not *change* the processor frequency - it should merely be updated to
-#     reflect the processor speed set externally so that the code can use accurate
-#     software delays.
-F_CPU = 16000000
-
-#
-# LUFA specific
-#
-# Target architecture (see library "Board Types" documentation).
-ARCH = AVR8
-
-# Input clock frequency.
-#     This will define a symbol, F_USB, in all source code files equal to the
-#     input clock frequency (before any prescaling is performed) in Hz. This value may
-#     differ from F_CPU if prescaling is used on the latter, and is required as the
-#     raw input clock is fed directly to the PLL sections of the AVR for high speed
-#     clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL'
-#     at the end, this will be done automatically to create a 32-bit value in your
-#     source code.
-#
-#     If no clock division is performed on the input clock inside the AVR (via the
-#     CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
-F_USB = $(F_CPU)
-
-# Bootloader
-#     This definition is optional, and if your keyboard supports multiple bootloaders of
-#     different sizes, comment this out, and the correct address will be loaded
-#     automatically (+60). See bootloader.mk for all options.
+# Bootloader selection
+#   Teensy       halfkay
+#   Pro Micro    caterina
+#   Atmel DFU    atmel-dfu
+#   LUFA DFU     lufa-dfu
+#   QMK DFU      qmk-dfu
+#   ATmega32A    bootloadHID
+#   ATmega328P   USBasp
 BOOTLOADER = caterina
 
-# Interrupt driven control endpoint task(+60)
-OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
-
 # Build Options
 #   change to "no" to disable the options, or define them in the Makefile in
 #   the appropriate keymap folder that will get included automatically
@@ -71,4 +32,11 @@ SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
 
 CUSTOM_MATRIX = yes
 
+SRC += i2c.c
+SRC += serial.c
+SRC += ssd1306.c
+
+# if firmware size over limit, try this option
+# CFLAGS += -flto
+
 DEFAULT_FOLDER = lily58/rev1
diff --git a/keyboards/lily58/serial.c b/keyboards/lily58/serial.c
index 325c29a3f..f6293c3dc 100755
--- a/keyboards/lily58/serial.c
+++ b/keyboards/lily58/serial.c
@@ -17,7 +17,6 @@
 #include <stddef.h>
 #include <stdbool.h>
 #include "serial.h"
-//#include <pro_micro.h>
 
 #ifdef SOFT_SERIAL_PIN