Simple fix for selecting which tracked key press to work off of for simple reactive effects (#5745 )

rgblight 255 hue (#5547 )
Fixing incorrect usage of RGBLED_NUM in ws2812 driver when used with RGB Matrix (#5744 )
2019-05-01 11:36:50 -07:00 · 2019-05-01 08:02:02 -07:00 · 2019-05-01 05:48:33 -07:00 · 2019-04-30 22:35:49 -07:00 · 2019-04-30 21:54:52 -07:00 · 2019-04-30 21:53:29 -07:00
159 changed files with 4322 additions and 1636 deletions
@@ -54,6 +54,7 @@ util/Win_Check_Output.txt
 .vscode/tasks.json
 .vscode/last.sql
 .vscode/temp.sql
 .vscode/ipch/
 .stfolder
 .tags
@@ -105,6 +105,7 @@ endif
 ifeq ($(strip $(RGBLIGHT_ENABLE)), yes)
    POST_CONFIG_H += $(QUANTUM_DIR)/rgblight_post_config.h
    OPT_DEFS += -DRGBLIGHT_ENABLE
    SRC += $(QUANTUM_DIR)/color.c
    SRC += $(QUANTUM_DIR)/rgblight.c
    CIE1931_CURVE = yes
    LED_BREATHING_TABLE = yes
@@ -351,3 +352,9 @@ ifeq ($(strip $(OLED_DRIVER_ENABLE)), yes)
    QUANTUM_LIB_SRC += i2c_master.c
    SRC += oled_driver.c
 endif
 SPACE_CADET_ENABLE ?= yes
 ifeq ($(strip $(SPACE_CADET_ENABLE)), yes)
  SRC += $(QUANTUM_DIR)/process_keycode/process_space_cadet.c
  OPT_DEFS += -DSPACE_CADET_ENABLE
 endif
@@ -63,13 +63,13 @@
  * [LED Matrix](feature_led_matrix.md)
  * [Macros](feature_macros.md)
  * [Mouse Keys](feature_mouse_keys.md)
  * [OLED Driver](feature_oled_driver)
  * [One Shot Keys](feature_advanced_keycodes.md#one-shot-keys)
  * [Pointing Device](feature_pointing_device.md)
  * [PS/2 Mouse](feature_ps2_mouse.md)
  * [RGB Lighting](feature_rgblight.md)
  * [RGB Matrix](feature_rgb_matrix.md)
-  * [Space Cadet Shift](feature_space_cadet_shift.md)
+  * [Space Cadet](feature_space_cadet.md)
  * [Space Cadet Shift Enter](feature_space_cadet_shift_enter.md)
  * [Stenography](feature_stenography.md)
  * [Swap Hands](feature_swap_hands.md)
  * [Tap Dance](feature_tap_dance.md)
@@ -127,13 +127,13 @@ Configure the hardware via your `config.h`:
 From this point forward the configuration is the same for all the drivers. The struct rgb_led array tells the system for each led, what key electrical matrix it represents, what the physical position is on the board, and if the led is for a modifier key or not. Here is a brief example:
 ```C
-const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
+rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
 /*  {row | col << 4}
    *    |         {x=0..224, y=0..64}
-    *    |            |              modifier
+    *    |            |              flags
    *    |            |                | */
    {{0|(0<<4)},   {20.36*0, 21.33*0}, 1},
-    {{0|(1<<4)},   {20.36*1, 21.33*0}, 1},
+    {{0|(1<<4)},   {20.36*1, 21.33*0}, 4},
    ....
 }
 ```
@@ -147,7 +147,19 @@ y =  64 / (NUMBER_OF_ROWS - 1) * ROW_POSITION
 Where NUMBER_OF_COLS, NUMBER_OF_ROWS, COL_POSITION, & ROW_POSITION are all based on the physical layout of your keyboard, not the electrical layout.
-`modifier` is a boolean, whether or not a certain key is considered a modifier (used in some effects).
+`flags` is a bitmask, whether or not a certain LEDs is of a certain type. It is recommended that LEDs are set to only 1 type.
 ## Flags
 |Define                              |Description                                |
 |------------------------------------|-------------------------------------------|
 |`#define HAS_FLAGS(bits, flags)`    |Returns true if `bits` has all `flags` set.|
 |`#define HAS_ANY_FLAGS(bits, flags)`|Returns true if `bits` has any `flags` set.|
 |`#define LED_FLAG_NONE      0x00`   |If thes LED has no flags.                  |
 |`#define LED_FLAG_ALL       0xFF`   |If thes LED has all flags.                 |
 |`#define LED_FLAG_MODIFIER  0x01`   |If the Key for this LED is a modifier.     |
 |`#define LED_FLAG_UNDERGLOW 0x02`   |If the LED is for underglow.               |
 |`#define LED_FLAG_KEYLIGHT  0x04`   |If the LED is for key backlight.           |
 ## Keycodes
@@ -145,7 +145,7 @@ const uint8_t RGBLED_SNAKE_INTERVALS[] PROGMEM = {100, 50, 20};
 const uint8_t RGBLED_KNIGHT_INTERVALS[] PROGMEM = {127, 63, 31};
 // These control which hues are selected for each of the "Static gradient" modes
-const uint16_t RGBLED_GRADIENT_RANGES[] PROGMEM = {360, 240, 180, 120, 90};
+const uint8_t RGBLED_GRADIENT_RANGES[] PROGMEM = {255, 170, 127, 85, 64};
 ```
 ## Functions
@@ -0,0 +1,59 @@
 # Space Cadet: The Future, Built In
 Steve Losh described the [Space Cadet Shift](http://stevelosh.com/blog/2012/10/a-modern-space-cadet/) quite well. Essentially, when you tap Left Shift on its own, you get an opening parenthesis; tap Right Shift on its own and you get the closing one. When held, the Shift keys function as normal. Yes, it's as cool as it sounds, and now even cooler supporting Control and Alt as well!
 ## Usage
 Firstly, in your keymap, do one of the following:
 - Replace the Left Shift key with `KC_LSPO` (Left Shift, Parenthesis Open), and Right Shift with `KC_RSPC` (Right Shift, Parenthesis Close).
 - Replace the Left Control key with `KC_LCPO` (Left Control, Parenthesis Open), and Right Control with `KC_RCPC` (Right Control, Parenthesis Close).
 - Replace the Left Alt key with `KC_LAPO` (Left Alt, Parenthesis Open), and Right Alt with `KC_RAPC` (Right Alt, Parenthesis Close).
 - Replace any Shift key in your keymap with `KC_SFTENT` (Right Shift, Enter).
 ## Keycodes
 |Keycode    |Description                                |
 |-----------|-------------------------------------------|
 |`KC_LSPO`  |Left Shift when held, `(` when tapped      |
 |`KC_RSPC`  |Right Shift when held, `)` when tapped     |
 |`KC_LCPO`  |Left Control when held, `(` when tapped    |
 |`KC_RCPC`  |Right Control when held, `)` when tapped   |
 |`KC_LAPO`  |Left Alt when held, `(` when tapped        |
 |`KC_RAPC`  |Right Alt when held, `)` when tapped       |
 |`KC_SFTENT`|Right Shift when held, `Enter` when tapped |
 ## Caveats
 Space Cadet's functionality can conflict with the default Command functionality when both Shift keys are held at the same time. See the [Command feature](feature_command.md) for info on how to change it, or make sure that Command is disabled in your `rules.mk` with:
 ```make
 COMMAND_ENABLE = no
 ```
 ## Configuration
 By default Space Cadet assumes a US ANSI layout, but if your layout uses different keys for parentheses, you can redefine them in your `config.h`. In addition, you can redefine the modifier to send on tap, or even send no modifier at all. The new configuration defines bundle all options up into a single define of 3 key codes in this order: the `Modifier` when held or when used with other keys, the `Tap Modifer` sent when tapped (no modifier if `KC_TRNS`), finally the `Keycode` sent when tapped. Now keep in mind, mods from other keys will still apply to the `Keycode` if say `KC_RSFT` is held while tapping `KC_LSPO` key with `KC_TRNS` as the `Tap Modifer`.
 |Define          |Default                        |Description                                                                      |
 |----------------|-------------------------------|---------------------------------------------------------------------------------|
 |`LSPO_KEYS`     |`KC_LSFT, LSPO_MOD, LSPO_KEY`  |Send `KC_LSFT` when held, the mod and  key defined by `LSPO_MOD` and `LSPO_KEY`. |
 |`RSPC_KEYS`     |`KC_RSFT, RSPC_MOD, RSPC_KEY`  |Send `KC_RSFT` when held, the mod and  key defined by `RSPC_MOD` and `RSPC_KEY`. |
 |`LCPO_KEYS`     |`KC_LCTL, KC_LCTL, KC_9`       |Send `KC_LCTL` when held, the mod `KC_LCTL` with the key `KC_9` when tapped.     |
 |`RCPO_KEYS`     |`KC_RCTL, KC_RCTL, KC_0`       |Send `KC_RCTL` when held, the mod `KC_RCTL` with the key `KC_0` when tapped.     |
 |`LAPO_KEYS`     |`KC_LALT, KC_LALT, KC_9`       |Send `KC_LALT` when held, the mod `KC_LALT` with the key `KC_9` when tapped.     |
 |`RAPO_KEYS`     |`KC_RALT, KC_RALT, KC_0`       |Send `KC_RALT` when held, the mod `KC_RALT` with the key `KC_0` when tapped.     |
 |`SFTENT_KEYS`   |`KC_RSFT, KC_TRNS, SFTENT_KEY` |Send `KC_RSFT` when held, no mod with the key `SFTENT_KEY` when tapped.          |
 ## Obsolete Configuration
 These defines are used in the above defines internally to support backwards compatibility, so you may continue to use them, however the above defines open up a larger range of flexibility than before. As an example, say you want to not send any modifier when you tap just `KC_LSPO`, with the old defines you had an all or nothing choice of using the `DISABLE_SPACE_CADET_MODIFIER` define. Now you can define that key as: `#define KC_LSPO_KEYS KC_LSFT, KC_TRNS, KC_9`. This tells the system to set Left Shift if held or used with other keys, then on tap send no modifier (transparent) with the `KC_9`
 |Define                        |Default      |Description                                                       |
 |------------------------------|-------------|------------------------------------------------------------------|
 |`LSPO_KEY`                    |`KC_9`       |The keycode to send when Left Shift is tapped                     |
 |`RSPC_KEY`                    |`KC_0`       |The keycode to send when Right Shift is tapped                    |
 |`LSPO_MOD`                    |`KC_LSFT`    |The modifier to apply to `LSPO_KEY`                               |
 |`RSPC_MOD`                    |`KC_RSFT`    |The modifier to apply to `RSPC_KEY`                               |
 |`SFTENT_KEY`                  |`KC_ENT`     |The keycode to send when the Shift key is tapped                  |
 |`DISABLE_SPACE_CADET_MODIFIER`|*Not defined*|If defined, prevent the Space Cadet from applying a modifier      |
@@ -1,37 +0,0 @@
 # Space Cadet Shift: The Future, Built In
 Steve Losh described the [Space Cadet Shift](http://stevelosh.com/blog/2012/10/a-modern-space-cadet/) quite well. Essentially, when you tap Left Shift on its own, you get an opening parenthesis; tap Right Shift on its own and you get the closing one. When held, the Shift keys function as normal. Yes, it's as cool as it sounds.
 ## Usage
 Replace the Left Shift key in your keymap with `KC_LSPO` (Left Shift, Parenthesis Open), and Right Shift with `KC_RSPC` (Right Shift, Parenthesis Close).
 ## Keycodes
 |Keycode  |Description                           |
 |---------|--------------------------------------|
 |`KC_LSPO`|Left Shift when held, `(` when tapped |
 |`KC_RSPC`|Right Shift when held, `)` when tapped|
 ## Caveats
 Space Cadet's functionality can conflict with the default Command functionality when both Shift keys are held at the same time. Make sure that Command is disabled in your `rules.mk` with:
 ```make
 COMMAND_ENABLE = no
 ```
 ## Configuration
 By default Space Cadet assumes a US ANSI layout, but if your layout uses different keys for parentheses, you can redefine them in your `config.h`.
 You can also disable the rollover, allowing you to use the opposite Shift key to cancel the Space Cadet state in the event of an erroneous press, instead of emitting a pair of parentheses when the keys are released.
 Also, by default, the Space Cadet applies modifiers LSPO_MOD and RSPC_MOD to keys defined by LSPO_KEY and RSPC_KEY. You can override this behavior by redefining those variables in your `config.h`. You can also prevent the Space Cadet to apply a modifier by defining DISABLE_SPACE_CADET_MODIFIER in your `config.h`.
 |Define                        |Default      |Description                                                                     |
 |------------------------------|-------------|--------------------------------------------------------------------------------|
 |`LSPO_KEY`                    |`KC_9`       |The keycode to send when Left Shift is tapped                                   |
 |`RSPC_KEY`                    |`KC_0`       |The keycode to send when Right Shift is tapped                                  |
 |`LSPO_MOD`                    |`KC_LSFT`    |The keycode to send when Left Shift is tapped                                   |
 |`RSPC_MOD`                    |`KC_RSFT`    |The keycode to send when Right Shift is tapped                                  |
 |`DISABLE_SPACE_CADET_ROLLOVER`|*Not defined*|If defined, use the opposite Shift key to cancel Space Cadet                    |
 |`DISABLE_SPACE_CADET_MODIFIER`|*Not defined*|If defined, prevent the Space Cadet to apply a modifier to LSPO_KEY and RSPC_KEY|
@@ -1,31 +0,0 @@
 # Space Cadet Shift Enter
 Based on the [Space Cadet Shift](feature_space_cadet_shift.md) feature. Tap the Shift key on its own, and it behaves like Enter. When held, the Shift functions as normal.
 ## Usage
 Replace any Shift key in your keymap with `KC_SFTENT` (Shift, Enter), and you're done.
 ## Keycodes
 |Keycode    |Description                             |
 |-----------|----------------------------------------|
 |`KC_SFTENT`|Right Shift when held, Enter when tapped|
 ## Caveats
 As with Space Cadet Shift, this feature may conflict with Command, so it should be disabled in your `rules.mk` with:
 ```make
 COMMAND_ENABLE = no
 ```
 This feature also uses the same timers as Space Cadet Shift, so using them in tandem may produce strange results.
 ## Configuration
 By default Space Cadet assumes a US ANSI layout, but if you'd like to use a different key for Enter, you can redefine it in your `config.h`:
 |Define      |Default |Description                                     |
 |------------|--------|------------------------------------------------|
 |`SFTENT_KEY`|`KC_ENT`|The keycode to send when the Shift key is tapped|
@@ -158,7 +158,7 @@ void inline ws2812_setled(int i, uint8_t r, uint8_t g, uint8_t b)
 void ws2812_setled_all  (uint8_t r, uint8_t g, uint8_t b)
 {
-  for (int i = 0; i < RGBLED_NUM; i++) {
+  for (int i = 0; i < sizeof(led)/sizeof(led[0]); i++) {
    led[i].r = r;
    led[i].g = g;
    led[i].b = b;
@@ -123,7 +123,7 @@
        {"label":";", "x":10.75, "y":2},
        {"label":"'", "x":11.75, "y":2},
        {"label":"ISO #", "x":12.75, "y":2},
-        {"label":"Enter", "x":13.75, "y":2, "w":1.25, "h":2},
+        {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
        {"label":"Shift", "x":0, "y":3, "w":1.25},
        {"label":"ISO \\", "x":1.25, "y":3},
        {"label":"Z", "x":2.25, "y":3},
@@ -0,0 +1,15 @@
 #pragma once
 #include "quantum.h"
 #define LAYOUT_ortho_4x4( \
 	K00, K01, K02, K03, \
 	K10, K11, K12, K13, \
 	K20, K21, K22, K23, \
 	K30, K31, K32, K33  \
 ) { \
 	{ K00,   K01,   K02,   K03 }, \
 	{ K10,   K11,   K12,   K13 }, \
 	{ K20,   K21,   K22,   K23 }, \
 	{ K30,   K31,   K32,   K33 }  \
 }
@@ -0,0 +1,46 @@
 #pragma once
 #include "config_common.h"
 /* USB Device descriptor parameter */
 #define VENDOR_ID       0xFEED
 #define PRODUCT_ID      0x6060
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    KPrepublic
 #define PRODUCT         bm16s
 #define DESCRIPTION     KPrepublic bm16s
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 4
 /* key matrix pins */
 #define MATRIX_ROW_PINS { D1, D0, D3, D2 }
 #define MATRIX_COL_PINS { F7, F6, D4, D6 }
 #define UNUSED_PINS
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 /* number of backlight levels */
 #ifdef BACKLIGHT_PIN
    #define BACKLIGHT_LEVELS 3
 #endif
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCING_DELAY 5
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 #define RGB_DI_PIN E2
 #ifdef RGB_DI_PIN
    #define RGBLIGHT_ANIMATIONS
    #define RGBLED_NUM 16
    #define RGBLIGHT_HUE_STEP 8
    #define RGBLIGHT_SAT_STEP 8
    #define RGBLIGHT_VAL_STEP 8
 #endif
@@ -0,0 +1,30 @@
 {
    "keyboard_name": "bm16s",
    "url": "",
    "maintainer": "qmk",
    "width": 4,
    "height": 4,
    "layouts": {
      "LAYOUT_ortho_4x4": {
        "key_count": 16,
        "layout": [
          {"x":0, "y":0},
          {"x":1, "y":0},
          {"x":2, "y":0},
          {"x":3, "y":0},
          {"x":0, "y":1},
          {"x":1, "y":1},
          {"x":2, "y":1},
          {"x":3, "y":1},
          {"x":0, "y":2},
          {"x":1, "y":2},
          {"x":2, "y":2},
          {"x":3, "y":2},
          {"x":0, "y":3},
          {"x":1, "y":3},
          {"x":2, "y":3},
          {"x":3, "y":3}
        ]
      }
    }
  }
@@ -0,0 +1,16 @@
 #include QMK_KEYBOARD_H
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT_ortho_4x4(
 		KC_KP_7, KC_KP_8, KC_KP_9, MO(1),   \
 		KC_KP_4, KC_KP_5, KC_KP_6, KC_PMNS, \
 		KC_KP_1, KC_KP_2, KC_KP_3, KC_PPLS, \
 		KC_KP_0, KC_PDOT, KC_PCMM, KC_PENT  \
 	),
 	[1] = LAYOUT_ortho_4x4(
 		RESET,   BL_STEP, _______, KC_VOLU, \
 		BL_TOGG, BL_DEC,  BL_INC,  KC_VOLD, \
 		RGB_TOG, RGB_MOD, RGB_HUI, KC_MUTE, \
 		RGB_SAI, RGB_SAD, RGB_HUD, _______  \
 	),
 };
@@ -0,0 +1,20 @@
 #include QMK_KEYBOARD_H
 #define RGB_BRU RGB_VAI
 #define RGB_BRD RGB_VAD
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	[0] = LAYOUT_ortho_4x4(
 		KC_BRIU, _______, _______, KC_VOLU, \
 		KC_BRID, _______, _______, KC_VOLD, \
 		_______, _______, _______, KC_MUTE, \
 		KC_MPRV, KC_MPLY, KC_MNXT, MO(1)    \
 	),
 	[1] = LAYOUT_ortho_4x4(
 		RESET,    _______, _______, _______, \
 		RGB_SPD,  RGB_BRU, RGB_SPI, _______, \
 		RGB_RMOD, RGB_BRD, RGB_MOD, _______, \
 		RGB_TOG,  _______, _______, _______  \
 	),
 };
@@ -0,0 +1,13 @@
 # bm16s
 A 16-key macropad, with USB C and per-key RGB backlighting. This is a variant of the BM16A, but with low profile Choc switches.
 Keyboard Maintainer: QMK Community  
 Hardware Supported: The PCBs, controllers supported  
 Hardware Availability: [KPrepublic](https://kprepublic.com/collections/pcb/products/bm16s-16-keys-custom-mechanical-keyboard-pcb-plate-programmed-numpad-layouts-qmk-firmware-with-rgb-switch-leds-choc-switch); [AliExpress](https://www.aliexpress.com/item/bm16s-16-keys-Custom-Mechanical-Keyboard-PCB-plate-programmed-numpad-layouts-qmk-firmware-with-rgb-switch/32999247908.html); [Massdrop](https://www.massdrop.com/buy/78169)
 Make example for this keyboard (after setting up your build environment):
    make bm16s:default
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
@@ -0,0 +1,72 @@
 # MCU name
 MCU = atmega32u4
 # Processor frequency.
 #     This will define a symbol, F_CPU, in all source code files equal to the
 #     processor frequency in Hz. You can then use this symbol in your source code to
 #     calculate timings. Do NOT tack on a 'UL' at the end, this will be done
 #     automatically to create a 32-bit value in your source code.
 #
 #     This will be an integer division of F_USB below, as it is sourced by
 #     F_USB after it has run through any CPU prescalers. Note that this value
 #     does not *change* the processor frequency - it should merely be updated to
 #     reflect the processor speed set externally so that the code can use accurate
 #     software delays.
 F_CPU = 16000000
 #
 # LUFA specific
 #
 # Target architecture (see library "Board Types" documentation).
 ARCH = AVR8
 # Input clock frequency.
 #     This will define a symbol, F_USB, in all source code files equal to the
 #     input clock frequency (before any prescaling is performed) in Hz. This value may
 #     differ from F_CPU if prescaling is used on the latter, and is required as the
 #     raw input clock is fed directly to the PLL sections of the AVR for high speed
 #     clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL'
 #     at the end, this will be done automatically to create a 32-bit value in your
 #     source code.
 #
 #     If no clock division is performed on the input clock inside the AVR (via the
 #     CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
 F_USB = $(F_CPU)
 # Interrupt driven control endpoint task(+60)
 OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
 # Bootloader selection
 #   Teensy       halfkay
 #   Pro Micro    caterina
 #   Atmel DFU    atmel-dfu
 #   LUFA DFU     lufa-dfu
 #   QMK DFU      qmk-dfu
 #   atmega32a    bootloadHID
 BOOTLOADER = atmel-dfu
 # If you don't know the bootloader type, then you can specify the
 # Boot Section Size in *bytes* by uncommenting out the OPT_DEFS line
 #   Teensy halfKay      512
 #   Teensy++ halfKay    1024
 #   Atmel DFU loader    4096
 #   LUFA bootloader     4096
 #   USBaspLoader        2048
 # OPT_DEFS += -DBOOTLOADER_SIZE=4096
 # Build Options
 #   comment out to disable the options.
 #
 BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration
 MOUSEKEY_ENABLE  = yes  # Mouse keys
 EXTRAKEY_ENABLE  = yes  # Audio control and System control
 CONSOLE_ENABLE   = no   # Console for debug
 COMMAND_ENABLE   = no   # Commands for debug and configuration
 SLEEP_LED_ENABLE = no   # Breathing sleep LED during USB suspend
 NKRO_ENABLE      = yes  # USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
 BACKLIGHT_ENABLE = no   # Enable keyboard backlight functionality
 AUDIO_ENABLE     = no
 RGBLIGHT_ENABLE  = yes
 LAYOUTS = ortho_4x4
@@ -21,17 +21,17 @@
 #ifdef RGB_MATRIX_ENABLE
 #include "rgblight.h"
-const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
+rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
  /*{row | col << 4}
    |             {x=0..224, y=0..64}
    |              |         modifier
    |              |         | */
-  {{1|(3<<4)},    {188, 16}, 0},
+  {{1|(3<<4)},    {188, 16}, 4},
-  {{3|(3<<4)},    {187, 48}, 0},
+  {{3|(3<<4)},    {187, 48}, 4},
-  {{4|(2<<4)},    {149, 64}, 0},
+  {{4|(2<<4)},    {149, 64}, 4},
-  {{4|(1<<4)},    {112, 64}, 0},
+  {{4|(1<<4)},    {112, 64}, 4},
-  {{3|(0<<4)},    {37,  48}, 0},
+  {{3|(0<<4)},    {37,  48}, 4},
-  {{1|(0<<4)},    {38, 16}, 0}
+  {{1|(0<<4)},    {38, 16}, 4}
 };
 #endif
@@ -0,0 +1,56 @@
 /* Copyright 2019 Jeremy Bernhardt
 *
 * 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 "butterstick.h"
 // Optional override functions below.
 // You can leave any or all of these undefined.
 // These are only required if you want to perform custom actions.
 /*
 void matrix_init_kb(void) {
  // put your keyboard start-up code here
  // runs once when the firmware starts up
  matrix_init_user();
 }
 */
 void matrix_scan_kb(void) {
 #ifdef DEBUG_MATRIX
    for (uint8_t c = 0; c < MATRIX_COLS; c++)
 		for (uint8_t r = 0; r < MATRIX_ROWS; r++)
 		  if (matrix_is_on(r, c)) xprintf("r:%d c:%d \n", r, c);
 #endif
  matrix_scan_user();
 }
 /*
 bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
  // put your per-action keyboard code here
  // runs for every action, just before processing by the firmware
  return process_record_user(keycode, record);
 }
 void led_set_kb(uint8_t usb_led) {
  // put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
  led_set_user(usb_led);
 }
 */
@@ -0,0 +1,11 @@
 #pragma once
 #include "quantum.h"
 #define LAYOUT_butter( 										\
    k09, k08, k07, k06, k05, k04, k03, k02, k01, k00,		\
 	k19, k18, k17, k16, k15, k14, k13, k12, k11, k10		\
 ) { 														\
 	{ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09},	\
 	{ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19},	\
 }
@@ -0,0 +1,26 @@
 #pragma once
 #include "config_common.h"
 /* USB Device descriptor parameter */
 #define VENDOR_ID       0xFEED
 #define PRODUCT_ID      0x1337
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    g Heavy Industries
 #define PRODUCT         Butter Stick
 #define DESCRIPTION     Its a stick of butter
 #define VERSION 		"Paula Deen"
 #define DEBOUNCING_DELAY 5
 #define FORCE_NKRO
 /* key matrix size */
 #define MATRIX_ROWS 2
 #define MATRIX_COLS 10
 #define MATRIX_ROW_PINS { F4, F5 }
 #define MATRIX_COL_PINS { B0, B1, B2, B3, B4, B5, B6, B7, C6, C7}
 #define UNUSED_PINS
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION ROW2COL
@@ -0,0 +1,183 @@
 #include QMK_KEYBOARD_H
 #include "sten.h"
 /* 	 	
 *  Key names are inherited from steno machines
 *  .-----------------------------------------------------.
 *	| LSU | LFT | LP | LH | ST1 | RF | RP | RL | RT | RD  |
 *  |-----------------------------------------------------|
 *	| LSD | LK  | LW | LR | ST2 | RR | RB | RG | RS | RZ  |
 *  '-----------------------------------------------------'
 */
 // Function prefixes
 #define MEDIA 	(LSD | LK  | LW | LR)	
 #define FUNCT 	(LSD | LK  | LP | LH)	
 #define MOVE	(LSU | LFT | LP | LH)	
 #define SYMB	(RD  | RZ)	
 #define NUMA    (LW  | LR)	
 #define NUMB    (RR  | RB)	
 // QMK Layer Numbers
 #define BASE 0
 #define GAME 1
 // Do not change QMK Layer 0! This is your main keyboard.
 // Make your QMK modifications to the later layers, to add 
 // keys/customize on the first layer modify processQwerty():
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  [BASE] = LAYOUT_butter(
  	STN_S1,  STN_TL,  STN_PL,  STN_HL,  STN_ST1, STN_FR,  STN_PR,  STN_LR,  STN_TR,  STN_DR,
   	STN_S2,  STN_KL,  STN_WL,  STN_RL,  STN_ST2, STN_RR,  STN_BR,  STN_GR,  STN_SR,  STN_ZR
  ),
  // I don't game don't roast me thanks
  [GAME] = LAYOUT_butter(
  	KC_Q,  KC_W,  KC_E,  KC_R,  KC_T, KC_Y, KC_U, KC_I,  KC_O, KC_ENT,
  	KC_A,  KC_S,  KC_D,  KC_F,  KC_G, KC_H, KC_J, KC_K,  KC_L, TO(BASE)
  )
 };
 // Note: You can only use basic keycodes here!
 // P() is just a wrapper to make your life easier, any C code can be executed.
 // Only the longest matched chord is run!
 //
 // http://docs.gboards.ca
 uint32_t processQwerty(bool lookup) {
    // SECRET AGENT CHORDS
    P( LSU | LK | RS | RD,    	SEND_STRING(VERSION); SEND_STRING(__DATE__));
    P( LSD | RZ,   			 	SEND(KC_SPC));
    // Dual chords
    P( LP  | LH,    			CLICK_MOUSE(KC_MS_BTN2));
    P( ST1 | RF,    			CLICK_MOUSE(KC_MS_BTN1));
    P( LSU | LFT,               SEND(KC_ESC));
 	P( LSD | LK,				SEND(KC_LSFT));
 	P( RZ  | RS,				SEND(KC_LSFT));
 	P( ST2 | RR,				SEND(KC_SPC));
    P( RP  | RL,    			SEND(KC_LGUI));
    P( RT  | RD,    			SEND(KC_LCTL));
    P( RL  | RT,    			SEND(KC_LALT));
 	P( LSU | LSD | LFT | LK,	SEND(KC_LCTL));
 	P( RS  | RT  | RD  | RZ,	SEND(KC_ENT));
    // Function Layer
    P( FUNCT | RF,         SEND(KC_F1));
    P( FUNCT | RP,         SEND(KC_F2));
    P( FUNCT | RL,         SEND(KC_F3));
    P( FUNCT | RT,         SEND(KC_F4));
    P( FUNCT | RF | RR,    SEND(KC_F5));
    P( FUNCT | RP | RB,    SEND(KC_F6));
    P( FUNCT | RL | RG,    SEND(KC_F7));
    P( FUNCT | RT | RS,    SEND(KC_F8));
    P( FUNCT | RR,         SEND(KC_F9));
    P( FUNCT | RB,         SEND(KC_F10));
    P( FUNCT | RG,         SEND(KC_F11));
    P( FUNCT | RS,         SEND(KC_F12));
    // Movement Layer
    P( MOVE | RF,     SEND(KC_LEFT));
    P( MOVE | RP,     SEND(KC_DOWN));
    P( MOVE | RL,     SEND(KC_UP));
    P( MOVE | RT,     SEND(KC_RIGHT));
    P( MOVE | ST1,    SEND(KC_PGUP));
    P( MOVE | ST2,    SEND(KC_PGDN));
    // Media Layer
    P( MEDIA | RF,    SEND(KC_MPRV));
    P( MEDIA | RP,    SEND(KC_MPLY));
    P( MEDIA | RL,    SEND(KC_MPLY));
    P( MEDIA | RT,    SEND(KC_MNXT));
    P( MEDIA | RG,	  SEND(KC_VOLU));
    P( MEDIA | RB,    SEND(KC_VOLD));
    P( MEDIA | RS,    SEND(KC_MUTE));
    // Number Row, Right
    P( NUMB | LSU,    SEND(KC_1));
    P( NUMB | LFT,    SEND(KC_2));
    P( NUMB | LP,     SEND(KC_3));
    P( NUMB | LH,     SEND(KC_4));
    P( NUMB | ST1,    SEND(KC_5));
    P( NUMB | RF,     SEND(KC_6));
    P( NUMB | RP,     SEND(KC_7));
    P( NUMB | RL,     SEND(KC_8));
    P( NUMB | RT,     SEND(KC_9));
    P( NUMB | RD,     SEND(KC_0));
    // Number Row, Left
    P( NUMA | LSU,    SEND(KC_1));
    P( NUMA | LFT,    SEND(KC_2));
    P( NUMA | LP,     SEND(KC_3));
    P( NUMA | LH,     SEND(KC_4));
    P( NUMA | ST1,    SEND(KC_5));
    P( NUMA | RF,     SEND(KC_6));
    P( NUMA | RP,     SEND(KC_7));
    P( NUMA | RL,     SEND(KC_8));
    P( NUMA | RT,     SEND(KC_9));
    P( NUMA | RD,     SEND(KC_0));
    // Symbols and Numbers
    P( SYMB | LP | LW,      SEND(KC_LSFT); SEND(KC_9));       // (
    P( SYMB | LH | LR,      SEND(KC_LSFT); SEND(KC_0));       // )
    P( SYMB | ST1 | ST2,    SEND(KC_GRV));                    // `
    P( SYMB | RR  | RF,    	SEND(KC_LSFT); SEND(KC_3));       // #
    P( SYMB | LFT | LK,     SEND(KC_LSFT); SEND(KC_4));       // $
    P( SYMB | LSU,          SEND(KC_LSFT); SEND(KC_1));       // !
    P( SYMB | LSD,          SEND(KC_LSFT); SEND(KC_5));       // %
    P( SYMB | LFT,          SEND(KC_LSFT); SEND(KC_2));       // @
    P( SYMB | LK,           SEND(KC_LSFT); SEND(KC_6));       // ^
    P( SYMB | LP,           SEND(KC_LSFT); SEND(KC_LBRC));    // {
    P( SYMB | LW,           SEND(KC_LBRC));
    P( SYMB | LH,           SEND(KC_LSFT); SEND(KC_RBRC));    // }
    P( SYMB | LR,           SEND(KC_RBRC));
    P( SYMB | ST1,          SEND(KC_LSFT); SEND(KC_BSLS));    // |
    P( SYMB | ST2,          SEND(KC_LSFT); SEND(KC_GRV));     // ~
    P( SYMB | RP | RB,      SEND(KC_QUOT));
    P( SYMB | RP | RG,      SEND(KC_LSFT); SEND(KC_QUOT));    // "
    P( SYMB | RF,           SEND(KC_KP_PLUS));
    P( SYMB | RR,           SEND(KC_LSFT); SEND(KC_7));       // &
    P( SYMB | RP,           SEND(KC_MINS));
    P( SYMB | RB,           SEND(KC_EQL));
    P( SYMB | RL,           SEND(KC_SLSH));
    P( SYMB | RG,           SEND(KC_COMM));
    P( SYMB | RT,           SEND(KC_PAST));
    P( SYMB | RS,           SEND(KC_DOT));
    // Letters
    P( LSU | LSD,    SEND(KC_A));
    P( LFT | LK,     SEND(KC_S));
    P( LP  | LW,     SEND(KC_D));
    P( LH  | LR,     SEND(KC_F));
    P( ST1 | ST2,    SEND(KC_G));
    P( RF  | RR,     SEND(KC_H));
    P( RT  | RS,     SEND(KC_L));
    P( RD  | RZ,     SEND(KC_SCLN));
    P( RG  | RL,     SEND(KC_K));
    P( RP  | RB,     SEND(KC_J));
    P( LSU,          SEND(KC_Q));
    P( LSD,          SEND(KC_Z));
    P( LFT,          SEND(KC_W));
    P( LK,           SEND(KC_X));
    P( LP,           SEND(KC_E));
    P( LW,           SEND(KC_C));
    P( LH,           SEND(KC_R));
    P( LR,           SEND(KC_V));
    P( ST1,          SEND(KC_T));
    P( ST2,          SEND(KC_B));
    P( RF,          SEND(KC_Y));
    P( RR,          SEND(KC_N));
    P( RP,           SEND(KC_U));
    P( RB,           SEND(KC_M));
    P( RL,           SEND(KC_I));
    P( RG,           SEND(KC_COMM));
    P( RT,           SEND(KC_O));
    P( RS,           SEND(KC_DOT));
    P( RD,           SEND(KC_P));
    P( RZ,           SEND(KC_SLSH));
    return 0;
 }
 // Don't fuck with this, thanks.
 size_t keymapsCount  = sizeof(keymaps)/sizeof(keymaps[0]);
@@ -0,0 +1,14 @@
 # Butter Stick
 ![Butter Stick](https://i.redd.it/mvteaomko7s21.jpg)
 A chorded 20% keyboard packing full sized useage into  your pocket. More info on [gboards.ca](http://docs.gboards.ca/Meet-Butter-Stick)!
 Keyboard Maintainer: [Germ](https://github.com/germ)  
 Hardware Availability: [g Heavy Industries](https://www.gboards.ca/product/butter-stick-limited-edition)
 Make example for this keyboard (after setting up your build environment):
    make butterstick:default
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
@@ -0,0 +1,19 @@
 # MCU name
 MCU = atmega32u4
 F_CPU = 16000000
 ARCH = AVR8
 F_USB = $(F_CPU)
 OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT -DONLYQWERTY -DDEBUG_MATRIX
 SRC += sten.c
 EXTRAFLAGS += -flto
 BOOTLOADER = atmel-dfu
 MOUSEKEY_ENABLE 	= yes		# Mouse keys(+4700)
 EXTRAKEY_ENABLE 	= yes       # Audio control and System control(+450)
 CONSOLE_ENABLE 		= yes       # Console for debug(+400)
 COMMAND_ENABLE 		= no		# Commands for debug and configuration
 NKRO_ENABLE 		= yes       # USB Nkey Rollover
 STENO_ENABLE		= yes 		# Needed for chording
@@ -0,0 +1,367 @@
 #include "sten.h"
 // Chord state
 uint32_t cChord 		= 0;		// Current Chord
 int		 chordIndex 	= 0;		// Keys in previousachord
 int32_t  chordState[32];			// Full Chord history
 #define  QWERBUF		24			// Size of chords to buffer for output
 bool	 repeatFlag 	= false;	// Should we repeat?
 uint32_t pChord 		= 0;		// Previous Chord
 int		 pChordIndex 	= 0;		// Keys in previousachord
 uint32_t pChordState[32];			// Previous chord sate 
 uint32_t stickyBits = 0;			// Or'd with every incoming press
 // Mode state
 enum MODE { STENO = 0, QWERTY, COMMAND };
 enum MODE pMode;
 bool QWERSTENO = false;
 #ifdef ONLYQWERTY
 enum MODE cMode = QWERTY;
 #else
 enum MODE cMode = STENO;
 #endif
 // Command State
 #define MAX_CMD_BUF   20
 uint8_t	 CMDLEN 	= 0;
 uint8_t	 CMDBUF[MAX_CMD_BUF];
 // Key Repeat state
 bool     inChord  		= false;
 bool	 repEngaged 	= false;
 uint16_t repTimer 		= 0;
 #define  REP_INIT_DELAY 750
 #define  REP_DELAY 		25
 // Mousekeys state
 bool	inMouse 		= false;
 int8_t	mousePress;
 // All processing done at chordUp goes through here
 // Note, this is a gutted version of the Georgi sten.h
 bool send_steno_chord_user(steno_mode_t mode, uint8_t chord[6]) { 
 	// Check for mousekeys, this is release
 #ifdef MOUSEKEY_ENABLE
 	if (inMouse) {
 		inMouse = false;
 		mousekey_off(mousePress);
 		mousekey_send();
 	}
 #endif
 	// handle command mode
 	if (cChord == (LSU | LSD | RD | RZ)) {
 		if (cMode != COMMAND) {   // Entering Command Mode
 			CMDLEN = 0;
 			pMode = cMode;
 			cMode = COMMAND;
 		} else {                  // Exiting Command Mode
 			cMode = pMode;
 			// Press all and release all
 			for (int i = 0; i < CMDLEN; i++) {
 				register_code(CMDBUF[i]);
 			}
 			clear_keyboard();
 		}
 		goto out;
 	}
 	// Handle Gaming Toggle,
 	if (cChord == (LSU | LSD | LFT | LK | RT | RS | RD | RZ) && keymapsCount > 1) {
 #ifndef NO_DEBUG
 		uprintf("Switching to QMK\n");
 #endif
 		layer_on(1);
 		goto out;
 	}
 	// Do QWERTY and Momentary QWERTY
 	if (cMode == QWERTY || (cMode == COMMAND)) {
 		processChord(false);
 		goto out;
 	} 
 out:
 	cChord = 0;
 	inChord = false;
 	chordIndex = 0;
 	clear_keyboard();
 	repEngaged  = false;
 	for (int i = 0; i < 32; i++)
 		chordState[i] = 0xFFFF;
 	return false;
 }
 // Update Chord State 
 bool process_steno_user(uint16_t keycode, keyrecord_t *record) { 
 	// Everything happens in here when steno keys come in.
 	// Bail on keyup
 	if (!record->event.pressed) return true;
 	// Update key repeat timers
 	repTimer = timer_read();
 	inChord  = true;
 	// Switch on the press adding to chord
 	bool pr = record->event.pressed;
 	switch (keycode) {
 			// Mods and stuff
 			case STN_ST1:			pr ? (cChord |= (ST1)): (cChord &= ~(ST1)); break;
 			case STN_ST2:			pr ? (cChord |= (ST2)): (cChord &= ~(ST2)); break;
 			case STN_ST3:			pr ? (cChord |= (ST3)): (cChord &= ~(ST3)); break;
 			case STN_ST4:			pr ? (cChord |= (ST4)): (cChord &= ~(ST4)); break;
 			case STN_FN:			pr ? (cChord |= (FN)) : (cChord &= ~(FN)); break;
 			case STN_PWR:			pr ? (cChord |= (PWR)): (cChord &= ~(PWR)); break;
 			case STN_N1...STN_N6:	pr ? (cChord |= (LNO)): (cChord &= ~(LNO)); break;
 			case STN_N7...STN_NC:	pr ? (cChord |= (RNO)): (cChord &= ~(RNO)); break;
 			// All the letter keys
 			case STN_S1:			pr ? (cChord |= (LSU)) : (cChord &= ~(LSU));  break;
 			case STN_S2:			pr ? (cChord |= (LSD)) : (cChord &= ~(LSD));  break;
 			case STN_TL:			pr ? (cChord |= (LFT)) : (cChord &= ~(LFT)); break;
 			case STN_KL:			pr ? (cChord |= (LK)) : (cChord &= ~(LK)); break;
 			case STN_PL:			pr ? (cChord |= (LP)) : (cChord &= ~(LP)); break;
 			case STN_WL:			pr ? (cChord |= (LW)) : (cChord &= ~(LW)); break;
 			case STN_HL:			pr ? (cChord |= (LH)) : (cChord &= ~(LH)); break;
 			case STN_RL:			pr ? (cChord |= (LR)) : (cChord &= ~(LR)); break;
 			case STN_A:				pr ? (cChord |= (LA)) : (cChord &= ~(LA)); break;
 			case STN_O:				pr ? (cChord |= (LO)) : (cChord &= ~(LO)); break;
 			case STN_E:				pr ? (cChord |= (RE)) : (cChord &= ~(RE)); break;
 			case STN_U:				pr ? (cChord |= (RU)) : (cChord &= ~(RU)); break;
 			case STN_FR:			pr ? (cChord |= (RF)) : (cChord &= ~(RF)); break;
 			case STN_RR:			pr ? (cChord |= (RR)) : (cChord &= ~(RR)); break;
 			case STN_PR:			pr ? (cChord |= (RP)) : (cChord &= ~(RP)); break;
 			case STN_BR:			pr ? (cChord |= (RB)) : (cChord &= ~(RB)); break;
 			case STN_LR:			pr ? (cChord |= (RL)) : (cChord &= ~(RL)); break;
 			case STN_GR:			pr ? (cChord |= (RG)) : (cChord &= ~(RG)); break;
 			case STN_TR:			pr ? (cChord |= (RT)) : (cChord &= ~(RT)); break;
 			case STN_SR:			pr ? (cChord |= (RS)) : (cChord &= ~(RS)); break;
 			case STN_DR:			pr ? (cChord |= (RD)) : (cChord &= ~(RD)); break;
 			case STN_ZR:			pr ? (cChord |= (RZ)) : (cChord &= ~(RZ)); break;
 	}
 	// Store previous state for fastQWER
 	if (pr) {
 		chordState[chordIndex] = cChord; 
 		chordIndex++;
 	}
 	return true; 
 }
 void matrix_scan_user(void) {
 	// We abuse this for early sending of key
 	// Key repeat only on QWER/SYMB layers
 	if (cMode != QWERTY || !inChord) return;
 	// Check timers
 #ifndef NO_REPEAT
 	if (repEngaged && timer_elapsed(repTimer) > REP_DELAY) {
 		// Process Key for report
 		processChord(false);
 		// Send report to host
 		send_keyboard_report();
 		clear_keyboard();
 		repTimer = timer_read();
 	}
 	if (!repEngaged && timer_elapsed(repTimer) > REP_INIT_DELAY) {
 		repEngaged = true;
 	}
 #endif
 };
 // For Plover NKRO
 uint32_t processFakeSteno(bool lookup) { 
 	P( LSU,				SEND(KC_Q););
 	P( LSD,				SEND(KC_A););
 	P( LFT,				SEND(KC_W););
 	P( LP,				SEND(KC_E););
 	P( LH,				SEND(KC_R););
 	P( LK,				SEND(KC_S););
 	P( LW,				SEND(KC_D););
 	P( LR,				SEND(KC_F););
 	P( ST1,				SEND(KC_T););
 	P( ST2,				SEND(KC_G););
 	P( LA,				SEND(KC_C););
 	P( LO,				SEND(KC_V););
 	P( RE,				SEND(KC_N););
 	P( RU,				SEND(KC_M););
 	P( ST3,				SEND(KC_Y););
 	P( ST4,				SEND(KC_H););
 	P( RF,				SEND(KC_U););
 	P( RP,				SEND(KC_I););
 	P( RL,				SEND(KC_O););
 	P( RT,				SEND(KC_P););
 	P( RD,				SEND(KC_LBRC););
 	P( RR,				SEND(KC_J););
 	P( RB,				SEND(KC_K););
 	P( RG,				SEND(KC_L););
 	P( RS,				SEND(KC_SCLN););
 	P( RZ,				SEND(KC_COMM););
 	P( LNO,				SEND(KC_1););
 	P( RNO,				SEND(KC_1););
 	return 0;
 }
 // Traverse the chord history to a given point
 // Returns the mask to use
 void processChord(bool useFakeSteno) {
 	// Save the clean chord state
 	uint32_t savedChord = cChord;
 	// Apply Stick Bits if needed
 	if (stickyBits != 0) {
 		cChord |= stickyBits;
 		for (int i = 0; i <= chordIndex; i++)
 			chordState[i] |= stickyBits;
 	}
 	// Strip FN
 	if (cChord & FN) cChord ^= FN;
 	// First we test if a whole chord was passsed
 	// If so we just run it handling repeat logic
 	if (useFakeSteno && processFakeSteno(true) == cChord) {
 		processFakeSteno(false);
 		return;
 	} else if (processQwerty(true) == cChord) {
 		processQwerty(false);
 		// Repeat logic
 		if (repeatFlag) {
 			restoreState();
 			repeatFlag = false;
 			processChord(false);
 		} else {
 			saveState(cChord);
 		}
 		return;
 	}
 	// Iterate through chord picking out the individual 
 	// and longest chords
 	uint32_t bufChords[QWERBUF];
 	int 	 bufLen		= 0;
 	uint32_t mask		= 0;
 	// We iterate over it multiple times to catch the longest
 	// chord. Then that gets addded to the mask and re run.
 	while (savedChord != mask) {
 		uint32_t test  	 		= 0;
 		uint32_t longestChord	= 0;
 		for (int i = 0; i <= chordIndex; i++) {
 			cChord = chordState[i] & ~mask;
 			if (cChord == 0)
 				continue;
 			// Assume mid parse Sym is new chord
 			if (i != 0 && test != 0 && (cChord ^ test) == PWR) {
 				longestChord = test;
 				break;
 			}
 			// Lock SYM layer in once detected
 			if (mask & PWR)
 				cChord |= PWR;
 			// Testing for keycodes
 			if (useFakeSteno) {
 				test = processFakeSteno(true);
 			} else {
 				test = processQwerty(true);
 			}
 			if (test != 0) {
 				longestChord = test;
 			}
 		}
 		mask |= longestChord;
 		bufChords[bufLen] = longestChord;
 		bufLen++;
 		// That's a loop of sorts, halt processing
 		if (bufLen >= QWERBUF) {
 			return;
 		}
 	}
 	// Now that the buffer is populated, we run it
 	for (int i = 0; i < bufLen ; i++) {
 		cChord = bufChords[i];
 		if (useFakeSteno) {
 			processFakeSteno(false);
 		} else {
 			processQwerty(false);
 		}
 	}
 	// Save state in case of repeat
 	if (!repeatFlag) {			
 		saveState(savedChord);
 	}
 	// Restore cChord for held repeat
 	cChord = savedChord;
 	return;
 }
 void saveState(uint32_t cleanChord) {
 	pChord = cleanChord;
 	pChordIndex = chordIndex;
 	for (int i = 0; i < 32; i++) 
 		pChordState[i] = chordState[i];
 }
 void restoreState() {
 	cChord = pChord;
 	chordIndex = pChordIndex;
 	for (int i = 0; i < 32; i++) 
 		chordState[i] = pChordState[i];
 }
 // Macros for calling from keymap.c
 void SEND(uint8_t kc) {
 	// Send Keycode, Does not work for Quantum Codes
 	if (cMode == COMMAND && CMDLEN < MAX_CMD_BUF) {
 #ifndef NO_DEBUG
 		uprintf("CMD LEN: %d BUF: %d\n", CMDLEN, MAX_CMD_BUF);
 #endif
 		CMDBUF[CMDLEN] = kc;
 		CMDLEN++;
 	} 
 	if (cMode != COMMAND) register_code(kc);
 	return;
 }
 void REPEAT(void) {
 	if (cMode != QWERTY)
 		return;
 	repeatFlag = true;
 	return;
 }
 void SET_STICKY(uint32_t stick) {
 	stickyBits = stick;
 	return;
 }
 void SWITCH_LAYER(int layer) {
 	if (keymapsCount >= layer) 
 		layer_on(layer);
 }
 void CLICK_MOUSE(uint8_t kc) {
 #ifdef MOUSEKEY_ENABLE
 	mousekey_on(kc);
 	mousekey_send();
 	// Store state for later use
 	inMouse = true;
 	mousePress = kc;
 #endif
 }
@@ -0,0 +1,77 @@
 // 2019, g Heavy Industries
 // Blessed mother of Christ, please keep this readable
 // and protect us from segfaults. For thine is the clock,
 // the slave and the master. Until we return from main.
 //
 // Amen.
 #include QMK_KEYBOARD_H
 #include "mousekey.h"
 #include "keymap.h"
 #include "keymap_steno.h"
 #include "wait.h"
 extern size_t keymapsCount;			// Total keymaps
 extern uint32_t cChord;				// Current Chord
 // Function defs
 void 			processChord(bool useFakeSteno);
 uint32_t		processQwerty(bool lookup);
 uint32_t 		processFakeSteno(bool lookup);
 void 			saveState(uint32_t cChord);
 void 			restoreState(void);
 // Macros for use in keymap.c
 void 			SEND(uint8_t kc);
 void 			REPEAT(void);
 void 			SET_STICKY(uint32_t);
 void 			SWITCH_LAYER(int);
 void 			CLICK_MOUSE(uint8_t);
 // Keymap helper
 #define P(chord, act) if (cChord == (chord)) { if (!lookup) {act;} return chord;}
 // Shift to internal representation
 // i.e) S(teno)R(ight)F
 #define STN(n) (1L<<n)
 enum ORDER { 
 		SFN = 0, SPWR, SST1, SST2, SST3, SST4, SNUML, SNUMR,
 		SLSU, SLSD, SLT, SLK, SLP, SLW, SLH, SLR, SLA, SLO, 
 		SRE, SRU, SRF, SRR, SRP, SRB, SRL, SRG, SRT, SRS, SRD, SRZ, SRES1, SRES2
 };
 // Break it all out
 #define FN	STN(SFN)
 #define PWR	STN(SPWR)
 #define ST1 STN(SST1)
 #define ST2 STN(SST2)
 #define ST3 STN(SST3)
 #define ST4 STN(SST4)
 #define LNO STN(SNUML) 	// STN1-6
 #define RNO STN(SNUMR) 	// STN7-C
 #define RES1 STN(SRES1) // Use reserved for sticky state
 #define RES2 STN(SRES2)
 #define LSU STN(SLSU)
 #define LSD STN(SLSD)
 #define LFT STN(SLT)  	// (L)e(F)t (T), preprocessor conflict
 #define LK  STN(SLK)
 #define LP  STN(SLP)
 #define LW  STN(SLW)
 #define LH  STN(SLH)
 #define LR  STN(SLR)
 #define LA  STN(SLA)
 #define LO  STN(SLO)
 #define RE  STN(SRE)
 #define RU  STN(SRU)
 #define RF  STN(SRF)
 #define RR  STN(SRR)
 #define RP  STN(SRP)
 #define RB  STN(SRB)
 #define RL  STN(SRL)
 #define RG  STN(SRG)
 #define RT  STN(SRT)
 #define RS  STN(SRS)
 #define RD  STN(SRD)
 #define RZ  STN(SRZ)
@@ -56,70 +56,70 @@ void led_set_kb(uint8_t usb_led) {
 *      |                            |           |     modifier
 *      |                            |           |   */
 #define RGB_MATRIX_LEFT_LEDS  \
-    { { 0xFF           }, {  85, 16 }, 0 }, /*  1 */ \
+    { { 0xFF           }, {  85, 16 }, 2 }, /*  1 */ \
-    { { 0xFF           }, {  50, 13 }, 0 }, /*  2 */ \
+    { { 0xFF           }, {  50, 13 }, 2 }, /*  2 */ \
-    { { 0xFF           }, {  16, 20 }, 0 }, /*  3 */ \
+    { { 0xFF           }, {  16, 20 }, 2 }, /*  3 */ \
-    { { 0xFF           }, {  16, 38 }, 0 }, /*  4 */ \
+    { { 0xFF           }, {  16, 38 }, 2 }, /*  4 */ \
-    { { 0xFF           }, {  50, 48 }, 0 }, /*  5 */ \
+    { { 0xFF           }, {  50, 48 }, 2 }, /*  5 */ \
-    { { 0xFF           }, {  85, 52 }, 0 }, /*  6 */ \
+    { { 0xFF           }, {  85, 52 }, 2 }, /*  6 */ \
    { { 3 | ( 5 << 4 ) }, {  95, 63 }, 1 }, /*  7 */ \
-    { { 2 | ( 5 << 4 ) }, {  85, 39 }, 0 }, /*  8 */ \
+    { { 2 | ( 5 << 4 ) }, {  85, 39 }, 4 }, /*  8 */ \
-    { { 1 | ( 5 << 4 ) }, {  85, 21 }, 0 }, /*  9 */ \
+    { { 1 | ( 5 << 4 ) }, {  85, 21 }, 4 }, /*  9 */ \
-    { { 0 | ( 5 << 4 ) }, {  85,  4 }, 0 }, /* 10 */ \
+    { { 0 | ( 5 << 4 ) }, {  85,  4 }, 4 }, /* 10 */ \
-    { { 0 | ( 4 << 4 ) }, {  68, 02 }, 0 }, /* 11 */ \
+    { { 0 | ( 4 << 4 ) }, {  68, 02 }, 4 }, /* 11 */ \
-    { { 1 | ( 4 << 4 ) }, {  68, 19 }, 0 }, /* 12 */ \
+    { { 1 | ( 4 << 4 ) }, {  68, 19 }, 4 }, /* 12 */ \
-    { { 2 | ( 4 << 4 ) }, {  68, 37 }, 0 }, /* 13 */ \
+    { { 2 | ( 4 << 4 ) }, {  68, 37 }, 4 }, /* 13 */ \
    { { 3 | ( 4 << 4 ) }, {  80, 58 }, 1 }, /* 14 */ \
    { { 3 | ( 3 << 4 ) }, {  60, 55 }, 1 }, /* 15 */ \
-    { { 2 | ( 3 << 4 ) }, {  50, 35 }, 0 }, /* 16 */ \
+    { { 2 | ( 3 << 4 ) }, {  50, 35 }, 4 }, /* 16 */ \
-    { { 1 | ( 3 << 4 ) }, {  50, 13 }, 0 }, /* 17 */ \
+    { { 1 | ( 3 << 4 ) }, {  50, 13 }, 4 }, /* 17 */ \
-    { { 0 | ( 3 << 4 ) }, {  50,  0 }, 0 }, /* 18 */ \
+    { { 0 | ( 3 << 4 ) }, {  50,  0 }, 4 }, /* 18 */ \
-    { { 0 | ( 2 << 4 ) }, {  33,  3 }, 0 }, /* 19 */ \
+    { { 0 | ( 2 << 4 ) }, {  33,  3 }, 4 }, /* 19 */ \
-    { { 1 | ( 2 << 4 ) }, {  33, 20 }, 0 }, /* 20 */ \
+    { { 1 | ( 2 << 4 ) }, {  33, 20 }, 4 }, /* 20 */ \
-    { { 2 | ( 2 << 4 ) }, {  33, 37 }, 0 }, /* 21 */ \
+    { { 2 | ( 2 << 4 ) }, {  33, 37 }, 4 }, /* 21 */ \
-    { { 2 | ( 1 << 4 ) }, {  16, 42 }, 0 }, /* 22 */ \
+    { { 2 | ( 1 << 4 ) }, {  16, 42 }, 4 }, /* 22 */ \
-    { { 1 | ( 1 << 4 ) }, {  16, 24 }, 0 }, /* 23 */ \
+    { { 1 | ( 1 << 4 ) }, {  16, 24 }, 4 }, /* 23 */ \
-    { { 0 | ( 1 << 4 ) }, {  16,  7 }, 0 }, /* 24 */ \
+    { { 0 | ( 1 << 4 ) }, {  16,  7 }, 4 }, /* 24 */ \
    { { 0 | ( 0 << 4 ) }, {   0,  7 }, 1 }, /* 25 */ \
    { { 1 | ( 0 << 4 ) }, {   0, 24 }, 1 }, /* 26 */ \
    { { 2 | ( 0 << 4 ) }, {   0, 41 }, 1 }, /* 27 */
 #define RGB_MATRIX_RIGHT_LEDS  \
-    { { 0xFF           }, { 139, 16 }, 0 }, /*  1 */ \
+    { { 0xFF           }, { 139, 16 }, 2 }, /*  1 */ \
-    { { 0xFF           }, { 174, 13 }, 0 }, /*  2 */ \
+    { { 0xFF           }, { 174, 13 }, 2 }, /*  2 */ \
-    { { 0xFF           }, { 208, 20 }, 0 }, /*  3 */ \
+    { { 0xFF           }, { 208, 20 }, 2 }, /*  3 */ \
-    { { 0xFF           }, { 208, 38 }, 0 }, /*  4 */ \
+    { { 0xFF           }, { 208, 38 }, 2 }, /*  4 */ \
-    { { 0xFF           }, { 174, 48 }, 0 }, /*  5 */ \
+    { { 0xFF           }, { 174, 48 }, 2 }, /*  5 */ \
-    { { 0xFF           }, { 139, 52 }, 0 }, /*  6 */ \
+    { { 0xFF           }, { 139, 52 }, 2 }, /*  6 */ \
    { { 7 | ( 5 << 4 ) }, { 129, 63 }, 1 }, /*  7 */ \
-    { { 6 | ( 5 << 4 ) }, { 139, 39 }, 0 }, /*  8 */ \
+    { { 6 | ( 5 << 4 ) }, { 139, 39 }, 4 }, /*  8 */ \
-    { { 5 | ( 5 << 4 ) }, { 139, 21 }, 0 }, /*  9 */ \
+    { { 5 | ( 5 << 4 ) }, { 139, 21 }, 4 }, /*  9 */ \
-    { { 4 | ( 5 << 4 ) }, { 139,  4 }, 0 }, /* 10 */ \
+    { { 4 | ( 5 << 4 ) }, { 139,  4 }, 4 }, /* 10 */ \
-    { { 4 | ( 4 << 4 ) }, { 156, 02 }, 0 }, /* 11 */ \
+    { { 4 | ( 4 << 4 ) }, { 156, 02 }, 4 }, /* 11 */ \
-    { { 5 | ( 4 << 4 ) }, { 156, 19 }, 0 }, /* 12 */ \
+    { { 5 | ( 4 << 4 ) }, { 156, 19 }, 4 }, /* 12 */ \
-    { { 6 | ( 4 << 4 ) }, { 156, 37 }, 0 }, /* 13 */ \
+    { { 6 | ( 4 << 4 ) }, { 156, 37 }, 4 }, /* 13 */ \
    { { 7 | ( 4 << 4 ) }, { 144, 58 }, 1 }, /* 14 */ \
    { { 7 | ( 3 << 4 ) }, { 164, 55 }, 1 }, /* 15 */ \
-    { { 6 | ( 3 << 4 ) }, { 174, 35 }, 0 }, /* 16 */ \
+    { { 6 | ( 3 << 4 ) }, { 174, 35 }, 4 }, /* 16 */ \
-    { { 5 | ( 3 << 4 ) }, { 174, 13 }, 0 }, /* 17 */ \
+    { { 5 | ( 3 << 4 ) }, { 174, 13 }, 4 }, /* 17 */ \
-    { { 4 | ( 3 << 4 ) }, { 174,  0 }, 0 }, /* 18 */ \
+    { { 4 | ( 3 << 4 ) }, { 174,  0 }, 4 }, /* 18 */ \
-    { { 4 | ( 2 << 4 ) }, { 191,  3 }, 0 }, /* 19 */ \
+    { { 4 | ( 2 << 4 ) }, { 191,  3 }, 4 }, /* 19 */ \
-    { { 5 | ( 2 << 4 ) }, { 191, 20 }, 0 }, /* 20 */ \
+    { { 5 | ( 2 << 4 ) }, { 191, 20 }, 4 }, /* 20 */ \
-    { { 6 | ( 2 << 4 ) }, { 191, 37 }, 0 }, /* 21 */ \
+    { { 6 | ( 2 << 4 ) }, { 191, 37 }, 4 }, /* 21 */ \
-    { { 6 | ( 1 << 4 ) }, { 208, 42 }, 0 }, /* 22 */ \
+    { { 6 | ( 1 << 4 ) }, { 208, 42 }, 4 }, /* 22 */ \
-    { { 5 | ( 1 << 4 ) }, { 208, 24 }, 0 }, /* 23 */ \
+    { { 5 | ( 1 << 4 ) }, { 208, 24 }, 4 }, /* 23 */ \
-    { { 4 | ( 1 << 4 ) }, { 208,  7 }, 0 }, /* 24 */ \
+    { { 4 | ( 1 << 4 ) }, { 208,  7 }, 4 }, /* 24 */ \
    { { 4 | ( 0 << 4 ) }, { 224,  7 }, 1 }, /* 25 */ \
    { { 5 | ( 0 << 4 ) }, { 224, 24 }, 1 }, /* 26 */ \
    { { 6 | ( 0 << 4 ) }, { 224, 41 }, 1 }, /* 27 */
 #ifdef RGB_MATRIX_SPLIT_RIGHT
-const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
+rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
        RGB_MATRIX_RIGHT_LEDS
        RGB_MATRIX_LEFT_LEDS
    };
 #else
-const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
+rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
        RGB_MATRIX_LEFT_LEDS
        RGB_MATRIX_RIGHT_LEDS
    };
@@ -1,5 +1,12 @@
 # Default Doro67 ANSI layout.
 **THIS IS THE DEFAULT ANSI KEYMAP (AVAILABILITY: CHINA + INTERNATIONAL GB)**
 The "multi" directory includes keymaps for the multi-layout PCB, which supports ANSI, ISO, and multi (split backspace & non-blocker).
 The keymap you choose from the "multi" directory must correspond to the integrated plate option you chose.
 The multi-layout PCB and RGB pcb were the only two options available to NON-china buyers.
 If you purchased an RGB PCB, please see the 'rgb' directory.
 This is the default ANSI layout that comes flashed on the Doro67 multi PCB with
 the exception of adding backtick as it was not mapped.
@@ -1,5 +1,12 @@
 # Default Doro67 ISO layout.
 **THIS IS THE DEFAULT ISO KEYMAP (AVAILABILITY: CHINA + INTERNATIONAL GB)**
 The "multi" directory includes keymaps for the multi-layout PCB, which supports ANSI, ISO, and multi (split backspace & non-blocker).
 The keymap you choose from the "multi" directory must correspond to the integrated plate option you chose.
 The multi-layout PCB and RGB pcb were the only two options available to NON-china buyers.
 If you purchased an RGB PCB, please see the 'rgb' directory.
 This is the default ISO layout that comes flashed on the Doro67 multi PCB with
 the exception of adding backtick and UK ISO specific keycodes as they were not mapped.
@@ -1,5 +1,12 @@
 # Default Doro67 Multi layout.
 **THIS IS THE DEFAULT MULTI-LAYOUT (SPLIT BACKSPACE) KEYMAP (AVAILABILITY: CHINA + INTERNATIONAL GB)**
 The "multi" directory includes keymaps for the multi-layout PCB, which supports ANSI, ISO, and multi (split backspace & non-blocker).
 The keymap you choose from the "multi" directory must correspond to the integrated plate option you chose.
 The multi-layout PCB and RGB pcb were the only two options available to NON-china buyers.
 If you purchased an RGB PCB, please see the 'rgb' directory.
 This is the default Multi layout that comes flashed on the Doro67 multi PCB with
 the exception of adding backtick as it was not mapped.
@@ -2,6 +2,13 @@
 65% custom keyboard made by 80ultraman/Alf/Backprop Studios with multiple layout support. Despite the layout options available, layout is dictated by the selected integrated plate.  
 **MULTI-LAYOUT PCB (AVAILABILITY: CHINA + INTERNATIONAL GB)**
 The "multi" directory includes keymaps for the multi-layout PCB, which supports ANSI, ISO, and multi (split backspace & non-blocker).
 The keymap you choose from the "multi" directory must correspond to the integrated plate option you chose.
 The multi-layout PCB and RGB pcb were the only two options available to NON-china buyers.
 If you purchased an RGB PCB, please see the 'rgb' directory.
 Keyboard Maintainer: [ShadeDream](https://github.com/shadedream)  
 Hardware Supported: Doro67 Multi PCB  
 Hardware Availability: [Geekhack GB](https://geekhack.org/index.php?topic=97265.0)
@@ -1 +1,5 @@
 # The default keymap for doro67
 **THIS IS THE DEFAULT KEYMAP DIRECTORY (AVAILABILITY: CHINA GB ONLY)**
 If you are a non-china buyer, you probably have the multi PCB or rgb PCB. 
 Please look at the "multi" and "rgb" readme files.
@@ -4,6 +4,10 @@
 This is not the PCB with RGB support. Do not flash RGB firmware for this board. 
 **REGULAR PCB (AVAILABILITY: CHINA GB ONLY)*
 If you are a non-china buyer, you probably have the multi PCB or rgb PCB. 
 Please look at the "multi" and "rgb" readme files.
 Keyboard Maintainer: [MechMerlin](https://github.com/mechmerlin)  
 Hardware Supported: Doro67 Regular PCB  
 Hardware Availability: [Geekhack GB](https://geekhack.org/index.php?topic=97265.0)
@@ -1 +1,7 @@
 # The default keymap for rgb
 **RGB PCB (AVAILABILITY: CHINA + INTERNATIONAL GB)**
 The "rgb" directory includes the keymap for the RGB PCB.
 The multi-layout PCB and RGB pcb were the only two options available to NON-china buyers.
 If you purchased a non-rgb PCB, please see the 'multi' directory.
@@ -4,6 +4,12 @@
 Flashing the regular PCB firmware on this board will work, but will disable RGB lighting. 
 **THIS IS THE RGB PCB DIRECTORY (AVAILABILITY: CHINA + INTERNATIONAL GB)**
 The "rgb" directory includes the keymap for the RGB PCB.
 The multi-layout PCB and RGB pcb were the only two options available to NON-china buyers.
 If you purchased a non-rgb PCB, please see the 'multi' directory.
 Keyboard Maintainer: [MechMerlin](https://github.com/mechmerlin)  
 Hardware Supported: Doro 67 RGB PCB  
 Hardware Availability: [Geekhack GB](https://geekhack.org/index.php?topic=97265.0)
@@ -52,65 +52,65 @@ void led_set_kb(uint8_t usb_led) {
 	led_set_user(usb_led);
 }
-const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
+rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
-    {{0|(0<<4)},   {15*0, 0},  0},     // Esc
+    {{0|(0<<4)},   {15*0, 0},  4},     // Esc
-    {{0|(1<<4)},   {15*1, 0},  0},     // 1
+    {{0|(1<<4)},   {15*1, 0},  4},     // 1
-    {{0|(2<<4)},   {15*2, 0},  0},     // 2
+    {{0|(2<<4)},   {15*2, 0},  4},     // 2
-    {{0|(3<<4)},   {15*3, 0},  0},     // 3
+    {{0|(3<<4)},   {15*3, 0},  4},     // 3
-    {{0|(4<<4)},   {15*4, 0},  0},     // 4
+    {{0|(4<<4)},   {15*4, 0},  4},     // 4
-    {{0|(5<<4)},   {15*5, 0},  0},     // 5
+    {{0|(5<<4)},   {15*5, 0},  4},     // 5
-    {{0|(6<<4)},   {15*6, 0},  0},     // 6
+    {{0|(6<<4)},   {15*6, 0},  4},     // 6
-    {{0|(7<<4)},   {15*7, 0},  0},     // 7
+    {{0|(7<<4)},   {15*7, 0},  4},     // 7
-    {{0|(8<<4)},   {15*8, 0},  0},     // 8
+    {{0|(8<<4)},   {15*8, 0},  4},     // 8
-    {{0|(9<<4)},   {15*9, 0},  0},     // 9
+    {{0|(9<<4)},   {15*9, 0},  4},     // 9
-    {{0|(10<<4)},  {15*10, 0}, 0},     // 0
+    {{0|(10<<4)},  {15*10, 0}, 4},     // 0
-    {{0|(11<<4)},  {15*11, 0}, 0},     // -
+    {{0|(11<<4)},  {15*11, 0}, 4},     // -
-    {{0|(12<<4)},  {15*12, 0}, 0},     // =
+    {{0|(12<<4)},  {15*12, 0}, 4},     // =
    {{0|(13<<4)},  {15*13.5, 0}, 1},   // Backspace
    {{0|(14<<4)},  {15*15, 0},   1},   // Ins
    {{1|(0<<4)},   {15*0.5, 16},  1},  // Tab
-    {{1|(1<<4)},   {15*1.5, 16},  0},  // Q
+    {{1|(1<<4)},   {15*1.5, 16},  4},  // Q
-    {{1|(2<<4)},   {15*2.5, 16},  0},  // W
+    {{1|(2<<4)},   {15*2.5, 16},  4},  // W
-    {{1|(3<<4)},   {15*3.5, 16},  0},  // E
+    {{1|(3<<4)},   {15*3.5, 16},  4},  // E
-    {{1|(4<<4)},   {15*4.5, 16},  0},  // R
+    {{1|(4<<4)},   {15*4.5, 16},  4},  // R
-    {{1|(5<<4)},   {15*5.5, 16},  0},  // T
+    {{1|(5<<4)},   {15*5.5, 16},  4},  // T
-    {{1|(6<<4)},   {15*6.5, 16},  0},  // Y
+    {{1|(6<<4)},   {15*6.5, 16},  4},  // Y
-    {{1|(7<<4)},   {15*7.5, 16},  0},  // U
+    {{1|(7<<4)},   {15*7.5, 16},  4},  // U
-    {{1|(8<<4)},   {15*8.5, 16},  0},  // I
+    {{1|(8<<4)},   {15*8.5, 16},  4},  // I
-    {{1|(9<<4)},   {15*9.5, 16},  0},  // O
+    {{1|(9<<4)},   {15*9.5, 16},  4},  // O
-    {{1|(10<<4)},  {15*10.5, 16}, 0},  // P
+    {{1|(10<<4)},  {15*10.5, 16}, 4},  // P
-    {{1|(11<<4)},  {15*11.5, 16}, 0},  // [
+    {{1|(11<<4)},  {15*11.5, 16}, 4},  // [
-    {{1|(12<<4)},  {15*12.5, 16},  0}, // ]
+    {{1|(12<<4)},  {15*12.5, 16},  4}, // ]
    {{1|(13<<4)},  {15*13.75, 16}, 1}, //
    {{1|(14<<4)},  {15*15, 16},    1}, // Del
    {{2|(0<<4)},   {15*0.75, 32},  1}, // Capslock
-    {{2|(1<<4)},   {15*1.75, 32},  0}, // A
+    {{2|(1<<4)},   {15*1.75, 32},  4}, // A
-    {{2|(2<<4)},   {15*2.75, 32},  0}, // S
+    {{2|(2<<4)},   {15*2.75, 32},  4}, // S
-    {{2|(3<<4)},   {15*3.75, 32},  0}, // D
+    {{2|(3<<4)},   {15*3.75, 32},  4}, // D
-    {{2|(4<<4)},   {15*4.75, 32},  0}, // F
+    {{2|(4<<4)},   {15*4.75, 32},  4}, // F
-    {{2|(5<<4)},   {15*5.75, 32},  0}, // G
+    {{2|(5<<4)},   {15*5.75, 32},  4}, // G
-    {{2|(6<<4)},   {15*6.75, 32},  0}, // H
+    {{2|(6<<4)},   {15*6.75, 32},  4}, // H
-    {{2|(7<<4)},   {15*7.75, 32},  0}, // J
+    {{2|(7<<4)},   {15*7.75, 32},  4}, // J
-    {{2|(8<<4)},   {15*8.75, 32},  0}, // K
+    {{2|(8<<4)},   {15*8.75, 32},  4}, // K
-    {{2|(9<<4)},   {15*9.75, 32},  0}, // L
+    {{2|(9<<4)},   {15*9.75, 32},  4}, // L
-    {{2|(10<<4)},  {15*10.75, 32}, 0}, // ;
+    {{2|(10<<4)},  {15*10.75, 32}, 4}, // ;
-    {{2|(11<<4)},  {15*11.75, 32}, 0}, // '
+    {{2|(11<<4)},  {15*11.75, 32}, 4}, // '
    {{2|(13<<4)},  {15*13.25, 32}, 1}, // Enter
    {{2|(14<<4)},  {15*15, 32},    1}, // Pgup
    {{3|(0<<4)},   {15*1.25, 48},  1}, // LShift
-    {{3|(2<<4)},   {15*2, 48},  0},    // Z
+    {{3|(2<<4)},   {15*2, 48},  4},    // Z
-    {{3|(3<<4)},   {15*3, 48},  0},    // X
+    {{3|(3<<4)},   {15*3, 48},  4},    // X
-    {{3|(4<<4)},   {15*4, 48},  0},    // C
+    {{3|(4<<4)},   {15*4, 48},  4},    // C
-    {{3|(5<<4)},   {15*5, 48},  0},    // V
+    {{3|(5<<4)},   {15*5, 48},  4},    // V
-    {{3|(6<<4)},   {15*6, 48},  0},    // B
+    {{3|(6<<4)},   {15*6, 48},  4},    // B
-    {{3|(7<<4)},   {15*7, 48},  0},    // N
+    {{3|(7<<4)},   {15*7, 48},  4},    // N
-    {{3|(8<<4)},   {15*8, 48},  0},    // M
+    {{3|(8<<4)},   {15*8, 48},  4},    // M
-    {{3|(9<<4)},   {15*9, 48},  0},    // ,
+    {{3|(9<<4)},   {15*9, 48},  4},    // ,
-    {{3|(10<<4)},  {15*10, 48},  0},   // .
+    {{3|(10<<4)},  {15*10, 48},  4},   // .
-    {{3|(11<<4)},  {15*11, 48}, 0},    // /
+    {{3|(11<<4)},  {15*11, 48}, 4},    // /
    {{3|(12<<4)},  {15*12.75, 48}, 1}, // Shift
    {{3|(13<<4)},  {15*14, 48}, 1},    // Up
    {{3|(14<<4)},  {15*15, 48}, 1},    // Pgdn
@@ -118,7 +118,7 @@ const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
    {{4|(0<<4)},   {15*0.25,  64}, 1}, // Ctrl
    {{4|(1<<4)},   {15*1.5,   64}, 1}, // GUI
    {{4|(2<<4)},   {15*2.25,  64}, 1}, // Alt
-    {{4|(3<<4)},   {15*6.75,  64}, 0}, // Space
+    {{4|(3<<4)},   {15*6.75,  64}, 4}, // Space
    {{4|(9<<4)},   {15*9,     64}, 1}, // RAlt
    {{4|(10<<4)},  {15*10.25, 64}, 1}, // FN
    {{4|(12<<4)},  {15*13,    64}, 1}, // Left
@@ -71,7 +71,7 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
 };
-const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
+rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
    {{0|(11<<4)},   {20.36*11,  0}, 1},
    {{0|(10<<4)},   {20.36*10,  0}, 1},
@@ -90,32 +90,32 @@ const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
    {{0|(13<<4)},  {20.36*0,21.33*0.5}, 1},
    {{1|(11<<4)},   {20.36*11,  21.33}, 1},
-    {{1|(10<<4)},   {20.36*10,  21.33}, 0},
+    {{1|(10<<4)},   {20.36*10,  21.33}, 4},
-    {{1|(9<<4)},    {20.36*9,  21.33}, 0},
+    {{1|(9<<4)},    {20.36*9,  21.33}, 4},
-    {{1|(8<<4)},    {20.36*8,  21.33}, 0},
+    {{1|(8<<4)},    {20.36*8,  21.33}, 4},
-    {{1|(7<<4)},    {20.36*7,  21.33}, 0},
+    {{1|(7<<4)},    {20.36*7,  21.33}, 4},
-	{{1|(6<<4)},    { 20.36*6,  21.33}, 0},
+    {{1|(6<<4)},    { 20.36*6,  21.33}, 4},
-    {{1|(5<<4)},    { 20.36*5,  21.33}, 0},
+    {{1|(5<<4)},    { 20.36*5,  21.33}, 4},
-    {{1|(4<<4)},    { 20.36*4,  21.33}, 0},
+    {{1|(4<<4)},    { 20.36*4,  21.33}, 4},
-    {{1|(3<<4)},    { 20.36*3,  21.33}, 0},
+    {{1|(3<<4)},    { 20.36*3,  21.33}, 4},
-    {{1|(2<<4)},    { 20.36*2,  21.33}, 0},
+    {{1|(2<<4)},    { 20.36*2,  21.33}, 4},
-    {{1|(1<<4)},    { 20.36*1,  21.33}, 0},
+    {{1|(1<<4)},    { 20.36*1,  21.33}, 4},
    {{1|(0<<4)},    { 20.36*0,  21.33}, 1},
    {{1|(12<<4)},   {20.36*11, 21.33*1.5}, 1},
    {{1|(13<<4)},  {20.36*0,21.33*1.5}, 1},
    {{2|(11<<4)},   {20.36*11,  21.33*2}, 1},
-    {{2|(10<<4)},   {20.36*10,  21.33*2}, 0},
+    {{2|(10<<4)},   {20.36*10,  21.33*2}, 4},
-    {{2|(9<<4)},    {20.36*9,  21.33*2}, 0},
+    {{2|(9<<4)},    {20.36*9,  21.33*2}, 4},
-    {{2|(8<<4)},    {20.36*8,  21.33*2}, 0},
+    {{2|(8<<4)},    {20.36*8,  21.33*2}, 4},
-    {{2|(7<<4)},    {20.36*7,  21.33*2}, 0},
+    {{2|(7<<4)},    {20.36*7,  21.33*2}, 4},
-	{{2|(6<<4)},    { 20.36*6,  21.33*2}, 0},
+    {{2|(6<<4)},    { 20.36*6,  21.33*2}, 4},
-    {{2|(5<<4)},    { 20.36*5,  21.33*2}, 0},
+    {{2|(5<<4)},    { 20.36*5,  21.33*2}, 4},
-    {{2|(4<<4)},    { 20.36*4,  21.33*2}, 0},
+    {{2|(4<<4)},    { 20.36*4,  21.33*2}, 4},
-    {{2|(3<<4)},    { 20.36*3,  21.33*2}, 0},
+    {{2|(3<<4)},    { 20.36*3,  21.33*2}, 4},
-    {{2|(2<<4)},    { 20.36*2,  21.33*2}, 0},
+    {{2|(2<<4)},    { 20.36*2,  21.33*2}, 4},
-    {{2|(1<<4)},    { 20.36*1,  21.33*2}, 0},
+    {{2|(1<<4)},    { 20.36*1,  21.33*2}, 4},
    {{2|(0<<4)},    { 20.36*0,  21.33*2}, 1},
    {{2|(12<<4)},   {20.36*11, 21.33*2.5}, 1},
@@ -205,7 +205,7 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
 };
-const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
+rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
    {{0|(11<<4)},   {20.36*11,  0}, 1},
    {{0|(10<<4)},   {20.36*10,  0}, 1},
@@ -224,32 +224,32 @@ const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
    {{0|(13<<4)},  {20.36*0,21.33*0.5}, 1},
    {{1|(11<<4)},   {20.36*11,  21.33}, 1},
-    {{1|(10<<4)},   {20.36*10,  21.33}, 0},
+    {{1|(10<<4)},   {20.36*10,  21.33}, 4},
-    {{1|(9<<4)},    {20.36*9,  21.33}, 0},
+    {{1|(9<<4)},    {20.36*9,  21.33}, 4},
-    {{1|(8<<4)},    {20.36*8,  21.33}, 0},
+    {{1|(8<<4)},    {20.36*8,  21.33}, 4},
-    {{1|(7<<4)},    {20.36*7,  21.33}, 0},
+    {{1|(7<<4)},    {20.36*7,  21.33}, 4},
-	{{1|(6<<4)},    { 20.36*6,  21.33}, 0},
+    {{1|(6<<4)},    { 20.36*6,  21.33}, 4},
-    {{1|(5<<4)},    { 20.36*5,  21.33}, 0},
+    {{1|(5<<4)},    { 20.36*5,  21.33}, 4},
-    {{1|(4<<4)},    { 20.36*4,  21.33}, 0},
+    {{1|(4<<4)},    { 20.36*4,  21.33}, 4},
-    {{1|(3<<4)},    { 20.36*3,  21.33}, 0},
+    {{1|(3<<4)},    { 20.36*3,  21.33}, 4},
-    {{1|(2<<4)},    { 20.36*2,  21.33}, 0},
+    {{1|(2<<4)},    { 20.36*2,  21.33}, 4},
-    {{1|(1<<4)},    { 20.36*1,  21.33}, 0},
+    {{1|(1<<4)},    { 20.36*1,  21.33}, 4},
    {{1|(0<<4)},    { 20.36*0,  21.33}, 1},
    {{1|(12<<4)},   {20.36*11, 21.33*1.5}, 1},
    {{1|(13<<4)},  {20.36*0,21.33*1.5}, 1},
    {{2|(11<<4)},   {20.36*11,  21.33*2}, 1},
-    {{2|(10<<4)},   {20.36*10,  21.33*2}, 0},
+    {{2|(10<<4)},   {20.36*10,  21.33*2}, 4},
-    {{2|(9<<4)},    {20.36*9,  21.33*2}, 0},
+    {{2|(9<<4)},    {20.36*9,  21.33*2}, 4},
-    {{2|(8<<4)},    {20.36*8,  21.33*2}, 0},
+    {{2|(8<<4)},    {20.36*8,  21.33*2}, 4},
-    {{2|(7<<4)},    {20.36*7,  21.33*2}, 0},
+    {{2|(7<<4)},    {20.36*7,  21.33*2}, 4},
-	{{2|(6<<4)},    { 20.36*6,  21.33*2}, 0},
+    {{2|(6<<4)},    { 20.36*6,  21.33*2}, 4},
-    {{2|(5<<4)},    { 20.36*5,  21.33*2}, 0},
+    {{2|(5<<4)},    { 20.36*5,  21.33*2}, 4},
-    {{2|(4<<4)},    { 20.36*4,  21.33*2}, 0},
+    {{2|(4<<4)},    { 20.36*4,  21.33*2}, 4},
-    {{2|(3<<4)},    { 20.36*3,  21.33*2}, 0},
+    {{2|(3<<4)},    { 20.36*3,  21.33*2}, 4},
-    {{2|(2<<4)},    { 20.36*2,  21.33*2}, 0},
+    {{2|(2<<4)},    { 20.36*2,  21.33*2}, 4},
-    {{2|(1<<4)},    { 20.36*1,  21.33*2}, 0},
+    {{2|(1<<4)},    { 20.36*1,  21.33*2}, 4},
    {{2|(0<<4)},    { 20.36*0,  21.33*2}, 1},
    {{2|(12<<4)},   {20.36*11, 21.33*2.5}, 1},
@@ -35,10 +35,8 @@ void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue, bool def
  rgb_led led;
  for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
    led = g_rgb_leds[i];
-    if (led.matrix_co.raw < 0xFF) {
+    if (HAS_FLAGS(led.flags, LED_FLAG_MODIFIER)) {
-      if (led.modifier) {
+        rgb_matrix_set_color( i, red, green, blue );
          rgb_matrix_set_color( i, red, green, blue );
      }
    }
  }
 }
@@ -58,10 +58,8 @@ void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue, bool def
  rgb_led led;
  for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
    led = g_rgb_leds[i];
-    if (led.matrix_co.raw < 0xFF) {
+    if (HAS_FLAGS(led.flags, LED_FLAG_MODIFIER)) {
-      if (led.modifier) {
+        rgb_matrix_set_color( i, red, green, blue );
          rgb_matrix_set_color( i, red, green, blue );
      }
    }
  }
 }
@@ -64,7 +64,8 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
    {0, H_16,   G_16,   I_16},
    {0, K_16,   J_16,   L_16},
 };
-const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
+
 rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
    {{0|(13<<4)},   {16*13.5,  0}, 1},
    {{0|(12<<4)},   {16*12,  0}, 1},
    {{0|(11<<4)},   {16*11,  0}, 1},
@@ -80,49 +81,49 @@ const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
    {{0|(1<<4)},    {16*1,  0}, 1},
    {{0|(0<<4)},    {16*0,  0}, 1},
 	{{2|(13<<4)},   {16*13.75, 24}, 1},
-    {{1|(12<<4)},   {16*12.5,  16}, 0},
+    {{1|(12<<4)},   {16*12.5,  16}, 4},
-    {{1|(11<<4)},   {16*11.5,  16}, 0},
+    {{1|(11<<4)},   {16*11.5,  16}, 4},
-    {{1|(10<<4)},   {16*10.5,  16}, 0},
+    {{1|(10<<4)},   {16*10.5,  16}, 4},
-    {{1|(9<<4)},    { 16*9.5,  16}, 0},
+    {{1|(9<<4)},    { 16*9.5,  16}, 4},
-    {{1|(8<<4)},    { 16*8.5,  16}, 0},
+    {{1|(8<<4)},    { 16*8.5,  16}, 4},
-    {{1|(7<<4)},    { 16*7.5,  16}, 0},
+    {{1|(7<<4)},    { 16*7.5,  16}, 4},
-	{{1|(6<<4)},    { 16*6.5,  16}, 0},
+	{{1|(6<<4)},    { 16*6.5,  16}, 4},
-    {{1|(5<<4)},    { 16*5.5,  16}, 0},
+    {{1|(5<<4)},    { 16*5.5,  16}, 4},
-    {{1|(4<<4)},    { 16*4.5,  16}, 0},
+    {{1|(4<<4)},    { 16*4.5,  16}, 4},
-    {{1|(3<<4)},    { 16*3.5,  16}, 0},
+    {{1|(3<<4)},    { 16*3.5,  16}, 4},
-    {{1|(2<<4)},    { 16*2.5,  16}, 0},
+    {{1|(2<<4)},    { 16*2.5,  16}, 4},
-    {{1|(1<<4)},    { 16*1.5,  16}, 0},
+    {{1|(1<<4)},    { 16*1.5,  16}, 4},
    {{1|(0<<4)},    { 16*0.25,  16}, 1},
 	{{1|(13<<4)},   {16*12.75,  32}, 1},
-    {{2|(11<<4)},   {16*11.75,  32}, 0},
+    {{2|(11<<4)},   {16*11.75,  32}, 4},
-    {{2|(10<<4)},   {16*10.75,  32}, 0},
+    {{2|(10<<4)},   {16*10.75,  32}, 4},
-    {{2|(9<<4)},    {16*9.75,  32}, 0},
+    {{2|(9<<4)},    {16*9.75,  32}, 4},
-    {{2|(8<<4)},    {16*8.75,  32}, 0},
+    {{2|(8<<4)},    {16*8.75,  32}, 4},
-    {{2|(7<<4)},    {16*7.75,  32}, 0},
+    {{2|(7<<4)},    {16*7.75,  32}, 4},
-	{{2|(6<<4)},    { 16*6.75,  32}, 0},
+	{{2|(6<<4)},    { 16*6.75,  32}, 4},
-    {{2|(5<<4)},    { 16*5.75,  32}, 0},
+    {{2|(5<<4)},    { 16*5.75,  32}, 4},
-    {{2|(4<<4)},    { 16*4.75,  32}, 0},
+    {{2|(4<<4)},    { 16*4.75,  32}, 4},
-    {{2|(3<<4)},    { 16*3.75,  32}, 0},
+    {{2|(3<<4)},    { 16*3.75,  32}, 4},
-    {{2|(2<<4)},    { 16*2.75,  32}, 0},
+    {{2|(2<<4)},    { 16*2.75,  32}, 4},
-    {{2|(1<<4)},    { 16*1.75,  32}, 0},
+    {{2|(1<<4)},    { 16*1.75,  32}, 4},
    {{2|(0<<4)},    { 16*0.375,  32}, 1},
    {{3|(11<<4)},   {16*13.125,  48}, 1},
-    {{3|(10<<4)},   {16*11.25,  48}, 0},
+    {{3|(10<<4)},   {16*11.25,  48}, 4},
-    {{3|(9<<4)},    {16*10.25,  48}, 0},
+    {{3|(9<<4)},    {16*10.25,  48}, 4},
-    {{3|(8<<4)},    {16*9.25,  48}, 0},
+    {{3|(8<<4)},    {16*9.25,  48}, 4},
-    {{3|(7<<4)},    {16*8.25,  48}, 0},
+    {{3|(7<<4)},    {16*8.25,  48}, 4},
-	{{3|(6<<4)},    {16*7.25,  48}, 0},
+	{{3|(6<<4)},    {16*7.25,  48}, 4},
-    {{3|(5<<4)},    {16*6.25,  48}, 0},
+    {{3|(5<<4)},    {16*6.25,  48}, 4},
-    {{3|(4<<4)},    {16*5.25,  48}, 0},
+    {{3|(4<<4)},    {16*5.25,  48}, 4},
-    {{3|(3<<4)},    {16*4.25,  48}, 0},
+    {{3|(3<<4)},    {16*4.25,  48}, 4},
-    {{3|(2<<4)},    {16*3.25,  48}, 0},
+    {{3|(2<<4)},    {16*3.25,  48}, 4},
-    {{3|(1<<4)},    {16*1.25,  48}, 0},
+    {{3|(1<<4)},    {16*1.25,  48}, 4},
    {{3|(0<<4)},    {16*0.625,  48}, 1},
 	{{4|(13<<4)},   {16*13.875,  64}, 1},
    {{4|(11<<4)},   {16*12.625,  64}, 1},
    {{4|(10<<4)},   {16*11.375,  64}, 1},
    {{4|(9<<4)},    {16*10.125,  64}, 1},
-    {{4|(5<<4)},    { 16*6.375,  64}, 0},
+    {{4|(5<<4)},    { 16*6.375,  64}, 4},
    {{4|(2<<4)},    { 16*2.625,  64}, 1},
    {{4|(1<<4)},    { 16*1.375,  64}, 1},
    {{4|(0<<4)},    { 16*0.125,  64}, 1},
@@ -192,7 +193,8 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
    {0, H_16,   G_16,   I_16},
    {0, K_16,   J_16,   L_16},
 };
-const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
+
 rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
 	{{2|(12<<4)},   {16*14,  0}, 1},
    {{0|(13<<4)},   {16*13,  0}, 1},
    {{0|(12<<4)},   {16*12,  0}, 1},
@@ -209,49 +211,49 @@ const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
    {{0|(1<<4)},    {16*1,  0}, 1},
    {{0|(0<<4)},    {16*0,  0}, 1},
 	{{1|(13<<4)},   {16*13.75, 16}, 1},
-    {{1|(12<<4)},   {16*12.5,  16}, 0},
+    {{1|(12<<4)},   {16*12.5,  16}, 4},
-    {{1|(11<<4)},   {16*11.5,  16}, 0},
+    {{1|(11<<4)},   {16*11.5,  16}, 4},
-    {{1|(10<<4)},   {16*10.5,  16}, 0},
+    {{1|(10<<4)},   {16*10.5,  16}, 4},
-    {{1|(9<<4)},    { 16*9.5,  16}, 0},
+    {{1|(9<<4)},    { 16*9.5,  16}, 4},
-    {{1|(8<<4)},    { 16*8.5,  16}, 0},
+    {{1|(8<<4)},    { 16*8.5,  16}, 4},
-    {{1|(7<<4)},    { 16*7.5,  16}, 0},
+    {{1|(7<<4)},    { 16*7.5,  16}, 4},
-	{{1|(6<<4)},    { 16*6.5,  16}, 0},
+	{{1|(6<<4)},    { 16*6.5,  16}, 4},
-    {{1|(5<<4)},    { 16*5.5,  16}, 0},
+    {{1|(5<<4)},    { 16*5.5,  16}, 4},
-    {{1|(4<<4)},    { 16*4.5,  16}, 0},
+    {{1|(4<<4)},    { 16*4.5,  16}, 4},
-    {{1|(3<<4)},    { 16*3.5,  16}, 0},
+    {{1|(3<<4)},    { 16*3.5,  16}, 4},
-    {{1|(2<<4)},    { 16*2.5,  16}, 0},
+    {{1|(2<<4)},    { 16*2.5,  16}, 4},
-    {{1|(1<<4)},    { 16*1.5,  16}, 0},
+    {{1|(1<<4)},    { 16*1.5,  16}, 4},
    {{1|(0<<4)},    { 16*0.25,  16}, 1},
 	{{2|(13<<4)},   {16*12.75,  32}, 1},
-    {{2|(11<<4)},   {16*11.75,  32}, 0},
+    {{2|(11<<4)},   {16*11.75,  32}, 4},
-    {{2|(10<<4)},   {16*10.75,  32}, 0},
+    {{2|(10<<4)},   {16*10.75,  32}, 4},
-    {{2|(9<<4)},    {16*9.75,  32}, 0},
+    {{2|(9<<4)},    {16*9.75,  32}, 4},
-    {{2|(8<<4)},    {16*8.75,  32}, 0},
+    {{2|(8<<4)},    {16*8.75,  32}, 4},
-    {{2|(7<<4)},    {16*7.75,  32}, 0},
+    {{2|(7<<4)},    {16*7.75,  32}, 4},
-	{{2|(6<<4)},    { 16*6.75,  32}, 0},
+	{{2|(6<<4)},    { 16*6.75,  32}, 4},
-    {{2|(5<<4)},    { 16*5.75,  32}, 0},
+    {{2|(5<<4)},    { 16*5.75,  32}, 4},
-    {{2|(4<<4)},    { 16*4.75,  32}, 0},
+    {{2|(4<<4)},    { 16*4.75,  32}, 4},
-    {{2|(3<<4)},    { 16*3.75,  32}, 0},
+    {{2|(3<<4)},    { 16*3.75,  32}, 4},
-    {{2|(2<<4)},    { 16*2.75,  32}, 0},
+    {{2|(2<<4)},    { 16*2.75,  32}, 4},
-    {{2|(1<<4)},    { 16*1.75,  32}, 0},
+    {{2|(1<<4)},    { 16*1.75,  32}, 4},
    {{2|(0<<4)},    { 16*0.375,  32}, 1},
    {{3|(13<<4)},   {16*14,     48}, 1},
-    {{3|(11<<4)},   {16*12.625, 48}, 0},
+    {{3|(11<<4)},   {16*12.625, 48}, 4},
-    {{3|(10<<4)},   {16*11.25,  48}, 0},
+    {{3|(10<<4)},   {16*11.25,  48}, 4},
-    {{3|(9<<4)},    {16*10.25,  48}, 0},
+    {{3|(9<<4)},    {16*10.25,  48}, 4},
-    {{3|(8<<4)},    {16*9.25,  48}, 0},
+    {{3|(8<<4)},    {16*9.25,  48}, 4},
-    {{3|(7<<4)},    {16*8.25,  48}, 0},
+    {{3|(7<<4)},    {16*8.25,  48}, 4},
-	{{3|(6<<4)},    {16*7.25,  48}, 0},
+	{{3|(6<<4)},    {16*7.25,  48}, 4},
-    {{3|(5<<4)},    {16*6.25,  48}, 0},
+    {{3|(5<<4)},    {16*6.25,  48}, 4},
-    {{3|(4<<4)},    {16*5.25,  48}, 0},
+    {{3|(4<<4)},    {16*5.25,  48}, 4},
-    {{3|(3<<4)},    {16*4.25,  48}, 0},
+    {{3|(3<<4)},    {16*4.25,  48}, 4},
-    {{3|(2<<4)},    {16*3.25,  48}, 0},
+    {{3|(2<<4)},    {16*3.25,  48}, 4},
-    {{3|(1<<4)},    {16*1.25,  48}, 0},
+    {{3|(1<<4)},    {16*1.25,  48}, 4},
    {{3|(0<<4)},    {16*0.625,  48}, 1},
 	{{4|(13<<4)},   {16*13.625,  64}, 1},
    {{4|(11<<4)},   {16*12.375,  64}, 1},
    {{4|(10<<4)},   {16*11.125,  64}, 1},
-    {{4|(5<<4)},    { 16*7,      64}, 0},
+    {{4|(5<<4)},    { 16*7,      64}, 4},
    {{4|(2<<4)},    { 16*2.875,  64}, 1},
    {{4|(1<<4)},    { 16*1.625,  64}, 1},
    {{4|(0<<4)},    { 16*0.375,  64}, 1},
@@ -321,7 +323,8 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
    {0, H_16,   G_16,   I_16},
    {0, K_16,   J_16,   L_16},
 };
-const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
+
 rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
 	{{2|(12<<4)},   {16*14,  0}, 1},
    {{0|(13<<4)},   {16*13,  0}, 1},
    {{0|(12<<4)},   {16*12,  0}, 1},
@@ -338,49 +341,49 @@ const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
    {{0|(1<<4)},    {16*1,  0}, 1},
    {{0|(0<<4)},    {16*0,  0}, 1},
 	{{2|(13<<4)},   {16*13.75, 24}, 1},
-    {{1|(12<<4)},   {16*12.5,  16}, 0},
+    {{1|(12<<4)},   {16*12.5,  16}, 4},
-    {{1|(11<<4)},   {16*11.5,  16}, 0},
+    {{1|(11<<4)},   {16*11.5,  16}, 4},
-    {{1|(10<<4)},   {16*10.5,  16}, 0},
+    {{1|(10<<4)},   {16*10.5,  16}, 4},
-    {{1|(9<<4)},    { 16*9.5,  16}, 0},
+    {{1|(9<<4)},    { 16*9.5,  16}, 4},
-    {{1|(8<<4)},    { 16*8.5,  16}, 0},
+    {{1|(8<<4)},    { 16*8.5,  16}, 4},
-    {{1|(7<<4)},    { 16*7.5,  16}, 0},
+    {{1|(7<<4)},    { 16*7.5,  16}, 4},
-	{{1|(6<<4)},    { 16*6.5,  16}, 0},
+	{{1|(6<<4)},    { 16*6.5,  16}, 4},
-    {{1|(5<<4)},    { 16*5.5,  16}, 0},
+    {{1|(5<<4)},    { 16*5.5,  16}, 4},
-    {{1|(4<<4)},    { 16*4.5,  16}, 0},
+    {{1|(4<<4)},    { 16*4.5,  16}, 4},
-    {{1|(3<<4)},    { 16*3.5,  16}, 0},
+    {{1|(3<<4)},    { 16*3.5,  16}, 4},
-    {{1|(2<<4)},    { 16*2.5,  16}, 0},
+    {{1|(2<<4)},    { 16*2.5,  16}, 4},
-    {{1|(1<<4)},    { 16*1.5,  16}, 0},
+    {{1|(1<<4)},    { 16*1.5,  16}, 4},
    {{1|(0<<4)},    { 16*0.25,  16}, 1},
 	{{1|(13<<4)},   {16*12.75,  32}, 1},
-    {{2|(11<<4)},   {16*11.75,  32}, 0},
+    {{2|(11<<4)},   {16*11.75,  32}, 4},
-    {{2|(10<<4)},   {16*10.75,  32}, 0},
+    {{2|(10<<4)},   {16*10.75,  32}, 4},
-    {{2|(9<<4)},    {16*9.75,  32}, 0},
+    {{2|(9<<4)},    {16*9.75,  32}, 4},
-    {{2|(8<<4)},    {16*8.75,  32}, 0},
+    {{2|(8<<4)},    {16*8.75,  32}, 4},
-    {{2|(7<<4)},    {16*7.75,  32}, 0},
+    {{2|(7<<4)},    {16*7.75,  32}, 4},
-	{{2|(6<<4)},    { 16*6.75,  32}, 0},
+	{{2|(6<<4)},    { 16*6.75,  32}, 4},
-    {{2|(5<<4)},    { 16*5.75,  32}, 0},
+    {{2|(5<<4)},    { 16*5.75,  32}, 4},
-    {{2|(4<<4)},    { 16*4.75,  32}, 0},
+    {{2|(4<<4)},    { 16*4.75,  32}, 4},
-    {{2|(3<<4)},    { 16*3.75,  32}, 0},
+    {{2|(3<<4)},    { 16*3.75,  32}, 4},
-    {{2|(2<<4)},    { 16*2.75,  32}, 0},
+    {{2|(2<<4)},    { 16*2.75,  32}, 4},
-    {{2|(1<<4)},    { 16*1.75,  32}, 0},
+    {{2|(1<<4)},    { 16*1.75,  32}, 4},
    {{2|(0<<4)},    { 16*0.375,  32}, 1},
    {{3|(13<<4)},   {16*14,     48}, 1},
-    {{3|(11<<4)},   {16*12.625, 48}, 0},
+    {{3|(11<<4)},   {16*12.625, 48}, 4},
-    {{3|(10<<4)},   {16*11.25,  48}, 0},
+    {{3|(10<<4)},   {16*11.25,  48}, 4},
-    {{3|(9<<4)},    {16*10.25,  48}, 0},
+    {{3|(9<<4)},    {16*10.25,  48}, 4},
-    {{3|(8<<4)},    {16*9.25,  48}, 0},
+    {{3|(8<<4)},    {16*9.25,  48}, 4},
-    {{3|(7<<4)},    {16*8.25,  48}, 0},
+    {{3|(7<<4)},    {16*8.25,  48}, 4},
-	{{3|(6<<4)},    {16*7.25,  48}, 0},
+	{{3|(6<<4)},    {16*7.25,  48}, 4},
-    {{3|(5<<4)},    {16*6.25,  48}, 0},
+    {{3|(5<<4)},    {16*6.25,  48}, 4},
-    {{3|(4<<4)},    {16*5.25,  48}, 0},
+    {{3|(4<<4)},    {16*5.25,  48}, 4},
-    {{3|(3<<4)},    {16*4.25,  48}, 0},
+    {{3|(3<<4)},    {16*4.25,  48}, 4},
-    {{3|(2<<4)},    {16*3.25,  48}, 0},
+    {{3|(2<<4)},    {16*3.25,  48}, 4},
-    {{3|(1<<4)},    {16*1.25,  48}, 0},
+    {{3|(1<<4)},    {16*1.25,  48}, 4},
    {{3|(0<<4)},    {16*0.625,  48}, 1},
 	{{4|(13<<4)},   {16*13.625,  64}, 1},
    {{4|(11<<4)},   {16*12.375,  64}, 1},
    {{4|(10<<4)},   {16*11.125,  64}, 1},
-    {{4|(5<<4)},    { 16*7,      64}, 0},
+    {{4|(5<<4)},    { 16*7,      64}, 4},
    {{4|(2<<4)},    { 16*2.875,  64}, 1},
    {{4|(1<<4)},    { 16*1.625,  64}, 1},
    {{4|(0<<4)},    { 16*0.375,  64}, 1},
@@ -449,7 +452,8 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
    {0, H_16,   G_16,   I_16},
    {0, K_16,   J_16,   L_16},
 };
-const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
+
 rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
    {{0|(13<<4)},   {16*13.5,  0}, 1},
    {{0|(12<<4)},   {16*12,  0}, 1},
    {{0|(11<<4)},   {16*11,  0}, 1},
@@ -465,49 +469,49 @@ const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
    {{0|(1<<4)},    {16*1,  0}, 1},
    {{0|(0<<4)},    {16*0,  0}, 1},
 	{{1|(13<<4)},   {16*13.75, 16}, 1},
-    {{1|(12<<4)},   {16*12.5,  16}, 0},
+    {{1|(12<<4)},   {16*12.5,  16}, 4},
-    {{1|(11<<4)},   {16*11.5,  16}, 0},
+    {{1|(11<<4)},   {16*11.5,  16}, 4},
-    {{1|(10<<4)},   {16*10.5,  16}, 0},
+    {{1|(10<<4)},   {16*10.5,  16}, 4},
-    {{1|(9<<4)},    { 16*9.5,  16}, 0},
+    {{1|(9<<4)},    { 16*9.5,  16}, 4},
-    {{1|(8<<4)},    { 16*8.5,  16}, 0},
+    {{1|(8<<4)},    { 16*8.5,  16}, 4},
-    {{1|(7<<4)},    { 16*7.5,  16}, 0},
+    {{1|(7<<4)},    { 16*7.5,  16}, 4},
-	{{1|(6<<4)},    { 16*6.5,  16}, 0},
+	{{1|(6<<4)},    { 16*6.5,  16}, 4},
-    {{1|(5<<4)},    { 16*5.5,  16}, 0},
+    {{1|(5<<4)},    { 16*5.5,  16}, 4},
-    {{1|(4<<4)},    { 16*4.5,  16}, 0},
+    {{1|(4<<4)},    { 16*4.5,  16}, 4},
-    {{1|(3<<4)},    { 16*3.5,  16}, 0},
+    {{1|(3<<4)},    { 16*3.5,  16}, 4},
-    {{1|(2<<4)},    { 16*2.5,  16}, 0},
+    {{1|(2<<4)},    { 16*2.5,  16}, 4},
-    {{1|(1<<4)},    { 16*1.5,  16}, 0},
+    {{1|(1<<4)},    { 16*1.5,  16}, 4},
    {{1|(0<<4)},    { 16*0.25,  16}, 1},
 	{{2|(13<<4)},   {16*13.375,  24}, 1},
-    {{2|(11<<4)},   {16*11.75,  32}, 0},
+    {{2|(11<<4)},   {16*11.75,  32}, 4},
-    {{2|(10<<4)},   {16*10.75,  32}, 0},
+    {{2|(10<<4)},   {16*10.75,  32}, 4},
-    {{2|(9<<4)},    {16*9.75,  32}, 0},
+    {{2|(9<<4)},    {16*9.75,  32}, 4},
-    {{2|(8<<4)},    {16*8.75,  32}, 0},
+    {{2|(8<<4)},    {16*8.75,  32}, 4},
-    {{2|(7<<4)},    {16*7.75,  32}, 0},
+    {{2|(7<<4)},    {16*7.75,  32}, 4},
-	{{2|(6<<4)},    { 16*6.75,  32}, 0},
+	{{2|(6<<4)},    { 16*6.75,  32}, 4},
-    {{2|(5<<4)},    { 16*5.75,  32}, 0},
+    {{2|(5<<4)},    { 16*5.75,  32}, 4},
-    {{2|(4<<4)},    { 16*4.75,  32}, 0},
+    {{2|(4<<4)},    { 16*4.75,  32}, 4},
-    {{2|(3<<4)},    { 16*3.75,  32}, 0},
+    {{2|(3<<4)},    { 16*3.75,  32}, 4},
-    {{2|(2<<4)},    { 16*2.75,  32}, 0},
+    {{2|(2<<4)},    { 16*2.75,  32}, 4},
-    {{2|(1<<4)},    { 16*1.75,  32}, 0},
+    {{2|(1<<4)},    { 16*1.75,  32}, 4},
    {{2|(0<<4)},    { 16*0.375,  32}, 1},
    {{3|(11<<4)},   {16*13.125,  48}, 1},
-    {{3|(10<<4)},   {16*11.25,  48}, 0},
+    {{3|(10<<4)},   {16*11.25,  48}, 4},
-    {{3|(9<<4)},    {16*10.25,  48}, 0},
+    {{3|(9<<4)},    {16*10.25,  48}, 4},
-    {{3|(8<<4)},    {16*9.25,  48}, 0},
+    {{3|(8<<4)},    {16*9.25,  48}, 4},
-    {{3|(7<<4)},    {16*8.25,  48}, 0},
+    {{3|(7<<4)},    {16*8.25,  48}, 4},
-	{{3|(6<<4)},    {16*7.25,  48}, 0},
+	{{3|(6<<4)},    {16*7.25,  48}, 4},
-    {{3|(5<<4)},    {16*6.25,  48}, 0},
+    {{3|(5<<4)},    {16*6.25,  48}, 4},
-    {{3|(4<<4)},    {16*5.25,  48}, 0},
+    {{3|(4<<4)},    {16*5.25,  48}, 4},
-    {{3|(3<<4)},    {16*4.25,  48}, 0},
+    {{3|(3<<4)},    {16*4.25,  48}, 4},
-    {{3|(2<<4)},    {16*3.25,  48}, 0},
+    {{3|(2<<4)},    {16*3.25,  48}, 4},
-    {{3|(1<<4)},    {16*1.25,  48}, 0},
+    {{3|(1<<4)},    {16*1.25,  48}, 4},
    {{3|(0<<4)},    {16*0.625,  48}, 1},
 	{{4|(13<<4)},   {16*13.875,  64}, 1},
    {{4|(11<<4)},   {16*12.625,  64}, 1},
    {{4|(10<<4)},   {16*11.375,  64}, 1},
    {{4|(9<<4)},    {16*10.125,  64}, 1},
-    {{4|(5<<4)},    { 16*6.375,  64}, 0},
+    {{4|(5<<4)},    { 16*6.375,  64}, 4},
    {{4|(2<<4)},    { 16*2.625,  64}, 1},
    {{4|(1<<4)},    { 16*1.375,  64}, 1},
    {{4|(0<<4)},    { 16*0.125,  64}, 1},
@@ -578,7 +582,8 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
    {0, H_16,   G_16,   I_16},
    {0, K_16,   J_16,   L_16},
 };
-const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
+
 rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
    {{0|(13<<4)},   {17.23*13,  0}, 1},
    {{0|(12<<4)},   {17.23*12,  0}, 1},
    {{0|(11<<4)},   {17.23*11,  0}, 1},
@@ -594,51 +599,51 @@ const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
    {{0|(1<<4)},    { 17.23*1,  0}, 1},
    {{0|(0<<4)},    { 17.23*0,  0}, 1},
 	{{1|(13<<4)},   {17.23*13,  16}, 1},
-    {{1|(12<<4)},   {17.23*12,  16}, 0},
+    {{1|(12<<4)},   {17.23*12,  16}, 4},
-    {{1|(11<<4)},   {17.23*11,  16}, 0},
+    {{1|(11<<4)},   {17.23*11,  16}, 4},
-    {{1|(10<<4)},   {17.23*10,  16}, 0},
+    {{1|(10<<4)},   {17.23*10,  16}, 4},
-    {{1|(9<<4)},    {17.23*9,  16}, 0},
+    {{1|(9<<4)},    {17.23*9,  16}, 4},
-    {{1|(8<<4)},    {17.23*8,  16}, 0},
+    {{1|(8<<4)},    {17.23*8,  16}, 4},
-    {{1|(7<<4)},    {17.23*7,  16}, 0},
+    {{1|(7<<4)},    {17.23*7,  16}, 4},
-	{{1|(6<<4)},    { 17.23*6,  16}, 0},
+	{{1|(6<<4)},    { 17.23*6,  16}, 4},
-    {{1|(5<<4)},    { 17.23*5,  16}, 0},
+    {{1|(5<<4)},    { 17.23*5,  16}, 4},
-    {{1|(4<<4)},    { 17.23*4,  16}, 0},
+    {{1|(4<<4)},    { 17.23*4,  16}, 4},
-    {{1|(3<<4)},    { 17.23*3,  16}, 0},
+    {{1|(3<<4)},    { 17.23*3,  16}, 4},
-    {{1|(2<<4)},    { 17.23*2,  16}, 0},
+    {{1|(2<<4)},    { 17.23*2,  16}, 4},
-    {{1|(1<<4)},    { 17.23*1,  16}, 0},
+    {{1|(1<<4)},    { 17.23*1,  16}, 4},
    {{1|(0<<4)},    { 17.23*0,  16}, 1},
 	{{2|(13<<4)},   {17.23*13,  32}, 1},
-    {{2|(11<<4)},   {17.23*11,  32}, 0},
+    {{2|(11<<4)},   {17.23*11,  32}, 4},
-    {{2|(10<<4)},   {17.23*10,  32}, 0},
+    {{2|(10<<4)},   {17.23*10,  32}, 4},
-    {{2|(9<<4)},    {17.23*9,  32}, 0},
+    {{2|(9<<4)},    {17.23*9,  32}, 4},
-    {{2|(8<<4)},    {17.23*8,  32}, 0},
+    {{2|(8<<4)},    {17.23*8,  32}, 4},
-    {{2|(7<<4)},    {17.23*7,  32}, 0},
+    {{2|(7<<4)},    {17.23*7,  32}, 4},
-	{{2|(6<<4)},    { 17.23*6,  32}, 0},
+	{{2|(6<<4)},    { 17.23*6,  32}, 4},
-    {{2|(5<<4)},    { 17.23*5,  32}, 0},
+    {{2|(5<<4)},    { 17.23*5,  32}, 4},
-    {{2|(4<<4)},    { 17.23*4,  32}, 0},
+    {{2|(4<<4)},    { 17.23*4,  32}, 4},
-    {{2|(3<<4)},    { 17.23*3,  32}, 0},
+    {{2|(3<<4)},    { 17.23*3,  32}, 4},
-    {{2|(2<<4)},    { 17.23*2,  32}, 0},
+    {{2|(2<<4)},    { 17.23*2,  32}, 4},
-    {{2|(1<<4)},    { 17.23*1,  32}, 0},
+    {{2|(1<<4)},    { 17.23*1,  32}, 4},
    {{2|(0<<4)},    { 17.23*0,  32}, 1},
 	{{3|(13<<4)},   {17.23*13,  48}, 1},
-    {{3|(11<<4)},   {17.23*11,  48}, 0},
+    {{3|(11<<4)},   {17.23*11,  48}, 4},
-    {{3|(10<<4)},   {17.23*10,  48}, 0},
+    {{3|(10<<4)},   {17.23*10,  48}, 4},
-    {{3|(9<<4)},    {17.23*9,  48}, 0},
+    {{3|(9<<4)},    {17.23*9,  48}, 4},
-    {{3|(8<<4)},    {17.23*8,  48}, 0},
+    {{3|(8<<4)},    {17.23*8,  48}, 4},
-    {{3|(7<<4)},    {17.23*7,  48}, 0},
+    {{3|(7<<4)},    {17.23*7,  48}, 4},
-	{{3|(6<<4)},    { 17.23*6,  48}, 0},
+	{{3|(6<<4)},    { 17.23*6,  48}, 4},
-    {{3|(5<<4)},    { 17.23*5,  48}, 0},
+    {{3|(5<<4)},    { 17.23*5,  48}, 4},
-    {{3|(4<<4)},    { 17.23*4,  48}, 0},
+    {{3|(4<<4)},    { 17.23*4,  48}, 4},
-    {{3|(3<<4)},    { 17.23*3,  48}, 0},
+    {{3|(3<<4)},    { 17.23*3,  48}, 4},
-    {{3|(2<<4)},    { 17.23*2,  48}, 0},
+    {{3|(2<<4)},    { 17.23*2,  48}, 4},
-    {{3|(1<<4)},    { 17.23*1,  48}, 0},
+    {{3|(1<<4)},    { 17.23*1,  48}, 4},
    {{3|(0<<4)},    { 17.23*0,  48}, 1},
 	{{4|(13<<4)},   {17.23*13,  64}, 1},
    {{4|(11<<4)},   {17.23*11,  64}, 1},
    {{4|(10<<4)},   {17.23*10,  64}, 1},
    {{4|(9<<4)},    {17.23*9,  64}, 1},
    {{4|(8<<4)},    {17.23*8,  64}, 1},
-    {{4|(5<<4)},    { 17.23*5,  64}, 0},
+    {{4|(5<<4)},    { 17.23*5,  64}, 4},
    {{4|(2<<4)},    { 17.23*2,  64}, 1},
    {{4|(1<<4)},    { 17.23*1,  64}, 1},
    {{4|(0<<4)},    { 17.23*0,  64}, 1},
@@ -42,10 +42,8 @@ void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue, bool def
  rgb_led led;
  for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
    led = g_rgb_leds[i];
-    if (led.matrix_co.raw < 0xFF) {
+    if (HAS_FLAGS(led.flags, LED_FLAG_MODIFIER)) {
-      if (led.modifier) {
+        rgb_matrix_set_color( i, red, green, blue );
          rgb_matrix_set_color( i, red, green, blue );
      }
    }
  }
 }
@@ -43,10 +43,8 @@ void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue, bool def
  rgb_led led;
  for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
    led = g_rgb_leds[i];
-    if (led.matrix_co.raw < 0xFF) {
+    if (HAS_FLAGS(led.flags, LED_FLAG_MODIFIER)) {
-      if (led.modifier) {
+        rgb_matrix_set_color( i, red, green, blue );
          rgb_matrix_set_color( i, red, green, blue );
      }
    }
  }
 }
@@ -43,10 +43,8 @@ void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue, bool def
  rgb_led led;
  for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
    led = g_rgb_leds[i];
-    if (led.matrix_co.raw < 0xFF) {
+    if (HAS_FLAGS(led.flags, LED_FLAG_MODIFIER)) {
-      if (led.modifier) {
+        rgb_matrix_set_color( i, red, green, blue );
          rgb_matrix_set_color( i, red, green, blue );
      }
    }
  }
 }
@@ -42,10 +42,8 @@ void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue, bool def
  rgb_led led;
  for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
    led = g_rgb_leds[i];
-    if (led.matrix_co.raw < 0xFF) {
+    if (HAS_FLAGS(led.flags, LED_FLAG_MODIFIER)) {
-      if (led.modifier) {
+        rgb_matrix_set_color( i, red, green, blue );
          rgb_matrix_set_color( i, red, green, blue );
      }
    }
  }
 }
@@ -57,10 +57,8 @@ void rgb_matrix_layer_helper(uint8_t red, uint8_t green, uint8_t blue, bool defa
 	for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
 		led = g_rgb_leds[i];
-		if (led.matrix_co.raw < 0xFF) {
+		if (HAS_FLAGS(led.flags, LED_FLAG_MODIFIER)) {
-			if (led.modifier) {
+				rgb_matrix_set_color( i, red, green, blue );
 				rgb_matrix_set_color(i, red, green, blue);
 			}
 		}
 	}
 }
@@ -269,64 +269,64 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
 };
-const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
+rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
    /*{row | col << 4}
      |             {x=0..224, y=0..64}
-      |              |                    modifier
+      |              |                    flags
      |              |                    | */
-    {{ 8|(0<<4)},   {17.2* 8, 12.8*0}, 0}, // LED 1 on right > Key 6
+    {{ 8|(0<<4)},   {17.2* 8, 12.8*0}, 4}, // LED 1 on right > Key 6
-    {{ 9|(0<<4)},   {17.2* 9, 12.8*0}, 0}, // LED 2 > Key 7
+    {{ 9|(0<<4)},   {17.2* 9, 12.8*0}, 4}, // LED 2 > Key 7
-    {{10|(0<<4)},   {17.2*10, 12.8*0}, 0}, // LED 3 > Key 8
+    {{10|(0<<4)},   {17.2*10, 12.8*0}, 4}, // LED 3 > Key 8
-    {{11|(0<<4)},   {17.2*11, 12.8*0}, 0}, // LED 4 > Key 9
+    {{11|(0<<4)},   {17.2*11, 12.8*0}, 4}, // LED 4 > Key 9
-    {{12|(0<<4)},   {17.2*12, 12.8*0}, 0}, // LED 5 > Key 0
+    {{12|(0<<4)},   {17.2*12, 12.8*0}, 4}, // LED 5 > Key 0
-    {{ 8|(1<<4)},   {17.2* 8, 12.8*1}, 0}, // LED 6
+    {{ 8|(1<<4)},   {17.2* 8, 12.8*1}, 4}, // LED 6
-    {{ 9|(1<<4)},   {17.2* 9, 12.8*1}, 0}, // LED 7
+    {{ 9|(1<<4)},   {17.2* 9, 12.8*1}, 4}, // LED 7
-    {{10|(1<<4)},   {17.2*10, 12.8*1}, 0}, // LED 8
+    {{10|(1<<4)},   {17.2*10, 12.8*1}, 4}, // LED 8
-    {{11|(1<<4)},   {17.2*11, 12.8*1}, 0}, // LED 9
+    {{11|(1<<4)},   {17.2*11, 12.8*1}, 4}, // LED 9
-    {{12|(1<<4)},   {17.2*12, 12.8*1}, 0}, // LED 10
+    {{12|(1<<4)},   {17.2*12, 12.8*1}, 4}, // LED 10
-    {{ 8|(2<<4)},   {17.2* 8, 12.8*2}, 0}, // LED 11
+    {{ 8|(2<<4)},   {17.2* 8, 12.8*2}, 4}, // LED 11
-    {{ 9|(2<<4)},   {17.2* 9, 12.8*2}, 0}, // LED 12
+    {{ 9|(2<<4)},   {17.2* 9, 12.8*2}, 4}, // LED 12
-    {{10|(2<<4)},   {17.2*10, 12.8*2}, 0}, // LED 13
+    {{10|(2<<4)},   {17.2*10, 12.8*2}, 4}, // LED 13
-    {{11|(2<<4)},   {17.2*11, 12.8*2}, 0}, // LED 14
+    {{11|(2<<4)},   {17.2*11, 12.8*2}, 4}, // LED 14
-    {{12|(2<<4)},   {17.2*12, 12.8*2}, 0}, // LED 15
+    {{12|(2<<4)},   {17.2*12, 12.8*2}, 4}, // LED 15
-    {{ 8|(3<<4)},   {17.2* 8, 12.8*3}, 0}, // LED 16
+    {{ 8|(3<<4)},   {17.2* 8, 12.8*3}, 4}, // LED 16
-    {{ 9|(3<<4)},   {17.2* 9, 12.8*3}, 0}, // LED 17
+    {{ 9|(3<<4)},   {17.2* 9, 12.8*3}, 4}, // LED 17
-    {{10|(3<<4)},   {17.2*10, 12.8*3}, 0}, // LED 18
+    {{10|(3<<4)},   {17.2*10, 12.8*3}, 4}, // LED 18
-    {{11|(3<<4)},   {17.2*11, 12.8*3}, 0}, // LED 19
+    {{11|(3<<4)},   {17.2*11, 12.8*3}, 4}, // LED 19
-    {{12|(3<<4)},   {17.2*12, 12.8*3}, 0}, // LED 20
+    {{12|(3<<4)},   {17.2*12, 12.8*3}, 4}, // LED 20
    {{ 9|(4<<4)},   {17.2* 9, 12.8*4}, 1}, // LED 21
    {{10|(4<<4)},   {17.2*10, 12.8*4}, 1}, // LED 22
    {{11|(4<<4)},   {17.2*11, 12.8*4}, 1}, // LED 23
    {{12|(4<<4)},   {17.2*12, 12.8*4}, 1}, // LED 24
-    {{ 5|(0<<4)},   {17.2* 5, 12.8*0}, 0}, // LED 1 on left > Key 5
+    {{ 5|(0<<4)},   {17.2* 5, 12.8*0}, 4}, // LED 1 on left > Key 5
-    {{ 4|(0<<4)},   {17.2* 4, 12.8*0}, 0}, // LED 2 > Key 4
+    {{ 4|(0<<4)},   {17.2* 4, 12.8*0}, 4}, // LED 2 > Key 4
-    {{ 3|(0<<4)},   {17.2* 3, 12.8*0}, 0}, // LED 3 > Key 3
+    {{ 3|(0<<4)},   {17.2* 3, 12.8*0}, 4}, // LED 3 > Key 3
-    {{ 2|(0<<4)},   {17.2* 2, 12.8*0}, 0}, // LED 4 > Key 2
+    {{ 2|(0<<4)},   {17.2* 2, 12.8*0}, 4}, // LED 4 > Key 2
-    {{ 1|(0<<4)},   {17.2* 1, 12.8*0}, 0}, // LED 5 > Key 1
+    {{ 1|(0<<4)},   {17.2* 1, 12.8*0}, 4}, // LED 5 > Key 1
-    {{ 5|(1<<4)},   {17.2* 5, 12.8*1}, 0}, // LED 6
+    {{ 5|(1<<4)},   {17.2* 5, 12.8*1}, 4}, // LED 6
-    {{ 4|(1<<4)},   {17.2* 4, 12.8*1}, 0}, // LED 7
+    {{ 4|(1<<4)},   {17.2* 4, 12.8*1}, 4}, // LED 7
-    {{ 3|(1<<4)},   {17.2* 3, 12.8*1}, 0}, // LED 8
+    {{ 3|(1<<4)},   {17.2* 3, 12.8*1}, 4}, // LED 8
-    {{ 2|(1<<4)},   {17.2* 2, 12.8*1}, 0}, // LED 9
+    {{ 2|(1<<4)},   {17.2* 2, 12.8*1}, 4}, // LED 9
-    {{ 1|(1<<4)},   {17.2* 1, 12.8*1}, 0}, // LED 10
+    {{ 1|(1<<4)},   {17.2* 1, 12.8*1}, 4}, // LED 10
-    {{ 5|(2<<4)},   {17.2* 5, 12.8*2}, 0}, // LED 11
+    {{ 5|(2<<4)},   {17.2* 5, 12.8*2}, 4}, // LED 11
-    {{ 4|(2<<4)},   {17.2* 4, 12.8*2}, 0}, // LED 12
+    {{ 4|(2<<4)},   {17.2* 4, 12.8*2}, 4}, // LED 12
-    {{ 3|(2<<4)},   {17.2* 3, 12.8*2}, 0}, // LED 13
+    {{ 3|(2<<4)},   {17.2* 3, 12.8*2}, 4}, // LED 13
-    {{ 2|(2<<4)},   {17.2* 2, 12.8*2}, 0}, // LED 14
+    {{ 2|(2<<4)},   {17.2* 2, 12.8*2}, 4}, // LED 14
-    {{ 1|(2<<4)},   {17.2* 1, 12.8*2}, 0}, // LED 15
+    {{ 1|(2<<4)},   {17.2* 1, 12.8*2}, 4}, // LED 15
-    {{ 5|(3<<4)},   {17.2* 5, 12.8*3}, 0}, // LED 16
+    {{ 5|(3<<4)},   {17.2* 5, 12.8*3}, 4}, // LED 16
-    {{ 4|(3<<4)},   {17.2* 4, 12.8*3}, 0}, // LED 17
+    {{ 4|(3<<4)},   {17.2* 4, 12.8*3}, 4}, // LED 17
-    {{ 3|(3<<4)},   {17.2* 3, 12.8*3}, 0}, // LED 18
+    {{ 3|(3<<4)},   {17.2* 3, 12.8*3}, 4}, // LED 18
-    {{ 2|(3<<4)},   {17.2* 2, 12.8*3}, 0}, // LED 19
+    {{ 2|(3<<4)},   {17.2* 2, 12.8*3}, 4}, // LED 19
-    {{ 1|(3<<4)},   {17.2* 1, 12.8*3}, 0}, // LED 20
+    {{ 1|(3<<4)},   {17.2* 1, 12.8*3}, 4}, // LED 20
    {{ 4|(4<<4)},   {17.2* 4, 12.8*4}, 1}, // LED 21
    {{ 3|(4<<4)},   {17.2* 3, 12.8*4}, 1}, // LED 22
@@ -114,80 +114,80 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
    {0, E_16,   D_16,   F_16},
    {0, B_16,   A_16,   C_16},
 };
-const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
+rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
 /* {row | col << 4}
 *    |           {x=0..224, y=0..64}
- *    |              |            modifier
+ *    |              |            flags
 *    |              |         | */
 //cs1
    {{0|(0<<4)},    {  0,  0}, 1},
-    {{0|(1<<4)},    { 17,  0}, 0},
+    {{0|(1<<4)},    { 17,  0}, 4},
    {{1|(0<<4)},    {  0, 16}, 1},
    {{2|(0<<4)},    {  0, 32}, 1},
 //cs2
-    {{0|(2<<4)},    { 34,  0}, 0},
+    {{0|(2<<4)},    { 34,  0}, 4},
-    {{0|(3<<4)},    { 51,  0}, 0},
+    {{0|(3<<4)},    { 51,  0}, 4},
-    {{1|(1<<4)},    { 17, 16}, 0},
+    {{1|(1<<4)},    { 17, 16}, 4},
-    {{1|(2<<4)},    { 34, 16}, 0},
+    {{1|(2<<4)},    { 34, 16}, 4},
 //cs3
-    {{2|(1<<4)},    { 17, 32}, 0},
+    {{2|(1<<4)},    { 17, 32}, 4},
-    {{2|(2<<4)},    { 34, 32}, 0},
+    {{2|(2<<4)},    { 34, 32}, 4},
-    {{3|(1<<4)},    { 17, 48}, 0},
+    {{3|(1<<4)},    { 17, 48}, 4},
-    {{3|(2<<4)},    { 34, 48}, 0},
+    {{3|(2<<4)},    { 34, 48}, 4},
 //cs4
-    {{0|(4<<4)},    { 68,  0}, 0},
+    {{0|(4<<4)},    { 68,  0}, 4},
-    {{0|(5<<4)},    { 85,  0}, 0},
+    {{0|(5<<4)},    { 85,  0}, 4},
-    {{1|(3<<4)},    { 51, 16}, 0},
+    {{1|(3<<4)},    { 51, 16}, 4},
-    {{1|(4<<4)},    { 68, 16}, 0},
+    {{1|(4<<4)},    { 68, 16}, 4},
 //cs5
-    {{0|(11<<4)},   {187,  0}, 0},
+    {{0|(11<<4)},   {187,  0}, 4},
-    {{0|(12<<4)},   {204,  0}, 0},
+    {{0|(12<<4)},   {204,  0}, 4},
-    {{1|(11<<4)},   {187, 16}, 0},
+    {{1|(11<<4)},   {187, 16}, 4},
-    {{1|(12<<4)},   {204, 16}, 0},
+    {{1|(12<<4)},   {204, 16}, 4},
 //cs6
-    {{0|(7<<4)},    {119,  0}, 0},
+    {{0|(7<<4)},    {119,  0}, 4},
-    {{0|(8<<4)},    {136,  0}, 0},
+    {{0|(8<<4)},    {136,  0}, 4},
-    {{1|(7<<4)},    {119, 16}, 0},
+    {{1|(7<<4)},    {119, 16}, 4},
-    {{1|(8<<4)},    {136, 16}, 0},
+    {{1|(8<<4)},    {136, 16}, 4},
 //cs7
-    {{0|(9<<4)},    {153,  0}, 0},
+    {{0|(9<<4)},    {153,  0}, 4},
-    {{0|(10<<4)},   {170,  0}, 0},
+    {{0|(10<<4)},   {170,  0}, 4},
-    {{1|(9<<4)},    {153, 16}, 0},
+    {{1|(9<<4)},    {153, 16}, 4},
-    {{1|(10<<4)},   {170, 16}, 0},
+    {{1|(10<<4)},   {170, 16}, 4},
 //cs8
-    {{0|(13<<4)},   {221,  0}, 0},
+    {{0|(13<<4)},   {221,  0}, 4},
-    {{0|(14<<4)},   {221,  0}, 0},
+    {{0|(14<<4)},   {221,  0}, 4},
    {{1|(13<<4)},   {221, 32}, 1},
    {{2|(12<<4)},   {221, 16}, 1},
 //cs9
-    {{2|(3<<4)},    { 51, 32}, 0},
+    {{2|(3<<4)},    { 51, 32}, 4},
-    {{2|(4<<4)},    { 68, 32}, 0},
+    {{2|(4<<4)},    { 68, 32}, 4},
-    {{3|(3<<4)},    { 51, 48}, 0},
+    {{3|(3<<4)},    { 51, 48}, 4},
-    {{3|(4<<4)},    { 68, 48}, 0},
+    {{3|(4<<4)},    { 68, 48}, 4},
 //cs10
-    {{0|(6<<4)},    {102,  0}, 0},
+    {{0|(6<<4)},    {102,  0}, 4},
-    {{1|(5<<4)},    { 85, 16}, 0},
+    {{1|(5<<4)},    { 85, 16}, 4},
-    {{1|(6<<4)},    {102, 16}, 0},
+    {{1|(6<<4)},    {102, 16}, 4},
-    {{2|(5<<4)},    { 85, 32}, 0},
+    {{2|(5<<4)},    { 85, 32}, 4},
 //cs11
-    {{2|(6<<4)},    {102, 32}, 0},
+    {{2|(6<<4)},    {102, 32}, 4},
-    {{3|(5<<4)},    { 85, 48}, 0},
+    {{3|(5<<4)},    { 85, 48}, 4},
-    {{3|(6<<4)},    {102, 48}, 0},
+    {{3|(6<<4)},    {102, 48}, 4},
-    {{4|(5<<4)},    {102, 64}, 0},
+    {{4|(5<<4)},    {102, 64}, 4},
 //cs12
-    {{2|(7<<4)},    {119, 32}, 0},
+    {{2|(7<<4)},    {119, 32}, 4},
-    {{2|(8<<4)},    {136, 32}, 0},
+    {{2|(8<<4)},    {136, 32}, 4},
-    {{3|(7<<4)},    {119, 48}, 0},
+    {{3|(7<<4)},    {119, 48}, 4},
-    {{3|(8<<4)},    {136, 48}, 0},
+    {{3|(8<<4)},    {136, 48}, 4},
 //cs13
-    {{2|(9<<4)},    {153, 32}, 0},
+    {{2|(9<<4)},    {153, 32}, 4},
-    {{2|(10<<4)},   {170, 32}, 0},
+    {{2|(10<<4)},   {170, 32}, 4},
-    {{3|(9<<4)},    {153, 48}, 0},
+    {{3|(9<<4)},    {153, 48}, 4},
    {{4|(6<<4)},    {136, 48}, 1},
 //cs14
-    {{2|(11<<4)},   {187, 32}, 0},
+    {{2|(11<<4)},   {187, 32}, 4},
-    {{3|(10<<4)},   {170, 48}, 0},
+    {{3|(10<<4)},   {170, 48}, 4},
    {{3|(11<<4)},   {187, 48}, 1},
    {{4|(7<<4)},    {153, 48}, 1},
 //cs15
@@ -0,0 +1,174 @@
 /* Good on you for modifying your layout! if you don't have
 * time to read the QMK docs, a list of keycodes can be found at
 *
 * https://github.com/qmk/qmk_firmware/blob/master/docs/keycodes.md
 *
 * There's also a template for adding new layers at the bottom of this file!
 */
 #include QMK_KEYBOARD_H
 #define IGNORE_MOD_TAP_INTERRUPT
 #define BASE 0 // default layer
 #define SYMB 1 // symbols
 #define NUMB 2 // numbers/motion
 enum custom_keycodes {
  M1_STRING = SAFE_RANGE,
  M2_URL,
 };
 // Blank template at the bottom
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* Keymap 0: Basic layer
 *
 *       ,-------------------------------------------.                         ,-------------------------------------------.
 *       |  TAB   |   Q  |   W  |   F  |   P  |   G  |                         |   J  |   L  |   U  |   Y  | ; :  |  | \   |
 *       |--------+------+------+------+------+------|------.           .------|------+------+------+------+------+--------|
 *       |  Ctrl  |   A  |   R  |  S   |   T  |   D  |O(CMD)|           |O(CTL)|   H  |   N  |   E  |   I  |  O   |  ' "   |
 *       |--------+------+------+------+------+------|------|           |------|------+------+------+------+------+--------|
 *       | LShift |   Z  |   X  |   C  |   V  |   B  |O(ALT)|           |      |   K  |   M  | ,  < | . >  | /  ? | RShift |
 *       `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
 *                          .----------.   .-------.                                 .------.   .--------.
 *                          | alt/del  |   | BKSP  |                                 | Space|   |cmd/del |
 *                          '----------'   '-------'                                 `------.   '--------'
 *                                              ,-------.                      ,-------.
 *                                              | MMB   |                      |  :    |
 *                                       ,------|-------|                      |-------|------.
 *                                       | NUMB | SYMB  |                      | SYMB  | NUMB |
 *                                       |  Esc |  F13  |                      | F14   | Enter|
 *                                       |      |       |                      |       |      |
 *                                       `--------------'                      `--------------'
 */
 [BASE] = LAYOUT_gergo(
 KC_TAB,               KC_Q,  KC_W,   KC_F,   KC_P, KC_G,                                       KC_J,  KC_L,  KC_U,  KC_Y,KC_SCLN,  KC_BSLS,
 KC_LCTL,              KC_A,  KC_R,   KC_S,   KC_T, KC_D, OSM(MOD_LGUI),       OSM(MOD_LCTL),   KC_H,  KC_N,  KC_E,  KC_I, KC_O, KC_QUOT,
 KC_LSFT,              KC_Z,  KC_X,   KC_C,   KC_V, KC_B, OSM(MOD_LALT),       KC_TRNS,         KC_K, KC_M,  KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
                                     ALT_T(KC_DEL), KC_BSPC,                           KC_SPC, CMD_T(KC_DEL),
                                                         KC_BTN3,       KC_COLON,
                                LT(SYMB, KC_ESC), LT(NUMB, KC_F13),     LT(NUMB, KC_F14), LT(SYMB, KC_ENT)),
 /* Keymap 1: Symbols layer
 *
 * ,-------------------------------------------.                         ,-------------------------------------------.
 * |        |  !   |  @   |  #   |  $   |  %   |                         |   ^  |  &   |  *   |  (   |  )   |  VolUp |
 * |--------+------+------+------+------+------|------.           .------|------+------+------+------+------+--------|
 * |        |  [   |  ]   |  {   |  }   |  `   |  M1  |           |      |      |  -   |  _   |  +   |  =   |  VolDn |
 * |--------+------+------+------+------+------|------|           |------|------+------+------+------+------+--------|
 * |        |  `   |  ~   |      |      |  ~   |  M2  |           |      |      |      | Prev |Pl/Pau| Next |  Mute  |
 * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
 *                        .------.   .------.                                 .------.   .-----.
 *                        |      |   |      |                                 |      |   |     |
 *                        '------'   '------'                                 `------.   '-----'
 *                                        ,-------.                     ,-------.
 *                                        |       |                     |       |
 *                                 ,------|-------|                     |-------|------.
 *                                 |      |       |                     |       |      |
 *                                 |      |       |                     |       |      |
 *                                 |      |       |                     |       |      |
 *                                 `--------------'                     `--------------'
 */
 [SYMB] = LAYOUT_gergo(
 KC_TRNS, KC_EXLM, KC_AT,  KC_HASH,KC_DLR, KC_PERC,                         KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC__VOLUP,
 KC_TRNS, KC_LBRC, KC_RBRC, KC_LCBR,KC_RCBR, KC_PLUS, M1_STRING,             KC_TRNS,  KC_TRNS, KC_MINS, KC_UNDERSCORE, KC_PLUS, KC_EQL, KC__VOLDOWN,
 KC_TRNS, KC_GRV, KC_TILD,KC_TRNS,KC_TRNS, KC_EQL, M2_URL,                 KC_TRNS,  KC_TRNS, KC_TRNS,  KC_MEDIA_REWIND, KC_MEDIA_PLAY_PAUSE,  KC_MEDIA_FAST_FORWARD, KC__MUTE,
                                                  KC_TRNS, KC_TRNS,       KC_TRNS, KC_TRNS,
                                                           KC_TRNS,       KC_TRNS,
                                             	  KC_TRNS, KC_TRNS,        KC_TRNS, KC_TRNS),
 /* Keymap 2: Pad/Function layer
 *
 * ,-------------------------------------------.                         ,-------------------------------------------.
 * |        |   1  |  2   |  3   |  4   |  5   |                         |  6   |  7   |  8   |  9   |  0   | PgUp   |
 * |--------+------+------+------+------+------|------.           .------|------+------+------+------+------+--------|
 * |  F1    |  F2  | F3   | F4   | F5   | F6   | BTN1 |           | Home | LEFT | DOWN |  UP  | RIGHT| End  | PgDn   |
 * |--------+------+------+------+------+------|------|           |------|------+------+------+------+------+--------|
 * |  F7    |  F8  | F9   | F10  | F11  | F12  | BTN2 |           |      | MLFT | MDWN | MUP  | MRGHT|      |        |
 * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
 *                        .------.   .------.                                 .------.   .-----.
 *                        |      |   |      |                                 |  ALT |   |     |
 *                        '------'   '------'                                 `------.   '-----'
 *                                        ,-------.                     ,-------.
 *                                        |       |                     |       |
 *                                 ,------|-------|                     |-------|------.
 *                                 |      |       |                     |       |      |
 *                                 |      |       |                     |       |      |
 *                                 |      |       |                     |       |      |
 *                                 `--------------'                     `--------------'
 */
 [NUMB] = LAYOUT_gergo(
 KC_TRNS, KC_1, 	  KC_2,    KC_3,    KC_4,    KC_5,                             KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_PGUP,
 KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6, KC_BTN1,         KC_HOME,  KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_END, KC_PGDN,
 KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, KC_BTN2,        KC_TRNS,  KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_TRNS, KC_TRNS,
                                                  KC_TRNS, KC_TRNS,       KC_RALT, KC_TRNS,
                                                           KC_TRNS,       KC_TRNS,
                                             	  KC_TRNS, KC_TRNS,       KC_TRNS, KC_TRNS)
 };
 /* Keymap template
 *
 * ,-------------------------------------------.                         ,-------------------------------------------.
 * |        |      |      |      |      |      |                         |      |      |      |      |      |        |
 * |--------+------+------+------+------+------|------.           .------|------+------+------+------+------+--------|
 * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
 * |--------+------+------+------+------+------|------|           |------|------+------+------+------+------+--------|
 * |        |      |      |      |      |      |      |           |      |      |      |      |      |      |        |
 * `--------+------+------+------+------+-------------'           `-------------+------+------+------+------+--------'
 *                        .------.   .------.                                 .------.   .-----.
 *                        |      |   |      |                                 |      |   |     |
 *                        '------'   '------'                                 `------.   '-----'
 *                                        ,-------.       ,-------.
 *                                        |       |       |       |
 *                                 ,------|-------|       |-------|------.
 *                                 |      |       |       |       |      |
 *                                 |      |       |       |       |      |
 *                                 |      |       |       |       |      |
 *                                 `--------------'       `--------------'
 [SYMB] = LAYOUT_gergo(
 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,       KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS,
                                                  KC_TRNS, KC_TRNS,       KC_TRNS, KC_TRNS,
                                                           KC_TRNS,       KC_TRNS,
                                             	  KC_TRNS, KC_TRNS,       KC_TRNS, KC_TRNS),
 */
 // Runs just one time when the keyboard initializes.
 void matrix_init_user(void) {
 };
 // Runs constantly in the background, in a loop.
 void matrix_scan_user(void) {
    //uint8_t layer = biton32(layer_state);
    biton32(layer_state);
 };
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  switch (keycode) {
    case M1_STRING:
      if (record->event.pressed) {
        // when keycode QMKBEST is pressed
        SEND_STRING("Hi!" SS_TAP(X_ENTER));
      } else {
        // when keycode QMKBEST is released
      }
      break;
    case M2_URL:
      if (record->event.pressed) {
          SEND_STRING("https://ddg.gg" SS_TAP(X_ENTER));
      }
      break;
  }
  return true;
 };
@@ -0,0 +1,16 @@
 # [Gergo! By g Heavy Industries](http://gboards.ca)
 ![Gergo image](https://4.bp.blogspot.com/-889nMXxgSM0/XCNxwnO5kUI/AAAAAAAA6mI/tZbWgZVCBW0dyZOCGJDkjN06DVax7j8XwCLcBGAs/s1600/48422820_967732713413298_485744639215665152_n.jpg)
 This is a [Colemak](https://colemak.com/) mapping for the Gergo, 
 Unlike the default mapping, most symbols are at their original place on the number row to ease in the
 learning curve.
 You can view this layout over at
 [keyboad-layout-editor.com](http://www.keyboard-layout-editor.com/#/gists/f04d6a3b0cd3db91407c51f7ba36aeb3).
 ## Settings
 To edit various settings, enable the 1u trackball and whatnot please modify /keyboards/gergo/keymaps/default/rules.mk
 Ideally you should copy this directory and make your changes there. If you come up with a good layout submit a PR!
@@ -0,0 +1,36 @@
 #----------------------------------------------------------------------------
 # make gergo:germ:dfu
 # Make sure you have dfu-programmer installed!
 #----------------------------------------------------------------------------
 # Firmware options
 BALLER = no 			# Enable to ball out
 BALLSTEP = 20  			# Multiple in px to move, multiplied by layer number
 SCROLLSTEP = 1 			# Lines to scroll with ball
 MOUSEKEY_ENABLE = yes  		# Mouse keys(+4700), needed for baller
 #Debug options
 VERBOSE 		 = no
 DEBUG_MATRIX_SCAN_RATE   = no
 DEBUG_BALLER 		 = no
 DEBUG_MATRIX		 = no
 # A bunch of stuff that you shouldn't touch unless you
 # know what you're doing.
 #
 # No touchy, capiche?
 SRC += matrix.c i2c_master.c
 ifneq ($(strip $(BALLSTEP)),)
    OPT_DEFS += -DTRKSTEP=$(strip $(BALLSTEP))
 endif
 ifneq ($(strip $(SCROLLSTEP)),)
    OPT_DEFS += -DSCROLLSTEP=$(strip $(SCROLLSTEP))
 endif
 ifeq ($(strip $(BALLER)), yes)
    OPT_DEFS += -DBALLER
 endif
 ifeq ($(strip $(DEBUG_BALLER)), yes)
    OPT_DEFS += -DDEBUG_BALLER
 endif
 ifeq ($(strip $(DEBUG_MATRIX)), yes)
    OPT_DEFS += -DDEBUG_MATRIX
 endif
@@ -3,7 +3,7 @@
 # Make sure you have dfu-programmer installed!
 #----------------------------------------------------------------------------
 # Firmware options
-BALLER = yes 			# Enable to ball out
+BALLER = no 			# Enable to ball out
 BALLSTEP = 20  			# Multiple in px to move, multiplied by layer number
 SCROLLSTEP = 1 			# Lines to scroll with ball
 MOUSEKEY_ENABLE = yes  		# Mouse keys(+4700), needed for baller
@@ -26,6 +26,7 @@ ifneq ($(strip $(SCROLLSTEP)),)
    OPT_DEFS += -DSCROLLSTEP=$(strip $(SCROLLSTEP))
 endif
 ifeq ($(strip $(BALLER)), yes)
 	POINTING_DEVICE_ENABLE	= yes
    OPT_DEFS += -DBALLER
 endif
 ifeq ($(strip $(DEBUG_BALLER)), yes)
@@ -27,6 +27,7 @@ ifneq ($(strip $(SCROLLSTEP)),)
 endif
 ifeq ($(strip $(BALLER)), yes)
    OPT_DEFS += -DBALLER
 	POINTING_DEVICE_ENABLE = yes
 endif
 ifeq ($(strip $(DEBUG_BALLER)), yes)
    OPT_DEFS += -DDEBUG_BALLER
@@ -30,7 +30,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "debug.h"
 #include "util.h"
 #include "debounce.h"
 #include "pointing_device.h"
 #include QMK_KEYBOARD_H
 #ifdef DEBUG_MATRIX_SCAN_RATE
 #   include  "timer.h"
@@ -38,6 +37,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifdef BALLER
 #include <avr/interrupt.h>
 #include "pointing_device.h"
 #endif
 #ifndef DEBOUNCE
@@ -14,7 +14,6 @@ BOOTLOADER = atmel-dfu
 F_USB = $(F_CPU)
 CUSTOM_MATRIX 		= yes
 POINTING_DEVICE_ENABLE	= yes
 EXTRAKEY_ENABLE		= yes
 CONSOLE_ENABLE  	= yes
 COMMAND_ENABLE		= yes
@@ -1,47 +0,0 @@
 /* Copyright 2018 Josh Hinnebusch
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #ifndef H87A_H
 #define H87A_H
 #include "quantum.h"
 // This a shortcut to help you visually see your layout.
 // The following is an example using the Planck MIT layout
 // The first section contains all of the arguments
 // The second converts the arguments into a two-dimensional array
 #define LAYOUT_all(\
 	K000,       K001, K011, K002, K012,    K003, K013, K004, K014,    K015, K006, K016, K007,    K017, K008, K018,  \
 	K020, K030, K021, K031, K022, K032, K023, K033, K024, K034, K025, K035, K026, K036, K027,    K037, K028, K038,  \
 	K040, K050, K041, K051, K042, K052, K043, K053, K044, K054, K045, K055, K046, K056,                K057, K048, K058,  \
 	K060, K070, K061, K071, K062, K072, K063, K073, K064, K074, K065, K075, K066, K076,                             \
 	K080, K090, K081, K091, K082, K092, K083, K093, K084, K094, K085, K095, K086, K096,                K088,        \
 	K100, K110, K101,                   K113,                   K105, K115, K106, K116,          K117, K108, K118   \
 ) { \
 	{ K000,  K001,  K002,  K003,  K004,  KC_NO, K006,  K007,  K008 }, \
 	{ KC_NO, K011,  K012,  K013,  K014,  K015,  K016,  K017,  K018 }, \
 	{ K020,  K021,  K022,  K023,  K024,  K025,  K026,  K027,  K028 }, \
 	{ K030,  K031,  K032,  K033,  K034,  K035,  K036,  K037,  K038 }, \
 	{ K040,  K041,  K042,  K043,  K044,  K045,  K046,  KC_NO, K048 }, \
 	{ K050,  K051,  K052,  K053,  K054,  K055,  K056,  K057,  K058 }, \
 	{ K060,  K061,  K062,  K063,  K064,  K065,  K066,  KC_NO, KC_NO }, \
 	{ K070,  K071,  K072,  K073,  K074,  K075,  K076,  KC_NO, KC_NO }, \
 	{ K080,  K081,  K082,  K083,  K084,  K085,  K086,  KC_NO, K088 }, \
 	{ K090,  K091,  K092,  K093,  K094,  K095,  K096,  KC_NO, KC_NO }, \
 	{ K100,  K101,  KC_NO, KC_NO, KC_NO, K105,  K106,  KC_NO, K108 }, \
 	{ K110,  KC_NO, KC_NO, K113,  KC_NO, K115,  K116,  K117,  K118 }  \
 }
 #endif
@@ -1,12 +0,0 @@
 {
    "keyboard_name": "h87a", 
    "url": "", 
    "maintainer": "hineybush", 
    "width": 18.25, 
    "height": 6.5, 
    "layouts": {
        "LAYOUT_all": {
            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"x":13, "y":1.5}, {"x":14, "y":1.5}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Home", "x":16.25, "y":1.5}, {"label":"PgUp", "x":17.25, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"|", "x":13.5, "y":2.5, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"x":12.75, "y":3.5}, {"label":"Enter", "x":13.75, "y":3.5, "w":1.25}, {"label":"Shift", "x":0, "y":4.5, "w":1.25}, {"x":1.25, "y":4.5}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":1.75}, {"x":14, "y":4.5}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"label":"Alt", "x":10, "y":5.5, "w":1.25}, {"label":"Win", "x":11.25, "y":5.5, "w":1.25}, {"label":"Menu", "x":12.5, "y":5.5, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}]
        }
    }
 }
@@ -21,21 +21,21 @@
 #ifdef RGB_MATRIX_ENABLE
 #include "rgblight.h"
-const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
+rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
  /*{row | col << 4}
    |             {x=0..224, y=0..64}
    |              |         modifier
    |              |         | */
-  {{1|(13<<4)},   {195, 3},  0},
+  {{1|(13<<4)},   {195, 3},  4},
-  {{4|(13<<4)},   {195, 16}, 0},
+  {{4|(13<<4)},   {195, 16}, 4},
-  {{4|(10<<4)},   {150, 16}, 0},
+  {{4|(10<<4)},   {150, 16}, 4},
-  {{4|(7<<4)},    {105, 16}, 0},
+  {{4|(7<<4)},    {105, 16}, 4},
-  {{4|(4<<4)},    {60,  16}, 0},
+  {{4|(4<<4)},    {60,  16}, 4},
-  {{4|(1<<4)},    {15,  16}, 0},
+  {{4|(1<<4)},    {15,  16}, 4},
-  {{1|(1<<4)},    {15,  3},  0},
+  {{1|(1<<4)},    {15,  3},  4},
-  {{1|(4<<4)},    {60,  3},  0},
+  {{1|(4<<4)},    {60,  3},  4},
-  {{1|(7<<4)},    {105, 3},  0},
+  {{1|(7<<4)},    {105, 3},  4},
-  {{1|(10<<4)},   {150, 3},  0}
+  {{1|(10<<4)},   {150, 3},  4}
 };
 #endif
@@ -72,4 +72,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_SLEEP // RGB will turn off when PC is put to sleep
 #endif
@@ -0,0 +1,90 @@
 /* Copyright 2018 Josh Hinnebusch
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 #include "quantum.h"
 // This a shortcut to help you visually see your layout.
 // The following is an example using the Planck MIT layout
 // The first section contains all of the arguments
 // The second converts the arguments into a two-dimensional array
 #define LAYOUT_all(\
 	K000,       K001, K011, K002, K012,    K003, K013, K004, K014,    K015, K006, K016, K007,    K017, K008, K018,  \
 	K020, K030, K021, K031, K022, K032, K023, K033, K024, K034, K025, K035, K026, K036, K027,    K037, K028, K038,  \
 	K040, K050, K041, K051, K042, K052, K043, K053, K044, K054, K045, K055, K046, K056,          K057, K048, K058,  \
 	K060, K070, K061, K071, K062, K072, K063, K073, K064, K074, K065, K075, K066, K076,                             \
 	K080, K090, K081, K091, K082, K092, K083, K093, K084, K094, K085, K095, K086, K096,                K088,        \
 	K100, K110, K101,                   K113,                   K105, K115, K106, K116,          K117, K108, K118   \
 ) { \
 	{ K000,  K001,  K002,  K003,  K004,  KC_NO, K006,  K007,  K008 }, \
 	{ KC_NO, K011,  K012,  K013,  K014,  K015,  K016,  K017,  K018 }, \
 	{ K020,  K021,  K022,  K023,  K024,  K025,  K026,  K027,  K028 }, \
 	{ K030,  K031,  K032,  K033,  K034,  K035,  K036,  K037,  K038 }, \
 	{ K040,  K041,  K042,  K043,  K044,  K045,  K046,  KC_NO, K048 }, \
 	{ K050,  K051,  K052,  K053,  K054,  K055,  K056,  K057,  K058 }, \
 	{ K060,  K061,  K062,  K063,  K064,  K065,  K066,  KC_NO, KC_NO }, \
 	{ K070,  K071,  K072,  K073,  K074,  K075,  K076,  KC_NO, KC_NO }, \
 	{ K080,  K081,  K082,  K083,  K084,  K085,  K086,  KC_NO, K088 }, \
 	{ K090,  K091,  K092,  K093,  K094,  K095,  K096,  KC_NO, KC_NO }, \
 	{ K100,  K101,  KC_NO, KC_NO, KC_NO, K105,  K106,  KC_NO, K108 }, \
 	{ K110,  KC_NO, KC_NO, K113,  KC_NO, K115,  K116,  K117,  K118 }  \
 }
 #define LAYOUT_tkl_ansi(\
 	K000,       K001, K011, K002, K012,    K003, K013, K004, K014,    K015, K006, K016, K007,    K017, K008, K018,  \
 	K020, K030, K021, K031, K022, K032, K023, K033, K024, K034, K025, K035, K026, K027,          K037, K028, K038,  \
 	K040, K050, K041, K051, K042, K052, K043, K053, K044, K054, K045, K055, K046, K056,          K057, K048, K058,  \
 	K060, K070, K061, K071, K062, K072, K063, K073, K064, K074, K065, K075,  K076,                                  \
 	K080,     K081, K091, K082, K092, K083, K093, K084, K094, K085, K095,      K086,                   K088,        \
 	K100, K110, K101,                   K113,                   K105, K115, K106, K116,          K117, K108, K118   \
 ) { \
 	{ K000,  K001,  K002,  K003,  K004,  KC_NO, K006,  K007,  K008 }, \
 	{ KC_NO, K011,  K012,  K013,  K014,  K015,  K016,  K017,  K018 }, \
 	{ K020,  K021,  K022,  K023,  K024,  K025,  K026,  K027,  K028 }, \
 	{ K030,  K031,  K032,  K033,  K034,  K035, KC_NO,  K037,  K038 }, \
 	{ K040,  K041,  K042,  K043,  K044,  K045,  K046,  KC_NO, K048 }, \
 	{ K050,  K051,  K052,  K053,  K054,  K055,  K056,  K057,  K058 }, \
 	{ K060,  K061,  K062,  K063,  K064,  K065, KC_NO,  KC_NO, KC_NO }, \
 	{ K070,  K071,  K072,  K073,  K074,  K075,  K076,  KC_NO, KC_NO }, \
 	{ K080,  K081,  K082,  K083,  K084,  K085,  K086,  KC_NO, K088 }, \
 	{KC_NO,  K091,  K092,  K093,  K094,  K095, KC_NO,  KC_NO, KC_NO }, \
 	{ K100,  K101,  KC_NO, KC_NO, KC_NO, K105,  K106,  KC_NO, K108 }, \
 	{ K110,  KC_NO, KC_NO, K113,  KC_NO, K115,  K116,  K117,  K118 }  \
 }
 #define LAYOUT_tkl_ansi_wkl(\
 	K000,       K001, K011, K002, K012,    K003, K013, K004, K014,    K015, K006, K016, K007,    K017, K008, K018,  \
 	K020, K030, K021, K031, K022, K032, K023, K033, K024, K034, K025, K035, K026, K027,          K037, K028, K038,  \
 	K040, K050, K041, K051, K042, K052, K043, K053, K044, K054, K045, K055, K046, K056,          K057, K048, K058,  \
 	K060, K070, K061, K071, K062, K072, K063, K073, K064, K074, K065, K075,  K076,                                  \
 	K080,     K081, K091, K082, K092, K083, K093, K084, K094, K085, K095,      K086,                   K088,        \
 	K100,       K101,                   K113,                         K115,       K116,          K117, K108, K118   \
 ) { \
 	{ K000,  K001,  K002,  K003,  K004,  KC_NO, K006,  K007,  K008 }, \
 	{ KC_NO, K011,  K012,  K013,  K014,  K015,  K016,  K017,  K018 }, \
 	{ K020,  K021,  K022,  K023,  K024,  K025,  K026,  K027,  K028 }, \
 	{ K030,  K031,  K032,  K033,  K034,  K035, KC_NO,  K037,  K038 }, \
 	{ K040,  K041,  K042,  K043,  K044,  K045,  K046,  KC_NO, K048 }, \
 	{ K050,  K051,  K052,  K053,  K054,  K055,  K056,  K057,  K058 }, \
 	{ K060,  K061,  K062,  K063,  K064,  K065, KC_NO,  KC_NO, KC_NO }, \
 	{ K070,  K071,  K072,  K073,  K074,  K075,  K076,  KC_NO, KC_NO }, \
 	{ K080,  K081,  K082,  K083,  K084,  K085,  K086,  KC_NO, K088 }, \
 	{KC_NO,  K091,  K092,  K093,  K094,  K095, KC_NO,  KC_NO, KC_NO }, \
 	{ K100,  K101,  KC_NO, KC_NO, KC_NO,KC_NO, KC_NO,  KC_NO, K108 }, \
 	{KC_NO,  KC_NO, KC_NO, K113,  KC_NO, K115,  K116,  K117,  K118 }  \
 }
@@ -0,0 +1,20 @@
 {
    "keyboard_name": "h87a",
    "url": "",
    "maintainer": "hineybush",
    "width": 18.25,
    "height": 6.5,
    "layouts": {
        "LAYOUT_all": {
            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"x":13, "y":1.5}, {"label":"Bksp", "x":14, "y":1.5}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Home", "x":16.25, "y":1.5}, {"label":"PgUp", "x":17.25, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"|", "x":13.5, "y":2.5, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"x":12.75, "y":3.5}, {"label":"Enter", "x":13.75, "y":3.5, "w":1.25}, {"label":"Shift", "x":0, "y":4.5, "w":1.25}, {"x":1.25, "y":4.5}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":1.75}, {"x":14, "y":4.5}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"label":"Alt", "x":10, "y":5.5, "w":1.25}, {"label":"Win", "x":11.25, "y":5.5, "w":1.25}, {"label":"Menu", "x":12.5, "y":5.5, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}]
        },
        "LAYOUT_tkl_ansi": {
            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"Bksp", "x":13, "y":1.5, "w":2}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Home", "x":16.25, "y":1.5}, {"label":"PgUp", "x":17.25, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"|", "x":13.5, "y":2.5, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, {"label":"Shift", "x":0, "y":4.5, "w":2.25}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.25}, {"label":"Win", "x":1.25, "y":5.5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.25}, {"x":3.75, "y":5.5, "w":6.25}, {"label":"Alt", "x":10, "y":5.5, "w":1.25}, {"label":"Win", "x":11.25, "y":5.5, "w":1.25}, {"label":"Menu", "x":12.5, "y":5.5, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":5.5, "w":1.25}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}]
        },
        "LAYOUT_tkl_ansi_wkl": {
           "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":2, "y":0}, {"label":"F2", "x":3, "y":0}, {"label":"F3", "x":4, "y":0}, {"label":"F4", "x":5, "y":0}, {"label":"F5", "x":6.5, "y":0}, {"label":"F6", "x":7.5, "y":0}, {"label":"F7", "x":8.5, "y":0}, {"label":"F8", "x":9.5, "y":0}, {"label":"F9", "x":11, "y":0}, {"label":"F10", "x":12, "y":0}, {"label":"F11", "x":13, "y":0}, {"label":"F12", "x":14, "y":0}, {"label":"PrtSc", "x":15.25, "y":0}, {"label":"Scroll Lock", "x":16.25, "y":0}, {"label":"Pause", "x":17.25, "y":0}, {"label":"~", "x":0, "y":1.5}, {"label":"!", "x":1, "y":1.5}, {"label":"@", "x":2, "y":1.5}, {"label":"#", "x":3, "y":1.5}, {"label":"$", "x":4, "y":1.5}, {"label":"%", "x":5, "y":1.5}, {"label":"^", "x":6, "y":1.5}, {"label":"&", "x":7, "y":1.5}, {"label":"*", "x":8, "y":1.5}, {"label":"(", "x":9, "y":1.5}, {"label":")", "x":10, "y":1.5}, {"label":"_", "x":11, "y":1.5}, {"label":"+", "x":12, "y":1.5}, {"label":"Bksp", "x":13, "y":1.5, "w":2}, {"label":"Insert", "x":15.25, "y":1.5}, {"label":"Home", "x":16.25, "y":1.5}, {"label":"PgUp", "x":17.25, "y":1.5}, {"label":"Tab", "x":0, "y":2.5, "w":1.5}, {"label":"Q", "x":1.5, "y":2.5}, {"label":"W", "x":2.5, "y":2.5}, {"label":"E", "x":3.5, "y":2.5}, {"label":"R", "x":4.5, "y":2.5}, {"label":"T", "x":5.5, "y":2.5}, {"label":"Y", "x":6.5, "y":2.5}, {"label":"U", "x":7.5, "y":2.5}, {"label":"I", "x":8.5, "y":2.5}, {"label":"O", "x":9.5, "y":2.5}, {"label":"P", "x":10.5, "y":2.5}, {"label":"{", "x":11.5, "y":2.5}, {"label":"}", "x":12.5, "y":2.5}, {"label":"|", "x":13.5, "y":2.5, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.5}, {"label":"End", "x":16.25, "y":2.5}, {"label":"PgDn", "x":17.25, "y":2.5}, {"label":"Caps Lock", "x":0, "y":3.5, "w":1.75}, {"label":"A", "x":1.75, "y":3.5}, {"label":"S", "x":2.75, "y":3.5}, {"label":"D", "x":3.75, "y":3.5}, {"label":"F", "x":4.75, "y":3.5}, {"label":"G", "x":5.75, "y":3.5}, {"label":"H", "x":6.75, "y":3.5}, {"label":"J", "x":7.75, "y":3.5}, {"label":"K", "x":8.75, "y":3.5}, {"label":"L", "x":9.75, "y":3.5}, {"label":":", "x":10.75, "y":3.5}, {"label":"\"", "x":11.75, "y":3.5}, {"label":"Enter", "x":12.75, "y":3.5, "w":2.25}, {"label":"Shift", "x":0, "y":4.5, "w":2.25}, {"label":"Z", "x":2.25, "y":4.5}, {"label":"X", "x":3.25, "y":4.5}, {"label":"C", "x":4.25, "y":4.5}, {"label":"V", "x":5.25, "y":4.5}, {"label":"B", "x":6.25, "y":4.5}, {"label":"N", "x":7.25, "y":4.5}, {"label":"M", "x":8.25, "y":4.5}, {"label":"<", "x":9.25, "y":4.5}, {"label":">", "x":10.25, "y":4.5}, {"label":"?", "x":11.25, "y":4.5}, {"label":"Shift", "x":12.25, "y":4.5, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.5}, {"label":"Ctrl", "x":0, "y":5.5, "w":1.5}, {"label":"Alt", "x":2.5, "y":5.5, "w":1.5}, {"x":4, "y":5.5, "w":7}, {"label":"Alt", "x":11, "y":5.5, "w":1.5}, {"label":"Ctrl", "x":13.5, "y":5.5, "w":1.5}, {"label":"\u2190", "x":15.25, "y":5.5}, {"label":"\u2193", "x":16.25, "y":5.5}, {"label":"\u2192", "x":17.25, "y":5.5}]
       }
    }
 }
@@ -0,0 +1,21 @@
 /* Copyright 2018 Josh Hinnebusch
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 // place overrides here
@@ -22,7 +22,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    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_BSPC,   KC_BSPC,      KC_INS,  KC_HOME, KC_PGUP,
    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_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_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,   KC_SLSH,    KC_LSFT,    KC_TRNS,                          KC_UP,
+    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_RSFT,    KC_TRNS,                          KC_UP,
    KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT,  KC_RGUI,    MO(1),      KC_RCTL,                 KC_LEFT, KC_DOWN, KC_RGHT),
  [1] = LAYOUT_all(
@@ -0,0 +1 @@
 # The default keymap for h87a
@@ -0,0 +1,21 @@
 /* Copyright 2018 Josh Hinnebusch
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 // place overrides here
@@ -0,0 +1,73 @@
 /* Copyright 2018 Josh Hinnebusch
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include QMK_KEYBOARD_H
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  [0] = LAYOUT_tkl_ansi_wkl(
    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_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_BSPC,                 KC_INS,  KC_HOME, KC_PGUP,
    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_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, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT,                                                  KC_UP,
    KC_LCTL, KC_LALT,                   KC_SPC,                                      MO(1),             KC_RCTL,                                         KC_LEFT, KC_DOWN, KC_RGHT),
  [1] = LAYOUT_tkl_ansi_wkl(
    KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,      RGB_TOG, RGB_MOD, RGB_HUD, RGB_HUI,     RGB_SAD, RGB_SAI, RGB_VAD, RGB_VAI,               BL_TOGG, BL_DEC,  BL_INC,
    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,               KC_TRNS, KC_TRNS, KC_VOLU,
    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,               KC_MPLY, KC_MNXT, KC_VOLD,
    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,
    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                                                   KC_TRNS, 
    KC_TRNS, KC_TRNS,                   KC_TRNS,                                     KC_TRNS,          KC_TRNS,                                          KC_TRNS, KC_TRNS, KC_TRNS ),
 };
 void matrix_init_user(void) {
 }
 void matrix_scan_user(void) {
 }
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  return true;
 }
 void led_init_ports(void) {
  setPinOutput(D5);
  setPinOutput(E6);
 }
 void led_set_user(uint8_t usb_led) {
  if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
    setPinOutput(D5);
    writePinLow(D5);
  } else {
    setPinInput(D5);
    writePinLow(D5);
  }
  if (IS_LED_ON(usb_led, USB_LED_SCROLL_LOCK)) {
    setPinOutput(E6);
    writePinLow(E6);
  } else {
    setPinInput(E6);
    writePinLow(E6);
  }
 }
@@ -0,0 +1 @@
 # The default keymap for h87a
@@ -3,15 +3,15 @@ h87a
 A QMK-powered replacement PCB for custom TKL keyboards. This PCB has the same size of the b.87 PCB, while using the USB port placement and spacebar stabilizer orientation as the a.87 PCB.
-Keyboard Maintainer: hineybush (Josh Hinnebusch)  
+Keyboard Maintainer: [hineybush](https://github.com/hineybush)  
-
+Hardware Supported: h87a ver. 1.5, ver. 1.6 (normal and thin), h87alps  
-Hardware Supported: h87a Rev 1  
+Hardware Availability: hineybush.com
 Hardware Availability: Currently prototyped, group buy TBD  
 Make example for this keyboard (after setting up your build environment):
-     make h87a:default
+     make hineybush/h87a:default
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
 ## h87a hardware information
@@ -35,8 +35,11 @@ The H87a PCB utilizes duplex matrix organization.
    Backlight Pin: B7
    RGB Data Pin: D3
 For ver 1.5 in-switch indicators:
 To connect the Caps Lock LED to the main backlight matrix, jump the middle pad and the left pad on J1. To use the Caps Lock LED as an indicator, jump the middle pad and the right pad on J1.
 To connect the Scroll Lock LED to the main backlight matrix, jump the middle pad and the right pad on J2. To use the Scroll Lock LED as an indicator, jump the middle pad and the left pad on J2.
-Note: The different orientations of J1 and J2 will be fixed with Rev 2.
+Note: The different orientations of J1 and J2 was fixed with ver. 1.6.
@@ -0,0 +1,47 @@
 #pragma once
 #include "config_common.h"
 /* USB Device descriptor parameter */
 #define VENDOR_ID       0xFEED
 #define PRODUCT_ID      0x6060
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    hineybush
 #define PRODUCT         hineyG80
 #define DESCRIPTION     QMK-powered PCB for Cherry G80/81-1800 Boards
 /* key matrix size */
 #define MATRIX_ROWS 12
 #define MATRIX_COLS 9
 /* key matrix pins */
 #define MATRIX_ROW_PINS { B2, B3, D0, B1, D2, D1, D5, D3, D6, D4, B4, D7 }
 #define MATRIX_COL_PINS { C7, F7, F6, F5, F4, F1, F0, B7, B0 }
 #define UNUSED_PINS
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 /* number of backlight levels */
 #ifdef BACKLIGHT_PIN
 #define BACKLIGHT_LEVELS 3
 #endif
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCING_DELAY 5
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 #ifdef RGB_DI_PIN
 #define RGBLIGHT_ANIMATIONS
 #define RGBLED_NUM 0
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
 #endif
@@ -0,0 +1,63 @@
 /* Copyright 2019 Josh Hinnebusch
 *
 * 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 "hineyg80.h"
 void matrix_init_kb(void) {
 	// put your keyboard start-up code here
 	// runs once when the firmware starts up
 	matrix_init_user();
 }
 void matrix_scan_kb(void) {
 	// put your looping keyboard code here
 	// runs every cycle (a lot)
 	matrix_scan_user();
 }
 bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
 	// put your per-action keyboard code here
 	// runs for every action, just before processing by the firmware
 	return process_record_user(keycode, record);
 }
 void led_set_kb(uint8_t usb_led) {
 	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
 	if (IS_LED_ON(usb_led, USB_LED_NUM_LOCK)) {
        // Turn numlock on
 		writePinHigh(C6);
    } else {
        // Turn numlock off
 	    writePinLow(C6);
    }
 	if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
        // Turn capslock on
 		writePinHigh(B6);
    } else {
        // Turn capslock off
 		writePinLow(B6);
    }
 	if (IS_LED_ON(usb_led, USB_LED_SCROLL_LOCK)) {
        // Turn scrolllock on
 	    writePinHigh(B5);
    } else {
        // Turn scrolllock off
 		writePinLow(B5);
    }
 	led_set_user(usb_led);
 }
@@ -0,0 +1,89 @@
 /* Copyright 2019 Josh Hinnebusch
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 #include "quantum.h"
 #define LAYOUT_all( \
    K000,K010,K001,K011,K002,K012,K003,K013,K004,K014,K005,K015,K006,         K007,K017,K008,K018, \
 																		      K027,K016,K028,K038, \
 	K020,K030,K021,K031,K022,K032,K023,K033,K024,K034,K025,K035,K026,K036,K037,K047,K057,K048,K058, \
 	K040,K050,K041,K051,K042,K052,K043,K053,K044,K054,K045,K055,K046,K056,    K067,K077,K068,K078, \
 	K060,K070,K061,K071,K062,K072,K063,K073,K064,K074,K065,K075,K066,K076,    K087,K097,K088,K098, \
 	K080,K090,K081,K091,K082,K092,K083,K093,K084,K094,K085,K095,K086,K096,    K106,K116,K108,K118, \
 	K100,K110,K101,     		K102,            K112,K103,K113,K104,K114,    K105,K115,K117,K107  \
 ) { \
 	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008 }, \
 	{ K010,  K011,  K012,  K013,  K014,  K015,  K016,  K017,  K018 }, \
 	{ K020,  K021,  K022,  K023,  K024,  K025,  K026,  K027,  K028 }, \
 	{ K030,  K031,  K032,  K033,  K034,  K035,  K036,  K037,  K038 }, \
 	{ K040,  K041,  K042,  K043,  K044,  K045,  K046,  K047,  K048 }, \
 	{ K050,  K051,  K052,  K053,  K054,  K055,  K056,  K057,  K058 }, \
 	{ K060,  K061,  K062,  K063,  K064,  K065,  K066,  K067,  K068 }, \
 	{ K070,  K071,  K072,  K073,  K074,  K075,  K076,  K077,  K078 }, \
 	{ K080,  K081,  K082,  K083,  K084,  K085,  K086,  K087,  K088 }, \
 	{ K090,  K091,  K092,  K093,  K094,  K095,  K096,  K097,  K098 }, \
 	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108 }, \
 	{ K110,  KC_NO, K112,  K113,  K114,  K115,  K116,  K117,  K118 }  \
 }
 /* 6U spacebar, 1U mods */
 #define LAYOUT_ansi_100u_mods( \
    K000,K010,K001,K011,K002,K012,K003,K013,K004,K014,K005,K015,K006,     K007,K017,K008,K018, \
 																		  K027,K016,K028,K038, \
 	K020,K030,K021,K031,K022,K032,K023,K033,K024,K034,K025,K035,K026,K036,K047,K057,K048,K058, \
 	K040,K050,K041,K051,K042,K052,K043,K053,K044,K054,K045,K055,K046,K056,K067,K077,K068,K078, \
 	K060,K070,K061,K071,K062,K072,K063,K073,K064,K074,K065,K075,     K076,K087,K097,K088,K098, \
 	K080     ,K081,K091,K082,K092,K083,K093,K084,K094,K085,K095,K086,K096,K106,K116,K108,K118, \
 	K100,K110,K101,     		K102,            K112,K103,K113,K104,K114,K105,K115,K117,K107  \
 ) { \
 	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008 }, \
 	{ K010,  K011,  K012,  K013,  K014,  K015,  K016,  K017,  K018 }, \
 	{ K020,  K021,  K022,  K023,  K024,  K025,  K026,  K027,  K028 }, \
 	{ K030,  K031,  K032,  K033,  K034,  K035,  K036, KC_NO,  K038 }, \
 	{ K040,  K041,  K042,  K043,  K044,  K045,  K046,  K047,  K048 }, \
 	{ K050,  K051,  K052,  K053,  K054,  K055,  K056,  K057,  K058 }, \
 	{ K060,  K061,  K062,  K063,  K064,  K065, KC_NO,  K067,  K068 }, \
 	{ K070,  K071,  K072,  K073,  K074,  K075,  K076,  K077,  K078 }, \
 	{ K080,  K081,  K082,  K083,  K084,  K085,  K086,  K087,  K088 }, \
 	{KC_NO,  K091,  K092,  K093,  K094,  K095,  K096,  K097,  K098 }, \
 	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108 }, \
 	{ K110,  KC_NO, K112,  K113,  K114,  K115,  K116,  K117,  K118 }  \
 }
 /* 7U spacebar, 1.5U mods */
 #define LAYOUT_ansi_150u_mods( \
    K000,K010,K001,K011,K002,K012,K003,K013,K004,K014,K005,K015,K006,     K007,K017,K008,K018, \
 																		  K027,K016,K028,K038, \
 	K020,K030,K021,K031,K022,K032,K023,K033,K024,K034,K025,K035,K026,K036,K047,K057,K048,K058, \
 	K040,K050,K041,K051,K042,K052,K043,K053,K044,K054,K045,K055,K046,K056,K067,K077,K068,K078, \
 	K060,K070,K061,K071,K062,K072,K063,K073,K064,K074,K065,K075     ,K076,K087,K097,K088,K098, \
 	K080     ,K081,K091,K082,K092,K083,K093,K084,K094,K085,K095,K086,K096,K106,K116,K108,K118, \
 	K100,      K101,     		K102,                 K103,     K104,K114,K105,K115,K117,K107  \
 ) { \
 	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008 }, \
 	{ K010,  K011,  K012,  K013,  K014,  K015,  K016,  K017,  K018 }, \
 	{ K020,  K021,  K022,  K023,  K024,  K025,  K026,  K027,  K028 }, \
 	{ K030,  K031,  K032,  K033,  K034,  K035,  K036, KC_NO,  K038 }, \
 	{ K040,  K041,  K042,  K043,  K044,  K045,  K046,  K047,  K048 }, \
 	{ K050,  K051,  K052,  K053,  K054,  K055,  K056,  K057,  K058 }, \
 	{ K060,  K061,  K062,  K063,  K064,  K065, KC_NO,  K067,  K068 }, \
 	{ K070,  K071,  K072,  K073,  K074,  K075,  K076,  K077,  K078 }, \
 	{ K080,  K081,  K082,  K083,  K084,  K085,  K086,  K087,  K088 }, \
 	{KC_NO,  K091,  K092,  K093,  K094,  K095,  K096,  K097,  K098 }, \
 	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108 }, \
 	{ KC_NO, KC_NO, KC_NO, KC_NO, K114,  K115,  K116,  K117,  K118 }  \
 }
@@ -0,0 +1,19 @@
 {
    "keyboard_name": "hineyg80", 
    "url": "", 
    "maintainer": "hineybush", 
    "width": 19.5, 
    "height": 7.25, 
    "layouts": {
        "LAYOUT_all": {
            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1.25, "y":0}, {"label":"F2", "x":2.25, "y":0}, {"label":"F3", "x":3.25, "y":0}, {"label":"F4", "x":4.25, "y":0}, {"label":"F5", "x":5.5, "y":0}, {"label":"F6", "x":6.5, "y":0}, {"label":"F7", "x":7.5, "y":0}, {"label":"F8", "x":8.5, "y":0}, {"label":"F9", "x":9.75, "y":0}, {"label":"F10", "x":10.75, "y":0}, {"label":"F11", "x":11.75, "y":0}, {"label":"F12", "x":12.75, "y":0}, {"label":"Pause", "x":15.5, "y":0}, {"label":"Insert", "x":16.5, "y":0}, {"label":"Home", "x":17.5, "y":0}, {"label":"PgUp", "x":18.5, "y":0}, {"label":"Scroll Lock", "x":15.5, "y":1}, {"label":"Delete", "x":16.5, "y":1}, {"label":"End", "x":17.5, "y":1}, {"label":"PgDn", "x":18.5, "y":1}, {"label":"~", "x":0, "y":2}, {"label":"!", "x":1, "y":2}, {"label":"@", "x":2, "y":2}, {"label":"#", "x":3, "y":2}, {"label":"$", "x":4, "y":2}, {"label":"%", "x":5, "y":2}, {"label":"^", "x":6, "y":2}, {"label":"&", "x":7, "y":2}, {"label":"*", "x":8, "y":2}, {"label":"(", "x":9, "y":2}, {"label":")", "x":10, "y":2}, {"label":"_", "x":11, "y":2}, {"label":"+", "x":12, "y":2}, {"label":"Bksp", "x":13, "y":2}, {"x":14, "y":2}, {"label":"Num Lock", "x":15.5, "y":2}, {"label":"/", "x":16.5, "y":2}, {"label":"*", "x":17.5, "y":2}, {"label":"-", "x":18.5, "y":2}, {"label":"Tab", "x":0, "y":3, "w":1.5}, {"label":"Q", "x":1.5, "y":3}, {"label":"W", "x":2.5, "y":3}, {"label":"E", "x":3.5, "y":3}, {"label":"R", "x":4.5, "y":3}, {"label":"T", "x":5.5, "y":3}, {"label":"Y", "x":6.5, "y":3}, {"label":"U", "x":7.5, "y":3}, {"label":"I", "x":8.5, "y":3}, {"label":"O", "x":9.5, "y":3}, {"label":"P", "x":10.5, "y":3}, {"label":"{", "x":11.5, "y":3}, {"label":"}", "x":12.5, "y":3}, {"label":"|", "x":13.5, "y":3, "w":1.5}, {"label":"7", "x":15.5, "y":3}, {"label":"8", "x":16.5, "y":3}, {"label":"9", "x":17.5, "y":3}, {"label":"+", "x":18.5, "y":3}, {"label":"Caps Lock", "x":0, "y":4, "w":1.75}, {"label":"A", "x":1.75, "y":4}, {"label":"S", "x":2.75, "y":4}, {"label":"D", "x":3.75, "y":4}, {"label":"F", "x":4.75, "y":4}, {"label":"G", "x":5.75, "y":4}, {"label":"H", "x":6.75, "y":4}, {"label":"J", "x":7.75, "y":4}, {"label":"K", "x":8.75, "y":4}, {"label":"L", "x":9.75, "y":4}, {"label":":", "x":10.75, "y":4}, {"label":"\"", "x":11.75, "y":4}, {"x":12.75, "y":4}, {"label":"Enter", "x":13.75, "y":4, "w":1.25}, {"label":"4", "x":15.5, "y":4}, {"label":"5", "x":16.5, "y":4}, {"label":"6", "x":17.5, "y":4}, {"x":18.5, "y":4}, {"label":"Shift", "x":0, "y":5, "w":1.25}, {"x":1.25, "y":5}, {"label":"Z", "x":2.25, "y":5}, {"label":"X", "x":3.25, "y":5}, {"label":"C", "x":4.25, "y":5}, {"label":"V", "x":5.25, "y":5}, {"label":"B", "x":6.25, "y":5}, {"label":"N", "x":7.25, "y":5}, {"label":"M", "x":8.25, "y":5}, {"label":"<", "x":9.25, "y":5}, {"label":">", "x":10.25, "y":5}, {"label":"?", "x":11.25, "y":5}, {"label":"Shift", "x":12.25, "y":5, "w":1.75}, {"label":"\u2191", "x":14.25, "y":5.25}, {"label":"1", "x":15.5, "y":5}, {"label":"2", "x":16.5, "y":5}, {"label":"3", "x":17.5, "y":5}, {"label":"Enter", "x":18.5, "y":5, "h":2}, {"label":"Ctrl", "x":0, "y":6}, {"label":"Win", "x":1, "y":6}, {"label":"Alt", "x":2, "y":6}, {"x":3, "y":6, "w":6}, {"label":"Alt", "x":9, "y":6}, {"label":"Win", "x":10, "y":6}, {"label":"Menu", "x":11, "y":6}, {"label":"Ctrl", "x":12, "y":6}, {"label":"\u2190", "x":13.25, "y":6.25}, {"label":"\u2193", "x":14.25, "y":6.25}, {"label":"\u2192", "x":15.25, "y":6.25}, {"label":"0", "x":16.5, "y":6}, {"label":".", "x":17.5, "y":6}]
        },
        "LAYOUT_ansi_100u_mods": {
            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1.25, "y":0}, {"label":"F2", "x":2.25, "y":0}, {"label":"F3", "x":3.25, "y":0}, {"label":"F4", "x":4.25, "y":0}, {"label":"F5", "x":5.5, "y":0}, {"label":"F6", "x":6.5, "y":0}, {"label":"F7", "x":7.5, "y":0}, {"label":"F8", "x":8.5, "y":0}, {"label":"F9", "x":9.75, "y":0}, {"label":"F10", "x":10.75, "y":0}, {"label":"F11", "x":11.75, "y":0}, {"label":"F12", "x":12.75, "y":0}, {"label":"Insert", "x":15.5, "y":0}, {"label":"Home", "x":16.5, "y":0}, {"label":"PgUp", "x":17.5, "y":0}, {"label":"Prt Sc", "x":18.5, "y":0}, {"label":"Delete", "x":15.5, "y":1}, {"label":"End", "x":16.5, "y":1}, {"label":"PgDn", "x":17.5, "y":1}, {"label":"Scroll", "x":18.5, "y":1}, {"label":"~", "x":0, "y":2}, {"label":"!", "x":1, "y":2}, {"label":"@", "x":2, "y":2}, {"label":"#", "x":3, "y":2}, {"label":"$", "x":4, "y":2}, {"label":"%", "x":5, "y":2}, {"label":"^", "x":6, "y":2}, {"label":"&", "x":7, "y":2}, {"label":"*", "x":8, "y":2}, {"label":"(", "x":9, "y":2}, {"label":")", "x":10, "y":2}, {"label":"_", "x":11, "y":2}, {"label":"+", "x":12, "y":2}, {"label":"Backspace", "x":13, "y":2, "w":2}, {"label":"Num Lock", "x":15.5, "y":2}, {"label":"/", "x":16.5, "y":2}, {"label":"*", "x":17.5, "y":2}, {"label":"Pause", "x":18.5, "y":2}, {"label":"Tab", "x":0, "y":3, "w":1.5}, {"label":"Q", "x":1.5, "y":3}, {"label":"W", "x":2.5, "y":3}, {"label":"E", "x":3.5, "y":3}, {"label":"R", "x":4.5, "y":3}, {"label":"T", "x":5.5, "y":3}, {"label":"Y", "x":6.5, "y":3}, {"label":"U", "x":7.5, "y":3}, {"label":"I", "x":8.5, "y":3}, {"label":"O", "x":9.5, "y":3}, {"label":"P", "x":10.5, "y":3}, {"label":"{", "x":11.5, "y":3}, {"label":"}", "x":12.5, "y":3}, {"label":"|", "x":13.5, "y":3, "w":1.5}, {"label":"7", "x":15.5, "y":3}, {"label":"8", "x":16.5, "y":3}, {"label":"9", "x":17.5, "y":3}, {"label":"-", "x":18.5, "y":3}, {"label":"Caps Lock", "x":0, "y":4, "w":1.75}, {"label":"A", "x":1.75, "y":4}, {"label":"S", "x":2.75, "y":4}, {"label":"D", "x":3.75, "y":4}, {"label":"F", "x":4.75, "y":4}, {"label":"G", "x":5.75, "y":4}, {"label":"H", "x":6.75, "y":4}, {"label":"J", "x":7.75, "y":4}, {"label":"K", "x":8.75, "y":4}, {"label":"L", "x":9.75, "y":4}, {"label":":", "x":10.75, "y":4}, {"label":"\"", "x":11.75, "y":4}, {"label":"Enter", "x":12.75, "y":4, "w":2.25}, {"label":"4", "x":15.5, "y":4}, {"label":"5", "x":16.5, "y":4}, {"label":"6", "x":17.5, "y":4}, {"label":"+", "x":18.5, "y":4}, {"label":"Shift", "x":0, "y":5, "w":2.25}, {"label":"Z", "x":2.25, "y":5}, {"label":"X", "x":3.25, "y":5}, {"label":"C", "x":4.25, "y":5}, {"label":"V", "x":5.25, "y":5}, {"label":"B", "x":6.25, "y":5}, {"label":"N", "x":7.25, "y":5}, {"label":"M", "x":8.25, "y":5}, {"label":"<", "x":9.25, "y":5}, {"label":">", "x":10.25, "y":5}, {"label":"?", "x":11.25, "y":5}, {"label":"Shift", "x":12.25, "y":5, "w":1.75}, {"label":"\u2191", "x":14.25, "y":5.25}, {"label":"1", "x":15.5, "y":5}, {"label":"2", "x":16.5, "y":5}, {"label":"3", "x":17.5, "y":5}, {"label":"Enter", "x":18.5, "y":5, "h":2}, {"label":"Ctrl", "x":0, "y":6}, {"label":"Win", "x":1, "y":6}, {"label":"Alt", "x":2, "y":6}, {"x":3, "y":6, "w":6}, {"label":"Alt", "x":9, "y":6}, {"label":"Win", "x":10, "y":6}, {"label":"Menu", "x":11, "y":6}, {"label":"Ctrl", "x":12, "y":6}, {"label":"\u2190", "x":13.25, "y":6.25}, {"label":"\u2193", "x":14.25, "y":6.25}, {"label":"\u2192", "x":15.25, "y":6.25}, {"label":"0", "x":16.5, "y":6}, {"label":".", "x":17.5, "y":6}]
        },
        "LAYOUT_ansi_150u_mods": {
            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1.25, "y":0}, {"label":"F2", "x":2.25, "y":0}, {"label":"F3", "x":3.25, "y":0}, {"label":"F4", "x":4.25, "y":0}, {"label":"F5", "x":5.5, "y":0}, {"label":"F6", "x":6.5, "y":0}, {"label":"F7", "x":7.5, "y":0}, {"label":"F8", "x":8.5, "y":0}, {"label":"F9", "x":9.75, "y":0}, {"label":"F10", "x":10.75, "y":0}, {"label":"F11", "x":11.75, "y":0}, {"label":"F12", "x":12.75, "y":0}, {"label":"Insert", "x":15.5, "y":0}, {"label":"Home", "x":16.5, "y":0}, {"label":"PgUp", "x":17.5, "y":0}, {"label":"Prt Sc", "x":18.5, "y":0}, {"label":"Delete", "x":15.5, "y":1}, {"label":"End", "x":16.5, "y":1}, {"label":"PgDn", "x":17.5, "y":1}, {"label":"Scroll", "x":18.5, "y":1}, {"label":"~", "x":0, "y":2}, {"label":"!", "x":1, "y":2}, {"label":"@", "x":2, "y":2}, {"label":"#", "x":3, "y":2}, {"label":"$", "x":4, "y":2}, {"label":"%", "x":5, "y":2}, {"label":"^", "x":6, "y":2}, {"label":"&", "x":7, "y":2}, {"label":"*", "x":8, "y":2}, {"label":"(", "x":9, "y":2}, {"label":")", "x":10, "y":2}, {"label":"_", "x":11, "y":2}, {"label":"+", "x":12, "y":2}, {"label":"Backspace", "x":13, "y":2, "w":2}, {"label":"Num Lock", "x":15.5, "y":2}, {"label":"/", "x":16.5, "y":2}, {"label":"*", "x":17.5, "y":2}, {"label":"Pause", "x":18.5, "y":2}, {"label":"Tab", "x":0, "y":3, "w":1.5}, {"label":"Q", "x":1.5, "y":3}, {"label":"W", "x":2.5, "y":3}, {"label":"E", "x":3.5, "y":3}, {"label":"R", "x":4.5, "y":3}, {"label":"T", "x":5.5, "y":3}, {"label":"Y", "x":6.5, "y":3}, {"label":"U", "x":7.5, "y":3}, {"label":"I", "x":8.5, "y":3}, {"label":"O", "x":9.5, "y":3}, {"label":"P", "x":10.5, "y":3}, {"label":"{", "x":11.5, "y":3}, {"label":"}", "x":12.5, "y":3}, {"label":"|", "x":13.5, "y":3, "w":1.5}, {"label":"7", "x":15.5, "y":3}, {"label":"8", "x":16.5, "y":3}, {"label":"9", "x":17.5, "y":3}, {"label":"-", "x":18.5, "y":3}, {"label":"Caps Lock", "x":0, "y":4, "w":1.75}, {"label":"A", "x":1.75, "y":4}, {"label":"S", "x":2.75, "y":4}, {"label":"D", "x":3.75, "y":4}, {"label":"F", "x":4.75, "y":4}, {"label":"G", "x":5.75, "y":4}, {"label":"H", "x":6.75, "y":4}, {"label":"J", "x":7.75, "y":4}, {"label":"K", "x":8.75, "y":4}, {"label":"L", "x":9.75, "y":4}, {"label":":", "x":10.75, "y":4}, {"label":"\"", "x":11.75, "y":4}, {"label":"Enter", "x":12.75, "y":4, "w":2.25}, {"label":"4", "x":15.5, "y":4}, {"label":"5", "x":16.5, "y":4}, {"label":"6", "x":17.5, "y":4}, {"label":"+", "x":18.5, "y":4}, {"label":"Shift", "x":0, "y":5, "w":2.25}, {"label":"Z", "x":2.25, "y":5}, {"label":"X", "x":3.25, "y":5}, {"label":"C", "x":4.25, "y":5}, {"label":"V", "x":5.25, "y":5}, {"label":"B", "x":6.25, "y":5}, {"label":"N", "x":7.25, "y":5}, {"label":"M", "x":8.25, "y":5}, {"label":"<", "x":9.25, "y":5}, {"label":">", "x":10.25, "y":5}, {"label":"?", "x":11.25, "y":5}, {"label":"Shift", "x":12.25, "y":5, "w":1.75}, {"label":"\u2191", "x":14.25, "y":5.25}, {"label":"1", "x":15.5, "y":5}, {"label":"2", "x":16.5, "y":5}, {"label":"3", "x":17.5, "y":5}, {"label":"Enter", "x":18.5, "y":5, "h":2}, {"label":"Ctrl", "x":0, "y":6, "w":1.5}, {"label":"Alt", "x":1.5, "y":6, "w":1.5}, {"x":3, "y":6, "w":7}, {"label":"Menu", "x":10, "y":6, "w":1.5}, {"label":"Ctrl", "x":11.5, "y":6, "w":1.5}, {"label":"\u2190", "x":13.25, "y":6.25}, {"label":"\u2193", "x":14.25, "y":6.25}, {"label":"\u2192", "x":15.25, "y":6.25}, {"label":"0", "x":16.5, "y":6}, {"label":".", "x":17.5, "y":6}]
        }
    }
 }
@@ -0,0 +1,19 @@
 /* Copyright 2019 Josh Hinnebusch
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 // place overrides here
@@ -0,0 +1,58 @@
 /* Copyright 2019 Josh Hinnebusch
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include QMK_KEYBOARD_H
 // Defines the keycodes used by our macros in process_record_user
 enum custom_keycodes {
  QMKBEST = SAFE_RANGE,
  QMKURL,
 };
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  [0] = LAYOUT_ansi_100u_mods( /* Base */
    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_INS,   KC_HOME,   KC_PGUP,   KC_PSCR, 
                                                                                   KC_DEL,   KC_END,    KC_PGDN,   KC_SLCK, 
    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_BSPC,  KC_NLCK,  KC_PSLS,   KC_PAST,   KC_PAUS, 
    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_P7,    KC_P8,     KC_P9,     KC_PMNS,
    KC_LCTL, KC_A,     KC_S,    KC_D,   KC_F,   KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT,            KC_ENT,   KC_P4,    KC_P5,     KC_P6,     KC_PPLS, 
    KC_LSFT,           KC_Z,    KC_X,   KC_C,   KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,   KC_SLSH,  KC_RSFT,  KC_UP,    KC_P1,    KC_P2,     KC_P3,     KC_PENT, 
    KC_LCTL, KC_LGUI,  KC_LALT,         KC_SPC, KC_RALT, KC_RGUI, MO(1),  KC_RCTL,                               KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,     KC_PDOT           
    ),
  [1] = LAYOUT_ansi_100u_mods( /* Fn */KC_TRNS,   KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_MPRV,   KC_MPLY,   KC_MNXT,    KC_VOLU,  
                                                                          KC_TRNS,    KC_TRNS,    KC_TRNS,     KC_VOLD,  
    KC_TRNS,   KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_DEL,   KC_TRNS,    KC_TRNS,    KC_TRNS,     KC_TRNS,  
    KC_TRNS,   KC_TRNS,   KC_TRNS,  KC_TRNS, RESET , KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,     KC_TRNS,  
    KC_CAPS,  KC_TRNS,   KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,     KC_TRNS,  
    KC_TRNS,             KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS,     KC_TRNS,  
    KC_TRNS,   KC_TRNS,   KC_TRNS,          KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,                               KC_TRNS,   KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS          
    ),
 };
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  return true;
 }
 void matrix_init_user(void) {
 }
 void matrix_scan_user(void) {
 }
 void led_set_user(uint8_t usb_led) {
 }
@@ -0,0 +1 @@
 # The default keymap for hineyg80
@@ -0,0 +1,19 @@
 /* Copyright 2019 Josh Hinnebusch
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #pragma once
 // place overrides here
@@ -0,0 +1,60 @@
 /* Copyright 2019 %YOUR_NAME%
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation, either version 2 of the License, or
 * (at your option) any later version.
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 #include QMK_KEYBOARD_H
 // Defines the keycodes used by our macros in process_record_user
 enum custom_keycodes {
  QMKBEST = SAFE_RANGE,
  QMKURL,
  ______ = KC_TRNS,
  XXXXXX = KC_NO
 };
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  [0] = LAYOUT_ansi_150u_mods( /* Base */
    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_INS,   KC_HOME,   KC_PGUP,   KC_PSCR, 
                                                                                   KC_DEL,   KC_END,    KC_PGDN,   KC_SLCK, 
    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_BSPC,  KC_NLCK,  KC_PSLS,   KC_PAST,   KC_PAUS, 
    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_P7,    KC_P8,     KC_P9,     KC_PMNS,
    KC_LCTL, KC_A,     KC_S,    KC_D,   KC_F,   KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,  KC_QUOT,      KC_ENT,   KC_P4,    KC_P5,     KC_P6,     KC_PPLS, 
    KC_LSFT,    KC_Z,    KC_X,   KC_C,   KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,   KC_SLSH,  KC_RSFT,  KC_UP,    KC_P1,    KC_P2,     KC_P3,     KC_PENT, 
    KC_LCTL,    KC_LALT,         KC_SPC,    MO(1),     KC_RCTL,                              KC_LEFT,  KC_DOWN,  KC_RGHT,  KC_P0,     KC_PDOT           
    ),
  [1] = LAYOUT_ansi_150u_mods( /* Fn */______,   ______,   ______,  ______, ______, ______,  ______,    ______,  ______,  ______,   ______,   ______,   ______,   KC_MPRV,   KC_MPLY,   KC_MNXT,    KC_VOLU,  
                                                                          ______,    ______,    ______,     KC_VOLD,  
    ______,   ______,   ______,  ______, ______, ______,  ______,  ______,  ______,  ______,  ______,   ______,   ______,   KC_DEL,   ______,    ______,    ______,     ______,  
    ______,   ______,   ______,  ______, RESET , ______,  ______,  ______,  ______,  ______,  ______,   ______,   ______,   ______,   ______,    ______,    ______,     ______,  
    KC_CAPS,  ______,   ______,  ______, ______, ______,  ______,  ______,  ______,  ______,  ______,    ______,   ______,   ______,    ______,    ______,     ______,  
    ______,      ______,  ______, ______, ______,  ______,  ______,  ______,  ______,  ______,   ______,   ______,   ______,   ______,    ______,    ______,     ______,  
    ______,      ______,          ______,  ______,    ______,                               ______,   ______,   ______,    ______,    ______          
    ),
 };
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
  return true;
 }
 void matrix_init_user(void) {
 }
 void matrix_scan_user(void) {
 }
 void led_set_user(uint8_t usb_led) {
 }
@@ -0,0 +1 @@
 # The default keymap for hineyg80
@@ -0,0 +1,16 @@
 # hineyg80
 A small-batch PCB design to be a drop-in replacement for G80-1800 and G81-1800 boards.
 Keyboard Maintainer: [hineybush](https://github.com/hineybush)  
 Hardware Supported: hiney g80 rev 2
 Hardware Availability: https://geekhack.org/index.php?topic=92389.0
 Make example for this keyboard (after setting up your build environment):
    make hineybush/hineyg80:default
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
@@ -0,0 +1,81 @@
 # MCU name
 #MCU = at90usb1286
 MCU = atmega32u4
 # Processor frequency.
 #     This will define a symbol, F_CPU, in all source code files equal to the
 #     processor frequency in Hz. You can then use this symbol in your source code to
 #     calculate timings. Do NOT tack on a 'UL' at the end, this will be done
 #     automatically to create a 32-bit value in your source code.
 #
 #     This will be an integer division of F_USB below, as it is sourced by
 #     F_USB after it has run through any CPU prescalers. Note that this value
 #     does not *change* the processor frequency - it should merely be updated to
 #     reflect the processor speed set externally so that the code can use accurate
 #     software delays.
 F_CPU = 16000000
 #
 # LUFA specific
 #
 # Target architecture (see library "Board Types" documentation).
 ARCH = AVR8
 # Input clock frequency.
 #     This will define a symbol, F_USB, in all source code files equal to the
 #     input clock frequency (before any prescaling is performed) in Hz. This value may
 #     differ from F_CPU if prescaling is used on the latter, and is required as the
 #     raw input clock is fed directly to the PLL sections of the AVR for high speed
 #     clock generation for the USB and other AVR subsections. Do NOT tack on a 'UL'
 #     at the end, this will be done automatically to create a 32-bit value in your
 #     source code.
 #
 #     If no clock division is performed on the input clock inside the AVR (via the
 #     CPU clock adjust registers or the clock division fuses), this will be equal to F_CPU.
 F_USB = $(F_CPU)
 # Interrupt driven control endpoint task(+60)
 OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
 # Bootloader selection
 #   Teensy       halfkay
 #   Pro Micro    caterina
 #   Atmel DFU    atmel-dfu
 #   LUFA DFU     lufa-dfu
 #   QMK DFU      qmk-dfu
 #   atmega32a    bootloadHID
 BOOTLOADER = atmel-dfu
 # If you don't know the bootloader type, then you can specify the
 # Boot Section Size in *bytes* by uncommenting out the OPT_DEFS line
 #   Teensy halfKay      512
 #   Teensy++ halfKay    1024
 #   Atmel DFU loader    4096
 #   LUFA bootloader     4096
 #   USBaspLoader        2048
 # OPT_DEFS += -DBOOTLOADER_SIZE=4096
 # Build Options
 #   change yes to no to disable
 #
 BOOTMAGIC_ENABLE = no      # Virtual DIP switch configuration(+1000)
 MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
 EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
 CONSOLE_ENABLE = yes        # Console for debug(+400)
 COMMAND_ENABLE = yes        # Commands for debug and configuration
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
 NKRO_ENABLE = no            # USB Nkey Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality on B7 by default
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 MIDI_ENABLE = no            # MIDI support (+2400 to 4200, depending on config)
 UNICODE_ENABLE = no         # Unicode
 BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 AUDIO_ENABLE = no           # Audio output on port C6
 FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches
 HD44780_ENABLE = no 		# Enable support for HD44780 based LCDs (+400)
@@ -165,7 +165,7 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
    {1, C9_16,  C7_15,  C6_15}  //D16
 };
-const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
+rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
 //
 //  C7,  C6,  C5,  C4,  C3,  C2,  C1,  A7,  A6,  A5,  A4,  A3,  A2,  A1,
 //  C8,  C9, C10, C11, C12, C13, C14,  A8,  A9, A10, A11, A12, A13, A15,
@@ -174,70 +174,70 @@ const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
 // D16, D15, D14, ---, ---, ---, D13, ---, ---, ---, B14, B13, B12, B11
 /* {row | col << 4}
 *    |           {x=0..224, y=0..64}
- *    |              |            modifier
+ *    |              |            flags
 *    |              |         | */
    {{0|(13<<4)},   {224,  0}, 1}, //A1-A16
-    {{0|(12<<4)},   {204,  0}, 0},
+    {{0|(12<<4)},   {204,  0}, 4},
-    {{0|(11<<4)},   {187,  0}, 0},
+    {{0|(11<<4)},   {187,  0}, 4},
-    {{0|(10<<4)},   {170,  0}, 0},
+    {{0|(10<<4)},   {170,  0}, 4},
-    {{0|(9<<4)},    {153,  0}, 0},
+    {{0|(9<<4)},    {153,  0}, 4},
-    {{0|(8<<4)},    {136,  0}, 0},
+    {{0|(8<<4)},    {136,  0}, 4},
-    {{0|(7<<4)},    {119,  0}, 0},
+    {{0|(7<<4)},    {119,  0}, 4},
-    {{1|(7<<4)},    {119, 16}, 0},
+    {{1|(7<<4)},    {119, 16}, 4},
-    {{1|(8<<4)},    {136, 16}, 0},
+    {{1|(8<<4)},    {136, 16}, 4},
-    {{1|(9<<4)},    {153, 16}, 0},
+    {{1|(9<<4)},    {153, 16}, 4},
-    {{1|(10<<4)},   {170, 16}, 0},
+    {{1|(10<<4)},   {170, 16}, 4},
-    {{1|(11<<4)},   {187, 16}, 0},
+    {{1|(11<<4)},   {187, 16}, 4},
-    {{1|(12<<4)},   {204, 16}, 0},
+    {{1|(12<<4)},   {204, 16}, 4},
    {{2|(13<<4)},   {224, 32}, 1},
-    {{2|(12<<4)},   {224, 16}, 0},
+    {{2|(12<<4)},   {224, 16}, 4},
-    {{2|(11<<4)},   {197, 32}, 0},
+    {{2|(11<<4)},   {197, 32}, 4},
-    {{3|(10<<4)},   {170, 48}, 0}, //B1-B14
+    {{3|(10<<4)},   {170, 48}, 4}, //B1-B14
-    {{3|(9<<4)},    {153, 48}, 0},
+    {{3|(9<<4)},    {153, 48}, 4},
-    {{3|(8<<4)},    {136, 48}, 0},
+    {{3|(8<<4)},    {136, 48}, 4},
-    {{3|(7<<4)},    {119, 48}, 0},
+    {{3|(7<<4)},    {119, 48}, 4},
-    {{2|(7<<4)},    {119, 32}, 0},
+    {{2|(7<<4)},    {119, 32}, 4},
-    {{2|(8<<4)},    {136, 32}, 0},
+    {{2|(8<<4)},    {136, 32}, 4},
-    {{2|(9<<4)},    {153, 32}, 0},
+    {{2|(9<<4)},    {153, 32}, 4},
-    {{2|(10<<4)},   {170, 32}, 0},
+    {{2|(10<<4)},   {170, 32}, 4},
-    {{3|(11<<4)},   {187, 48}, 0},
+    {{3|(11<<4)},   {187, 48}, 4},
    {{3|(13<<4)},   {214, 48}, 1},
    {{4|(13<<4)},   {224, 64}, 1},
    {{4|(12<<4)},   {204, 64}, 1},
    {{4|(11<<4)},   {187, 64}, 1},
    {{4|(10<<4)},   {170, 64}, 1},
-    {{0|(6<<4)},    {102,  0}, 0}, //C1-C16
+    {{0|(6<<4)},    {102,  0}, 4}, //C1-C16
-    {{0|(5<<4)},    { 85,  0}, 0},
+    {{0|(5<<4)},    { 85,  0}, 4},
-    {{0|(4<<4)},    { 68,  0}, 0},
+    {{0|(4<<4)},    { 68,  0}, 4},
-    {{0|(3<<4)},    { 51,  0}, 0},
+    {{0|(3<<4)},    { 51,  0}, 4},
-    {{0|(2<<4)},    { 34,  0}, 0},
+    {{0|(2<<4)},    { 34,  0}, 4},
-    {{0|(1<<4)},    { 17,  0}, 0},
+    {{0|(1<<4)},    { 17,  0}, 4},
    {{0|(0<<4)},    {  0,  0}, 1},
    {{1|(0<<4)},    {  0, 16}, 1},
-    {{1|(1<<4)},    { 17, 16}, 0},
+    {{1|(1<<4)},    { 17, 16}, 4},
-    {{1|(2<<4)},    { 34, 16}, 0},
+    {{1|(2<<4)},    { 34, 16}, 4},
-    {{1|(3<<4)},    { 51, 16}, 0},
+    {{1|(3<<4)},    { 51, 16}, 4},
-    {{1|(4<<4)},    { 68, 16}, 0},
+    {{1|(4<<4)},    { 68, 16}, 4},
-    {{1|(5<<4)},    { 85, 16}, 0},
+    {{1|(5<<4)},    { 85, 16}, 4},
-    {{1|(6<<4)},    {102, 16}, 0},
+    {{1|(6<<4)},    {102, 16}, 4},
-    {{2|(6<<4)},    {102, 32}, 0},
+    {{2|(6<<4)},    {102, 32}, 4},
-    {{2|(5<<4)},    { 85, 32}, 0},
+    {{2|(5<<4)},    { 85, 32}, 4},
-    {{3|(2<<4)},    { 32, 48}, 0}, //D1-D16
+    {{3|(2<<4)},    { 32, 48}, 4}, //D1-D16
    //D2
    {{3|(0<<4)},    { 10, 48}, 1},
    {{2|(0<<4)},    {  0, 32}, 1},
-    {{2|(1<<4)},    { 17, 32}, 0},
+    {{2|(1<<4)},    { 17, 32}, 4},
-    {{2|(2<<4)},    { 34, 32}, 0},
+    {{2|(2<<4)},    { 34, 32}, 4},
-    {{2|(3<<4)},    { 51, 32}, 0},
+    {{2|(3<<4)},    { 51, 32}, 4},
-    {{2|(4<<4)},    { 68, 32}, 0},
+    {{2|(4<<4)},    { 68, 32}, 4},
-    {{3|(3<<4)},    { 51, 48}, 0},
+    {{3|(3<<4)},    { 51, 48}, 4},
-    {{3|(4<<4)},    { 68, 48}, 0},
+    {{3|(4<<4)},    { 68, 48}, 4},
-    {{3|(5<<4)},    { 85, 48}, 0},
+    {{3|(5<<4)},    { 85, 48}, 4},
-    {{3|(6<<4)},    {102, 48}, 0},
+    {{3|(6<<4)},    {102, 48}, 4},
-    {{4|(3<<4)},    {102, 64}, 0},
+    {{4|(3<<4)},    {102, 64}, 4},
    {{4|(2<<4)},    { 34, 68}, 1},
    {{4|(1<<4)},    { 17, 68}, 1},
    {{4|(0<<4)},    {  0, 68}, 1}
@@ -319,7 +319,7 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
    {1, C9_16,  C7_15,  C6_15}  //D16
 };
-const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
+rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
 //
 //  C7,  C6,  C5,  C4,  C3,  C2,  C1,  A7,  A6,  A5,  A4,  A3,  A2,  A1,
 //  C8,  C9, C10, C11, C12, C13, C14,  A8,  A9, A10, A11, A12, A13, ---,
@@ -328,70 +328,70 @@ const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
 // D16, D15, D14, ---, ---, ---, D13, ---, ---, ---, B14, B13, B12, B11
 /* {row | col << 4}
 *    |           {x=0..224, y=0..64}
- *    |              |            modifier
+ *    |              |            flags
 *    |              |         | */
    {{0|(13<<4)},   {224,  0}, 1}, //A1-A16
-    {{0|(12<<4)},   {204,  0}, 0},
+    {{0|(12<<4)},   {204,  0}, 4},
-    {{0|(11<<4)},   {187,  0}, 0},
+    {{0|(11<<4)},   {187,  0}, 4},
-    {{0|(10<<4)},   {170,  0}, 0},
+    {{0|(10<<4)},   {170,  0}, 4},
-    {{0|(9<<4)},    {153,  0}, 0},
+    {{0|(9<<4)},    {153,  0}, 4},
-    {{0|(8<<4)},    {136,  0}, 0},
+    {{0|(8<<4)},    {136,  0}, 4},
-    {{0|(7<<4)},    {119,  0}, 0},
+    {{0|(7<<4)},    {119,  0}, 4},
-    {{1|(7<<4)},    {119, 16}, 0},
+    {{1|(7<<4)},    {119, 16}, 4},
-    {{1|(8<<4)},    {136, 16}, 0},
+    {{1|(8<<4)},    {136, 16}, 4},
-    {{1|(9<<4)},    {153, 16}, 0},
+    {{1|(9<<4)},    {153, 16}, 4},
-    {{1|(10<<4)},   {170, 16}, 0},
+    {{1|(10<<4)},   {170, 16}, 4},
-    {{1|(11<<4)},   {187, 16}, 0},
+    {{1|(11<<4)},   {187, 16}, 4},
-    {{1|(12<<4)},   {204, 16}, 0},
+    {{1|(12<<4)},   {204, 16}, 4},
    {{2|(13<<4)},   {224,  8}, 1},
-    {{2|(12<<4)},   {204, 32}, 0},
+    {{2|(12<<4)},   {204, 32}, 4},
-    {{2|(11<<4)},   {187, 32}, 0},
+    {{2|(11<<4)},   {187, 32}, 4},
-    {{3|(10<<4)},   {170, 48}, 0}, //B1-B14
+    {{3|(10<<4)},   {170, 48}, 4}, //B1-B14
-    {{3|(9<<4)},    {153, 48}, 0},
+    {{3|(9<<4)},    {153, 48}, 4},
-    {{3|(8<<4)},    {136, 48}, 0},
+    {{3|(8<<4)},    {136, 48}, 4},
-    {{3|(7<<4)},    {119, 48}, 0},
+    {{3|(7<<4)},    {119, 48}, 4},
-    {{2|(7<<4)},    {119, 32}, 0},
+    {{2|(7<<4)},    {119, 32}, 4},
-    {{2|(8<<4)},    {136, 32}, 0},
+    {{2|(8<<4)},    {136, 32}, 4},
-    {{2|(9<<4)},    {153, 32}, 0},
+    {{2|(9<<4)},    {153, 32}, 4},
-    {{2|(10<<4)},   {170, 32}, 0},
+    {{2|(10<<4)},   {170, 32}, 4},
-    {{3|(11<<4)},   {187, 48}, 0},
+    {{3|(11<<4)},   {187, 48}, 4},
    {{3|(13<<4)},   {214, 48}, 1},
    {{4|(13<<4)},   {224, 64}, 1},
    {{4|(12<<4)},   {204, 64}, 1},
    {{4|(11<<4)},   {187, 64}, 1},
    {{4|(10<<4)},   {170, 64}, 1},
-    {{0|(6<<4)},    {102,  0}, 0}, //C1-C16
+    {{0|(6<<4)},    {102,  0}, 4}, //C1-C16
-    {{0|(5<<4)},    { 85,  0}, 0},
+    {{0|(5<<4)},    { 85,  0}, 4},
-    {{0|(4<<4)},    { 68,  0}, 0},
+    {{0|(4<<4)},    { 68,  0}, 4},
-    {{0|(3<<4)},    { 51,  0}, 0},
+    {{0|(3<<4)},    { 51,  0}, 4},
-    {{0|(2<<4)},    { 34,  0}, 0},
+    {{0|(2<<4)},    { 34,  0}, 4},
-    {{0|(1<<4)},    { 17,  0}, 0},
+    {{0|(1<<4)},    { 17,  0}, 4},
    {{0|(0<<4)},    {  0,  0}, 1},
    {{1|(0<<4)},    {  0, 16}, 1},
-    {{1|(1<<4)},    { 17, 16}, 0},
+    {{1|(1<<4)},    { 17, 16}, 4},
-    {{1|(2<<4)},    { 34, 16}, 0},
+    {{1|(2<<4)},    { 34, 16}, 4},
-    {{1|(3<<4)},    { 51, 16}, 0},
+    {{1|(3<<4)},    { 51, 16}, 4},
-    {{1|(4<<4)},    { 68, 16}, 0},
+    {{1|(4<<4)},    { 68, 16}, 4},
-    {{1|(5<<4)},    { 85, 16}, 0},
+    {{1|(5<<4)},    { 85, 16}, 4},
-    {{1|(6<<4)},    {102, 16}, 0},
+    {{1|(6<<4)},    {102, 16}, 4},
-    {{2|(6<<4)},    {102, 32}, 0},
+    {{2|(6<<4)},    {102, 32}, 4},
-    {{2|(5<<4)},    { 85, 32}, 0},
+    {{2|(5<<4)},    { 85, 32}, 4},
-    {{3|(2<<4)},    { 32, 48}, 0}, //D1-D16
+    {{3|(2<<4)},    { 32, 48}, 4}, //D1-D16
-    {{3|(1<<4)},    { 17, 48}, 0},
+    {{3|(1<<4)},    { 17, 48}, 4},
    {{3|(0<<4)},    {  0, 48}, 1},
    {{2|(0<<4)},    {  0, 32}, 1},
-    {{2|(1<<4)},    { 17, 32}, 0},
+    {{2|(1<<4)},    { 17, 32}, 4},
-    {{2|(2<<4)},    { 34, 32}, 0},
+    {{2|(2<<4)},    { 34, 32}, 4},
-    {{2|(3<<4)},    { 51, 32}, 0},
+    {{2|(3<<4)},    { 51, 32}, 4},
-    {{2|(4<<4)},    { 68, 32}, 0},
+    {{2|(4<<4)},    { 68, 32}, 4},
-    {{3|(3<<4)},    { 51, 48}, 0},
+    {{3|(3<<4)},    { 51, 48}, 4},
-    {{3|(4<<4)},    { 68, 48}, 0},
+    {{3|(4<<4)},    { 68, 48}, 4},
-    {{3|(5<<4)},    { 85, 48}, 0},
+    {{3|(5<<4)},    { 85, 48}, 4},
-    {{3|(6<<4)},    {102, 48}, 0},
+    {{3|(6<<4)},    {102, 48}, 4},
-    {{4|(3<<4)},    {102, 64}, 0},
+    {{4|(3<<4)},    {102, 64}, 4},
    {{4|(2<<4)},    { 34, 68}, 1},
    {{4|(1<<4)},    { 17, 68}, 1},
    {{4|(0<<4)},    {  0, 68}, 1}
@@ -15,7 +15,7 @@ const uint8_t RGBLED_SNAKE_INTERVALS[] PROGMEM = {100, 50, 20};
 const uint8_t RGBLED_KNIGHT_INTERVALS[] PROGMEM = {127, 63, 31};
 // These control which colors are selected for the gradient mode
-const uint16_t RGBLED_GRADIENT_RANGES[] PROGMEM = {360, 240, 180, 120, 90};
+const uint8_t RGBLED_GRADIENT_RANGES[] PROGMEM = {255, 170, 127, 85, 64};
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  [0] = LAYOUT(
@@ -21,13 +21,13 @@
 	k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
 	k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
 	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-	k30, k31, k32, k33, k34,    k35,   k37, k38, k39, k3a, k3b \
+	k30, k31, k32, k33, k34,    k35,   k37, k38, k39, k3a, k3b  \
 ) \
 { \
 	{ k00, k01, k02, k03, k04, k05, k06,   k07, k08, k09, k0a, k0b }, \
 	{ k10, k11, k12, k13, k14, k15, k16,   k17, k18, k19, k1a, k1b }, \
 	{ k20, k21, k22, k23, k24, k25, k26,   k27, k28, k29, k2a, k2b }, \
-	{ k30, k31, k32, k33, k34, k35, KC_NO, k37, k38, k39, k3a, k3b } \
+	{ k30, k31, k32, k33, k34, k35, KC_NO, k37, k38, k39, k3a, k3b }  \
 }
 // The PCB does support a grid layout, but the case does not.
@@ -35,11 +35,24 @@
 	k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
 	k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
 	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
-	k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b \
+	k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b  \
 ) \
 { \
 	{ k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b }, \
 	{ k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b }, \
 	{ k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b }, \
-	{ k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b } \
+	{ k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b }  \
 }
 #define LAYOUT_kc_ortho_4x12( \
 	k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
 	k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
 	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
 	k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b  \
 ) \
 { \
 	{ KC_##k00, KC_##k01, KC_##k02, KC_##k03, KC_##k04, KC_##k05, KC_##k06, KC_##k07, KC_##k08, KC_##k09, KC_##k0a, KC_##k0b }, \
 	{ KC_##k10, KC_##k11, KC_##k12, KC_##k13, KC_##k14, KC_##k15, KC_##k16, KC_##k17, KC_##k18, KC_##k19, KC_##k1a, KC_##k1b }, \
 	{ KC_##k20, KC_##k21, KC_##k22, KC_##k23, KC_##k24, KC_##k25, KC_##k26, KC_##k27, KC_##k28, KC_##k29, KC_##k2a, KC_##k2b }, \
 	{ KC_##k30, KC_##k31, KC_##k32, KC_##k33, KC_##k34, KC_##k35, KC_##k36, KC_##k37, KC_##k38, KC_##k39, KC_##k3a, KC_##k3b }  \
 }
@@ -65,7 +65,7 @@ BOOTLOADER = atmel-dfu
 BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration(+1000)
 MOUSEKEY_ENABLE = no        # Mouse keys(+4700)
 EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
-CONSOLE_ENABLE = yes        # Console for debug(+400)
+CONSOLE_ENABLE = no        # Console for debug(+400)
 COMMAND_ENABLE = yes        # Commands for debug and configuration
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
@@ -79,3 +79,5 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 AUDIO_ENABLE = no           # Audio output on port C6
 FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches
 HD44780_ENABLE = no 		# Enable support for HD44780 based LCDs (+400)
 LAYOUTS = ortho_4x12 planck_mit
@@ -123,6 +123,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_MATRIX_LED_PROCESS_LIMIT 15
 #define RGB_MATRIX_LED_FLUSH_LIMIT 10
 #define RGB_MATRIX_EXTRA_TOG
 #include "config_led.h"
@@ -20,122 +20,122 @@
 //
 // There is a quick-and-dirty implementation of this under ledvis.html
-const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
+rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
-  /*  0 */ { { (0)|(0  << 4) }, { 8,   56 }, 0 }, // KC_ESC
+  /*  0 */ { { (0)|(0  << 4) }, { 8,   56 }, 4 }, // KC_ESC
-  /*  1 */ { { (0)|(1  << 4) }, { 22,  56 }, 0 }, // KC_1
+  /*  1 */ { { (0)|(1  << 4) }, { 22,  56 }, 4 }, // KC_1
-  /*  2 */ { { (0)|(2  << 4) }, { 35,  56 }, 0 }, // KC_2
+  /*  2 */ { { (0)|(2  << 4) }, { 35,  56 }, 4 }, // KC_2
-  /*  3 */ { { (0)|(3  << 4) }, { 49,  56 }, 0 }, // KC_3
+  /*  3 */ { { (0)|(3  << 4) }, { 49,  56 }, 4 }, // KC_3
-  /*  4 */ { { (0)|(4  << 4) }, { 63,  56 }, 0 }, // KC_4
+  /*  4 */ { { (0)|(4  << 4) }, { 63,  56 }, 4 }, // KC_4
-  /*  5 */ { { (0)|(5  << 4) }, { 77,  56 }, 0 }, // KC_5
+  /*  5 */ { { (0)|(5  << 4) }, { 77,  56 }, 4 }, // KC_5
-  /*  6 */ { { (0)|(6  << 4) }, { 91,  56 }, 0 }, // KC_6
+  /*  6 */ { { (0)|(6  << 4) }, { 91,  56 }, 4 }, // KC_6
-  /*  7 */ { { (0)|(7  << 4) }, { 105, 56 }, 0 }, // KC_7
+  /*  7 */ { { (0)|(7  << 4) }, { 105, 56 }, 4 }, // KC_7
-  /*  8 */ { { (0)|(8  << 4) }, { 118, 56 }, 0 }, // KC_8
+  /*  8 */ { { (0)|(8  << 4) }, { 118, 56 }, 4 }, // KC_8
-  /*  9 */ { { (0)|(9  << 4) }, { 132, 56 }, 0 }, // KC_9
+  /*  9 */ { { (0)|(9  << 4) }, { 132, 56 }, 4 }, // KC_9
-  /* 10 */ { { (0)|(10 << 4) }, { 146, 56 }, 0 }, // KC_0
+  /* 10 */ { { (0)|(10 << 4) }, { 146, 56 }, 4 }, // KC_0
-  /* 11 */ { { (0)|(11 << 4) }, { 160, 56 }, 0 }, // KC_MINS
+  /* 11 */ { { (0)|(11 << 4) }, { 160, 56 }, 4 }, // KC_MINS
-  /* 12 */ { { (0)|(12 << 4) }, { 174, 56 }, 0 }, // KC_EQL
+  /* 12 */ { { (0)|(12 << 4) }, { 174, 56 }, 4 }, // KC_EQL
-  /* 13 */ { { (0)|(13 << 4) }, { 195, 56 }, 0 }, // KC_BSPC
+  /* 13 */ { { (0)|(13 << 4) }, { 195, 56 }, 4 }, // KC_BSPC
-  /* 14 */ { { (0)|(14 << 4) }, { 215, 56 }, 0 }, // KC_DEL
+  /* 14 */ { { (0)|(14 << 4) }, { 215, 56 }, 4 }, // KC_DEL
-  /* 15 */ { { (1)|(0  << 4) }, { 11,  44 }, 0 }, // KC_TAB
+  /* 15 */ { { (1)|(0  << 4) }, { 11,  44 }, 4 }, // KC_TAB
-  /* 16 */ { { (1)|(1  << 4) }, { 28,  44 }, 0 }, // KC_Q
+  /* 16 */ { { (1)|(1  << 4) }, { 28,  44 }, 4 }, // KC_Q
-  /* 17 */ { { (1)|(2  << 4) }, { 42,  44 }, 0 }, // KC_W
+  /* 17 */ { { (1)|(2  << 4) }, { 42,  44 }, 4 }, // KC_W
-  /* 18 */ { { (1)|(3  << 4) }, { 56,  44 }, 0 }, // KC_E
+  /* 18 */ { { (1)|(3  << 4) }, { 56,  44 }, 4 }, // KC_E
-  /* 19 */ { { (1)|(4  << 4) }, { 70,  44 }, 0 }, // KC_R
+  /* 19 */ { { (1)|(4  << 4) }, { 70,  44 }, 4 }, // KC_R
-  /* 20 */ { { (1)|(5  << 4) }, { 84,  44 }, 0 }, // KC_T
+  /* 20 */ { { (1)|(5  << 4) }, { 84,  44 }, 4 }, // KC_T
-  /* 21 */ { { (1)|(6  << 4) }, { 98,  44 }, 0 }, // KC_Y
+  /* 21 */ { { (1)|(6  << 4) }, { 98,  44 }, 4 }, // KC_Y
-  /* 22 */ { { (1)|(7  << 4) }, { 112, 44 }, 0 }, // KC_U
+  /* 22 */ { { (1)|(7  << 4) }, { 112, 44 }, 4 }, // KC_U
-  /* 23 */ { { (1)|(8  << 4) }, { 125, 44 }, 0 }, // KC_I
+  /* 23 */ { { (1)|(8  << 4) }, { 125, 44 }, 4 }, // KC_I
-  /* 24 */ { { (1)|(9  << 4) }, { 139, 44 }, 0 }, // KC_O
+  /* 24 */ { { (1)|(9  << 4) }, { 139, 44 }, 4 }, // KC_O
-  /* 25 */ { { (1)|(10 << 4) }, { 153, 44 }, 0 }, // KC_P
+  /* 25 */ { { (1)|(10 << 4) }, { 153, 44 }, 4 }, // KC_P
-  /* 26 */ { { (1)|(11 << 4) }, { 167, 44 }, 0 }, // KC_LBRC
+  /* 26 */ { { (1)|(11 << 4) }, { 167, 44 }, 4 }, // KC_LBRC
-  /* 27 */ { { (1)|(12 << 4) }, { 181, 44 }, 0 }, // KC_RBRC
+  /* 27 */ { { (1)|(12 << 4) }, { 181, 44 }, 4 }, // KC_RBRC
-  /* 28 */ { { (1)|(13 << 4) }, { 198, 44 }, 0 }, // KC_BSLS
+  /* 28 */ { { (1)|(13 << 4) }, { 198, 44 }, 4 }, // KC_BSLS
-  /* 29 */ { { (1)|(14 << 4) }, { 215, 44 }, 0 }, // KC_HOME
+  /* 29 */ { { (1)|(14 << 4) }, { 215, 44 }, 4 }, // KC_HOME
  /* 30 */ { { (2)|(0  << 4) }, { 13,  32 }, 1 }, // KC_CAPS
-  /* 31 */ { { (2)|(1  << 4) }, { 32,  32 }, 0 }, // KC_A
+  /* 31 */ { { (2)|(1  << 4) }, { 32,  32 }, 4 }, // KC_A
-  /* 32 */ { { (2)|(2  << 4) }, { 46,  32 }, 0 }, // KC_S
+  /* 32 */ { { (2)|(2  << 4) }, { 46,  32 }, 4 }, // KC_S
-  /* 33 */ { { (2)|(3  << 4) }, { 60,  32 }, 0 }, // KC_D
+  /* 33 */ { { (2)|(3  << 4) }, { 60,  32 }, 4 }, // KC_D
-  /* 34 */ { { (2)|(4  << 4) }, { 73,  32 }, 0 }, // KC_F
+  /* 34 */ { { (2)|(4  << 4) }, { 73,  32 }, 4 }, // KC_F
-  /* 35 */ { { (2)|(5  << 4) }, { 87,  32 }, 0 }, // KC_G
+  /* 35 */ { { (2)|(5  << 4) }, { 87,  32 }, 4 }, // KC_G
-  /* 36 */ { { (2)|(6  << 4) }, { 101, 32 }, 0 }, // KC_H
+  /* 36 */ { { (2)|(6  << 4) }, { 101, 32 }, 4 }, // KC_H
-  /* 37 */ { { (2)|(7  << 4) }, { 115, 32 }, 0 }, // KC_J
+  /* 37 */ { { (2)|(7  << 4) }, { 115, 32 }, 4 }, // KC_J
-  /* 38 */ { { (2)|(8  << 4) }, { 129, 32 }, 0 }, // KC_K
+  /* 38 */ { { (2)|(8  << 4) }, { 129, 32 }, 4 }, // KC_K
-  /* 39 */ { { (2)|(9  << 4) }, { 143, 32 }, 0 }, // KC_L
+  /* 39 */ { { (2)|(9  << 4) }, { 143, 32 }, 4 }, // KC_L
-  /* 40 */ { { (2)|(10 << 4) }, { 156, 32 }, 0 }, // KC_SCLN
+  /* 40 */ { { (2)|(10 << 4) }, { 156, 32 }, 4 }, // KC_SCLN
-  /* 41 */ { { (2)|(11 << 4) }, { 170, 32 }, 0 }, // KC_QUOT
+  /* 41 */ { { (2)|(11 << 4) }, { 170, 32 }, 4 }, // KC_QUOT
  /* _________________________________________ */ // ____
-  /* 42 */ { { (2)|(13 << 4) }, { 193, 32 }, 0 }, // KC_ENT
+  /* 42 */ { { (2)|(13 << 4) }, { 193, 32 }, 4 }, // KC_ENT
-  /* 43 */ { { (2)|(14 << 4) }, { 215, 32 }, 0 }, // KC_PGUP
+  /* 43 */ { { (2)|(14 << 4) }, { 215, 32 }, 4 }, // KC_PGUP
-  /* 44 */ { { (3)|(0  << 4) }, { 16,  19 }, 0 }, // KC_LSFT
+  /* 44 */ { { (3)|(0  << 4) }, { 16,  19 }, 4 }, // KC_LSFT
-  /* 45 */ { { (3)|(2  << 4) }, { 39,  19 }, 0 }, // KC_Z
+  /* 45 */ { { (3)|(2  << 4) }, { 39,  19 }, 4 }, // KC_Z
-  /* 46 */ { { (3)|(3  << 4) }, { 53,  19 }, 0 }, // KC_X
+  /* 46 */ { { (3)|(3  << 4) }, { 53,  19 }, 4 }, // KC_X
-  /* 47 */ { { (3)|(4  << 4) }, { 67,  19 }, 0 }, // KC_C
+  /* 47 */ { { (3)|(4  << 4) }, { 67,  19 }, 4 }, // KC_C
-  /* 48 */ { { (3)|(5  << 4) }, { 80,  19 }, 0 }, // KC_V
+  /* 48 */ { { (3)|(5  << 4) }, { 80,  19 }, 4 }, // KC_V
-  /* 49 */ { { (3)|(6  << 4) }, { 94,  19 }, 0 }, // KC_B
+  /* 49 */ { { (3)|(6  << 4) }, { 94,  19 }, 4 }, // KC_B
-  /* 50 */ { { (3)|(7  << 4) }, { 108, 19 }, 0 }, // KC_N
+  /* 50 */ { { (3)|(7  << 4) }, { 108, 19 }, 4 }, // KC_N
-  /* 51 */ { { (3)|(8  << 4) }, { 122, 19 }, 0 }, // KC_M
+  /* 51 */ { { (3)|(8  << 4) }, { 122, 19 }, 4 }, // KC_M
-  /* 52 */ { { (3)|(9  << 4) }, { 136, 19 }, 0 }, // KC_COMM
+  /* 52 */ { { (3)|(9  << 4) }, { 136, 19 }, 4 }, // KC_COMM
-  /* 53 */ { { (3)|(10 << 4) }, { 150, 19 }, 0 }, // KC_DOT
+  /* 53 */ { { (3)|(10 << 4) }, { 150, 19 }, 4 }, // KC_DOT
-  /* 54 */ { { (3)|(11 << 4) }, { 163, 19 }, 0 }, // KC_SLSH
+  /* 54 */ { { (3)|(11 << 4) }, { 163, 19 }, 4 }, // KC_SLSH
-  /* 55 */ { { (3)|(12 << 4) }, { 182, 19 }, 0 }, // KC_RSFT
+  /* 55 */ { { (3)|(12 << 4) }, { 182, 19 }, 4 }, // KC_RSFT
  /* _________________________________________ */ // ____
-  /* 56 */ { { (3)|(13 << 4) }, { 201, 19 }, 0 }, // KC_UP
+  /* 56 */ { { (3)|(13 << 4) }, { 201, 19 }, 4 }, // KC_UP
-  /* 57 */ { { (3)|(14 << 4) }, { 215, 19 }, 0 }, // KC_PGDN
+  /* 57 */ { { (3)|(14 << 4) }, { 215, 19 }, 4 }, // KC_PGDN
-  /* 58 */ { { (4)|(0  << 4) }, { 9,    7 }, 0 }, // KC_LCTL
+  /* 58 */ { { (4)|(0  << 4) }, { 9,    7 }, 4 }, // KC_LCTL
-  /* 59 */ { { (4)|(1  << 4) }, { 27,   7 }, 0 }, // KC_LGUI
+  /* 59 */ { { (4)|(1  << 4) }, { 27,   7 }, 4 }, // KC_LGUI
-  /* 60 */ { { (4)|(2  << 4) }, { 44,   7 }, 0 }, // KC_LALT
+  /* 60 */ { { (4)|(2  << 4) }, { 44,   7 }, 4 }, // KC_LALT
  /* _________________________________________ */ // ____
  /* _________________________________________ */ // ____
  /* _________________________________________ */ // ____
-  /* 61 */ { { (4)|(6  << 4) }, { 96,   7 }, 0 }, // KC_SPC
+  /* 61 */ { { (4)|(6  << 4) }, { 96,   7 }, 4 }, // KC_SPC
  /* _________________________________________ */ // ____
  /* _________________________________________ */ // ____
  /* _________________________________________ */ // ____
-  /* 62 */ { { (4)|(10 << 4) }, { 148,  7 }, 0 }, // KC_RALT
+  /* 62 */ { { (4)|(10 << 4) }, { 148,  7 }, 4 }, // KC_RALT
-  /* 63 */ { { (4)|(11 << 4) }, { 165,  7 }, 0 }, // MO(1)
+  /* 63 */ { { (4)|(11 << 4) }, { 165,  7 }, 4 }, // MO(1)
-  /* 64 */ { { (4)|(12 << 4) }, { 188,  7 }, 0 }, // KC_LEFT
+  /* 64 */ { { (4)|(12 << 4) }, { 188,  7 }, 4 }, // KC_LEFT
-  /* 65 */ { { (4)|(13 << 4) }, { 201,  7 }, 0 }, // KC_DOWN
+  /* 65 */ { { (4)|(13 << 4) }, { 201,  7 }, 4 }, // KC_DOWN
-  /* 66 */ { { (4)|(14 << 4) }, { 215,  7 }, 0 }, // KC_RGHT
+  /* 66 */ { { (4)|(14 << 4) }, { 215,  7 }, 4 }, // KC_RGHT
  // Underglow LEDs
-  { { 255 }, { 1,    1 }, 0 },
+  { { 255 }, { 1,    1 }, 2 },
-  { { 255 }, { 15,   0 }, 0 },
+  { { 255 }, { 15,   0 }, 2 },
-  { { 255 }, { 31,   0 }, 0 },
+  { { 255 }, { 31,   0 }, 2 },
-  { { 255 }, { 47,   0 }, 0 },
+  { { 255 }, { 47,   0 }, 2 },
-  { { 255 }, { 63,   0 }, 0 },
+  { { 255 }, { 63,   0 }, 2 },
-  { { 255 }, { 79,   0 }, 0 },
+  { { 255 }, { 79,   0 }, 2 },
-  { { 255 }, { 95,   0 }, 0 },
+  { { 255 }, { 95,   0 }, 2 },
-  { { 255 }, { 112,  0 }, 0 },
+  { { 255 }, { 112,  0 }, 2 },
-  { { 255 }, { 128,  0 }, 0 },
+  { { 255 }, { 128,  0 }, 2 },
-  { { 255 }, { 144,  0 }, 0 },
+  { { 255 }, { 144,  0 }, 2 },
-  { { 255 }, { 160,  0 }, 0 },
+  { { 255 }, { 160,  0 }, 2 },
-  { { 255 }, { 176,  0 }, 0 },
+  { { 255 }, { 176,  0 }, 2 },
-  { { 255 }, { 192,  0 }, 0 },
+  { { 255 }, { 192,  0 }, 2 },
-  { { 255 }, { 208,  0 }, 0 },
+  { { 255 }, { 208,  0 }, 2 },
-  { { 255 }, { 222,  1 }, 0 },
+  { { 255 }, { 222,  1 }, 2 },
-  { { 255 }, { 224, 13 }, 0 },
+  { { 255 }, { 224, 13 }, 2 },
-  { { 255 }, { 224, 25 }, 0 },
+  { { 255 }, { 224, 25 }, 2 },
-  { { 255 }, { 224, 38 }, 0 },
+  { { 255 }, { 224, 38 }, 2 },
-  { { 255 }, { 224, 50 }, 0 },
+  { { 255 }, { 224, 50 }, 2 },
-  { { 255 }, { 222, 62 }, 0 },
+  { { 255 }, { 222, 62 }, 2 },
-  { { 255 }, { 191, 64 }, 0 },
+  { { 255 }, { 191, 64 }, 2 },
-  { { 255 }, { 179, 64 }, 0 },
+  { { 255 }, { 179, 64 }, 2 },
-  { { 255 }, { 167, 64 }, 0 },
+  { { 255 }, { 167, 64 }, 2 },
-  { { 255 }, { 153, 64 }, 0 },
+  { { 255 }, { 153, 64 }, 2 },
-  { { 255 }, { 139, 64 }, 0 },
+  { { 255 }, { 139, 64 }, 2 },
-  { { 255 }, { 125, 64 }, 0 },
+  { { 255 }, { 125, 64 }, 2 },
-  { { 255 }, { 112, 64 }, 0 },
+  { { 255 }, { 112, 64 }, 2 },
-  { { 255 }, { 98,  64 }, 0 },
+  { { 255 }, { 98,  64 }, 2 },
-  { { 255 }, { 84,  64 }, 0 },
+  { { 255 }, { 84,  64 }, 2 },
-  { { 255 }, { 70,  64 }, 0 },
+  { { 255 }, { 70,  64 }, 2 },
-  { { 255 }, { 56,  64 }, 0 },
+  { { 255 }, { 56,  64 }, 2 },
-  { { 255 }, { 42,  64 }, 0 },
+  { { 255 }, { 42,  64 }, 2 },
-  { { 255 }, { 28,  64 }, 0 },
+  { { 255 }, { 28,  64 }, 2 },
-  { { 255 }, { 1,   62 }, 0 },
+  { { 255 }, { 1,   62 }, 2 },
-  { { 255 }, { 0,   50 }, 0 },
+  { { 255 }, { 0,   50 }, 2 },
-  { { 255 }, { 0,   38 }, 0 },
+  { { 255 }, { 0,   38 }, 2 },
-  { { 255 }, { 0,   25 }, 0 },
+  { { 255 }, { 0,   25 }, 2 },
-  { { 255 }, { 0,   13 }, 0 },
+  { { 255 }, { 0,   13 }, 2 },
 };
 #ifdef USB_LED_INDICATOR_ENABLE
@@ -95,6 +95,32 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
                }
            }
            return false;
        case RGB_TOG:
            if (record->event.pressed) {
              switch (rgb_matrix_get_flags()) {
                case LED_FLAG_ALL: {
                    rgb_matrix_set_flags(LED_FLAG_KEYLIGHT);
                    rgb_matrix_set_color_all(0, 0, 0);
                  }
                  break;
                case LED_FLAG_KEYLIGHT: {
                    rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
                    rgb_matrix_set_color_all(0, 0, 0);
                  }
                  break;
                case LED_FLAG_UNDERGLOW: {
                    rgb_matrix_set_flags(LED_FLAG_NONE);
                    rgb_matrix_disable_noeeprom();
                  }
                  break;
                default: {
                    rgb_matrix_set_flags(LED_FLAG_ALL);
                    rgb_matrix_enable_noeeprom();
                  }
                  break;
              }
            }
            return false;
        default:
            return true; //Process all other keycodes normally
    }
@@ -95,6 +95,32 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
                }
            }
            return false;
        case RGB_TOG:
            if (record->event.pressed) {
              switch (rgb_matrix_get_flags()) {
                case LED_FLAG_ALL: {
                    rgb_matrix_set_flags(LED_FLAG_KEYLIGHT);
                    rgb_matrix_set_color_all(0, 0, 0);
                  }
                  break;
                case LED_FLAG_KEYLIGHT: {
                    rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
                    rgb_matrix_set_color_all(0, 0, 0);
                  }
                  break;
                case LED_FLAG_UNDERGLOW: {
                    rgb_matrix_set_flags(LED_FLAG_NONE);
                    rgb_matrix_disable_noeeprom();
                  }
                  break;
                default: {
                    rgb_matrix_set_flags(LED_FLAG_ALL);
                    rgb_matrix_enable_noeeprom();
                  }
                  break;
              }
            }
            return false;
        default:
            return true; //Process all other keycodes normally
    }
@@ -95,6 +95,32 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
                }
            }
            return false;
        case RGB_TOG:
            if (record->event.pressed) {
              switch (rgb_matrix_get_flags()) {
                case LED_FLAG_ALL: {
                    rgb_matrix_set_flags(LED_FLAG_KEYLIGHT);
                    rgb_matrix_set_color_all(0, 0, 0);
                  }
                  break;
                case LED_FLAG_KEYLIGHT: {
                    rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
                    rgb_matrix_set_color_all(0, 0, 0);
                  }
                  break;
                case LED_FLAG_UNDERGLOW: {
                    rgb_matrix_set_flags(LED_FLAG_NONE);
                    rgb_matrix_disable_noeeprom();
                  }
                  break;
                default: {
                    rgb_matrix_set_flags(LED_FLAG_ALL);
                    rgb_matrix_enable_noeeprom();
                  }
                  break;
              }
            }
            return false;
        default:
            return true; //Process all other keycodes normally
    }
@@ -123,6 +123,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_MATRIX_KEYPRESSES
 #define RGB_MATRIX_LED_PROCESS_LIMIT 15
 #define RGB_MATRIX_LED_FLUSH_LIMIT 10
 #define RGB_MATRIX_EXTRA_TOG
 #include "config_led.h"
@@ -5,133 +5,133 @@
 #include "rgb_matrix.h"
 #include "config_led.h"
-const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
+rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
  // 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
-  { { 0|(0<<4) }, { 7, 5 }, 0 },
+  { { 0|(0<<4) }, { 7, 5 }, 4 },
-  { { 0|(1<<4) }, { 31, 5 }, 0 },
+  { { 0|(1<<4) }, { 31, 5 }, 4 },
-  { { 0|(2<<4) }, { 43, 5 }, 0 },
+  { { 0|(2<<4) }, { 43, 5 }, 4 },
-  { { 0|(3<<4) }, { 55, 5 }, 0 },
+  { { 0|(3<<4) }, { 55, 5 }, 4 },
-  { { 0|(4<<4) }, { 67, 5 }, 0 },
+  { { 0|(4<<4) }, { 67, 5 }, 4 },
-  { { 0|(5<<4) }, { 85, 5 }, 0 },
+  { { 0|(5<<4) }, { 85, 5 }, 4 },
-  { { 0|(6<<4) }, { 97, 5 }, 0 },
+  { { 0|(6<<4) }, { 97, 5 }, 4 },
-  { { 0|(7<<4) }, { 109, 5 }, 0 },
+  { { 0|(7<<4) }, { 109, 5 }, 4 },
-  { { 6|(0<<4) }, { 121, 5 }, 0 },
+  { { 6|(0<<4) }, { 121, 5 }, 4 },
-  { { 6|(1<<4) }, { 139, 5 }, 0 },
+  { { 6|(1<<4) }, { 139, 5 }, 4 },
-  { { 6|(2<<4) }, { 151, 5 }, 0 },
+  { { 6|(2<<4) }, { 151, 5 }, 4 },
-  { { 6|(3<<4) }, { 163, 5 }, 0 },
+  { { 6|(3<<4) }, { 163, 5 }, 4 },
-  { { 6|(4<<4) }, { 175, 5 }, 0 },
+  { { 6|(4<<4) }, { 175, 5 }, 4 },
-  { { 6|(5<<4) }, { 193, 5 }, 0 },
+  { { 6|(5<<4) }, { 193, 5 }, 4 },
  { { 6|(6<<4) }, { 205, 5 }, 1 },
-  { { 6|(7<<4) }, { 217, 5 }, 0 },
+  { { 6|(7<<4) }, { 217, 5 }, 4 },
  // 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_BSPC, KC_INS, KC_HOME, KC_PGUP
-  { { 1|(0<<4) }, { 7, 20 }, 0 },
+  { { 1|(0<<4) }, { 7, 20 }, 4 },
-  { { 1|(1<<4) }, { 19, 20 }, 0 },
+  { { 1|(1<<4) }, { 19, 20 }, 4 },
-  { { 1|(2<<4) }, { 31, 20 }, 0 },
+  { { 1|(2<<4) }, { 31, 20 }, 4 },
-  { { 1|(3<<4) }, { 43, 20 }, 0 },
+  { { 1|(3<<4) }, { 43, 20 }, 4 },
-  { { 1|(4<<4) }, { 55, 20 }, 0 },
+  { { 1|(4<<4) }, { 55, 20 }, 4 },
-  { { 1|(5<<4) }, { 67, 20 }, 0 },
+  { { 1|(5<<4) }, { 67, 20 }, 4 },
-  { { 1|(6<<4) }, { 79, 20 }, 0 },
+  { { 1|(6<<4) }, { 79, 20 }, 4 },
-  { { 1|(7<<4) }, { 91, 20 }, 0 },
+  { { 1|(7<<4) }, { 91, 20 }, 4 },
-  { { 7|(0<<4) }, { 103, 20 }, 0 },
+  { { 7|(0<<4) }, { 103, 20 }, 4 },
-  { { 7|(1<<4) }, { 115, 20 }, 0 },
+  { { 7|(1<<4) }, { 115, 20 }, 4 },
-  { { 7|(2<<4) }, { 127, 20 }, 0 },
+  { { 7|(2<<4) }, { 127, 20 }, 4 },
-  { { 7|(3<<4) }, { 139, 20 }, 0 },
+  { { 7|(3<<4) }, { 139, 20 }, 4 },
-  { { 7|(4<<4) }, { 151, 20 }, 0 },
+  { { 7|(4<<4) }, { 151, 20 }, 4 },
-  { { 7|(5<<4) }, { 169, 20 }, 0 },
+  { { 7|(5<<4) }, { 169, 20 }, 4 },
-  { { 7|(6<<4) }, { 193, 20 }, 0 },
+  { { 7|(6<<4) }, { 193, 20 }, 4 },
-  { { 7|(7<<4) }, { 205, 20 }, 0 },
+  { { 7|(7<<4) }, { 205, 20 }, 4 },
-  { { 9|(7<<4) }, { 217, 20 }, 0 },
+  { { 9|(7<<4) }, { 217, 20 }, 4 },
  // 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
-  { { 2|(0<<4) }, { 10, 30 }, 0 },
+  { { 2|(0<<4) }, { 10, 30 }, 4 },
-  { { 2|(1<<4) }, { 25, 30 }, 0 },
+  { { 2|(1<<4) }, { 25, 30 }, 4 },
-  { { 2|(2<<4) }, { 37, 30 }, 0 },
+  { { 2|(2<<4) }, { 37, 30 }, 4 },
-  { { 2|(3<<4) }, { 49, 30 }, 0 },
+  { { 2|(3<<4) }, { 49, 30 }, 4 },
-  { { 2|(4<<4) }, { 61, 30 }, 0 },
+  { { 2|(4<<4) }, { 61, 30 }, 4 },
-  { { 2|(5<<4) }, { 73, 30 }, 0 },
+  { { 2|(5<<4) }, { 73, 30 }, 4 },
-  { { 2|(6<<4) }, { 85, 30 }, 0 },
+  { { 2|(6<<4) }, { 85, 30 }, 4 },
-  { { 2|(7<<4) }, { 97, 30 }, 0 },
+  { { 2|(7<<4) }, { 97, 30 }, 4 },
-  { { 8|(0<<4) }, { 109, 30 }, 0 },
+  { { 8|(0<<4) }, { 109, 30 }, 4 },
-  { { 8|(1<<4) }, { 121, 30 }, 0 },
+  { { 8|(1<<4) }, { 121, 30 }, 4 },
-  { { 8|(2<<4) }, { 133, 30 }, 0 },
+  { { 8|(2<<4) }, { 133, 30 }, 4 },
-  { { 8|(3<<4) }, { 145, 30 }, 0 },
+  { { 8|(3<<4) }, { 145, 30 }, 4 },
-  { { 8|(4<<4) }, { 157, 30 }, 0 },
+  { { 8|(4<<4) }, { 157, 30 }, 4 },
-  { { 8|(5<<4) }, { 172, 30 }, 0 },
+  { { 8|(5<<4) }, { 172, 30 }, 4 },
-  { { 8|(6<<4) }, { 193, 30 }, 0 },
+  { { 8|(6<<4) }, { 193, 30 }, 4 },
-  { { 8|(7<<4) }, { 205, 30 }, 0 },
+  { { 8|(7<<4) }, { 205, 30 }, 4 },
-  { { 9|(6<<4) }, { 217, 30 }, 0 },
+  { { 9|(6<<4) }, { 217, 30 }, 4 },
  // 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
  { { 3|(0<<4) }, { 11, 39 }, 1 },
-  { { 3|(1<<4) }, { 28, 39 }, 0 },
+  { { 3|(1<<4) }, { 28, 39 }, 4 },
-  { { 3|(2<<4) }, { 40, 39 }, 0 },
+  { { 3|(2<<4) }, { 40, 39 }, 4 },
-  { { 3|(3<<4) }, { 52, 39 }, 0 },
+  { { 3|(3<<4) }, { 52, 39 }, 4 },
-  { { 3|(4<<4) }, { 64, 39 }, 0 },
+  { { 3|(4<<4) }, { 64, 39 }, 4 },
-  { { 3|(5<<4) }, { 76, 39 }, 0 },
+  { { 3|(5<<4) }, { 76, 39 }, 4 },
-  { { 3|(6<<4) }, { 88, 39 }, 0 },
+  { { 3|(6<<4) }, { 88, 39 }, 4 },
-  { { 3|(7<<4) }, { 100, 39 }, 0 },
+  { { 3|(7<<4) }, { 100, 39 }, 4 },
-  { { 9|(0<<4) }, { 112, 39 }, 0 },
+  { { 9|(0<<4) }, { 112, 39 }, 4 },
-  { { 9|(1<<4) }, { 124, 39 }, 0 },
+  { { 9|(1<<4) }, { 124, 39 }, 4 },
-  { { 9|(2<<4) }, { 136, 39 }, 0 },
+  { { 9|(2<<4) }, { 136, 39 }, 4 },
-  { { 9|(3<<4) }, { 148, 39 }, 0 },
+  { { 9|(3<<4) }, { 148, 39 }, 4 },
-  { { 9|(4<<4) }, { 168, 39 }, 0 },
+  { { 9|(4<<4) }, { 168, 39 }, 4 },
  // KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP
-  { { 4|(0<<4) }, { 14, 49 }, 0 },
+  { { 4|(0<<4) }, { 14, 49 }, 4 },
-  { { 4|(1<<4) }, { 34, 49 }, 0 },
+  { { 4|(1<<4) }, { 34, 49 }, 4 },
-  { { 4|(2<<4) }, { 46, 49 }, 0 },
+  { { 4|(2<<4) }, { 46, 49 }, 4 },
-  { { 4|(3<<4) }, { 58, 49 }, 0 },
+  { { 4|(3<<4) }, { 58, 49 }, 4 },
-  { { 4|(4<<4) }, { 70, 49 }, 0 },
+  { { 4|(4<<4) }, { 70, 49 }, 4 },
-  { { 4|(5<<4) }, { 82, 49 }, 0 },
+  { { 4|(5<<4) }, { 82, 49 }, 4 },
-  { { 4|(6<<4) }, { 94, 49 }, 0 },
+  { { 4|(6<<4) }, { 94, 49 }, 4 },
-  { { 4|(7<<4) }, { 106, 49 }, 0 },
+  { { 4|(7<<4) }, { 106, 49 }, 4 },
-  { { 10|(0<<4) }, { 118, 49 }, 0 },
+  { { 10|(0<<4) }, { 118, 49 }, 4 },
-  { { 10|(1<<4) }, { 130, 49 }, 0 },
+  { { 10|(1<<4) }, { 130, 49 }, 4 },
-  { { 10|(2<<4) }, { 142, 49 }, 0 },
+  { { 10|(2<<4) }, { 142, 49 }, 4 },
-  { { 10|(3<<4) }, { 165, 49 }, 0 },
+  { { 10|(3<<4) }, { 165, 49 }, 4 },
-  { { 9|(5<<4) }, { 205, 49 }, 0 },
+  { { 9|(5<<4) }, { 205, 49 }, 4 },
  // KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_APP, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-  { { 5|(0<<4) }, { 8, 59 }, 0 },
+  { { 5|(0<<4) }, { 8, 59 }, 4 },
-  { { 5|(1<<4) }, { 23, 59 }, 0 },
+  { { 5|(1<<4) }, { 23, 59 }, 4 },
-  { { 5|(2<<4) }, { 38, 59 }, 0 },
+  { { 5|(2<<4) }, { 38, 59 }, 4 },
-  { { 5|(3<<4) }, { 83, 59 }, 0 },
+  { { 5|(3<<4) }, { 83, 59 }, 4 },
-  { { 5|(4<<4) }, { 129, 59 }, 0 },
+  { { 5|(4<<4) }, { 129, 59 }, 4 },
-  { { 5|(5<<4) }, { 144, 59 }, 0 },
+  { { 5|(5<<4) }, { 144, 59 }, 4 },
-  { { 5|(6<<4) }, { 159, 59 }, 0 },
+  { { 5|(6<<4) }, { 159, 59 }, 4 },
-  { { 5|(7<<4) }, { 174, 59 }, 0 },
+  { { 5|(7<<4) }, { 174, 59 }, 4 },
-  { { 10|(4<<4) }, { 193, 59 }, 0 },
+  { { 10|(4<<4) }, { 193, 59 }, 4 },
-  { { 10|(5<<4) }, { 205, 59 }, 0 },
+  { { 10|(5<<4) }, { 205, 59 }, 4 },
-  { { 10|(6<<4) }, { 217, 59 }, 0 },
+  { { 10|(6<<4) }, { 217, 59 }, 4 },
  // Underglow / Border
-  { { 0xFF }, { 222, 64 }, 0 },
+  { { 0xFF }, { 222, 64 }, 2 },
-  { { 0xFF }, { 204, 64 }, 0 },
+  { { 0xFF }, { 204, 64 }, 2 },
-  { { 0xFF }, { 186, 64 }, 0 },
+  { { 0xFF }, { 186, 64 }, 2 },
-  { { 0xFF }, { 167, 64 }, 0 },
+  { { 0xFF }, { 167, 64 }, 2 },
-  { { 0xFF }, { 149, 64 }, 0 },
+  { { 0xFF }, { 149, 64 }, 2 },
-  { { 0xFF }, { 130, 64 }, 0 },
+  { { 0xFF }, { 130, 64 }, 2 },
-  { { 0xFF }, { 112, 64 }, 0 },
+  { { 0xFF }, { 112, 64 }, 2 },
-  { { 0xFF }, { 94, 64 }, 0 },
+  { { 0xFF }, { 94, 64 }, 2 },
-  { { 0xFF }, { 75, 64 }, 0 },
+  { { 0xFF }, { 75, 64 }, 2 },
-  { { 0xFF }, { 57, 64 }, 0 },
+  { { 0xFF }, { 57, 64 }, 2 },
-  { { 0xFF }, { 38, 64 }, 0 },
+  { { 0xFF }, { 38, 64 }, 2 },
-  { { 0xFF }, { 20, 64 }, 0 },
+  { { 0xFF }, { 20, 64 }, 2 },
-  { { 0xFF }, { 0, 64 }, 0 },
+  { { 0xFF }, { 0, 64 }, 2 },
-  { { 0xFF }, { 0, 47 }, 0 },
+  { { 0xFF }, { 0, 47 }, 2 },
-  { { 0xFF }, { 0, 32 }, 0 },
+  { { 0xFF }, { 0, 32 }, 2 },
-  { { 0xFF }, { 0, 17 }, 0 },
+  { { 0xFF }, { 0, 17 }, 2 },
-  { { 0xFF }, { 0, 0 }, 0 },
+  { { 0xFF }, { 0, 0 }, 2 },
-  { { 0xFF }, { 20, 0 }, 0 },
+  { { 0xFF }, { 20, 0 }, 2 },
-  { { 0xFF }, { 38, 0 }, 0 },
+  { { 0xFF }, { 38, 0 }, 2 },
-  { { 0xFF }, { 57, 0 }, 0 },
+  { { 0xFF }, { 57, 0 }, 2 },
-  { { 0xFF }, { 75, 0 }, 0 },
+  { { 0xFF }, { 75, 0 }, 2 },
-  { { 0xFF }, { 94, 0 }, 0 },
+  { { 0xFF }, { 94, 0 }, 2 },
-  { { 0xFF }, { 112, 0 }, 0 },
+  { { 0xFF }, { 112, 0 }, 2 },
-  { { 0xFF }, { 130, 0 }, 0 },
+  { { 0xFF }, { 130, 0 }, 2 },
-  { { 0xFF }, { 149, 0 }, 0 },
+  { { 0xFF }, { 149, 0 }, 2 },
-  { { 0xFF }, { 167, 0 }, 0 },
+  { { 0xFF }, { 167, 0 }, 2 },
-  { { 0xFF }, { 186, 0 }, 0 },
+  { { 0xFF }, { 186, 0 }, 2 },
-  { { 0xFF }, { 204, 0 }, 0 },
+  { { 0xFF }, { 204, 0 }, 2 },
-  { { 0xFF }, { 222, 1 }, 0 },
+  { { 0xFF }, { 222, 1 }, 2 },
-  { { 0xFF }, { 224, 17 }, 0 },
+  { { 0xFF }, { 224, 17 }, 2 },
-  { { 0xFF }, { 224, 32 }, 0 },
+  { { 0xFF }, { 224, 32 }, 2 },
-  { { 0xFF }, { 224, 47 }, 0 },
+  { { 0xFF }, { 224, 47 }, 2 },
 };
 #ifdef USB_LED_INDICATOR_ENABLE
@@ -98,6 +98,32 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
                }
            }
            return false;
        case RGB_TOG:
            if (record->event.pressed) {
              switch (rgb_matrix_get_flags()) {
                case LED_FLAG_ALL: {
                    rgb_matrix_set_flags(LED_FLAG_KEYLIGHT);
                    rgb_matrix_set_color_all(0, 0, 0);
                  }
                  break;
                case LED_FLAG_KEYLIGHT: {
                    rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
                    rgb_matrix_set_color_all(0, 0, 0);
                  }
                  break;
                case LED_FLAG_UNDERGLOW: {
                    rgb_matrix_set_flags(LED_FLAG_NONE);
                    rgb_matrix_disable_noeeprom();
                  }
                  break;
                default: {
                    rgb_matrix_set_flags(LED_FLAG_ALL);
                    rgb_matrix_enable_noeeprom();
                  }
                  break;
              }
            }
            return false;
        default:
            return true; //Process all other keycodes normally
    }
@@ -98,6 +98,32 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
                }
            }
            return false;
        case RGB_TOG:
            if (record->event.pressed) {
              switch (rgb_matrix_get_flags()) {
                case LED_FLAG_ALL: {
                    rgb_matrix_set_flags(LED_FLAG_KEYLIGHT);
                    rgb_matrix_set_color_all(0, 0, 0);
                  }
                  break;
                case LED_FLAG_KEYLIGHT: {
                    rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
                    rgb_matrix_set_color_all(0, 0, 0);
                  }
                  break;
                case LED_FLAG_UNDERGLOW: {
                    rgb_matrix_set_flags(LED_FLAG_NONE);
                    rgb_matrix_disable_noeeprom();
                  }
                  break;
                default: {
                    rgb_matrix_set_flags(LED_FLAG_ALL);
                    rgb_matrix_enable_noeeprom();
                  }
                  break;
              }
            }
            return false;
        default:
            return true; //Process all other keycodes normally
    }
@@ -46,34 +46,34 @@ void set_led_to(int led, uint8_t r, uint8_t g, uint8_t b) {
 #ifdef RGB_MATRIX_ENABLE
 __attribute__ ((weak))
-const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
+rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
-  {{0x73}, {  3, 35}, 0},
+  {{0x73}, {  3, 35}, 4},
-  {{0x72}, {  0, 26}, 0},
+  {{0x72}, {  0, 26}, 4},
-  {{0x71}, {  0, 17}, 0},
+  {{0x71}, {  0, 17}, 4},
-  {{0x70}, {  0,  6}, 0},
+  {{0x70}, {  0,  6}, 4},
-  {{0x60}, { 14,  5}, 0},
+  {{0x60}, { 14,  5}, 4},
-  {{0x61}, { 15, 16}, 0},
+  {{0x61}, { 15, 16}, 4},
-  {{0x62}, { 16, 25}, 0},
+  {{0x62}, { 16, 25}, 4},
-  {{0x63}, { 17, 34}, 0},
+  {{0x63}, { 17, 34}, 4},
-  {{0x53}, { 31, 29}, 0},
+  {{0x53}, { 31, 29}, 4},
-  {{0x52}, { 31, 19}, 0},
+  {{0x52}, { 31, 19}, 4},
-  {{0x51}, { 30, 11}, 0},
+  {{0x51}, { 30, 11}, 4},
-  {{0x50}, { 30,  1}, 0},
+  {{0x50}, { 30,  1}, 4},
-  {{0x40}, { 45,  0}, 0},
+  {{0x40}, { 45,  0}, 4},
-  {{0x41}, { 45,  8}, 0},
+  {{0x41}, { 45,  8}, 4},
-  {{0x42}, { 46, 17}, 0},
+  {{0x42}, { 46, 17}, 4},
-  {{0x43}, { 46, 27}, 0},
+  {{0x43}, { 46, 27}, 4},
-  {{0x33}, { 60, 27}, 0},
+  {{0x33}, { 60, 27}, 4},
-  {{0x32}, { 60, 18}, 0},
+  {{0x32}, { 60, 18}, 4},
-  {{0x31}, { 60,  9}, 0},
+  {{0x31}, { 60,  9}, 4},
-  {{0x30}, { 60,  0}, 0},
+  {{0x30}, { 60,  0}, 4},
-  {{0x20}, { 74,  2}, 0},
+  {{0x20}, { 74,  2}, 4},
-  {{0x21}, { 74, 11}, 0},
+  {{0x21}, { 74, 11}, 4},
-  {{0x22}, { 75, 20}, 0},
+  {{0x22}, { 75, 20}, 4},
-  {{0x23}, { 74, 28}, 0},
+  {{0x23}, { 74, 28}, 4},
-  {{0x12}, { 89, 30}, 0},
+  {{0x12}, { 89, 30}, 4},
-  {{0x11}, { 89, 19}, 0},
+  {{0x11}, { 89, 19}, 4},
-  {{0x10}, { 89,  7}, 0},
+  {{0x10}, { 89,  7}, 4},
  {{0x00}, { 70, 38}, 1},
  {{0x01}, { 82, 41}, 1},
  {{0x02}, { 93, 45}, 1},
@@ -84,33 +84,33 @@ const rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
  {{0x76}, {130, 45}, 1},
  {{0x75}, {141, 41}, 1},
  {{0x74}, {153, 38}, 1},
-  {{0x64}, {134,  7}, 0},
+  {{0x64}, {134,  7}, 4},
-  {{0x65}, {134, 19}, 0},
+  {{0x65}, {134, 19}, 4},
-  {{0x66}, {134, 30}, 0},
+  {{0x66}, {134, 30}, 4},
-  {{0x57}, {149, 28}, 0},
+  {{0x57}, {149, 28}, 4},
-  {{0x56}, {148, 20}, 0},
+  {{0x56}, {148, 20}, 4},
-  {{0x55}, {149, 11}, 0},
+  {{0x55}, {149, 11}, 4},
-  {{0x54}, {149,  2}, 0},
+  {{0x54}, {149,  2}, 4},
-  {{0x44}, {163,  0}, 0},
+  {{0x44}, {163,  0}, 4},
-  {{0x45}, {163,  9}, 0},
+  {{0x45}, {163,  9}, 4},
-  {{0x46}, {163, 18}, 0},
+  {{0x46}, {163, 18}, 4},
-  {{0x47}, {163, 27}, 0},
+  {{0x47}, {163, 27}, 4},
-  {{0x37}, {177, 27}, 0},
+  {{0x37}, {177, 27}, 4},
-  {{0x36}, {177, 17}, 0},
+  {{0x36}, {177, 17}, 4},
-  {{0x35}, {178,  8}, 0},
+  {{0x35}, {178,  8}, 4},
-  {{0x34}, {178,  0}, 0},
+  {{0x34}, {178,  0}, 4},
-  {{0x24}, {193,  1}, 0},
+  {{0x24}, {193,  1}, 4},
-  {{0x25}, {193, 11}, 0},
+  {{0x25}, {193, 11}, 4},
-  {{0x26}, {192, 19}, 0},
+  {{0x26}, {192, 19}, 4},
-  {{0x27}, {192, 29}, 0},
+  {{0x27}, {192, 29}, 4},
-  {{0x17}, {206, 34}, 0},
+  {{0x17}, {206, 34}, 4},
-  {{0x16}, {207, 25}, 0},
+  {{0x16}, {207, 25}, 4},
-  {{0x15}, {208, 16}, 0},
+  {{0x15}, {208, 16}, 4},
-  {{0x14}, {209,  5}, 0},
+  {{0x14}, {209,  5}, 4},
-  {{0x04}, {224,  6}, 0},
+  {{0x04}, {224,  6}, 4},
-  {{0x05}, {223, 17}, 0},
+  {{0x05}, {223, 17}, 4},
-  {{0x06}, {223, 26}, 0},
+  {{0x06}, {223, 26}, 4},
-  {{0x07}, {220, 35}, 0},
+  {{0x07}, {220, 35}, 4},
 };
 static struct {
Author	SHA1	Message	Date
XScorpion2	3235c8527d	Simple fix for selecting which tracked key press to work off of for simple reactive effects (#5745 )	2019-05-01 11:36:50 -07:00
XScorpion2	22ba36a4d8	rgblight 255 hue (#5547 )	2019-05-01 08:02:02 -07:00
XScorpion2	50bc2dbe77	Fixing incorrect usage of RGBLED_NUM in ws2812 driver when used with RGB Matrix (#5744 )	2019-05-01 05:48:33 -07:00
Josh Hinnebusch	61ce41ae13	[Keyboard] Update hineybush keyboard projects (#5554 ) * Add H87a keymap and info * Create readme.md * Add h87a .json for kbfirmware.com use * Update readme.md * Update readme.md * Update h87a files * Delete Makefile * Update readme.md * Delete desktop.ini * update files to match new QMK framework * Update files to match new QMK structure * Update files to match new QMK structure * add layout name information * Add info.json * update keymap to support layout_all * update keymap to support layout_all * update rules.mk to fix filesize * Update readme.md * Update config.h * Update readme.md * Update config.h * Update config.h Add "define CONFIG_H and include "config_common.h" back to file * update config.h to include RGB turnoff when PC goes to sleep * update info.json * update info.json * Update readme.md Add project link * Update readme.md * refactor hineybush projects into single folder. update hineyg80 to modern code * updated layout file to reflect new keymap changes * actually updated all layout names this time, verified make * Update keyboards/hineybush/h87a/h87a.h Co-Authored-By: hineybush <[email protected]> * Update keyboards/hineybush/h87a/keymaps/default/config.h Co-Authored-By: hineybush <[email protected]> * Update keyboards/hineybush/h87a/readme.md Co-Authored-By: hineybush <[email protected]> * edit based on PR edit requests * update hiney80 files to avoid confusion * update hineyg80.h to reflect matrix * Update keyboards/hineybush/hineyg80/info.json Co-Authored-By: hineybush <[email protected]> * Update keyboards/hineybush/hineyg80/info.json Co-Authored-By: hineybush <[email protected]> * Update keyboards/hineybush/hineyg80/info.json Co-Authored-By: hineybush <[email protected]> * Update keyboards/hineybush/h87a/info.json Co-Authored-By: hineybush <[email protected]> * Update keyboards/hineybush/h87a/keymaps/default/config.h Co-Authored-By: hineybush <[email protected]> * Update keyboards/hineybush/hineyg80/keymaps/wkl/config.h Co-Authored-By: hineybush <[email protected]> * Update keyboards/hineybush/h87a/keymaps/default/config.h Co-Authored-By: hineybush <[email protected]> * Update keyboards/hineybush/hineyg80/readme.md Co-Authored-By: hineybush <[email protected]> * Update keyboards/hineybush/hineyg80/readme.md Co-Authored-By: hineybush <[email protected]> * Update keyboards/hineybush/h87a/readme.md Co-Authored-By: hineybush <[email protected]> * Update keyboards/hineybush/h87a/readme.md Co-Authored-By: hineybush <[email protected]> * Update keyboards/hineybush/h87a/keymaps/default/config.h Co-Authored-By: hineybush <[email protected]> * Update keyboards/hineybush/h87a/keymaps/wkl/config.h Co-Authored-By: hineybush <[email protected]> * Update keyboards/hineybush/h87a/keymaps/wkl/config.h Co-Authored-By: hineybush <[email protected]> * Update keyboards/hineybush/hineyg80/keymaps/default/config.h Co-Authored-By: hineybush <[email protected]> * Update keyboards/hineybush/h87a/keymaps/wkl/config.h Co-Authored-By: hineybush <[email protected]> * Update keyboards/hineybush/h87a/readme.md Co-Authored-By: hineybush <[email protected]> * Update keyboards/hineybush/h87a/keymaps/wkl/config.h Co-Authored-By: hineybush <[email protected]> * Update keyboards/hineybush/h87a/readme.md Co-Authored-By: hineybush <[email protected]> * Update keyboards/hineybush/hineyg80/hineyg80.c Co-Authored-By: hineybush <[email protected]> * update hineyg80 config.h * Update keyboards/hineybush/h87a/keymaps/wkl/keymap.c Co-Authored-By: hineybush <[email protected]> * Update keyboards/hineybush/h87a/keymaps/wkl/keymap.c Co-Authored-By: hineybush <[email protected]> * Update keyboards/hineybush/h87a/keymaps/wkl/keymap.c Co-Authored-By: hineybush <[email protected]> * Update keyboards/hineybush/h87a/keymaps/wkl/keymap.c Co-Authored-By: hineybush <[email protected]> * Update keyboards/hineybush/hineyg80/hineyg80.c Co-Authored-By: hineybush <[email protected]> * Update keyboards/hineybush/hineyg80/hineyg80.c Co-Authored-By: hineybush <[email protected]> * Update keyboards/hineybush/hineyg80/hineyg80.c Co-Authored-By: hineybush <[email protected]> * Update keyboards/hineybush/h87a/keymaps/wkl/keymap.c Co-Authored-By: hineybush <[email protected]> * Update keyboards/hineybush/h87a/keymaps/wkl/keymap.c Co-Authored-By: hineybush <[email protected]> * Update keyboards/hineybush/h87a/keymaps/wkl/keymap.c Co-Authored-By: hineybush <[email protected]> * Update keyboards/hineybush/h87a/keymaps/wkl/keymap.c Co-Authored-By: hineybush <[email protected]> * Update keyboards/hineybush/hineyg80/hineyg80.c Co-Authored-By: hineybush <[email protected]> * Update keyboards/hineybush/hineyg80/hineyg80.c Co-Authored-By: hineybush <[email protected]> * Update keyboards/hineybush/hineyg80/hineyg80.c Co-Authored-By: hineybush <[email protected]> * Update keyboards/hineybush/hineyg80/hineyg80.c Co-Authored-By: hineybush <[email protected]> * Update keyboards/hineybush/hineyg80/hineyg80.c Co-Authored-By: hineybush <[email protected]> * Update keyboards/hineybush/hineyg80/hineyg80.c Co-Authored-By: hineybush <[email protected]> * Update keyboards/hineybush/hineyg80/config.h Co-Authored-By: hineybush <[email protected]> * Update keyboards/hineybush/hineyg80/config.h Co-Authored-By: hineybush <[email protected]> * Update keyboards/hineybush/hineyg80/config.h Co-Authored-By: hineybush <[email protected]>	2019-04-30 22:35:49 -07:00
fauxpark	e4b5c44262	[Docs] Use HTTPS for qmk.fm link (#5506 ) * Use HTTPS for qmk.fm link * Fix the rest of the HTTP links	2019-04-30 21:54:52 -07:00
Jan Christoph Ebersbach	074be4fe5e	[Keyboard] Signum3.0 generate json keymap (#5688 ) * Remove dependency on sortedcontainers * Sort dictionary on output * Externalize writing of keymap.c into function - serialize layers into one flat list * Add encoding * Generate JSON keymap in addition to keymap.c * Replace XXXXXX with KC_NO	2019-04-30 21:53:29 -07:00
mikethetiger	670ff2d19f	[Keymap] Made adjustment to my Preonic keymap (#5733 ) * Added my Preonic keymap * Update keyboards/preonic/keymaps/mikethetiger/keymap.c Co-Authored-By: mikethetiger <[email protected]> * Update keyboards/preonic/keymaps/mikethetiger/keymap.c Co-Authored-By: mikethetiger <[email protected]> * Added my Preonic keymap * Added my Preonic keymap	2019-04-30 21:35:21 -07:00
XScorpion2	e95283b545	[Keymap] Xulkal keymap tweeks (#5746 ) * Minor keymap tweeks and more oled data * Update keymap.c	2019-04-30 20:55:01 -07:00
Benjamin	8725197ad6	[Keyboard] Adds support for BM16S keyboard (#5659 ) * Added support for BM16S keyboard. * Update keyboards/bm16s/bm16s.h Co-Authored-By: bontakun <[email protected]> * Update keyboards/bm16s/bm16s.h Co-Authored-By: bontakun <[email protected]> * Cleaned up a bunch of unneeded stuff. * Made layout name match. * Changed rules file to have correct bootloader and indention. Updated readme to reflect availability on krepublic. Updated keymap to have more obvious RGB controls. * Removed unnecessary file. * Fixed grammar in readme. Co-Authored-By: bontakun <[email protected]> * Migrated to autogenerated layout config, without issue. * Renamed LAYOUT to match community standards.	2019-04-30 19:29:51 -07:00
Ryan Caltabiano	d67b99ff3c	Added OLED Driver to the summary	2019-04-30 18:04:11 -07:00
Daniel Peregolise	7c2a7ab817	[Keyboard] doro67 readme clarification (#5736 ) * readme clarification * Apply suggestions from code review verbiage updates Co-Authored-By: dperegolise <[email protected]> * mechmerlin suggested verbiage	2019-04-30 12:11:57 -07:00
Drashna Jaelre	5b9667a4bf	Ignore VSCode ipsh folder (#5741 )	2019-04-30 09:18:11 -07:00
Jeremy Bernhardt	0cde880747	🐮🥛 Butterstick Support 🥛🐮 (#5742 ) * Working on chording * Working on chording * Got layouts in order * Initial Georgi support * forgot to add keymaps * Updated readme * Update keyboards/georgi/keymaps/template/readme.md Co-Authored-By: germ <[email protected]> * Update keyboards/georgi/georgi.h Co-Authored-By: germ <[email protected]> * Update keyboards/georgi/keymaps/default/keymap.c Co-Authored-By: germ <[email protected]> * Update keyboards/georgi/keymaps/default/keymap.c Co-Authored-By: germ <[email protected]> * Update keyboards/georgi/rules.mk Co-Authored-By: germ <[email protected]> * Update keyboards/georgi/rules.mk Co-Authored-By: germ <[email protected]> * Update keyboards/georgi/matrix.c Co-Authored-By: germ <[email protected]> * Update keyboards/georgi/georgi.c Co-Authored-By: germ <[email protected]> * Update keyboards/georgi/georgi.c Co-Authored-By: germ <[email protected]> * Update keyboards/georgi/rules.mk Co-Authored-By: germ <[email protected]> * Update keyboards/georgi/keymaps/default/keymap.c Co-Authored-By: germ <[email protected]> * Update keyboards/georgi/keymaps/template/keymap.c Co-Authored-By: germ <[email protected]> * Update keyboards/georgi/matrix.c Co-Authored-By: germ <[email protected]> * Disabled features, updated info * Update keyboards/georgi/config.h Co-Authored-By: germ <[email protected]> * Update keyboards/georgi/config.h Co-Authored-By: germ <[email protected]> * Fixed info.json * Split the number button and fixed gaming mode. * started work on history feature * Working history/multikeyfuckery * type * inital code reduction refactor * Got multikey patched up, optimizing for size * Forgot to remove stuff * fixed key repeat * Key repeat added. * Symshift locking * Midchord Sym shenanigans. * Added only QWERTY mode * Split out header * Added stickybits, minimal layour * Fixing user layout * Whitespace fixing * Fixing Version name * Starting work on BS * Fixing default layout and rules * Updated Butter fw * Copy-paste rebase * more fixing from merge. Fuck * Forgot to roll version * Added revisions as per @mechmerlin	2019-04-30 08:28:01 -07:00
motform	b09dc19d32	[Keymap] Add motform planck keymap (swedish colemak) (#5734 ) * [Keymap] Add motform planck keymap (swedish colemak) * Add readme and remove unused enums (thanks @drasha!)	2019-04-30 08:25:31 -07:00
XScorpion2	bb208f3e3b	Implement kb function for rgb matrix to led lookup (#5738 )	2019-04-30 07:55:53 -07:00
Jan Christoph Ebersbach	483ad4e3e0	[Keyboard] Signum 3.0 Fix key order in layout (#5687 ) * Fix key order in layout * Reduce keyboard dimensions * Reduce space around keys	2019-04-29 22:06:23 -07:00
Jan Christoph Ebersbach	4c2453aa1b	[Keyboard] Signum3.0 remove sortedcontainers (#5679 ) * Remove dependency on sortedcontainers * Sort dictionary on output	2019-04-29 21:35:34 -07:00
XScorpion2	c745d9b82e	Simple extended space cadet (#5277 ) * Simplifying and Extending Space Cadet to work on Ctrl and Alt keys * PR Review feedback * Reverting back to keycodes	2019-04-29 20:21:46 -07:00
XScorpion2	7d4ae3e66e	Removed forced in lining for lib8tion functions (#5670 )	2019-04-29 17:45:42 -07:00
Alec Geatches	75d72c221d	Change lib8tion library to be usable in user keymaps (#5598 ) * Move lib8tion header-defined constant into implementation file, add to build * Move b_m16_interleave initializtion to lib8tion.c, change build to include lib8tion.c in QUANTUM_LIB_SRC * Remove left-over whitespace * Move lib8tion include by RGB_MATRIX_ENABLE code in makefile * Revert build changes and change lib8tion b_m16_interleave constant to static	2019-04-29 17:44:36 -07:00
Jeremy Bernhardt	507805cd10	[Keyboard] Fixing drag-and-drop (#5728 ) * Fixing drag-and-drop * Forgot to rtfm and do a full build. Added colemak * What	2019-04-29 17:29:00 -07:00
David Dai	e77e46f4bf	[Keyboard] Adding ortho_4x12 & planck_mit layouts for KBD4X (#5729 ) * Adding ortho_4x12 & planck_mit layouts for KBD4X. * Adding LAYOUT_kc_ortho_4x12 macro to KBD4x. * Turn off console for KBD4X so firmware size falls within limit.	2019-04-29 17:27:49 -07:00
noroadsleft	1f0a2d5550	[Keyboard] Minor fixes for Baguette (#5737 ) * Fix Baguette ISO layout in QMK Configurator Corrected the position of the ISO Enter key. * Fix readme markdown Was missing a line break.	2019-04-29 17:23:01 -07:00
XScorpion2	a7113c8ed0	Updated rgb_led struct field modifier to flags (#5619 ) Updated effects to test led flags Updated massdrop to use new flags field for led toggle	2019-04-29 15:18:50 -07:00