Fix avrdude message to not mention any specific device model.

Added BLE support for USB-USB converter. (#1824 )
* Added BLE support to USB-USB converter * Added readme * Removed images and Makefile
2017-10-16 09:54:17 -10:00 · 2017-10-15 15:04:03 -10:00 · 2017-10-15 15:03:23 -10:00 · 2017-10-15 20:04:23 -04:00 · 2017-10-15 16:54:06 -04:00 · 2017-10-15 16:52:51 -04:00
64 changed files with 2313 additions and 545 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,7 +11,7 @@ env:
  global:
  - secure: vBTSL34BDPxDilKUuTXqU4CJ26Pv5hogD2nghatkxSQkI1/jbdnLj/DQdPUrMJFDIY6TK3AltsBx72MaMsLQ1JO/Ou24IeHINHXzUC1FlS9yQa48cpxnhX5kzXNyGs3oa0qaFbvnr7RgYRWtmD52n4bIZuSuW+xpBv05x2OCizdT2ZonH33nATaHGFasxROm4qYZ241VfzcUv766V6RVHgL4x9V08warugs+RENVkfzxxwhk3NmkrISabze0gSVJLHBPHxroZC6EUcf/ocobcuDrCwFqtEt90i7pNIAFUE7gZsN2uE75LmpzAWin21G7lLPcPL2k4FJVd8an1HiP2WmscJU6U89fOfMb2viObnKcCzebozBCmKGtHEuXZo9FcReOx49AnQSpmESJGs+q2dL/FApkTjQiyT4J6O5dJpoww0/r57Wx0cmmqjETKBb5rSgXM51Etk3wO09mvcPHsEwrT7qH8r9XWdyCDoEn7FCLX3/LYnf/D4SmZ633YPl5gv3v9XEwxR5+04akjgnvWDSNIaDbWBdxHNb7l4pMc+WR1bwCyMyA7KXj0RrftEGOrm9ZRLe6BkbT4cycA+j77nbPOMcyZChliV9pPQos+4TOJoTzcK2L8yWVoY409aDNVuAjdP6Yum0R2maBGl/etLmIMpJC35C5/lZ+dUNjJAM=
 before_install:
-  - wget http://www.atmel.com/images/avr8-gnu-toolchain-3.5.4.1709-linux.any.x86_64.tar.gz
+  - wget http://www.atmel.com/images/avr8-gnu-toolchain-3.5.4.1709-linux.any.x86_64.tar.gz || wget http://qmk.fm/avr8-gnu-toolchain-3.5.4.1709-linux.any.x86_64.tar.gz
 install:
  - tar -zxf avr8-gnu-toolchain-3.5.4.1709-linux.any.x86_64.tar.gz
  - export PATH="$PATH:$TRAVIS_BUILD_DIR/avr8-gnu-toolchain-linux_x86_64/bin"
--- a/3
+++ b/3
@@ -304,7 +304,8 @@ define PARSE_KEYBOARD
    KEYMAPS += $$(notdir $$(patsubst %/.,%,$$(wildcard $(ROOT_DIR)/keyboards/$$(KEYBOARD_FOLDER_PATH_3)/keymaps/*/.)))
    KEYMAPS += $$(notdir $$(patsubst %/.,%,$$(wildcard $(ROOT_DIR)/keyboards/$$(KEYBOARD_FOLDER_PATH_4)/keymaps/*/.)))
    KEYMAPS += $$(notdir $$(patsubst %/.,%,$$(wildcard $(ROOT_DIR)/keyboards/$$(KEYBOARD_FOLDER_PATH_5)/keymaps/*/.)))
-    KEYMAPS := $$(sort $$(filter-out $$(KEYBOARD_FOLDER_1) $$(KEYBOARD_FOLDER_2) \
+    # this might be needed, but in a different form
+    #KEYMAPS := $$(sort $$(filter-out $$(KEYBOARD_FOLDER_1) $$(KEYBOARD_FOLDER_2) \
        $$(KEYBOARD_FOLDER_3) $$(KEYBOARD_FOLDER_4) $$(KEYBOARD_FOLDER_5), $$(KEYMAPS)))

    KEYBOARD_LAYOUTS :=
--- a/docs/keymap.md
+++ b/docs/keymap.md
@@ -79,7 +79,7 @@ Key with `KC_TRANS` (`KC_TRNS` and `_______` are the alias) doesn't has its own

 ## Anatomy Of A `keymap.c`

-For this example we will walk through the [default Clueboard keymap](https://github.com/qmk/qmk_firmware/blob/master/keyboards/clueboard/keymaps/default/keymap.c). You'll find it helpful to open that file in another browser window so you can look at everything in context.
+For this example we will walk through the [default Clueboard 66% keymap](https://github.com/qmk/qmk_firmware/blob/master/keyboards/clueboard_66/keymaps/default/keymap.c). You'll find it helpful to open that file in another browser window so you can look at everything in context.

 There are 3 main sections of a `keymap.c` file you'll want to concern yourself with:

--- a/keyboards/amj40/keymaps/default/keymap.c
+++ b/keyboards/amj40/keymaps/default/keymap.c
@@ -1,7 +1,5 @@


-// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
-// this is the style you want to emulate.

 #include "amj40.h"

--- a/keyboards/amj60/keymaps/default/keymap.c
+++ b/keyboards/amj60/keymaps/default/keymap.c
@@ -0,0 +1,59 @@
+
+#include "amj60.h"
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+#define _DEF 0
+#define _SPC 1
+
+// dual-role shortcuts
+#define SPACEDUAL LT(_SPC, KC_SPACE)
+
+
+// increase readability 
+#define _______ KC_TRNS
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Keymap _DEF: Default Layer
+     * ,-----------------------------------------------------------.
+     * |Esc|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =| \ | ~ |
+     * |-----------------------------------------------------------|
+     * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]| bspc|
+     * |-----------------------------------------------------------|
+     * |Caps   | A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '| Return |
+     * |-----------------------------------------------------------|
+     * |Sft | Fn0|  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /| Sft |Fn2|
+     * |-----------------------------------------------------------|
+     * |Ctrl|Win |Alt |      Space/Fn0         |Alt |Win |Menu|RCtl|
+     * `-----------------------------------------------------------'
+     */
+    [_DEF] = KEYMAP_MAX(
+        KC_ESC,   KC_1,    KC_2,    KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9,    KC_0,    KC_MINS, KC_EQL, KC_BSLS, KC_GRV, \
+        KC_TAB,   KC_Q,    KC_W,    KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O,    KC_P,    KC_LBRC, KC_RBRC,    KC_BSPC,  \
+        KC_CAPS,  KC_A,    KC_S,    KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L,    KC_SCLN, KC_QUOT, KC_ENT,   \
+        KC_LSFT,  F(0),    KC_Z,    KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,    F(1),     \
+        KC_LCTL,  KC_LALT, KC_LGUI,             SPACEDUAL,                       KC_RGUI, KC_RALT, KC_RCTL,    F(2)),
+
+    /* Keymap 1: F-and-vim Layer, modified with Space (by holding space)
+     * ,-----------------------------------------------------------.
+     * |PrSc| F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|   |  |
+     * |-----------------------------------------------------------|
+     * |    |Paus| Up| [ | ] |   |   |   | ( | ) |   |   |   | Del |
+     * |-----------------------------------------------------------|
+     * |      |Lft|Dwn|Rgt|   |   |Left|Down|Right|Up|  |   | PLAY |
+     * |-----------------------------------------------------------|
+     * |    |   |   |   | < | > |   |M0 |   |   |   |   | Vol+ |   |
+     * |-----------------------------------------------------------|
+     * |    |    |    |                        |Alt |Prev|Vol-|Next|
+     * `-----------------------------------------------------------'
+     */
+    [_SPC] = KEYMAP_MAX(
+        KC_PSCR, KC_F1,   KC_F2,   KC_F3,    KC_F4,   KC_F5,   KC_F6,    KC_F7,     KC_F8,     KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______,  \
+        _______, KC_PAUS, KC_UP,   _______,  _______, _______, _______,  _______, _______, _______, _______, _______, _______, KC_DEL, \
+        _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, KC_LEFT,  KC_DOWN,   KC_UP,     KC_RGHT, _______, _______, KC_MPLY, \
+        _______, _______, _______, _______,  _______, _______, KC_SPACE, M(0),      _______,   _______, _______, _______, KC_VOLU, _______, \
+        _______, _______, _______,                                  _______,                                 _______, KC_MPRV, KC_VOLD, KC_MNXT),
+
+};
--- a/keyboards/amj60/keymaps/iso_split_rshift/keymap.c
+++ b/keyboards/amj60/keymaps/iso_split_rshift/keymap.c
@@ -1,5 +1,3 @@
-// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
-// this is the style you want to emulate.

 #include "amj60.h"

--- a/keyboards/amj60/keymaps/maximized/keymap.c
+++ b/keyboards/amj60/keymaps/maximized/keymap.c
@@ -1,5 +1,3 @@
-// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
-// this is the style you want to emulate.

 #include "amj60.h"

--- a/keyboards/converter/usb_usb/keymaps/ble/README.md
+++ b/keyboards/converter/usb_usb/keymaps/ble/README.md
@@ -0,0 +1,30 @@
+QMK BLE Adapter
+===============
+A small device that reads USB keyboard input and passes it on over Bluetooth LE HID.
+
+![Picture of Adapter](https://i.imgur.com/O3VwBBJ.png)
+
+Hardware
+--------
+The hardware is relatively easy to assemble. Just follow the schematic and don't forget to [cut the VBUS jumper](https://www.pjrc.com/teensy/td_libs_USBHostShield_4a.jpg).
+
+Schematic:
+![Schematic](https://i.imgur.com/s1Ia9We.png)
+
+Part list:
+* [Adafruit Feather 32u4 Bluefruit LE](https://www.adafruit.com/product/2829)
+* [USB Host Mini](https://www.circuitsathome.com/arduino_usb_host_shield_projects/)
+* [Pololu 5V Step-Up Voltage Regulator U3V12F5](https://www.pololu.com/product/2115)
+* [Lithium Ion Battery - 3.7v 2000mAh](https://www.adafruit.com/product/2011)
+* Some sort of switch to be able to turn it off
+
+Building and Flashing
+---------------------
+
+```
+make converter-usb_usb-ble
+```
+
+```
+make converter-usb_usb-ble-avrdude
+```
--- a/keyboards/converter/usb_usb/keymaps/ble/config.h
+++ b/keyboards/converter/usb_usb/keymaps/ble/config.h
@@ -0,0 +1,15 @@
+#ifndef CONFIG_USER_H
+#define CONFIG_USER_H
+
+#include "../../config.h"
+
+#undef PRODUCT
+#define PRODUCT         QMK BLE Adapter
+#undef DESCRIPTION
+#define DESCRIPTION  
+
+// Turn off the mode leds on the BLE module
+#define ADAFRUIT_BLE_ENABLE_MODE_LEDS 0
+#define ADAFRUIT_BLE_ENABLE_POWER_LED 0
+
+#endif
--- a/keyboards/converter/usb_usb/keymaps/ble/keymap.c
+++ b/keyboards/converter/usb_usb/keymaps/ble/keymap.c
@@ -0,0 +1,76 @@
+/*
+Copyright 2017 Balz Guenat <balz.guenat@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 "usb_usb.h"
+
+const uint16_t keymaps[][MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
+    /* 0: plain Qwerty without layer switching
+     *         ,---------------. ,---------------. ,---------------.
+     *         |F13|F14|F15|F16| |F17|F18|F19|F20| |F21|F22|F23|F24|
+     * ,---.   |---------------| |---------------| |---------------| ,-----------. ,---------------. ,-------.
+     * |Esc|   |F1 |F2 |F3 |F4 | |F5 |F6 |F7 |F8 | |F9 |F10|F11|F12| |PrS|ScL|Pau| |VDn|VUp|Mut|Pwr| | Help  |
+     * `---'   `---------------' `---------------' `---------------' `-----------' `---------------' `-------'
+     * ,-----------------------------------------------------------. ,-----------. ,---------------. ,-------.
+     * |  `|  1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|JPY|Bsp| |Ins|Hom|PgU| |NmL|  /|  *|  -| |Stp|Agn|
+     * |-----------------------------------------------------------| |-----------| |---------------| |-------|
+     * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  | |Del|End|PgD| |  7|  8|  9|  +| |Mnu|Und|
+     * |-----------------------------------------------------------| `-----------' |---------------| |-------|
+     * |CapsL |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  :|  #|Retn|               |  4|  5|  6|KP,| |Sel|Cpy|
+     * |-----------------------------------------------------------|     ,---.     |---------------| |-------|
+     * |Shft|  <|  Z|  X|  C|  V|  B|  N|  M|  ,|  ,|  /| RO|Shift |     |Up |     |  1|  2|  3|KP=| |Exe|Pst|
+     * |-----------------------------------------------------------| ,-----------. |---------------| |-------|
+     * |Ctl|Gui|Alt|MHEN|HNJ| Space  |H/E|HENK|KANA|Alt|Gui|App|Ctl| |Lef|Dow|Rig| |  0    |  .|Ent| |Fnd|Cut|
+     * `-----------------------------------------------------------' `-----------' `---------------' `-------'
+     */
+    [0] = KEYMAP_ALL(
+                      KC_F13,  KC_F14,  KC_F15,  KC_F16, KC_F17, KC_F18, KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24,
+    KC_ESC,           KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  KC_F6,  KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,               KC_PSCR, KC_SLCK, KC_PAUS,    KC_VOLD, KC_VOLU, KC_MUTE, KC_PWR,     KC_HELP, 
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_JYEN, KC_BSPC,     KC_INS,  KC_HOME, KC_PGUP,    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,    KC_STOP, KC_AGIN,
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,   KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS,     KC_DEL,  KC_END,  KC_PGDN,    KC_P7,   KC_P8,   KC_P9,   KC_PPLS,    KC_MENU, KC_UNDO,
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,   KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_NUHS, KC_ENT,                                    KC_P4,   KC_P5,   KC_P6,   KC_PCMM,    KC_SLCT, KC_COPY,
+    KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,   KC_B,   KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH,          KC_RO,   KC_RSFT,              KC_UP,               KC_P1,   KC_P2,   KC_P3,   KC_PEQL,    KC_EXEC, KC_PSTE,
+    KC_LCTL, KC_LGUI, KC_LALT, KC_MHEN, KC_HANJ,         KC_SPC,         KC_HAEN, KC_HENK, KC_KANA, KC_RALT, KC_RGUI, KC_APP,  KC_RCTL,     KC_LEFT, KC_DOWN, KC_RGHT,    KC_P0,            KC_PDOT, KC_PENT,    KC_FIND, KC_CUT
+    ),
+};
+
+const uint16_t PROGMEM fn_actions[] = {
+
+};
+
+const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) {
+  switch(id) {
+    default:
+      return MACRO_NONE;
+  }
+};
+
+
+void matrix_init_user(void) {
+
+}
+
+void matrix_scan_user(void) {
+
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  return true;
+}
+
+void led_set_user(uint8_t usb_led) {
+
+}
--- a/keyboards/converter/usb_usb/keymaps/ble/rules.mk
+++ b/keyboards/converter/usb_usb/keymaps/ble/rules.mk
@@ -0,0 +1,3 @@
+BLUETOOTH = AdafruitBLE
+ADAFRUIT_BLE_ENABLE = yes
+OPT_DEFS +=  -DCATERINA_BOOTLOADER
--- a/keyboards/eco/keymaps/default/keymap.c
+++ b/keyboards/eco/keymaps/default/keymap.c
@@ -1,5 +1,3 @@
-// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
-// this is the style you want to emulate.

 // Default ECO Layout
 // KLE here : http://www.keyboard-layout-editor.com/#/gists/0733eca6b4cb88ff9d7de746803f4039
--- a/keyboards/eco/keymaps/that_canadian/keymap.c
+++ b/keyboards/eco/keymaps/that_canadian/keymap.c
@@ -1,5 +1,3 @@
-// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
-// this is the style you want to emulate.

 // Below layout is based upon /u/That-Canadian's planck layout

--- a/keyboards/handwired/arrow_pad/keymaps/default/keymap.c
+++ b/keyboards/handwired/arrow_pad/keymaps/default/keymap.c
@@ -1,5 +1,3 @@
-// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
-// this is the style you want to emulate.

 #include "arrow_pad.h"
 #include "led.h"
--- a/keyboards/handwired/arrow_pad/keymaps/pad_21/keymap.c
+++ b/keyboards/handwired/arrow_pad/keymaps/pad_21/keymap.c
@@ -1,5 +1,3 @@
-// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
-// this is the style you want to emulate.

 #include "arrow_pad.h"
 #include "led.h"
--- a/keyboards/handwired/arrow_pad/keymaps/pad_24/keymap.c
+++ b/keyboards/handwired/arrow_pad/keymaps/pad_24/keymap.c
@@ -1,5 +1,3 @@
-// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
-// this is the style you want to emulate.

 #include "arrow_pad.h"
 #include "led.h"
--- a/keyboards/handwired/minorca/keymaps/default/keymap.c
+++ b/keyboards/handwired/minorca/keymaps/default/keymap.c
@@ -1,5 +1,3 @@
-// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
-// this is the style you want to emulate.

 #include "minorca.h"
 #include "action_layer.h"
--- a/keyboards/handwired/minorca/keymaps/rgb/keymap.c
+++ b/keyboards/handwired/minorca/keymaps/rgb/keymap.c
@@ -1,5 +1,3 @@
-// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
-// this is the style you want to emulate.

 #include "minorca.h"
 #include "action_layer.h"
--- a/keyboards/handwired/promethium/keymaps/default/README.md
+++ b/keyboards/handwired/promethium/keymaps/default/README.md
@@ -0,0 +1,44 @@
+Priyadi Keymap for Planck-like Keyboards
+========================================
+
+Main layer modifications from default Planck layout:
+
+* Enter moved to quotes position
+* Quotes moved to semicolon position.
+* QWERTZ style colon & semicolon. shift-. = :  shift-, = ;  This is done in hardware, no layout switching needed in software.
+* < & > occupied precious real estate, and so they are moved down to punctuation layer.
+* Right-shift on Enter position.
+* Removed arrow keys, they are on another layer now.
+* Put Ctrl-Alt-Super and Super-AltGr-Ctrl in left & right corners.
+* Lower & Raise is now called Num and Fun.
+* OS & Left keys become another thumb modifier: Empty & Greek (Empty because I used this for another use and my muscle memory is not adapted to it yet)
+
+On Promethium, Trackpoint is enabled on PD2 and PD3. We impersonate a Thinkpad keyboard to be able to use Thinkpad driver on Windows (still needs verification).
+
+AltGr & Compose dual use key. Tap for Compose (mapped to Scroll Lock in hardware) and press for AltGr.
+
+Supported layouts: QWERTY, DVORAK, Colemak, Workman, Norman. Switchable from SYS layer. In DVORAK, semicolon is replaced by /? key.
+
+Num activates NUM layer: hexkeypad on the right side and most punctuation on the left side. Hexkeypad is optimized for C-style hex, IPv6, HTML RGB triplets, etc.
+
+Fun activates FUN layer: arrow cluster on right home row, F-numbers on left side.
+
+Pressing Num+Fun activates PUNC layer: same punctuations as NUM layer on the left side, parens on the right side.
+
+Greek activates either GREEKU or GREEKL layer, depending whether shift is pressed or not. Shift state changes are also taken into account when the layer is active.
+
+Greek+Empty activates EMOJI layer. The whole keyboard now outputs emojis!
+
+Pressing both spacebars (spacekeys, actually) activates GUI layer. QWERTYUIOP switches to a virtual desktop. J & L switches virtual desktop to the left or right. S & F behaves like Alt-Tab and Alt-Shift-Tab. This works by sending Alt press when entering the layer, and Alt release when other than S or F keys are pressed.
+
+Pressing both Ctrls activates SYS layer for configuring the keyboard.
+
+On Promethium, USB or Bluetooth output is detected on startup. If USB is connected, then USB is used initially. SYS-U and SYS-B switch output to USB or Bluetooth at runtime. Current active output is indicated with LEDs.
+
+SYS-W, SYS-L, SYS-M switch Unicode input method. SYS-Q, SYS-D, SYS-C, SYS-K, SYS-N switch to QWERTY, DVORAK, Colemak, Workman and Norman, respectively.
+
+SYS-A (mnemonic: audio) toggles faux clicky: use buzzer to emit clicks on key presses and releases.
+
+On Promethium there are 16 indicator LEDs, and under switch LEDs on each switches, including Trackpoint buttons. Totaling 67 LEDs. Output is limited to 0xF for each LEDs to conserve power. SYS-G (mnemonic: glow) toggles various backlighting modes.
+
+On Promethium, there's a LED to indicate battery level. Hue indicates level: green is full, red is empty.
--- a/keyboards/handwired/promethium/keymaps/default/config.h
+++ b/keyboards/handwired/promethium/keymaps/default/config.h
@@ -0,0 +1,29 @@
+#ifndef CONFIG_USER_H
+#define CONFIG_USER_H
+
+#include "../../config.h"
+
+#define PRIYADI_PROMETHIUM
+
+/* bootmagic salt key */
+#define BOOTMAGIC_KEY_SALT              KC_ESC
+
+/* skip bootmagic and eeconfig */
+#define BOOTMAGIC_KEY_SKIP              KC_SPACE
+
+#define PREVENT_STUCK_MODIFIERS
+
+#define RGBSPS_ENABLE
+#define RGBSPS_DEMO_ENABLE
+
+#define UNICODE_TYPE_DELAY 0
+
+#define LAYOUT_DVORAK
+#define LAYOUT_COLEMAK
+#define LAYOUT_NORMAN
+#define LAYOUT_WORKMAN
+
+#define DOUBLESPACE_LAYER_ENABLE
+// #define TOLELOT_ENABLE
+
+#endif
--- a/keyboards/handwired/promethium/keymaps/default/flash.sh
+++ b/keyboards/handwired/promethium/keymaps/default/flash.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+sleep 10
+avrdude -p m32u4 -P /dev/ttyACM0 -c avr109 -U flash:w:../../../../../.build/handwired_promethium_priyadi.hex
--- a/keyboards/handwired/promethium/keymaps/default/keymap.c
+++ b/keyboards/handwired/promethium/keymaps/default/keymap.c
--- a/keyboards/handwired/promethium/keymaps/default/rgbtheme.h
+++ b/keyboards/handwired/promethium/keymaps/default/rgbtheme.h
@@ -0,0 +1 @@
+#include "rgbtheme_default.h"
--- a/keyboards/handwired/promethium/keymaps/default/rgbtheme_carbon.h
+++ b/keyboards/handwired/promethium/keymaps/default/rgbtheme_carbon.h
@@ -0,0 +1,36 @@
+#include "color.h"
+
+#define THEME_COLOR_LINUX                 COLOR_WHITE
+#define THEME_COLOR_APPLE                 COLOR_WHITE
+#define THEME_COLOR_WINDOWS               COLOR_WHITE
+
+#define THEME_COLOR_QWERTY                COLOR_RED
+#define THEME_COLOR_ALT                   COLOR_RED
+
+#define THEME_COLOR_AUDIO                 COLOR_GREEN
+
+#define THEME_COLOR_BLUETOOTH             7,7,15
+#define THEME_COLOR_USB                   COLOR_WHITE
+
+#define THEME_COLOR_CAPSLOCK              COLOR_RED
+
+#define THEME_COLOR_GUI                   COLOR_MAGENTA
+#define THEME_COLOR_FUN                   COLOR_RED
+#define THEME_COLOR_NUM                   7,7,15
+#define THEME_COLOR_PUNC                  COLOR_GREEN
+#define THEME_COLOR_GREEK                 COLOR_CYAN
+#define THEME_COLOR_EMOJI                 COLOR_YELLOW
+#define THEME_COLOR_OTHERLAYER            COLOR_GRAY
+
+#define THEME_COLOR_GLOW1_HOME            COLOR_ORANGE
+#define THEME_COLOR_GLOW1_HOMING          COLOR_RED
+
+#define THEME_COLOR_GLOW2_ALPHA           COLOR_ORANGE
+#define THEME_COLOR_GLOW2_MODS            COLOR_ORANGE
+#define THEME_COLOR_GLOW2_FN              COLOR_ORANGE
+#define THEME_COLOR_GLOW2_HOME            COLOR_ORANGE
+#define THEME_COLOR_GLOW2_HOMING          COLOR_RED
+
+#define THEME_COLOR_TP1                   COLOR_ORANGE
+#define THEME_COLOR_TP2                   COLOR_RED
+#define THEME_COLOR_TP3                   COLOR_ORANGE
--- a/keyboards/handwired/promethium/keymaps/default/rgbtheme_default.h
+++ b/keyboards/handwired/promethium/keymaps/default/rgbtheme_default.h
@@ -0,0 +1,36 @@
+#include "color.h"
+
+#define THEME_COLOR_LINUX                 COLOR_WHITE
+#define THEME_COLOR_APPLE                 COLOR_WHITE
+#define THEME_COLOR_WINDOWS               COLOR_WHITE
+
+#define THEME_COLOR_QWERTY                COLOR_RED
+#define THEME_COLOR_ALT                   COLOR_RED
+
+#define THEME_COLOR_AUDIO                 COLOR_GREEN
+
+#define THEME_COLOR_BLUETOOTH             COLOR_BLUE
+#define THEME_COLOR_USB                   COLOR_WHITE
+
+#define THEME_COLOR_CAPSLOCK              COLOR_RED
+
+#define THEME_COLOR_GUI                   COLOR_MAGENTA
+#define THEME_COLOR_FUN                   COLOR_RED
+#define THEME_COLOR_NUM                   COLOR_BLUE
+#define THEME_COLOR_PUNC                  COLOR_GREEN
+#define THEME_COLOR_GREEK                 COLOR_CYAN
+#define THEME_COLOR_EMOJI                 COLOR_YELLOW
+#define THEME_COLOR_OTHERLAYER            COLOR_GRAY
+
+#define THEME_COLOR_GLOW1_HOME            COLOR_GRAY
+#define THEME_COLOR_GLOW1_HOMING          COLOR_RED
+
+#define THEME_COLOR_GLOW2_ALPHA           COLOR_GRAY
+#define THEME_COLOR_GLOW2_MODS            COLOR_GREEN
+#define THEME_COLOR_GLOW2_FN              COLOR_BLUE
+#define THEME_COLOR_GLOW2_HOME            COLOR_RED
+#define THEME_COLOR_GLOW2_HOMING          COLOR_YELLOW
+
+#define THEME_COLOR_TP1                   COLOR_RED
+#define THEME_COLOR_TP2                   COLOR_BLUE
+#define THEME_COLOR_TP3                   COLOR_RED
--- a/keyboards/handwired/promethium/keymaps/default/rules.mk
+++ b/keyboards/handwired/promethium/keymaps/default/rules.mk
@@ -0,0 +1,26 @@
+
+
+# Build Options
+#   change to "no" to disable the options, or define them in the Makefile in 
+#   the appropriate keymap folder that will get included automatically
+#
+BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration(+1000)
+MOUSEKEY_ENABLE = no        # Mouse keys(+4700)
+EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
+CONSOLE_ENABLE = no         # Console for debug(+400)
+COMMAND_ENABLE = no         # Commands for debug and configuration
+NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+MIDI_ENABLE = no            # MIDI controls
+AUDIO_ENABLE = no           # Audio output on port C6
+UNICODE_ENABLE = no         # Unicode
+UNICODEMAP_ENABLE = yes
+BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
+RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time.
+PS2_MOUSE_ENABLE = yes
+PS2_USE_INT = yes
+FAUXCLICKY_ENABLE = yes
+BLUETOOTH = AdafruitBLE
+
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
--- a/keyboards/handwired/retro_refit/keymaps/default/keymap.c
+++ b/keyboards/handwired/retro_refit/keymaps/default/keymap.c
@@ -1,5 +1,3 @@
-// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
-// this is the style you want to emulate.

 #include "retro_refit.h"

--- a/keyboards/kc60/keymaps/dbroqua/keymap.c
+++ b/keyboards/kc60/keymaps/dbroqua/keymap.c
@@ -1,5 +1,3 @@
-// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
-// this is the style you want to emulate.

 #include "kc60.h"

--- a/keyboards/kc60/keymaps/dbroqua_hhkb/keymap.c
+++ b/keyboards/kc60/keymaps/dbroqua_hhkb/keymap.c
@@ -1,5 +1,3 @@
-// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
-// this is the style you want to emulate.

 #include "kc60.h"

--- a/keyboards/kc60/keymaps/default/keymap.c
+++ b/keyboards/kc60/keymaps/default/keymap.c
@@ -1,5 +1,3 @@
-// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
-// this is the style you want to emulate.

 #include "kc60.h"

--- a/keyboards/kc60/keymaps/sgoodwin/keymap.c
+++ b/keyboards/kc60/keymaps/sgoodwin/keymap.c
@@ -1,5 +1,3 @@
-// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
-// this is the style you want to emulate.

 #include "kc60.h"

--- a/keyboards/kc60/keymaps/stanleylai/keymap.c
+++ b/keyboards/kc60/keymaps/stanleylai/keymap.c
@@ -1,5 +1,3 @@
-// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
-// this is the style you want to emulate.

 #include "kc60.h"

--- a/keyboards/kc60/keymaps/ws2812/keymap.c
+++ b/keyboards/kc60/keymaps/ws2812/keymap.c
@@ -1,5 +1,3 @@
-// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
-// this is the style you want to emulate.

 #include "kc60.h"

--- a/keyboards/kinesis/keymaps/salty/keymap.c
+++ b/keyboards/kinesis/keymaps/salty/keymap.c
@@ -2,16 +2,14 @@
 #include "action_layer.h"
 #include "eeconfig.h"

-#define _CMD   0 // Base Colemak Mod-DH
-#define _QW    1 // Base QWERTY
-#define _CG    2 // Colemak Mod-DH gaming layer
-#define _QG    3 // QWERTY gaming layer
-#define _NM    4 // Number layer
-#define _MD    5 // Media Layer
-#define _KP    6 // KP layer
-#define _LY    7 // Layer switcher
-#define _FN    8 // Function layer
-#define _FN2   9 // Function layer (identical as _FN; used to deal with minor key interaction issue)
+#define _QW    0 // Base QWERTY
+#define _CM    1 // Colemak
+#define _QG    2 // QWERTY gaming
+#define _NS    3 // Number/Symbol
+#define _NP    4 // Numpad
+#define _LY    5 // Layer switcher
+#define _FN    6 // Function
+#define _FN2   7 // Function 2 (identical as _FN; used to deal with minor key interaction issue)

 #define _______ KC_TRNS
 #define XXXXXXX KC_NO
@@ -27,466 +25,371 @@ qk_tap_dance_action_t tap_dance_actions[] = {
 [RPN_RBC] = ACTION_TAP_DANCE_DOUBLE(KC_RPRN, KC_RBRC)
 };

-/*
-
-        Function Keys on All Layers (Keypad toggles):
-	,-----------------------------------------------------------------.
-	|  ESC |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   F7   |  F8   |
- 	`-----------------------------------------------------------------'
-	,---------------------------------------------------------------- --------------.
-	|  F9  |  F10 |  F11 |  F12 | PScr | SLck | Paus | Keypad | Layer/              |
-	|      |      |      |      |      |      |      |        | RESET (in Fn layer) |
-	`-------------------------------------------------------------------------------'
-
-        Colemak Mod-DH layer:
-	,-------------------------------------------.,-------------------------------------------.
-	|   =    |   1  |   2  |   3  |   4  |   5  ||   6  |   7  |   8  |   9  |   0  |   -    |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	| Tab    |   Q  |   W  |   F  |   P  |   B  ||   J  |   L  |   U  |   Y  |   ;  |   \    |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	| Ctl/Esc|   A  |   R  |   S  |   T  |   G  ||   M  |   N  |   E  |   I  |   O  |   '    |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	| (    [ |   Z  |   X  |   C  |   D  |   V  ||   K  |   H  |   ,  |   .  |   /  | )    ] |
-	`--------+------+------+------+------+------'`------+------+------+------+------+--------'
-	         |   `  |      |   [  |   ]  |              | Left | Down |  Up  | Right|
-	         `---------------------------'              `---------------------------'
-	                             ,--------------.,--------------.
-	                             |Ctl/Esc| LAlt || RAlt | RCtl  |
-	                      ,------|-------|------||------+-------+-------.
-	                      |      | Enter |Number|| RGUI | Delete|       |
-	                      | Space|   /   |------||------|   /   | Bspc  |
-	                      |  /Fn | LShift| Bspc || Media| RShift|  /Fn  |
-	                      `---------------------'`----------------------' 
-
-
-        QWERTY layer:
-	,-------------------------------------------.,-------------------------------------------.
-	|   =    |   1  |   2  |   3  |   4  |   5  ||   6  |   7  |   8  |   9  |   0  |   -    |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	| Tab    |   Q  |   W  |   E  |   R  |   T  ||   Y  |   U  |   I  |   O  |   P  |   \    |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	| Ctl/Esc|   A  |   S  |   D  |   F  |   G  ||   H  |   J  |   K  |   L  |   ;  |   '    |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	| (    [ |   Z  |   X  |   C  |   V  |   B  ||   N  |   M  |   ,  |   .  |   /  | )    ] |
-	`--------+------+------+------+------+------'`------+------+------+------+------+--------'
-	         |   `  |      |   [  |   ]  |              | Left | Down |  Up  | Right|
-	         `---------------------------'              `---------------------------'
-	                             ,--------------.,--------------.
-	                             |Ctl/Esc| LAlt || RAlt | RCtl  |
-	                      ,------|-------|------||------+-------+-------.
-	                      |      | Enter |Number|| RGUI | Delete|       |
-	                      | Space|   /   |------||------|   /   | Bspc  |
-	                      |  /Fn | LShift| Bspc || Media| RShift|  /Fn  |
-	                      `---------------------'`----------------------' 
-
-
-        Colemak Mod-DH Gaming layer:
-	,-------------------------------------------.,-------------------------------------------.
-	|   =    |   1  |   2  |   3  |   4  |   5  ||   6  |   7  |   8  |   9  |   0  |   -    |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	| Tab    |   Q  |   W  |   F  |   P  |   B  ||   J  |   L  |   U  |   Y  |   ;  |   \    |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	| Ctl/Esc|   A  |   R  |   S  |   T  |   G  ||   M  |   N  |   E  |   I  |   O  |   '    |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	| LShift |   Z  |   X  |   C  |   D  |   V  ||   K  |   H  |   ,  |   .  |   /  | RShift |
-	`--------+------+------+------+------+------'`------+------+------+------+------+--------'
-	         |   `  |      |   [  |   ]  |              | Left | Down |  Up  | Right|
-	         `---------------------------'              `---------------------------'
-	                             ,--------------.,--------------.
-	                             |Ctl/Esc| LAlt || RAlt | RCtl  |
-	                      ,------|-------|------||------+-------+-------.
-	                      |      | Enter |Number|| RGUI | Delete|       |
-	                      | Space|   /   |------||------|   /   | Bspc  |
-	                      |      | LShift| Bspc || Media| RShift|       |
-	                      `---------------------'`----------------------'
-
-
-         QWERTY Gaming layer:
-	,-------------------------------------------.,-------------------------------------------.
-	|   =    |   1  |   2  |   3  |   4  |   5  ||   6  |   7  |   8  |   9  |   0  |   -    |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	| Tab    |   Q  |   W  |   E  |   R  |   T  ||   Y  |   U  |   I  |   O  |   P  |   \    |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	| Ctl/Esc|   A  |   S  |   D  |   F  |   G  ||   H  |   J  |   K  |   L  |   ;  |   '    |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	| LShift |   Z  |   X  |   C  |   V  |   B  ||   N  |   M  |   ,  |   .  |   /  | RShift |
-	`--------+------+------+------+------+------'`------+------+------+------+------+--------'
-	         |   `  |      |   [  |   ]  |              | Left | Down |  Up  | Right|
-	         `---------------------------'              `---------------------------'
-	                             ,--------------.,--------------.
-	                             |Ctl/Esc| LAlt || RAlt | RCtl  |
-	                      ,------|-------|------||------+-------+-------.
-	                      |      | Enter |Number|| RGUI | Delete|       |
-	                      | Space|   /   |------||------|   /   | Bspc  |
-	                      |      | LShift| Bspc || Media| RShift|       |
-	                      `---------------------'`----------------------'
-
-
-        Media layer:
-	,-------------------------------------------.,-------------------------------------------.
-	|        |      |      |      |      |      ||      |      |      |      |      |        |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	|        |      |      |      |      |      ||      |      |      |      |      |        |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	|        |      | Mute | Vol- | Vol+ |      ||      |      |      |      |      |        |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	|        |      | Prev | Play | Next | Stop ||      |      |      |      |      |        |
-	`--------+------+------+------+------+------'`------+------+------+------+------+--------'
-	         |      |      |      |      |              |      |      |      |      |
-	         `---------------------------'              `---------------------------'
-	                              ,-------------.,-------------.
-	                              |      |      ||      |      |
-	                       ,------|------|------||------+------+------.
-	                       |      |      |      ||      |      |      |
-	                       |      |      |------||------|      |      |
-	                       |      |      |      ||      |      |      |
-	                       `--------------------'`--------------------'
-
-        Keypad layer:
-	,-------------------------------------------.,-------------------------------------------.
-	|        |      |      |      |      |      ||      |      | KP = | KP / | KP * |        |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	|        |      |      |  Up  |      |      ||      | KP 7 | KP 8 | KP 9 | KP - |        |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	|        |      | Left | Down | Right|      ||      | KP 4 | KP 5 | KP 6 | KP + |        |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	|        |      |      |      |      |      ||      | KP 1 | KP 2 | KP 3 |KP Ent|        |
-	`--------+------+------+------+------+------'`------+------+------+------+------+--------'
-	         |      | INS  |      |      |              |      |      | KP . |KP Ent|
-	         `---------------------------'              `---------------------------'
-	                              ,-------------.,-------------.
-	                              |      |      ||      |      |
-	                       ,------|------|------||------+------+------.
-	                       |      |      |      ||      |      |      |
-	                       |      |      |------||------|      | KP 0 |
-	                       |      |      |      ||      |      |      |
-	                       `--------------------'`--------------------'
-
-        Layer switch layer:
-	,-------------------------------------------.,-------------------------------------------.
-	|        |Col DH|QWERTY|Col GM|QW GM |      ||      |      |      |      |      |        |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	|        |      |      |      |      |      ||      |      |      |      |      |        |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	|        |      |      |      |      |      ||      |      |      |      |      |        |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	|        |      |      |      |      |      ||      |      |      |      |      |        |
-	`--------+------+------+------+------+------'`------+------+------+------+------+--------'
-	         |      |      |      |      |              |      |      |      |      |
-	         `---------------------------'              `---------------------------'
-	                              ,-------------.,-------------.
-	                              |      |      ||      |      |
-	                       ,------|------|------||------+------+------.
-	                       |      |      |      ||      |      |      |
-	                       |      |      |------||------|      |      |
-	                       |      |      |      ||      |      |      |
-	                       `--------------------'`--------------------'
-
-        Function layer:
-	,-------------------------------------------.,-------------------------------------------.
-	|   F11  |  F1  |  F2  |  F3  |  F4  |  F5  ||  F6  |  F7  |  F8  |  F9  |  F10 |  F12   |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	|        |      |      |  Up  |      |      ||      | Home |  Up  |  End |      |        |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	|        |      | Left | Down | Right|      || PgUp | Right| Down | Left |      |        |
-	|--------+------+------+------+------+------||------+------+------+------+------+--------|
-	|        |      |      |      |      |      || PgDn |      |      |      |      |        |
-	`--------+------+------+------+------+------'`------+------+------+------+------+--------'
-	         |      |  INS |      |      |              |      |      |      |      |
-	         `---------------------------'              `---------------------------'
-	                              ,-------------.,-------------.
-	                              |      |      ||      |      |
-	                       ,------|------|------||------+------+------.
-	                       |      |      |      ||      |      |      |
-	                       |      |      |------||------|      |      |
-	                       |      |      |      ||      |      |      |
-	                       `--------------------'`--------------------'
-
-
-*/
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {

-[_CMD] = KEYMAP(
-           // Left Hand
-           KC_ESC,        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,
-           KC_EQL,        KC_1,    KC_2,    KC_3,    KC_4,    KC_5,
-           KC_TAB,        KC_Q,    KC_W,    KC_F,    KC_P,    KC_B,
-           CTL_T(KC_ESC), KC_A,    KC_R,    KC_S,    KC_T,    KC_G,
-           TD(LPN_LBC),   KC_Z,    KC_X,    KC_C,    KC_D,    KC_V,
-                          KC_GRV,  XXXXXXX, KC_LBRC, KC_RBRC,
-
-           //Left Thumb
-                                   CTL_T(KC_ESC),    KC_LALT,
-                                                     MO(_NM),
-           LT(_FN, KC_SPC),        LSFT_T(KC_ENT),   KC_BSPC,
-
-           //Right Hand
-           KC_F9,         KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS, TG(_KP), MO(_LY),
-           KC_6,          KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
-           KC_J,          KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSLS,
-           KC_M,          KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
-           KC_K,          KC_H,    KC_COMM, KC_DOT,  KC_SLSH, TD(RPN_RBC),
-           KC_LEFT,       KC_DOWN, KC_UP,   KC_RGHT,
-
-           //Right Thumb
-           KC_RALT,       KC_RCTL,
-           KC_RGUI,
-           MO(_MD),       RSFT_T(KC_DEL),   LT(_FN2, KC_BSPC)
-    ),
-
+/* QWERTY
+*  (Keys separated by /: tap for first, hold for second)
+*  ,-----------------------------------------------------------------------------------------------------------.
+*  | ESC |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  F7 |  F8 |  F9 | F10 | F11 | F12 | PScr| SLck| Paus|Numpd|Layer|
+*  `-----------------------------------------------------------------------------------------------------------'
+*  ,-------------------------------------------.                   ,-------------------------------------------.
+*  |   =    |   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  |   ;  |   '    |
+*  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
+*  |  Shift |   Z  |   X  |   C  |   V  |   B  |                   |   N  |   M  |   ,  |   .  |   /  |  Shift |
+*  `--------+------+------+------+------+------'                   `------+------+------+------+------+--------'
+*           |   `  |      |   [  |   ]  |                                 | Left | Down |  Up  | Right|
+*           `---------------------------'                                 `---------------------------'
+*                               ,--------------.                   ,--------------.
+*                               |  LCtl | LAlt |                   | RAlt | RCtl  |
+*                        ,------|-------|------|                   |------+-------+------.
+*                        | Space| Enter |  App |                   | RGUI | Delete| Bspc |
+*                        |   /  |   /   |------|                   |------|   /   |   /  |
+*                        |  Fn  | Number| Bspc |                   | Enter| Number|  Fn2 |
+*                        `---------------------'                   `---------------------' 
+*/
 [_QW] = KEYMAP(
-           // Left Hand
-           KC_ESC,        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,
-           KC_EQL,        KC_1,    KC_2,    KC_3,    KC_4,    KC_5,
-           KC_TAB,        KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,
-           CTL_T(KC_ESC), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,
-           TD(LPN_LBC),   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,
-                          KC_GRV,  XXXXXXX, KC_LBRC, KC_RBRC,
-           
-           //Left Thumb
-                                   CTL_T(KC_ESC),    KC_LALT,
-                                                     MO(_NM),
-           LT(_FN, KC_SPC),        LSFT_T(KC_ENT),   KC_BSPC,
+  // Left Hand
+  KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,
+  KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,
+  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,
+  KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,
+  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,
+           KC_GRV,  XXXXXXX, KC_LBRC, KC_RBRC,
+  //Left Thumb
+                             KC_LCTL,          KC_LALT,
+                                               KC_APP,
+           LT(_FN, KC_SPC),  LT(_NS, KC_ENT),  KC_BSPC,
+  //Right Hand
+  KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS, TG(_NP), MO(_LY),
+  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
+  KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
+  KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
+  KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT,
+  //Right Thumb
+  KC_RALT, KC_RCTL,
+  KC_RGUI,
+  KC_ENT,  LT(_NS, KC_DEL),  LT(_FN2, KC_BSPC)
+),

-           //Right Hand
-           KC_F9,         KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS, TG(_KP), MO(_LY),
-           KC_6,          KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
-           KC_Y,          KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
-           KC_H,          KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-           KC_N,          KC_M,    KC_COMM, KC_DOT,  KC_SLSH, TD(RPN_RBC),
-           KC_LEFT,       KC_DOWN, KC_UP,   KC_RGHT,
-
-           //Right Thumb
-           KC_RALT,       KC_RCTL,
-           KC_RGUI,
-           MO(_MD),       RSFT_T(KC_DEL),   LT(_FN2, KC_BSPC)
-
-    ),
-
-[_CG] = KEYMAP(
-           // Left Hand
-           KC_ESC,        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,
-           KC_EQL,        KC_1,    KC_2,    KC_3,    KC_4,    KC_5,
-           KC_TAB,        KC_Q,    KC_W,    KC_F,    KC_P,    KC_B,
-           CTL_T(KC_ESC), KC_A,    KC_R,    KC_S,    KC_T,    KC_G,
-           KC_LSFT,       KC_Z,    KC_X,    KC_C,    KC_D,    KC_V,
-                          KC_GRV,  XXXXXXX, KC_LBRC, KC_RBRC,
-
-           //Left Thumb
-                                   CTL_T(KC_ESC),    KC_LALT,
-                                                     MO(_NM),
-           KC_SPC,                 LSFT_T(KC_ENT),   KC_BSPC,
-
-           //Right Hand
-           KC_F9,         KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS, TG(_KP), MO(_LY),
-           KC_6,          KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
-           KC_J,          KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSLS,
-           KC_M,          KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
-           KC_K,          KC_H,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-           KC_LEFT,       KC_DOWN, KC_UP,   KC_RGHT,
-
-           //Right Thumb
-           KC_RALT,       KC_RCTL,
-           KC_RGUI,
-           MO(_MD),       RSFT_T(KC_DEL),   KC_BSPC
-    ),
+/* Colemak
+*  (Keys separated by /: tap for first, hold for second)
+*  ,-----------------------------------------------------------------------------------------------------------.
+*  | ESC |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  F7 |  F8 |  F9 | F10 | F11 | F12 | PScr| SLck| Paus|Numpd|Layer|
+*  `-----------------------------------------------------------------------------------------------------------'
+*  ,-------------------------------------------.                   ,-------------------------------------------.
+*  |   =    |   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  |   '    |
+*  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
+*  |  Shift |   Z  |   X  |   C  |   V  |   B  |                   |   K  |   M  |   ,  |   .  |   /  |  Shift |
+*  `--------+------+------+------+------+------'                   `------+------+------+------+------+--------'
+*           |   `  |      |   [  |   ]  |                                 | Left | Down |  Up  | Right|
+*           `---------------------------'                                 `---------------------------'
+*                               ,--------------.                   ,--------------.
+*                               |  LCtl | LAlt |                   | RAlt | RCtl  |
+*                        ,------|-------|------|                   |------+-------+------.
+*                        | Space| Enter |  App |                   | RGUI | Delete| Bspc |
+*                        |   /  |   /   |------|                   |------|   /   |   /  |
+*                        |  Fn  | Number| Bspc |                   | Enter| Number|  Fn2 |
+*                        `---------------------'                   `---------------------' 
+*/
+[_CM] = KEYMAP(
+  // Left Hand
+  KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,
+  KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,
+  KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,
+  KC_ESC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,
+  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,
+           KC_GRV,  XXXXXXX, KC_LBRC, KC_RBRC,
+  //Left Thumb
+                             KC_LCTL,          KC_LALT,
+                                               KC_APP,
+           LT(_FN, KC_SPC),  LT(_NS, KC_ENT),  KC_BSPC,
+  //Right Hand
+  KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS, TG(_NP), MO(_LY),
+  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
+  KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSLS,
+  KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
+  KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
+  KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT,
+  //Right Thumb
+  KC_RALT, KC_RCTL,
+  KC_RGUI,
+  KC_ENT,  LT(_NS, KC_DEL),  LT(_FN2, KC_BSPC)
+),

+/* QWERTY Gaming
+*  (Keys separated by /: tap for first, hold for second; no access to Fn layer)
+*  ,-----------------------------------------------------------------------------------------------------------.
+*  | ESC |  F1 |  F2 |  F3 |  F4 |  F5 |  F6 |  F7 |  F8 |  F9 | F10 | F11 | F12 | PScr| SLck| Paus|Numpd|Layer|
+*  `-----------------------------------------------------------------------------------------------------------'
+*  ,-------------------------------------------.                   ,-------------------------------------------.
+*  |   =    |   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  |   ;  |   '    |
+*  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
+*  |  Shift |   Z  |   X  |   C  |   V  |   B  |                   |   N  |   M  |   ,  |   .  |   /  |  Shift |
+*  `--------+------+------+------+------+------'                   `------+------+------+------+------+--------'
+*           |   `  |      |   [  |   ]  |                                 | Left | Down |  Up  | Right|
+*           `---------------------------'                                 `---------------------------'
+*                               ,--------------.                   ,--------------.
+*                               |  LCtl | LAlt |                   | RAlt | RCtl  |
+*                        ,------|-------|------|                   |------+-------+------.
+*                        |      | Enter |      |                   | RGUI | Delete|      |
+*                        | Space|   /   |------|                   |------|   /   | Bspc |
+*                        |      | Number| Bspc |                   | Enter| Number|      |
+*                        `---------------------'                   `---------------------' 
+*/
 [_QG] = KEYMAP(
-           // Left Hand
-           KC_ESC,        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,
-           KC_EQL,        KC_1,    KC_2,    KC_3,    KC_4,    KC_5,
-           KC_TAB,        KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,
-           CTL_T(KC_ESC), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,
-           KC_LSFT,       KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,
-                          KC_GRV,  XXXXXXX, KC_LBRC, KC_RBRC,
+  // Left Hand
+  KC_ESC,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,
+  KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,
+  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,
+  KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,
+  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,
+           KC_GRV,  XXXXXXX, KC_LBRC, KC_RBRC,
+  //Left Thumb
+                             KC_LCTL,          KC_LALT,
+                                               XXXXXXX,
+           KC_SPC,           LT(_NS, KC_ENT),  KC_BSPC,
+  //Right Hand
+  KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS, TG(_NP), MO(_LY),
+  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
+  KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
+  KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
+  KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT,
+  //Right Thumb
+  KC_RALT, KC_RCTL,
+  KC_RGUI,
+  KC_ENT,  LT(_NS, KC_DEL),  KC_BSPC
+),

-           //Left Thumb
-                                   CTL_T(KC_ESC),    KC_LALT,
-                                                     MO(_NM),
-           KC_SPC,                 LSFT_T(KC_ENT),   KC_BSPC,
+/* Number/symbol layer
+*  ,-----------------------------------------------------------------------------------------------------------.
+*  |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |
+*  `-----------------------------------------------------------------------------------------------------------'
+*  ,-------------------------------------------.                   ,-------------------------------------------.
+*  |   F12  |  F1  |  F2  |  F3  |  F4  |  F5  |                   |  F6  |  F7  |  F8  |  F9  |  F10 |   F11  |
+*  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
+*  |        |   !  |   @  |   #  |   $  |   %  |                   |   ^  |   &  |   *  |   `  |   ~  |        |
+*  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
+*  |        |   1  |   2  |   3  |   4  |   5  |                   |   6  |   7  |   8  |   9  |   0  |        |
+*  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
+*  |        |   =  |   {  |   [  |   (  |   +  |                   |   _  |   )  |   ]  |   }  |   -  |        |
+*  `--------+------+------+------+------+------'                   `------+------+------+------+------+--------'
+*           |      |      |      |      |                                 |      |      |      |      |
+*           `---------------------------'                                 `---------------------------'
+*                                ,-------------.                   ,-------------.
+*                                |      |      |                   |      |      |
+*                         ,------|------|------|                   |------+------+------.
+*                         |      |      |      |                   |      |      |      |
+*                         |      |      |------|                   |------|      |      |
+*                         |      |      |      |                   |      |      |      |
+*                         `--------------------'                   `--------------------'
+*/
+[_NS] = KEYMAP(
+  // Left Hand
+  _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  KC_F12,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,
+  _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,
+  _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,
+  _______, KC_EQL,  KC_LCBR, KC_LBRC, KC_LPRN, KC_PLUS,
+           _______, _______, _______, _______,
+  // Left Thumb
+                             _______,          _______,
+                                               _______,
+                    _______, _______,          _______,
+  // Right Hand
+  _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
+  KC_CIRC, KC_AMPR, KC_ASTR, KC_GRV,  KC_TILD, _______, 
+  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______, 
+  KC_UNDS, KC_RPRN, KC_RBRC, KC_RCBR, KC_MINS, _______,
+           _______, _______, _______, _______, 
+  // Right Thumb
+  _______, _______,
+  _______,
+  _______, _______, _______
+),

-           //Right Hand
-           KC_F9,         KC_F10,  KC_F11,  KC_F12,  KC_PSCR, KC_SLCK, KC_PAUS, TG(_KP), MO(_LY),
-           KC_6,          KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
-           KC_Y,          KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
-           KC_H,          KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-           KC_N,          KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-           KC_LEFT,       KC_DOWN, KC_UP,   KC_RGHT,
-
-           //Right Thumb
-           KC_RALT,       KC_RCTL,
-           KC_RGUI,
-           MO(_MD),       RSFT_T(KC_DEL),   KC_BSPC
-    ),
-
-[_NM] = KEYMAP(
-           // Left Hand
-           _______, _______, _______, _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-           KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,
-           _______, _______, _______, _______, _______, _______,
-                    _______, _______, _______, _______,
-
-           // Left Thumb
-                    _______, _______,
-                             _______,
-           _______, _______, _______,
-
-           // Right Hand
-           _______, _______, _______, _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-           KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
-           _______, _______, _______, _______, _______, _______,
-                    _______, _______, _______, _______, 
-
-           // Right Thumb
-           _______, _______,
-           _______,
-           _______, _______, _______
-    ),
-
-[_MD] = KEYMAP(
-           // Left Hand
-           _______, _______, _______, _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-           _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______,
-           _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP,
-                    _______, _______, _______, _______,
-
-           // Left Thumb
-                    _______, _______,
-                             _______,
-           _______, _______, _______,
-
-           // Right Hand
-           _______, _______, _______, _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-                    _______, _______, _______, _______,
-
-           // Right Thumb
-           _______, _______,
-           _______,
-           _______, _______, _______
-    ),
-
-[_KP] = KEYMAP(
-           // Left Hand
-           _______, _______, _______, _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, _______, _______, _______,
-           _______, _______, _______, KC_UP,   _______, _______,
-           _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______,
-           _______, _______, _______, _______, _______, _______,
-                    _______, KC_INS,  _______, _______,
-
-           // Left Thumb
-                    _______, _______,
-                             _______,
-           _______, _______, _______,
-
-           // Right Hand
-           _______, _______, _______, _______, _______, _______, _______, _______, _______,
-           _______, _______, KC_PEQL, KC_PSLS, KC_PAST, _______,
-           _______, KC_P7,   KC_P8,   KC_P9,   KC_PMNS, _______,
-           _______, KC_P4,   KC_P5,   KC_P6,   KC_PPLS, _______,
-           _______, KC_P1,   KC_P2,   KC_P3,   KC_PENT, _______,
-                    _______, _______, KC_PDOT, KC_PENT,
-
-           // Right Thumb
-           _______, _______,
-           _______,
-           _______, _______, KC_P0
-    ),
+/* Numpad layer
+*  ,-----------------------------------------------------------------------------------------------------------.
+*  |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |
+*  `-----------------------------------------------------------------------------------------------------------'
+*  ,-------------------------------------------.                   ,-------------------------------------------.
+*  |        |      |      |      |      |      |                   | NumLk|  Tab | KP / |  kP *| KP - |        |
+*  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
+*  |        |      |      |  Up  |      |      |                   |      | KP 7 | KP 8 | KP 9 | KP + |        |
+*  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
+*  |        |      | Left | Down | Right|      |                   |      | KP 4 | KP 5 | KP 6 | KP = |        |
+*  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
+*  |        |      |      |      |      |      |                   |      | KP 1 | KP 2 | KP 3 |KP Ent|        |
+*  `--------+------+------+------+------+------'                   `------+------+------+------+------+--------'
+*           |      | INS  |      |      |                                 |      | KP , | KP . |KP Ent|
+*           `---------------------------'                                 `---------------------------'
+*                                ,-------------.                   ,-------------.
+*                                |      |      |                   |      |      |
+*                         ,------|------|------|                   |------+------+------.
+*                         |      |      |      |                   |      |      |      |
+*                         |      |      |------|                   |------|      | KP 0 |
+*                         |      |      |      |                   |      |      |      |
+*                         `--------------------'                   `--------------------'
+*/
+[_NP] = KEYMAP(
+  // Left Hand
+  _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, KC_UP,   _______, _______,
+  _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______,
+  _______, _______, _______, _______, _______, _______,
+           _______, KC_INS,  _______, _______,
+  // Left Thumb
+                                      _______, _______,
+                                               _______,
+                             _______, _______, _______,
+  // Right Hand
+  _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  KC_NLCK, KC_TAB,  KC_PSLS, KC_PAST, KC_PMNS, _______,
+  _______, KC_P7,   KC_P8,   KC_P9,   KC_PPLS, _______,
+  _______, KC_P4,   KC_P5,   KC_P6,   KC_PEQL, _______,
+  _______, KC_P1,   KC_P2,   KC_P3,   KC_PENT, _______,
+           _______, KC_PCMM, KC_PDOT, KC_PENT,
+  // Right Thumb
+  _______, _______,
+  _______,
+  _______, _______, KC_P0
+),

+/* Layer switch layer
+*  ,-----------------------------------------------------------------------------------------------------------.
+*  |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |     |
+*  `-----------------------------------------------------------------------------------------------------------'
+*  ,-------------------------------------------.                   ,-------------------------------------------.
+*  |        |QWERTY|Colemk|QW GM |      |      |                   |      |      |      |      |      |        |
+*  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
+*  |        |      |      |      |      |      |                   |      |      |      |      |      |        |
+*  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
+*  |        |      |      |      |      |      |                   |      |      |      |      |      |        |
+*  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
+*  |        |      |      |      |      |      |                   |      |      |      |      |      |        |
+*  `--------+------+------+------+------+------'                   `------+------+------+------+------+--------'
+*           |      |      |      |      |                                 |      |      |      |      |
+*           `---------------------------'                                 `---------------------------'
+*                                ,-------------.                   ,-------------.
+*                                |      |      |                   |      |      |
+*                         ,------|------|------|                   |------+------+------.
+*                         |      |      |      |                   |      |      |      |
+*                         |      |      |------|                   |------|      |      |
+*                         |      |      |      |                   |      |      |      |
+*                         `--------------------'                   `--------------------'
+*/
 [_LY] = KEYMAP(
-           // Left Hand
-           _______, _______,  _______, _______, _______, _______, _______, _______, _______,
-           _______, DF(_CMD), DF(_QW), DF(_CG), DF(_QG), _______,
-           _______, _______,  _______, _______, _______, _______,
-           _______, _______,  _______, _______, _______, _______,
-           _______, _______,  _______, _______, _______, _______,
-                    _______,  _______, _______, _______,
-
-           // Left Thumb
-                    _______, _______,
-                             _______,
-           _______, _______, _______,
-
-           // Right Hand
-           _______, _______,  _______, _______, _______, _______, _______, _______, _______,
-           _______, _______,  _______, _______, _______, _______,
-           _______, _______,  _______, _______, _______, _______,
-           _______, _______,  _______, _______, _______, _______,
-           _______, _______,  _______, _______, _______, _______,
-                    _______,  _______, _______, _______, 
-
-           // Right Thumb
-           _______, _______,
-           _______,
-           _______, _______,  _______
-    ),
+  // Left Hand
+  _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, DF(_QW), DF(_CM), DF(_QG), _______, _______,
+  _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______,
+           _______, _______, _______, _______,
+  // Left Thumb
+                                      _______, _______,
+                                               _______,
+                             _______, _______, _______,
+  // Right Hand
+  _______, _______, _______,  _______, _______, _______, _______, _______, _______,
+  _______, _______, _______,  _______, _______, _______,
+  _______, _______, _______,  _______, _______, _______,
+  _______, _______, _______,  _______, _______, _______,
+  _______, _______, _______,  _______, _______, _______,
+           _______, _______,  _______, _______, 
+  // Right Thumb
+  _______, _______,
+  _______,
+  _______, _______, _______
+),

+/* Function layer
+*  ,-----------------------------------------------------------------------------------------------------------.
+*  |     |     |     |     |     |     |     |     |     |RESET|     |     |     |     |     |     |     |     |
+*  `-----------------------------------------------------------------------------------------------------------'
+*  ,-------------------------------------------.                   ,-------------------------------------------.
+*  |   F12  |  F1  |  F2  |  F3  |  F4  |  F5  |                   |  F6  |  F7  |  F8  |  F9  |  F10 |   F11  |
+*  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
+*  |        |      |      |  Up  |      |Alt+Tb|                   |      | Home |  Up  |  End |      |        |
+*  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
+*  |        |      | Left | Down | Right|      |                   | PgUp | Right| Down | Left |      |        |
+*  |--------+------+------+------+------+------|                   |------+------+------+------+------+--------|
+*  |        |      | Prev | Play | Next | Stop |                   | PgDn | Mute | Vol- | Vol+ |      |        |
+*  `--------+------+------+------+------+------'                   `------+------+------+------+------+--------'
+*           |      |  INS |      |      |                                 |      |      |      |      |
+*           `---------------------------'                                 `---------------------------'
+*                                ,-------------.                   ,-------------.
+*                                |      |      |                   |      |      |
+*                         ,------|------|------|                   |------+------+------.
+*                         |      |      |      |                   |      |      |      |
+*                         |      |      |------|                   |------|      |      |
+*                         |      |      |      |                   |      |      |      |
+*                         `--------------------'                   `--------------------'
+*/
 [_FN] = KEYMAP(
-           // Left Hand
-           _______, _______, _______, _______, _______, _______, _______, _______, _______,
-           KC_F11,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,
-           _______, _______, _______, KC_UP,   _______, _______,
-           _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______,
-           _______, _______, _______, _______, _______, _______,
-                    _______, KC_INS,  _______, _______,
-
-           // Left Thumb
-                    _______, _______,
-                             _______,
-           _______, _______, _______,
-
-           // Right Hand
-           _______, _______, _______, _______, _______, _______, _______, _______, RESET,
-           KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F12,
-           _______, KC_HOME, KC_UP,   KC_END,  _______, _______,
-           KC_PGUP, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,
-           KC_PGDN, _______, _______, _______, _______, _______,
-                    _______, _______, _______, _______, 
-
-           // Right Thumb
-           _______, _______,
-           _______,
-           _______, _______, _______
-    ),
+  // Left Hand
+  _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  KC_F12,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,
+  _______, _______, _______, KC_UP,   _______, LALT(KC_TAB),
+  _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______,
+  _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP,
+           _______, KC_INS,  _______, _______,
+  // Left Thumb
+                                      _______, _______,
+                                               _______,
+                             _______, _______, _______,
+  // Right Hand
+  RESET,   _______, _______, _______, _______, _______, _______, _______, _______,
+  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
+  _______, KC_HOME, KC_UP,   KC_END,  _______, _______,
+  KC_PGUP, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,
+  KC_PGDN, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,
+           _______, _______, _______, _______, 
+  // Right Thumb
+  _______, _______,
+  _______,
+  _______, _______, _______
+),

 [_FN2] = KEYMAP(
-           // Left Hand
-           _______, _______, _______, _______, _______, _______, _______, _______, _______,
-           KC_F11,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,
-           _______, _______, _______, KC_UP,   _______, _______,
-           _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______,
-           _______, _______, _______, _______, _______, _______,
-                    _______, KC_INS,  _______, _______,
-
-           // Left Thumb
-                    _______, _______,
-                             _______,
-           _______, _______, _______,
-
-           // Right Hand
-           _______, _______, _______, _______, _______, _______, _______, _______, RESET,
-           KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F12,
-           _______, KC_HOME, KC_UP,   KC_END,  _______, _______,
-           KC_PGUP, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,
-           KC_PGDN, _______, _______, _______, _______, _______,
-                    _______, _______, _______, _______, 
-
-           // Right Thumb
-           _______, _______,
-           _______,
-           _______, _______, _______
-    )
+  // Left Hand
+  _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  KC_F12,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,
+  _______, _______, _______, KC_UP,   _______, LALT(KC_TAB),
+  _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______,
+  _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP,
+           _______, KC_INS,  _______, _______,
+  // Left Thumb
+                                      _______, _______,
+                                               _______,
+                             _______, _______, _______,
+  // Right Hand
+  RESET,   _______, _______, _______, _______, _______, _______, _______, _______,
+  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
+  _______, KC_HOME, KC_UP,   KC_END,  _______, _______,
+  KC_PGUP, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,
+  KC_PGDN, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,
+           _______, _______, _______, _______, 
+  // Right Thumb
+  _______, _______,
+  _______,
+  _______, _______, _______
+)

 };

@@ -525,3 +428,6 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 void led_set_user(uint8_t usb_led) {

 }
+
+
+
--- a/keyboards/kinesis/keymaps/salty/readme.md
+++ b/keyboards/kinesis/keymaps/salty/readme.md
@@ -0,0 +1,14 @@
+# Salty's Kinesis Keymap
+
+These layouts are derived from what I was using on my Kinesis Contoured keyboards through TMK converters.  With the move to QMK through Stapelberg replacement controller, I've cleaned up the layouts a bit while adding number/symbol layer.
+
+There are only minor changes in the base keywell layout (e.g., CapsLock is ESC, arrow clusters on one side), while the thumb clusters deviate more from the default layout.
+
+Changes to the thumb clusters include: 
+* The navigations keys moved to Fn layers.
+* The function of 2u keys have been reversed - I've always used space with my left thumb, and I find it more helpful to have access to Space and Enter while using my mouse/trackball.
+* Enter and Backspace have been duplicated on both clusters.
+* The 2u keys serve dual function as momentary layer switchers.
+
+I'm frequently fiddle around with the layouts as I find certain things I want to try out.
+
--- a/keyboards/kinesis/keymaps/salty/rules.mk
+++ b/keyboards/kinesis/keymaps/salty/rules.mk
@@ -2,7 +2,7 @@
 #   change to "no" to disable the options, or define them in the Makefile in 
 #   the appropriate keymap folder that will get included automatically
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration(+1000)
+BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration(+1000)
 MOUSEKEY_ENABLE = no        # Mouse keys(+4700)
 EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
 CONSOLE_ENABLE = no         # Console for debug(+400)
@@ -11,11 +11,12 @@ NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: ht
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 MIDI_ENABLE = no            # MIDI controls
 AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
+UNICODE_ENABLE = yes        # Unicode
 BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time.
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-TAP_DANCE_ENABLE = yes
+TAP_DANCE_ENABLE = yes      # Enable Tap Dancing function
+KEY_LOCK_ENABLE = yes       # Enable key lock

 ifndef QUANTUM_DIR
 	include ../../../../Makefile
--- a/keyboards/m10a/keymaps/default/keymap.c
+++ b/keyboards/m10a/keymaps/default/keymap.c
@@ -1,5 +1,3 @@
-// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
-// this is the style you want to emulate.

 #include "m10a.h"
 #include "action_layer.h"
--- a/keyboards/minidox/keymaps/tomb0y/README.md
+++ b/keyboards/minidox/keymaps/tomb0y/README.md
@@ -0,0 +1,49 @@
+```
+/* Base layer - workman
+ *
+ * ,----------------------------------.           ,----------------------------------.
+ * |   q  |   d  |   r  |   w  |   b  |           |   j  |   f  |   u  |   p  |   ;  |
+ * |------+------+------+------+------|           |------+------+------+------+------|
+ * |   a  |   s  |   h  |   t  |   g  |           |   y  |   n  |   e  |   o  |   i  |
+ * |------+------+------+------+------|           |------+------+------+------+------|
+ * |   z  |   x  |   m  |   c  |   v  |           |   k  |   l  | dead |   .  |   /  |
+ * `----------------------------------'           `----------------------------------'
+ *                  ,--------------------.    ,---------------------.
+ *                 | tab   | esc  | enter|    |bckspc| space|   tab |
+ *                 | shift | ctrl | alt  |    |  gui |   fn | shift |
+ *                 `-------+------+      |    |      |------+-------.
+ *                                `------'    `------'
+ */
+
+/* Dead key layer
+ *
+ * ,----------------------------------.           ,----------------------------------.
+ * |   %  |   &  |   ?  |   +  |   @  |           |   $  |   _  |   [  |   ]  |   !  |
+ * |------+------+------+------+------|           |------+------+------+------+------|
+ * |   #  |   (  |   =  |   0  |   {  |           |   }  |   1  |   *  |   )  |   -  |
+ * |------+------+------+------+------|           |------+------+------+------+------|
+ * |   6  |   7  |   8  |   9  |   |  |           |   \  |   2  |   3  |   4  |   5  |
+ * `----------------------------------'           `----------------------------------'
+ *                  ,--------------------.    ,---------------------.
+ *                 | tab   | esc  | comma|    |bckspc| comma|   tab |
+ *                 | shift | ctrl |+enter|    |  gui |+space| shift |
+ *                 `-------+------+      |    |      |------+-------.
+ *                                `------'    `------'
+ */
+
+/* Function layer
+ *
+ * ,----------------------------------.           ,---------------------------------.
+ * |      |  del |⌃←  |  ⌃→ |      |           | mute | vol- | vol+ | ⌘⌃p |      |
+ * |------+------+------+------+------|           |------+------+------+------+------|
+ * |   `  |  end | pgup | pgdn | home |           |  ←  |   ↓  |   ↑  |  →  |   '  |
+ * |------+------+------+------+------|           |------+------+------+------+------|
+ * | ⌥⇥ |      |⇧⌃⇥| ⌃⇥  |       |           |      |  br- | ,    | br+  |  ^   |
+ * `----------------------------------'           `----------------------------------'
+ *                  ,--------------------.    ,---------------------.
+ *                 | tab   |      | enter|    |bckspc|      |   tab |
+ *                 | shift |      | alt  |    |  gui |      | shift |
+ *                 `-------+------+      |    |      |------+-------.
+ *                                `------'    `------'
+ */
+```
--- a/keyboards/minidox/keymaps/tomb0y/keymap.c
+++ b/keyboards/minidox/keymaps/tomb0y/keymap.c
@@ -0,0 +1,144 @@
+#include "minidox.h"
+#include "action_layer.h"
+#include "eeconfig.h"
+
+extern keymap_config_t keymap_config;
+
+#define _WM      0
+#define _DK      1
+#define _FUN     2
+
+#define _DK_ACT  0
+#define _DK_REL  1
+#define _KC_COMS 2
+#define _KC_CENT 3
+
+#define DK_ACT   M(_DK_ACT)        // activate dead key layer
+#define DK_REL   M(_DK_REL)        // release dead key layer
+#define KC_COMS  M(_KC_COMS)       // comma + space
+#define KC_CENT  M(_KC_CENT)       // comma + enter
+#define KC_ENOP  ALT_T(KC_ENT)     // press for enter, hold for option
+#define KC_BSCM  GUI_T(KC_BSPC)    // press for backspace, hold for command
+#define KC_CTES  CTL_T(KC_ESC)     // press for escape, hold for control
+#define KC_SHTB  SFT_T(KC_TAB)     // press for tab, hold for shift
+#define KC_SPFN  LT(_FUN, KC_SPC)  // press for space, hold for function layer (aka spacefn)
+#define KC_OPTB  RALT(KC_TAB)      // option + tab
+#define KC_CCSP  RGUI(RCTL(KC_P))  // control + command + p
+#define KC_CSTB  S(RCTL(KC_TAB))   // shift + control + tab
+#define KC_C_TB  RCTL(KC_TAB)      // control + tab
+#define KC_C_LF  RCTL(KC_LEFT)     // control + left
+#define KC_C_RT  RCTL(KC_RGHT)     // control + right
+#define KC_BRUP  KC_F15            // brightness up on osx
+#define KC_BRDN  KC_F14            // brightness down on osx
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/* Base layer - workman
+ *
+ * ,----------------------------------.           ,----------------------------------.
+ * |   q  |   d  |   r  |   w  |   b  |           |   j  |   f  |   u  |   p  |   ;  |
+ * |------+------+------+------+------|           |------+------+------+------+------|
+ * |   a  |   s  |   h  |   t  |   g  |           |   y  |   n  |   e  |   o  |   i  |
+ * |------+------+------+------+------|           |------+------+------+------+------|
+ * |   z  |   x  |   m  |   c  |   v  |           |   k  |   l  | dead |   .  |   /  |
+ * `----------------------------------'           `----------------------------------'
+ *                  ,--------------------.    ,---------------------.
+ *                 | tab   | esc  | enter|    |bckspc| space|   tab |
+ *                 | shift | ctrl | alt  |    |  gui |   fn | shift |
+ *                 `-------+------+      |    |      |------+-------.
+ *                                `------'    `------'
+ */
+  [_WM] = KEYMAP( \
+    KC_Q,    KC_D,    KC_R,    KC_W,    KC_B,        KC_J,    KC_F,    KC_U,    KC_P,    KC_SCLN, \
+    KC_A,    KC_S,    KC_H,    KC_T,    KC_G,        KC_Y,    KC_N,    KC_E,    KC_O,    KC_I,    \
+    KC_Z,    KC_X,    KC_M,    KC_C,    KC_V,        KC_K,    KC_L,    DK_ACT,  KC_DOT,  KC_SLSH, \
+                      KC_SHTB, KC_CTES, KC_ENOP,     KC_BSCM, KC_SPFN, KC_SHTB                    \
+  ),
+
+/* Dead key layer
+ *
+ * ,----------------------------------.           ,----------------------------------.
+ * |   %  |   &  |   ?  |   +  |   @  |           |   $  |   _  |   [  |   ]  |   !  |
+ * |------+------+------+------+------|           |------+------+------+------+------|
+ * |   #  |   (  |   =  |   0  |   {  |           |   }  |   1  |   *  |   )  |   -  |
+ * |------+------+------+------+------|           |------+------+------+------+------|
+ * |   6  |   7  |   8  |   9  |   |  |           |   \  |   2  |   3  |   4  |   5  |
+ * `----------------------------------'           `----------------------------------'
+ *                  ,--------------------.    ,---------------------.
+ *                 | tab   | esc  | comma|    |bckspc| comma|   tab |
+ *                 | shift | ctrl |+enter|    |  gui |+space| shift |
+ *                 `-------+------+      |    |      |------+-------.
+ *                                `------'    `------'
+ */
+  [_DK] = KEYMAP( \
+    KC_PERC, KC_AMPR, KC_QUES, KC_PLUS, KC_AT,       KC_DLR,  KC_UNDS, KC_LBRC, KC_RBRC, KC_EXLM, \
+    KC_HASH, KC_LPRN, KC_EQL,  KC_0,    KC_LCBR,     KC_RCBR, KC_1,    KC_ASTR, KC_RPRN, KC_MINS, \
+    KC_6,    KC_7,    KC_8,    KC_9,    KC_PIPE,     KC_BSLS, KC_2,    DK_REL,  KC_4,    KC_5,    \
+                      KC_SHTB, KC_CTES, KC_CENT,     KC_BSCM, KC_COMS, KC_SHTB                    \
+  ),
+
+/* Function layer
+ *
+ * ,----------------------------------.           ,---------------------------------.
+ * |      |  del |⌃←  |  ⌃→ |      |           | mute | vol- | vol+ | ⌘⌃p |      |
+ * |------+------+------+------+------|           |------+------+------+------+------|
+ * |   `  |  end | pgup | pgdn | home |           |  ←  |   ↓  |   ↑  |  →  |   '  |
+ * |------+------+------+------+------|           |------+------+------+------+------|
+ * | ⌥⇥ |      |⇧⌃⇥| ⌃⇥  |       |           |      |  br- | ,    | br+  |  ^   |
+ * `----------------------------------'           `----------------------------------'
+ *                  ,--------------------.    ,---------------------.
+ *                 | tab   |      | enter|    |bckspc|      |   tab |
+ *                 | shift |      | alt  |    |  gui |      | shift |
+ *                 `-------+------+      |    |      |------+-------.
+ *                                `------'    `------'
+ */
+ [_FUN] = KEYMAP( \
+    XXXXXXX, KC_DEL,  KC_C_LF, KC_C_RT, XXXXXXX,     KC_MUTE, KC_VOLD, KC_VOLU, KC_CCSP, XXXXXXX, \
+    KC_GRV,  KC_END,  KC_PGUP, KC_PGDN, KC_HOME,     KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_QUOT, \
+    KC_OPTB, XXXXXXX, KC_CSTB, KC_C_TB, XXXXXXX,     XXXXXXX, KC_BRDN, KC_COMM, KC_BRUP, KC_CIRC, \
+                      KC_SHTB, XXXXXXX, KC_ENOP,     KC_BSCM, _______, KC_SHTB                    \
+  )
+};
+
+void persistant_default_layer_set(uint16_t default_layer) {
+  eeconfig_update_default_layer(default_layer);
+  default_layer_set(default_layer);
+}
+
+const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
+{
+  switch(id) {
+    case _KC_COMS:
+      if (record->event.pressed) {
+        return MACRO(T(COMM), T(SPC), END); // comma + space
+      }
+      break;
+    case _KC_CENT:
+      if (record->event.pressed) {
+        return MACRO(T(COMM), T(ENT), END); // comma + enter
+      }
+      break;
+    case _DK_ACT:
+      if (record->event.pressed) {
+        if (keyboard_report->mods & MOD_BIT(KC_LSFT) || keyboard_report->mods & MOD_BIT(KC_RSFT)) { // act as comma when shift is pressed (eg <)
+          register_code(KC_COMM);
+        } else { // activate oneshot dead key layer otherwise
+          layer_on(_DK);
+          set_oneshot_layer(_DK, ONESHOT_START);
+        }
+      } else { // make sure to deactive dead key layer on key release
+        clear_oneshot_layer_state(ONESHOT_PRESSED);
+        unregister_code(KC_COMM);
+      }
+      break;
+    case _DK_REL:
+      if (record->event.pressed) { // act as 3 on keypress
+        register_code(KC_3);
+      } else { // make sure to deactive dead key layer on key release
+        clear_oneshot_layer_state(ONESHOT_PRESSED);
+        unregister_code(KC_3);
+      }
+      break;
+  }
+
+  return MACRO_NONE;
+};
--- a/keyboards/planck/keymaps/ab/keymap.c
+++ b/keyboards/planck/keymaps/ab/keymap.c
@@ -1,5 +1,3 @@
-// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
-// this is the style you want to emulate.

 #include "planck.h"
 #include "action_layer.h"
--- a/keyboards/planck/keymaps/chance/keymap.c
+++ b/keyboards/planck/keymaps/chance/keymap.c
@@ -1,5 +1,3 @@
-// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
-// this is the style you want to emulate.

 #include "planck.h"
 #include "action_layer.h"
--- a/keyboards/planck/keymaps/dbroqua/keymap.c
+++ b/keyboards/planck/keymaps/dbroqua/keymap.c
@@ -1,5 +1,3 @@
-// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
-// this is the style you want to emulate.

 #include "planck.h"
 #include "action_layer.h"
--- a/keyboards/planck/keymaps/experimental/keymap.c
+++ b/keyboards/planck/keymaps/experimental/keymap.c
@@ -1,5 +1,3 @@
-// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
-// this is the style you want to emulate.

 #include "planck.h"
 #include "action_layer.h"
--- a/keyboards/planck/keymaps/handwired_binaryplease/keymap.c
+++ b/keyboards/planck/keymaps/handwired_binaryplease/keymap.c
@@ -1,5 +1,3 @@
-// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
-// this is the style you want to emulate.

 #include "planck.h"
 #include "action_layer.h"
--- a/keyboards/planck/keymaps/impossible/keymap.c
+++ b/keyboards/planck/keymaps/impossible/keymap.c
@@ -1,5 +1,3 @@
-// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
-// this is the style you want to emulate.

 #include "planck.h"
 #include "action_layer.h"
--- a/keyboards/planck/keymaps/jeebak/keymap.c
+++ b/keyboards/planck/keymaps/jeebak/keymap.c
@@ -1,5 +1,3 @@
-// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
-// this is the style you want to emulate.

 #include "planck.h"
 #include "action_layer.h"
--- a/keyboards/planck/keymaps/jhenahan/keymap.c
+++ b/keyboards/planck/keymaps/jhenahan/keymap.c
@@ -1,5 +1,3 @@
-// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
-// this is the style you want to emulate.

 #include "planck.h"
 #include "action_layer.h"
--- a/keyboards/planck/keymaps/nico/keymap.c
+++ b/keyboards/planck/keymaps/nico/keymap.c
@@ -1,5 +1,3 @@
-// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
-// this is the style you want to emulate.

 #include "planck.h"
 #include "backlight.h"
--- a/keyboards/planck/keymaps/originerd/keymap.c
+++ b/keyboards/planck/keymaps/originerd/keymap.c
@@ -1,5 +1,3 @@
-// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
-// this is the style you want to emulate.

 #include "planck.h"
 #include "action_layer.h"
--- a/keyboards/planck/keymaps/pete/keymap.c
+++ b/keyboards/planck/keymaps/pete/keymap.c
@@ -1,5 +1,3 @@
-// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
-// this is the style you want to emulate.

 #include "planck.h"
 #include "action_layer.h"
--- a/keyboards/planck/keymaps/premek/keymap.c
+++ b/keyboards/planck/keymaps/premek/keymap.c
@@ -1,5 +1,3 @@
-// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
-// this is the style you want to emulate.

 #include "planck.h"
 #include "action_layer.h"
--- a/keyboards/planck/keymaps/tak3over/keymap.c
+++ b/keyboards/planck/keymaps/tak3over/keymap.c
@@ -1,5 +1,3 @@
-// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
-// this is the style you want to emulate.
 //
 //Dropped the Dvorak layer and added two my layer buttons.  Both Raise and lower can be accessed from either side now.

--- a/keyboards/planck/keymaps/thermal_printer/keymap.c
+++ b/keyboards/planck/keymaps/thermal_printer/keymap.c
@@ -1,5 +1,3 @@
-// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
-// this is the style you want to emulate.

 #include "planck.h"
 #include "action_layer.h"
--- a/keyboards/planck/keymaps/vifon/keymap.c
+++ b/keyboards/planck/keymaps/vifon/keymap.c
@@ -1,5 +1,3 @@
-// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
-// this is the style you want to emulate.

 #include "planck.h"
 #ifdef BACKLIGHT_ENABLE
--- a/keyboards/planck/keymaps/xyverz/keymap.c
+++ b/keyboards/planck/keymaps/xyverz/keymap.c
@@ -1,5 +1,3 @@
-// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
-// this is the style you want to emulate.

 #include "planck.h"
 #include "action_layer.h"
--- a/keyboards/planck/keymaps/yale/keymap.c
+++ b/keyboards/planck/keymaps/yale/keymap.c
@@ -1,5 +1,3 @@
-// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
-// this is the style you want to emulate.
 //

 #include "planck.h"
--- a/keyboards/planck/keymaps/yang/keymap.c
+++ b/keyboards/planck/keymaps/yang/keymap.c
@@ -1,5 +1,3 @@
-// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
-// this is the style you want to emulate.

 #include "planck.h"
 #ifdef BACKLIGHT_ENABLE
--- a/keyboards/satan/keymaps/iso_split_rshift/keymap.c
+++ b/keyboards/satan/keymaps/iso_split_rshift/keymap.c
@@ -1,5 +1,3 @@
-// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
-// this is the style you want to emulate.

 #include "satan.h"
 // TODO: replace your ugly german brckets with #defines
--- a/keyboards/sixkeyboard/keymaps/default/keymap.c
+++ b/keyboards/sixkeyboard/keymaps/default/keymap.c
@@ -1,5 +1,3 @@
-// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
-// this is the style you want to emulate.

 #include "sixkeyboard.h"
 #include "matrix.h"
--- a/keyboards/tv44/keymaps/tong92/keymap.c
+++ b/keyboards/tv44/keymaps/tong92/keymap.c
@@ -1,5 +1,3 @@
-// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
-// this is the style you want to emulate.
 //Author: tong92 <tong92power@gmail.com>

 #include "tv44.h"
--- a/tmk_core/avr.mk
+++ b/tmk_core/avr.mk
@@ -146,10 +146,10 @@ dfu-ee: $(BUILD_DIR)/$(TARGET).hex $(BUILD_DIR)/$(TARGET).eep

 avrdude: $(BUILD_DIR)/$(TARGET).hex
 	if grep -q -s Microsoft /proc/version; then \
-		echo 'ERROR: Pro Micros can not be flashed within the Windows Subsystem for Linux (WSL) currently. Instead, take the .hex file generated and flash it using AVRDUDE, AVRDUDESS, or XLoader.'; \
+		echo 'ERROR: AVR flashing cannot be automated within the Windows Subsystem for Linux (WSL) currently. Instead, take the .hex file generated and flash it using AVRDUDE, AVRDUDESS, or XLoader.'; \
 	else \
 		ls /dev/tty* > /tmp/1; \
-		echo "Detecting Pro Micro port, reset your Pro Micro now.\c"; \
+		echo "Detecting USB port, reset your controller now.\c"; \
 		while [ -z $$USB ]; do \
 			sleep 1; \
 			echo ".\c"; \
@@ -157,7 +157,7 @@ avrdude: $(BUILD_DIR)/$(TARGET).hex
 			USB=`diff /tmp/1 /tmp/2 | grep -o '/dev/tty.*'`; \
 		done; \
 		echo ""; \
-		echo "Detected Pro Micro port at $$USB"; \
+		echo "Detected controller on USB port at $$USB"; \
 		sleep 1; \
 		avrdude -p $(MCU) -c avr109 -P $$USB -U flash:w:$(BUILD_DIR)/$(TARGET).hex; \
 	fi
--- a/tmk_core/protocol/lufa/adafruit_ble.h
+++ b/tmk_core/protocol/lufa/adafruit_ble.h
@@ -8,6 +8,9 @@
 #include <stdint.h>
 #include <string.h>

+#include "config_common.h"
+#include "progmem.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
--- a/util/travis_build.sh
+++ b/util/travis_build.sh
@@ -9,7 +9,7 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
 	BRANCH=$(git rev-parse --abbrev-ref HEAD)
 	if [ $NEFM -gt 0 -o "$BRANCH" = "master" ]; then
 		echo "Making all keymaps for all keyboards"
-		make all:all AUTOGEN="true"
+		make all:default AUTOGEN="true"
 		: $((exit_code = $exit_code + $?))
 	else
 		MKB=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -oP '(?<=keyboards\/)([a-zA-Z0-9_\/]+)(?=\/)' | sort -u)
--- a/util/travis_compiled_push.sh
+++ b/util/travis_compiled_push.sh
@@ -40,7 +40,8 @@ if [[ $NEFM -gt 0 ]] ; then
 	#lasttag=$(git describe --tags $(git rev-list --tags --max-count=10) | grep -Ev '\-' | xargs -I@ git log --format=format:"%ai @%n" -1 @ | sort -V | awk '{print $4}' | tail -1)
 	lasttag=$(git describe --tags $(git rev-list --tags --max-count=10) | grep -Ev '\-' | sort -V | tail -1)
 	newtag=$(increment_version $lasttag)
-	git tag $newtag
+	newertag=$(increment_version $newtag)
+	git tag $newtag || git tag $newertag
 	git push --tags git@github.com:qmk/qmk_firmware.git
 else
 	echo "No essential files modified."
Author	SHA1	Message	Date
Phil Hagelberg	0f5928fdf4	Fix avrdude message to not mention any specific device model.	2017-10-16 09:54:17 -10:00
Benjamin Dengler	ba4b3d9d72	Added BLE support for USB-USB converter. (#1824 ) * Added BLE support to USB-USB converter * Added readme * Removed images and Makefile	2017-10-15 15:04:03 -10:00
Dylan Khor	aa660c1eb7	Broken link found in issue #1845	2017-10-15 15:03:23 -10:00
Jack Humbert	12b2e0ac73	hack to force new tag	2017-10-15 20:04:23 -04:00
Jack Humbert	bd642d08ab	add note to makefile for future use	2017-10-15 16:54:06 -04:00
Jack Humbert	7f2882832e	adds default keymap for handwired boards	2017-10-15 16:52:51 -04:00
Jack Humbert	32f18cf616	fix up default keymaps and remove keyboard folder filter	2017-10-15 16:44:31 -04:00
Jack Humbert	1745f202cc	update keymaps to not be the canonical file	2017-10-15 16:18:45 -04:00
Jack Humbert	115e49b2af	only build default keymaps	2017-10-15 16:18:28 -04:00
Jack Humbert	e64313cdb3	adds default keymap for amj60	2017-10-15 16:17:47 -04:00
Jack Humbert	066525ab9e	add qmk.fm as a backup host	2017-10-15 13:37:46 -04:00
Salt-Peanuts	e1bcb40e90	Cleaned up my Kinesis layout and created readme. (#1843 ) * Cleaned up keymap and readme * Cleaned up keymap and readme * Cleaned up keymap and readme * Cleaned up keymap and readme	2017-10-15 06:12:39 -10:00
zs	0b023ef67c	Add tomb0y's minidox layout	2017-10-14 19:12:59 -10:00