[Keymap] Drashna Code Cleanup (#10656)

* Add Launchpad keymap

Note: RGB and Audio won't work when using B pins for audio

* Add support for rgb matrix on launchpad

* Update config for launchpag

* Disable wait on layer change

* Update config for ErgoDox EZ

* Fixup rgb light userspace code

* Move Corne layout to community layouts folder

* Update config for corne to support community layouts

* Add license header to files

* Minor cleanup of userspace config

* Update Pimironi Trackball code

* Increase debounce time on ergodox

* Fix keymap handling

* Enable wait for USB for moonlander

* Update/add license headers

* fix review issues

19 files changed, 481 insertions, 331 deletions

diff --git a/users/drashna/config.h b/users/drashna/config.h
index 7d83c7884..9fc65e5c9 100644
--- a/users/drashna/config.h
+++ b/users/drashna/config.h
@@ -1,3 +1,19 @@
+/* Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #pragma once
 
 // Use custom magic number so that when switching branches, EEPROM always gets reset
@@ -7,11 +23,6 @@
 #define USB_POLLING_INTERVAL_MS 1
 
 #ifdef AUDIO_ENABLE
-#    if __GNUC__ > 5
-#        if __has_include("drashna_song_list.h")
-#            include "drashna_song_list.h"
-#        endif  // if file exists
-#    endif      // __GNUC__
 
 #    define AUDIO_CLICKY
 #    define STARTUP_SONG SONG(RICK_ROLL)
@@ -49,7 +60,7 @@
 // #   define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
 // #   define EECONFIG_RGB_MATRIX (uint32_t *)16
 
-#    if defined(__AVR__) && !defined(__AVR_AT90USB1286__)
+#    if defined(__AVR__) && !defined(__AVR_AT90USB1286__) && !defined(KEYBOARD_launchpad)
 #        define DISABLE_RGB_MATRIX_ALPHAS_MODS
 #        define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN
 #        define DISABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
@@ -63,7 +74,7 @@
 #        define DISABLE_RGB_MATRIX_CYCLE_ALL
 #        define DISABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
 #        define DISABLE_RGB_MATRIX_CYCLE_UP_DOWN
-#        define DISABLE_RGB_MATRIX_CYCLE_OUT_IN
+// #        define DISABLE_RGB_MATRIX_CYCLE_OUT_IN
 // #       define DISABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
 #        define DISABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
 #        define DISABLE_RGB_MATRIX_DUAL_BEACON
@@ -100,7 +111,7 @@
 
 #ifdef QMK_KEYS_PER_SCAN
 #    undef QMK_KEYS_PER_SCAN
-#    define QMK_KEYS_PER_SCAN 1
+#    define QMK_KEYS_PER_SCAN 2
 #endif  // !QMK_KEYS_PER_SCAN
 
 // this makes it possible to do rolling combos (zx) with keys that
@@ -111,6 +122,7 @@
 #undef PERMISSIVE_HOLD
 //#define TAPPING_FORCE_HOLD
 //#define RETRO_TAPPING
+#define TAPPING_TERM_PER_KEY
 
 #define FORCE_NKRO
 
diff --git a/users/drashna/drashna.c b/users/drashna/drashna.c
index 5c0f18027..ec6484621 100644
--- a/users/drashna/drashna.c
+++ b/users/drashna/drashna.c
@@ -1,19 +1,18 @@
-/*
-Copyright 2017 Christopher Courtney <drashna@live.com> @drashna
-
-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/>.
-*/
+/* Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
 #include "drashna.h"
 
diff --git a/users/drashna/drashna.h b/users/drashna/drashna.h
index dd2b02258..772005a03 100644
--- a/users/drashna/drashna.h
+++ b/users/drashna/drashna.h
@@ -1,19 +1,18 @@
-/*
-Copyright 2017 Christopher Courtney <drashna@live.com> @drashna
-
-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/>.
-*/
+/* Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
 #pragma once
 #include QMK_KEYBOARD_H
diff --git a/users/drashna/oled_stuff.c b/users/drashna/oled_stuff.c
index 6503b970e..46288aad2 100644
--- a/users/drashna/oled_stuff.c
+++ b/users/drashna/oled_stuff.c
@@ -1,3 +1,19 @@
+/* Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include "drashna.h"
 
 extern uint8_t is_master;
diff --git a/users/drashna/oled_stuff.h b/users/drashna/oled_stuff.h
index 662e206b7..7f2786d00 100644
--- a/users/drashna/oled_stuff.h
+++ b/users/drashna/oled_stuff.h
@@ -1,3 +1,19 @@
+/* Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #pragma once
 
 #include "quantum.h"
diff --git a/users/drashna/pimoroni_trackball.c b/users/drashna/pimoroni_trackball.c
index c5bb560b3..9ae094c05 100644
--- a/users/drashna/pimoroni_trackball.c
+++ b/users/drashna/pimoroni_trackball.c
@@ -1,3 +1,19 @@
+/* Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include "pimoroni_trackball.h"
 #include "i2c_master.h"
 
@@ -6,7 +22,7 @@ static int16_t x_offset       = 0;
 static int16_t y_offset       = 0;
 static int16_t h_offset       = 0;
 static int16_t v_offset       = 0;
-static float precisionSpeed = 1;
+static float   precisionSpeed = 1;
 
 #ifndef I2C_TIMEOUT
 #    define I2C_TIMEOUT 100
@@ -47,17 +63,37 @@ __attribute__((weak)) void trackball_check_click(bool pressed, report_mouse_t* m
     }
 }
 
+void trackball_register_button(bool pressed, enum mouse_buttons button) {
+    report_mouse_t currentReport = pointing_device_get_report();
+    if (pressed) {
+        currentReport.buttons |= button;
+    } else {
+        currentReport.buttons &= ~button;
+    }
+    pointing_device_set_report(currentReport);
+}
+
 float trackball_get_precision(void) { return precisionSpeed; }
-void    trackball_set_precision(float precision) { precisionSpeed = precision; }
-bool    trackball_is_scrolling(void) { return scrolling; }
-void    trackball_set_scrolling(bool scroll) { scrolling = scroll; }
+void  trackball_set_precision(float precision) { precisionSpeed = precision; }
+bool  trackball_is_scrolling(void) { return scrolling; }
+void  trackball_set_scrolling(bool scroll) { scrolling = scroll; }
 
-__attribute__((weak)) void pointing_device_init(void) { trackball_set_rgbw(0x00,0x00,0x00,0x4F); }
+bool has_report_changed (report_mouse_t first, report_mouse_t second) {
+    return !(
+        (!first.buttons && first.buttons == second.buttons) &&
+        (!first.x && first.x == second.x) &&
+        (!first.y && first.y == second.y) &&
+        (!first.h && first.h == second.h) &&
+        (!first.v && first.v == second.v) );
+}
+
+
+__attribute__((weak)) void pointing_device_init(void) { trackball_set_rgbw(0x00, 0x00, 0x00, 0x4F); }
 
 void pointing_device_task(void) {
-    static bool debounce;
+    static bool     debounce;
     static uint16_t debounce_timer;
-    uint8_t state[5] = {};
+    uint8_t         state[5] = {};
     if (i2c_readReg(TRACKBALL_WRITE, 0x04, state, 5, I2C_TIMEOUT) == I2C_STATUS_SUCCESS) {
         if (!state[4] && !debounce) {
             if (scrolling) {
@@ -85,7 +121,7 @@ void pointing_device_task(void) {
             }
         } else {
             if (state[4]) {
-                debounce = true;
+                debounce       = true;
                 debounce_timer = timer_read();
             }
         }
@@ -97,7 +133,6 @@ void pointing_device_task(void) {
 
     trackball_check_click(state[4] & (1 << 7), &mouse);
 
-
 #ifndef PIMORONI_TRACKBALL_ROTATE
     update_member(&mouse.x, &x_offset);
     update_member(&mouse.y, &y_offset);
@@ -110,5 +145,7 @@ void pointing_device_task(void) {
     update_member(&mouse.v, &h_offset);
 #endif
     pointing_device_set_report(mouse);
-    pointing_device_send();
+    if (has_report_changed(mouse, pointing_device_get_report())) {
+        pointing_device_send();
+    }
 }
diff --git a/users/drashna/pimoroni_trackball.h b/users/drashna/pimoroni_trackball.h
index 7e8a7cc81..83d248d3f 100644
--- a/users/drashna/pimoroni_trackball.h
+++ b/users/drashna/pimoroni_trackball.h
@@ -1,3 +1,19 @@
+/* Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #pragma once
 
 #include "quantum.h"
@@ -11,6 +27,7 @@
 
 void trackball_set_rgbw(uint8_t red, uint8_t green, uint8_t blue, uint8_t white);
 void trackball_check_click(bool pressed, report_mouse_t *mouse);
+void trackball_register_button(bool pressed, enum mouse_buttons button);
 
 float trackball_get_precision(void);
 void    trackball_set_precision(float precision);
diff --git a/users/drashna/process_records.c b/users/drashna/process_records.c
index 8e3d3356e..19bdef73f 100644
--- a/users/drashna/process_records.c
+++ b/users/drashna/process_records.c
@@ -1,3 +1,19 @@
+/* Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include "drashna.h"
 
 uint16_t copy_paste_timer;
@@ -21,304 +37,171 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     process_record_user_oled(keycode, record);
 #endif  // OLED
 
-    if (process_record_keymap(keycode, record) && process_record_secrets(keycode, record)
+    if (!(process_record_keymap(keycode, record) && process_record_secrets(keycode, record)
 #ifdef RGB_MATRIX_ENABLE
         && process_record_user_rgb_matrix(keycode, record)
 #endif
 #ifdef RGBLIGHT_ENABLE
         && process_record_user_rgb_light(keycode, record)
 #endif
-    ) {
-        switch (keycode) {
-            case KC_QWERTY ... KC_WORKMAN:
-                if (record->event.pressed) {
-                    uint8_t mods = mod_config(get_mods() | get_oneshot_mods());
-                    if (!mods) {
-                        set_single_persistent_default_layer(keycode - KC_QWERTY);
-                    } else if (mods & MOD_MASK_SHIFT) {
-                        set_single_persistent_default_layer(keycode - KC_QWERTY + 4);
-                    } else if (mods & MOD_MASK_CTRL) {
-                        set_single_persistent_default_layer(keycode - KC_QWERTY + 8);
-                    }
+    && true)) {
+        return false;
+    }
+
+    switch (keycode) {
+        case KC_QWERTY ... KC_WORKMAN:
+            if (record->event.pressed) {
+                uint8_t mods = mod_config(get_mods() | get_oneshot_mods());
+                if (!mods) {
+                    set_single_persistent_default_layer(keycode - KC_QWERTY);
+                } else if (mods & MOD_MASK_SHIFT) {
+                    set_single_persistent_default_layer(keycode - KC_QWERTY + 4);
+                } else if (mods & MOD_MASK_CTRL) {
+                    set_single_persistent_default_layer(keycode - KC_QWERTY + 8);
                 }
-                break;
+            }
+            break;
 
-            case KC_MAKE:  // Compiles the firmware, and adds the flash command based on keyboard bootloader
-                if (!record->event.pressed) {
+        case KC_MAKE:  // Compiles the firmware, and adds the flash command based on keyboard bootloader
+            if (!record->event.pressed) {
 #ifndef MAKE_BOOTLOADER
-                    uint8_t temp_mod = mod_config(get_mods());
-                    uint8_t temp_osm = mod_config(get_oneshot_mods());
-                    clear_mods();
-                    clear_oneshot_mods();
+                uint8_t temp_mod = mod_config(get_mods());
+                uint8_t temp_osm = mod_config(get_oneshot_mods());
+                clear_mods();
+                clear_oneshot_mods();
 #endif
-                    send_string_with_delay_P(PSTR("qmk"), TAP_CODE_DELAY);
+                send_string_with_delay_P(PSTR("qmk"), TAP_CODE_DELAY);
 #ifndef MAKE_BOOTLOADER
-                    if ((temp_mod | temp_osm) & MOD_MASK_SHIFT)
+                if ((temp_mod | temp_osm) & MOD_MASK_SHIFT)
 #endif
-                    {
-                        send_string_with_delay_P(PSTR(" flash "), TAP_CODE_DELAY);
+                {
+                    send_string_with_delay_P(PSTR(" flash "), TAP_CODE_DELAY);
 #ifndef MAKE_BOOTLOADER
-                    } else {
-                        send_string_with_delay_P(PSTR(" compile "), TAP_CODE_DELAY);
+                } else {
+                    send_string_with_delay_P(PSTR(" compile "), TAP_CODE_DELAY);
 #endif
-                    }
-                    send_string_with_delay_P(PSTR("-kb " QMK_KEYBOARD " -km " QMK_KEYMAP), TAP_CODE_DELAY);
+                }
+                send_string_with_delay_P(PSTR("-kb " QMK_KEYBOARD " -km " QMK_KEYMAP), TAP_CODE_DELAY);
 #ifdef RGB_MATRIX_SPLIT_RIGHT
-                    send_string_with_delay_P(PSTR(" RGB_MATRIX_SPLIT_RIGHT=yes"), TAP_CODE_DELAY);
+                send_string_with_delay_P(PSTR(" RGB_MATRIX_SPLIT_RIGHT=yes"), TAP_CODE_DELAY);
 #    ifndef OLED_DRIVER_ENABLE
-                    send_string_with_delay_P(PSTR(" OLED_DRIVER_ENABLE=no"), TAP_CODE_DELAY);
+                send_string_with_delay_P(PSTR(" OLED_DRIVER_ENABLE=no"), TAP_CODE_DELAY);
 #    endif
 #endif
-                    send_string_with_delay_P(PSTR(SS_TAP(X_ENTER)), TAP_CODE_DELAY);
-                }
+                send_string_with_delay_P(PSTR(SS_TAP(X_ENTER)), TAP_CODE_DELAY);
+            }
 
-                break;
+            break;
 
-            case VRSN:  // Prints firmware version
-                if (record->event.pressed) {
-                    send_string_with_delay_P(PSTR(QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION ", Built on: " QMK_BUILDDATE), TAP_CODE_DELAY);
-                }
-                break;
+        case VRSN:  // Prints firmware version
+            if (record->event.pressed) {
+                send_string_with_delay_P(PSTR(QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION ", Built on: " QMK_BUILDDATE), TAP_CODE_DELAY);
+            }
+            break;
 
-            case KC_DIABLO_CLEAR:  // reset all Diablo timers, disabling them
+        case KC_DIABLO_CLEAR:  // reset all Diablo timers, disabling them
 #ifdef TAP_DANCE_ENABLE
-                if (record->event.pressed) {
-                    for (uint8_t index = 0; index < 4; index++) {
-                        diablo_timer[index].key_interval = 0;
-                    }
+            if (record->event.pressed) {
+                for (uint8_t index = 0; index < 4; index++) {
+                    diablo_timer[index].key_interval = 0;
                 }
+            }
 #endif  // TAP_DANCE_ENABLE
-                break;
+            break;
 
-            case KC_CCCV:  // One key copy/paste
-                if (record->event.pressed) {
-                    copy_paste_timer = timer_read();
-                } else {
-                    if (timer_elapsed(copy_paste_timer) > TAPPING_TERM) {  // Hold, copy
-                        tap_code16(LCTL(KC_C));
-                    } else {  // Tap, paste
-                        tap_code16(LCTL(KC_V));
-                    }
+        case KC_CCCV:  // One key copy/paste
+            if (record->event.pressed) {
+                copy_paste_timer = timer_read();
+            } else {
+                if (timer_elapsed(copy_paste_timer) > TAPPING_TERM) {  // Hold, copy
+                    tap_code16(LCTL(KC_C));
+                } else {  // Tap, paste
+                    tap_code16(LCTL(KC_V));
                 }
-                break;
+            }
+            break;
 #ifdef UNICODE_ENABLE
-            case UC_FLIP:  // (ノಠ痊ಠ)ノ彡┻━┻
-                if (record->event.pressed) {
-                    send_unicode_string("(ノಠ痊ಠ)ノ彡┻━┻");
-                }
-                break;
-            case UC_TABL:  // ┬─┬ノ( º _ ºノ)
-                if (record->event.pressed) {
-                    send_unicode_string("┬─┬ノ( º _ ºノ)");
-                }
-                break;
-            case UC_SHRG:  // ¯\_(ツ)_/¯
-                if (record->event.pressed) {
-                    send_unicode_string("¯\\_(ツ)_/¯");
-                }
-                break;
-            case UC_DISA:  // ಠ_ಠ
-                if (record->event.pressed) {
-                    send_unicode_string("ಠ_ಠ");
-                }
-                break;
+        case UC_FLIP:  // (ノಠ痊ಠ)ノ彡┻━┻
+            if (record->event.pressed) {
+                send_unicode_string("(ノಠ痊ಠ)ノ彡┻━┻");
+            }
+            break;
+        case UC_TABL:  // ┬─┬ノ( º _ ºノ)
+            if (record->event.pressed) {
+                send_unicode_string("┬─┬ノ( º _ ºノ)");
+            }
+            break;
+        case UC_SHRG:  // ¯\_(ツ)_/¯
+            if (record->event.pressed) {
+                send_unicode_string("¯\\_(ツ)_/¯");
+            }
+            break;
+        case UC_DISA:  // ಠ_ಠ
+            if (record->event.pressed) {
+                send_unicode_string("ಠ_ಠ");
+            }
+            break;
 #endif
-            case KC_RGB_T:  // This allows me to use underglow as layer indication, or as normal
+        case KC_RGB_T:  // This allows me to use underglow as layer indication, or as normal
 #if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE)
-                if (record->event.pressed) {
-                    userspace_config.rgb_layer_change ^= 1;
-                    dprintf("rgblight layer change [EEPROM]: %u\n", userspace_config.rgb_layer_change);
-                    eeconfig_update_user(userspace_config.raw);
-                    if (userspace_config.rgb_layer_change) {
+            if (record->event.pressed) {
+                userspace_config.rgb_layer_change ^= 1;
+                dprintf("rgblight layer change [EEPROM]: %u\n", userspace_config.rgb_layer_change);
+                eeconfig_update_user(userspace_config.raw);
+                if (userspace_config.rgb_layer_change) {
 #    if defined(RGBLIGHT_ENABLE) && defined(RGB_MATRIX_ENABLE)
-                        rgblight_enable_noeeprom();
+                    rgblight_enable_noeeprom();
 #    endif
-                        layer_state_set(layer_state);  // This is needed to immediately set the layer color (looks better)
+                    layer_state_set(layer_state);  // This is needed to immediately set the layer color (looks better)
 #    if defined(RGBLIGHT_ENABLE) && defined(RGB_MATRIX_ENABLE)
-                    } else {
-                        rgblight_disable_noeeprom();
+                } else {
+                    rgblight_disable_noeeprom();
 #    endif
-                    }
                 }
+            }
 #endif  // RGBLIGHT_ENABLE
-                break;
+            break;
 
 #if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE)
-            case RGB_TOG:
-                // Split keyboards need to trigger on key-up for edge-case issue
+        case RGB_TOG:
+            // Split keyboards need to trigger on key-up for edge-case issue
 #    ifndef SPLIT_KEYBOARD
-                if (record->event.pressed) {
+            if (record->event.pressed) {
 #    else
-                if (!record->event.pressed) {
+            if (!record->event.pressed) {
 #    endif
 #    if defined(RGBLIGHT_ENABLE) && !defined(RGBLIGHT_DISABLE_KEYCODES)
-                    rgblight_toggle();
+                rgblight_toggle();
 #    endif
 #    if defined(RGB_MATRIX_ENABLE) && !defined(RGB_MATRIX_DISABLE_KEYCODES)
-                    rgb_matrix_toggle();
+                rgb_matrix_toggle();
 #    endif
-                }
-                return false;
-                break;
-            case RGB_MODE_FORWARD ... RGB_MODE_GRADIENT:  // quantum_keycodes.h L400 for definitions
-                if (record->event.pressed) {
-                    bool is_eeprom_updated;
+            }
+            return false;
+            break;
+        case RGB_MODE_FORWARD ... RGB_MODE_GRADIENT:  // quantum_keycodes.h L400 for definitions
+            if (record->event.pressed) {
+                bool is_eeprom_updated;
 #    if defined(RGBLIGHT_ENABLE) && !defined(RGBLIGHT_DISABLE_KEYCODES)
-                    // This disables layer indication, as it's assumed that if you're changing this ... you want that disabled
-                    if (userspace_config.rgb_layer_change) {
-                        userspace_config.rgb_layer_change = false;
-                        dprintf("rgblight layer change [EEPROM]: %u\n", userspace_config.rgb_layer_change);
-                        is_eeprom_updated = true;
-                    }
+                // This disables layer indication, as it's assumed that if you're changing this ... you want that disabled
+                if (userspace_config.rgb_layer_change) {
+                    userspace_config.rgb_layer_change = false;
+                    dprintf("rgblight layer change [EEPROM]: %u\n", userspace_config.rgb_layer_change);
+                    is_eeprom_updated = true;
+                }
 #    endif
 #    if defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_FRAMEBUFFER_EFFECTS)
-                    if (userspace_config.rgb_matrix_idle_anim) {
-                        userspace_config.rgb_matrix_idle_anim = false;
-                        dprintf("RGB Matrix Idle Animation [EEPROM]: %u\n", userspace_config.rgb_matrix_idle_anim);
-                        is_eeprom_updated = true;
-                    }
-#    endif
-                    if (is_eeprom_updated) {
-                        eeconfig_update_user(userspace_config.raw);
-                    }
-                }
-
-#    if defined(RGBLIGHT_DISABLE_KEYCODES) || defined(RGB_MATRIX_DISABLE_KEYCODES)
-                if (keycode == RGB_MODE_FORWARD && record->event.pressed) {
-                    uint8_t shifted = get_mods() & (MOD_MASK_SHIFT);
-                    if (shifted) {
-#        if defined(RGBLIGHT_ENABLE) && !defined(RGBLIGHT_DISABLE_KEYCODES)
-                        rgblight_step_reverse();
-#        endif
-#        if defined(RGB_MATRIX_ENABLE) && !defined(RGB_MATRIX_DISABLE_KEYCODES)
-                        rgb_matrix_step_reverse();
-#        endif
-                    } else {
-#        if defined(RGBLIGHT_ENABLE) && !defined(RGBLIGHT_DISABLE_KEYCODES)
-                        rgblight_step();
-#        endif
-#        if defined(RGB_MATRIX_ENABLE) && !defined(RGB_MATRIX_DISABLE_KEYCODES)
-                        rgb_matrix_step();
-#        endif
-                    }
-                } else if (keycode == RGB_MODE_REVERSE && record->event.pressed) {
-                    uint8_t shifted = get_mods() & (MOD_MASK_SHIFT);
-                    if (shifted) {
-#        if defined(RGBLIGHT_ENABLE) && !defined(RGBLIGHT_DISABLE_KEYCODES)
-                        rgblight_step();
-#        endif
-#        if defined(RGB_MATRIX_ENABLE) && !defined(RGB_MATRIX_DISABLE_KEYCODES)
-                        rgb_matrix_step();
-#        endif
-                    } else {
-#        if defined(RGBLIGHT_ENABLE) && !defined(RGBLIGHT_DISABLE_KEYCODES)
-                        rgblight_step_reverse();
-#        endif
-#        if defined(RGB_MATRIX_ENABLE) && !defined(RGB_MATRIX_DISABLE_KEYCODES)
-                        rgb_matrix_step_reverse();
-#        endif
-                    }
-                } else if (keycode == RGB_HUI) {
-#        ifndef SPLIT_KEYBOARD
-                    if (record->event.pressed) {
-#        else
-                    if (!record->event.pressed) {
-#        endif
-#        if defined(RGBLIGHT_ENABLE) && !defined(RGBLIGHT_DISABLE_KEYCODES)
-                        rgblight_increase_hue();
-#        endif
-#        if defined(RGB_MATRIX_ENABLE) && !defined(RGB_MATRIX_DISABLE_KEYCODES)
-                        rgb_matrix_increase_hue();
-#        endif
-                    }
-                } else if (keycode == RGB_HUD) {
-#        ifndef SPLIT_KEYBOARD
-                    if (record->event.pressed) {
-#        else
-                    if (!record->event.pressed) {
-#        endif
-#        if defined(RGBLIGHT_ENABLE) && !defined(RGBLIGHT_DISABLE_KEYCODES)
-                        rgblight_decrease_hue();
-#        endif
-#        if defined(RGB_MATRIX_ENABLE) && !defined(RGB_MATRIX_DISABLE_KEYCODES)
-                        rgb_matrix_decrease_hue();
-#        endif
-                    }
-                } else if (keycode == RGB_SAI) {
-#        ifndef SPLIT_KEYBOARD
-                    if (record->event.pressed) {
-#        else
-                    if (!record->event.pressed) {
-#        endif
-#        if defined(RGBLIGHT_ENABLE) && !defined(RGBLIGHT_DISABLE_KEYCODES)
-                        rgblight_increase_sat();
-#        endif
-#        if defined(RGB_MATRIX_ENABLE) && !defined(RGB_MATRIX_DISABLE_KEYCODES)
-                        rgb_matrix_increase_sat();
-#        endif
-                    }
-                } else if (keycode == RGB_SAD) {
-#        ifndef SPLIT_KEYBOARD
-                    if (record->event.pressed) {
-#        else
-                    if (!record->event.pressed) {
-#        endif
-#        if defined(RGBLIGHT_ENABLE) && !defined(RGBLIGHT_DISABLE_KEYCODES)
-                        rgblight_decrease_sat();
-#        endif
-#        if defined(RGB_MATRIX_ENABLE) && !defined(RGB_MATRIX_DISABLE_KEYCODES)
-                        rgb_matrix_decrease_sat();
-#        endif
-                    }
-                } else if (keycode == RGB_VAI) {
-#        ifndef SPLIT_KEYBOARD
-                    if (record->event.pressed) {
-#        else
-                    if (!record->event.pressed) {
-#        endif
-#        if defined(RGBLIGHT_ENABLE) && !defined(RGBLIGHT_DISABLE_KEYCODES)
-                        rgblight_increase_val();
-#        endif
-#        if defined(RGB_MATRIX_ENABLE) && !defined(RGB_MATRIX_DISABLE_KEYCODES)
-                        rgb_matrix_increase_val();
-#        endif
-                    }
-                } else if (keycode == RGB_VAD) {
-#        ifndef SPLIT_KEYBOARD
-                    if (record->event.pressed) {
-#        else
-                    if (!record->event.pressed) {
-#        endif
-#        if defined(RGBLIGHT_ENABLE) && !defined(RGBLIGHT_DISABLE_KEYCODES)
-                        rgblight_decrease_val();
-#        endif
-#        if defined(RGB_MATRIX_ENABLE) && !defined(RGB_MATRIX_DISABLE_KEYCODES)
-                        rgb_matrix_decrease_val();
-#        endif
-                    }
-                } else if (keycode == RGB_SPI) {
-                    if (record->event.pressed) {
-#        if defined(RGBLIGHT_ENABLE) && !defined(RGBLIGHT_DISABLE_KEYCODES)
-                        rgblight_increase_speed();
-#        endif
-#        if defined(RGB_MATRIX_ENABLE) && !defined(RGB_MATRIX_DISABLE_KEYCODES)
-                        rgb_matrix_increase_speed();
-#        endif
-                    }
-                } else if (keycode == RGB_SPD) {
-                    if (record->event.pressed) {
-#        if defined(RGBLIGHT_ENABLE) && !defined(RGBLIGHT_DISABLE_KEYCODES)
-                        rgblight_decrease_speed();
-#        endif
-#        if defined(RGB_MATRIX_ENABLE) && !defined(RGB_MATRIX_DISABLE_KEYCODES)
-                        rgb_matrix_decrease_speed();
-#        endif
-                    }
+                if (userspace_config.rgb_matrix_idle_anim) {
+                    userspace_config.rgb_matrix_idle_anim = false;
+                    dprintf("RGB Matrix Idle Animation [EEPROM]: %u\n", userspace_config.rgb_matrix_idle_anim);
+                    is_eeprom_updated = true;
                 }
-                return false;
 #    endif
+                if (is_eeprom_updated) {
+                    eeconfig_update_user(userspace_config.raw);
+                }
+            }
 #endif
-        }
     }
     return true;
 }
diff --git a/users/drashna/process_records.h b/users/drashna/process_records.h
index 999882d4b..d41be962d 100644
--- a/users/drashna/process_records.h
+++ b/users/drashna/process_records.h
@@ -1,3 +1,19 @@
+/* Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #pragma once
 #include "drashna.h"
 
diff --git a/users/drashna/rgb_matrix_stuff.c b/users/drashna/rgb_matrix_stuff.c
index c9c3224fa..52e261234 100644
--- a/users/drashna/rgb_matrix_stuff.c
+++ b/users/drashna/rgb_matrix_stuff.c
@@ -1,5 +1,21 @@
-#include "drashna.h"
+/* Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 
+#include "drashna.h"
+#include "rgb_matrix.h"
 #include "lib/lib8tion/lib8tion.h"
 extern led_config_t g_led_config;
 
diff --git a/users/drashna/rgb_matrix_stuff.h b/users/drashna/rgb_matrix_stuff.h
index 35b01047b..592f9c9e6 100644
--- a/users/drashna/rgb_matrix_stuff.h
+++ b/users/drashna/rgb_matrix_stuff.h
@@ -1,3 +1,19 @@
+/* Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #pragma once
 #include "quantum.h"
 
diff --git a/users/drashna/rgb_stuff.c b/users/drashna/rgb_stuff.c
index defee9ac1..d98f7cc2f 100644
--- a/users/drashna/rgb_stuff.c
+++ b/users/drashna/rgb_stuff.c
@@ -1,3 +1,19 @@
+/* Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include "drashna.h"
 #include "rgb_stuff.h"
 #include "eeprom.h"
@@ -152,14 +168,15 @@ void matrix_scan_rgb_light(void) {
 
 void rgblight_set_hsv_and_mode(uint8_t hue, uint8_t sat, uint8_t val, uint8_t mode) {
     rgblight_sethsv_noeeprom(hue, sat, val);
-    wait_us(175);  // Add a slight delay between color and mode to ensure it's processed correctly
+    // wait_us(175);  // Add a slight delay between color and mode to ensure it's processed correctly
     rgblight_mode_noeeprom(mode);
 }
 
 layer_state_t layer_state_set_rgb_light(layer_state_t state) {
 #ifdef RGBLIGHT_ENABLE
     if (userspace_config.rgb_layer_change) {
-        switch (get_highest_layer(state)) {
+        uint8_t mode = layer_state_cmp(state,_MODS) ? RGBLIGHT_MODE_BREATHING : RGBLIGHT_MODE_STATIC_LIGHT;
+        switch (get_highest_layer(state|default_layer_state)) {
             case _MACROS:
                 rgblight_set_hsv_and_mode(HSV_ORANGE, userspace_config.is_overwatch ? RGBLIGHT_MODE_SNAKE + 2 : RGBLIGHT_MODE_SNAKE + 3);
                 break;
@@ -181,37 +198,30 @@ layer_state_t layer_state_set_rgb_light(layer_state_t state) {
             case _ADJUST:
                 rgblight_set_hsv_and_mode(HSV_RED, RGBLIGHT_MODE_KNIGHT + 2);
                 break;
-            default:  //  for any other layers, or the default layer
-            {
-                uint8_t mode = get_highest_layer(state) == _MODS ? RGBLIGHT_MODE_BREATHING : RGBLIGHT_MODE_STATIC_LIGHT;
-                switch (get_highest_layer(default_layer_state)) {
-                    case _COLEMAK:
-                        rgblight_set_hsv_and_mode(HSV_MAGENTA, mode);
-                        break;
-                    case _DVORAK:
-                        rgblight_set_hsv_and_mode(HSV_SPRINGGREEN, mode);
-                        break;
-                    case _WORKMAN:
-                        rgblight_set_hsv_and_mode(HSV_GOLDENROD, mode);
-                        break;
-                    case _NORMAN:
-                        rgblight_set_hsv_and_mode(HSV_CORAL, mode);
-                        break;
-                    case _MALTRON:
-                        rgblight_set_hsv_and_mode(HSV_YELLOW, mode);
-                        break;
-                    case _EUCALYN:
-                        rgblight_set_hsv_and_mode(HSV_PINK, mode);
-                        break;
-                    case _CARPLAX:
-                        rgblight_set_hsv_and_mode(HSV_BLUE, mode);
-                        break;
-                    default:
-                        rgblight_set_hsv_and_mode(HSV_CYAN, mode);
-                        break;
-                }
+            case _COLEMAK:
+                rgblight_set_hsv_and_mode(HSV_MAGENTA, mode);
+                break;
+            case _DVORAK:
+                rgblight_set_hsv_and_mode(HSV_SPRINGGREEN, mode);
+                break;
+            case _WORKMAN:
+                rgblight_set_hsv_and_mode(HSV_GOLDENROD, mode);
+                break;
+            case _NORMAN:
+                rgblight_set_hsv_and_mode(HSV_CORAL, mode);
+                break;
+            case _MALTRON:
+                rgblight_set_hsv_and_mode(HSV_YELLOW, mode);
+                break;
+            case _EUCALYN:
+                rgblight_set_hsv_and_mode(HSV_PINK, mode);
+                break;
+            case _CARPLAX:
+                rgblight_set_hsv_and_mode(HSV_BLUE, mode);
+                break;
+            default:
+                rgblight_set_hsv_and_mode(HSV_CYAN, mode);
                 break;
-            }
         }
     }
 #endif  // RGBLIGHT_ENABLE
diff --git a/users/drashna/rgb_stuff.h b/users/drashna/rgb_stuff.h
index 98a552db1..0153adb54 100644
--- a/users/drashna/rgb_stuff.h
+++ b/users/drashna/rgb_stuff.h
@@ -1,3 +1,19 @@
+/* Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #pragma once
 #include "quantum.h"
 
diff --git a/users/drashna/rgblight_breathe_table.h b/users/drashna/rgblight_breathe_table.h
index 4c6ae38fa..b6f7a13ac 100644
--- a/users/drashna/rgblight_breathe_table.h
+++ b/users/drashna/rgblight_breathe_table.h
@@ -1,3 +1,19 @@
+/* Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #ifndef RGBLIGHT_EFFECT_BREATHE_TABLE
 #define RGBLIGHT_EFFECT_BREATHE_TABLE
 
diff --git a/users/drashna/tap_dances.c b/users/drashna/tap_dances.c
index 65019ab75..01873489d 100644
--- a/users/drashna/tap_dances.c
+++ b/users/drashna/tap_dances.c
@@ -1,3 +1,19 @@
+/* Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include "tap_dances.h"
 
 #define NUM_OF_DIABLO_KEYS 4
diff --git a/users/drashna/tap_dances.h b/users/drashna/tap_dances.h
index 44fa0b934..7f73f2803 100644
--- a/users/drashna/tap_dances.h
+++ b/users/drashna/tap_dances.h
@@ -1,3 +1,19 @@
+/* Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #pragma once
 #include "drashna.h"
 
diff --git a/users/drashna/template.c b/users/drashna/template.c
index 833447daa..f98964ae4 100644
--- a/users/drashna/template.c
+++ b/users/drashna/template.c
@@ -1,3 +1,19 @@
+/* Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include "template.h"
 
 // Add reconfigurable functions here, for keymap customization
diff --git a/users/drashna/template.h b/users/drashna/template.h
index 178f96e22..cb1ad75d8 100644
--- a/users/drashna/template.h
+++ b/users/drashna/template.h
@@ -1,3 +1,19 @@
+/* Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #pragma once
 
 #include QMK_KEYBOARD_H
diff --git a/users/drashna/wrappers.h b/users/drashna/wrappers.h
index d22e2959c..ed4022aaa 100644
--- a/users/drashna/wrappers.h
+++ b/users/drashna/wrappers.h
@@ -1,3 +1,19 @@
+/* Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #pragma once
 #include "drashna.h"
 /*
@@ -17,6 +33,7 @@ expanded before being used as arguments to the LAYOUT_xxx macro.
 #define LAYOUT_ortho_4x12_wrapper(...)       LAYOUT_ortho_4x12(__VA_ARGS__)
 #define LAYOUT_ortho_5x12_wrapper(...)       LAYOUT_ortho_5x12(__VA_ARGS__)
 #define LAYOUT_gergo_wrapper(...)            LAYOUT_gergo(__VA_ARGS__)
+#define LAYOUT_split_3x6_3_wrapper(...)      LAYOUT_split_3x6_3(__VA_ARGS__)
 
 /*
 Blocks for each of the four major keyboard layouts