diff --git a/qmk/.github/workflows/api.yml b/qmk/.github/workflows/api.yml
index 2d09089b..dfb1b588 100644
--- a/qmk/.github/workflows/api.yml
+++ b/qmk/.github/workflows/api.yml
@@ -13,6 +13,9 @@ jobs:
     runs-on: ubuntu-latest
     container: qmkfm/base_container
 
+    # protect against those who develop with their fork on master
+    if: github.repository == 'qmk/qmk_firmware'
+
     steps:
     - uses: actions/checkout@v2
       with:
diff --git a/qmk/.github/workflows/auto_tag.yaml b/qmk/.github/workflows/auto_tag.yaml
new file mode 100644
index 00000000..29e85c41
--- /dev/null
+++ b/qmk/.github/workflows/auto_tag.yaml
@@ -0,0 +1,33 @@
+name: Essential files modified
+
+on:
+  push:
+    branches:
+    - master
+    paths:
+    - quantum/**/*
+    - tmk_core/**/*
+    - drivers/**/*
+    - tests/**/*
+    - util/**/*
+    - platforms/**/*
+    - Makefile
+    - '*.mk'
+
+jobs:
+  tag:
+    runs-on: ubuntu-latest
+
+    # protect against those who develop with their fork on master
+    if: github.repository == 'qmk/qmk_firmware'
+
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+
+    - name: Bump version and push tag
+      uses: anothrNick/github-tag-action@1.26.0
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        DEFAULT_BUMP: 'patch'
diff --git a/qmk/.github/workflows/develop_api.yml b/qmk/.github/workflows/develop_api.yml
new file mode 100644
index 00000000..53a5b452
--- /dev/null
+++ b/qmk/.github/workflows/develop_api.yml
@@ -0,0 +1,42 @@
+name: Update Develop API Data
+
+on:
+  push:
+    branches:
+    - develop
+    paths:
+    - 'keyboards/**'
+    - 'layouts/community/**'
+
+jobs:
+  api_data:
+    runs-on: ubuntu-latest
+    container: qmkfm/base_container
+
+    # protect against those who work in their fork on develop
+    if: github.repository == 'qmk/qmk_firmware'
+
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        fetch-depth: 1
+        persist-credentials: false
+
+    - name: Generate API Data
+      run: qmk generate-api
+
+    - name: Install rsync
+      run: |
+        apt-get update && apt-get install -y rsync
+
+    - name: Upload API Data
+      uses: JamesIves/github-pages-deploy-action@3.7.1
+      with:
+        ACCESS_TOKEN: ${{ secrets.API_TOKEN_GITHUB }}
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        BRANCH: main
+        FOLDER: api_data/v1
+        CLEAN: true
+        GIT_CONFIG_EMAIL: hello@qmk.fm
+        REPOSITORY_NAME: qmk/qmk_keyboards_devel
+        TARGET_FOLDER: v1
diff --git a/qmk/.github/workflows/develop_update.yml b/qmk/.github/workflows/develop_update.yml
new file mode 100644
index 00000000..285720fe
--- /dev/null
+++ b/qmk/.github/workflows/develop_update.yml
@@ -0,0 +1,37 @@
+name: Update develop after master merge
+
+on:
+  push:
+    branches:
+    - master
+
+
+jobs:
+  develop_update:
+    runs-on: ubuntu-latest
+
+    if: github.repository == 'qmk/qmk_firmware'
+
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+
+    - name: Checkout develop
+      run: |
+        git fetch origin master develop
+        git checkout develop
+
+    - name: Check if branch locked
+      id: check_locked
+      uses: andstor/file-existence-action@v1
+      with:
+        files: ".locked"
+
+    - name: Update develop from master
+      if: steps.check_locked.outputs.files_exists == 'false'
+      run: |
+        git config --global user.name "QMK Bot"
+        git config --global user.email "hello@qmk.fm"
+        git merge origin/master
+        git push origin develop
diff --git a/qmk/.github/workflows/docs.yml b/qmk/.github/workflows/docs.yml
new file mode 100644
index 00000000..8855d110
--- /dev/null
+++ b/qmk/.github/workflows/docs.yml
@@ -0,0 +1,43 @@
+name: Generate Docs
+
+on:
+  push:
+    branches:
+    - master
+    paths:
+    - 'tmk_core/**'
+    - 'quantum/**'
+    - 'platforms/**'
+    - 'docs/**'
+    - '.github/workflows/docs.yml'
+
+jobs:
+  generate:
+    runs-on: ubuntu-latest
+    container: qmkfm/base_container
+
+    # protect against those who develop with their fork on master
+    if: github.repository == 'qmk/qmk_firmware'
+
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        fetch-depth: 1
+
+    - name: Install dependencies
+      run: |
+        apt-get update && apt-get install -y rsync nodejs npm doxygen
+        npm install -g moxygen
+
+    - name: Build docs
+      run: |
+        qmk --verbose generate-docs
+
+    - name: Deploy
+      uses: JamesIves/github-pages-deploy-action@3.7.1
+      with:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        BASE_BRANCH: master
+        BRANCH: gh-pages
+        FOLDER: .build/docs
+        GIT_CONFIG_EMAIL: hello@qmk.fm
diff --git a/qmk/.github/workflows/format.yaml b/qmk/.github/workflows/format.yaml
new file mode 100644
index 00000000..f4acb944
--- /dev/null
+++ b/qmk/.github/workflows/format.yaml
@@ -0,0 +1,37 @@
+name: Format Codebase
+
+on:
+  push:
+    branches:
+    - master
+
+jobs:
+  format:
+    runs-on: ubuntu-latest
+    container: qmkfm/base_container
+
+    # protect against those who develop with their fork on master
+    if: github.repository == 'qmk/qmk_firmware'
+
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        token: ${{ secrets.API_TOKEN_GITHUB }}
+
+    - name: Install dependencies
+      run: |
+        apt-get update && apt-get install -y dos2unix
+
+    - name: Format files
+      run: |
+        bin/qmk cformat -a
+        bin/qmk pyformat
+        bin/qmk fileformat
+
+    - name: Commit files
+      uses: stefanzweifel/git-auto-commit-action@v4
+      with:
+        commit_message: Format code according to conventions for $GITHUB_SHA
+        commit_user_name: QMK Bot
+        commit_user_email: hello@qmk.fm
+        commit_author: QMK Bot <hello@qmk.fm>
diff --git a/qmk/.github/workflows/lint.yml b/qmk/.github/workflows/lint.yml
new file mode 100644
index 00000000..cd67de9d
--- /dev/null
+++ b/qmk/.github/workflows/lint.yml
@@ -0,0 +1,55 @@
+name: PR Lint keyboards
+
+on:
+  pull_request:
+    paths:
+    - 'keyboards/**'
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+
+    container: qmkfm/base_container
+
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+
+    - uses: trilom/file-changes-action@v1.2.4
+      id: file_changes
+      with:
+        output: '\n'
+
+    - name: Print info
+      run: |
+        git rev-parse --short HEAD
+        echo ${{ github.event.pull_request.base.sha }}
+        echo '${{ steps.file_changes.outputs.files}}'
+
+    - name: Run qmk lint
+      shell: 'bash {0}'
+      run: |
+        QMK_CHANGES=$(echo -e '${{ steps.file_changes.outputs.files}}')
+        QMK_KEYBOARDS=$(qmk list-keyboards)
+
+        exit_code=0
+        for KB in $QMK_KEYBOARDS; do
+          KEYBOARD_CHANGES=$(echo "$QMK_CHANGES" | grep -E '^(keyboards/'${KB}'/)')
+          if [[ -z "$KEYBOARD_CHANGES" ]]; then
+            # skip as no changes for this keyboard
+            continue
+          fi
+
+          KEYMAP_ONLY=$(echo "$KEYBOARD_CHANGES" | grep -cv /keymaps/)
+          if [[ $KEYMAP_ONLY -gt 0 ]]; then
+            echo "linting ${KB}"
+
+            qmk lint --keyboard ${KB} && qmk info -l --keyboard ${KB}
+            exit_code=$(($exit_code + $?))
+          fi
+        done
+        if [[ $exit_code -gt 255 ]]; then
+            exit 255
+        fi
+        exit $exit_code
diff --git a/qmk/.travis.yml b/qmk/.travis.yml
index f2e8a841..17f401da 100644
--- a/qmk/.travis.yml
+++ b/qmk/.travis.yml
@@ -18,21 +18,15 @@ addons:
       - ubuntu-toolchain-r-test
       - llvm-toolchain-trusty-7
     packages:
-    - pandoc
     - diffutils
-    - dos2unix
-    - doxygen
     - clang-format-7
     - libstdc++-7-dev
-install:
-  - npm install -g moxygen
 script:
   - git fetch --depth=50 origin $TRAVIS_BRANCH:$TRAVIS_BRANCH
   - git rev-parse --short HEAD
   - git diff --name-only HEAD $TRAVIS_BRANCH
   - bash util/travis_test.sh
   - bash util/travis_build.sh
-  - bash util/travis_docs.sh
 after_script:
   bash util/travis_compiled_push.sh
 notifications:
diff --git a/qmk/Makefile b/qmk/Makefile
index c851e01e..a13b9286 100644
--- a/qmk/Makefile
+++ b/qmk/Makefile
@@ -99,40 +99,13 @@ $(eval $(call NEXT_PATH_ELEMENT))
 #     endif
 # endif
 
-define GET_KEYBOARDS
-ifndef ALT_GET_KEYBOARDS
-    All_RULES_MK := $$(patsubst $(ROOT_DIR)/keyboards/%/rules.mk,%,$$(wildcard $(ROOT_DIR)/keyboards/*/rules.mk))
-    All_RULES_MK += $$(patsubst $(ROOT_DIR)/keyboards/%/rules.mk,%,$$(wildcard $(ROOT_DIR)/keyboards/*/*/rules.mk))
-    All_RULES_MK += $$(patsubst $(ROOT_DIR)/keyboards/%/rules.mk,%,$$(wildcard $(ROOT_DIR)/keyboards/*/*/*/rules.mk))
-    All_RULES_MK += $$(patsubst $(ROOT_DIR)/keyboards/%/rules.mk,%,$$(wildcard $(ROOT_DIR)/keyboards/*/*/*/*/rules.mk))
-
-    KEYMAPS_MK := $$(patsubst $(ROOT_DIR)/keyboards/%/rules.mk,%,$$(wildcard $(ROOT_DIR)/keyboards/*/keymaps/*/rules.mk))
-    KEYMAPS_MK += $$(patsubst $(ROOT_DIR)/keyboards/%/rules.mk,%,$$(wildcard $(ROOT_DIR)/keyboards/*/*/keymaps/*/rules.mk))
-    KEYMAPS_MK += $$(patsubst $(ROOT_DIR)/keyboards/%/rules.mk,%,$$(wildcard $(ROOT_DIR)/keyboards/*/*/*/keymaps/*/rules.mk))
-    KEYMAPS_MK += $$(patsubst $(ROOT_DIR)/keyboards/%/rules.mk,%,$$(wildcard $(ROOT_DIR)/keyboards/*/*/*/*/keymaps/*/rules.mk))
-
-    KEYBOARDS := $$(sort $$(filter-out $$(KEYMAPS_MK), $$(All_RULES_MK)))
-else
-    KEYBOARDS := $(shell find keyboards/ -type f -iname "rules.mk" | grep -v keymaps | sed 's!keyboards/\(.*\)/rules.mk!\1!' | sort | uniq)
-endif
-endef
-
-$(eval $(call GET_KEYBOARDS))
-
-# Only consider folders with makefiles, to prevent errors in case there are extra folders
-#KEYBOARDS += $(patsubst $(ROOD_DIR)/keyboards/%/rules.mk,%,$(wildcard $(ROOT_DIR)/keyboards/*/*/rules.mk))
-
 .PHONY: list-keyboards
 list-keyboards:
-	echo $(KEYBOARDS)
-
-define PRINT_KEYBOARD
-	$(info $(PRINTING_KEYBOARD))
-endef
+	util/list_keyboards.sh | sort -u | tr '\n' ' '
 
 .PHONY: generate-keyboards-file
 generate-keyboards-file:
-	$(foreach PRINTING_KEYBOARD,$(KEYBOARDS),$(eval $(call PRINT_KEYBOARD)))
+	util/list_keyboards.sh | sort -u
 
 .PHONY: clean
 clean:
@@ -159,7 +132,6 @@ endif
 # $(info Keyboard: $(KEYBOARD))
 # $(info Keymap: $(KEYMAP))
 # $(info Subproject: $(SUBPROJECT))
-# $(info Keyboards: $(KEYBOARDS))
 
 
 # Set the default goal depending on where we are running make from
@@ -272,16 +244,29 @@ endef
 define PARSE_RULE
     RULE := $1
     COMMANDS :=
+    REQUIRE_PLATFORM_KEY :=
     # If the rule starts with all, then continue the parsing from
     # PARSE_ALL_KEYBOARDS
     ifeq ($$(call COMPARE_AND_REMOVE_FROM_RULE,all),true)
         KEYBOARD_RULE=all
         $$(eval $$(call PARSE_ALL_KEYBOARDS))
+    else ifeq ($$(call COMPARE_AND_REMOVE_FROM_RULE,all-avr),true)
+        KEYBOARD_RULE=all
+        REQUIRE_PLATFORM_KEY := avr
+        $$(eval $$(call PARSE_ALL_KEYBOARDS))
+    else ifeq ($$(call COMPARE_AND_REMOVE_FROM_RULE,all-chibios),true)
+        KEYBOARD_RULE=all
+        REQUIRE_PLATFORM_KEY := chibios
+        $$(eval $$(call PARSE_ALL_KEYBOARDS))
+    else ifeq ($$(call COMPARE_AND_REMOVE_FROM_RULE,all-arm_atsam),true)
+        KEYBOARD_RULE=all
+        REQUIRE_PLATFORM_KEY := arm_atsam
+        $$(eval $$(call PARSE_ALL_KEYBOARDS))
     else ifeq ($$(call COMPARE_AND_REMOVE_FROM_RULE,test),true)
         $$(eval $$(call PARSE_TEST))
     # If the rule starts with the name of a known keyboard, then continue
     # the parsing from PARSE_KEYBOARD
-    else ifeq ($$(call TRY_TO_MATCH_RULE_FROM_LIST,$$(KEYBOARDS)),true)
+    else ifeq ($$(call TRY_TO_MATCH_RULE_FROM_LIST,$$(shell util/list_keyboards.sh | sort -u)),true)
         KEYBOARD_RULE=$$(MATCHED_ITEM)
         $$(eval $$(call PARSE_KEYBOARD,$$(MATCHED_ITEM)))
     # Otherwise use the KEYBOARD variable, which is determined either by
@@ -398,7 +383,7 @@ endef
 # if we are going to compile all keyboards, match the rest of the rule
 # for each of them
 define PARSE_ALL_KEYBOARDS
-    $$(eval $$(call PARSE_ALL_IN_LIST,PARSE_KEYBOARD,$(KEYBOARDS)))
+    $$(eval $$(call PARSE_ALL_IN_LIST,PARSE_KEYBOARD,$(shell util/list_keyboards.sh noci | sort -u)))
 endef
 
 # $1 Subproject
@@ -447,7 +432,7 @@ define PARSE_KEYMAP
     # Format it in bold
     KB_SP := $(BOLD)$$(KB_SP)$(NO_COLOR)
     # Specify the variables that we are passing forward to submake
-    MAKE_VARS := KEYBOARD=$$(CURRENT_KB) KEYMAP=$$(CURRENT_KM)
+    MAKE_VARS := KEYBOARD=$$(CURRENT_KB) KEYMAP=$$(CURRENT_KM) REQUIRE_PLATFORM_KEY=$$(REQUIRE_PLATFORM_KEY)
     # And the first part of the make command
     MAKE_CMD := $$(MAKE) -r -R -C $(ROOT_DIR) -f build_keyboard.mk $$(MAKE_TARGET)
     # The message to display
@@ -466,6 +451,8 @@ define BUILD
         LOG=$$$$($$(MAKE_CMD) $$(MAKE_VARS) SILENT=true 2>&1) ; \
         if [ $$$$? -gt 0 ]; \
             then $$(PRINT_ERROR_PLAIN); \
+        elif [ "$$$$LOG" = "skipped" ] ; \
+            then $$(PRINT_SKIPPED_PLAIN); \
         elif [ "$$$$LOG" != "" ] ; \
             then $$(PRINT_WARNING_PLAIN); \
         else \
@@ -637,12 +624,13 @@ else
 endif
 ifndef SKIP_VERSION
 BUILD_DATE := $(shell date +"%Y-%m-%d-%H:%M:%S")
+else
+BUILD_DATE := 2020-01-01-00:00:00
+endif
+
 $(shell echo '#define QMK_VERSION "$(GIT_VERSION)"' > $(ROOT_DIR)/quantum/version.h)
 $(shell echo '#define QMK_BUILDDATE "$(BUILD_DATE)"' >> $(ROOT_DIR)/quantum/version.h)
 $(shell echo '#define CHIBIOS_VERSION "$(CHIBIOS_VERSION)"' >> $(ROOT_DIR)/quantum/version.h)
 $(shell echo '#define CHIBIOS_CONTRIB_VERSION "$(CHIBIOS_CONTRIB_VERSION)"' >> $(ROOT_DIR)/quantum/version.h)
-else
-BUILD_DATE := NA
-endif
 
 include $(ROOT_DIR)/testlist.mk
diff --git a/qmk/build_keyboard.mk b/qmk/build_keyboard.mk
index b4e1efd9..e87dcb8f 100644
--- a/qmk/build_keyboard.mk
+++ b/qmk/build_keyboard.mk
@@ -317,6 +317,13 @@ SRC += $(TMK_COMMON_SRC)
 OPT_DEFS += $(TMK_COMMON_DEFS)
 EXTRALDFLAGS += $(TMK_COMMON_LDFLAGS)
 
+SKIP_COMPILE := no
+ifneq ($(REQUIRE_PLATFORM_KEY),)
+    ifneq ($(REQUIRE_PLATFORM_KEY),$(PLATFORM_KEY))
+        SKIP_COMPILE := yes
+    endif
+endif
+
 include $(TMK_PATH)/$(PLATFORM_KEY).mk
 ifneq ($(strip $(PROTOCOL)),)
     include $(TMK_PATH)/protocol/$(strip $(shell echo $(PROTOCOL) | tr '[:upper:]' '[:lower:]')).mk
@@ -352,7 +359,13 @@ $(KEYBOARD_OUTPUT)_INC := $(PROJECT_INC) $(GFXINC)
 $(KEYBOARD_OUTPUT)_CONFIG := $(PROJECT_CONFIG)
 
 # Default target.
+ifeq ($(SKIP_COMPILE),no)
 all: build check-size
+else
+all:
+	echo "skipped" >&2
+endif
+
 build: elf cpfirmware
 check-size: build
 objs-size: build
diff --git a/qmk/build_test.mk b/qmk/build_test.mk
index d13d9a51..e705c6a3 100644
--- a/qmk/build_test.mk
+++ b/qmk/build_test.mk
@@ -49,6 +49,7 @@ endif
 
 include common_features.mk
 include $(TMK_PATH)/common.mk
+include $(QUANTUM_PATH)/sequencer/tests/rules.mk
 include $(QUANTUM_PATH)/serial_link/tests/rules.mk
 ifneq ($(filter $(FULL_TESTS),$(TEST)),)
 include build_full_test.mk
diff --git a/qmk/common.mk b/qmk/common.mk
index aea29a7a..c13b5e27 100644
--- a/qmk/common.mk
+++ b/qmk/common.mk
@@ -21,4 +21,5 @@ COMMON_VPATH += $(QUANTUM_PATH)/keymap_extras
 COMMON_VPATH += $(QUANTUM_PATH)/audio
 COMMON_VPATH += $(QUANTUM_PATH)/process_keycode
 COMMON_VPATH += $(QUANTUM_PATH)/api
+COMMON_VPATH += $(QUANTUM_PATH)/sequencer
 COMMON_VPATH += $(DRIVER_PATH)
diff --git a/qmk/common_features.mk b/qmk/common_features.mk
index 5f232d5f..8ac53ec4 100644
--- a/qmk/common_features.mk
+++ b/qmk/common_features.mk
@@ -17,9 +17,15 @@ SERIAL_PATH := $(QUANTUM_PATH)/serial_link
 
 QUANTUM_SRC += \
     $(QUANTUM_DIR)/quantum.c \
+    $(QUANTUM_DIR)/led.c \
     $(QUANTUM_DIR)/keymap_common.c \
     $(QUANTUM_DIR)/keycode_config.c
 
+ifeq ($(strip $(DEBUG_MATRIX_SCAN_RATE_ENABLE)), yes)
+    OPT_DEFS += -DDEBUG_MATRIX_SCAN_RATE
+    CONSOLE_ENABLE = yes
+endif
+
 ifeq ($(strip $(API_SYSEX_ENABLE)), yes)
     OPT_DEFS += -DAPI_SYSEX_ENABLE
     OPT_DEFS += -DAPI_ENABLE
@@ -38,6 +44,13 @@ ifeq ($(strip $(AUDIO_ENABLE)), yes)
     SRC += $(QUANTUM_DIR)/audio/luts.c
 endif
 
+ifeq ($(strip $(SEQUENCER_ENABLE)), yes)
+    OPT_DEFS += -DSEQUENCER_ENABLE
+    MUSIC_ENABLE = yes
+    SRC += $(QUANTUM_DIR)/sequencer/sequencer.c
+    SRC += $(QUANTUM_DIR)/process_keycode/process_sequencer.c
+endif
+
 ifeq ($(strip $(MIDI_ENABLE)), yes)
     OPT_DEFS += -DMIDI_ENABLE
     MUSIC_ENABLE = yes
@@ -155,12 +168,14 @@ ifeq ($(strip $(RGBLIGHT_ENABLE)), yes)
     endif
 endif
 
-VALID_MATRIX_TYPES := yes IS31FL3731 IS31FL3733 IS31FL3737 IS31FL3741 WS2812 custom
 
 LED_MATRIX_ENABLE ?= no
-ifneq ($(strip $(LED_MATRIX_ENABLE)), no)
-    ifeq ($(filter $(LED_MATRIX_ENABLE),$(VALID_MATRIX_TYPES)),)
-        $(error LED_MATRIX_ENABLE="$(LED_MATRIX_ENABLE)" is not a valid matrix type)
+VALID_LED_MATRIX_TYPES := IS31FL3731 custom
+# TODO: IS31FL3733 IS31FL3737 IS31FL3741
+
+ifeq ($(strip $(LED_MATRIX_ENABLE)), yes)
+    ifeq ($(filter $(LED_MATRIX_DRIVER),$(VALID_LED_MATRIX_TYPES)),)
+        $(error LED_MATRIX_DRIVER="$(LED_MATRIX_DRIVER)" is not a valid matrix type)
     else
         BACKLIGHT_ENABLE = yes
         BACKLIGHT_DRIVER = custom
@@ -168,21 +183,22 @@ ifneq ($(strip $(LED_MATRIX_ENABLE)), no)
         SRC += $(QUANTUM_DIR)/led_matrix.c
         SRC += $(QUANTUM_DIR)/led_matrix_drivers.c
     endif
-endif
 
-ifeq ($(strip $(LED_MATRIX_ENABLE)), IS31FL3731)
-    OPT_DEFS += -DIS31FL3731
-    COMMON_VPATH += $(DRIVER_PATH)/issi
-    SRC += is31fl3731-simple.c
-    QUANTUM_LIB_SRC += i2c_master.c
+    ifeq ($(strip $(LED_MATRIX_DRIVER)), IS31FL3731)
+        OPT_DEFS += -DIS31FL3731 -DSTM32_I2C -DHAL_USE_I2C=TRUE
+        COMMON_VPATH += $(DRIVER_PATH)/issi
+        SRC += is31fl3731-simple.c
+        QUANTUM_LIB_SRC += i2c_master.c
+    endif
 endif
 
 RGB_MATRIX_ENABLE ?= no
+VALID_RGB_MATRIX_TYPES := IS31FL3731 IS31FL3733 IS31FL3737 IS31FL3741 WS2812 custom
 
-ifneq ($(strip $(RGB_MATRIX_ENABLE)), no)
-ifeq ($(filter $(RGB_MATRIX_ENABLE),$(VALID_MATRIX_TYPES)),)
-    $(error RGB_MATRIX_ENABLE="$(RGB_MATRIX_ENABLE)" is not a valid matrix type)
-endif
+ifeq ($(strip $(RGB_MATRIX_ENABLE)), yes)
+    ifeq ($(filter $(RGB_MATRIX_DRIVER),$(VALID_RGB_MATRIX_TYPES)),)
+        $(error "$(RGB_MATRIX_DRIVER)" is not a valid matrix type)
+    endif
     OPT_DEFS += -DRGB_MATRIX_ENABLE
 ifneq (,$(filter $(MCU), atmega16u2 atmega32u2))
     # ATmegaxxU2 does not have hardware MUL instruction - lib8tion must be told to use software multiplication routines
@@ -193,51 +209,47 @@ endif
     SRC += $(QUANTUM_DIR)/rgb_matrix_drivers.c
     CIE1931_CURVE := yes
     RGB_KEYCODES_ENABLE := yes
-endif
 
-ifeq ($(strip $(RGB_MATRIX_ENABLE)), yes)
-	RGB_MATRIX_ENABLE := IS31FL3731
-endif
+    ifeq ($(strip $(RGB_MATRIX_DRIVER)), IS31FL3731)
+        OPT_DEFS += -DIS31FL3731 -DSTM32_I2C -DHAL_USE_I2C=TRUE
+        COMMON_VPATH += $(DRIVER_PATH)/issi
+        SRC += is31fl3731.c
+        QUANTUM_LIB_SRC += i2c_master.c
+    endif
 
-ifeq ($(strip $(RGB_MATRIX_ENABLE)), IS31FL3731)
-    OPT_DEFS += -DIS31FL3731 -DSTM32_I2C -DHAL_USE_I2C=TRUE
-    COMMON_VPATH += $(DRIVER_PATH)/issi
-    SRC += is31fl3731.c
-    QUANTUM_LIB_SRC += i2c_master.c
-endif
+    ifeq ($(strip $(RGB_MATRIX_DRIVER)), IS31FL3733)
+        OPT_DEFS += -DIS31FL3733 -DSTM32_I2C -DHAL_USE_I2C=TRUE
+        COMMON_VPATH += $(DRIVER_PATH)/issi
+        SRC += is31fl3733.c
+        QUANTUM_LIB_SRC += i2c_master.c
+    endif
 
-ifeq ($(strip $(RGB_MATRIX_ENABLE)), IS31FL3733)
-    OPT_DEFS += -DIS31FL3733 -DSTM32_I2C -DHAL_USE_I2C=TRUE
-    COMMON_VPATH += $(DRIVER_PATH)/issi
-    SRC += is31fl3733.c
-    QUANTUM_LIB_SRC += i2c_master.c
-endif
+    ifeq ($(strip $(RGB_MATRIX_DRIVER)), IS31FL3737)
+        OPT_DEFS += -DIS31FL3737 -DSTM32_I2C -DHAL_USE_I2C=TRUE
+        COMMON_VPATH += $(DRIVER_PATH)/issi
+        SRC += is31fl3737.c
+        QUANTUM_LIB_SRC += i2c_master.c
+    endif
 
-ifeq ($(strip $(RGB_MATRIX_ENABLE)), IS31FL3737)
-    OPT_DEFS += -DIS31FL3737 -DSTM32_I2C -DHAL_USE_I2C=TRUE
-    COMMON_VPATH += $(DRIVER_PATH)/issi
-    SRC += is31fl3737.c
-    QUANTUM_LIB_SRC += i2c_master.c
-endif
+    ifeq ($(strip $(RGB_MATRIX_DRIVER)), IS31FL3741)
+        OPT_DEFS += -DIS31FL3741 -DSTM32_I2C -DHAL_USE_I2C=TRUE
+        COMMON_VPATH += $(DRIVER_PATH)/issi
+        SRC += is31fl3741.c
+        QUANTUM_LIB_SRC += i2c_master.c
+    endif
 
-ifeq ($(strip $(RGB_MATRIX_ENABLE)), IS31FL3741)
-    OPT_DEFS += -DIS31FL3741 -DSTM32_I2C -DHAL_USE_I2C=TRUE
-    COMMON_VPATH += $(DRIVER_PATH)/issi
-    SRC += is31fl3741.c
-    QUANTUM_LIB_SRC += i2c_master.c
-endif
+    ifeq ($(strip $(RGB_MATRIX_DRIVER)), WS2812)
+        OPT_DEFS += -DWS2812
+        WS2812_DRIVER_REQUIRED := yes
+    endif
 
-ifeq ($(strip $(RGB_MATRIX_ENABLE)), WS2812)
-    OPT_DEFS += -DWS2812
-    WS2812_DRIVER_REQUIRED := yes
-endif
+    ifeq ($(strip $(RGB_MATRIX_CUSTOM_KB)), yes)
+        OPT_DEFS += -DRGB_MATRIX_CUSTOM_KB
+    endif
 
-ifeq ($(strip $(RGB_MATRIX_CUSTOM_KB)), yes)
-    OPT_DEFS += -DRGB_MATRIX_CUSTOM_KB
-endif
-
-ifeq ($(strip $(RGB_MATRIX_CUSTOM_USER)), yes)
-    OPT_DEFS += -DRGB_MATRIX_CUSTOM_USER
+    ifeq ($(strip $(RGB_MATRIX_CUSTOM_USER)), yes)
+        OPT_DEFS += -DRGB_MATRIX_CUSTOM_USER
+    endif
 endif
 
 ifeq ($(strip $(RGB_KEYCODES_ENABLE)), yes)
@@ -443,11 +455,14 @@ ifeq ($(strip $(SPLIT_KEYBOARD)), yes)
         # Functions added via QUANTUM_LIB_SRC are only included in the final binary if they're called.
         # Unused functions are pruned away, which is why we can add multiple drivers here without bloat.
         ifeq ($(PLATFORM),AVR)
-            QUANTUM_LIB_SRC += i2c_master.c \
-                               i2c_slave.c
+            ifneq ($(NO_I2C),yes)
+                QUANTUM_LIB_SRC += i2c_master.c \
+                                   i2c_slave.c
+            endif
         endif
 
         SERIAL_DRIVER ?= bitbang
+        OPT_DEFS += -DSERIAL_DRIVER_$(strip $(shell echo $(SERIAL_DRIVER) | tr '[:lower:]' '[:upper:]'))
         ifeq ($(strip $(SERIAL_DRIVER)), bitbang)
             QUANTUM_LIB_SRC += serial.c
         else
diff --git a/qmk/docs/ChangeLog/20201128.md b/qmk/docs/ChangeLog/20201128.md
new file mode 100644
index 00000000..86abd384
--- /dev/null
+++ b/qmk/docs/ChangeLog/20201128.md
@@ -0,0 +1,150 @@
+# QMK Breaking Change - 2020 Nov 28 Changelog
+
+Four times a year QMK runs a process for merging Breaking Changes. A Breaking Change is any change which modifies how QMK behaves in a way that is incompatible or potentially dangerous. We limit these changes to 4 times per year so that users can have confidence that updating their QMK tree will not break their keymaps.
+
+
+## Changes Requiring User Action :id=changes-requiring-user-action
+
+### Relocated Keyboards :id-relocated-keyboards
+
+#### Reduce Helix keyboard build variation ([#8669](https://github.com/qmk/qmk_firmware/pull/8669))
+
+The build commands for the Helix keyboard are:
+
+```
+make <helix_build_name>:<keymap_name>
+```
+
+For `<helix_build_name>`, specify the one in the rightmost column of the table below, such as `helix`,` helix/pico`.
+
+| before Oct 17 2019   |  Oct 17 2019            | Mar 10 2020             | Nov 28 2020             |
+| ---------------------|-------------------------|-------------------------| ------------------------|
+| helix/rev1           | helix/rev1              | helix/rev1              | helix/rev1              |
+| helix/pico           | helix/pico              | helix/pico              | helix/pico              |
+|                      | helix/pico/back         | helix/pico/back         | helix/pico/back         |
+|                      | helix/pico/under        | helix/pico/under        | helix/pico/under        |
+|                      |                         | helix/pico/sc           | --                      |
+|                      |                         | helix/pico/sc/back      | helix/pico/sc           |
+|                      |                         | helix/pico/sc/under     | --                      |
+| helix/rev2 (=helix)  | helix/rev2 (=helix)     | helix/rev2 (=helix)     | --                      |
+|                      | helix/rev2/back         | helix/rev2/back         | --                      |
+|                      | helix/rev2/back/oled    | helix/rev2/back/oled    | ( --> helix/rev2/back)  |
+|                      | helix/rev2/oled         | helix/rev2/oled         | helix/rev2　(=helix)     |
+|                      | helix/rev2/oled/back    | helix/rev2/oled/back    | helix/rev2/back         |
+|                      | helix/rev2/oled/under   | helix/rev2/oled/under   | helix/rev2/under        |
+|                      |                         | helix/rev2/sc           | --                      |
+|                      |                         | helix/rev2/sc/back      | --                      |
+|                      |                         | helix/rev2/sc/oled      | --                      |
+|                      |                         | helix/rev2/sc/oledback  | helix/rev2/sc           |
+|                      |                         | helix/rev2/sc/oledunder | --                      |
+|                      |                         | helix/rev2/sc/under     | --                      |
+|                      | helix/rev2/under        | helix/rev2/under        | --                      |
+|                      | helix/rev2/under/oled   | helix/rev2/under/oled   | ( --> helix/rev2/under) |
+
+#### Update the Speedo firmware for v3.0 ([#10657](https://github.com/qmk/qmk_firmware/pull/10657))
+
+The Speedo keyboard has moved to `cozykeys/speedo/v2` as the designer prepares to release the Speedo v3.0.
+
+| Previous Name | New Name                   |
+| :------------ | :------------------------- |
+| speedo        | cozykeys/speedo/v2         |
+| --            | cozykeys/speedo/v3 **new** |
+
+#### Maartenwut/Maarten name change to evyd13/Evy ([#10274](https://github.com/qmk/qmk_firmware/pull/10274))
+
+Maartenwut has rebranded as @evyd13, and all released Maartenwut boards have moved.
+
+| Previous Name          | New Name           |
+| :--------------------- | :----------------- |
+| maartenwut/atom47/rev2 | evyd13/atom47/rev2 |
+| maartenwut/atom47/rev3 | evyd13/atom47/rev3 |
+| maartenwut/eon40       | evyd13/eon40       |
+| maartenwut/eon65       | evyd13/eon65       |
+| maartenwut/eon75       | evyd13/eon75       |
+| maartenwut/eon87       | evyd13/eon87       |
+| maartenwut/eon95       | evyd13/eon95       |
+| maartenwut/gh80_1800   | evyd13/gh80_1800   |
+| maartenwut/gh80_3700   | evyd13/gh80_3700   |
+| maartenwut/minitomic   | evyd13/minitomic   |
+| maartenwut/mx5160      | evyd13/mx5160      |
+| maartenwut/nt660       | evyd13/nt660       |
+| maartenwut/omrontkl    | evyd13/omrontkl    |
+| maartenwut/plain60     | evyd13/plain60     |
+| maartenwut/pockettype  | evyd13/pockettype  |
+| maartenwut/quackfire   | evyd13/quackfire   |
+| maartenwut/solheim68   | evyd13/solheim68   |
+| maartenwut/ta65        | evyd13/ta65        |
+| maartenwut/wasdat      | evyd13/wasdat      |
+| maartenwut/wasdat_code | evyd13/wasdat_code |
+| maartenwut/wonderland  | evyd13/wonderland  |
+
+#### Xelus Valor and Dawn60 Refactors ([#10512](https://github.com/qmk/qmk_firmware/pull/10512), [#10584](https://github.com/qmk/qmk_firmware/pull/10584))
+
+The Valor and Dawn60 keyboards by Xelus22 both now require their revisions to be specified when compiling.
+
+| Previous Name | New Name          |
+| :------------ | :---------------- |
+| xelus/dawn60  | xelus/dawn60/rev1 |
+| xelus/valor   | xelus/valor/rev1  |
+
+
+### Updated Keyboard Codebases :id=keyboard-updates
+
+#### AEboards EXT65 Refactor ([#10820](https://github.com/qmk/qmk_firmware/pull/10820))
+
+The EXT65 codebase has been reworked so keymaps can be used with either revision.
+
+
+## Core Changes :id=core-changes
+
+### Fixes :id=core-fixes
+
+* Reconnect the USB if users wake up a computer from the keyboard to restore the USB state ([#10088](https://github.com/qmk/qmk_firmware/pull/10088))
+* Fix cursor position bug in oled_write_raw functions ([#10800](https://github.com/qmk/qmk_firmware/pull/10800))
+
+### Additions and Enhancements :id=core-additions
+
+* Allow MATRIX_ROWS to be greater than 32 ([#10183](https://github.com/qmk/qmk_firmware/pull/10183))
+* Add support for soft serial to ATmega32U2 ([#10204](https://github.com/qmk/qmk_firmware/pull/10204))
+* Allow direct control of MIDI velocity value ([#9940](https://github.com/qmk/qmk_firmware/pull/9940))
+* Joystick 16-bit support ([#10439](https://github.com/qmk/qmk_firmware/pull/10439))
+* Allow encoder resolutions to be set per encoder ([#10259](https://github.com/qmk/qmk_firmware/pull/10259))
+* Share button state from mousekey to pointing_device ([#10179](https://github.com/qmk/qmk_firmware/pull/10179))
+* Add advanced/efficient RGB Matrix Indicators ([#8564](https://github.com/qmk/qmk_firmware/pull/8564))
+* OLED display update interval support ([#10388](https://github.com/qmk/qmk_firmware/pull/10388))
+* Per-Key Retro Tapping ([#10622](https://github.com/qmk/qmk_firmware/pull/10622))
+* Allow backlight duty cycle limit ([#10260](https://github.com/qmk/qmk_firmware/pull/10260))
+* Add step sequencer feature ([#9703](https://github.com/qmk/qmk_firmware/pull/9703))
+* Added `add_oneshot_mods` & `del_oneshot_mods` ([#10549](https://github.com/qmk/qmk_firmware/pull/10549))
+* Add AT90USB support for serial.c ([#10706](https://github.com/qmk/qmk_firmware/pull/10706))
+* Auto shift: support repeats and early registration (#9826)
+
+### Clean-ups and Optimizations :id=core-optimizations
+
+* Haptic and solenoid cleanup ([#9700](https://github.com/qmk/qmk_firmware/pull/9700))
+* XD75 cleanup ([#10524](https://github.com/qmk/qmk_firmware/pull/10524))
+* Minor change to behavior allowing display updates to continue between task ticks ([#10750](https://github.com/qmk/qmk_firmware/pull/10750))
+* Change some GPIO manipulations in matrix.c to be atomic ([#10491](https://github.com/qmk/qmk_firmware/pull/10491))
+* combine repeated lines of code for ATmega32U2, ATmega16U2, ATmega328 and ATmega328P ([#10837](https://github.com/qmk/qmk_firmware/pull/10837))
+* Remove references to HD44780 ([#10735](https://github.com/qmk/qmk_firmware/pull/10735))
+
+
+## QMK Infrastructure and Internals :id=qmk-internals
+
+* Add ability to build a subset of all keyboards based on platform. ([#10420](https://github.com/qmk/qmk_firmware/pull/10420))
+* Initialise EEPROM drivers at startup, instead of upon first execution ([#10438](https://github.com/qmk/qmk_firmware/pull/10438))
+* Make bootloader_jump weak for ChibiOS ([#10417](https://github.com/qmk/qmk_firmware/pull/10417))
+* Support for STM32 GPIOF,G,H,I,J,K ([#10206](https://github.com/qmk/qmk_firmware/pull/10206))
+* Add milc as a dependency and remove the installed milc ([#10563](https://github.com/qmk/qmk_firmware/pull/10563))
+* ChibiOS upgrade: early init conversions ([#10214](https://github.com/qmk/qmk_firmware/pull/10214))
+* ChibiOS upgrade: configuration file migrator ([#9952](https://github.com/qmk/qmk_firmware/pull/9952))
+* Add definition based on currently-selected serial driver. ([#10716](https://github.com/qmk/qmk_firmware/pull/10716))
+* Allow for modification of output RGB values when using rgblight/rgb_matrix. ([#10638](https://github.com/qmk/qmk_firmware/pull/10638))
+* Allow keyboards/keymaps to execute code at each main loop iteration ([#10530](https://github.com/qmk/qmk_firmware/pull/10530))
+* qmk cformat ([#10767](https://github.com/qmk/qmk_firmware/pull/10767))
+* Add a Make variable to easily enable DEBUG_MATRIX_SCAN_RATE on the command line ([#10824](https://github.com/qmk/qmk_firmware/pull/10824))
+* update Chibios OS USB for the OTG driver ([#8893](https://github.com/qmk/qmk_firmware/pull/8893))
+* Fixup version.h writing when using `SKIP_VERSION=yes` ([#10972](https://github.com/qmk/qmk_firmware/pull/10972), [#10974](https://github.com/qmk/qmk_firmware/pull/10974))
+* Rename ledmatrix.h to match .c file ([#7949](https://github.com/qmk/qmk_firmware/pull/7949))
+* Split RGB_MATRIX_ENABLE into _ENABLE and _DRIVER ([#10231](https://github.com/qmk/qmk_firmware/pull/10231))
+* Split LED_MATRIX_ENABLE into _ENABLE and _DRIVER ([#10840](https://github.com/qmk/qmk_firmware/pull/10840))
diff --git a/qmk/docs/_summary.md b/qmk/docs/_summary.md
index 2e874fb1..19498f6a 100644
--- a/qmk/docs/_summary.md
+++ b/qmk/docs/_summary.md
@@ -80,6 +80,7 @@
     * [One Shot Keys](one_shot_keys.md)
     * [Pointing Device](feature_pointing_device.md)
     * [Raw HID](feature_rawhid.md)
+    * [Sequencer](feature_sequencer.md)
     * [Swap Hands](feature_swap_hands.md)
     * [Tap Dance](feature_tap_dance.md)
     * [Tap-Hold Configuration](tap_hold.md)
@@ -105,6 +106,7 @@
     * [Encoders](feature_encoders.md)
     * [Haptic Feedback](feature_haptic_feedback.md)
     * [Joystick](feature_joystick.md)
+    * [LED Indicators](feature_led_indicators.md)
     * [Proton C Conversion](proton_c_conversion.md)
     * [PS/2 Mouse](feature_ps2_mouse.md)
     * [Split Keyboard](feature_split_keyboard.md)
@@ -118,6 +120,7 @@
     * [Overview](breaking_changes.md)
     * [My Pull Request Was Flagged](breaking_changes_instructions.md)
     * History
+      * [2020 Nov 28](ChangeLog/20201128.md)
       * [2020 Aug 29](ChangeLog/20200829.md)
       * [2020 May 30](ChangeLog/20200530.md)
       * [2020 Feb 29](ChangeLog/20200229.md)
diff --git a/qmk/docs/breaking_changes.md b/qmk/docs/breaking_changes.md
index abace816..3ee14f2b 100644
--- a/qmk/docs/breaking_changes.md
+++ b/qmk/docs/breaking_changes.md
@@ -6,6 +6,7 @@ The breaking change period is when we will merge PR's that change QMK in dangero
 
 ## What has been included in past Breaking Changes?
 
+* [2020 Nov 28](ChangeLog/20201128.md)
 * [2020 Aug 29](ChangeLog/20200829.md)
 * [2020 May 30](ChangeLog/20200530.md)
 * [2020 Feb 29](ChangeLog/20200229.md)
@@ -13,16 +14,16 @@ The breaking change period is when we will merge PR's that change QMK in dangero
 
 ## When is the next Breaking Change?
 
-The next Breaking Change is scheduled for November 28, 2020.
+The next Breaking Change is scheduled for February 27, 2021.
 
 ### Important Dates
 
-* [x] 2020 Aug 29 - `develop` is created. It will be rebased weekly.
-* [ ] 2020 Oct 31 - `develop` closed to new PR's.
-* [ ] 2020 Oct 31 - Call for testers.
-* [ ] 2020 Nov 26 - `master` is locked, no PR's merged.
-* [ ] 2020 Nov 28 - Merge `develop` to `master`.
-* [ ] 2020 Nov 28 - `master` is unlocked. PR's can be merged again.
+* [x] 2020 Nov 28 - `develop` is created. Each push to `master` is subsequently merged to `develop`
+* [ ] 2021 Jan 30 - `develop` closed to new PR's.
+* [ ] 2021 Jan 30 - Call for testers.
+* [ ] 2021 Feb 25 - `master` is locked, no PR's merged.
+* [ ] 2021 Feb 27 - Merge `develop` to `master`.
+* [ ] 2021 Feb 27 - `master` is unlocked. PR's can be merged again.
 
 ## What changes will be included?
 
@@ -39,21 +40,6 @@ Criteria for acceptance:
 
 This section documents various processes we use when running the Breaking Changes process.
 
-## Rebase `develop` from `master`
-
-This is run every Friday while `develop` is open.
-
-Process:
-
-```
-cd qmk_firmware
-git checkout master
-git pull --ff-only
-git checkout develop
-git rebase master
-git push --force
-```
-
 ## Creating the `develop` branch
 
 This happens immediately after the previous `develop` branch is merged.
diff --git a/qmk/docs/cli_commands.md b/qmk/docs/cli_commands.md
index fe6f0663..61ce1aa2 100644
--- a/qmk/docs/cli_commands.md
+++ b/qmk/docs/cli_commands.md
@@ -175,9 +175,27 @@ Creates a keymap.json from a keymap.c.
 **Usage**:
 
 ```
-qmk c2json [--no-cpp] [-o OUTPUT] filename
+qmk c2json -km KEYMAP -kb KEYBOARD [-q] [--no-cpp] [-o OUTPUT] filename
 ```
 
+## `qmk lint`
+
+Checks over a keyboard and/or keymap and highlights common errors, problems, and anti-patterns.
+
+**Usage**:
+
+```
+qmk lint [-km KEYMAP] [-kb KEYBOARD] [--strict]
+```
+
+This command is directory aware. It will automatically fill in KEYBOARD and/or KEYMAP if you are in a keyboard or keymap directory.
+
+**Examples**:
+
+Do a basic lint check:
+
+    qmk lint -kb rominronin/katana60/rev2
+
 ## `qmk list-keyboards`
 
 This command lists all the keyboards currently defined in `qmk_firmware`
@@ -212,6 +230,16 @@ This command is directory aware. It will automatically fill in KEYBOARD and/or K
 qmk new-keymap [-kb KEYBOARD] [-km KEYMAP]
 ```
 
+## `qmk clean`
+
+This command cleans up the `.build` folder. If `--all` is passed, any .hex or .bin files present in the `qmk_firmware` directory will also be deleted.
+
+**Usage**:
+
+```
+qmk clean [-a]
+```
+
 ---
 
 # Developer Commands
@@ -258,6 +286,26 @@ This command starts a local HTTP server which you can use for browsing or improv
 qmk docs [-p PORT]
 ```
 
+## `qmk generate-docs`
+
+This command allows you to generate QMK documentation locally. It can be uses for general browsing or improving the docs. External tools such as [serve](https://www.npmjs.com/package/serve) can be used to browse the generated files.
+
+**Usage**:
+
+```
+qmk generate-docs
+```
+
+## `qmk generate-rgb-breathe-table`
+
+This command generates a lookup table (LUT) header file for the [RGB Lighting](feature_rgblight.md) feature's breathing animation. Place this file in your keyboard or keymap directory as `rgblight_breathe_table.h` to override the default LUT in `quantum/`.
+
+**Usage**:
+
+```
+qmk generate-rgb-breathe-table [-q] [-o OUTPUT] [-m MAX] [-c CENTER]
+```
+
 ## `qmk kle2json`
 
 This command allows you to convert from raw KLE data to QMK Configurator JSON. It accepts either an absolute file path, or a file name in the current directory. By default it will not overwrite `info.json` if it is already present. Use the `-f` or `--force` flag to overwrite.
@@ -299,4 +347,3 @@ This command runs the python test suite. If you make changes to python code you
 ```
 qmk pytest
 ```
-
diff --git a/qmk/docs/config_options.md b/qmk/docs/config_options.md
index f9b1cc65..a3262b41 100644
--- a/qmk/docs/config_options.md
+++ b/qmk/docs/config_options.md
@@ -29,7 +29,9 @@ This level contains all of the options for that particular keymap. If you wish t
 
 This is a C header file that is one of the first things included, and will persist over the whole project (if included). Lots of variables can be set here and accessed elsewhere. The `config.h` file shouldn't be including other `config.h` files, or anything besides this:
 
-    #include "config_common.h"
+```c
+#include "config_common.h"
+```
 
 
 ## Hardware Options
@@ -135,6 +137,8 @@ If you define these options you will enable the associated feature, which may in
 * `#define RETRO_TAPPING`
   * tap anyway, even after TAPPING_TERM, if there was no other key interruption between press and release
   * See [Retro Tapping](tap_hold.md#retro-tapping) for details
+* `#define RETRO_TAPPING_PER_KEY`
+  * enables handling for per key `RETRO_TAPPING` settings
 * `#define TAPPING_TOGGLE 2`
   * how many taps before triggering the toggle
 * `#define PERMISSIVE_HOLD`
diff --git a/qmk/docs/custom_quantum_functions.md b/qmk/docs/custom_quantum_functions.md
index bf3a6037..694b421e 100644
--- a/qmk/docs/custom_quantum_functions.md
+++ b/qmk/docs/custom_quantum_functions.md
@@ -88,108 +88,6 @@ keyrecord_t record {
 }
 ```
 
-# LED Control
-
-QMK provides methods to read 5 of the LEDs defined in the HID spec:
-
-* Num Lock
-* Caps Lock
-* Scroll Lock
-* Compose
-* Kana
-
-There are two ways to get the lock LED state:
-
-* by implementing `bool led_update_kb(led_t led_state)` or `_user(led_t led_state)`; or
-* by calling `led_t host_keyboard_led_state()`
-
-!> `host_keyboard_led_state()` may already reflect a new value before `led_update_user()` is called.
-
-Two more deprecated functions exist that provide the LED state as a `uint8_t`:
-
-* `uint8_t led_set_kb(uint8_t usb_led)` and `_user(uint8_t usb_led)`
-* `uint8_t host_keyboard_leds()`
-
-## `led_update_user()`
-
-This function will be called when the state of one of those 5 LEDs changes. It receives the LED state as a struct parameter.
-
-By convention, return `true` from `led_update_user()` to get the `led_update_kb()` hook to run its code, and
-return `false` when you would prefer not to run the code in `led_update_kb()`.
-
-Some examples include:
-
-  - overriding the LEDs to use them for something else like layer indication
-    - return `false` because you do not want the `_kb()` function to run, as it would override your layer behavior.
-  - play a sound when an LED turns on or off.
-    - return `true` because you want the `_kb` function to run, and this is in addition to the default LED behavior.
-
-?> Because the `led_set_*` functions return `void` instead of `bool`, they do not allow for overriding the keyboard LED control, and thus it's recommended to use `led_update_*` instead.
-
-### Example `led_update_kb()` Implementation
-
-```c
-bool led_update_kb(led_t led_state) {
-    bool res = led_update_user(led_state);
-    if(res) {
-        // writePin sets the pin high for 1 and low for 0.
-        // In this example the pins are inverted, setting
-        // it low/0 turns it on, and high/1 turns the LED off.
-        // This behavior depends on whether the LED is between the pin
-        // and VCC or the pin and GND.
-        writePin(B0, !led_state.num_lock);
-        writePin(B1, !led_state.caps_lock);
-        writePin(B2, !led_state.scroll_lock);
-        writePin(B3, !led_state.compose);
-        writePin(B4, !led_state.kana);
-    }
-    return res;
-}
-```
-
-### Example `led_update_user()` Implementation
-
-This incomplete example would play a sound if Caps Lock is turned on or off. It returns `true`, because you also want the LEDs to maintain their state.
-
-```c
-#ifdef AUDIO_ENABLE
-  float caps_on[][2] = SONG(CAPS_LOCK_ON_SOUND);
-  float caps_off[][2] = SONG(CAPS_LOCK_OFF_SOUND);
-#endif
-
-bool led_update_user(led_t led_state) {
-    #ifdef AUDIO_ENABLE
-    static uint8_t caps_state = 0;
-    if (caps_state != led_state.caps_lock) {
-        led_state.caps_lock ? PLAY_SONG(caps_on) : PLAY_SONG(caps_off);
-        caps_state = led_state.caps_lock;
-    }
-    #endif
-    return true;
-}
-```
-
-### `led_update_*` Function Documentation
-
-* Keyboard/Revision: `bool led_update_kb(led_t led_state)`
-* Keymap: `bool led_update_user(led_t led_state)`
-
-## `host_keyboard_led_state()`
-
-Call this function to get the last received LED state as a `led_t`. This is useful for reading the LED state outside `led_update_*`, e.g. in [`matrix_scan_user()`](#matrix-scanning-code).
-
-## Setting Physical LED State
-
-Some keyboard implementations provide convenience methods for setting the state of the physical LEDs.
-
-### Ergodox Boards
-
-The Ergodox implementations provide `ergodox_right_led_1`/`2`/`3_on`/`off()` to turn individual LEDs on or off, as well as `ergodox_right_led_on`/`off(uint8_t led)` to turn them on or off by their index.
-
-In addition, it is possible to specify the brightness level of all LEDs with `ergodox_led_all_set(uint8_t n)`; of individual LEDs with `ergodox_right_led_1`/`2`/`3_set(uint8_t n)`; or by index with `ergodox_right_led_set(uint8_t led, uint8_t n)`.
-
-Ergodox boards also define `LED_BRIGHTNESS_LO` for the lowest brightness and `LED_BRIGHTNESS_HI` for the highest brightness (which is the default).
-
 # Keyboard Initialization Code
 
 There are several steps in the keyboard initialization process.  Depending on what you want to do, it will influence which function you should use.
@@ -287,6 +185,14 @@ This function gets called at every matrix scan, which is basically as often as t
 
 You should use this function if you need custom matrix scanning code. It can also be used for custom status output (such as LEDs or a display) or other functionality that you want to trigger regularly even when the user isn't typing.
 
+# Keyboard housekeeping
+
+* Keyboard/Revision: `void housekeeping_task_kb(void)`
+* Keymap: `void housekeeping_task_user(void)`
+
+This function gets called at the end of all QMK processing, before starting the next iteration. You can safely assume that QMK has dealt with the last matrix scan at the time that these functions are invoked -- layer states have been updated, USB reports have been sent, LEDs have been updated, and displays have been drawn.
+
+Similar to `matrix_scan_*`, these are called as often as the MCU can handle. To keep your board responsive, it's suggested to do as little as possible during these function calls, potentially throtting their behaviour if you do indeed require implementing something special.
 
 # Keyboard Idling/Wake Code
 
diff --git a/qmk/docs/de/newbs_testing_debugging.md b/qmk/docs/de/newbs_testing_debugging.md
index acc067e1..b3907277 100644
--- a/qmk/docs/de/newbs_testing_debugging.md
+++ b/qmk/docs/de/newbs_testing_debugging.md
@@ -41,7 +41,9 @@ Bevorzugst Du es lieber auf der Befehlszeile zu debuggen? Dafür eignet sich das
 
 Manchmal ist es hilfreich Debug-Nachrichten innerhalb deines eigenen [Custom Codes](de/custom_quantum_functions.md) zu drucken. Das ist ziemlich einfach. Beginne damit `print.h` am Anfang deiner Datei zu inkludieren:
 
-    #include <print.h>
+```c
+#include "print.h"
+```
 
 Danach stehen dir verschiedene Druck-Funktionen zur Verfügung:
 
diff --git a/qmk/docs/eeprom_driver.md b/qmk/docs/eeprom_driver.md
index 188b95ca..e2c26254 100644
--- a/qmk/docs/eeprom_driver.md
+++ b/qmk/docs/eeprom_driver.md
@@ -40,6 +40,7 @@ Module           | Equivalent `#define`            | Source
 -----------------|---------------------------------|------------------------------------------
 CAT24C512 EEPROM | `#define EEPROM_I2C_CAT24C512`  | <https://www.sparkfun.com/products/14764>
 RM24C512C EEPROM | `#define EEPROM_I2C_RM24C512C`  | <https://www.sparkfun.com/products/14764>
+24LC64 EEPROM    | `#define EEPROM_I2C_24LC64`     | <https://www.microchip.com/wwwproducts/en/24LC64>
 24LC128 EEPROM   | `#define EEPROM_I2C_24LC128`    | <https://www.microchip.com/wwwproducts/en/24LC128>
 24LC256 EEPROM   | `#define EEPROM_I2C_24LC256`    | <https://www.sparkfun.com/products/525>
 MB85RC256V FRAM  | `#define EEPROM_I2C_MB85RC256V` | <https://www.adafruit.com/product/1895>
diff --git a/qmk/docs/es/newbs_testing_debugging.md b/qmk/docs/es/newbs_testing_debugging.md
index ef7412f1..cb65b174 100644
--- a/qmk/docs/es/newbs_testing_debugging.md
+++ b/qmk/docs/es/newbs_testing_debugging.md
@@ -41,7 +41,9 @@ Para plataformas compatibles, [QMK Toolbox](https://github.com/qmk/qmk_toolbox)
 
 A veces, es útil imprimir mensajes de depuración desde tu [código personalizado](custom_quantum_functions.md). Hacerlo es bastante simple. Comienza incluyendo `print.h` al principio de tu fichero:
 
-    #include <print.h>
+```c
+#include "print.h"
+```
 
 Después de eso puedes utilzar algunas funciones print diferentes:
 
diff --git a/qmk/docs/feature_auto_shift.md b/qmk/docs/feature_auto_shift.md
index b21a7690..8e04d9dd 100644
--- a/qmk/docs/feature_auto_shift.md
+++ b/qmk/docs/feature_auto_shift.md
@@ -15,25 +15,31 @@ problem.
 When you tap a key, it stays depressed for a short period of time before it is
 then released. This depressed time is a different length for everyone. Auto Shift
 defines a constant `AUTO_SHIFT_TIMEOUT` which is typically set to twice your
-normal pressed state time. When you press a key, a timer starts and then stops
-when you release the key. If the time depressed is greater than or equal to the
-`AUTO_SHIFT_TIMEOUT`, then a shifted version of the key is emitted. If the time
-is less than the `AUTO_SHIFT_TIMEOUT` time, then the normal state is emitted.
+normal pressed state time. When you press a key, a timer starts, and if you
+have not released the key after the `AUTO_SHIFT_TIMEOUT` period, then a shifted
+version of the key is emitted. If the time is less than the `AUTO_SHIFT_TIMEOUT`
+time, or you press another key, then the normal state is emitted.
+
+If `AUTO_SHIFT_REPEAT` is defined, there is keyrepeat support. Holding the key
+down will repeat the shifted key, though this can be disabled with
+`AUTO_SHIFT_NO_AUTO_REPEAT`. If you want to repeat the normal key, then tap it
+once then immediately (within `TAPPING_TERM`) hold it down again (this works
+with the shifted value as well if auto-repeat is disabled).
 
 ## Are There Limitations to Auto Shift?
 
 Yes, unfortunately.
 
-1. Key repeat will cease to work. For example, before if you wanted 20 'a'
-   characters, you could press and hold the 'a' key for a second or two. This no
-   longer works with Auto Shift because it is timing your depressed time instead
-   of emitting a depressed key state to your operating system.
-2. You will have characters that are shifted when you did not intend on shifting, and
-   other characters you wanted shifted, but were not. This simply comes down to
-   practice. As we get in a hurry, we think we have hit the key long enough
-   for a shifted version, but we did not. On the other hand, we may think we are
-   tapping the keys, but really we have held it for a little longer than
-   anticipated.
+You will have characters that are shifted when you did not intend on shifting, and
+other characters you wanted shifted, but were not. This simply comes down to
+practice. As we get in a hurry, we think we have hit the key long enough for a
+shifted version, but we did not. On the other hand, we may think we are tapping
+the keys, but really we have held it for a little longer than anticipated.
+
+Additionally, with keyrepeat the desired shift state can get mixed up. It will
+always 'belong' to the last key pressed. For example, keyrepeating a capital
+and then tapping something lowercase (whether or not it's an Auto Shift key)
+will result in the capital's *key* still being held, but shift not.
 
 ## How Do I Enable Auto Shift?
 
@@ -103,6 +109,14 @@ Do not Auto Shift numeric keys, zero through nine.
 
 Do not Auto Shift alpha characters, which include A through Z.
 
+### AUTO_SHIFT_REPEAT (simple define)
+
+Enables keyrepeat.
+
+### AUTO_SHIFT_NO_AUTO_REPEAT (simple define)
+
+Disables automatically keyrepeating when `AUTO_SHIFT_TIMEOUT` is exceeded.
+
 ## Using Auto Shift Setup
 
 This will enable you to define three keys temporarily to increase, decrease and report your `AUTO_SHIFT_TIMEOUT`.
diff --git a/qmk/docs/feature_backlight.md b/qmk/docs/feature_backlight.md
index 6bb2bbed..a558af64 100644
--- a/qmk/docs/feature_backlight.md
+++ b/qmk/docs/feature_backlight.md
@@ -62,14 +62,15 @@ Valid driver values are `pwm`, `software`, `custom` or `no`. See below for help
 
 To configure the backlighting, `#define` these in your `config.h`:
 
-|Define               |Default      |Description                                                                          |
-|---------------------|-------------|-------------------------------------------------------------------------------------|
-|`BACKLIGHT_PIN`      |*Not defined*|The pin that controls the LED(s)                                                     |
-|`BACKLIGHT_LEVELS`   |`3`          |The number of brightness levels (maximum 31 excluding off)                           |
-|`BACKLIGHT_CAPS_LOCK`|*Not defined*|Enable Caps Lock indicator using backlight (for keyboards without dedicated LED)     |
-|`BACKLIGHT_BREATHING`|*Not defined*|Enable backlight breathing, if supported                                             |
-|`BREATHING_PERIOD`   |`6`          |The length of one backlight "breath" in seconds                                      |
-|`BACKLIGHT_ON_STATE` |`1`          |The state of the backlight pin when the backlight is "on" - `1` for high, `0` for low|
+| Define                 | Default       | Description                                                                                                       |
+|------------------------|---------------|-------------------------------------------------------------------------------------------------------------------|
+| `BACKLIGHT_PIN`        | *Not defined* | The pin that controls the LED(s)                                                                                  |
+| `BACKLIGHT_LEVELS`     | `3`           | The number of brightness levels (maximum 31 excluding off)                                                        |
+| `BACKLIGHT_CAPS_LOCK`  | *Not defined* | Enable Caps Lock indicator using backlight (for keyboards without dedicated LED)                                  |
+| `BACKLIGHT_BREATHING`  | *Not defined* | Enable backlight breathing, if supported                                                                          |
+| `BREATHING_PERIOD`     | `6`           | The length of one backlight "breath" in seconds                                                                   |
+| `BACKLIGHT_ON_STATE`   | `1`           | The state of the backlight pin when the backlight is "on" - `1` for high, `0` for low                             |
+| `BACKLIGHT_LIMIT_VAL ` | `255`         | The maximum duty cycle of the backlight -- `255` allows for full brightness, any lower will decrease the maximum. |
 
 Unless you are designing your own keyboard, you generally should not need to change the `BACKLIGHT_PIN` or `BACKLIGHT_ON_STATE`.
 
diff --git a/qmk/docs/feature_encoders.md b/qmk/docs/feature_encoders.md
index 8f9ba1a8..e2cafdac 100644
--- a/qmk/docs/feature_encoders.md
+++ b/qmk/docs/feature_encoders.md
@@ -32,13 +32,20 @@ Additionally, the resolution, which defines how many pulses the encoder register
 #define ENCODER_RESOLUTION 4
 ```
 
+It can also be defined per-encoder, by instead defining:
+
+```c
+#define ENCODER_RESOLUTIONS { 4, 2 }
+```
+
 ## Split Keyboards
 
-If you are using different pinouts for the encoders on each half of a split keyboard, you can define the pinout for the right half like this:
+If you are using different pinouts for the encoders on each half of a split keyboard, you can define the pinout (and optionally, resolutions) for the right half like this:
 
 ```c
 #define ENCODERS_PAD_A_RIGHT { encoder1a, encoder2a }
 #define ENCODERS_PAD_B_RIGHT { encoder1b, encoder2b }
+#define ENCODER_RESOLUTIONS_RIGHT { 2, 4 }
 ```
 
 ## Callbacks
diff --git a/qmk/docs/feature_haptic_feedback.md b/qmk/docs/feature_haptic_feedback.md
index ff7337a5..64b66310 100644
--- a/qmk/docs/feature_haptic_feedback.md
+++ b/qmk/docs/feature_haptic_feedback.md
@@ -42,14 +42,21 @@ First you will need a build a circuit to drive the solenoid through a mosfet as
 [Wiring diagram provided by Adafruit](https://playground.arduino.cc/uploads/Learning/solenoid_driver.pdf)
 
 
-| Settings                 | Default       | Description                                           |
-|--------------------------|---------------|-------------------------------------------------------|
-|`SOLENOID_PIN`            | *Not defined* |Configures the pin that the Solenoid is connected to.  |
-|`SOLENOID_DEFAULT_DWELL`  | `12` ms       |Configures the default dwell time for the solenoid.    |
-|`SOLENOID_MIN_DWELL`      | `4` ms        |Sets the lower limit for the dwell.                    |
-|`SOLENOID_MAX_DWELL`      | `100` ms      |Sets the upper limit for the dwell.                    |
+| Settings                   | Default              | Description                                           |
+|----------------------------|----------------------|-------------------------------------------------------|
+|`SOLENOID_PIN`              | *Not defined*        |Configures the pin that the Solenoid is connected to.  |
+|`SOLENOID_DEFAULT_DWELL`    | `12` ms              |Configures the default dwell time for the solenoid.    |
+|`SOLENOID_MIN_DWELL`        | `4` ms               |Sets the lower limit for the dwell.                    |
+|`SOLENOID_MAX_DWELL`        | `100` ms             |Sets the upper limit for the dwell.                    |
+|`SOLENOID_DWELL_STEP_SIZE`  | `1` ms               |The step size to use when `HPT_DWL*` keycodes are sent |
+|`SOLENOID_DEFAULT_BUZZ`     | `0` (disabled)       |On HPT_RST buzz is set "on" if this is "1"             |
+|`SOLENOID_BUZZ_ACTUATED`    | `SOLENOID_MIN_DWELL` |Actuated-time when the solenoid is in buzz mode        |
+|`SOLENOID_BUZZ_NONACTUATED` | `SOLENOID_MIN_DWELL` |Non-Actuated-time when the solenoid is in buzz mode    |
 
-?> Dwell time is how long the "plunger" stays activated.  The dwell time changes how the solenoid sounds.
+* If solenoid buzz is off, then dwell time is how long the "plunger" stays activated. The dwell time changes how the solenoid sounds.
+* If solenoid buzz is on, then dwell time sets the length of the buzz, while `SOLENOID_BUZZ_ACTUATED` and `SOLENOID_BUZZ_NONACTUATED` set the (non-)actuation times withing the buzz period.
+* With the current implementation, for any of the above time settings, the precision of these settings may be affected by how fast the keyboard is able to scan the matrix.
+  Therefore, if the keyboards scanning routine is slow, it may be preferable to set `SOLENOID_DWELL_STEP_SIZE` to a value slightly smaller than the time it takes to scan the keyboard.
 
 Beware that some pins may be powered during bootloader (ie. A13 on the STM32F303 chip) and will result in the solenoid kept in the on state through the whole flashing process. This may overheat and damage the solenoid. If you find that the pin the solenoid is connected to is triggering the solenoid during bootloader/DFU, select another pin.
 
diff --git a/qmk/docs/feature_joystick.md b/qmk/docs/feature_joystick.md
index be3c781f..12bbf5b3 100644
--- a/qmk/docs/feature_joystick.md
+++ b/qmk/docs/feature_joystick.md
@@ -141,6 +141,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 }
 ```
 
+### Axis Resolution
+
+By default, the resolution of each axis is 8 bit, giving a range of -127 to +127. If you need higher precision, you can increase it by defining eg. `JOYSTICK_AXES_RESOLUTION 12` in your `config.h`. The resolution must be between 8 and 16.
+
+Note that the supported AVR MCUs have a 10-bit ADC, and 12-bit for most STM32 MCUs.
+
 ### Triggering Joystick Buttons
 
 Joystick buttons are normal Quantum keycodes, defined as `JS_BUTTON0` to `JS_BUTTON31`, depending on the number of buttons you have configured.
diff --git a/qmk/docs/feature_led_indicators.md b/qmk/docs/feature_led_indicators.md
new file mode 100644
index 00000000..10e095ab
--- /dev/null
+++ b/qmk/docs/feature_led_indicators.md
@@ -0,0 +1,116 @@
+# LED Indicators
+
+QMK provides methods to read 5 of the LEDs defined in the HID spec:
+
+* Num Lock
+* Caps Lock
+* Scroll Lock
+* Compose
+* Kana
+
+There are three ways to get the lock LED state:
+* by specifying configuration options within `config.h`
+* by implementing `bool led_update_kb(led_t led_state)` or `_user(led_t led_state)`; or
+* by calling `led_t host_keyboard_led_state()`
+
+!> `host_keyboard_led_state()` may already reflect a new value before `led_update_user()` is called.
+
+Two more deprecated functions exist that provide the LED state as a `uint8_t`:
+
+* `uint8_t led_set_kb(uint8_t usb_led)` and `_user(uint8_t usb_led)`
+* `uint8_t host_keyboard_leds()`
+
+## Configuration Options
+
+To configure the indicators, `#define` these in your `config.h`:
+
+|Define               |Default      |Description                                |
+|---------------------|-------------|-------------------------------------------|
+|`LED_NUM_LOCK_PIN`   |*Not defined*|The pin that controls the `Num Lock` LED   |
+|`LED_CAPS_LOCK_PIN`  |*Not defined*|The pin that controls the `Caps Lock` LED  |
+|`LED_SCROLL_LOCK_PIN`|*Not defined*|The pin that controls the `Scroll Lock` LED|
+|`LED_COMPOSE_PIN`    |*Not defined*|The pin that controls the `Compose` LED    |
+|`LED_KANA_PIN`       |*Not defined*|The pin that controls the `Kana` LED       |
+|`LED_PIN_ON_STATE`   |`1`          |The state of the indicator pins when the LED is "on" - `1` for high, `0` for low|
+
+Unless you are designing your own keyboard, you generally should not need to change the above config options.
+
+## `led_update_*()`
+
+When the configuration options do not provide enough flexibility, the API hooks provided allow custom control of the LED behavior. These functions will be called when the state of one of those 5 LEDs changes. It receives the LED state as a struct parameter.
+
+By convention, return `true` from `led_update_user()` to get the `led_update_kb()` hook to run its code, and
+return `false` when you would prefer not to run the code in `led_update_kb()`.
+
+Some examples include:
+
+  - overriding the LEDs to use them for something else like layer indication
+    - return `false` because you do not want the `_kb()` function to run, as it would override your layer behavior.
+  - play a sound when an LED turns on or off.
+    - return `true` because you want the `_kb` function to run, and this is in addition to the default LED behavior.
+
+?> Because the `led_set_*` functions return `void` instead of `bool`, they do not allow for overriding the keyboard LED control, and thus it's recommended to use `led_update_*` instead.
+
+### Example `led_update_kb()` Implementation
+
+```c
+bool led_update_kb(led_t led_state) {
+    bool res = led_update_user(led_state);
+    if(res) {
+        // writePin sets the pin high for 1 and low for 0.
+        // In this example the pins are inverted, setting
+        // it low/0 turns it on, and high/1 turns the LED off.
+        // This behavior depends on whether the LED is between the pin
+        // and VCC or the pin and GND.
+        writePin(B0, !led_state.num_lock);
+        writePin(B1, !led_state.caps_lock);
+        writePin(B2, !led_state.scroll_lock);
+        writePin(B3, !led_state.compose);
+        writePin(B4, !led_state.kana);
+    }
+    return res;
+}
+```
+
+### Example `led_update_user()` Implementation
+
+This incomplete example would play a sound if Caps Lock is turned on or off. It returns `true`, because you also want the LEDs to maintain their state.
+
+```c
+#ifdef AUDIO_ENABLE
+  float caps_on[][2] = SONG(CAPS_LOCK_ON_SOUND);
+  float caps_off[][2] = SONG(CAPS_LOCK_OFF_SOUND);
+#endif
+
+bool led_update_user(led_t led_state) {
+    #ifdef AUDIO_ENABLE
+    static uint8_t caps_state = 0;
+    if (caps_state != led_state.caps_lock) {
+        led_state.caps_lock ? PLAY_SONG(caps_on) : PLAY_SONG(caps_off);
+        caps_state = led_state.caps_lock;
+    }
+    #endif
+    return true;
+}
+```
+
+### `led_update_*` Function Documentation
+
+* Keyboard/Revision: `bool led_update_kb(led_t led_state)`
+* Keymap: `bool led_update_user(led_t led_state)`
+
+## `host_keyboard_led_state()`
+
+Call this function to get the last received LED state as a `led_t`. This is useful for reading the LED state outside `led_update_*`, e.g. in [`matrix_scan_user()`](#matrix-scanning-code).
+
+## Setting Physical LED State
+
+Some keyboard implementations provide convenience methods for setting the state of the physical LEDs.
+
+### Ergodox Boards
+
+The Ergodox implementations provide `ergodox_right_led_1`/`2`/`3_on`/`off()` to turn individual LEDs on or off, as well as `ergodox_right_led_on`/`off(uint8_t led)` to turn them on or off by their index.
+
+In addition, it is possible to specify the brightness level of all LEDs with `ergodox_led_all_set(uint8_t n)`; of individual LEDs with `ergodox_right_led_1`/`2`/`3_set(uint8_t n)`; or by index with `ergodox_right_led_set(uint8_t led, uint8_t n)`.
+
+Ergodox boards also define `LED_BRIGHTNESS_LO` for the lowest brightness and `LED_BRIGHTNESS_HI` for the highest brightness (which is the default).
diff --git a/qmk/docs/feature_led_matrix.md b/qmk/docs/feature_led_matrix.md
index 372407b9..a4e9d7eb 100644
--- a/qmk/docs/feature_led_matrix.md
+++ b/qmk/docs/feature_led_matrix.md
@@ -10,7 +10,8 @@ If you want to use RGB LED's you should use the [RGB Matrix Subsystem](feature_r
 
 There is basic support for addressable LED matrix lighting with the I2C IS31FL3731 RGB controller. To enable it, add this to your `rules.mk`:
 
-    LED_MATRIX_ENABLE = IS31FL3731
+    LED_MATRIX_ENABLE = yes
+    LED_MATRIX_DRIVER = IS31FL3731
     
 You can use between 1 and 4 IS31FL3731 IC's. Do not specify `LED_DRIVER_ADDR_<N>` defines for IC's that are not present on your keyboard. You can define the following items in `config.h`:
 
diff --git a/qmk/docs/feature_macros.md b/qmk/docs/feature_macros.md
index acd40d1b..3752b324 100644
--- a/qmk/docs/feature_macros.md
+++ b/qmk/docs/feature_macros.md
@@ -182,7 +182,9 @@ Which would send Left Control+`a` (Left Control down, `a`, Left Control up) - no
 
 By default, it assumes a US keymap with a QWERTY layout; if you want to change that (e.g. if your OS uses software Colemak), include this somewhere in your keymap:
 
-    #include <sendstring_colemak.h>
+```c
+#include "sendstring_colemak.h"
+```
 
 ### Strings in Memory
 
diff --git a/qmk/docs/feature_mouse_keys.md b/qmk/docs/feature_mouse_keys.md
index a6b46bc1..ffde1338 100644
--- a/qmk/docs/feature_mouse_keys.md
+++ b/qmk/docs/feature_mouse_keys.md
@@ -140,3 +140,7 @@ To use constant speed mode, you must at least define `MK_COMBINED` in your keyma
 ```c
 #define MK_COMBINED
 ```
+
+## Use with PS/2 Mouse and Pointing Device
+
+Mouse keys button state is shared with [PS/2 mouse](feature_ps2_mouse.md) and [pointing device](feature_pointing_device.md) so mouse keys button presses can be used for clicks and drags.
diff --git a/qmk/docs/feature_oled_driver.md b/qmk/docs/feature_oled_driver.md
index 9f0ef166..44202487 100644
--- a/qmk/docs/feature_oled_driver.md
+++ b/qmk/docs/feature_oled_driver.md
@@ -150,6 +150,7 @@ void oled_task_user(void) {
 |`OLED_IC`                  |`OLED_IC_SSD1306`|Set to `OLED_IC_SH1106` if you're using the SH1106 OLED controller.                                                       |
 |`OLED_COLUMN_OFFSET`       |`0`              |(SH1106 only.) Shift output to the right this many pixels.<br />Useful for 128x64 displays centered on a 132x64 SH1106 IC.|
 |`OLED_BRIGHTNESS`          |`255`            |The default brightness level of the OLED, from 0 to 255.                                                                  |
+|`OLED_UPDATE_INTERVAL`     |`0`              |Set the time interval for updating the OLED display in ms. This will improve the matrix scan rate.                        |
 
  ## 128x64 & Custom sized OLED Displays
 
diff --git a/qmk/docs/feature_rgb_matrix.md b/qmk/docs/feature_rgb_matrix.md
index b70a5fcb..f8b06535 100644
--- a/qmk/docs/feature_rgb_matrix.md
+++ b/qmk/docs/feature_rgb_matrix.md
@@ -11,7 +11,8 @@ If you want to use single color LED's you should use the [LED Matrix Subsystem](
 There is basic support for addressable RGB matrix lighting with the I2C IS31FL3731 RGB controller. To enable it, add this to your `rules.mk`:
 
 ```makefile
-RGB_MATRIX_ENABLE = IS31FL3731
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = IS31FL3731
 ```
 
 Configure the hardware via your `config.h`:
@@ -62,7 +63,8 @@ Where `Cx_y` is the location of the LED in the matrix defined by [the datasheet]
 There is basic support for addressable RGB matrix lighting with the I2C IS31FL3733 RGB controller. To enable it, add this to your `rules.mk`:
 
 ```makefile
-RGB_MATRIX_ENABLE = IS31FL3733
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = IS31FL3733
 ```
 
 Configure the hardware via your `config.h`:
@@ -112,7 +114,8 @@ Where `X_Y` is the location of the LED in the matrix defined by [the datasheet](
 There is basic support for addressable RGB matrix lighting with a WS2811/WS2812{a,b,c} addressable LED strand. To enable it, add this to your `rules.mk`:
 
 ```makefile
-RGB_MATRIX_ENABLE = WS2812
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = WS2812
 ```
 
 Configure the hardware via your `config.h`:
@@ -482,6 +485,14 @@ void rgb_matrix_indicators_kb(void) {
 }
 ```
 
+In addition, there are the advanced indicator functions.  These are aimed at those with heavily customized displays, where rendering every LED per cycle is expensive.  Such as some of the "drashna" layouts.  This includes a special macro to help make this easier to use: `RGB_MATRIX_INDICATOR_SET_COLOR(i, r, g, b)`.
+
+```c
+void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {
+    RGB_MATRIX_INDICATOR_SET_COLOR(index, red, green, blue);
+}
+```
+
 ### Suspended state :id=suspended-state
 To use the suspend feature, make sure that `#define RGB_DISABLE_WHEN_USB_SUSPENDED true` is added to the `config.h` file. 
 
diff --git a/qmk/docs/feature_rgblight.md b/qmk/docs/feature_rgblight.md
index 23b2886e..762056b3 100644
--- a/qmk/docs/feature_rgblight.md
+++ b/qmk/docs/feature_rgblight.md
@@ -41,6 +41,8 @@ Changing the **Hue** cycles around the circle.<br>
 Changing the **Saturation** moves between the inner and outer sections of the wheel, affecting the intensity of the color.<br>
 Changing the **Value** sets the overall brightness.<br>
 
+![QMK Color Wheel with HSV Values](https://i.imgur.com/vkYVo66.jpg)
+
 ## Keycodes
 
 |Key                |Aliases   |Description                                                         |
diff --git a/qmk/docs/feature_sequencer.md b/qmk/docs/feature_sequencer.md
new file mode 100644
index 00000000..8c8587a9
--- /dev/null
+++ b/qmk/docs/feature_sequencer.md
@@ -0,0 +1,88 @@
+# Sequencer
+
+Since QMK has experimental support for MIDI, you can now turn your keyboard into a [step sequencer](https://en.wikipedia.org/wiki/Music_sequencer#Step_sequencers)!
+
+!> **IMPORTANT:** This feature is highly experimental, it has only been tested on a Planck EZ so far. Also, the scope will be limited to support the drum machine use-case to start with.
+
+## Enable the step sequencer
+
+Add the following line to your `rules.mk`:
+
+```make
+SEQUENCER_ENABLE = yes
+```
+
+By default the sequencer has 16 steps, but you can override this setting in your `config.h`:
+
+```c
+#define SEQUENCER_STEPS 32
+```
+
+## Tracks
+
+You can program up to 8 independent tracks with the step sequencer. Select the tracks you want to edit, enable or disable some steps, and start the sequence!
+
+## Resolutions
+
+While the tempo defines the absolute speed at which the sequencer goes through the steps, the resolution defines the granularity of these steps (from coarser to finer).
+
+|Resolution   |Description            |
+|----------   |-----------            |
+|`SQ_RES_2`   |Every other beat       |
+|`SQ_RES_2T`  |Every 1.5 beats        |
+|`SQ_RES_4`   |Every beat             |
+|`SQ_RES_4T`  |Three times per 2 beats|
+|`SQ_RES_8`   |Twice per beat         |
+|`SQ_RES_8T`  |Three times per beat   |
+|`SQ_RES_16`  |Four times per beat    |
+|`SQ_RES_16T` |Six times per beat     |
+|`SQ_RES_32`  |Eight times per beat   |
+
+## Keycodes
+
+|Keycode  |Description                                        |
+|-------  |-----------                                        |
+|`SQ_ON`  |Start the step sequencer                           |
+|`SQ_OFF` |Stop the step sequencer                            |
+|`SQ_TOG` |Toggle the step sequencer playback                 |
+|`SQ_SALL`|Enable all the steps                               |
+|`SQ_SCLR`|Disable all the steps                              |
+|`SQ_S(n)`|Toggle the step `n`                                |
+|`SQ_TMPD`|Decrease the tempo                                 |
+|`SQ_TMPU`|Increase the tempo                                 |
+|`SQ_R(n)`|Set the resolution to n                            |
+|`SQ_RESD`|Change to the slower resolution                    |
+|`SQ_RESU`|Change to the faster resolution                    |
+|`SQ_T(n)`|Set `n` as the only active track or deactivate all |
+
+## Functions
+
+|Function                                                             |Description                                            |
+|--------                                                             |-----------                                            |
+|`bool is_sequencer_on(void);`                                        |Return whether the sequencer is playing                |
+|`void sequencer_toggle(void);`                                       |Toggle the step sequencer playback                     |
+|`void sequencer_on(void);`                                           |Start the step sequencer                               |
+|`void sequencer_off(void);`                                          |Stop the step sequencer                                |
+|`bool is_sequencer_step_on(uint8_t step);`                           |Return whether the step is currently enabled           |
+|`void sequencer_set_step(uint8_t step, bool value);`                 |Enable or disable the step                             |
+|`void sequencer_set_step_on();`                                      |Enable the step                                        |
+|`void sequencer_set_step_off();`                                     |Disable the step                                       |
+|`void sequencer_toggle_step(uint8_t step);`                          |Toggle the step                                        |
+|`void sequencer_set_all_steps(bool value);`                          |Enable or disable all the steps                        |
+|`void sequencer_set_all_steps_on();`                                 |Enable all the steps                                   |
+|`void sequencer_set_all_steps_off();`                                |Disable all the steps                                  |
+|`uint8_t sequencer_get_tempo(void);`                                 |Return the current tempo                               |
+|`void sequencer_set_tempo(uint8_t tempo);`                           |Set the tempo to `tempo` (between 1 and 255)           |
+|`void sequencer_increase_tempo(void);`                               |Increase the tempo                                     |
+|`void sequencer_decrease_tempo(void);`                               |Decrease the tempo                                     |
+|`sequencer_resolution_t sequencer_get_resolution(void);`             |Return the current resolution                          |
+|`void sequencer_set_resolution(sequencer_resolution_t resolution);`  |Set the resolution to `resolution`                     |
+|`void sequencer_increase_resolution(void);`                          |Change to the faster resolution                        |
+|`void sequencer_decrease_resolution(void);`                          |Change to the slower resolution                        |
+|`bool is_sequencer_track_active(uint8_t track);`                     |Return whether the track is active                     |
+|`void sequencer_set_track_activation(uint8_t track, bool value);`    |Activate or deactivate the `track`                     |
+|`void sequencer_toggle_track_activation(uint8_t track);`             |Toggle the `track`                                     |
+|`void sequencer_activate_track(uint8_t track);`                      |Activate the `track`                                   |
+|`void sequencer_deactivate_track(uint8_t track);`                    |Deactivate the `track`                                 |
+|`void sequencer_toggle_single_active_track(uint8_t track);`          |Set `track` as the only active track or deactivate all |
+
diff --git a/qmk/docs/feature_split_keyboard.md b/qmk/docs/feature_split_keyboard.md
index f054f365..b2341142 100644
--- a/qmk/docs/feature_split_keyboard.md
+++ b/qmk/docs/feature_split_keyboard.md
@@ -237,6 +237,26 @@ This sets the maximum timeout when detecting master/slave when using `SPLIT_USB_
 ```
 This sets the poll frequency when detecting master/slave when using `SPLIT_USB_DETECT`
 
+## Hardware Considerations and Mods
+
+While most any Pro Micro can be used, micro controllers like the AVR Teensys and most (if not all) ARM boards require the Split USB Detect.
+
+However, with the Teensy 2.0 and Teensy++ 2.0, there is a simple hardware mod that you can perform to add VBUS detection, so you don't need the Split USB detection option.
+
+You'll only need a few things:
+
+* A knife (x-acto knife, ideally)
+* A solder station or hot air station
+* An appropriate Schottky diode, such as the [PMEG2005EH](https://www.digikey.com/en/products/detail/nexperia-usa-inc/PMEG2005EH,115/1589924)
+
+You'll need to cut the small trace between the 5V and center pads on the back of the Teensy.
+
+Once you have done that, you will want to solder the diode from the 5V pad to the center pad.
+
+You may need to use the 5V pad from the regulator block above as the pads were too small and placed too closely together to place the Schottky diode properly.
+
+![Teensy++ 2.0](https://i.imgur.com/BPEC5n5.png)
+
 ## Additional Resources
 
 Nicinabox has a [very nice and detailed guide](https://github.com/nicinabox/lets-split-guide) for the Let's Split keyboard, that covers most everything you need to know, including troubleshooting information. 
diff --git a/qmk/docs/feature_userspace.md b/qmk/docs/feature_userspace.md
index 77a6c8d7..8b001e3c 100644
--- a/qmk/docs/feature_userspace.md
+++ b/qmk/docs/feature_userspace.md
@@ -184,7 +184,7 @@ If you wanted to consolidate macros and other functions into your userspace for
 
 First, you'd want to go through all of your `keymap.c` files and replace `process_record_user` with `process_record_keymap` instead.   This way, you can still use keyboard specific codes on those boards, and use your custom "global" keycodes as well.   You'll also want to replace `SAFE_RANGE` with `NEW_SAFE_RANGE` so that you wont have any overlapping keycodes
 
-Then add `#include <name.h>` to all of your keymap.c files.  This allows you to use these new keycodes without having to redefine them in each keymap.
+Then add `#include "<name>.h"` to all of your keymap.c files.  This allows you to use these new keycodes without having to redefine them in each keymap.
 
 Once you've done that, you'll want to set the keycode definitions that you need to the `<name>.h`  file. For instance:
 ```c
diff --git a/qmk/docs/fr-fr/newbs_testing_debugging.md b/qmk/docs/fr-fr/newbs_testing_debugging.md
index 680d7644..0307429e 100644
--- a/qmk/docs/fr-fr/newbs_testing_debugging.md
+++ b/qmk/docs/fr-fr/newbs_testing_debugging.md
@@ -42,7 +42,9 @@ Vous préférez une solution basée sur le terminal? [hid_listen](https://www.pj
 
 Parfois, il est utile d'afficher des messages de débugage depuis votre [code custom](custom_quantum_functions.md). Le faire est assez simple. Commencez par ajouter `print.h` au début de votre fichier:
 
-    #include <print.h>
+```c
+#include "print.h"
+```
 
 Une fois fait, vous pouvez utiliser les fonctions print suivantes:
 
diff --git a/qmk/docs/hardware_keyboard_guidelines.md b/qmk/docs/hardware_keyboard_guidelines.md
index d49d0d09..742b5657 100644
--- a/qmk/docs/hardware_keyboard_guidelines.md
+++ b/qmk/docs/hardware_keyboard_guidelines.md
@@ -3,6 +3,25 @@
 Since starting, QMK has grown by leaps and bounds thanks to people like you who contribute to creating and maintaining our community keyboards. As we've grown we've discovered some patterns that work well, and ask that you conform to them to make it easier for other people to benefit from your hard work.
 
 
+## Use QMK Lint
+
+We have provided a tool, `qmk lint`, which will let you check over your keyboard for problems. We suggest using it frequently while working on your keyboard and keymap. 
+
+Example passing check:
+
+```
+$ qmk lint -kb rominronin/katana60/rev2
+Ψ Lint check passed!
+```
+
+Example failing check:
+
+```
+$ qmk lint -kb clueboard/66/rev3
+☒ Missing keyboards/clueboard/66/rev3/readme.md
+☒ Lint check failed!
+```
+
 ## Naming Your Keyboard/Project
 
 All keyboard names are in lower case, consisting only of letters, numbers, and underscore (`_`). Names may not begin with an underscore. Forward slash (`/`) is used as a sub-folder separation character.
diff --git a/qmk/docs/index.html b/qmk/docs/index.html
index 68bd00f6..5cab97a5 100644
--- a/qmk/docs/index.html
+++ b/qmk/docs/index.html
@@ -46,6 +46,7 @@
         '/unicode': '/feature_unicode',
         '/python_development': '/cli_development',
         '/getting_started_build_tools':'/newbs_getting_started',
+        '/tutorial':'/newbs',
       },
       basePath: '/',
       name: 'QMK Firmware',
diff --git a/qmk/docs/internals_gpio_control.md b/qmk/docs/internals_gpio_control.md
index 48eaf887..7c222894 100644
--- a/qmk/docs/internals_gpio_control.md
+++ b/qmk/docs/internals_gpio_control.md
@@ -21,3 +21,22 @@ The following functions can provide basic control of GPIOs and are found in `qua
 ## Advanced Settings :id=advanced-settings
 
 Each microcontroller can have multiple advanced settings regarding its GPIO. This abstraction layer does not limit the use of architecture-specific functions. Advanced users should consult the datasheet of their desired device and include any needed libraries. For AVR, the standard avr/io.h library is used; for STM32, the ChibiOS [PAL library](http://chibios.sourceforge.net/docs3/hal/group___p_a_l.html) is used.
+
+## Atomic Operation
+
+The above functions are not always guaranteed to work atomically. Therefore, if you want to prevent interruptions in the middle of operations when using multiple combinations of the above functions, use the following `ATOMIC_BLOCK_FORCEON` macro.
+
+eg.
+```c
+void some_function() {
+     // some process
+     ATOMIC_BLOCK_FORCEON {
+        // Atomic Processing
+     }
+     // some process
+}
+```
+
+`ATOMIC_BLOCK_FORCEON` forces interrupts to be disabled before the block is executed, without regard to whether they are enabled or disabled. Then, after the block is executed, the interrupt is enabled.
+
+Note that `ATOMIC_BLOCK_FORCEON` can therefore be used if you know that interrupts are enabled before the execution of the block, or if you know that it is OK to enable interrupts at the completion of the block.
diff --git a/qmk/docs/ja/config_options.md b/qmk/docs/ja/config_options.md
index 67e97303..170beade 100644
--- a/qmk/docs/ja/config_options.md
+++ b/qmk/docs/ja/config_options.md
@@ -34,7 +34,9 @@ QMK での全ての利用可能な設定にはデフォルトがあります。
 
 これは最初に include されるものの 1 つである C ヘッダファイルで、プロジェクト全体(もし含まれる場合)にわたって持続します。多くの変数をここで設定し、他の場所からアクセスすることができます。`config.h` ファイルでは、以下のもの以外の、他の `config.h`  ファイルやその他のファイルの include をしないでください:
 
-    #include "config_common.h"
+```c
+#include "config_common.h"
+```
 
 
 ## ハードウェアオプション
diff --git a/qmk/docs/ja/feature_led_matrix.md b/qmk/docs/ja/feature_led_matrix.md
index b2595f99..e7b60f59 100644
--- a/qmk/docs/ja/feature_led_matrix.md
+++ b/qmk/docs/ja/feature_led_matrix.md
@@ -15,7 +15,8 @@ RGB LED を使いたい場合は、代わりに [RGB マトリックスサブシ
 
 I2C IS31FL3731 RGB コントローラを使ったアドレス指定可能な LED マトリックスライトのための基本的なサポートがあります:有効にするには、`rules.mk` に以下を追加します:
 
-    LED_MATRIX_ENABLE = IS31FL3731
+    LED_MATRIX_ENABLE = yes
+    LED_MATRIX_DRIVER = IS31FL3731
 
 1から4個の IS31FL3731 IC を使うことができます。キーボード上に存在しない IC の `LED_DRIVER_ADDR_<N>` 定義を指定しないでください。`config.h` に以下の項目を定義することができます:
 
diff --git a/qmk/docs/ja/feature_macros.md b/qmk/docs/ja/feature_macros.md
index 5fbe3672..14a58ad2 100644
--- a/qmk/docs/ja/feature_macros.md
+++ b/qmk/docs/ja/feature_macros.md
@@ -187,7 +187,9 @@ void post_process_record_user(uint16_t keycode, keyrecord_t *record) {
 
 デフォルトでは、QWERTY レイアウトの US キーマップを想定しています; それを変更したい場合(例えば OS がソフトウェア Colemak を使う場合)、キーマップのどこかに以下を含めます:
 
-    #include <sendstring_colemak.h>
+```c
+#include "sendstring_colemak.h"
+```
 
 ### メモリ内の文字列
 
diff --git a/qmk/docs/ja/feature_userspace.md b/qmk/docs/ja/feature_userspace.md
index d0d46f63..b0c113d1 100644
--- a/qmk/docs/ja/feature_userspace.md
+++ b/qmk/docs/ja/feature_userspace.md
@@ -189,7 +189,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
 最初に、全ての `keymap.c` ファイルを調べ、代わりに `process_record_user` を `process_record_keymap` に置き換えます。この方法では、これらのキーボードでキーボード固有のコードを使用でき、カスタムの "global" キーコードも使うことができます。また、`SAFE_RANGE` を `NEW_SAFE_RANGE` に置き換えて、キーコードが重複しないようにすることもできます。
 
-次に、全ての keymap.c ファイルに `#include <name.h>` を追加します。これにより、各キーマップでそれらを再定義することなく新しいキーコードを使うことができます。
+次に、全ての keymap.c ファイルに `#include "<name>.h"` を追加します。これにより、各キーマップでそれらを再定義することなく新しいキーコードを使うことができます。
 
 それが完了したら、必要なキーコードの定義を `<name>.h` ファイルに設定します。例えば:
 ```c
diff --git a/qmk/docs/ja/newbs_testing_debugging.md b/qmk/docs/ja/newbs_testing_debugging.md
index b80e09fc..41103bae 100644
--- a/qmk/docs/ja/newbs_testing_debugging.md
+++ b/qmk/docs/ja/newbs_testing_debugging.md
@@ -45,7 +45,9 @@ void keyboard_post_init_user(void) {
 
 [custom code](ja/custom_quantum_functions.md)内からデバッグメッセージを出力すると便利な場合があります。それはとても簡単です。ファイルの先頭に`print.h`のインクルードを追加します:
 
-    #include <print.h>
+```c
+#include "print.h"
+```
 
 そのあとは、いくつかの異なった print 関数を使用することが出来ます。
 
diff --git a/qmk/docs/ko-kr/README.md b/qmk/docs/ko-kr/README.md
new file mode 100644
index 00000000..881b4b5a
--- /dev/null
+++ b/qmk/docs/ko-kr/README.md
@@ -0,0 +1,33 @@
+# Quantum Mechanical Keyboard Firmware
+
+[![Current Version](https://img.shields.io/github/tag/qmk/qmk_firmware.svg)](https://github.com/qmk/qmk_firmware/tags)
+[![Build Status](https://travis-ci.org/qmk/qmk_firmware.svg?branch=master)](https://travis-ci.org/qmk/qmk_firmware)
+[![Discord](https://img.shields.io/discord/440868230475677696.svg)](https://discord.gg/Uq7gcHh)
+[![Docs Status](https://img.shields.io/badge/docs-ready-orange.svg)](https://docs.qmk.fm)
+[![GitHub contributors](https://img.shields.io/github/contributors/qmk/qmk_firmware.svg)](https://github.com/qmk/qmk_firmware/pulse/monthly)
+[![GitHub forks](https://img.shields.io/github/forks/qmk/qmk_firmware.svg?style=social&label=Fork)](https://github.com/qmk/qmk_firmware/)
+
+## QMK Firmware 란?
+
+QMK(*Quantum Mechanical Keyboard 양자 기계식 키보드*)란 QMK 컴워어, QMK 툴박스, qmk.fm 를 관리하고 있는 오픈소스 커뮤니티 입니다. QMK펌웨어는 [tmk\_keyboard](http://github.com/tmk/tmk_keyboard)를 바탕으로 만들어진 키보드펌웨어이며, Atmel AVR컨트롤러와 [OLKB 제품군](http://olkb.com) [ErgoDox EZ](http://www.ergodox-ez.com), 그리고 [Clueboard 제품군](http://clueboard.co/) 이용할때 매우 편리합니다. 또한 QMK는 ChibiOS를 사용하여 ARM기반의 컨트롤러로도 사용할수 있습니다. 마지막으로 QMK는 커스텀회로와 핸드와이어드 키보드을 작동시키는데에도 사용가능합니다.
+
+
+## 설치하기
+
+만약 당신이 QMK에 키보드, 키맵, 또는 새로운 기능을 추가하고싶다면, 가장쉬운 방법은 Github를 통해 [저장소(REPO)를 추가하고]((https://github.com/qmk/qmk_firmware#fork-destination-box)) 로컬에서 변화 또는 수정하고, [PULL REQUEST](https://github.com/qmk/qmk_firmware/pulls)을 통해 업로드 할수 있습니다.
+
+또다른 방법으로는, 직접 파일들 로컬로 다운로드 하거나([zip](https://github.com/qmk/qmk_firmware/zipball/master), [tar](https://github.com/qmk/qmk_firmware/tarball/master)), git (`git@github.com:qmk/qmk_firmware.git`), https (`https://github.com/qmk/qmk_firmware.git`)을 통해 클론을 만들수 있습니다.
+
+## 컴파일
+
+먼저 컴파일을 하기전 AVR 이나 ARM [개발환경](getting_started_build_tools.md)을 구축해야 합니다. 모든준비가 끝났다면 `make`를 다음과 같이 키보드와 키맵을 선택하여 컴파일 할 수 있습니다.
+
+    make planck/rev4:default
+
+이 커맨드는 `rev4`버전의 `planck`를 `default`키맵으로 컴파일 할것입니다. 다만 모든 키보드는 파일, 수정본 또는 세부프로젝트를 가지고있지 않음으로 수정본 부분을 생략될수 있습니다.
+
+    make preonic:default
+
+## 커스터마이징
+
+QMK는 사용할 수 있는 매우 다양한 [기능](features.md)과 체계화된 [참고자료](http://docs.qmk.fm)들이 있습니다. 그중 대부분은 [키맵](keymap.md)을 수정하거나 [키코드](keycodes.md)를 변경하는데에 특화되어 있습니다.
diff --git a/qmk/docs/ko-kr/getting_started_build_tools.md b/qmk/docs/ko-kr/getting_started_build_tools.md
new file mode 100644
index 00000000..3aae69d2
--- /dev/null
+++ b/qmk/docs/ko-kr/getting_started_build_tools.md
@@ -0,0 +1,156 @@
+# 컴파일 도구 설치
+
+이 페이지는 QMK 컴파일 환경을 설치하는 방법을 설명합니다. 이 페이지는 AVR 프로세서들(예를 들면 atmega32u4와 비슷한)을 위한 가이드를 제공합니다
+
+<!-- FIXME: We should have ARM instructions somewhere. -->
+
+
+**노트:** 만약 당신이 처음 시작한다면 [입문자를 위한 가이드](newbs.md)페이지를 확인하세요.
+
+계속하기전에 당신의 서브모듈(외부라이브러리)이 최신인지 `make git-submodule`을 사용하여 확인하세요.
+
+## 리눅스
+
+당신이 항상 최신 파일을 가지고 있는지는 `sudo util/qmk_install.sh`을 이용하여 간단히 확인할 수 있습니다. 이 명령어는 당신이 필요한 모든 속성물(dependencies)를 설치할 것입니다. **이 명령어는 `apt-get upgrade`를 사용합니다**
+
+또한 당신의 직접 필요한 것들을 설치할 수도 있습니다. 하지만 이 자료는 항상 최신의 자료을 가지고 있지 않습니다.
+
+현재로써 필요한 것은 다음과 같습니다. 하지만 당신이 하는 작업에 따라 당신은 다음 패키지를 다 쓰지 않을 수도 있습니다. 또한 환경에 따라 모든 다음 패키지는 다른이름으로 존재하거나, 없을 수도 있습니다.
+
+```
+build-essential
+gcc
+unzip
+wget
+zip
+gcc-avr
+binutils-avr
+avr-libc
+dfu-programmer
+dfu-util
+gcc-arm-none-eabi
+binutils-arm-none-eabi
+libnewlib-arm-none-eabi
+git
+```
+
+당신이 사용하는 패키지 매니져에서 이러한 방법으로 설치하십시요.
+
+데비안 / 우분투 예시:
+
+    sudo apt-get update
+    sudo apt-get install gcc unzip wget zip gcc-avr binutils-avr avr-libc dfu-programmer dfu-util gcc-arm-none-eabi binutils-arm-none-eabi libnewlib-arm-none-eabi
+
+페도라 / 레드햇 예시:
+
+    sudo dnf install gcc unzip wget zip dfu-util dfu-programmer avr-gcc avr-libc binutils-avr32-linux-gnu arm-none-eabi-gcc-cs arm-none-eabi-binutils-cs arm-none-eabi-newlib
+    
+아치 / 맨자로(Manjaro) 예시:
+
+    pacman -S base-devel gcc unzip wget zip avr-gcc avr-binutils avr-libc dfu-util arm-none-eabi-gcc arm-none-eabi-binutils arm-none-eabi-newlib git dfu-programmer dfu-util
+
+## 닉스 (NIX)
+
+만약 당신이 [NixOS](https://nixos.org/)를 사용중이거나 NIX를 리눅스 또는 맥에서 사용중이라면 `nix-shell`를 root 디렉토리에서 사용하여 컴파일 환경의 구축할 수 있습니다.
+
+기본적으로 다음 커맨드는 AVR과 ARM 컴파일러를 설치할것입니다. 만약 필요 없다면 `avr` 또는 `arm`을 인수에서 해제할 수 있습니다.
+
+    nix-shell --arg arm false
+
+## 맥
+당신이 홈브루([homebrew](http://brew.sh/))를 사용한다면, 다음을 입력하세요.
+
+    brew tap osx-cross/avr
+    brew tap PX4/homebrew-px4
+    brew update
+    brew install avr-gcc@7
+    brew link --force avr-gcc@7
+    brew install dfu-programmer
+    brew install dfu-util
+    brew install gcc-arm-none-eabi
+    brew install avrdude
+
+이 방법을 가장 추천합니다. 만약 홈브루가 없다면 커맨드라인 환경에서 매우 편한 [Homebrew](http://brew.sh/)를 다운받는 것을 추천합니다. 참고로 `avr-gcc@7`를 설치하는 중 `make`과 `make install`는 대개 20분 넘게 걸리고 CPU 사용량이 높아집니다.
+
+## msys2를 사용하는 윈도우 (추천)
+윈도우 비스타 부터 최신버젼까지 가장추천되는 환경은 [msys2](http://www.msys2.org)를 이용하는 것입니다. (윈도우 7과 윈도우 10에서 모두 테스트되었음)
+
+* 이 사이트에 있는 설명을 이용해 msys2를 설치하세요: http://www.msys2.org
+* ``MSYS2 MingGW 64-bit`` 를 여세요
+* QMK폴더로 이동하세요. c드라이브 루트에 있는경우:
+ * `$ cd /c/qmk_firmware`
+* `util/qmk_install.sh`을 실행시키고 나오는데요 따라하세요
+
+### 크리에이터 업데이트
+만약 당신의 윈도우 10이 크리에이터 업데이트 버전 또는 더 높은 버전이라면 바로 컴파일과 프로그램 업로드(flashing)를 할 수 있습니다. 크리에이터 업데이트 전 버전이라면 컴파일만 가능합니다. 만약 당신이 잘 모르겠거나 업데이트된 버전이 아니라면 [이 링크](https://support.microsoft.com/en-us/instantanswers/d4efb316-79f0-1aa1-9ef3-dcada78f3fa0/get-the-windows-10-creators-update)를 확인해 보십시오.
+
+### 리눅스용 윈도우 하위 시스템 사용 (Windows10 Subsystem for Linux)
+크리에이터 업데이트에 추가로 만약 당신이 리눅스용 윈도우 하위 시스템이 필요하다면 이 링크에서 다운받으십시오: [설명](http://www.howtogeek.com/249966/how-to-install-and-use-the-linux-bash-shell-on-windows-10/)
+
+만약 당신이 이미 리눅스용 윈도우 하위 시스템을 Anniversary업데이트를 통해 받았다면 이 링크에서 16.04LTS로 업데이트 하는것을 추천합니다. 왜냐하면 업데이트 없이는 일부키보드가 14.04LTS에 포함되있는 도구들로 컴파일되지 않을수 있기때문입니다 : [WSL 업데이트](https://betanews.com/2017/04/14/upgrade-windows-subsystem-for-linux/)
+
+
+### Git
+만약 당신이 이미 파일을 로컬로 복제하였다면 이 섹션을 무시하십시요.
+
+당신은 파일을 기본적인 git을 사용하여 로컬로 복제해야 합니다. **주의, WSL Git을 사용하면 안됩니다** [Git](https://git-scm.com/download/win) 이 링크에서 git을 다운받고 설치하십시오.
+그리고 [기본설정](https://git-scm.com/book/en/v2/Getting-Started-First-Time-Git-Setup), 유저네임과 이메일을 설정하는 것은 만약 당신이 온라인에 기여할 계획이라면 매우 중요합니다.
+
+Git의 설치가 완료되었다면 Git Bash커맨드을 열고 당신의 복제 QMK파일이 있는 위치로 이동하고 `git clone --recurse-submodules https://github.com/qmk/qmk_firmware`를 실행 시키십니오. 이 커맨드는 새로운 `qmk_firmware`폴더를 이미 존재하는 것의 하위 폴더설정으로 생성할 것입니다.
+
+### 도구(Toolchain) 설정
+기본적으로 도구설정은 리눅스용 윈도우 하위 시스템이 설치될때 자동으로 설정됩니다. 하지만 수동적으로 하고 싶다면 여기 설명이 있습니다. (If you want to do everything manually, there are no other instructions than the scripts themselves, but you can always open issues and ask for more information. )
+
+1. "Bash On Ubuntu On Windows" 을 실행시키십시오.
+2. 당신이 `qmk_firmware`를 복제한 위치로 가십시오. WSL(리눅스용 윈도우 하위 시스템 사용)에서 `/mnt/`로 시작되는 패스를 찾으십시오. 즉 당신은 다음과 같은 형식으로 입력해야 합니다. `cd /mnt/c/path/to/qmk_firmware`  (Note that the paths start with `/mnt/`in the WSL, so you have to write for example `cd /mnt/c/path/to/qmk_firmware`.)
+3. `util/wsl_install.sh`를 실행시키고 화면에 나오는 지시를 따르십니오.
+4. Bash command window를 재실행 시키십시오.
+5. 이로써 당신은 컴파일과 프로그램 업로드(flashing)을 위한 준비가 모두 끝났습니다.
+
+### 중요한 참고사항
+*`util/wsl_install.sh` 명령어를 다시 실행시켜 최신 업데이트를 다운받을 수 있습니다.
+* QMK 폴더의 위치는 윈도우 파일시스템을 기반으로 해야 됩니다. WSL는 외부실행파일를 작동 시킬수 없기 때문이죠.
+* WSL의 Git은 윈도우용 Git과 **호환되지 않습니다**
+* 파일을 수정하는 것은 WSL안과 밖에서 모두 가능합니다 하지만 만약 .makefile 혹은 .sh를 수정한다면 유닉스 라인엔딩(Unix line endings)을 지원하는 에디터를 사용하는지 확인하십이오. 그렇지 않다면 컴파일이 되지않을 수도 있습니다.
+
+## 윈두우 (비스타 혹은 더 최신) (비추천)
+
+이 섹션은 윈도우 비스타 혹은 더 최신버젼을 위한 오래된 설명입니다. [MSYS2](#windows-with-msys2-recommended)를 사용하는 것을 더 추천합니다.
+
+1. WinAVR을 설치하였다면 먼저 삭제하십시오.
+2. [MHV AVR Tools](https://infernoembedded.com/sites/default/files/project/MHV_AVR_Tools_20131101.exe)을 설치하십시오. (Disable smatch, but **be sure to leave the option to add the tools to the PATH checked**)
+3. 만약 당신이 Infinity을 기반으로 하는 키보드에 프로그램 업로드를(flashing) 할거라면 dfu-util을 설치해야 합니다, [Input Club](https://github.com/kiibohd/controller/wiki/Loading-DFU-Firmware) 를 참고 하십시오.
+4. [MinGW](https://sourceforge.net/projects/mingw/files/Installer/mingw-get-setup.exe/download)를 설치하십시오. 설치중 윈도우화면에서 GUI 추가 설치 옵션을 해재하십니오. **기본 설치 위치를 바꾸지 마십시오.** 이 명령어는 기본위치를 기반으로 하고 있습니다.
+5. 레파지토리를 복제하십시오. [이 링크로 압축파일을 받고 앞축해제 하십시오.](https://github.com/qmk/qmk_firmware/archive/master.zip) 윈도우 탐색기에서 다운받은 파일을 여십시오.
+6. `\util` 폴더를 여십시오.
+7. `1-setup-path-win` .bat파일을 더블클릭해서 실행시키시오. 유저 계정 설정 변경을 허용해야될 수도 있습니다. 스페이스바를 눌러 설치가 성공적으로 완료되었다는 메세지를 닫을 수 있습니다.
+8. `2-setup-environment-win` .bat파일에 우클릭해서 '관리자 권한으로 실행'으로 실행시키십시오. 이 작업을 꽤 오래 걸릴 수도 있습니다. 또한 드라이버 설정을 승인해야 될 수도 있습니다. 하지만 이 모든것이 끝나면 당신의 시스템의 설정이 모두 끝났습니다.
+
+만약 이 작업을 하는데에 문제가 있어 도움받고 싶다면 *Win_Check_Output.txt*을 생성하는 것이 도움이 될것입니다. 이 파일은 `Win_Check.bat`을 `\util`폴더에서 실행시켜 생성할 수 있습니다.
+
+## 도커(Docker)
+만약 위작업들이 당신에게 좀 어렵게 느껴졌다면 도커(Docker)가 당신을 위한 최선일 수도 있습니다(의역). [Docker CE](https://docs.docker.com/install/#supported-platforms)를 설치한뒤 아래 커맨드를 `qmk_firmware` 디랙토리에서 실행시켜 키보드 또는 키맵을 생성시킵니다.
+```bash
+util/docker_build.sh keyboard:keymap
+# 예: util/docker_build.sh ergodox_ez:steno
+```
+이 커맨드는 원하는 키보드 또는 키맵을 컴파일하고 `.hex`또는 `.bin`파일을 프로그램 업로드를(flashing) 위해 QMK디랙토리에 생성할것입니다. 만약 `:keymap`이 생략된다면 `default`이 기본을로 사용됩니다. 참고로 여기서 사용되는 인수는 `make` 커맨드를 사용하여 컴파일할때와 동일합니다.
+
+
+또한 스크립트를 그냥 아무 인수 없이도 사용가능합니다. 그렇게 된다면 프로그램은 하나씩 자동으로 인수입력을 요구 할것입니다. 어쩌면 이방법이 더 쉬울 수도 있습니다.
+```bash
+util/docker_build.sh
+# 인수을 입력받습니다.(아무것도 쓰지 않고 놔두는면 기본값으로 설정됩니다)
+```
+
+다음과 같이 `target`를 사용하여 컴파일과 프로그램 업로드(flashing)을 동시에 할수도 있습니다.
+```bash
+util/docker_build.sh keyboard:keymap:target
+# 예: util/docker_build.sh planck/rev6:default:dfu-util
+```
+만약 당시이 리눅스를 사용한다면 이 커맨드들은 추가 설정 없이 바로 작동할 것입니다. 하지만 위도우 또는 맥 환경에서는 [Docker Machine](http://gw.tnode.com/docker/docker-machine-with-usb-support-on-windows-macos/)를 사용하여야 이 커맨드들을 사용가능합니다. Docker Machine설정은 꽤 지루하고 짜증남으로 추천하지 않고 [QMK Toolbox](https://github.com/qmk/qmk_toolbox)를 사용하는 것을 추천합니다.
+
+!> 윈도우에서 독커는 [Hyper-V](https://docs.microsoft.com/en-us/virtualization/hyper-v-on-windows/quick-start/enable-hyper-v)을 활성화 설정하여야 사용가능합니다. 즉, 도커는 Hyper-V를 지원하지 않는 윈도우 7, 윈도우 8, 그리고 **윈도우 10 홈**과 같은 윈도우 버전에서 사용할수 없다는 것을 의미합니다.
+
+## Vagrant
+만약 컴웨어를 사용하는데 문제가 있다면 Vagrant라는 이름의 툴을 사용해 볼 수 있습니다. 이 툴은 가상환경을 세팅해줌과 동시에 컴웨어를 사용하는데에 필요한 모든 설정을 해줄 것입니다. OLKB는 가상환경에 파일을 호스팅하지 않습니다. [Vagrant 가이드](getting_started_vagrant.md)에서 더 많은 정보를 확인할 수 있습니다.
diff --git a/qmk/docs/ko-kr/getting_started_getting_help.md b/qmk/docs/ko-kr/getting_started_getting_help.md
new file mode 100644
index 00000000..2ae7917a
--- /dev/null
+++ b/qmk/docs/ko-kr/getting_started_getting_help.md
@@ -0,0 +1,17 @@
+# 도움 받기
+
+QMK에서 도움을 받는 방법은 다양합니다.
+
+**주의, 아래 링크들은 영어로 이루어져 있으며 영어 사용이 가능해야 편리하게 이용할 수 있습니다.**
+
+## 디스코드 실시간 채팅
+
+[QMK 디스코드 서버](https://discord.gg/Uq7gcHh)에서 QMK 개발자들과 실시간으로 대화를 나눌수있습니다. 이 디스코드에는 펌웨어, 툴박스, 하드웨어, 그리고 컨피겨레이터(configurator)에 관한 특별화된 채널이 운영되고 있습니다.
+
+## OLKB 서브레딧
+
+공식 QMK 포럼은 [reddit.com](https://reddit.com) 에 [/r/olkb](https://reddit.com/r/olkb)입니다.
+
+## Github 이슈
+
+[issue on GitHub](https://github.com/qmk/qmk_firmware/issues)에서 문제를 보고 할 수 있습니다. 이 링크는 문제가 오랜 시간을 필요로하거나 디버깅를 요구 할때 매우 유용합니다.
diff --git a/qmk/docs/ko-kr/getting_started_github.md b/qmk/docs/ko-kr/getting_started_github.md
new file mode 100644
index 00000000..2ff0ccb7
--- /dev/null
+++ b/qmk/docs/ko-kr/getting_started_github.md
@@ -0,0 +1,67 @@
+# QMK와 함께 Github를 사용하는 방법
+
+Github can be a little tricky to those that aren't familiar with it - this guide will walk through each step of forking, cloning, and submitting a pull request with QMK.
+
+Github는 자주 사용하는 사람이 아니면 좀 여려울수도 있습니다. 이 문서는 Github를 사용하는데 필요한 forking, cloning 그리고 submitting a pull request with QMK를 설명할 것입니다. 
+
+?> 이 가이드는 당신이 git커맨드를 사용하는데 익숙하고 git환경을 당신의 시스템이 설치하였다는 전제하에 작성되었습니다.
+
+아래와 같이 [QMK Github 페이지](https://github.com/qmk/qmk_firmware)에서 당신은 "Fork"라고 쓰여있는 버튼을 볼 수 있습니다
+
+![Fork on Github](http://i.imgur.com/8Toomz4.jpg)
+
+만약 당신이 어느기관 소속이고, 무슨 계정을 사용할것인지 골라야 한다면 개인 계정을 사용하는 것을 추천합니다.
+"Fork"가 성공적으로 끝났다면 아래 보이는 "Clone or Download"를 눌러야 합니다.
+
+![Download from Github](http://i.imgur.com/N1NYcSz.jpg)
+
+"HTTPS"채크 했는지 확인하고 나와 있는 링크를 복사하세요.
+
+![HTTPS link](http://i.imgur.com/eGO0ohO.jpg)
+
+여기거 부터 커맨드라인을 사용합니다. 커맨드 라인에서 `git clone `을 치고 복사한 링크를 붙여넣은후 실행시키세요.
+
+```
+user@computer:~$ git clone https://github.com/whoeveryouare/qmk_firmware.git
+Cloning into 'qmk_firmware'...
+remote: Counting objects: 46625, done.
+remote: Compressing objects: 100% (2/2), done.
+remote: Total 46625 (delta 0), reused 0 (delta 0), pack-reused 46623
+Receiving objects: 100% (46625/46625), 84.47 MiB | 3.14 MiB/s, done.
+Resolving deltas: 100% (29362/29362), done.
+Checking out files: 100% (2799/2799), done.
+```
+
+당신은 이제 모든파일이 로컬시스템이 추가 되었습니다 그리고 이제 키맵을 추가하거나 컴파일, 프로그램 업로드(flashing)를 할 수 있습니다. 
+모든 추가 변경을 만든 뒤에는 add, commit, and push를 사용하여 당신의 Folk에 추가 할 수 있습니다.
+
+```
+user@computer:~$ git add .
+user@computer:~$ git commit -m "adding my keymap"
+[master cccb1608] adding my keymap
+ 1 file changed, 1 insertion(+)
+ create mode 100644 keyboards/planck/keymaps/mine/keymap.c
+user@computer:~$ git push
+Counting objects: 1, done.
+Delta compression using up to 4 threads.
+Compressing objects: 100% (1/1), done.
+Writing objects: 100% (1/1), 1.64 KiB | 0 bytes/s, done.
+Total 1 (delta 1), reused 0 (delta 0)
+remote: Resolving deltas: 100% (1/1), completed with 1 local objects.
+To https://github.com/whoeveryouare/qmk_firmware.git
+ + 20043e64...7da94ac5 master -> master
+```
+
+이로써 당신이 만든 모든 변경들이 당신의 Github의 Folk에 추가 되었습니다. (`https://github.com/<whoeveryouare>/qmk_firmware`)에서 확인하고 "New Pull Request"를 눌러 변경사항을 QMK에 업로드할수 있습니다.
+
+![New Pull Request](http://i.imgur.com/DxMHpJ8.jpg)
+
+이 버튼을 누르면 당신이 만든 모든 변경사항들이 보여질 것입니다. 만약 모든 변경사항이 맘에 든다면 "Create Pull Request"를 눌러 요청을 확정할수 있습니다.
+
+**요청사항이 확정된다고 변경사항이 바로 적용되는 것은 아닙니다.**
+
+![Create Pull Request](http://i.imgur.com/Ojydlaj.jpg)
+
+요청을 한뒤 QMK개발자들은 댓글로 무엇이 변경되었는지 등을 물어 볼수있지만 끝에는 매인 디랙토리로 업로드 될것입니다.
+
+**"Thanks for contributing to QMK :)"**
diff --git a/qmk/docs/newbs.md b/qmk/docs/newbs.md
index 389e3f47..02b0a070 100644
--- a/qmk/docs/newbs.md
+++ b/qmk/docs/newbs.md
@@ -1,4 +1,4 @@
-# The Complete Newbs Guide To QMK
+# The QMK Tutorial
 
 Your computer keyboard has a processor inside of it, similar to the one inside your computer. This processor runs software that is responsible for detecting button presses and informing the computer when keys are pressed. QMK Firmware fills the role of that software, detecting button presses and passing that information on to the host computer. When you build your custom keymap, you are creating an executable program for your keyboard.
 
diff --git a/qmk/docs/newbs_getting_started.md b/qmk/docs/newbs_getting_started.md
index dfb2d54f..eee087e4 100644
--- a/qmk/docs/newbs_getting_started.md
+++ b/qmk/docs/newbs_getting_started.md
@@ -60,9 +60,12 @@ After Homebrew is installed run this command:
 
 You will need to install Git and Python. It's very likely that you already have both, but if not, one of the following commands should install them:
 
-* Debian / Ubuntu / Devuan: `sudo apt install git python3 python3-pip`
-* Fedora / Red Hat / CentOS: `sudo yum install git python3 python3-pip`
-* Arch / Manjaro: `sudo pacman -S git python python-pip python-setuptools libffi`
+* Debian / Ubuntu / Devuan: `sudo apt install -y git python3-pip`
+* Fedora / Red Hat / CentOS: `sudo yum -y install git python3-pip`
+* Arch / Manjaro: `sudo pacman --needed --noconfirm -S git python-pip libffi`
+* Void: `sudo xbps-install -y git python3-pip`
+* Solus: `sudo eopkg -y install git python3`
+* Sabayon: `sudo equo install dev-vcs/git dev-python/pip`
 
 Install the global CLI to bootstrap your system:
 
diff --git a/qmk/docs/newbs_testing_debugging.md b/qmk/docs/newbs_testing_debugging.md
index 18123890..834fed71 100644
--- a/qmk/docs/newbs_testing_debugging.md
+++ b/qmk/docs/newbs_testing_debugging.md
@@ -36,7 +36,9 @@ Prefer a terminal based solution? [hid_listen](https://www.pjrc.com/teensy/hid_l
 
 Sometimes it's useful to print debug messages from within your [custom code](custom_quantum_functions.md). Doing so is pretty simple. Start by including `print.h` at the top of your file:
 
-    #include <print.h>
+```c
+#include "print.h"
+```
 
 After that you can use a few different print functions:
 
diff --git a/qmk/docs/one_shot_keys.md b/qmk/docs/one_shot_keys.md
index aa3db5ac..9a082d7d 100644
--- a/qmk/docs/one_shot_keys.md
+++ b/qmk/docs/one_shot_keys.md
@@ -22,7 +22,7 @@ Sometimes, you want to activate a one-shot key as part of a macro or tap dance r
 
 For one shot layers, you need to call `set_oneshot_layer(LAYER, ONESHOT_START)` on key down, and `clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED)` on key up. If you want to cancel the oneshot, call `reset_oneshot_layer()`.
 
-For one shot mods, you need to call `set_oneshot_mods(MOD)` to set it, or `clear_oneshot_mods()` to cancel it.
+For one shot mods, you need to call `set_oneshot_mods(MOD_BIT(KC_*))` to set it, or `clear_oneshot_mods()` to cancel it.
 
 !> If you're having issues with OSM translating over Remote Desktop Connection, this can be fixed by opening the settings, going to the "Local Resources" tap, and in the keyboard section, change the drop down to "On this Computer".  This will fix the issue and allow OSM to function properly over Remote Desktop.
 
diff --git a/qmk/docs/pr_checklist.md b/qmk/docs/pr_checklist.md
index 22e8a3fe..e0dd0770 100644
--- a/qmk/docs/pr_checklist.md
+++ b/qmk/docs/pr_checklist.md
@@ -73,6 +73,7 @@ https://github.com/qmk/qmk_firmware/pulls?q=is%3Apr+is%3Aclosed+label%3Akeyboard
     - commented-out functions removed too
     - `matrix_init_board()` etc. migrated to `keyboard_pre_init_kb()`, see: [keyboard_pre_init*](https://docs.qmk.fm/#/custom_quantum_functions?id=keyboard_pre_init_-function-documentation)
     - prefer `CUSTOM_MATRIX = lite` if custom matrix used, allows for standard debounce, see [custom matrix 'lite'](https://docs.qmk.fm/#/custom_matrix?id=lite)
+    - prefer LED indicator [Configuration Options](https://docs.qmk.fm/#/feature_led_indicators?id=configuration-options) to custom `led_update_*()` implementations where possible
 - `keyboard.h`
     - `#include "quantum.h"` appears at the top
     - `LAYOUT` macros should use standard definitions if applicable
diff --git a/qmk/docs/tap_hold.md b/qmk/docs/tap_hold.md
index 9ffbfde8..aacff400 100644
--- a/qmk/docs/tap_hold.md
+++ b/qmk/docs/tap_hold.md
@@ -179,6 +179,25 @@ Holding and releasing a dual function key without pressing another key will resu
 
 For instance, holding and releasing `LT(2, KC_SPACE)` without hitting another key will result in nothing happening. With this enabled, it will send `KC_SPACE` instead.
 
+For more granular control of this feature, you can add the following to your `config.h`:
+
+```c
+#define RETRO_TAPPING_PER_KEY
+```
+
+You can then add the following function to your keymap:
+
+```c
+bool get_retro_tapping(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case LT(2, KC_SPACE):
+            return true;
+        default:
+            return false;
+    }
+}
+```
+
 ## Why do we include the key record for the per key functions?
 
 One thing that you may notice is that we include the key record for all of the "per key" functions, and may be wondering why we do that.
diff --git a/qmk/docs/ws2812_driver.md b/qmk/docs/ws2812_driver.md
index c1b96329..da5db01d 100644
--- a/qmk/docs/ws2812_driver.md
+++ b/qmk/docs/ws2812_driver.md
@@ -28,6 +28,17 @@ The default setting is 280 µs, which should work for most cases, but this can b
 #define WS2812_TRST_US 80
 ```
 
+#### Byte Order
+
+Some variants of the WS2812 may have their color components in a different physical or logical order. For example, the WS2812B-2020 has physically swapped red and green LEDs, which causes the wrong color to be displayed, because the default order of the bytes sent over the wire is defined as GRB.
+In this case, you can change the byte order by defining `WS2812_BYTE_ORDER` as one of the following values:
+
+| Byte order                        | Known devices                 |
+|-----------------------------------|-------------------------------|
+| `WS2812_BYTE_ORDER_GRB` (default) | Most WS2812's, SK6812, SK6805 |
+| `WS2812_BYTE_ORDER_RGB`           | WS2812B-2020                  |
+
+
 ### Bitbang
 Default driver, the absence of configuration assumes this driver. To configure it, add this to your rules.mk:
 
diff --git a/qmk/docs/zh-cn/newbs_testing_debugging.md b/qmk/docs/zh-cn/newbs_testing_debugging.md
index 4edceee4..38e6346c 100644
--- a/qmk/docs/zh-cn/newbs_testing_debugging.md
+++ b/qmk/docs/zh-cn/newbs_testing_debugging.md
@@ -34,7 +34,9 @@ void keyboard_post_init_user(void) {
 
 有时用[custom code](custom_quantum_functions.md)发送自定义调试信息很有用. 这么做很简单. 首先在你文件头部包含`print.h`:
 
-    #include <print.h>
+```c
+#include "print.h"
+```
 
 之后，您可以使用一些不同的打印功能:
 
diff --git a/qmk/drivers/avr/serial.c b/qmk/drivers/avr/serial.c
index c27cbfdd..526a0946 100644
--- a/qmk/drivers/avr/serial.c
+++ b/qmk/drivers/avr/serial.c
@@ -20,50 +20,111 @@
 
 #ifdef SOFT_SERIAL_PIN
 
-#    ifdef __AVR_ATmega32U4__
-// if using ATmega32U4 I2C, can not use PD0 and PD1 in soft serial.
-#        ifdef USE_AVR_I2C
-#            if SOFT_SERIAL_PIN == D0 || SOFT_SERIAL_PIN == D1
-#                error Using ATmega32U4 I2C, so can not use PD0, PD1
-#            endif
+#    if !(defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB647__) || defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB1287__) || defined(__AVR_ATmega16U2__) || defined(__AVR_ATmega32U2__) || defined(__AVR_ATmega16U4__) || defined(__AVR_ATmega32U4__))
+#        error serial.c is not supported for the currently selected MCU
+#    endif
+// if using ATmega32U4/2, AT90USBxxx I2C, can not use PD0 and PD1 in soft serial.
+#    if defined(__AVR_ATmega16U4__) || defined(__AVR_ATmega32U4__) || defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB647__) || defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB1287__)
+#        if defined(USE_AVR_I2C) && (SOFT_SERIAL_PIN == D0 || SOFT_SERIAL_PIN == D1)
+#            error Using I2C, so can not use PD0, PD1
 #        endif
+#    endif
+// PD0..PD3, common config
+#    if SOFT_SERIAL_PIN == D0
+#        define EIMSK_BIT _BV(INT0)
+#        define EICRx_BIT (~(_BV(ISC00) | _BV(ISC01)))
+#        define SERIAL_PIN_INTERRUPT INT0_vect
+#        define EICRx EICRA
+#    elif SOFT_SERIAL_PIN == D1
+#        define EIMSK_BIT _BV(INT1)
+#        define EICRx_BIT (~(_BV(ISC10) | _BV(ISC11)))
+#        define SERIAL_PIN_INTERRUPT INT1_vect
+#        define EICRx EICRA
+#    elif SOFT_SERIAL_PIN == D2
+#        define EIMSK_BIT _BV(INT2)
+#        define EICRx_BIT (~(_BV(ISC20) | _BV(ISC21)))
+#        define SERIAL_PIN_INTERRUPT INT2_vect
+#        define EICRx EICRA
+#    elif SOFT_SERIAL_PIN == D3
+#        define EIMSK_BIT _BV(INT3)
+#        define EICRx_BIT (~(_BV(ISC30) | _BV(ISC31)))
+#        define SERIAL_PIN_INTERRUPT INT3_vect
+#        define EICRx EICRA
+#    endif
 
-#        define setPinInputHigh(pin) (DDRx_ADDRESS(pin) &= ~_BV((pin)&0xF), PORTx_ADDRESS(pin) |= _BV((pin)&0xF))
-#        define setPinOutput(pin) (DDRx_ADDRESS(pin) |= _BV((pin)&0xF))
-#        define writePinHigh(pin) (PORTx_ADDRESS(pin) |= _BV((pin)&0xF))
-#        define writePinLow(pin) (PORTx_ADDRESS(pin) &= ~_BV((pin)&0xF))
-#        define readPin(pin) ((bool)(PINx_ADDRESS(pin) & _BV((pin)&0xF)))
+// ATmegaxxU2 specific config
+#    if defined(__AVR_ATmega16U2__) || defined(__AVR_ATmega32U2__)
+// PD4(INT5), PD6(INT6), PD7(INT7), PC7(INT4)
+#        if SOFT_SERIAL_PIN == D4
+#            define EIMSK_BIT _BV(INT5)
+#            define EICRx_BIT (~(_BV(ISC50) | _BV(ISC51)))
+#            define SERIAL_PIN_INTERRUPT INT5_vect
+#            define EICRx EICRB
+#        elif SOFT_SERIAL_PIN == D6
+#            define EIMSK_BIT _BV(INT6)
+#            define EICRx_BIT (~(_BV(ISC60) | _BV(ISC61)))
+#            define SERIAL_PIN_INTERRUPT INT6_vect
+#            define EICRx EICRB
+#        elif SOFT_SERIAL_PIN == D7
+#            define EIMSK_BIT _BV(INT7)
+#            define EICRx_BIT (~(_BV(ISC70) | _BV(ISC71)))
+#            define SERIAL_PIN_INTERRUPT INT7_vect
+#            define EICRx EICRB
+#        elif SOFT_SERIAL_PIN == C7
+#            define EIMSK_BIT _BV(INT4)
+#            define EICRx_BIT (~(_BV(ISC40) | _BV(ISC41)))
+#            define SERIAL_PIN_INTERRUPT INT4_vect
+#            define EICRx EICRB
+#        endif
+#    endif
 
-#        if SOFT_SERIAL_PIN >= D0 && SOFT_SERIAL_PIN <= D3
-#            if SOFT_SERIAL_PIN == D0
-#                define EIMSK_BIT _BV(INT0)
-#                define EICRx_BIT (~(_BV(ISC00) | _BV(ISC01)))
-#                define SERIAL_PIN_INTERRUPT INT0_vect
-#            elif SOFT_SERIAL_PIN == D1
-#                define EIMSK_BIT _BV(INT1)
-#                define EICRx_BIT (~(_BV(ISC10) | _BV(ISC11)))
-#                define SERIAL_PIN_INTERRUPT INT1_vect
-#            elif SOFT_SERIAL_PIN == D2
-#                define EIMSK_BIT _BV(INT2)
-#                define EICRx_BIT (~(_BV(ISC20) | _BV(ISC21)))
-#                define SERIAL_PIN_INTERRUPT INT2_vect
-#            elif SOFT_SERIAL_PIN == D3
-#                define EIMSK_BIT _BV(INT3)
-#                define EICRx_BIT (~(_BV(ISC30) | _BV(ISC31)))
-#                define SERIAL_PIN_INTERRUPT INT3_vect
-#            endif
+// ATmegaxxU4 specific config
+#    if defined(__AVR_ATmega16U4__) || defined(__AVR_ATmega32U4__)
+// PE6(INT6)
+#        if SOFT_SERIAL_PIN == E6
+#            define EIMSK_BIT _BV(INT6)
+#            define EICRx_BIT (~(_BV(ISC60) | _BV(ISC61)))
+#            define SERIAL_PIN_INTERRUPT INT6_vect
+#            define EICRx EICRB
+#        endif
+#    endif
+
+// AT90USBxxx specific config
+#    if defined(__AVR_AT90USB646__) || defined(__AVR_AT90USB647__) || defined(__AVR_AT90USB1286__) || defined(__AVR_AT90USB1287__)
+// PE4..PE7(INT4..INT7)
+#        if SOFT_SERIAL_PIN == E4
+#            define EIMSK_BIT _BV(INT4)
+#            define EICRx_BIT (~(_BV(ISC40) | _BV(ISC41)))
+#            define SERIAL_PIN_INTERRUPT INT4_vect
+#            define EICRx EICRB
+#        elif SOFT_SERIAL_PIN == E5
+#            define EIMSK_BIT _BV(INT5)
+#            define EICRx_BIT (~(_BV(ISC50) | _BV(ISC51)))
+#            define SERIAL_PIN_INTERRUPT INT5_vect
+#            define EICRx EICRB
 #        elif SOFT_SERIAL_PIN == E6
 #            define EIMSK_BIT _BV(INT6)
 #            define EICRx_BIT (~(_BV(ISC60) | _BV(ISC61)))
 #            define SERIAL_PIN_INTERRUPT INT6_vect
-#        else
-#            error invalid SOFT_SERIAL_PIN value
+#            define EICRx EICRB
+#        elif SOFT_SERIAL_PIN == E7
+#            define EIMSK_BIT _BV(INT7)
+#            define EICRx_BIT (~(_BV(ISC70) | _BV(ISC71)))
+#            define SERIAL_PIN_INTERRUPT INT7_vect
+#            define EICRx EICRB
 #        endif
-
-#    else
-#        error serial.c now support ATmega32U4 only
 #    endif
 
+#    ifndef SERIAL_PIN_INTERRUPT
+#        error invalid SOFT_SERIAL_PIN value
+#    endif
+
+#    define setPinInputHigh(pin) (DDRx_ADDRESS(pin) &= ~_BV((pin)&0xF), PORTx_ADDRESS(pin) |= _BV((pin)&0xF))
+#    define setPinOutput(pin) (DDRx_ADDRESS(pin) |= _BV((pin)&0xF))
+#    define writePinHigh(pin) (PORTx_ADDRESS(pin) |= _BV((pin)&0xF))
+#    define writePinLow(pin) (PORTx_ADDRESS(pin) &= ~_BV((pin)&0xF))
+#    define readPin(pin) ((bool)(PINx_ADDRESS(pin) & _BV((pin)&0xF)))
+
 #    define ALWAYS_INLINE __attribute__((always_inline))
 #    define NO_INLINE __attribute__((noinline))
 #    define _delay_sub_us(x) __builtin_avr_delay_cycles(x)
@@ -210,15 +271,9 @@ void soft_serial_target_init(SSTD_t *sstd_table, int sstd_table_size) {
     Transaction_table_size = (uint8_t)sstd_table_size;
     serial_input_with_pullup();
 
-    // Enable INT0-INT3,INT6
+    // Enable INT0-INT7
     EIMSK |= EIMSK_BIT;
-#    if SOFT_SERIAL_PIN == E6
-    // Trigger on falling edge of INT6
-    EICRB &= EICRx_BIT;
-#    else
-    // Trigger on falling edge of INT0-INT3
-    EICRA &= EICRx_BIT;
-#    endif
+    EICRx &= EICRx_BIT;
 }
 
 // Used by the sender to synchronize timing with the reciver.
diff --git a/qmk/drivers/avr/spi_master.c b/qmk/drivers/avr/spi_master.c
index f91baf70..cbec9f36 100644
--- a/qmk/drivers/avr/spi_master.c
+++ b/qmk/drivers/avr/spi_master.c
@@ -140,27 +140,33 @@ spi_status_t spi_read() {
 }
 
 spi_status_t spi_transmit(const uint8_t *data, uint16_t length) {
-    spi_status_t status = SPI_STATUS_ERROR;
+    spi_status_t status;
 
     for (uint16_t i = 0; i < length; i++) {
         status = spi_write(data[i]);
+
+        if (status < 0) {
+            return status;
+        }
     }
 
-    return status;
+    return SPI_STATUS_SUCCESS;
 }
 
 spi_status_t spi_receive(uint8_t *data, uint16_t length) {
-    spi_status_t status = SPI_STATUS_ERROR;
+    spi_status_t status;
 
     for (uint16_t i = 0; i < length; i++) {
         status = spi_read();
 
-        if (status > 0) {
+        if (status >= 0) {
             data[i] = status;
+        } else {
+            return status;
         }
     }
 
-    return (status < 0) ? status : SPI_STATUS_SUCCESS;
+    return SPI_STATUS_SUCCESS;
 }
 
 void spi_stop(void) {
diff --git a/qmk/drivers/chibios/analog.c b/qmk/drivers/chibios/analog.c
index 6f6db640..2b3872af 100644
--- a/qmk/drivers/chibios/analog.c
+++ b/qmk/drivers/chibios/analog.c
@@ -16,7 +16,7 @@
 
 #include "quantum.h"
 #include "analog.h"
-#include "ch.h"
+#include <ch.h>
 #include <hal.h>
 
 #if !HAL_USE_ADC
diff --git a/qmk/drivers/chibios/i2c_master.c b/qmk/drivers/chibios/i2c_master.c
index 4bd8e2af..fc4bb2ab 100644
--- a/qmk/drivers/chibios/i2c_master.c
+++ b/qmk/drivers/chibios/i2c_master.c
@@ -58,18 +58,23 @@ static i2c_status_t chibios_to_qmk(const msg_t* status) {
 }
 
 __attribute__((weak)) void i2c_init(void) {
-    // Try releasing special pins for a short time
-    palSetPadMode(I2C1_SCL_BANK, I2C1_SCL, PAL_MODE_INPUT);
-    palSetPadMode(I2C1_SDA_BANK, I2C1_SDA, PAL_MODE_INPUT);
+    static bool is_initialised = false;
+    if (!is_initialised) {
+        is_initialised = true;
 
-    chThdSleepMilliseconds(10);
+        // Try releasing special pins for a short time
+        palSetPadMode(I2C1_SCL_BANK, I2C1_SCL, PAL_MODE_INPUT);
+        palSetPadMode(I2C1_SDA_BANK, I2C1_SDA, PAL_MODE_INPUT);
+
+        chThdSleepMilliseconds(10);
 #if defined(USE_GPIOV1)
-    palSetPadMode(I2C1_SCL_BANK, I2C1_SCL, I2C1_SCL_PAL_MODE);
-    palSetPadMode(I2C1_SDA_BANK, I2C1_SDA, I2C1_SDA_PAL_MODE);
+        palSetPadMode(I2C1_SCL_BANK, I2C1_SCL, I2C1_SCL_PAL_MODE);
+        palSetPadMode(I2C1_SDA_BANK, I2C1_SDA, I2C1_SDA_PAL_MODE);
 #else
-    palSetPadMode(I2C1_SCL_BANK, I2C1_SCL, PAL_MODE_ALTERNATE(I2C1_SCL_PAL_MODE) | PAL_STM32_OTYPE_OPENDRAIN);
-    palSetPadMode(I2C1_SDA_BANK, I2C1_SDA, PAL_MODE_ALTERNATE(I2C1_SDA_PAL_MODE) | PAL_STM32_OTYPE_OPENDRAIN);
+        palSetPadMode(I2C1_SCL_BANK, I2C1_SCL, PAL_MODE_ALTERNATE(I2C1_SCL_PAL_MODE) | PAL_STM32_OTYPE_OPENDRAIN);
+        palSetPadMode(I2C1_SDA_BANK, I2C1_SDA, PAL_MODE_ALTERNATE(I2C1_SDA_PAL_MODE) | PAL_STM32_OTYPE_OPENDRAIN);
 #endif
+    }
 }
 
 i2c_status_t i2c_start(uint8_t address) {
diff --git a/qmk/drivers/chibios/i2c_master.h b/qmk/drivers/chibios/i2c_master.h
index b3e234e1..c68109ac 100644
--- a/qmk/drivers/chibios/i2c_master.h
+++ b/qmk/drivers/chibios/i2c_master.h
@@ -24,7 +24,7 @@
  */
 #pragma once
 
-#include "ch.h"
+#include <ch.h>
 #include <hal.h>
 
 #ifdef I2C1_BANK
diff --git a/qmk/drivers/chibios/serial.c b/qmk/drivers/chibios/serial.c
index 26c68065..54f7e132 100644
--- a/qmk/drivers/chibios/serial.c
+++ b/qmk/drivers/chibios/serial.c
@@ -6,7 +6,7 @@
 #include "serial.h"
 #include "wait.h"
 
-#include "hal.h"
+#include <hal.h>
 
 // TODO: resolve/remove build warnings
 #if defined(RGBLIGHT_ENABLE) && defined(RGBLED_SPLIT) && defined(PROTOCOL_CHIBIOS) && defined(WS2812_DRIVER_BITBANG)
diff --git a/qmk/drivers/chibios/serial_usart.c b/qmk/drivers/chibios/serial_usart.c
index 62b4913c..a3e21f90 100644
--- a/qmk/drivers/chibios/serial_usart.c
+++ b/qmk/drivers/chibios/serial_usart.c
@@ -1,9 +1,9 @@
 #include "quantum.h"
 #include "serial.h"
-#include "printf.h"
+#include "print.h"
 
-#include "ch.h"
-#include "hal.h"
+#include <ch.h>
+#include <hal.h>
 
 #ifndef USART_CR1_M0
 #    define USART_CR1_M0 USART_CR1_M  // some platforms (f1xx) dont have this so
diff --git a/qmk/drivers/chibios/spi_master.c b/qmk/drivers/chibios/spi_master.c
index 552ac663..5aa60742 100644
--- a/qmk/drivers/chibios/spi_master.c
+++ b/qmk/drivers/chibios/spi_master.c
@@ -22,21 +22,26 @@ static pin_t     currentSlavePin = NO_PIN;
 static SPIConfig spiConfig       = {false, NULL, 0, 0, 0, 0};
 
 __attribute__((weak)) void spi_init(void) {
-    // Try releasing special pins for a short time
-    palSetPadMode(PAL_PORT(SPI_SCK_PIN), PAL_PAD(SPI_SCK_PIN), PAL_MODE_INPUT);
-    palSetPadMode(PAL_PORT(SPI_MOSI_PIN), PAL_PAD(SPI_MOSI_PIN), PAL_MODE_INPUT);
-    palSetPadMode(PAL_PORT(SPI_MISO_PIN), PAL_PAD(SPI_MISO_PIN), PAL_MODE_INPUT);
+    static bool is_initialised = false;
+    if (!is_initialised) {
+        is_initialised = true;
 
-    chThdSleepMilliseconds(10);
+        // Try releasing special pins for a short time
+        palSetPadMode(PAL_PORT(SPI_SCK_PIN), PAL_PAD(SPI_SCK_PIN), PAL_MODE_INPUT);
+        palSetPadMode(PAL_PORT(SPI_MOSI_PIN), PAL_PAD(SPI_MOSI_PIN), PAL_MODE_INPUT);
+        palSetPadMode(PAL_PORT(SPI_MISO_PIN), PAL_PAD(SPI_MISO_PIN), PAL_MODE_INPUT);
+
+        chThdSleepMilliseconds(10);
 #if defined(USE_GPIOV1)
-    palSetPadMode(PAL_PORT(SPI_SCK_PIN), PAL_PAD(SPI_SCK_PIN), PAL_MODE_STM32_ALTERNATE_PUSHPULL);
-    palSetPadMode(PAL_PORT(SPI_MOSI_PIN), PAL_PAD(SPI_MOSI_PIN), PAL_MODE_STM32_ALTERNATE_PUSHPULL);
-    palSetPadMode(PAL_PORT(SPI_MISO_PIN), PAL_PAD(SPI_MISO_PIN), PAL_MODE_STM32_ALTERNATE_PUSHPULL);
+        palSetPadMode(PAL_PORT(SPI_SCK_PIN), PAL_PAD(SPI_SCK_PIN), PAL_MODE_STM32_ALTERNATE_PUSHPULL);
+        palSetPadMode(PAL_PORT(SPI_MOSI_PIN), PAL_PAD(SPI_MOSI_PIN), PAL_MODE_STM32_ALTERNATE_PUSHPULL);
+        palSetPadMode(PAL_PORT(SPI_MISO_PIN), PAL_PAD(SPI_MISO_PIN), PAL_MODE_STM32_ALTERNATE_PUSHPULL);
 #else
-    palSetPadMode(PAL_PORT(SPI_SCK_PIN), PAL_PAD(SPI_SCK_PIN), PAL_MODE_ALTERNATE(SPI_SCK_PAL_MODE) | PAL_STM32_OTYPE_PUSHPULL | PAL_STM32_OSPEED_HIGHEST);
-    palSetPadMode(PAL_PORT(SPI_MOSI_PIN), PAL_PAD(SPI_MOSI_PIN), PAL_MODE_ALTERNATE(SPI_MOSI_PAL_MODE) | PAL_STM32_OTYPE_PUSHPULL | PAL_STM32_OSPEED_HIGHEST);
-    palSetPadMode(PAL_PORT(SPI_MISO_PIN), PAL_PAD(SPI_MISO_PIN), PAL_MODE_ALTERNATE(SPI_MISO_PAL_MODE) | PAL_STM32_OTYPE_PUSHPULL | PAL_STM32_OSPEED_HIGHEST);
+        palSetPadMode(PAL_PORT(SPI_SCK_PIN), PAL_PAD(SPI_SCK_PIN), PAL_MODE_ALTERNATE(SPI_SCK_PAL_MODE) | PAL_STM32_OTYPE_PUSHPULL | PAL_STM32_OSPEED_HIGHEST);
+        palSetPadMode(PAL_PORT(SPI_MOSI_PIN), PAL_PAD(SPI_MOSI_PIN), PAL_MODE_ALTERNATE(SPI_MOSI_PAL_MODE) | PAL_STM32_OTYPE_PUSHPULL | PAL_STM32_OSPEED_HIGHEST);
+        palSetPadMode(PAL_PORT(SPI_MISO_PIN), PAL_PAD(SPI_MISO_PIN), PAL_MODE_ALTERNATE(SPI_MISO_PAL_MODE) | PAL_STM32_OTYPE_PUSHPULL | PAL_STM32_OSPEED_HIGHEST);
 #endif
+    }
 }
 
 bool spi_start(pin_t slavePin, bool lsbFirst, uint8_t mode, uint16_t divisor) {
diff --git a/qmk/drivers/chibios/spi_master.h b/qmk/drivers/chibios/spi_master.h
index 0c18587c..5953bef7 100644
--- a/qmk/drivers/chibios/spi_master.h
+++ b/qmk/drivers/chibios/spi_master.h
@@ -18,7 +18,7 @@
 
 #include <ch.h>
 #include <hal.h>
-#include <quantum.h>
+#include "quantum.h"
 
 #ifndef SPI_DRIVER
 #    define SPI_DRIVER SPID2
diff --git a/qmk/drivers/chibios/ws2812.c b/qmk/drivers/chibios/ws2812.c
index 0440cac7..59ed9037 100644
--- a/qmk/drivers/chibios/ws2812.c
+++ b/qmk/drivers/chibios/ws2812.c
@@ -1,7 +1,7 @@
 #include "quantum.h"
 #include "ws2812.h"
-#include "ch.h"
-#include "hal.h"
+#include <ch.h>
+#include <hal.h>
 
 /* Adapted from https://github.com/bigjosh/SimpleNeoPixelDemo/ */
 
@@ -89,9 +89,16 @@ void ws2812_setleds(LED_TYPE *ledarray, uint16_t leds) {
 
     for (uint8_t i = 0; i < leds; i++) {
         // WS2812 protocol dictates grb order
+#if (WS2812_BYTE_ORDER == WS2812_BYTE_ORDER_GRB)
         sendByte(ledarray[i].g);
         sendByte(ledarray[i].r);
         sendByte(ledarray[i].b);
+#elif (WS2812_BYTE_ORDER == WS2812_BYTE_ORDER_RGB)
+        sendByte(ledarray[i].r);
+        sendByte(ledarray[i].g);
+        sendByte(ledarray[i].b);
+#endif
+
 #ifdef RGBW
         sendByte(ledarray[i].w);
 #endif
diff --git a/qmk/drivers/chibios/ws2812_pwm.c b/qmk/drivers/chibios/ws2812_pwm.c
index bfb44ce4..3af922c0 100644
--- a/qmk/drivers/chibios/ws2812_pwm.c
+++ b/qmk/drivers/chibios/ws2812_pwm.c
@@ -1,6 +1,6 @@
 #include "ws2812.h"
 #include "quantum.h"
-#include "hal.h"
+#include <hal.h>
 
 /* Adapted from https://github.com/joewa/WS2812-LED-Driver_ChibiOS/ */
 
@@ -107,6 +107,7 @@
  */
 #define WS2812_BIT(led, byte, bit) (24 * (led) + 8 * (byte) + (7 - (bit)))
 
+#if (WS2812_BYTE_ORDER == WS2812_BYTE_ORDER_GRB)
 /**
  * @brief   Determine the index in @ref ws2812_frame_buffer "the frame buffer" of a given red bit
  *
@@ -117,7 +118,7 @@
  *
  * @return                          The bit index
  */
-#define WS2812_RED_BIT(led, bit) WS2812_BIT((led), 1, (bit))
+#    define WS2812_RED_BIT(led, bit) WS2812_BIT((led), 1, (bit))
 
 /**
  * @brief   Determine the index in @ref ws2812_frame_buffer "the frame buffer" of a given green bit
@@ -129,7 +130,7 @@
  *
  * @return                          The bit index
  */
-#define WS2812_GREEN_BIT(led, bit) WS2812_BIT((led), 0, (bit))
+#    define WS2812_GREEN_BIT(led, bit) WS2812_BIT((led), 0, (bit))
 
 /**
  * @brief   Determine the index in @ref ws2812_frame_buffer "the frame buffer" of a given blue bit
@@ -141,7 +142,45 @@
  *
  * @return                          The bit index
  */
-#define WS2812_BLUE_BIT(led, bit) WS2812_BIT((led), 2, (bit))
+#    define WS2812_BLUE_BIT(led, bit) WS2812_BIT((led), 2, (bit))
+
+#elif (WS2812_BYTE_ORDER == WS2812_BYTE_ORDER_RGB)
+/**
+ * @brief   Determine the index in @ref ws2812_frame_buffer "the frame buffer" of a given red bit
+ *
+ * @note    The red byte is the middle byte in the color packet
+ *
+ * @param[in] led:                  The led index [0, @ref RGBLED_NUM)
+ * @param[in] bit:                  The bit number [0, 7]
+ *
+ * @return                          The bit index
+ */
+#    define WS2812_RED_BIT(led, bit) WS2812_BIT((led), 0, (bit))
+
+/**
+ * @brief   Determine the index in @ref ws2812_frame_buffer "the frame buffer" of a given green bit
+ *
+ * @note    The red byte is the first byte in the color packet
+ *
+ * @param[in] led:                  The led index [0, @ref RGBLED_NUM)
+ * @param[in] bit:                  The bit number [0, 7]
+ *
+ * @return                          The bit index
+ */
+#    define WS2812_GREEN_BIT(led, bit) WS2812_BIT((led), 1, (bit))
+
+/**
+ * @brief   Determine the index in @ref ws2812_frame_buffer "the frame buffer" of a given blue bit
+ *
+ * @note    The red byte is the last byte in the color packet
+ *
+ * @param[in] led:                  The led index [0, @ref RGBLED_NUM)
+ * @param[in] bit:                  The bit index [0, 7]
+ *
+ * @return                          The bit index
+ */
+#    define WS2812_BLUE_BIT(led, bit) WS2812_BIT((led), 2, (bit))
+#endif
 
 /* --- PRIVATE VARIABLES ---------------------------------------------------- */
 
diff --git a/qmk/drivers/chibios/ws2812_spi.c b/qmk/drivers/chibios/ws2812_spi.c
index 7a1d2f05..a9334243 100644
--- a/qmk/drivers/chibios/ws2812_spi.c
+++ b/qmk/drivers/chibios/ws2812_spi.c
@@ -62,9 +62,15 @@ static uint8_t get_protocol_eq(uint8_t data, int pos) {
 static void set_led_color_rgb(LED_TYPE color, int pos) {
     uint8_t* tx_start = &txbuf[PREAMBLE_SIZE];
 
+#if (WS2812_BYTE_ORDER == WS2812_BYTE_ORDER_GRB)
     for (int j = 0; j < 4; j++) tx_start[BYTES_FOR_LED * pos + j] = get_protocol_eq(color.g, j);
     for (int j = 0; j < 4; j++) tx_start[BYTES_FOR_LED * pos + BYTES_FOR_LED_BYTE + j] = get_protocol_eq(color.r, j);
     for (int j = 0; j < 4; j++) tx_start[BYTES_FOR_LED * pos + BYTES_FOR_LED_BYTE * 2 + j] = get_protocol_eq(color.b, j);
+#elif (WS2812_BYTE_ORDER == WS2812_BYTE_ORDER_RGB)
+    for (int j = 0; j < 4; j++) tx_start[BYTES_FOR_LED * pos + j] = get_protocol_eq(color.r, j);
+    for (int j = 0; j < 4; j++) tx_start[BYTES_FOR_LED * pos + BYTES_FOR_LED_BYTE + j] = get_protocol_eq(color.g, j);
+    for (int j = 0; j < 4; j++) tx_start[BYTES_FOR_LED * pos + BYTES_FOR_LED_BYTE * 2 + j] = get_protocol_eq(color.b, j);
+#endif
 }
 
 void ws2812_init(void) {
diff --git a/qmk/drivers/eeprom/eeprom_i2c.c b/qmk/drivers/eeprom/eeprom_i2c.c
index ca8af3da..4210f06f 100644
--- a/qmk/drivers/eeprom/eeprom_i2c.c
+++ b/qmk/drivers/eeprom/eeprom_i2c.c
@@ -42,14 +42,6 @@
 #    include "debug.h"
 #endif  // DEBUG_EEPROM_OUTPUT
 
-static inline void init_i2c_if_required(void) {
-    static int done = 0;
-    if (!done) {
-        i2c_init();
-        done = 1;
-    }
-}
-
 static inline void fill_target_address(uint8_t *buffer, const void *addr) {
     uintptr_t p = (uintptr_t)addr;
     for (int i = 0; i < EXTERNAL_EEPROM_ADDRESS_SIZE; ++i) {
@@ -58,7 +50,7 @@ static inline void fill_target_address(uint8_t *buffer, const void *addr) {
     }
 }
 
-void eeprom_driver_init(void) {}
+void eeprom_driver_init(void) { i2c_init(); }
 
 void eeprom_driver_erase(void) {
 #if defined(CONSOLE_ENABLE) && defined(DEBUG_EEPROM_OUTPUT)
@@ -80,7 +72,6 @@ void eeprom_read_block(void *buf, const void *addr, size_t len) {
     uint8_t complete_packet[EXTERNAL_EEPROM_ADDRESS_SIZE];
     fill_target_address(complete_packet, addr);
 
-    init_i2c_if_required();
     i2c_transmit(EXTERNAL_EEPROM_I2C_ADDRESS((uintptr_t)addr), complete_packet, EXTERNAL_EEPROM_ADDRESS_SIZE, 100);
     i2c_receive(EXTERNAL_EEPROM_I2C_ADDRESS((uintptr_t)addr), buf, len, 100);
 
@@ -98,7 +89,6 @@ void eeprom_write_block(const void *buf, void *addr, size_t len) {
     uint8_t * read_buf    = (uint8_t *)buf;
     uintptr_t target_addr = (uintptr_t)addr;
 
-    init_i2c_if_required();
     while (len > 0) {
         uintptr_t page_offset  = target_addr % EXTERNAL_EEPROM_PAGE_SIZE;
         int       write_length = EXTERNAL_EEPROM_PAGE_SIZE - page_offset;
diff --git a/qmk/drivers/eeprom/eeprom_i2c.h b/qmk/drivers/eeprom/eeprom_i2c.h
index 51bce825..77eea66d 100644
--- a/qmk/drivers/eeprom/eeprom_i2c.h
+++ b/qmk/drivers/eeprom/eeprom_i2c.h
@@ -49,6 +49,11 @@
 #    define EXTERNAL_EEPROM_PAGE_SIZE 64
 #    define EXTERNAL_EEPROM_ADDRESS_SIZE 2
 #    define EXTERNAL_EEPROM_WRITE_TIME 5
+#elif defined(EEPROM_I2C_24LC64)
+#    define EXTERNAL_EEPROM_BYTE_COUNT 8192
+#    define EXTERNAL_EEPROM_PAGE_SIZE 32
+#    define EXTERNAL_EEPROM_ADDRESS_SIZE 2
+#    define EXTERNAL_EEPROM_WRITE_TIME 5
 #elif defined(EEPROM_I2C_MB85RC256V)
 #    define EXTERNAL_EEPROM_BYTE_COUNT 32768
 #    define EXTERNAL_EEPROM_PAGE_SIZE 128
diff --git a/qmk/drivers/eeprom/eeprom_spi.c b/qmk/drivers/eeprom/eeprom_spi.c
index 7b6416ea..182731d8 100644
--- a/qmk/drivers/eeprom/eeprom_spi.c
+++ b/qmk/drivers/eeprom/eeprom_spi.c
@@ -55,14 +55,6 @@
 #    include "debug.h"
 #endif  // CONSOLE_ENABLE
 
-static void init_spi_if_required(void) {
-    static int done = 0;
-    if (!done) {
-        spi_init();
-        done = 1;
-    }
-}
-
 static bool spi_eeprom_start(void) { return spi_start(EXTERNAL_EEPROM_SPI_SLAVE_SELECT_PIN, EXTERNAL_EEPROM_SPI_LSBFIRST, EXTERNAL_EEPROM_SPI_MODE, EXTERNAL_EEPROM_SPI_CLOCK_DIVISOR); }
 
 static spi_status_t spi_eeprom_wait_while_busy(int timeout) {
@@ -91,7 +83,7 @@ static void spi_eeprom_transmit_address(uintptr_t addr) {
 
 //----------------------------------------------------------------------------------------------------------------------
 
-void eeprom_driver_init(void) {}
+void eeprom_driver_init(void) { spi_init(); }
 
 void eeprom_driver_erase(void) {
 #if defined(CONSOLE_ENABLE) && defined(DEBUG_EEPROM_OUTPUT)
@@ -110,8 +102,6 @@ void eeprom_driver_erase(void) {
 }
 
 void eeprom_read_block(void *buf, const void *addr, size_t len) {
-    init_spi_if_required();
-
     //-------------------------------------------------
     // Wait for the write-in-progress bit to be cleared
     bool res = spi_eeprom_start();
@@ -154,8 +144,6 @@ void eeprom_read_block(void *buf, const void *addr, size_t len) {
 }
 
 void eeprom_write_block(const void *buf, void *addr, size_t len) {
-    init_spi_if_required();
-
     bool      res;
     uint8_t * read_buf    = (uint8_t *)buf;
     uintptr_t target_addr = (uintptr_t)addr;
diff --git a/qmk/drivers/eeprom/eeprom_stm32_L0_L1.c b/qmk/drivers/eeprom/eeprom_stm32_L0_L1.c
index b62e6ffd..ed26cc71 100644
--- a/qmk/drivers/eeprom/eeprom_stm32_L0_L1.c
+++ b/qmk/drivers/eeprom/eeprom_stm32_L0_L1.c
@@ -17,7 +17,7 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "hal.h"
+#include <hal.h>
 #include "eeprom_driver.h"
 #include "eeprom_stm32_L0_L1.h"
 
diff --git a/qmk/drivers/haptic/DRV2605L.c b/qmk/drivers/haptic/DRV2605L.c
index 830d629d..5de2b354 100644
--- a/qmk/drivers/haptic/DRV2605L.c
+++ b/qmk/drivers/haptic/DRV2605L.c
@@ -21,8 +21,6 @@
 #include <math.h>
 
 uint8_t DRV2605L_transfer_buffer[2];
-uint8_t DRV2605L_tx_register[0];
-uint8_t DRV2605L_read_buffer[0];
 uint8_t DRV2605L_read_register;
 
 void DRV_write(uint8_t drv_register, uint8_t settings) {
@@ -32,8 +30,7 @@ void DRV_write(uint8_t drv_register, uint8_t settings) {
 }
 
 uint8_t DRV_read(uint8_t regaddress) {
-    i2c_readReg(DRV2605L_BASE_ADDRESS << 1, regaddress, DRV2605L_read_buffer, 1, 100);
-    DRV2605L_read_register = (uint8_t)DRV2605L_read_buffer[0];
+    i2c_readReg(DRV2605L_BASE_ADDRESS << 1, regaddress, &DRV2605L_read_register, 1, 100);
 
     return DRV2605L_read_register;
 }
diff --git a/qmk/drivers/haptic/haptic.c b/qmk/drivers/haptic/haptic.c
index 2ce279b7..de3f4005 100644
--- a/qmk/drivers/haptic/haptic.c
+++ b/qmk/drivers/haptic/haptic.c
@@ -33,11 +33,18 @@ void haptic_init(void) {
         eeconfig_init();
     }
     haptic_config.raw = eeconfig_read_haptic();
-    if (haptic_config.mode < 1) {
-        haptic_config.mode = 1;
-    }
-    if (!haptic_config.mode) {
-        dprintf("No haptic config found in eeprom, setting default configs\n");
+#ifdef SOLENOID_ENABLE
+    solenoid_set_dwell(haptic_config.dwell);
+#endif
+    if ((haptic_config.raw == 0)
+#ifdef SOLENOID_ENABLE
+        || (haptic_config.dwell == 0)
+#endif
+    ) {
+        // this will be called, if the eeprom is not corrupt,
+        // but the previous firmware didn't have haptic enabled,
+        // or the previous firmware didn't have solenoid enabled,
+        // and the current one has solenoid enabled.
         haptic_reset();
     }
 #ifdef SOLENOID_ENABLE
@@ -118,25 +125,37 @@ void haptic_mode_decrease(void) {
 }
 
 void haptic_dwell_increase(void) {
-    uint8_t dwell = haptic_config.dwell + 1;
 #ifdef SOLENOID_ENABLE
+    int16_t next_dwell = ((int16_t)haptic_config.dwell) + SOLENOID_DWELL_STEP_SIZE;
     if (haptic_config.dwell >= SOLENOID_MAX_DWELL) {
-        dwell = 1;
+        // if it's already at max, we wrap back to min
+        next_dwell = SOLENOID_MIN_DWELL;
+    } else if (next_dwell > SOLENOID_MAX_DWELL) {
+        // if we overshoot the max, then cap at max
+        next_dwell = SOLENOID_MAX_DWELL;
     }
-    solenoid_set_dwell(dwell);
+    solenoid_set_dwell(next_dwell);
+#else
+    int16_t next_dwell = ((int16_t)haptic_config.dwell) + 1;
 #endif
-    haptic_set_dwell(dwell);
+    haptic_set_dwell(next_dwell);
 }
 
 void haptic_dwell_decrease(void) {
-    uint8_t dwell = haptic_config.dwell - 1;
 #ifdef SOLENOID_ENABLE
-    if (haptic_config.dwell < SOLENOID_MIN_DWELL) {
-        dwell = SOLENOID_MAX_DWELL;
+    int16_t next_dwell = ((int16_t)haptic_config.dwell) - SOLENOID_DWELL_STEP_SIZE;
+    if (haptic_config.dwell <= SOLENOID_MIN_DWELL) {
+        // if it's already at min, we wrap to max
+        next_dwell = SOLENOID_MAX_DWELL;
+    } else if (next_dwell < SOLENOID_MIN_DWELL) {
+        // if we go below min, then we cap to min
+        next_dwell = SOLENOID_MIN_DWELL;
     }
-    solenoid_set_dwell(dwell);
+    solenoid_set_dwell(next_dwell);
+#else
+    int16_t next_dwell = ((int16_t)haptic_config.dwell) - 1;
 #endif
-    haptic_set_dwell(dwell);
+    haptic_set_dwell(next_dwell);
 }
 
 void haptic_reset(void) {
@@ -150,6 +169,12 @@ void haptic_reset(void) {
 #ifdef SOLENOID_ENABLE
     uint8_t dwell       = SOLENOID_DEFAULT_DWELL;
     haptic_config.dwell = dwell;
+    haptic_config.buzz  = SOLENOID_DEFAULT_BUZZ;
+    solenoid_set_dwell(dwell);
+#else
+    // This is to trigger haptic_reset again, if solenoid is enabled in the future.
+    haptic_config.dwell = 0;
+    haptic_config.buzz  = 0;
 #endif
     eeconfig_update_haptic(haptic_config.raw);
     xprintf("haptic_config.feedback = %u\n", haptic_config.feedback);
diff --git a/qmk/drivers/haptic/solenoid.c b/qmk/drivers/haptic/solenoid.c
index d645c379..3e61d5a1 100644
--- a/qmk/drivers/haptic/solenoid.c
+++ b/qmk/drivers/haptic/solenoid.c
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <timer.h>
+#include "timer.h"
 #include "solenoid.h"
 #include "haptic.h"
 
@@ -32,14 +32,6 @@ void solenoid_buzz_off(void) { haptic_set_buzz(0); }
 
 void solenoid_set_buzz(int buzz) { haptic_set_buzz(buzz); }
 
-void solenoid_dwell_minus(uint8_t solenoid_dwell) {
-    if (solenoid_dwell > 0) solenoid_dwell--;
-}
-
-void solenoid_dwell_plus(uint8_t solenoid_dwell) {
-    if (solenoid_dwell < SOLENOID_MAX_DWELL) solenoid_dwell++;
-}
-
 void solenoid_set_dwell(uint8_t dwell) { solenoid_dwell = dwell; }
 
 void solenoid_stop(void) {
@@ -73,7 +65,7 @@ void solenoid_check(void) {
 
     // Check whether to buzz the solenoid on and off
     if (haptic_config.buzz) {
-        if (elapsed / SOLENOID_MIN_DWELL % 2 == 0) {
+        if ((elapsed % (SOLENOID_BUZZ_ACTUATED + SOLENOID_BUZZ_NONACTUATED)) < SOLENOID_BUZZ_ACTUATED) {
             if (!solenoid_buzzing) {
                 solenoid_buzzing = true;
                 writePinHigh(SOLENOID_PIN);
diff --git a/qmk/drivers/haptic/solenoid.h b/qmk/drivers/haptic/solenoid.h
index dd6ececa..f2a3bc4c 100644
--- a/qmk/drivers/haptic/solenoid.h
+++ b/qmk/drivers/haptic/solenoid.h
@@ -29,6 +29,22 @@
 #    define SOLENOID_MIN_DWELL 4
 #endif
 
+#ifndef SOLENOID_DWELL_STEP_SIZE
+#    define SOLENOID_DWELL_STEP_SIZE 1
+#endif
+
+#ifndef SOLENOID_DEFAULT_BUZZ
+#    define SOLENOID_DEFAULT_BUZZ 0
+#endif
+
+#ifndef SOLENOID_BUZZ_ACTUATED
+#    define SOLENOID_BUZZ_ACTUATED SOLENOID_MIN_DWELL
+#endif
+
+#ifndef SOLENOID_BUZZ_NONACTUATED
+#    define SOLENOID_BUZZ_NONACTUATED SOLENOID_MIN_DWELL
+#endif
+
 #ifndef SOLENOID_PIN
 #    error SOLENOID_PIN not defined
 #endif
@@ -37,8 +53,6 @@ void solenoid_buzz_on(void);
 void solenoid_buzz_off(void);
 void solenoid_set_buzz(int buzz);
 
-void solenoid_dwell_minus(uint8_t solenoid_dwell);
-void solenoid_dwell_plus(uint8_t solenoid_dwell);
 void solenoid_set_dwell(uint8_t dwell);
 
 void solenoid_stop(void);
diff --git a/qmk/drivers/issi/is31fl3731-simple.c b/qmk/drivers/issi/is31fl3731-simple.c
index bd3bb474..7c86841f 100644
--- a/qmk/drivers/issi/is31fl3731-simple.c
+++ b/qmk/drivers/issi/is31fl3731-simple.c
@@ -63,7 +63,7 @@ uint8_t g_twi_transfer_buffer[20];
 // buffers and the transfers in IS31FL3731_write_pwm_buffer() but it's
 // probably not worth the extra complexity.
 uint8_t g_pwm_buffer[LED_DRIVER_COUNT][144];
-bool    g_pwm_buffer_update_required = false;
+bool    g_pwm_buffer_update_required[LED_DRIVER_COUNT] = {false};
 
 /* There's probably a better way to init this... */
 #if LED_DRIVER_COUNT == 1
@@ -75,7 +75,7 @@ uint8_t g_led_control_registers[LED_DRIVER_COUNT][18] = {{0}, {0}, {0}};
 #elif LED_DRIVER_COUNT == 4
 uint8_t g_led_control_registers[LED_DRIVER_COUNT][18] = {{0}, {0}, {0}, {0}};
 #endif
-bool g_led_control_registers_update_required = false;
+bool g_led_control_registers_update_required[LED_DRIVER_COUNT] = {false};
 
 // This is the bit pattern in the LED control registers
 // (for matrix A, add one to register for matrix B)
@@ -190,8 +190,8 @@ void IS31FL3731_set_value(int index, uint8_t value) {
         is31_led led = g_is31_leds[index];
 
         // Subtract 0x24 to get the second index of g_pwm_buffer
-        g_pwm_buffer[led.driver][led.v - 0x24] = value;
-        g_pwm_buffer_update_required           = true;
+        g_pwm_buffer[led.driver][led.v - 0x24]   = value;
+        g_pwm_buffer_update_required[led.driver] = true;
     }
 }
 
@@ -213,20 +213,21 @@ void IS31FL3731_set_led_control_register(uint8_t index, bool value) {
         g_led_control_registers[led.driver][control_register] &= ~(1 << bit_value);
     }
 
-    g_led_control_registers_update_required = true;
+    g_led_control_registers_update_required[led.driver] = true;
 }
 
 void IS31FL3731_update_pwm_buffers(uint8_t addr, uint8_t index) {
-    if (g_pwm_buffer_update_required) {
+    if (g_pwm_buffer_update_required[index]) {
         IS31FL3731_write_pwm_buffer(addr, g_pwm_buffer[index]);
-        g_pwm_buffer_update_required = false;
+        g_pwm_buffer_update_required[index] = false;
     }
 }
 
 void IS31FL3731_update_led_control_registers(uint8_t addr, uint8_t index) {
-    if (g_led_control_registers_update_required) {
+    if (g_led_control_registers_update_required[index]) {
         for (int i = 0; i < 18; i++) {
             IS31FL3731_write_register(addr, i, g_led_control_registers[index][i]);
         }
+        g_led_control_registers_update_required[index] = false;
     }
 }
diff --git a/qmk/drivers/oled/oled_driver.c b/qmk/drivers/oled/oled_driver.c
index ba11db1d..92c64399 100644
--- a/qmk/drivers/oled/oled_driver.c
+++ b/qmk/drivers/oled/oled_driver.c
@@ -119,6 +119,9 @@ uint32_t oled_timeout;
 #if OLED_SCROLL_TIMEOUT > 0
 uint32_t oled_scroll_timeout;
 #endif
+#if OLED_UPDATE_INTERVAL > 0
+uint16_t oled_update_timeout;
+#endif
 
 // Internal variables to reduce math instructions
 
@@ -268,6 +271,10 @@ static void rotate_90(const uint8_t *src, uint8_t *dest) {
 }
 
 void oled_render(void) {
+    if (!oled_initialized) {
+        return;
+    }
+
     // Do we have work to do?
     oled_dirty &= OLED_ALL_BLOCKS_MASK;
     if (!oled_dirty || oled_scrolling) {
@@ -468,8 +475,9 @@ void oled_write_raw_byte(const char data, uint16_t index) {
 }
 
 void oled_write_raw(const char *data, uint16_t size) {
-    if (size > OLED_MATRIX_SIZE) size = OLED_MATRIX_SIZE;
-    for (uint16_t i = 0; i < size; i++) {
+    uint16_t cursor_start_index = oled_cursor - &oled_buffer[0];
+    if ((size + cursor_start_index) > OLED_MATRIX_SIZE) size = OLED_MATRIX_SIZE - cursor_start_index;
+    for (uint16_t i = cursor_start_index; i < cursor_start_index + size; i++) {
         if (oled_buffer[i] == data[i]) continue;
         oled_buffer[i] = data[i];
         oled_dirty |= ((OLED_BLOCK_TYPE)1 << (i / OLED_BLOCK_SIZE));
@@ -511,8 +519,9 @@ void oled_write_ln_P(const char *data, bool invert) {
 }
 
 void oled_write_raw_P(const char *data, uint16_t size) {
-    if (size > OLED_MATRIX_SIZE) size = OLED_MATRIX_SIZE;
-    for (uint16_t i = 0; i < size; i++) {
+    uint16_t cursor_start_index = oled_cursor - &oled_buffer[0];
+    if ((size + cursor_start_index) > OLED_MATRIX_SIZE) size = OLED_MATRIX_SIZE - cursor_start_index;
+    for (uint16_t i = cursor_start_index; i < cursor_start_index + size; i++) {
         uint8_t c = pgm_read_byte(data++);
         if (oled_buffer[i] == c) continue;
         oled_buffer[i] = c;
@@ -522,6 +531,10 @@ void oled_write_raw_P(const char *data, uint16_t size) {
 #endif  // defined(__AVR__)
 
 bool oled_on(void) {
+    if (!oled_initialized) {
+        return oled_active;
+    }
+
 #if OLED_TIMEOUT > 0
     oled_timeout = timer_read32() + OLED_TIMEOUT;
 #endif
@@ -538,6 +551,10 @@ bool oled_on(void) {
 }
 
 bool oled_off(void) {
+    if (!oled_initialized) {
+        return !oled_active;
+    }
+
     static const uint8_t PROGMEM display_off[] = {I2C_CMD, DISPLAY_OFF};
     if (oled_active) {
         if (I2C_TRANSMIT_P(display_off) != I2C_STATUS_SUCCESS) {
@@ -552,6 +569,10 @@ bool oled_off(void) {
 bool is_oled_on(void) { return oled_active; }
 
 uint8_t oled_set_brightness(uint8_t level) {
+    if (!oled_initialized) {
+        return oled_brightness;
+    }
+
     uint8_t set_contrast[] = {I2C_CMD, CONTRAST, level};
     if (oled_brightness != level) {
         if (I2C_TRANSMIT(set_contrast) != I2C_STATUS_SUCCESS) {
@@ -591,6 +612,10 @@ void oled_scroll_set_speed(uint8_t speed) {
 }
 
 bool oled_scroll_right(void) {
+    if (!oled_initialized) {
+        return oled_scrolling;
+    }
+
     // Dont enable scrolling if we need to update the display
     // This prevents scrolling of bad data from starting the scroll too early after init
     if (!oled_dirty && !oled_scrolling) {
@@ -605,6 +630,10 @@ bool oled_scroll_right(void) {
 }
 
 bool oled_scroll_left(void) {
+    if (!oled_initialized) {
+        return oled_scrolling;
+    }
+
     // Dont enable scrolling if we need to update the display
     // This prevents scrolling of bad data from starting the scroll too early after init
     if (!oled_dirty && !oled_scrolling) {
@@ -619,6 +648,10 @@ bool oled_scroll_left(void) {
 }
 
 bool oled_scroll_off(void) {
+    if (!oled_initialized) {
+        return !oled_scrolling;
+    }
+
     if (oled_scrolling) {
         static const uint8_t PROGMEM display_scroll_off[] = {I2C_CMD, DEACTIVATE_SCROLL};
         if (I2C_TRANSMIT_P(display_scroll_off) != I2C_STATUS_SUCCESS) {
@@ -650,9 +683,16 @@ void oled_task(void) {
         return;
     }
 
+#if OLED_UPDATE_INTERVAL > 0
+    if (timer_elapsed(oled_update_timeout) >= OLED_UPDATE_INTERVAL) {
+        oled_update_timeout = timer_read();
+        oled_set_cursor(0, 0);
+        oled_task_user();
+    }
+#else
     oled_set_cursor(0, 0);
-
     oled_task_user();
+#endif
 
 #if OLED_SCROLL_TIMEOUT > 0
     if (oled_dirty && oled_scrolling) {
diff --git a/qmk/drivers/qwiic/micro_oled.c b/qmk/drivers/qwiic/micro_oled.c
index bed6b250..c7a4ee08 100644
--- a/qmk/drivers/qwiic/micro_oled.c
+++ b/qmk/drivers/qwiic/micro_oled.c
@@ -28,11 +28,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "micro_oled.h"
-#include <print.h>
+#include "print.h"
 #include <stdlib.h>
 #include "util/font5x7.h"
 #include "util/font8x16.h"
-#include "string.h"
+#include <string.h>
 
 #define TOTALFONTS 2
 const unsigned char* fonts_pointer[] = {font5x7, font8x16};
diff --git a/qmk/drivers/ugfx/gdisp/st7565/board_st7565_template.h b/qmk/drivers/ugfx/gdisp/st7565/board_st7565_template.h
index 194f8ea2..875ed9e6 100644
--- a/qmk/drivers/ugfx/gdisp/st7565/board_st7565_template.h
+++ b/qmk/drivers/ugfx/gdisp/st7565/board_st7565_template.h
@@ -8,8 +8,9 @@
 #ifndef _GDISP_LLD_BOARD_H
 #define _GDISP_LLD_BOARD_H
 
-#define ST7565_LCD_BIAS ST7565_LCD_BIAS_9  // actually 6
-#define ST7565_ADC ST7565_ADC_NORMAL
+#include "quantum.h"
+
+#define ST7565_LCD_BIAS ST7565_LCD_BIAS_7
 #define ST7565_COM_SCAN ST7565_COM_SCAN_DEC
 #define ST7565_PAGE_ORDER 0, 1, 2, 3
 /*
@@ -17,19 +18,12 @@
  * #define ST7565_PAGE_ORDER       4,5,6,7,0,1,2,3
  */
 
-#define ST7565_GPIOPORT GPIOC
-#define ST7565_PORT PORTC
-#define ST7565_A0_PIN 7
-#define ST7565_RST_PIN 8
-#define ST7565_MOSI_PIN 6
-#define ST7565_SLCK_PIN 5
-#define ST7565_SS_PIN 4
+#define ST7565_A0_PIN C7
+#define ST7565_RST_PIN C8
+#define ST7565_MOSI_PIN C6
+#define ST7565_SCLK_PIN C5
+#define ST7565_SS_PIN C4
 
-#define palSetPadModeRaw(portname, bits) ST7565_PORT->PCR[ST7565_##portname##_PIN] = bits
-
-#define palSetPadModeNamed(portname, portmode) palSetPadMode(ST7565_GPIOPORT, ST7565_##portname##_PIN, portmode)
-
-#define ST7565_SPI_MODE PORTx_PCRn_DSE | PORTx_PCRn_MUX(2)
 // DSPI Clock and Transfer Attributes
 // Frame Size: 8 bits
 // MSB First
@@ -38,9 +32,9 @@ static const SPIConfig spi1config = {
     // Operation complete callback or @p NULL.
     .end_cb = NULL,
     // The chip select line port - when not using pcs.
-    .ssport = ST7565_GPIOPORT,
+    .ssport = PAL_PORT(ST7565_SS_PIN),
     // brief The chip select line pad number - when not using pcs.
-    .sspad = ST7565_SS_PIN,
+    .sspad = PAL_PAD(ST7565_SS_PIN),
     // SPI initialization data.
     .tar0 = SPIx_CTARn_FMSZ(7)     // Frame size = 8 bytes
             | SPIx_CTARn_ASC(1)    // After SCK Delay Scaler (min 50 ns) = 55.56ns
@@ -66,13 +60,14 @@ static GFXINLINE void release_bus(GDisplay *g) {
 
 static GFXINLINE void init_board(GDisplay *g) {
     (void)g;
-    palSetPadModeNamed(A0, PAL_MODE_OUTPUT_PUSHPULL);
-    palSetPad(ST7565_GPIOPORT, ST7565_A0_PIN);
-    palSetPadModeNamed(RST, PAL_MODE_OUTPUT_PUSHPULL);
-    palSetPad(ST7565_GPIOPORT, ST7565_RST_PIN);
-    palSetPadModeRaw(MOSI, ST7565_SPI_MODE);
-    palSetPadModeRaw(SLCK, ST7565_SPI_MODE);
-    palSetPadModeNamed(SS, PAL_MODE_OUTPUT_PUSHPULL);
+    setPinOutput(ST7565_A0_PIN);
+    writePinHigh(ST7565_A0_PIN);
+    setPinOutput(ST7565_RST_PIN);
+    writePinHigh(ST7565_RST_PIN);
+    setPinOutput(ST7565_SS_PIN);
+
+    palSetPadMode(PAL_PORT(ST7565_MOSI_PIN), PAL_PAD(ST7565_MOSI_PIN), PAL_MODE_ALTERNATIVE_2);
+    palSetPadMode(PAL_PORT(ST7565_SCLK_PIN), PAL_PAD(ST7565_SCLK_PIN), PAL_MODE_ALTERNATIVE_2);
 
     spiInit();
     spiStart(&SPID1, &spi1config);
@@ -83,19 +78,18 @@ static GFXINLINE void post_init_board(GDisplay *g) { (void)g; }
 
 static GFXINLINE void setpin_reset(GDisplay *g, bool_t state) {
     (void)g;
-    if (state) {
-        palClearPad(ST7565_GPIOPORT, ST7565_RST_PIN);
-    } else {
-        palSetPad(ST7565_GPIOPORT, ST7565_RST_PIN);
-    }
+    writePin(ST7565_RST_PIN, !state);
 }
 
-static GFXINLINE void enter_data_mode(GDisplay *g) { palSetPad(ST7565_GPIOPORT, ST7565_A0_PIN); }
-
-static GFXINLINE void enter_cmd_mode(GDisplay *g) { palClearPad(ST7565_GPIOPORT, ST7565_A0_PIN); }
-
-static GFXINLINE void write_data(GDisplay *g, uint8_t *data, uint16_t length) {
+static GFXINLINE void write_cmd(GDisplay *g, gU8 cmd) {
     (void)g;
+    writePinLow(ST7565_A0_PIN);
+    spiSend(&SPID1, 1, &cmd);
+}
+
+static GFXINLINE void write_data(GDisplay *g, gU8 *data, gU16 length) {
+    (void)g;
+    writePinHigh(ST7565_A0_PIN);
     spiSend(&SPID1, length, data);
 }
 
diff --git a/qmk/drivers/ugfx/gdisp/st7565/driver.mk b/qmk/drivers/ugfx/gdisp/st7565/driver.mk
index 31fc8f1c..799a986b 100644
--- a/qmk/drivers/ugfx/gdisp/st7565/driver.mk
+++ b/qmk/drivers/ugfx/gdisp/st7565/driver.mk
@@ -1,3 +1,3 @@
 GFXINC += drivers/ugfx/gdisp/st7565
 GFXSRC += drivers/ugfx/gdisp/st7565/gdisp_lld_ST7565.c
-GDISP_DRIVER_LIST += GDISPVMT_ST7565_QMK
\ No newline at end of file
+GDISP_DRIVER_LIST += GDISPVMT_ST7565_QMK
diff --git a/qmk/drivers/ugfx/gdisp/st7565/gdisp_lld_ST7565.c b/qmk/drivers/ugfx/gdisp/st7565/gdisp_lld_ST7565.c
index fde32098..f586f97e 100644
--- a/qmk/drivers/ugfx/gdisp/st7565/gdisp_lld_ST7565.c
+++ b/qmk/drivers/ugfx/gdisp/st7565/gdisp_lld_ST7565.c
@@ -49,31 +49,15 @@
 #        define ST7565_COM_SCAN ST7565_COM_SCAN_INC
 #    endif
 #    ifndef ST7565_PAGE_ORDER
-#        define ST7565_PAGE_ORDER 0, 1, 2, 3
+#        define ST7565_PAGE_ORDER 0, 1, 2, 3, 4, 5, 6, 7
 #    endif
 
 /*===========================================================================*/
 /* Driver local functions.                                                   */
 /*===========================================================================*/
 
-typedef struct {
-    bool_t  buffer2;
-    uint8_t data_pos;
-    uint8_t data[16];
-    uint8_t ram[GDISP_SCREEN_HEIGHT * GDISP_SCREEN_WIDTH / 8];
-} PrivData;
-
 // Some common routines and macros
-#    define PRIV(g) ((PrivData *)g->priv)
-#    define RAM(g) (PRIV(g)->ram)
-
-static GFXINLINE void write_cmd(GDisplay *g, uint8_t cmd) { PRIV(g)->data[PRIV(g)->data_pos++] = cmd; }
-
-static GFXINLINE void flush_cmd(GDisplay *g) {
-    write_data(g, PRIV(g)->data, PRIV(g)->data_pos);
-    PRIV(g)->data_pos = 0;
-}
-
+#    define RAM(g) ((gU8 *)g->priv)
 #    define write_cmd2(g, cmd1, cmd2) \
         {                             \
             write_cmd(g, cmd1);       \
@@ -106,9 +90,10 @@ static GFXINLINE void flush_cmd(GDisplay *g) {
 
 LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
     // The private area is the display surface.
-    g->priv           = gfxAlloc(sizeof(PrivData));
-    PRIV(g)->buffer2  = false;
-    PRIV(g)->data_pos = 0;
+    g->priv = gfxAlloc(GDISP_SCREEN_HEIGHT * GDISP_SCREEN_WIDTH / 8);
+    if (!g->priv) {
+        return gFalse;
+    }
 
     // Initialise the board interface
     init_board(g);
@@ -119,25 +104,33 @@ LLDSPEC bool_t gdisp_lld_init(GDisplay *g) {
     setpin_reset(g, FALSE);
     gfxSleepMilliseconds(20);
     acquire_bus(g);
-    enter_cmd_mode(g);
 
-    write_cmd(g, ST7565_RESET);
     write_cmd(g, ST7565_LCD_BIAS);
     write_cmd(g, ST7565_ADC);
     write_cmd(g, ST7565_COM_SCAN);
 
-    write_cmd(g, ST7565_RESISTOR_RATIO | 0x1);
-    write_cmd2(g, ST7565_CONTRAST, GDISP_INITIAL_CONTRAST);
-
-    // turn on internal power supply (VC=1, VR=1, VF=1)
-    write_cmd(g, ST7565_POWER_CONTROL | 0x07);
-
-    write_cmd(g, ST7565_INVERT_DISPLAY);
-    write_cmd(g, ST7565_ALLON_NORMAL);
-
     write_cmd(g, ST7565_START_LINE | 0);
+
+    write_cmd2(g, ST7565_CONTRAST, GDISP_INITIAL_CONTRAST * 64 / 101);
+    write_cmd(g, ST7565_RESISTOR_RATIO | 0x1);
+
+    // turn on voltage converter (VC=1, VR=0, VF=0)
+    write_cmd(g, ST7565_POWER_CONTROL | 0x04);
+    delay_ms(50);
+
+    // turn on voltage regulator (VC=1, VR=1, VF=0)
+    write_cmd(g, ST7565_POWER_CONTROL | 0x06);
+    delay_ms(50);
+
+    // turn on voltage follower (VC=1, VR=1, VF=1)
+    write_cmd(g, ST7565_POWER_CONTROL | 0x07);
+    delay_ms(50);
+
+    write_cmd(g, ST7565_DISPLAY_ON);
+    write_cmd(g, ST7565_ALLON_NORMAL);
+    write_cmd(g, ST7565_INVERT_DISPLAY);  // Disable Inversion of display.
+
     write_cmd(g, ST7565_RMW);
-    flush_cmd(g);
 
     // Finish Init
     post_init_board(g);
@@ -163,22 +156,14 @@ LLDSPEC void gdisp_lld_flush(GDisplay *g) {
     if (!(g->flags & GDISP_FLG_NEEDFLUSH)) return;
 
     acquire_bus(g);
-    enter_cmd_mode(g);
-    unsigned dstOffset = (PRIV(g)->buffer2 ? 4 : 0);
-    for (p = 0; p < 4; p++) {
-        write_cmd(g, ST7565_PAGE | (p + dstOffset));
+    gU8 pagemap[] = {ST7565_PAGE_ORDER};
+    for (p = 0; p < sizeof(pagemap); p++) {
+        write_cmd(g, ST7565_PAGE | pagemap[p]);
         write_cmd(g, ST7565_COLUMN_MSB | 0);
         write_cmd(g, ST7565_COLUMN_LSB | 0);
         write_cmd(g, ST7565_RMW);
-        flush_cmd(g);
-        enter_data_mode(g);
         write_data(g, RAM(g) + (p * GDISP_SCREEN_WIDTH), GDISP_SCREEN_WIDTH);
-        enter_cmd_mode(g);
     }
-    unsigned line = (PRIV(g)->buffer2 ? 32 : 0);
-    write_cmd(g, ST7565_START_LINE | line);
-    flush_cmd(g);
-    PRIV(g)->buffer2 = !PRIV(g)->buffer2;
     release_bus(g);
 
     g->flags &= ~GDISP_FLG_NEEDFLUSH;
@@ -243,6 +228,7 @@ LLDSPEC color_t gdisp_lld_get_pixel_color(GDisplay *g) {
 }
 #    endif
 
+#    if GDISP_HARDWARE_BITFILLS
 LLDSPEC void gdisp_lld_blit_area(GDisplay *g) {
     uint8_t *buffer     = (uint8_t *)g->p.ptr;
     int      linelength = g->p.cx;
@@ -268,6 +254,7 @@ LLDSPEC void gdisp_lld_blit_area(GDisplay *g) {
     }
     g->flags |= GDISP_FLG_NEEDFLUSH;
 }
+#    endif
 
 #    if GDISP_NEED_CONTROL && GDISP_HARDWARE_CONTROL
 LLDSPEC void gdisp_lld_control(GDisplay *g) {
@@ -279,16 +266,12 @@ LLDSPEC void gdisp_lld_control(GDisplay *g) {
                 case powerSleep:
                 case powerDeepSleep:
                     acquire_bus(g);
-                    enter_cmd_mode(g);
                     write_cmd(g, ST7565_DISPLAY_OFF);
-                    flush_cmd(g);
                     release_bus(g);
                     break;
                 case powerOn:
                     acquire_bus(g);
-                    enter_cmd_mode(g);
                     write_cmd(g, ST7565_DISPLAY_ON);
-                    flush_cmd(g);
                     release_bus(g);
                     break;
                 default:
@@ -318,12 +301,11 @@ LLDSPEC void gdisp_lld_control(GDisplay *g) {
             return;
 
         case GDISP_CONTROL_CONTRAST:
-            g->g.Contrast = (unsigned)g->p.ptr & 63;
+            if ((unsigned)g->p.ptr > 100) g->p.ptr = (void *)100;
             acquire_bus(g);
-            enter_cmd_mode(g);
-            write_cmd2(g, ST7565_CONTRAST, g->g.Contrast);
-            flush_cmd(g);
+            write_cmd2(g, ST7565_CONTRAST, ((((unsigned)g->p.ptr) << 6) / 101) & 0x3F);
             release_bus(g);
+            g->g.Contrast = (unsigned)g->p.ptr;
             return;
     }
 }
diff --git a/qmk/keyboards/10bleoledhub/config.h b/qmk/keyboards/10bleoledhub/config.h
index 0cc7831f..d3e845fe 100644
--- a/qmk/keyboards/10bleoledhub/config.h
+++ b/qmk/keyboards/10bleoledhub/config.h
@@ -26,7 +26,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.*/
 /* key matrix size */
 #define MATRIX_ROWS 4
 #define MATRIX_COLS 3
-#define MATRIX_ROW_PINS { F6, F5, F4, F1 }
+#define MATRIX_ROW_PINS { F0, F5, F4, F6 }
 #define MATRIX_COL_PINS { D6, D7, B5 }
 #define UNUSED_PINS
 
diff --git a/qmk/keyboards/1upkeyboards/1up60hse/keymaps/via/rules.mk b/qmk/keyboards/1upkeyboards/1up60hse/keymaps/via/rules.mk
index 6305f94a..44a2bc49 100644
--- a/qmk/keyboards/1upkeyboards/1up60hse/keymaps/via/rules.mk
+++ b/qmk/keyboards/1upkeyboards/1up60hse/keymaps/via/rules.mk
@@ -1,3 +1,4 @@
 VIA_ENABLE = yes
 LTO_ENABLE = yes
-MOUSEKEY_ENABLE = no
\ No newline at end of file
+
+CONSOLE_ENABLE = no
diff --git a/qmk/keyboards/1upkeyboards/1up60hte/1up60hte.c b/qmk/keyboards/1upkeyboards/1up60hte/1up60hte.c
index 3af0e9d4..460e42a0 100644
--- a/qmk/keyboards/1upkeyboards/1up60hte/1up60hte.c
+++ b/qmk/keyboards/1upkeyboards/1up60hte/1up60hte.c
@@ -16,19 +16,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "1up60hte.h"
-
-void keyboard_pre_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-    setPinOutput(B6);
-    keyboard_pre_init_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-	if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
-		writePinLow(B6);
-	} else {
-		writePinHigh(B6);
-	}
-    led_set_user(usb_led);
-}
\ No newline at end of file
diff --git a/qmk/keyboards/1upkeyboards/1up60hte/config.h b/qmk/keyboards/1upkeyboards/1up60hte/config.h
index 8c4d2fc3..c3ba030d 100644
--- a/qmk/keyboards/1upkeyboards/1up60hte/config.h
+++ b/qmk/keyboards/1upkeyboards/1up60hte/config.h
@@ -40,6 +40,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
+#define LED_CAPS_LOCK_PIN B6
+#define LED_PIN_ON_STATE 0
+
 /* number of backlight levels */
 #define BACKLIGHT_PIN B7
 #ifdef BACKLIGHT_PIN
diff --git a/qmk/keyboards/1upkeyboards/1up60hte/keymaps/via/rules.mk b/qmk/keyboards/1upkeyboards/1up60hte/keymaps/via/rules.mk
index bee21da5..1e5b9980 100644
--- a/qmk/keyboards/1upkeyboards/1up60hte/keymaps/via/rules.mk
+++ b/qmk/keyboards/1upkeyboards/1up60hte/keymaps/via/rules.mk
@@ -1,2 +1 @@
 VIA_ENABLE = yes
-MOUSEKEY_ENABLE = no
\ No newline at end of file
diff --git a/qmk/keyboards/1upkeyboards/super16/rules.mk b/qmk/keyboards/1upkeyboards/super16/rules.mk
index 2ef04cd5..90e7e42a 100644
--- a/qmk/keyboards/1upkeyboards/super16/rules.mk
+++ b/qmk/keyboards/1upkeyboards/super16/rules.mk
@@ -25,7 +25,8 @@ SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 NKRO_ENABLE = no            # USB Nkey Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality on B7 by default
 RGBLIGHT_ENABLE = no       # Enable keyboard RGB underglow
-RGB_MATRIX_ENABLE = WS2812
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = WS2812
 MIDI_ENABLE = no            # MIDI support
 UNICODE_ENABLE = no         # Unicode
 BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
diff --git a/qmk/keyboards/1upkeyboards/sweet16/v1/config.h b/qmk/keyboards/1upkeyboards/sweet16/v1/config.h
index 5264ef69..4020f4fd 100644
--- a/qmk/keyboards/1upkeyboards/sweet16/v1/config.h
+++ b/qmk/keyboards/1upkeyboards/sweet16/v1/config.h
@@ -17,6 +17,12 @@
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
 
+#ifndef CONVERT_TO_PROTON_C
+#    define LED_NUM_LOCK_PIN B0 // RXLED
+#    define LED_CAPS_LOCK_PIN D5 // TXLED
+#    define LED_PIN_ON_STATE 0
+#endif
+
 /* Underglow options */
 #define RGB_DI_PIN B1
 #ifdef RGB_DI_PIN
diff --git a/qmk/keyboards/1upkeyboards/sweet16/v1/v1.c b/qmk/keyboards/1upkeyboards/sweet16/v1/v1.c
index 053620d3..0ff1041a 100644
--- a/qmk/keyboards/1upkeyboards/sweet16/v1/v1.c
+++ b/qmk/keyboards/1upkeyboards/sweet16/v1/v1.c
@@ -1,21 +1 @@
 #include "v1.h"
-
-void led_set_kb(uint8_t usb_led) {
-#ifndef CONVERT_TO_PROTON_C
-    /* Map RXLED to USB_LED_NUM_LOCK */
-    if (IS_LED_ON(usb_led, USB_LED_NUM_LOCK)) {
-        setPinOutput(B0);
-        writePinLow(B0);
-    } else {
-        setPinInput(B0);
-    }
-
-    /* Map TXLED to USB_LED_CAPS_LOCK */
-    if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
-        setPinOutput(D5);
-        writePinLow(D5);
-    } else {
-        setPinInput(D5);
-    }
-#endif
-}
diff --git a/qmk/keyboards/40percentclub/mf68/config.h b/qmk/keyboards/40percentclub/mf68/config.h
index 5bda9bb7..7c5a0cd5 100644
--- a/qmk/keyboards/40percentclub/mf68/config.h
+++ b/qmk/keyboards/40percentclub/mf68/config.h
@@ -20,8 +20,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0xCEEB
-#define PRODUCT_ID      0x0510
+#define VENDOR_ID       0x3430 // "40"
+#define PRODUCT_ID      0x4D68 // "M68"
 #define DEVICE_VER      0x0101
 #define MANUFACTURER    di0ib
 #define PRODUCT         MF68
diff --git a/qmk/keyboards/40percentclub/mf68/keymaps/via/keymap.c b/qmk/keyboards/40percentclub/mf68/keymaps/via/keymap.c
new file mode 100644
index 00000000..efd595ac
--- /dev/null
+++ b/qmk/keyboards/40percentclub/mf68/keymaps/via/keymap.c
@@ -0,0 +1,49 @@
+/* Copyright 2020 MechMerlin 
+  * 
+  * 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_68_ansi(
+    KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_INS,  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_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_LGUI, KC_LALT,                            KC_SPC,                             MO(1),   KC_RALT, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
+  ),
+  [1] = LAYOUT_68_ansi(
+    KC_GRV,  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_BSPC,          KC_VOLU, KC_HOME,
+    _______, _______, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, BL_STEP, _______,          KC_VOLD, KC_END,
+    _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______,          _______,
+    _______, _______, _______, _______, _______, _______, _______, KC_MUTE, _______, _______, _______,                   _______,          KC_MUTE,
+    _______, _______, _______,                            _______,                            _______, _______, _______,          KC_MPRV, KC_MPLY, KC_MNXT
+  ),
+  [2] = LAYOUT_68_ansi(
+    _______, _______, _______,   _______, _______, _______,   _______, _______, _______,   _______, _______, _______,  _______, _______, _______, _______,
+    _______, _______, _______, _______,   _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______,          _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______,          _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______,    _______,                   _______,          _______,
+    _______, _______, _______,                            _______,                            _______, _______, _______,          _______, _______, _______
+  ),
+  [3] = LAYOUT_68_ansi(
+    _______, _______, _______,   _______, _______, _______,   _______, _______, _______,   _______, _______, _______,  _______, _______, _______, _______,
+    _______, _______, _______, _______,   _______, _______, _______, _______, _______, _______,    _______, _______, _______, _______,          _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______,          _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______,    _______,                   _______,          _______,
+    _______, _______, _______,                            _______,                            _______, _______, _______,          _______, _______, _______
+  )
+};
diff --git a/qmk/keyboards/40percentclub/mf68/keymaps/via/rules.mk b/qmk/keyboards/40percentclub/mf68/keymaps/via/rules.mk
new file mode 100644
index 00000000..36b7ba9c
--- /dev/null
+++ b/qmk/keyboards/40percentclub/mf68/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/qmk/keyboards/40percentclub/mf68/mf68.h b/qmk/keyboards/40percentclub/mf68/mf68.h
index a34f9cde..6844ed1b 100644
--- a/qmk/keyboards/40percentclub/mf68/mf68.h
+++ b/qmk/keyboards/40percentclub/mf68/mf68.h
@@ -16,7 +16,7 @@
     { K40, K41, K42, K43, K44, K45, K46, K47, K48 }, \
     { K50, K51, K52, K53, K54, K55, K56, K57, K58 }, \
     { K60, K61, K62, K63, K64, K65, K66, K67, K68 }, \
-    { K70, K71, K72, K73, K74 } \
+    { K70, K71, K72, K73, K74, KC_NO, KC_NO, KC_NO, KC_NO } \
 }
 
 #define LAYOUT_kc( \
diff --git a/qmk/keyboards/40percentclub/mf68/rules.mk b/qmk/keyboards/40percentclub/mf68/rules.mk
index 65d18703..f1967d83 100644
--- a/qmk/keyboards/40percentclub/mf68/rules.mk
+++ b/qmk/keyboards/40percentclub/mf68/rules.mk
@@ -14,7 +14,7 @@ BOOTLOADER = caterina
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration
+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
@@ -22,7 +22,7 @@ COMMAND_ENABLE = no         # 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
+NKRO_ENABLE = yes            # USB Nkey Rollover
 BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality on B7 by default
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 MIDI_ENABLE = no            # MIDI controls
diff --git a/qmk/keyboards/40percentclub/ut47/led.c b/qmk/keyboards/40percentclub/ut47/led.c
index 9458c038..f5d8ffc1 100644
--- a/qmk/keyboards/40percentclub/ut47/led.c
+++ b/qmk/keyboards/40percentclub/ut47/led.c
@@ -16,7 +16,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include <avr/io.h>
-#include "stdint.h"
+#include <stdint.h>
 #include "led.h"
 
 
diff --git a/qmk/keyboards/4pplet/bootleg/info.json b/qmk/keyboards/4pplet/bootleg/info.json
new file mode 100644
index 00000000..4abffda3
--- /dev/null
+++ b/qmk/keyboards/4pplet/bootleg/info.json
@@ -0,0 +1,79 @@
+{
+    "keyboard_name": "bootleg Rev A",
+    "url": "https://github.com/4pplet/bootlegs",
+    "maintainer": "4pplet",
+    "width": 15,
+    "height": 5,
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                { "label": "Esc", "x": 0, "y": 0 },
+                { "label": "!", "x": 1, "y": 0 },
+                { "label": "@", "x": 2, "y": 0 },
+                { "label": "#", "x": 3, "y": 0 },
+                { "label": "$", "x": 4, "y": 0 },
+                { "label": "%", "x": 5, "y": 0 },
+                { "label": "^", "x": 6, "y": 0 },
+                { "label": "&", "x": 7, "y": 0 },
+                { "label": "*", "x": 8, "y": 0 },
+                { "label": "(", "x": 9, "y": 0 },
+                { "label": ")", "x": 10, "y": 0 },
+                { "label": "_", "x": 11, "y": 0 },
+                { "label": "+", "x": 12, "y": 0 },
+                { "label": "|", "x": 13, "y": 0 },
+                { "label": "~", "x": 14, "y": 0 },
+                { "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
+                { "label": "Q", "x": 1.5, "y": 1 },
+                { "label": "W", "x": 2.5, "y": 1 },
+                { "label": "E", "x": 3.5, "y": 1 },
+                { "label": "R", "x": 4.5, "y": 1 },
+                { "label": "T", "x": 5.5, "y": 1 },
+                { "label": "Y", "x": 6.5, "y": 1 },
+                { "label": "U", "x": 7.5, "y": 1 },
+                { "label": "I", "x": 8.5, "y": 1 },
+                { "label": "O", "x": 9.5, "y": 1 },
+                { "label": "P", "x": 10.5, "y": 1 },
+                { "label": "{", "x": 11.5, "y": 1 },
+                { "label": "}", "x": 12.5, "y": 1 },
+                { "label": "Backsp.", "x": 13.5, "y": 1, "w": 1.5 },
+                { "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 },
+                { "label": "A", "x": 1.75, "y": 2 },
+                { "label": "S", "x": 2.75, "y": 2 },
+                { "label": "D", "x": 3.75, "y": 2 },
+                { "label": "F", "x": 4.75, "y": 2 },
+                { "label": "G", "x": 5.75, "y": 2 },
+                { "label": "H", "x": 6.75, "y": 2 },
+                { "label": "J", "x": 7.75, "y": 2 },
+                { "label": "K", "x": 8.75, "y": 2 },
+                { "label": "L", "x": 9.75, "y": 2 },
+                { "label": ":", "x": 10.75, "y": 2 },
+                { "label": "\"", "x": 11.75, "y": 2 },
+                { "label": "Enter", "x": 12.75, "y": 2, "w": 2.25 },
+                { "label": "Shift", "x": 0, "y": 3, "w": 1.25 },
+                { "label": "|", "x": 1.25, "y": 3 },
+                { "label": "Z", "x": 2.25, "y": 3 },
+                { "label": "X", "x": 3.25, "y": 3 },
+                { "label": "C", "x": 4.25, "y": 3 },
+                { "label": "V", "x": 5.25, "y": 3 },
+                { "label": "B", "x": 6.25, "y": 3 },
+                { "label": "N", "x": 7.25, "y": 3 },
+                { "label": "M", "x": 8.25, "y": 3 },
+                { "label": "<", "x": 9.25, "y": 3 },
+                { "label": ">", "x": 10.25, "y": 3 },
+                { "label": "?", "x": 11.25, "y": 3 },
+                { "label": "Shift", "x": 12.25, "y": 3, "w": 1.75 },
+                { "label": "Fn", "x": 14, "y": 3, "w": 1 },
+                { "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 },
+                { "label": "Win", "x": 1.25, "y": 4, "w": 1.25 },
+                { "label": "Alt", "x": 2.5, "y": 4, "w": 1.25 },
+                { "label": "Space1", "x": 3.75, "y": 4, "w": 2.25 },
+                { "label": "Space2", "x": 6, "y": 4, "w": 1.25 },
+                { "label": "Space3", "x": 7.25, "y": 4, "w": 2.75 },
+                { "label": "Alt", "x": 10, "y": 4, "w": 1.25 },
+                { "label": "Menu", "x": 11.25, "y": 4, "w": 1.25 },
+                { "label": "Win", "x": 12.5, "y": 4, "w": 1.25 },
+                { "label": "Ctrl", "x": 13.75, "y": 4, "w": 1.25 }
+            ]
+        }
+    }
+}
diff --git a/qmk/keyboards/4pplet/bootleg/keymaps/default/keymap.c b/qmk/keyboards/4pplet/bootleg/keymaps/default/keymap.c
new file mode 100644
index 00000000..c9ae421a
--- /dev/null
+++ b/qmk/keyboards/4pplet/bootleg/keymaps/default/keymap.c
@@ -0,0 +1,34 @@
+/*
+Copyright 2020 Stefan Sundin "4pplet" <4pplet@protonmail.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 QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+// main layer
+[0] = LAYOUT_all(
+  KC_ESC,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,       KC_6,      KC_7,      KC_8,      KC_9,       KC_0,    KC_MINS, KC_EQL,  KC_NO, KC_BSPC,
+  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_LCTRL, 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_NO,    KC_Z,     KC_X,     KC_C,     KC_V,       KC_B,      KC_N,      KC_M,      KC_COMM,    KC_DOT,  KC_SLSH, KC_RSFT, KC_NO,
+  KC_LCTL,  KC_LGUI,  KC_LALT,            KC_SPC,               KC_SPC,               KC_SPC,                KC_RALT, KC_RGUI, KC_APP,  MO(1)),
+// basic function layer
+[1] = LAYOUT_all(
+  RESET,    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_TRNS, KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_UP,    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_LEFT,  KC_DOWN,  KC_RIGHT, 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)
+};
diff --git a/qmk/keyboards/4pplet/bootleg/keymaps/via/keymap.c b/qmk/keyboards/4pplet/bootleg/keymaps/via/keymap.c
new file mode 100644
index 00000000..b83266d8
--- /dev/null
+++ b/qmk/keyboards/4pplet/bootleg/keymaps/via/keymap.c
@@ -0,0 +1,48 @@
+/*
+Copyright 2020 Stefan Sundin "4pplet" <4pplet@protonmail.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 QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+// main layer
+[0] = LAYOUT_all(
+  KC_ESC,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,       KC_6,      KC_7,      KC_8,      KC_9,       KC_0,    KC_MINS, KC_EQL,  KC_NO, KC_BSPC,
+  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_LCTRL, 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_NO,    KC_Z,     KC_X,     KC_C,     KC_V,       KC_B,      KC_N,      KC_M,      KC_COMM,    KC_DOT,  KC_SLSH, KC_RSFT, KC_NO,
+  KC_LCTL,  KC_LGUI,  KC_LALT,            KC_SPC,               KC_SPC,               KC_SPC,                KC_RALT, KC_RGUI, KC_APP,  MO(1)),
+// basic function layer
+[1] = LAYOUT_all(
+  RESET,    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_TRNS, KC_TRNS,
+  KC_TRNS,  KC_TRNS,  KC_UP,    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_LEFT,  KC_DOWN,  KC_RIGHT, 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),
+// extra layer for VIA
+[2] = LAYOUT_all(
+  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,   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),
+// extra layer for VIA
+[3] = LAYOUT_all(
+  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,   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)
+};
diff --git a/qmk/keyboards/4pplet/bootleg/keymaps/via/rules.mk b/qmk/keyboards/4pplet/bootleg/keymaps/via/rules.mk
new file mode 100644
index 00000000..1e5b9980
--- /dev/null
+++ b/qmk/keyboards/4pplet/bootleg/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/qmk/keyboards/4pplet/bootleg/readme.md b/qmk/keyboards/4pplet/bootleg/readme.md
new file mode 100644
index 00000000..3ced86e6
--- /dev/null
+++ b/qmk/keyboards/4pplet/bootleg/readme.md
@@ -0,0 +1,12 @@
+# bootleg
+
+A 60% PCB for non tray-mount keyboards
+
+* Keyboard Maintainer: [4pplet](https://github.com/4pplet)
+* Hardware Supported: bootleg Rev A
+
+Make example for this keyboard (after setting up your build environment):
+
+    make 4pplet/bootleg/rev_a: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).
diff --git a/qmk/keyboards/4pplet/bootleg/rev_a/config.h b/qmk/keyboards/4pplet/bootleg/rev_a/config.h
new file mode 100644
index 00000000..4d3122af
--- /dev/null
+++ b/qmk/keyboards/4pplet/bootleg/rev_a/config.h
@@ -0,0 +1,42 @@
+/*
+Copyright 2020 Stefan Sundin "4pplet" <4pplet@protonmail.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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x4444
+#define PRODUCT_ID      0x0004
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    4pplet
+#define PRODUCT         bootleg Rev A
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+// ROWS: Top to bottom, COLS: Left to right
+#define MATRIX_ROW_PINS {D0,C2,C4,D4,D2}
+#define MATRIX_COL_PINS {C5,C6,C7,B7,B6,B5,B4,B3,B2,B1,B0,D6,D5,D3,D1}
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+#define QMK_ESC_OUTPUT C4 // usually COL
+#define QMK_ESC_INPUT D0 // usually ROW
diff --git a/qmk/keyboards/4pplet/bootleg/rev_a/readme.md b/qmk/keyboards/4pplet/bootleg/rev_a/readme.md
new file mode 100644
index 00000000..3ced86e6
--- /dev/null
+++ b/qmk/keyboards/4pplet/bootleg/rev_a/readme.md
@@ -0,0 +1,12 @@
+# bootleg
+
+A 60% PCB for non tray-mount keyboards
+
+* Keyboard Maintainer: [4pplet](https://github.com/4pplet)
+* Hardware Supported: bootleg Rev A
+
+Make example for this keyboard (after setting up your build environment):
+
+    make 4pplet/bootleg/rev_a: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).
diff --git a/qmk/keyboards/4pplet/bootleg/rev_a/rev_a.c b/qmk/keyboards/4pplet/bootleg/rev_a/rev_a.c
new file mode 100644
index 00000000..b4f233d3
--- /dev/null
+++ b/qmk/keyboards/4pplet/bootleg/rev_a/rev_a.c
@@ -0,0 +1,17 @@
+/*
+Copyright 2020 Stefan Sundin "4pplet" <4pplet@protonmail.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 "rev_a.h"
diff --git a/qmk/keyboards/4pplet/bootleg/rev_a/rev_a.h b/qmk/keyboards/4pplet/bootleg/rev_a/rev_a.h
new file mode 100644
index 00000000..f9bbb445
--- /dev/null
+++ b/qmk/keyboards/4pplet/bootleg/rev_a/rev_a.h
@@ -0,0 +1,34 @@
+/*
+Copyright 2020 Stefan Sundin "4pplet" <4pplet@protonmail.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"
+
+#define LAYOUT_all( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1d, k1e, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, k3e, \
+    k40, k41, k43, k45, k47, k48, k4a, k4b, k4d, k4e \
+) \
+{ \
+    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e}, \
+    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1d, k1e}, \
+    {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d}, \
+    {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3d, k3e}, \
+    {k40, k41, k43, k45, k47, k48, k4a, k4b, k4d, k4e }  \
+}
diff --git a/qmk/keyboards/4pplet/bootleg/rev_a/rules.mk b/qmk/keyboards/4pplet/bootleg/rev_a/rules.mk
new file mode 100644
index 00000000..380c35d4
--- /dev/null
+++ b/qmk/keyboards/4pplet/bootleg/rev_a/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u2
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # 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
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
diff --git a/qmk/keyboards/4pplet/waffling60/README.md b/qmk/keyboards/4pplet/waffling60/README.md
index a6b56a69..bf5fda88 100644
--- a/qmk/keyboards/4pplet/waffling60/README.md
+++ b/qmk/keyboards/4pplet/waffling60/README.md
@@ -9,6 +9,7 @@ More info: https://geekhack.org/index.php?topic=103531.0
 
 Make example for this keyboard (after setting up your build environment):
 
-    make 4pplet/steezy60/rev_a:default
+    make 4pplet/waffling60/rev_a:default
+    make 4pplet/waffling60/rev_b: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).
\ No newline at end of file
+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).
diff --git a/qmk/keyboards/4pplet/waffling60/info.json b/qmk/keyboards/4pplet/waffling60/info.json
new file mode 100644
index 00000000..6c5c83fa
--- /dev/null
+++ b/qmk/keyboards/4pplet/waffling60/info.json
@@ -0,0 +1,79 @@
+{
+    "keyboard_name": "Waffling60 Rev A",
+    "url": "https://github.com/4pplet/waffling60",
+    "maintainer": "4pplet",
+    "width": 15,
+    "height": 5,
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                { "label": "Esc", "x": 0, "y": 0 },
+                { "label": "!", "x": 1, "y": 0 },
+                { "label": "@", "x": 2, "y": 0 },
+                { "label": "#", "x": 3, "y": 0 },
+                { "label": "$", "x": 4, "y": 0 },
+                { "label": "%", "x": 5, "y": 0 },
+                { "label": "^", "x": 6, "y": 0 },
+                { "label": "&", "x": 7, "y": 0 },
+                { "label": "*", "x": 8, "y": 0 },
+                { "label": "(", "x": 9, "y": 0 },
+                { "label": ")", "x": 10, "y": 0 },
+                { "label": "_", "x": 11, "y": 0 },
+                { "label": "+", "x": 12, "y": 0 },
+                { "label": "|", "x": 13, "y": 0 },
+                { "label": "~", "x": 14, "y": 0 },
+                { "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
+                { "label": "Q", "x": 1.5, "y": 1 },
+                { "label": "W", "x": 2.5, "y": 1 },
+                { "label": "E", "x": 3.5, "y": 1 },
+                { "label": "R", "x": 4.5, "y": 1 },
+                { "label": "T", "x": 5.5, "y": 1 },
+                { "label": "Y", "x": 6.5, "y": 1 },
+                { "label": "U", "x": 7.5, "y": 1 },
+                { "label": "I", "x": 8.5, "y": 1 },
+                { "label": "O", "x": 9.5, "y": 1 },
+                { "label": "P", "x": 10.5, "y": 1 },
+                { "label": "{", "x": 11.5, "y": 1 },
+                { "label": "}", "x": 12.5, "y": 1 },
+                { "label": "Backsp.", "x": 13.5, "y": 1, "w": 1.5 },
+                { "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 },
+                { "label": "A", "x": 1.75, "y": 2 },
+                { "label": "S", "x": 2.75, "y": 2 },
+                { "label": "D", "x": 3.75, "y": 2 },
+                { "label": "F", "x": 4.75, "y": 2 },
+                { "label": "G", "x": 5.75, "y": 2 },
+                { "label": "H", "x": 6.75, "y": 2 },
+                { "label": "J", "x": 7.75, "y": 2 },
+                { "label": "K", "x": 8.75, "y": 2 },
+                { "label": "L", "x": 9.75, "y": 2 },
+                { "label": ":", "x": 10.75, "y": 2 },
+                { "label": "\"", "x": 11.75, "y": 2 },
+                { "label": "Enter", "x": 12.75, "y": 2, "w": 2.25 },
+                { "label": "Shift", "x": 0, "y": 3, "w": 1.25 },
+                { "label": "|", "x": 1.25, "y": 3 },
+                { "label": "Z", "x": 2.25, "y": 3 },
+                { "label": "X", "x": 3.25, "y": 3 },
+                { "label": "C", "x": 4.25, "y": 3 },
+                { "label": "V", "x": 5.25, "y": 3 },
+                { "label": "B", "x": 6.25, "y": 3 },
+                { "label": "N", "x": 7.25, "y": 3 },
+                { "label": "M", "x": 8.25, "y": 3 },
+                { "label": "<", "x": 9.25, "y": 3 },
+                { "label": ">", "x": 10.25, "y": 3 },
+                { "label": "?", "x": 11.25, "y": 3 },
+                { "label": "Shift", "x": 12.25, "y": 3, "w": 1.75 },
+                { "label": "Fn", "x": 14, "y": 3, "w": 1 },
+                { "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 },
+                { "label": "Win", "x": 1.25, "y": 4, "w": 1.25 },
+                { "label": "Alt", "x": 2.5, "y": 4, "w": 1.25 },
+                { "label": "Space1", "x": 3.75, "y": 4, "w": 2.25 },
+                { "label": "Space2", "x": 6, "y": 4, "w": 1.25 },
+                { "label": "Space3", "x": 7.25, "y": 4, "w": 2.75 },
+                { "label": "Alt", "x": 10, "y": 4, "w": 1.25 },
+                { "label": "Menu", "x": 11.25, "y": 4, "w": 1.25 },
+                { "label": "Win", "x": 12.5, "y": 4, "w": 1.25 },
+                { "label": "Ctrl", "x": 13.75, "y": 4, "w": 1.25 }
+            ]
+        }
+    }
+}
diff --git a/qmk/keyboards/4pplet/waffling60/keymaps/default/keymap.c b/qmk/keyboards/4pplet/waffling60/keymaps/default/keymap.c
index d61c3f6c..c9ae421a 100644
--- a/qmk/keyboards/4pplet/waffling60/keymaps/default/keymap.c
+++ b/qmk/keyboards/4pplet/waffling60/keymaps/default/keymap.c
@@ -1,3 +1,19 @@
+/*
+Copyright 2020 Stefan Sundin "4pplet" <4pplet@protonmail.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 QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/qmk/keyboards/4pplet/waffling60/keymaps/via/keymap.c b/qmk/keyboards/4pplet/waffling60/keymaps/via/keymap.c
index 40ca2a28..d20c6bf0 100644
--- a/qmk/keyboards/4pplet/waffling60/keymaps/via/keymap.c
+++ b/qmk/keyboards/4pplet/waffling60/keymaps/via/keymap.c
@@ -1,3 +1,19 @@
+/*
+Copyright 2020 Stefan Sundin "4pplet" <4pplet@protonmail.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 QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@@ -29,4 +45,4 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   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)
-};
+};
\ No newline at end of file
diff --git a/qmk/keyboards/4pplet/waffling60/rev_a/readme.md b/qmk/keyboards/4pplet/waffling60/rev_a/readme.md
new file mode 100644
index 00000000..1519fa66
--- /dev/null
+++ b/qmk/keyboards/4pplet/waffling60/rev_a/readme.md
@@ -0,0 +1,14 @@
+# waffling60
+
+A 60% PCB for MX switches, one hot swap and one solder-pcb version with decent layout support.
+
+More info: https://geekhack.org/index.php?topic=103531.0
+
+* Keyboard Maintainer: [4pplet](https://github.com/4pplet)
+* Hardware Supported: [waffling60](https://github.com/4pplet/waffling60)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make 4pplet/waffling60/rev_a: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).
diff --git a/qmk/keyboards/4pplet/waffling60/rev_b/config.h b/qmk/keyboards/4pplet/waffling60/rev_b/config.h
new file mode 100644
index 00000000..eb9882d7
--- /dev/null
+++ b/qmk/keyboards/4pplet/waffling60/rev_b/config.h
@@ -0,0 +1,55 @@
+/*
+Copyright 2020 Stefan Sundin "4pplet" <4pplet@protonmail.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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x4444
+#define PRODUCT_ID      0x0005
+#define DEVICE_VER      0x0002
+#define MANUFACTURER    4pplet
+#define PRODUCT         waffling60 Rev B
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 14
+// ROWS: Top to bottom, COLS: Left to right
+
+#define MATRIX_ROW_PINS {C2,D0,B0,D6,D5}
+#define MATRIX_COL_PINS {C4,C5,D2,C6,C7,B7,B6,B5,B4,B3,B2,B1,D1,D4}
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* define if matrix has ghost */
+//#define MATRIX_HAS_GHOST
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+#define QMK_ESC_OUTPUT C2 // usually COL
+#define QMK_ESC_INPUT C4 // usually ROW
+
+#define RGB_DI_PIN D3
+#define RGBLED_NUM 1
+#define BACKLIGHT_LEVELS 5
+
+#define RGBLIGHT_HUE_STEP 8
+#define RGBLIGHT_SAT_STEP 8
+#define RGBLIGHT_VAL_STEP 8
+#define RGBLIGHT_ANIMATIONS
diff --git a/qmk/keyboards/4pplet/waffling60/rev_b/readme.md b/qmk/keyboards/4pplet/waffling60/rev_b/readme.md
new file mode 100644
index 00000000..27ca8ca9
--- /dev/null
+++ b/qmk/keyboards/4pplet/waffling60/rev_b/readme.md
@@ -0,0 +1,14 @@
+# waffling60
+
+A 60% PCB for MX switches, one hot swap and one solder-pcb version with decent layout support.
+
+More info: https://geekhack.org/index.php?topic=103531.0
+
+* Keyboard Maintainer: [4pplet](https://github.com/4pplet)
+* Hardware Supported: [waffling60](https://github.com/4pplet/waffling60)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make 4pplet/waffling60/rev_b: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).
diff --git a/qmk/keyboards/4pplet/waffling60/rev_b/rev_b.c b/qmk/keyboards/4pplet/waffling60/rev_b/rev_b.c
new file mode 100644
index 00000000..5f701b57
--- /dev/null
+++ b/qmk/keyboards/4pplet/waffling60/rev_b/rev_b.c
@@ -0,0 +1,33 @@
+/*
+Copyright 2020 Stefan Sundin "4pplet" <4pplet@protonmail.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 "rev_b.h"
+
+bool led_update_kb(led_t led_state) {
+    bool res = led_update_user(led_state);
+    if(CAPS_LOCK_ENABLE){
+        if(res) {
+            if(led_state.caps_lock){
+                rgblight_enable();
+                rgblight_mode(1);
+                rgblight_sethsv_noeeprom(CAPS_LOCK_COLOR);
+            }
+            else
+                rgblight_disable_noeeprom();
+        }
+    }
+    return res;
+}
diff --git a/qmk/keyboards/4pplet/waffling60/rev_b/rev_b.h b/qmk/keyboards/4pplet/waffling60/rev_b/rev_b.h
new file mode 100644
index 00000000..e6dc7a15
--- /dev/null
+++ b/qmk/keyboards/4pplet/waffling60/rev_b/rev_b.h
@@ -0,0 +1,38 @@
+/*
+Copyright 2020 Stefan Sundin "4pplet" <4pplet@protonmail.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
+
+// defines to set RGB-led behaviour. Off by default
+#define CAPS_LOCK_ENABLE false
+#define CAPS_LOCK_COLOR HSV_ORANGE
+
+#include "quantum.h"
+
+#define LAYOUT_all( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k1d, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k2c, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
+    k40, k41, k42, k44, k46, k48, k4a, k4b, k4c, k4d  \
+) \
+{ \
+    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d}, \
+    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d}, \
+    {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d}, \
+    {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d}, \
+    {k40, k41, k42, KC_NO, k44, KC_NO, k46, KC_NO, k48, KC_NO, k4a, k4b, k4c, k4d}, \
+}
diff --git a/qmk/keyboards/4pplet/waffling60/rev_b/rules.mk b/qmk/keyboards/4pplet/waffling60/rev_b/rules.mk
new file mode 100644
index 00000000..69c524b7
--- /dev/null
+++ b/qmk/keyboards/4pplet/waffling60/rev_b/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u2
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # 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
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
diff --git a/qmk/keyboards/acekeyboard/titan60/config.h b/qmk/keyboards/acekeyboard/titan60/config.h
new file mode 100644
index 00000000..d34622b2
--- /dev/null
+++ b/qmk/keyboards/acekeyboard/titan60/config.h
@@ -0,0 +1,86 @@
+/*
+Copyright 2020 MechMerlin
+
+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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID    0xACE1 // Ace
+#define PRODUCT_ID   0x5449 // TI
+#define DEVICE_VER   0x0001
+#define MANUFACTURER Acekeyboard
+#define PRODUCT      titan60
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 14
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+ */
+
+
+//                         0   1   2   3   4   5   6   7   8   9   A   B   C   D
+#define MATRIX_ROW_PINS { B1, B2, B3, F0, F1 }
+#define MATRIX_COL_PINS { F4, F7, F5, F6, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3}
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+#define SOFT_SERIAL_PIN D0  // or D1, D2, D3, E6
+
+#define BACKLIGHT_PIN B7
+#define BACKLIGHT_LEVELS 3
+#define BACKLIGHT_BREATHING
+
+#define RGB_DI_PIN D2
+#ifdef RGB_DI_PIN
+#    define RGBLED_NUM 14
+#    define RGBLIGHT_HUE_STEP 8
+#    define RGBLIGHT_SAT_STEP 8
+#    define RGBLIGHT_VAL_STEP 8
+#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+#    define RGBLIGHT_ANIMATIONS
+#endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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 NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
diff --git a/qmk/keyboards/acekeyboard/titan60/info.json b/qmk/keyboards/acekeyboard/titan60/info.json
new file mode 100644
index 00000000..0839c7fb
--- /dev/null
+++ b/qmk/keyboards/acekeyboard/titan60/info.json
@@ -0,0 +1,32 @@
+{
+    "keyboard_name": "Titan60", 
+    "url": "", 
+    "maintainer": "qmk", 
+    "width": 15, 
+    "height": 5, 
+    "layouts": {
+        "LAYOUT_all_ansi_std": {
+            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":2.75}, {"x":6.5, "y":4, "w":1.25}, {"x":7.75, "y":4, "w":2.25}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}]
+        },
+
+        "LAYOUT_all_ansi_2u_lshift": {
+            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":2}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":2.75}, {"x":6.5, "y":4, "w":1.25}, {"x":7.75, "y":4, "w":2.25}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}]
+        },
+
+        "LAYOUT_60_ansi": {
+            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0, "w":2}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":2.75}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":12.5, "y":4, "w":1.25}, {"x":13.75, "y":4, "w":1.25}]
+        },
+
+        "LAYOUT_60_ansi_tsangan": {
+            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":0, "y":4, "w":1.5}, {"x":1.5, "y":4}, {"x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"x":11, "y":4, "w":1.5}, {"x":12.5, "y":4}, {"x":13.5, "y":4, "w":1.5}]
+        },
+
+        "LAYOUT_60_ansi_split_bs_rshift": {
+            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":12.5, "y":4, "w":1.25}, {"x":13.75, "y":4, "w":1.25}]
+        },
+
+        "LAYOUT_60_ansi_split_spacebar": {
+            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0, "w":2}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":2.75}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":2.75}, {"x":6.5, "y":4, "w":1.25}, {"x":7.75, "y":4, "w":2.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":12.5, "y":4, "w":1.25}, {"x":13.75, "y":4, "w":1.25}]
+        }
+    }
+}
diff --git a/qmk/keyboards/acekeyboard/titan60/keymaps/default/keymap.c b/qmk/keyboards/acekeyboard/titan60/keymaps/default/keymap.c
new file mode 100644
index 00000000..be3ed10b
--- /dev/null
+++ b/qmk/keyboards/acekeyboard/titan60/keymaps/default/keymap.c
@@ -0,0 +1,48 @@
+/*
+Copyright 2020 MechMerlin
+
+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] = {
+    /*
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+     * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
+     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │  \  │
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+     * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │  Enter │
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
+     * │ Shift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │    Shift │
+     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
+     * │Ctrl│GUI │Alt │                        │ Alt│ GUI│Menu│Ctrl│
+     * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+     */
+    [0] = LAYOUT_60_ansi(
+        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_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_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_B,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             MO(1), KC_RALT, KC_RGUI,  KC_RCTL
+    ),
+
+    [1] = LAYOUT_60_ansi(
+        KC_TRNS,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,    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
+    ),
+};
\ No newline at end of file
diff --git a/qmk/keyboards/acekeyboard/titan60/keymaps/via/keymap.c b/qmk/keyboards/acekeyboard/titan60/keymaps/via/keymap.c
new file mode 100644
index 00000000..c78d8f0b
--- /dev/null
+++ b/qmk/keyboards/acekeyboard/titan60/keymaps/via/keymap.c
@@ -0,0 +1,64 @@
+/*
+Copyright 2020 MechMerlin
+
+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] = {
+    /*
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+     * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
+     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │  \  │
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+     * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │  Enter │
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
+     * │ Shift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │    Shift │
+     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
+     * │Ctrl│GUI │Alt │                        │ Alt│ GUI│Menu│Ctrl│
+     * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+     */
+    [0] = LAYOUT_60_ansi(
+        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_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_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_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             MO(1), KC_RALT, KC_RGUI,  KC_RCTL
+    ),
+
+    [1] = LAYOUT_60_ansi(
+        KC_TRNS,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,    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
+    ),
+
+    [2] = LAYOUT_60_ansi(
+        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, KC_TRNS,  KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                             KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS
+    ),
+
+    [3] = LAYOUT_60_ansi(
+        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, KC_TRNS,  KC_TRNS,          KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                             KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS
+    )
+};
\ No newline at end of file
diff --git a/qmk/keyboards/acekeyboard/titan60/keymaps/via/rules.mk b/qmk/keyboards/acekeyboard/titan60/keymaps/via/rules.mk
new file mode 100644
index 00000000..5f615ff6
--- /dev/null
+++ b/qmk/keyboards/acekeyboard/titan60/keymaps/via/rules.mk
@@ -0,0 +1,3 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
+
diff --git a/qmk/keyboards/acekeyboard/titan60/readme.md b/qmk/keyboards/acekeyboard/titan60/readme.md
new file mode 100644
index 00000000..f977b4b8
--- /dev/null
+++ b/qmk/keyboards/acekeyboard/titan60/readme.md
@@ -0,0 +1,17 @@
+# titan60
+
+60% custom keyboard originally meant for the Saturn 60
+
+* Keyboard Maintainer: [MechMerlin](https://github.com/mechmerlin)
+* Hardware Supported: Titan 60 PCB
+* Hardware Availability: [Acekeyboard](https://acekeyboard.co/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make acekeyboard/titan60:default
+
+Flashing example for this keyboard:
+
+    make acekeyboard/titan60:default:flash
+
+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).
diff --git a/qmk/keyboards/acekeyboard/titan60/rules.mk b/qmk/keyboards/acekeyboard/titan60/rules.mk
new file mode 100644
index 00000000..92f7aba5
--- /dev/null
+++ b/qmk/keyboards/acekeyboard/titan60/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+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
+# 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 = yes       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
diff --git a/qmk/keyboards/acekeyboard/titan60/titan60.c b/qmk/keyboards/acekeyboard/titan60/titan60.c
new file mode 100644
index 00000000..64479f31
--- /dev/null
+++ b/qmk/keyboards/acekeyboard/titan60/titan60.c
@@ -0,0 +1,18 @@
+/*
+Copyright 2020 MechMerlin
+
+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 "titan60.h"
diff --git a/qmk/keyboards/acekeyboard/titan60/titan60.h b/qmk/keyboards/acekeyboard/titan60/titan60.h
new file mode 100644
index 00000000..219a28a8
--- /dev/null
+++ b/qmk/keyboards/acekeyboard/titan60/titan60.h
@@ -0,0 +1,109 @@
+/*
+Copyright 2020 MechMerlin
+
+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 ___ KC_NO
+
+
+#define LAYOUT_all_ansi_std( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k2c,  \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,       \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d,            \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k43,       \
+    k40, k41, k42, k44, k46, k48, k4a, k4d, k4b, k4c, k49                       \
+){ \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d },  \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d },  \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d },  \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, ___, ___ },  \
+    { k40, k41, k42, k43, k44, ___, k46, ___, k48, k49, k4a, k4b, k4c, k4d }   \
+}
+
+#define LAYOUT_all_ansi_2u_lshift( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k2c,  \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,       \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d,            \
+    k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k47, k3c, k43,       \
+    k40, k41, k42, k44, k46, k48, k4a, k4d, k4b, k4c, k49                       \
+){ \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d },  \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d },  \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d },  \
+    { k30, ___, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, ___, ___ },  \
+    { k40, k41, k42, k43, k44, ___, k46, k47, k48, k49, k4a, k4b, k4c, k4d }   \
+}
+
+#define LAYOUT_60_ansi( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d,  \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,  \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d,       \
+    k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c,            \
+    k40, k41, k42, k46, k4a, k4b, k4c, k4d                                 \
+){ \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d },  \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d },  \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, ___, k2d },  \
+    { k30, ___, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, ___, ___ },  \
+    { k40, k41, k42, ___, ___, ___, k46, ___, ___, ___, k4a, k4b, k4c, k4d }   \
+}
+
+#define LAYOUT_60_ansi_tsangan( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k2c,  \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,       \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d,            \
+    k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k43,            \
+    k40, k41, k42, k46, k4b, k4c, k4d                                           \
+){ \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d },  \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d },  \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d },  \
+    { k30, ___, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, ___, ___ },  \
+    { k40, k41, k42, k43, ___, ___, k46, ___, ___, ___, ___, k4b, k4c, k4d }   \
+}
+
+#define LAYOUT_60_ansi_split_bs_rshift( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k2c, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,      \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d,           \
+    k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k43,           \
+    k40, k41, k42, k46, k4a, k4b, k4c, k4d                                     \
+){ \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d },  \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d },  \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d },  \
+    { k30, ___, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, ___, ___ },  \
+    { k40, k41, k42, k43, ___, ___, k46, ___, ___, ___, k4a, k4b, k4c, k4d }   \
+}
+
+#define LAYOUT_60_ansi_split_spacebar( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d,  \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,  \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d,       \
+    k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c,            \
+    k40, k41, k42, k44, k46, k48, k4a, k4b, k4c, k4d                       \
+){ \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d },  \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d },  \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, ___, k2d },  \
+    { k30, ___, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, ___, ___ },  \
+    { k40, k41, k42, ___, k44, ___, k46, ___, k48, ___, k4a, k4b, k4c, k4d }   \
+}
+
+
diff --git a/qmk/keyboards/acheron/lasgweloth/chconf.h b/qmk/keyboards/acheron/lasgweloth/chconf.h
new file mode 100644
index 00000000..4640ff53
--- /dev/null
+++ b/qmk/keyboards/acheron/lasgweloth/chconf.h
@@ -0,0 +1,714 @@
+/*
+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+/**
+ * @file    rt/templates/chconf.h
+ * @brief   Configuration file template.
+ * @details A copy of this file must be placed in each project directory, it
+ *          contains the application specific kernel settings.
+ *
+ * @addtogroup config
+ * @details Kernel related settings and hooks.
+ * @{
+ */
+
+#ifndef CHCONF_H
+#define CHCONF_H
+
+#define _CHIBIOS_RT_CONF_
+#define _CHIBIOS_RT_CONF_VER_6_0_
+
+/*===========================================================================*/
+/**
+ * @name System timers settings
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   System time counter resolution.
+ * @note    Allowed values are 16 or 32 bits.
+ */
+#if !defined(CH_CFG_ST_RESOLUTION)
+#define CH_CFG_ST_RESOLUTION                32
+#endif
+
+/**
+ * @brief   System tick frequency.
+ * @details Frequency of the system timer that drives the system ticks. This
+ *          setting also defines the system tick time unit.
+ */
+#if !defined(CH_CFG_ST_FREQUENCY)
+#define CH_CFG_ST_FREQUENCY                 10000
+#endif
+
+/**
+ * @brief   Time intervals data size.
+ * @note    Allowed values are 16, 32 or 64 bits.
+ */
+#if !defined(CH_CFG_INTERVALS_SIZE)
+#define CH_CFG_INTERVALS_SIZE               32
+#endif
+
+/**
+ * @brief   Time types data size.
+ * @note    Allowed values are 16 or 32 bits.
+ */
+#if !defined(CH_CFG_TIME_TYPES_SIZE)
+#define CH_CFG_TIME_TYPES_SIZE              32
+#endif
+
+/**
+ * @brief   Time delta constant for the tick-less mode.
+ * @note    If this value is zero then the system uses the classic
+ *          periodic tick. This value represents the minimum number
+ *          of ticks that is safe to specify in a timeout directive.
+ *          The value one is not valid, timeouts are rounded up to
+ *          this value.
+ */
+#if !defined(CH_CFG_ST_TIMEDELTA)
+#define CH_CFG_ST_TIMEDELTA                 2
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Kernel parameters and options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   Round robin interval.
+ * @details This constant is the number of system ticks allowed for the
+ *          threads before preemption occurs. Setting this value to zero
+ *          disables the preemption for threads with equal priority and the
+ *          round robin becomes cooperative. Note that higher priority
+ *          threads can still preempt, the kernel is always preemptive.
+ * @note    Disabling the round robin preemption makes the kernel more compact
+ *          and generally faster.
+ * @note    The round robin preemption is not supported in tickless mode and
+ *          must be set to zero in that case.
+ */
+#if !defined(CH_CFG_TIME_QUANTUM)
+#define CH_CFG_TIME_QUANTUM                 0
+#endif
+
+/**
+ * @brief   Managed RAM size.
+ * @details Size of the RAM area to be managed by the OS. If set to zero
+ *          then the whole available RAM is used. The core memory is made
+ *          available to the heap allocator and/or can be used directly through
+ *          the simplified core memory allocator.
+ *
+ * @note    In order to let the OS manage the whole RAM the linker script must
+ *          provide the @p __heap_base__ and @p __heap_end__ symbols.
+ * @note    Requires @p CH_CFG_USE_MEMCORE.
+ */
+#if !defined(CH_CFG_MEMCORE_SIZE)
+#define CH_CFG_MEMCORE_SIZE                 0
+#endif
+
+/**
+ * @brief   Idle thread automatic spawn suppression.
+ * @details When this option is activated the function @p chSysInit()
+ *          does not spawn the idle thread. The application @p main()
+ *          function becomes the idle thread and must implement an
+ *          infinite loop.
+ */
+#if !defined(CH_CFG_NO_IDLE_THREAD)
+#define CH_CFG_NO_IDLE_THREAD               FALSE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Performance options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   OS optimization.
+ * @details If enabled then time efficient rather than space efficient code
+ *          is used when two possible implementations exist.
+ *
+ * @note    This is not related to the compiler optimization options.
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_OPTIMIZE_SPEED)
+#define CH_CFG_OPTIMIZE_SPEED               FALSE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Subsystem options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   Time Measurement APIs.
+ * @details If enabled then the time measurement APIs are included in
+ *          the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_TM)
+#define CH_CFG_USE_TM                       FALSE
+#endif
+
+/**
+ * @brief   Threads registry APIs.
+ * @details If enabled then the registry APIs are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_REGISTRY)
+#define CH_CFG_USE_REGISTRY                 TRUE
+#endif
+
+/**
+ * @brief   Threads synchronization APIs.
+ * @details If enabled then the @p chThdWait() function is included in
+ *          the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_WAITEXIT)
+#define CH_CFG_USE_WAITEXIT                 TRUE
+#endif
+
+/**
+ * @brief   Semaphores APIs.
+ * @details If enabled then the Semaphores APIs are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_SEMAPHORES)
+#define CH_CFG_USE_SEMAPHORES               TRUE
+#endif
+
+/**
+ * @brief   Semaphores queuing mode.
+ * @details If enabled then the threads are enqueued on semaphores by
+ *          priority rather than in FIFO order.
+ *
+ * @note    The default is @p FALSE. Enable this if you have special
+ *          requirements.
+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.
+ */
+#if !defined(CH_CFG_USE_SEMAPHORES_PRIORITY)
+#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE
+#endif
+
+/**
+ * @brief   Mutexes APIs.
+ * @details If enabled then the mutexes APIs are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_MUTEXES)
+#define CH_CFG_USE_MUTEXES                  TRUE
+#endif
+
+/**
+ * @brief   Enables recursive behavior on mutexes.
+ * @note    Recursive mutexes are heavier and have an increased
+ *          memory footprint.
+ *
+ * @note    The default is @p FALSE.
+ * @note    Requires @p CH_CFG_USE_MUTEXES.
+ */
+#if !defined(CH_CFG_USE_MUTEXES_RECURSIVE)
+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE
+#endif
+
+/**
+ * @brief   Conditional Variables APIs.
+ * @details If enabled then the conditional variables APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_MUTEXES.
+ */
+#if !defined(CH_CFG_USE_CONDVARS)
+#define CH_CFG_USE_CONDVARS                 TRUE
+#endif
+
+/**
+ * @brief   Conditional Variables APIs with timeout.
+ * @details If enabled then the conditional variables APIs with timeout
+ *          specification are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_CONDVARS.
+ */
+#if !defined(CH_CFG_USE_CONDVARS_TIMEOUT)
+#define CH_CFG_USE_CONDVARS_TIMEOUT         FALSE
+#endif
+
+/**
+ * @brief   Events Flags APIs.
+ * @details If enabled then the event flags APIs are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_EVENTS)
+#define CH_CFG_USE_EVENTS                   TRUE
+#endif
+
+/**
+ * @brief   Events Flags APIs with timeout.
+ * @details If enabled then the events APIs with timeout specification
+ *          are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_EVENTS.
+ */
+#if !defined(CH_CFG_USE_EVENTS_TIMEOUT)
+#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE
+#endif
+
+/**
+ * @brief   Synchronous Messages APIs.
+ * @details If enabled then the synchronous messages APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_MESSAGES)
+#define CH_CFG_USE_MESSAGES                 TRUE
+#endif
+
+/**
+ * @brief   Synchronous Messages queuing mode.
+ * @details If enabled then messages are served by priority rather than in
+ *          FIFO order.
+ *
+ * @note    The default is @p FALSE. Enable this if you have special
+ *          requirements.
+ * @note    Requires @p CH_CFG_USE_MESSAGES.
+ */
+#if !defined(CH_CFG_USE_MESSAGES_PRIORITY)
+#define CH_CFG_USE_MESSAGES_PRIORITY        FALSE
+#endif
+
+/**
+ * @brief   Mailboxes APIs.
+ * @details If enabled then the asynchronous messages (mailboxes) APIs are
+ *          included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.
+ */
+#if !defined(CH_CFG_USE_MAILBOXES)
+#define CH_CFG_USE_MAILBOXES                TRUE
+#endif
+
+/**
+ * @brief   Core Memory Manager APIs.
+ * @details If enabled then the core memory manager APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_MEMCORE)
+#define CH_CFG_USE_MEMCORE                  FALSE
+#endif
+
+/**
+ * @brief   Heap Allocator APIs.
+ * @details If enabled then the memory heap allocator APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_MEMCORE and either @p CH_CFG_USE_MUTEXES or
+ *          @p CH_CFG_USE_SEMAPHORES.
+ * @note    Mutexes are recommended.
+ */
+#if !defined(CH_CFG_USE_HEAP)
+#define CH_CFG_USE_HEAP                     FALSE
+#endif
+
+/**
+ * @brief   Memory Pools Allocator APIs.
+ * @details If enabled then the memory pools allocator APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_MEMPOOLS)
+#define CH_CFG_USE_MEMPOOLS                 FALSE
+#endif
+
+/**
+ * @brief   Objects FIFOs APIs.
+ * @details If enabled then the objects FIFOs APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_OBJ_FIFOS)
+#define CH_CFG_USE_OBJ_FIFOS                FALSE
+#endif
+
+/**
+ * @brief   Pipes APIs.
+ * @details If enabled then the pipes APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_PIPES)
+#define CH_CFG_USE_PIPES                    FALSE
+#endif
+
+/**
+ * @brief   Dynamic Threads APIs.
+ * @details If enabled then the dynamic threads creation APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_WAITEXIT.
+ * @note    Requires @p CH_CFG_USE_HEAP and/or @p CH_CFG_USE_MEMPOOLS.
+ */
+#if !defined(CH_CFG_USE_DYNAMIC)
+#define CH_CFG_USE_DYNAMIC                  FALSE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Objects factory options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   Objects Factory APIs.
+ * @details If enabled then the objects factory APIs are included in the
+ *          kernel.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_CFG_USE_FACTORY)
+#define CH_CFG_USE_FACTORY                  FALSE
+#endif
+
+/**
+ * @brief   Maximum length for object names.
+ * @details If the specified length is zero then the name is stored by
+ *          pointer but this could have unintended side effects.
+ */
+#if !defined(CH_CFG_FACTORY_MAX_NAMES_LENGTH)
+#define CH_CFG_FACTORY_MAX_NAMES_LENGTH     8
+#endif
+
+/**
+ * @brief   Enables the registry of generic objects.
+ */
+#if !defined(CH_CFG_FACTORY_OBJECTS_REGISTRY)
+#define CH_CFG_FACTORY_OBJECTS_REGISTRY     FALSE
+#endif
+
+/**
+ * @brief   Enables factory for generic buffers.
+ */
+#if !defined(CH_CFG_FACTORY_GENERIC_BUFFERS)
+#define CH_CFG_FACTORY_GENERIC_BUFFERS      FALSE
+#endif
+
+/**
+ * @brief   Enables factory for semaphores.
+ */
+#if !defined(CH_CFG_FACTORY_SEMAPHORES)
+#define CH_CFG_FACTORY_SEMAPHORES           FALSE
+#endif
+
+/**
+ * @brief   Enables factory for mailboxes.
+ */
+#if !defined(CH_CFG_FACTORY_MAILBOXES)
+#define CH_CFG_FACTORY_MAILBOXES            FALSE
+#endif
+
+/**
+ * @brief   Enables factory for objects FIFOs.
+ */
+#if !defined(CH_CFG_FACTORY_OBJ_FIFOS)
+#define CH_CFG_FACTORY_OBJ_FIFOS            FALSE
+#endif
+
+/**
+ * @brief   Enables factory for Pipes.
+ */
+#if !defined(CH_CFG_FACTORY_PIPES) || defined(__DOXYGEN__)
+#define CH_CFG_FACTORY_PIPES                FALSE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Debug options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   Debug option, kernel statistics.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_STATISTICS)
+#define CH_DBG_STATISTICS                   FALSE
+#endif
+
+/**
+ * @brief   Debug option, system state check.
+ * @details If enabled the correct call protocol for system APIs is checked
+ *          at runtime.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_SYSTEM_STATE_CHECK)
+#define CH_DBG_SYSTEM_STATE_CHECK           FALSE
+#endif
+
+/**
+ * @brief   Debug option, parameters checks.
+ * @details If enabled then the checks on the API functions input
+ *          parameters are activated.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_ENABLE_CHECKS)
+#define CH_DBG_ENABLE_CHECKS                FALSE
+#endif
+
+/**
+ * @brief   Debug option, consistency checks.
+ * @details If enabled then all the assertions in the kernel code are
+ *          activated. This includes consistency checks inside the kernel,
+ *          runtime anomalies and port-defined checks.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_ENABLE_ASSERTS)
+#define CH_DBG_ENABLE_ASSERTS               FALSE
+#endif
+
+/**
+ * @brief   Debug option, trace buffer.
+ * @details If enabled then the trace buffer is activated.
+ *
+ * @note    The default is @p CH_DBG_TRACE_MASK_DISABLED.
+ */
+#if !defined(CH_DBG_TRACE_MASK)
+#define CH_DBG_TRACE_MASK                   CH_DBG_TRACE_MASK_DISABLED
+#endif
+
+/**
+ * @brief   Trace buffer entries.
+ * @note    The trace buffer is only allocated if @p CH_DBG_TRACE_MASK is
+ *          different from @p CH_DBG_TRACE_MASK_DISABLED.
+ */
+#if !defined(CH_DBG_TRACE_BUFFER_SIZE)
+#define CH_DBG_TRACE_BUFFER_SIZE            128
+#endif
+
+/**
+ * @brief   Debug option, stack checks.
+ * @details If enabled then a runtime stack check is performed.
+ *
+ * @note    The default is @p FALSE.
+ * @note    The stack check is performed in a architecture/port dependent way.
+ *          It may not be implemented or some ports.
+ * @note    The default failure mode is to halt the system with the global
+ *          @p panic_msg variable set to @p NULL.
+ */
+#if !defined(CH_DBG_ENABLE_STACK_CHECK)
+#define CH_DBG_ENABLE_STACK_CHECK           FALSE
+#endif
+
+/**
+ * @brief   Debug option, stacks initialization.
+ * @details If enabled then the threads working area is filled with a byte
+ *          value when a thread is created. This can be useful for the
+ *          runtime measurement of the used stack.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_FILL_THREADS)
+#define CH_DBG_FILL_THREADS                 FALSE
+#endif
+
+/**
+ * @brief   Debug option, threads profiling.
+ * @details If enabled then a field is added to the @p thread_t structure that
+ *          counts the system ticks occurred while executing the thread.
+ *
+ * @note    The default is @p FALSE.
+ * @note    This debug option is not currently compatible with the
+ *          tickless mode.
+ */
+#if !defined(CH_DBG_THREADS_PROFILING)
+#define CH_DBG_THREADS_PROFILING            FALSE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Kernel hooks
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   System structure extension.
+ * @details User fields added to the end of the @p ch_system_t structure.
+ */
+#define CH_CFG_SYSTEM_EXTRA_FIELDS                                          \
+  /* Add threads custom fields here.*/
+
+/**
+ * @brief   System initialization hook.
+ * @details User initialization code added to the @p chSysInit() function
+ *          just before interrupts are enabled globally.
+ */
+#define CH_CFG_SYSTEM_INIT_HOOK() {                                         \
+  /* Add threads initialization code here.*/                                \
+}
+
+/**
+ * @brief   Threads descriptor structure extension.
+ * @details User fields added to the end of the @p thread_t structure.
+ */
+#define CH_CFG_THREAD_EXTRA_FIELDS                                          \
+  /* Add threads custom fields here.*/
+
+/**
+ * @brief   Threads initialization hook.
+ * @details User initialization code added to the @p _thread_init() function.
+ *
+ * @note    It is invoked from within @p _thread_init() and implicitly from all
+ *          the threads creation APIs.
+ */
+#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \
+  /* Add threads initialization code here.*/                                \
+}
+
+/**
+ * @brief   Threads finalization hook.
+ * @details User finalization code added to the @p chThdExit() API.
+ */
+#define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \
+  /* Add threads finalization code here.*/                                  \
+}
+
+/**
+ * @brief   Context switch hook.
+ * @details This hook is invoked just before switching between threads.
+ */
+#define CH_CFG_CONTEXT_SWITCH_HOOK(ntp, otp) {                              \
+  /* Context switch code here.*/                                            \
+}
+
+/**
+ * @brief   ISR enter hook.
+ */
+#define CH_CFG_IRQ_PROLOGUE_HOOK() {                                        \
+  /* IRQ prologue code here.*/                                              \
+}
+
+/**
+ * @brief   ISR exit hook.
+ */
+#define CH_CFG_IRQ_EPILOGUE_HOOK() {                                        \
+  /* IRQ epilogue code here.*/                                              \
+}
+
+/**
+ * @brief   Idle thread enter hook.
+ * @note    This hook is invoked within a critical zone, no OS functions
+ *          should be invoked from here.
+ * @note    This macro can be used to activate a power saving mode.
+ */
+#define CH_CFG_IDLE_ENTER_HOOK() {                                          \
+  /* Idle-enter code here.*/                                                \
+}
+
+/**
+ * @brief   Idle thread leave hook.
+ * @note    This hook is invoked within a critical zone, no OS functions
+ *          should be invoked from here.
+ * @note    This macro can be used to deactivate a power saving mode.
+ */
+#define CH_CFG_IDLE_LEAVE_HOOK() {                                          \
+  /* Idle-leave code here.*/                                                \
+}
+
+/**
+ * @brief   Idle Loop hook.
+ * @details This hook is continuously invoked by the idle thread loop.
+ */
+#define CH_CFG_IDLE_LOOP_HOOK() {                                           \
+  /* Idle loop code here.*/                                                 \
+}
+
+/**
+ * @brief   System tick event hook.
+ * @details This hook is invoked in the system tick handler immediately
+ *          after processing the virtual timers queue.
+ */
+#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \
+  /* System tick event code here.*/                                         \
+}
+
+/**
+ * @brief   System halt hook.
+ * @details This hook is invoked in case to a system halting error before
+ *          the system is halted.
+ */
+#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \
+  /* System halt code here.*/                                               \
+}
+
+/**
+ * @brief   Trace hook.
+ * @details This hook is invoked each time a new record is written in the
+ *          trace buffer.
+ */
+#define CH_CFG_TRACE_HOOK(tep) {                                            \
+  /* Trace code here.*/                                                     \
+}
+
+/** @} */
+
+/*===========================================================================*/
+/* Port-specific settings (override port settings defaulted in chcore.h).    */
+/*===========================================================================*/
+
+#endif  /* CHCONF_H */
+
+/** @} */
diff --git a/qmk/keyboards/acheron/lasgweloth/config.h b/qmk/keyboards/acheron/lasgweloth/config.h
new file mode 100644
index 00000000..e131787f
--- /dev/null
+++ b/qmk/keyboards/acheron/lasgweloth/config.h
@@ -0,0 +1,70 @@
+/*
+Copyright 2015 Álvaro "Gondolindrim" Volpato  <gondolindrim@acheronproject.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
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x4150 // AP for AcheronProject
+#define PRODUCT_ID      0x7641 // LA for Lasgweloth
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    AcheronProect
+#define PRODUCT         Lasgweloth
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 14
+
+#define MATRIX_COL_PINS { B12, A2 , A1 , A0 , F1 , F0 , C15, C14, C13, A7 , A6 , A5 , A4 , B7}
+#define MATRIX_ROW_PINS { B9 , B8 , A3 , B0 , B1 }
+#define DIODE_DIRECTION COL2ROW
+
+//#define BACKLIGHT_PIN           A6
+//#define BACKLIGHT_PWM_DRIVER    PWMD3
+//#define BACKLIGHT_PWM_CHANNEL   1
+//#define BACKLIGHT_PAL_MODE      1
+//#define BACKLIGHT_LEVELS 6
+//#define BACKLIGHT_BREATHING
+//#define BREATHING_PERIOD 6
+
+/* define if matrix has ghost */
+//#define MATRIX_HAS_GHOST
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE    5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+//#define NO_ACTION_MACRO
+//#define NO_ACTION_FUNCTION
diff --git a/qmk/keyboards/acheron/lasgweloth/halconf.h b/qmk/keyboards/acheron/lasgweloth/halconf.h
new file mode 100644
index 00000000..16f32117
--- /dev/null
+++ b/qmk/keyboards/acheron/lasgweloth/halconf.h
@@ -0,0 +1,525 @@
+/*
+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+/**
+ * @file    templates/halconf.h
+ * @brief   HAL configuration header.
+ * @details HAL configuration file, this file allows to enable or disable the
+ *          various device drivers from your application. You may also use
+ *          this file in order to override the device drivers default settings.
+ *
+ * @addtogroup HAL_CONF
+ * @{
+ */
+
+#ifndef HALCONF_H
+#define HALCONF_H
+
+#define _CHIBIOS_HAL_CONF_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
+
+#include "mcuconf.h"
+
+/**
+ * @brief   Enables the PAL subsystem.
+ */
+#if !defined(HAL_USE_PAL) || defined(__DOXYGEN__)
+#define HAL_USE_PAL                         TRUE
+#endif
+
+/**
+ * @brief   Enables the ADC subsystem.
+ */
+#if !defined(HAL_USE_ADC) || defined(__DOXYGEN__)
+#define HAL_USE_ADC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the CAN subsystem.
+ */
+#if !defined(HAL_USE_CAN) || defined(__DOXYGEN__)
+#define HAL_USE_CAN                         FALSE
+#endif
+
+/**
+ * @brief   Enables the cryptographic subsystem.
+ */
+#if !defined(HAL_USE_CRY) || defined(__DOXYGEN__)
+#define HAL_USE_CRY                         FALSE
+#endif
+
+/**
+ * @brief   Enables the DAC subsystem.
+ */
+#if !defined(HAL_USE_DAC) || defined(__DOXYGEN__)
+#define HAL_USE_DAC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the GPT subsystem.
+ */
+#if !defined(HAL_USE_GPT) || defined(__DOXYGEN__)
+#define HAL_USE_GPT                         FALSE
+#endif
+
+/**
+ * @brief   Enables the I2C subsystem.
+ */
+#if !defined(HAL_USE_I2C) || defined(__DOXYGEN__)
+#define HAL_USE_I2C                         FALSE
+#endif
+
+/**
+ * @brief   Enables the I2S subsystem.
+ */
+#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)
+#define HAL_USE_I2S                         FALSE
+#endif
+
+/**
+ * @brief   Enables the ICU subsystem.
+ */
+#if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)
+#define HAL_USE_ICU                         FALSE
+#endif
+
+/**
+ * @brief   Enables the MAC subsystem.
+ */
+#if !defined(HAL_USE_MAC) || defined(__DOXYGEN__)
+#define HAL_USE_MAC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the MMC_SPI subsystem.
+ */
+#if !defined(HAL_USE_MMC_SPI) || defined(__DOXYGEN__)
+#define HAL_USE_MMC_SPI                     FALSE
+#endif
+
+/**
+ * @brief   Enables the PWM subsystem.
+ */
+#if !defined(HAL_USE_PWM) || defined(__DOXYGEN__)
+#define HAL_USE_PWM                         FALSE
+#endif
+
+/**
+ * @brief   Enables the RTC subsystem.
+ */
+#if !defined(HAL_USE_RTC) || defined(__DOXYGEN__)
+#define HAL_USE_RTC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the SDC subsystem.
+ */
+#if !defined(HAL_USE_SDC) || defined(__DOXYGEN__)
+#define HAL_USE_SDC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the SERIAL subsystem.
+ */
+#if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__)
+#define HAL_USE_SERIAL                      FALSE
+#endif
+
+/**
+ * @brief   Enables the SERIAL over USB subsystem.
+ */
+#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)
+#define HAL_USE_SERIAL_USB                  FALSE
+#endif
+
+/**
+ * @brief   Enables the SIO subsystem.
+ */
+#if !defined(HAL_USE_SIO) || defined(__DOXYGEN__)
+#define HAL_USE_SIO                         FALSE
+#endif
+
+/**
+ * @brief   Enables the SPI subsystem.
+ */
+#if !defined(HAL_USE_SPI) || defined(__DOXYGEN__)
+#define HAL_USE_SPI                         FALSE
+#endif
+
+/**
+ * @brief   Enables the TRNG subsystem.
+ */
+#if !defined(HAL_USE_TRNG) || defined(__DOXYGEN__)
+#define HAL_USE_TRNG                        FALSE
+#endif
+
+/**
+ * @brief   Enables the UART subsystem.
+ */
+#if !defined(HAL_USE_UART) || defined(__DOXYGEN__)
+#define HAL_USE_UART                        FALSE
+#endif
+
+/**
+ * @brief   Enables the USB subsystem.
+ */
+#if !defined(HAL_USE_USB) || defined(__DOXYGEN__)
+#define HAL_USE_USB                         TRUE
+#endif
+
+/**
+ * @brief   Enables the WDG subsystem.
+ */
+#if !defined(HAL_USE_WDG) || defined(__DOXYGEN__)
+#define HAL_USE_WDG                         FALSE
+#endif
+
+/**
+ * @brief   Enables the WSPI subsystem.
+ */
+#if !defined(HAL_USE_WSPI) || defined(__DOXYGEN__)
+#define HAL_USE_WSPI                        FALSE
+#endif
+
+/*===========================================================================*/
+/* PAL driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(PAL_USE_CALLBACKS) || defined(__DOXYGEN__)
+#define PAL_USE_CALLBACKS                   FALSE
+#endif
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(PAL_USE_WAIT) || defined(__DOXYGEN__)
+#define PAL_USE_WAIT                        FALSE
+#endif
+
+/*===========================================================================*/
+/* ADC driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(ADC_USE_WAIT) || defined(__DOXYGEN__)
+#define ADC_USE_WAIT                        TRUE
+#endif
+
+/**
+ * @brief   Enables the @p adcAcquireBus() and @p adcReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(ADC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define ADC_USE_MUTUAL_EXCLUSION            TRUE
+#endif
+
+/*===========================================================================*/
+/* CAN driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Sleep mode related APIs inclusion switch.
+ */
+#if !defined(CAN_USE_SLEEP_MODE) || defined(__DOXYGEN__)
+#define CAN_USE_SLEEP_MODE                  TRUE
+#endif
+
+/**
+ * @brief   Enforces the driver to use direct callbacks rather than OSAL events.
+ */
+#if !defined(CAN_ENFORCE_USE_CALLBACKS) || defined(__DOXYGEN__)
+#define CAN_ENFORCE_USE_CALLBACKS           FALSE
+#endif
+
+/*===========================================================================*/
+/* CRY driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables the SW fall-back of the cryptographic driver.
+ * @details When enabled, this option, activates a fall-back software
+ *          implementation for algorithms not supported by the underlying
+ *          hardware.
+ * @note    Fall-back implementations may not be present for all algorithms.
+ */
+#if !defined(HAL_CRY_USE_FALLBACK) || defined(__DOXYGEN__)
+#define HAL_CRY_USE_FALLBACK                FALSE
+#endif
+
+/**
+ * @brief   Makes the driver forcibly use the fall-back implementations.
+ */
+#if !defined(HAL_CRY_ENFORCE_FALLBACK) || defined(__DOXYGEN__)
+#define HAL_CRY_ENFORCE_FALLBACK            FALSE
+#endif
+
+/*===========================================================================*/
+/* DAC driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(DAC_USE_WAIT) || defined(__DOXYGEN__)
+#define DAC_USE_WAIT                        TRUE
+#endif
+
+/**
+ * @brief   Enables the @p dacAcquireBus() and @p dacReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(DAC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define DAC_USE_MUTUAL_EXCLUSION            TRUE
+#endif
+
+/*===========================================================================*/
+/* I2C driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables the mutual exclusion APIs on the I2C bus.
+ */
+#if !defined(I2C_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define I2C_USE_MUTUAL_EXCLUSION            TRUE
+#endif
+
+/*===========================================================================*/
+/* MAC driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables the zero-copy API.
+ */
+#if !defined(MAC_USE_ZERO_COPY) || defined(__DOXYGEN__)
+#define MAC_USE_ZERO_COPY                   FALSE
+#endif
+
+/**
+ * @brief   Enables an event sources for incoming packets.
+ */
+#if !defined(MAC_USE_EVENTS) || defined(__DOXYGEN__)
+#define MAC_USE_EVENTS                      TRUE
+#endif
+
+/*===========================================================================*/
+/* MMC_SPI driver related settings.                                          */
+/*===========================================================================*/
+
+/**
+ * @brief   Delays insertions.
+ * @details If enabled this options inserts delays into the MMC waiting
+ *          routines releasing some extra CPU time for the threads with
+ *          lower priority, this may slow down the driver a bit however.
+ *          This option is recommended also if the SPI driver does not
+ *          use a DMA channel and heavily loads the CPU.
+ */
+#if !defined(MMC_NICE_WAITING) || defined(__DOXYGEN__)
+#define MMC_NICE_WAITING                    TRUE
+#endif
+
+/*===========================================================================*/
+/* SDC driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Number of initialization attempts before rejecting the card.
+ * @note    Attempts are performed at 10mS intervals.
+ */
+#if !defined(SDC_INIT_RETRY) || defined(__DOXYGEN__)
+#define SDC_INIT_RETRY                      100
+#endif
+
+/**
+ * @brief   Include support for MMC cards.
+ * @note    MMC support is not yet implemented so this option must be kept
+ *          at @p FALSE.
+ */
+#if !defined(SDC_MMC_SUPPORT) || defined(__DOXYGEN__)
+#define SDC_MMC_SUPPORT                     FALSE
+#endif
+
+/**
+ * @brief   Delays insertions.
+ * @details If enabled this options inserts delays into the MMC waiting
+ *          routines releasing some extra CPU time for the threads with
+ *          lower priority, this may slow down the driver a bit however.
+ */
+#if !defined(SDC_NICE_WAITING) || defined(__DOXYGEN__)
+#define SDC_NICE_WAITING                    TRUE
+#endif
+
+/**
+ * @brief   OCR initialization constant for V20 cards.
+ */
+#if !defined(SDC_INIT_OCR_V20) || defined(__DOXYGEN__)
+#define SDC_INIT_OCR_V20                    0x50FF8000U
+#endif
+
+/**
+ * @brief   OCR initialization constant for non-V20 cards.
+ */
+#if !defined(SDC_INIT_OCR) || defined(__DOXYGEN__)
+#define SDC_INIT_OCR                        0x80100000U
+#endif
+
+/*===========================================================================*/
+/* SERIAL driver related settings.                                           */
+/*===========================================================================*/
+
+/**
+ * @brief   Default bit rate.
+ * @details Configuration parameter, this is the baud rate selected for the
+ *          default configuration.
+ */
+#if !defined(SERIAL_DEFAULT_BITRATE) || defined(__DOXYGEN__)
+#define SERIAL_DEFAULT_BITRATE              38400
+#endif
+
+/**
+ * @brief   Serial buffers size.
+ * @details Configuration parameter, you can change the depth of the queue
+ *          buffers depending on the requirements of your application.
+ * @note    The default is 16 bytes for both the transmission and receive
+ *          buffers.
+ */
+#if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__)
+#define SERIAL_BUFFERS_SIZE                 16
+#endif
+
+/*===========================================================================*/
+/* SERIAL_USB driver related setting.                                        */
+/*===========================================================================*/
+
+/**
+ * @brief   Serial over USB buffers size.
+ * @details Configuration parameter, the buffer size must be a multiple of
+ *          the USB data endpoint maximum packet size.
+ * @note    The default is 256 bytes for both the transmission and receive
+ *          buffers.
+ */
+#if !defined(SERIAL_USB_BUFFERS_SIZE) || defined(__DOXYGEN__)
+#define SERIAL_USB_BUFFERS_SIZE             1
+#endif
+
+/**
+ * @brief   Serial over USB number of buffers.
+ * @note    The default is 2 buffers.
+ */
+#if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
+#define SERIAL_USB_BUFFERS_NUMBER           2
+#endif
+
+/*===========================================================================*/
+/* SPI driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(SPI_USE_WAIT) || defined(__DOXYGEN__)
+#define SPI_USE_WAIT                        TRUE
+#endif
+
+/**
+ * @brief   Enables circular transfers APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(SPI_USE_CIRCULAR) || defined(__DOXYGEN__)
+#define SPI_USE_CIRCULAR                    FALSE
+#endif
+
+
+/**
+ * @brief   Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(SPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define SPI_USE_MUTUAL_EXCLUSION            TRUE
+#endif
+
+/**
+ * @brief   Handling method for SPI CS line.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(SPI_SELECT_MODE) || defined(__DOXYGEN__)
+#define SPI_SELECT_MODE                     SPI_SELECT_MODE_PAD
+#endif
+
+/*===========================================================================*/
+/* UART driver related settings.                                             */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(UART_USE_WAIT) || defined(__DOXYGEN__)
+#define UART_USE_WAIT                       FALSE
+#endif
+
+/**
+ * @brief   Enables the @p uartAcquireBus() and @p uartReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(UART_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define UART_USE_MUTUAL_EXCLUSION           FALSE
+#endif
+
+/*===========================================================================*/
+/* USB driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(USB_USE_WAIT) || defined(__DOXYGEN__)
+#define USB_USE_WAIT                        TRUE
+#endif
+
+/*===========================================================================*/
+/* WSPI driver related settings.                                             */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(WSPI_USE_WAIT) || defined(__DOXYGEN__)
+#define WSPI_USE_WAIT                       TRUE
+#endif
+
+/**
+ * @brief   Enables the @p wspiAcquireBus() and @p wspiReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(WSPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define WSPI_USE_MUTUAL_EXCLUSION           TRUE
+#endif
+
+#endif /* HALCONF_H */
+
+/** @} */
diff --git a/qmk/keyboards/acheron/lasgweloth/keymaps/default/keymap.c b/qmk/keyboards/acheron/lasgweloth/keymaps/default/keymap.c
new file mode 100644
index 00000000..a87c25c7
--- /dev/null
+++ b/qmk/keyboards/acheron/lasgweloth/keymaps/default/keymap.c
@@ -0,0 +1,35 @@
+/*
+Copyright 2012,2013 Jun Wako <wakojun@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+   [0] = LAYOUT(
+   	KC_GESC, 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_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_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_DEL,
+        KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, MO(1) , 
+	KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC ,          KC_RALT, KC_RGUI, MO(1)  , KC_RCTL
+ ),
+   [1] = LAYOUT(
+	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+	_______, _______, KC_UP  , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+	_______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+	_______, _______, _______,                            _______,          _______, _______, _______, _______ 
+)
+};
diff --git a/qmk/keyboards/acheron/lasgweloth/keymaps/xoxotus/keymap.c b/qmk/keyboards/acheron/lasgweloth/keymaps/xoxotus/keymap.c
new file mode 100644
index 00000000..8183bb56
--- /dev/null
+++ b/qmk/keyboards/acheron/lasgweloth/keymaps/xoxotus/keymap.c
@@ -0,0 +1,35 @@
+/*
+Copyright 2012,2013 Jun Wako <wakojun@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+   [0] = LAYOUT(
+   	KC_GESC, 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_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_TILD, 
+        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_DEL,
+        KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, MO(1) , 
+	KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC ,          KC_RALT, KC_RGUI, MO(1)  , KC_RCTL
+ ),
+   [1] = LAYOUT(
+	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+	_______, _______, KC_UP  , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+	_______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+	_______, _______, _______,                            _______,          _______, _______, _______, _______ 
+)
+};
diff --git a/qmk/keyboards/acheron/lasgweloth/lasgweloth.c b/qmk/keyboards/acheron/lasgweloth/lasgweloth.c
new file mode 100644
index 00000000..be2052a3
--- /dev/null
+++ b/qmk/keyboards/acheron/lasgweloth/lasgweloth.c
@@ -0,0 +1,18 @@
+/*
+Copyright 2020 Álvaro "Gondolindrim" Volpato  <gondolindrim@acheronproject.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 "lasgweloth.h"
diff --git a/qmk/keyboards/acheron/lasgweloth/lasgweloth.h b/qmk/keyboards/acheron/lasgweloth/lasgweloth.h
new file mode 100644
index 00000000..2c144de4
--- /dev/null
+++ b/qmk/keyboards/acheron/lasgweloth/lasgweloth.h
@@ -0,0 +1,36 @@
+/*
+Copyright 2015 Álvaro "Gondolindrim" Volpato  <gondolindrim@acheronproject.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
+
+#define ___ KC_NO
+
+#include "quantum.h"
+
+#define LAYOUT( \
+	K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
+	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
+	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
+	K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,      \
+	K40, K41, K42,                K46,      K48, K49, K4A, K4B           \
+) { \
+	{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
+	{ K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
+	{ K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
+	{ K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, ___ }, \
+	{ K40, K41, K42, ___, ___, ___, K46, ___, K48, K49, K4A, K4B, ___, ___ }  \
+}
diff --git a/qmk/keyboards/acheron/lasgweloth/mcuconf.h b/qmk/keyboards/acheron/lasgweloth/mcuconf.h
new file mode 100644
index 00000000..6289be66
--- /dev/null
+++ b/qmk/keyboards/acheron/lasgweloth/mcuconf.h
@@ -0,0 +1,176 @@
+/*
+    ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
+/*
+ * STM32F0xx drivers configuration.
+ * The following settings override the default settings present in
+ * the various device driver implementation headers.
+ * Note that the settings for each driver only have effect if the whole
+ * driver is enabled in halconf.h.
+ *
+ * IRQ priorities:
+ * 3...0       Lowest...Highest.
+ *
+ * DMA priorities:
+ * 0...3        Lowest...Highest.
+ */
+
+#define STM32F0xx_MCUCONF
+// #define STM32F070xB
+
+/*
+ * HAL driver system settings.
+ */
+#define STM32_NO_INIT                       FALSE
+#define STM32_PVD_ENABLE                    FALSE
+#define STM32_PLS                           STM32_PLS_LEV0
+#define STM32_HSI_ENABLED                   TRUE
+#define STM32_HSI14_ENABLED                 TRUE
+#define STM32_HSI48_ENABLED                 FALSE
+#define STM32_LSI_ENABLED                   TRUE
+#define STM32_HSE_ENABLED                   FALSE
+#define STM32_LSE_ENABLED                   FALSE
+#define STM32_SW                            STM32_SW_PLL
+#define STM32_PLLSRC                        STM32_PLLSRC_HSI_DIV2
+#define STM32_PREDIV_VALUE                  1
+#define STM32_PLLMUL_VALUE                  12
+#define STM32_HPRE                          STM32_HPRE_DIV1
+#define STM32_PPRE                          STM32_PPRE_DIV1
+#define STM32_ADCSW                         STM32_ADCSW_HSI14
+#define STM32_ADCPRE                        STM32_ADCPRE_DIV4
+#define STM32_MCOSEL                        STM32_MCOSEL_NOCLOCK
+#define STM32_ADCPRE                        STM32_ADCPRE_DIV4
+#define STM32_ADCSW                         STM32_ADCSW_HSI14
+#define STM32_USBSW                         STM32_USBSW_HSI48
+#define STM32_CECSW                         STM32_CECSW_HSI
+#define STM32_I2C1SW                        STM32_I2C1SW_HSI
+#define STM32_USART1SW                      STM32_USART1SW_PCLK
+#define STM32_RTCSEL                        STM32_RTCSEL_LSI
+
+/*
+ * ADC driver system settings.
+ */
+#define STM32_ADC_USE_ADC1                  FALSE
+#define STM32_ADC_ADC1_DMA_PRIORITY         2
+#define STM32_ADC_IRQ_PRIORITY              2
+#define STM32_ADC_ADC1_DMA_IRQ_PRIORITY     2
+
+/*
+ * EXT driver system settings.
+ */
+#define STM32_EXT_EXTI0_1_IRQ_PRIORITY      3
+#define STM32_EXT_EXTI2_3_IRQ_PRIORITY      3
+#define STM32_EXT_EXTI4_15_IRQ_PRIORITY     3
+#define STM32_EXT_EXTI16_IRQ_PRIORITY       3
+#define STM32_EXT_EXTI17_IRQ_PRIORITY       3
+
+/*
+ * GPT driver system settings.
+ */
+#define STM32_GPT_USE_TIM1                  FALSE
+#define STM32_GPT_USE_TIM2                  FALSE
+#define STM32_GPT_USE_TIM3                  FALSE
+#define STM32_GPT_USE_TIM14                 FALSE
+#define STM32_GPT_TIM1_IRQ_PRIORITY         2
+#define STM32_GPT_TIM2_IRQ_PRIORITY         2
+#define STM32_GPT_TIM3_IRQ_PRIORITY         2
+#define STM32_GPT_TIM14_IRQ_PRIORITY        2
+
+/*
+ * I2C driver system settings.
+ */
+#define STM32_I2C_USE_I2C1                  FALSE
+#define STM32_I2C_USE_I2C2                  FALSE
+#define STM32_I2C_BUSY_TIMEOUT              50
+#define STM32_I2C_I2C1_IRQ_PRIORITY         3
+#define STM32_I2C_I2C2_IRQ_PRIORITY         3
+#define STM32_I2C_USE_DMA                   FALSE
+#define STM32_I2C_I2C1_DMA_PRIORITY         1
+#define STM32_I2C_I2C2_DMA_PRIORITY         1
+#define STM32_I2C_I2C1_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 7)
+#define STM32_I2C_I2C1_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 6)
+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")
+
+/*
+ * ICU driver system settings.
+ */
+#define STM32_ICU_USE_TIM1                  FALSE
+#define STM32_ICU_USE_TIM2                  FALSE
+#define STM32_ICU_USE_TIM3                  FALSE
+#define STM32_ICU_TIM1_IRQ_PRIORITY         3
+#define STM32_ICU_TIM2_IRQ_PRIORITY         3
+#define STM32_ICU_TIM3_IRQ_PRIORITY         3
+
+/*
+ * PWM driver system settings.
+ */
+#define STM32_PWM_USE_ADVANCED              FALSE
+#define STM32_PWM_USE_TIM1                  FALSE
+#define STM32_PWM_USE_TIM2                  FALSE
+#define STM32_PWM_USE_TIM3                  FALSE
+#define STM32_PWM_TIM1_IRQ_PRIORITY         3
+#define STM32_PWM_TIM2_IRQ_PRIORITY         3
+#define STM32_PWM_TIM3_IRQ_PRIORITY         3
+
+/*
+ * SERIAL driver system settings.
+ */
+#define STM32_SERIAL_USE_USART1             FALSE
+#define STM32_SERIAL_USE_USART2             FALSE
+#define STM32_SERIAL_USART1_PRIORITY        3
+#define STM32_SERIAL_USART2_PRIORITY        3
+
+/*
+ * SPI driver system settings.
+ */
+#define STM32_SPI_USE_SPI1                  FALSE
+#define STM32_SPI_USE_SPI2                  FALSE
+#define STM32_SPI_SPI1_DMA_PRIORITY         1
+#define STM32_SPI_SPI2_DMA_PRIORITY         1
+#define STM32_SPI_SPI1_IRQ_PRIORITY         2
+#define STM32_SPI_SPI2_IRQ_PRIORITY         2
+#define STM32_SPI_SPI2_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 4)
+#define STM32_SPI_SPI2_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 5)
+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")
+
+/*
+ * ST driver system settings.
+ */
+#define STM32_ST_IRQ_PRIORITY               2
+#define STM32_ST_USE_TIMER                  2
+
+/*
+ * UART driver system settings.
+ */
+#define STM32_UART_USE_USART1               FALSE
+#define STM32_UART_USE_USART2               FALSE
+#define STM32_UART_USART1_IRQ_PRIORITY      3
+#define STM32_UART_USART2_IRQ_PRIORITY      3
+#define STM32_UART_USART1_DMA_PRIORITY      0
+#define STM32_UART_USART2_DMA_PRIORITY      0
+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")
+
+/*
+ * USB driver system settings.
+ */
+#define STM32_USB_USE_USB1                  TRUE
+#define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE
+#define STM32_USB_USB1_LP_IRQ_PRIORITY      3
+
+#endif /* _MCUCONF_H_ */
diff --git a/qmk/keyboards/acheron/lasgweloth/readme.md b/qmk/keyboards/acheron/lasgweloth/readme.md
new file mode 100644
index 00000000..49b20e84
--- /dev/null
+++ b/qmk/keyboards/acheron/lasgweloth/readme.md
@@ -0,0 +1,29 @@
+# Acheron Aχξρων 60-SM-S-STM32-MX-TH-WI (codename "Lasgweloth") QMK firmware
+
+<p align="center">
+  <img align="middle" src="https://raw.githubusercontent.com/Gondolindrim/acheronLibrary/master/graphics/acheronLong.png"  width="400"> 
+</p>
+
+## Introduction
+
+This is the QMK firmware repository for the Lasgweloth PCB, updated until [pre-revision Alpha](https://github.com/AcheronProject/Lasgweloth/releases/).
+
+The Lasgweloth PCB is an Open-Hardware guidelines compliant PCB which files can be found at [this link](https://github.com/AcheronProject/Lasgweloth). Its designer and maintainer is [Gondolindrim](https://github.com/Gondolindrim).
+
+## Layouts
+
+The possible layouts consist of a default or 7U bottom row, with possibility of using split backspace, split right shift and stepped caps lock.
+
+## PCB Documentation
+
+See the [AcheronDocs](https://acheronproject.com/lasgweloth/intro.html) page for the Lasgweloth full documentation. You can also check the KiCad PCB files at the [GitHub repository](https://github.com/AcheronProject/Lasgweloth).
+
+Before using the files for personal or commercial use, please read the [Acheron Open-Hardware License V1.3](https://gondolindrim.github.io/AcheronDocs/license/license.html) under which the Arctic PCB is published.
+
+## How to compile
+
+After setting up your build environment, you can compile the Arctic default keymap by using:
+
+    make acheron/lasgweloth: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).
diff --git a/qmk/keyboards/acheron/lasgweloth/rules.mk b/qmk/keyboards/acheron/lasgweloth/rules.mk
new file mode 100644
index 00000000..2d2f71e1
--- /dev/null
+++ b/qmk/keyboards/acheron/lasgweloth/rules.mk
@@ -0,0 +1,23 @@
+# MCU name
+MCU = STM32F072
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = yes        # Console for debug
+COMMAND_ENABLE = yes        # Commands for debug and configuration
+# 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 = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = no
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/qmk/keyboards/aeboards/ext65/config.h b/qmk/keyboards/aeboards/ext65/config.h
new file mode 100644
index 00000000..ff2ace92
--- /dev/null
+++ b/qmk/keyboards/aeboards/ext65/config.h
@@ -0,0 +1,17 @@
+/* Copyright 2020 Harrison Chan (Xelus)
+ *
+ * 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 "config_common.h"
diff --git a/qmk/keyboards/aeboards/ext65/ext65.c b/qmk/keyboards/aeboards/ext65/ext65.c
new file mode 100644
index 00000000..5f824b72
--- /dev/null
+++ b/qmk/keyboards/aeboards/ext65/ext65.c
@@ -0,0 +1 @@
+#include "ext65.h"
diff --git a/qmk/keyboards/aeboards/ext65/ext65.h b/qmk/keyboards/aeboards/ext65/ext65.h
new file mode 100644
index 00000000..571ed055
--- /dev/null
+++ b/qmk/keyboards/aeboards/ext65/ext65.h
@@ -0,0 +1,9 @@
+#pragma once
+
+#include "quantum.h"
+
+#if defined(KEYBOARD_aeboards_ext65_rev1)
+    #include "rev1.h"
+#elif defined(KEYBOARD_aeboards_ext65_rev2)
+    #include "rev2.h"
+#endif
\ No newline at end of file
diff --git a/qmk/keyboards/aeboards/ext65/keymaps/default/keymap.c b/qmk/keyboards/aeboards/ext65/keymaps/default/keymap.c
new file mode 100644
index 00000000..af753792
--- /dev/null
+++ b/qmk/keyboards/aeboards/ext65/keymaps/default/keymap.c
@@ -0,0 +1,98 @@
+/* Copyright 2020 Harrison Chan (Xelus)
+ *
+ * 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] = {
+  /* Keymap BASE: (Base Layer) Default Layer
+   * ,-------------------.  ,-------------------------------------------------------------------.
+   * |-   | *  | /  |NmLK|  |Esc| 1 |  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|pipe| ~  | Pscr|
+   * |-------------------|  |-------------------------------------------------------------------|
+   * |    | 9  | 8  | 7  |  |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]| BSPC  | Del |
+   * |  + |--------------|  |-------------------------------------------------------------------|
+   * |    | 6  | 5  | 4  |  |Caps   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return   | Pgup|
+   * |-------------------|  |-------------------------------------------------------------------|
+   * |    | 3  | 2  | 1  |  |Shift    |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift | Up | Pgdn|
+   * | ENT|-------------------------------------------------------------------------------------|
+   * |    | .  | 0       |  | Ctrl | Win | Alt |    Space        | FN | Ctrl |  |Left| Dn | Rght|
+   * `------------------------------------------------------------------------------------------'
+   */
+  [0] = LAYOUT_ext65(
+    KC_PMNS, KC_PAST, KC_PSLS, KC_NLCK, KC_ESC , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSLS, KC_GRV , KC_PSCR,
+    KC_PPLS, KC_P9  , KC_P8  , KC_P7  , KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSPC,          KC_DEL ,
+    KC_PPLS, KC_P6  , KC_P5  , KC_P4  , 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_PGUP,
+    KC_PENT, KC_P3  , KC_P2  , KC_P1  , 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_PGDN,
+    KC_PENT, KC_PDOT, KC_P0  , KC_P0  , KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC ,                   MO(1)  , KC_RCTL,                   KC_LEFT, KC_DOWN, KC_RGHT
+  ),
+
+  [1] = LAYOUT_ext65(
+    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, RESET,
+    KC_TRNS, RGB_TOG, RGB_MOD, 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,          EEP_RST,
+    KC_TRNS, RGB_HUI, RGB_SAI, RGB_VAI, 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,                   DEBUG,
+    KC_TRNS, RGB_HUD, RGB_SAD, RGB_VAD, 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
+  ),
+
+  [2] = LAYOUT_ext65(
+    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, 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
+  ),
+
+  [3] = LAYOUT_ext65(
+    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, 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
+  )
+};
+
+#ifdef OLED_DRIVER_ENABLE
+
+void render_layer_state(void) {
+    oled_write_ln(PSTR("LAYER"), false);
+    oled_write_ln(PSTR("L1"), layer_state_is(1));
+    oled_write_ln(PSTR("L2"), layer_state_is(2));
+    oled_write_ln(PSTR("L3"), layer_state_is(3));
+    oled_write_ln(PSTR(" "), false);
+}
+
+void render_keylock_status(led_t led_state) {
+    oled_write_ln(PSTR("Lock:"), false);
+    oled_write(PSTR("N"), led_state.num_lock);
+    oled_write(PSTR("C"), led_state.caps_lock);
+    oled_write_ln(PSTR("S"), led_state.scroll_lock);
+    oled_write_ln(PSTR(" "), false);
+}
+
+void render_mod_status(uint8_t modifiers) {
+    oled_write_ln(PSTR("Mods:"), false);
+    oled_write(PSTR("S"), (modifiers & MOD_MASK_SHIFT));
+    oled_write(PSTR("C"), (modifiers & MOD_MASK_CTRL));
+    oled_write(PSTR("A"), (modifiers & MOD_MASK_ALT));
+    oled_write_ln(PSTR("G"), (modifiers & MOD_MASK_GUI));
+    oled_write_ln(PSTR(" "), false);
+}
+
+void oled_task_user(void) {
+    render_layer_state();
+    render_keylock_status(host_keyboard_led_state());
+    render_mod_status(get_mods()|get_oneshot_mods());
+}
+
+#endif
diff --git a/qmk/keyboards/aeboards/ext65/keymaps/default/readme.md b/qmk/keyboards/aeboards/ext65/keymaps/default/readme.md
new file mode 100644
index 00000000..3a3bb66d
--- /dev/null
+++ b/qmk/keyboards/aeboards/ext65/keymaps/default/readme.md
@@ -0,0 +1,2 @@
+# The Default Ext65Rev2 Layout
+
diff --git a/qmk/keyboards/aeboards/ext65/keymaps/via/keymap.c b/qmk/keyboards/aeboards/ext65/keymaps/via/keymap.c
new file mode 100644
index 00000000..af753792
--- /dev/null
+++ b/qmk/keyboards/aeboards/ext65/keymaps/via/keymap.c
@@ -0,0 +1,98 @@
+/* Copyright 2020 Harrison Chan (Xelus)
+ *
+ * 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] = {
+  /* Keymap BASE: (Base Layer) Default Layer
+   * ,-------------------.  ,-------------------------------------------------------------------.
+   * |-   | *  | /  |NmLK|  |Esc| 1 |  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|pipe| ~  | Pscr|
+   * |-------------------|  |-------------------------------------------------------------------|
+   * |    | 9  | 8  | 7  |  |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]| BSPC  | Del |
+   * |  + |--------------|  |-------------------------------------------------------------------|
+   * |    | 6  | 5  | 4  |  |Caps   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return   | Pgup|
+   * |-------------------|  |-------------------------------------------------------------------|
+   * |    | 3  | 2  | 1  |  |Shift    |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift | Up | Pgdn|
+   * | ENT|-------------------------------------------------------------------------------------|
+   * |    | .  | 0       |  | Ctrl | Win | Alt |    Space        | FN | Ctrl |  |Left| Dn | Rght|
+   * `------------------------------------------------------------------------------------------'
+   */
+  [0] = LAYOUT_ext65(
+    KC_PMNS, KC_PAST, KC_PSLS, KC_NLCK, KC_ESC , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_BSLS, KC_GRV , KC_PSCR,
+    KC_PPLS, KC_P9  , KC_P8  , KC_P7  , KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_LBRC, KC_RBRC, KC_BSPC,          KC_DEL ,
+    KC_PPLS, KC_P6  , KC_P5  , KC_P4  , 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_PGUP,
+    KC_PENT, KC_P3  , KC_P2  , KC_P1  , 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_PGDN,
+    KC_PENT, KC_PDOT, KC_P0  , KC_P0  , KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC ,                   MO(1)  , KC_RCTL,                   KC_LEFT, KC_DOWN, KC_RGHT
+  ),
+
+  [1] = LAYOUT_ext65(
+    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, RESET,
+    KC_TRNS, RGB_TOG, RGB_MOD, 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,          EEP_RST,
+    KC_TRNS, RGB_HUI, RGB_SAI, RGB_VAI, 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,                   DEBUG,
+    KC_TRNS, RGB_HUD, RGB_SAD, RGB_VAD, 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
+  ),
+
+  [2] = LAYOUT_ext65(
+    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, 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
+  ),
+
+  [3] = LAYOUT_ext65(
+    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, 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
+  )
+};
+
+#ifdef OLED_DRIVER_ENABLE
+
+void render_layer_state(void) {
+    oled_write_ln(PSTR("LAYER"), false);
+    oled_write_ln(PSTR("L1"), layer_state_is(1));
+    oled_write_ln(PSTR("L2"), layer_state_is(2));
+    oled_write_ln(PSTR("L3"), layer_state_is(3));
+    oled_write_ln(PSTR(" "), false);
+}
+
+void render_keylock_status(led_t led_state) {
+    oled_write_ln(PSTR("Lock:"), false);
+    oled_write(PSTR("N"), led_state.num_lock);
+    oled_write(PSTR("C"), led_state.caps_lock);
+    oled_write_ln(PSTR("S"), led_state.scroll_lock);
+    oled_write_ln(PSTR(" "), false);
+}
+
+void render_mod_status(uint8_t modifiers) {
+    oled_write_ln(PSTR("Mods:"), false);
+    oled_write(PSTR("S"), (modifiers & MOD_MASK_SHIFT));
+    oled_write(PSTR("C"), (modifiers & MOD_MASK_CTRL));
+    oled_write(PSTR("A"), (modifiers & MOD_MASK_ALT));
+    oled_write_ln(PSTR("G"), (modifiers & MOD_MASK_GUI));
+    oled_write_ln(PSTR(" "), false);
+}
+
+void oled_task_user(void) {
+    render_layer_state();
+    render_keylock_status(host_keyboard_led_state());
+    render_mod_status(get_mods()|get_oneshot_mods());
+}
+
+#endif
diff --git a/qmk/keyboards/aeboards/ext65/keymaps/via/readme.md b/qmk/keyboards/aeboards/ext65/keymaps/via/readme.md
new file mode 100644
index 00000000..4be6efb9
--- /dev/null
+++ b/qmk/keyboards/aeboards/ext65/keymaps/via/readme.md
@@ -0,0 +1,2 @@
+# The VIA Ext65Rev2 Layout
+
diff --git a/qmk/keyboards/aeboards/ext65/keymaps/via/rules.mk b/qmk/keyboards/aeboards/ext65/keymaps/via/rules.mk
new file mode 100644
index 00000000..1e5b9980
--- /dev/null
+++ b/qmk/keyboards/aeboards/ext65/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/qmk/keyboards/aeboards/ext65/readme.md b/qmk/keyboards/aeboards/ext65/readme.md
new file mode 100644
index 00000000..dfbb403b
--- /dev/null
+++ b/qmk/keyboards/aeboards/ext65/readme.md
@@ -0,0 +1,19 @@
+# EXT65
+
+A southpaw inspired keyboard by [AEBoards](https://aeboards.com/)
+
+* Keyboard Maintainer: [Xelus22](https://github.com/Xelus22)
+* Hardware Supported: EXT65 Rev1, Rev2
+* Hardware Availability: Custom keyboard group buys
+
+Make example for this keyboard (after setting up your build environment):
+
+    make aeboards/ext65/rev1:default
+    make aeboards/ext65/rev2:default
+
+Flashing example for this keyboard:
+
+    make aeboards/ext65/rev1:default:flash
+    make aeboards/ext65/rev2:default:flash
+
+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).
diff --git a/qmk/keyboards/aeboards/ext65/rev1/config.h b/qmk/keyboards/aeboards/ext65/rev1/config.h
index c6e6ac89..cd9c2400 100644
--- a/qmk/keyboards/aeboards/ext65/rev1/config.h
+++ b/qmk/keyboards/aeboards/ext65/rev1/config.h
@@ -22,9 +22,8 @@
 #define VENDOR_ID       0x4145 // "AE"
 #define PRODUCT_ID      0xAE65 // AEboards EXT65
 #define DEVICE_VER      0x0001
-#define MANUFACTURER    AEboards
-#define PRODUCT         AEboards Ext65
-#define DESCRIPTION     AEboards Ext65
+#define MANUFACTURER    AEBoards
+#define PRODUCT         AEBoards Ext65
 
 /* key matrix size */
 #define MATRIX_ROWS 10
diff --git a/qmk/keyboards/aeboards/ext65/rev1/rev1.c b/qmk/keyboards/aeboards/ext65/rev1/rev1.c
index f52f8d43..1d69a689 100644
--- a/qmk/keyboards/aeboards/ext65/rev1/rev1.c
+++ b/qmk/keyboards/aeboards/ext65/rev1/rev1.c
@@ -1,18 +1,32 @@
-/* Copyright 2018 Jason Williams (Wilba)
- *
- * 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 "rev1.h"
 
-// Nothing to see here, move along... ;-)
+void keyboard_pre_init_user(void) {
+  // Call the keyboard pre init code.
+  // Set our LED pins as output
+  setPinOutput(D5);
+  setPinOutput(D3);
+  setPinOutput(D2);
+  setPinOutput(D1);
+}
 
+bool led_update_kb(led_t led_state) {
+    bool res = led_update_user(led_state);
+    if(res) {
+        writePin(D5, led_state.num_lock);
+        writePin(D3, led_state.caps_lock);
+        writePin(D2, led_state.scroll_lock);
+    }
+    return res;
+}
+
+layer_state_t layer_state_set_kb(layer_state_t state) {
+    switch (get_highest_layer(state)) {
+      case 1:
+        writePinHigh(D1);
+        break;
+      default: //  for any other layers, or the default layer
+        writePinLow(D1);
+        break;
+      }
+    return layer_state_set_user(state);
+}
diff --git a/qmk/keyboards/aeboards/ext65/rev1/rev1.h b/qmk/keyboards/aeboards/ext65/rev1/rev1.h
index de79b92a..a8efc48a 100644
--- a/qmk/keyboards/aeboards/ext65/rev1/rev1.h
+++ b/qmk/keyboards/aeboards/ext65/rev1/rev1.h
@@ -1,4 +1,4 @@
-/* Copyright 2018 Jason Williams (Wilba)
+/* Copyright 2020 Harrison Chan (Xelus)
  *
  * 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
@@ -16,6 +16,7 @@
 
 #pragma once
 
+#include "ext65.h"
 #include "quantum.h"
 
 #define ____ KC_NO
diff --git a/qmk/keyboards/aeboards/ext65/rev2/config.h b/qmk/keyboards/aeboards/ext65/rev2/config.h
index 959bf91d..9db2b313 100644
--- a/qmk/keyboards/aeboards/ext65/rev2/config.h
+++ b/qmk/keyboards/aeboards/ext65/rev2/config.h
@@ -21,7 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define VENDOR_ID       0x4145 // "AE"
 #define PRODUCT_ID      0xA652 // AEboards EXT65 Rev2
 #define DEVICE_VER      0x0001
-#define MANUFACTURER    AEboards
+#define MANUFACTURER    AEBoards
 #define PRODUCT         AEBoards Ext65 Rev2
 
 /* key matrix size */
diff --git a/qmk/keyboards/aeboards/ext65/rev2/rev2.c b/qmk/keyboards/aeboards/ext65/rev2/rev2.c
index 35e88a8b..5d765810 100644
--- a/qmk/keyboards/aeboards/ext65/rev2/rev2.c
+++ b/qmk/keyboards/aeboards/ext65/rev2/rev2.c
@@ -1,5 +1,8 @@
 #include "rev2.h"
 
+// Tested and verified working on ext65rev2
+void matrix_io_delay(void) { __asm__ volatile("nop\nnop\nnop\n"); }
+
 #ifdef OLED_DRIVER_ENABLE
 void board_init(void) {
   SYSCFG->CFGR1 |= SYSCFG_CFGR1_I2C1_DMA_RMP;
diff --git a/qmk/keyboards/aeboards/ext65/rev2/rev2.h b/qmk/keyboards/aeboards/ext65/rev2/rev2.h
index 23a4d7c8..a8efc48a 100644
--- a/qmk/keyboards/aeboards/ext65/rev2/rev2.h
+++ b/qmk/keyboards/aeboards/ext65/rev2/rev2.h
@@ -1,5 +1,22 @@
+/* Copyright 2020 Harrison Chan (Xelus)
+ *
+ * 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 "ext65.h"
 #include "quantum.h"
 
 #define ____ KC_NO
diff --git a/qmk/keyboards/aeboards/ext65/rules.mk b/qmk/keyboards/aeboards/ext65/rules.mk
new file mode 100644
index 00000000..d8b0595a
--- /dev/null
+++ b/qmk/keyboards/aeboards/ext65/rules.mk
@@ -0,0 +1 @@
+DEFAULT_FOLDER = aeboards/ext65/rev2
\ No newline at end of file
diff --git a/qmk/keyboards/ai03/orbit/matrix.h b/qmk/keyboards/ai03/orbit/matrix.h
index c2bdd309..664372b7 100644
--- a/qmk/keyboards/ai03/orbit/matrix.h
+++ b/qmk/keyboards/ai03/orbit/matrix.h
@@ -1,3 +1,3 @@
 #pragma once
 
-#include <common/matrix.h>
+#include "common/matrix.h"
diff --git a/qmk/keyboards/ai03/orbit/orbit.c b/qmk/keyboards/ai03/orbit/orbit.c
index 2f149875..b51ddbc6 100644
--- a/qmk/keyboards/ai03/orbit/orbit.c
+++ b/qmk/keyboards/ai03/orbit/orbit.c
@@ -208,8 +208,6 @@ uint32_t layer_state_set_kb(uint32_t state) {
 	
 	if (is_keyboard_master())
 	{
-		
-		current_layer = biton32(state);
 		serial_m2s_buffer.current_layer = biton32(state);
 		
 		// If left half, do the LED toggle thing
diff --git a/qmk/keyboards/ai03/orbit/orbit.h b/qmk/keyboards/ai03/orbit/orbit.h
index 211b9ebc..2ada881f 100644
--- a/qmk/keyboards/ai03/orbit/orbit.h
+++ b/qmk/keyboards/ai03/orbit/orbit.h
@@ -56,8 +56,6 @@
 	{ R40,   R41,   R42,   R43,   R44,   R45, KC_NO }  \
 }
 
-uint8_t current_layer;
-
 extern void led_toggle(int id, bool on);
 void set_all_leds(bool leds[6]);
 extern void set_layer_indicators(uint8_t layer);
diff --git a/qmk/keyboards/ai03/orbit/transport.h b/qmk/keyboards/ai03/orbit/transport.h
index 422e2ecb..67597652 100644
--- a/qmk/keyboards/ai03/orbit/transport.h
+++ b/qmk/keyboards/ai03/orbit/transport.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/matrix.h>
+#include "common/matrix.h"
 
 #define ROWS_PER_HAND (MATRIX_ROWS/2)
 
diff --git a/qmk/keyboards/ai03/polaris/keymaps/mekberg/config.h b/qmk/keyboards/ai03/polaris/keymaps/mekberg/config.h
new file mode 100644
index 00000000..ef8caf87
--- /dev/null
+++ b/qmk/keyboards/ai03/polaris/keymaps/mekberg/config.h
@@ -0,0 +1,22 @@
+/*
+Copyright 2019 Ryota Goto
+
+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
+
+// Define some configuration for modtap behavior
+// #define TAPPING_TERM 150
+#define PERMISSIVE_HOLD
diff --git a/qmk/keyboards/ai03/polaris/keymaps/mekberg/keymap.c b/qmk/keyboards/ai03/polaris/keymaps/mekberg/keymap.c
new file mode 100644
index 00000000..fce03adf
--- /dev/null
+++ b/qmk/keyboards/ai03/polaris/keymaps/mekberg/keymap.c
@@ -0,0 +1,97 @@
+/* Copyright 2019 Ryota Goto
+ *
+ * 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
+
+enum layer_names {
+    _BASE,
+    _NAV,
+    _FN
+};
+
+#define MY_LOCK C(LCMD(KC_L))      // Mac: Custom lock hotkey in BTT (when Alt/Command have been swapped in macOS)
+
+/*
+KBD6x ANSI physical layout
+1u == 8chars
+    ┌─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
+    |        |        |        |        |        |        |        |        |        |        |        |        |        |        |       |
+    |─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────|
+    |    1,5u    |        |        |        |        |        |        |        |        |        |        |        |        |     1,5u   |
+    |─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────|
+    |     1,75u    |        |        |        |        |        |        |        |        |        |        |        |        1,25u      |
+    |─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────|
+    |       2,25u      |        |        |        |        |        |        |        |        |        |        |     1,75u     |        |
+    └─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
+                 |        |   1,25u    |                                                        |   1,25u    |        |
+                 └────────────────────────────────────────────────────────────────────────────────────────────────────┘
+*/
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_BASE] = LAYOUT_60_tsangan_hhkb(
+//  ┌─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
+//  |        |        |        |        |        |        |        |        |        |        |        |        |        |        |       |
+      KC_GESC, 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_NUBS, KC_RBRC,
+//  |─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────|
+//  |    1,5u    |        |        |        |        |        |        |        |        |        |        |        |        |     1,5u   |
+  LT(_NAV,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_NUHS,   KC_BSPC,
+//  |─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────|
+//  |     1,75u    |        |        |        |        |        |        |        |        |        |        |        |        1,25u      |
+         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,
+//  |─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────|
+//  |   1,25u          |        |        |        |        |        |        |        |        |        |        |     1,75u     |        |
+           KC_LSFT,       KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,   KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,    KC_RSFT,     MO(_FN),
+//  └─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
+//                   |        |   1,25u    |                                                        |   1,25u    |        |
+         XXXXXXX,     KC_LGUI,   KC_LALT,                         KC_SPACE,                            KC_RALT,   KC_RGUI,      XXXXXXX
+//                   └────────────────────────────────────────────────────────────────────────────────────────────────────┘
+  ),
+  [_NAV] = LAYOUT_60_tsangan_hhkb(
+//  ┌─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
+//  |        |        |        |        |        |        |        |        |        |        |        |        |        |        |       |
+     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  KC_INS, KC_BSPC,
+//  |─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────|
+//  |    1,5u    |        |        |        |        |        |        |        |        |        |        |        |        |     1,5u   |
+      _______,    _______, _______, _______, _______, _______, KC_END,  KC_PGDN, KC_UP,   KC_PGUP, KC_HOME, _______, _______,    KC_DEL,
+//  |─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────|
+//  |     1,75u    |        |        |        |        |        |        |        |        |        |        |        |        1,25u      |
+       _______,     _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,       _______,
+//  |─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────|
+//  |   1,25u          |        |        |        |        |        |        |        |        |        |        |     1,75u     |        |
+          _______,      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______,     _______,
+//  └─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
+//                   |        |   1,25u    |                                                        |   1,25u    |        |
+         XXXXXXX,     _______,  _______,                         _______,                             _______,    _______,      XXXXXXX
+//                   └────────────────────────────────────────────────────────────────────────────────────────────────────┘
+  ),
+  [_FN] = LAYOUT_60_tsangan_hhkb(
+//  ┌─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┐
+//  |        |        |        |        |        |        |        |        |        |        |        |        |        |        |       |
+      RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12, _______, _______,
+//  |─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────|
+//  |    1,5u    |        |        |        |        |        |        |        |        |        |        |        |        |     1,5u   |
+      _______,   _______,  _______, _______, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______,   _______,
+//  |─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────|
+//  |     1,75u    |        |        |        |        |        |        |        |        |        |        |        |        1,25u      |
+        KC_RCTL,    KC_VOLD, KC_VOLU, KC_MUTE, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______,       MY_LOCK,
+//  |─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────|
+//  |   1,25u          |        |        |        |        |        |        |        |        |        |        |     1,75u     |        |
+          _______,      BL_TOGG,  BL_INC,  BL_DEC, BL_STEP, _______, _______, _______, KC_MRWD, KC_MFFD, _______,    _______,     _______,
+//  └─────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────┘
+//                   |        |   1,25u    |                                                        |   1,25u    |        |
+         XXXXXXX,     _______,  _______,                          KC_MPLY,                            _______,    _______,      XXXXXXX
+//                   └────────────────────────────────────────────────────────────────────────────────────────────────────┘
+  ),
+};
diff --git a/qmk/keyboards/ai03/polaris/keymaps/mekberg/readme.md b/qmk/keyboards/ai03/polaris/keymaps/mekberg/readme.md
new file mode 100644
index 00000000..b9ae9642
--- /dev/null
+++ b/qmk/keyboards/ai03/polaris/keymaps/mekberg/readme.md
@@ -0,0 +1,14 @@
+# General Information
+
+This is more or less a HHKB base layout, but with completely different Fn layers. I don't use most of the HHKB secondary key positions because, honestly, they make no sense to me at all.
+
+Fn key layer is focused mostly on keyboard firmware features (like RGB) as well as some of the necessary alternate functions. It also hold media controls, F-keys and Reset.
+
+Left Tab-Hold layer is focused on nav cluster functionality, and turns Backspace into Delete (and moves Backspace up into the top right 1u position).
+
+
+# Build instructions
+
+To simply build the firmware file: `make clean && make ai03/polaris:mekberg`
+
+To build and immediately flash: `make clean && make ai03/polaris:mekberg:flash`
diff --git a/qmk/keyboards/ai03/polaris/keymaps/mekberg/rules.mk b/qmk/keyboards/ai03/polaris/keymaps/mekberg/rules.mk
new file mode 100644
index 00000000..e47bb9e6
--- /dev/null
+++ b/qmk/keyboards/ai03/polaris/keymaps/mekberg/rules.mk
@@ -0,0 +1,2 @@
+BACKLIGHT_ENABLE = no      # Disable keyboard backlight functionality
+RGBLIGHT_ENABLE = no       # Disable keyboard RGB underglow
diff --git a/qmk/keyboards/akegata_denki/device_one/boards/DEVICE_ONE/board.c b/qmk/keyboards/akegata_denki/device_one/boards/DEVICE_ONE/board.c
index 8e030352..20b857d0 100644
--- a/qmk/keyboards/akegata_denki/device_one/boards/DEVICE_ONE/board.c
+++ b/qmk/keyboards/akegata_denki/device_one/boards/DEVICE_ONE/board.c
@@ -16,8 +16,8 @@
  * generator plugin. Do not edit manually.
  */
 
-#include "hal.h"
-#include "stm32_gpio.h"
+#include <hal.h>
+#include <stm32_gpio.h>
 
 /*===========================================================================*/
 /* Driver local definitions.                                                 */
diff --git a/qmk/keyboards/al1/al1.c b/qmk/keyboards/al1/al1.c
index e50a6373..460a7620 100644
--- a/qmk/keyboards/al1/al1.c
+++ b/qmk/keyboards/al1/al1.c
@@ -14,27 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "al1.h"
-
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	return process_record_user(keycode, record);
-}
-
-void led_set_kb(uint8_t usb_led) {
-    CONFIG_LED_IO;
-    print_dec(usb_led);
-    if (usb_led & (1<<USB_LED_CAPS_LOCK))
-        PORTB &= ~(1<<7);
-    else
-        PORTB |=  (1<<7);
-
-    if (usb_led & (1<<USB_LED_NUM_LOCK))
-        PORTD &= ~(1<<0);
-    else
-        PORTD |=  (1<<0);
-
-    if (usb_led & (1<<USB_LED_SCROLL_LOCK))
-        PORTD &= ~(1<<1);
-    else
-        PORTD |=  (1<<1);
-	led_set_user(usb_led);
-}
diff --git a/qmk/keyboards/al1/al1.h b/qmk/keyboards/al1/al1.h
index 17a0c965..c313a898 100644
--- a/qmk/keyboards/al1/al1.h
+++ b/qmk/keyboards/al1/al1.h
@@ -18,11 +18,6 @@
 
 #include "quantum.h"
 
-#define CONFIG_LED_IO \
-  DDRB |= (1<<7) | (1<<6); \
-  DDRD |= (1<<0) | (1<<1);
-
-
 #define LAYOUT( \
                K500, K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K415, K414,\
                K501, K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K215, K413,\
diff --git a/qmk/keyboards/al1/config.h b/qmk/keyboards/al1/config.h
index f4ded434..6a59afae 100644
--- a/qmk/keyboards/al1/config.h
+++ b/qmk/keyboards/al1/config.h
@@ -46,6 +46,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
+#define LED_NUM_LOCK_PIN D0
+#define LED_CAPS_LOCK_PIN B7
+#define LED_SCROLL_LOCK_PIN D1
+#define LED_PIN_ON_STATE 0
+
 #define BACKLIGHT_PIN B6
 #define BACKLIGHT_BREATHING
 #define BACKLIGHT_LEVELS 3
diff --git a/qmk/keyboards/alf/dc60/config.h b/qmk/keyboards/alf/dc60/config.h
index b4cff82d..098891ee 100644
--- a/qmk/keyboards/alf/dc60/config.h
+++ b/qmk/keyboards/alf/dc60/config.h
@@ -48,6 +48,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
+#define LED_CAPS_LOCK_PIN B7
+#define LED_PIN_ON_STATE 0
+
 #define BACKLIGHT_PIN B6
 #define BACKLIGHT_BREATHING
 #define BACKLIGHT_LEVELS 5
diff --git a/qmk/keyboards/alf/dc60/dc60.c b/qmk/keyboards/alf/dc60/dc60.c
index 70979adf..4096d10a 100644
--- a/qmk/keyboards/alf/dc60/dc60.c
+++ b/qmk/keyboards/alf/dc60/dc60.c
@@ -14,36 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "dc60.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) {
-	if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
-		DDRB |= (1 << 7);
-		PORTB &= ~(1 << 7);
-	} else {
-		DDRB &= ~(1 << 7);
-		PORTB &= ~(1 << 7);
-	}
-
-	led_set_user(usb_led);
-}
diff --git a/qmk/keyboards/alf/x11/config.h b/qmk/keyboards/alf/x11/config.h
index fcf4e85a..cd989350 100644
--- a/qmk/keyboards/alf/x11/config.h
+++ b/qmk/keyboards/alf/x11/config.h
@@ -48,10 +48,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
-/*
- * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
- */
-#define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6
+#define LED_NUM_LOCK_PIN E6
+#define LED_CAPS_LOCK_PIN C6
+#define LED_SCROLL_LOCK_PIN C7
+#define LED_PIN_ON_STATE 0
 
 #define BACKLIGHT_PIN B7
 #define BACKLIGHT_BREATHING
diff --git a/qmk/keyboards/alf/x11/x11.c b/qmk/keyboards/alf/x11/x11.c
index 9699918d..28e77ecd 100644
--- a/qmk/keyboards/alf/x11/x11.c
+++ b/qmk/keyboards/alf/x11/x11.c
@@ -14,51 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "x11.h"
-
-void matrix_init_kb(void) {
-    // put your keyboard start-up code here
-    // runs once when the firmware starts up
-
-    setPinOutput(C6);
-    setPinOutput(E6);
-    setPinOutput(C7);
-    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_CAPS_LOCK)) {
-        writePinLow(C6);
-    } else {
-        writePinHigh(C6);
-    }
-
-    if (IS_LED_ON(usb_led, USB_LED_NUM_LOCK)) {
-        writePinLow(E6);
-    } else {
-        writePinHigh(E6);
-    }
-
-    if (IS_LED_ON(usb_led, USB_LED_SCROLL_LOCK)) {
-        writePinLow(C7);
-    } else {
-        writePinHigh(C7);
-    }
-
-    led_set_user(usb_led);
-}
diff --git a/qmk/keyboards/alps64/alps64.c b/qmk/keyboards/alps64/alps64.c
index 0e4ef07b..61270aac 100644
--- a/qmk/keyboards/alps64/alps64.c
+++ b/qmk/keyboards/alps64/alps64.c
@@ -15,23 +15,3 @@ 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 "alps64.h"
-
-void keyboard_pre_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-    setPinOutput(C5);
-    keyboard_pre_init_user();
-}
-
-void led_set_kb(uint8_t usb_led)
-{
-    if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
-        // output high
-        writePinHigh(C5);
-    } else {
-        // Hi-Z
-        writePinLow(C5);
-    }
-
-    led_set_user(usb_led);
-}
diff --git a/qmk/keyboards/alps64/config.h b/qmk/keyboards/alps64/config.h
index 25453e69..15903818 100644
--- a/qmk/keyboards/alps64/config.h
+++ b/qmk/keyboards/alps64/config.h
@@ -37,6 +37,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define DIODE_DIRECTION COL2ROW
 
+#define LED_CAPS_LOCK_PIN C5
+
 /* define if matrix has ghost */
 //#define MATRIX_HAS_GHOST
 
diff --git a/qmk/keyboards/amj40/amj40.c b/qmk/keyboards/amj40/amj40.c
index 5a237699..20742c32 100644
--- a/qmk/keyboards/amj40/amj40.c
+++ b/qmk/keyboards/amj40/amj40.c
@@ -1,30 +1 @@
 #include "amj40.h"
-#include "led.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-	matrix_init_user();
-	led_init_ports();
-};
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-	matrix_scan_user();
-};
-
-void led_init_ports(void) {
-    // * Set our LED pins as output
-    DDRB |= (1<<2);
-}
-
-void led_set_kb(uint8_t usb_led) {
-    if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
-        // Turn capslock on
-        PORTB &= ~(1<<2);
-    } else {
-        // Turn capslock off
-        PORTB |= (1<<2);
-    }
-}
diff --git a/qmk/keyboards/amj40/config.h b/qmk/keyboards/amj40/config.h
index f9a3c1ac..5534dbf1 100644
--- a/qmk/keyboards/amj40/config.h
+++ b/qmk/keyboards/amj40/config.h
@@ -38,6 +38,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COL_PINS { F1, F0, E6, C7, C6, B0, D4, B1, B7, B5, B4, D7}
 #define UNUSED_PINS
 
+#define LED_CAPS_LOCK_PIN B2
+#define LED_PIN_ON_STATE 0
+
 #define BACKLIGHT_PIN B6
 
 /* COL2ROW or ROW2COL */
diff --git a/qmk/keyboards/amj60/amj60.c b/qmk/keyboards/amj60/amj60.c
index 993a5917..02aa116d 100644
--- a/qmk/keyboards/amj60/amj60.c
+++ b/qmk/keyboards/amj60/amj60.c
@@ -1,30 +1 @@
 #include "amj60.h"
-#include "led.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-	matrix_init_user();
-	led_init_ports();
-};
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-	matrix_scan_user();
-};
-
-void led_init_ports(void) {
-    // * Set our LED pins as output
-    DDRB |= (1<<2);
-}
-
-void led_set_kb(uint8_t usb_led) {
-    if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
-        // Turn capslock on
-        PORTB &= ~(1<<2);
-    } else {
-        // Turn capslock off
-        PORTB |= (1<<2);
-    }
-}
diff --git a/qmk/keyboards/amj60/config.h b/qmk/keyboards/amj60/config.h
index 81b70111..79cfbe59 100644
--- a/qmk/keyboards/amj60/config.h
+++ b/qmk/keyboards/amj60/config.h
@@ -38,11 +38,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COL_PINS { F1, F0, E6, C7, C6, B0, D4, B1, B7, B5, B4, D7, D6, B3}
 #define UNUSED_PINS
 
-#define BACKLIGHT_PIN B6
-
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
+#define LED_CAPS_LOCK_PIN B2
+#define LED_PIN_ON_STATE 0
+
+#define BACKLIGHT_PIN B6
+
+
 /* define if matrix has ghost */
 //#define MATRIX_HAS_GHOST
 
diff --git a/qmk/keyboards/amjpad/amjpad.c b/qmk/keyboards/amjpad/amjpad.c
index ac5991bd..83cdedf6 100644
--- a/qmk/keyboards/amjpad/amjpad.c
+++ b/qmk/keyboards/amjpad/amjpad.c
@@ -1,30 +1 @@
 #include "amjpad.h"
-#include "led.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-	matrix_init_user();
-	led_init_ports();
-};
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-	matrix_scan_user();
-};
-
-void led_init_ports(void) {
-    // * Set our LED pins as output
-    DDRD |= (1<<6);
-}
-
-void led_set_kb(uint8_t usb_led) {
-    if (usb_led & (1<<USB_LED_NUM_LOCK)) {
-        // Turn numlock on
-        PORTD &= ~(1<<6);
-    } else {
-        // Turn numlock off
-        PORTD |= (1<<6);
-    }
-}
diff --git a/qmk/keyboards/amjpad/config.h b/qmk/keyboards/amjpad/config.h
index bbb48624..dd579be5 100644
--- a/qmk/keyboards/amjpad/config.h
+++ b/qmk/keyboards/amjpad/config.h
@@ -54,6 +54,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
+#define LED_NUM_LOCK_PIN D6
+#define LED_PIN_ON_STATE 0
+
 /* Backlight configuration
  */
 #define BACKLIGHT_LEVELS 4
diff --git a/qmk/keyboards/anavi/macropad8/keymaps/default/keymap.c b/qmk/keyboards/anavi/macropad8/keymaps/default/keymap.c
index 8cdf9028..68fbdf0d 100644
--- a/qmk/keyboards/anavi/macropad8/keymaps/default/keymap.c
+++ b/qmk/keyboards/anavi/macropad8/keymaps/default/keymap.c
@@ -25,7 +25,7 @@ oled_rotation_t oled_init_user(oled_rotation_t rotation) {
 void oled_task_user(void) {
   // Host Keyboard Layer Status
   oled_write_ln_P(PSTR("ANAVI Macro Pad 8"), false);
-  oled_write_P(PSTR("Active layer:"), false);
+  oled_write_P(PSTR("Active layer: "), false);
 
   switch (get_highest_layer(layer_state)) {
     case _MAIN:
diff --git a/qmk/keyboards/anavi/macropad8/keymaps/kodi/keymap.c b/qmk/keyboards/anavi/macropad8/keymaps/kodi/keymap.c
index 17b00807..72022a01 100644
--- a/qmk/keyboards/anavi/macropad8/keymaps/kodi/keymap.c
+++ b/qmk/keyboards/anavi/macropad8/keymaps/kodi/keymap.c
@@ -12,6 +12,18 @@ const uint8_t RGBLED_RAINBOW_MOOD_INTERVALS[] PROGMEM = {60, 30, 15};
 const uint8_t RGBLED_RAINBOW_SWIRL_INTERVALS[] PROGMEM = {20, 10, 4};
 #endif
 
+/**
+ * Kodi shortcuts:
+ *
+ * ESC - Previous menu OR Home screen
+ * Enter - Select
+ * X - Stop
+ * Arrows to move
+ *
+ * For details have a look at:
+ * https://kodi.wiki/view/Keyboard_controls
+ */
+
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_MAIN] = LAYOUT_ortho_2x4(
      KC_ESC, KC_UP, KC_ENTER, KC_X,
@@ -32,11 +44,11 @@ oled_rotation_t oled_init_user(oled_rotation_t rotation) {
 void oled_task_user(void) {
   // Host Keyboard Layer Status
   oled_write_ln_P(PSTR("ANAVI Macro Pad 8"), false);
-  oled_write_P(PSTR("Active layer:"), false);
+  oled_write_P(PSTR("Active layer: "), false);
 
   switch (get_highest_layer(layer_state)) {
     case _MAIN:
-      oled_write_ln_P(PSTR("Main"), false);
+      oled_write_ln_P(PSTR("Kodi"), false);
       break;
     case _FN:
       oled_write_ln_P(PSTR("FN"), false);
diff --git a/qmk/keyboards/aos/tkl/keymaps/via/rules.mk b/qmk/keyboards/aos/tkl/keymaps/via/rules.mk
index 96d2d189..1e5b9980 100644
--- a/qmk/keyboards/aos/tkl/keymaps/via/rules.mk
+++ b/qmk/keyboards/aos/tkl/keymaps/via/rules.mk
@@ -1,2 +1 @@
 VIA_ENABLE = yes
-MOUSEKEY_ENABLE = no
diff --git a/qmk/keyboards/ares/ares.h b/qmk/keyboards/ares/ares.h
index 41ecb570..6628bb02 100644
--- a/qmk/keyboards/ares/ares.h
+++ b/qmk/keyboards/ares/ares.h
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 Maarten Dekkers <maartenwut@gmail.com>
+Copyright 2019 Evy Dekkers
 
 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
diff --git a/qmk/keyboards/ares/keymaps/default/keymap.c b/qmk/keyboards/ares/keymaps/default/keymap.c
index 18e3d30b..490dbdf6 100644
--- a/qmk/keyboards/ares/keymaps/default/keymap.c
+++ b/qmk/keyboards/ares/keymaps/default/keymap.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 Maarten Dekkers <maartenwut@gmail.com>
+Copyright 2019 Evy Dekkers
 
 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
diff --git a/qmk/keyboards/at_at/660m/660m.c b/qmk/keyboards/at_at/660m/660m.c
index 1a54df3b..92ccc067 100644
--- a/qmk/keyboards/at_at/660m/660m.c
+++ b/qmk/keyboards/at_at/660m/660m.c
@@ -1 +1,6 @@
 #include "660m.h"
+
+void board_init(void) {
+  SYSCFG->CFGR1 |= SYSCFG_CFGR1_I2C1_DMA_RMP;
+  SYSCFG->CFGR1 &= ~(SYSCFG_CFGR1_SPI2_DMA_RMP);
+}
diff --git a/qmk/keyboards/at_at/660m/bootloader_defs.h b/qmk/keyboards/at_at/660m/bootloader_defs.h
index 02c48c4e..dccd0fa5 100644
--- a/qmk/keyboards/at_at/660m/bootloader_defs.h
+++ b/qmk/keyboards/at_at/660m/bootloader_defs.h
@@ -1,7 +1,5 @@
 /* Address for jumping to bootloader on STM32 chips. */
 /* It is chip dependent, the correct number can be looked up here (page 175):
  * http://www.st.com/web/en/resource/technical/document/application_note/CD00167594.pdf
- * This also requires a patch to chibios:
- *  <tmk_dir>/tmk_core/tool/chibios/ch-bootloader-jump.patch
  */
 #define STM32_BOOTLOADER_ADDRESS 0x1FFFC800
diff --git a/qmk/keyboards/at_at/660m/config.h b/qmk/keyboards/at_at/660m/config.h
index 93b58b30..c876e0d1 100644
--- a/qmk/keyboards/at_at/660m/config.h
+++ b/qmk/keyboards/at_at/660m/config.h
@@ -17,6 +17,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
+/* Ensure we jump to bootloader if the RESET keycode was pressed */
+#define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
+
+/* LSE clock */
+#define STM32_LSECLK 32768
+
 /* USB Device descriptor parameter */
 #define VENDOR_ID       0xA22A
 #define PRODUCT_ID      0x6600
diff --git a/qmk/keyboards/at_at/660m/rules.mk b/qmk/keyboards/at_at/660m/rules.mk
index 8c69ff7e..a94604fb 100644
--- a/qmk/keyboards/at_at/660m/rules.mk
+++ b/qmk/keyboards/at_at/660m/rules.mk
@@ -1,6 +1,6 @@
 # MCU name
 MCU = STM32F072
-BOARD = ST_STM32F072B_DISCOVERY
+BOARD = GENERIC_STM32_F072XB
 
 # Build Options
 #   comment out to disable the options.
diff --git a/qmk/keyboards/atreus/keymaps/talljoe/config.h b/qmk/keyboards/atreus/keymaps/talljoe/config.h
new file mode 100644
index 00000000..64d5b589
--- /dev/null
+++ b/qmk/keyboards/atreus/keymaps/talljoe/config.h
@@ -0,0 +1,53 @@
+/* Copyright 2020 Joseph Wasson
+ *
+ * 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
+
+#define SPACE_COUNT 3
+
+#define TEMPLATE_TKL( \
+  KESC,       KF01, KF02, KF03, KF04, KF05, KF06, KF07, KF08, KF09, KF10, KF11, KF12,   KSCL, KPRS, KADJ, \
+  KGRV, K_1 , K_2 , K_3 , K_4 , K_5 , K_6 , K_7 , K_8 , K_9 , K_0 , KMIN, KEQL, KBSP,   KINS, KHOM, KPUP, \
+  KTAB, K_Q , K_W , K_E , K_R , K_T , K_Y , K_U , K_I , K_O , K_P , KLBR, KRBR, KBLS,   KDEL, KEND, LPDN, \
+  KCAP, K_A , K_S , K_D , K_F , K_G , K_H , K_J , K_K , K_L , KSMI, KQUO,       KENT,                     \
+  KLSH, K_Z , K_X , K_C , K_V , K_B , K_N , K_M , KCMA, KDOT, KSLS,             KRSH,         K_UP,       \
+  KLCT, KLOS, KLAL,             KSP3, KSP2, KSP1,             KRAL, KROS, KRCT, KPTT,   K_LT, K_DN, K_RT  \
+) LAYOUT( \
+  K_Q , K_W , K_E , K_R , K_T ,             K_Y , K_U , K_I , K_O , K_P , \
+  K_A , K_S , K_D , K_F , K_G ,             K_H , K_J , K_K , K_L , KSMI, \
+  K_Z , K_X , K_C , K_V , K_B ,             K_N , K_M , KCMA, KDOT, KSLS, \
+  KTAB, KLOS, KLAL, KLSH, KSP3, KSP2, KCAP, KSP1, KRSH, KBLS, KQUO, KADJ \
+)
+
+#define TEMPLATE_NUM( \
+  KGRV, K_1 , K_2 , K_3 , K_4 , K_5 , K_6 , K_7 , K_8 , K_9 , K_0 , KMIN, KEQL, KBSL, KESC, \
+  KTAB, K_Q , K_W , K_E , K_R , K_T , K_Y , K_U , K_I , K_O , K_P , KLBR, KRBR,       KBSP, \
+  KCAP, K_A , K_S , K_D , K_F , K_G , K_H , K_J , K_K , K_L , KSMI, KQUO,             KENT, \
+  KLSH, K_Z , K_X , K_C , K_V , K_B , K_N , K_M , KCMA, KDOT, KSLS,             KRSH, KADJ, \
+  KLCT, KLOS, KLAL,             KSP3, KSP2, KSP1,             KRAL, KROS, KRCT, KPTT        \
+) LAYOUT( \
+  K_Q , K_W , K_E , K_R , K_T ,             K_Y , K_U , K_I , K_O , K_P , \
+  K_A , K_S , K_D , K_F , K_G ,             K_H , K_J , K_K , K_L , KSMI, \
+  K_Z , K_X , K_C , K_V , K_B ,             K_N , K_M , KCMA, KDOT, KSLS, \
+  KTAB, KLOS, KLAL, KLSH, KSP3, KSP2, KCAP, KSP1, KRAL, KROS, KQUO, KADJ \
+)
+
+#define TEMPLATE_RESET LAYOUT( \
+  RESET  , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
+  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
+  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
+  RESET  , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET  , XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX \
+)
diff --git a/qmk/keyboards/atreus/keymaps/talljoe/keymap.c b/qmk/keyboards/atreus/keymaps/talljoe/keymap.c
new file mode 100644
index 00000000..7812add8
--- /dev/null
+++ b/qmk/keyboards/atreus/keymaps/talljoe/keymap.c
@@ -0,0 +1 @@
+// This space intentionally left blank
diff --git a/qmk/keyboards/atreus/keymaps/talljoe/rules.mk b/qmk/keyboards/atreus/keymaps/talljoe/rules.mk
new file mode 100644
index 00000000..92007fe8
--- /dev/null
+++ b/qmk/keyboards/atreus/keymaps/talljoe/rules.mk
@@ -0,0 +1 @@
+USER_NAME := talljoe
diff --git a/qmk/keyboards/beatervan/beatervan.c b/qmk/keyboards/beatervan/beatervan.c
new file mode 100644
index 00000000..0730af00
--- /dev/null
+++ b/qmk/keyboards/beatervan/beatervan.c
@@ -0,0 +1,16 @@
+/* Copyright 2020 OJtheTiny
+ *
+ * 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 "beatervan.h"
diff --git a/qmk/keyboards/beatervan/beatervan.h b/qmk/keyboards/beatervan/beatervan.h
new file mode 100644
index 00000000..e6458098
--- /dev/null
+++ b/qmk/keyboards/beatervan/beatervan.h
@@ -0,0 +1,70 @@
+/* Copyright 2020 OJtheTiny
+ *
+ * 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( \
+    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,           K34, K36,           K37, K38, K39  \
+) \
+{ \
+    { 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, KC_NO, K34,  KC_NO, K36,  K37, K38, K39, KC_NO, KC_NO }  \
+}
+
+#define LAYOUT_arrow( \
+    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, 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,  KC_NO, KC_NO, KC_NO, K37,   K38,   K39,   K3A,   K3B }  \
+}
+
+#define LAYOUT_command( \
+    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, K34,      K33, K37,           K38, K39, 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,   KC_NO, KC_NO, K37,   K38,   K39, KC_NO,   K3B }  \
+}
+
+#define LAYOUT_arrow_command( \
+    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, K34,      K33, 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,   KC_NO, KC_NO, K37,   K38,   K39,   K3A,   K3B }  \
+}
diff --git a/qmk/keyboards/beatervan/config.h b/qmk/keyboards/beatervan/config.h
new file mode 100644
index 00000000..a8973ab4
--- /dev/null
+++ b/qmk/keyboards/beatervan/config.h
@@ -0,0 +1,55 @@
+
+/* Copyright 2020 OJtheTiny
+ *
+ * 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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID 0x6F6A // "oj"
+#define PRODUCT_ID 0x6276 // "bv"
+#define DEVICE_VER 0x0001
+#define MANUFACTURER OJ
+#define PRODUCT beatervan
+
+/* key matrix size */
+#define MATRIX_ROWS 4
+#define MATRIX_COLS 12
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+ */
+#define MATRIX_ROW_PINS { D1, D0, D4, C6 }
+#define MATRIX_COL_PINS { D7, E6, B4, B5, F4, F5, F6, F7, B1, B3, B2, B6 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
diff --git a/qmk/keyboards/beatervan/info.json b/qmk/keyboards/beatervan/info.json
new file mode 100644
index 00000000..f6f38764
--- /dev/null
+++ b/qmk/keyboards/beatervan/info.json
@@ -0,0 +1,204 @@
+{
+  "keyboard_name": "beatervan",
+  "url": "",
+  "maintainer": "OJ",
+  "width": 12.75,
+  "height": 4,
+  "layouts": {
+    "LAYOUT": {
+        "layout": [
+            {"label":"Tab", "x":0, "y":0},
+            {"label":"Q", "x":1, "y":0},
+            {"label":"W", "x":2, "y":0},
+            {"label":"E", "x":3, "y":0},
+            {"label":"R", "x":4, "y":0},
+            {"label":"T", "x":5, "y":0},
+            {"label":"Y", "x":6, "y":0},
+            {"label":"U", "x":7, "y":0},
+            {"label":"I", "x":8, "y":0},
+            {"label":"O", "x":9, "y":0},
+            {"label":"P", "x":10, "y":0},
+            {"label":"|", "x":11, "y":0, "w":1.75},
+            {"label":"Caps Lock", "x":0, "y":1, "w":1.25},
+            {"label":"A", "x":1.25, "y":1},
+            {"label":"S", "x":2.25, "y":1},
+            {"label":"D", "x":3.25, "y":1},
+            {"label":"F", "x":4.25, "y":1},
+            {"label":"G", "x":5.25, "y":1},
+            {"label":"H", "x":6.25, "y":1},
+            {"label":"J", "x":7.25, "y":1},
+            {"label":"K", "x":8.25, "y":1},
+            {"label":"L", "x":9.25, "y":1},
+            {"label":":", "x":10.25, "y":1},
+            {"label":"\"", "x":11.25, "y":1, "w":1.5},
+            {"label":"Shift", "x":0, "y":2, "w":1.75},
+            {"label":"Z", "x":1.75, "y":2},
+            {"label":"X", "x":2.75, "y":2},
+            {"label":"C", "x":3.75, "y":2},
+            {"label":"V", "x":4.75, "y":2},
+            {"label":"B", "x":5.75, "y":2},
+            {"label":"N", "x":6.75, "y":2},
+            {"label":"M", "x":7.75, "y":2},
+            {"label":"<", "x":8.75, "y":2},
+            {"label":">", "x":9.75, "y":2},
+            {"label":"?", "x":10.75, "y":2},
+            {"x":11.75, "y":2},
+            {"label":"Ctrl", "x":0, "y":3, "w":1.25},
+            {"label":"Win", "x":1.25, "y":3, "w":1.5},
+            {"label":"Alt", "x":2.75, "y":3, "w":1.25},
+            {"x":4, "y":3, "w":2.25},
+            {"x":6.25, "y":3, "w":2},
+            {"label":"Alt", "x":8.25, "y":3, "w":1.25},
+            {"label":"Win", "x":9.5, "y":3, "w":1.5},
+            {"label":"Menu", "x":11, "y":3, "w":1.75} ]
+    },
+
+    "LAYOUT_arrow": {
+        "layout": [
+            {"label":"Tab", "x":0, "y":0},
+            {"label":"Q", "x":1, "y":0},
+            {"label":"W", "x":2, "y":0},
+            {"label":"E", "x":3, "y":0},
+            {"label":"R", "x":4, "y":0},
+            {"label":"T", "x":5, "y":0},
+            {"label":"Y", "x":6, "y":0},
+            {"label":"U", "x":7, "y":0},
+            {"label":"I", "x":8, "y":0},
+            {"label":"O", "x":9, "y":0},
+            {"label":"P", "x":10, "y":0},
+            {"label":"|", "x":11, "y":0, "w":1.75},
+            {"label":"Caps Lock", "x":0, "y":1, "w":1.25},
+            {"label":"A", "x":1.25, "y":1},
+            {"label":"S", "x":2.25, "y":1},
+            {"label":"D", "x":3.25, "y":1},
+            {"label":"F", "x":4.25, "y":1},
+            {"label":"G", "x":5.25, "y":1},
+            {"label":"H", "x":6.25, "y":1},
+            {"label":"J", "x":7.25, "y":1},
+            {"label":"K", "x":8.25, "y":1},
+            {"label":"L", "x":9.25, "y":1},
+            {"label":":", "x":10.25, "y":1},
+            {"label":"\"", "x":11.25, "y":1, "w":1.5},
+            {"label":"Shift", "x":0, "y":2, "w":1.75},
+            {"label":"Z", "x":1.75, "y":2},
+            {"label":"X", "x":2.75, "y":2},
+            {"label":"C", "x":3.75, "y":2},
+            {"label":"V", "x":4.75, "y":2},
+            {"label":"B", "x":5.75, "y":2},
+            {"label":"N", "x":6.75, "y":2},
+            {"label":"M", "x":7.75, "y":2},
+            {"label":"<", "x":8.75, "y":2},
+            {"label":">", "x":9.75, "y":2},
+            {"label":"?", "x":10.75, "y":2},
+            {"x":11.75, "y":2},
+            {"label":"Ctrl", "x":0, "y":3, "w":1.25},
+            {"label":"Win", "x":1.25, "y":3, "w":1.5},
+            {"label":"Alt", "x":2.75, "y":3, "w":1.25},
+            {"x":4, "y":3, "w":2.25},
+            {"x":6.25, "y":3, "w":2},
+            {"x":8.25, "y":3, "w":1.5},
+            {"label":"Alt", "x":9.75, "y":3},
+            {"label":"Win", "x":10.75, "y":3},
+            {"label":"Menu", "x":11.75, "y":3} ]
+    },
+
+    "LAYOUT_command": {
+        "layout": [
+            {"label":"Tab", "x":0, "y":0},
+            {"label":"Q", "x":1, "y":0},
+            {"label":"W", "x":2, "y":0},
+            {"label":"E", "x":3, "y":0},
+            {"label":"R", "x":4, "y":0},
+            {"label":"T", "x":5, "y":0},
+            {"label":"Y", "x":6, "y":0},
+            {"label":"U", "x":7, "y":0},
+            {"label":"I", "x":8, "y":0},
+            {"label":"O", "x":9, "y":0},
+            {"label":"P", "x":10, "y":0},
+            {"label":"|", "x":11, "y":0, "w":1.75},
+            {"label":"Caps Lock", "x":0, "y":1, "w":1.25},
+            {"label":"A", "x":1.25, "y":1},
+            {"label":"S", "x":2.25, "y":1},
+            {"label":"D", "x":3.25, "y":1},
+            {"label":"F", "x":4.25, "y":1},
+            {"label":"G", "x":5.25, "y":1},
+            {"label":"H", "x":6.25, "y":1},
+            {"label":"J", "x":7.25, "y":1},
+            {"label":"K", "x":8.25, "y":1},
+            {"label":"L", "x":9.25, "y":1},
+            {"label":":", "x":10.25, "y":1},
+            {"label":"\"", "x":11.25, "y":1, "w":1.5},
+            {"label":"Shift", "x":0, "y":2, "w":1.75},
+            {"label":"Z", "x":1.75, "y":2},
+            {"label":"X", "x":2.75, "y":2},
+            {"label":"C", "x":3.75, "y":2},
+            {"label":"V", "x":4.75, "y":2},
+            {"label":"B", "x":5.75, "y":2},
+            {"label":"N", "x":6.75, "y":2},
+            {"label":"M", "x":7.75, "y":2},
+            {"label":"<", "x":8.75, "y":2},
+            {"label":">", "x":9.75, "y":2},
+            {"label":"?", "x":10.75, "y":2},
+            {"x":11.75, "y":2},
+            {"label":"Ctrl", "x":0, "y":3},
+            {"label":"Win", "x":1, "y":3},
+            {"label":"Alt", "x":2, "y":3},
+            {"x":3, "y":3},
+            {"x":4, "y":3, "w":2.25},
+            {"x":6.25, "y":3, "w":2},
+            {"x":8.25, "y":3, "w":1.5},
+            {"label":"Alt", "x":9.75, "y":3, "w":1.5},
+            {"label":"Win", "x":11.25, "y":3, "w":1.5} ]
+    },
+
+    "LAYOUT_arrow_command": {
+        "layout": [
+            {"label":"Tab", "x":0, "y":0},
+            {"label":"Q", "x":1, "y":0},
+            {"label":"W", "x":2, "y":0},
+            {"label":"E", "x":3, "y":0},
+            {"label":"R", "x":4, "y":0},
+            {"label":"T", "x":5, "y":0},
+            {"label":"Y", "x":6, "y":0},
+            {"label":"U", "x":7, "y":0},
+            {"label":"I", "x":8, "y":0},
+            {"label":"O", "x":9, "y":0},
+            {"label":"P", "x":10, "y":0},
+            {"label":"|", "x":11, "y":0, "w":1.75},
+            {"label":"Caps Lock", "x":0, "y":1, "w":1.25},
+            {"label":"A", "x":1.25, "y":1},
+            {"label":"S", "x":2.25, "y":1},
+            {"label":"D", "x":3.25, "y":1},
+            {"label":"F", "x":4.25, "y":1},
+            {"label":"G", "x":5.25, "y":1},
+            {"label":"H", "x":6.25, "y":1},
+            {"label":"J", "x":7.25, "y":1},
+            {"label":"K", "x":8.25, "y":1},
+            {"label":"L", "x":9.25, "y":1},
+            {"label":":", "x":10.25, "y":1},
+            {"label":"\"", "x":11.25, "y":1, "w":1.5},
+            {"label":"Shift", "x":0, "y":2, "w":1.75},
+            {"label":"Z", "x":1.75, "y":2},
+            {"label":"X", "x":2.75, "y":2},
+            {"label":"C", "x":3.75, "y":2},
+            {"label":"V", "x":4.75, "y":2},
+            {"label":"B", "x":5.75, "y":2},
+            {"label":"N", "x":6.75, "y":2},
+            {"label":"M", "x":7.75, "y":2},
+            {"label":"<", "x":8.75, "y":2},
+            {"label":">", "x":9.75, "y":2},
+            {"label":"?", "x":10.75, "y":2},
+            {"x":11.75, "y":2},
+            {"label":"Ctrl", "x":0, "y":3},
+            {"label":"Win", "x":1, "y":3},
+            {"label":"Alt", "x":2, "y":3},
+            {"x":3, "y":3},
+            {"x":4, "y":3, "w":2.25},
+            {"x":6.25, "y":3, "w":2},
+            {"x":8.25, "y":3, "w":1.5},
+            {"label":"Alt", "x":9.75, "y":3},
+            {"label":"Win", "x":10.75, "y":3},
+            {"label":"Menu", "x":11.75, "y":3} ]
+    }
+  }
+}
diff --git a/qmk/keyboards/beatervan/keymaps/default/keymap.c b/qmk/keyboards/beatervan/keymaps/default/keymap.c
new file mode 100644
index 00000000..a99b9c9e
--- /dev/null
+++ b/qmk/keyboards/beatervan/keymaps/default/keymap.c
@@ -0,0 +1,93 @@
+/* Copyright 2020 OJtheTiny
+ *
+ * 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
+
+enum layers {
+  _QW,
+  _DV,
+  _CM,
+  _L1,
+  _L2,
+  _L3,
+};
+
+enum custom_keycodes {
+  DVORAK = SAFE_RANGE,
+  QWERTY,
+  COLEMAK
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_QW] = LAYOUT( /* Qwerty */
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+    MO(_L1), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, MO(_L1),
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, MO(_L2),
+    KC_LCTL, MO(_L2), KC_LGUI,                   KC_ENT,  KC_SPC,                    KC_RALT, KC_ESC,  TG(_L3)
+  ),
+  [_DV] = LAYOUT( /* Dvorak */
+    KC_TAB,  KC_SLSH, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
+    MO(_L1), KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    MO(_L1),
+    KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    MO(_L2),
+    KC_LCTL, MO(_L2), KC_LGUI,                   KC_ENT,  KC_SPC,                    KC_RALT, KC_ESC,  TG(_L3)
+  ),
+  [_CM] = LAYOUT( /* Colemak */
+    KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
+    MO(_L1), KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    MO(_L1),
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, MO(_L2),
+    KC_LCTL, MO(_L2), KC_LGUI,                   KC_ENT,  KC_SPC,                    KC_RALT, KC_ESC,  TG(_L3)
+  ),
+  [_L1] = LAYOUT( /* LAYER 1 */
+    KC_GRV,  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL,
+    _______, KC_BSLS, KC_QUOT, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_DOWN, KC_UP,   KC_LEFT, KC_RGHT, _______,
+    _______, KC_ESC,  _______, KC_PSCR, _______, _______, _______, KC_MSTP, KC_MPLY, KC_MPRV, KC_MNXT, KC_RSFT,
+    _______, KC_LGUI, _______,                   _______, _______,                   _______, _______, _______
+  ),
+  [_L2] = LAYOUT( /* LAYER 2 */
+    _______, QWERTY,  DVORAK,  COLEMAK, _______, _______, _______, KC_7,    KC_8,    KC_9,    KC_0,    _______,
+    KC_ESC,  KC_PIPE, KC_DQUO, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_4,    KC_5,    KC_6,    KC_VOLU, KC_ENT,
+    _______, _______, _______, _______, _______, _______, KC_0,    KC_1,    KC_2,    KC_3,    KC_VOLD, _______,
+    _______, _______, _______,                   _______, _______,                   _______, _______, _______
+  ),
+  [_L3] = LAYOUT( /* LAYER 3 */
+    _______, _______, _______, _______, _______, _______, _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   _______,
+    KC_ESC,  _______, _______, _______, _______, _______, _______, KC_F5,   KC_F6,   KC_F7,   KC_F8,   _______,
+    KC_LSFT, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,
+    _______, KC_LSFT, KC_B,                      KC_SPC,  KC_C,                      _______, _______, _______
+  )
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+      switch(keycode) {
+        case DVORAK:
+          if (record->event.pressed) {
+            set_single_persistent_default_layer(_DV);
+          }
+          return false;
+        case QWERTY:
+          if (record->event.pressed) {
+            set_single_persistent_default_layer(_QW);
+          }
+          return false;
+        case COLEMAK:
+          if (record->event.pressed) {
+            set_single_persistent_default_layer(_CM);
+          }
+          return false;
+        default:
+          return true;
+      }
+    return true;
+};
diff --git a/qmk/keyboards/beatervan/keymaps/default/readme.md b/qmk/keyboards/beatervan/keymaps/default/readme.md
new file mode 100644
index 00000000..ac84c08c
--- /dev/null
+++ b/qmk/keyboards/beatervan/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for tv44
\ No newline at end of file
diff --git a/qmk/keyboards/beatervan/keymaps/oj/keymap.c b/qmk/keyboards/beatervan/keymaps/oj/keymap.c
new file mode 100644
index 00000000..6b32c4dd
--- /dev/null
+++ b/qmk/keyboards/beatervan/keymaps/oj/keymap.c
@@ -0,0 +1,93 @@
+/* Copyright 2020 OJtheTiny
+ *
+ * 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
+
+enum layers {
+  _QW,
+  _DV,
+  _CM,
+  _L1,
+  _L2,
+  _L3
+};
+enum custom_keycodes {
+  DVORAK = SAFE_RANGE,
+  QWERTY,
+  COLEMAK
+};
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_QW] = LAYOUT( /* Qwerty */
+    KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_DEL,
+    KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_QUOT, KC_ENTER,
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, MO(_L2),
+    KC_TAB,  MO(_L1), KC_LGUI,                   KC_SPC,  KC_BSPC,                   KC_LALT, KC_RALT, TG(_L3)
+  ),
+  [_DV] = LAYOUT( /* Dvorak */
+    KC_ESC,  KC_SLSH, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_QUOT,
+    KC_LCTL, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_ENTER,
+    KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    MO(_L2),
+    KC_TAB,  MO(_L1), KC_LGUI,                   KC_SPC,  KC_BSPC,                   KC_LALT, KC_RALT, TG(_L3)
+  ),
+  [_CM] = LAYOUT( /* Colemak */
+    KC_ESC,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_QUOT,
+    KC_LCTL, KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_ENTER,
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, MO(_L2),
+    KC_TAB,  MO(_L1), KC_LGUI,                   KC_SPC,  KC_BSPC,                   KC_LALT, KC_RALT, TG(_L3)
+  ),
+  [_L1] = LAYOUT( /* NUM */
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,
+    _______, _______, _______, _______, _______, _______, KC_LEFT, KC_UP,   KC_DOWN, KC_RGHT, KC_SCLN, KC_BSLS,
+    _______, _______, _______, KC_PSCR, _______, _______, _______, _______, KC_LBRC, KC_RBRC, KC_MINS, KC_EQL,
+    _______, _______, _______,                   _______, _______,                   _______, _______, _______
+  ),
+  [_L2] = LAYOUT( /* F Keys */
+    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,      KC_F10,     KC_F11,
+    _______, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, _______, _______, _______,    _______, KC_ENTER,
+    _______, QWERTY,  DVORAK,  COLEMAK, _______, _______, _______, _______, _______, _______,    _______,    _______,
+    _______, _______, _______,                   _______, _______,                   _______,    _______,    _______
+  ),
+  [_L3] = LAYOUT( /* Gaming */
+    KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   _______,
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    _______, _______, KC_F5,   KC_F6,   KC_F7,   KC_F8,   _______,
+    KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    _______, MO(_L2), KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,
+    KC_LSFT, KC_Z,    KC_B,                      KC_SPC,  KC_BSPC,                   _______, _______, TG(_L3)
+  )
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+      switch(keycode) {
+        case DVORAK:
+          if (record->event.pressed) {
+            set_single_persistent_default_layer(_DV);
+          }
+          return false;
+        case QWERTY:
+          if (record->event.pressed) {
+            set_single_persistent_default_layer(_QW);
+          }
+          return false;
+        case COLEMAK:
+          if (record->event.pressed) {
+            set_single_persistent_default_layer(_CM);
+          }
+          return false;
+        default:
+          return true;
+      }
+    return true;
+};
diff --git a/qmk/keyboards/beatervan/keymaps/oj/readme.md b/qmk/keyboards/beatervan/keymaps/oj/readme.md
new file mode 100644
index 00000000..34c2f075
--- /dev/null
+++ b/qmk/keyboards/beatervan/keymaps/oj/readme.md
@@ -0,0 +1 @@
+#Objectively superior keymap for v44
diff --git a/qmk/keyboards/beatervan/keymaps/via/keymap.c b/qmk/keyboards/beatervan/keymaps/via/keymap.c
new file mode 100644
index 00000000..938f9030
--- /dev/null
+++ b/qmk/keyboards/beatervan/keymaps/via/keymap.c
@@ -0,0 +1,48 @@
+/* Copyright 2020 OJtheTiny
+ *
+ * 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] = {
+     
+     /* Default Layer*/
+     [0] = LAYOUT(
+         KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
+         KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_QUOT, KC_ENTER,
+         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_LCTRL, KC_LGUI, KC_LALT,      KC_SPC, KC_TAB,            KC_RALT, KC_RGUI, KC_RCTL
+     ),
+     /* Num Layer */
+     [1] = LAYOUT(
+         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
+     ),
+    /* F-Layer */
+    [2] = LAYOUT(
+         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
+    ),
+    /* Lock Layer */
+    [3] = LAYOUT(
+         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
+    )
+};
diff --git a/qmk/keyboards/beatervan/keymaps/via/readme.md b/qmk/keyboards/beatervan/keymaps/via/readme.md
new file mode 100644
index 00000000..2e9d4517
--- /dev/null
+++ b/qmk/keyboards/beatervan/keymaps/via/readme.md
@@ -0,0 +1 @@
+# Via keymap for beatervan
diff --git a/qmk/keyboards/beatervan/keymaps/via/rules.mk b/qmk/keyboards/beatervan/keymaps/via/rules.mk
new file mode 100644
index 00000000..1e5b9980
--- /dev/null
+++ b/qmk/keyboards/beatervan/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/qmk/keyboards/beatervan/readme.md b/qmk/keyboards/beatervan/readme.md
new file mode 100644
index 00000000..2b7dd590
--- /dev/null
+++ b/qmk/keyboards/beatervan/readme.md
@@ -0,0 +1,13 @@
+# Beatervan (minivan)
+
+A Pro-Micro based Minivan with THT diodes
+
+Keyboard Maintainer: OJ  
+Hardware Supported: Beatervan PCB, 32u4 "pro-micro"  
+Hardware Availability: Private GB
+
+Make example for this keyboard (after setting up your build environment):
+
+    make beatervan: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).
diff --git a/qmk/keyboards/beatervan/rules.mk b/qmk/keyboards/beatervan/rules.mk
new file mode 100644
index 00000000..1ea4a84d
--- /dev/null
+++ b/qmk/keyboards/beatervan/rules.mk
@@ -0,0 +1,23 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # 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 = 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 = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality on B7 by default
+MIDI_ENABLE = no            # MIDI controls
+UNICODE_ENABLE = yes         # Unicode
+BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
+AUDIO_ENABLE = no           # Audio output on port C6
diff --git a/qmk/keyboards/bm16s/config.h b/qmk/keyboards/bm16s/config.h
index 379e59bd..83f5bbbe 100644
--- a/qmk/keyboards/bm16s/config.h
+++ b/qmk/keyboards/bm16s/config.h
@@ -2,8 +2,8 @@
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x6060
+#define VENDOR_ID       0x4B50 //KP
+#define PRODUCT_ID      0x016B
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    KPrepublic
 #define PRODUCT         bm16s
diff --git a/qmk/keyboards/bm16s/keymaps/via/keymap.c b/qmk/keyboards/bm16s/keymaps/via/keymap.c
new file mode 100644
index 00000000..71b0d2b0
--- /dev/null
+++ b/qmk/keyboards/bm16s/keymaps/via/keymap.c
@@ -0,0 +1,43 @@
+/* Copyright 2020 Relocks
+ *
+ * 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_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_TRNS, KC_VOLU,
+		BL_TOGG, BL_DEC,  BL_INC,  KC_VOLD,
+		RGB_TOG, RGB_MOD, RGB_HUI, KC_MUTE,
+		RGB_SAI, RGB_SAD, RGB_HUD, KC_TRNS
+	),
+	[2] = LAYOUT_ortho_4x4(
+		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
+	),
+	[3] = LAYOUT_ortho_4x4(
+		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
+	),
+};
diff --git a/qmk/keyboards/bm16s/keymaps/via/readme.md b/qmk/keyboards/bm16s/keymaps/via/readme.md
new file mode 100644
index 00000000..f5e43b90
--- /dev/null
+++ b/qmk/keyboards/bm16s/keymaps/via/readme.md
@@ -0,0 +1 @@
+# Via keymap for bm16s
diff --git a/qmk/keyboards/bm16s/keymaps/via/rules.mk b/qmk/keyboards/bm16s/keymaps/via/rules.mk
new file mode 100644
index 00000000..43061db1
--- /dev/null
+++ b/qmk/keyboards/bm16s/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
\ No newline at end of file
diff --git a/qmk/keyboards/bm40hsrgb/rules.mk b/qmk/keyboards/bm40hsrgb/rules.mk
index e83c0edb..426c99c9 100644
--- a/qmk/keyboards/bm40hsrgb/rules.mk
+++ b/qmk/keyboards/bm40hsrgb/rules.mk
@@ -19,7 +19,8 @@ NKRO_ENABLE = no            # USB Nkey Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 BLUETOOTH_ENABLE = no       # Enable Bluetooth
 AUDIO_ENABLE = no           # Audio output
-RGB_MATRIX_ENABLE = WS2812
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = WS2812
 
 LAYOUTS = planck_mit
 LAYOUTS_HAS_RGB = yes
diff --git a/qmk/keyboards/bm60poker/rules.mk b/qmk/keyboards/bm60poker/rules.mk
index 3f4a00ea..74364ace 100644
--- a/qmk/keyboards/bm60poker/rules.mk
+++ b/qmk/keyboards/bm60poker/rules.mk
@@ -20,5 +20,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 BLUETOOTH_ENABLE = no       # Enable Bluetooth
 AUDIO_ENABLE = no           # Audio output
-RGB_MATRIX_ENABLE = WS2812
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = WS2812
 LAYOUTS = 60_ansi
diff --git a/qmk/keyboards/bm60rgb/rules.mk b/qmk/keyboards/bm60rgb/rules.mk
index d888399c..9e0e3661 100644
--- a/qmk/keyboards/bm60rgb/rules.mk
+++ b/qmk/keyboards/bm60rgb/rules.mk
@@ -30,7 +30,8 @@ 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
-RGB_MATRIX_ENABLE = WS2812
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = WS2812
 LTO_ENABLE = yes
 
 # partially generated by KBFirmware JSON to QMK Parser
diff --git a/qmk/keyboards/bm60rgb_iso/rules.mk b/qmk/keyboards/bm60rgb_iso/rules.mk
index e5915538..8a550e63 100644
--- a/qmk/keyboards/bm60rgb_iso/rules.mk
+++ b/qmk/keyboards/bm60rgb_iso/rules.mk
@@ -20,5 +20,6 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 BLUETOOTH_ENABLE = no       # Enable Bluetooth
 AUDIO_ENABLE = no           # Audio output
-RGB_MATRIX_ENABLE = WS2812
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = WS2812
 LTO_ENABLE = yes
diff --git a/qmk/keyboards/boardrun/bizarre/bizarre.c b/qmk/keyboards/boardrun/bizarre/bizarre.c
new file mode 100644
index 00000000..10125f57
--- /dev/null
+++ b/qmk/keyboards/boardrun/bizarre/bizarre.c
@@ -0,0 +1,16 @@
+/*
+ * 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 "bizarre.h"
diff --git a/qmk/keyboards/boardrun/bizarre/bizarre.h b/qmk/keyboards/boardrun/bizarre/bizarre.h
new file mode 100644
index 00000000..656ab673
--- /dev/null
+++ b/qmk/keyboards/boardrun/bizarre/bizarre.h
@@ -0,0 +1,78 @@
+/*
+ * 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( \
+  k11,  k12, k117, k13, k14, k15, k16, k17,           k18, k19, k110, k111, k112, k113, k114, k115, k116, \
+  k21,      k22,   k23, k24, k25, k26, k27,           k28, k29, k210, k211, k212, k213, k214,   k215,  \
+           k32,    k33, k34, k35, k36, k37,           k38, k39, k310, k311, k312, k313, k314, k315,      \
+         k41, k42, k43, k44, k45, k46, k47, k57, k58, k48, k49, k410, k411, k412,      k413,    k415, \
+           k52,                   k55,    k56,        k59,                   k512,        k514, k515, k516 \
+) \
+{ \
+  { k11,   k12, k13,   k14,   k15, k16, k17, k18, k19, k110,  k111,  k112, k113,  k114,  k115, k116,  k117 }, \
+  { k21,   k22, k23,   k24,   k25, k26, k27, k28, k29, k210,  k211,  k212, k213,  k214,  k215, KC_NO, KC_NO }, \
+  { KC_NO, k32, k33,   k34,   k35, k36, k37, k38, k39, k310,  k311,  k312, k313,  k314,  k315, KC_NO, KC_NO }, \
+  { k41,   k42, k43,   k44,   k45, k46, k47, k48, k49, k410,  k411,  k412, k413,  KC_NO, k415, KC_NO, KC_NO }, \
+  { KC_NO, k52, KC_NO, KC_NO, k55, k56, k57, k58, k59, KC_NO, KC_NO, k512, KC_NO, k514,  k515, k516,  KC_NO } \
+}
+
+#define LAYOUT_ansi( \
+  k11,  k12, k117, k13, k14, k15, k16, k17,           k18, k19, k110, k111, k112, k113, k114, k115,   \
+  k21,      k22,   k23, k24, k25, k26, k27,           k28, k29, k210, k211, k212, k213, k214,   k215,  \
+           k32,    k33, k34, k35, k36, k37,           k38, k39, k310, k311, k312, k313,     k315,      \
+         k41,      k43, k44, k45, k46, k47, k57, k58, k48, k49, k410, k411, k412,     k413,     k415, \
+           k52,                   k55,    k56,        k59,                   k512,        k514, k515, k516 \
+) \
+{ \
+  { k11,   k12,   k13,   k14,   k15, k16, k17, k18, k19, k110,  k111,  k112, k113,  k114,  k115, KC_NO,  k117 }, \
+  { k21,   k22,   k23,   k24,   k25, k26, k27, k28, k29, k210,  k211,  k212, k213,  k214,  k215, KC_NO, KC_NO }, \
+  { KC_NO, k32,   k33,   k34,   k35, k36, k37, k38, k39, k310,  k311,  k312, k313,  KC_NO, k315, KC_NO, KC_NO }, \
+  { k41,   KC_NO, k43,   k44,   k45, k46, k47, k48, k49, k410,  k411,  k412, k413,  KC_NO, k415, KC_NO, KC_NO }, \
+  { KC_NO, k52,   KC_NO, KC_NO, k55, k56, k57, k58, k59, KC_NO, KC_NO, k512, KC_NO, k514,  k515, k516, KC_NO } \
+}
+
+#define LAYOUT_split_bs( \
+  k11,  k12, k117, k13, k14, k15, k16, k17,           k18, k19, k110, k111, k112, k113, k114, k115, k116,   \
+  k21,      k22,   k23, k24, k25, k26, k27,           k28, k29, k210, k211, k212, k213, k214,   k215,  \
+           k32,    k33, k34, k35, k36, k37,           k38, k39, k310, k311, k312, k313,     k315,      \
+         k41,      k43, k44, k45, k46, k47, k57, k58, k48, k49, k410, k411, k412,     k413,     k415, \
+           k52,                   k55,    k56,        k59,                   k512,        k514, k515, k516 \
+) \
+{ \
+  { k11,   k12,   k13,   k14,   k15, k16, k17, k18, k19, k110,  k111,  k112, k113,  k114,  k115, k116,  k117 }, \
+  { k21,   k22,   k23,   k24,   k25, k26, k27, k28, k29, k210,  k211,  k212, k213,  k214,  k215, KC_NO, KC_NO }, \
+  { KC_NO, k32,   k33,   k34,   k35, k36, k37, k38, k39, k310,  k311,  k312, k313,  KC_NO, k315, KC_NO, KC_NO }, \
+  { k41,   KC_NO, k43,   k44,   k45, k46, k47, k48, k49, k410,  k411,  k412, k413,  KC_NO, k415, KC_NO, KC_NO }, \
+  { KC_NO, k52,   KC_NO, KC_NO, k55, k56, k57, k58, k59, KC_NO, KC_NO, k512, KC_NO, k514,  k515, k516, KC_NO } \
+}
+
+#define LAYOUT_iso( \
+  k11,  k12, k117, k13, k14, k15, k16, k17,           k18, k19, k110, k111, k112, k113, k114,   k115,    \
+  k21,      k22,   k23, k24, k25, k26, k27,           k28, k29, k210, k211, k212, k213, k214,          \
+           k32,    k33, k34, k35, k36, k37,           k38, k39, k310, k311, k312, k313, k314, k315,    \
+         k41, k42, k43, k44, k45, k46, k47, k57, k58, k48, k49, k410, k411, k412,     k413,     k415, \
+           k52,                   k55,    k56,        k59,                   k512,        k514, k515, k516 \
+) \
+{ \
+  { k11,   k12, k13,   k14,   k15, k16, k17, k18, k19, k110,  k111,  k112, k113,  k114,  k115,  KC_NO,  k117 }, \
+  { k21,   k22, k23,   k24,   k25, k26, k27, k28, k29, k210,  k211,  k212, k213,  k214,  KC_NO, KC_NO, KC_NO }, \
+  { KC_NO, k32, k33,   k34,   k35, k36, k37, k38, k39, k310,  k311,  k312, k313,  k314,  k315,  KC_NO, KC_NO }, \
+  { k41,   k42, k43,   k44,   k45, k46, k47, k48, k49, k410,  k411,  k412, k413,  KC_NO, k415,  KC_NO, KC_NO }, \
+  { KC_NO, k52, KC_NO, KC_NO, k55, k56, k57, k58, k59, KC_NO, KC_NO, k512, KC_NO, k514,  k515,  k516,  KC_NO } \
+}
diff --git a/qmk/keyboards/boardrun/bizarre/config.h b/qmk/keyboards/boardrun/bizarre/config.h
new file mode 100644
index 00000000..6e08d1f4
--- /dev/null
+++ b/qmk/keyboards/boardrun/bizarre/config.h
@@ -0,0 +1,83 @@
+/*
+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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0xCDCD
+#define PRODUCT_ID      0x5339
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    shensmobile
+#define PRODUCT         Boardrun Bizarre
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 17
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+*/
+#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6 }
+#define MATRIX_COL_PINS { F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0, B3, B2, B1 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+// #define BACKLIGHT_PIN F5
+// #define BACKLIGHT_LEVELS 6
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 10
+
+/* 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
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+//#define NO_ACTION_MACRO
+//#define NO_ACTION_FUNCTION
+
+// ws2812 options
+#define RGB_DI_PIN B7 // pin the DI on the ws2812 is hooked-up to
+#define RGBLIGHT_ANIMATIONS // run RGB animations
+#define RGBLED_NUM 15 // number of LEDs
+#define RGBLIGHT_HUE_STEP 12 // units to step when in/decreasing hue
+#define RGBLIGHT_SAT_STEP 25 // units to step when in/decresing saturation
+#define RGBLIGHT_VAL_STEP 12 // units to step when in/decreasing value (brightness)
diff --git a/qmk/keyboards/boardrun/bizarre/info.json b/qmk/keyboards/boardrun/bizarre/info.json
new file mode 100644
index 00000000..3a100287
--- /dev/null
+++ b/qmk/keyboards/boardrun/bizarre/info.json
@@ -0,0 +1,397 @@
+{
+    "keyboard_name": "Boardrun Bizarre",
+    "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/boardrun/bizarre",
+    "maintainer": "QMK Community",
+    "manufacturer": "shensmobile",
+    "width": 21,
+    "height": 5,
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"y":0, "x":0,    "label":"Home"},   
+                
+                {"y":0, "x":1.5,  "label":"Esc"},    
+                {"y":0, "x":2.5,  "label":"`"},      
+                {"y":0, "x":3.5,  "label":"1"}, 
+                
+                {"y":0, "x":4.75, "label":"2"},          
+                {"y":0, "x":5.75, "label":"3"},        
+                {"y":0, "x":6.75, "label":"4"},
+                {"y":0, "x":7.75, "label":"5"},        
+                
+                {"y":0, "x":11.25,"label":"6"},
+                {"y":0, "x":12.25,"label":"7"},
+                {"y":0, "x":13.25,"label":"8"},
+                {"y":0, "x":14.25,"label":"9"},
+                
+                {"y":0, "x":15.5, "label":"0"},
+                {"y":0, "x":16.5, "label":"-"},
+                {"y":0, "x":17.5, "label":"="},
+                {"y":0, "x":18.5, "label":"Backspace"},
+                {"y":0, "x":19.5, "label":"Bksp (Split)"},
+                
+                
+                {"y":1, "x":0,    "label":"End"},  
+                
+                {"y":1, "x":1.75, "label":"Tab", "w":1.5},  
+                {"y":1, "x":3.25, "label":"Q"},  
+                    
+                {"y":1, "x":4.75, "label":"W"},          
+                {"y":1, "x":5.75, "label":"E"},        
+                {"y":1, "x":6.75, "label":"R"},
+                {"y":1, "x":7.75, "label":"T"},
+                
+                {"y":1, "x":11.25,"label":"Y"},
+                {"y":1, "x":12.25,"label":"U"},
+                {"y":1, "x":13.25,"label":"I"},
+                {"y":1, "x":14.25,"label":"O"},
+                
+                {"y":1, "x":15.75,"label":"P"},
+                {"y":1, "x":16.75,"label":"["},
+                {"y":1, "x":17.75,"label":"]"},
+                {"y":1, "x":18.75,"label":"\\| (ANSI)", "w":1.5},
+                
+                
+                {"y":2, "x":1.25, "label":"Caps Lock", "w":1.75},
+                {"y":2, "x":3,    "label":"A"},
+                
+                {"y":2, "x":4.75, "label":"S"},          
+                {"y":2, "x":5.75, "label":"D"},        
+                {"y":2, "x":6.75, "label":"F"},
+                {"y":2, "x":7.75, "label":"G"},
+                
+                {"y":2, "x":11.25,"label":"H"},
+                {"y":2, "x":12.25,"label":"J"},
+                {"y":2, "x":13.25,"label":"K"},
+                {"y":2, "x":14.25,"label":"L"},
+                
+                {"y":2, "x":16,   "label":";"},
+                {"y":2, "x":17,   "label":"'"},
+                {"y":2, "x":18,   "label":"#~ (ISO)"},
+                {"y":2, "x":19,   "label":"Enter (ANSI or ISO)", "w":1.25},
+                
+                
+                {"y":3, "x":0.5,  "label":"Shift", "w":1.25},
+                {"y":3, "x":1.75, "label":"\\| (ISO)"},
+                {"y":3, "x":2.75, "label":"Z"},
+                
+                {"y":3, "x":4.75, "label":"X"},          
+                {"y":3, "x":5.75, "label":"C"},        
+                {"y":3, "x":6.75, "label":"V"},
+                {"y":3, "x":7.75, "label":"B"},
+                {"y":3, "x":8.75, "label":"Super"},
+                
+                {"y":3, "x":10.25,"label":"Fn"},
+                {"y":3, "x":11.25,"label":"N"},
+                {"y":3, "x":12.25,"label":"M"},
+                {"y":3, "x":13.25,"label":","},
+                {"y":3, "x":14.25,"label":"."},
+                
+                {"y":3, "x":16.25,"label":"/"},
+                {"y":3, "x":17.25,"label":"Shift", "w":1.75},
+                {"y":3, "x":19,   "label":"Up"},
+                
+                
+                {"y":4, "x":1.25, "label":"Control", "w":1.5},
+                
+                {"y":4, "x":6.25, "label":"Alt", "w":1.5},
+                {"y":4, "x":7.75, "label":"Space", "w":2},
+                
+                {"y":4, "x":10.25,"label":"Space", "w":2.75},
+                {"y":4, "x":16.5, "label":"Control", "w":1.5},
+                {"y":4, "x":18,   "label":"Left"},
+                {"y":4, "x":19,   "label":"Down"},
+                {"y":4, "x":20,   "label":"Right"}
+            ]
+        },
+        "LAYOUT_ansi": {
+            "layout": [
+                {"y":0, "x":0,    "label":"Home"},   
+                
+                {"y":0, "x":1.5,  "label":"Esc"},    
+                {"y":0, "x":2.5,  "label":"`"},      
+                {"y":0, "x":3.5,  "label":"1"}, 
+                
+                {"y":0, "x":4.75, "label":"2"},          
+                {"y":0, "x":5.75, "label":"3"},        
+                {"y":0, "x":6.75, "label":"4"},
+                {"y":0, "x":7.75, "label":"5"},        
+                
+                {"y":0, "x":11.25,"label":"6"},
+                {"y":0, "x":12.25,"label":"7"},
+                {"y":0, "x":13.25,"label":"8"},
+                {"y":0, "x":14.25,"label":"9"},
+                
+                {"y":0, "x":15.5, "label":"0"},
+                {"y":0, "x":16.5, "label":"-"},
+                {"y":0, "x":17.5, "label":"="},
+                {"y":0, "x":18.5, "label":"Backspace", "w":2},
+                
+                
+                {"y":1, "x":0,    "label":"End"},  
+                
+                {"y":1, "x":1.75, "label":"Tab", "w":1.5},  
+                {"y":1, "x":3.25, "label":"Q"},  
+                    
+                {"y":1, "x":4.75, "label":"W"},          
+                {"y":1, "x":5.75, "label":"E"},        
+                {"y":1, "x":6.75, "label":"R"},
+                {"y":1, "x":7.75, "label":"T"},
+                
+                {"y":1, "x":11.25,"label":"Y"},
+                {"y":1, "x":12.25,"label":"U"},
+                {"y":1, "x":13.25,"label":"I"},
+                {"y":1, "x":14.25,"label":"O"},
+                
+                {"y":1, "x":15.75,"label":"P"},
+                {"y":1, "x":16.75,"label":"["},
+                {"y":1, "x":17.75,"label":"]"},
+                {"y":1, "x":18.75,"label":"\\", "w":1.5},
+                
+                
+                {"y":2, "x":1.25, "label":"Caps Lock", "w":1.75},
+                {"y":2, "x":3,    "label":"A"},
+                
+                {"y":2, "x":4.75, "label":"S"},          
+                {"y":2, "x":5.75, "label":"D"},        
+                {"y":2, "x":6.75, "label":"F"},
+                {"y":2, "x":7.75, "label":"G"},
+                
+                {"y":2, "x":11.25,"label":"H"},
+                {"y":2, "x":12.25,"label":"J"},
+                {"y":2, "x":13.25,"label":"K"},
+                {"y":2, "x":14.25,"label":"L"},
+                
+                {"y":2, "x":16,   "label":";"},
+                {"y":2, "x":17,   "label":"'"},
+                {"y":2, "x":18,   "label":"Enter", "w":2.25},
+                
+                
+                {"y":3, "x":0.5,  "label":"Shift", "w":2.25},
+                {"y":3, "x":2.75, "label":"Z"},
+                
+                {"y":3, "x":4.75, "label":"X"},          
+                {"y":3, "x":5.75, "label":"C"},        
+                {"y":3, "x":6.75, "label":"V"},
+                {"y":3, "x":7.75, "label":"B"},
+                {"y":3, "x":8.75, "label":"Super"},
+                
+                {"y":3, "x":10.25,"label":"Fn"},
+                {"y":3, "x":11.25,"label":"N"},
+                {"y":3, "x":12.25,"label":"M"},
+                {"y":3, "x":13.25,"label":","},
+                {"y":3, "x":14.25,"label":"."},
+                
+                {"y":3, "x":16.25,"label":"/"},
+                {"y":3, "x":17.25,"label":"Shift", "w":1.75},
+                {"y":3, "x":19,   "label":"Up"},
+                
+                
+                {"y":4, "x":1.25, "label":"Control", "w":1.5},
+                
+                {"y":4, "x":6.25, "label":"Alt", "w":1.5},
+                {"y":4, "x":7.75, "label":"Space", "w":2},
+                
+                {"y":4, "x":10.25,"label":"Space", "w":2.75},
+                {"y":4, "x":16.5, "label":"Control", "w":1.5},
+                {"y":4, "x":18,   "label":"Left"},
+                {"y":4, "x":19,   "label":"Down"},
+                {"y":4, "x":20,   "label":"Right"}
+            ]
+        },
+        "LAYOUT_split_bs": {
+            "layout": [
+                {"y":0, "x":0,    "label":"Home"},   
+                
+                {"y":0, "x":1.5,  "label":"Esc"},    
+                {"y":0, "x":2.5,  "label":"`"},      
+                {"y":0, "x":3.5,  "label":"1"}, 
+                
+                {"y":0, "x":4.75, "label":"2"},          
+                {"y":0, "x":5.75, "label":"3"},        
+                {"y":0, "x":6.75, "label":"4"},
+                {"y":0, "x":7.75, "label":"5"},        
+                
+                {"y":0, "x":11.25,"label":"6"},
+                {"y":0, "x":12.25,"label":"7"},
+                {"y":0, "x":13.25,"label":"8"},
+                {"y":0, "x":14.25,"label":"9"},
+                
+                {"y":0, "x":15.5, "label":"0"},
+                {"y":0, "x":16.5, "label":"-"},
+                {"y":0, "x":17.5, "label":"="},
+                {"y":0, "x":18.5, "label":"\\"},
+                {"y":0, "x":19.5, "label":"Del"},
+                
+                
+                {"y":1, "x":0,    "label":"End"},  
+                
+                {"y":1, "x":1.75, "label":"Tab", "w":1.5},  
+                {"y":1, "x":3.25, "label":"Q"},  
+                    
+                {"y":1, "x":4.75, "label":"W"},          
+                {"y":1, "x":5.75, "label":"E"},        
+                {"y":1, "x":6.75, "label":"R"},
+                {"y":1, "x":7.75, "label":"T"},
+                
+                {"y":1, "x":11.25,"label":"Y"},
+                {"y":1, "x":12.25,"label":"U"},
+                {"y":1, "x":13.25,"label":"I"},
+                {"y":1, "x":14.25,"label":"O"},
+                
+                {"y":1, "x":15.75,"label":"P"},
+                {"y":1, "x":16.75,"label":"["},
+                {"y":1, "x":17.75,"label":"]"},
+                {"y":1, "x":18.75,"label":"Backspace", "w":1.5},
+                
+                
+                {"y":2, "x":1.25, "label":"Control", "w":1.75},
+                {"y":2, "x":3,    "label":"A"},
+                
+                {"y":2, "x":4.75, "label":"S"},          
+                {"y":2, "x":5.75, "label":"D"},        
+                {"y":2, "x":6.75, "label":"F"},
+                {"y":2, "x":7.75, "label":"G"},
+                
+                {"y":2, "x":11.25,"label":"H"},
+                {"y":2, "x":12.25,"label":"J"},
+                {"y":2, "x":13.25,"label":"K"},
+                {"y":2, "x":14.25,"label":"L"},
+                
+                {"y":2, "x":16,   "label":";"},
+                {"y":2, "x":17,   "label":"'"},
+                {"y":2, "x":18,   "label":"Enter", "w":2.25},
+                
+                
+                {"y":3, "x":0.5,  "label":"Shift", "w":2.25},
+                {"y":3, "x":2.75, "label":"Z"},
+                
+                {"y":3, "x":4.75, "label":"X"},          
+                {"y":3, "x":5.75, "label":"C"},        
+                {"y":3, "x":6.75, "label":"V"},
+                {"y":3, "x":7.75, "label":"B"},
+                {"y":3, "x":8.75, "label":"Super"},
+                
+                {"y":3, "x":10.25,"label":"Fn"},
+                {"y":3, "x":11.25,"label":"N"},
+                {"y":3, "x":12.25,"label":"M"},
+                {"y":3, "x":13.25,"label":","},
+                {"y":3, "x":14.25,"label":"."},
+                
+                {"y":3, "x":16.25,"label":"/"},
+                {"y":3, "x":17.25,"label":"Shift", "w":1.75},
+                {"y":3, "x":19,   "label":"Up"},
+                
+                
+                {"y":4, "x":1.25, "label":"Control", "w":1.5},
+                
+                {"y":4, "x":6.25, "label":"Alt", "w":1.5},
+                {"y":4, "x":7.75, "label":"Space", "w":2},
+                
+                {"y":4, "x":10.25,"label":"Space", "w":2.75},
+                {"y":4, "x":16.5, "label":"Control", "w":1.5},
+                {"y":4, "x":18,   "label":"Left"},
+                {"y":4, "x":19,   "label":"Down"},
+                {"y":4, "x":20,   "label":"Right"}
+            ]
+        },
+        "LAYOUT_iso": {
+            "layout": [
+                {"y":0, "x":0,    "label":"Home"},   
+                
+                {"y":0, "x":1.5,  "label":"Esc"},    
+                {"y":0, "x":2.5,  "label":"`"},      
+                {"y":0, "x":3.5,  "label":"1"}, 
+                
+                {"y":0, "x":4.75, "label":"2"},          
+                {"y":0, "x":5.75, "label":"3"},        
+                {"y":0, "x":6.75, "label":"4"},
+                {"y":0, "x":7.75, "label":"5"},        
+                
+                {"y":0, "x":11.25,"label":"6"},
+                {"y":0, "x":12.25,"label":"7"},
+                {"y":0, "x":13.25,"label":"8"},
+                {"y":0, "x":14.25,"label":"9"},
+                
+                {"y":0, "x":15.5, "label":"0"},
+                {"y":0, "x":16.5, "label":"-"},
+                {"y":0, "x":17.5, "label":"="},
+                {"y":0, "x":18.5, "label":"Backspace", "w":2},
+                
+                
+                {"y":1, "x":0,    "label":"End"},  
+                
+                {"y":1, "x":1.75, "label":"Tab", "w":1.5},  
+                {"y":1, "x":3.25, "label":"Q"},  
+                    
+                {"y":1, "x":4.75, "label":"W"},          
+                {"y":1, "x":5.75, "label":"E"},        
+                {"y":1, "x":6.75, "label":"R"},
+                {"y":1, "x":7.75, "label":"T"},
+                
+                {"y":1, "x":11.25,"label":"Y"},
+                {"y":1, "x":12.25,"label":"U"},
+                {"y":1, "x":13.25,"label":"I"},
+                {"y":1, "x":14.25,"label":"O"},
+                
+                {"y":1, "x":15.75,"label":"P"},
+                {"y":1, "x":16.75,"label":"["},
+                {"y":1, "x":17.75,"label":"]"},
+                
+                
+                {"y":2, "x":1.25, "label":"Caps Lock", "w":1.75},
+                {"y":2, "x":3,    "label":"A"},
+                
+                {"y":2, "x":4.75, "label":"S"},          
+                {"y":2, "x":5.75, "label":"D"},        
+                {"y":2, "x":6.75, "label":"F"},
+                {"y":2, "x":7.75, "label":"G"},
+                
+                {"y":2, "x":11.25,"label":"H"},
+                {"y":2, "x":12.25,"label":"J"},
+                {"y":2, "x":13.25,"label":"K"},
+                {"y":2, "x":14.25,"label":"L"},
+                
+                {"y":2, "x":16,   "label":";"},
+                {"y":2, "x":17,   "label":"'"},
+                {"y":2, "x":18,   "label":"#"},
+                {"y":1, "x":19,   "label":"Enter", "w":1.25, "h":2},
+                
+                
+                {"y":3, "x":0.5,  "label":"Shift", "w":1.25},
+                {"y":3, "x":1.75, "label":"\\"},
+                {"y":3, "x":2.75, "label":"Z"},
+                
+                {"y":3, "x":4.75, "label":"X"},          
+                {"y":3, "x":5.75, "label":"C"},        
+                {"y":3, "x":6.75, "label":"V"},
+                {"y":3, "x":7.75, "label":"B"},
+                {"y":3, "x":8.75, "label":"Super"},
+                
+                {"y":3, "x":10.25,"label":"Fn"},
+                {"y":3, "x":11.25,"label":"N"},
+                {"y":3, "x":12.25,"label":"M"},
+                {"y":3, "x":13.25,"label":","},
+                {"y":3, "x":14.25,"label":"."},
+                
+                {"y":3, "x":16.25,"label":"/"},
+                {"y":3, "x":17.25,"label":"Shift", "w":1.75},
+                {"y":3, "x":19,   "label":"Up"},
+                
+                
+                {"y":4, "x":1.25, "label":"Control", "w":1.5},
+                
+                {"y":4, "x":6.25, "label":"Alt", "w":1.5},
+                {"y":4, "x":7.75, "label":"Space", "w":2},
+                
+                {"y":4, "x":10.25,"label":"Space", "w":2.75},
+                {"y":4, "x":16.5, "label":"Control", "w":1.5},
+                {"y":4, "x":18,   "label":"Left"},
+                {"y":4, "x":19,   "label":"Down"},
+                {"y":4, "x":20,   "label":"Right"}
+            ]
+        }
+        
+    }
+
+}
diff --git a/qmk/keyboards/boardrun/bizarre/keymaps/default/keymap.c b/qmk/keyboards/boardrun/bizarre/keymaps/default/keymap.c
new file mode 100644
index 00000000..49c2f1a7
--- /dev/null
+++ b/qmk/keyboards/boardrun/bizarre/keymaps/default/keymap.c
@@ -0,0 +1,71 @@
+/*
+ * 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
+
+#define _FUNC   MO(_FNBIZARRE)
+
+// Layer shorthand
+enum layer_names {
+    _BIZARRE,
+    _FNBIZARRE,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    /*Bizarre Base Layer (defaults for "any" layout)
+    * +-------+   +-----------------------+ +-------------------------------+                   +-------------------------------+ +---------------------------------------+
+    * � HOME  �   � ESC   � `~    � 1     � � 2     � 3     � 4     � 5     �                   � 6     � 7     � 8     � 9     � � 0     � -     � =     � BKSP  � DEL   �
+    * +-------�   +-----------------------+ +-------+-------+-------+-------�                   +-------+-------+-------+-------� +---------------------------------------+
+    * � END   �     � TAB       � Q     �   � W     � E     � R     � T     �                   � Y     � U     � I     � O     �   � P     � [     � ]     � \ ANSI    �
+    * +-------+ +-----------------------+   +-------+-------+-------+-------�                   +-------+-------+-------+-------�   +-----------------------------------�
+    *           � CAPS        � A     �     � S     � D     � F     � G     �                   � H     � J     � K     � L     �     � ;     � '     � # ISO � ENTER   �
+    *     +---------------------------+     +-------+-------+-------+-------+-------+   +-------+-------+-------+-------+-------�     +-----------------------+---------+
+    *     � LSHIFT  � \ ISO � Z     �       � X     � C     � V     � B     � LGUI  �   � FN    � N     � M     � ,     � .     �       � /     � RSHIFT      � UP    �
+    *     +-----------------+-------+       +-----------------------+---------------�   +---------------------------------------+       +---------------------+-------+-------+
+    *           � LCTRL     �                           � LALT      � SPACE         �   � SPACE               �                           � RCTRL     � LEFT  � DOWN  � RIGHT �
+    *           +-----------+                           +---------------------------+   +---------------------+                           +-----------------------------------+
+    */
+    
+    [_BIZARRE] = LAYOUT_all(
+       KC_HOME,    KC_ESC, 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_DEL,
+       KC_END,       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_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_LGUI,    _FUNC,  KC_N,   KC_M,   KC_COMM,KC_DOT,         KC_SLSH,KC_RSFT,      KC_UP,
+                 KC_LCTL,                                KC_LALT,    KC_SPC,             KC_SPC,                                           KC_RCTL,    KC_LEFT,KC_DOWN,KC_RGHT
+    ), 
+    
+    /*Bizarre Function Layer
+    * +-------+   +-----------------------+ +-------------------------------+                   +-------------------------------+ +---------------------------------------+
+    * � RESET �   �       �       � F1    � � F2    � F3    � F4    � F5    �                   � F6    � F7    � F8    � F9    � � F10   � F11   � F12   � DEL   �       �
+    * +-------�   +-----------------------+ +-------+-------+-------+-------�                   +-------+-------+-------+-------� +---------------------------------------+
+    * �       �     �           �       �   �       �       �       �       �                   �       �       � INS   �       �   � PRINT �       �       �           �
+    * +-------+ +-----------------------+   +-------+-------+-------+-------�                   +-------+-------+-------+-------�   +-----------------------------------�
+    *           �             �       �     � SCRLL �       �       �       �                   �       �       �       �       �     �       �       �       �         �
+    *     +---------------------------+     +-------+-------+-------+-------+-------+   +-------+-------+-------+-------+-------�     +-----------------------+---------+
+    *     �         �       �       �       �       �       �       � PAUSE � RGUI  �   �       �       � MENU  �       �       �       �       �             � PGUP  �
+    *     +-----------------+-------+       +-----------------------+---------------�   +---------------------------------------+       +---------------------+-------+-------+
+    *           �           �                           �           �               �   � RALT                �                           �           � HOME  � PGDN  � END   �
+    *           +-----------+                           +---------------------------+   +---------------------+                           +-----------------------------------+
+    */
+    
+    [_FNBIZARRE] = LAYOUT_all(
+       RESET,     _______,_______,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_DEL, _______,
+       _______,      _______,    _______,    _______,_______,RESET,  _______,                    _______,_______,KC_INS ,_______,    KC_PSCR,_______,_______,_______,
+                 _______,      _______,      KC_SLCK,_______,_______,_______,                    _______,_______,_______,_______,      _______,_______,_______,_______,
+           _______,  _______,_______,        _______,_______,_______,KC_PAUS,KC_RGUI,    _______,_______,KC_MENU,_______,_______,        _______,_______,      KC_PGUP,
+                 _______,                                _______,    _______,            KC_RALT,                                          _______,    KC_HOME,KC_PGDN,KC_END
+    )
+};
\ No newline at end of file
diff --git a/qmk/keyboards/boardrun/bizarre/keymaps/nopunin10did/keymap.c b/qmk/keyboards/boardrun/bizarre/keymaps/nopunin10did/keymap.c
new file mode 100644
index 00000000..c0653be0
--- /dev/null
+++ b/qmk/keyboards/boardrun/bizarre/keymaps/nopunin10did/keymap.c
@@ -0,0 +1,50 @@
+/*
+ * 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
+
+#define _FUNC   MO(_FN)
+#define _LSADEL LSA_T(KC_DEL)
+#define _AGRHOM RALT_T(KC_HOME)
+#define _CTLEND RCTL_T(KC_END)
+#define _CTLALT LCTL(KC_LALT)
+#define _LSNUBS LSFT_T(KC_NUBS)
+#define _MINMIZ LGUI(KC_D)
+
+// Layer shorthand
+enum layer_names {
+    _ZERO,
+    _FN,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    
+    [_ZERO] = LAYOUT_ansi(
+       KC_ESC,    KC_BSLS,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_TAB,   KC_Q,       KC_W,   KC_E,   KC_R,   KC_T,                       KC_Y,   KC_U,   KC_I,   KC_O,       KC_P,   KC_LBRC,KC_RBRC,KC_BSPC,
+                 KC_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_LSFT,          KC_Z,           KC_X,   KC_C,   KC_V,   KC_B,   _LSADEL,    KC_LGUI,KC_N,   KC_M,   KC_COMM,KC_DOT,         KC_SLSH,KC_RSFT,      KC_UP,
+                 _FUNC,                                  KC_LALT,    KC_SPC,             _AGRHOM,                                          _CTLEND,    KC_LEFT,KC_DOWN,KC_RGHT
+    ), 
+
+    
+    [_FN] = LAYOUT_ansi(
+       _MINMIZ,   _______,_______,   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_CALC,      _______,    _______,    _______,_______,RESET,  _______,                    _______,_______,KC_INS ,_______,    KC_PSCR,_______,_______,_______,
+                 KC_CAPS,      _______,      KC_SLCK,_______,_______,_______,                    _______,_______,_______,_______,      _______,_______,_______,
+           _LSNUBS,          _______,        _______,_______,_______,KC_PAUS,_______,    KC_RGUI,_______,KC_MENU,_______,_______,        _______,_______,      KC_PGUP,
+                 _______,                                _CTLALT,    KC_DEL,             _______,                                          _______,    _______,KC_PGDN,_______
+    )
+};
diff --git a/qmk/keyboards/boardrun/bizarre/keymaps/via/keymap.c b/qmk/keyboards/boardrun/bizarre/keymaps/via/keymap.c
new file mode 100644
index 00000000..d4d2fee9
--- /dev/null
+++ b/qmk/keyboards/boardrun/bizarre/keymaps/via/keymap.c
@@ -0,0 +1,81 @@
+/*
+ * 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] = {
+
+    /*Bizarre Base Layer (defaults for "any" layout)
+    * +-------+   +-----------------------+ +-------------------------------+                   +-------------------------------+ +---------------------------------------+
+    * ¦ HOME  ¦   ¦ ESC   ¦ `~    ¦ 1     ¦ ¦ 2     ¦ 3     ¦ 4     ¦ 5     ¦                   ¦ 6     ¦ 7     ¦ 8     ¦ 9     ¦ ¦ 0     ¦ -     ¦ =     ¦ BKSP  ¦ DEL   ¦
+    * +-------¦   +-----------------------+ +-------+-------+-------+-------¦                   +-------+-------+-------+-------¦ +---------------------------------------+
+    * ¦ END   ¦     ¦ TAB       ¦ Q     ¦   ¦ W     ¦ E     ¦ R     ¦ T     ¦                   ¦ Y     ¦ U     ¦ I     ¦ O     ¦   ¦ P     ¦ [     ¦ ]     ¦ \ ANSI    ¦
+    * +-------+ +-----------------------+   +-------+-------+-------+-------¦                   +-------+-------+-------+-------¦   +-----------------------------------¦
+    *           ¦ CAPS        ¦ A     ¦     ¦ S     ¦ D     ¦ F     ¦ G     ¦                   ¦ H     ¦ J     ¦ K     ¦ L     ¦     ¦ ;     ¦ '     ¦ # ISO ¦ ENTER   ¦
+    *     +---------------------------+     +-------+-------+-------+-------+-------+   +-------+-------+-------+-------+-------¦     +-----------------------+---------+
+    *     ¦ LSHIFT  ¦ \ ISO ¦ Z     ¦       ¦ X     ¦ C     ¦ V     ¦ B     ¦ LGUI  ¦   ¦ MO    ¦ N     ¦ M     ¦ ,     ¦ .     ¦       ¦ /     ¦ RSHIFT      ¦ UP    ¦
+    *     +-----------------+-------+       +-----------------------+---------------¦   +---------------------------------------+       +---------------------+-------+-------+
+    *           ¦ LCTRL     ¦                           ¦ LALT      ¦ SPACE         ¦   ¦ SPACE               ¦                           ¦ RCTRL     ¦ LEFT  ¦ DOWN  ¦ RIGHT ¦
+    *           +-----------+                           +---------------------------+   +---------------------+                           +-----------------------------------+
+    */
+    
+    [0] = LAYOUT_all(
+       KC_HOME,    KC_ESC, 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_DEL,
+       KC_END,       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_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_LGUI,    MO(1),  KC_N,   KC_M,   KC_COMM,KC_DOT,         KC_SLSH,KC_RSFT,      KC_UP,
+                 KC_LCTL,                                KC_LALT,    KC_SPC,             KC_SPC,                                           KC_RCTL,    KC_LEFT,KC_DOWN,KC_RGHT
+    ), 
+    
+    /*Bizarre Function Layer
+    * +-------+   +-----------------------+ +-------------------------------+                   +-------------------------------+ +---------------------------------------+
+    * ¦ RESET ¦   ¦       ¦       ¦ F1    ¦ ¦ F2    ¦ F3    ¦ F4    ¦ F5    ¦                   ¦ F6    ¦ F7    ¦ F8    ¦ F9    ¦ ¦ F10   ¦ F11   ¦ F12   ¦ DEL   ¦       ¦
+    * +-------¦   +-----------------------+ +-------+-------+-------+-------¦                   +-------+-------+-------+-------¦ +---------------------------------------+
+    * ¦       ¦     ¦           ¦       ¦   ¦       ¦       ¦       ¦       ¦                   ¦       ¦       ¦ INS   ¦       ¦   ¦ PRINT ¦       ¦       ¦           ¦
+    * +-------+ +-----------------------+   +-------+-------+-------+-------¦                   +-------+-------+-------+-------¦   +-----------------------------------¦
+    *           ¦             ¦       ¦     ¦ SCRLL ¦       ¦       ¦       ¦                   ¦       ¦       ¦       ¦       ¦     ¦       ¦       ¦       ¦         ¦
+    *     +---------------------------+     +-------+-------+-------+-------+-------+   +-------+-------+-------+-------+-------¦     +-----------------------+---------+
+    *     ¦         ¦       ¦       ¦       ¦       ¦       ¦       ¦ PAUSE ¦ RGUI  ¦   ¦       ¦       ¦ MENU  ¦       ¦       ¦       ¦       ¦             ¦ PGUP  ¦
+    *     +-----------------+-------+       +-----------------------+---------------¦   +---------------------------------------+       +---------------------+-------+-------+
+    *           ¦           ¦                           ¦           ¦               ¦   ¦ RALT                ¦                           ¦           ¦ HOME  ¦ PGDN  ¦ END   ¦
+    *           +-----------+                           +---------------------------+   +---------------------+                           +-----------------------------------+
+    */
+    
+    [1] = LAYOUT_all(
+       RESET,     _______,_______,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_DEL, _______,
+       _______,      _______,    _______,    _______,_______,RESET,  _______,                    _______,_______,KC_INS ,_______,    KC_PSCR,_______,_______,_______,
+                 _______,      _______,      KC_SLCK,_______,_______,_______,                    _______,_______,_______,_______,      _______,_______,_______,_______,
+           _______,  _______,_______,        _______,_______,_______,KC_PAUS,KC_RGUI,    _______,_______,KC_MENU,_______,_______,        _______,_______,      KC_PGUP,
+                 _______,                                _______,    _______,            KC_RALT,                                          _______,    KC_HOME,KC_PGDN,KC_END
+    ),
+
+    [2] = LAYOUT_all(
+       _______,     _______,_______,_______, _______,_______,_______,_______,                    _______,_______,_______,_______,    _______,_______,_______,_______,_______,
+       _______,      _______,    _______,    _______,_______,_______,_______,                    _______,_______,_______,_______,    _______,_______,_______,_______,
+                 _______,      _______,      _______,_______,_______,_______,                    _______,_______,_______,_______,      _______,_______,_______,_______,
+           _______,  _______,_______,        _______,_______,_______,_______,_______,    _______,_______,_______,_______,_______,        _______,_______,      _______,
+                 _______,                                _______,    _______,            _______,                                          _______,    _______,_______,_______
+    ),
+
+    [3] = LAYOUT_all(
+       _______,     _______,_______,_______, _______,_______,_______,_______,                    _______,_______,_______,_______,    _______,_______,_______,_______,_______,
+       _______,      _______,    _______,    _______,_______,_______,_______,                    _______,_______,_______,_______,    _______,_______,_______,_______,
+                 _______,      _______,      _______,_______,_______,_______,                    _______,_______,_______,_______,      _______,_______,_______,_______,
+           _______,  _______,_______,        _______,_______,_______,_______,_______,    _______,_______,_______,_______,_______,        _______,_______,      _______,
+                 _______,                                _______,    _______,            _______,                                          _______,    _______,_______,_______
+    )
+
+
+};
diff --git a/qmk/keyboards/boardrun/bizarre/keymaps/via/rules.mk b/qmk/keyboards/boardrun/bizarre/keymaps/via/rules.mk
new file mode 100644
index 00000000..36b7ba9c
--- /dev/null
+++ b/qmk/keyboards/boardrun/bizarre/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/qmk/keyboards/boardrun/bizarre/readme.md b/qmk/keyboards/boardrun/bizarre/readme.md
new file mode 100644
index 00000000..5c73313d
--- /dev/null
+++ b/qmk/keyboards/boardrun/bizarre/readme.md
@@ -0,0 +1,23 @@
+# Boardrun Bizarre
+
+![Boardrun Bizarre](https://i.imgur.com/usKQUWI.jpg)
+
+The Boardrun is a family of ortholinear keyboards with columnar stagger, inspired by the Alice layout. The Classic is a 60% layout that uses Ergodox keycap sets for compatibility, whereas the Bizarre is a 65% layout that uses standard (staggered) keycap sets in an ortholinear arrangement.
+
+The Boardrun is an evolution of the Boardwalk layout. The Boardwalk proved that the Ergodox keycap set could be adapted to more keyboards that provided a more compact design and layout flexibility. While adaptation was a design goal of the Boardwalk layout, the Boardrun was designed to distill and refine the best aspects of the current state of keyboard layouts, taking into account current trends in staggered design, the Ergodox keycap layout, and the Boardwalk's most popular layouts. To that end, a columnar staggered, ortholinear layout with alpha rotation was settled on, using the "HHKB" layout from the Boardwalk. The result is two layouts that are comfortable, familiar, and have great compatibility with keysets.
+
+-   Keyboard Maintainer: QMK Community
+-   Hardware Supported: Boardrun Bizarre Ortholinear PCB
+-   Hardware Availability: mkultra.click
+
+Make example for this keyboard (after setting up your build environment):
+
+    make boardrun/bizarre:default
+    
+Flashing example for this keyboard:
+
+    make boardrun/bizarre:default:flash
+    
+The board may be reset into bootloader mode via either the reset button (on the bottom of the PCB) or a configured RESET shortcut (which may vary depending on when the PCB was flashed).
+
+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).
diff --git a/qmk/keyboards/boardrun/bizarre/rules.mk b/qmk/keyboards/boardrun/bizarre/rules.mk
new file mode 100644
index 00000000..f841c16c
--- /dev/null
+++ b/qmk/keyboards/boardrun/bizarre/rules.mk
@@ -0,0 +1,23 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+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 = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+UNICODE_ENABLE = no         # Unicode
diff --git a/qmk/keyboards/boardrun/classic/classic.c b/qmk/keyboards/boardrun/classic/classic.c
new file mode 100644
index 00000000..49eea393
--- /dev/null
+++ b/qmk/keyboards/boardrun/classic/classic.c
@@ -0,0 +1,16 @@
+/*
+ * 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 "classic.h"
diff --git a/qmk/keyboards/boardrun/classic/classic.h b/qmk/keyboards/boardrun/classic/classic.h
new file mode 100644
index 00000000..173c686c
--- /dev/null
+++ b/qmk/keyboards/boardrun/classic/classic.h
@@ -0,0 +1,33 @@
+/*
+ * 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_classic( \
+  k11, k12, k13, k14, k15, k16, k17,          k18, k19, k110, k111, k112, k113, k114, \
+  k21, k22, k23, k24, k25, k26, k27,          k28, k29, k210, k211, k212, k213, k214, \
+  k31, k32, k33, k34, k35, k36, k37,          k38, k39, k310, k311, k312, k313, k314, \
+  k41, k42, k43, k44, k45, k46, k47,          k48, k49, k410, k411, k412, k413, k414, \
+       k52, k53, k54, k55, k56, k57,   k51,   k58, k59, k510, k511, k512, k513       \
+) \
+{ \
+  { k11, k12, k13, k14, k15, k16, k17, k18, k19, k110, k111, k112, k113, k114 , KC_NO, KC_NO, KC_NO,}, \
+  { k21, k22, k23, k24, k25, k26, k27, k28, k29, k210, k211, k212, k213, k214 , KC_NO, KC_NO, KC_NO,}, \
+  { k31, k32, k33, k34, k35, k36, k37, k38, k39, k310, k311, k312, k313, k314 , KC_NO, KC_NO, KC_NO,}, \
+  { k41, k42, k43, k44, k45, k46, k47, k48, k49, k410, k411, k412, k413, k414 , KC_NO, KC_NO, KC_NO,}, \
+  { k51, k52, k53, k54, k55, k56, k57, k58, k59, k510, k511, k512, k513, KC_NO, KC_NO, KC_NO, KC_NO} \
+}
diff --git a/qmk/keyboards/boardrun/classic/config.h b/qmk/keyboards/boardrun/classic/config.h
new file mode 100644
index 00000000..6c814eb3
--- /dev/null
+++ b/qmk/keyboards/boardrun/classic/config.h
@@ -0,0 +1,83 @@
+/*
+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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0xCDCD
+#define PRODUCT_ID      0x5338
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    shensmobile
+#define PRODUCT         Boardrun Classic
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 17
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+*/
+#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6 }
+#define MATRIX_COL_PINS { F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0, B3, B2, B1 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+// #define BACKLIGHT_PIN F5
+// #define BACKLIGHT_LEVELS 6
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 10
+
+/* 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
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+//#define NO_ACTION_MACRO
+//#define NO_ACTION_FUNCTION
+
+// ws2812 options
+#define RGB_DI_PIN B7 // pin the DI on the ws2812 is hooked-up to
+#define RGBLIGHT_ANIMATIONS // run RGB animations
+#define RGBLED_NUM 14 // number of LEDs
+#define RGBLIGHT_HUE_STEP 12 // units to step when in/decreasing hue
+#define RGBLIGHT_SAT_STEP 25 // units to step when in/decresing saturation
+#define RGBLIGHT_VAL_STEP 12 // units to step when in/decreasing value (brightness)
diff --git a/qmk/keyboards/boardrun/classic/info.json b/qmk/keyboards/boardrun/classic/info.json
new file mode 100644
index 00000000..a37e6ece
--- /dev/null
+++ b/qmk/keyboards/boardrun/classic/info.json
@@ -0,0 +1,89 @@
+{
+    "keyboard_name": "Boardrun Classic",
+    "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/boardrun/classic",
+    "maintainer": "QMK Community",
+    "manufacturer": "shensmobile",
+    "width": 16.5,
+    "height": 5,
+    "layouts": {
+        "LAYOUT_classic": {
+            "layout": [
+                {"y":0, "x":0,   "label":"Esc", "w":1.5},   
+                {"y":0, "x":1.5, "label":"1"},    
+                {"y":0, "x":2.5, "label":"2"},      
+                {"y":0, "x":3.5, "label":"3"}, 
+                {"y":0, "x":4.5, "label":"4"},          
+                {"y":0, "x":5.5, "label":"5"},        
+                {"y":0, "x":6.5, "label":"-"},
+                {"y":0, "x":9,   "label":"="},        
+                {"y":0, "x":10,  "label":"6"},
+                {"y":0, "x":11,  "label":"7"},
+                {"y":0, "x":12,  "label":"8"},
+                {"y":0, "x":13,  "label":"9"},
+                {"y":0, "x":14,  "label":"0"},
+                {"y":0, "x":15,  "label":"Backspace", "w":1.5},
+                
+                {"y":1, "x":0,   "label":"Tab", "w":1.5},
+                {"y":1, "x":1.5, "label":"Q"},    
+                {"y":1, "x":2.5, "label":"W"},      
+                {"y":1, "x":3.5, "label":"E"}, 
+                {"y":1, "x":4.5, "label":"R"},          
+                {"y":1, "x":5.5, "label":"T"},        
+                {"y":1, "x":6.5, "label":"["},
+                {"y":1, "x":9,   "label":"]"},        
+                {"y":1, "x":10,  "label":"Y"},
+                {"y":1, "x":11,  "label":"U"},
+                {"y":1, "x":12,  "label":"I"},
+                {"y":1, "x":13,  "label":"O"},
+                {"y":1, "x":14,  "label":"P"},
+                {"y":1, "x":15,  "label":"\\",    "w":1.5},
+                
+                {"y":2, "x":0,   "label":"LCtrl", "w":1.5},
+                {"y":2, "x":1.5, "label":"A"},    
+                {"y":2, "x":2.5, "label":"S"},      
+                {"y":2, "x":3.5, "label":"D"}, 
+                {"y":2, "x":4.5, "label":"F"},          
+                {"y":2, "x":5.5, "label":"G"},        
+                {"y":2, "x":6.5, "label":"Home"},
+                {"y":2, "x":9,   "label":"PgUp"},        
+                {"y":2, "x":10,  "label":"H"},
+                {"y":2, "x":11,  "label":"J"},
+                {"y":2, "x":12,  "label":"K"},
+                {"y":2, "x":13,  "label":"L"},
+                {"y":2, "x":14,  "label":";"},
+                {"y":2, "x":15,  "label":"'", "w":1.5},
+                
+                {"y":3, "x":0,   "label":"LShift", "w":1.5},
+                {"y":3, "x":1.5, "label":"Z"},    
+                {"y":3, "x":2.5, "label":"X"},      
+                {"y":3, "x":3.5, "label":"C"}, 
+                {"y":3, "x":4.5, "label":"V"},          
+                {"y":3, "x":5.5, "label":"B"},        
+                {"y":3, "x":6.5, "label":"End"},
+                {"y":3, "x":9,   "label":"PgDn"},        
+                {"y":3, "x":10,  "label":"N"},
+                {"y":3, "x":11,  "label":"M"},
+                {"y":3, "x":12,  "label":","},
+                {"y":3, "x":13,  "label":"."},
+                {"y":3, "x":14,  "label":"/"},
+                {"y":3, "x":15,  "label":"RShift / Enter", "w":1.5},
+                
+                {"y":4, "x":1.5, "label":"LGui"},    
+                {"y":4, "x":2.5, "label":"Del"},      
+                {"y":4, "x":3.5, "label":"`"}, 
+                {"y":4, "x":4.5, "label":"LAlt"},          
+                {"y":4, "x":5.5, "label":"Space"},        
+                {"y":4, "x":6.5, "label":"Space"},
+                {"y":4, "x":7.75,"label":"Fn"},
+                {"y":4, "x":9,   "label":"Space / AltGr"},        
+                {"y":4, "x":10,  "label":"Space / AltGr"},
+                {"y":4, "x":11,  "label":"Left"},
+                {"y":4, "x":12,  "label":"Down"},
+                {"y":4, "x":13,  "label":"Up"},
+                {"y":4, "x":14,  "label":"Right"}
+
+            ]
+        }
+    }
+
+}
diff --git a/qmk/keyboards/boardrun/classic/keymaps/default/keymap.c b/qmk/keyboards/boardrun/classic/keymaps/default/keymap.c
new file mode 100644
index 00000000..60769992
--- /dev/null
+++ b/qmk/keyboards/boardrun/classic/keymaps/default/keymap.c
@@ -0,0 +1,73 @@
+/*
+ * 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
+
+#define _FUNC       MO(_FNCLASSIC)
+#define _SHENT      RSFT_T(KC_ENT)
+#define _LSNUBS     LSFT_T(KC_NUBS)
+#define _AGRSPC     RALT_T(KC_SPC)
+
+
+// Layer shorthand
+enum layer_names {
+    _CLASSIC,
+    _FNCLASSIC,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    /* Base Layer
+     * .--------------------------------------------------------------.        .--------------------------------------------------------------.
+     * | ESC    | 1      | 2      | 3      | 4      | 5      | -      |        | =      | 6      | 7      | 8      | 9      | 0      | BACKSP |
+     * |--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
+     * | TAB    | Q      | W      | E      | R      | T      | [      |        | ]      | Y      | U      | I      | O      | P      | |\     |
+     * |--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
+     * | LCTRL  | A      | S      | D      | F      | G      | HOME   |        | PG UP  | H      | J      | K      | L      | ;      | '      |
+     * |--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
+     * | LSHIFT | Z      | X      | C      | V      | B      | END    |        | PG DN  | N      | M      | ,      | .      | /      | SH/ENT |
+     * '--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------'
+     *          | LGUI   | DEL    | ~`     | LALT   | SPACE  |        | FN     | SPACE  |        | LEFT   | DOWN   | UP     | RIGHT  |
+     *          '--------------------------------------------------------------------------------------------------------------------'
+     */
+    [_CLASSIC] = LAYOUT_classic(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_MINS,           KC_EQL,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_LBRC,           KC_RBRC, KC_Y,	   KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
+        KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_HOME,           KC_PGUP, KC_H,	   KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_END,            KC_PGDN, KC_N,	   KC_M,    KC_COMM, KC_DOT,  KC_SLSH, _SHENT,
+                 KC_LGUI, KC_DEL,  KC_GRV,  KC_LALT, KC_SPC,  KC_SPC,  _FUNC,    _AGRSPC, _AGRSPC, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+    ),
+
+    /* Function Layer
+	 * .--------------------------------------------------------------.        .--------------------------------------------------------------.
+     * | RESET  | F1     | F2     | F3     | F4     | F5     | F11    |        | F12    | F6     | F7     | F8     | F9     | F10    | DEL    |
+     * |--------+--------+--------+--------+--------+--------+--------+        +--------+--------+--------+--------+--------+--------+--------|
+     * |        |        | MENU   |        | RESET  |        |        |        |        |        |        | INS    |        | PRT SC |        |
+     * |--------+--------+--------+--------+--------+--------+--------+        +--------+--------+--------+--------+--------+--------+--------|
+     * | CAPSLK |        | SCROLL |        |        |        |        |        |        |        |        |        |        |        | RCTL   |
+     * |--------+--------+--------+--------+--------+--------+--------+        +--------+--------+--------+--------+--------+--------+--------|
+     * | UK \|  |        |        |        |        | PAUSE  |        |        |        |        | MUTE   | VOL DN | VOL UP |        |        |
+     * '--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+--------+--------+--------+--------'
+     *          | RGUI   |        |        | RALT   |                 |        |                 |        |        |        |        |
+     *          '--------------------------------------------------------------------------------------------------------------------'
+     */
+    [_FNCLASSIC] = LAYOUT_classic(
+        RESET,    KC_F1,  KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F11,           KC_F12,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______,
+        _______, _______, KC_APP,  _______, RESET,   _______, _______,          _______, _______, _______, KC_INS,  _______, KC_PSCR, _______,
+        KC_CAPS, _______, KC_SLCK, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, KC_RCTL,
+        _LSNUBS, _______, _______, _______, _______, KC_PAUS, _______,          _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,
+                 KC_RGUI, _______, _______, KC_RALT, _______, _______, _______, _______, _______, _______, _______, _______, _______
+    )
+};
diff --git a/qmk/keyboards/boardrun/classic/keymaps/via/keymap.c b/qmk/keyboards/boardrun/classic/keymaps/via/keymap.c
new file mode 100644
index 00000000..0b0d9538
--- /dev/null
+++ b/qmk/keyboards/boardrun/classic/keymaps/via/keymap.c
@@ -0,0 +1,77 @@
+/*
+ * 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] = {
+
+    /* Base Layer
+     * .--------------------------------------------------------------.        .--------------------------------------------------------------.
+     * | ESC    | 1      | 2      | 3      | 4      | 5      | -      |        | =      | 6      | 7      | 8      | 9      | 0      | BACKSP |
+     * |--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
+     * | TAB    | Q      | W      | E      | R      | T      | [      |        | ]      | Y      | U      | I      | O      | P      | |\     |
+     * |--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
+     * | LCTRL  | A      | S      | D      | F      | G      | HOME   |        | PG UP  | H      | J      | K      | L      | ;      | '      |
+     * |--------+--------+--------+--------+--------+--------+--------|        |--------+--------+--------+--------+--------+--------+--------|
+     * | LSHIFT | Z      | X      | C      | V      | B      | END    |        | PG DN  | N      | M      | ,      | .      | /      | ENTER  |
+     * '--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-------'
+     *          | LGUI   | DEL    | ~`     | LALT   | SPACE  |        | MO     | SPACE  |        | LEFT   | DOWN   | UP     | RIGHT  |
+     *          '--------------------------------------------------------------------------------------------------------------------'
+     */
+    [0] = LAYOUT_classic(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_MINS,           KC_EQL,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_LBRC,           KC_RBRC, KC_Y,	   KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
+        KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_HOME,           KC_PGUP, KC_H,	   KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_END,            KC_PGDN, KC_N,	   KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
+                 KC_LGUI, KC_DEL,  KC_GRV,  KC_LALT, KC_SPC,  KC_SPC,  MO(1),    KC_SPC,  KC_SPC,  KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+    ),
+
+    /* Function Layer
+	 * .--------------------------------------------------------------.        .--------------------------------------------------------------.
+     * |        | F1     | F2     | F3     | F4     | F5     |        |        |        | F6     | F7     | F8     | F9     | F10    | F11    |
+     * |--------+--------+--------+--------+--------+--------+--------+        +--------+--------+--------+--------+--------+--------+--------|
+     * |        |        |        |        |        |        |        |        |        |        |        |        |        | PRT SC | F12    |
+     * |--------+--------+--------+--------+--------+--------+--------+        +--------+--------+--------+--------+--------+--------+--------|
+     * |        |        |        |        |        |        |        |        |        |        |        |        |        |        | RESET  |
+     * |--------+--------+--------+--------+--------+--------+--------+        +--------+--------+--------+--------+--------+--------+--------|
+     * |        |        |        |        |        |        |        |        |        |        | MUTE   | VOL DN | VOL UP |        |        |
+     * '--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+--------+--------+--------+-------'
+     *          |        |        |        |        |                 |        |                 |        |        |        |        |
+     *          '--------------------------------------------------------------------------------------------------------------------'
+     */
+    [1] = LAYOUT_classic(
+        _______,  KC_F1,  KC_F2,   KC_F3,   KC_F4,   KC_F5,   _______,          _______, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
+        _______, _______, KC_APP,  _______, _______, _______, _______,          _______, _______, _______, _______, _______, KC_PSCR, KC_F12,
+        _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, RESET,
+        _______, _______, _______, _______, _______, _______, _______,          _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______,
+                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+    ),
+
+    [2] = LAYOUT_classic(
+        _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______,
+                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+    ),
+
+    [3] = LAYOUT_classic(
+        _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______,
+                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+    )
+};
diff --git a/qmk/keyboards/boardrun/classic/keymaps/via/rules.mk b/qmk/keyboards/boardrun/classic/keymaps/via/rules.mk
new file mode 100644
index 00000000..43061db1
--- /dev/null
+++ b/qmk/keyboards/boardrun/classic/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
\ No newline at end of file
diff --git a/qmk/keyboards/boardrun/classic/readme.md b/qmk/keyboards/boardrun/classic/readme.md
new file mode 100644
index 00000000..2ed4ff1b
--- /dev/null
+++ b/qmk/keyboards/boardrun/classic/readme.md
@@ -0,0 +1,23 @@
+# Boardrun Classic
+
+![Boardrun Classic](https://i.imgur.com/Efo0ItKl.jpg)
+
+The Boardrun is a family of ortholinear keyboards with columnar stagger, inspired by the Alice layout. The Classic is a 60% layout that uses Ergodox keycap sets for compatibility, whereas the Bizarre is a 65% layout that uses standard (staggered) keycap sets in an ortholinear arrangement.
+
+The Boardrun is an evolution of the Boardwalk layout. The Boardwalk proved that the Ergodox keycap set could be adapted to more keyboards that provided a more compact design and layout flexibility. While adaptation was a design goal of the Boardwalk layout, the Boardrun was designed to distill and refine the best aspects of the current state of keyboard layouts, taking into account current trends in staggered design, the Ergodox keycap layout, and the Boardwalk's most popular layouts. To that end, a columnar staggered, ortholinear layout with alpha rotation was settled on, using the "HHKB" layout from the Boardwalk. The result is two layouts that are comfortable, familiar, and have great compatibility with keysets.
+
+-   Keyboard Maintainer: QMK Community
+-   Hardware Supported: Boardrun Classic Ortholinear PCB
+-   Hardware Availability: mkultra.click
+
+Make example for this keyboard (after setting up your build environment):
+
+    make boardrun/classic:default
+
+Flashing example for this keyboard:
+    
+    make boardrun/classic:default:flash
+
+The board may be reset into bootloader mode via either the reset button (on the bottom of the PCB) or a configured RESET shortcut (which may vary depending on when the PCB was flashed).
+
+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).
diff --git a/qmk/keyboards/boardrun/classic/rules.mk b/qmk/keyboards/boardrun/classic/rules.mk
new file mode 100644
index 00000000..065bd540
--- /dev/null
+++ b/qmk/keyboards/boardrun/classic/rules.mk
@@ -0,0 +1,23 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # 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 = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+UNICODE_ENABLE = no         # Unicode
diff --git a/qmk/keyboards/boardsource/microdox/keymaps/via/keymap.c b/qmk/keyboards/boardsource/microdox/keymaps/via/keymap.c
new file mode 100644
index 00000000..2f4785ad
--- /dev/null
+++ b/qmk/keyboards/boardsource/microdox/keymaps/via/keymap.c
@@ -0,0 +1,104 @@
+/*
+Copyright 2020 Jack Sangdahl <@toastedmangoes>
+
+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_split_3x5_3(
+  KC_Q,         KC_W,    KC_E,    KC_R,    KC_T,         KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,
+  SFT_T(KC_A),  KC_S,    KC_D,    KC_F,    KC_G,         KC_H,    KC_J,    KC_K,    KC_L,    SFT_T(KC_SCLN),
+  CTL_T(KC_Z),  KC_X,    KC_C,    KC_V,    KC_B,         KC_N,    KC_M,    KC_COMM, KC_DOT,  CTL_T(KC_SLSH),
+                LT(3, KC_LGUI),   MO(1),   KC_SPC,       KC_BSPC, MO(2),   KC_ENT
+),
+
+[1] = LAYOUT_split_3x5_3(
+  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,         KC_6,    KC_7,    KC_8,    KC_9,    KC_0,
+  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,      KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,
+  KC_ESC,  KC_TAB,  KC_CAPS, KC_TILD, KC_GRV,       KC_QUOT, KC_DQUO, KC_MPRV, KC_MPLY, KC_MNXT,
+                    KC_LGUI, KC_TRNS, KC_SPC,       KC_ENT,  KC_TRNS, KC_RALT
+),
+
+[2] = LAYOUT_split_3x5_3(
+  KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,      KC_PSCR, KC_DEL,  KC_INS,   KC_HOME, KC_END,
+  KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,      KC_LEFT, KC_DOWN, KC_RIGHT, KC_UP,   KC_VOLU,
+  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,        KC_F6,   KC_F7,   KC_F8,    KC_F9,   KC_VOLD,
+                    KC_PGDN, KC_TRNS, KC_SPC,       KC_ENT,  KC_TRNS, KC_PGUP
+),
+[3] = LAYOUT_split_3x5_3(
+  RESET,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,      RGB_TOG,  RGB_HUD, RGB_HUI, XXXXXXX, XXXXXXX,
+  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,      RGB_MOD,  RGB_SAD, RGB_SAI, XXXXXXX, XXXXXXX,
+  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,      RGB_RMOD, RGB_VAD, RGB_VAI, XXXXXXX, XXXXXXX,
+                    KC_TRNS, XXXXXXX, XXXXXXX,      XXXXXXX, XXXXXXX, XXXXXXX
+)
+};
+
+#ifdef OLED_DRIVER_ENABLE
+oled_rotation_t oled_init_user(oled_rotation_t rotation) {
+  if (is_keyboard_master())
+    return OLED_ROTATION_180;
+  return rotation;
+}
+
+static void render_logo(void) {
+  static const char PROGMEM qmk_logo[] = {
+     0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94,
+    0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4,
+    0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0xd4,
+    0
+  };
+  oled_write_P(qmk_logo, false);
+}
+
+static void render_status(void) {
+   switch (get_highest_layer(layer_state)) {
+    case 0:
+      oled_write_P(PSTR("B R L A O\n"), false);
+      oled_write_P(PSTR("^\n"), false);
+      oled_write_P(PSTR("Layer: Base\n"), false);
+      break;
+    case 1:
+      oled_write_P(PSTR("B R L A O\n"), false);
+      oled_write_P(PSTR("  ^\n"), false);
+      oled_write_P(PSTR("Layer: Raise\n"), false);
+      break;
+    case 2:
+      oled_write_P(PSTR("B R L A O\n"), false);
+      oled_write_P(PSTR("    ^\n"), false);
+      oled_write_P(PSTR("Layer: Lower\n"), false);
+      break;
+    case 3:
+      oled_write_P(PSTR("B R L A O\n"), false);
+      oled_write_P(PSTR("      ^\n"), false);
+      oled_write_P(PSTR("Layer: Adjust\n"), false);
+      break;
+    default:
+      oled_write_P(PSTR("B R L A O"), false);
+      oled_write_P(PSTR("        ^\n"), false);
+      oled_write_P(PSTR("Layer: Other\n"), false);
+  }
+}
+
+void oled_task_user(void) {
+  if (is_keyboard_master()) {
+    render_status();
+  } else {
+    render_logo();
+    oled_scroll_left();
+  }
+}
+
+#endif
diff --git a/qmk/keyboards/boardsource/microdox/keymaps/via/rules.mk b/qmk/keyboards/boardsource/microdox/keymaps/via/rules.mk
new file mode 100644
index 00000000..667a6b25
--- /dev/null
+++ b/qmk/keyboards/boardsource/microdox/keymaps/via/rules.mk
@@ -0,0 +1,4 @@
+OLED_DRIVER_ENABLE = yes
+VIA_ENABLE = yes
+EXTRAKEY_ENABLE = yes
+RGBLIGHT_ENABLE = yes
diff --git a/qmk/keyboards/boston_meetup/2019/rules.mk b/qmk/keyboards/boston_meetup/2019/rules.mk
index 73f9008f..aa35ba75 100644
--- a/qmk/keyboards/boston_meetup/2019/rules.mk
+++ b/qmk/keyboards/boston_meetup/2019/rules.mk
@@ -16,7 +16,8 @@ NKRO_ENABLE = yes	    # USB Nkey Rollover
 CUSTOM_MATRIX = no # Custom matrix file
 AUDIO_ENABLE = yes
 RGBLIGHT_ENABLE = no
-RGB_MATRIX_ENABLE = no #WS2812
+RGB_MATRIX_ENABLE = no
+RGB_MATRIX_DRIVER = WS2812
 HAPTIC_ENABLE += DRV2605L
 QWIIC_ENABLE += MICRO_OLED
 # SERIAL_LINK_ENABLE = yes
diff --git a/qmk/keyboards/botanicalkeyboards/fm2u/keymaps/via/rules.mk b/qmk/keyboards/botanicalkeyboards/fm2u/keymaps/via/rules.mk
index 7d47e6b7..44a2bc49 100644
--- a/qmk/keyboards/botanicalkeyboards/fm2u/keymaps/via/rules.mk
+++ b/qmk/keyboards/botanicalkeyboards/fm2u/keymaps/via/rules.mk
@@ -1,4 +1,4 @@
 VIA_ENABLE = yes
 LTO_ENABLE = yes
 
-EXTRAKEY_ENABLE = no
+CONSOLE_ENABLE = no
diff --git a/qmk/keyboards/box75/box75.c b/qmk/keyboards/box75/box75.c
new file mode 100644
index 00000000..43d30309
--- /dev/null
+++ b/qmk/keyboards/box75/box75.c
@@ -0,0 +1,18 @@
+/*
+Copyright 2020 Álvaro "Gondolindrim" Volpato  <gondolindrim@acheronproject.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 "box75.h"
diff --git a/qmk/keyboards/box75/box75.h b/qmk/keyboards/box75/box75.h
new file mode 100644
index 00000000..16ac3b22
--- /dev/null
+++ b/qmk/keyboards/box75/box75.h
@@ -0,0 +1,38 @@
+/*
+Copyright 2015 Álvaro "Gondolindrim" Volpato  <gondolindrim@acheronproject.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
+
+#define ___ KC_NO
+
+#include "quantum.h"
+
+#define LAYOUT( \
+	K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
+	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K3D, \
+	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, \
+	K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,      K3E, \
+	K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E, \
+	K50, K51, K52,                K56,           K59, K5A,      K5C, K5D, K5E \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E}, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E}, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E}, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E}, \
+    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E}, \
+    { K50, K51, K52, ___, ___, ___, K56, ___, ___, K59, K5A, ___, K5C, K5D, K5E} \
+}
diff --git a/qmk/keyboards/box75/chconf.h b/qmk/keyboards/box75/chconf.h
new file mode 100644
index 00000000..4640ff53
--- /dev/null
+++ b/qmk/keyboards/box75/chconf.h
@@ -0,0 +1,714 @@
+/*
+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+/**
+ * @file    rt/templates/chconf.h
+ * @brief   Configuration file template.
+ * @details A copy of this file must be placed in each project directory, it
+ *          contains the application specific kernel settings.
+ *
+ * @addtogroup config
+ * @details Kernel related settings and hooks.
+ * @{
+ */
+
+#ifndef CHCONF_H
+#define CHCONF_H
+
+#define _CHIBIOS_RT_CONF_
+#define _CHIBIOS_RT_CONF_VER_6_0_
+
+/*===========================================================================*/
+/**
+ * @name System timers settings
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   System time counter resolution.
+ * @note    Allowed values are 16 or 32 bits.
+ */
+#if !defined(CH_CFG_ST_RESOLUTION)
+#define CH_CFG_ST_RESOLUTION                32
+#endif
+
+/**
+ * @brief   System tick frequency.
+ * @details Frequency of the system timer that drives the system ticks. This
+ *          setting also defines the system tick time unit.
+ */
+#if !defined(CH_CFG_ST_FREQUENCY)
+#define CH_CFG_ST_FREQUENCY                 10000
+#endif
+
+/**
+ * @brief   Time intervals data size.
+ * @note    Allowed values are 16, 32 or 64 bits.
+ */
+#if !defined(CH_CFG_INTERVALS_SIZE)
+#define CH_CFG_INTERVALS_SIZE               32
+#endif
+
+/**
+ * @brief   Time types data size.
+ * @note    Allowed values are 16 or 32 bits.
+ */
+#if !defined(CH_CFG_TIME_TYPES_SIZE)
+#define CH_CFG_TIME_TYPES_SIZE              32
+#endif
+
+/**
+ * @brief   Time delta constant for the tick-less mode.
+ * @note    If this value is zero then the system uses the classic
+ *          periodic tick. This value represents the minimum number
+ *          of ticks that is safe to specify in a timeout directive.
+ *          The value one is not valid, timeouts are rounded up to
+ *          this value.
+ */
+#if !defined(CH_CFG_ST_TIMEDELTA)
+#define CH_CFG_ST_TIMEDELTA                 2
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Kernel parameters and options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   Round robin interval.
+ * @details This constant is the number of system ticks allowed for the
+ *          threads before preemption occurs. Setting this value to zero
+ *          disables the preemption for threads with equal priority and the
+ *          round robin becomes cooperative. Note that higher priority
+ *          threads can still preempt, the kernel is always preemptive.
+ * @note    Disabling the round robin preemption makes the kernel more compact
+ *          and generally faster.
+ * @note    The round robin preemption is not supported in tickless mode and
+ *          must be set to zero in that case.
+ */
+#if !defined(CH_CFG_TIME_QUANTUM)
+#define CH_CFG_TIME_QUANTUM                 0
+#endif
+
+/**
+ * @brief   Managed RAM size.
+ * @details Size of the RAM area to be managed by the OS. If set to zero
+ *          then the whole available RAM is used. The core memory is made
+ *          available to the heap allocator and/or can be used directly through
+ *          the simplified core memory allocator.
+ *
+ * @note    In order to let the OS manage the whole RAM the linker script must
+ *          provide the @p __heap_base__ and @p __heap_end__ symbols.
+ * @note    Requires @p CH_CFG_USE_MEMCORE.
+ */
+#if !defined(CH_CFG_MEMCORE_SIZE)
+#define CH_CFG_MEMCORE_SIZE                 0
+#endif
+
+/**
+ * @brief   Idle thread automatic spawn suppression.
+ * @details When this option is activated the function @p chSysInit()
+ *          does not spawn the idle thread. The application @p main()
+ *          function becomes the idle thread and must implement an
+ *          infinite loop.
+ */
+#if !defined(CH_CFG_NO_IDLE_THREAD)
+#define CH_CFG_NO_IDLE_THREAD               FALSE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Performance options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   OS optimization.
+ * @details If enabled then time efficient rather than space efficient code
+ *          is used when two possible implementations exist.
+ *
+ * @note    This is not related to the compiler optimization options.
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_OPTIMIZE_SPEED)
+#define CH_CFG_OPTIMIZE_SPEED               FALSE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Subsystem options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   Time Measurement APIs.
+ * @details If enabled then the time measurement APIs are included in
+ *          the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_TM)
+#define CH_CFG_USE_TM                       FALSE
+#endif
+
+/**
+ * @brief   Threads registry APIs.
+ * @details If enabled then the registry APIs are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_REGISTRY)
+#define CH_CFG_USE_REGISTRY                 TRUE
+#endif
+
+/**
+ * @brief   Threads synchronization APIs.
+ * @details If enabled then the @p chThdWait() function is included in
+ *          the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_WAITEXIT)
+#define CH_CFG_USE_WAITEXIT                 TRUE
+#endif
+
+/**
+ * @brief   Semaphores APIs.
+ * @details If enabled then the Semaphores APIs are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_SEMAPHORES)
+#define CH_CFG_USE_SEMAPHORES               TRUE
+#endif
+
+/**
+ * @brief   Semaphores queuing mode.
+ * @details If enabled then the threads are enqueued on semaphores by
+ *          priority rather than in FIFO order.
+ *
+ * @note    The default is @p FALSE. Enable this if you have special
+ *          requirements.
+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.
+ */
+#if !defined(CH_CFG_USE_SEMAPHORES_PRIORITY)
+#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE
+#endif
+
+/**
+ * @brief   Mutexes APIs.
+ * @details If enabled then the mutexes APIs are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_MUTEXES)
+#define CH_CFG_USE_MUTEXES                  TRUE
+#endif
+
+/**
+ * @brief   Enables recursive behavior on mutexes.
+ * @note    Recursive mutexes are heavier and have an increased
+ *          memory footprint.
+ *
+ * @note    The default is @p FALSE.
+ * @note    Requires @p CH_CFG_USE_MUTEXES.
+ */
+#if !defined(CH_CFG_USE_MUTEXES_RECURSIVE)
+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE
+#endif
+
+/**
+ * @brief   Conditional Variables APIs.
+ * @details If enabled then the conditional variables APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_MUTEXES.
+ */
+#if !defined(CH_CFG_USE_CONDVARS)
+#define CH_CFG_USE_CONDVARS                 TRUE
+#endif
+
+/**
+ * @brief   Conditional Variables APIs with timeout.
+ * @details If enabled then the conditional variables APIs with timeout
+ *          specification are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_CONDVARS.
+ */
+#if !defined(CH_CFG_USE_CONDVARS_TIMEOUT)
+#define CH_CFG_USE_CONDVARS_TIMEOUT         FALSE
+#endif
+
+/**
+ * @brief   Events Flags APIs.
+ * @details If enabled then the event flags APIs are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_EVENTS)
+#define CH_CFG_USE_EVENTS                   TRUE
+#endif
+
+/**
+ * @brief   Events Flags APIs with timeout.
+ * @details If enabled then the events APIs with timeout specification
+ *          are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_EVENTS.
+ */
+#if !defined(CH_CFG_USE_EVENTS_TIMEOUT)
+#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE
+#endif
+
+/**
+ * @brief   Synchronous Messages APIs.
+ * @details If enabled then the synchronous messages APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_MESSAGES)
+#define CH_CFG_USE_MESSAGES                 TRUE
+#endif
+
+/**
+ * @brief   Synchronous Messages queuing mode.
+ * @details If enabled then messages are served by priority rather than in
+ *          FIFO order.
+ *
+ * @note    The default is @p FALSE. Enable this if you have special
+ *          requirements.
+ * @note    Requires @p CH_CFG_USE_MESSAGES.
+ */
+#if !defined(CH_CFG_USE_MESSAGES_PRIORITY)
+#define CH_CFG_USE_MESSAGES_PRIORITY        FALSE
+#endif
+
+/**
+ * @brief   Mailboxes APIs.
+ * @details If enabled then the asynchronous messages (mailboxes) APIs are
+ *          included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.
+ */
+#if !defined(CH_CFG_USE_MAILBOXES)
+#define CH_CFG_USE_MAILBOXES                TRUE
+#endif
+
+/**
+ * @brief   Core Memory Manager APIs.
+ * @details If enabled then the core memory manager APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_MEMCORE)
+#define CH_CFG_USE_MEMCORE                  FALSE
+#endif
+
+/**
+ * @brief   Heap Allocator APIs.
+ * @details If enabled then the memory heap allocator APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_MEMCORE and either @p CH_CFG_USE_MUTEXES or
+ *          @p CH_CFG_USE_SEMAPHORES.
+ * @note    Mutexes are recommended.
+ */
+#if !defined(CH_CFG_USE_HEAP)
+#define CH_CFG_USE_HEAP                     FALSE
+#endif
+
+/**
+ * @brief   Memory Pools Allocator APIs.
+ * @details If enabled then the memory pools allocator APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_MEMPOOLS)
+#define CH_CFG_USE_MEMPOOLS                 FALSE
+#endif
+
+/**
+ * @brief   Objects FIFOs APIs.
+ * @details If enabled then the objects FIFOs APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_OBJ_FIFOS)
+#define CH_CFG_USE_OBJ_FIFOS                FALSE
+#endif
+
+/**
+ * @brief   Pipes APIs.
+ * @details If enabled then the pipes APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_PIPES)
+#define CH_CFG_USE_PIPES                    FALSE
+#endif
+
+/**
+ * @brief   Dynamic Threads APIs.
+ * @details If enabled then the dynamic threads creation APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_WAITEXIT.
+ * @note    Requires @p CH_CFG_USE_HEAP and/or @p CH_CFG_USE_MEMPOOLS.
+ */
+#if !defined(CH_CFG_USE_DYNAMIC)
+#define CH_CFG_USE_DYNAMIC                  FALSE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Objects factory options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   Objects Factory APIs.
+ * @details If enabled then the objects factory APIs are included in the
+ *          kernel.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_CFG_USE_FACTORY)
+#define CH_CFG_USE_FACTORY                  FALSE
+#endif
+
+/**
+ * @brief   Maximum length for object names.
+ * @details If the specified length is zero then the name is stored by
+ *          pointer but this could have unintended side effects.
+ */
+#if !defined(CH_CFG_FACTORY_MAX_NAMES_LENGTH)
+#define CH_CFG_FACTORY_MAX_NAMES_LENGTH     8
+#endif
+
+/**
+ * @brief   Enables the registry of generic objects.
+ */
+#if !defined(CH_CFG_FACTORY_OBJECTS_REGISTRY)
+#define CH_CFG_FACTORY_OBJECTS_REGISTRY     FALSE
+#endif
+
+/**
+ * @brief   Enables factory for generic buffers.
+ */
+#if !defined(CH_CFG_FACTORY_GENERIC_BUFFERS)
+#define CH_CFG_FACTORY_GENERIC_BUFFERS      FALSE
+#endif
+
+/**
+ * @brief   Enables factory for semaphores.
+ */
+#if !defined(CH_CFG_FACTORY_SEMAPHORES)
+#define CH_CFG_FACTORY_SEMAPHORES           FALSE
+#endif
+
+/**
+ * @brief   Enables factory for mailboxes.
+ */
+#if !defined(CH_CFG_FACTORY_MAILBOXES)
+#define CH_CFG_FACTORY_MAILBOXES            FALSE
+#endif
+
+/**
+ * @brief   Enables factory for objects FIFOs.
+ */
+#if !defined(CH_CFG_FACTORY_OBJ_FIFOS)
+#define CH_CFG_FACTORY_OBJ_FIFOS            FALSE
+#endif
+
+/**
+ * @brief   Enables factory for Pipes.
+ */
+#if !defined(CH_CFG_FACTORY_PIPES) || defined(__DOXYGEN__)
+#define CH_CFG_FACTORY_PIPES                FALSE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Debug options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   Debug option, kernel statistics.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_STATISTICS)
+#define CH_DBG_STATISTICS                   FALSE
+#endif
+
+/**
+ * @brief   Debug option, system state check.
+ * @details If enabled the correct call protocol for system APIs is checked
+ *          at runtime.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_SYSTEM_STATE_CHECK)
+#define CH_DBG_SYSTEM_STATE_CHECK           FALSE
+#endif
+
+/**
+ * @brief   Debug option, parameters checks.
+ * @details If enabled then the checks on the API functions input
+ *          parameters are activated.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_ENABLE_CHECKS)
+#define CH_DBG_ENABLE_CHECKS                FALSE
+#endif
+
+/**
+ * @brief   Debug option, consistency checks.
+ * @details If enabled then all the assertions in the kernel code are
+ *          activated. This includes consistency checks inside the kernel,
+ *          runtime anomalies and port-defined checks.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_ENABLE_ASSERTS)
+#define CH_DBG_ENABLE_ASSERTS               FALSE
+#endif
+
+/**
+ * @brief   Debug option, trace buffer.
+ * @details If enabled then the trace buffer is activated.
+ *
+ * @note    The default is @p CH_DBG_TRACE_MASK_DISABLED.
+ */
+#if !defined(CH_DBG_TRACE_MASK)
+#define CH_DBG_TRACE_MASK                   CH_DBG_TRACE_MASK_DISABLED
+#endif
+
+/**
+ * @brief   Trace buffer entries.
+ * @note    The trace buffer is only allocated if @p CH_DBG_TRACE_MASK is
+ *          different from @p CH_DBG_TRACE_MASK_DISABLED.
+ */
+#if !defined(CH_DBG_TRACE_BUFFER_SIZE)
+#define CH_DBG_TRACE_BUFFER_SIZE            128
+#endif
+
+/**
+ * @brief   Debug option, stack checks.
+ * @details If enabled then a runtime stack check is performed.
+ *
+ * @note    The default is @p FALSE.
+ * @note    The stack check is performed in a architecture/port dependent way.
+ *          It may not be implemented or some ports.
+ * @note    The default failure mode is to halt the system with the global
+ *          @p panic_msg variable set to @p NULL.
+ */
+#if !defined(CH_DBG_ENABLE_STACK_CHECK)
+#define CH_DBG_ENABLE_STACK_CHECK           FALSE
+#endif
+
+/**
+ * @brief   Debug option, stacks initialization.
+ * @details If enabled then the threads working area is filled with a byte
+ *          value when a thread is created. This can be useful for the
+ *          runtime measurement of the used stack.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_FILL_THREADS)
+#define CH_DBG_FILL_THREADS                 FALSE
+#endif
+
+/**
+ * @brief   Debug option, threads profiling.
+ * @details If enabled then a field is added to the @p thread_t structure that
+ *          counts the system ticks occurred while executing the thread.
+ *
+ * @note    The default is @p FALSE.
+ * @note    This debug option is not currently compatible with the
+ *          tickless mode.
+ */
+#if !defined(CH_DBG_THREADS_PROFILING)
+#define CH_DBG_THREADS_PROFILING            FALSE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Kernel hooks
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   System structure extension.
+ * @details User fields added to the end of the @p ch_system_t structure.
+ */
+#define CH_CFG_SYSTEM_EXTRA_FIELDS                                          \
+  /* Add threads custom fields here.*/
+
+/**
+ * @brief   System initialization hook.
+ * @details User initialization code added to the @p chSysInit() function
+ *          just before interrupts are enabled globally.
+ */
+#define CH_CFG_SYSTEM_INIT_HOOK() {                                         \
+  /* Add threads initialization code here.*/                                \
+}
+
+/**
+ * @brief   Threads descriptor structure extension.
+ * @details User fields added to the end of the @p thread_t structure.
+ */
+#define CH_CFG_THREAD_EXTRA_FIELDS                                          \
+  /* Add threads custom fields here.*/
+
+/**
+ * @brief   Threads initialization hook.
+ * @details User initialization code added to the @p _thread_init() function.
+ *
+ * @note    It is invoked from within @p _thread_init() and implicitly from all
+ *          the threads creation APIs.
+ */
+#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \
+  /* Add threads initialization code here.*/                                \
+}
+
+/**
+ * @brief   Threads finalization hook.
+ * @details User finalization code added to the @p chThdExit() API.
+ */
+#define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \
+  /* Add threads finalization code here.*/                                  \
+}
+
+/**
+ * @brief   Context switch hook.
+ * @details This hook is invoked just before switching between threads.
+ */
+#define CH_CFG_CONTEXT_SWITCH_HOOK(ntp, otp) {                              \
+  /* Context switch code here.*/                                            \
+}
+
+/**
+ * @brief   ISR enter hook.
+ */
+#define CH_CFG_IRQ_PROLOGUE_HOOK() {                                        \
+  /* IRQ prologue code here.*/                                              \
+}
+
+/**
+ * @brief   ISR exit hook.
+ */
+#define CH_CFG_IRQ_EPILOGUE_HOOK() {                                        \
+  /* IRQ epilogue code here.*/                                              \
+}
+
+/**
+ * @brief   Idle thread enter hook.
+ * @note    This hook is invoked within a critical zone, no OS functions
+ *          should be invoked from here.
+ * @note    This macro can be used to activate a power saving mode.
+ */
+#define CH_CFG_IDLE_ENTER_HOOK() {                                          \
+  /* Idle-enter code here.*/                                                \
+}
+
+/**
+ * @brief   Idle thread leave hook.
+ * @note    This hook is invoked within a critical zone, no OS functions
+ *          should be invoked from here.
+ * @note    This macro can be used to deactivate a power saving mode.
+ */
+#define CH_CFG_IDLE_LEAVE_HOOK() {                                          \
+  /* Idle-leave code here.*/                                                \
+}
+
+/**
+ * @brief   Idle Loop hook.
+ * @details This hook is continuously invoked by the idle thread loop.
+ */
+#define CH_CFG_IDLE_LOOP_HOOK() {                                           \
+  /* Idle loop code here.*/                                                 \
+}
+
+/**
+ * @brief   System tick event hook.
+ * @details This hook is invoked in the system tick handler immediately
+ *          after processing the virtual timers queue.
+ */
+#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \
+  /* System tick event code here.*/                                         \
+}
+
+/**
+ * @brief   System halt hook.
+ * @details This hook is invoked in case to a system halting error before
+ *          the system is halted.
+ */
+#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \
+  /* System halt code here.*/                                               \
+}
+
+/**
+ * @brief   Trace hook.
+ * @details This hook is invoked each time a new record is written in the
+ *          trace buffer.
+ */
+#define CH_CFG_TRACE_HOOK(tep) {                                            \
+  /* Trace code here.*/                                                     \
+}
+
+/** @} */
+
+/*===========================================================================*/
+/* Port-specific settings (override port settings defaulted in chcore.h).    */
+/*===========================================================================*/
+
+#endif  /* CHCONF_H */
+
+/** @} */
diff --git a/qmk/keyboards/box75/config.h b/qmk/keyboards/box75/config.h
new file mode 100644
index 00000000..b3b52c87
--- /dev/null
+++ b/qmk/keyboards/box75/config.h
@@ -0,0 +1,70 @@
+/*
+Copyright 2015 Álvaro "Gondolindrim" Volpato  <gondolindrim@acheronproject.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
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x7668 // LD for LinDesign
+#define PRODUCT_ID      0xB075 // For BOX75
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Lin Design
+#define PRODUCT         BOX75
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 15
+
+#define MATRIX_COL_PINS { B11, B10, B2 , B1, B0, A7 , A6, A5, A4, A3, A8, B15, B14, B13, A15 }
+#define MATRIX_ROW_PINS { A10, A9 , B12, A2, A1, A0 }
+#define DIODE_DIRECTION COL2ROW
+
+//#define BACKLIGHT_PIN           A6
+//#define BACKLIGHT_PWM_DRIVER    PWMD3
+//#define BACKLIGHT_PWM_CHANNEL   1
+//#define BACKLIGHT_PAL_MODE      1
+//#define BACKLIGHT_LEVELS 6
+//#define BACKLIGHT_BREATHING
+//#define BREATHING_PERIOD 6
+
+/* define if matrix has ghost */
+//#define MATRIX_HAS_GHOST
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE    5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+//#define NO_ACTION_MACRO
+//#define NO_ACTION_FUNCTION
diff --git a/qmk/keyboards/box75/halconf.h b/qmk/keyboards/box75/halconf.h
new file mode 100644
index 00000000..16f32117
--- /dev/null
+++ b/qmk/keyboards/box75/halconf.h
@@ -0,0 +1,525 @@
+/*
+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+/**
+ * @file    templates/halconf.h
+ * @brief   HAL configuration header.
+ * @details HAL configuration file, this file allows to enable or disable the
+ *          various device drivers from your application. You may also use
+ *          this file in order to override the device drivers default settings.
+ *
+ * @addtogroup HAL_CONF
+ * @{
+ */
+
+#ifndef HALCONF_H
+#define HALCONF_H
+
+#define _CHIBIOS_HAL_CONF_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
+
+#include "mcuconf.h"
+
+/**
+ * @brief   Enables the PAL subsystem.
+ */
+#if !defined(HAL_USE_PAL) || defined(__DOXYGEN__)
+#define HAL_USE_PAL                         TRUE
+#endif
+
+/**
+ * @brief   Enables the ADC subsystem.
+ */
+#if !defined(HAL_USE_ADC) || defined(__DOXYGEN__)
+#define HAL_USE_ADC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the CAN subsystem.
+ */
+#if !defined(HAL_USE_CAN) || defined(__DOXYGEN__)
+#define HAL_USE_CAN                         FALSE
+#endif
+
+/**
+ * @brief   Enables the cryptographic subsystem.
+ */
+#if !defined(HAL_USE_CRY) || defined(__DOXYGEN__)
+#define HAL_USE_CRY                         FALSE
+#endif
+
+/**
+ * @brief   Enables the DAC subsystem.
+ */
+#if !defined(HAL_USE_DAC) || defined(__DOXYGEN__)
+#define HAL_USE_DAC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the GPT subsystem.
+ */
+#if !defined(HAL_USE_GPT) || defined(__DOXYGEN__)
+#define HAL_USE_GPT                         FALSE
+#endif
+
+/**
+ * @brief   Enables the I2C subsystem.
+ */
+#if !defined(HAL_USE_I2C) || defined(__DOXYGEN__)
+#define HAL_USE_I2C                         FALSE
+#endif
+
+/**
+ * @brief   Enables the I2S subsystem.
+ */
+#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)
+#define HAL_USE_I2S                         FALSE
+#endif
+
+/**
+ * @brief   Enables the ICU subsystem.
+ */
+#if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)
+#define HAL_USE_ICU                         FALSE
+#endif
+
+/**
+ * @brief   Enables the MAC subsystem.
+ */
+#if !defined(HAL_USE_MAC) || defined(__DOXYGEN__)
+#define HAL_USE_MAC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the MMC_SPI subsystem.
+ */
+#if !defined(HAL_USE_MMC_SPI) || defined(__DOXYGEN__)
+#define HAL_USE_MMC_SPI                     FALSE
+#endif
+
+/**
+ * @brief   Enables the PWM subsystem.
+ */
+#if !defined(HAL_USE_PWM) || defined(__DOXYGEN__)
+#define HAL_USE_PWM                         FALSE
+#endif
+
+/**
+ * @brief   Enables the RTC subsystem.
+ */
+#if !defined(HAL_USE_RTC) || defined(__DOXYGEN__)
+#define HAL_USE_RTC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the SDC subsystem.
+ */
+#if !defined(HAL_USE_SDC) || defined(__DOXYGEN__)
+#define HAL_USE_SDC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the SERIAL subsystem.
+ */
+#if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__)
+#define HAL_USE_SERIAL                      FALSE
+#endif
+
+/**
+ * @brief   Enables the SERIAL over USB subsystem.
+ */
+#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)
+#define HAL_USE_SERIAL_USB                  FALSE
+#endif
+
+/**
+ * @brief   Enables the SIO subsystem.
+ */
+#if !defined(HAL_USE_SIO) || defined(__DOXYGEN__)
+#define HAL_USE_SIO                         FALSE
+#endif
+
+/**
+ * @brief   Enables the SPI subsystem.
+ */
+#if !defined(HAL_USE_SPI) || defined(__DOXYGEN__)
+#define HAL_USE_SPI                         FALSE
+#endif
+
+/**
+ * @brief   Enables the TRNG subsystem.
+ */
+#if !defined(HAL_USE_TRNG) || defined(__DOXYGEN__)
+#define HAL_USE_TRNG                        FALSE
+#endif
+
+/**
+ * @brief   Enables the UART subsystem.
+ */
+#if !defined(HAL_USE_UART) || defined(__DOXYGEN__)
+#define HAL_USE_UART                        FALSE
+#endif
+
+/**
+ * @brief   Enables the USB subsystem.
+ */
+#if !defined(HAL_USE_USB) || defined(__DOXYGEN__)
+#define HAL_USE_USB                         TRUE
+#endif
+
+/**
+ * @brief   Enables the WDG subsystem.
+ */
+#if !defined(HAL_USE_WDG) || defined(__DOXYGEN__)
+#define HAL_USE_WDG                         FALSE
+#endif
+
+/**
+ * @brief   Enables the WSPI subsystem.
+ */
+#if !defined(HAL_USE_WSPI) || defined(__DOXYGEN__)
+#define HAL_USE_WSPI                        FALSE
+#endif
+
+/*===========================================================================*/
+/* PAL driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(PAL_USE_CALLBACKS) || defined(__DOXYGEN__)
+#define PAL_USE_CALLBACKS                   FALSE
+#endif
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(PAL_USE_WAIT) || defined(__DOXYGEN__)
+#define PAL_USE_WAIT                        FALSE
+#endif
+
+/*===========================================================================*/
+/* ADC driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(ADC_USE_WAIT) || defined(__DOXYGEN__)
+#define ADC_USE_WAIT                        TRUE
+#endif
+
+/**
+ * @brief   Enables the @p adcAcquireBus() and @p adcReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(ADC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define ADC_USE_MUTUAL_EXCLUSION            TRUE
+#endif
+
+/*===========================================================================*/
+/* CAN driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Sleep mode related APIs inclusion switch.
+ */
+#if !defined(CAN_USE_SLEEP_MODE) || defined(__DOXYGEN__)
+#define CAN_USE_SLEEP_MODE                  TRUE
+#endif
+
+/**
+ * @brief   Enforces the driver to use direct callbacks rather than OSAL events.
+ */
+#if !defined(CAN_ENFORCE_USE_CALLBACKS) || defined(__DOXYGEN__)
+#define CAN_ENFORCE_USE_CALLBACKS           FALSE
+#endif
+
+/*===========================================================================*/
+/* CRY driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables the SW fall-back of the cryptographic driver.
+ * @details When enabled, this option, activates a fall-back software
+ *          implementation for algorithms not supported by the underlying
+ *          hardware.
+ * @note    Fall-back implementations may not be present for all algorithms.
+ */
+#if !defined(HAL_CRY_USE_FALLBACK) || defined(__DOXYGEN__)
+#define HAL_CRY_USE_FALLBACK                FALSE
+#endif
+
+/**
+ * @brief   Makes the driver forcibly use the fall-back implementations.
+ */
+#if !defined(HAL_CRY_ENFORCE_FALLBACK) || defined(__DOXYGEN__)
+#define HAL_CRY_ENFORCE_FALLBACK            FALSE
+#endif
+
+/*===========================================================================*/
+/* DAC driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(DAC_USE_WAIT) || defined(__DOXYGEN__)
+#define DAC_USE_WAIT                        TRUE
+#endif
+
+/**
+ * @brief   Enables the @p dacAcquireBus() and @p dacReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(DAC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define DAC_USE_MUTUAL_EXCLUSION            TRUE
+#endif
+
+/*===========================================================================*/
+/* I2C driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables the mutual exclusion APIs on the I2C bus.
+ */
+#if !defined(I2C_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define I2C_USE_MUTUAL_EXCLUSION            TRUE
+#endif
+
+/*===========================================================================*/
+/* MAC driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables the zero-copy API.
+ */
+#if !defined(MAC_USE_ZERO_COPY) || defined(__DOXYGEN__)
+#define MAC_USE_ZERO_COPY                   FALSE
+#endif
+
+/**
+ * @brief   Enables an event sources for incoming packets.
+ */
+#if !defined(MAC_USE_EVENTS) || defined(__DOXYGEN__)
+#define MAC_USE_EVENTS                      TRUE
+#endif
+
+/*===========================================================================*/
+/* MMC_SPI driver related settings.                                          */
+/*===========================================================================*/
+
+/**
+ * @brief   Delays insertions.
+ * @details If enabled this options inserts delays into the MMC waiting
+ *          routines releasing some extra CPU time for the threads with
+ *          lower priority, this may slow down the driver a bit however.
+ *          This option is recommended also if the SPI driver does not
+ *          use a DMA channel and heavily loads the CPU.
+ */
+#if !defined(MMC_NICE_WAITING) || defined(__DOXYGEN__)
+#define MMC_NICE_WAITING                    TRUE
+#endif
+
+/*===========================================================================*/
+/* SDC driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Number of initialization attempts before rejecting the card.
+ * @note    Attempts are performed at 10mS intervals.
+ */
+#if !defined(SDC_INIT_RETRY) || defined(__DOXYGEN__)
+#define SDC_INIT_RETRY                      100
+#endif
+
+/**
+ * @brief   Include support for MMC cards.
+ * @note    MMC support is not yet implemented so this option must be kept
+ *          at @p FALSE.
+ */
+#if !defined(SDC_MMC_SUPPORT) || defined(__DOXYGEN__)
+#define SDC_MMC_SUPPORT                     FALSE
+#endif
+
+/**
+ * @brief   Delays insertions.
+ * @details If enabled this options inserts delays into the MMC waiting
+ *          routines releasing some extra CPU time for the threads with
+ *          lower priority, this may slow down the driver a bit however.
+ */
+#if !defined(SDC_NICE_WAITING) || defined(__DOXYGEN__)
+#define SDC_NICE_WAITING                    TRUE
+#endif
+
+/**
+ * @brief   OCR initialization constant for V20 cards.
+ */
+#if !defined(SDC_INIT_OCR_V20) || defined(__DOXYGEN__)
+#define SDC_INIT_OCR_V20                    0x50FF8000U
+#endif
+
+/**
+ * @brief   OCR initialization constant for non-V20 cards.
+ */
+#if !defined(SDC_INIT_OCR) || defined(__DOXYGEN__)
+#define SDC_INIT_OCR                        0x80100000U
+#endif
+
+/*===========================================================================*/
+/* SERIAL driver related settings.                                           */
+/*===========================================================================*/
+
+/**
+ * @brief   Default bit rate.
+ * @details Configuration parameter, this is the baud rate selected for the
+ *          default configuration.
+ */
+#if !defined(SERIAL_DEFAULT_BITRATE) || defined(__DOXYGEN__)
+#define SERIAL_DEFAULT_BITRATE              38400
+#endif
+
+/**
+ * @brief   Serial buffers size.
+ * @details Configuration parameter, you can change the depth of the queue
+ *          buffers depending on the requirements of your application.
+ * @note    The default is 16 bytes for both the transmission and receive
+ *          buffers.
+ */
+#if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__)
+#define SERIAL_BUFFERS_SIZE                 16
+#endif
+
+/*===========================================================================*/
+/* SERIAL_USB driver related setting.                                        */
+/*===========================================================================*/
+
+/**
+ * @brief   Serial over USB buffers size.
+ * @details Configuration parameter, the buffer size must be a multiple of
+ *          the USB data endpoint maximum packet size.
+ * @note    The default is 256 bytes for both the transmission and receive
+ *          buffers.
+ */
+#if !defined(SERIAL_USB_BUFFERS_SIZE) || defined(__DOXYGEN__)
+#define SERIAL_USB_BUFFERS_SIZE             1
+#endif
+
+/**
+ * @brief   Serial over USB number of buffers.
+ * @note    The default is 2 buffers.
+ */
+#if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
+#define SERIAL_USB_BUFFERS_NUMBER           2
+#endif
+
+/*===========================================================================*/
+/* SPI driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(SPI_USE_WAIT) || defined(__DOXYGEN__)
+#define SPI_USE_WAIT                        TRUE
+#endif
+
+/**
+ * @brief   Enables circular transfers APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(SPI_USE_CIRCULAR) || defined(__DOXYGEN__)
+#define SPI_USE_CIRCULAR                    FALSE
+#endif
+
+
+/**
+ * @brief   Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(SPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define SPI_USE_MUTUAL_EXCLUSION            TRUE
+#endif
+
+/**
+ * @brief   Handling method for SPI CS line.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(SPI_SELECT_MODE) || defined(__DOXYGEN__)
+#define SPI_SELECT_MODE                     SPI_SELECT_MODE_PAD
+#endif
+
+/*===========================================================================*/
+/* UART driver related settings.                                             */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(UART_USE_WAIT) || defined(__DOXYGEN__)
+#define UART_USE_WAIT                       FALSE
+#endif
+
+/**
+ * @brief   Enables the @p uartAcquireBus() and @p uartReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(UART_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define UART_USE_MUTUAL_EXCLUSION           FALSE
+#endif
+
+/*===========================================================================*/
+/* USB driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(USB_USE_WAIT) || defined(__DOXYGEN__)
+#define USB_USE_WAIT                        TRUE
+#endif
+
+/*===========================================================================*/
+/* WSPI driver related settings.                                             */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(WSPI_USE_WAIT) || defined(__DOXYGEN__)
+#define WSPI_USE_WAIT                       TRUE
+#endif
+
+/**
+ * @brief   Enables the @p wspiAcquireBus() and @p wspiReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(WSPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define WSPI_USE_MUTUAL_EXCLUSION           TRUE
+#endif
+
+#endif /* HALCONF_H */
+
+/** @} */
diff --git a/qmk/keyboards/box75/keymaps/default/keymap.c b/qmk/keyboards/box75/keymaps/default/keymap.c
new file mode 100644
index 00000000..741839e1
--- /dev/null
+++ b/qmk/keyboards/box75/keymaps/default/keymap.c
@@ -0,0 +1,29 @@
+/*
+Copyright 2012,2013 Jun Wako <wakojun@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#define ____ KC_NO
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+   [0] = LAYOUT(
+        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_Q   , KC_DEL ,
+        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_HOME, 
+        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_PGUP,
+        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_PGDN,
+        KC_LSFT, KC_BSLS, 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_END , 
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC ,                   KC_RALT, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT)
+};
diff --git a/qmk/keyboards/box75/keymaps/via/keymap.c b/qmk/keyboards/box75/keymaps/via/keymap.c
new file mode 100644
index 00000000..0c8a67b0
--- /dev/null
+++ b/qmk/keyboards/box75/keymaps/via/keymap.c
@@ -0,0 +1,49 @@
+/*
+Copyright 2012,2013 Jun Wako <wakojun@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+   [0] = LAYOUT(
+        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_DEL ,
+	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_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_PGUP,
+        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_HOME, KC_PGDN,
+        KC_LSFT, KC_BSLS, 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_END , 
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC ,                   KC_RALT, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT),
+   [1] = LAYOUT(
+	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+	_______, _______, _______,                            _______,                   _______, _______,          _______, _______, _______ ),
+   [2] = LAYOUT(
+	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+	_______, _______, _______,                            _______,                   _______, _______,          _______, _______, _______ ),
+   [3] = LAYOUT(
+	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+	_______, _______, _______,                            _______,                   _______, _______,          _______, _______, _______ )
+};
diff --git a/qmk/keyboards/box75/keymaps/via/rules.mk b/qmk/keyboards/box75/keymaps/via/rules.mk
new file mode 100644
index 00000000..1e5b9980
--- /dev/null
+++ b/qmk/keyboards/box75/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/qmk/keyboards/box75/mcuconf.h b/qmk/keyboards/box75/mcuconf.h
new file mode 100644
index 00000000..6289be66
--- /dev/null
+++ b/qmk/keyboards/box75/mcuconf.h
@@ -0,0 +1,176 @@
+/*
+    ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
+/*
+ * STM32F0xx drivers configuration.
+ * The following settings override the default settings present in
+ * the various device driver implementation headers.
+ * Note that the settings for each driver only have effect if the whole
+ * driver is enabled in halconf.h.
+ *
+ * IRQ priorities:
+ * 3...0       Lowest...Highest.
+ *
+ * DMA priorities:
+ * 0...3        Lowest...Highest.
+ */
+
+#define STM32F0xx_MCUCONF
+// #define STM32F070xB
+
+/*
+ * HAL driver system settings.
+ */
+#define STM32_NO_INIT                       FALSE
+#define STM32_PVD_ENABLE                    FALSE
+#define STM32_PLS                           STM32_PLS_LEV0
+#define STM32_HSI_ENABLED                   TRUE
+#define STM32_HSI14_ENABLED                 TRUE
+#define STM32_HSI48_ENABLED                 FALSE
+#define STM32_LSI_ENABLED                   TRUE
+#define STM32_HSE_ENABLED                   FALSE
+#define STM32_LSE_ENABLED                   FALSE
+#define STM32_SW                            STM32_SW_PLL
+#define STM32_PLLSRC                        STM32_PLLSRC_HSI_DIV2
+#define STM32_PREDIV_VALUE                  1
+#define STM32_PLLMUL_VALUE                  12
+#define STM32_HPRE                          STM32_HPRE_DIV1
+#define STM32_PPRE                          STM32_PPRE_DIV1
+#define STM32_ADCSW                         STM32_ADCSW_HSI14
+#define STM32_ADCPRE                        STM32_ADCPRE_DIV4
+#define STM32_MCOSEL                        STM32_MCOSEL_NOCLOCK
+#define STM32_ADCPRE                        STM32_ADCPRE_DIV4
+#define STM32_ADCSW                         STM32_ADCSW_HSI14
+#define STM32_USBSW                         STM32_USBSW_HSI48
+#define STM32_CECSW                         STM32_CECSW_HSI
+#define STM32_I2C1SW                        STM32_I2C1SW_HSI
+#define STM32_USART1SW                      STM32_USART1SW_PCLK
+#define STM32_RTCSEL                        STM32_RTCSEL_LSI
+
+/*
+ * ADC driver system settings.
+ */
+#define STM32_ADC_USE_ADC1                  FALSE
+#define STM32_ADC_ADC1_DMA_PRIORITY         2
+#define STM32_ADC_IRQ_PRIORITY              2
+#define STM32_ADC_ADC1_DMA_IRQ_PRIORITY     2
+
+/*
+ * EXT driver system settings.
+ */
+#define STM32_EXT_EXTI0_1_IRQ_PRIORITY      3
+#define STM32_EXT_EXTI2_3_IRQ_PRIORITY      3
+#define STM32_EXT_EXTI4_15_IRQ_PRIORITY     3
+#define STM32_EXT_EXTI16_IRQ_PRIORITY       3
+#define STM32_EXT_EXTI17_IRQ_PRIORITY       3
+
+/*
+ * GPT driver system settings.
+ */
+#define STM32_GPT_USE_TIM1                  FALSE
+#define STM32_GPT_USE_TIM2                  FALSE
+#define STM32_GPT_USE_TIM3                  FALSE
+#define STM32_GPT_USE_TIM14                 FALSE
+#define STM32_GPT_TIM1_IRQ_PRIORITY         2
+#define STM32_GPT_TIM2_IRQ_PRIORITY         2
+#define STM32_GPT_TIM3_IRQ_PRIORITY         2
+#define STM32_GPT_TIM14_IRQ_PRIORITY        2
+
+/*
+ * I2C driver system settings.
+ */
+#define STM32_I2C_USE_I2C1                  FALSE
+#define STM32_I2C_USE_I2C2                  FALSE
+#define STM32_I2C_BUSY_TIMEOUT              50
+#define STM32_I2C_I2C1_IRQ_PRIORITY         3
+#define STM32_I2C_I2C2_IRQ_PRIORITY         3
+#define STM32_I2C_USE_DMA                   FALSE
+#define STM32_I2C_I2C1_DMA_PRIORITY         1
+#define STM32_I2C_I2C2_DMA_PRIORITY         1
+#define STM32_I2C_I2C1_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 7)
+#define STM32_I2C_I2C1_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 6)
+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")
+
+/*
+ * ICU driver system settings.
+ */
+#define STM32_ICU_USE_TIM1                  FALSE
+#define STM32_ICU_USE_TIM2                  FALSE
+#define STM32_ICU_USE_TIM3                  FALSE
+#define STM32_ICU_TIM1_IRQ_PRIORITY         3
+#define STM32_ICU_TIM2_IRQ_PRIORITY         3
+#define STM32_ICU_TIM3_IRQ_PRIORITY         3
+
+/*
+ * PWM driver system settings.
+ */
+#define STM32_PWM_USE_ADVANCED              FALSE
+#define STM32_PWM_USE_TIM1                  FALSE
+#define STM32_PWM_USE_TIM2                  FALSE
+#define STM32_PWM_USE_TIM3                  FALSE
+#define STM32_PWM_TIM1_IRQ_PRIORITY         3
+#define STM32_PWM_TIM2_IRQ_PRIORITY         3
+#define STM32_PWM_TIM3_IRQ_PRIORITY         3
+
+/*
+ * SERIAL driver system settings.
+ */
+#define STM32_SERIAL_USE_USART1             FALSE
+#define STM32_SERIAL_USE_USART2             FALSE
+#define STM32_SERIAL_USART1_PRIORITY        3
+#define STM32_SERIAL_USART2_PRIORITY        3
+
+/*
+ * SPI driver system settings.
+ */
+#define STM32_SPI_USE_SPI1                  FALSE
+#define STM32_SPI_USE_SPI2                  FALSE
+#define STM32_SPI_SPI1_DMA_PRIORITY         1
+#define STM32_SPI_SPI2_DMA_PRIORITY         1
+#define STM32_SPI_SPI1_IRQ_PRIORITY         2
+#define STM32_SPI_SPI2_IRQ_PRIORITY         2
+#define STM32_SPI_SPI2_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 4)
+#define STM32_SPI_SPI2_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 5)
+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")
+
+/*
+ * ST driver system settings.
+ */
+#define STM32_ST_IRQ_PRIORITY               2
+#define STM32_ST_USE_TIMER                  2
+
+/*
+ * UART driver system settings.
+ */
+#define STM32_UART_USE_USART1               FALSE
+#define STM32_UART_USE_USART2               FALSE
+#define STM32_UART_USART1_IRQ_PRIORITY      3
+#define STM32_UART_USART2_IRQ_PRIORITY      3
+#define STM32_UART_USART1_DMA_PRIORITY      0
+#define STM32_UART_USART2_DMA_PRIORITY      0
+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")
+
+/*
+ * USB driver system settings.
+ */
+#define STM32_USB_USE_USB1                  TRUE
+#define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE
+#define STM32_USB_USB1_LP_IRQ_PRIORITY      3
+
+#endif /* _MCUCONF_H_ */
diff --git a/qmk/keyboards/box75/readme.md b/qmk/keyboards/box75/readme.md
new file mode 100644
index 00000000..881eb750
--- /dev/null
+++ b/qmk/keyboards/box75/readme.md
@@ -0,0 +1,18 @@
+# BOX75 QMK firmware folder
+
+## Introduction
+
+This is the QMK firmware repository for the BOX75, a keyboard designed by [Lin Design Studio](https://www.instagram.com/lin_designstudio/?hl=en). The PCB was designed by [Gondolindrim](https://github.com/Gondolindrim).
+
+The BOX75 is a 75% keyboard featuring a sleek exterior inspired by modern architecture. It supports MX-type switches only with no lighting options. Layout-wise, the BOX75 supports ISO layouts, split backspace and split right shift and three bottom row options (6u, 6.25u, 7u).
+
+As of november 2020, the only way to obtain a BOX75 is through the still upcoming Group Buy on [Novelkeys](http://novelkeys.xyz).
+
+## How to compile
+
+After setting up your build environment, you can compile the BOX75 default keymap by using:
+
+    make box75: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).
+
diff --git a/qmk/keyboards/box75/rules.mk b/qmk/keyboards/box75/rules.mk
new file mode 100644
index 00000000..2d2f71e1
--- /dev/null
+++ b/qmk/keyboards/box75/rules.mk
@@ -0,0 +1,23 @@
+# MCU name
+MCU = STM32F072
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = yes        # Console for debug
+COMMAND_ENABLE = yes        # Commands for debug and configuration
+# 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 = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = no
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/qmk/keyboards/bpiphany/kitten_paw/config.h b/qmk/keyboards/bpiphany/kitten_paw/config.h
index 89f104cf..5e1429c8 100644
--- a/qmk/keyboards/bpiphany/kitten_paw/config.h
+++ b/qmk/keyboards/bpiphany/kitten_paw/config.h
@@ -47,7 +47,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
- 
+
+#define LED_NUM_LOCK_PIN B7
+#define LED_CAPS_LOCK_PIN C6
+#define LED_SCROLL_LOCK_PIN C5
+#define LED_PIN_ON_STATE 0
+
 // #define BACKLIGHT_PIN B7
 // #define BACKLIGHT_BREATHING
 // #define BACKLIGHT_LEVELS 3
diff --git a/qmk/keyboards/bpiphany/kitten_paw/kitten_paw.c b/qmk/keyboards/bpiphany/kitten_paw/kitten_paw.c
index 26cb533f..e71b3c80 100644
--- a/qmk/keyboards/bpiphany/kitten_paw/kitten_paw.c
+++ b/qmk/keyboards/bpiphany/kitten_paw/kitten_paw.c
@@ -1,51 +1 @@
 #include "kitten_paw.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();
-}
-
-__attribute__ ((weak))
-void matrix_init_user(void) {
-}
-
-__attribute__ ((weak))
-void matrix_scan_user(void) {
-}
-
-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
-    CONFIG_LED_IO;
-    CONFIG_LED_IO;
-    print_dec(usb_led);
-    if (usb_led & (1<<USB_LED_CAPS_LOCK))
-        USB_LED_CAPS_LOCK_ON;
-    else
-        USB_LED_CAPS_LOCK_OFF;
-
-    if (usb_led & (1<<USB_LED_NUM_LOCK))
-        USB_LED_NUM_LOCK_ON;
-    else
-        USB_LED_NUM_LOCK_OFF;
-    if (usb_led & (1<<USB_LED_SCROLL_LOCK))
-        USB_LED_SCROLL_LOCK_ON;
-    else
-        USB_LED_SCROLL_LOCK_OFF;
-	led_set_user(usb_led);
-}
diff --git a/qmk/keyboards/bpiphany/kitten_paw/kitten_paw.h b/qmk/keyboards/bpiphany/kitten_paw/kitten_paw.h
index 4de550f8..38b2a943 100644
--- a/qmk/keyboards/bpiphany/kitten_paw/kitten_paw.h
+++ b/qmk/keyboards/bpiphany/kitten_paw/kitten_paw.h
@@ -3,17 +3,6 @@
 
 #include "quantum.h"
 
-#define CONFIG_LED_IO \
-  DDRB |= (1<<7); \
-  DDRC |= (1<<5) | (1<<6);
-
-#define USB_LED_CAPS_LOCK_ON    PORTC &= ~(1<<6)
-#define USB_LED_CAPS_LOCK_OFF   PORTC |=  (1<<6)
-#define USB_LED_NUM_LOCK_ON     PORTB &= ~(1<<7)
-#define USB_LED_NUM_LOCK_OFF    PORTB |=  (1<<7)
-#define USB_LED_SCROLL_LOCK_ON  PORTC &= ~(1<<5)
-#define USB_LED_SCROLL_LOCK_OFF PORTC |=  (1<<5)
-
 // This a shortcut to help you visually see your layout.
 // The first section contains all of the arguements
 // The second converts the arguments into a two-dimensional array
diff --git a/qmk/keyboards/bpiphany/tiger_lily/config.h b/qmk/keyboards/bpiphany/tiger_lily/config.h
index 1ab352cc..d7eb4294 100644
--- a/qmk/keyboards/bpiphany/tiger_lily/config.h
+++ b/qmk/keyboards/bpiphany/tiger_lily/config.h
@@ -44,6 +44,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define UNUSED_PINS { B0, C4, D3 }
 
+#define LED_NUM_LOCK_PIN C5
+#define LED_CAPS_LOCK_PIN C6
+#define LED_SCROLL_LOCK_PIN B7
+#define LED_PIN_ON_STATE 0
+
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
 
diff --git a/qmk/keyboards/bpiphany/tiger_lily/tiger_lily.c b/qmk/keyboards/bpiphany/tiger_lily/tiger_lily.c
index d2e7ba70..f57f8b5f 100644
--- a/qmk/keyboards/bpiphany/tiger_lily/tiger_lily.c
+++ b/qmk/keyboards/bpiphany/tiger_lily/tiger_lily.c
@@ -1,63 +1 @@
 #include "tiger_lily.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) {
-    DDRB |= (1<<7);
-    DDRC |= (1<<5) | (1<<6);
-
-    print_dec(usb_led);
-
-    if (usb_led & (1<<USB_LED_NUM_LOCK))
-        PORTC &= ~(1<<5);
-    else
-        PORTC |=  (1<<5);
-
-    if (usb_led & (1<<USB_LED_SCROLL_LOCK))
-        PORTB &= ~(1<<7);
-    else
-        PORTB |=  (1<<7);
-
-    if (usb_led & (1<<USB_LED_CAPS_LOCK))
-        PORTC &= ~(1<<6);
-    else
-        PORTC |=  (1<<6);
-
-    led_set_user(usb_led);
-}
-
-__attribute__ ((weak))
-void matrix_init_user(void) {
-}
-
-__attribute__ ((weak))
-void matrix_scan_user(void) {
-}
-
-__attribute__ ((weak))
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-
-__attribute__ ((weak))
-void led_set_user(uint8_t usb_led) {
-}
\ No newline at end of file
diff --git a/qmk/keyboards/bpiphany/unloved_bastard/config.h b/qmk/keyboards/bpiphany/unloved_bastard/config.h
index 029cdb59..e67ca658 100644
--- a/qmk/keyboards/bpiphany/unloved_bastard/config.h
+++ b/qmk/keyboards/bpiphany/unloved_bastard/config.h
@@ -35,6 +35,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
 
+#define LED_NUM_LOCK_PIN B7
+#define LED_CAPS_LOCK_PIN C5
+#define LED_SCROLL_LOCK_PIN C6
+#define LED_PIN_ON_STATE 0
+
 /* define if matrix has ghost (lacks anti-ghosting diodes) */
 //#define MATRIX_HAS_GHOST
 
diff --git a/qmk/keyboards/bpiphany/unloved_bastard/unloved_bastard.c b/qmk/keyboards/bpiphany/unloved_bastard/unloved_bastard.c
index 19759306..f4b8032a 100644
--- a/qmk/keyboards/bpiphany/unloved_bastard/unloved_bastard.c
+++ b/qmk/keyboards/bpiphany/unloved_bastard/unloved_bastard.c
@@ -14,57 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "unloved_bastard.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-	led_init_ports();
-	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);
-}
-
-// C5 left
-// C6 middle led
-// B7 right led
-void led_init_ports(void) {
-    DDRB |= (1<<7);
-    DDRC |= (1<<5);
-    DDRC |= (1<<6);
-
-    PORTB |= (1<<7);
-    PORTC |= (1<<5);
-    PORTC |= (1<<6);
-}
-
-
-void led_set_kb(uint8_t usb_led) {
-
-    if (usb_led & (1<<USB_LED_CAPS_LOCK))
-        PORTC &= ~(1<<5);
-    else
-        PORTC |=  (1<<5);
-
-    if (usb_led & (1<<USB_LED_NUM_LOCK))
-        PORTB &= ~(1<<7);
-    else
-        PORTB |=  (1<<7);
-
-    if (usb_led & (1<<USB_LED_SCROLL_LOCK))
-        PORTC &= ~(1<<6);
-    else
-        PORTC |=  (1<<6);
-
-    led_set_user(usb_led);
-}
diff --git a/qmk/keyboards/bt66tech/bt66tech60/bt66tech60.c b/qmk/keyboards/bt66tech/bt66tech60/bt66tech60.c
new file mode 100644
index 00000000..e7218b9e
--- /dev/null
+++ b/qmk/keyboards/bt66tech/bt66tech60/bt66tech60.c
@@ -0,0 +1,18 @@
+/* Copyright 2020 bt66tech
+ *
+ * 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 "bt66tech60.h"
diff --git a/qmk/keyboards/bt66tech/bt66tech60/bt66tech60.h b/qmk/keyboards/bt66tech/bt66tech60/bt66tech60.h
new file mode 100644
index 00000000..68db70b0
--- /dev/null
+++ b/qmk/keyboards/bt66tech/bt66tech60/bt66tech60.h
@@ -0,0 +1,41 @@
+/* Copyright 2020 bt66tech
+ *
+ * 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 is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT_60_ansi( \
+        K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
+        K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
+        K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, \
+        K30, 	  K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A,      K3D, \
+        K40, K41, K42,             K45,              	  K49, K4A, K4B, K4D  \
+) { \
+        { K00,  K01,  K02,  K03,   K04,   K05, K06,   K07,   K08,   K09, K0A, K0B,   K0C,   K0D }, \
+        { K10,  K11,  K12,  K13,   K14,   K15, K16,   K17,   K18,   K19, K1A, K1B,   K1C,   K1D }, \
+        { K20,  K21,  K22,  K23,   K24,   K25, K26,   K27,   K28,   K29, K2A, K2B,   KC_NO, K2D }, \
+        { K30,  K31,  K32,  K33,   K34,   K35, K36,   K37,   K38,   K39, K3A, KC_NO, KC_NO, K3D }, \
+        { K40,  K41,  K42,  KC_NO, KC_NO, K45, KC_NO, KC_NO, KC_NO, K49, K4A, K4B,   KC_NO, K4D }  \
+}
diff --git a/qmk/keyboards/bt66tech/bt66tech60/chconf.h b/qmk/keyboards/bt66tech/bt66tech60/chconf.h
new file mode 100644
index 00000000..f5e47164
--- /dev/null
+++ b/qmk/keyboards/bt66tech/bt66tech60/chconf.h
@@ -0,0 +1,714 @@
+/*
+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+/**
+ * @file    rt/templates/chconf.h
+ * @brief   Configuration file template.
+ * @details A copy of this file must be placed in each project directory, it
+ *          contains the application specific kernel settings.
+ *
+ * @addtogroup config
+ * @details Kernel related settings and hooks.
+ * @{
+ */
+
+#ifndef CHCONF_H
+#define CHCONF_H
+
+#define _CHIBIOS_RT_CONF_
+#define _CHIBIOS_RT_CONF_VER_6_0_
+
+/*===========================================================================*/
+/**
+ * @name System timers settings
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   System time counter resolution.
+ * @note    Allowed values are 16 or 32 bits.
+ */
+#if !defined(CH_CFG_ST_RESOLUTION)
+#define CH_CFG_ST_RESOLUTION                32
+#endif
+
+/**
+ * @brief   System tick frequency.
+ * @details Frequency of the system timer that drives the system ticks. This
+ *          setting also defines the system tick time unit.
+ */
+#if !defined(CH_CFG_ST_FREQUENCY)
+#define CH_CFG_ST_FREQUENCY                 100000
+#endif
+
+/**
+ * @brief   Time intervals data size.
+ * @note    Allowed values are 16, 32 or 64 bits.
+ */
+#if !defined(CH_CFG_INTERVALS_SIZE)
+#define CH_CFG_INTERVALS_SIZE               32
+#endif
+
+/**
+ * @brief   Time types data size.
+ * @note    Allowed values are 16 or 32 bits.
+ */
+#if !defined(CH_CFG_TIME_TYPES_SIZE)
+#define CH_CFG_TIME_TYPES_SIZE              32
+#endif
+
+/**
+ * @brief   Time delta constant for the tick-less mode.
+ * @note    If this value is zero then the system uses the classic
+ *          periodic tick. This value represents the minimum number
+ *          of ticks that is safe to specify in a timeout directive.
+ *          The value one is not valid, timeouts are rounded up to
+ *          this value.
+ */
+#if !defined(CH_CFG_ST_TIMEDELTA)
+#define CH_CFG_ST_TIMEDELTA                 0
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Kernel parameters and options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   Round robin interval.
+ * @details This constant is the number of system ticks allowed for the
+ *          threads before preemption occurs. Setting this value to zero
+ *          disables the preemption for threads with equal priority and the
+ *          round robin becomes cooperative. Note that higher priority
+ *          threads can still preempt, the kernel is always preemptive.
+ * @note    Disabling the round robin preemption makes the kernel more compact
+ *          and generally faster.
+ * @note    The round robin preemption is not supported in tickless mode and
+ *          must be set to zero in that case.
+ */
+#if !defined(CH_CFG_TIME_QUANTUM)
+#define CH_CFG_TIME_QUANTUM                 0
+#endif
+
+/**
+ * @brief   Managed RAM size.
+ * @details Size of the RAM area to be managed by the OS. If set to zero
+ *          then the whole available RAM is used. The core memory is made
+ *          available to the heap allocator and/or can be used directly through
+ *          the simplified core memory allocator.
+ *
+ * @note    In order to let the OS manage the whole RAM the linker script must
+ *          provide the @p __heap_base__ and @p __heap_end__ symbols.
+ * @note    Requires @p CH_CFG_USE_MEMCORE.
+ */
+#if !defined(CH_CFG_MEMCORE_SIZE)
+#define CH_CFG_MEMCORE_SIZE                 0
+#endif
+
+/**
+ * @brief   Idle thread automatic spawn suppression.
+ * @details When this option is activated the function @p chSysInit()
+ *          does not spawn the idle thread. The application @p main()
+ *          function becomes the idle thread and must implement an
+ *          infinite loop.
+ */
+#if !defined(CH_CFG_NO_IDLE_THREAD)
+#define CH_CFG_NO_IDLE_THREAD               FALSE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Performance options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   OS optimization.
+ * @details If enabled then time efficient rather than space efficient code
+ *          is used when two possible implementations exist.
+ *
+ * @note    This is not related to the compiler optimization options.
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_OPTIMIZE_SPEED)
+#define CH_CFG_OPTIMIZE_SPEED               TRUE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Subsystem options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   Time Measurement APIs.
+ * @details If enabled then the time measurement APIs are included in
+ *          the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_TM)
+#define CH_CFG_USE_TM                       FALSE
+#endif
+
+/**
+ * @brief   Threads registry APIs.
+ * @details If enabled then the registry APIs are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_REGISTRY)
+#define CH_CFG_USE_REGISTRY                 TRUE
+#endif
+
+/**
+ * @brief   Threads synchronization APIs.
+ * @details If enabled then the @p chThdWait() function is included in
+ *          the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_WAITEXIT)
+#define CH_CFG_USE_WAITEXIT                 TRUE
+#endif
+
+/**
+ * @brief   Semaphores APIs.
+ * @details If enabled then the Semaphores APIs are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_SEMAPHORES)
+#define CH_CFG_USE_SEMAPHORES               TRUE
+#endif
+
+/**
+ * @brief   Semaphores queuing mode.
+ * @details If enabled then the threads are enqueued on semaphores by
+ *          priority rather than in FIFO order.
+ *
+ * @note    The default is @p FALSE. Enable this if you have special
+ *          requirements.
+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.
+ */
+#if !defined(CH_CFG_USE_SEMAPHORES_PRIORITY)
+#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE
+#endif
+
+/**
+ * @brief   Mutexes APIs.
+ * @details If enabled then the mutexes APIs are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_MUTEXES)
+#define CH_CFG_USE_MUTEXES                  TRUE
+#endif
+
+/**
+ * @brief   Enables recursive behavior on mutexes.
+ * @note    Recursive mutexes are heavier and have an increased
+ *          memory footprint.
+ *
+ * @note    The default is @p FALSE.
+ * @note    Requires @p CH_CFG_USE_MUTEXES.
+ */
+#if !defined(CH_CFG_USE_MUTEXES_RECURSIVE)
+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE
+#endif
+
+/**
+ * @brief   Conditional Variables APIs.
+ * @details If enabled then the conditional variables APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_MUTEXES.
+ */
+#if !defined(CH_CFG_USE_CONDVARS)
+#define CH_CFG_USE_CONDVARS                 TRUE
+#endif
+
+/**
+ * @brief   Conditional Variables APIs with timeout.
+ * @details If enabled then the conditional variables APIs with timeout
+ *          specification are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_CONDVARS.
+ */
+#if !defined(CH_CFG_USE_CONDVARS_TIMEOUT)
+#define CH_CFG_USE_CONDVARS_TIMEOUT         FALSE
+#endif
+
+/**
+ * @brief   Events Flags APIs.
+ * @details If enabled then the event flags APIs are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_EVENTS)
+#define CH_CFG_USE_EVENTS                   TRUE
+#endif
+
+/**
+ * @brief   Events Flags APIs with timeout.
+ * @details If enabled then the events APIs with timeout specification
+ *          are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_EVENTS.
+ */
+#if !defined(CH_CFG_USE_EVENTS_TIMEOUT)
+#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE
+#endif
+
+/**
+ * @brief   Synchronous Messages APIs.
+ * @details If enabled then the synchronous messages APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_MESSAGES)
+#define CH_CFG_USE_MESSAGES                 TRUE
+#endif
+
+/**
+ * @brief   Synchronous Messages queuing mode.
+ * @details If enabled then messages are served by priority rather than in
+ *          FIFO order.
+ *
+ * @note    The default is @p FALSE. Enable this if you have special
+ *          requirements.
+ * @note    Requires @p CH_CFG_USE_MESSAGES.
+ */
+#if !defined(CH_CFG_USE_MESSAGES_PRIORITY)
+#define CH_CFG_USE_MESSAGES_PRIORITY        FALSE
+#endif
+
+/**
+ * @brief   Mailboxes APIs.
+ * @details If enabled then the asynchronous messages (mailboxes) APIs are
+ *          included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.
+ */
+#if !defined(CH_CFG_USE_MAILBOXES)
+#define CH_CFG_USE_MAILBOXES                TRUE
+#endif
+
+/**
+ * @brief   Core Memory Manager APIs.
+ * @details If enabled then the core memory manager APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_MEMCORE)
+#define CH_CFG_USE_MEMCORE                  TRUE
+#endif
+
+/**
+ * @brief   Heap Allocator APIs.
+ * @details If enabled then the memory heap allocator APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_MEMCORE and either @p CH_CFG_USE_MUTEXES or
+ *          @p CH_CFG_USE_SEMAPHORES.
+ * @note    Mutexes are recommended.
+ */
+#if !defined(CH_CFG_USE_HEAP)
+#define CH_CFG_USE_HEAP                     TRUE
+#endif
+
+/**
+ * @brief   Memory Pools Allocator APIs.
+ * @details If enabled then the memory pools allocator APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_MEMPOOLS)
+#define CH_CFG_USE_MEMPOOLS                 FALSE
+#endif
+
+/**
+ * @brief   Objects FIFOs APIs.
+ * @details If enabled then the objects FIFOs APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_OBJ_FIFOS)
+#define CH_CFG_USE_OBJ_FIFOS                FALSE
+#endif
+
+/**
+ * @brief   Pipes APIs.
+ * @details If enabled then the pipes APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_PIPES)
+#define CH_CFG_USE_PIPES                    FALSE
+#endif
+
+/**
+ * @brief   Dynamic Threads APIs.
+ * @details If enabled then the dynamic threads creation APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_WAITEXIT.
+ * @note    Requires @p CH_CFG_USE_HEAP and/or @p CH_CFG_USE_MEMPOOLS.
+ */
+#if !defined(CH_CFG_USE_DYNAMIC)
+#define CH_CFG_USE_DYNAMIC                  FALSE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Objects factory options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   Objects Factory APIs.
+ * @details If enabled then the objects factory APIs are included in the
+ *          kernel.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_CFG_USE_FACTORY)
+#define CH_CFG_USE_FACTORY                  FALSE
+#endif
+
+/**
+ * @brief   Maximum length for object names.
+ * @details If the specified length is zero then the name is stored by
+ *          pointer but this could have unintended side effects.
+ */
+#if !defined(CH_CFG_FACTORY_MAX_NAMES_LENGTH)
+#define CH_CFG_FACTORY_MAX_NAMES_LENGTH     8
+#endif
+
+/**
+ * @brief   Enables the registry of generic objects.
+ */
+#if !defined(CH_CFG_FACTORY_OBJECTS_REGISTRY)
+#define CH_CFG_FACTORY_OBJECTS_REGISTRY     FALSE
+#endif
+
+/**
+ * @brief   Enables factory for generic buffers.
+ */
+#if !defined(CH_CFG_FACTORY_GENERIC_BUFFERS)
+#define CH_CFG_FACTORY_GENERIC_BUFFERS      FALSE
+#endif
+
+/**
+ * @brief   Enables factory for semaphores.
+ */
+#if !defined(CH_CFG_FACTORY_SEMAPHORES)
+#define CH_CFG_FACTORY_SEMAPHORES           FALSE
+#endif
+
+/**
+ * @brief   Enables factory for mailboxes.
+ */
+#if !defined(CH_CFG_FACTORY_MAILBOXES)
+#define CH_CFG_FACTORY_MAILBOXES            FALSE
+#endif
+
+/**
+ * @brief   Enables factory for objects FIFOs.
+ */
+#if !defined(CH_CFG_FACTORY_OBJ_FIFOS)
+#define CH_CFG_FACTORY_OBJ_FIFOS            FALSE
+#endif
+
+/**
+ * @brief   Enables factory for Pipes.
+ */
+#if !defined(CH_CFG_FACTORY_PIPES) || defined(__DOXYGEN__)
+#define CH_CFG_FACTORY_PIPES                FALSE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Debug options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   Debug option, kernel statistics.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_STATISTICS)
+#define CH_DBG_STATISTICS                   FALSE
+#endif
+
+/**
+ * @brief   Debug option, system state check.
+ * @details If enabled the correct call protocol for system APIs is checked
+ *          at runtime.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_SYSTEM_STATE_CHECK)
+#define CH_DBG_SYSTEM_STATE_CHECK           FALSE
+#endif
+
+/**
+ * @brief   Debug option, parameters checks.
+ * @details If enabled then the checks on the API functions input
+ *          parameters are activated.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_ENABLE_CHECKS)
+#define CH_DBG_ENABLE_CHECKS                FALSE
+#endif
+
+/**
+ * @brief   Debug option, consistency checks.
+ * @details If enabled then all the assertions in the kernel code are
+ *          activated. This includes consistency checks inside the kernel,
+ *          runtime anomalies and port-defined checks.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_ENABLE_ASSERTS)
+#define CH_DBG_ENABLE_ASSERTS               FALSE
+#endif
+
+/**
+ * @brief   Debug option, trace buffer.
+ * @details If enabled then the trace buffer is activated.
+ *
+ * @note    The default is @p CH_DBG_TRACE_MASK_DISABLED.
+ */
+#if !defined(CH_DBG_TRACE_MASK)
+#define CH_DBG_TRACE_MASK                   CH_DBG_TRACE_MASK_DISABLED
+#endif
+
+/**
+ * @brief   Trace buffer entries.
+ * @note    The trace buffer is only allocated if @p CH_DBG_TRACE_MASK is
+ *          different from @p CH_DBG_TRACE_MASK_DISABLED.
+ */
+#if !defined(CH_DBG_TRACE_BUFFER_SIZE)
+#define CH_DBG_TRACE_BUFFER_SIZE            128
+#endif
+
+/**
+ * @brief   Debug option, stack checks.
+ * @details If enabled then a runtime stack check is performed.
+ *
+ * @note    The default is @p FALSE.
+ * @note    The stack check is performed in a architecture/port dependent way.
+ *          It may not be implemented or some ports.
+ * @note    The default failure mode is to halt the system with the global
+ *          @p panic_msg variable set to @p NULL.
+ */
+#if !defined(CH_DBG_ENABLE_STACK_CHECK)
+#define CH_DBG_ENABLE_STACK_CHECK           FALSE
+#endif
+
+/**
+ * @brief   Debug option, stacks initialization.
+ * @details If enabled then the threads working area is filled with a byte
+ *          value when a thread is created. This can be useful for the
+ *          runtime measurement of the used stack.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_FILL_THREADS)
+#define CH_DBG_FILL_THREADS                 FALSE
+#endif
+
+/**
+ * @brief   Debug option, threads profiling.
+ * @details If enabled then a field is added to the @p thread_t structure that
+ *          counts the system ticks occurred while executing the thread.
+ *
+ * @note    The default is @p FALSE.
+ * @note    This debug option is not currently compatible with the
+ *          tickless mode.
+ */
+#if !defined(CH_DBG_THREADS_PROFILING)
+#define CH_DBG_THREADS_PROFILING            FALSE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Kernel hooks
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   System structure extension.
+ * @details User fields added to the end of the @p ch_system_t structure.
+ */
+#define CH_CFG_SYSTEM_EXTRA_FIELDS                                          \
+  /* Add threads custom fields here.*/
+
+/**
+ * @brief   System initialization hook.
+ * @details User initialization code added to the @p chSysInit() function
+ *          just before interrupts are enabled globally.
+ */
+#define CH_CFG_SYSTEM_INIT_HOOK() {                                         \
+  /* Add threads initialization code here.*/                                \
+}
+
+/**
+ * @brief   Threads descriptor structure extension.
+ * @details User fields added to the end of the @p thread_t structure.
+ */
+#define CH_CFG_THREAD_EXTRA_FIELDS                                          \
+  /* Add threads custom fields here.*/
+
+/**
+ * @brief   Threads initialization hook.
+ * @details User initialization code added to the @p _thread_init() function.
+ *
+ * @note    It is invoked from within @p _thread_init() and implicitly from all
+ *          the threads creation APIs.
+ */
+#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \
+  /* Add threads initialization code here.*/                                \
+}
+
+/**
+ * @brief   Threads finalization hook.
+ * @details User finalization code added to the @p chThdExit() API.
+ */
+#define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \
+  /* Add threads finalization code here.*/                                  \
+}
+
+/**
+ * @brief   Context switch hook.
+ * @details This hook is invoked just before switching between threads.
+ */
+#define CH_CFG_CONTEXT_SWITCH_HOOK(ntp, otp) {                              \
+  /* Context switch code here.*/                                            \
+}
+
+/**
+ * @brief   ISR enter hook.
+ */
+#define CH_CFG_IRQ_PROLOGUE_HOOK() {                                        \
+  /* IRQ prologue code here.*/                                              \
+}
+
+/**
+ * @brief   ISR exit hook.
+ */
+#define CH_CFG_IRQ_EPILOGUE_HOOK() {                                        \
+  /* IRQ epilogue code here.*/                                              \
+}
+
+/**
+ * @brief   Idle thread enter hook.
+ * @note    This hook is invoked within a critical zone, no OS functions
+ *          should be invoked from here.
+ * @note    This macro can be used to activate a power saving mode.
+ */
+#define CH_CFG_IDLE_ENTER_HOOK() {                                          \
+  /* Idle-enter code here.*/                                                \
+}
+
+/**
+ * @brief   Idle thread leave hook.
+ * @note    This hook is invoked within a critical zone, no OS functions
+ *          should be invoked from here.
+ * @note    This macro can be used to deactivate a power saving mode.
+ */
+#define CH_CFG_IDLE_LEAVE_HOOK() {                                          \
+  /* Idle-leave code here.*/                                                \
+}
+
+/**
+ * @brief   Idle Loop hook.
+ * @details This hook is continuously invoked by the idle thread loop.
+ */
+#define CH_CFG_IDLE_LOOP_HOOK() {                                           \
+  /* Idle loop code here.*/                                                 \
+}
+
+/**
+ * @brief   System tick event hook.
+ * @details This hook is invoked in the system tick handler immediately
+ *          after processing the virtual timers queue.
+ */
+#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \
+  /* System tick event code here.*/                                         \
+}
+
+/**
+ * @brief   System halt hook.
+ * @details This hook is invoked in case to a system halting error before
+ *          the system is halted.
+ */
+#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \
+  /* System halt code here.*/                                               \
+}
+
+/**
+ * @brief   Trace hook.
+ * @details This hook is invoked each time a new record is written in the
+ *          trace buffer.
+ */
+#define CH_CFG_TRACE_HOOK(tep) {                                            \
+  /* Trace code here.*/                                                     \
+}
+
+/** @} */
+
+/*===========================================================================*/
+/* Port-specific settings (override port settings defaulted in chcore.h).    */
+/*===========================================================================*/
+
+#endif  /* CHCONF_H */
+
+/** @} */
diff --git a/qmk/keyboards/bt66tech/bt66tech60/config.h b/qmk/keyboards/bt66tech/bt66tech60/config.h
new file mode 100644
index 00000000..ae202407
--- /dev/null
+++ b/qmk/keyboards/bt66tech/bt66tech60/config.h
@@ -0,0 +1,95 @@
+/*
+Copyright 2020 bt66tech
+
+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
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0xCA04
+#define PRODUCT_ID      0x6060
+#define DEVICE_VER      0x0001
+#define MANUFACTURER bt66tech
+#define PRODUCT bt66tech 60% 
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 14
+
+#define MATRIX_COL_PINS { B9, B8, B7, B6, B5, B4, B3, B11, A15, A10, A9, B14, B13, B12 }
+#define MATRIX_ROW_PINS { B10, B1, B0, A7, A6 }
+#define DIODE_DIRECTION COL2ROW
+
+#define BACKLIGHT_PIN A8
+#define BACKLIGHT_PWM_DRIVER PWMD1
+#define BACKLIGHT_PWM_CHANNEL 1
+#define BACKLIGHT_LEVELS 6
+#define BACKLIGHT_BREATHING
+#define BREATHING_PERIOD 6
+
+/* define if matrix has ghost */
+//#define MATRIX_HAS_GHOST
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE    5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+#define RGBLIGHT_ANIMATIONS
+#define RGB_DI_PIN B15
+#define RGBLED_NUM 9
+#define WS2812_SPI SPID2
+#define WS2812_SPI_MOSI_PAL_MODE 5
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+#define FORCE_NKRO
+
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+//#define NO_ACTION_MACRO
+//#define NO_ACTION_FUNCTION
diff --git a/qmk/keyboards/bt66tech/bt66tech60/halconf.h b/qmk/keyboards/bt66tech/bt66tech60/halconf.h
new file mode 100644
index 00000000..92180376
--- /dev/null
+++ b/qmk/keyboards/bt66tech/bt66tech60/halconf.h
@@ -0,0 +1,525 @@
+/*
+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+/**
+ * @file    templates/halconf.h
+ * @brief   HAL configuration header.
+ * @details HAL configuration file, this file allows to enable or disable the
+ *          various device drivers from your application. You may also use
+ *          this file in order to override the device drivers default settings.
+ *
+ * @addtogroup HAL_CONF
+ * @{
+ */
+
+#ifndef HALCONF_H
+#define HALCONF_H
+
+#define _CHIBIOS_HAL_CONF_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
+
+#include "mcuconf.h"
+
+/**
+ * @brief   Enables the PAL subsystem.
+ */
+#if !defined(HAL_USE_PAL) || defined(__DOXYGEN__)
+#define HAL_USE_PAL                         TRUE
+#endif
+
+/**
+ * @brief   Enables the ADC subsystem.
+ */
+#if !defined(HAL_USE_ADC) || defined(__DOXYGEN__)
+#define HAL_USE_ADC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the CAN subsystem.
+ */
+#if !defined(HAL_USE_CAN) || defined(__DOXYGEN__)
+#define HAL_USE_CAN                         FALSE
+#endif
+
+/**
+ * @brief   Enables the cryptographic subsystem.
+ */
+#if !defined(HAL_USE_CRY) || defined(__DOXYGEN__)
+#define HAL_USE_CRY                         FALSE
+#endif
+
+/**
+ * @brief   Enables the DAC subsystem.
+ */
+#if !defined(HAL_USE_DAC) || defined(__DOXYGEN__)
+#define HAL_USE_DAC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the GPT subsystem.
+ */
+#if !defined(HAL_USE_GPT) || defined(__DOXYGEN__)
+#define HAL_USE_GPT                         FALSE
+#endif
+
+/**
+ * @brief   Enables the I2C subsystem.
+ */
+#if !defined(HAL_USE_I2C) || defined(__DOXYGEN__)
+#define HAL_USE_I2C                         FALSE
+#endif
+
+/**
+ * @brief   Enables the I2S subsystem.
+ */
+#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)
+#define HAL_USE_I2S                         FALSE
+#endif
+
+/**
+ * @brief   Enables the ICU subsystem.
+ */
+#if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)
+#define HAL_USE_ICU                         FALSE
+#endif
+
+/**
+ * @brief   Enables the MAC subsystem.
+ */
+#if !defined(HAL_USE_MAC) || defined(__DOXYGEN__)
+#define HAL_USE_MAC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the MMC_SPI subsystem.
+ */
+#if !defined(HAL_USE_MMC_SPI) || defined(__DOXYGEN__)
+#define HAL_USE_MMC_SPI                     FALSE
+#endif
+
+/**
+ * @brief   Enables the PWM subsystem.
+ */
+#if !defined(HAL_USE_PWM) || defined(__DOXYGEN__)
+#define HAL_USE_PWM                         TRUE
+#endif
+
+/**
+ * @brief   Enables the RTC subsystem.
+ */
+#if !defined(HAL_USE_RTC) || defined(__DOXYGEN__)
+#define HAL_USE_RTC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the SDC subsystem.
+ */
+#if !defined(HAL_USE_SDC) || defined(__DOXYGEN__)
+#define HAL_USE_SDC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the SERIAL subsystem.
+ */
+#if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__)
+#define HAL_USE_SERIAL                      FALSE
+#endif
+
+/**
+ * @brief   Enables the SERIAL over USB subsystem.
+ */
+#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)
+#define HAL_USE_SERIAL_USB                  FALSE
+#endif
+
+/**
+ * @brief   Enables the SIO subsystem.
+ */
+#if !defined(HAL_USE_SIO) || defined(__DOXYGEN__)
+#define HAL_USE_SIO                         FALSE
+#endif
+
+/**
+ * @brief   Enables the SPI subsystem.
+ */
+#if !defined(HAL_USE_SPI) || defined(__DOXYGEN__)
+#define HAL_USE_SPI                         TRUE
+#endif
+
+/**
+ * @brief   Enables the TRNG subsystem.
+ */
+#if !defined(HAL_USE_TRNG) || defined(__DOXYGEN__)
+#define HAL_USE_TRNG                        FALSE
+#endif
+
+/**
+ * @brief   Enables the UART subsystem.
+ */
+#if !defined(HAL_USE_UART) || defined(__DOXYGEN__)
+#define HAL_USE_UART                        FALSE
+#endif
+
+/**
+ * @brief   Enables the USB subsystem.
+ */
+#if !defined(HAL_USE_USB) || defined(__DOXYGEN__)
+#define HAL_USE_USB                         TRUE
+#endif
+
+/**
+ * @brief   Enables the WDG subsystem.
+ */
+#if !defined(HAL_USE_WDG) || defined(__DOXYGEN__)
+#define HAL_USE_WDG                         FALSE
+#endif
+
+/**
+ * @brief   Enables the WSPI subsystem.
+ */
+#if !defined(HAL_USE_WSPI) || defined(__DOXYGEN__)
+#define HAL_USE_WSPI                        FALSE
+#endif
+
+/*===========================================================================*/
+/* PAL driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(PAL_USE_CALLBACKS) || defined(__DOXYGEN__)
+#define PAL_USE_CALLBACKS                   FALSE
+#endif
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(PAL_USE_WAIT) || defined(__DOXYGEN__)
+#define PAL_USE_WAIT                        FALSE
+#endif
+
+/*===========================================================================*/
+/* ADC driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(ADC_USE_WAIT) || defined(__DOXYGEN__)
+#define ADC_USE_WAIT                        TRUE
+#endif
+
+/**
+ * @brief   Enables the @p adcAcquireBus() and @p adcReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(ADC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define ADC_USE_MUTUAL_EXCLUSION            TRUE
+#endif
+
+/*===========================================================================*/
+/* CAN driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Sleep mode related APIs inclusion switch.
+ */
+#if !defined(CAN_USE_SLEEP_MODE) || defined(__DOXYGEN__)
+#define CAN_USE_SLEEP_MODE                  TRUE
+#endif
+
+/**
+ * @brief   Enforces the driver to use direct callbacks rather than OSAL events.
+ */
+#if !defined(CAN_ENFORCE_USE_CALLBACKS) || defined(__DOXYGEN__)
+#define CAN_ENFORCE_USE_CALLBACKS           FALSE
+#endif
+
+/*===========================================================================*/
+/* CRY driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables the SW fall-back of the cryptographic driver.
+ * @details When enabled, this option, activates a fall-back software
+ *          implementation for algorithms not supported by the underlying
+ *          hardware.
+ * @note    Fall-back implementations may not be present for all algorithms.
+ */
+#if !defined(HAL_CRY_USE_FALLBACK) || defined(__DOXYGEN__)
+#define HAL_CRY_USE_FALLBACK                FALSE
+#endif
+
+/**
+ * @brief   Makes the driver forcibly use the fall-back implementations.
+ */
+#if !defined(HAL_CRY_ENFORCE_FALLBACK) || defined(__DOXYGEN__)
+#define HAL_CRY_ENFORCE_FALLBACK            FALSE
+#endif
+
+/*===========================================================================*/
+/* DAC driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(DAC_USE_WAIT) || defined(__DOXYGEN__)
+#define DAC_USE_WAIT                        TRUE
+#endif
+
+/**
+ * @brief   Enables the @p dacAcquireBus() and @p dacReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(DAC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define DAC_USE_MUTUAL_EXCLUSION            TRUE
+#endif
+
+/*===========================================================================*/
+/* I2C driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables the mutual exclusion APIs on the I2C bus.
+ */
+#if !defined(I2C_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define I2C_USE_MUTUAL_EXCLUSION            TRUE
+#endif
+
+/*===========================================================================*/
+/* MAC driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables the zero-copy API.
+ */
+#if !defined(MAC_USE_ZERO_COPY) || defined(__DOXYGEN__)
+#define MAC_USE_ZERO_COPY                   FALSE
+#endif
+
+/**
+ * @brief   Enables an event sources for incoming packets.
+ */
+#if !defined(MAC_USE_EVENTS) || defined(__DOXYGEN__)
+#define MAC_USE_EVENTS                      TRUE
+#endif
+
+/*===========================================================================*/
+/* MMC_SPI driver related settings.                                          */
+/*===========================================================================*/
+
+/**
+ * @brief   Delays insertions.
+ * @details If enabled this options inserts delays into the MMC waiting
+ *          routines releasing some extra CPU time for the threads with
+ *          lower priority, this may slow down the driver a bit however.
+ *          This option is recommended also if the SPI driver does not
+ *          use a DMA channel and heavily loads the CPU.
+ */
+#if !defined(MMC_NICE_WAITING) || defined(__DOXYGEN__)
+#define MMC_NICE_WAITING                    TRUE
+#endif
+
+/*===========================================================================*/
+/* SDC driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Number of initialization attempts before rejecting the card.
+ * @note    Attempts are performed at 10mS intervals.
+ */
+#if !defined(SDC_INIT_RETRY) || defined(__DOXYGEN__)
+#define SDC_INIT_RETRY                      100
+#endif
+
+/**
+ * @brief   Include support for MMC cards.
+ * @note    MMC support is not yet implemented so this option must be kept
+ *          at @p FALSE.
+ */
+#if !defined(SDC_MMC_SUPPORT) || defined(__DOXYGEN__)
+#define SDC_MMC_SUPPORT                     FALSE
+#endif
+
+/**
+ * @brief   Delays insertions.
+ * @details If enabled this options inserts delays into the MMC waiting
+ *          routines releasing some extra CPU time for the threads with
+ *          lower priority, this may slow down the driver a bit however.
+ */
+#if !defined(SDC_NICE_WAITING) || defined(__DOXYGEN__)
+#define SDC_NICE_WAITING                    TRUE
+#endif
+
+/**
+ * @brief   OCR initialization constant for V20 cards.
+ */
+#if !defined(SDC_INIT_OCR_V20) || defined(__DOXYGEN__)
+#define SDC_INIT_OCR_V20                    0x50FF8000U
+#endif
+
+/**
+ * @brief   OCR initialization constant for non-V20 cards.
+ */
+#if !defined(SDC_INIT_OCR) || defined(__DOXYGEN__)
+#define SDC_INIT_OCR                        0x80100000U
+#endif
+
+/*===========================================================================*/
+/* SERIAL driver related settings.                                           */
+/*===========================================================================*/
+
+/**
+ * @brief   Default bit rate.
+ * @details Configuration parameter, this is the baud rate selected for the
+ *          default configuration.
+ */
+#if !defined(SERIAL_DEFAULT_BITRATE) || defined(__DOXYGEN__)
+#define SERIAL_DEFAULT_BITRATE              38400
+#endif
+
+/**
+ * @brief   Serial buffers size.
+ * @details Configuration parameter, you can change the depth of the queue
+ *          buffers depending on the requirements of your application.
+ * @note    The default is 16 bytes for both the transmission and receive
+ *          buffers.
+ */
+#if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__)
+#define SERIAL_BUFFERS_SIZE                 16
+#endif
+
+/*===========================================================================*/
+/* SERIAL_USB driver related setting.                                        */
+/*===========================================================================*/
+
+/**
+ * @brief   Serial over USB buffers size.
+ * @details Configuration parameter, the buffer size must be a multiple of
+ *          the USB data endpoint maximum packet size.
+ * @note    The default is 256 bytes for both the transmission and receive
+ *          buffers.
+ */
+#if !defined(SERIAL_USB_BUFFERS_SIZE) || defined(__DOXYGEN__)
+#define SERIAL_USB_BUFFERS_SIZE             1
+#endif
+
+/**
+ * @brief   Serial over USB number of buffers.
+ * @note    The default is 2 buffers.
+ */
+#if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
+#define SERIAL_USB_BUFFERS_NUMBER           2
+#endif
+
+/*===========================================================================*/
+/* SPI driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(SPI_USE_WAIT) || defined(__DOXYGEN__)
+#define SPI_USE_WAIT                        TRUE
+#endif
+
+/**
+ * @brief   Enables circular transfers APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(SPI_USE_CIRCULAR) || defined(__DOXYGEN__)
+#define SPI_USE_CIRCULAR                    FALSE
+#endif
+
+
+/**
+ * @brief   Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(SPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define SPI_USE_MUTUAL_EXCLUSION            TRUE
+#endif
+
+/**
+ * @brief   Handling method for SPI CS line.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(SPI_SELECT_MODE) || defined(__DOXYGEN__)
+#define SPI_SELECT_MODE                     SPI_SELECT_MODE_PAD
+#endif
+
+/*===========================================================================*/
+/* UART driver related settings.                                             */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(UART_USE_WAIT) || defined(__DOXYGEN__)
+#define UART_USE_WAIT                       FALSE
+#endif
+
+/**
+ * @brief   Enables the @p uartAcquireBus() and @p uartReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(UART_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define UART_USE_MUTUAL_EXCLUSION           FALSE
+#endif
+
+/*===========================================================================*/
+/* USB driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(USB_USE_WAIT) || defined(__DOXYGEN__)
+#define USB_USE_WAIT                        TRUE
+#endif
+
+/*===========================================================================*/
+/* WSPI driver related settings.                                             */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(WSPI_USE_WAIT) || defined(__DOXYGEN__)
+#define WSPI_USE_WAIT                       TRUE
+#endif
+
+/**
+ * @brief   Enables the @p wspiAcquireBus() and @p wspiReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(WSPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define WSPI_USE_MUTUAL_EXCLUSION           TRUE
+#endif
+
+#endif /* HALCONF_H */
+
+/** @} */
diff --git a/qmk/keyboards/bt66tech/bt66tech60/info.json b/qmk/keyboards/bt66tech/bt66tech60/info.json
new file mode 100644
index 00000000..3ea3f584
--- /dev/null
+++ b/qmk/keyboards/bt66tech/bt66tech60/info.json
@@ -0,0 +1,15 @@
+{
+    "keyboard_name": "bt66tech60",
+    "url": "",
+    "maintainer": "bt66tech",
+    "width": 15,
+    "height": 5,
+    "layouts": {
+        "LAYOUT_60_ansi": {
+"layout": [
+{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":2.75}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}
+              ]
+    }
+  }
+}
+
diff --git a/qmk/keyboards/bt66tech/bt66tech60/keymaps/default/keymap.c b/qmk/keyboards/bt66tech/bt66tech60/keymaps/default/keymap.c
new file mode 100644
index 00000000..7e2326ad
--- /dev/null
+++ b/qmk/keyboards/bt66tech/bt66tech60/keymaps/default/keymap.c
@@ -0,0 +1,51 @@
+/* Copyright 2020 bt66tech
+ *
+ * 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 names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _FN,
+    _FN1
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+[_BASE] = LAYOUT_60_ansi(
+    KC_GESC, 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_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_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_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                          KC_RALT, KC_RGUI, KC_RCTL,  MO(_FN)
+  ),
+
+  [_FN] = LAYOUT_60_ansi(
+    	  KC_GRV,      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_DEL, 
+    KC_MS_ACCEL0, KC_MS_BTN1,    KC_MS_UP, KC_MS_BTN2, 	 _______,    _______, 	 _______,  _______, _______,  _______, KC_PSCREEN, _______, _______, _______, 
+    KC_MS_ACCEL1, KC_MS_LEFT,  KC_MS_DOWN,KC_MS_RIGHT, 	 _______,    _______,	 _______,  _______, _______,  _______,    _______, _______,          _______, 
+    KC_MS_ACCEL2,    _______,     _______,    _______,    _______,    _______,    _______,  _______, _______,  _______,              KC_UP,          MO(_FN1), 
+    	 _______,    _______,     _______,                                       _______,                                 KC_LEFT, KC_DOWN, KC_RGHT, _______
+  ),
+
+[_FN1] = LAYOUT_60_ansi(
+    BL_TOGG, BL_STEP,   BL_ON,   BL_OFF,   BL_INC,   BL_DEC,   BL_BRTG,   _______,   _______,   _______,   _______,  BL_DEC,  BL_INC,   _______, 
+     _______, _______,  _______,   _______,  _______,  _______,  _______, _______, _______, _______, _______, _______, _______, _______, 
+     _______,  _______,  _______,  _______,  _______,  _______,  _______, _______, _______, _______, _______, _______,          _______, 
+     _______,  _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, 
+    _______,  _______, _______,                            _______,                            _______,  _______, _______, _______
+  )
+
+};
diff --git a/qmk/keyboards/bt66tech/bt66tech60/keymaps/default/readme.md b/qmk/keyboards/bt66tech/bt66tech60/keymaps/default/readme.md
new file mode 100644
index 00000000..73d3f723
--- /dev/null
+++ b/qmk/keyboards/bt66tech/bt66tech60/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for bt66tech60
diff --git a/qmk/keyboards/bt66tech/bt66tech60/mcuconf.h b/qmk/keyboards/bt66tech/bt66tech60/mcuconf.h
new file mode 100644
index 00000000..fced2728
--- /dev/null
+++ b/qmk/keyboards/bt66tech/bt66tech60/mcuconf.h
@@ -0,0 +1,209 @@
+/*
+    ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
+#define STM32F103_MCUCONF
+
+/*
+ * STM32F103 drivers configuration.
+ * The following settings override the default settings present in
+ * the various device driver implementation headers.
+ * Note that the settings for each driver only have effect if the whole
+ * driver is enabled in halconf.h.
+ *
+ * IRQ priorities:
+ * 15...0       Lowest...Highest.
+ *
+ * DMA priorities:
+ * 0...3        Lowest...Highest.
+ */
+
+/*
+ * HAL driver system settings.
+ */
+#define STM32_NO_INIT                       FALSE
+#define STM32_HSI_ENABLED                   TRUE
+#define STM32_LSI_ENABLED                   FALSE
+#define STM32_HSE_ENABLED                   TRUE
+#define STM32_LSE_ENABLED                   FALSE
+#define STM32_SW                            STM32_SW_PLL
+#define STM32_PLLSRC                        STM32_PLLSRC_HSE
+#define STM32_PLLXTPRE                      STM32_PLLXTPRE_DIV1
+#define STM32_PLLMUL_VALUE                  9
+#define STM32_HPRE                          STM32_HPRE_DIV1
+#define STM32_PPRE1                         STM32_PPRE1_DIV2
+#define STM32_PPRE2                         STM32_PPRE2_DIV2
+#define STM32_ADCPRE                        STM32_ADCPRE_DIV4
+#define STM32_USB_CLOCK_REQUIRED            TRUE
+#define STM32_USBPRE                        STM32_USBPRE_DIV1P5
+#define STM32_MCOSEL                        STM32_MCOSEL_NOCLOCK
+#define STM32_RTCSEL                        STM32_RTCSEL_HSEDIV
+#define STM32_PVD_ENABLE                    FALSE
+#define STM32_PLS                           STM32_PLS_LEV0
+
+/*
+ * ADC driver system settings.
+ */
+#define STM32_ADC_USE_ADC1                  FALSE
+#define STM32_ADC_ADC1_DMA_PRIORITY         2
+#define STM32_ADC_ADC1_IRQ_PRIORITY         6
+
+/*
+ * CAN driver system settings.
+ */
+#define STM32_CAN_USE_CAN1                  FALSE
+#define STM32_CAN_CAN1_IRQ_PRIORITY         11
+
+/*
+ * EXT driver system settings.
+ */
+#define STM32_EXT_EXTI0_IRQ_PRIORITY        6
+#define STM32_EXT_EXTI1_IRQ_PRIORITY        6
+#define STM32_EXT_EXTI2_IRQ_PRIORITY        6
+#define STM32_EXT_EXTI3_IRQ_PRIORITY        6
+#define STM32_EXT_EXTI4_IRQ_PRIORITY        6
+#define STM32_EXT_EXTI5_9_IRQ_PRIORITY      6
+#define STM32_EXT_EXTI10_15_IRQ_PRIORITY    6
+#define STM32_EXT_EXTI16_IRQ_PRIORITY       6
+#define STM32_EXT_EXTI17_IRQ_PRIORITY       6
+#define STM32_EXT_EXTI18_IRQ_PRIORITY       6
+#define STM32_EXT_EXTI19_IRQ_PRIORITY       6
+
+/*
+ * GPT driver system settings.
+ */
+#define STM32_GPT_USE_TIM1                  FALSE
+#define STM32_GPT_USE_TIM2                  FALSE
+#define STM32_GPT_USE_TIM3                  FALSE
+#define STM32_GPT_USE_TIM4                  FALSE
+#define STM32_GPT_USE_TIM5                  FALSE
+#define STM32_GPT_USE_TIM8                  FALSE
+#define STM32_GPT_TIM1_IRQ_PRIORITY         7
+#define STM32_GPT_TIM2_IRQ_PRIORITY         7
+#define STM32_GPT_TIM3_IRQ_PRIORITY         7
+#define STM32_GPT_TIM4_IRQ_PRIORITY         7
+#define STM32_GPT_TIM5_IRQ_PRIORITY         7
+#define STM32_GPT_TIM8_IRQ_PRIORITY         7
+
+/*
+ * I2C driver system settings.
+ */
+#define STM32_I2C_USE_I2C1                  FALSE
+#define STM32_I2C_USE_I2C2                  FALSE
+#define STM32_I2C_BUSY_TIMEOUT              50
+#define STM32_I2C_I2C1_IRQ_PRIORITY         5
+#define STM32_I2C_I2C2_IRQ_PRIORITY         5
+#define STM32_I2C_I2C1_DMA_PRIORITY         3
+#define STM32_I2C_I2C2_DMA_PRIORITY         3
+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")
+
+/*
+ * ICU driver system settings.
+ */
+#define STM32_ICU_USE_TIM1                  FALSE
+#define STM32_ICU_USE_TIM2                  FALSE
+#define STM32_ICU_USE_TIM3                  FALSE
+#define STM32_ICU_USE_TIM4                  FALSE
+#define STM32_ICU_USE_TIM5                  FALSE
+#define STM32_ICU_USE_TIM8                  FALSE
+#define STM32_ICU_TIM1_IRQ_PRIORITY         7
+#define STM32_ICU_TIM2_IRQ_PRIORITY         7
+#define STM32_ICU_TIM3_IRQ_PRIORITY         7
+#define STM32_ICU_TIM4_IRQ_PRIORITY         7
+#define STM32_ICU_TIM5_IRQ_PRIORITY         7
+#define STM32_ICU_TIM8_IRQ_PRIORITY         7
+
+/*
+ * PWM driver system settings.
+ */
+#define STM32_PWM_USE_ADVANCED              FALSE
+#define STM32_PWM_USE_TIM1                  TRUE
+#define STM32_PWM_USE_TIM2                  FALSE
+#define STM32_PWM_USE_TIM3                  FALSE
+#define STM32_PWM_USE_TIM4                  FALSE
+#define STM32_PWM_USE_TIM5                  FALSE
+#define STM32_PWM_USE_TIM8                  FALSE
+#define STM32_PWM_TIM1_IRQ_PRIORITY         7
+#define STM32_PWM_TIM2_IRQ_PRIORITY         7
+#define STM32_PWM_TIM3_IRQ_PRIORITY         7
+#define STM32_PWM_TIM4_IRQ_PRIORITY         7
+#define STM32_PWM_TIM5_IRQ_PRIORITY         7
+#define STM32_PWM_TIM8_IRQ_PRIORITY         7
+
+/*
+ * RTC driver system settings.
+ */
+#define STM32_RTC_IRQ_PRIORITY              15
+
+/*
+ * SERIAL driver system settings.
+ */
+#define STM32_SERIAL_USE_USART1             FALSE
+#define STM32_SERIAL_USE_USART2             FALSE
+#define STM32_SERIAL_USE_USART3             FALSE
+#define STM32_SERIAL_USE_UART4              FALSE
+#define STM32_SERIAL_USE_UART5              FALSE
+#define STM32_SERIAL_USART1_PRIORITY        12
+#define STM32_SERIAL_USART2_PRIORITY        12
+#define STM32_SERIAL_USART3_PRIORITY        12
+#define STM32_SERIAL_UART4_PRIORITY         12
+#define STM32_SERIAL_UART5_PRIORITY         12
+
+/*
+ * SPI driver system settings.
+ */
+#define STM32_SPI_USE_SPI1                  FALSE
+#define STM32_SPI_USE_SPI2                  TRUE
+#define STM32_SPI_USE_SPI3                  FALSE
+#define STM32_SPI_SPI1_DMA_PRIORITY         1
+#define STM32_SPI_SPI2_DMA_PRIORITY         1
+#define STM32_SPI_SPI3_DMA_PRIORITY         1
+#define STM32_SPI_SPI1_IRQ_PRIORITY         10
+#define STM32_SPI_SPI2_IRQ_PRIORITY         10
+#define STM32_SPI_SPI3_IRQ_PRIORITY         10
+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")
+
+/*
+ * ST driver system settings.
+ */
+#define STM32_ST_IRQ_PRIORITY               8
+#define STM32_ST_USE_TIMER                  2
+
+/*
+ * UART driver system settings.
+ */
+#define STM32_UART_USE_USART1               FALSE
+#define STM32_UART_USE_USART2               FALSE
+#define STM32_UART_USE_USART3               FALSE
+#define STM32_UART_USART1_IRQ_PRIORITY      12
+#define STM32_UART_USART2_IRQ_PRIORITY      12
+#define STM32_UART_USART3_IRQ_PRIORITY      12
+#define STM32_UART_USART1_DMA_PRIORITY      0
+#define STM32_UART_USART2_DMA_PRIORITY      0
+#define STM32_UART_USART3_DMA_PRIORITY      0
+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")
+
+/*
+ * USB driver system settings.
+ */
+#define STM32_USB_USE_USB1                  TRUE
+#define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE
+#define STM32_USB_USB1_HP_IRQ_PRIORITY      13
+#define STM32_USB_USB1_LP_IRQ_PRIORITY      14
+
+#endif /* _MCUCONF_H_ */
diff --git a/qmk/keyboards/bt66tech/bt66tech60/readme.md b/qmk/keyboards/bt66tech/bt66tech60/readme.md
new file mode 100644
index 00000000..51755c5c
--- /dev/null
+++ b/qmk/keyboards/bt66tech/bt66tech60/readme.md
@@ -0,0 +1,19 @@
+# bt66tech60
+
+![bt66tech60](https://i.imgur.com/8eJ4liU.jpg)
+
+* A handwired 60% keyboard with stm32
+
+* Keyboard Maintainer: [bt66](https://github.com/bt66)
+* Hardware Supported: handwired, STM32
+* Hardware Availability: anywhere
+
+Make example for this keyboard (after setting up your build environment):
+
+    make bt66tech:default
+
+Flashing example for this keyboard:
+
+    make bt66tech:default:flash
+
+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).
diff --git a/qmk/keyboards/bt66tech/bt66tech60/rules.mk b/qmk/keyboards/bt66tech/bt66tech60/rules.mk
new file mode 100644
index 00000000..e043210f
--- /dev/null
+++ b/qmk/keyboards/bt66tech/bt66tech60/rules.mk
@@ -0,0 +1,30 @@
+# MCU name
+MCU = STM32F103
+
+# Bootloader selection
+BOOTLOADER = stm32duino
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = yes        # Console for debug
+COMMAND_ENABLE = yes        # Commands for debug and configuration
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = yes      # 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 = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+WS2812_DRIVER = spi
+
+DEFAULT_FOLDER = bt66tech/bt66tech60
+
+LAYOUTS = 60_ansi
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/qmk/keyboards/butterstick/sten.h b/qmk/keyboards/butterstick/sten.h
index 84635a55..0d5c58df 100644
--- a/qmk/keyboards/butterstick/sten.h
+++ b/qmk/keyboards/butterstick/sten.h
@@ -15,7 +15,6 @@ extern size_t keymapsCount;			// Total keymaps
 extern uint32_t cChord;				// Current Chord
 extern uint32_t stenoLayers[];		// Chords that simulate QMK layers
 extern size_t stenoLayerCount;		// Number of simulated layers
-uint32_t refChord;					// Reference chord for PC macro
 
 // Function defs
 void 			processChord(bool useFakeSteno);
@@ -35,7 +34,7 @@ void 			CLICK_MOUSE(uint8_t);
 #define P(chord, act) if (cChord == (chord)) { if (!lookup) {act;} return chord;}
 #define PC(chord, act) if (cChord == (chord)) { if (!lookup) {act;} return chord;} \
 	for(int i = 0; i < stenoLayerCount; i++) { \
-		refChord = stenoLayers[i] | chord; \
+		uint32_t refChord = stenoLayers[i] | chord; \
 		if (cChord == (refChord)) { if (!lookup) {act;} return refChord;}; \
 }
 
diff --git a/qmk/keyboards/cannonkeys/an_c/rules.mk b/qmk/keyboards/cannonkeys/an_c/rules.mk
index d9702224..8ed2d0ea 100644
--- a/qmk/keyboards/cannonkeys/an_c/rules.mk
+++ b/qmk/keyboards/cannonkeys/an_c/rules.mk
@@ -20,6 +20,8 @@ WS2812_DRIVER = spi
 
 LAYOUTS = 60_ansi 60_tsangan_hhkb
 
+# Wildcard to allow APM32 MCU 
+DFU_SUFFIX_ARGS = -p FFFF -v FFFF
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/qmk/keyboards/cannonkeys/bluepill/keyboard.c b/qmk/keyboards/cannonkeys/bluepill/keyboard.c
index c2e5946d..6a8edd4a 100644
--- a/qmk/keyboards/cannonkeys/bluepill/keyboard.c
+++ b/qmk/keyboards/cannonkeys/bluepill/keyboard.c
@@ -1,5 +1,5 @@
-#include "ch.h"
-#include "hal.h"
+#include <ch.h>
+#include <hal.h>
 #include "util.h"
 #include "quantum.h"
 
diff --git a/qmk/keyboards/cannonkeys/bluepill/ws2812.c b/qmk/keyboards/cannonkeys/bluepill/ws2812.c
index d30806d5..779e9051 100644
--- a/qmk/keyboards/cannonkeys/bluepill/ws2812.c
+++ b/qmk/keyboards/cannonkeys/bluepill/ws2812.c
@@ -6,7 +6,7 @@
  */
 
 #include "ws2812.h"
-#include "stdlib.h"
+#include <stdlib.h>
 
 #define BYTES_FOR_LED_BYTE 4
 #define NB_COLORS 3
diff --git a/qmk/keyboards/cannonkeys/db60/rules.mk b/qmk/keyboards/cannonkeys/db60/rules.mk
index 12672865..23385081 100644
--- a/qmk/keyboards/cannonkeys/db60/rules.mk
+++ b/qmk/keyboards/cannonkeys/db60/rules.mk
@@ -17,5 +17,8 @@ WS2812_DRIVER = spi
 
 LAYOUTS = 60_ansi 60_tsangan_hhkb 60_iso
 
+# Wildcard to allow APM32 MCU 
+DFU_SUFFIX_ARGS = -p FFFF -v FFFF
+
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/qmk/keyboards/cannonkeys/devastatingtkl/rules.mk b/qmk/keyboards/cannonkeys/devastatingtkl/rules.mk
index 9c3d0179..4ce69bf4 100644
--- a/qmk/keyboards/cannonkeys/devastatingtkl/rules.mk
+++ b/qmk/keyboards/cannonkeys/devastatingtkl/rules.mk
@@ -16,5 +16,8 @@ BACKLIGHT_ENABLE = yes
 RGBLIGHT_ENABLE = yes
 WS2812_DRIVER = spi
 
+# Wildcard to allow APM32 MCU 
+DFU_SUFFIX_ARGS = -p FFFF -v FFFF
+
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/qmk/keyboards/cannonkeys/instant60/rules.mk b/qmk/keyboards/cannonkeys/instant60/rules.mk
index b863bfad..0973ad95 100644
--- a/qmk/keyboards/cannonkeys/instant60/rules.mk
+++ b/qmk/keyboards/cannonkeys/instant60/rules.mk
@@ -19,6 +19,8 @@ WS2812_DRIVER = spi
 
 LAYOUTS = 60_ansi 60_tsangan_hhkb
 
+# Wildcard to allow APM32 MCU 
+DFU_SUFFIX_ARGS = -p FFFF -v FFFF
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/qmk/keyboards/cannonkeys/instant65/rules.mk b/qmk/keyboards/cannonkeys/instant65/rules.mk
index 33c186b2..eba941f8 100644
--- a/qmk/keyboards/cannonkeys/instant65/rules.mk
+++ b/qmk/keyboards/cannonkeys/instant65/rules.mk
@@ -21,3 +21,6 @@ WS2812_DRIVER = spi
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
+
+# Wildcard to allow APM32 MCU 
+DFU_SUFFIX_ARGS = -p FFFF -v FFFF
diff --git a/qmk/keyboards/cannonkeys/obliterated75/rules.mk b/qmk/keyboards/cannonkeys/obliterated75/rules.mk
index a1aa5f14..fd12ef84 100644
--- a/qmk/keyboards/cannonkeys/obliterated75/rules.mk
+++ b/qmk/keyboards/cannonkeys/obliterated75/rules.mk
@@ -19,5 +19,8 @@ AUDIO_ENABLE = no           # Audio output on port C6
 FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches
 WS2812_DRIVER = spi
 
+# Wildcard to allow APM32 MCU 
+DFU_SUFFIX_ARGS = -p FFFF -v FFFF
+
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/qmk/keyboards/cannonkeys/rekt1800/rules.mk b/qmk/keyboards/cannonkeys/rekt1800/rules.mk
index c8f75b7d..c4f07f54 100644
--- a/qmk/keyboards/cannonkeys/rekt1800/rules.mk
+++ b/qmk/keyboards/cannonkeys/rekt1800/rules.mk
@@ -15,5 +15,8 @@ CUSTOM_MATRIX = no          # Custom matrix file
 BACKLIGHT_ENABLE = yes
 RGBLIGHT_ENABLE = no
 
+# Wildcard to allow APM32 MCU 
+DFU_SUFFIX_ARGS = -p FFFF -v FFFF
+
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/qmk/keyboards/cannonkeys/satisfaction75/bootloader_defs.h b/qmk/keyboards/cannonkeys/satisfaction75/bootloader_defs.h
index 02c48c4e..dccd0fa5 100644
--- a/qmk/keyboards/cannonkeys/satisfaction75/bootloader_defs.h
+++ b/qmk/keyboards/cannonkeys/satisfaction75/bootloader_defs.h
@@ -1,7 +1,5 @@
 /* Address for jumping to bootloader on STM32 chips. */
 /* It is chip dependent, the correct number can be looked up here (page 175):
  * http://www.st.com/web/en/resource/technical/document/application_note/CD00167594.pdf
- * This also requires a patch to chibios:
- *  <tmk_dir>/tmk_core/tool/chibios/ch-bootloader-jump.patch
  */
 #define STM32_BOOTLOADER_ADDRESS 0x1FFFC800
diff --git a/qmk/keyboards/cannonkeys/satisfaction75/config.h b/qmk/keyboards/cannonkeys/satisfaction75/config.h
index ff31e37c..6a3598f8 100644
--- a/qmk/keyboards/cannonkeys/satisfaction75/config.h
+++ b/qmk/keyboards/cannonkeys/satisfaction75/config.h
@@ -17,6 +17,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
+/* Ensure we jump to bootloader if the RESET keycode was pressed */
+#define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
+
+/* LSE clock */
+#define STM32_LSECLK 32768
+
 /* USB Device descriptor parameter */
 #define VENDOR_ID       0xCA04
 #define PRODUCT_ID      0x57F5
diff --git a/qmk/keyboards/cannonkeys/satisfaction75/led.c b/qmk/keyboards/cannonkeys/satisfaction75/led.c
index 3ddcec20..18ef06ac 100644
--- a/qmk/keyboards/cannonkeys/satisfaction75/led.c
+++ b/qmk/keyboards/cannonkeys/satisfaction75/led.c
@@ -15,10 +15,9 @@ 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 "hal.h"
+#include <hal.h>
 #include "led_custom.h"
 #include "satisfaction75.h"
-#include "printf.h"
 
 static void breathing_callback(PWMDriver *pwmp);
 
diff --git a/qmk/keyboards/cannonkeys/satisfaction75/rules.mk b/qmk/keyboards/cannonkeys/satisfaction75/rules.mk
index 80f57181..3a48d3eb 100644
--- a/qmk/keyboards/cannonkeys/satisfaction75/rules.mk
+++ b/qmk/keyboards/cannonkeys/satisfaction75/rules.mk
@@ -1,6 +1,6 @@
 # MCU name
 MCU = STM32F072
-BOARD = ST_STM32F072B_DISCOVERY
+BOARD = GENERIC_STM32_F072XB
 
 # Build Options
 #   comment out to disable the options.
@@ -24,6 +24,8 @@ QWIIC_ENABLE += MICRO_OLED
 
 DEFAULT_FOLDER = cannonkeys/satisfaction75/rev1
 
+# Wildcard to allow APM32 MCU 
+DFU_SUFFIX_ARGS = -p FFFF -v FFFF
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/qmk/keyboards/cannonkeys/satisfaction75/satisfaction75.c b/qmk/keyboards/cannonkeys/satisfaction75/satisfaction75.c
index f92067c9..fd85b823 100644
--- a/qmk/keyboards/cannonkeys/satisfaction75/satisfaction75.c
+++ b/qmk/keyboards/cannonkeys/satisfaction75/satisfaction75.c
@@ -2,8 +2,8 @@
 #include "print.h"
 #include "debug.h"
 
-#include "ch.h"
-#include "hal.h"
+#include <ch.h>
+#include <hal.h>
 
 #ifdef QWIIC_MICRO_OLED_ENABLE
 #include "micro_oled.h"
@@ -54,6 +54,11 @@ backlight_config_t kb_backlight_config = {
   .level = BACKLIGHT_LEVELS
 };
 
+void board_init(void) {
+  SYSCFG->CFGR1 |= SYSCFG_CFGR1_I2C1_DMA_RMP;
+  SYSCFG->CFGR1 &= ~(SYSCFG_CFGR1_SPI2_DMA_RMP);
+}
+
 #ifdef VIA_ENABLE
 
 void backlight_get_value( uint8_t *data )
diff --git a/qmk/keyboards/cannonkeys/savage65/rules.mk b/qmk/keyboards/cannonkeys/savage65/rules.mk
index 577c578d..8e1b984f 100644
--- a/qmk/keyboards/cannonkeys/savage65/rules.mk
+++ b/qmk/keyboards/cannonkeys/savage65/rules.mk
@@ -21,4 +21,7 @@ WS2812_DRIVER = spi
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
 
+# Wildcard to allow APM32 MCU 
+DFU_SUFFIX_ARGS = -p FFFF -v FFFF
+
 LAYOUTS = 65_ansi_blocker 65_ansi_blocker_split_bs 65_ansi_blocker_tsangan 65_iso_blocker
diff --git a/qmk/keyboards/cannonkeys/tmov2/keymaps/brandonschlack/keymap.c b/qmk/keyboards/cannonkeys/tmov2/keymaps/brandonschlack/keymap.c
new file mode 100644
index 00000000..1d0cdf4f
--- /dev/null
+++ b/qmk/keyboards/cannonkeys/tmov2/keymaps/brandonschlack/keymap.c
@@ -0,0 +1,173 @@
+/* Copyright 2020 Brandon Schlack
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+#include "brandonschlack.h"
+
+/**
+ * Layer Names
+ *
+ * Layers mostly used for macro keys
+ */
+#define _REEDER   _M1
+#define _NAV      _M2
+#define _MOUSE    _M3
+
+/**
+ * Keycodes & Macros
+ */
+#define TG_BASE   TO(_BASE)
+#define TG_REDR   TO(_REEDER)
+#define TG_NAV    TO(_NAV)
+#define TG_MOUS   TO(_MOUSE)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /**
+     * Base
+     * ┌───┬┬┬─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+     * │Esc│││Tab  │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │{ [│} ]│Bck│
+     * ├───┼┼┼─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤
+     * │PgU│││HyEsc │ A │ S │ D │ F │ G │ H │ J │ K │ L │: ;│" '│ Enter│
+     * ├───┼┼┼──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──┬───┤
+     * │PgD│││Shift   │ Z │ X │ C │ V │ B │ N │ M │< ,│> .│? /│Shft│ Fn│
+     * ├───┼┼┼┬┬┬┬┬┬┬┬┴──┬┴───┴┬──┴───┴─┬─┴───┴───┴┬──┴──┬┴──┬┼┬┬┬┬┼┬┬┬┤
+     * │End│││││││││││Opt│Cmd  │        │          │  Cmd│Ctl│││││││││││
+     * └───┴┴┴┴┴┴┴┴┴┴┴───┴─────┴────────┴──────────┴─────┴───┴┴┴┴┴┴┴┴┴┴┘
+     */
+	[_BASE] = LAYOUT_default(
+        KC_ESC,    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC, \
+        KC_PGUP,   HY_ESC,  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_PGDN,   KC_LSFT, XXXXXXX, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, PLY_FN1, \
+        KC_END,                      KC_LOPT, KC_LCMD,                   SPC_RAI, SPC_RAI,                            KC_RCMD, KC_RCTL  \
+    ),
+    /**
+     * Reeder
+     * ┌───┬┬┬─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+     * │ P │││     │   │   │   │   │   │   │   │   │   │   │   │   │   │
+     * ├───┼┼┼─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤
+     * │ K │││      │   │   │   │   │   │   │   │   │   │   │   │      │
+     * ├───┼┼┼──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──┬───┤
+     * │ J │││        │   │   │   │   │   │   │   │   │   │   │    │   │
+     * ├───┼┼┼┬┬┬┬┬┬┬┬┴──┬┴───┴┬──┴───┴─┬─┴───┴───┴┬──┴──┬┴──┬┼┬┬┬┬┼┬┬┬┤
+     * │ N │││││││││││   │     │        │          │     │   │││││││││││
+     * └───┴┴┴┴┴┴┴┴┴┴┴───┴─────┴────────┴──────────┴─────┴───┴┴┴┴┴┴┴┴┴┴┘
+     */
+    [_REEDER] = LAYOUT_default( \
+        KC_P,      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+        KC_K,      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, \
+        KC_J,      _______, XXXXXXX, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+        KC_N,                        _______, _______,                   _______, _______,                            _______, _______  \
+    ),
+    /**
+     * Nav
+     * ┌───┬┬┬─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+     * │ → │││     │   │   │   │   │   │   │   │   │   │   │   │   │   │
+     * ├───┼┼┼─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤
+     * │ ↑ │││      │   │   │   │   │   │   │   │   │   │   │   │      │
+     * ├───┼┼┼──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──┬───┤
+     * │ ↓ │││        │   │   │   │   │   │   │   │   │   │   │    │   │
+     * ├───┼┼┼┬┬┬┬┬┬┬┬┴──┬┴───┴┬──┴───┴─┬─┴───┴───┴┬──┴──┬┴──┬┼┬┬┬┬┼┬┬┬┤
+     * │ ← │││││││││││   │     │        │          │     │   │││││││││││
+     * └───┴┴┴┴┴┴┴┴┴┴┴───┴─────┴────────┴──────────┴─────┴───┴┴┴┴┴┴┴┴┴┴┘
+     */
+    [_NAV] = LAYOUT_default( \
+        KC_RGHT,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+        KC_UP,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, \
+        KC_DOWN,   _______, XXXXXXX, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+        KC_LEFT,                     _______, _______,                   _______, _______,                            _______, _______  \
+    ),
+    /**
+     * Mouse
+     * ┌───┬┬┬─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+     * │WhU│││     │   │   │   │   │   │   │   │   │   │   │   │   │   │
+     * ├───┼┼┼─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤
+     * │ ↑ │││      │   │   │   │   │   │   │   │   │   │   │   │      │
+     * ├───┼┼┼──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──┬───┤
+     * │ ↓ │││        │   │   │   │   │   │   │   │   │   │   │    │   │
+     * ├───┼┼┼┬┬┬┬┬┬┬┬┴──┬┴───┴┬──┴───┴─┬─┴───┴───┴┬──┴──┬┴──┬┼┬┬┬┬┼┬┬┬┤
+     * │WhD│││││││││││   │     │        │          │     │   │││││││││││
+     * └───┴┴┴┴┴┴┴┴┴┴┴───┴─────┴────────┴──────────┴─────┴───┴┴┴┴┴┴┴┴┴┴┘
+     */
+    [_MOUSE] = LAYOUT_default( \
+        MC_WH_U,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+        KC_UP,     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, \
+        KC_DOWN,   _______, XXXXXXX, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+        MC_WH_D,                     _______, _______,                   _______, _______,                            _______, _______  \
+    ),
+    /**
+     * Lower
+     * ┌───┬┬┬─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+     * │Nxt│││Del  │BrD│BrU│Msn│LHP│   │   │   │   │   │   │ ↑ │Mut│SlD│
+     * ├───┼┼┼─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤
+     * │VlU│││HyCaps│   │   │NxW│PvT│Bck│Fwd│NxT│   │   │ ← │ → │ Play │
+     * ├───┼┼┼──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──┬───┤
+     * │VlD│││        │   │   │   │1PX│1Ps│   │   │   │   │ ↓ │    │   │
+     * ├───┼┼┼┬┬┬┬┬┬┬┬┴──┬┴───┴┬──┴───┴─┬─┴───┴───┴┬──┴──┬┴──┬┼┬┬┬┬┼┬┬┬┤
+     * │Prv│││││││││││   │     │        │          │     │   │││││││││││
+     * └───┴┴┴┴┴┴┴┴┴┴┴───┴─────┴────────┴──────────┴─────┴───┴┴┴┴┴┴┴┴┴┴┘
+     */
+    [_LOWER] = LAYOUT_default( \
+        KC_MNXT,   KC_DELT, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, _______, _______, _______, _______, _______, _______, KC_UP,   KC_MUTE, MC_SLPD, \
+        KC_VOLU,   HY_CAPS, _______, _______, NXT_WIN, PRV_TAB, MC_BACK, MC_FWRD, NXT_TAB, _______, _______, KC_LEFT, KC_RGHT,          KC_MPLY, \
+        KC_VOLD,   _______, XXXXXXX, _______, _______, _______, PX_AFLL, OP_AFLL, _______, _______, _______, _______, KC_DOWN, _______, _______, \
+        KC_MPRV,                     _______, _______,                   _______, _______,                            _______, _______  \
+    ),
+
+    /**
+     * Raise
+     * ┌───┬┬┬─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+     * │Hom│││~ `  │! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│_ -│+ =│   │
+     * ├───┼┼┼─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤
+     * │PgU│││      │ F1│ F2│ F3│ F4│ F5│ F6│_ -│+ =│   │   │   │      │
+     * ├───┼┼┼──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──┬───┤
+     * │PgD│││        │ F7│ F8│ F9│F10│F11│F12│   │   │   │| \│    │   │
+     * ├───┼┼┼┬┬┬┬┬┬┬┬┴──┬┴───┴┬──┴───┴─┬─┴───┴───┴┬──┴──┬┴──┬┼┬┬┬┬┼┬┬┬┤
+     * │End│││││││││││   │     │        │          │     │   │││││││││││
+     * └───┴┴┴┴┴┴┴┴┴┴┴───┴─────┴────────┴──────────┴─────┴───┴┴┴┴┴┴┴┴┴┴┘
+     */
+    [_RAISE] = LAYOUT_default( \
+        KC_HOME,   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_PGUP,   _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  _______, _______, _______,          _______, \
+        KC_PGDN,   _______, XXXXXXX, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______, KC_BSLS, _______, _______, \
+        KC_END,                      _______, _______,                   _______, _______,                            _______, _______  \
+    ),
+    /**
+     * Adjust
+     * ┌───┬┬┬─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+     * │Bse│││Make │   │   │EEP│RST│   │   │   │   │   │   │   │   │   │
+     * ├───┼┼┼─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤
+     * │Rdr│││      │   │   │   │   │   │   │   │   │   │   │   │      │
+     * ├───┼┼┼──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──┬───┤
+     * │Nav│││        │   │   │   │   │   │   │   │   │   │   │    │   │
+     * ├───┼┼┼┬┬┬┬┬┬┬┬┴──┬┴───┴┬──┴───┴─┬─┴───┴───┴┬──┴──┬┴──┬┼┬┬┬┬┼┬┬┬┤
+     * │Mse│││││││││││   │     │        │          │     │   │││││││││││
+     * └───┴┴┴┴┴┴┴┴┴┴┴───┴─────┴────────┴──────────┴─────┴───┴┴┴┴┴┴┴┴┴┴┘
+     */
+    [_ADJUST] = LAYOUT_default( \
+        TG_BASE,   QM_MAKE, _______, _______, EEP_RST, RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+        TG_REDR,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, \
+        TG_NAV,    _______, XXXXXXX, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+        TG_MOUS,                     _______, _______,                   _______, _______,                            _______, _______  \
+    ),
+};
+
+void keyboard_post_init_keymap(void) {
+    rgblight_disable_noeeprom();
+}
+
+layer_state_t layer_state_set_keymap(layer_state_t state) {
+    return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
+}
diff --git a/qmk/keyboards/cannonkeys/tmov2/rules.mk b/qmk/keyboards/cannonkeys/tmov2/rules.mk
index dc7f59ae..9b29e8fd 100644
--- a/qmk/keyboards/cannonkeys/tmov2/rules.mk
+++ b/qmk/keyboards/cannonkeys/tmov2/rules.mk
@@ -20,3 +20,6 @@ WS2812_DRIVER = spi
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
+
+# Wildcard to allow APM32 MCU 
+DFU_SUFFIX_ARGS = -p FFFF -v FFFF
diff --git a/qmk/keyboards/capsunlocked/cu65/config.h b/qmk/keyboards/capsunlocked/cu65/config.h
new file mode 100644
index 00000000..8fac6cd0
--- /dev/null
+++ b/qmk/keyboards/capsunlocked/cu65/config.h
@@ -0,0 +1,105 @@
+/*
+Copyright 2020 CapsUnlocked
+
+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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x4355
+#define PRODUCT_ID      0x0065
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    CapsUnlocked
+#define PRODUCT         CU65
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 16
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+*/
+#define MATRIX_ROW_PINS { F1, F4, F5, F6, D3 }
+#define MATRIX_COL_PINS { D6, D7, D4, B4, B5, B6, C6, D5, C7, F0, E6, B0, B1, B7, B3, B2 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+//#define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
diff --git a/qmk/keyboards/capsunlocked/cu65/cu65.c b/qmk/keyboards/capsunlocked/cu65/cu65.c
new file mode 100644
index 00000000..2b7f720e
--- /dev/null
+++ b/qmk/keyboards/capsunlocked/cu65/cu65.c
@@ -0,0 +1,14 @@
+/*
+Copyright 2020 CapsUnlocked
+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 "cu65.h"
diff --git a/qmk/keyboards/capsunlocked/cu65/cu65.h b/qmk/keyboards/capsunlocked/cu65/cu65.h
new file mode 100644
index 00000000..89b02ed9
--- /dev/null
+++ b/qmk/keyboards/capsunlocked/cu65/cu65.h
@@ -0,0 +1,67 @@
+/*
+Copyright 2020 CapsUnlocked
+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 first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+
+#define LAYOUT_all( \
+	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \
+	K100,       K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, \
+	K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, \
+	K300, K301,       K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, \
+	K400, K401, K402,                         K407,             K410,       K412, K413, K414, K415  \
+) { \
+	{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015 }, \
+	{ K100, KC_NO,K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115 }, \
+	{ K200, KC_NO,K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215 }, \
+	{ K300, K301, KC_NO,K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315 }, \
+	{ K400, K401, K402, KC_NO,KC_NO,KC_NO,KC_NO,K407, KC_NO,KC_NO,K410, KC_NO,K412, K413, K414, K415 }  \
+}
+
+#define LAYOUT_65_ansi( \
+	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012,       K014, K015, \
+	K100,       K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, \
+	K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,       K214, K215, \
+	K300,             K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, \
+	K400, K401, K402,                         K407,             K410,       K412, K413, K414, K415  \
+) { \
+	{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, KC_NO,K014, K015 }, \
+	{ K100, KC_NO,K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115 }, \
+	{ K200, KC_NO,K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,KC_NO, K214, K215 }, \
+	{ K300, KC_NO, KC_NO,K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315 }, \
+	{ K400, K401, K402, KC_NO,KC_NO,KC_NO,KC_NO,K407, KC_NO,KC_NO,K410, KC_NO,K412, K413, K414, K415 }  \
+}
+
+#define LAYOUT_65_iso( \
+	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012,       K014, K015, \
+	K100,       K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,       K115, \
+	K200,       K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, \
+	K300, K301,       K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315, \
+	K400, K401, K402,                         K407,             K410,       K412, K413, K414, K415  \
+) { \
+	{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, KC_NO,K014, K015 }, \
+	{ K100, KC_NO,K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, KC_NO,K115 }, \
+	{ K200, KC_NO,K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215 }, \
+	{ K300, K301, KC_NO,K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K315 }, \
+	{ K400, K401, K402, KC_NO,KC_NO,KC_NO,KC_NO,K407, KC_NO,KC_NO,K410, KC_NO,K412, K413, K414, K415 }  \
+}
diff --git a/qmk/keyboards/capsunlocked/cu65/info.json b/qmk/keyboards/capsunlocked/cu65/info.json
new file mode 100644
index 00000000..fdb187e3
--- /dev/null
+++ b/qmk/keyboards/capsunlocked/cu65/info.json
@@ -0,0 +1,15 @@
+{
+    "keyboard_name": "CU65",
+    "url": "",
+    "maintainer": "qmk",
+    "width": 16,
+    "height": 5,
+    "layouts": {
+      "LAYOUT_65_ansi": {
+        "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Insert", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Delete", "x":15, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"PgUp", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"\u2191", "x":14, "y":3}, {"label":"PgDn", "x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Ctrl", "x":11.25, "y":4, "w":1.25}, {"label":"\u2190", "x":13, "y":4}, {"label":"\u2193", "x":14, "y":4}, {"label":"\u2192", "x":15, "y":4}]
+      },
+      "LAYOUT_65_iso": {
+        "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Insert", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2}, {"label":"Delete", "x":15, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"~", "x":12.75, "y":2}, {"label":"PgUp", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":1.25}, {"label":"|", "x":1.25, "y":3}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"\u2191", "x":14, "y":3}, {"label":"PgDn", "x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Ctrl", "x":11.25, "y":4, "w":1.25}, {"label":"\u2190", "x":13, "y":4}, {"label":"\u2193", "x":14, "y":4}, {"label":"\u2192", "x":15, "y":4}]
+      }
+    }
+  }
diff --git a/qmk/keyboards/capsunlocked/cu65/keymaps/default/keymap.c b/qmk/keyboards/capsunlocked/cu65/keymaps/default/keymap.c
new file mode 100644
index 00000000..1bf11d96
--- /dev/null
+++ b/qmk/keyboards/capsunlocked/cu65/keymaps/default/keymap.c
@@ -0,0 +1,62 @@
+/*
+Copyright 2020 CapsUnlocked
+
+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_65_ansi(
+    /*
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+     * │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│Ins│
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │  \  │Del│
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+     * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │  Enter │Pg+│
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+     * │  Shift │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Shift│ ↑ │Pg-│
+     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+     * │Ctrl│LGUI│LAlt│         Space          │RAlt│ L1 │ │ ← │ ↓ │ → │
+     * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+     */
+        KC_GESC, 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_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_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_PGUP,
+        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_PGDN,
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, MO(1),            KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_65_ansi(
+    /*
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+     * │RST│ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│       │   │
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+     * │     │   │   │   │   │   │   │   │   │   │   │   │   │     │   │
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+     * │      │   │   │   │   │   │   │   │   │   │   │   │        │   │
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+     * │        │   │   │   │   │   │   │   │   │   │   │      │   │   │
+     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+     * │    │    │    │                        │    │    │ │   │   │   │
+     * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+     */
+        RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                   _______,                            _______, _______,          _______, _______, _______
+    ),
+};
+
diff --git a/qmk/keyboards/capsunlocked/cu65/keymaps/default/readme.md b/qmk/keyboards/capsunlocked/cu65/keymaps/default/readme.md
new file mode 100644
index 00000000..65bed4a3
--- /dev/null
+++ b/qmk/keyboards/capsunlocked/cu65/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default ANSI keymap for CU65
diff --git a/qmk/keyboards/capsunlocked/cu65/keymaps/iso/keymap.c b/qmk/keyboards/capsunlocked/cu65/keymaps/iso/keymap.c
new file mode 100644
index 00000000..a8a32cc7
--- /dev/null
+++ b/qmk/keyboards/capsunlocked/cu65/keymaps/iso/keymap.c
@@ -0,0 +1,61 @@
+/*
+Copyright 2020 CapsUnlocked
+
+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_65_iso(
+    /*
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+     * │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│Ins│
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │     │Del│
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ Ent├───┤
+     * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ # │    │Pg+│
+     * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤
+     * │Shft│ \ │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Shift│ ↑ │Pg-│
+     * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+     * │Ctrl│LGUI│LAlt│         Space          │RAlt│ L1 │ │ ← │ ↓ │ → │
+     * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+     */
+        KC_GESC, 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_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_DEL,
+        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_PGUP,
+        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_UP,   KC_PGDN,
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, MO(1),            KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_65_iso(
+    /*
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+     * │RST│ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│       │   │
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+     * │     │   │   │   │   │   │   │   │   │   │   │   │   │     │   │
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    ├───┤
+     * │      │   │   │   │   │   │   │   │   │   │   │   │   │    │   │
+     * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤
+     * │    │   │   │   │   │   │   │   │   │   │   │   │      │   │   │
+     * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+     * │    │    │    │                        │    │    │ │   │   │   │
+     * └────┴────┴────┴────────────────────────┴────┴────┘ └───┴───┴───┘
+     */
+        RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                   _______,                            _______, _______,          _______, _______, _______
+    ),
+};
diff --git a/qmk/keyboards/capsunlocked/cu65/keymaps/iso/readme.md b/qmk/keyboards/capsunlocked/cu65/keymaps/iso/readme.md
new file mode 100644
index 00000000..2c2ded31
--- /dev/null
+++ b/qmk/keyboards/capsunlocked/cu65/keymaps/iso/readme.md
@@ -0,0 +1 @@
+# The ISO keymap for CU65
diff --git a/qmk/keyboards/capsunlocked/cu65/keymaps/via/keymap.c b/qmk/keyboards/capsunlocked/cu65/keymaps/via/keymap.c
new file mode 100644
index 00000000..1bd83329
--- /dev/null
+++ b/qmk/keyboards/capsunlocked/cu65/keymaps/via/keymap.c
@@ -0,0 +1,47 @@
+/* Copyright 2020 CapsUnlocked
+ *
+ * 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_all(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_INS,
+        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_CAPS,          KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUBS, KC_ENT,  KC_PGUP,
+        KC_LSFT,          KC_NUHS, 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_PGDN,
+        KC_LCTL, KC_LALT, KC_LGUI,                            KC_SPC,                             KC_RALT, MO(1),            KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT_all(
+        RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______,          _______, _______, _______
+    ),
+    [2] = LAYOUT_all(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______,          _______, _______, _______
+    ),
+    [3] = LAYOUT_all(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______,          _______, _______, _______
+    ),
+};
diff --git a/qmk/keyboards/capsunlocked/cu65/keymaps/via/rules.mk b/qmk/keyboards/capsunlocked/cu65/keymaps/via/rules.mk
new file mode 100644
index 00000000..1e5b9980
--- /dev/null
+++ b/qmk/keyboards/capsunlocked/cu65/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/qmk/keyboards/capsunlocked/cu65/readme.md b/qmk/keyboards/capsunlocked/cu65/readme.md
new file mode 100644
index 00000000..0a51d7b1
--- /dev/null
+++ b/qmk/keyboards/capsunlocked/cu65/readme.md
@@ -0,0 +1,13 @@
+# CU65
+
+The CU65 is a customisable 65% that supports hotswap ISO and ANSI layouts on the same PCB.
+
+* Keyboard maintainer: [rys](https://github.com/rys)
+* Hardware supported: CU65 r2
+* Hardware availability: [CapsUnlocked](https://caps-unlocked.com/cu65-r2/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make capsunlocked/cu65: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).
diff --git a/qmk/keyboards/capsunlocked/cu65/rules.mk b/qmk/keyboards/capsunlocked/cu65/rules.mk
new file mode 100644
index 00000000..cf7418e4
--- /dev/null
+++ b/qmk/keyboards/capsunlocked/cu65/rules.mk
@@ -0,0 +1,24 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+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
+# 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
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+
+LAYOUTS = 65_ansi 65_iso
diff --git a/qmk/keyboards/capsunlocked/readme.md b/qmk/keyboards/capsunlocked/readme.md
new file mode 100644
index 00000000..b2306e02
--- /dev/null
+++ b/qmk/keyboards/capsunlocked/readme.md
@@ -0,0 +1,3 @@
+# CapsUnlocked keyboards
+
+Home of the firmware for CapsUnlocked keyboards!
diff --git a/qmk/keyboards/chavdai40/boards/GENERIC_STM32_F042X6/board.c b/qmk/keyboards/chavdai40/boards/GENERIC_STM32_F042X6/board.c
index 2bd2c5e2..faf57654 100644
--- a/qmk/keyboards/chavdai40/boards/GENERIC_STM32_F042X6/board.c
+++ b/qmk/keyboards/chavdai40/boards/GENERIC_STM32_F042X6/board.c
@@ -19,8 +19,8 @@
  * generator plugin. Do not edit manually.
  */
 
-#include "hal.h"
-#include "stm32_gpio.h"
+#include <hal.h>
+#include <stm32_gpio.h>
 
 /*===========================================================================*/
 /* Driver local definitions.                                                 */
diff --git a/qmk/keyboards/chavdai40/bootloader_defs.h b/qmk/keyboards/chavdai40/bootloader_defs.h
index 4994be9c..6b218f7b 100644
--- a/qmk/keyboards/chavdai40/bootloader_defs.h
+++ b/qmk/keyboards/chavdai40/bootloader_defs.h
@@ -1,7 +1,5 @@
 /* Address for jumping to bootloader on STM32 chips. */
 /* It is chip dependent, the correct number can be looked up here:
  * http://www.st.com/web/en/resource/technical/document/application_note/CD00167594.pdf
- * This also requires a patch to chibios:
- *  <tmk_dir>/tmk_core/tool/chibios/ch-bootloader-jump.patch
  */
 #define STM32_BOOTLOADER_ADDRESS 0x1FFFC400
\ No newline at end of file
diff --git a/qmk/keyboards/cheshire/curiosity/curiosity.h b/qmk/keyboards/cheshire/curiosity/curiosity.h
index e250eda8..c26b03e2 100644
--- a/qmk/keyboards/cheshire/curiosity/curiosity.h
+++ b/qmk/keyboards/cheshire/curiosity/curiosity.h
@@ -26,7 +26,7 @@
  * The second converts the arguments into a two-dimensional array which
  * represents the switch matrix.
  */
-#define LAYOUT_default( \
+#define LAYOUT_alice_split_bs( \
   K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, \
   K100, K101, K102, K103, K104, K105, K106,       K108, K109, K110, K111, K112, K113, K114, K115, \
   K200, K201, K202, K203, K204, K205, K206,       K208, K209, K210, K211, K212, K213,      K215,  \
@@ -40,3 +40,20 @@
     { ____, K301, K302, K303, K304, K305, K306, ____, K308, K309, K310, K311, K312, K313, K314, K315}, \
     { ____, K401, ____, K403, ____, K405, K406, ____, ____, K409, ____, K411, ____, ____, K414, ____}, \
 }
+
+#define LAYOUT_alice( \
+  K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013,       K015, \
+  K100, K101, K102, K103, K104, K105, K106,       K108, K109, K110, K111, K112, K113, K114, K115, \
+  K200, K201, K202, K203, K204, K205, K206,       K208, K209, K210, K211, K212, K213,      K215,  \
+        K301, K302, K303, K304, K305, K306,       K308, K309, K310, K311, K312, K313, K314, K315, \
+        K401,       K403,       K405, K406,             K409,       K411,                K414 \
+) \
+{ \
+    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, ____, K015}, \
+    { K100, K101, K102, K103, K104, K105, K106, ____, K108, K109, K110, K111, K112, K113, K114, K115}, \
+    { K200, K201, K202, K203, K204, K205, K206, ____, K208, K209, K210, K211, K212, K213, ____, K215}, \
+    { ____, K301, K302, K303, K304, K305, K306, ____, K308, K309, K310, K311, K312, K313, K314, K315}, \
+    { ____, K401, ____, K403, ____, K405, K406, ____, ____, K409, ____, K411, ____, ____, K414, ____}, \
+}
+
+#define LAYOUT_default LAYOUT_alice_split_bs
diff --git a/qmk/keyboards/cheshire/curiosity/info.json b/qmk/keyboards/cheshire/curiosity/info.json
index f9895465..d9a28d01 100644
--- a/qmk/keyboards/cheshire/curiosity/info.json
+++ b/qmk/keyboards/cheshire/curiosity/info.json
@@ -4,7 +4,7 @@
     "width": 19.75,
     "height": 5.25,
     "layouts": {
-        "LAYOUT_default": {
+        "LAYOUT_alice_split_bs": {
             "layout": [
                 {"label":"Esc", "x":0.5, "y":0},
                 {"label":"`", "x":1.75, "y":0.25},
@@ -69,6 +69,79 @@
                 {"label":"Shift", "x":17, "y":3.25, "w":1.75},
                 {"label":"Fn", "x":18.75, "y":3.25},
 
+                {"label":"Ctrl", "x":1.5, "y":4.25, "w":1.5},
+                {"label":"Alt", "x":5, "y":4.25, "w":1.5},
+                {"label":"Space", "x":6.5, "y":4.25, "w":2},
+                {"label":"Menu", "x":8.5, "y":4.25},
+                {"label":"Space", "x":10.25, "y":4.25, "w":2.75},
+                {"label":"Alt", "x":13, "y":4.25, "w":1.5},
+                {"label":"Ctrl", "x":18, "y":4.25, "w":1.5}
+            ]
+        },
+        "LAYOUT_alice": {
+            "layout": [
+                {"label":"Esc", "x":0.5, "y":0},
+                {"label":"`", "x":1.75, "y":0.25},
+                {"label":"1", "x":2.75, "y":0.25},
+                {"label":"2", "x":3.75, "y":0},
+                {"label":"3", "x":4.75, "y":0.25},
+                {"label":"4", "x":5.75, "y":0.25},
+                {"label":"5", "x":6.75, "y":0.25},
+                {"label":"6", "x":7.75, "y":0.25},
+                {"label":"7", "x":11, "y":0.25},
+                {"label":"8", "x":12, "y":0.25},
+                {"label":"9", "x":13, "y":0.25},
+                {"label":"0", "x":14, "y":0.25},
+                {"label":"-", "x":15, "y":0},
+                {"label":"=", "x":16, "y":0.25},
+                {"label":"Backspace", "x":17, "y":0.25, "w":2},
+
+                {"label":"PgUp", "x":0.25, "y":1},
+                {"label":"Tab", "x":1.5, "y":1.25, "w":1.5},
+                {"label":"Q", "x":3, "y":1.25},
+                {"label":"W", "x":4.25, "y":1.25},
+                {"label":"E", "x":5.25, "y":1.25},
+                {"label":"R", "x":6.25, "y":1.25},
+                {"label":"T", "x":7.25, "y":1.25},
+                {"label":"Y", "x":10.5, "y":1.25},
+                {"label":"U", "x":11.5, "y":1.25},
+                {"label":"I", "x":12.5, "y":1.25},
+                {"label":"O", "x":13.5, "y":1.25},
+                {"label":"P", "x":14.75, "y":1.25},
+                {"label":"{", "x":15.75, "y":1.25},
+                {"label":"}", "x":16.75, "y":1.25},
+                {"label":"|", "x":17.75, "y":1.25, "w":1.5},
+
+                {"label":"PgDn", "x":0, "y":2},
+                {"label":"Caps Lock", "x":1.5, "y":2.25, "w":1.75},
+                {"label":"A", "x":3.25, "y":2.25},
+                {"label":"S", "x":4.5, "y":2.25},
+                {"label":"D", "x":5.5, "y":2.25},
+                {"label":"F", "x":6.5, "y":2.25},
+                {"label":"G", "x":7.5, "y":2.25},
+                {"label":"H", "x":10.75, "y":2.25},
+                {"label":"J", "x":11.75, "y":2.25},
+                {"label":"K", "x":12.75, "y":2.25},
+                {"label":"L", "x":13.75, "y":2.25},
+                {"label":":", "x":15.25, "y":2.25},
+                {"label":"\"", "x":16.25, "y":2.25},
+                {"label":"Enter", "x":17.25, "y":2.25, "w":2.25},
+
+                {"label":"Shift", "x":1.5, "y":3.25, "w":2.25},
+                {"label":"Z", "x":3.75, "y":3.25},
+                {"label":"X", "x":5, "y":3.25},
+                {"label":"C", "x":6, "y":3.25},
+                {"label":"V", "x":7, "y":3.25},
+                {"label":"B", "x":8, "y":3.25},
+                {"label":"Fn", "x":10.25, "y":3.25},
+                {"label":"N", "x":11.25, "y":3.25},
+                {"label":"M", "x":12.25, "y":3.25},
+                {"label":"<", "x":13.25, "y":3.25},
+                {"label":">", "x":15, "y":3.25},
+                {"label":"?", "x":16, "y":3.25},
+                {"label":"Shift", "x":17, "y":3.25, "w":1.75},
+                {"label":"Fn", "x":18.75, "y":3.25},
+
                 {"label":"Ctrl", "x":1.5, "y":4.25, "w":1.5},
                 {"label":"Alt", "x":5, "y":4.25, "w":1.5},
                 {"label":"Space", "x":6.5, "y":4.25, "w":2},
diff --git a/qmk/keyboards/cheshire/curiosity/keymaps/madhatter/keymap.c b/qmk/keyboards/cheshire/curiosity/keymaps/madhatter/keymap.c
index b0649d37..2273ad93 100644
--- a/qmk/keyboards/cheshire/curiosity/keymaps/madhatter/keymap.c
+++ b/qmk/keyboards/cheshire/curiosity/keymaps/madhatter/keymap.c
@@ -25,6 +25,7 @@ enum my_layers {
 #define FNMS MO(_FNMS)
 #define NAVMED MO(_NAVMED)
 #define CAP_CTL CTL_T(KC_CAPS)
+#define GUI_BSPC LCMD_T(KC_BSPC)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_QWERTY] = LAYOUT_default(
@@ -32,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     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_BSPC,
     KC_PGDN, CAP_CTL, 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_B,   KC_N,  KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, FNMS,
-             KC_LCTL,              KC_LALT,    KC_LCMD, NAVMED,       KC_SPC,        KC_RALT,                              KC_RCTL
+             KC_LCTL,              KC_LALT,   GUI_BSPC, NAVMED,       KC_SPC,        KC_RALT,                              KC_RCTL
   ),
 
   [_FNMS] = LAYOUT_default(
diff --git a/qmk/keyboards/cheshire/curiosity/keymaps/madhatter/rules.mk b/qmk/keyboards/cheshire/curiosity/keymaps/madhatter/rules.mk
index 1b0f198d..41fcf032 100644
--- a/qmk/keyboards/cheshire/curiosity/keymaps/madhatter/rules.mk
+++ b/qmk/keyboards/cheshire/curiosity/keymaps/madhatter/rules.mk
@@ -1 +1,2 @@
-VELOCIKEY_ENABLE = yes
+VIA_ENABLE = yes
+VELOCIKEY_ENABLE = yes
\ No newline at end of file
diff --git a/qmk/keyboards/cheshire/curiosity/keymaps/via/keymap.c b/qmk/keyboards/cheshire/curiosity/keymaps/via/keymap.c
new file mode 100644
index 00000000..2425474a
--- /dev/null
+++ b/qmk/keyboards/cheshire/curiosity/keymaps/via/keymap.c
@@ -0,0 +1,56 @@
+/*
+Copyright 2019 Khader Syed
+
+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
+
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT_default(
+    KC_ESC,  	KC_TILD, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_DEL,
+    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_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_B,   KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_RGUI,
+				KC_LCTL,          KC_LALT, KC_SPC,  MO(1),                          KC_SPC,           KC_RALT,          KC_RCTL
+  ),
+  [1] = LAYOUT_default(
+    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, 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
+  ),
+  [2] = LAYOUT_default(
+    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, 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
+  ),
+  [3] = LAYOUT_default(
+    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, 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
+  )
+
+};
\ No newline at end of file
diff --git a/qmk/keyboards/cheshire/curiosity/keymaps/via/rules.mk b/qmk/keyboards/cheshire/curiosity/keymaps/via/rules.mk
new file mode 100644
index 00000000..40bded39
--- /dev/null
+++ b/qmk/keyboards/cheshire/curiosity/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE=yes
\ No newline at end of file
diff --git a/qmk/keyboards/cheshire/curiosity/rules.mk b/qmk/keyboards/cheshire/curiosity/rules.mk
index 354465a0..d9a7d86a 100644
--- a/qmk/keyboards/cheshire/curiosity/rules.mk
+++ b/qmk/keyboards/cheshire/curiosity/rules.mk
@@ -15,3 +15,5 @@ SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 NKRO_ENABLE = no            # USB Nkey Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+
+LAYOUTS = alice alice_split_bs
diff --git a/qmk/keyboards/claw44/claw44.c b/qmk/keyboards/claw44/claw44.c
index f564fb62..d8710306 100644
--- a/qmk/keyboards/claw44/claw44.c
+++ b/qmk/keyboards/claw44/claw44.c
@@ -1,10 +1 @@
 #include "claw44.h"
-#include "ssd1306.h"
-
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-#ifdef SSD1306OLED
-  return process_record_gfx(keycode,record) && process_record_user(keycode, record);
-#else
-  return process_record_user(keycode, record);
-#endif
-}
diff --git a/qmk/keyboards/claw44/config.h b/qmk/keyboards/claw44/config.h
index fb1cdf39..0bd74ff8 100644
--- a/qmk/keyboards/claw44/config.h
+++ b/qmk/keyboards/claw44/config.h
@@ -19,10 +19,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #include "config_common.h"
-#include <serial_config.h>
-
-#define USE_I2C
-#define USE_SERIAL
 
 #define NO_ACTION_MACRO
 #define NO_ACTION_FUNCTION
diff --git a/qmk/keyboards/claw44/keymaps/default/config.h b/qmk/keyboards/claw44/keymaps/default/config.h
index eff6ad3c..d2ea0254 100644
--- a/qmk/keyboards/claw44/keymaps/default/config.h
+++ b/qmk/keyboards/claw44/keymaps/default/config.h
@@ -20,16 +20,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-//#define USE_MATRIX_I2C
-
-/* Select hand configuration */
-
 #define MASTER_LEFT
-// #define MASTER_RIGHT
-// #define EE_HANDS
-
-#define SSD1306OLED
-
-#define USE_SERIAL_PD2
-
-#define TAPPING_TERM 200
diff --git a/qmk/keyboards/claw44/keymaps/default/keymap.c b/qmk/keyboards/claw44/keymaps/default/keymap.c
index 088087c7..65dbd67d 100644
--- a/qmk/keyboards/claw44/keymaps/default/keymap.c
+++ b/qmk/keyboards/claw44/keymaps/default/keymap.c
@@ -1,168 +1,59 @@
 #include QMK_KEYBOARD_H
-#ifdef PROTOCOL_LUFA
-  #include "lufa.h"
-  #include "split_util.h"
-#endif
-#ifdef SSD1306OLED
-  #include "ssd1306.h"
-#endif
-
-
-extern uint8_t is_master;
 
 // Each layer gets a name for readability, which is then used in the keymap matrix below.
 // The underscores don't mean anything - you can have a layer called STUFF or any other name.
 // Layer names don't all need to be of the same length, obviously, and you can also skip them
 // entirely and just use numbers.
 
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE
-};
-
-enum macro_keycodes {
-  KC_SAMPLEMACRO,
+enum layer_number {
+    _QWERTY = 0,
+    _RAISE,
+    _LOWER,
 };
 
 #define KC_ KC_TRNS
 #define KC_RST RESET
-#define KC_L_SPC LT(_LOWER, KC_SPC) // lower
-#define KC_R_ENT LT(_RAISE, KC_ENT) // raise
-#define KC_G_JA LGUI_T(KC_LANG1) // cmd or win
-#define KC_G_EN LGUI_T(KC_LANG2) // cmd or win
-#define KC_C_BS LCTL_T(KC_BSPC) // ctrl
-#define KC_A_DEL ALT_T(KC_DEL) // alt
+#define KC_L_SPC LT(_LOWER, KC_SPC)  // lower
+#define KC_R_ENT LT(_RAISE, KC_ENT)  // raise
+#define KC_G_JA LGUI_T(KC_LANG1)     // cmd or win
+#define KC_G_EN LGUI_T(KC_LANG2)     // cmd or win
+#define KC_C_BS LCTL_T(KC_BSPC)      // ctrl
+#define KC_A_DEL ALT_T(KC_DEL)       // alt
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_QWERTY] = LAYOUT( \
+    //,--------+--------+---------+--------+---------+--------.   ,--------+---------+--------+---------+--------+--------.
+       KC_ESC , KC_Q   , KC_W    , KC_E   , KC_R    , KC_T   ,     KC_Y   , KC_U    , KC_I   , KC_O    , KC_P   , KC_MINS,
+    //|--------+--------+---------+--------+---------+--------|   |--------+---------+--------+---------+--------+--------|
+       KC_TAB , KC_A   , KC_S    , KC_D   , KC_F    , KC_G   ,     KC_H   , KC_J    , KC_K   , KC_L    , KC_SCLN, KC_QUOT,
+    //|--------+--------+---------+--------+---------+--------|   |--------+---------+--------+---------+--------+--------|
+       KC_LSFT, KC_Z   , KC_X    , KC_C   , KC_V    , KC_B   ,     KC_N   , KC_M    , KC_COMM, KC_DOT  , KC_SLSH, KC_RSFT,
+    //`--------+--------+---------+--------+---------+--------/   \--------+---------+--------+---------+--------+--------'
+                         KC_A_DEL, KC_G_EN, KC_L_SPC, KC_C_BS,     KC_C_BS, KC_R_ENT, KC_G_JA, KC_A_DEL
+    //                 `----------+--------+---------+--------'   `--------+---------+--------+---------'
+    ),
 
-  [_QWERTY] = LAYOUT( \
-  //,--------+--------+---------+--------+---------+--------.   ,--------+---------+--------+---------+--------+--------.
-     KC_ESC , KC_Q   , KC_W    , KC_E   , KC_R    , KC_T   ,     KC_Y   , KC_U    , KC_I   , KC_O    , KC_P   , KC_MINS,
-  //|--------+--------+---------+--------+---------+--------|   |--------+---------+--------+---------+--------+--------|
-     KC_TAB , KC_A   , KC_S    , KC_D   , KC_F    , KC_G   ,     KC_H   , KC_J    , KC_K   , KC_L    , KC_SCLN, KC_QUOT,
-  //|--------+--------+---------+--------+---------+--------|   |--------+---------+--------+---------+--------+--------|
-     KC_LSFT, KC_Z   , KC_X    , KC_C   , KC_V    , KC_B   ,     KC_N   , KC_M    , KC_COMM, KC_DOT  , KC_SLSH, KC_RSFT,
-  //`--------+--------+---------+--------+---------+--------/   \--------+---------+--------+---------+--------+--------'
-                       KC_A_DEL, KC_G_EN, KC_L_SPC, KC_C_BS,     KC_C_BS, KC_R_ENT, KC_G_JA, KC_A_DEL
-  //                 `----------+--------+---------+--------'   `--------+---------+--------+---------'
-  ),
+    [_RAISE] = LAYOUT( \
+    //,--------+--------+--------+--------+--------+--------.   ,--------+--------+--------+--------+--------+--------.
+       _______, KC_BSLS, KC_CIRC, KC_EXLM, KC_AMPR, KC_PIPE,     KC_AT  , KC_EQL , KC_PLUS, KC_ASTR, KC_PERC, KC_MINS,
+    //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------|
+       KC_LPRN, KC_HASH, KC_DLR , KC_DQT , KC_QUOT, KC_TILD,     KC_LEFT, KC_DOWN,  KC_UP , KC_RGHT, KC_GRV , KC_RPRN,
+    //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------|
+       _______, _______, _______, _______, KC_LCBR, KC_LBRC,     KC_RBRC, KC_RCBR, _______, _______, _______, _______,
+    //`--------+--------+--------+--------+--------+--------/   \--------+--------+--------+--------+--------+--------'
+                         _______, _______, _______, _______,     _______, _______, _______, RESET
+    //                  `--------+--------+--------+--------'   `--------+--------+--------+--------'
+    ),
 
-  //   \ ^ ! & |  @ = + * % -
-  // ( # $ " ' ~  ← ↓ ↑ → ` )
-  //         { [  ] }
-
-  [_RAISE] = LAYOUT( \
-  //,--------+--------+--------+--------+--------+--------.   ,--------+--------+--------+--------+--------+--------.
-     _______, KC_BSLS, KC_CIRC, KC_EXLM, KC_AMPR, KC_PIPE,     KC_AT  , KC_EQL , KC_PLUS, KC_ASTR, KC_PERC, KC_MINS,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------|
-     KC_LPRN, KC_HASH, KC_DLR , KC_DQT , KC_QUOT, KC_TILD,     KC_LEFT, KC_DOWN,  KC_UP , KC_RGHT, KC_GRV , KC_RPRN,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------|
-     _______, _______, _______, _______, KC_LCBR, KC_LBRC,     KC_RBRC, KC_RCBR, _______, _______, _______, _______,
-  //`--------+--------+--------+--------+--------+--------/   \--------+--------+--------+--------+--------+--------'
-                       _______, _______, _______, _______,     _______, _______, _______, RESET
-  //                  `--------+--------+--------+--------'   `--------+--------+--------+--------'
-  ),
-
-  [_LOWER] = LAYOUT( \
-  //,--------+--------+--------+--------+--------+--------.   ,--------+--------+--------+--------+--------+--------.
-     KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  ,     _______, KC_EQL , KC_PLUS, KC_ASTR, KC_PERC, KC_MINS,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------|
-     _______, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   ,     KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , _______,
-  //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------|
-     KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 ,     _______, _______, KC_COMM, KC_DOT , KC_SLSH, _______,
-  //`--------+--------+--------+--------+--------+--------/   \--------+--------+--------+--------+--------+--------'
-                       RESET  , _______, _______, _______,     _______, _______, _______, _______
-  //                  `--------+--------+--------+--------'   `--------+--------+--------+--------'
-  ),
+    [_LOWER] = LAYOUT( \
+    //,--------+--------+--------+--------+--------+--------.   ,--------+--------+--------+--------+--------+--------.
+       KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  ,     _______, KC_EQL , KC_PLUS, KC_ASTR, KC_PERC, KC_MINS,
+    //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------|
+       _______, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   ,     KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , _______,
+    //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------|
+       KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 ,     _______, _______, KC_COMM, KC_DOT , KC_SLSH, _______,
+    //`--------+--------+--------+--------+--------+--------/   \--------+--------+--------+--------+--------+--------'
+                         RESET  , _______, _______, _______,     _______, _______, _______, _______
+    //                  `--------+--------+--------+--------'   `--------+--------+--------+--------'
+    ),
 };
-
-void matrix_init_user(void) {
-  //SSD1306 OLED init, make sure to add #define SSD1306OLED in config.h
-  #ifdef SSD1306OLED
-    iota_gfx_init(!has_usb());   // turns on the display
-  #endif
-}
-
-//SSD1306 OLED update loop, make sure to add #define SSD1306OLED in config.h
-#ifdef SSD1306OLED
-
-// When add source files to SRC in rules.mk, you can use functions.
-const char *read_layer_state(void);
-const char *read_logo(void);
-void set_keylog(uint16_t keycode, keyrecord_t *record);
-const char *read_keylog(void);
-const char *read_keylogs(void);
-
-// const char *read_mode_icon(bool swap);
-// const char *read_host_led_state(void);
-// void set_timelog(void);
-// const char *read_timelog(void);
-
-void matrix_scan_user(void) {
-  iota_gfx_task();
-}
-
-void matrix_render_user(struct CharacterMatrix *matrix) {
-  if (is_master) {
-    // If you want to change the display of OLED, you need to change here
-    matrix_write_ln(matrix, read_layer_state());
-    matrix_write_ln(matrix, read_keylog());
-    matrix_write_ln(matrix, read_keylogs());
-    //matrix_write_ln(matrix, read_mode_icon(keymap_config.swap_lalt_lgui));
-    //matrix_write_ln(matrix, read_host_led_state());
-    //matrix_write_ln(matrix, read_timelog());
-  } else {
-    matrix_write(matrix, read_logo());
-  }
-}
-
-void matrix_update(struct CharacterMatrix *dest, const struct CharacterMatrix *source) {
-  if (memcmp(dest->display, source->display, sizeof(dest->display))) {
-    memcpy(dest->display, source->display, sizeof(dest->display));
-    dest->dirty = true;
-  }
-}
-
-void iota_gfx_task_user(void) {
-  struct CharacterMatrix matrix;
-  matrix_clear(&matrix);
-  matrix_render_user(&matrix);
-  matrix_update(&display, &matrix);
-}
-#endif//SSD1306OLED
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  if (record->event.pressed) {
-#ifdef SSD1306OLED
-    set_keylog(keycode, record);
-#endif
-    // set_timelog();
-  }
-
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-      break;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-      } else {
-        layer_off(_LOWER);
-      }
-      return false;
-      break;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-      } else {
-        layer_off(_RAISE);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/qmk/keyboards/claw44/keymaps/oled/config.h b/qmk/keyboards/claw44/keymaps/oled/config.h
new file mode 100644
index 00000000..edde2c67
--- /dev/null
+++ b/qmk/keyboards/claw44/keymaps/oled/config.h
@@ -0,0 +1,24 @@
+/*
+This is the c configuration file for the keymap
+
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+Copyright 2015 Jack Humbert
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#define MASTER_LEFT
+#define OLED_FONT_H "keyboards/claw44/lib/glcdfont.c"
diff --git a/qmk/keyboards/claw44/keymaps/oled/keymap.c b/qmk/keyboards/claw44/keymaps/oled/keymap.c
new file mode 100644
index 00000000..0d10c371
--- /dev/null
+++ b/qmk/keyboards/claw44/keymaps/oled/keymap.c
@@ -0,0 +1,137 @@
+#include QMK_KEYBOARD_H
+#include <stdio.h>
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+
+enum layer_number {
+    _QWERTY = 0,
+    _RAISE,
+    _LOWER,
+};
+
+#define KC_ KC_TRNS
+#define KC_RST RESET
+#define KC_L_SPC LT(_LOWER, KC_SPC)  // lower
+#define KC_R_ENT LT(_RAISE, KC_ENT)  // raise
+#define KC_G_JA LGUI_T(KC_LANG1)     // cmd or win
+#define KC_G_EN LGUI_T(KC_LANG2)     // cmd or win
+#define KC_C_BS LCTL_T(KC_BSPC)      // ctrl
+#define KC_A_DEL ALT_T(KC_DEL)       // alt
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_QWERTY] = LAYOUT( \
+    //,--------+--------+---------+--------+---------+--------.   ,--------+---------+--------+---------+--------+--------.
+        KC_ESC , KC_Q   , KC_W    , KC_E   , KC_R    , KC_T   ,     KC_Y   , KC_U    , KC_I   , KC_O    , KC_P   , KC_MINS,
+    //|--------+--------+---------+--------+---------+--------|   |--------+---------+--------+---------+--------+--------|
+        KC_TAB , KC_A   , KC_S    , KC_D   , KC_F    , KC_G   ,     KC_H   , KC_J    , KC_K   , KC_L    , KC_SCLN, KC_QUOT,
+    //|--------+--------+---------+--------+---------+--------|   |--------+---------+--------+---------+--------+--------|
+        KC_LSFT, KC_Z   , KC_X    , KC_C   , KC_V    , KC_B   ,     KC_N   , KC_M    , KC_COMM, KC_DOT  , KC_SLSH, KC_RSFT,
+    //`--------+--------+---------+--------+---------+--------/   \--------+---------+--------+---------+--------+--------'
+                          KC_A_DEL, KC_G_EN, KC_L_SPC, KC_C_BS,     KC_C_BS, KC_R_ENT, KC_G_JA, KC_A_DEL
+    //                 `----------+--------+---------+--------'   `--------+---------+--------+---------'
+    ),
+
+    [_RAISE] = LAYOUT( \
+    //,--------+--------+--------+--------+--------+--------.   ,--------+--------+--------+--------+--------+--------.
+        _______, KC_BSLS, KC_CIRC, KC_EXLM, KC_AMPR, KC_PIPE,     KC_AT  , KC_EQL , KC_PLUS, KC_ASTR, KC_PERC, KC_MINS,
+    //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------|
+        KC_LPRN, KC_HASH, KC_DLR , KC_DQT , KC_QUOT, KC_TILD,     KC_LEFT, KC_DOWN,  KC_UP , KC_RGHT, KC_GRV , KC_RPRN,
+    //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------|
+        _______, _______, _______, _______, KC_LCBR, KC_LBRC,     KC_RBRC, KC_RCBR, _______, _______, _______, _______,
+    //`--------+--------+--------+--------+--------+--------/   \--------+--------+--------+--------+--------+--------'
+                          _______, _______, _______, _______,     _______, _______, _______, RESET
+    //                  `--------+--------+--------+--------'   `--------+--------+--------+--------'
+    ),
+
+    [_LOWER] = LAYOUT( \
+    //,--------+--------+--------+--------+--------+--------.   ,--------+--------+--------+--------+--------+--------.
+        KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  ,     _______, KC_EQL , KC_PLUS, KC_ASTR, KC_PERC, KC_MINS,
+    //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------|
+        _______, KC_1   , KC_2   , KC_3   , KC_4   , KC_5   ,     KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , _______,
+    //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------|
+        KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 ,     _______, _______, KC_COMM, KC_DOT , KC_SLSH, _______,
+    //`--------+--------+--------+--------+--------+--------/   \--------+--------+--------+--------+--------+--------'
+                          RESET  , _______, _______, _______,     _______, _______, _______, _______
+    //                  `--------+--------+--------+--------'   `--------+--------+--------+--------'
+    ),
+};
+
+#ifdef OLED_DRIVER_ENABLE
+
+void render_layer_state(void) {
+    switch (get_highest_layer(layer_state)) {
+        case _QWERTY:
+            oled_write_ln_P(PSTR("Layer: Default"), false);
+            break;
+        case _RAISE:
+            oled_write_ln_P(PSTR("Layer: Raise"), false);
+            break;
+        case _LOWER:
+            oled_write_ln_P(PSTR("Layer: Lower"), false);
+            break;
+        default:
+            oled_write_ln_P(PSTR("Layer: Undefined"), false);
+    }
+}
+
+void render_logo(void) {
+    static const char PROGMEM logo[] = {0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94, 0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0};
+    oled_write_P(logo, false);
+}
+
+char keylog_str[24]  = {};
+char keylogs_str[21] = {};
+int  keylogs_str_idx = 0;
+
+const char code_to_name[60] = {' ', ' ', ' ', ' ', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '1', '2', '3', '4', '5', '6', '7', '8', '9', '0', 'R', 'E', 'B', 'T', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ';', '\'', ' ', ',', '.', '/', ' ', ' ', ' '};
+
+void set_keylog(uint16_t keycode, keyrecord_t *record) {
+    char name = ' ';
+    if (keycode < 60) {
+        name = code_to_name[keycode];
+    }
+
+    // update keylog
+    snprintf(keylog_str, sizeof(keylog_str), "%dx%d, k%2d : %c", record->event.key.row, record->event.key.col, keycode, name);
+
+    // update keylogs
+    if (keylogs_str_idx == sizeof(keylogs_str) - 1) {
+        keylogs_str_idx = 0;
+        for (int i = 0; i < sizeof(keylogs_str) - 1; i++) {
+            keylogs_str[i] = ' ';
+        }
+    }
+
+    keylogs_str[keylogs_str_idx] = name;
+    keylogs_str_idx++;
+}
+
+const char *read_keylog(void) { return keylog_str; }
+const char *read_keylogs(void) { return keylogs_str; }
+
+void oled_task_user(void) {
+    if (is_keyboard_master()) {
+        render_layer_state();
+        oled_write_ln(read_keylog(), false);
+        oled_write_ln(read_keylogs(), false);
+    } else {
+        render_logo();
+    }
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    if (record->event.pressed) {
+        set_keylog(keycode, record);
+    }
+    return true;
+}
+
+oled_rotation_t oled_init_user(oled_rotation_t rotation) {
+    if (!is_keyboard_master()) return OLED_ROTATION_180;
+    return rotation;
+}
+
+#endif
diff --git a/qmk/keyboards/claw44/keymaps/oled/rules.mk b/qmk/keyboards/claw44/keymaps/oled/rules.mk
new file mode 100644
index 00000000..c5826621
--- /dev/null
+++ b/qmk/keyboards/claw44/keymaps/oled/rules.mk
@@ -0,0 +1 @@
+OLED_DRIVER_ENABLE = yes
diff --git a/qmk/keyboards/claw44/rev1/config.h b/qmk/keyboards/claw44/rev1/config.h
index f3406fee..dc6e49dd 100644
--- a/qmk/keyboards/claw44/rev1/config.h
+++ b/qmk/keyboards/claw44/rev1/config.h
@@ -19,22 +19,21 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x3060
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    yfuku
-#define PRODUCT         claw44
-#define DESCRIPTION     A split keyboard with 3x6 vertically staggered keys and 4 thumb keys
+#define VENDOR_ID 0xFEED
+#define PRODUCT_ID 0x3060
+#define DEVICE_VER 0x0001
+#define MANUFACTURER yfuku
+#define PRODUCT claw44
+#define DESCRIPTION A split keyboard with 3x6 vertically staggered keys and 4 thumb keys
 
 /* key matrix size */
-// Rows are doubled-up
 #define MATRIX_ROWS 8
-#define MATRIX_COLS 7
+#define MATRIX_COLS 6
 #define MATRIX_ROW_PINS { D4, C6, D7, E6 }
-
-// wiring of each half
-#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2 }
-// #define MATRIX_COL_PINS { B2, B3, B1, F7, F6, F5, F4 } //uncomment this line and comment line above if you need to reverse left-to-right key order
+#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 }
+#define UNUSED_PINS
+#define DIODE_DIRECTION COL2ROW
+#define SOFT_SERIAL_PIN D2
 
 /* define if matrix has ghost */
 //#define MATRIX_HAS_GHOST
diff --git a/qmk/keyboards/claw44/rev1/rev1.c b/qmk/keyboards/claw44/rev1/rev1.c
index 9529636f..520a869e 100644
--- a/qmk/keyboards/claw44/rev1/rev1.c
+++ b/qmk/keyboards/claw44/rev1/rev1.c
@@ -1,8 +1 @@
-#include "claw44.h"
-
-#ifdef SSD1306OLED
-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);
-}
-#endif
+#include "rev1.h"
diff --git a/qmk/keyboards/claw44/rev1/rev1.h b/qmk/keyboards/claw44/rev1/rev1.h
index c6c9057f..79ae9586 100644
--- a/qmk/keyboards/claw44/rev1/rev1.h
+++ b/qmk/keyboards/claw44/rev1/rev1.h
@@ -1,55 +1,33 @@
 #pragma once
 
-#include "../claw44.h"
-
 #include "quantum.h"
 
-#ifdef RGBLIGHT_ENABLE
-//rgb led driver
-#include "ws2812.h"
-#endif
-
-#ifdef USE_I2C
-#include <stddef.h>
-#ifdef __AVR__
-	#include <avr/io.h>
-	#include <avr/interrupt.h>
-#endif
-#endif
-
 #define LAYOUT( \
-  L00, L01, L02, L03, L04, L05,           R00, R01, R02, R03, R04, R05, \
-  L10, L11, L12, L13, L14, L15,           R10, R11, R12, R13, R14, R15, \
-  L20, L21, L22, L23, L24, L25,           R20, R21, R22, R23, R24, R25, \
-                 L30, L31, L32, L33, R30, R31, R32, R33 \
-  ) \
-  { \
-    { L00, L01, L02, L03, L04, L05 }, \
-    { L10, L11, L12, L13, L14, L15 }, \
-    { L20, L21, L22, L23, L24, L25 }, \
-    { KC_NO, KC_NO, L30, L31, L32, L33 }, \
-    { R05, R04, R03, R02, R01, R00 }, \
-    { R15, R14, R13, R12, R11, R10 }, \
-    { R25, R24, R23, R22, R21, R20 }, \
-    { KC_NO, KC_NO, R33, R32, R31, R30 } \
-  }
+    L00, L01, L02, L03, L04, L05,           R00, R01, R02, R03, R04, R05, \
+    L10, L11, L12, L13, L14, L15,           R10, R11, R12, R13, R14, R15, \
+    L20, L21, L22, L23, L24, L25,           R20, R21, R22, R23, R24, R25, \
+                   L30, L31, L32, L33, R30, R31, R32, R33 \
+    ) \
+    { \
+        { L00, L01, L02, L03, L04, L05 }, \
+        { L10, L11, L12, L13, L14, L15 }, \
+        { L20, L21, L22, L23, L24, L25 }, \
+        { KC_NO, KC_NO, L30, L31, L32, L33 }, \
+        { R05, R04, R03, R02, R01, R00 }, \
+        { R15, R14, R13, R12, R11, R10 }, \
+        { R25, R24, R23, R22, R21, R20 }, \
+        { KC_NO, KC_NO, R33, R32, R31, R30 } \
+    }
 
 #define LAYOUT_kc( \
-  L00, L01, L02, L03, L04, L05,           R00, R01, R02, R03, R04, R05, \
-  L10, L11, L12, L13, L14, L15,           R10, R11, R12, R13, R14, R15, \
-  L20, L21, L22, L23, L24, L25,           R20, R21, R22, R23, R24, R25, \
-                 L30, L31, L32, L33, R30, R31, R32, R33 \
-  ) \
-  LAYOUT( \
-    KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05,                     KC_##R00, KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05, \
-    KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15,                     KC_##R10, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15, \
-    KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25,                     KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25, \
-                                  KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##R30, KC_##R31, KC_##R32, KC_##R33 \
-  )
-
-enum layer_number {
-  _QWERTY = 0,
-  _LOWER,
-  _RAISE,
-  _ADJUST,
-};
+    L00, L01, L02, L03, L04, L05,           R00, R01, R02, R03, R04, R05, \
+    L10, L11, L12, L13, L14, L15,           R10, R11, R12, R13, R14, R15, \
+    L20, L21, L22, L23, L24, L25,           R20, R21, R22, R23, R24, R25, \
+                   L30, L31, L32, L33, R30, R31, R32, R33 \
+    ) \
+    LAYOUT( \
+        KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05,                     KC_##R00, KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05, \
+        KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15,                     KC_##R10, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15, \
+        KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25,                     KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25, \
+                                      KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##R30, KC_##R31, KC_##R32, KC_##R33 \
+    )
diff --git a/qmk/keyboards/claw44/rev1/rules.mk b/qmk/keyboards/claw44/rev1/rules.mk
index 016bc362..b1af22c5 100644
--- a/qmk/keyboards/claw44/rev1/rules.mk
+++ b/qmk/keyboards/claw44/rev1/rules.mk
@@ -1,7 +1,3 @@
-SRC += rev1/matrix.c
-SRC += rev1/split_util.c
-SRC += rev1/split_scomm.c
-
 # Build Options
 BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = no        # Mouse keys
@@ -10,7 +6,6 @@ CONSOLE_ENABLE = no         # Console for debug
 COMMAND_ENABLE = no         # Commands for debug and configuration
 NKRO_ENABLE = no            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
 AUDIO_ENABLE = no           # Audio output on port C6
 UNICODE_ENABLE = no         # Unicode
 BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
@@ -20,12 +15,5 @@ SWAP_HANDS_ENABLE = no      # Enable one-hand typing
 # 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 you want to change the display of OLED, you need to change here
-SRC += ./lib/glcdfont.c \
-       ./lib/layer_state_reader.c \
-       ./lib/logo_reader.c \
-       ./lib/keylogger.c \
-       # ./lib/rgb_state_reader.c \
-       # ./lib/mode_icon_reader.c \
-       # ./lib/host_led_state_reader.c \
-       # ./lib/timelogger.c \
+OLED_DRIVER_ENABLE = no     # Add OLED displays support
+SPLIT_KEYBOARD = yes
diff --git a/qmk/keyboards/claw44/rules.mk b/qmk/keyboards/claw44/rules.mk
index f872b9eb..f4d44b23 100644
--- a/qmk/keyboards/claw44/rules.mk
+++ b/qmk/keyboards/claw44/rules.mk
@@ -22,7 +22,6 @@ CONSOLE_ENABLE = no         # Console for debug
 COMMAND_ENABLE = no        # Commands for debug and configuration
 NKRO_ENABLE = no            # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
 BACKLIGHT_ENABLE = no      # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI controls
 AUDIO_ENABLE = no           # Audio output on port C6
 UNICODE_ENABLE = no         # Unicode
 BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
@@ -30,12 +29,4 @@ RGBLIGHT_ENABLE = no       # Enable WS2812 RGB underlight.
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
 
-CUSTOM_MATRIX = yes
-SRC += i2c.c
-SRC += serial.c
-SRC += ssd1306.c
-
-# if firmware size over limit, try this option
-# CFLAGS += -flto
-
 DEFAULT_FOLDER = claw44/rev1
diff --git a/qmk/keyboards/clueboard/17/.noci b/qmk/keyboards/clueboard/17/.noci
new file mode 100644
index 00000000..e69de29b
diff --git a/qmk/keyboards/clueboard/17/17.c b/qmk/keyboards/clueboard/17/17.c
index 9e8ca644..44b55a32 100644
--- a/qmk/keyboards/clueboard/17/17.c
+++ b/qmk/keyboards/clueboard/17/17.c
@@ -2,16 +2,6 @@
 
 int pwm_level;
 
-void matrix_init_kb(void) {
-    // put your keyboard start-up code here
-    // runs once when the firmware starts up
-    matrix_init_user();
-};
-
-void led_set_kb(uint8_t usb_led) {
-    print("led_set\n");
-}
-
 void backlight_init_ports(void) {
     // Set C7 to output
     DDRC |= (1<<7);
diff --git a/qmk/keyboards/clueboard/2x1800/2018/.noci b/qmk/keyboards/clueboard/2x1800/2018/.noci
new file mode 100644
index 00000000..e69de29b
diff --git a/qmk/keyboards/clueboard/2x1800/2018/2018.c b/qmk/keyboards/clueboard/2x1800/2018/2018.c
index 1745309f..dee0c01b 100644
--- a/qmk/keyboards/clueboard/2x1800/2018/2018.c
+++ b/qmk/keyboards/clueboard/2x1800/2018/2018.c
@@ -14,44 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "2018.h"
-
-void matrix_init_kb(void) {
-	// Set our LED pins as output
-	DDRB |= (1<<4);  // Numlock
-	DDRB |= (1<<5);  // Capslock
-	DDRB |= (1<<6);  // Scroll Lock
-
-	// Run the keymap level init
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	matrix_scan_user();
-}
-
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-	return process_record_user(keycode, record);
-}
-
-void led_set_kb(uint8_t usb_led) {
-  // Toggle numlock as needed
-	if (usb_led & (1<<USB_LED_NUM_LOCK)) {
-		PORTB |= (1<<4);
-	} else {
-		PORTB &= ~(1<<4);
-	}
-
-  // Toggle capslock as needed
-	if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
-		PORTB |= (1<<5);
-	} else {
-		PORTB &= ~(1<<5);
-	}
-
-	// Toggle scrolllock as needed
-	if (usb_led & (1<<USB_LED_SCROLL_LOCK)) {
-		PORTB |= (1<<6);
-	} else {
-		PORTB &= ~(1<<6);
-	}
-}
diff --git a/qmk/keyboards/clueboard/2x1800/2018/config.h b/qmk/keyboards/clueboard/2x1800/2018/config.h
index af67b15b..0c57b432 100644
--- a/qmk/keyboards/clueboard/2x1800/2018/config.h
+++ b/qmk/keyboards/clueboard/2x1800/2018/config.h
@@ -60,6 +60,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define C4_AUDIO
 #define AUDIO_CLICKY
 
+#define LED_NUM_LOCK_PIN B4
+#define LED_CAPS_LOCK_PIN B5
+#define LED_SCROLL_LOCK_PIN B6
+
 /* number of backlight levels */
 // #define BACKLIGHT_PIN B7
 // #define BACKLIGHT_BREATHING
diff --git a/qmk/keyboards/clueboard/60/.noci b/qmk/keyboards/clueboard/60/.noci
new file mode 100644
index 00000000..e69de29b
diff --git a/qmk/keyboards/clueboard/60/config.h b/qmk/keyboards/clueboard/60/config.h
index f0e157ff..3f54d0a9 100644
--- a/qmk/keyboards/clueboard/60/config.h
+++ b/qmk/keyboards/clueboard/60/config.h
@@ -121,6 +121,8 @@
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
- /* Backlight configuration
+#define LED_CAPS_LOCK_PIN B7
+
+/* Backlight configuration
  */
 #define BACKLIGHT_LEVELS 1
diff --git a/qmk/keyboards/clueboard/60/led.c b/qmk/keyboards/clueboard/60/led.c
index 91a2c537..ad11ad5d 100644
--- a/qmk/keyboards/clueboard/60/led.c
+++ b/qmk/keyboards/clueboard/60/led.c
@@ -15,9 +15,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "hal.h"
-#include "led.h"
-#include "printf.h"
+#include <hal.h>
+#include "print.h"
 
 #ifdef BACKLIGHT_ENABLE
 #include "backlight.h"
@@ -40,14 +39,3 @@ void backlight_set(uint8_t level) {
     }
 }
 #endif
-
-void led_set_kb(uint8_t usb_led) {
-    printf("led_set_kb(%d)\n", usb_led);
-    if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
-        // Turn capslock on
-        palSetPad(GPIOB, 7);
-    } else {
-        // Turn capslock off
-        palClearPad(GPIOB, 7);
-    }
-}
diff --git a/qmk/keyboards/clueboard/66/rev1/.noci b/qmk/keyboards/clueboard/66/rev1/.noci
new file mode 100644
index 00000000..e69de29b
diff --git a/qmk/keyboards/clueboard/66/rev1/config.h b/qmk/keyboards/clueboard/66/rev1/config.h
index 9db64fbd..6b61ca4d 100644
--- a/qmk/keyboards/clueboard/66/rev1/config.h
+++ b/qmk/keyboards/clueboard/66/rev1/config.h
@@ -50,6 +50,8 @@
 //#define NO_ACTION_MACRO
 //#define NO_ACTION_FUNCTION
 
+#define LED_CAPS_LOCK_PIN F0
+
 /* Underlight configuration
  */
 #define RGB_DI_PIN B2
diff --git a/qmk/keyboards/clueboard/66/rev1/rev1.c b/qmk/keyboards/clueboard/66/rev1/rev1.c
index 90fc6956..520a869e 100644
--- a/qmk/keyboards/clueboard/66/rev1/rev1.c
+++ b/qmk/keyboards/clueboard/66/rev1/rev1.c
@@ -1,17 +1 @@
 #include "rev1.h"
-
-void led_init_ports() {
-    // * Set our LED pins as output
-    DDRF |= (1<<0);
-}
-
-void led_set_kb(uint8_t usb_led) {
-    DDRF |= (1<<0);
-    if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
-        // Turn capslock on
-        PORTF |= (1<<0);
-    } else {
-        // Turn capslock off
-        PORTF &= ~(1<<0);
-    }
-}
diff --git a/qmk/keyboards/clueboard/66/rev2/.noci b/qmk/keyboards/clueboard/66/rev2/.noci
new file mode 100644
index 00000000..e69de29b
diff --git a/qmk/keyboards/clueboard/66/rev2/config.h b/qmk/keyboards/clueboard/66/rev2/config.h
index f11cfe82..a1e4804c 100644
--- a/qmk/keyboards/clueboard/66/rev2/config.h
+++ b/qmk/keyboards/clueboard/66/rev2/config.h
@@ -49,7 +49,9 @@
 //#define NO_ACTION_MACRO
 //#define NO_ACTION_FUNCTION
 
- /* Backlight configuration
+#define LED_CAPS_LOCK_PIN B4
+
+/* Backlight configuration
  */
 #define BACKLIGHT_LEVELS 1
 
diff --git a/qmk/keyboards/clueboard/66/rev2/rev2.c b/qmk/keyboards/clueboard/66/rev2/rev2.c
index d676b6d5..a533c550 100644
--- a/qmk/keyboards/clueboard/66/rev2/rev2.c
+++ b/qmk/keyboards/clueboard/66/rev2/rev2.c
@@ -1,20 +1,6 @@
 #include "rev2.h"
-#include <avr/io.h>
-#include "backlight.h"
 #include "print.h"
 
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-	matrix_init_user();
-	led_init_ports();
-}
-
-
-void matrix_scan_kb(void) {
-    matrix_scan_user();
-}
-
 void backlight_init_ports(void) {
     print("init_backlight_pin()\n");
     // Set our LED pins as output
@@ -41,19 +27,3 @@ void backlight_set(uint8_t level) {
         PORTD &= ~(1<<4); // Arrows
     }
 }
-
-void led_init_ports() {
-    // * Set our LED pins as output
-    DDRB |= (1<<4);
-}
-
-void led_set_kb(uint8_t usb_led) {
-    DDRB |= (1<<4);
-    if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
-        // Turn capslock on
-        PORTB |= (1<<4);
-    } else {
-        // Turn capslock off
-        PORTB &= ~(1<<4);
-    }
-}
diff --git a/qmk/keyboards/clueboard/66/rev3/config.h b/qmk/keyboards/clueboard/66/rev3/config.h
index bbbd82a1..2d063d4e 100644
--- a/qmk/keyboards/clueboard/66/rev3/config.h
+++ b/qmk/keyboards/clueboard/66/rev3/config.h
@@ -49,7 +49,9 @@
 //#define NO_ACTION_MACRO
 //#define NO_ACTION_FUNCTION
 
- /* Backlight configuration
+#define LED_CAPS_LOCK_PIN B4
+
+/* Backlight configuration
  */
 #define BACKLIGHT_LEVELS 1
 
diff --git a/qmk/keyboards/clueboard/66/rev3/rev3.c b/qmk/keyboards/clueboard/66/rev3/rev3.c
index 195a21a9..7ec8dcb6 100644
--- a/qmk/keyboards/clueboard/66/rev3/rev3.c
+++ b/qmk/keyboards/clueboard/66/rev3/rev3.c
@@ -1,20 +1,6 @@
 #include "rev3.h"
-#include <avr/io.h>
-#include "backlight.h"
 #include "print.h"
 
-void matrix_init_kb(void) {
-    // put your keyboard start-up code here
-    // runs once when the firmware starts up
-    matrix_init_user();
-    led_init_ports();
-}
-
-
-void matrix_scan_kb(void) {
-    matrix_scan_user();
-}
-
 void backlight_init_ports(void) {
     print("init_backlight_pin()\n");
     // Set our LED pins as output
@@ -41,19 +27,3 @@ void backlight_set(uint8_t level) {
         PORTD &= ~(1<<4); // Arrows
     }
 }
-
-void led_init_ports() {
-    // * Set our LED pins as output
-    DDRB |= (1<<4);
-}
-
-void led_set_kb(uint8_t usb_led) {
-    DDRB |= (1<<4);
-    if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
-        // Turn capslock on
-        PORTB |= (1<<4);
-    } else {
-        // Turn capslock off
-        PORTB &= ~(1<<4);
-    }
-}
diff --git a/qmk/keyboards/clueboard/66/rev4/rev4.c b/qmk/keyboards/clueboard/66/rev4/rev4.c
index 69eb4818..00d4f325 100644
--- a/qmk/keyboards/clueboard/66/rev4/rev4.c
+++ b/qmk/keyboards/clueboard/66/rev4/rev4.c
@@ -1,43 +1,30 @@
 #include "rev4.h"
-//#include "backlight.h"
 
 void matrix_init_kb(void) {
-    // put your keyboard start-up code here
-    // runs once when the firmware starts up
-    matrix_init_user();
     led_init_ports();
+
+    matrix_init_user();
 }
 
 void led_init_ports() {
     // Set our LED pins as output
-    palSetPadMode(GPIOB, 13, PAL_MODE_OUTPUT_PUSHPULL); // LED1
-    palClearPad(GPIOB, 13);
-    palSetPadMode(GPIOB, 14, PAL_MODE_OUTPUT_PUSHPULL); // LED2
-    palClearPad(GPIOB, 14);
-    palSetPadMode(GPIOA, 8, PAL_MODE_OUTPUT_PUSHPULL); // LED3
-    palClearPad(GPIOA, 8);
-    palSetPadMode(GPIOA, 0, PAL_MODE_OUTPUT_PUSHPULL); // Capslock LED
-    palClearPad(GPIOA, 0);
+    setPinOutput(B13); // LED1
+    writePinLow(B13);
+    setPinOutput(B14); // LED2
+    writePinLow(B14);
+    setPinOutput(A8); // LED3
+    writePinLow(A8);
+    setPinOutput(A0); // Capslock LED
+    writePinLow(A0);
 }
 
-void led_set_kb(uint8_t usb_led) {
-    if (usb_led & (1<<USB_LED_NUM_LOCK)) {
-        palSetPad(GPIOB, 13);    // LED1
-    } else {
-        palClearPad(GPIOB, 13);  // LED1
-    }
-
-    if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
-        palSetPad(GPIOA, 0);     // Capslock LED
-        palSetPad(GPIOB, 14);    // LED2
-    } else {
-        palClearPad(GPIOA, 0);   // Capslock LED
-        palClearPad(GPIOB, 14);  // LED2
-    }
-
-    if (usb_led & (1<<USB_LED_SCROLL_LOCK)) {
-        palSetPad(GPIOA, 8);     // LED3
-    } else {
-        palClearPad(GPIOA, 8);   // LED3
+bool led_update_kb(led_t led_state) {
+    bool res = led_update_user(led_state);
+    if(res) {
+        writePin(B13, led_state.num_lock);
+        writePin(A0, led_state.caps_lock);
+        writePin(B14, led_state.caps_lock);
+        writePin(A8, led_state.scroll_lock);
     }
+    return res;
 }
diff --git a/qmk/keyboards/clueboard/66_hotswap/gen1/config.h b/qmk/keyboards/clueboard/66_hotswap/gen1/config.h
index ea01a078..7c90d05b 100644
--- a/qmk/keyboards/clueboard/66_hotswap/gen1/config.h
+++ b/qmk/keyboards/clueboard/66_hotswap/gen1/config.h
@@ -27,8 +27,6 @@
 /* Address for jumping to bootloader on STM32 chips. */
 /* It is chip dependent, the correct number can be looked up here:
  * http://www.st.com/web/en/resource/technical/document/application_note/CD00167594.pdf
- * This also requires a patch to chibios:
- *  <tmk_dir>/tmk_core/tool/chibios/ch-bootloader-jump.patch
  */
 #define STM32_BOOTLOADER_ADDRESS 0x1FFFD800
 
diff --git a/qmk/keyboards/clueboard/66_hotswap/gen1/rules.mk b/qmk/keyboards/clueboard/66_hotswap/gen1/rules.mk
index c0132684..48740725 100644
--- a/qmk/keyboards/clueboard/66_hotswap/gen1/rules.mk
+++ b/qmk/keyboards/clueboard/66_hotswap/gen1/rules.mk
@@ -2,7 +2,8 @@
 MCU = STM32F303
 
 # LED Configuration
-LED_MATRIX_ENABLE = IS31FL3731
+LED_MATRIX_ENABLE = yes
+LED_MATRIX_DRIVER = IS31FL3731
 
 # Build Options
 #   comment out to disable the options.
@@ -15,10 +16,7 @@ CONSOLE_ENABLE = yes	# Console for debug
 COMMAND_ENABLE = yes    # Commands for debug and configuration
 #SLEEP_LED_ENABLE = yes  # Breathing sleep LED during USB suspend
 NKRO_ENABLE = yes	    # USB Nkey Rollover
-#CUSTOM_MATRIX = yes # Custom matrix file
 AUDIO_ENABLE = yes
 # SERIAL_LINK_ENABLE = yes
 
-# project specific files
-SRC =	led.c
 LAYOUTS = 66_ansi
diff --git a/qmk/keyboards/clueboard/66_hotswap/prototype/.noci b/qmk/keyboards/clueboard/66_hotswap/prototype/.noci
new file mode 100644
index 00000000..e69de29b
diff --git a/qmk/keyboards/clueboard/66_hotswap/prototype/config.h b/qmk/keyboards/clueboard/66_hotswap/prototype/config.h
index 7679d08e..f6ab6ba5 100644
--- a/qmk/keyboards/clueboard/66_hotswap/prototype/config.h
+++ b/qmk/keyboards/clueboard/66_hotswap/prototype/config.h
@@ -32,6 +32,8 @@
  */
 #define NO_ACTION_TAPPING
 
+#define LED_CAPS_LOCK_PIN B4
+
 /* Backlight configuration
  */
 #define BACKLIGHT_LEVELS 1
diff --git a/qmk/keyboards/clueboard/66_hotswap/prototype/prototype.c b/qmk/keyboards/clueboard/66_hotswap/prototype/prototype.c
index 7c307be6..4ce3dd65 100644
--- a/qmk/keyboards/clueboard/66_hotswap/prototype/prototype.c
+++ b/qmk/keyboards/clueboard/66_hotswap/prototype/prototype.c
@@ -1,20 +1,6 @@
 #include "prototype.h"
-#include <avr/io.h>
-#include "backlight.h"
 #include "print.h"
 
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-	matrix_init_user();
-	led_init_ports();
-}
-
-
-void matrix_scan_kb(void) {
-    matrix_scan_user();
-}
-
 void backlight_init_ports(void) {
     print("init_backlight_pin()\n");
     // Set our LED pins as output
@@ -41,19 +27,3 @@ void backlight_set(uint8_t level) {
         PORTD &= ~(1<<1); // Arrows
     }
 }
-
-void led_init_ports() {
-    // * Set our LED pins as output
-    DDRB |= (1<<4);
-}
-
-void led_set_kb(uint8_t usb_led) {
-    DDRB |= (1<<4);
-    if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
-        // Turn capslock on
-        PORTB |= (1<<4);
-    } else {
-        // Turn capslock off
-        PORTB &= ~(1<<4);
-    }
-}
diff --git a/qmk/keyboards/clueboard/card/.noci b/qmk/keyboards/clueboard/card/.noci
new file mode 100644
index 00000000..e69de29b
diff --git a/qmk/keyboards/clueboard/card/card.c b/qmk/keyboards/clueboard/card/card.c
index 9b4b397d..33a4cc3c 100644
--- a/qmk/keyboards/clueboard/card/card.c
+++ b/qmk/keyboards/clueboard/card/card.c
@@ -1,35 +1,9 @@
 #include "card.h"
+
 #define BL_RED OCR1B
 #define BL_GREEN OCR1A
 #define BL_BLUE OCR1C
 
-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
-
-	led_set_user(usb_led);
-}
-
 void backlight_init_ports(void)
 {
 	// Set B5, B6, and B7 as output
diff --git a/qmk/keyboards/coarse/cordillera/rules.mk b/qmk/keyboards/coarse/cordillera/rules.mk
index 462340c7..d35a6a65 100644
--- a/qmk/keyboards/coarse/cordillera/rules.mk
+++ b/qmk/keyboards/coarse/cordillera/rules.mk
@@ -18,5 +18,7 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 BLUETOOTH_ENABLE = no       # Enable Bluetooth
 AUDIO_ENABLE = no           # Audio output
 
+LAYOUTS = alice alice_split_bs
+
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/qmk/keyboards/converter/adb_usb/led.h b/qmk/keyboards/converter/adb_usb/led.h
index 19952fae..b33b6894 100644
--- a/qmk/keyboards/converter/adb_usb/led.h
+++ b/qmk/keyboards/converter/adb_usb/led.h
@@ -19,7 +19,7 @@ Ported to QMK by Peter Roe <pete@13bit.me>
 
 #ifndef LED_H
 #define LED_H
-#include "stdint.h"
+#include <stdint.h>
 
 
 /* keyboard LEDs */
diff --git a/qmk/keyboards/converter/hp_46010a/matrix.c b/qmk/keyboards/converter/hp_46010a/matrix.c
index ac922408..72a09874 100644
--- a/qmk/keyboards/converter/hp_46010a/matrix.c
+++ b/qmk/keyboards/converter/hp_46010a/matrix.c
@@ -29,7 +29,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "util.h"
 #include "matrix.h"
 #include "timer.h"
-#include "LUFA/Drivers/Peripheral/SPI.h"
+#include <LUFA/Drivers/Peripheral/SPI.h>
 
 #include "config.h"
 
diff --git a/qmk/keyboards/converter/ibm_terminal/led.c b/qmk/keyboards/converter/ibm_terminal/led.c
index e448e84e..e0f31ee4 100644
--- a/qmk/keyboards/converter/ibm_terminal/led.c
+++ b/qmk/keyboards/converter/ibm_terminal/led.c
@@ -15,7 +15,7 @@ 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 "stdint.h"
+#include <stdint.h>
 #include "ps2.h"
 #include "led.h"
 
diff --git a/qmk/keyboards/converter/siemens_tastatur/matrix.c b/qmk/keyboards/converter/siemens_tastatur/matrix.c
index 9fcfe9fd..2da4e33d 100644
--- a/qmk/keyboards/converter/siemens_tastatur/matrix.c
+++ b/qmk/keyboards/converter/siemens_tastatur/matrix.c
@@ -22,8 +22,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "wait.h"
 #include "print.h"
 #include "matrix.h"
-#include "ch.h"
-#include "hal.h"
+#include <ch.h>
+#include <hal.h>
 
 static matrix_row_t matrix[MATRIX_ROWS];
 static matrix_row_t matrix_debouncing[MATRIX_ROWS];
diff --git a/qmk/keyboards/coseyfannitutti/discipad/keymaps/via/rules.mk b/qmk/keyboards/coseyfannitutti/discipad/keymaps/via/rules.mk
index fcb7b9ea..36b7ba9c 100644
--- a/qmk/keyboards/coseyfannitutti/discipad/keymaps/via/rules.mk
+++ b/qmk/keyboards/coseyfannitutti/discipad/keymaps/via/rules.mk
@@ -1,3 +1,2 @@
 VIA_ENABLE = yes
 LTO_ENABLE = yes
-MOUSEKEY_ENABLE = no
diff --git a/qmk/keyboards/coseyfannitutti/discipline/keymaps/brandonschlack/keymap.c b/qmk/keyboards/coseyfannitutti/discipline/keymaps/brandonschlack/keymap.c
new file mode 100644
index 00000000..4c63a3e1
--- /dev/null
+++ b/qmk/keyboards/coseyfannitutti/discipline/keymaps/brandonschlack/keymap.c
@@ -0,0 +1,60 @@
+/* Copyright 2019 Brandon Schlack
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+#include "brandonschlack.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/* Base Layer
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+ * │Esc│! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│_ -│+ =│ Bckspc│Hom│
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+ * │Tab  │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │{ [│} ]│|   \│PgU│
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+ * │HyCaps│ A │ S │ D │ F │ G │ H │ J │ K │ L │: ;│" '│   Enter│PgD│
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+ * │Shift   │ Z │ X │ C │ V │ B │ N │ M │< ,│> .│? /│ Shift│ Up│End│
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┴┬──┴──┬───┼───┼───┤
+ * │Ctrl│ Opt│ Cmd│          Space         │ Cmd │FnPly│Lef│Dow│Rig│
+ * └────┴────┴────┴────────────────────────┴─────┴─────┴───┴───┴───┘
+ */
+[_BASE] = LAYOUT_65_ansi_2_right_mods( \
+    KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME, \
+    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_PGUP, \
+    HY_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_PGDN, \
+    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_END,  \
+    KC_LCTL, KC_LOPT, KC_LCMD,                            KC_SPC,                    KC_RCMD, PLY_FN1,          KC_LEFT, KC_DOWN, KC_RGHT  \
+),
+/* Function Layer
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+ * │` ~│ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│   Del │SlD│
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+ * │     │   │   │   │   │   │   │   │   │   │F13│F14│F15│ LHP │VlU│
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+ * │      │   │   │   │   │   │   │   │   │   │   │   │        │VlD│
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+ * │        │   │   │   │   │RST│   │Mke│Prv│Nxt│Ply│      │PgU│Mut│
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┴┬──┴──┬───┼───┼───┤
+ * │    │    │    │                        │     │     │Hom│PgD│End│
+ * └────┴────┴────┴────────────────────────┴─────┴─────┴───┴───┴───┘
+ */
+[_FN1] = LAYOUT_65_ansi_2_right_mods( \
+    KC_GRV,  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_DELT, MC_SLPD, \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_F13,  KC_F14,  KC_F15,  MC_LHPD, KC_VOLU, \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, KC_VOLD, \
+    _______,          _______, _______, _______, _______, RESET,   _______, QM_MAKE, KC_MPRV, KC_MNXT, KC_MPLY, _______, KC_PGUP, KC_MUTE, \
+    _______, _______, _______,                            _______,                   _______, _______,          KC_HOME, KC_PGDN, KC_END   \
+)
+};
diff --git a/qmk/keyboards/coseyfannitutti/discipline/keymaps/via/rules.mk b/qmk/keyboards/coseyfannitutti/discipline/keymaps/via/rules.mk
index fcb7b9ea..36b7ba9c 100644
--- a/qmk/keyboards/coseyfannitutti/discipline/keymaps/via/rules.mk
+++ b/qmk/keyboards/coseyfannitutti/discipline/keymaps/via/rules.mk
@@ -1,3 +1,2 @@
 VIA_ENABLE = yes
 LTO_ENABLE = yes
-MOUSEKEY_ENABLE = no
diff --git a/qmk/keyboards/coseyfannitutti/romeo/keymaps/brandonschlack/keymap.c b/qmk/keyboards/coseyfannitutti/romeo/keymaps/brandonschlack/keymap.c
new file mode 100644
index 00000000..3be5d44e
--- /dev/null
+++ b/qmk/keyboards/coseyfannitutti/romeo/keymaps/brandonschlack/keymap.c
@@ -0,0 +1,111 @@
+/* Copyright 2020 Brandon Schlack
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+#include "brandonschlack.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/* Base Layer
+* ┌─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐
+* │Tab  │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ Bspc│
+* ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+* │HyEsc │ A │ S │ D │ F │ G │ H │ J │ K │ L │   Enter│
+* ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬──────┤
+* │Shift   │ Z │ X │ C │ V │ B │ N │ M │< ,│> .│ ?/Sft│
+* ├────┬───┼───┼───┴───┴───┴───┴───┴───┴┬──┴─┬─┴─┬────┤
+* │Ctrl│Opt│Cmd│          Space         │ Cmd│Opt│ Lwr│
+* └────┴───┴───┴────────────────────────┴────┴───┴────┘
+*/
+[_BASE] = LAYOUT_ansi_40( \
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC, \
+    HY_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,             KC_ENT,  \
+    KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  SF_SLSH, \
+    KC_LCTL, KC_LOPT, KC_LCMD,                            SPC_RAI,                   KC_RCMD, KC_ROPT, LOWER    \
+),
+/* Lower
+* ┌─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐
+* │Del  │BrD│BrU│Msn│LHP│   │   │   │PgU│Hom│End│ SlpD│
+* ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+* │HyCaps│Mut│VlU│NxW│PvT│Bck│Fwd│NxT│PgD│ ↑ │    Play│
+* ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬──────┤
+* │        │Prv│VlD│Nxt│1PX│1Ps│   │ ← │ ↓ │ → │      │
+* ├────┬───┼───┼───┴───┴───┴───┴───┴───┴┬──┴─┬─┴─┬────┤
+* │    │   │   │                        │    │   │    │
+* └────┴───┴───┴────────────────────────┴────┴───┴────┘
+*/
+[_LOWER] = LAYOUT_ansi_40( \
+    KC_DELT, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, _______, _______, _______, KC_PGUP, KC_HOME, KC_END,  MC_SLPD, \
+    HY_CAPS, KC_MUTE, KC_VOLU, NXT_WIN, PRV_TAB, MC_BACK, MC_FWRD, NXT_TAB, KC_PGDN, KC_UP,            KC_MPLY, \
+    _______,          KC_MPRV, KC_VOLD, KC_MNXT, PX_AFLL, OP_AFLL, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, \
+    _______, _______, _______,                            _______,                   _______, _______, _______  \
+),
+/* Raise
+* ┌─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐
+* │~ `  │! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│     │
+* ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+* │      │ F1│ F2│ F3│ F4│ F5│ F6│_ -│+ =│: ;│     " '│
+* ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬──────┤
+* │        │ F7│ F8│ F9│F10│F11│F12│   │{ [│} ]│ |\Sft│
+* ├────┬───┼───┼───┴───┴───┴───┴───┴───┴┬──┴─┬─┴─┬────┤
+* │    │   │   │                        │    │   │    │
+* └────┴───┴───┴────────────────────────┴────┴───┴────┘
+*/
+[_RAISE] = LAYOUT_ansi_40( \
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______, \
+    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_SCLN,          KC_QUOT, \
+    _______,          KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_LBRC, KC_RBRC, SF_BSLS, \
+    _______, _______, _______,                            _______,                   _______, _______, _______  \
+),
+/* Adjust/Macro Layer
+* ┌─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐
+* │Make │   │   │EEP│RST│   │   │   │   │   │   │     │
+* ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+* │      │   │   │   │   │   │   │   │   │   │        │
+* ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬──────┤
+* │        │   │   │   │   │   │   │   │   │   │      │
+* ├────┬───┼───┼───┴───┴───┴───┴───┴───┴┬──┴─┬─┴─┬────┤
+* │    │   │   │                        │    │   │    │
+* └────┴───┴───┴────────────────────────┴────┴───┴────┘
+*/
+[_ADJUST] = LAYOUT_ansi_40( \
+    QM_MAKE, _______, _______, EEP_RST, RESET,   _______, _______, _______, _______, _______, _______, _______, \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, \
+    _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    _______, _______, _______,                            _______,                   _______, _______, _______  \
+)
+/* Blank Layer
+* ┌─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐
+* │     │   │   │   │   │   │   │   │   │   │   │     │
+* ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+* │      │   │   │   │   │   │   │   │   │   │        │
+* ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬──────┤
+* │        │   │   │   │   │   │   │   │   │   │      │
+* ├────┬───┼───┼───┴───┴───┴───┴───┴───┴┬──┴─┬─┴─┬────┤
+* │    │   │   │                        │    │   │    │
+* └────┴───┴───┴────────────────────────┴────┴───┴────┘
+*/
+/*
+[BLANK] = LAYOUT_ansi_40( \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, \
+    _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    _______, _______, _______,                            _______,                   _______, _______, _______  \
+)
+*/
+};
+
+layer_state_t layer_state_set_keymap(layer_state_t state) {
+    return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
+}
diff --git a/qmk/keyboards/coseyfannitutti/romeo/keymaps/via/rules.mk b/qmk/keyboards/coseyfannitutti/romeo/keymaps/via/rules.mk
index fcb7b9ea..36b7ba9c 100644
--- a/qmk/keyboards/coseyfannitutti/romeo/keymaps/via/rules.mk
+++ b/qmk/keyboards/coseyfannitutti/romeo/keymaps/via/rules.mk
@@ -1,3 +1,2 @@
 VIA_ENABLE = yes
 LTO_ENABLE = yes
-MOUSEKEY_ENABLE = no
diff --git a/qmk/keyboards/cospad/config.h b/qmk/keyboards/cospad/config.h
index 8d2994b7..648fa29a 100644
--- a/qmk/keyboards/cospad/config.h
+++ b/qmk/keyboards/cospad/config.h
@@ -53,6 +53,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define SOFT_SERIAL_PIN D0  // or D1, D2, D3, E6
 
+#define LED_NUM_LOCK_PIN B2
+#define LED_PIN_ON_STATE 0
+
 #define BACKLIGHT_PIN F7
 // #define BACKLIGHT_BREATHING
 #define BACKLIGHT_LEVELS 3
diff --git a/qmk/keyboards/cospad/cospad.c b/qmk/keyboards/cospad/cospad.c
index c1f3a704..e7772f29 100644
--- a/qmk/keyboards/cospad/cospad.c
+++ b/qmk/keyboards/cospad/cospad.c
@@ -14,19 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "cospad.h"
-
-void keyboard_pre_init_kb(void) {
-    led_init_ports();
-    keyboard_pre_init_user();
-}
-
-void led_init_ports(void) {
-    setPinOutput(B2);
-}
-
-bool led_update_kb(led_t led_state) {
-    if (led_update_user(led_state)) {
-        writePin(B2, !led_state.num_lock);
-    }
-    return true;
-}
diff --git a/qmk/keyboards/cozykeys/speedo/readme.md b/qmk/keyboards/cozykeys/speedo/readme.md
new file mode 100644
index 00000000..e2193363
--- /dev/null
+++ b/qmk/keyboards/cozykeys/speedo/readme.md
@@ -0,0 +1,28 @@
+# Speedo
+
+![Speedo](http://assets.cozykeys.xyz/images/keyboards/speedo/speedo-v3.0-angle-led-front_1600x1600.png)
+
+- Keyboard Maintainer: [Paul Ewing](https://github.com/pcewing)
+- Hardware Supported: Elite-C
+- Hardware Availability: [Speedo Repository](https://github.com/cozykeys/speedo)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make cozykeys/speedo/v2:default  # for Speedo v2
+    make cozykeys/speedo/v3:default  # for Speedo v3
+
+Flashing example for this keyboard:
+
+    make cozykeys/speedo/v2:default:flash  # for Speedo v2
+    make cozykeys/speedo/v3:default:flash  # for Speedo v3
+
+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).
+
+## Flashing the Firmware
+
+See the QMK docs for handwiring a keyboard; there is a section with
+instructions on how to flash the *.hex* file to the Teensy 2.0 controller.
diff --git a/qmk/keyboards/cozykeys/speedo/speedo.c b/qmk/keyboards/cozykeys/speedo/speedo.c
new file mode 100644
index 00000000..852459f8
--- /dev/null
+++ b/qmk/keyboards/cozykeys/speedo/speedo.c
@@ -0,0 +1,17 @@
+/*
+Copyright 2020 Paul Ewing
+
+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 "speedo.h"
diff --git a/qmk/keyboards/cozykeys/speedo/speedo.h b/qmk/keyboards/cozykeys/speedo/speedo.h
new file mode 100644
index 00000000..2a2adff4
--- /dev/null
+++ b/qmk/keyboards/cozykeys/speedo/speedo.h
@@ -0,0 +1,23 @@
+/*
+Copyright 2020 Paul Ewing
+
+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
+
+#ifdef KEYBOARD_cozykeys_speedo_v2
+    #include "v2.h"
+#elif KEYBOARD_cozykeys_speedo_v3
+    #include "v3.h"
+#endif
diff --git a/qmk/keyboards/cozykeys/speedo/v2/config.h b/qmk/keyboards/cozykeys/speedo/v2/config.h
new file mode 100644
index 00000000..1ab81ed7
--- /dev/null
+++ b/qmk/keyboards/cozykeys/speedo/v2/config.h
@@ -0,0 +1,44 @@
+/*
+Copyright 2020 Paul Ewing
+
+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 "config_common.h"
+
+// USB Device descriptor parameter
+#define VENDOR_ID       0xFEED
+#define PRODUCT_ID      0x1192
+#define DEVICE_VER      0x0002
+#define MANUFACTURER    CozyKeys
+#define PRODUCT         Speedo
+
+// Key matrix size
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 14
+
+// Keyboard Matrix Assignments
+#define MATRIX_ROW_PINS { D1, D2, D3, C6, C7 }
+#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, B6, B5, D0, B7, B3, B2, B1, B0 }
+#define UNUSED_PINS { D5, D4, D6, D7, B4 }
+#define DIODE_DIRECTION COL2ROW
+
+// Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed
+#define DEBOUNCE 5
+
+// Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap
+#define LOCKING_SUPPORT_ENABLE
+// Locking resynchronize hack
+#define LOCKING_RESYNC_ENABLE
diff --git a/qmk/keyboards/cozykeys/speedo/v2/info.json b/qmk/keyboards/cozykeys/speedo/v2/info.json
new file mode 100644
index 00000000..714de357
--- /dev/null
+++ b/qmk/keyboards/cozykeys/speedo/v2/info.json
@@ -0,0 +1,79 @@
+{
+  "keyboard_name": "Speedo",
+  "url": "https://github.com/cozykeys/speedo",
+  "maintainer": "pcewing",
+  "width": 14,
+  "height": 5,
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        { "label": "k01", "x":  0.693, "y":   0.0, "r":  10 },
+        { "label": "k02", "x":  1.675, "y": 0.173, "r":  10 },
+        { "label": "k03", "x":  2.685, "y": 0.191, "r":  10 },
+        { "label": "k04", "x":  3.712, "y": 0.106, "r":  10 },
+        { "label": "k05", "x":   4.64, "y": 0.589, "r":  10 },
+        { "label": "k06", "x":  5.577, "y": 1.021, "r":  10 },
+        { "label": "k07", "x":  7.571, "y": 1.021, "r": -10 },
+        { "label": "k08", "x":  8.507, "y": 0.589, "r": -10 },
+        { "label": "k09", "x":  9.435, "y": 0.106, "r": -10 },
+        { "label": "k10", "x": 10.463, "y": 0.191, "r": -10 },
+        { "label": "k11", "x": 11.472, "y": 0.173, "r": -10 },
+        { "label": "k12", "x": 12.454, "y":   0.0, "r": -10 },
+        { "label": "k13", "x":   0.52, "y": 0.982, "r":  10 },
+        { "label": "k14", "x":  1.502, "y": 1.155, "r":  10 },
+        { "label": "k15", "x":  2.511, "y": 1.174, "r":  10 },
+        { "label": "k16", "x":  3.539, "y": 1.088, "r":  10 },
+        { "label": "k17", "x":  4.467, "y": 1.572, "r":  10 },
+        { "label": "k18", "x":  5.403, "y": 2.003, "r":  10 },
+        { "label": "k19", "x":  6.574, "y": 2.559, "r":   0 },
+        { "label": "k20", "x":  7.744, "y": 2.003, "r": -10 },
+        { "label": "k21", "x":  8.681, "y": 1.572, "r": -10 },
+        { "label": "k22", "x":  9.608, "y": 1.088, "r": -10 },
+        { "label": "k23", "x": 10.636, "y": 1.174, "r": -10 },
+        { "label": "k24", "x": 11.645, "y": 1.155, "r": -10 },
+        { "label": "k25", "x": 12.628, "y": 0.982, "r": -10 },
+        { "label": "k26", "x":  0.346, "y": 1.964, "r":  10 },
+        { "label": "k27", "x":  1.329, "y": 2.138, "r":  10 },
+        { "label": "k28", "x":  2.338, "y": 2.156, "r":  10 },
+        { "label": "k29", "x":  3.366, "y":  2.07, "r":  10 },
+        { "label": "k30", "x":  4.294, "y": 2.554, "r":  10 },
+        { "label": "k31", "x":   5.23, "y": 2.986, "r":  10 },
+        { "label": "k32", "x":  6.574, "y": 3.557, "r":   0 },
+        { "label": "k33", "x":  7.917, "y": 2.986, "r": -10 },
+        { "label": "k34", "x":  8.854, "y": 2.554, "r": -10 },
+        { "label": "k35", "x":  9.781, "y":  2.07, "r": -10 },
+        { "label": "k36", "x": 10.809, "y": 2.156, "r": -10 },
+        { "label": "k37", "x": 11.819, "y": 2.138, "r": -10 },
+        { "label": "k38", "x": 12.801, "y": 1.964, "r": -10 },
+        { "label": "k39", "x":  0.173, "y": 2.947, "r":  10 },
+        { "label": "k40", "x":  1.155, "y":  3.12, "r":  10 },
+        { "label": "k41", "x":  2.165, "y": 3.138, "r":  10 },
+        { "label": "k42", "x":  3.193, "y": 3.053, "r":  10 },
+        { "label": "k43", "x":   4.12, "y": 3.536, "r":  10 },
+        { "label": "k44", "x":  5.057, "y": 3.968, "r":  10 },
+        { "label": "k45", "x":  6.075, "y": 4.554, "r":   0 },
+        { "label": "k46", "x":  7.072, "y": 4.554, "r":   0 },
+        { "label": "k47", "x":   8.09, "y": 3.968, "r": -10 },
+        { "label": "k48", "x":  9.027, "y": 3.536, "r": -10 },
+        { "label": "k49", "x":  9.954, "y": 3.053, "r": -10 },
+        { "label": "k50", "x": 10.982, "y": 3.138, "r": -10 },
+        { "label": "k51", "x": 11.992, "y":  3.12, "r": -10 },
+        { "label": "k52", "x": 12.974, "y": 2.947, "r": -10 },
+        { "label": "k53", "x":    0.0, "y": 3.929, "r":  10 },
+        { "label": "k54", "x":  0.982, "y": 4.102, "r":  10 },
+        { "label": "k55", "x":  1.992, "y":  4.12, "r":  10 },
+        { "label": "k56", "x":   3.02, "y": 4.035, "r":  10 },
+        { "label": "k57", "x":  3.947, "y": 4.518, "r":  10 },
+        { "label": "k58", "x":  4.994, "y": 5.235, "r":  40 },
+        { "label": "k59", "x":  5.753, "y": 6.064, "r":  55 },
+        { "label": "k60", "x":  7.395, "y": 6.064, "r": -55 },
+        { "label": "k61", "x":  8.154, "y": 5.235, "r":  40 },
+        { "label": "k62", "x":    9.2, "y": 4.518, "r": -10 },
+        { "label": "k63", "x": 10.128, "y": 4.035, "r": -10 },
+        { "label": "k64", "x": 11.155, "y":  4.12, "r": -10 },
+        { "label": "k65", "x": 12.165, "y": 4.102, "r": -10 },
+        { "label": "k66", "x": 13.147, "y": 3.929, "r": -10 }
+      ]
+    }
+  }
+}
diff --git a/qmk/keyboards/cozykeys/speedo/v2/keymaps/default/keymap.c b/qmk/keyboards/cozykeys/speedo/v2/keymaps/default/keymap.c
new file mode 100644
index 00000000..814aeb60
--- /dev/null
+++ b/qmk/keyboards/cozykeys/speedo/v2/keymaps/default/keymap.c
@@ -0,0 +1,58 @@
+/*
+Copyright 2020 Paul Ewing
+
+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
+
+enum {
+  LAYER_DEFAULT,
+  LAYER_FN,
+  LAYER_RESET,
+
+  __LAYER_COUNT,
+};
+
+#define FN MO(LAYER_FN)
+#define TORST TO(LAYER_RESET)
+#define TODFT TO(LAYER_DEFAULT)
+#define TODO KC_NO
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[LAYER_DEFAULT] = LAYOUT(
+    KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                       KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, \
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,          KC_UP,       KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS, \
+    KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,         KC_DOWN,      KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, \
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_LEFT,  KC_RGHT, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, \
+    KC_LCTL, KC_LGUI, KC_LALT, KC_GRV,  FN,      KC_BSPC, KC_DEL,   KC_ENT,  KC_SPC,  FN,      TODO,    KC_RALT, KC_RGUI, KC_RCTL \
+),
+
+[LAYER_FN] = LAYOUT(
+    _______, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______,   TORST, \
+    _______, KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR,      _______,     KC_PGUP, KC_HOME, KC_END,  _______, _______, _______, \
+    KC_CAPS, KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_PAUS,      _______,     KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______, \
+    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_INS,  _______, _______, KC_PGDN, KC_LBRC, KC_RBRC, _______, _______, _______, \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ \
+),
+
+[LAYER_RESET] = LAYOUT(
+    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,                     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   TODFT, \
+    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,        KC_NO,       KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO, \
+    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,        KC_NO,       KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO, \
+    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO, \
+    KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO \
+)
+
+};
diff --git a/qmk/keyboards/cozykeys/speedo/v2/keymaps/default/readme.md b/qmk/keyboards/cozykeys/speedo/v2/keymaps/default/readme.md
new file mode 100644
index 00000000..46d98fad
--- /dev/null
+++ b/qmk/keyboards/cozykeys/speedo/v2/keymaps/default/readme.md
@@ -0,0 +1 @@
+# CozyKeys Speedo v2 Default Keymap
diff --git a/qmk/keyboards/cozykeys/speedo/v2/rules.mk b/qmk/keyboards/cozykeys/speedo/v2/rules.mk
new file mode 100644
index 00000000..53127aaf
--- /dev/null
+++ b/qmk/keyboards/cozykeys/speedo/v2/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = halfkay
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no       # 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
+# 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
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
diff --git a/qmk/keyboards/cozykeys/speedo/v2/v2.c b/qmk/keyboards/cozykeys/speedo/v2/v2.c
new file mode 100644
index 00000000..1cab7521
--- /dev/null
+++ b/qmk/keyboards/cozykeys/speedo/v2/v2.c
@@ -0,0 +1,17 @@
+/*
+Copyright 2020 Paul Ewing
+
+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 "v2.h"
diff --git a/qmk/keyboards/cozykeys/speedo/v2/v2.h b/qmk/keyboards/cozykeys/speedo/v2/v2.h
new file mode 100644
index 00000000..295d6f8f
--- /dev/null
+++ b/qmk/keyboards/cozykeys/speedo/v2/v2.h
@@ -0,0 +1,36 @@
+/*
+Copyright 2020 Paul Ewing
+
+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 ___ KC_NO
+
+#define LAYOUT( \
+    k01, k02, k03, k04, k05, k06,           k07, k08, k09, k10, k11, k12, \
+    k13, k14, k15, k16, k17, k18,    k19,   k20, k21, k22, k23, k24, k25, \
+    k26, k27, k28, k29, k30, k31,    k32,   k33, k34, k35, k36, k37, k38, \
+    k39, k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k50, k51, k52, \
+    k53, k54, k55, k56, k57, k58, k59, k60, k61, k62, k63, k64, k65, k66 \
+) \
+{ \
+    { k01, k01, k03, k04, k05, k06, ___, ___, k07, k08, k09, k10, k11, k12 }, \
+    { k13, k15, k15, k16, k17, k18, k19, ___, k20, k21, k22, k23, k24, k25 }, \
+    { k26, k28, k28, k29, k30, k31, ___, k32, k33, k34, k35, k36, k37, k38 }, \
+    { k39, k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k50, k51, k52 }, \
+    { k53, k54, k55, k56, k57, k58, k59, k60, k61, k62, k63, k64, k65, k66 } \
+}
diff --git a/qmk/keyboards/cozykeys/speedo/v3/config.h b/qmk/keyboards/cozykeys/speedo/v3/config.h
new file mode 100644
index 00000000..9928e91f
--- /dev/null
+++ b/qmk/keyboards/cozykeys/speedo/v3/config.h
@@ -0,0 +1,58 @@
+/*
+Copyright 2020 Paul Ewing
+
+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 "config_common.h"
+
+// USB Device descriptor parameter
+#define VENDOR_ID       0xFEED
+#define PRODUCT_ID      0x1192
+#define DEVICE_VER      0x0003
+#define MANUFACTURER    CozyKeys
+#define PRODUCT         Speedo
+
+// Key matrix size
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 14
+
+// Keyboard Matrix Assignments
+#define MATRIX_ROW_PINS { F0, F1, C7, D5, B7 }
+#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B6, B2, E6, D7, C6, D4, D0, D1 }
+#define UNUSED_PINS { D2, D3, B0, B4 }
+#define DIODE_DIRECTION COL2ROW
+
+#ifdef RGBLIGHT_ENABLE
+#define RGB_DI_PIN B5
+#define RGBLED_NUM 12
+#define RGBLIGHT_HUE_STEP 8
+#define RGBLIGHT_SAT_STEP 8
+#define RGBLIGHT_VAL_STEP 8
+#define RGBLIGHT_LIMIT_VAL 255
+#define RGBLIGHT_SLEEP
+#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_BREATHE_TABLE_SIZE    256
+#define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85
+#define RGBLIGHT_EFFECT_BREATHE_MAX    255
+#endif
+
+// Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed
+#define DEBOUNCE 5
+
+// Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap
+#define LOCKING_SUPPORT_ENABLE
+// Locking resynchronize hack
+#define LOCKING_RESYNC_ENABLE
diff --git a/qmk/keyboards/cozykeys/speedo/v3/info.json b/qmk/keyboards/cozykeys/speedo/v3/info.json
new file mode 100644
index 00000000..079f5de4
--- /dev/null
+++ b/qmk/keyboards/cozykeys/speedo/v3/info.json
@@ -0,0 +1,79 @@
+{
+  "keyboard_name": "Speedo",
+  "url": "https://github.com/cozykeys/speedo",
+  "maintainer": "pcewing",
+  "width": 14,
+  "height": 5,
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        { "label": "k01", "x":  0.695, "y":     0, "r":  10 },
+        { "label": "k02", "x":  1.679, "y": 0.174, "r":  10 },
+        { "label": "k03", "x":  2.692, "y": 0.192, "r":  10 },
+        { "label": "k04", "x":  3.722, "y": 0.107, "r":  10 },
+        { "label": "k05", "x":  4.652, "y": 0.591, "r":  10 },
+        { "label": "k06", "x":  5.591, "y": 1.023, "r":  10 },
+        { "label": "k07", "x":  9.457, "y": 1.023, "r": -10 },
+        { "label": "k08", "x": 10.396, "y": 0.591, "r": -10 },
+        { "label": "k09", "x": 11.326, "y": 0.107, "r": -10 },
+        { "label": "k10", "x": 12.356, "y": 0.192, "r": -10 },
+        { "label": "k11", "x": 13.369, "y": 0.174, "r": -10 },
+        { "label": "k12", "x": 14.353, "y":     0, "r": -10 },
+        { "label": "k13", "x":  0.521, "y": 0.985, "r":  10 },
+        { "label": "k14", "x":  1.506, "y": 1.158, "r":  10 },
+        { "label": "k15", "x":  2.518, "y": 1.177, "r":  10 },
+        { "label": "k16", "x":  3.548, "y": 1.092, "r":  10 },
+        { "label": "k17", "x":  4.478, "y": 1.576, "r":  10 },
+        { "label": "k18", "x":  5.418, "y": 2.008, "r":  10 },
+        { "label": "k19", "x":  7.524, "y": 3.305, "r":   0 },
+        { "label": "k20", "x":   9.63, "y": 2.008, "r": -10 },
+        { "label": "k21", "x":  10.57, "y": 1.576, "r": -10 },
+        { "label": "k22", "x":   11.5, "y": 1.092, "r": -10 },
+        { "label": "k23", "x":  12.53, "y": 1.177, "r": -10 },
+        { "label": "k24", "x": 13.542, "y": 1.158, "r": -10 },
+        { "label": "k25", "x": 14.527, "y": 0.985, "r": -10 },
+        { "label": "k26", "x":  0.347, "y":  1.97, "r":  10 },
+        { "label": "k27", "x":  1.332, "y": 2.143, "r":  10 },
+        { "label": "k28", "x":  2.344, "y": 2.162, "r":  10 },
+        { "label": "k29", "x":  3.375, "y": 2.077, "r":  10 },
+        { "label": "k30", "x":  4.305, "y": 2.561, "r":  10 },
+        { "label": "k31", "x":  5.244, "y": 2.993, "r":  10 },
+        { "label": "k32", "x":  6.524, "y": 3.805, "r":   0 },
+        { "label": "k33", "x":  8.524, "y": 3.805, "r":   0 },
+        { "label": "k34", "x":  9.804, "y": 2.993, "r": -10 },
+        { "label": "k35", "x": 10.743, "y": 2.561, "r": -10 },
+        { "label": "k36", "x": 11.673, "y": 2.077, "r": -10 },
+        { "label": "k37", "x": 12.704, "y": 2.162, "r": -10 },
+        { "label": "k38", "x": 13.716, "y": 2.143, "r": -10 },
+        { "label": "k39", "x": 14.701, "y":  1.97, "r": -10 },
+        { "label": "k40", "x":  0.174, "y": 2.954, "r":  10 },
+        { "label": "k41", "x":  1.158, "y": 3.128, "r":  10 },
+        { "label": "k42", "x":  2.171, "y": 3.147, "r":  10 },
+        { "label": "k43", "x":  3.201, "y": 3.062, "r":  10 },
+        { "label": "k44", "x":  4.131, "y": 3.546, "r":  10 },
+        { "label": "k45", "x":   5.07, "y": 3.978, "r":  10 },
+        { "label": "k46", "x":  7.524, "y": 4.305, "r":   0 },
+        { "label": "k47", "x":  9.978, "y": 3.978, "r": -10 },
+        { "label": "k48", "x": 10.917, "y": 3.546, "r": -10 },
+        { "label": "k49", "x": 11.847, "y": 3.062, "r": -10 },
+        { "label": "k50", "x": 12.877, "y": 3.147, "r": -10 },
+        { "label": "k51", "x":  13.89, "y": 3.128, "r": -10 },
+        { "label": "k52", "x": 14.874, "y": 2.954, "r": -10 },
+        { "label": "k53", "x":      0, "y": 3.939, "r":  10 },
+        { "label": "k54", "x":  0.985, "y": 4.113, "r":  10 },
+        { "label": "k55", "x":  1.997, "y": 4.131, "r":  10 },
+        { "label": "k56", "x":  3.027, "y": 4.047, "r":  10 },
+        { "label": "k57", "x":  3.957, "y":  4.53, "r":  10 },
+        { "label": "k58", "x":  4.897, "y": 4.963, "r":  10 },
+        { "label": "k59", "x":  5.881, "y": 5.136, "r":  10 },
+        { "label": "k60", "x":  9.166, "y": 5.136, "r": -10 },
+        { "label": "k61", "x": 10.151, "y": 4.963, "r": -10 },
+        { "label": "k62", "x":  11.09, "y":  4.53, "r": -10 },
+        { "label": "k63", "x": 12.021, "y": 4.047, "r": -10 },
+        { "label": "k64", "x": 13.051, "y": 4.131, "r": -10 },
+        { "label": "k65", "x": 14.063, "y": 4.113, "r": -10 },
+        { "label": "k66", "x": 15.048, "y": 3.939, "r": -10 }
+      ]
+    }
+  }
+}
diff --git a/qmk/keyboards/cozykeys/speedo/v3/keymaps/default/keymap.c b/qmk/keyboards/cozykeys/speedo/v3/keymaps/default/keymap.c
new file mode 100644
index 00000000..4319bd18
--- /dev/null
+++ b/qmk/keyboards/cozykeys/speedo/v3/keymaps/default/keymap.c
@@ -0,0 +1,49 @@
+/*
+Copyright 2020 Paul Ewing
+
+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
+
+enum {
+  LAYER_DEFAULT,
+  LAYER_FN,
+
+  __LAYER_COUNT,
+};
+
+#define FN MO(LAYER_FN)
+
+#define RGB_N RGB_MOD  // Rotate to next RGB mode
+#define RGB_P RGB_RMOD // Rotate to next RGB mode
+
+const uint16_t PROGMEM keymaps[__LAYER_COUNT][MATRIX_ROWS][MATRIX_COLS] = {
+
+[LAYER_DEFAULT] = LAYOUT(
+    KC_EQL,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                                KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,             KC_UP,             KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
+    KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_LEFT,           KC_RGHT, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,             KC_DOWN,           KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
+    KC_LCTL, KC_LGUI, KC_LALT, KC_GRV,  FN,      KC_BSPC, KC_DEL,            KC_ENT,  KC_SPC,  KC_LBRC, KC_RBRC, KC_RALT, KC_RGUI, KC_RCTL
+),
+
+[LAYER_FN] = LAYOUT(
+    RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD,                            _______, _______, _______, _______, _______, RESET,
+    _______, KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_PSCR,          RGB_TOG,          _______, KC_GRV,  KC_LBRC, KC_RBRC, _______, _______,
+    KC_CAPS, KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_INS,  RGB_N,            RGB_P,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______, _______,
+    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_PAUS,          RGB_M_P,          KC_HOME, KC_PGDN, KC_PGUP, KC_END,  _______, _______,
+    _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______
+),
+
+};
diff --git a/qmk/keyboards/cozykeys/speedo/v3/keymaps/default/readme.md b/qmk/keyboards/cozykeys/speedo/v3/keymaps/default/readme.md
new file mode 100644
index 00000000..a69d6f38
--- /dev/null
+++ b/qmk/keyboards/cozykeys/speedo/v3/keymaps/default/readme.md
@@ -0,0 +1,10 @@
+# CozyKeys Speedo v3 Default Keymap
+
+## Default Layer
+
+![Default Layer](https://raw.githubusercontent.com/cozykeys/speedo/master/layout/speedo_layer_default.svg)
+
+## Function Layer
+
+![Function Layer](https://raw.githubusercontent.com/cozykeys/speedo/master/layout/speedo_layer_fn.svg)
+
diff --git a/qmk/keyboards/cozykeys/speedo/v3/rules.mk b/qmk/keyboards/cozykeys/speedo/v3/rules.mk
new file mode 100644
index 00000000..15eb4da9
--- /dev/null
+++ b/qmk/keyboards/cozykeys/speedo/v3/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no       # 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
+# 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
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
diff --git a/qmk/keyboards/cozykeys/speedo/v3/v3.c b/qmk/keyboards/cozykeys/speedo/v3/v3.c
new file mode 100644
index 00000000..f35be99e
--- /dev/null
+++ b/qmk/keyboards/cozykeys/speedo/v3/v3.c
@@ -0,0 +1,17 @@
+/*
+Copyright 2020 Paul Ewing
+
+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 "v3.h"
diff --git a/qmk/keyboards/cozykeys/speedo/v3/v3.h b/qmk/keyboards/cozykeys/speedo/v3/v3.h
new file mode 100644
index 00000000..a8623c0f
--- /dev/null
+++ b/qmk/keyboards/cozykeys/speedo/v3/v3.h
@@ -0,0 +1,36 @@
+/*
+Copyright 2020 Paul Ewing
+
+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 ___ KC_NO
+
+#define LAYOUT( \
+    k01, k02, k03, k04, k05, k06,                k07, k08, k09, k10, k11, k12, \
+    k13, k14, k15, k16, k17, k18,      k19,      k20, k21, k22, k23, k24, k25, \
+    k26, k27, k28, k29, k30, k31, k32,      k33, k34, k35, k36, k37, k38, k39, \
+    k40, k41, k42, k43, k44, k45,      k46,      k47, k48, k49, k50, k51, k52, \
+    k53, k54, k55, k56, k57, k58, k59,      k60, k61, k62, k63, k64, k65, k66 \
+) \
+{ \
+    { k01, k02, k03, k04, k05, k06, ___, ___, k07, k08, k09, k10, k11, k12 }, \
+    { k13, k14, k15, k16, k17, k18, ___, ___, k20, k21, k22, k23, k24, k25 }, \
+    { k26, k27, k28, k29, k30, k31, k32, k19, k34, k35, k36, k37, k38, k39 }, \
+    { k40, k41, k42, k43, k44, k45, k46, k33, k47, k48, k49, k50, k51, k52 }, \
+    { k53, k54, k55, k56, k57, k58, k59, k60, k61, k62, k63, k64, k65, k66 } \
+}
diff --git a/qmk/keyboards/crazy_keyboard_68/config.h b/qmk/keyboards/crazy_keyboard_68/config.h
new file mode 100644
index 00000000..2558e757
--- /dev/null
+++ b/qmk/keyboards/crazy_keyboard_68/config.h
@@ -0,0 +1,146 @@
+/*
+Copyright 2020 chent7
+
+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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID    0xFEED // by default from pcb
+#define PRODUCT_ID   0x13DE
+#define DEVICE_VER   0x0001
+#define MANUFACTURER chent7
+#define PRODUCT      Crazy Keyboard 68
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+ */
+#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
+#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B7, B5, B4, D7, D6, B3, F4 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+//#define SOFT_SERIAL_PIN D0  // or D1, D2, D3, E6
+
+//#define BACKLIGHT_PIN B7
+//#define BACKLIGHT_LEVELS 3
+//#define BACKLIGHT_BREATHING
+
+#define RGB_DI_PIN F6
+#ifdef RGB_DI_PIN
+#    define RGBLED_NUM 84
+#    define RGBLIGHT_HUE_STEP 8
+#    define RGBLIGHT_SAT_STEP 8
+#    define RGBLIGHT_VAL_STEP 8
+#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+/*== all animations enable ==*/
+#    define RGBLIGHT_ANIMATIONS
+/*== or choose animations ==*/
+//#    define RGBLIGHT_EFFECT_BREATHING
+//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+//#    define RGBLIGHT_EFFECT_SNAKE
+//#    define RGBLIGHT_EFFECT_KNIGHT
+//#    define RGBLIGHT_EFFECT_CHRISTMAS
+//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+//#    define RGBLIGHT_EFFECT_RGB_TEST
+//#    define RGBLIGHT_EFFECT_ALTERNATING
+/*== customize breathing effect ==*/
+/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+/*==== use exp() and sin() ====*/
+//#    define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//#    define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+#endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+//#define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+/* Bootmagic Lite key configuration */
+//#define BOOTMAGIC_LITE_ROW 0
+//#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/crazy_keyboard_68/crazy_keyboard_68.c b/qmk/keyboards/crazy_keyboard_68/crazy_keyboard_68.c
new file mode 100644
index 00000000..f4f8515b
--- /dev/null
+++ b/qmk/keyboards/crazy_keyboard_68/crazy_keyboard_68.c
@@ -0,0 +1,36 @@
+/* Copyright 2020 chent7
+ *
+ * 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 "crazy_keyboard_68.h"
+
+void matrix_init_kb(void) {
+	led_init_ports();
+	
+	matrix_init_user();
+}
+
+void led_init_ports(void) {
+    // Caps lock pin
+    setPinOutput(B0);
+    writePinHigh(B0);
+}
+
+bool led_update_kb(led_t led_state) {
+    if(led_update_user(led_state)) {
+        writePin(B0, !led_state.caps_lock);
+    }
+    return true;
+}
diff --git a/qmk/keyboards/crazy_keyboard_68/crazy_keyboard_68.h b/qmk/keyboards/crazy_keyboard_68/crazy_keyboard_68.h
new file mode 100644
index 00000000..c253824b
--- /dev/null
+++ b/qmk/keyboards/crazy_keyboard_68/crazy_keyboard_68.h
@@ -0,0 +1,57 @@
+/* Copyright 2020 chent7
+ *
+ * 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 XXX KC_NO
+
+/* Crazy Keyboard 68 (ANSI) layout
+ * ,----------------------------------------------------------------.
+ * | 00 |01| 02| 03| 04| 05| 06| 07| 08| 09| 0a| 0b| 0c| 0d    | 0e |
+ * |----------------------------------------------------------------|
+ * | 10  | 11| 12| 13| 14| 15| 16| 17| 18| 19| 1a| 1b| 1c|  1d | 1e |
+ * |----------------------------------------------------------------|
+ * | 20    | 22| 23| 24| 25| 26| 27| 28| 29| 2a| 2b| 2c| 2d    | 2e |
+ * |----------------------------------------------------------------|
+ * | 31     | 32| 33| 34| 35| 36| 37| 38| 39| 3a| 3b|    3c| 3d| 3e |
+ * |----------------------------------------------------------------|
+ * | 40 | 41 | 43 |        46             | 49| 4a|  4b| 4c| 4d| 4e |
+ * `----------------------------------------------------------------'
+ *
+ * This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT_65_ansi( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \
+    k20, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c,      k2d, k2e, \
+    k31,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
+    k40, k41, k43,                k46,           k49, k4a, k4b, k4c, k4d, k4e  \
+) \
+{ \
+    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e}, \
+    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e}, \
+    {k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e}, \
+    {XXX, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e}, \
+    {k40, k41, XXX, k43, XXX, XXX, k46, XXX, XXX, k49, k4a, k4b, k4c, k4d, k4e}  \
+}
diff --git a/qmk/keyboards/crazy_keyboard_68/info.json b/qmk/keyboards/crazy_keyboard_68/info.json
new file mode 100644
index 00000000..fa9546a1
--- /dev/null
+++ b/qmk/keyboards/crazy_keyboard_68/info.json
@@ -0,0 +1,81 @@
+{
+    "keyboard_name": "crazy_keyboard_68",
+    "url": "",
+    "maintainer": "chent7",
+    "width": 15,
+    "height": 5,
+    "layouts": {
+        "LAYOUT_65_ansi": {
+            "layout": [
+                {"label":"k00", "x":0, "y":0},
+                {"label":"k01", "x":1, "y":0},
+                {"label":"k02", "x":2, "y":0},
+                {"label":"k03", "x":3, "y":0},
+                {"label":"k04", "x":4, "y":0},
+                {"label":"k05", "x":5, "y":0},
+                {"label":"k06", "x":6, "y":0},
+                {"label":"k07", "x":7, "y":0},
+                {"label":"k08", "x":8, "y":0},
+                {"label":"k09", "x":9, "y":0},
+                {"label":"k0a", "x":10, "y":0},
+                {"label":"k0b", "x":11, "y":0},
+                {"label":"k0c", "x":12, "y":0},
+                {"label":"k0d", "x":13, "y":0, "w":2},
+                {"label":"k0e", "x":15, "y":0},
+                {"label":"k10", "x":0, "y":1, "w":1.5},
+                {"label":"k11", "x":1.5, "y":1},
+                {"label":"k12", "x":2.5, "y":1},
+                {"label":"k13", "x":3.5, "y":1},
+                {"label":"k14", "x":4.5, "y":1},
+                {"label":"k15", "x":5.5, "y":1},
+                {"label":"k16", "x":6.5, "y":1},
+                {"label":"k17", "x":7.5, "y":1},
+                {"label":"k18", "x":8.5, "y":1},
+                {"label":"k19", "x":9.5, "y":1},
+                {"label":"k1a", "x":10.5, "y":1},
+                {"label":"k1b", "x":11.5, "y":1},
+                {"label":"k1c", "x":12.5, "y":1},
+                {"label":"k1d", "x":13.5, "y":1, "w":1.5},
+                {"label":"k1e", "x":15, "y":1},
+                {"label":"k20", "x":0, "y":2, "w":1.75},
+                {"label":"k22", "x":1.75, "y":2},
+                {"label":"k23", "x":2.75, "y":2},
+                {"label":"k24", "x":3.75, "y":2},
+                {"label":"k25", "x":4.75, "y":2},
+                {"label":"k26", "x":5.75, "y":2},
+                {"label":"k27", "x":6.75, "y":2},
+                {"label":"k28", "x":7.75, "y":2},
+                {"label":"k29", "x":8.75, "y":2},
+                {"label":"k2a", "x":9.75, "y":2},
+                {"label":"k2b", "x":10.75, "y":2},
+                {"label":"k2c", "x":11.75, "y":2},
+                {"label":"k2d", "x":12.75, "y":2, "w":2.25},
+                {"label":"k2e", "x":15, "y":2},
+                {"label":"k31", "x":0, "y":3, "w":2.25},
+                {"label":"k32", "x":2.25, "y":3},
+                {"label":"k33", "x":3.25, "y":3},
+                {"label":"k34", "x":4.25, "y":3},
+                {"label":"k35", "x":5.25, "y":3},
+                {"label":"k36", "x":6.25, "y":3},
+                {"label":"k37", "x":7.25, "y":3},
+                {"label":"k38", "x":8.25, "y":3},
+                {"label":"k39", "x":9.25, "y":3},
+                {"label":"k3a", "x":10.25, "y":3},
+                {"label":"k3b", "x":11.25, "y":3},
+                {"label":"k3c", "x":12.25, "y":3, "w":1.75},
+                {"label":"k3d", "x":14, "y":3},
+                {"label":"k3e", "x":15, "y":3},
+                {"label":"k40", "x":0, "y":4, "w":1.25},
+                {"label":"k41", "x":1.25, "y":4, "w":1.25},
+                {"label":"k43", "x":2.5, "y":4, "w":1.25},
+                {"label":"k46", "x":3.75, "y":4, "w":6.25},
+                {"label":"k49", "x":10, "y":4},
+                {"label":"k4a", "x":11, "y":4},
+                {"label":"k4b", "x":12, "y":4},
+                {"label":"k4c", "x":13, "y":4},
+                {"label":"k4d", "x":14, "y":4},
+                {"label":"k4e", "x":15, "y":4}
+            ]
+        }
+    }
+}
diff --git a/qmk/keyboards/crazy_keyboard_68/keymaps/default/keymap.c b/qmk/keyboards/crazy_keyboard_68/keymaps/default/keymap.c
new file mode 100644
index 00000000..c41916fc
--- /dev/null
+++ b/qmk/keyboards/crazy_keyboard_68/keymaps/default/keymap.c
@@ -0,0 +1,66 @@
+/* Copyright 2020 chent7
+ *
+ * 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 names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Keymap _BASE: (Base Layer) Default Layer
+     * ,----------------------------------------------------------------.
+     * |Esc | 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |~ ` |
+     * |----------------------------------------------------------------|
+     * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  |PgUp|
+     * |----------------------------------------------------------------|
+     * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |PgDn|
+     * |----------------------------------------------------------------|
+     * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift | Up|Del |
+     * |----------------------------------------------------------------|
+     * |Ctrl|Win |Alt |        Space          |Alt|Fn |Ctrl|Lef|Dow|Rig |
+     * `----------------------------------------------------------------'
+     */
+    [_BASE] = LAYOUT_65_ansi(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_GRV,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_PGUP,
+        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_PGDN,
+        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_DEL,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, MO(_FN), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    /* Keymap _BASE: (Base Layer) Default Layer
+     * ,----------------------------------------------------------------.
+     * |    |F1| F2| F3| F4| F5| F6| F7| F8| F9|F10|F11|F12|       |Home|
+     * |----------------------------------------------------------------|
+     * |     |   |   |   |   |   |   |   |   |   |PSC|SLC|Pau|     |End |
+     * |----------------------------------------------------------------|
+     * |       |TOG|M_P|M_B|M_R|MSW|MSN|M_K|M_X|M_G|M_T|   |       |Ins |
+     * |----------------------------------------------------------------|
+     * |        |MOD|HUI|HUD|SAI|SAD|VAI|VAD|   |   |   |      |   |    |
+     * |----------------------------------------------------------------|
+     * |Reset|   |    |                       |   |   |    |   |   |    |
+     * `----------------------------------------------------------------'
+     */
+    [_FN] = LAYOUT_65_ansi(
+        _______, 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_HOME,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, KC_END,
+        _______, RGB_TOG, RGB_M_P, RGB_M_B, RGB_M_R,RGB_M_SW,RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, RGB_M_T, _______,          _______, KC_INS,
+        _______,          RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______,
+        RESET,   _______, _______,                            _______,                   _______, _______, _______, _______, _______, _______
+    )
+};
diff --git a/qmk/keyboards/crazy_keyboard_68/keymaps/default/readme.md b/qmk/keyboards/crazy_keyboard_68/keymaps/default/readme.md
new file mode 100644
index 00000000..21c72142
--- /dev/null
+++ b/qmk/keyboards/crazy_keyboard_68/keymaps/default/readme.md
@@ -0,0 +1,4 @@
+# The default keymap for crazy_keyboard_68
+```
+make crazy_keyboard_68:default
+```
diff --git a/qmk/keyboards/crazy_keyboard_68/readme.md b/qmk/keyboards/crazy_keyboard_68/readme.md
new file mode 100644
index 00000000..3afa9cc6
--- /dev/null
+++ b/qmk/keyboards/crazy_keyboard_68/readme.md
@@ -0,0 +1,25 @@
+# Crazy Keyboard 68
+
+![Front View of Crazy Keyboard 68 PCB](https://i.imgur.com/0nTjDbU.jpg)\
+![Back View of Crazy Keyboard 68 PCB](https://i.imgur.com/gTpdux3.jpeg)
+
+Obscure 68% hotswap PCB sold on taobao, powered by ATM32U4. RGB key lighting and underglow requires self-soldering.
+
+* Keyboard Maintainer: [chent7](https://github.com/chent7)
+* Hardware Supported: crazy keyboard 68 Standard
+* Hardware Availability: [taobao.com](https://item.taobao.com/item.htm?spm=a1z09.2.0.0.19422e8dJUzj8d&id=605218560507)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make crazy_keyboard_68:default
+
+Flashing example for this keyboard:
+
+    make crazy_keyboard_68:default:flash
+
+## Layouts 
+
+### ANSI
+![Default ANSI Layout](https://i.imgur.com/y1ZApvU.png)
+
+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).
diff --git a/qmk/keyboards/crazy_keyboard_68/rules.mk b/qmk/keyboards/crazy_keyboard_68/rules.mk
new file mode 100644
index 00000000..5a51c94e
--- /dev/null
+++ b/qmk/keyboards/crazy_keyboard_68/rules.mk
@@ -0,0 +1,24 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+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
+# 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 = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+
+LAYOUTS = 65_ansi
diff --git a/qmk/keyboards/crkbd/keymaps/curry/rules.mk b/qmk/keyboards/crkbd/keymaps/curry/rules.mk
index 7d35d5f0..a7533578 100644
--- a/qmk/keyboards/crkbd/keymaps/curry/rules.mk
+++ b/qmk/keyboards/crkbd/keymaps/curry/rules.mk
@@ -8,7 +8,7 @@ CONSOLE_ENABLE          = no
 COMMAND_ENABLE          = no
 
 RGBLIGHT_ENABLE         = no
-RGB_MATRIX_ENABLE       = WS2812
+RGB_MATRIX_ENABLE       = yes
 
 OLED_DRIVER_ENABLE      = yes
 
diff --git a/qmk/keyboards/crkbd/keymaps/default/config.h b/qmk/keyboards/crkbd/keymaps/default/config.h
index 899fde00..937d67e2 100644
--- a/qmk/keyboards/crkbd/keymaps/default/config.h
+++ b/qmk/keyboards/crkbd/keymaps/default/config.h
@@ -28,8 +28,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define MASTER_RIGHT
 // #define EE_HANDS
 
-#define SSD1306OLED
-
 #define USE_SERIAL_PD2
 
 #define TAPPING_FORCE_HOLD
@@ -44,3 +42,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     #define RGBLIGHT_SAT_STEP 17
     #define RGBLIGHT_VAL_STEP 17
 #endif
+
+#define OLED_FONT_H "keyboards/crkbd/lib/glcdfont.c"
\ No newline at end of file
diff --git a/qmk/keyboards/crkbd/keymaps/default/keymap.c b/qmk/keyboards/crkbd/keymaps/default/keymap.c
index a3a9d953..27e3c840 100644
--- a/qmk/keyboards/crkbd/keymaps/default/keymap.c
+++ b/qmk/keyboards/crkbd/keymaps/default/keymap.c
@@ -18,218 +18,157 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include QMK_KEYBOARD_H
 
-
-#ifdef RGBLIGHT_ENABLE
-//Following line allows macro to read current RGB settings
-extern rgblight_config_t rgblight_config;
-#endif
-
-extern uint8_t is_master;
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-#define _QWERTY 0
-#define _LOWER 1
-#define _RAISE 2
-#define _ADJUST 3
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  ADJUST,
-  BACKLIT,
-  RGBRST
-};
-
-enum macro_keycodes {
-  KC_SAMPLEMACRO,
-};
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_split_3x6_3( \
+  [0] = LAYOUT_split_3x6_3(
   //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-       KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                         KC_Y,    KC_U,    KC_I,    KC_O,   KC_P,  KC_BSPC,\
+       KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                         KC_Y,    KC_U,    KC_I,    KC_O,   KC_P,  KC_BSPC,
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      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_LCTL,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                         KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT,
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                         KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH, KC_RSFT,\
+      KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                         KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_ESC,
   //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          KC_LGUI,   LOWER,  KC_SPC,     KC_ENT,  RAISE,  KC_RALT \
+                                          KC_LGUI,   MO(1),  KC_SPC,     KC_ENT,   MO(2), KC_RALT
                                       //`--------------------------'  `--------------------------'
 
   ),
 
-  [_LOWER] = LAYOUT_split_3x6_3( \
+  [1] = LAYOUT_split_3x6_3(
   //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-       KC_ESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                         KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_BSPC,\
+       KC_TAB,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                         KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_BSPC,
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      KC_LEFT, KC_DOWN,   KC_UP,KC_RIGHT, XXXXXXX, XXXXXXX,\
+      KC_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      KC_LEFT, KC_DOWN,   KC_UP,KC_RIGHT, XXXXXXX, XXXXXXX,
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,\
+      KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
   //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          KC_LGUI,   LOWER,  KC_SPC,     KC_ENT,   RAISE, KC_RALT \
-                                      //`--------------------------'  `--------------------------'
-    ),
-
-  [_RAISE] = LAYOUT_split_3x6_3( \
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-       KC_ESC, KC_EXLM,   KC_AT, KC_HASH,  KC_DLR, KC_PERC,                      KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,\
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      KC_MINS,  KC_EQL, KC_LCBR, KC_RCBR, KC_PIPE,  KC_GRV,\
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      KC_UNDS, KC_PLUS, KC_LBRC, KC_RBRC, KC_BSLS, KC_TILD,\
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          KC_LGUI,   LOWER,  KC_SPC,     KC_ENT,   RAISE, KC_RALT \
+                                          KC_LGUI, _______,  KC_SPC,     KC_ENT,   MO(3), KC_RALT
                                       //`--------------------------'  `--------------------------'
   ),
 
-  [_ADJUST] = LAYOUT_split_3x6_3( \
+  [2] = LAYOUT_split_3x6_3(
   //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-        RESET,  RGBRST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,\
+       KC_TAB, KC_EXLM,   KC_AT, KC_HASH,  KC_DLR, KC_PERC,                      KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,\
+      KC_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      KC_MINS,  KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,  KC_GRV,
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,\
+      KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, KC_TILD,
   //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          KC_LGUI,   LOWER,  KC_SPC,     KC_ENT,   RAISE, KC_RALT \
+                                          KC_LGUI,   MO(3),  KC_SPC,     KC_ENT, _______, KC_RALT
+                                      //`--------------------------'  `--------------------------'
+  ),
+
+  [3] = LAYOUT_split_3x6_3(
+  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
+        RESET, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                          KC_LGUI, _______,  KC_SPC,     KC_ENT, _______, KC_RALT
                                       //`--------------------------'  `--------------------------'
   )
 };
 
-int RGB_current_mode;
-
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
-// Setting ADJUST layer RGB back to default
-void update_tri_layer_RGB(uint8_t layer1, uint8_t layer2, uint8_t layer3) {
-  if (IS_LAYER_ON(layer1) && IS_LAYER_ON(layer2)) {
-    layer_on(layer3);
-  } else {
-    layer_off(layer3);
+#ifdef OLED_DRIVER_ENABLE
+oled_rotation_t oled_init_user(oled_rotation_t rotation) {
+  if (!is_master) {
+    return OLED_ROTATION_180;  // flips the display 180 degrees if offhand
   }
+  return rotation;
 }
 
-void matrix_init_user(void) {
-    #ifdef RGBLIGHT_ENABLE
-      RGB_current_mode = rgblight_config.mode;
-    #endif
-    //SSD1306 OLED init, make sure to add #define SSD1306OLED in config.h
-    #ifdef SSD1306OLED
-        iota_gfx_init(!has_usb());   // turns on the display
-    #endif
+#define L_BASE 0
+#define L_LOWER 2
+#define L_RAISE 4
+#define L_ADJUST 8
+
+void oled_render_layer_state(void) {
+    oled_write_P(PSTR("Layer: "), false);
+    switch (layer_state) {
+        case L_BASE:
+            oled_write_ln_P(PSTR("Default"), false);
+            break;
+        case L_LOWER:
+            oled_write_ln_P(PSTR("Lower"), false);
+            break;
+        case L_RAISE:
+            oled_write_ln_P(PSTR("Raise"), false);
+            break;
+        case L_ADJUST:
+        case L_ADJUST|L_LOWER:
+        case L_ADJUST|L_RAISE:
+        case L_ADJUST|L_LOWER|L_RAISE:
+            oled_write_ln_P(PSTR("Adjust"), false);
+            break;
+    }
 }
 
-//SSD1306 OLED update loop, make sure to add #define SSD1306OLED in config.h
-#ifdef SSD1306OLED
 
-// When add source files to SRC in rules.mk, you can use functions.
-const char *read_layer_state(void);
-const char *read_logo(void);
-void set_keylog(uint16_t keycode, keyrecord_t *record);
-const char *read_keylog(void);
-const char *read_keylogs(void);
+char keylog_str[24] = {};
 
-// const char *read_mode_icon(bool swap);
-// const char *read_host_led_state(void);
-// void set_timelog(void);
-// const char *read_timelog(void);
+const char code_to_name[60] = {
+    ' ', ' ', ' ', ' ', 'a', 'b', 'c', 'd', 'e', 'f',
+    'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p',
+    'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
+    '1', '2', '3', '4', '5', '6', '7', '8', '9', '0',
+    'R', 'E', 'B', 'T', '_', '-', '=', '[', ']', '\\',
+    '#', ';', '\'', '`', ',', '.', '/', ' ', ' ', ' '};
 
-void matrix_scan_user(void) {
-   iota_gfx_task();
-}
-
-void matrix_render_user(struct CharacterMatrix *matrix) {
-  if (is_master) {
-    // If you want to change the display of OLED, you need to change here
-    matrix_write_ln(matrix, read_layer_state());
-    matrix_write_ln(matrix, read_keylog());
-    //matrix_write_ln(matrix, read_keylogs());
-    //matrix_write_ln(matrix, read_mode_icon(keymap_config.swap_lalt_lgui));
-    //matrix_write_ln(matrix, read_host_led_state());
-    //matrix_write_ln(matrix, read_timelog());
-  } else {
-    matrix_write(matrix, read_logo());
+void set_keylog(uint16_t keycode, keyrecord_t *record) {
+  char name = ' ';
+    if ((keycode >= QK_MOD_TAP && keycode <= QK_MOD_TAP_MAX) ||
+        (keycode >= QK_LAYER_TAP && keycode <= QK_LAYER_TAP_MAX)) { keycode = keycode & 0xFF; }
+  if (keycode < 60) {
+    name = code_to_name[keycode];
   }
+
+  // update keylog
+  snprintf(keylog_str, sizeof(keylog_str), "%dx%d, k%2d : %c",
+           record->event.key.row, record->event.key.col,
+           keycode, name);
 }
 
-void matrix_update(struct CharacterMatrix *dest, const struct CharacterMatrix *source) {
-  if (memcmp(dest->display, source->display, sizeof(dest->display))) {
-    memcpy(dest->display, source->display, sizeof(dest->display));
-    dest->dirty = true;
-  }
+void oled_render_keylog(void) {
+    oled_write(keylog_str, false);
 }
 
-void iota_gfx_task_user(void) {
-  struct CharacterMatrix matrix;
-  matrix_clear(&matrix);
-  matrix_render_user(&matrix);
-  matrix_update(&display, &matrix);
+void render_bootmagic_status(bool status) {
+    /* Show Ctrl-Gui Swap options */
+    static const char PROGMEM logo[][2][3] = {
+        {{0x97, 0x98, 0}, {0xb7, 0xb8, 0}},
+        {{0x95, 0x96, 0}, {0xb5, 0xb6, 0}},
+    };
+    if (status) {
+        oled_write_ln_P(logo[0][0], false);
+        oled_write_ln_P(logo[0][1], false);
+    } else {
+        oled_write_ln_P(logo[1][0], false);
+        oled_write_ln_P(logo[1][1], false);
+    }
+}
+
+void oled_render_logo(void) {
+    static const char PROGMEM crkbd_logo[] = {
+        0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f, 0x90, 0x91, 0x92, 0x93, 0x94,
+        0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf, 0xb0, 0xb1, 0xb2, 0xb3, 0xb4,
+        0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf, 0xd0, 0xd1, 0xd2, 0xd3, 0xd4,
+        0};
+    oled_write_P(crkbd_logo, false);
+}
+
+void oled_task_user(void) {
+    if (is_master) {
+        oled_render_layer_state();
+        oled_render_keylog();
+    } else {
+        oled_render_logo();
+    }
 }
-#endif//SSD1306OLED
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   if (record->event.pressed) {
-#ifdef SSD1306OLED
     set_keylog(keycode, record);
-#endif
-    // set_timelog();
-  }
-
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        persistent_default_layer_set(1UL<<_QWERTY);
-      }
-      return false;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer_RGB(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-    case ADJUST:
-        if (record->event.pressed) {
-          layer_on(_ADJUST);
-        } else {
-          layer_off(_ADJUST);
-        }
-        return false;
-    case RGB_MOD:
-      #ifdef RGBLIGHT_ENABLE
-        if (record->event.pressed) {
-          rgblight_mode(RGB_current_mode);
-          rgblight_step();
-          RGB_current_mode = rgblight_config.mode;
-        }
-      #endif
-      return false;
-    case RGBRST:
-      #ifdef RGBLIGHT_ENABLE
-        if (record->event.pressed) {
-          eeconfig_update_rgblight_default();
-          rgblight_enable();
-          RGB_current_mode = rgblight_config.mode;
-        }
-      #endif
-      break;
   }
   return true;
 }
+#endif // OLED_DRIVER_ENABLE
diff --git a/qmk/keyboards/crkbd/keymaps/default/rules.mk b/qmk/keyboards/crkbd/keymaps/default/rules.mk
index f84e5b2a..9444b88d 100644
--- a/qmk/keyboards/crkbd/keymaps/default/rules.mk
+++ b/qmk/keyboards/crkbd/keymaps/default/rules.mk
@@ -1,10 +1 @@
-
-# If you want to change the display of OLED, you need to change here
-SRC +=  ./lib/glcdfont.c \
-        ./lib/rgb_state_reader.c \
-        ./lib/layer_state_reader.c \
-        ./lib/logo_reader.c \
-        ./lib/keylogger.c \
-        # ./lib/mode_icon_reader.c \
-        # ./lib/host_led_state_reader.c \
-        # ./lib/timelogger.c \
+OLED_DRIVER_ENABLE  = yes
diff --git a/qmk/keyboards/crkbd/keymaps/dsanchezseco/rules.mk b/qmk/keyboards/crkbd/keymaps/dsanchezseco/rules.mk
index 93a21f7b..0de80697 100644
--- a/qmk/keyboards/crkbd/keymaps/dsanchezseco/rules.mk
+++ b/qmk/keyboards/crkbd/keymaps/dsanchezseco/rules.mk
@@ -9,7 +9,7 @@ OLED_DRIVER_ENABLE = no
 EXTRAKEY_ENABLE = yes
 
 # enable LEDs
-RGB_MATRIX_ENABLE = WS2812
+RGB_MATRIX_ENABLE = yes
 
 # using elite-c controllers
 BOOTLOADER = qmk-dfu
diff --git a/qmk/keyboards/crkbd/keymaps/kidbrazil/rules.mk b/qmk/keyboards/crkbd/keymaps/kidbrazil/rules.mk
index 244712cd..a6057a73 100644
--- a/qmk/keyboards/crkbd/keymaps/kidbrazil/rules.mk
+++ b/qmk/keyboards/crkbd/keymaps/kidbrazil/rules.mk
@@ -4,7 +4,7 @@ MIDI_ENABLE = no            # MIDI controls
 AUDIO_ENABLE = no           # Audio output on port C6
 MOUSEKEY_ENABLE = no
 RGBLIGHT_ENABLE = no
-RGB_MATRIX_ENABLE = WS2812
+RGB_MATRIX_ENABLE = yes
 OLED_DRIVER_ENABLE = yes
 
 # If you want to change the display of OLED, you need to change here
diff --git a/qmk/keyboards/crkbd/keymaps/madhatter/config.h b/qmk/keyboards/crkbd/keymaps/madhatter/config.h
index 9a4d85df..899fde00 100644
--- a/qmk/keyboards/crkbd/keymaps/madhatter/config.h
+++ b/qmk/keyboards/crkbd/keymaps/madhatter/config.h
@@ -1,18 +1,46 @@
+/*
+This is the c configuration file for the keymap
+
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+Copyright 2015 Jack Humbert
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
 #pragma once
 
-#define EE_HANDS
+//#define USE_MATRIX_I2C
+
+/* Select hand configuration */
+
+#define MASTER_LEFT
+// #define MASTER_RIGHT
+// #define EE_HANDS
 
 #define SSD1306OLED
 
-#ifdef RGBLIGHT_ENABLE
-#    undef RGBLED_NUM
-#    define RGBLIGHT_ANIMATIONS
-#    define RGBLED_NUM 27
-#    define RGBLIGHT_LIMIT_VAL 120
-#    define RGBLIGHT_HUE_STEP 10
-#    define RGBLIGHT_SAT_STEP 17
-#    define RGBLIGHT_VAL_STEP 17
-#endif
+#define USE_SERIAL_PD2
 
-#undef PRODUCT
-#define PRODUCT MadHatter Hacked Corne Keyboard
+#define TAPPING_FORCE_HOLD
+#define TAPPING_TERM 100
+
+#ifdef RGBLIGHT_ENABLE
+    #undef RGBLED_NUM
+    #define RGBLIGHT_ANIMATIONS
+    #define RGBLED_NUM 27
+    #define RGBLIGHT_LIMIT_VAL 120
+    #define RGBLIGHT_HUE_STEP 10
+    #define RGBLIGHT_SAT_STEP 17
+    #define RGBLIGHT_VAL_STEP 17
+#endif
diff --git a/qmk/keyboards/crkbd/keymaps/madhatter/keymap.c b/qmk/keyboards/crkbd/keymaps/madhatter/keymap.c
index 9f52d3b5..57a522de 100644
--- a/qmk/keyboards/crkbd/keymaps/madhatter/keymap.c
+++ b/qmk/keyboards/crkbd/keymaps/madhatter/keymap.c
@@ -1,112 +1,96 @@
+/*
+Copyright 2019 @foostan
+Copyright 2020 Drashna Jaelre <@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/>.
+*/
+
 #include QMK_KEYBOARD_H
 
-
-#ifdef OLED_DRIVER_ENABLE
-#    define KEYLOGGER_LENGTH 5
-static uint32_t oled_timer                       = 0;
-static char     keylog_str[KEYLOGGER_LENGTH + 1] = {"\n"};
-static uint16_t log_timer                        = 0;
-// clang-format off
-static const char PROGMEM code_to_name[0xFF] = {
-//   0    1    2    3    4    5    6    7    8    9    A    B    c    D    E    F
-    ' ', ' ', ' ', ' ', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l',  // 0x
-    'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', '1', '2',  // 1x
-    '3', '4', '5', '6', '7', '8', '9', '0',  20,  19,  27,  26,  22, '-', '=', '[',  // 2x
-    ']','\\', '#', ';','\'', '`', ',', '.', '/', 128, ' ', ' ', ' ', ' ', ' ', ' ',  // 3x
-    ' ', ' ', ' ', ' ', ' ', ' ', 'P', 'S', ' ', ' ', ' ', ' ',  16, ' ', ' ', ' ',  // 4x
-    ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ',  // 5x
-    ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ',  // 6x
-    ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ',  // 7x
-    ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ',  // 8x
-    ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ',  // 9x
-    ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ',  // Ax
-    ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ',  // Bx
-    ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ',  // Cx
-    ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ',  // Dx
-    'C', 'S', 'A', 'C', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ',  // Ex
-    ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' ', ' '        // Fx
-};
-
-void add_keylog(uint16_t keycode);
-#endif
-
 extern uint8_t is_master;
 
 enum corny_layers {
-    _QWERTY,
-    _LOWER,
-    _RAISE,
-    _ADJUST,
+  _QWERTY,
+  _LOWER,
+  _RAISE,
+  _ADJUST
 };
 
-enum custom_keycodes {
+enum corny_keycodes {
   QWERTY = SAFE_RANGE,
   LOWER,
   RAISE,
   ADJUST,
+  BACKLIT,
   RGBRST
 };
 
-#define LY_LWR MO(_LOWER)
-#define LY_RSE MO(_RAISE)
-
-#define KY_CESC LCTL_T(KC_ESC)
+enum macro_keycodes {
+  KC_SAMPLEMACRO,
+};
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT(
+  [_QWERTY] = LAYOUT_split_3x6_3(
   //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-       KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                         KC_Y,    KC_U,    KC_I,    KC_O,   KC_P,  KC_BSPC,
+       KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                         KC_Y,    KC_U,    KC_I,    KC_O,   KC_P,  KC_BSPC,
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      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_LCTL,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                         KC_H,    KC_J,    KC_K,    KC_L, KC_SCLN, KC_QUOT,\
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_LSFT,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                         KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH, 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_ENT ,
   //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          KC_LALT,  LY_LWR, KC_LCMD,     KC_SPC,  LY_RSE,  KC_ENT
+                                          KC_LCTL,  LOWER, KC_BSPC,     KC_SPC,  RAISE,  KC_RCMD
                                       //`--------------------------'  `--------------------------'
 
   ),
 
-  [_LOWER] = LAYOUT(
+  [_LOWER] = LAYOUT_split_3x6_3(
   //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-       KC_ESC, KC_EXLM,   KC_AT, KC_HASH,  KC_DLR, KC_PERC,                      KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL,
+       KC_ESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                         KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_BSPC,
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_LCTL, XXXXXXX, KC_LEFT, KC_DOWN,   KC_UP,KC_RIGHT,                      KC_MINS,  KC_EQL, KC_LCBR, KC_RCBR, KC_PIPE, KC_GRV,
+      KC_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      KC_LEFT, KC_DOWN,   KC_UP,KC_RIGHT, XXXXXXX, XXXXXXX,
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      KC_UNDS, KC_PLUS, KC_LBRC, KC_RBRC, KC_BSLS, KC_TILD,
+      KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
   //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          KC_LALT,  LY_LWR, KC_LCMD,     KC_SPC,  LY_RSE, KC_ENT
-                                      //`--------------------------'  `--------------------------'
-  ),
-
-  [_RAISE] = LAYOUT(
-  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-       KC_ESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                         KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_DEL,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_LCTL, XXXXXXX, KC_PGUP, KC_HOME,   KC_END,KC_PGDN,                      KC_MINS,  KC_EQL, KC_LCBR, KC_RCBR, KC_PIPE, KC_GRV,
-  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      KC_UNDS, KC_PLUS, KC_LBRC, KC_RBRC, KC_BSLS, KC_TILD,
-  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          KC_LALT,  LY_LWR, KC_LCMD,     KC_SPC,  LY_RSE, KC_ENT
+                                          KC_TRNS,  LOWER, KC_TRNS,    KC_TRNS,   RAISE, KC_TRNS
                                       //`--------------------------'  `--------------------------'
     ),
 
-  [_ADJUST] = LAYOUT(
+  [_RAISE] = LAYOUT_split_3x6_3(
   //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-        RESET, KC_BTN1, KC_MS_U, KC_BTN2, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+       KC_ESC, KC_EXLM,   KC_AT, KC_HASH,  KC_DLR, KC_PERC,                      KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_R, XXXXXXX, XXXXXXX,                      RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, XXXXXXX,
+      KC_LCTL, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      KC_MINS,  KC_EQL, KC_LCBR, KC_RCBR, KC_PIPE,  KC_GRV,
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      XXXXXXX,  RGBRST, EEP_RST, AG_TOGG, XXXXXXX, XXXXXXX,                      RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX,
+      KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      KC_UNDS, KC_PLUS, KC_LBRC, KC_RBRC, KC_BSLS, KC_TILD,
   //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          KC_LALT,  LY_LWR, KC_LCMD,     KC_SPC,  LY_RSE, KC_ENT
+                                          KC_TRNS,  LOWER, KC_BSPC,    KC_TRNS,   RAISE, KC_TRNS
+                                      //`--------------------------'  `--------------------------'
+  ),
+
+  [_ADJUST] = LAYOUT_split_3x6_3(
+  //,-----------------------------------------------------.                    ,-----------------------------------------------------.
+      XXXXXXX,  RGBRST, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
+      RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   RESET,
+  //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
+                                          KC_TRNS,  LOWER, KC_TRNS,    KC_TRNS,   RAISE, KC_TRNS
                                       //`--------------------------'  `--------------------------'
   )
 };
 
-layer_state_t layer_state_set_user(layer_state_t state) {
-    return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
-}
-
 int RGB_current_mode;
 
 // Setting ADJUST layer RGB back to default
@@ -185,6 +169,11 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   }
 
   switch (keycode) {
+    case QWERTY:
+      if (record->event.pressed) {
+       set_single_persistent_default_layer(_QWERTY);
+      }
+      break;
     case LOWER:
       if (record->event.pressed) {
         layer_on(_LOWER);
@@ -210,6 +199,24 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
           layer_off(_ADJUST);
         }
         return false;
+    case RGB_MOD:
+      #ifdef RGBLIGHT_ENABLE
+        if (record->event.pressed) {
+          rgblight_mode(RGB_current_mode);
+          rgblight_step();
+          RGB_current_mode = rgblight_get_mode();
+        }
+      #endif
+      return false;
+    case RGBRST:
+      #ifdef RGBLIGHT_ENABLE
+        if (record->event.pressed) {
+          eeconfig_update_rgblight_default();
+          rgblight_enable();
+          RGB_current_mode = rgblight_get_mode();
+        }
+      #endif
+      break;
   }
   return true;
 }
diff --git a/qmk/keyboards/crkbd/keymaps/madhatter/rules.mk b/qmk/keyboards/crkbd/keymaps/madhatter/rules.mk
index dfee5a0b..f84e5b2a 100644
--- a/qmk/keyboards/crkbd/keymaps/madhatter/rules.mk
+++ b/qmk/keyboards/crkbd/keymaps/madhatter/rules.mk
@@ -1,11 +1,10 @@
-BOOTLOADER = atmel-dfu # Elite-C
-
-MOUSEKEY_ENABLE = yes
-RGBLIGHT_ENABLE = yes
 
 # If you want to change the display of OLED, you need to change here
 SRC +=  ./lib/glcdfont.c \
         ./lib/rgb_state_reader.c \
         ./lib/layer_state_reader.c \
         ./lib/logo_reader.c \
-        ./lib/keylogger.c
+        ./lib/keylogger.c \
+        # ./lib/mode_icon_reader.c \
+        # ./lib/host_led_state_reader.c \
+        # ./lib/timelogger.c \
diff --git a/qmk/keyboards/crkbd/keymaps/ninjonas/rules.mk b/qmk/keyboards/crkbd/keymaps/ninjonas/rules.mk
index 0c7fb3af..3c3bf923 100644
--- a/qmk/keyboards/crkbd/keymaps/ninjonas/rules.mk
+++ b/qmk/keyboards/crkbd/keymaps/ninjonas/rules.mk
@@ -1,4 +1,4 @@
-RGB_MATRIX_ENABLE = WS2812
+RGB_MATRIX_ENABLE = yes
 MOUSEKEY_ENABLE = no
 OLED_DRIVER_ENABLE = yes
 LTO_ENABLE = yes
diff --git a/qmk/keyboards/crkbd/keymaps/rpbaptist/rules.mk b/qmk/keyboards/crkbd/keymaps/rpbaptist/rules.mk
index dedd5753..623de8c9 100644
--- a/qmk/keyboards/crkbd/keymaps/rpbaptist/rules.mk
+++ b/qmk/keyboards/crkbd/keymaps/rpbaptist/rules.mk
@@ -21,7 +21,7 @@ UNICODE_ENABLE     = no   # Unicode
 BLUETOOTH_ENABLE   = no   # Enable Bluetooth with the Adafruit EZ-Key HID
 SWAP_HANDS_ENABLE  = no   # Enable one-hand typing
 
-RGB_MATRIX_ENABLE = WS2812
+RGB_MATRIX_ENABLE = yes
 
 #Do not enable SLEEP_LED_ENABLE.it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE   = no    # Breathing sleep LED during USB suspend
diff --git a/qmk/keyboards/crkbd/keymaps/soundmonster/rules.mk b/qmk/keyboards/crkbd/keymaps/soundmonster/rules.mk
index bf7a84eb..a73e6fe0 100644
--- a/qmk/keyboards/crkbd/keymaps/soundmonster/rules.mk
+++ b/qmk/keyboards/crkbd/keymaps/soundmonster/rules.mk
@@ -1,5 +1,5 @@
 RGBLIGHT_ENABLE    = no
-RGB_MATRIX_ENABLE  = WS2812
+RGB_MATRIX_ENABLE  = yes
 MOUSEKEY_ENABLE    = no
 NKRO_ENABLE        = yes
 OLED_DRIVER_ENABLE = yes
diff --git a/qmk/keyboards/crkbd/keymaps/vlukash_trackpad_right/trackpad.h b/qmk/keyboards/crkbd/keymaps/vlukash_trackpad_right/trackpad.h
index 755abc7d..cce460a9 100644
--- a/qmk/keyboards/crkbd/keymaps/vlukash_trackpad_right/trackpad.h
+++ b/qmk/keyboards/crkbd/keymaps/vlukash_trackpad_right/trackpad.h
@@ -4,7 +4,7 @@
 #include "quantum.h"
 #include "report.h"
 #include <util/delay.h>
-#include "../../lib/lufa/LUFA/Drivers/Peripheral/SPI.h"
+#include <LUFA/Drivers/Peripheral/SPI.h>
 
 // Trackpad speed adjustments
 #define POINTER_SPEED_MULTIPLIER 2
diff --git a/qmk/keyboards/crkbd/readme.md b/qmk/keyboards/crkbd/readme.md
index 5de3e3ae..1e5bfb39 100644
--- a/qmk/keyboards/crkbd/readme.md
+++ b/qmk/keyboards/crkbd/readme.md
@@ -27,7 +27,7 @@ In your keymap's `rules.mk` file, add the following:
 
 ```make
 RGBLIGHT_ENABLE = no
-RGB_MATRIX_ENABLE = WS2812
+RGB_MATRIX_ENABLE = yes
 ```
 
 And in your `config.h` file, add the following:
diff --git a/qmk/keyboards/crkbd/rev1/common/common.c b/qmk/keyboards/crkbd/rev1/common/common.c
index 5ea7347d..ddc0b5fe 100644
--- a/qmk/keyboards/crkbd/rev1/common/common.c
+++ b/qmk/keyboards/crkbd/rev1/common/common.c
@@ -17,5 +17,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "common.h"
-
-uint8_t is_master;
diff --git a/qmk/keyboards/crkbd/rev1/common/common.h b/qmk/keyboards/crkbd/rev1/common/common.h
index af1795f4..71779e2e 100644
--- a/qmk/keyboards/crkbd/rev1/common/common.h
+++ b/qmk/keyboards/crkbd/rev1/common/common.h
@@ -21,4 +21,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "rev1.h"
 
 #define has_usb() is_keyboard_master()
-extern uint8_t is_master;
+#define is_master is_keyboard_master()
diff --git a/qmk/keyboards/crkbd/rev1/common/keymaps/via/keymap.c b/qmk/keyboards/crkbd/rev1/common/keymaps/via/keymap.c
index a3b2e52c..ecd1f17a 100644
--- a/qmk/keyboards/crkbd/rev1/common/keymaps/via/keymap.c
+++ b/qmk/keyboards/crkbd/rev1/common/keymaps/via/keymap.c
@@ -19,7 +19,7 @@ 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_split_3x6_3( \
+  [0] = LAYOUT_split_3x6_3(
   //,-----------------------------------------------------.                    ,-----------------------------------------------------.
        KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                         KC_Y,    KC_U,    KC_I,    KC_O,   KC_P,  KC_BSPC,
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
@@ -32,7 +32,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   ),
 
-  [1] = LAYOUT_split_3x6_3( \
+  [1] = LAYOUT_split_3x6_3(
   //,-----------------------------------------------------.                    ,-----------------------------------------------------.
        KC_TAB,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                         KC_6,    KC_7,    KC_8,    KC_9,    KC_0, KC_BSPC,
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
@@ -40,11 +40,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
       KC_LSFT, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
   //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          KC_LGUI, _______,  KC_SPC,     KC_ENT, _______, KC_RALT\
+                                          KC_LGUI, _______,  KC_SPC,     KC_ENT, _______, KC_RALT
                                       //`--------------------------'  `--------------------------'
   ),
 
-  [2] = LAYOUT_split_3x6_3( \
+  [2] = LAYOUT_split_3x6_3(
   //,-----------------------------------------------------.                    ,-----------------------------------------------------.
        KC_TAB, KC_EXLM,   KC_AT, KC_HASH,  KC_DLR, KC_PERC,                      KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
@@ -56,15 +56,15 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                                       //`--------------------------'  `--------------------------'
   ),
 
-  [3] = LAYOUT_split_3x6_3( \
+  [3] = LAYOUT_split_3x6_3(
   //,-----------------------------------------------------.                    ,-----------------------------------------------------.
-        RESET, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,\
+        RESET, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,\
+      RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
   //|--------+--------+--------+--------+--------+--------|                    |--------+--------+--------+--------+--------+--------|
-      RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,\
+      RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX,                      XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
   //|--------+--------+--------+--------+--------+--------+--------|  |--------+--------+--------+--------+--------+--------+--------|
-                                          KC_LGUI, _______,  KC_SPC,     KC_ENT, _______, KC_RALT\
+                                          KC_LGUI, _______,  KC_SPC,     KC_ENT, _______, KC_RALT
                                       //`--------------------------'  `--------------------------'
   )
 };
@@ -83,30 +83,28 @@ oled_rotation_t oled_init_user(oled_rotation_t rotation) {
 #define L_ADJUST 8
 
 void oled_render_layer_state(void) {
-    oled_write_P("Layer: ", false);
+    oled_write_P(PSTR("Layer: "), false);
     switch (layer_state) {
         case L_BASE:
-            oled_write_ln_P("Default", false);
+            oled_write_ln_P(PSTR("Default"), false);
             break;
         case L_LOWER:
-            oled_write_ln_P("Lower", false);
+            oled_write_ln_P(PSTR("Lower"), false);
             break;
         case L_RAISE:
-            oled_write_ln_P("Raise", false);
+            oled_write_ln_P(PSTR("Raise"), false);
             break;
         case L_ADJUST:
         case L_ADJUST|L_LOWER:
         case L_ADJUST|L_RAISE:
         case L_ADJUST|L_LOWER|L_RAISE:
-            oled_write_ln_P("Adjust", false);
+            oled_write_ln_P(PSTR("Adjust"), false);
             break;
     }
 }
 
 
 char keylog_str[24] = {};
-char keylogs_str[21] = {};
-int keylogs_str_idx = 0;
 
 const char code_to_name[60] = {
     ' ', ' ', ' ', ' ', 'a', 'b', 'c', 'd', 'e', 'f',
@@ -128,25 +126,11 @@ void set_keylog(uint16_t keycode, keyrecord_t *record) {
   snprintf(keylog_str, sizeof(keylog_str), "%dx%d, k%2d : %c",
            record->event.key.row, record->event.key.col,
            keycode, name);
-
-  // update keylogs
-  if (keylogs_str_idx == sizeof(keylogs_str) - 1) {
-    keylogs_str_idx = 0;
-    for (int i = 0; i < sizeof(keylogs_str) - 1; i++) {
-      keylogs_str[i] = ' ';
-    }
-  }
-
-  keylogs_str[keylogs_str_idx] = name;
-  keylogs_str_idx++;
 }
 
 void oled_render_keylog(void) {
     oled_write(keylog_str, false);
 }
-void oled_render_keylogs(void) {
-    oled_write(keylogs_str, false);
-}
 
 void render_bootmagic_status(bool status) {
     /* Show Ctrl-Gui Swap options */
@@ -176,8 +160,6 @@ void oled_task_user(void) {
     if (is_master) {
         oled_render_layer_state();
         oled_render_keylog();
-        // oled_render_keylogs();
-        // oled_renger_bootmagic_icon(keymap_config.swap_lalt_lgui);
     } else {
         oled_render_logo();
     }
@@ -186,7 +168,6 @@ void oled_task_user(void) {
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   if (record->event.pressed) {
     set_keylog(keycode, record);
-    // set_timelog();
   }
   return true;
 }
diff --git a/qmk/keyboards/crkbd/rev1/legacy/config.h b/qmk/keyboards/crkbd/rev1/legacy/config.h
index 9e367641..eae6f788 100644
--- a/qmk/keyboards/crkbd/rev1/legacy/config.h
+++ b/qmk/keyboards/crkbd/rev1/legacy/config.h
@@ -18,6 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include <serial_config.h>
+#include "serial_config.h"
 
 #define PRODUCT         Corne Keyboard Rev.1 (Legacy Split)
diff --git a/qmk/keyboards/crkbd/rev1/legacy/legacy.h b/qmk/keyboards/crkbd/rev1/legacy/legacy.h
index 6c6308e5..08dfcefb 100644
--- a/qmk/keyboards/crkbd/rev1/legacy/legacy.h
+++ b/qmk/keyboards/crkbd/rev1/legacy/legacy.h
@@ -19,3 +19,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #include "rev1.h"
+
+extern uint8_t is_master;
\ No newline at end of file
diff --git a/qmk/keyboards/crkbd/rev1/legacy/split_scomm.c b/qmk/keyboards/crkbd/rev1/legacy/split_scomm.c
index c14bb32a..eccf2f3d 100644
--- a/qmk/keyboards/crkbd/rev1/legacy/split_scomm.c
+++ b/qmk/keyboards/crkbd/rev1/legacy/split_scomm.c
@@ -23,7 +23,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <stdbool.h>
 #include <stdint.h>
 #include <stddef.h>
-#include <split_scomm.h>
+#include "split_scomm.h"
 #include "serial.h"
 #ifdef CONSOLE_ENABLE
   #include "debug.h"
diff --git a/qmk/keyboards/crkbd/rev1/legacy/ssd1306.h b/qmk/keyboards/crkbd/rev1/legacy/ssd1306.h
new file mode 100644
index 00000000..11a3cc67
--- /dev/null
+++ b/qmk/keyboards/crkbd/rev1/legacy/ssd1306.h
@@ -0,0 +1,90 @@
+#pragma once
+
+#include <stdbool.h>
+#include <stdio.h>
+#include "action.h"
+
+enum ssd1306_cmds {
+  DisplayOff = 0xAE,
+  DisplayOn = 0xAF,
+
+  SetContrast = 0x81,
+  DisplayAllOnResume = 0xA4,
+
+  DisplayAllOn = 0xA5,
+  NormalDisplay = 0xA6,
+  InvertDisplay = 0xA7,
+  SetDisplayOffset = 0xD3,
+  SetComPins = 0xda,
+  SetVComDetect = 0xdb,
+  SetDisplayClockDiv = 0xD5,
+  SetPreCharge = 0xd9,
+  SetMultiPlex = 0xa8,
+  SetLowColumn = 0x00,
+  SetHighColumn = 0x10,
+  SetStartLine = 0x40,
+
+  SetMemoryMode = 0x20,
+  ColumnAddr = 0x21,
+  PageAddr = 0x22,
+
+  ComScanInc = 0xc0,
+  ComScanDec = 0xc8,
+  SegRemap = 0xa0,
+  SetChargePump = 0x8d,
+  ExternalVcc = 0x01,
+  SwitchCapVcc = 0x02,
+
+  ActivateScroll = 0x2f,
+  DeActivateScroll = 0x2e,
+  SetVerticalScrollArea = 0xa3,
+  RightHorizontalScroll = 0x26,
+  LeftHorizontalScroll = 0x27,
+  VerticalAndRightHorizontalScroll = 0x29,
+  VerticalAndLeftHorizontalScroll = 0x2a,
+};
+
+// Controls the SSD1306 128x32 OLED display via i2c
+
+#ifndef SSD1306_ADDRESS
+#define SSD1306_ADDRESS 0x3C
+#endif
+
+#define DisplayHeight 32
+#define DisplayWidth 128
+
+#define FontHeight 8
+#define FontWidth 6
+
+#define MatrixRows (DisplayHeight / FontHeight)
+#define MatrixCols (DisplayWidth / FontWidth)
+
+struct CharacterMatrix {
+  uint8_t display[MatrixRows][MatrixCols];
+  uint8_t *cursor;
+  bool dirty;
+};
+
+extern struct CharacterMatrix display;
+
+bool iota_gfx_init(bool rotate);
+void iota_gfx_task(void);
+bool iota_gfx_off(void);
+bool iota_gfx_on(void);
+void iota_gfx_flush(void);
+void iota_gfx_write_char(uint8_t c);
+void iota_gfx_write(const char *data);
+void iota_gfx_write_P(const char *data);
+void iota_gfx_clear_screen(void);
+
+void iota_gfx_task_user(void);
+
+void matrix_clear(struct CharacterMatrix *matrix);
+void matrix_write_char_inner(struct CharacterMatrix *matrix, uint8_t c);
+void matrix_write_char(struct CharacterMatrix *matrix, uint8_t c);
+void matrix_write(struct CharacterMatrix *matrix, const char *data);
+void matrix_write_ln(struct CharacterMatrix *matrix, const char *data);
+void matrix_write_P(struct CharacterMatrix *matrix, const char *data);
+void matrix_render(struct CharacterMatrix *matrix);
+
+bool process_record_gfx(uint16_t keycode, keyrecord_t *record);
diff --git a/qmk/keyboards/crkbd/rev1/rev1.c b/qmk/keyboards/crkbd/rev1/rev1.c
index 5e4e6560..f2df8942 100644
--- a/qmk/keyboards/crkbd/rev1/rev1.c
+++ b/qmk/keyboards/crkbd/rev1/rev1.c
@@ -87,10 +87,6 @@ led_config_t g_led_config = { {
 
 void matrix_init_kb(void) {
 
-#ifdef KEYBOARD_crkbd_rev1_common
-    is_master = (uint8_t)is_keyboard_master();
-#endif
-
 #ifdef RGB_MATRIX_ENABLE
     if (!isLeftHand) {
         g_led_config = (led_config_t){ {
diff --git a/qmk/keyboards/crkbd/rev1/rev1.h b/qmk/keyboards/crkbd/rev1/rev1.h
index ce88068e..c805efcc 100644
--- a/qmk/keyboards/crkbd/rev1/rev1.h
+++ b/qmk/keyboards/crkbd/rev1/rev1.h
@@ -18,8 +18,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-extern uint8_t is_master;
-
 #include "crkbd.h"
 #if defined(KEYBOARD_crkbd_rev1_legacy)
 #    include "legacy.h"
diff --git a/qmk/keyboards/crkbd/rules.mk b/qmk/keyboards/crkbd/rules.mk
index 30de5b38..adbbf016 100644
--- a/qmk/keyboards/crkbd/rules.mk
+++ b/qmk/keyboards/crkbd/rules.mk
@@ -27,6 +27,8 @@ AUDIO_ENABLE = no           # Audio output on port C6
 UNICODE_ENABLE = no         # Unicode
 BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no       # Enable WS2812 RGB underlight.
+RGB_MATRIX_ENABLE = no
+RGB_MATRIX_DRIVER = WS2812
 
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
diff --git a/qmk/keyboards/cu75/cu75.c b/qmk/keyboards/cu75/cu75.c
index 60c92b70..80941df3 100644
--- a/qmk/keyboards/cu75/cu75.c
+++ b/qmk/keyboards/cu75/cu75.c
@@ -10,7 +10,7 @@
 
 #ifdef AUDIO_ENABLE
 float test_sound[][2] = SONG(STARTUP_SOUND);
-#include <audio/audio.h>
+#include "audio.h"
 #endif
 
 uint16_t click_hz = CLICK_HZ;
diff --git a/qmk/keyboards/custommk/genesis/config.h b/qmk/keyboards/custommk/genesis/config.h
new file mode 100644
index 00000000..a527737f
--- /dev/null
+++ b/qmk/keyboards/custommk/genesis/config.h
@@ -0,0 +1,62 @@
+/* Copyright 2020 customMK
+ *
+ * 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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0xF35B
+#define PRODUCT_ID      0xFAB0
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    customMK
+#define PRODUCT         Genesis
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 4
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { F0, C7, C6, B6, B5 }
+#define MATRIX_COL_PINS { F4, F5, D7, B4 }
+#define UNUSED_PINS
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+#define ENCODERS_PAD_A { F6, D2 }
+#define ENCODERS_PAD_B { F7, D1 }
+#define ENCODER_RESOLUTION 4
+#define TAP_CODE_DELAY 10
+
+#define RGB_DI_PIN E6
+#define RGBLIGHT_ANIMATIONS
+#define RGBLED_NUM 13
+#define RGBLIGHT_HUE_STEP 8
+#define RGBLIGHT_SAT_STEP 8
+#define RGBLIGHT_VAL_STEP 8
+#define RGBLIGHT_LIMIT_VAL 128
+
diff --git a/qmk/keyboards/custommk/genesis/genesis.c b/qmk/keyboards/custommk/genesis/genesis.c
new file mode 100644
index 00000000..47296dd8
--- /dev/null
+++ b/qmk/keyboards/custommk/genesis/genesis.c
@@ -0,0 +1,36 @@
+/* Copyright 2020 customMK
+ *
+ * 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 "genesis.h"
+
+__attribute__((weak)) void encoder_update_user(uint8_t index, bool clockwise) {
+	/* top left encoder */
+	if (index == 0) {
+		if (clockwise) {
+			tap_code(KC_VOLU);
+		} else {
+			tap_code(KC_VOLD);
+		}
+	}
+	/* top right encoder */
+	else if (index == 1) {
+		if (clockwise) {
+			tap_code(KC_VOLU);
+		} else {
+			tap_code(KC_VOLD);
+		}
+	}    
+}
\ No newline at end of file
diff --git a/qmk/keyboards/custommk/genesis/genesis.h b/qmk/keyboards/custommk/genesis/genesis.h
new file mode 100644
index 00000000..ad107365
--- /dev/null
+++ b/qmk/keyboards/custommk/genesis/genesis.h
@@ -0,0 +1,48 @@
+/* Copyright 2020 customMK
+ *
+ * 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_numpad_5x4( \
+	K00, K01, K02, K03, \
+	K10, K11, K12,      \
+	K20, K21, K22, K23, \
+	K30, K31, K32,      \
+	K40,      K42, K43  \
+) { \
+	{ K00,   K01,   K02,   K03 }, \
+	{ K10,   K11,   K12,   KC_NO }, \
+	{ K20,   K21,   K22,   K23 }, \
+	{ K30,   K31,   K32,   KC_NO }, \
+	{ K40,   KC_NO, K42,   K43 }  \
+}
+
+#define LAYOUT_ortho_5x4( \
+	K00, K01, K02, K03, \
+	K10, K11, K12, K13, \
+	K20, K21, K22, K23, \
+	K30, K31, K32, K33, \
+	K40, K41, K42, K43  \
+) { \
+	{ K00,   K01,   K02,   K03 }, \
+	{ K10,   K11,   K12,   K13 }, \
+	{ K20,   K21,   K22,   K23 }, \
+	{ K30,   K31,   K32,   K33 }, \
+	{ K40,   K41,   K42,   K43 }  \
+}
+
diff --git a/qmk/keyboards/custommk/genesis/info.json b/qmk/keyboards/custommk/genesis/info.json
new file mode 100644
index 00000000..ddba21f9
--- /dev/null
+++ b/qmk/keyboards/custommk/genesis/info.json
@@ -0,0 +1,16 @@
+{
+    "keyboard_name": "Genesis", 
+    "url": "https://www.customMK.com", 
+    "maintainer": "customMK", 
+    "width": 4, 
+    "height": 5, 
+    "layouts": {
+        "LAYOUT_ortho_5x4": {
+            "layout": [{"label":"MO(1)", "x":0, "y":0}, {"label":"/", "x":1, "y":0}, {"label":"*", "x":2, "y":0}, {"label":"Mute", "x":3, "y":0}, {"label":"7", "x":0, "y":1}, {"label":"8", "x":1, "y":1}, {"label":"9", "x":2, "y":1}, {"label":"+", "x":3, "y":1}, {"label":"4", "x":0, "y":2}, {"label":"5", "x":1, "y":2}, {"label":"6", "x":2, "y":2}, {"label":"Pg Up", "x":3, "y":2}, {"label":"1", "x":0, "y":3}, {"label":"2", "x":1, "y":3}, {"label":"3", "x":2, "y":3}, {"label":"Pg Dn", "x":3, "y":3}, {"label":"0", "x":0, "y":4}, {"label":"Spc", "x":1, "y":4}, {"label":".", "x":2, "y":4}, {"label":"Enter", "x":3, "y":4}]
+        },
+        "LAYOUT_numpad_5x4": {
+            "layout": [{"label":"MO(1)", "x":0, "y":0}, {"label":"/", "x":1, "y":0}, {"label":"*", "x":2, "y":0}, {"label":"-", "x":3, "y":0}, {"label":"7", "x":0, "y":1}, {"label":"8", "x":1, "y":1}, {"label":"9", "x":2, "y":1}, {"label":"+", "x":3, "y":1, "h":2}, {"label":"4", "x":0, "y":2}, {"label":"5", "x":1, "y":2}, {"label":"6", "x":2, "y":2}, {"label":"1", "x":0, "y":3}, {"label":"2", "x":1, "y":3}, {"label":"3", "x":2, "y":3}, {"label":"Enter", "x":3, "y":3, "h":2}, {"label":"0", "x":0, "y":4, "w":2}, {"label":".", "x":2, "y":4}]
+        }
+        
+    }
+}
\ No newline at end of file
diff --git a/qmk/keyboards/custommk/genesis/keymaps/default/keymap.c b/qmk/keyboards/custommk/genesis/keymaps/default/keymap.c
new file mode 100644
index 00000000..1b061b03
--- /dev/null
+++ b/qmk/keyboards/custommk/genesis/keymaps/default/keymap.c
@@ -0,0 +1,37 @@
+/* Copyright 2020 customMK
+ *
+ * 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_ortho_5x4(
+			MO(1),   KC_PSLS, KC_PAST, KC_PMNS, 
+			KC_P7,   KC_P8,   KC_P9,   KC_BSPC, 
+			KC_P4,   KC_P5,   KC_P6,   KC_PPLS, 
+			KC_P1,   KC_P2,   KC_P3,   KC_CAPS,
+			KC_P0,   KC_SPC,  KC_PDOT, KC_ENT),
+
+	[1] = LAYOUT_ortho_5x4(
+			KC_TRNS, KC_VOLU, RGB_TOG, RGB_MOD, 
+			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+			RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, 
+			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+			RGB_HUI, KC_TRNS, KC_TRNS, RGB_HUD),
+
+};
+
+
diff --git a/qmk/keyboards/custommk/genesis/keymaps/default/readme.md b/qmk/keyboards/custommk/genesis/keymaps/default/readme.md
new file mode 100644
index 00000000..202402d8
--- /dev/null
+++ b/qmk/keyboards/custommk/genesis/keymaps/default/readme.md
@@ -0,0 +1,6 @@
+# Default Genesis Macro Pad Layout
+
+This is the default layout for the Genesis Macro Pad. It assumes all 1u switches 
+and optional rotary encoder in the top-left or top-right corner for media volume 
+control. The top left switch activates Layer 1 which enables control of the RGB
+underglow.
\ No newline at end of file
diff --git a/qmk/keyboards/custommk/genesis/keymaps/numpad/keymap.c b/qmk/keyboards/custommk/genesis/keymaps/numpad/keymap.c
new file mode 100644
index 00000000..97970191
--- /dev/null
+++ b/qmk/keyboards/custommk/genesis/keymaps/numpad/keymap.c
@@ -0,0 +1,51 @@
+/* Copyright 2020 customMK
+ *
+ * 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_numpad_5x4(
+			MO(1),  KC_PSLS,  KC_PAST, KC_PMNS, 
+			KC_P7,  KC_P8,    KC_P9,    
+			KC_P4,  KC_P5,    KC_P6,   KC_PPLS, 
+			KC_P1,  KC_P2,    KC_P3,    
+			KC_P0,            KC_PDOT, KC_ENT),
+
+	[1] = LAYOUT_numpad_5x4(
+			KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, 
+			KC_TRNS, KC_TRNS, KC_TRNS,   
+			RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, 
+			KC_TRNS, KC_TRNS, KC_TRNS, 	 
+			RGB_HUI, 	      KC_TRNS, RGB_HUD),
+
+	[2] = LAYOUT_numpad_5x4(
+			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),
+
+	[3] = LAYOUT_numpad_5x4(
+			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),
+
+};
+
+
diff --git a/qmk/keyboards/custommk/genesis/keymaps/numpad/readme.md b/qmk/keyboards/custommk/genesis/keymaps/numpad/readme.md
new file mode 100644
index 00000000..795e4341
--- /dev/null
+++ b/qmk/keyboards/custommk/genesis/keymaps/numpad/readme.md
@@ -0,0 +1,3 @@
+# Numpad Genesis Macro Pad Layout
+
+This is the numpad layout for the Genesis Macro Pad. It assumes the 0, +, and enter keys are all 2u size, with an optional rotary encoder in the top-left or top-right corner for media volume control. The top left switch activates Layer 1 which enables control of the RGB underglow.
\ No newline at end of file
diff --git a/qmk/keyboards/custommk/genesis/keymaps/via/keymap.c b/qmk/keyboards/custommk/genesis/keymaps/via/keymap.c
new file mode 100644
index 00000000..fe375547
--- /dev/null
+++ b/qmk/keyboards/custommk/genesis/keymaps/via/keymap.c
@@ -0,0 +1,51 @@
+/* Copyright 2020 customMK
+ *
+ * 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_ortho_5x4(
+			MO(1),   KC_PSLS, KC_PAST, KC_PMNS, 
+			KC_P7,   KC_P8,   KC_P9,   KC_PPLS, 
+			KC_P4,   KC_P5,   KC_P6,   KC_PGUP, 
+			KC_P1,   KC_P2,   KC_P3,   KC_PGDN, 
+			KC_P0,   KC_SPC,  KC_PDOT, KC_PENT),
+
+	[1] = LAYOUT_ortho_5x4(
+			KC_TRNS, RGB_TOG, RGB_MOD, KC_TRNS, 
+			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+			RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, 
+			KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, 
+			RGB_HUI, RGB_HUD, KC_TRNS, KC_TRNS),
+
+	[2] = LAYOUT_ortho_5x4(
+			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),
+
+	[3] = LAYOUT_ortho_5x4(
+			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),
+
+};
+
+
diff --git a/qmk/keyboards/custommk/genesis/keymaps/via/readme.md b/qmk/keyboards/custommk/genesis/keymaps/via/readme.md
new file mode 100644
index 00000000..aa70d622
--- /dev/null
+++ b/qmk/keyboards/custommk/genesis/keymaps/via/readme.md
@@ -0,0 +1,3 @@
+# Genesis Macro Pad Layout for VIA
+
+This is the via layout for the Genesis Macro Pad. It is identical to the default 1u layout which assumes all 1u switches and optional rotary encoder in the top-left or top-right corner for media volume control. The top-left switch activates Layer 1 which enables control of the RGB underglow.
\ No newline at end of file
diff --git a/qmk/keyboards/custommk/genesis/keymaps/via/rules.mk b/qmk/keyboards/custommk/genesis/keymaps/via/rules.mk
new file mode 100644
index 00000000..43061db1
--- /dev/null
+++ b/qmk/keyboards/custommk/genesis/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
\ No newline at end of file
diff --git a/qmk/keyboards/custommk/genesis/readme.md b/qmk/keyboards/custommk/genesis/readme.md
new file mode 100644
index 00000000..58bd2712
--- /dev/null
+++ b/qmk/keyboards/custommk/genesis/readme.md
@@ -0,0 +1,22 @@
+# Genesis
+
+![Genesis Macro Pad](https://i.imgur.com/voBjLrM.jpeg)
+![Genesis Macro Pad PCB](https://i.imgur.com/ST2vtkV.jpeg)
+
+Genesis is a 5x4 ortholinear macro pad designed and produced by customMK. 
+
+* Keyboard Maintainer: [customMK](https://github.com/customMK)
+* Hardware Supported: Genesis Macro Pad
+* Hardware Availability: [customMK](https://shop.custommk.com/products/genesis_macropad)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make custommk/genesis:default
+
+Flashing example for this keyboard:
+
+    make custommk/genesis:default:flash
+
+Genesis Macro Pad has qmk-dfu bootloader preinstalled. To enter the bootloader, run the flashing command above, and then either plug in the USB connection while holding the top-left key, or alternatively, plug in the USB connection and then press the reset button on the PCB
+
+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).
diff --git a/qmk/keyboards/custommk/genesis/rules.mk b/qmk/keyboards/custommk/genesis/rules.mk
new file mode 100644
index 00000000..1556125e
--- /dev/null
+++ b/qmk/keyboards/custommk/genesis/rules.mk
@@ -0,0 +1,23 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = qmk-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+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
+# 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 = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = yes
\ No newline at end of file
diff --git a/qmk/keyboards/cutie_club/wraith/config.h b/qmk/keyboards/cutie_club/wraith/config.h
index a5d3f0eb..e1d2d51d 100644
--- a/qmk/keyboards/cutie_club/wraith/config.h
+++ b/qmk/keyboards/cutie_club/wraith/config.h
@@ -48,10 +48,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
-/*
- * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
- */
-#define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6
+#define LED_CAPS_LOCK_PIN B3
+#define LED_PIN_ON_STATE 0
 
 // #define BACKLIGHT_PIN B7
 // #define BACKLIGHT_BREATHING
diff --git a/qmk/keyboards/cutie_club/wraith/wraith.c b/qmk/keyboards/cutie_club/wraith/wraith.c
index 95265384..cb2d1911 100644
--- a/qmk/keyboards/cutie_club/wraith/wraith.c
+++ b/qmk/keyboards/cutie_club/wraith/wraith.c
@@ -15,29 +15,8 @@
  */
 #include "wraith.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) {
-  setPinOutput(B3);
-  setPinOutput(B0);
-  matrix_init_user();
-}
+    setPinOutput(B0);
 
-void matrix_scan_kb(void) {
-  matrix_scan_user();
-}
-
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  return process_record_user(keycode, record);
-}
-
-void led_set_kb(uint8_t usb_led) {
-  if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
-        writePinLow(B3);
-    } else {
-        writePinHigh(B3);
-    }
-  led_set_user(usb_led);
+    matrix_init_user();
 }
diff --git a/qmk/keyboards/dekunukem/duckypad/chconf.h b/qmk/keyboards/dekunukem/duckypad/chconf.h
new file mode 100644
index 00000000..85c1c9b3
--- /dev/null
+++ b/qmk/keyboards/dekunukem/duckypad/chconf.h
@@ -0,0 +1,714 @@
+/*
+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+/**
+ * @file    rt/templates/chconf.h
+ * @brief   Configuration file template.
+ * @details A copy of this file must be placed in each project directory, it
+ *          contains the application specific kernel settings.
+ *
+ * @addtogroup config
+ * @details Kernel related settings and hooks.
+ * @{
+ */
+
+#ifndef CHCONF_H
+#define CHCONF_H
+
+#define _CHIBIOS_RT_CONF_
+#define _CHIBIOS_RT_CONF_VER_6_0_
+
+/*===========================================================================*/
+/**
+ * @name System timers settings
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   System time counter resolution.
+ * @note    Allowed values are 16 or 32 bits.
+ */
+#if !defined(CH_CFG_ST_RESOLUTION)
+#define CH_CFG_ST_RESOLUTION                32
+#endif
+
+/**
+ * @brief   System tick frequency.
+ * @details Frequency of the system timer that drives the system ticks. This
+ *          setting also defines the system tick time unit.
+ */
+#if !defined(CH_CFG_ST_FREQUENCY)
+#define CH_CFG_ST_FREQUENCY                 10000
+#endif
+
+/**
+ * @brief   Time intervals data size.
+ * @note    Allowed values are 16, 32 or 64 bits.
+ */
+#if !defined(CH_CFG_INTERVALS_SIZE)
+#define CH_CFG_INTERVALS_SIZE               32
+#endif
+
+/**
+ * @brief   Time types data size.
+ * @note    Allowed values are 16 or 32 bits.
+ */
+#if !defined(CH_CFG_TIME_TYPES_SIZE)
+#define CH_CFG_TIME_TYPES_SIZE              32
+#endif
+
+/**
+ * @brief   Time delta constant for the tick-less mode.
+ * @note    If this value is zero then the system uses the classic
+ *          periodic tick. This value represents the minimum number
+ *          of ticks that is safe to specify in a timeout directive.
+ *          The value one is not valid, timeouts are rounded up to
+ *          this value.
+ */
+#if !defined(CH_CFG_ST_TIMEDELTA)
+#define CH_CFG_ST_TIMEDELTA                 2
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Kernel parameters and options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   Round robin interval.
+ * @details This constant is the number of system ticks allowed for the
+ *          threads before preemption occurs. Setting this value to zero
+ *          disables the preemption for threads with equal priority and the
+ *          round robin becomes cooperative. Note that higher priority
+ *          threads can still preempt, the kernel is always preemptive.
+ * @note    Disabling the round robin preemption makes the kernel more compact
+ *          and generally faster.
+ * @note    The round robin preemption is not supported in tickless mode and
+ *          must be set to zero in that case.
+ */
+#if !defined(CH_CFG_TIME_QUANTUM)
+#define CH_CFG_TIME_QUANTUM                 0
+#endif
+
+/**
+ * @brief   Managed RAM size.
+ * @details Size of the RAM area to be managed by the OS. If set to zero
+ *          then the whole available RAM is used. The core memory is made
+ *          available to the heap allocator and/or can be used directly through
+ *          the simplified core memory allocator.
+ *
+ * @note    In order to let the OS manage the whole RAM the linker script must
+ *          provide the @p __heap_base__ and @p __heap_end__ symbols.
+ * @note    Requires @p CH_CFG_USE_MEMCORE.
+ */
+#if !defined(CH_CFG_MEMCORE_SIZE)
+#define CH_CFG_MEMCORE_SIZE                 0
+#endif
+
+/**
+ * @brief   Idle thread automatic spawn suppression.
+ * @details When this option is activated the function @p chSysInit()
+ *          does not spawn the idle thread. The application @p main()
+ *          function becomes the idle thread and must implement an
+ *          infinite loop.
+ */
+#if !defined(CH_CFG_NO_IDLE_THREAD)
+#define CH_CFG_NO_IDLE_THREAD               FALSE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Performance options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   OS optimization.
+ * @details If enabled then time efficient rather than space efficient code
+ *          is used when two possible implementations exist.
+ *
+ * @note    This is not related to the compiler optimization options.
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_OPTIMIZE_SPEED)
+#define CH_CFG_OPTIMIZE_SPEED               FALSE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Subsystem options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   Time Measurement APIs.
+ * @details If enabled then the time measurement APIs are included in
+ *          the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_TM)
+#define CH_CFG_USE_TM                       FALSE
+#endif
+
+/**
+ * @brief   Threads registry APIs.
+ * @details If enabled then the registry APIs are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_REGISTRY)
+#define CH_CFG_USE_REGISTRY                 TRUE
+#endif
+
+/**
+ * @brief   Threads synchronization APIs.
+ * @details If enabled then the @p chThdWait() function is included in
+ *          the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_WAITEXIT)
+#define CH_CFG_USE_WAITEXIT                 TRUE
+#endif
+
+/**
+ * @brief   Semaphores APIs.
+ * @details If enabled then the Semaphores APIs are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_SEMAPHORES)
+#define CH_CFG_USE_SEMAPHORES               TRUE
+#endif
+
+/**
+ * @brief   Semaphores queuing mode.
+ * @details If enabled then the threads are enqueued on semaphores by
+ *          priority rather than in FIFO order.
+ *
+ * @note    The default is @p FALSE. Enable this if you have special
+ *          requirements.
+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.
+ */
+#if !defined(CH_CFG_USE_SEMAPHORES_PRIORITY)
+#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE
+#endif
+
+/**
+ * @brief   Mutexes APIs.
+ * @details If enabled then the mutexes APIs are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_MUTEXES)
+#define CH_CFG_USE_MUTEXES                  TRUE
+#endif
+
+/**
+ * @brief   Enables recursive behavior on mutexes.
+ * @note    Recursive mutexes are heavier and have an increased
+ *          memory footprint.
+ *
+ * @note    The default is @p FALSE.
+ * @note    Requires @p CH_CFG_USE_MUTEXES.
+ */
+#if !defined(CH_CFG_USE_MUTEXES_RECURSIVE)
+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE
+#endif
+
+/**
+ * @brief   Conditional Variables APIs.
+ * @details If enabled then the conditional variables APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_MUTEXES.
+ */
+#if !defined(CH_CFG_USE_CONDVARS)
+#define CH_CFG_USE_CONDVARS                 TRUE
+#endif
+
+/**
+ * @brief   Conditional Variables APIs with timeout.
+ * @details If enabled then the conditional variables APIs with timeout
+ *          specification are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_CONDVARS.
+ */
+#if !defined(CH_CFG_USE_CONDVARS_TIMEOUT)
+#define CH_CFG_USE_CONDVARS_TIMEOUT         FALSE
+#endif
+
+/**
+ * @brief   Events Flags APIs.
+ * @details If enabled then the event flags APIs are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_EVENTS)
+#define CH_CFG_USE_EVENTS                   TRUE
+#endif
+
+/**
+ * @brief   Events Flags APIs with timeout.
+ * @details If enabled then the events APIs with timeout specification
+ *          are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_EVENTS.
+ */
+#if !defined(CH_CFG_USE_EVENTS_TIMEOUT)
+#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE
+#endif
+
+/**
+ * @brief   Synchronous Messages APIs.
+ * @details If enabled then the synchronous messages APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_MESSAGES)
+#define CH_CFG_USE_MESSAGES                 TRUE
+#endif
+
+/**
+ * @brief   Synchronous Messages queuing mode.
+ * @details If enabled then messages are served by priority rather than in
+ *          FIFO order.
+ *
+ * @note    The default is @p FALSE. Enable this if you have special
+ *          requirements.
+ * @note    Requires @p CH_CFG_USE_MESSAGES.
+ */
+#if !defined(CH_CFG_USE_MESSAGES_PRIORITY)
+#define CH_CFG_USE_MESSAGES_PRIORITY        FALSE
+#endif
+
+/**
+ * @brief   Mailboxes APIs.
+ * @details If enabled then the asynchronous messages (mailboxes) APIs are
+ *          included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.
+ */
+#if !defined(CH_CFG_USE_MAILBOXES)
+#define CH_CFG_USE_MAILBOXES                TRUE
+#endif
+
+/**
+ * @brief   Core Memory Manager APIs.
+ * @details If enabled then the core memory manager APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_MEMCORE)
+#define CH_CFG_USE_MEMCORE                  TRUE
+#endif
+
+/**
+ * @brief   Heap Allocator APIs.
+ * @details If enabled then the memory heap allocator APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_MEMCORE and either @p CH_CFG_USE_MUTEXES or
+ *          @p CH_CFG_USE_SEMAPHORES.
+ * @note    Mutexes are recommended.
+ */
+#if !defined(CH_CFG_USE_HEAP)
+#define CH_CFG_USE_HEAP                     FALSE
+#endif
+
+/**
+ * @brief   Memory Pools Allocator APIs.
+ * @details If enabled then the memory pools allocator APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_MEMPOOLS)
+#define CH_CFG_USE_MEMPOOLS                 FALSE
+#endif
+
+/**
+ * @brief   Objects FIFOs APIs.
+ * @details If enabled then the objects FIFOs APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_OBJ_FIFOS)
+#define CH_CFG_USE_OBJ_FIFOS                FALSE
+#endif
+
+/**
+ * @brief   Pipes APIs.
+ * @details If enabled then the pipes APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_PIPES)
+#define CH_CFG_USE_PIPES                    TRUE
+#endif
+
+/**
+ * @brief   Dynamic Threads APIs.
+ * @details If enabled then the dynamic threads creation APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_WAITEXIT.
+ * @note    Requires @p CH_CFG_USE_HEAP and/or @p CH_CFG_USE_MEMPOOLS.
+ */
+#if !defined(CH_CFG_USE_DYNAMIC)
+#define CH_CFG_USE_DYNAMIC                  FALSE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Objects factory options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   Objects Factory APIs.
+ * @details If enabled then the objects factory APIs are included in the
+ *          kernel.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_CFG_USE_FACTORY)
+#define CH_CFG_USE_FACTORY                  FALSE
+#endif
+
+/**
+ * @brief   Maximum length for object names.
+ * @details If the specified length is zero then the name is stored by
+ *          pointer but this could have unintended side effects.
+ */
+#if !defined(CH_CFG_FACTORY_MAX_NAMES_LENGTH)
+#define CH_CFG_FACTORY_MAX_NAMES_LENGTH     8
+#endif
+
+/**
+ * @brief   Enables the registry of generic objects.
+ */
+#if !defined(CH_CFG_FACTORY_OBJECTS_REGISTRY)
+#define CH_CFG_FACTORY_OBJECTS_REGISTRY     TRUE
+#endif
+
+/**
+ * @brief   Enables factory for generic buffers.
+ */
+#if !defined(CH_CFG_FACTORY_GENERIC_BUFFERS)
+#define CH_CFG_FACTORY_GENERIC_BUFFERS      TRUE
+#endif
+
+/**
+ * @brief   Enables factory for semaphores.
+ */
+#if !defined(CH_CFG_FACTORY_SEMAPHORES)
+#define CH_CFG_FACTORY_SEMAPHORES           TRUE
+#endif
+
+/**
+ * @brief   Enables factory for mailboxes.
+ */
+#if !defined(CH_CFG_FACTORY_MAILBOXES)
+#define CH_CFG_FACTORY_MAILBOXES            TRUE
+#endif
+
+/**
+ * @brief   Enables factory for objects FIFOs.
+ */
+#if !defined(CH_CFG_FACTORY_OBJ_FIFOS)
+#define CH_CFG_FACTORY_OBJ_FIFOS            TRUE
+#endif
+
+/**
+ * @brief   Enables factory for Pipes.
+ */
+#if !defined(CH_CFG_FACTORY_PIPES) || defined(__DOXYGEN__)
+#define CH_CFG_FACTORY_PIPES                TRUE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Debug options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   Debug option, kernel statistics.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_STATISTICS)
+#define CH_DBG_STATISTICS                   FALSE
+#endif
+
+/**
+ * @brief   Debug option, system state check.
+ * @details If enabled the correct call protocol for system APIs is checked
+ *          at runtime.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_SYSTEM_STATE_CHECK)
+#define CH_DBG_SYSTEM_STATE_CHECK           FALSE
+#endif
+
+/**
+ * @brief   Debug option, parameters checks.
+ * @details If enabled then the checks on the API functions input
+ *          parameters are activated.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_ENABLE_CHECKS)
+#define CH_DBG_ENABLE_CHECKS                FALSE
+#endif
+
+/**
+ * @brief   Debug option, consistency checks.
+ * @details If enabled then all the assertions in the kernel code are
+ *          activated. This includes consistency checks inside the kernel,
+ *          runtime anomalies and port-defined checks.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_ENABLE_ASSERTS)
+#define CH_DBG_ENABLE_ASSERTS               FALSE
+#endif
+
+/**
+ * @brief   Debug option, trace buffer.
+ * @details If enabled then the trace buffer is activated.
+ *
+ * @note    The default is @p CH_DBG_TRACE_MASK_DISABLED.
+ */
+#if !defined(CH_DBG_TRACE_MASK)
+#define CH_DBG_TRACE_MASK                   CH_DBG_TRACE_MASK_DISABLED
+#endif
+
+/**
+ * @brief   Trace buffer entries.
+ * @note    The trace buffer is only allocated if @p CH_DBG_TRACE_MASK is
+ *          different from @p CH_DBG_TRACE_MASK_DISABLED.
+ */
+#if !defined(CH_DBG_TRACE_BUFFER_SIZE)
+#define CH_DBG_TRACE_BUFFER_SIZE            128
+#endif
+
+/**
+ * @brief   Debug option, stack checks.
+ * @details If enabled then a runtime stack check is performed.
+ *
+ * @note    The default is @p FALSE.
+ * @note    The stack check is performed in a architecture/port dependent way.
+ *          It may not be implemented or some ports.
+ * @note    The default failure mode is to halt the system with the global
+ *          @p panic_msg variable set to @p NULL.
+ */
+#if !defined(CH_DBG_ENABLE_STACK_CHECK)
+#define CH_DBG_ENABLE_STACK_CHECK           FALSE
+#endif
+
+/**
+ * @brief   Debug option, stacks initialization.
+ * @details If enabled then the threads working area is filled with a byte
+ *          value when a thread is created. This can be useful for the
+ *          runtime measurement of the used stack.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_FILL_THREADS)
+#define CH_DBG_FILL_THREADS                 FALSE
+#endif
+
+/**
+ * @brief   Debug option, threads profiling.
+ * @details If enabled then a field is added to the @p thread_t structure that
+ *          counts the system ticks occurred while executing the thread.
+ *
+ * @note    The default is @p FALSE.
+ * @note    This debug option is not currently compatible with the
+ *          tickless mode.
+ */
+#if !defined(CH_DBG_THREADS_PROFILING)
+#define CH_DBG_THREADS_PROFILING            FALSE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Kernel hooks
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   System structure extension.
+ * @details User fields added to the end of the @p ch_system_t structure.
+ */
+#define CH_CFG_SYSTEM_EXTRA_FIELDS                                          \
+  /* Add threads custom fields here.*/
+
+/**
+ * @brief   System initialization hook.
+ * @details User initialization code added to the @p chSysInit() function
+ *          just before interrupts are enabled globally.
+ */
+#define CH_CFG_SYSTEM_INIT_HOOK() {                                         \
+  /* Add threads initialization code here.*/                                \
+}
+
+/**
+ * @brief   Threads descriptor structure extension.
+ * @details User fields added to the end of the @p thread_t structure.
+ */
+#define CH_CFG_THREAD_EXTRA_FIELDS                                          \
+  /* Add threads custom fields here.*/
+
+/**
+ * @brief   Threads initialization hook.
+ * @details User initialization code added to the @p _thread_init() function.
+ *
+ * @note    It is invoked from within @p _thread_init() and implicitly from all
+ *          the threads creation APIs.
+ */
+#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \
+  /* Add threads initialization code here.*/                                \
+}
+
+/**
+ * @brief   Threads finalization hook.
+ * @details User finalization code added to the @p chThdExit() API.
+ */
+#define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \
+  /* Add threads finalization code here.*/                                  \
+}
+
+/**
+ * @brief   Context switch hook.
+ * @details This hook is invoked just before switching between threads.
+ */
+#define CH_CFG_CONTEXT_SWITCH_HOOK(ntp, otp) {                              \
+  /* Context switch code here.*/                                            \
+}
+
+/**
+ * @brief   ISR enter hook.
+ */
+#define CH_CFG_IRQ_PROLOGUE_HOOK() {                                        \
+  /* IRQ prologue code here.*/                                              \
+}
+
+/**
+ * @brief   ISR exit hook.
+ */
+#define CH_CFG_IRQ_EPILOGUE_HOOK() {                                        \
+  /* IRQ epilogue code here.*/                                              \
+}
+
+/**
+ * @brief   Idle thread enter hook.
+ * @note    This hook is invoked within a critical zone, no OS functions
+ *          should be invoked from here.
+ * @note    This macro can be used to activate a power saving mode.
+ */
+#define CH_CFG_IDLE_ENTER_HOOK() {                                          \
+  /* Idle-enter code here.*/                                                \
+}
+
+/**
+ * @brief   Idle thread leave hook.
+ * @note    This hook is invoked within a critical zone, no OS functions
+ *          should be invoked from here.
+ * @note    This macro can be used to deactivate a power saving mode.
+ */
+#define CH_CFG_IDLE_LEAVE_HOOK() {                                          \
+  /* Idle-leave code here.*/                                                \
+}
+
+/**
+ * @brief   Idle Loop hook.
+ * @details This hook is continuously invoked by the idle thread loop.
+ */
+#define CH_CFG_IDLE_LOOP_HOOK() {                                           \
+  /* Idle loop code here.*/                                                 \
+}
+
+/**
+ * @brief   System tick event hook.
+ * @details This hook is invoked in the system tick handler immediately
+ *          after processing the virtual timers queue.
+ */
+#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \
+  /* System tick event code here.*/                                         \
+}
+
+/**
+ * @brief   System halt hook.
+ * @details This hook is invoked in case to a system halting error before
+ *          the system is halted.
+ */
+#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \
+  /* System halt code here.*/                                               \
+}
+
+/**
+ * @brief   Trace hook.
+ * @details This hook is invoked each time a new record is written in the
+ *          trace buffer.
+ */
+#define CH_CFG_TRACE_HOOK(tep) {                                            \
+  /* Trace code here.*/                                                     \
+}
+
+/** @} */
+
+/*===========================================================================*/
+/* Port-specific settings (override port settings defaulted in chcore.h).    */
+/*===========================================================================*/
+
+#endif  /* CHCONF_H */
+
+/** @} */
diff --git a/qmk/keyboards/dekunukem/duckypad/config.h b/qmk/keyboards/dekunukem/duckypad/config.h
new file mode 100644
index 00000000..27806ab8
--- /dev/null
+++ b/qmk/keyboards/dekunukem/duckypad/config.h
@@ -0,0 +1,61 @@
+/*
+
+QMK Firmware for dekuNukem/duckyPad
+
+Copyright (C) 2020 Max Bridgland <@M4cs>
+
+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 3 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 "config_common.h"
+
+#define VENDOR_ID       0xFEED
+#define PRODUCT_ID      0x0B91
+#define DEVICE_VER      0x0001
+#define MANUFACTURER dekuNukem
+#define PRODUCT duckyPad
+
+#define MATRIX_ROWS 1
+#define MATRIX_COLS 17
+
+#define DIRECT_PINS {{ B13, B14, B15, A8, A15, B3, B4, B5, B6, B7, C13, C14, C15, F0, F1, A1, A2 }}
+
+#define RGB_DI_PIN A10
+#define RGBLED_NUM 15
+#define DRIVER_LED_TOTAL 15
+
+#define RGB_MATRIX_KEYPRESSES
+#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#define RGB_MATRIX_STARTUP_HUE 221
+
+#define I2C1_SCL_BANK GPIOB
+#define I2C1_SCL 8
+#define I2C1_SDA_BANK GPIOB
+#define I2C1_SDA 9
+
+#define I2C1_SCL_PAL_MODE 1
+#define I2C1_SDA_PAL_MODE 1
+
+#define I2C1_OPMODE OPMODE_I2C
+#define I2C1_CLOCK_SPEED 100000
+#define I2C1_DUTY_CYCLE STD_DUTY_CYCLE
+
+#define OLED_DISPLAY_ADDRESS 0x3C
+#define OLED_DISPLAY_128X64
+#define OLED_COM_PINS 0x12
+
+#define OLED_IC OLED_IC_SH1106
+#define OLED_COLUMN_OFFSET 2
diff --git a/qmk/keyboards/dekunukem/duckypad/duckypad.c b/qmk/keyboards/dekunukem/duckypad/duckypad.c
new file mode 100644
index 00000000..831a42a0
--- /dev/null
+++ b/qmk/keyboards/dekunukem/duckypad/duckypad.c
@@ -0,0 +1,53 @@
+/*
+
+QMK Firmware for dekuNukem/duckyPad
+
+Copyright (C) 2020 Anthony Som
+
+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 3 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 "duckypad.h"
+
+led_config_t g_led_config = { {
+    { 2, 1, 0, 3, 4, 5, 8, 7, 6, 9, 10, 11, 14, 13, 12, NO_LED, NO_LED }
+}, {
+    {224, 0},
+    {112, 0},
+    {0, 0},
+    {0, 16},
+    {112, 16},
+    {224, 16},
+    {224, 32},
+    {112, 32},
+    {0, 32},
+    {0, 48},
+    {112, 48},
+    {224, 48},
+    {224, 64},
+    {112, 64},
+    {0, 64},
+}, {
+    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+} };
+
+void keyboard_pre_init_kb(void) {
+    setPinOutput(A0);
+    writePinHigh(A0);
+    writePinLow(A0);
+    wait_ms(10);
+    writePinHigh(A0);
+
+    keyboard_pre_init_user();
+}
diff --git a/qmk/keyboards/dekunukem/duckypad/duckypad.h b/qmk/keyboards/dekunukem/duckypad/duckypad.h
new file mode 100644
index 00000000..abde7aac
--- /dev/null
+++ b/qmk/keyboards/dekunukem/duckypad/duckypad.h
@@ -0,0 +1,32 @@
+/*
+
+QMK Firmware for dekuNukem/duckyPad
+
+Copyright (C) 2020 Anthony Som
+
+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 3 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( \
+    k00, k01, k02, \
+    k10, k11, k12, \
+    k20, k21, k22, \
+    k30, k31, k32, \
+    k40, k41, k42, \
+    kDown, kUp \
+) {{k00, k01, k02, k10, k11, k12, k20, k21, k22, k30, k31, k32, k40, k41, k42, kDown, kUp}}
diff --git a/qmk/keyboards/dekunukem/duckypad/halconf.h b/qmk/keyboards/dekunukem/duckypad/halconf.h
new file mode 100644
index 00000000..d08e8846
--- /dev/null
+++ b/qmk/keyboards/dekunukem/duckypad/halconf.h
@@ -0,0 +1,525 @@
+/*
+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+/**
+ * @file    templates/halconf.h
+ * @brief   HAL configuration header.
+ * @details HAL configuration file, this file allows to enable or disable the
+ *          various device drivers from your application. You may also use
+ *          this file in order to override the device drivers default settings.
+ *
+ * @addtogroup HAL_CONF
+ * @{
+ */
+
+#ifndef HALCONF_H
+#define HALCONF_H
+
+#define _CHIBIOS_HAL_CONF_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
+
+#include "mcuconf.h"
+
+/**
+ * @brief   Enables the PAL subsystem.
+ */
+#if !defined(HAL_USE_PAL) || defined(__DOXYGEN__)
+#define HAL_USE_PAL                         TRUE
+#endif
+
+/**
+ * @brief   Enables the ADC subsystem.
+ */
+#if !defined(HAL_USE_ADC) || defined(__DOXYGEN__)
+#define HAL_USE_ADC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the CAN subsystem.
+ */
+#if !defined(HAL_USE_CAN) || defined(__DOXYGEN__)
+#define HAL_USE_CAN                         FALSE
+#endif
+
+/**
+ * @brief   Enables the cryptographic subsystem.
+ */
+#if !defined(HAL_USE_CRY) || defined(__DOXYGEN__)
+#define HAL_USE_CRY                         FALSE
+#endif
+
+/**
+ * @brief   Enables the DAC subsystem.
+ */
+#if !defined(HAL_USE_DAC) || defined(__DOXYGEN__)
+#define HAL_USE_DAC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the GPT subsystem.
+ */
+#if !defined(HAL_USE_GPT) || defined(__DOXYGEN__)
+#define HAL_USE_GPT                         FALSE
+#endif
+
+/**
+ * @brief   Enables the I2C subsystem.
+ */
+#if !defined(HAL_USE_I2C) || defined(__DOXYGEN__)
+#define HAL_USE_I2C                         TRUE
+#endif
+
+/**
+ * @brief   Enables the I2S subsystem.
+ */
+#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)
+#define HAL_USE_I2S                         FALSE
+#endif
+
+/**
+ * @brief   Enables the ICU subsystem.
+ */
+#if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)
+#define HAL_USE_ICU                         FALSE
+#endif
+
+/**
+ * @brief   Enables the MAC subsystem.
+ */
+#if !defined(HAL_USE_MAC) || defined(__DOXYGEN__)
+#define HAL_USE_MAC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the MMC_SPI subsystem.
+ */
+#if !defined(HAL_USE_MMC_SPI) || defined(__DOXYGEN__)
+#define HAL_USE_MMC_SPI                     TRUE
+#endif
+
+/**
+ * @brief   Enables the PWM subsystem.
+ */
+#if !defined(HAL_USE_PWM) || defined(__DOXYGEN__)
+#define HAL_USE_PWM                         TRUE
+#endif
+
+/**
+ * @brief   Enables the RTC subsystem.
+ */
+#if !defined(HAL_USE_RTC) || defined(__DOXYGEN__)
+#define HAL_USE_RTC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the SDC subsystem.
+ */
+#if !defined(HAL_USE_SDC) || defined(__DOXYGEN__)
+#define HAL_USE_SDC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the SERIAL subsystem.
+ */
+#if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__)
+#define HAL_USE_SERIAL                      FALSE
+#endif
+
+/**
+ * @brief   Enables the SERIAL over USB subsystem.
+ */
+#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)
+#define HAL_USE_SERIAL_USB                  FALSE
+#endif
+
+/**
+ * @brief   Enables the SIO subsystem.
+ */
+#if !defined(HAL_USE_SIO) || defined(__DOXYGEN__)
+#define HAL_USE_SIO                         FALSE
+#endif
+
+/**
+ * @brief   Enables the SPI subsystem.
+ */
+#if !defined(HAL_USE_SPI) || defined(__DOXYGEN__)
+#define HAL_USE_SPI                         TRUE
+#endif
+
+/**
+ * @brief   Enables the TRNG subsystem.
+ */
+#if !defined(HAL_USE_TRNG) || defined(__DOXYGEN__)
+#define HAL_USE_TRNG                        FALSE
+#endif
+
+/**
+ * @brief   Enables the UART subsystem.
+ */
+#if !defined(HAL_USE_UART) || defined(__DOXYGEN__)
+#define HAL_USE_UART                        FALSE
+#endif
+
+/**
+ * @brief   Enables the USB subsystem.
+ */
+#if !defined(HAL_USE_USB) || defined(__DOXYGEN__)
+#define HAL_USE_USB                         TRUE
+#endif
+
+/**
+ * @brief   Enables the WDG subsystem.
+ */
+#if !defined(HAL_USE_WDG) || defined(__DOXYGEN__)
+#define HAL_USE_WDG                         FALSE
+#endif
+
+/**
+ * @brief   Enables the WSPI subsystem.
+ */
+#if !defined(HAL_USE_WSPI) || defined(__DOXYGEN__)
+#define HAL_USE_WSPI                        FALSE
+#endif
+
+/*===========================================================================*/
+/* PAL driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(PAL_USE_CALLBACKS) || defined(__DOXYGEN__)
+#define PAL_USE_CALLBACKS                   FALSE
+#endif
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(PAL_USE_WAIT) || defined(__DOXYGEN__)
+#define PAL_USE_WAIT                        FALSE
+#endif
+
+/*===========================================================================*/
+/* ADC driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(ADC_USE_WAIT) || defined(__DOXYGEN__)
+#define ADC_USE_WAIT                        TRUE
+#endif
+
+/**
+ * @brief   Enables the @p adcAcquireBus() and @p adcReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(ADC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define ADC_USE_MUTUAL_EXCLUSION            TRUE
+#endif
+
+/*===========================================================================*/
+/* CAN driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Sleep mode related APIs inclusion switch.
+ */
+#if !defined(CAN_USE_SLEEP_MODE) || defined(__DOXYGEN__)
+#define CAN_USE_SLEEP_MODE                  TRUE
+#endif
+
+/**
+ * @brief   Enforces the driver to use direct callbacks rather than OSAL events.
+ */
+#if !defined(CAN_ENFORCE_USE_CALLBACKS) || defined(__DOXYGEN__)
+#define CAN_ENFORCE_USE_CALLBACKS           FALSE
+#endif
+
+/*===========================================================================*/
+/* CRY driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables the SW fall-back of the cryptographic driver.
+ * @details When enabled, this option, activates a fall-back software
+ *          implementation for algorithms not supported by the underlying
+ *          hardware.
+ * @note    Fall-back implementations may not be present for all algorithms.
+ */
+#if !defined(HAL_CRY_USE_FALLBACK) || defined(__DOXYGEN__)
+#define HAL_CRY_USE_FALLBACK                FALSE
+#endif
+
+/**
+ * @brief   Makes the driver forcibly use the fall-back implementations.
+ */
+#if !defined(HAL_CRY_ENFORCE_FALLBACK) || defined(__DOXYGEN__)
+#define HAL_CRY_ENFORCE_FALLBACK            FALSE
+#endif
+
+/*===========================================================================*/
+/* DAC driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(DAC_USE_WAIT) || defined(__DOXYGEN__)
+#define DAC_USE_WAIT                        TRUE
+#endif
+
+/**
+ * @brief   Enables the @p dacAcquireBus() and @p dacReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(DAC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define DAC_USE_MUTUAL_EXCLUSION            TRUE
+#endif
+
+/*===========================================================================*/
+/* I2C driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables the mutual exclusion APIs on the I2C bus.
+ */
+#if !defined(I2C_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define I2C_USE_MUTUAL_EXCLUSION            TRUE
+#endif
+
+/*===========================================================================*/
+/* MAC driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables the zero-copy API.
+ */
+#if !defined(MAC_USE_ZERO_COPY) || defined(__DOXYGEN__)
+#define MAC_USE_ZERO_COPY                   FALSE
+#endif
+
+/**
+ * @brief   Enables an event sources for incoming packets.
+ */
+#if !defined(MAC_USE_EVENTS) || defined(__DOXYGEN__)
+#define MAC_USE_EVENTS                      TRUE
+#endif
+
+/*===========================================================================*/
+/* MMC_SPI driver related settings.                                          */
+/*===========================================================================*/
+
+/**
+ * @brief   Delays insertions.
+ * @details If enabled this options inserts delays into the MMC waiting
+ *          routines releasing some extra CPU time for the threads with
+ *          lower priority, this may slow down the driver a bit however.
+ *          This option is recommended also if the SPI driver does not
+ *          use a DMA channel and heavily loads the CPU.
+ */
+#if !defined(MMC_NICE_WAITING) || defined(__DOXYGEN__)
+#define MMC_NICE_WAITING                    TRUE
+#endif
+
+/*===========================================================================*/
+/* SDC driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Number of initialization attempts before rejecting the card.
+ * @note    Attempts are performed at 10mS intervals.
+ */
+#if !defined(SDC_INIT_RETRY) || defined(__DOXYGEN__)
+#define SDC_INIT_RETRY                      100
+#endif
+
+/**
+ * @brief   Include support for MMC cards.
+ * @note    MMC support is not yet implemented so this option must be kept
+ *          at @p FALSE.
+ */
+#if !defined(SDC_MMC_SUPPORT) || defined(__DOXYGEN__)
+#define SDC_MMC_SUPPORT                     FALSE
+#endif
+
+/**
+ * @brief   Delays insertions.
+ * @details If enabled this options inserts delays into the MMC waiting
+ *          routines releasing some extra CPU time for the threads with
+ *          lower priority, this may slow down the driver a bit however.
+ */
+#if !defined(SDC_NICE_WAITING) || defined(__DOXYGEN__)
+#define SDC_NICE_WAITING                    TRUE
+#endif
+
+/**
+ * @brief   OCR initialization constant for V20 cards.
+ */
+#if !defined(SDC_INIT_OCR_V20) || defined(__DOXYGEN__)
+#define SDC_INIT_OCR_V20                    0x50FF8000U
+#endif
+
+/**
+ * @brief   OCR initialization constant for non-V20 cards.
+ */
+#if !defined(SDC_INIT_OCR) || defined(__DOXYGEN__)
+#define SDC_INIT_OCR                        0x80100000U
+#endif
+
+/*===========================================================================*/
+/* SERIAL driver related settings.                                           */
+/*===========================================================================*/
+
+/**
+ * @brief   Default bit rate.
+ * @details Configuration parameter, this is the baud rate selected for the
+ *          default configuration.
+ */
+#if !defined(SERIAL_DEFAULT_BITRATE) || defined(__DOXYGEN__)
+#define SERIAL_DEFAULT_BITRATE              38400
+#endif
+
+/**
+ * @brief   Serial buffers size.
+ * @details Configuration parameter, you can change the depth of the queue
+ *          buffers depending on the requirements of your application.
+ * @note    The default is 16 bytes for both the transmission and receive
+ *          buffers.
+ */
+#if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__)
+#define SERIAL_BUFFERS_SIZE                 16
+#endif
+
+/*===========================================================================*/
+/* SERIAL_USB driver related setting.                                        */
+/*===========================================================================*/
+
+/**
+ * @brief   Serial over USB buffers size.
+ * @details Configuration parameter, the buffer size must be a multiple of
+ *          the USB data endpoint maximum packet size.
+ * @note    The default is 256 bytes for both the transmission and receive
+ *          buffers.
+ */
+#if !defined(SERIAL_USB_BUFFERS_SIZE) || defined(__DOXYGEN__)
+#define SERIAL_USB_BUFFERS_SIZE             1
+#endif
+
+/**
+ * @brief   Serial over USB number of buffers.
+ * @note    The default is 2 buffers.
+ */
+#if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
+#define SERIAL_USB_BUFFERS_NUMBER           2
+#endif
+
+/*===========================================================================*/
+/* SPI driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(SPI_USE_WAIT) || defined(__DOXYGEN__)
+#define SPI_USE_WAIT                        TRUE
+#endif
+
+/**
+ * @brief   Enables circular transfers APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(SPI_USE_CIRCULAR) || defined(__DOXYGEN__)
+#define SPI_USE_CIRCULAR                    FALSE
+#endif
+
+
+/**
+ * @brief   Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(SPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define SPI_USE_MUTUAL_EXCLUSION            TRUE
+#endif
+
+/**
+ * @brief   Handling method for SPI CS line.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(SPI_SELECT_MODE) || defined(__DOXYGEN__)
+#define SPI_SELECT_MODE                     SPI_SELECT_MODE_PAD
+#endif
+
+/*===========================================================================*/
+/* UART driver related settings.                                             */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(UART_USE_WAIT) || defined(__DOXYGEN__)
+#define UART_USE_WAIT                       FALSE
+#endif
+
+/**
+ * @brief   Enables the @p uartAcquireBus() and @p uartReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(UART_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define UART_USE_MUTUAL_EXCLUSION           FALSE
+#endif
+
+/*===========================================================================*/
+/* USB driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(USB_USE_WAIT) || defined(__DOXYGEN__)
+#define USB_USE_WAIT                        TRUE
+#endif
+
+/*===========================================================================*/
+/* WSPI driver related settings.                                             */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(WSPI_USE_WAIT) || defined(__DOXYGEN__)
+#define WSPI_USE_WAIT                       TRUE
+#endif
+
+/**
+ * @brief   Enables the @p wspiAcquireBus() and @p wspiReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(WSPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define WSPI_USE_MUTUAL_EXCLUSION           TRUE
+#endif
+
+#endif /* HALCONF_H */
+
+/** @} */
diff --git a/qmk/keyboards/dekunukem/duckypad/info.json b/qmk/keyboards/dekunukem/duckypad/info.json
new file mode 100644
index 00000000..664e9314
--- /dev/null
+++ b/qmk/keyboards/dekunukem/duckypad/info.json
@@ -0,0 +1,30 @@
+{
+    "keyboard_name": "duckyPad",
+    "url": "https://github.com/dekuNukem/",
+    "maintainer": "M4cs",
+    "width": 3,
+    "height": 5,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 0, "y": 1},
+                {"x": 1, "y": 1},
+                {"x": 2, "y": 1},
+                {"x": 0, "y": 2},
+                {"x": 1, "y": 2},
+                {"x": 2, "y": 2},
+                {"x": 0, "y": 3},
+                {"x": 1, "y": 3},
+                {"x": 2, "y": 3},
+                {"x": 0, "y": 4},
+                {"x": 1, "y": 4},
+                {"x": 2, "y": 4},
+                {"x": 3, "y": 4},
+                {"x": 4, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/qmk/keyboards/dekunukem/duckypad/keymaps/default/config.h b/qmk/keyboards/dekunukem/duckypad/keymaps/default/config.h
new file mode 100644
index 00000000..9d26b711
--- /dev/null
+++ b/qmk/keyboards/dekunukem/duckypad/keymaps/default/config.h
@@ -0,0 +1,59 @@
+/*
+
+Default Keymap Config for dekuNukem/duckyPad QMK firmware
+
+Copyright (C) 2020 Max Bridgland
+
+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 3 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
+
+#define NO_ACTION_FUNCTION
+#define NO_ACTION_ONESHOT
+
+#define OLED_TIMEOUT 90000
+#define RGB_DISABLE_TIMEOUT 90000
+
+#define MT_0_0 "   1  "
+#define MT_0_1 "   2  "
+#define MT_0_2 "   3  "
+#define MT_0_3 "   4  "
+#define MT_0_4 "   5  "
+#define MT_0_5 "   6  "
+#define MT_0_6 "   7  "
+#define MT_0_7 "   8  "
+#define MT_0_8 "   9  "
+#define MT_0_9 "   .  "
+#define MT_0_10 "   0  "
+#define MT_0_11 "   =  "
+#define MT_0_12 "   -  "
+#define MT_0_13 "   +  "
+#define MT_0_14 " enter"
+
+#define MT_1_0 " stat "
+#define MT_1_1 " brth "
+#define MT_1_2 " rbow "
+#define MT_1_3 " swrl "
+#define MT_1_4 " spd- "
+#define MT_1_5 " spd+ "
+#define MT_1_6 " eff- "
+#define MT_1_7 " sat- "
+#define MT_1_8 " sat+ "
+#define MT_1_9 " eff+ "
+#define MT_1_10 " hue- "
+#define MT_1_11 " hue+ "
+#define MT_1_12 " powr "
+#define MT_1_13 " bri- "
+#define MT_1_14 " bri+ "
diff --git a/qmk/keyboards/dekunukem/duckypad/keymaps/default/keymap.c b/qmk/keyboards/dekunukem/duckypad/keymaps/default/keymap.c
new file mode 100644
index 00000000..a87caa2c
--- /dev/null
+++ b/qmk/keyboards/dekunukem/duckypad/keymaps/default/keymap.c
@@ -0,0 +1,159 @@
+/*
+
+Default Keymap for dekuNukem/duckyPad QMK firmware
+
+Copyright (C) 2020 Max Bridgland
+
+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 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+#include <stdio.h>
+#include <unistd.h>
+#include <string.h>
+
+#define LOGO_SIZE 384
+
+bool rgbToggled = false;
+
+enum layer_codes {
+  RGB_LAYER = SAFE_RANGE
+};
+
+enum my_keycodes {
+    Z0 = SAFE_RANGE, Z1, Z2,
+    Z3, Z4, Z5,
+    Z6, Z7, Z8,
+    Z9, Z10, Z11,
+    Z12, Z13, Z14
+};
+
+#define _DEFAULT 0
+#define _RGB 1
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  /*
+  ,=========================================.
+  | Numpad 1    | Numpad 2    | Numpad 3    |
+  |=========================================|
+  | Numpad 4    | Numpad 5    | Numpad 6    |
+  |=========================================|
+  | Numpad 7    | Numpad 8    | Numpad 9    |
+  |=========================================|
+  | Numpad .    | Numpad 0    |  Numpad =   |
+  |=========================================| ,---------------------.
+  |  Numpad -   |  Numpad +   |  Numpad *   | | RGB Menu | Blank    |
+  `=========================================' `--------------------'
+  */
+  [_DEFAULT] = LAYOUT(
+      KC_P1, KC_P2, KC_P3,
+      KC_P4, KC_P5, KC_P6,
+      KC_P7, KC_P8, KC_P9,
+      KC_PDOT, KC_P0, KC_PENT,
+      KC_PMNS, KC_PPLS, KC_EQL,
+      RGB_LAYER, KC_NO
+  ),
+  /*
+  ,=========================================.
+  | Plain RGB   | Breathe RGB | Rainbow RGB |
+  |=========================================|
+  | Swirl RGB   | Speed Down  | Speed Up    |
+  |=========================================|
+  | Effect Up   | Sat. Down   | Sat. Up     |
+  |=========================================|
+  | Effect Down | Hue Down    | Hue Up      |
+  |=========================================| ,----------------------.
+  | Toggle RGB  | Brt. Down   | Brt. Up     | | Norm Menu | Blank    |
+  `=========================================' `---------------------'
+  */
+  [_RGB] = LAYOUT(
+      RGB_MODE_PLAIN, RGB_MODE_BREATHE, RGB_MODE_RAINBOW,
+      RGB_MODE_SWIRL, RGB_SPD, RGB_SPI,
+      RGB_MOD, RGB_SAD, RGB_SAI,
+      RGB_RMOD, RGB_HUD, RGB_HUI,
+      RGB_TOG, RGB_VAD, RGB_VAI,
+      RGB_LAYER, KC_NO
+  )
+};
+
+static void render_logo(void) {
+   static const char PROGMEM ducky_logo[LOGO_SIZE] = {
+      0, 0, 0, 0,128,128,128,128,128, 0, 0,252,252,252, 0, 0, 0,128,128,128, 0, 0, 0, 0, 0,128,128,128, 0, 0, 0, 0, 0,128,128,128,128,128, 0, 0, 0, 0, 0,252,252,252, 0, 0, 0, 0, 0,128,128,128,128,128,128, 0, 0, 0, 0, 0, 0,128,128,128,128, 0,248,248,248, 56, 56, 56, 56, 56, 56,120,240,224,192, 0, 0,128,128,128,128,128,128, 0, 0, 0, 0, 0, 0, 0, 0,128,128,128,128,128, 0, 0,252,252,252, 0, 0, 0, 0, 0,232, 24, 24,232, 0, 24, 48, 48, 24, 0,232, 24, 24,232, 0, 0,
+      0,248,254,255,143, 7, 3, 3, 3, 7,142,255,255,255, 0, 0, 0,255,255,255, 0, 0, 0, 0, 0,255,255,255, 0,248,254,255,143, 7, 3, 3, 3, 3,143, 7, 2, 0, 0,255,255,255,240,120,252,254,231,131, 1, 0, 1, 7, 63,254,240,192, 0,224,252,127, 31, 3, 0, 0,255,255,255,112,112,112,112,112,112, 56, 63, 31, 15,193,231,243,115, 51, 51, 51, 55,255,255,252, 0, 0,248,254,255,143, 7, 3, 3, 3, 7,142,255,255,255, 0, 0, 0, 0, 0, 21,127,127,252,252,252,253,253,252,252,252,255,255,255, 0, 0,
+      0, 0, 3, 7, 15, 15, 14, 14, 14, 7, 3, 15, 15, 15, 0, 0, 0, 3, 7, 15, 15, 14, 14, 6, 3, 15, 15, 15, 0, 0, 3, 7, 7, 15, 14, 14, 14, 14, 7, 7, 2, 0, 0, 15, 15, 15, 0, 0, 0, 1, 3, 15, 15, 12,136,224,224,224,247,127,127, 31, 3, 0, 0, 0, 0, 0, 15, 15, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 7, 15, 14, 14, 14, 6, 3, 15, 15, 15, 0, 0, 0, 3, 7, 15, 15, 14, 14, 14, 7, 3, 15, 15, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 7, 11, 3, 11, 7, 11, 7, 7, 31, 0, 0
+   };
+   oled_write_raw_P(ducky_logo, LOGO_SIZE);
+}
+
+char* make_menu_text(void){
+  char *s = malloc((30 * 6) * sizeof(*s));
+  int width = 3;
+  sprintf(s, "%-*s %-*s %-*s\n%-*s %-*s %-*s\n%-*s %-*s %-*s\n%-*s %-*s %-*s\n%-*s %-*s %-*s",
+    width, MT_0_0, width, MT_0_1, width, MT_0_2,
+    width, MT_0_3, width, MT_0_4, width, MT_0_5,
+    width, MT_0_6, width, MT_0_7, width, MT_0_8,
+    width, MT_0_9, width, MT_0_10, width,MT_0_11,
+    width, MT_0_12, width, MT_0_13, width, MT_0_14
+  );
+  return s;
+};
+
+char* make_rgb_text(void){
+  char *s = malloc((30 * 6) * sizeof(*s));
+  int width = 3;
+  sprintf(
+    s, "%-*s %-*s %-*s\n%-*s %-*s %-*s\n%-*s %-*s %-*s\n%-*s %-*s %-*s\n%-*s %-*s %-*s",
+    width, MT_1_0, width, MT_1_1, width, MT_1_2,
+    width, MT_1_3, width, MT_1_4, width, MT_1_5,
+    width, MT_1_6, width, MT_1_7, width, MT_1_8,
+    width, MT_1_9, width, MT_1_10, width,MT_1_11,
+    width, MT_1_12, width, MT_1_13, width, MT_1_14
+  );
+  return s;
+};
+
+void oled_task_user(void) {
+  render_logo();
+  oled_set_cursor(0,3);
+  if (rgbToggled) {
+    char *s = make_rgb_text();
+    oled_write_ln_P(s, false);
+    free(s);
+  } else {
+    char *s = make_menu_text();
+    oled_write_ln_P(s, false);
+    free(s);
+  }
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  switch (keycode) {
+    case RGB_LAYER:
+      if (record->event.pressed) {
+        if (rgbToggled) {
+          rgbToggled = false;
+          layer_clear();
+        } else {
+          rgbToggled = true;
+          layer_on(_RGB);
+        }
+      }
+      return false;
+    default:
+      return true;
+  }
+  return false;
+}
diff --git a/qmk/keyboards/dekunukem/duckypad/keymaps/default/readme.md b/qmk/keyboards/dekunukem/duckypad/keymaps/default/readme.md
new file mode 100644
index 00000000..0240cd57
--- /dev/null
+++ b/qmk/keyboards/dekunukem/duckypad/keymaps/default/readme.md
@@ -0,0 +1,19 @@
+Default duckyPad Layout
+
+### Layers:
+
+0: Default Layer w/ Numpad Functionality
+
+1: RGB Menu that allows RGB customization
+
+### Configuration:
+
+To change the menu, edit the `MT_X_XX` values in `config.h`. The sytax is as follows: `MT_A_B`, where A equals the layer, and B equals the key from 0-14.
+
+### Need Help?
+
+Contact me on discord: macs#0420
+
+or join the duckyPad Discord and find me in there :)
+
+https://discord.gg/ADtrCjf
diff --git a/qmk/keyboards/dekunukem/duckypad/keymaps/m4cs/config.h b/qmk/keyboards/dekunukem/duckypad/keymaps/m4cs/config.h
new file mode 100644
index 00000000..7d0bbb13
--- /dev/null
+++ b/qmk/keyboards/dekunukem/duckypad/keymaps/m4cs/config.h
@@ -0,0 +1,75 @@
+/*
+
+M4cs Keymap for dekuNukem/duckyPad QMK firmware
+
+Copyright (C) 2020 Max Bridgland
+
+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 3 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
+
+#define NO_ACTION_FUNCTION
+#define NO_ACTION_ONESHOT
+
+#define OLED_TIMEOUT 90000
+#define RGB_DISABLE_TIMEOUT 90000
+
+#define MT_0_0 " prev "
+#define MT_0_1 " pl/pa"
+#define MT_0_2 " next "
+#define MT_0_3 " volx "
+#define MT_0_4 " vol- "
+#define MT_0_5 " vol+ "
+#define MT_0_6 " spot "
+#define MT_0_7 " ffox "
+#define MT_0_8 " code "
+#define MT_0_9 " term "
+#define MT_0_10 " steam"
+#define MT_0_11 " dscd "
+#define MT_0_12 "      "
+#define MT_0_13 " micx "
+#define MT_0_14 "      "
+
+#define MT_1_0 " stat "
+#define MT_1_1 " brth "
+#define MT_1_2 " rbow "
+#define MT_1_3 " swrl "
+#define MT_1_4 " spd- "
+#define MT_1_5 " spd+ "
+#define MT_1_6 " eff- "
+#define MT_1_7 " sat- "
+#define MT_1_8 " sat+ "
+#define MT_1_9 " eff+ "
+#define MT_1_10 " hue- "
+#define MT_1_11 " hue+ "
+#define MT_1_12 " powr "
+#define MT_1_13 " bri- "
+#define MT_1_14 " bri+ "
+
+#define MT_2_0 "      "
+#define MT_2_1 "      "
+#define MT_2_2 "      "
+#define MT_2_3 " undo "
+#define MT_2_4 "  cut "
+#define MT_2_5 " copy "
+#define MT_2_6 " paste"
+#define MT_2_7 " find "
+#define MT_2_8 " pscr "
+#define MT_2_9 "      "
+#define MT_2_10 "      "
+#define MT_2_11 "      "
+#define MT_2_12 "      "
+#define MT_2_13 "      "
+#define MT_2_14 "      "
diff --git a/qmk/keyboards/dekunukem/duckypad/keymaps/m4cs/keymap.c b/qmk/keyboards/dekunukem/duckypad/keymaps/m4cs/keymap.c
new file mode 100644
index 00000000..2ce15d7e
--- /dev/null
+++ b/qmk/keyboards/dekunukem/duckypad/keymaps/m4cs/keymap.c
@@ -0,0 +1,236 @@
+/*
+
+M4cs Keymap for dekuNukem/duckyPad QMK firmware
+
+Copyright (C) 2020 Max Bridgland
+
+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 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+#include "stdio.h"
+#include <unistd.h>
+#include <string.h>
+
+#define LOGO_SIZE 384
+
+bool rgbToggled = false;
+bool altToggled = false;
+
+enum layer_codes {
+  RGB_LAYER = SAFE_RANGE,
+  ALT_LAYER
+};
+
+enum my_keycodes {
+    Z0 = SAFE_RANGE, Z1, Z2,
+    Z3, Z4, Z5,
+    Z6, Z7, Z8,
+    Z9, Z10, Z11,
+    Z12, Z13, Z14
+};
+
+#define MAC_1 LCTL(LALT(KC_MINS))
+#define MAC_2 LCTL(LALT(KC_EQL))
+#define MAC_3 LCTL(LALT(KC_LBRC))
+#define MAC_4 LCTL(LALT(KC_RBRC))
+#define MAC_5 LCTL(LALT(KC_BSLS))
+#define MAC_6 LCTL(LALT(KC_SCLN))
+#define MAC_7 LCTL(LALT(KC_QUOT))
+#define MAC_8 LCTL(LALT(KC_COMM))
+#define MAC_9 LCTL(LALT(KC_SLSH))
+
+#define MAC_10 LCTL(LSFT(KC_MINS))
+#define MAC_11 LCTL(LSFT(KC_EQL))
+#define MAC_12 LCTL(LSFT(KC_SLSH))
+#define MAC_13 LCTL(LSFT(KC_LBRC))
+#define MAC_14 LCTL(LSFT(KC_RBRC))
+#define MAC_15 LCTL(LSFT(KC_BSLS))
+#define MAC_16 LCTL(LSFT(KC_SCLN))
+#define MAC_17 LCTL(LSFT(KC_QUOT))
+#define MAC_18 LCTL(LSFT(KC_COMM))
+
+#define _DEFAULT 0
+#define _RGB 1
+#define _ALT 2
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  /*
+  ,=========================================.
+  | Media Prev. | Media Play  | Media Next  |
+  |=========================================|
+  | Mute Sound  | Volume Do.  | Volume Up   |
+  |=========================================|
+  | Macro 1     | Macro 2     | Macro 3     |
+  |=========================================|
+  | Macro 4     | Macro 5     | Macro 6     |
+  |=========================================| ,---------------------.
+  | Macro 7     | Macro 8     | Macro 9     | | RGB Menu | Alt Menu |
+  `=========================================' `--------------------'
+  */
+  [_DEFAULT] = LAYOUT(
+      KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK,
+      KC_AUDIO_MUTE, KC_AUDIO_VOL_DOWN, KC_AUDIO_VOL_UP,
+      MAC_1, MAC_2, MAC_3,
+      MAC_4, MAC_5, MAC_6,
+      MAC_7, MAC_8, MAC_9,
+      RGB_LAYER, ALT_LAYER
+  ),
+  /*
+  ,=========================================.
+  | Plain RGB   | Breathe RGB | Rainbow RGB |
+  |=========================================|
+  | Swirl RGB   | Speed Down  | Speed Up    |
+  |=========================================|
+  | Effect Up   | Sat. Down   | Sat. Up     |
+  |=========================================|
+  | Effect Down | Hue Down    | Hue Up      |
+  |=========================================| ,----------------------.
+  | Toggle RGB  | Brt. Down   | Brt. Up     | | Norm Menu | Alt Menu |
+  `=========================================' `---------------------'
+  */
+  [_RGB] = LAYOUT(
+      RGB_MODE_PLAIN, RGB_MODE_BREATHE, RGB_MODE_RAINBOW,
+      RGB_MODE_SWIRL, RGB_SPD, RGB_SPI,
+      RGB_MOD, RGB_SAD, RGB_SAI,
+      RGB_RMOD, RGB_HUD, RGB_HUI,
+      RGB_TOG, RGB_VAD, RGB_VAI,
+      RGB_LAYER, ALT_LAYER
+  ),
+  /*
+  ,=========================================.
+  | Macro 10    | Macro 11    | Macro 12    |
+  |=========================================|
+  | Undo        | Cut         | Copy        |
+  |=========================================|
+  | Paste       | Find        | Prnt Scrn.  |
+  |=========================================|
+  | Macro 13    | Macro 14    | Macro 15    |
+  |=========================================| ,----------------------.
+  | Macro 16    | Macro 17    | Macro 18    | | Norm Menu | Alt Menu |
+  `=========================================' `---------------------'
+  */
+  [_ALT] = LAYOUT(
+      MAC_10, MAC_11, MAC_12,
+      KC_UNDO, KC_CUT, KC_COPY,
+      KC_PASTE, KC_FIND, KC_PSCR,
+      MAC_13, MAC_14, MAC_15,
+      MAC_16, MAC_17, MAC_18,
+      RGB_LAYER, ALT_LAYER
+  )
+};
+
+static void render_logo(void) {
+   static const char PROGMEM ducky_logo[LOGO_SIZE] = {
+      0, 0, 0, 0,128,128,128,128,128, 0, 0,252,252,252, 0, 0, 0,128,128,128, 0, 0, 0, 0, 0,128,128,128, 0, 0, 0, 0, 0,128,128,128,128,128, 0, 0, 0, 0, 0,252,252,252, 0, 0, 0, 0, 0,128,128,128,128,128,128, 0, 0, 0, 0, 0, 0,128,128,128,128, 0,248,248,248, 56, 56, 56, 56, 56, 56,120,240,224,192, 0, 0,128,128,128,128,128,128, 0, 0, 0, 0, 0, 0, 0, 0,128,128,128,128,128, 0, 0,252,252,252, 0, 0, 0, 0, 0,232, 24, 24,232, 0, 24, 48, 48, 24, 0,232, 24, 24,232, 0, 0,
+      0,248,254,255,143, 7, 3, 3, 3, 7,142,255,255,255, 0, 0, 0,255,255,255, 0, 0, 0, 0, 0,255,255,255, 0,248,254,255,143, 7, 3, 3, 3, 3,143, 7, 2, 0, 0,255,255,255,240,120,252,254,231,131, 1, 0, 1, 7, 63,254,240,192, 0,224,252,127, 31, 3, 0, 0,255,255,255,112,112,112,112,112,112, 56, 63, 31, 15,193,231,243,115, 51, 51, 51, 55,255,255,252, 0, 0,248,254,255,143, 7, 3, 3, 3, 7,142,255,255,255, 0, 0, 0, 0, 0, 21,127,127,252,252,252,253,253,252,252,252,255,255,255, 0, 0,
+      0, 0, 3, 7, 15, 15, 14, 14, 14, 7, 3, 15, 15, 15, 0, 0, 0, 3, 7, 15, 15, 14, 14, 6, 3, 15, 15, 15, 0, 0, 3, 7, 7, 15, 14, 14, 14, 14, 7, 7, 2, 0, 0, 15, 15, 15, 0, 0, 0, 1, 3, 15, 15, 12,136,224,224,224,247,127,127, 31, 3, 0, 0, 0, 0, 0, 15, 15, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 7, 15, 14, 14, 14, 6, 3, 15, 15, 15, 0, 0, 0, 3, 7, 15, 15, 14, 14, 14, 7, 3, 15, 15, 15, 0, 0, 0, 0, 0, 0, 0, 0, 0, 8, 7, 11, 3, 11, 7, 11, 7, 7, 31, 0, 0
+   };
+   oled_write_raw_P(ducky_logo, LOGO_SIZE);
+}
+
+char* make_menu_text(void){
+  char *s = malloc((30 * 3) * sizeof(*s));
+  int width = 3;
+  sprintf(s, "%-*s %-*s %-*s\n%-*s %-*s %-*s\n%-*s %-*s %-*s\n%-*s %-*s %-*s\n%-*s %-*s %-*s",
+    width, MT_0_0, width, MT_0_1, width, MT_0_2,
+    width, MT_0_3, width, MT_0_4, width, MT_0_5,
+    width, MT_0_6, width, MT_0_7, width, MT_0_8,
+    width, MT_0_9, width, MT_0_10, width,MT_0_11,
+    width, MT_0_12, width, MT_0_13, width, MT_0_14
+  );
+  return s;
+};
+
+char* make_rgb_text(void){
+  char *s = malloc((30 * 3) * sizeof(*s));
+  int width = 3;
+  sprintf(
+    s, "%-*s %-*s %-*s\n%-*s %-*s %-*s\n%-*s %-*s %-*s\n%-*s %-*s %-*s\n%-*s %-*s %-*s",
+    width, MT_1_0, width, MT_1_1, width, MT_1_2,
+    width, MT_1_3, width, MT_1_4, width, MT_1_5,
+    width, MT_1_6, width, MT_1_7, width, MT_1_8,
+    width, MT_1_9, width, MT_1_10, width,MT_1_11,
+    width, MT_1_12, width, MT_1_13, width, MT_1_14
+  );
+  return s;
+};
+
+char* make_alt_text(void){
+  char *s = malloc((30 * 3) * sizeof(*s));
+  int width = 3;
+  sprintf(
+    s, "%-*s %-*s %-*s\n%-*s %-*s %-*s\n%-*s %-*s %-*s\n%-*s %-*s %-*s\n%-*s %-*s %-*s",
+    width, MT_2_0, width, MT_2_1, width, MT_2_2,
+    width, MT_2_3, width, MT_2_4, width, MT_2_5,
+    width, MT_2_6, width, MT_2_7, width, MT_2_8,
+    width, MT_2_9, width, MT_2_10, width,MT_2_11,
+    width, MT_2_12, width, MT_2_13, width, MT_2_14
+  );
+  return s;
+};
+
+void oled_task_user(void) {
+  render_logo();
+  oled_set_cursor(0,3);
+  if (rgbToggled) {
+    char *s = make_rgb_text();
+    oled_write_ln_P(s, false);
+    free(s);
+  } else if (altToggled) {
+    char *s = make_alt_text();
+    oled_write_ln_P(s, false);
+    free(s);
+  } else {
+    char *s = make_menu_text();
+    oled_write_ln_P(s, false);
+    free(s);
+  }
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  switch (keycode) {
+    case RGB_LAYER:
+      if (record->event.pressed) {
+        if (rgbToggled) {
+          rgbToggled = false;
+          altToggled = false;
+          layer_clear();
+        } else {
+          rgbToggled = true;
+          altToggled = false;
+          layer_on(_RGB);
+        }
+      }
+      return false;
+    case ALT_LAYER:
+      if (record->event.pressed) {
+        if (altToggled) {
+          rgbToggled = false;
+          altToggled = false;
+          layer_clear();
+        } else {
+          rgbToggled = false;
+          altToggled = true;
+          layer_on(_ALT);
+        }
+      }
+      return false;
+    default:
+      return true;
+  }
+  return false;
+}
diff --git a/qmk/keyboards/dekunukem/duckypad/keymaps/m4cs/readme.md b/qmk/keyboards/dekunukem/duckypad/keymaps/m4cs/readme.md
new file mode 100644
index 00000000..42fae004
--- /dev/null
+++ b/qmk/keyboards/dekunukem/duckypad/keymaps/m4cs/readme.md
@@ -0,0 +1,25 @@
+[M4cs'](https://github.com/M4cs) duckyPad Layout
+
+### Layers:
+
+0: Default Layer w/ Media Functionality and Macros
+
+1: RGB Menu that allows RGB customization
+
+2: Alternate Macro Menu
+
+### Configuration:
+
+To change the menu, edit the `MT_X_XX` values in `config.h`. The sytax is as follows: `MT_A_B`, where A equals the layer, and B equals the key from 0-14.
+
+### Misc. Info:
+
+The macros currently just map to Ctrl + Alt + (Different Keys) right now. I have them launching certain shortcuts. I recommend you change these and add your shortcuts to match your shortcut manager.
+
+### Need Help?
+
+Contact me on discord: macs#0420
+
+or join the duckyPad Discord and find me in there :)
+
+https://discord.gg/ADtrCjf
\ No newline at end of file
diff --git a/qmk/keyboards/dekunukem/duckypad/keymaps/m4cs/rules.mk b/qmk/keyboards/dekunukem/duckypad/keymaps/m4cs/rules.mk
new file mode 100644
index 00000000..87065466
--- /dev/null
+++ b/qmk/keyboards/dekunukem/duckypad/keymaps/m4cs/rules.mk
@@ -0,0 +1,2 @@
+LTO_ENABLE = yes # Enable Link Time Optimization
+NO_USB_STARTUP_CHECK = yes # Disables usb suspend check after keyboard startup
diff --git a/qmk/keyboards/dekunukem/duckypad/mcuconf.h b/qmk/keyboards/dekunukem/duckypad/mcuconf.h
new file mode 100644
index 00000000..201db101
--- /dev/null
+++ b/qmk/keyboards/dekunukem/duckypad/mcuconf.h
@@ -0,0 +1,178 @@
+/*
+    ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
+/*
+ * STM32F0xx drivers configuration.
+ * The following settings override the default settings present in
+ * the various device driver implementation headers.
+ * Note that the settings for each driver only have effect if the whole
+ * driver is enabled in halconf.h.
+ *
+ * IRQ priorities:
+ * 3...0       Lowest...Highest.
+ *
+ * DMA priorities:
+ * 0...3        Lowest...Highest.
+ */
+
+#define STM32F0xx_MCUCONF
+// #define STM32F070xB
+
+/*
+ * HAL driver system settings.
+ */
+#define STM32_NO_INIT                       FALSE
+#define STM32_PVD_ENABLE                    FALSE
+#define STM32_PLS                           STM32_PLS_LEV0
+#define STM32_HSI_ENABLED                   TRUE
+#define STM32_HSI14_ENABLED                 TRUE
+#define STM32_HSI48_ENABLED                 FALSE
+#define STM32_LSI_ENABLED                   TRUE
+#define STM32_HSE_ENABLED                   FALSE
+#define STM32_LSE_ENABLED                   FALSE
+#define STM32_SW                            STM32_SW_PLL
+#define STM32_PLLSRC                        STM32_PLLSRC_HSI_DIV2
+#define STM32_PREDIV_VALUE                  1
+#define STM32_PLLMUL_VALUE                  12
+#define STM32_HPRE                          STM32_HPRE_DIV1
+#define STM32_PPRE                          STM32_PPRE_DIV1
+#define STM32_ADCSW                         STM32_ADCSW_HSI14
+#define STM32_ADCPRE                        STM32_ADCPRE_DIV4
+#define STM32_MCOSEL                        STM32_MCOSEL_NOCLOCK
+#define STM32_ADCPRE                        STM32_ADCPRE_DIV4
+#define STM32_ADCSW                         STM32_ADCSW_HSI14
+#define STM32_USBSW                         STM32_USBSW_HSI48
+#define STM32_CECSW                         STM32_CECSW_HSI
+#define STM32_I2C1SW                        STM32_I2C1SW_HSI
+#define STM32_USART1SW                      STM32_USART1SW_PCLK
+#define STM32_RTCSEL                        STM32_RTCSEL_LSI
+
+/*
+ * ADC driver system settings.
+ */
+#define STM32_ADC_USE_ADC1                  FALSE
+#define STM32_ADC_ADC1_DMA_PRIORITY         2
+#define STM32_ADC_IRQ_PRIORITY              2
+#define STM32_ADC_ADC1_DMA_IRQ_PRIORITY     2
+
+/*
+ * EXT driver system settings.
+ */
+#define STM32_EXT_EXTI0_1_IRQ_PRIORITY      3
+#define STM32_EXT_EXTI2_3_IRQ_PRIORITY      3
+#define STM32_EXT_EXTI4_15_IRQ_PRIORITY     3
+#define STM32_EXT_EXTI16_IRQ_PRIORITY       3
+#define STM32_EXT_EXTI17_IRQ_PRIORITY       3
+
+/*
+ * GPT driver system settings.
+ */
+#define STM32_GPT_USE_TIM1                  FALSE
+#define STM32_GPT_USE_TIM2                  FALSE
+#define STM32_GPT_USE_TIM3                  FALSE
+#define STM32_GPT_USE_TIM14                 FALSE
+#define STM32_GPT_TIM1_IRQ_PRIORITY         2
+#define STM32_GPT_TIM2_IRQ_PRIORITY         2
+#define STM32_GPT_TIM3_IRQ_PRIORITY         2
+#define STM32_GPT_TIM14_IRQ_PRIORITY        2
+
+/*
+ * I2C driver system settings.
+ */
+#define STM32_I2C_USE_I2C1                  TRUE
+#define STM32_I2C_USE_I2C2                  FALSE
+#define STM32_I2C_BUSY_TIMEOUT              50
+#define STM32_I2C_I2C1_IRQ_PRIORITY         3
+#define STM32_I2C_I2C2_IRQ_PRIORITY         3
+#define STM32_I2C_USE_DMA                   TRUE
+#define STM32_I2C_I2C1_DMA_PRIORITY         1
+#define STM32_I2C_I2C2_DMA_PRIORITY         1
+#define STM32_I2C_I2C1_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 3)
+#define STM32_I2C_I2C1_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 2)
+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")
+
+/*
+ * ICU driver system settings.
+ */
+#define STM32_ICU_USE_TIM1                  FALSE
+#define STM32_ICU_USE_TIM2                  FALSE
+#define STM32_ICU_USE_TIM3                  FALSE
+#define STM32_ICU_TIM1_IRQ_PRIORITY         3
+#define STM32_ICU_TIM2_IRQ_PRIORITY         3
+#define STM32_ICU_TIM3_IRQ_PRIORITY         3
+
+/*
+ * PWM driver system settings.
+ */
+#define STM32_PWM_USE_ADVANCED              FALSE
+#define STM32_PWM_USE_TIM1                  FALSE
+#define STM32_PWM_USE_TIM2                  FALSE
+#define STM32_PWM_USE_TIM3                  TRUE
+#define STM32_PWM_TIM1_IRQ_PRIORITY         3
+#define STM32_PWM_TIM2_IRQ_PRIORITY         3
+#define STM32_PWM_TIM3_IRQ_PRIORITY         3
+
+/*
+ * SERIAL driver system settings.
+ */
+#define STM32_SERIAL_USE_USART1             FALSE
+#define STM32_SERIAL_USE_USART2             FALSE
+#define STM32_SERIAL_USART1_PRIORITY        3
+#define STM32_SERIAL_USART2_PRIORITY        3
+
+/*
+ * SPI driver system settings.
+ */
+#define STM32_SPI_USE_SPI1                  TRUE
+#define STM32_SPI_USE_SPI2                  FALSE
+#define STM32_SPI_SPI1_DMA_PRIORITY         1
+#define STM32_SPI_SPI2_DMA_PRIORITY         1
+#define STM32_SPI_SPI1_IRQ_PRIORITY         2
+#define STM32_SPI_SPI2_IRQ_PRIORITY         2
+#define STM32_SPI_SPI1_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 2)
+#define STM32_SPI_SPI1_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 3)
+#define STM32_SPI_SPI2_RX_DMA_STREAM        STM32_DMA_STREAM_ID(2, 4)
+#define STM32_SPI_SPI2_TX_DMA_STREAM        STM32_DMA_STREAM_ID(2, 5)
+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")
+
+/*
+ * ST driver system settings.
+ */
+#define STM32_ST_IRQ_PRIORITY               2
+#define STM32_ST_USE_TIMER                  2
+
+/*
+ * UART driver system settings.
+ */
+#define STM32_UART_USE_USART1               FALSE
+#define STM32_UART_USE_USART2               FALSE
+#define STM32_UART_USART1_IRQ_PRIORITY      3
+#define STM32_UART_USART2_IRQ_PRIORITY      3
+#define STM32_UART_USART1_DMA_PRIORITY      0
+#define STM32_UART_USART2_DMA_PRIORITY      0
+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")
+
+/*
+ * USB driver system settings.
+ */
+#define STM32_USB_USE_USB1                  TRUE
+#define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE
+#define STM32_USB_USB1_LP_IRQ_PRIORITY      3
+
+#endif /* _MCUCONF_H_ */
diff --git a/qmk/keyboards/dekunukem/duckypad/readme.md b/qmk/keyboards/dekunukem/duckypad/readme.md
new file mode 100644
index 00000000..581f52c8
--- /dev/null
+++ b/qmk/keyboards/dekunukem/duckypad/readme.md
@@ -0,0 +1,16 @@
+# ![duckyPad](https://github.com/dekuNukem/duckyPad)
+
+A 15 Key Macropad w/ RGB and OLED
+
+* Keyboard Maintainer: [M4cs](https://github.com/M4cs) and [half-cambodian-hacker-man](https://github.com/half-cambodian-hacker-man)
+* Hardware Supported: All duckyPad Revisions
+
+Make example for this keyboard (after setting up your build environment):
+
+    make dekunukem/duckypad:default
+
+Flashing example for this keyboard:
+
+    make dekunukem/duckypad:default:flash
+
+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).
diff --git a/qmk/keyboards/dekunukem/duckypad/rules.mk b/qmk/keyboards/dekunukem/duckypad/rules.mk
new file mode 100644
index 00000000..2deef1ee
--- /dev/null
+++ b/qmk/keyboards/dekunukem/duckypad/rules.mk
@@ -0,0 +1,25 @@
+# MCU Name
+MCU = STM32F072
+
+# Build Options
+#  change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # 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
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+
+WS2812_DRIVER = bitbang
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = WS2812
+
+OLED_DRIVER_ENABLE = yes
diff --git a/qmk/keyboards/dk60/config.h b/qmk/keyboards/dk60/config.h
index 6a69516c..bec66541 100644
--- a/qmk/keyboards/dk60/config.h
+++ b/qmk/keyboards/dk60/config.h
@@ -15,36 +15,127 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef CONFIG_H
-    #define CONFIG_H
+#pragma once
 
-    #include "config_common.h"
+#include "config_common.h"
 
-    /* USB Device descriptor parameter */
-    #define VENDOR_ID       0xFEED
-    #define PRODUCT_ID      0x6060
-    #define DEVICE_VER      0x0001
-    #define MANUFACTURER    DARKOU
-    #define PRODUCT         DK60
-    #define DESCRIPTION     QMK keyboard firmware for DK60 support
+/* USB Device descriptor parameter */
+#define VENDOR_ID    0xFEED
+#define PRODUCT_ID   0x56C2
+#define DEVICE_VER   0x0001
+#define MANUFACTURER DARKOU
+#define PRODUCT      DK60
 
-    /* key matrix size */
-    #define MATRIX_ROWS 5
-    #define MATRIX_COLS 13
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 13
 
-    // ROWS: Top to bottom, COLS: Left to right
-    #define MATRIX_ROW_PINS { B6, B4, D7, D6, D4 }
-    #define MATRIX_COL_PINS { B0, B3, B2, B1, D3, D5, B5, B7, C6, C7, D0, D1, D2 }
-    #define UNUSED_PINS
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+ */
+#define MATRIX_ROW_PINS { B6, B4, D7, D6, D4 }
+#define MATRIX_COL_PINS { B0, B3, B2, B1, D3, D5, B5, B7, C6, C7, D0, D1, D2 }
+#define UNUSED_PINS
 
-    /* COL2ROW or ROW2COL */
-    #define DIODE_DIRECTION COL2ROW
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
 
-    /* Set 0 if debouncing isn't needed */
-    #define DEBOUNCE 5
+//#define BACKLIGHT_PIN B7
+//#define BACKLIGHT_LEVELS 3
+//#define BACKLIGHT_BREATHING
 
-    /* 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
-#endif
+//#define RGB_DI_PIN E2
+//#ifdef RGB_DI_PIN
+//#    define RGBLED_NUM 16
+//#    define RGBLIGHT_HUE_STEP 8
+//#    define RGBLIGHT_SAT_STEP 8
+//#    define RGBLIGHT_VAL_STEP 8
+//#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+//#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+/*== all animations enable ==*/
+//#    define RGBLIGHT_ANIMATIONS
+/*== or choose animations ==*/
+//#    define RGBLIGHT_EFFECT_BREATHING
+//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+//#    define RGBLIGHT_EFFECT_SNAKE
+//#    define RGBLIGHT_EFFECT_KNIGHT
+//#    define RGBLIGHT_EFFECT_CHRISTMAS
+//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+//#    define RGBLIGHT_EFFECT_RGB_TEST
+//#    define RGBLIGHT_EFFECT_ALTERNATING
+/*== customize breathing effect ==*/
+/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+//#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+/*==== use exp() and sin() ====*/
+//#    define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//#    define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+//#endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+//#define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+/* Bootmagic Lite key configuration */
+//#define BOOTMAGIC_LITE_ROW 0
+//#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/dk60/dk60.c b/qmk/keyboards/dk60/dk60.c
index 8b9dc547..6d72ff6b 100644
--- a/qmk/keyboards/dk60/dk60.c
+++ b/qmk/keyboards/dk60/dk60.c
@@ -1,3 +1,20 @@
+/*
+Copyright 2017 Damien Broqua <contact@darkou.fr>
+
+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 "dk60.h"
 
 extern inline void dk60_caps_led_on(void);
@@ -9,12 +26,10 @@ extern inline void dk60_esc_led_off(void);
 extern inline void dk60_led_all_on(void);
 extern inline void dk60_led_all_off(void);
 
-
-void dk60_blink_all_leds(void)
-{
+void dk60_blink_all_leds(void) {
     dk60_led_all_off();
     dk60_led_all_on();
-    _delay_ms(500);
+    wait_ms(500);
     dk60_led_all_off();
 }
 
@@ -26,19 +41,18 @@ void matrix_init_kb(void) {
 }
 
 void led_init_ports(void) {
-    // * Set our LED pins as output
-    DDRE |= (1<<6);
-    DDRF |= (1<<0);
+    setPinOutput(E6);
+    setPinOutput(F0);
 }
 
-void led_set_kb(uint8_t usb_led) {
-	if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
-		// Turn capslock on
-		dk60_caps_led_on();
-	} else {
-		// Turn capslock off
-		dk60_caps_led_off();
-	}
+bool led_update_kb(led_t led_state) {
+    if (led_update_user(led_state)) {
+        if (led_state.caps_lock) {
+            dk60_caps_led_on();
+        } else {
+            dk60_caps_led_off();
+        }
+    }
 
-	led_set_user(usb_led);
+    return true;
 }
diff --git a/qmk/keyboards/dk60/dk60.h b/qmk/keyboards/dk60/dk60.h
index 7c96af10..36ac690a 100644
--- a/qmk/keyboards/dk60/dk60.h
+++ b/qmk/keyboards/dk60/dk60.h
@@ -1,41 +1,52 @@
-#ifndef DK60_H
-    #define DK60_H
+/*
+Copyright 2017 Damien Broqua <contact@darkou.fr>
 
-    #include "quantum.h"
-    #include <util/delay.h>
+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.
 
-    inline void dk60_caps_led_on(void)      {  PORTE |= (1<<6); }
-    inline void dk60_esc_led_on(void)    	{  PORTF |= (1<<0); }
+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.
 
-    inline void dk60_caps_led_off(void)     { PORTE &= ~(1<<6); }
-    inline void dk60_esc_led_off(void)   	{ PORTF &= ~(1<<0); }
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
 
-    inline void dk60_led_all_on(void)
-    {
-        dk60_caps_led_on();
-        dk60_esc_led_on();
-    }
+#pragma once
 
-    inline void dk60_led_all_off(void)
-    {
-        dk60_caps_led_off();
-        dk60_esc_led_off();
-    }
+#include "quantum.h"
 
-    #define ___ KC_NO
+inline void dk60_caps_led_on(void) { writePinHigh(E6); }
+inline void dk60_esc_led_on(void) { writePinHigh(F0); }
 
-    #define LAYOUT( \
-        K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K4B, K4A, \
-        K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K4C, \
-        K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \
-        K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, \
-             K41, K42,           K45,           K48, K49  \
-    ) { \
-        { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C }, \
-        { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C }, \
-        { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C }, \
-        { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C }, \
-        { ___, K41, K42, ___, ___, K45, ___, ___, K48, K49, K4A, K4B, K4C }  \
-    }
+inline void dk60_caps_led_off(void) { writePinLow(E6); }
+inline void dk60_esc_led_off(void) { writePinLow(F0); }
 
-#endif
+inline void dk60_led_all_on(void) {
+    dk60_caps_led_on();
+    dk60_esc_led_on();
+}
+
+inline void dk60_led_all_off(void) {
+    dk60_caps_led_off();
+    dk60_esc_led_off();
+}
+
+#define XXX KC_NO
+
+#define LAYOUT( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K4B, K4A, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K4C, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2C, \
+    K30,      K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, \
+         K41, K42,                K45,                K48, K49  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C }, \
+    { XXX, K41, K42, XXX, XXX, K45, XXX, XXX, K48, K49, K4A, K4B, K4C } \
+}
diff --git a/qmk/keyboards/dk60/info.json b/qmk/keyboards/dk60/info.json
index 0dd669fd..2a6725bd 100644
--- a/qmk/keyboards/dk60/info.json
+++ b/qmk/keyboards/dk60/info.json
@@ -1,13 +1,77 @@
 {
-  "keyboard_name": "DK60",
-  "url": "",
-  "maintainer": "qmk",
-  "width": 15,
-  "height": 5,
-  "layouts": {
-    "LAYOUT": {
-			"key_count": 60,
-      "layout": [{"label":"K00", "x":0, "y":0}, {"label":"K01", "x":1, "y":0}, {"label":"K02", "x":2, "y":0}, {"label":"K03", "x":3, "y":0}, {"label":"K04", "x":4, "y":0}, {"label":"K05", "x":5, "y":0}, {"label":"K06", "x":6, "y":0}, {"label":"K07", "x":7, "y":0}, {"label":"K08", "x":8, "y":0}, {"label":"K09", "x":9, "y":0}, {"label":"K0A", "x":10, "y":0}, {"label":"K0B", "x":11, "y":0}, {"label":"K0C", "x":12, "y":0}, {"label":"K4B", "x":13, "y":0}, {"label":"K4A", "x":14, "y":0}, {"label":"K10", "x":0, "y":1, "w":1.5}, {"label":"K11", "x":1.5, "y":1}, {"label":"K12", "x":2.5, "y":1}, {"label":"K13", "x":3.5, "y":1}, {"label":"K14", "x":4.5, "y":1}, {"label":"K15", "x":5.5, "y":1}, {"label":"K16", "x":6.5, "y":1}, {"label":"K17", "x":7.5, "y":1}, {"label":"K18", "x":8.5, "y":1}, {"label":"K19", "x":9.5, "y":1}, {"label":"K1A", "x":10.5, "y":1}, {"label":"K1B", "x":11.5, "y":1}, {"label":"K1C", "x":12.5, "y":1}, {"label":"K4C", "x":13.5, "y":1, "w":1.5}, {"label":"K20", "x":0, "y":2, "w":1.75}, {"label":"K21", "x":1.75, "y":2}, {"label":"K22", "x":2.75, "y":2}, {"label":"K23", "x":3.75, "y":2}, {"label":"K24", "x":4.75, "y":2}, {"label":"K25", "x":5.75, "y":2}, {"label":"K26", "x":6.75, "y":2}, {"label":"K27", "x":7.75, "y":2}, {"label":"K28", "x":8.75, "y":2}, {"label":"K29", "x":9.75, "y":2}, {"label":"K2A", "x":10.75, "y":2}, {"label":"K2B", "x":11.75, "y":2}, {"label":"K2C", "x":12.75, "y":2, "w":2.25}, {"label":"K30", "x":0, "y":3, "w":2.25}, {"label":"K31", "x":2.25, "y":3}, {"label":"K32", "x":3.25, "y":3}, {"label":"K33", "x":4.25, "y":3}, {"label":"K34", "x":5.25, "y":3}, {"label":"K35", "x":6.25, "y":3}, {"label":"K36", "x":7.25, "y":3}, {"label":"K37", "x":8.25, "y":3}, {"label":"K38", "x":9.25, "y":3}, {"label":"K39", "x":10.25, "y":3}, {"label":"K3A", "x":11.25, "y":3}, {"label":"K3B", "x":12.25, "y":3, "w":1.75}, {"label":"K3C", "x":14, "y":3}, {"label":"K41", "x":1.5, "y":4}, {"label":"K42", "x":2.5, "y":4, "w":1.25}, {"label":"K45", "x":3.75, "y":4, "w":7}, {"label":"K48", "x":10.75, "y":4, "w":1.25}, {"label":"K49", "x":12, "y":4}]
+    "keyboard_name": "DK60",
+    "url": "",
+    "maintainer": "qmk",
+    "width": 15,
+    "height": 5,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6, "y": 0},
+                {"x": 7, "y": 0},
+                {"x": 8, "y": 0},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0},
+                {"x": 14, "y": 0},
+
+                {"x": 0, "y": 1, "w": 1.5},
+                {"x": 1.5, "y": 1},
+                {"x": 2.5, "y": 1},
+                {"x": 3.5, "y": 1},
+                {"x": 4.5, "y": 1},
+                {"x": 5.5, "y": 1},
+                {"x": 6.5, "y": 1},
+                {"x": 7.5, "y": 1},
+                {"x": 8.5, "y": 1},
+                {"x": 9.5, "y": 1},
+                {"x": 10.5, "y": 1},
+                {"x": 11.5, "y": 1},
+                {"x": 12.5, "y": 1},
+                {"x": 13.5, "y": 1, "w": 1.5},
+
+                {"x": 0, "y": 2, "w": 1.75},
+                {"x": 1.75, "y": 2},
+                {"x": 2.75, "y": 2},
+                {"x": 3.75, "y": 2},
+                {"x": 4.75, "y": 2},
+                {"x": 5.75, "y": 2},
+                {"x": 6.75, "y": 2},
+                {"x": 7.75, "y": 2},
+                {"x": 8.75, "y": 2},
+                {"x": 9.75, "y": 2},
+                {"x": 10.75, "y": 2},
+                {"x": 11.75, "y": 2},
+                {"x": 12.75, "y": 2, "w": 2.25},
+
+                {"x": 0, "y": 3, "w": 2.25},
+                {"x": 2.25, "y": 3},
+                {"x": 3.25, "y": 3},
+                {"x": 4.25, "y": 3},
+                {"x": 5.25, "y": 3},
+                {"x": 6.25, "y": 3},
+                {"x": 7.25, "y": 3},
+                {"x": 8.25, "y": 3},
+                {"x": 9.25, "y": 3},
+                {"x": 10.25, "y": 3},
+                {"x": 11.25, "y": 3},
+                {"x": 12.25, "y": 3, "w": 1.75},
+                {"x": 14, "y": 3},
+
+                {"x": 1.5, "y": 4},
+                {"x": 2.5, "y": 4, "w": 1.25},
+                {"x": 3.75, "y": 4, "w": 7},
+                {"x": 10.75, "y": 4, "w": 1.25},
+                {"x": 12, "y": 4}
+            ]
+        }
     }
-  }
 }
diff --git a/qmk/keyboards/dk60/keymaps/default/keymap.c b/qmk/keyboards/dk60/keymaps/default/keymap.c
index 43c28198..7ebc3952 100644
--- a/qmk/keyboards/dk60/keymaps/default/keymap.c
+++ b/qmk/keyboards/dk60/keymaps/default/keymap.c
@@ -1,79 +1,80 @@
+/*
+Copyright 2017 Damien Broqua <contact@darkou.fr>
+
+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
 
-enum planck_layers {
-  _QWERTY,
-  _FN,
-  _DVORAK,
-  _LOWER,
-  _RAISE,
-  _PLOVER,
-  _ADJUST
+enum layer_names {
+    _QWERTY,
+    _FN
 };
 
-enum planck_keycodes {
-  QWERTY = SAFE_RANGE,
-  FN
-};
-
-// Fillers to make layering more clear
-#define ______ KC_TRNS
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Qwerty gui/alt/space/alt/gui
-   * ,-----------------------------------------------------------------------------------------.
-   * | Esc |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |  \  |  `  |
-   * |-----------------------------------------------------------------------------------------+
-   * | Tab    |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |  Bksp  |
-   * |-----------------------------------------------------------------------------------------+
-   * | Ctrl    |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |    Enter    |
-   * |-----------------------------------------------------------------------------------------+
-   * | Shift     |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  | RShift    | FN  |
-   * |-----------------------------------------------------------------------------------------+
-   *         |LGUI | LAlt  |               Space                | RAlt   |RGUI |
-   *         `-----------------------------------------------------------------'
-   */
-  [_QWERTY] = LAYOUT( /* Basic QWERTY */
-    KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV, \
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC, \
-    KC_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_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, FN,      \
-             KC_LGUI, KC_LALT,                   KC_SPC,                    KC_RALT, KC_RGUI  \
-  ),
+    /* Qwerty gui/alt/space/alt/gui
+     * ,-----------------------------------------------------------------------------------------.
+     * | Esc |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |  \  |  `  |
+     * |-----------------------------------------------------------------------------------------+
+     * | Tab    |  Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |  Bksp  |
+     * |-----------------------------------------------------------------------------------------+
+     * | Ctrl    |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  '  |    Enter    |
+     * |-----------------------------------------------------------------------------------------+
+     * | Shift     |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  ,  |  .  |  /  | RShift    | FN  |
+     * |-----------------------------------------------------------------------------------------+
+     *         |LGUI | LAlt  |               Space                | RAlt   |RGUI |
+     *         `-----------------------------------------------------------------'
+     */
+    [_QWERTY] = LAYOUT( /* Basic QWERTY */
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
+        KC_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_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(_FN),
+                 KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI
+    ),
 
-/* FN Layer
- * ,-----------------------------------------------------------------------------------------.
- * |     | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12 | Ins | Del |
- * |-----------------------------------------------------------------------------------------+
- * |  CAPS  |     |     |     |     |     |     |     | Psc | Slck| Paus| Up  |     |        |
- * |-----------------------------------------------------------------------------------------+
- * |         | Vol-| Vol+| Mute|     |     | *   | /   | Home| PgUp| Left|Right|             |
- * |-----------------------------------------------------------------------------------------+
- * |           | Prev| Play| Next|     |     | +   | -   | End  |PgDn| Down|           |     |
- * |-----------------------------------------------------------------------------------------+
- *         |       |       |                                 | Stop  |       |
- *         `-----------------------------------------------------------------'
- */
-  [_FN] = LAYOUT( /* Layer 1 */
-    ______,  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_DEL, \
-    KC_CAPS, ______,  ______,  ______,  ______, ______, ______,  ______,  KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   ______, ______, \
-    ______,  KC_VOLD, KC_VOLU, KC_MUTE, ______, ______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, ______, \
-    ______,  KC_MPRV, KC_MPLY, KC_MNXT, ______, ______, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, ______,  ______, \
-             ______,  ______,                   ______,                   KC_MSTP, ______   \
-  )
+    /* FN Layer
+     * ,-----------------------------------------------------------------------------------------.
+     * |     | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12 | Ins | Del |
+     * |-----------------------------------------------------------------------------------------+
+     * |  CAPS  |     |     |     |     |     |     |     | Psc | Slck| Paus| Up  |     |        |
+     * |-----------------------------------------------------------------------------------------+
+     * |         | Vol-| Vol+| Mute|     |     | *   | /   | Home| PgUp| Left|Right|             |
+     * |-----------------------------------------------------------------------------------------+
+     * |           | Prev| Play| Next|     |     | +   | -   | End  |PgDn| Down|           |     |
+     * |-----------------------------------------------------------------------------------------+
+     *         |       |       |                                 | Stop  |       |
+     *         `-----------------------------------------------------------------'
+     */
+    [_FN] = LAYOUT( /* Layer 1 */
+        _______, 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_DEL,
+        KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   _______, _______,
+        _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          _______,
+        _______,          KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, _______, _______,
+                 _______, _______,                            _______,                            KC_MSTP, _______
+    )
 };
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case FN:
-      if (record->event.pressed) {
-        layer_on(_FN);
-        dk60_esc_led_on();
-      } else {
-        layer_off(_FN);
-        dk60_esc_led_off();
-      }
-      return false;
-      break;
-  }
-  return true;
+    switch (keycode) {
+        case MO(_FN):
+            if (record->event.pressed) {
+                dk60_esc_led_on();
+            } else {
+                dk60_esc_led_off();
+            }
+            return false;
+    }
+    return true;
 }
diff --git a/qmk/keyboards/dk60/readme.md b/qmk/keyboards/dk60/readme.md
index b9d9b671..0e557f32 100644
--- a/qmk/keyboards/dk60/readme.md
+++ b/qmk/keyboards/dk60/readme.md
@@ -1,17 +1,19 @@
-DK60
-===
+# DK60
 
 ![DK60](https://github.com/Dbroqua/DK60/raw/master/Previews/DK60.png)
 
-Another 60% keyboard with different HHKB layout made and sold by dbroqua. [More info on github/dbroqua](https://github.com/Dbroqua/DK60/)
+Another 60% keyboard with different HHKB layout made and sold by dbroqua.
 
-Keyboard Maintainer: [Damien Broqua aka DarKou](https://github.com/Dbroqua)  
-Hardware Supported: DK60 PCB revA
+* Keyboard Maintainer: [Damien Broqua aka DarKou](https://github.com/Dbroqua)
+* Hardware Supported: DK60 PCB revA
+* Hardware Availability: https://github.com/Dbroqua/DK60/
 
 Make example for this keyboard (after setting up your build environment):
 
     make dk60:default
 
-See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
+Flashing example for this keyboard:
 
-Open Hardware project!
+    make dk60:default:flash
+
+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).
diff --git a/qmk/keyboards/dk60/rules.mk b/qmk/keyboards/dk60/rules.mk
index b7518eee..bd7843a9 100644
--- a/qmk/keyboards/dk60/rules.mk
+++ b/qmk/keyboards/dk60/rules.mk
@@ -2,26 +2,23 @@
 MCU = atmega32u4
 
 # Bootloader selection
-#   Teensy       halfkay
-#   Pro Micro    caterina
-#   Atmel DFU    atmel-dfu
-#   LUFA DFU     lufa-dfu
-#   QMK DFU      qmk-dfu
-#   ATmega32A    bootloadHID
-#   ATmega328P   USBasp
 BOOTLOADER = atmel-dfu
 
-BOOTMAGIC_ENABLE = yes	# Virtual DIP switch configuration
-MOUSEKEY_ENABLE = no	# Mouse keys
-EXTRAKEY_ENABLE = yes	# Audio control and System control
-# CONSOLE_ENABLE = yes	# Console for debug
-# COMMAND_ENABLE = yes    # Commands for debug and configuration
-KEYBOARD_LOCK_ENABLE = yes	# Allow locking of keyboard via magic key
-NKRO_ENABLE = yes		# USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-RGBLIGHT_ENABLE = no   # Enable keyboard underlight functionality
-BACKLIGHT_ENABLE = no  # Enable keyboard backlight functionality
-MIDI_ENABLE = no 		# MIDI controls
-AUDIO_ENABLE = no
-UNICODE_ENABLE = yes 		# Unicode
-BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
-SLEEP_LED_ENABLE = yes
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = full     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = yes      # 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 = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+KEYBOARD_LOCK_ENABLE = yes
+UNICODE_ENABLE = yes
diff --git a/qmk/keyboards/dm9records/ergoinu/config.h b/qmk/keyboards/dm9records/ergoinu/config.h
index dfc8a529..ce3bf1e7 100644
--- a/qmk/keyboards/dm9records/ergoinu/config.h
+++ b/qmk/keyboards/dm9records/ergoinu/config.h
@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #include "config_common.h"
-#include <serial_config.h>
+#include "serial_config.h"
 
 /* USB Device descriptor parameter
    VID & PID are lisenced from microchip sublisence program, Don't use other project! */
diff --git a/qmk/keyboards/dm9records/plaid/keymaps/via/rules.mk b/qmk/keyboards/dm9records/plaid/keymaps/via/rules.mk
index 930e3552..1e5b9980 100644
--- a/qmk/keyboards/dm9records/plaid/keymaps/via/rules.mk
+++ b/qmk/keyboards/dm9records/plaid/keymaps/via/rules.mk
@@ -1,3 +1 @@
 VIA_ENABLE = yes
-MOUSEKEY_ENABLE = no
-EXTRAKEY_ENABLE = no
diff --git a/qmk/keyboards/doro67/multi/config.h b/qmk/keyboards/doro67/multi/config.h
index d76e7aff..83a92203 100644
--- a/qmk/keyboards/doro67/multi/config.h
+++ b/qmk/keyboards/doro67/multi/config.h
@@ -29,5 +29,8 @@
 
 #define DIODE_DIRECTION COL2ROW
 
+#define LED_CAPS_LOCK_PIN E6
+#define LED_PIN_ON_STATE 0
+
 #define BACKLIGHT_PIN B7
 #define BACKLIGHT_LEVELS 7
diff --git a/qmk/keyboards/doro67/multi/multi.c b/qmk/keyboards/doro67/multi/multi.c
index 14e3359c..3ab1f536 100644
--- a/qmk/keyboards/doro67/multi/multi.c
+++ b/qmk/keyboards/doro67/multi/multi.c
@@ -14,37 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "multi.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-    setPinOutput(E6);
-	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_CAPS_LOCK)) {
-		writePinLow(E6);
-	} else {
-		writePinHigh(E6);
-	}
-
-	led_set_user(usb_led);
-}
diff --git a/qmk/keyboards/doro67/regular/config.h b/qmk/keyboards/doro67/regular/config.h
index 4cfe2487..85a0c503 100644
--- a/qmk/keyboards/doro67/regular/config.h
+++ b/qmk/keyboards/doro67/regular/config.h
@@ -28,3 +28,6 @@
 #define MATRIX_COL_PINS { B0, B1, B2, B3, D4, D6, D7, B4, B5, B6, C6, C7, F5, F6, F7 }
 
 #define DIODE_DIRECTION COL2ROW
+
+#define LED_CAPS_LOCK_PIN E6
+#define LED_PIN_ON_STATE 0
diff --git a/qmk/keyboards/doro67/regular/regular.c b/qmk/keyboards/doro67/regular/regular.c
index 719ceea6..c9b0a25b 100644
--- a/qmk/keyboards/doro67/regular/regular.c
+++ b/qmk/keyboards/doro67/regular/regular.c
@@ -14,34 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "regular.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-  setPinOutput(E6);
-	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_CAPS_LOCK)) {
-    writePinLow(E6);
-  } else {
-    writePinHigh(E6);
-  }
-	led_set_user(usb_led);
-}
diff --git a/qmk/keyboards/doro67/rgb/config.h b/qmk/keyboards/doro67/rgb/config.h
index 90fefa12..349b9f5c 100644
--- a/qmk/keyboards/doro67/rgb/config.h
+++ b/qmk/keyboards/doro67/rgb/config.h
@@ -48,6 +48,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
+#define LED_CAPS_LOCK_PIN E6
+#define LED_PIN_ON_STATE 0
+
 // The pin connected to the data pin of the LEDs
 #define RGB_DI_PIN B7
 // The number of LEDs connected
diff --git a/qmk/keyboards/doro67/rgb/rgb.c b/qmk/keyboards/doro67/rgb/rgb.c
index e8c9ac63..794c037d 100644
--- a/qmk/keyboards/doro67/rgb/rgb.c
+++ b/qmk/keyboards/doro67/rgb/rgb.c
@@ -16,43 +16,6 @@
 #include "rgb.h"
 #include "rgb_matrix_types.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
-  setPinOutput(E6);
-  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_CAPS_LOCK)) {
-    writePinLow(E6);
-  } else {
-    writePinHigh(E6);
-  }
-	led_set_user(usb_led);
-}
-
 led_config_t g_led_config = { {
   {   0,   1,   2,   3,   4,   5,   6,   7,   8,   9,  10,  11,  12,  13,  14 },
   {  15,  16,  17,  18,  19,  20,  21,  22,  23,  24,  25,  26,  27,  28,  29 },
diff --git a/qmk/keyboards/doro67/rgb/rules.mk b/qmk/keyboards/doro67/rgb/rules.mk
index 5a1462c1..958fee52 100644
--- a/qmk/keyboards/doro67/rgb/rules.mk
+++ b/qmk/keyboards/doro67/rgb/rules.mk
@@ -30,6 +30,7 @@ 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
-RGB_MATRIX_ENABLE = WS2812
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = WS2812
 
 LAYOUTS = 65_ansi_blocker
diff --git a/qmk/keyboards/dp60/config.h b/qmk/keyboards/dp60/config.h
index 2bedf519..d1cbd650 100644
--- a/qmk/keyboards/dp60/config.h
+++ b/qmk/keyboards/dp60/config.h
@@ -1,6 +1,17 @@
 /**
  * config.h
  *
+  Copyright 2020 astro <yuleiz@gmail.com>
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #pragma once
 
diff --git a/qmk/keyboards/dp60/dp60.c b/qmk/keyboards/dp60/dp60.c
index 3e478024..475084b0 100644
--- a/qmk/keyboards/dp60/dp60.c
+++ b/qmk/keyboards/dp60/dp60.c
@@ -1,5 +1,17 @@
 /**
  * dp60.c
+ *
+  Copyright 2020 astro <yuleiz@gmail.com>
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include "dp60.h"
diff --git a/qmk/keyboards/dp60/dp60.h b/qmk/keyboards/dp60/dp60.h
index a197ac2f..9d8bffa6 100644
--- a/qmk/keyboards/dp60/dp60.h
+++ b/qmk/keyboards/dp60/dp60.h
@@ -1,6 +1,17 @@
 /**
   * dp60.h
   *
+  Copyright 2020 astro <yuleiz@gmail.com>
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
   */
 #pragma once
 
diff --git a/qmk/keyboards/dp60/keymaps/allleds/keymap.c b/qmk/keyboards/dp60/keymaps/allleds/keymap.c
index f3862c38..66cc628d 100644
--- a/qmk/keyboards/dp60/keymaps/allleds/keymap.c
+++ b/qmk/keyboards/dp60/keymaps/allleds/keymap.c
@@ -1,3 +1,18 @@
+/**
+ * keymap.c
+ *
+  Copyright 2020 astro <yuleiz@gmail.com>
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/qmk/keyboards/dp60/keymaps/default/keymap.c b/qmk/keyboards/dp60/keymaps/default/keymap.c
index f3862c38..66cc628d 100644
--- a/qmk/keyboards/dp60/keymaps/default/keymap.c
+++ b/qmk/keyboards/dp60/keymaps/default/keymap.c
@@ -1,3 +1,18 @@
+/**
+ * keymap.c
+ *
+  Copyright 2020 astro <yuleiz@gmail.com>
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/qmk/keyboards/dp60/keymaps/indicator/config.h b/qmk/keyboards/dp60/keymaps/indicator/config.h
new file mode 100644
index 00000000..0476faca
--- /dev/null
+++ b/qmk/keyboards/dp60/keymaps/indicator/config.h
@@ -0,0 +1,25 @@
+/**
+ * config.h
+ *
+  Copyright 2020 astro <yuleiz@gmail.com>
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include "config_common.h"
+
+#define RGB_INDICATOR_NUM 8
+#undef RGBLED_NUM
+#define RGBLED_NUM  (18+RGB_INDICATOR_NUM)
+
+#define RGB_INDICATOR_PIN B1
+#define RGBLIGHT_LAYERS
diff --git a/qmk/keyboards/dp60/keymaps/indicator/indicator.c b/qmk/keyboards/dp60/keymaps/indicator/indicator.c
new file mode 100644
index 00000000..a3a826e8
--- /dev/null
+++ b/qmk/keyboards/dp60/keymaps/indicator/indicator.c
@@ -0,0 +1,101 @@
+/**
+ * indicator.c
+ *
+  Copyright 2020 astro <yuleiz@gmail.com>
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "dp60.h"
+
+#include "rgblight_list.h"
+#include "rgblight.h"
+
+
+// caps led
+const rgblight_segment_t PROGMEM dp60_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {18, 1, HSV_RED}
+);
+
+// scroll led
+const rgblight_segment_t PROGMEM dp60_scrolllock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {19, 1, HSV_GREEN}
+);
+
+// num led
+const rgblight_segment_t PROGMEM dp60_numlock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {20, 1, HSV_BLUE}
+);
+
+// light 21 to 26 for layer 1-5
+const rgblight_segment_t PROGMEM dp60_layer1_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {21, 1, HSV_PURPLE}
+);
+const rgblight_segment_t PROGMEM dp60_layer2_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {22, 1, HSV_CYAN}
+);
+const rgblight_segment_t PROGMEM dp60_layer3_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {23, 1, HSV_YELLOW}
+);
+const rgblight_segment_t PROGMEM dp60_layer4_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {24, 1, HSV_PINK}
+);
+const rgblight_segment_t PROGMEM dp60_layer5_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {25, 1, HSV_ORANGE}
+);
+
+// rgb light layers
+const rgblight_segment_t* const PROGMEM dp60_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
+    dp60_capslock_layer,
+    dp60_scrolllock_layer,
+    dp60_numlock_layer,
+    dp60_layer1_layer,
+    dp60_layer2_layer,
+    dp60_layer3_layer,
+    dp60_layer4_layer,
+    dp60_layer5_layer
+);
+
+void keyboard_post_init_user(void) {
+    // Enable the LED layers
+    rgblight_layers = dp60_rgb_layers;
+}
+
+extern rgblight_config_t rgblight_config;
+extern void              rgblight_layers_write(void);
+extern void              indicator_write(LED_TYPE *start_led, uint8_t num_leds);
+
+void rgblight_call_driver(LED_TYPE *start_led, uint8_t num_leds)
+{
+    ws2812_setleds(start_led, RGBLED_NUM-RGB_INDICATOR_NUM);
+
+    indicator_write(start_led + (RGBLED_NUM - RGB_INDICATOR_NUM), RGB_INDICATOR_NUM);
+}
+
+bool led_update_kb(led_t led_state) {
+    bool res = led_update_user(led_state);
+    if (res) {
+        rgblight_set_layer_state(0, led_state.caps_lock);
+        rgblight_set_layer_state(1, led_state.scroll_lock);
+        rgblight_set_layer_state(2, led_state.num_lock);
+    }
+    return res;
+}
+
+layer_state_t layer_state_set_kb(layer_state_t state) {
+    state = layer_state_set_user(state);
+    rgblight_set_layer_state(3, layer_state_cmp(state, 1));
+    rgblight_set_layer_state(4, layer_state_cmp(state, 2));
+    rgblight_set_layer_state(5, layer_state_cmp(state, 3));
+    rgblight_set_layer_state(6, layer_state_cmp(state, 4));
+    rgblight_set_layer_state(7, layer_state_cmp(state, 5));
+    return state;
+}
diff --git a/qmk/keyboards/dp60/keymaps/indicator/keymap.c b/qmk/keyboards/dp60/keymaps/indicator/keymap.c
new file mode 100644
index 00000000..170d4eb9
--- /dev/null
+++ b/qmk/keyboards/dp60/keymaps/indicator/keymap.c
@@ -0,0 +1,32 @@
+/**
+ * keymap.c
+ *
+  Copyright 2020 astro <yuleiz@gmail.com>
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_60_hhkb(
+      KC_ESC,     KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_EQL, KC_BSLS, KC_GRV,
+      KC_TAB,     KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_LBRC,KC_RBRC,KC_BSPC,
+      KC_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_LSFT,    KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,       KC_RSFT,  MO(1),
+               KC_LGUI,  KC_LALT,                     LT(1,KC_SPC),                  KC_RALT,KC_RGUI                   ),
+
+    [1] = LAYOUT_60_hhkb(
+      _______, 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,
+      RESET,   RGB_TOG,RGB_MOD,_______,KC_F13,KC_F14,_______,_______,_______,_______,_______,KC_PGUP,KC_PGDN,_______,
+      KC_CAPS,        _______,_______,_______,_______,_______,KC_LEFT,KC_DOWN, KC_UP,KC_RIGHT,KC_HOME,KC_END,_______,
+      _______,        _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,
+              _______,_______,                        _______,                        _______,_______),
+};
diff --git a/qmk/keyboards/dp60/keymaps/indicator/led_driver.c b/qmk/keyboards/dp60/keymaps/indicator/led_driver.c
new file mode 100644
index 00000000..2a1ac5a3
--- /dev/null
+++ b/qmk/keyboards/dp60/keymaps/indicator/led_driver.c
@@ -0,0 +1,26 @@
+/**
+ * led_driver.c
+ *
+ Copyright 2020 astro <yuleiz@gmail.com>
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#undef RGB_DI_PIN
+#define RGB_DI_PIN RGB_INDICATOR_PIN
+#define ws2812_setleds indicator_setleds
+#define ws2812_setleds_pin indicator_setleds_pin
+#include "ws2812.c"
+
+void indicator_write(LED_TYPE *start_led, uint8_t num_leds)
+{
+    indicator_setleds(start_led, num_leds);
+}
diff --git a/qmk/keyboards/dp60/keymaps/indicator/readme.md b/qmk/keyboards/dp60/keymaps/indicator/readme.md
new file mode 100644
index 00000000..bb3fbbbe
--- /dev/null
+++ b/qmk/keyboards/dp60/keymaps/indicator/readme.md
@@ -0,0 +1,10 @@
+
+Indicator RGB leds support for the open source viper/eagle fr4 [plate](https://github.com/yulei/viper_plate.git)
+
+Three wires need to be soldered:  
+
+B1 pin (SCLK at the board) to the plate's D pin
+
+VCC to plate's V
+
+GND to plate's G
diff --git a/qmk/keyboards/dp60/keymaps/indicator/rules.mk b/qmk/keyboards/dp60/keymaps/indicator/rules.mk
new file mode 100644
index 00000000..a8891659
--- /dev/null
+++ b/qmk/keyboards/dp60/keymaps/indicator/rules.mk
@@ -0,0 +1,4 @@
+
+RGBLIGHT_ENABLE = yes       	# Use RGB underglow light
+
+SRC += indicator.c led_driver.c
diff --git a/qmk/keyboards/dp60/keymaps/via/keymap.c b/qmk/keyboards/dp60/keymaps/via/keymap.c
index 1742f17b..5f2b0072 100644
--- a/qmk/keyboards/dp60/keymaps/via/keymap.c
+++ b/qmk/keyboards/dp60/keymaps/via/keymap.c
@@ -1,3 +1,18 @@
+/**
+ * keymap.c
+ *
+  Copyright 2020 astro <yuleiz@gmail.com>
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
diff --git a/qmk/keyboards/dp60/matrix.c b/qmk/keyboards/dp60/matrix.c
index 3aa5925f..a9974757 100644
--- a/qmk/keyboards/dp60/matrix.c
+++ b/qmk/keyboards/dp60/matrix.c
@@ -1,3 +1,18 @@
+/**
+ * matrix.c
+ *
+  Copyright 2020 astro <yuleiz@gmail.com>
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 2 of the License, or
+    (at your option) any later version.
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
 #include "quantum.h"
 
 static uint8_t debouncing = DEBOUNCE;
@@ -242,4 +257,4 @@ static void select_col(uint8_t col) {
           writePinHigh(D5);
           break;
     }
-}
\ No newline at end of file
+}
diff --git a/qmk/keyboards/dp60/rules.mk b/qmk/keyboards/dp60/rules.mk
index bcd6fb4c..02068d86 100644
--- a/qmk/keyboards/dp60/rules.mk
+++ b/qmk/keyboards/dp60/rules.mk
@@ -30,7 +30,8 @@ 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
 RGBLIGHT_ENABLE = no        # Use RGB underglow light
-RGB_MATRIX_ENABLE = yes     # Use RGB matrix
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = IS31FL3731 # Use RGB matrix
 
 LAYOUTS = 60_ansi 60_hhkb 60_iso 60_ansi_split_bs_rshift
 
diff --git a/qmk/keyboards/duck/tcv3/matrix.c b/qmk/keyboards/duck/tcv3/matrix.c
index 38bc5c88..d2d90470 100644
--- a/qmk/keyboards/duck/tcv3/matrix.c
+++ b/qmk/keyboards/duck/tcv3/matrix.c
@@ -21,8 +21,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "util.h"
 #include "print.h"
 #include "debug.h"
-#include "debounce.h"
-#include "wait.h"
+
+static uint8_t debouncing = DEBOUNCE;
 
 /* matrix state(1:on, 0:off) */
 static matrix_row_t matrix[MATRIX_ROWS];
@@ -74,16 +74,13 @@ void matrix_init(void) {
     matrix_debouncing[i] = 0;
   }
 
-  debounce_init(MATRIX_ROWS);
-
   matrix_init_quantum();
 }
-uint8_t matrix_scan(void) {
-    bool changed = false;
 
-    for (uint8_t col = 0; col < MATRIX_COLS; col++) {
+uint8_t matrix_scan(void) {
+  for (uint8_t col = 0; col < MATRIX_COLS; col++) {
     select_col(col);
-    wait_us(30);
+    _delay_us(3);
 
     uint8_t rows = read_rows(col);
 
@@ -92,16 +89,27 @@ uint8_t matrix_scan(void) {
       bool curr_bit = rows & (1<<row);
       if (prev_bit != curr_bit) {
         matrix_debouncing[row] ^= ((matrix_row_t)1<<col);
-        changed = true;
+        if (debouncing) {
+            dprint("bounce!: "); dprintf("%02X", debouncing); dprintln();
+        }
+        debouncing = DEBOUNCE;
       }
     }
     unselect_cols();
   }
 
-  debounce(matrix, matrix_debouncing, MATRIX_ROWS, changed);
+  if (debouncing) {
+    if (--debouncing) {
+      _delay_ms(1);
+    } else {
+      for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
+        matrix[i] = matrix_debouncing[i];
+      }
+    }
+  }
 
   matrix_scan_quantum();
-  return (uint8_t)changed;
+  return 1;
 }
 
 inline matrix_row_t matrix_get_row(uint8_t row) {
@@ -132,7 +140,7 @@ static void init_rows(void) {
 }
 
 static uint8_t read_rows(uint8_t col) {
-  if (col == 20) {
+  if (col == 19) {
     return PINE&(1<<2) ? 0 : (1<<0);
   } else {
       return (PIND&(1<<0) ? (1<<1) : 0) |
@@ -269,4 +277,4 @@ static void select_col(uint8_t col) {
             PORTB |= 0b00100000;
             break;
     }
-}
+}
\ No newline at end of file
diff --git a/qmk/keyboards/dz60/config.h b/qmk/keyboards/dz60/config.h
index 3699ef75..24fd6383 100644
--- a/qmk/keyboards/dz60/config.h
+++ b/qmk/keyboards/dz60/config.h
@@ -30,6 +30,9 @@
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
+#define LED_CAPS_LOCK_PIN B2
+#define LED_PIN_ON_STATE 0
+
 #define BACKLIGHT_PIN B6
 #define BACKLIGHT_LEVELS 5
 
diff --git a/qmk/keyboards/dz60/dz60.c b/qmk/keyboards/dz60/dz60.c
index 936d027a..23db2e4d 100644
--- a/qmk/keyboards/dz60/dz60.c
+++ b/qmk/keyboards/dz60/dz60.c
@@ -1,21 +1 @@
 #include "dz60.h"
-
-void matrix_init_kb(void) {
-    matrix_init_user();
-    led_init_ports();
-};
-
-void led_init_ports(void) {
-    setPinOutput(B2);
-    writePinHigh(B2);
-}
-
-void led_set_kb(uint8_t usb_led) {
-    if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
-        writePinLow(B2);
-    } else {
-        writePinHigh(B2);
-    }
-
-    led_set_user(usb_led);
-}
diff --git a/qmk/keyboards/dztech/dz60rgb/v1/rules.mk b/qmk/keyboards/dztech/dz60rgb/v1/rules.mk
index 9465b57e..d71fb4c5 100644
--- a/qmk/keyboards/dztech/dz60rgb/v1/rules.mk
+++ b/qmk/keyboards/dztech/dz60rgb/v1/rules.mk
@@ -19,5 +19,6 @@ MIDI_ENABLE = no               # MIDI support
 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
-RGB_MATRIX_ENABLE = IS31FL3733 # Use RGB matrix
+RGB_MATRIX_ENABLE = yes        # Use RGB matrix
+RGB_MATRIX_DRIVER = IS31FL3733
 NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
diff --git a/qmk/keyboards/dztech/dz60rgb/v2/rules.mk b/qmk/keyboards/dztech/dz60rgb/v2/rules.mk
index 8763c8ac..ed83bd9a 100644
--- a/qmk/keyboards/dztech/dz60rgb/v2/rules.mk
+++ b/qmk/keyboards/dztech/dz60rgb/v2/rules.mk
@@ -29,5 +29,6 @@ MIDI_ENABLE = no               # MIDI support
 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
-RGB_MATRIX_ENABLE = IS31FL3733 # Use RGB matrix
+RGB_MATRIX_ENABLE = yes        # Use RGB matrix
+RGB_MATRIX_DRIVER = IS31FL3733
 NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
diff --git a/qmk/keyboards/dztech/dz60rgb_ansi/v1/rules.mk b/qmk/keyboards/dztech/dz60rgb_ansi/v1/rules.mk
index 9465b57e..d71fb4c5 100644
--- a/qmk/keyboards/dztech/dz60rgb_ansi/v1/rules.mk
+++ b/qmk/keyboards/dztech/dz60rgb_ansi/v1/rules.mk
@@ -19,5 +19,6 @@ MIDI_ENABLE = no               # MIDI support
 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
-RGB_MATRIX_ENABLE = IS31FL3733 # Use RGB matrix
+RGB_MATRIX_ENABLE = yes        # Use RGB matrix
+RGB_MATRIX_DRIVER = IS31FL3733
 NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
diff --git a/qmk/keyboards/dztech/dz60rgb_ansi/v2/rules.mk b/qmk/keyboards/dztech/dz60rgb_ansi/v2/rules.mk
index 8763c8ac..ed83bd9a 100644
--- a/qmk/keyboards/dztech/dz60rgb_ansi/v2/rules.mk
+++ b/qmk/keyboards/dztech/dz60rgb_ansi/v2/rules.mk
@@ -29,5 +29,6 @@ MIDI_ENABLE = no               # MIDI support
 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
-RGB_MATRIX_ENABLE = IS31FL3733 # Use RGB matrix
+RGB_MATRIX_ENABLE = yes        # Use RGB matrix
+RGB_MATRIX_DRIVER = IS31FL3733
 NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
diff --git a/qmk/keyboards/dztech/dz60rgb_wkl/v1/rules.mk b/qmk/keyboards/dztech/dz60rgb_wkl/v1/rules.mk
index 1daa4ed5..9dfe1700 100644
--- a/qmk/keyboards/dztech/dz60rgb_wkl/v1/rules.mk
+++ b/qmk/keyboards/dztech/dz60rgb_wkl/v1/rules.mk
@@ -19,7 +19,8 @@ MIDI_ENABLE = no               # MIDI support
 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
-RGB_MATRIX_ENABLE = IS31FL3733 # Use RGB matrix
+RGB_MATRIX_ENABLE = yes        # Use RGB matrix
+RGB_MATRIX_DRIVER = IS31FL3733
 NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
 
 LAYOUTS = 60_tsangan_hhkb
diff --git a/qmk/keyboards/dztech/dz60rgb_wkl/v2/rules.mk b/qmk/keyboards/dztech/dz60rgb_wkl/v2/rules.mk
index 862024c4..89b74241 100644
--- a/qmk/keyboards/dztech/dz60rgb_wkl/v2/rules.mk
+++ b/qmk/keyboards/dztech/dz60rgb_wkl/v2/rules.mk
@@ -29,7 +29,8 @@ MIDI_ENABLE = no               # MIDI support
 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
-RGB_MATRIX_ENABLE = IS31FL3733 # Use RGB matrix
+RGB_MATRIX_ENABLE = yes        # Use RGB matrix
+RGB_MATRIX_DRIVER = IS31FL3733
 NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
 
 LAYOUTS = 60_tsangan_hhkb
diff --git a/qmk/keyboards/dztech/dz65rgb/v1/rules.mk b/qmk/keyboards/dztech/dz65rgb/v1/rules.mk
index 280d70aa..4570dc3b 100644
--- a/qmk/keyboards/dztech/dz65rgb/v1/rules.mk
+++ b/qmk/keyboards/dztech/dz65rgb/v1/rules.mk
@@ -19,6 +19,7 @@ MIDI_ENABLE = no               # MIDI support
 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
-RGB_MATRIX_ENABLE = IS31FL3731 # Use RGB matrix
+RGB_MATRIX_ENABLE = yes        # Use RGB matrix
+RGB_MATRIX_DRIVER = IS31FL3731
 
 LAYOUTS = 65_ansi
diff --git a/qmk/keyboards/dztech/dz65rgb/v2/rules.mk b/qmk/keyboards/dztech/dz65rgb/v2/rules.mk
index 9b871f73..5ecaae70 100644
--- a/qmk/keyboards/dztech/dz65rgb/v2/rules.mk
+++ b/qmk/keyboards/dztech/dz65rgb/v2/rules.mk
@@ -29,6 +29,7 @@ MIDI_ENABLE = no               # MIDI support
 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
-RGB_MATRIX_ENABLE = IS31FL3731 # Use RGB matrix
+RGB_MATRIX_ENABLE = yes        # Use RGB matrix
+RGB_MATRIX_DRIVER = IS31FL3731
 
 LAYOUTS = 65_ansi
diff --git a/qmk/keyboards/e88/config.h b/qmk/keyboards/e88/config.h
index a077370c..11b040c9 100644
--- a/qmk/keyboards/e88/config.h
+++ b/qmk/keyboards/e88/config.h
@@ -1,4 +1,4 @@
-/* Copyright 2019 Maarten Dekkers <maartenwut@gmail.com>
+/* Copyright 2019 Evy Dekkers
  *
  * 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
diff --git a/qmk/keyboards/e88/e88.c b/qmk/keyboards/e88/e88.c
index 970b04ce..336660a0 100644
--- a/qmk/keyboards/e88/e88.c
+++ b/qmk/keyboards/e88/e88.c
@@ -1,4 +1,4 @@
-/* Copyright 2019 Maarten Dekkers <maartenwut@gmail.com>
+/* Copyright 2019 Evy Dekkers
  *
  * 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
diff --git a/qmk/keyboards/e88/e88.h b/qmk/keyboards/e88/e88.h
index 2fc0428e..bb8c6e59 100644
--- a/qmk/keyboards/e88/e88.h
+++ b/qmk/keyboards/e88/e88.h
@@ -1,4 +1,4 @@
-/* Copyright 2019 Maarten Dekkers <maartenwut@gmail.com>
+/* Copyright 2019 Evy Dekkers
  *
  * 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
diff --git a/qmk/keyboards/e88/keymaps/default/keymap.c b/qmk/keyboards/e88/keymaps/default/keymap.c
index e58ffd12..feb4ecac 100644
--- a/qmk/keyboards/e88/keymaps/default/keymap.c
+++ b/qmk/keyboards/e88/keymaps/default/keymap.c
@@ -1,4 +1,4 @@
-/* Copyright 2019 Maarten Dekkers <maartenwut@gmail.com>
+/* Copyright 2019 Evy Dekkers
  *
  * 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
diff --git a/qmk/keyboards/e88/keymaps/via/keymap.c b/qmk/keyboards/e88/keymaps/via/keymap.c
new file mode 100644
index 00000000..92fce603
--- /dev/null
+++ b/qmk/keyboards/e88/keymaps/via/keymap.c
@@ -0,0 +1,55 @@
+/* Copyright 2020 Brett Monje <brett@monje.gg>
+ *
+ * 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_all(
+    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_LGUI,    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_LCTL,  KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,  KC_BSLS,            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_RSFT,  MO(1),              KC_UP,
+    KC_LCTL,  KC_LGUI,  KC_LALT,                                KC_SPC,                                           KC_TRNS,  KC_RALT,  RESET,  KC_RCTRL,   KC_LEFT,  KC_DOWN,  KC_RGHT
+    ),
+
+[1] = LAYOUT_all(
+    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_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_VOLD,   KC_MUTE,  KC_VOLU,
+    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_MPRV,   KC_MPLY,  KC_MNXT,
+    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
+    ),
+[2] = LAYOUT_all(
+    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_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,            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
+    ),
+[3] = LAYOUT_all(
+    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_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,            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
+    ),
+
+};
diff --git a/qmk/keyboards/e88/keymaps/via/readme.md b/qmk/keyboards/e88/keymaps/via/readme.md
new file mode 100644
index 00000000..28b835b2
--- /dev/null
+++ b/qmk/keyboards/e88/keymaps/via/readme.md
@@ -0,0 +1 @@
+# The default VIA keymap for the e88
diff --git a/qmk/keyboards/e88/keymaps/via/rules.mk b/qmk/keyboards/e88/keymaps/via/rules.mk
new file mode 100644
index 00000000..f87b150d
--- /dev/null
+++ b/qmk/keyboards/e88/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LT0_ENABLE = yes
diff --git a/qmk/keyboards/eco/keymaps/bcat/config.h b/qmk/keyboards/eco/keymaps/bcat/config.h
new file mode 100644
index 00000000..dffdc7b4
--- /dev/null
+++ b/qmk/keyboards/eco/keymaps/bcat/config.h
@@ -0,0 +1,22 @@
+/* Copyright 2020 Jonathan Rascher
+ *
+ * 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
+
+/* WS2812B RGB LED strip hand wired to Elite-C. */
+#define RGB_DI_PIN B7
+#define RGBLED_NUM 15
+#define RGBLIGHT_ANIMATIONS
diff --git a/qmk/keyboards/eco/keymaps/bcat/keymap.c b/qmk/keyboards/eco/keymaps/bcat/keymap.c
new file mode 100644
index 00000000..066acbe6
--- /dev/null
+++ b/qmk/keyboards/eco/keymaps/bcat/keymap.c
@@ -0,0 +1,72 @@
+/* Copyright 2020 Jonathan Rascher
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+#include "bcat.h"
+
+enum layer {
+    LAYER_DEFAULT,
+    LAYER_LOWER,
+    LAYER_RAISE,
+    LAYER_ADJUST,
+};
+
+#define LY_LWR MO(LAYER_LOWER)
+#define LY_RSE MO(LAYER_RAISE)
+
+#define KY_CSPC LCTL(KC_SPC)
+#define KY_ZMIN LCTL(KC_EQL)
+#define KY_ZMOUT LCTL(KC_MINS)
+#define KY_ZMRST LCTL(KC_0)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Default layer: http://www.keyboard-layout-editor.com/#/gists/2c11371c7a5f7cd08a0132631d3d3281 */
+    [LAYER_DEFAULT] = LAYOUT(
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,     KC_LBRC,  KC_RBRC,  KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_BSPC,
+        KC_ESC,   KC_A,     KC_S,     KC_D,     KC_F,     KC_G,     KC_HOME,  KC_PGUP,  KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,
+        KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_END,   KC_PGDN,  KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,
+        XXXXXXX,  XXXXXXX,  KC_LALT,  KC_LCTL,  LY_LWR,   KC_SPC,   XXXXXXX,  XXXXXXX,  KC_ENT,   LY_RSE,   KC_RALT,  KC_RGUI,  XXXXXXX,  XXXXXXX
+    ),
+
+    /* Lower layer: http://www.keyboard-layout-editor.com/#/gists/11256970dc0552886a82382ee02fa415 */
+    [LAYER_LOWER] = LAYOUT(
+        MC_ALTT,  KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,   KC_PERC,  _______,  _______,  KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_LPRN,  KC_RPRN,  _______,
+        KY_CSPC,  KY_ZMRST, KY_ZMOUT, KY_ZMIN,  KC_WBAK,  KC_WFWD,  _______,  _______,  KC_PIPE,  KC_UNDS,  KC_PLUS,  KC_LCBR,  KC_RCBR,  KC_TILD,
+        _______,  KC_APP,   KC_PSCR,  KC_SLCK,  KC_PAUS,  KC_LGUI,  _______,  _______,  KC_BSLS,  KC_MINS,  KC_EQL,   KC_LBRC,  KC_RBRC,  KC_GRV,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______
+    ),
+
+    /* Raise layer: http://www.keyboard-layout-editor.com/#/gists/308a8be75e0b85902dc18db1b2546862 */
+    [LAYER_RAISE] = LAYOUT(
+        KC_CAPS,  KC_1,     KC_2,     KC_3,     KC_4,     KC_5,     _______,  _______,  KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     _______,
+        _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    _______,  _______,  KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  KC_F11,   KC_DEL,
+        _______,  KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   _______,  _______,  KC_HOME,  KC_PGDN,  KC_PGUP,  KC_END,   KC_F12,   KC_INS,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______
+    ),
+
+    /* Adjust layer: http://www.keyboard-layout-editor.com/#/gists/b18aafa0327d7e83eaf485546c067a21 */
+    [LAYER_ADJUST] = LAYOUT(
+        _______,  NK_TOGG,  KC_MPLY,  KC_VOLU,  KC_MSTP,  _______,  _______,  _______,  EEP_RST,  RESET,    _______,  _______,  _______,  _______,
+        _______,  _______,  KC_MPRV,  KC_VOLD,  KC_MNXT,  _______,  _______,  _______,  RGB_RMOD, RGB_VAD,  RGB_VAI,  RGB_MOD,  RGB_SPI,  _______,
+        _______,  _______,  _______,  KC_MUTE,  _______,  _______,  _______,  _______,  RGB_HUI,  RGB_SAD,  RGB_SAI,  RGB_HUD,  RGB_SPD,  _______,
+        _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  RGB_TOG,  _______,  _______,  _______,  _______,  _______
+    ),
+};
+
+layer_state_t layer_state_set_keymap(layer_state_t state) {
+    return update_tri_layer_state(state, LAYER_LOWER, LAYER_RAISE, LAYER_ADJUST);
+}
diff --git a/qmk/keyboards/eco/keymaps/bcat/readme.md b/qmk/keyboards/eco/keymaps/bcat/readme.md
new file mode 100644
index 00000000..85e26155
--- /dev/null
+++ b/qmk/keyboards/eco/keymaps/bcat/readme.md
@@ -0,0 +1,44 @@
+# bcat's Eco layout
+
+This is a cute little 4x14 ortholinear keyboard. I've set it up using an
+unsplit, ortho version of my [split 3x6 + 3 thumb
+keys](https://github.com/qmk/qmk_firmware/tree/master/layouts/community/split_3x6_3/bcat)
+(Crkbd) layout, with the following changes:
+
+* The alpha keys are separated by an extra two columns in the middle to provide
+a little more hand separation, similar to a split keyboard.
+
+* The top three rows of the extra middle columns feature navigation keys and
+brackets/braces. I don't really use dedicated keys for these, but I had the
+keycaps, so I figured I may as well put them there.
+
+* I have a Left Alt and Right Super key on the bottom row just like my
+[Lily58](https://github.com/qmk/qmk_firmware/tree/master/keyboards/lily58/keymaps/bcat).
+
+* The two keys in each bottom corner are unbound, as is the 2U spacebar in the
+center of the bottom row. These keys are too inconvenient to reach, and there's
+nothing really useful to bind them to anyway.
+
+## Default layer
+
+![Default layer layout](https://i.imgur.com/uRUT2cY.png)
+
+([KLE](http://www.keyboard-layout-editor.com/#/gists/2c11371c7a5f7cd08a0132631d3d3281))
+
+## Lower layer
+
+![Lower layer layout](https://i.imgur.com/8SR0M9x.png)
+
+([KLE](http://www.keyboard-layout-editor.com/#/gists/11256970dc0552886a82382ee02fa415))
+
+## Raise layer
+
+![Raise layer layout](https://i.imgur.com/U7KERR3.png)
+
+([KLE](http://www.keyboard-layout-editor.com/#/gists/308a8be75e0b85902dc18db1b2546862))
+
+## Adjust layer
+
+![Adjust layer layout](https://i.imgur.com/J2rOshm.png)
+
+([KLE](http://www.keyboard-layout-editor.com/#/gists/b18aafa0327d7e83eaf485546c067a21))
diff --git a/qmk/keyboards/eco/keymaps/bcat/rules.mk b/qmk/keyboards/eco/keymaps/bcat/rules.mk
new file mode 100644
index 00000000..684d8e4e
--- /dev/null
+++ b/qmk/keyboards/eco/keymaps/bcat/rules.mk
@@ -0,0 +1,3 @@
+BOOTLOADER = atmel-dfu  # Elite-C
+
+RGBLIGHT_ENABLE = yes
diff --git a/qmk/keyboards/edc40/config.h b/qmk/keyboards/edc40/config.h
new file mode 100644
index 00000000..bcb8918b
--- /dev/null
+++ b/qmk/keyboards/edc40/config.h
@@ -0,0 +1,50 @@
+/* Copyright 2020 OJtheTiny
+ *
+ * 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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID 0x4F4A // "OJ"
+#define PRODUCT_ID 0x0002
+#define DEVICE_VER 0x0001
+#define MANUFACTURER OJ
+#define PRODUCT edc40
+
+#define MATRIX_ROWS 4
+#define MATRIX_COLS 12
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+ */
+ #define MATRIX_ROW_PINS { D4, D6, D7, F7 }
+ #define MATRIX_COL_PINS { B0, B1, B2, B3, D0, D1, D2, D3, D5, B4, B5 }
+ #define UNUSED_PINS
+
+ #define DIODE_DIRECTION COL2ROW
+
+#define DEBOUNCE 5
+
+#define LOCKING_SUPPORT_ENABLE
+#define LOCKING_RESYNC_ENABLE
+#define RGB_DI_PIN C6
diff --git a/qmk/keyboards/edc40/edc40.c b/qmk/keyboards/edc40/edc40.c
new file mode 100644
index 00000000..96746d4f
--- /dev/null
+++ b/qmk/keyboards/edc40/edc40.c
@@ -0,0 +1,16 @@
+/* Copyright 2020 OJtheTiny
+ *
+ * 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 "edc40.h"
diff --git a/qmk/keyboards/edc40/edc40.h b/qmk/keyboards/edc40/edc40.h
new file mode 100644
index 00000000..d946eadd
--- /dev/null
+++ b/qmk/keyboards/edc40/edc40.h
@@ -0,0 +1,31 @@
+/* Copyright 2020 OJtheTiny
+ *
+ * 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( \
+    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \
+    K100,  K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, \
+    K200,    K201, K202, K203, K204, K205, K206, K207, K208,    K210, \
+    K300, K301,                      K305,                K308, K310 \
+) \
+{ \
+    {K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011}, \
+    {K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, KC_NO, K110}, \
+    {K200, K201, K202, K203, K204, K205, K206, K207, K208, KC_NO, KC_NO, K210}, \
+    {K300, K301, KC_NO, KC_NO, KC_NO, K305, KC_NO, KC_NO, K308, KC_NO, K310} \
+}
diff --git a/qmk/keyboards/edc40/info.json b/qmk/keyboards/edc40/info.json
new file mode 100644
index 00000000..1585294b
--- /dev/null
+++ b/qmk/keyboards/edc40/info.json
@@ -0,0 +1,54 @@
+{
+    "keyboard_name": "edc40",
+    "url": "",
+    "maintainer": "ojthetiny",
+    "width": 12,
+    "height": 4,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6, "y": 0},
+                {"x": 7, "y": 0},
+                {"x": 8, "y": 0},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+
+                {"x": 0, "y": 1, "w":1.25},
+                {"x": 1.25, "y": 1},
+                {"x": 2.25, "y": 1},
+                {"x": 3.25, "y": 1},
+                {"x": 4.25, "y": 1},
+                {"x": 5.25, "y": 1},
+                {"x": 6.25, "y": 1},
+                {"x": 7.25, "y": 1},
+                {"x": 8.25, "y": 1},
+                {"x": 9.25, "y": 1},
+                {"x": 10.25, "y": 1, "w":1.75},
+
+                {"x": 0, "y": 2, "w":1.75},
+                {"x": 1.75, "y": 2},
+                {"x": 2.75, "y": 2},
+                {"x": 3.75, "y": 2},
+                {"x": 4.75, "y": 2},
+                {"x": 5.75, "y": 2},
+                {"x": 6.75, "y": 2},
+                {"x": 7.75, "y": 2},
+                {"x": 8.75, "y": 2},
+                {"x": 9.75, "y": 2, "w":2.25},
+
+                {"x": 0, "y": 3, "w":1.25},
+                {"x": 1.25, "y": 3, "w":1.25},
+                {"x": 2.5, "y": 3, "w":7},
+                {"x": 9.5, "y": 3, "w":1.25},
+                {"x": 10.75, "y": 3, "w":1.25}
+            ]
+        }
+    }
+}
diff --git a/qmk/keyboards/edc40/keymaps/default/keymap.c b/qmk/keyboards/edc40/keymaps/default/keymap.c
new file mode 100644
index 00000000..88d4eed2
--- /dev/null
+++ b/qmk/keyboards/edc40/keymaps/default/keymap.c
@@ -0,0 +1,43 @@
+/* Copyright 2020 OJtheTiny
+ *
+ * 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
+
+enum layers{
+    L0,
+    L1,
+    L2
+};
+
+const uint16_t PROGMEM keymaps [][MATRIX_ROWS][MATRIX_COLS] = {
+    [L0] = LAYOUT( /* Base Layer */
+      KC_ESC,  KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
+      KC_CAPS,  KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L,    KC_ENT,
+      KC_LSFT,   KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM,    KC_DOT,
+      KC_LCTL,  KC_LGUI,             LT(L1, KC_SPC),              KC_RALT, MO(L2)
+    ),
+    [L1] = LAYOUT( /* Num Layer */
+      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_TAB, _______, _______, _______, _______, _______, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT,      KC_BSLS,
+      _______,   _______, _______, KC_PSCR, _______, _______, KC_LBRC, KC_RBRC, KC_MINS,      KC_SLSH,
+      _______, _______,                             _______,                        _______, KC_EQL
+    ),
+    [L2] = LAYOUT( /* F-Keys */
+      _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,      KC_F10,     KC_F11,
+      _______,  KC_MPRV, KC_MPLY, KC_MNXT, _______, _______,  _______, _______, KC_SCLN, KC_QUOT,    KC_ENT,
+      _______,    KC_VOLD,  _______,  KC_VOLU, _______, _______, _______, _______, _______,            _______,
+      _______, _______,                              _______,                           _______, _______
+    )
+};
diff --git a/qmk/keyboards/edc40/keymaps/default/readme.md b/qmk/keyboards/edc40/keymaps/default/readme.md
new file mode 100644
index 00000000..127f7c56
--- /dev/null
+++ b/qmk/keyboards/edc40/keymaps/default/readme.md
@@ -0,0 +1 @@
+# default keymap for edc40
diff --git a/qmk/keyboards/edc40/keymaps/oj/keymap.c b/qmk/keyboards/edc40/keymaps/oj/keymap.c
new file mode 100644
index 00000000..1946750c
--- /dev/null
+++ b/qmk/keyboards/edc40/keymaps/oj/keymap.c
@@ -0,0 +1,94 @@
+/* Copyright 2020 OJtheTiny
+ *
+ * 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
+
+enum layers{
+  _QW,
+  _DV,
+  _CM,
+  _L1,
+  _L2,
+  _L3
+};
+enum custom_keycodes {
+    DVORAK = SAFE_RANGE,
+    QWERTY,
+    COLEMAK
+};
+
+
+const uint16_t PROGMEM keymaps [][MATRIX_ROWS][MATRIX_COLS] = {
+    [_QW] = LAYOUT( /* Qwerty */
+      KC_ESC,  KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
+      KC_LCTL,  KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L,    KC_ENT,
+      KC_LSFT,   KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM,    KC_DOT,
+      KC_TAB,  KC_LGUI,                  KC_SPC,              MO(_L1), MO(_L2)
+    ),
+    [_DV] = LAYOUT( /* Dvorak */
+      KC_ESC, KC_SLSH, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_QUOT,
+      KC_LCTL, KC_A,    KC_O,    KC_E,   KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S,
+      KC_LSFT,   KC_Q,    KC_J,   KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z,
+      KC_TAB,  KC_LGUI,                         KC_SPC,                       MO(_L1), MO(_L2)
+    ),
+    [_CM] = LAYOUT( /* Colemak */
+      KC_ESC, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_QUOT,
+      KC_LCTL, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O,
+      KC_LSFT,   KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM,    KC_DOT,
+      KC_TAB, KC_LGUI,                  KC_SPC,              MO(_L1), MO(_L2)
+    ),
+    [_L1] = LAYOUT( /* NUM */
+      KC_GRV, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,  KC_8,    KC_9,    KC_0,    KC_MINUS,
+      _______, _______, _______, _______, _______, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT, KC_SCLN,      KC_BSLS,
+      _______,   _______, _______, KC_PSCR, _______, _______, KC_LBRC, KC_RBRC, KC_MINUS,      KC_EQL,
+      _______, _______,                             _______,                        _______, _______
+    ),
+    [_L2] = LAYOUT( /* F Keys */
+      _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,      KC_F10,     KC_F11,
+      _______,  KC_MPRV, KC_MPLY, KC_MNXT, _______, _______,  _______, _______, UC(0xc3b6), UC(0xc3a4),    KC_ENT,
+      _______,    QWERTY,  DVORAK,  COLEMAK, TG(_L3), _______, _______, _______, _______,            _______,
+      _______, _______,                              _______,                           _______, _______
+    ),
+    [_L3] = LAYOUT( /*Gaming */
+    KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5,    _______, KC_F1, KC_F2, KC_F3, KC_F4, _______,
+    KC_TAB,  KC_Q, KC_W, KC_E, KC_R, _______,  KC_F5, KC_F6, KC_F7, KC_F8,    _______,
+    KC_LCTL,   KC_A, KC_S, KC_D, KC_F, KC_G, _______, _______, _______,       _______,
+    KC_LSFT, KC_B,                    KC_SPC,                      MO(_L2), _______
+    )
+};
+
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+      switch(keycode) {
+        case DVORAK:
+          if (record->event.pressed) {
+            set_single_persistent_default_layer(_DV);
+          }
+          return false;
+        case QWERTY:
+          if (record->event.pressed) {
+            set_single_persistent_default_layer(_QW);
+          }
+          return false;
+        case COLEMAK:
+          if (record->event.pressed) {
+            set_single_persistent_default_layer(_CM);
+          }
+          return false;
+        default:
+          return true;
+      }
+    return true;
+};
diff --git a/qmk/keyboards/edc40/keymaps/oj/readme.md b/qmk/keyboards/edc40/keymaps/oj/readme.md
new file mode 100644
index 00000000..8e21176a
--- /dev/null
+++ b/qmk/keyboards/edc40/keymaps/oj/readme.md
@@ -0,0 +1 @@
+# Objectively the best keymap for EDC40
\ No newline at end of file
diff --git a/qmk/keyboards/edc40/keymaps/via/keymap.c b/qmk/keyboards/edc40/keymaps/via/keymap.c
new file mode 100644
index 00000000..022970cd
--- /dev/null
+++ b/qmk/keyboards/edc40/keymaps/via/keymap.c
@@ -0,0 +1,55 @@
+/* Copyright 2020 OJtheTiny
+ *
+ * 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] = {
+     
+     /* Default Layer*/
+     [0] = LAYOUT(
+         KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
+         KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_ENT,
+         KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_RSFT,
+         KC_LCTL, KC_LGUI,               KC_SPC,               KC_RALT, KC_RCTL
+     ),
+     /* Num Layer */
+     [1] = LAYOUT( 
+         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
+     ),
+     /* F Layer */
+     [2] = LAYOUT(
+         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
+     ),
+     /* Lock Layer */
+     [3] = LAYOUT(
+         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
+     ),
+     /* Random Layer */
+     [4] = LAYOUT(
+         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
+     )
+};
\ No newline at end of file
diff --git a/qmk/keyboards/edc40/keymaps/via/readme.md b/qmk/keyboards/edc40/keymaps/via/readme.md
new file mode 100644
index 00000000..b53c7a62
--- /dev/null
+++ b/qmk/keyboards/edc40/keymaps/via/readme.md
@@ -0,0 +1 @@
+# VIA keymap for edc40
\ No newline at end of file
diff --git a/qmk/keyboards/edc40/keymaps/via/rules.mk b/qmk/keyboards/edc40/keymaps/via/rules.mk
new file mode 100644
index 00000000..036bd6d1
--- /dev/null
+++ b/qmk/keyboards/edc40/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/qmk/keyboards/edc40/readme.md b/qmk/keyboards/edc40/readme.md
new file mode 100644
index 00000000..8901ce71
--- /dev/null
+++ b/qmk/keyboards/edc40/readme.md
@@ -0,0 +1,13 @@
+# EDC40
+
+An everyday carry 40% keyboard
+
+* Keyboard Maintainer: [OJ](https://github.com/ojthetiny)
+* Hardware Supported: EDC40 PCB
+* Hardware Availabilty: TeslaSkeys
+
+Make example for this keyboard (after setting up your build environment):
+
+    make edc40: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).
diff --git a/qmk/keyboards/edc40/rules.mk b/qmk/keyboards/edc40/rules.mk
new file mode 100644
index 00000000..c5128a8f
--- /dev/null
+++ b/qmk/keyboards/edc40/rules.mk
@@ -0,0 +1,23 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = full     # 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 = 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 = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+UNICODE_ENABLE = yes
diff --git a/qmk/keyboards/eek/config.h b/qmk/keyboards/eek/config.h
new file mode 100644
index 00000000..d8a94926
--- /dev/null
+++ b/qmk/keyboards/eek/config.h
@@ -0,0 +1,134 @@
+/*
+Copyright 2020 klackygears
+
+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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x4A53
+#define PRODUCT_ID      0x0002
+#define DEVICE_VER      0x0004
+#define MANUFACTURER    klackygears
+#define PRODUCT         eek!
+
+/* key matrix size */
+#define MATRIX_ROWS 4
+#define MATRIX_COLS 10
+
+#define MATRIX_ROW_PINS { D7, E6, B4, B5 }
+#define MATRIX_COL_PINS { D4, C6, B6, B2, B3, B1, F7, F6, F5, F4 }
+
+#define UNUSED_PINS { D2, D1, D0 }
+
+#define DIODE_DIRECTION COL2ROW
+
+
+ #define RGB_DI_PIN D3
+#ifdef RGB_DI_PIN
+  #define RGBLED_NUM 36
+  #define RGBLIGHT_HUE_STEP 4
+  #define RGBLIGHT_SAT_STEP 8
+  #define RGBLIGHT_VAL_STEP 8
+  #define RGBLIGHT_LIMIT_VAL 200 /* The maximum brightness level */
+  #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+/*== all animations enable ==*/
+  #define RGBLIGHT_ANIMATIONS
+// /*== or choose animations ==*/
+//   #define RGBLIGHT_EFFECT_BREATHING
+//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
+//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+//   #define RGBLIGHT_EFFECT_SNAKE
+//   #define RGBLIGHT_EFFECT_KNIGHT
+//   #define RGBLIGHT_EFFECT_CHRISTMAS
+//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
+//   #define RGBLIGHT_EFFECT_RGB_TEST
+//   #define RGBLIGHT_EFFECT_ALTERNATING
+// /*== customize breathing effect ==*/
+//   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+//   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+//   /*==== use exp() and sin() ====*/
+//   #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//   #define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+ #endif
+
+ #ifdef RGB_MATRIX_ENABLE
+  #define DRIVER_LED_TOTAL 36
+  #define RGB_MATRIX_LED_FLUSH_LIMIT 16
+  #define RGB_MATRIX_STARTUP_VAL 150
+  #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
+ #endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is userful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+// #define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+//#define NO_ACTION_MACRO
+//#define NO_ACTION_FUNCTION
+
+
+/* Bootmagic Lite key configuration */
+// #define BOOTMAGIC_LITE_ROW 0
+// #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/eek/eek.c b/qmk/keyboards/eek/eek.c
new file mode 100644
index 00000000..37295625
--- /dev/null
+++ b/qmk/keyboards/eek/eek.c
@@ -0,0 +1,55 @@
+/* Copyright 2020 klackygears
+ *
+ * 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 "eek.h"
+
+#ifdef RGB_MATRIX_ENABLE
+
+  // Logical Layout
+  // Columns
+  //  0  1  2  3  4
+  //                   ROWS
+  //  4  3  2  1  0      0
+  //  5  6  7  8  9      1
+  // 14 13 12 11 10      2
+  //       15 16 17      3
+
+ // Logical Layout v1.3
+  // Columns
+  //  0  1  2  3  4  5  6  7  8  9
+  //                                 ROWS
+  //  0  1  2  3  4  5  6  7  8  9     0
+  // 19 18 17 16 15 14 13 12 11 10     1
+  // 20 21 22 23 24 25 26 27 28 29     2
+  //       35 34 33 32 31 30           3
+
+
+led_config_t g_led_config = { {
+    {    0,  1,  2,  3,  4,  5,  6,  7,  8,  9  },
+    {   19, 18, 17, 16, 15, 14, 13, 12, 11, 10  },
+    {   20, 21, 22, 23, 24, 25, 26, 27, 28, 29  },
+    { NO_LED, NO_LED, 35, 34, 33, 32, 31, 30, NO_LED, NO_LED }
+}, {
+    {  31,  0 }, {  46,  0 }, {  62,  0 }, {  77,  7 }, {  93, 13 }, { 131, 13 }, { 147,  7 }, { 162,  0 }, { 178,  0 }, { 193,  0 },
+    { 201, 10 }, { 185, 10 }, { 170, 10 }, { 154, 17 }, { 139, 24 }, {  85, 24 }, {  70, 17 }, {  54, 10 }, {  39, 10 }, {  23, 10 },
+    {  15, 20 }, {  31, 20 }, {  46, 20 }, {  62, 27 }, {  77, 34 }, { 147, 34 }, { 162, 27 }, { 178, 20 }, { 193, 20 }, { 209, 20 },
+    { 185, 34 }, { 170, 37 }, { 154, 44 }, {  70, 44 }, {  54, 37 }, {  39, 34 },
+}, {
+     4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+     4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+     4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+     1, 1, 1, 1, 1, 1,
+} };
+#endif
diff --git a/qmk/keyboards/eek/eek.h b/qmk/keyboards/eek/eek.h
new file mode 100644
index 00000000..4e4133d8
--- /dev/null
+++ b/qmk/keyboards/eek/eek.h
@@ -0,0 +1,24 @@
+/* Copyright 2020 klackygears
+ *
+ * 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"
+
+#if defined(KEYBOARD_eek_silk_down)
+#    include "silk_down.h"
+#elif defined(KEYBOARD_eek_silk_up)
+#    include "silk_up.h"
+#endif
diff --git a/qmk/keyboards/eek/info.json b/qmk/keyboards/eek/info.json
new file mode 100644
index 00000000..c911e50c
--- /dev/null
+++ b/qmk/keyboards/eek/info.json
@@ -0,0 +1,56 @@
+{
+    "keyboard_name": "eek!",
+    "url": "http://www.keyboard-layout-editor.com/#/gists/3e4d0cd1534dd4e4b9f25cf2b36d0d63",
+    "maintainer": "klackygears",
+    "width": 13,
+    "height": 6.25,
+    "layouts": {
+        "LAYOUT_split_3x5_3": {
+            "layout": [
+                {"x": 0, "y": 0.88},
+                {"x": 1, "y": 0.38},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0.38},
+                {"x": 4, "y": 0.5},
+
+                {"x": 6, "y": 0.5},
+                {"x": 7, "y": 0.38},
+                {"x": 8, "y": 0},
+                {"x": 9, "y": 0.38},
+                {"x": 10, "y": 0.88},
+
+                {"x": 0, "y": 1.88},
+                {"x": 1, "y": 1.38},
+                {"x": 2, "y": 1},
+                {"x": 3, "y": 1.38},
+                {"x": 4, "y": 1.5},
+
+                {"x": 6, "y": 1.5},
+                {"x": 7, "y": 1.38},
+                {"x": 8, "y": 1.0},
+                {"x": 9, "y": 1.38},
+                {"x": 10, "y": 1.88},
+
+                {"x": 0, "y": 2.88},
+                {"x": 1, "y": 2.38},
+                {"x": 2, "y": 2},
+                {"x": 3, "y": 2.38},
+                {"x": 4, "y": 2.5},
+
+                {"x": 6, "y": 2.5},
+                {"x": 7, "y": 2.38},
+                {"x": 8, "y": 2},
+                {"x": 9, "y": 2.38},
+                {"x": 10, "y": 2.88},
+
+                {"x": 2, "y": 3.25},
+                {"x": 3, "y": 3.38},
+                {"x": 4, "y": 3.5},
+
+                {"x": 6, "y": 3.5},
+                {"x": 7, "y": 3.38},
+                {"x": 8, "y": 3.25}
+            ]
+        }
+    }
+}
diff --git a/qmk/keyboards/eek/keymaps/default/keymap.c b/qmk/keyboards/eek/keymaps/default/keymap.c
new file mode 100644
index 00000000..ad8f9688
--- /dev/null
+++ b/qmk/keyboards/eek/keymaps/default/keymap.c
@@ -0,0 +1,72 @@
+/* Copyright 2020 klackygears
+ *
+ * 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
+
+enum layer_names {
+    _BASE,
+    _LOWER,
+    _RAISE,
+    _ADJUST
+};
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/* Qwerty
+ *
+ * ,----------------------------------.           ,----------------------------------.
+ * |   Q  |   W  |   E  |   R  |   T  |           |   Y  |   U  |   I  |   O  |   P  |
+ * |------+------+------+------+------|           |------+------+------+------+------|
+ * |   A  |   S  |   D  |   F  |   G  |           |   H  |   J  |   K  |   L  |   ;  |
+ * |------+------+------+------+------|           |------+------+------+------+------|
+ * |   Z  |   X  |   C  |   V  |   B  |           |   N  |   M  |   ,  |   .  |   /  |
+ * `-------------+------+------+------|           |------+------+------+-------------'
+ *               | Ctrl | LOWER| Space|           |BckSpc| RAISE| Shift|
+ *               `--------------------'           `--------------------'
+ *
+ */
+  [_BASE] = LAYOUT_split_3x5_3(
+    KC_Q,    KC_W,    KC_E,    KC_R,       KC_T,         KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,
+    KC_A,    KC_S,    KC_D,    KC_F,       KC_G,         KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,
+    KC_Z,    KC_X,    KC_C,    KC_V,       KC_B,         KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,
+                      KC_LCTL, MO(_LOWER), KC_SPC,       KC_BSPC, MO(_RAISE), OSM(MOD_LSFT)
+  ),
+
+  [_LOWER] = LAYOUT_split_3x5_3(
+    KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,      KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,
+    KC_ESC,  _______, _______, _______, _______,      _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR,
+    KC_CAPS, KC_TILD, _______, _______, _______,      _______, _______, _______, KC_PIPE,  KC_DQT,
+                      _______, _______, _______,      KC_ENT,  _______, KC_DEL
+),
+
+  [_RAISE] = LAYOUT_split_3x5_3(
+    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,         KC_6,    KC_7,    KC_8,    KC_9,    KC_0,
+    KC_TAB,  KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT,      _______, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC,
+    KC_LCTL, KC_GRV,  KC_LGUI, KC_LALT, _______,      _______, _______, _______, KC_BSLS, KC_QUOT,
+                      _______, _______, _______,      _______, _______, _______
+  ),
+
+  [_ADJUST] = LAYOUT_split_3x5_3(
+    RGB_VAI,   RGB_SAI, RGB_HUI,  RGB_MOD,  RGB_TOG,      _______,  KC_F9,  KC_F10, KC_F11, KC_F12,
+    RGB_VAD,   RGB_SAD, RGB_HUD,  RGB_RMOD, _______,      _______,  KC_F5,  KC_F6,  KC_F7,  KC_F8,
+    _______,   _______, _______,  _______,  _______,      RESET,    KC_F1,  KC_F2,  KC_F3,  KC_F4,
+                        _______,  _______,  _______,      _______,  _______,  _______
+  ),
+};
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
+}
diff --git a/qmk/keyboards/eek/keymaps/default/readme.md b/qmk/keyboards/eek/keymaps/default/readme.md
new file mode 100644
index 00000000..fe83fd2c
--- /dev/null
+++ b/qmk/keyboards/eek/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for eek!
diff --git a/qmk/keyboards/eek/keymaps/ledtest/keymap.c b/qmk/keyboards/eek/keymaps/ledtest/keymap.c
new file mode 100644
index 00000000..8b046223
--- /dev/null
+++ b/qmk/keyboards/eek/keymaps/ledtest/keymap.c
@@ -0,0 +1,92 @@
+/* Copyright 2020 klackygears
+ *
+ * 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
+
+enum layer_names {
+    _QUERTY,
+    _LOWER,
+    _RAISE,
+    _ADJUST
+};
+
+enum custom_keycodes {
+  RGBRST = SAFE_RANGE
+};
+
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/* Qwerty
+ *
+ * ,----------------------------------.           ,------------------------------------------------------------------------------.
+ * |   Q  |   W  |   E  |   R  |   T  |           | RGB reset|Hue increase|Saturation increase|Brightness increase|Speed increase|
+ * |------+------+------+------+------|           |----------+------------+-------------------+-------------------+--------------|
+ * |   A  |   S  |   D  |   F  |   G  |           | RGB Mode |Hue decrease|Saturation decrease|Brightness decrease|Speed decrease|
+ * |------+------+------+------+------|           |----------+------------+-------------------+-------------------+--------------|
+ * |   Z  |   X  |   C  |   V  |   B  |           |RGB Toggle|       M    |         ,         |         .         |      /       |
+ * `-------------+------+------+------|           |----------+------------+-------------------+----------------------------------'
+ *               | Ctrl | LOWER| Space|           |   BckSpc |     RAISE  |        Shift      |
+ *               `--------------------'           `-------------------------------------------'
+ *
+ */
+  [_QUERTY] = LAYOUT_split_3x5_3(
+    KC_Q,    KC_W,    KC_E,    KC_R,       KC_T,         RGBRST,     RGB_HUI,    RGB_SAI,    RGB_VAI,    RGB_SPI,
+    KC_A,    KC_S,    KC_D,    KC_F,       KC_G,         RGB_MOD,    RGB_HUD,    RGB_SAD,    RGB_VAD,    RGB_SPD,
+    KC_Z,    KC_X,    KC_C,    KC_V,       KC_B,         RGB_TOG,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,
+                      KC_LCTL, MO(_LOWER), KC_SPC,       KC_BSPC, MO(_RAISE), OSM(MOD_LSFT)
+  ),
+
+  [_LOWER] = LAYOUT_split_3x5_3(
+    KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,      KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,
+    KC_ESC,  _______, _______, _______, _______,      _______, KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR,
+    KC_CAPS, KC_TILD, _______, _______, _______,      _______, _______, _______, KC_PIPE,  KC_DQT,
+                      _______, _______, _______,      KC_ENT,  _______, KC_DEL
+),
+
+  [_RAISE] = LAYOUT_split_3x5_3(
+    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,         KC_6,    KC_7,    KC_8,    KC_9,    KC_0,
+    KC_TAB,  KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT,      _______, KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC,
+    KC_LCTL, KC_GRV,  KC_LGUI, KC_LALT, _______,      _______, _______, _______, KC_BSLS, KC_QUOT,
+                      _______, _______, _______,      _______, _______, _______
+  ),
+
+  [_ADJUST] = LAYOUT_split_3x5_3(
+    RGB_VAI,   RGB_SAI, RGB_HUI,  RGB_MOD,  RGB_TOG,      _______,  KC_F9,  KC_F10, KC_F11, KC_F12,
+    RGB_VAD,   RGB_SAD, RGB_HUD,  RGB_RMOD, _______,      _______,  KC_F5,  KC_F6,  KC_F7,  KC_F8,
+    _______,   _______, _______,  _______,  _______,      RESET,    KC_F1,  KC_F2,  KC_F3,  KC_F4,
+                        _______,  _______,  _______,      _______,  _______,  _______
+  ),
+};
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+
+  switch (keycode) {
+    case RGBRST:
+      #ifdef RGBLIGHT_ENABLE
+        if (record->event.pressed) {
+          eeconfig_update_rgblight_default();
+          rgblight_enable();
+        }
+      #endif
+      break;
+  }
+  return true;
+}
diff --git a/qmk/keyboards/eek/keymaps/ledtest/rules.mk b/qmk/keyboards/eek/keymaps/ledtest/rules.mk
new file mode 100644
index 00000000..92a83337
--- /dev/null
+++ b/qmk/keyboards/eek/keymaps/ledtest/rules.mk
@@ -0,0 +1,2 @@
+#RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
+RGB_MATRIX_ENABLE = yes       # Enable for pretty RGB matrix effects
diff --git a/qmk/keyboards/eek/readme.md b/qmk/keyboards/eek/readme.md
new file mode 100644
index 00000000..89c6deb3
--- /dev/null
+++ b/qmk/keyboards/eek/readme.md
@@ -0,0 +1,25 @@
+# eek!
+
+![eek](https://i.imgur.com/34O3xKWl.jpg)
+
+The eek! is a 36 key per key RGB keyboard with a 90 degree split layout suited for travel and typing close to the body. It uses a Pro Micro or an Elite C and can be soldered low profile using castilated pads. The PCB can be flipped so that the silk is on top and the USB plugin can face to the right or left. The keyboard is compatible with MX, Alps, and Choc style switches. It can use SMD or through hole diodes. The per key RGB LEDs used in the build are the SK6812 Mini E (these can also be flipped). The eek! can be used without a case if you choose for a very low profile keyboard.
+
+When flashing the eek! with the bat side up follow the second example below and use: make eek/silk_up:default
+
+![eek_bat](https://i.imgur.com/YrOqmft.jpeg)
+
+* Keyboard Maintainer: [klackygears](https://github.com/klackygears)
+* Hardware Supported: The eek! PCBs, Pro Micro supported, Low Profile Elite-C supported
+* Hardware Availability: [Case Data & firmware](https://github.com/klackygears/eek_doc)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make eek:default
+    make eek/silk_up:default
+
+Flashing example for this keyboard:
+
+    make eek:default:flash
+    make eek/silk_up:default:flash
+
+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).
diff --git a/qmk/keyboards/eek/rules.mk b/qmk/keyboards/eek/rules.mk
new file mode 100644
index 00000000..ce3df8f2
--- /dev/null
+++ b/qmk/keyboards/eek/rules.mk
@@ -0,0 +1,25 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = qmk-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = yes        # Console for debug
+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
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+RGB_MATRIX_DRIVER = WS2812
+DEFAULT_FOLDER = eek/silk_down
+LAYOUTS = split_3x5_3
diff --git a/qmk/keyboards/eek/silk_down/readme.md b/qmk/keyboards/eek/silk_down/readme.md
new file mode 100644
index 00000000..12e250f7
--- /dev/null
+++ b/qmk/keyboards/eek/silk_down/readme.md
@@ -0,0 +1,13 @@
+# eek!
+
+This is the default layout for the eek! The silkscreen with the bat and the eek! text will face down. See the picture and the flashing example.
+
+![eek](https://i.imgur.com/34O3xKW.jpg)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make eek:default
+
+Flashing example for this keyboard:
+
+    make eek:default:flash
diff --git a/qmk/keyboards/eek/silk_down/rules.mk b/qmk/keyboards/eek/silk_down/rules.mk
new file mode 100644
index 00000000..e69de29b
diff --git a/qmk/keyboards/eek/silk_down/silk_down.h b/qmk/keyboards/eek/silk_down/silk_down.h
new file mode 100644
index 00000000..c8ececd9
--- /dev/null
+++ b/qmk/keyboards/eek/silk_down/silk_down.h
@@ -0,0 +1,39 @@
+/* Copyright 2020 klackygears
+ *
+ * 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 "eek.h"
+
+/* This a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT_split_3x5_3( \
+    K00, K01, K02, K03, K04,     K05, K06, K07, K08, K09, \
+    K10, K11, K12, K13, K14,     K15, K16, K17, K18, K19, \
+    K20, K21, K22, K23, K24,     K25, K26, K27, K28, K29, \
+              K32, K33, K34,     K35, K36, K37 \
+) \
+{ \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09 }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19 }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29 }, \
+    { KC_NO, KC_NO, K32, K33, K34, K35, K36, K37, KC_NO, KC_NO } \
+}
diff --git a/qmk/keyboards/eek/silk_up/readme.md b/qmk/keyboards/eek/silk_up/readme.md
new file mode 100644
index 00000000..1b24b954
--- /dev/null
+++ b/qmk/keyboards/eek/silk_up/readme.md
@@ -0,0 +1,14 @@
+# eek!
+
+This is the alternate layout for the eek! The silkscreen with the bat and eek! text will face up. See the picture and the flashing example.
+
+![eek_bat](https://i.imgur.com/YrOqmft.jpeg)
+ 
+Make example for this keyboard (after setting up your build environment):
+ 
+    make eek/silk_up:default
+
+Flashing example for this keyboard:
+ 
+    make eek/silk_up:default:flash
+ 
\ No newline at end of file
diff --git a/qmk/keyboards/eek/silk_up/rules.mk b/qmk/keyboards/eek/silk_up/rules.mk
new file mode 100644
index 00000000..e69de29b
diff --git a/qmk/keyboards/eek/silk_up/silk_up.h b/qmk/keyboards/eek/silk_up/silk_up.h
new file mode 100644
index 00000000..8b9fe395
--- /dev/null
+++ b/qmk/keyboards/eek/silk_up/silk_up.h
@@ -0,0 +1,39 @@
+/* Copyright 2020 klackygears
+ *
+ * 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 "eek.h"
+
+/* This a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT_split_3x5_3( \
+    K09, K08, K07, K06, K05,     K04, K03, K02, K01, K00, \
+    K19, K18, K17, K16, K15,     K14, K13, K12, K11, K10, \
+    K29, K28, K27, K26, K25,     K24, K23, K22, K21, K20, \
+              K37, K36, K35,     K34, K33, K32 \
+) \
+{ \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09 }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19 }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29 }, \
+    { KC_NO, KC_NO, K32, K33, K34, K35, K36, K37, KC_NO, KC_NO } \
+}
diff --git a/qmk/keyboards/efreet/config.h b/qmk/keyboards/efreet/config.h
index b73ce7e0..ed5bb730 100644
--- a/qmk/keyboards/efreet/config.h
+++ b/qmk/keyboards/efreet/config.h
@@ -20,12 +20,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0x534F // "SO"
-#define PRODUCT_ID      0x0001
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Soran
-#define PRODUCT         Efreet
-#define DESCRIPTION     A 40% ortholinear keyboard.
+#define VENDOR_ID    0x534F // "SO"
+#define PRODUCT_ID   0x0001
+#define DEVICE_VER   0x0001
+#define MANUFACTURER Soran
+#define PRODUCT      Efreet
 
 /* key matrix size */
 #define MATRIX_ROWS 8
@@ -40,50 +39,50 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
  *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
  *
-*/
+ */
 #define MATRIX_ROW_PINS { B0, D6, D5, D4, D3, D2, D1, C2 }
 #define MATRIX_COL_PINS { B3, B4, B5, B6, B7, C7 }
 #define UNUSED_PINS
 
-/* COL2ROW, ROW2COL*/
+/* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
 /*
  * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
  */
-#define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6
+#define SOFT_SERIAL_PIN D0  // or D1, D2, D3, E6
 
 #define BACKLIGHT_PIN D0
-#define BACKLIGHT_BREATHING
 #define BACKLIGHT_LEVELS 3
+#define BACKLIGHT_BREATHING
 
-// #define RGB_DI_PIN E2
-// #ifdef RGB_DI_PIN
-//   #define RGBLED_NUM 16
-//   #define RGBLIGHT_HUE_STEP 8
-//   #define RGBLIGHT_SAT_STEP 8
-//   #define RGBLIGHT_VAL_STEP 8
-//   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
-//   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-//   #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
-// /*== customize breathing effect ==*/
-//   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
-//   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
-//   /*==== use exp() and sin() ====*/
-//   #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
-//   #define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
-// #endif
+//#define RGB_DI_PIN E2
+//#ifdef RGB_DI_PIN
+//#    define RGBLED_NUM 16
+//#    define RGBLIGHT_HUE_STEP 8
+//#    define RGBLIGHT_SAT_STEP 8
+//#    define RGBLIGHT_VAL_STEP 8
+//#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+//#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+/*== all animations enable ==*/
+//#    define RGBLIGHT_ANIMATIONS
+/*== or choose animations ==*/
+//#    define RGBLIGHT_EFFECT_BREATHING
+//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+//#    define RGBLIGHT_EFFECT_SNAKE
+//#    define RGBLIGHT_EFFECT_KNIGHT
+//#    define RGBLIGHT_EFFECT_CHRISTMAS
+//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+//#    define RGBLIGHT_EFFECT_RGB_TEST
+//#    define RGBLIGHT_EFFECT_ALTERNATING
+/*== customize breathing effect ==*/
+/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+//#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+/*==== use exp() and sin() ====*/
+//#    define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//#    define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+//#endif
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
@@ -97,9 +96,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_RESYNC_ENABLE
 
 /* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
- * This is userful for the Windows task manager shortcut (ctrl+shift+esc).
+ * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
  */
-// #define GRAVE_ESC_CTRL_OVERRIDE
+//#define GRAVE_ESC_CTRL_OVERRIDE
 
 /*
  * Force NKRO
@@ -122,55 +121,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 //#define FORCE_NKRO
 
-/*
- * Magic Key Options
- *
- * Magic keys are hotkey commands that allow control over firmware functions of
- * the keyboard. They are best used in combination with the HID Listen program,
- * found here: https://www.pjrc.com/teensy/hid_listen.html
- *
- * The options below allow the magic key functionality to be changed. This is
- * useful if your keyboard/keypad is missing keys and you want magic key support.
- *
- */
-
-/* control how magic key switches layers */
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS  true
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS  true
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false
-
-/* override magic key keymap */
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM
-//#define MAGIC_KEY_HELP           H
-//#define MAGIC_KEY_HELP_ALT       SLASH
-//#define MAGIC_KEY_DEBUG          D
-//#define MAGIC_KEY_DEBUG_MATRIX   X
-//#define MAGIC_KEY_DEBUG_KBD      K
-//#define MAGIC_KEY_DEBUG_MOUSE    M
-//#define MAGIC_KEY_VERSION        V
-//#define MAGIC_KEY_STATUS         S
-//#define MAGIC_KEY_CONSOLE        C
-//#define MAGIC_KEY_LAYER0         0
-//#define MAGIC_KEY_LAYER0_ALT     GRAVE
-//#define MAGIC_KEY_LAYER1         1
-//#define MAGIC_KEY_LAYER2         2
-//#define MAGIC_KEY_LAYER3         3
-//#define MAGIC_KEY_LAYER4         4
-//#define MAGIC_KEY_LAYER5         5
-//#define MAGIC_KEY_LAYER6         6
-//#define MAGIC_KEY_LAYER7         7
-//#define MAGIC_KEY_LAYER8         8
-//#define MAGIC_KEY_LAYER9         9
-//#define MAGIC_KEY_BOOTLOADER     B
-//#define MAGIC_KEY_BOOTLOADER_ALT ESC
-//#define MAGIC_KEY_LOCK           CAPS
-//#define MAGIC_KEY_EEPROM         E
-//#define MAGIC_KEY_EEPROM_CLEAR   BSPACE
-//#define MAGIC_KEY_NKRO           N
-//#define MAGIC_KEY_SLEEP_LED      Z
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
@@ -186,32 +136,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
-/*
- * MIDI options
- */
-
-/* Prevent use of disabled MIDI features in the keymap */
-//#define MIDI_ENABLE_STRICT 1
-
-/* enable basic MIDI features:
-   - MIDI notes can be sent when in Music mode is on
-*/
-//#define MIDI_BASIC
-
-/* enable advanced MIDI features:
-   - MIDI notes can be added to the keymap
-   - Octave shift and transpose
-   - Virtual sustain, portamento, and modulation wheel
-   - etc.
-*/
-//#define MIDI_ADVANCED
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 1
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
-// #define BOOTMAGIC_LITE_ROW 0
-// #define BOOTMAGIC_LITE_COLUMN 0
+//#define BOOTMAGIC_LITE_ROW 0
+//#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/efreet/efreet.c b/qmk/keyboards/efreet/efreet.c
index a05db74a..3c52e1cd 100644
--- a/qmk/keyboards/efreet/efreet.c
+++ b/qmk/keyboards/efreet/efreet.c
@@ -13,39 +13,5 @@
  * 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 "efreet.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) {
-  // 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
-
-  led_set_user(usb_led);
-}
-
-*/
diff --git a/qmk/keyboards/efreet/efreet.h b/qmk/keyboards/efreet/efreet.h
index 7ad717f3..4b0c9f55 100644
--- a/qmk/keyboards/efreet/efreet.h
+++ b/qmk/keyboards/efreet/efreet.h
@@ -17,7 +17,9 @@
 
 #include "quantum.h"
 
-/* This a shortcut to help you visually see your layout.
+#define XXX KC_NO
+
+/* This is a shortcut to help you visually see your layout.
  *
  * The first section contains all of the arguments representing the physical
  * layout of the board and position of the keys.
@@ -25,35 +27,34 @@
  * The second converts the arguments into a two-dimensional array which
  * represents the switch matrix.
  */
+#define LAYOUT_ortho_4x12( \
+    k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, \
+    k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, \
+    k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, \
+    k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75 \
+) { \
+    { k10, k11, k12, k13, k14, k15 }, \
+    { k00, k01, k02, k03, k04, k05 }, \
+    { k30, k31, k32, k33, k34, k35 }, \
+    { k20, k21, k22, k23, k24, k25 }, \
+    { k50, k51, k52, k53, k54, k55 }, \
+    { k40, k41, k42, k43, k44, k45 }, \
+    { k70, k71, k72, k73, k74, k75 }, \
+    { k60, k61, k62, k63, k64, k65 } \
+}
 
- #define LAYOUT_ortho_4x12( \
-     K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15,\
-     K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35,\
-     K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,\
-     K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75\
- ) { \
- 	{ K10, K11, K12, K13, K14, K15 }, \
-     { K00, K01, K02, K03, K04, K05 }, \
-     { K30, K31, K32, K33, K34, K35 }, \
-     { K20, K21, K22, K23, K24, K25 }, \
-     { K50, K51, K52, K53, K54, K55 }, \
-		 { K40, K41, K42, K43, K44, K45 }, \
-     { K70, K71, K72, K73, K74, K75 }, \
-     { K60, K61, K62, K63, K64, K65 } \
- }
-
- #define LAYOUT_planck_mit( \
- 		K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15,\
- 		K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35,\
- 		K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,\
- 		K60, K70, K61, K71, K62,    K72,   K73, K64, K74, K65, K75\
- ) { \
-  { K10, K11, K12, K13, K14, K15 }, \
- 		{ K00, K01, K02, K03, K04, K05 }, \
- 		{ K30, K31, K32, K33, K34, K35 }, \
- 		{ K20, K21, K22, K23, K24, K25 }, \
- 		{ K50, K51, K52, K53, K54, K55 }, \
-		{ K40, K41, K42, K43, K44, K45 }, \
- 		{ K70, K71, K72, K73, K74, K75 }, \
- 		{ K60, K61, K62, KC_NO, K64, K65 } \
- }
+#define LAYOUT_planck_mit( \
+    k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, \
+    k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, \
+    k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, \
+    k60, k70, k61, k71, k62,    k72,   k73, k64, k74, k65, k75 \
+) { \
+    { k10, k11, k12, k13, k14, k15 }, \
+    { k00, k01, k02, k03, k04, k05 }, \
+    { k30, k31, k32, k33, k34, k35 }, \
+    { k20, k21, k22, k23, k24, k25 }, \
+    { k50, k51, k52, k53, k54, k55 }, \
+    { k40, k41, k42, k43, k44, k45 }, \
+    { k70, k71, k72, k73, k74, k75 }, \
+    { k60, k61, k62, XXX, k64, k65 } \
+}
diff --git a/qmk/keyboards/efreet/info.json b/qmk/keyboards/efreet/info.json
index 25b627d8..6766b395 100644
--- a/qmk/keyboards/efreet/info.json
+++ b/qmk/keyboards/efreet/info.json
@@ -6,10 +6,113 @@
     "height": 4,
     "layouts": {
         "LAYOUT_planck_mit": {
-            "layout": [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Back Space", "x":11, "y":0}, {"label":"Esc", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"'", "x":11, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"/", "x":10, "y":2}, {"label":"Return", "x":11, "y":2}, {"x":0, "y":3}, {"label":"Ctrl", "x":1, "y":3}, {"label":"Alt", "x":2, "y":3}, {"label":"Super", "x":3, "y":3}, {"label":"&dArr;", "x":4, "y":3}, {"x":5, "y":3, "w":2}, {"label":"&uArr;", "x":7, "y":3}, {"label":"&larr;", "x":8, "y":3}, {"label":"&darr;", "x":9, "y":3}, {"label":"&uarr;", "x":10, "y":3}, {"label":"&rarr;", "x":11, "y":3}]
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6, "y": 0},
+                {"x": 7, "y": 0},
+                {"x": 8, "y": 0},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+
+                {"x": 0, "y": 1},
+                {"x": 1, "y": 1},
+                {"x": 2, "y": 1},
+                {"x": 3, "y": 1},
+                {"x": 4, "y": 1},
+                {"x": 5, "y": 1},
+                {"x": 6, "y": 1},
+                {"x": 7, "y": 1},
+                {"x": 8, "y": 1},
+                {"x": 9, "y": 1},
+                {"x": 10, "y": 1},
+                {"x": 11, "y": 1},
+
+                {"x": 0, "y": 2},
+                {"x": 1, "y": 2},
+                {"x": 2, "y": 2},
+                {"x": 3, "y": 2},
+                {"x": 4, "y": 2},
+                {"x": 5, "y": 2},
+                {"x": 6, "y": 2},
+                {"x": 7, "y": 2},
+                {"x": 8, "y": 2},
+                {"x": 9, "y": 2},
+                {"x": 10, "y": 2},
+                {"x": 11, "y": 2},
+
+                {"x": 0, "y": 3},
+                {"x": 1, "y": 3},
+                {"x": 2, "y": 3},
+                {"x": 3, "y": 3},
+                {"x": 4, "y": 3},
+                {"x": 5, "y": 3, "w": 2},
+                {"x": 7, "y": 3},
+                {"x": 8, "y": 3},
+                {"x": 9, "y": 3},
+                {"x": 10, "y": 3},
+                {"x": 11, "y": 3}
+            ]
         },
-			"LAYOUT_ortho_4x12": {
-          "layout": [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Back Space", "x":11, "y":0}, {"label":"Esc", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"'", "x":11, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"/", "x":10, "y":2}, {"label":"Return", "x":11, "y":2}, {"x":0, "y":3}, {"label":"Ctrl", "x":1, "y":3}, {"label":"Alt", "x":2, "y":3}, {"label":"Super", "x":3, "y":3}, {"label":"&dArr;", "x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"label":"&uArr;", "x":7, "y":3}, {"label":"&larr;", "x":8, "y":3}, {"label":"&darr;", "x":9, "y":3}, {"label":"&uarr;", "x":10, "y":3}, {"label":"&rarr;", "x":11, "y":3}]
+        "LAYOUT_ortho_4x12": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6, "y": 0},
+                {"x": 7, "y": 0},
+                {"x": 8, "y": 0},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+
+                {"x": 0, "y": 1},
+                {"x": 1, "y": 1},
+                {"x": 2, "y": 1},
+                {"x": 3, "y": 1},
+                {"x": 4, "y": 1},
+                {"x": 5, "y": 1},
+                {"x": 6, "y": 1},
+                {"x": 7, "y": 1},
+                {"x": 8, "y": 1},
+                {"x": 9, "y": 1},
+                {"x": 10, "y": 1},
+                {"x": 11, "y": 1},
+
+                {"x": 0, "y": 2},
+                {"x": 1, "y": 2},
+                {"x": 2, "y": 2},
+                {"x": 3, "y": 2},
+                {"x": 4, "y": 2},
+                {"x": 5, "y": 2},
+                {"x": 6, "y": 2},
+                {"x": 7, "y": 2},
+                {"x": 8, "y": 2},
+                {"x": 9, "y": 2},
+                {"x": 10, "y": 2},
+                {"x": 11, "y": 2},
+
+                {"x": 0, "y": 3},
+                {"x": 1, "y": 3},
+                {"x": 2, "y": 3},
+                {"x": 3, "y": 3},
+                {"x": 4, "y": 3},
+                {"x": 5, "y": 3},
+                {"x": 6, "y": 3},
+                {"x": 7, "y": 3},
+                {"x": 8, "y": 3},
+                {"x": 9, "y": 3},
+                {"x": 10, "y": 3},
+                {"x": 11, "y": 3}
+            ]
         }
     }
 }
diff --git a/qmk/keyboards/efreet/keymaps/default/keymap.c b/qmk/keyboards/efreet/keymaps/default/keymap.c
index 72443411..9f3bc08c 100644
--- a/qmk/keyboards/efreet/keymaps/default/keymap.c
+++ b/qmk/keyboards/efreet/keymaps/default/keymap.c
@@ -13,43 +13,26 @@
  * 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_ortho_4x12(
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-    KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,
-    BL_TOGG, KC_LCTL, KC_LALT, KC_LGUI, MO(1),   KC_SPC,  KC_SPC,  MO(2),   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-  ),
-   [1] = LAYOUT_ortho_4x12(
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-    KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
-    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-  ),
-   [2] = LAYOUT_ortho_4x12(
-    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_BSPC,
-    KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS,    KC_PLUS,    KC_LCBR, KC_RCBR, KC_PIPE,
-    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  S(KC_NUHS), S(KC_NUBS), KC_HOME, KC_END,  _______,
-    _______, _______, _______, _______, _______, _______, _______, _______,    KC_MNXT,    KC_VOLD, KC_VOLU, KC_MPLY
-  )
+    [0] = LAYOUT_ortho_4x12(
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+        KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
+        BL_TOGG, KC_LCTL, KC_LALT, KC_LGUI, MO(1),   KC_SPC,  KC_SPC,  MO(2),   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+    ),
+    [1] = LAYOUT_ortho_4x12(
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
+        KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
+        _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+    ),
+    [2] = LAYOUT_ortho_4x12(
+        KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_BSPC,
+        KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS,    KC_PLUS,    KC_LCBR, KC_RCBR, KC_PIPE,
+        _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  S(KC_NUHS), S(KC_NUBS), KC_HOME, KC_END,  _______,
+        _______, _______, _______, _______, _______, _______, _______, _______,    KC_MNXT,    KC_VOLD, KC_VOLU, KC_MPLY
+    )
 };
-
-void matrix_init_user(void) {
-
-}
-
-void matrix_scan_user(void) {
-
-}
-
-void led_set_user(uint8_t usb_led) {
-
-}
diff --git a/qmk/keyboards/efreet/keymaps/default/readme.md b/qmk/keyboards/efreet/keymaps/default/readme.md
index d714acd9..08f10328 100644
--- a/qmk/keyboards/efreet/keymaps/default/readme.md
+++ b/qmk/keyboards/efreet/keymaps/default/readme.md
@@ -1 +1 @@
-# The default keymap for efreet
\ No newline at end of file
+# The default keymap for efreet
diff --git a/qmk/keyboards/efreet/keymaps/via/keymap.c b/qmk/keyboards/efreet/keymaps/via/keymap.c
index c08e3bbe..0cd90f80 100644
--- a/qmk/keyboards/efreet/keymaps/via/keymap.c
+++ b/qmk/keyboards/efreet/keymaps/via/keymap.c
@@ -13,31 +13,32 @@
  * 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_ortho_4x12(
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
-    KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
-    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT ,
-    BL_TOGG, KC_LCTL, KC_LALT, KC_LGUI, MO(1),   KC_SPC,  KC_SPC,  MO(2),   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
-  ),
-   [1] = LAYOUT_ortho_4x12(
-    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-    KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
-    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
-  ),
-   [2] = LAYOUT_ortho_4x12(
-    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_BSPC,
-    KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS,    KC_PLUS,    KC_LCBR, KC_RCBR, KC_PIPE,
-    _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  S(KC_NUHS), S(KC_NUBS), KC_HOME, KC_END,  _______,
-    _______, _______, _______, _______, _______, _______, _______, _______,    KC_MNXT,    KC_VOLD, KC_VOLU, KC_MPLY
-  ),
-   [3] = LAYOUT_ortho_4x12(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-  )
+    [0] = LAYOUT_ortho_4x12(
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+        KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
+        BL_TOGG, KC_LCTL, KC_LALT, KC_LGUI, MO(1),   KC_SPC,  KC_SPC,  MO(2),   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+    ),
+    [1] = LAYOUT_ortho_4x12(
+        KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
+        KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
+        _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NUHS, KC_NUBS, KC_PGUP, KC_PGDN, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+    ),
+    [2] = LAYOUT_ortho_4x12(
+        KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR,    KC_ASTR,    KC_LPRN, KC_RPRN, KC_BSPC,
+        KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS,    KC_PLUS,    KC_LCBR, KC_RCBR, KC_PIPE,
+        _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  S(KC_NUHS), S(KC_NUBS), KC_HOME, KC_END,  _______,
+        _______, _______, _______, _______, _______, _______, _______, _______,    KC_MNXT,    KC_VOLD, KC_VOLU, KC_MPLY
+    ),
+    [3] = LAYOUT_ortho_4x12(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+    )
 };
diff --git a/qmk/keyboards/efreet/readme.md b/qmk/keyboards/efreet/readme.md
index 9310dacf..13c9cd50 100644
--- a/qmk/keyboards/efreet/readme.md
+++ b/qmk/keyboards/efreet/readme.md
@@ -1,15 +1,19 @@
 # Efreet
 
-![efreet](https://i.imgur.com/Lh6WLuI.jpg)
+![efreet](https://i.imgur.com/Lh6WLuIl.jpg)
 
 Custom PCB for the Efreet (as4x) keyboard.
 
-Keyboard Maintainer: [Amber Holly](https://github.com/amberstarlight)  
-Hardware Supported: Efreet PCB  
-Hardware Availability: private group buy
+* Keyboard Maintainer: [Amber Holly](https://github.com/amberstarlight)
+* Hardware Supported: Efreet PCB
+* Hardware Availability: private group buy
 
 Make example for this keyboard (after setting up your build environment):
 
     make efreet:default
 
+Flashing example for this keyboard:
+
+    make efreet:default:flash
+
 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).
diff --git a/qmk/keyboards/efreet/rules.mk b/qmk/keyboards/efreet/rules.mk
index 4f0e32f5..a9a43874 100644
--- a/qmk/keyboards/efreet/rules.mk
+++ b/qmk/keyboards/efreet/rules.mk
@@ -2,30 +2,23 @@
 MCU = atmega32u2
 
 # Bootloader selection
-#   Teensy       halfkay
-#   Pro Micro    caterina
-#   Atmel DFU    atmel-dfu
-#   LUFA DFU     lufa-dfu
-#   QMK DFU      qmk-dfu
-#   ATmega32A    bootloadHID
-#   ATmega328P   USBasp
 BOOTLOADER = atmel-dfu
 
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = lite      # Virtual DIP switch configuration
+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
-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 = yes       # Enable keyboard backlight functionality
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # 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 = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-MIDI_ENABLE = no            # MIDI support
-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
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
 
 LAYOUTS = ortho_4x12 planck_mit
diff --git a/qmk/keyboards/ergodone/twimaster.c b/qmk/keyboards/ergodone/twimaster.c
index f91c08e6..d6f3f784 100644
--- a/qmk/keyboards/ergodone/twimaster.c
+++ b/qmk/keyboards/ergodone/twimaster.c
@@ -9,7 +9,7 @@
 #include <inttypes.h>
 #include <compat/twi.h>
 
-#include <i2cmaster.h>
+#include "i2cmaster.h"
 
 
 /* define CPU frequency in Mhz here if not defined in Makefile */
diff --git a/qmk/keyboards/ergodox_ez/keymaps/nfriend/config.h b/qmk/keyboards/ergodox_ez/keymaps/nfriend/config.h
new file mode 100644
index 00000000..36d23c96
--- /dev/null
+++ b/qmk/keyboards/ergodox_ez/keymaps/nfriend/config.h
@@ -0,0 +1,31 @@
+/* Copyright (C) 2020 Nathan Friend
+ *
+ * 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 3 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
+
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+#undef DEBOUNCE
+#define DEBOUNCE 15
+
+#undef ONESHOT_TIMEOUT
+#define ONESHOT_TIMEOUT 1003
+
+#define PERMISSIVE_HOLD
+
+#undef IGNORE_MOD_TAP_INTERRUPT
+
+#define RGBLIGHT_SLEEP
diff --git a/qmk/keyboards/ergodox_ez/keymaps/nfriend/keymap.c b/qmk/keyboards/ergodox_ez/keymaps/nfriend/keymap.c
new file mode 100644
index 00000000..ccea63c9
--- /dev/null
+++ b/qmk/keyboards/ergodox_ez/keymaps/nfriend/keymap.c
@@ -0,0 +1,1096 @@
+/* Copyright (C) 2020 Nathan Friend
+ *
+ * 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 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+#include "version.h"
+#include "keymap_german.h"
+#include "keymap_nordic.h"
+#include "keymap_french.h"
+#include "keymap_spanish.h"
+#include "keymap_hungarian.h"
+
+#define KC_MAC_UNDO LGUI(KC_Z)
+#define KC_MAC_CUT LGUI(KC_X)
+#define KC_MAC_COPY LGUI(KC_C)
+#define KC_MAC_PASTE LGUI(KC_V)
+#define KC_PC_UNDO LCTL(KC_Z)
+#define KC_PC_CUT LCTL(KC_X)
+#define KC_PC_COPY LCTL(KC_C)
+#define KC_PC_PASTE LCTL(KC_V)
+#define ___ KC_TRNS
+
+/* Shortcut for Option+Ctrl */
+#define OC(keycode) LALT(LCTL(keycode))
+
+enum layer_names {
+
+    /* Base layers */
+    _COLEMAK,
+    _QWERTY,
+    _DVORAK,
+
+    /* Keys the base layers share */
+    _COMMON,
+
+    /* OS layers */
+    _MAC,
+    _WINDOWS,
+
+    /* Symbols */
+    _NUMPAD,
+    _SYMBOLS,
+
+    /* Window management */
+    _WM_MAC,
+    _WM_WINDOWS,
+
+    /* Navigation */
+    _ARROWS_MAC,
+    _ARROWS_WINDOWS,
+
+    _MISC
+};
+
+enum custom_keycodes {
+    RGB_SLD = SAFE_RANGE, /* Can always be here */
+    HSV_0_255_255,
+    HSV_120_255_128,
+    HSV_240_255_255,
+    MAC_MODE,
+    WINDOWS_MODE,
+    DYNAMIC_MACRO_RANGE, /* This needs to be last! */
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* clang-format off */
+
+    [_COLEMAK] = LAYOUT_ergodox(
+        /* Left hand */
+
+        /*=========================================================================================================*/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /*=========================================================================================================*/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /**/ _______,  /**/   KC_Q,   /**/   KC_W,   /**/   KC_F,   /**/   KC_P,   /**/   KC_G,   /**/ _______,  /**/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /*==========================================================================================*/           /**/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /**/ _______,  /**/   KC_A,   /**/   KC_R,   /**/   KC_S,   /**/   KC_T,   /**/   KC_D,   /*===============*/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /*==========================================================================================*/           /**/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /**/ _______,  /**/   KC_Z,   /**/   KC_X,   /**/   KC_C,   /**/   KC_V,   /**/   KC_B,   /**/ _______,  /**/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /*=========================================================================================================*/
+            /**/       /**/           /**/           /**/           /**/           /**/
+            /**/  ___, /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
+            /**/       /**/           /**/           /**/           /**/           /**/
+            /*=======================================================================*/
+                                                                                               /*==============================*/
+                                                                                               /**/           /**/           /**/
+                                                                                               /**/ _______,  /**/ _______,  /**/
+                                                                                               /**/           /**/           /**/
+                                                                                /*=============================================*/
+                                                                                /**/           /**/           /**/           /**/
+                                                                                /**/           /**/           /**/ _______,  /**/
+                                                                                /**/           /**/           /**/           /**/
+                                                                                /**/           /**/           /*===============*/
+                                                                                /**/           /**/           /**/           /**/
+                                                                                /**/ _______,  /**/ _______,  /**/ _______,  /**/
+                                                                                /**/           /**/           /**/           /**/
+                                                                                /*=============================================*/
+
+        /* Right hand */
+
+                    /*=========================================================================================================*/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /*=========================================================================================================*/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /**/ _______,  /**/   KC_J,   /**/   KC_L,   /**/   KC_U,   /**/   KC_Y,   /**/ KC_SCOLON,/**/ _______,  /**/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /**/           /*==========================================================================================*/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /*===============*/   KC_H,   /**/   KC_N,   /**/   KC_E,   /**/   KC_I,   /**/   KC_O,   /**/ _______,  /**/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /**/           /*==========================================================================================*/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /**/ _______,  /**/   KC_K,   /**/   KC_M,   /**/ KC_COMMA, /**/  KC_DOT,  /**/ KC_SLASH, /**/ _______,  /**/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /*=========================================================================================================*/
+                                                  /**/           /**/           /**/           /**/           /**/       /**/
+                                                  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/  ___, /**/
+                                                  /**/           /**/           /**/           /**/           /**/       /**/
+                                                  /*=======================================================================*/
+        /*==============================*/
+        /**/           /**/           /**/
+        /**/ _______,  /**/ _______,  /**/
+        /**/           /**/           /**/
+        /*=============================================*/
+        /**/           /**/           /**/           /**/
+        /**/ _______,  /**/           /**/           /**/
+        /**/           /**/           /**/           /**/
+        /*===============*/           /**/           /**/
+        /**/           /**/           /**/           /**/
+        /**/ _______,  /**/ _______,  /**/ _______   /**/
+        /**/           /**/           /**/           /**/
+        /*=============================================*/
+    ),
+
+    [_QWERTY] = LAYOUT_ergodox(
+        /* Left hand */
+
+        /*=========================================================================================================*/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /*=========================================================================================================*/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /**/ _______,  /**/   KC_Q,   /**/   KC_W,   /**/   KC_E,   /**/   KC_R,   /**/   KC_T,   /**/ _______,  /**/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /*==========================================================================================*/           /**/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /**/ _______,  /**/   KC_A,   /**/   KC_S,   /**/   KC_D,   /**/   KC_F,   /**/   KC_G,   /*===============*/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /*==========================================================================================*/           /**/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /**/ _______,  /**/   KC_Z,   /**/   KC_X,   /**/   KC_C,   /**/   KC_V,   /**/   KC_B,   /**/ _______,  /**/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /*=========================================================================================================*/
+            /**/       /**/           /**/           /**/           /**/           /**/
+            /**/  ___, /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
+            /**/       /**/           /**/           /**/           /**/           /**/
+            /*=======================================================================*/
+                                                                                               /*==============================*/
+                                                                                               /**/           /**/           /**/
+                                                                                               /**/ _______,  /**/ _______,  /**/
+                                                                                               /**/           /**/           /**/
+                                                                                /*=============================================*/
+                                                                                /**/           /**/           /**/           /**/
+                                                                                /**/           /**/           /**/ _______,  /**/
+                                                                                /**/           /**/           /**/           /**/
+                                                                                /**/           /**/           /*===============*/
+                                                                                /**/           /**/           /**/           /**/
+                                                                                /**/ _______,  /**/ _______,  /**/ _______,  /**/
+                                                                                /**/           /**/           /**/           /**/
+                                                                                /*=============================================*/
+
+        /* Right hand */
+
+                    /*=========================================================================================================*/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /*=========================================================================================================*/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /**/ _______,  /**/   KC_Y,   /**/   KC_U,   /**/   KC_I,   /**/   KC_O,   /**/   KC_P,   /**/ _______,  /**/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /**/           /*==========================================================================================*/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /*===============*/   KC_H,   /**/   KC_J,   /**/   KC_K,   /**/   KC_L,   /**/ KC_SCOLON,/**/ _______,  /**/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /**/           /*==========================================================================================*/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /**/ _______,  /**/   KC_N,   /**/   KC_M,   /**/ KC_COMMA, /**/  KC_DOT,  /**/ KC_SLASH, /**/ _______,  /**/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /*=========================================================================================================*/
+                                                  /**/           /**/           /**/           /**/           /**/       /**/
+                                                  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/  ___, /**/
+                                                  /**/           /**/           /**/           /**/           /**/       /**/
+                                                  /*=======================================================================*/
+        /*==============================*/
+        /**/           /**/           /**/
+        /**/ _______,  /**/ _______,  /**/
+        /**/           /**/           /**/
+        /*=============================================*/
+        /**/           /**/           /**/           /**/
+        /**/ _______,  /**/           /**/           /**/
+        /**/           /**/           /**/           /**/
+        /*===============*/           /**/           /**/
+        /**/           /**/           /**/           /**/
+        /**/ _______,  /**/ _______,  /**/ _______   /**/
+        /**/           /**/           /**/           /**/
+        /*=============================================*/
+    ),
+
+    [_DVORAK] = LAYOUT_ergodox(
+        /* Left hand */
+
+        /*=========================================================================================================*/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /*=========================================================================================================*/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /**/ _______,  /**/ KC_QUOTE, /**/ KC_COMMA, /**/  KC_DOT,  /**/   KC_P,   /**/   KC_Y,   /**/ _______,  /**/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /*==========================================================================================*/           /**/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /**/ _______,  /**/   KC_A,   /**/   KC_O,   /**/   KC_E,   /**/   KC_U,   /**/   KC_I,   /*===============*/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /*==========================================================================================*/           /**/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /**/ _______,  /**/ KC_SCOLON,/**/   KC_Q,   /**/   KC_J,   /**/   KC_K,   /**/   KC_X,   /**/ _______,  /**/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /*=========================================================================================================*/
+            /**/       /**/           /**/           /**/           /**/           /**/
+            /**/  ___, /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
+            /**/       /**/           /**/           /**/           /**/           /**/
+            /*=======================================================================*/
+                                                                                               /*==============================*/
+                                                                                               /**/           /**/           /**/
+                                                                                               /**/ _______,  /**/ _______,  /**/
+                                                                                               /**/           /**/           /**/
+                                                                                /*=============================================*/
+                                                                                /**/           /**/           /**/           /**/
+                                                                                /**/           /**/           /**/ _______,  /**/
+                                                                                /**/           /**/           /**/           /**/
+                                                                                /**/           /**/           /*===============*/
+                                                                                /**/           /**/           /**/           /**/
+                                                                                /**/ _______,  /**/ _______,  /**/ _______,  /**/
+                                                                                /**/           /**/           /**/           /**/
+                                                                                /*=============================================*/
+
+        /* Right hand */
+
+                    /*=========================================================================================================*/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /*=========================================================================================================*/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /**/ _______,  /**/   KC_F,   /**/   KC_G,   /**/   KC_C,   /**/   KC_R,   /**/   KC_L,   /**/ _______,  /**/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /**/           /*==========================================================================================*/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /*===============*/   KC_D,   /**/   KC_H,   /**/   KC_T,   /**/   KC_N,   /**/   KC_S,   /**/ _______,  /**/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /**/           /*==========================================================================================*/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /**/ _______,  /**/   KC_B,   /**/   KC_M,   /**/   KC_W,   /**/   KC_V,   /**/   KC_Z,   /**/ _______,  /**/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /*=========================================================================================================*/
+                                                  /**/           /**/           /**/           /**/           /**/       /**/
+                                                  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/  ___, /**/
+                                                  /**/           /**/           /**/           /**/           /**/       /**/
+                                                  /*=======================================================================*/
+        /*==============================*/
+        /**/           /**/           /**/
+        /**/ _______,  /**/ _______,  /**/
+        /**/           /**/           /**/
+        /*=============================================*/
+        /**/           /**/           /**/           /**/
+        /**/ _______,  /**/           /**/           /**/
+        /**/           /**/           /**/           /**/
+        /*===============*/           /**/           /**/
+        /**/           /**/           /**/           /**/
+        /**/ _______,  /**/ _______,  /**/ _______   /**/
+        /**/           /**/           /**/           /**/
+        /*=============================================*/
+    ),
+
+    [_COMMON] = LAYOUT_ergodox(
+        /* Left hand */
+
+        /*=========================================================================================================*/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /**/ KC_ESCAPE,/**/   KC_1,   /**/   KC_2,   /**/   KC_3,   /**/   KC_4,   /**/   KC_5,   /**/ _______,  /**/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /*=========================================================================================================*/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /**/ KC_TAB,   /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /*==========================================================================================*/           /**/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /**/MO(_SYMBOLS),   _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /*===============*/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /*==========================================================================================*/           /**/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /**/KC_LSHIFT, /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/LT(_NUMPAD,KC_TAB),
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /*=========================================================================================================*/
+            /**/       /**/           /**/           /**/           /**/           /**/
+            /**/  ___, /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
+            /**/       /**/           /**/           /**/           /**/           /**/
+            /*=======================================================================*/
+                                                                                               /*==============================*/
+                                                                                               /**/           /**/           /**/
+                                                                                               /**/ KC_SPACE, /**/ _______,  /**/
+                                                                                               /**/           /**/           /**/
+                                                                                /*=============================================*/
+                                                                                /**/           /**/           /**/           /**/
+                                                                                /**/           /**/           /**/ KC_AUDIO_VOL_DOWN,
+                                                                                /**/           /**/           /**/           /**/
+                                                                                /**/           /**/           /*===============*/
+                                                                                /**/           /**/           /**/           /**/
+                                                                                /**/ KC_BSPACE,/**/ _______,  /**/ KC_ENTER, /**/
+                                                                                /**/           /**/           /**/           /**/
+                                                                                /*=============================================*/
+
+        /* Right hand */
+
+                    /*=========================================================================================================*/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /**/ _______,  /**/   KC_6,   /**/   KC_7,   /**/   KC_8,   /**/   KC_9,   /**/   KC_0,   /**/  KC_F12,  /**/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /*=========================================================================================================*/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /**/ KC_HYPR,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ KC_BSLASH,/**/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /**/           /*==========================================================================================*/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /*===============*/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/MO(_SYMBOLS),//
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /**/           /*==========================================================================================*/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /**/  KC_MEH,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/KC_RSHIFT, /**/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /*=========================================================================================================*/
+                                                  /**/           /**/           /**/           /**/           /**/       /**/
+                                                  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/TT(_MISC),
+                                                  /**/           /**/           /**/           /**/           /**/       /**/
+                                                  /*=======================================================================*/
+          /*==============================*/
+          /**/           /**/           /**/
+          /**/ _______,  /**/ KC_CAPS,  /**/
+          /**/           /**/           /**/
+          /*=============================================*/
+          /**/           /**/           /**/           /**/
+         KC_AUDIO_VOL_UP,/**/           /**/           /**/
+          /**/           /**/           /**/           /**/
+          /*===============*/           /**/           /**/
+          /**/           /**/           /**/           /**/
+          /**/ KC_ESCAPE,/**/ KC_ENTER, /**/  KC_SPACE /**/
+          /**/           /**/           /**/           /**/
+          /*=============================================*/
+    ),
+
+    [_MAC] = LAYOUT_ergodox(
+        /* Left hand */
+
+        /*=========================================================================================================*/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/LCTL(LGUI(LSFT(KC_4))),
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /*=========================================================================================================*/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /**/ _______  ,/**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/LALT(KC_BSPACE),
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /*==========================================================================================*/           /**/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /*===============*/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /*==========================================================================================*/           /**/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /*=========================================================================================================*/
+            /**/       /**/           /**/           /**/           /**/           /**/
+              KC_LCTRL,/**/ KC_LGUI,  /**/  KC_LALT, /**/MO(_WM_MAC),   MO(_ARROWS_MAC),
+            /**/       /**/           /**/           /**/           /**/           /**/
+            /*=======================================================================*/
+                                                                                               /*==============================*/
+                                                                                               /**/           /**/           /**/
+                                                                                               /**/ _______,  /**/LCTL(LGUI(KC_Q)),
+                                                                                               /**/           /**/           /**/
+                                                                                /*=============================================*/
+                                                                                /**/           /**/           /**/           /**/
+                                                                                /**/           /**/           /**/ _______,  /**/
+                                                                                /**/           /**/           /**/           /**/
+                                                                                /**/           /**/           /*===============*/
+                                                                                /**/           /**/           /**/           /**/
+                                                                                /**/ _______,  /**/ KC_LGUI,  /**/ _______,  /**/
+                                                                                /**/           /**/           /**/           /**/
+                                                                                /*=============================================*/
+
+        /* Right hand */
+
+                    /*=========================================================================================================*/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                  RGUI(RSFT(KC_7)),/**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /*=========================================================================================================*/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /**/           /*==========================================================================================*/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /*===============*/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /**/           /*==========================================================================================*/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /*=========================================================================================================*/
+                                                  /**/           /**/           /**/           /**/           /**/       /**/
+                                                  MO(_ARROWS_MAC),  MO(_WM_MAC),/**/ KC_LALT,  /**/ KC_LGUI,  /**/  ___, /**/
+                                                  /**/           /**/           /**/           /**/           /**/       /**/
+                                                  /*=======================================================================*/
+          /*==============================*/
+          /**/           /**/           /**/
+        LCTL(LGUI(KC_Q)),/**/ KC_CAPS,  /**/
+          /**/           /**/           /**/
+          /*=============================================*/
+          /**/           /**/           /**/           /**/
+          /**/ _______,  /**/           /**/           /**/
+          /**/           /**/           /**/           /**/
+          /*===============*/           /**/           /**/
+          /**/           /**/           /**/           /**/
+          /**/ _______,  /**/ _______,  /**/ _______   /**/
+          /**/           /**/           /**/           /**/
+          /*=============================================*/
+    ),
+
+    [_WINDOWS] = LAYOUT_ergodox(
+        /* Left hand */
+
+        /*=========================================================================================================*/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/LGUI(LSFT(KC_S)),
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /*=========================================================================================================*/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/LCTL(KC_BSPACE),
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /*==========================================================================================*/           /**/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /*===============*/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /*==========================================================================================*/           /**/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /*=========================================================================================================*/
+            /**/       /**/           /**/           /**/           /**/           /**/
+              KC_LGUI, /**/ KC_LCTRL, /**/  KC_LALT,   MO(_WM_WINDOWS), MO(_ARROWS_WINDOWS),
+            /**/       /**/           /**/           /**/           /**/           /**/
+            /*=======================================================================*/
+                                                                                               /*==============================*/
+                                                                                               /**/           /**/           /**/
+                                                                                               /**/ _______,  /**/LGUI(KC_L),/**/
+                                                                                               /**/           /**/           /**/
+                                                                                /*=============================================*/
+                                                                                /**/           /**/           /**/           /**/
+                                                                                /**/           /**/           /**/ _______,  /**/
+                                                                                /**/           /**/           /**/           /**/
+                                                                                /**/           /**/           /*===============*/
+                                                                                /**/           /**/           /**/           /**/
+                                                                                /**/ _______,  /**/ KC_LCTRL, /**/ _______,  /**/
+                                                                                /**/           /**/           /**/           /**/
+                                                                                /*=============================================*/
+
+        /* Right hand */
+
+                    /*=========================================================================================================*/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                  LALT(KC_PSCREEN),/**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /*=========================================================================================================*/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /**/           /*==========================================================================================*/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /*===============*/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /**/           /*==========================================================================================*/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /*=========================================================================================================*/
+                                                  /**/           /**/           /**/           /**/           /**/       /**/
+                                              MO(_ARROWS_WINDOWS), MO(_WM_WINDOWS),  KC_RALT,  /**/ KC_RCTRL, /**/  ___, /**/
+                                                  /**/           /**/           /**/           /**/           /**/       /**/
+                                                  /*=======================================================================*/
+        /*==============================*/
+        /**/           /**/           /**/
+        /**/LGUI(KC_L),/**/ _______,  /**/
+        /**/           /**/           /**/
+        /*=============================================*/
+        /**/           /**/           /**/           /**/
+        /**/ _______,  /**/           /**/           /**/
+        /**/           /**/           /**/           /**/
+        /*===============*/           /**/           /**/
+        /**/           /**/           /**/           /**/
+        /**/ _______,  /**/ _______,  /**/ _______   /**/
+        /**/           /**/           /**/           /**/
+        /*=============================================*/
+    ),
+
+    [_NUMPAD] = LAYOUT_ergodox(
+        /* Left hand */
+
+        /*=========================================================================================================*/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /*=========================================================================================================*/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /*==========================================================================================*/           /**/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /*===============*/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /*==========================================================================================*/           /**/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /*=========================================================================================================*/
+            /**/       /**/           /**/           /**/           /**/           /**/
+            /**/  ___, /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
+            /**/       /**/           /**/           /**/           /**/           /**/
+            /*=======================================================================*/
+                                                                                               /*==============================*/
+                                                                                               /**/           /**/           /**/
+                                                                                               /**/ _______,  /**/ _______,  /**/
+                                                                                               /**/           /**/           /**/
+                                                                                /*=============================================*/
+                                                                                /**/           /**/           /**/           /**/
+                                                                                /**/           /**/           /**/ _______,  /**/
+                                                                                /**/           /**/           /**/           /**/
+                                                                                /**/           /**/           /*===============*/
+                                                                                /**/           /**/           /**/           /**/
+                                                                                /**/ _______,  /**/ _______,  /**/ _______,  /**/
+                                                                                /**/           /**/           /**/           /**/
+                                                                                /*=============================================*/
+
+        /* Right hand */
+
+                    /*=========================================================================================================*/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /**/ _______,  /**/ XXXXXXX,  /**/ KC_ESCAPE, LALT(KC_KP_MINUS),  KC_PERC, /**/KC_KP_SLASH,    _______,  /**/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /*=========================================================================================================*/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /**/ _______,  /**/ XXXXXXX,  /**/ KC_KP_7,  /**/ KC_KP_8,  /**/ KC_KP_9,  /**/KC_KP_ASTERISK, _______,  /**/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /**/           /*==========================================================================================*/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /*===============*/ KC_COLN,  /**/ KC_KP_4,  /**/ KC_KP_5,  /**/ KC_KP_6,  /**/KC_KP_MINUS,    _______,  /**/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /**/           /*==========================================================================================*/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /**/ _______,  /**/ KC_COMMA, /**/ KC_KP_1,  /**/ KC_KP_2,  /**/ KC_KP_3,  /**/KC_KP_PLUS,/**/ _______,  /**/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /*=========================================================================================================*/
+                                                  /**/           /**/           /**/           /**/           /**/       /**/
+                                                  /**/  KC_0,    /**/   KC_0,   /**/  KC_DOT,  /**/KC_KP_ENTER,     ___, /**/
+                                                  /**/           /**/           /**/           /**/           /**/       /**/
+                                                  /*=======================================================================*/
+        /*==============================*/
+        /**/           /**/           /**/
+        /**/ _______,  /**/ _______,  /**/
+        /**/           /**/           /**/
+        /*=============================================*/
+        /**/           /**/           /**/           /**/
+        /**/ _______,  /**/           /**/           /**/
+        /**/           /**/           /**/           /**/
+        /*===============*/           /**/           /**/
+        /**/           /**/           /**/           /**/
+        /**/ _______,  /**/ _______,  /**/ KC_0      /**/
+        /**/           /**/           /**/           /**/
+        /*=============================================*/
+    ),
+
+    [_SYMBOLS] = LAYOUT_ergodox(
+        /* Left hand */
+
+        /*=========================================================================================================*/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /**/ _______,  /**/  KC_F1,   /**/  KC_F2,   /**/  KC_F3,   /**/  KC_F4,   /**/  KC_F5,   /**/ _______,  /**/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /*=========================================================================================================*/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /**/ _______,  /**/ KC_EXLM,  /**/  KC_AT,   /**/ KC_LCBR,  /**/ KC_RCBR,  /**/ KC_PERC,  /**/ _______,  /**/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /*==========================================================================================*/           /**/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+       LGUI(KC_BSPACE),/**/ KC_HASH,  /**/ KC_UNDS,  /**/ KC_LPRN,  /**/ KC_RPRN,  /**/ KC_AMPR,  /*===============*/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /*==========================================================================================*/           /**/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /**/ _______,  /**/ KC_BSLASH,/**/ KC_SLASH, /**/KC_LBRACKET,  KC_RBRACKET,/**/ KC_TILD,  /**/ _______,  /**/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /*=========================================================================================================*/
+            /**/       /**/           /**/           /**/           /**/           /**/
+            /**/  ___, /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
+            /**/       /**/           /**/           /**/           /**/           /**/
+            /*=======================================================================*/
+                                                                                               /*==============================*/
+                                                                                               /**/           /**/           /**/
+                                                                                               /**/ _______,  /**/ _______,  /**/
+                                                                                               /**/           /**/           /**/
+                                                                                /*=============================================*/
+                                                                                /**/           /**/           /**/           /**/
+                                                                                /**/           /**/           /**/ _______,  /**/
+                                                                                /**/           /**/           /**/           /**/
+                                                                                /**/           /**/           /*===============*/
+                                                                                /**/           /**/           /**/           /**/
+                                                                                /**/ _______,  /**/ _______,  /**/ _______,  /**/
+                                                                                /**/           /**/           /**/           /**/
+                                                                                /*=============================================*/
+
+        /* Right hand */
+
+                    /*=========================================================================================================*/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /**/ _______,  /**/  KC_F6,   /**/   KC_F7,  /**/  KC_F8,   /**/  KC_F9,   /**/  KC_F10,  /**/  KC_F11,  /**/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /*=========================================================================================================*/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /**/ _______,  /**/ KC_CIRC,  /**/KC_KP_PLUS,/**/KC_KP_MINUS,    KC_GRAVE, /**/ KC_SCOLON,/**/ _______,  /**/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /**/           /*==========================================================================================*/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /*===============*/ KC_PIPE,  /**/ KC_EQUAL, /**/ KC_QUOTE, /**/ KC_COLN,  /**/ KC_DQUO,  /**/LGUI(KC_DELETE),
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /**/           /*==========================================================================================*/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /**/ _______,  /**/  KC_DLR,  /**/ KC_ASTR,  /**/  KC_LABK, /**/ KC_RABK,  /**/ KC_SLASH, /**/ _______,  /**/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /*=========================================================================================================*/
+                                                  /**/           /**/           /**/           /**/           /**/       /**/
+                                                  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/  ___, /**/
+                                                  /**/           /**/           /**/           /**/           /**/       /**/
+                                                  /*=======================================================================*/
+        /*==============================*/
+        /**/           /**/           /**/
+        /**/ _______,  /**/ _______,  /**/
+        /**/           /**/           /**/
+        /*=============================================*/
+        /**/           /**/           /**/           /**/
+        /**/ _______,  /**/           /**/           /**/
+        /**/           /**/           /**/           /**/
+        /*===============*/           /**/           /**/
+        /**/           /**/           /**/           /**/
+        /**/ _______,  /**/ _______,  /**/ _______   /**/
+        /**/           /**/           /**/           /**/
+        /*=============================================*/
+    ),
+
+    [_WM_MAC] = LAYOUT_ergodox(
+        /* Left hand */
+
+        /*=========================================================================================================*/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /**/ _______,  /**/ _______,  /**/ _______,  /**/  OC(KC_C), /**/ _______,  /**/ _______,  /**/ _______,  /**/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /*=========================================================================================================*/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /**/ _______,  /**/ OC(KC_U), OC(LGUI(KC_LEFT)),OC(KC_ENTER),OC(LGUI(KC_RIGHT)), OC(KC_I),/**/ _______,  /**/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /*==========================================================================================*/           /**/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /**/ _______,  /**/ OC(KC_J),    OC(KC_LEFT),  OC(KC_BSPACE),  OC(KC_RIGHT),    OC(KC_K), /*===============*/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /*==========================================================================================*/           /**/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /**/ _______,  /**/   KC_UP,  /**/ OC(KC_E), /**/ OC(KC_F), /**/ OC(KC_T), /**/ OC(KC_G), /**/ _______,  /**/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /*=========================================================================================================*/
+            /**/       /**/           /**/           /**/           /**/           /**/
+            /**/KC_LEFT,     KC_DOWN, /**/ KC_RIGHT, /**/ _______,  /**/ _______,  /**/
+            /**/       /**/           /**/           /**/           /**/           /**/
+            /*=======================================================================*/
+                                                                                               /*==============================*/
+                                                                                               /**/           /**/           /**/
+                                                                                               /**/ _______,  /**/ _______,  /**/
+                                                                                               /**/           /**/           /**/
+                                                                                /*=============================================*/
+                                                                                /**/           /**/           /**/           /**/
+                                                                                /**/           /**/           /**/ _______,  /**/
+                                                                                /**/           /**/           /**/           /**/
+                                                                                /**/           /**/           /*===============*/
+                                                                                /**/           /**/           /**/           /**/
+                                                                                /**/ _______,  /**/ _______,  /**/ _______,  /**/
+                                                                                /**/           /**/           /**/           /**/
+                                                                                /*=============================================*/
+
+        /* Right hand */
+
+                    /*=========================================================================================================*/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /**/ _______,  /**/ _______,  /**/ _______,  /**/  OC(KC_C), /**/ _______,  /**/ _______, /**/ _______,  /**/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /*=========================================================================================================*/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /**/ _______,  /**/ OC(KC_U), OC(LGUI(KC_LEFT)),OC(KC_ENTER),OC(LGUI(KC_RIGHT)), OC(KC_I),/**/ _______,  /**/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /**/           /*==========================================================================================*/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /*===============*/ OC(KC_J),    OC(KC_LEFT),  OC(KC_BSPACE),  OC(KC_RIGHT),    OC(KC_K), /**/ _______,  /**/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /**/           /*==========================================================================================*/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /**/ _______,  /**/ OC(KC_D), /**/ OC(KC_E), /**/ OC(KC_F), /**/ OC(KC_T), /**/  KC_UP,   /**/ _______,  /**/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /*=========================================================================================================*/
+                                                  /**/           /**/           /**/           /**/           /**/       /**/
+                                                  /**/ _______,  /**/ _______,  /**/ KC_LEFT,  /**/  KC_DOWN, /**/KC_RIGHT,//
+                                                  /**/           /**/           /**/           /**/           /**/       /**/
+                                                  /*=======================================================================*/
+        /*==============================*/
+        /**/           /**/           /**/
+        /**/ _______,  /**/ _______,  /**/
+        /**/           /**/           /**/
+        /*=============================================*/
+        /**/           /**/           /**/           /**/
+        /**/ _______,  /**/           /**/           /**/
+        /**/           /**/           /**/           /**/
+        /*===============*/           /**/           /**/
+        /**/           /**/           /**/           /**/
+        /**/ _______,  /**/ _______,  /**/ _______   /**/
+        /**/           /**/           /**/           /**/
+        /*=============================================*/
+    ),
+
+    [_ARROWS_MAC] = LAYOUT_ergodox(
+        /* Left hand */
+
+        /*=========================================================================================================*/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /*=========================================================================================================*/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /**/ _______,  /**/LGUI(KC_Q),/**/LGUI(KC_W),/**/LGUI(KC_F),/**/LGUI(KC_P),/**/LGUI(KC_G),/**/ _______,  /**/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /*==========================================================================================*/           /**/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /**/ _______,  /**/ KC_LCTRL, /**/ KC_LGUI,  /**/ KC_LSHIFT,/**/ KC_LALT,  /**/LGUI(KC_D),/*===============*/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /*==========================================================================================*/           /**/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /**/ _______,  /**/LGUI(KC_Z),/**/LGUI(KC_X),/**/LGUI(KC_C),/**/LGUI(KC_V),/**/LGUI(KC_B),/**/ _______,  /**/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /*=========================================================================================================*/
+            /**/       /**/           /**/           /**/           /**/           /**/
+            /**/  ___, /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
+            /**/       /**/           /**/           /**/           /**/           /**/
+            /*=======================================================================*/
+                                                                                               /*==============================*/
+                                                                                               /**/           /**/           /**/
+                                                                                               /**/ _______,  /**/ _______,  /**/
+                                                                                               /**/           /**/           /**/
+                                                                                /*=============================================*/
+                                                                                /**/           /**/           /**/           /**/
+                                                                                /**/           /**/           /**/ _______,  /**/
+                                                                                /**/           /**/           /**/           /**/
+                                                                                /**/           /**/           /*===============*/
+                                                                                /**/           /**/           /**/           /**/
+                                                                                /**/ _______,  /**/ _______,  /**/ _______,  /**/
+                                                                                /**/           /**/           /**/           /**/
+                                                                                /*=============================================*/
+
+        /* Right hand */
+
+                    /*=========================================================================================================*/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /*=========================================================================================================*/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /**/ _______,  /**/RGUI(KC_J),/**/ KC_BSPACE,/**/  KC_UP,   /**/ KC_DELETE,  RGUI(KC_SCOLON),  _______,  /**/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /**/           /*==========================================================================================*/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /*===============*/RGUI(KC_H),/**/ KC_LEFT,  /**/ KC_DOWN,  /**/ KC_RIGHT, /**/ KC_ENTER, /**/ _______,  /**/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /**/           /*==========================================================================================*/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /**/ _______,  /**/RGUI(KC_K),/**/RGUI(KC_M),  RGUI(KC_COMMA), RGUI(KC_DOT), RGUI(KC_SLASH),   _______,  /**/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /*=========================================================================================================*/
+                                                  /**/           /**/           /**/           /**/           /**/       /**/
+                                                  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/  ___, /**/
+                                                  /**/           /**/           /**/           /**/           /**/       /**/
+                                                  /*=======================================================================*/
+        /*==============================*/
+        /**/           /**/           /**/
+        /**/ _______,  /**/ _______,  /**/
+        /**/           /**/           /**/
+        /*=============================================*/
+        /**/           /**/           /**/           /**/
+        /**/ _______,  /**/           /**/           /**/
+        /**/           /**/           /**/           /**/
+        /*===============*/           /**/           /**/
+        /**/           /**/           /**/           /**/
+        /**/ _______,  /**/ _______,  /**/ _______   /**/
+        /**/           /**/           /**/           /**/
+        /*=============================================*/
+    ),
+
+    [_ARROWS_WINDOWS] = LAYOUT_ergodox(
+        /* Left hand */
+
+        /*=========================================================================================================*/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /*=========================================================================================================*/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /**/ _______,  /**/LCTL(KC_Q),/**/LCTL(KC_W),/**/LCTL(KC_F),/**/LCTL(KC_P),/**/LCTL(KC_G),/**/ _______,  /**/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /*==========================================================================================*/           /**/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /**/ _______,  /**/ KC_LGUI,  /**/ KC_HYPR,  /**/ KC_LSHIFT,/**/ KC_LCTRL, /**/LCTL(KC_D),/*===============*/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /*==========================================================================================*/           /**/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /**/ _______,  /**/LCTL(KC_Z),/**/LCTL(KC_X),/**/LCTL(KC_C),/**/LCTL(KC_V),/**/LCTL(KC_B),/**/ _______,  /**/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /*=========================================================================================================*/
+            /**/       /**/           /**/           /**/           /**/           /**/
+            /**/  ___, /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
+            /**/       /**/           /**/           /**/           /**/           /**/
+            /*=======================================================================*/
+                                                                                               /*==============================*/
+                                                                                               /**/           /**/           /**/
+                                                                                               /**/ _______,  /**/ _______,  /**/
+                                                                                               /**/           /**/           /**/
+                                                                                /*=============================================*/
+                                                                                /**/           /**/           /**/           /**/
+                                                                                /**/           /**/           /**/ _______,  /**/
+                                                                                /**/           /**/           /**/           /**/
+                                                                                /**/           /**/           /*===============*/
+                                                                                /**/           /**/           /**/           /**/
+                                                                                /**/ _______,  /**/ _______,  /**/ _______,  /**/
+                                                                                /**/           /**/           /**/           /**/
+                                                                                /*=============================================*/
+
+        /* Right hand */
+
+                    /*=========================================================================================================*/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /*=========================================================================================================*/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /**/ _______,  /**/RCTL(KC_J),/**/ KC_BSPACE,/**/  KC_UP,   /**/ KC_DELETE,  RCTL(KC_SCOLON),  _______,  /**/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /**/           /*==========================================================================================*/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /*===============*/RCTL(KC_H),/**/ KC_LEFT,  /**/ KC_DOWN,  /**/ KC_RIGHT, /**/ KC_ENTER, /**/ _______,  /**/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /**/           /*==========================================================================================*/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /**/ _______,  /**/RCTL(KC_K),/**/RCTL(KC_M),  RCTL(KC_COMMA), RCTL(KC_DOT), RCTL(KC_SLASH),   _______,  /**/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /*=========================================================================================================*/
+                                                  /**/           /**/           /**/           /**/           /**/       /**/
+                                                  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/  ___, /**/
+                                                  /**/           /**/           /**/           /**/           /**/       /**/
+                                                  /*=======================================================================*/
+        /*==============================*/
+        /**/           /**/           /**/
+        /**/ _______,  /**/ _______,  /**/
+        /**/           /**/           /**/
+        /*=============================================*/
+        /**/           /**/           /**/           /**/
+        /**/ _______,  /**/           /**/           /**/
+        /**/           /**/           /**/           /**/
+        /*===============*/           /**/           /**/
+        /**/           /**/           /**/           /**/
+        /**/ _______,  /**/ _______,  /**/ _______   /**/
+        /**/           /**/           /**/           /**/
+        /*=============================================*/
+    ),
+
+    [_MISC] = LAYOUT_ergodox(
+        /* Left hand */
+
+        /*=========================================================================================================*/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /**/ _______,  /**/  KC_F14,  /**/  KC_F15,  /**/ _______,  /**/ _______,  /**/ _______,  /**/   RESET,  /**/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /*=========================================================================================================*/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /**/ _______,  /**/ _______,  /**/ _______,  /**/ KC_MS_UP, /**/ _______,  /**/ _______,  /**/ _______,  /**/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /*==========================================================================================*/           /**/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /**/ _______,  /**/ _______,  /**/KC_MS_LEFT,/**/KC_MS_DOWN,/**/KC_MS_RIGHT,    _______,  /*===============*/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /*==========================================================================================*/           /**/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
+        /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+        /*=========================================================================================================*/
+            /**/       /**/           /**/           /**/           /**/           /**/
+            /**/  ___, /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
+            /**/       /**/           /**/           /**/           /**/           /**/
+            /*=======================================================================*/
+                                                                                               /*==============================*/
+                                                                                               /**/           /**/           /**/
+                                                                                               /**/ RGB_MOD,  /**/HSV_0_255_255,
+                                                                                               /**/           /**/           /**/
+                                                                                /*=============================================*/
+                                                                                /**/           /**/           /**/           /**/
+                                                                                /**/           /**/           /**/HSV_120_255_128,
+                                                                                /**/           /**/           /**/           /**/
+                                                                                /**/           /**/           /*===============*/
+                                                                                /**/           /**/           /**/           /**/
+                                                                                /**/KC_MS_BTN1,/**/KC_MS_BTN2,/**/HSV_240_255_255,
+                                                                                /**/           /**/           /**/           /**/
+                                                                                /*=============================================*/
+
+        /* Right hand */
+
+                    /*=========================================================================================================*/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/KC_MEDIA_EJECT,
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /*=========================================================================================================*/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /**/           /*==========================================================================================*/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /*===============*/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /**/           /*==========================================================================================*/
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/DF(_DVORAK),   DF(_QWERTY),   DF(_COLEMAK),//
+                    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                    /*=========================================================================================================*/
+                                                  /**/           /**/           /**/           /**/           /**/       /**/
+                                                  /**/ _______,  /**/ _______,     WINDOWS_MODE,    MAC_MODE, /**/  ___, /**/
+                                                  /**/           /**/           /**/           /**/           /**/       /**/
+                                                  /*=======================================================================*/
+        /*==============================*/
+        /**/           /**/           /**/
+        /**/ RGB_TOG,  /**/ RGB_SLD,  /**/
+        /**/           /**/           /**/
+        /*=============================================*/
+        /**/           /**/           /**/           /**/
+        /**/ RGB_VAI,  /**/           /**/           /**/
+        /**/           /**/           /**/           /**/
+        /*===============*/           /**/           /**/
+        /**/           /**/           /**/           /**/
+        /**/ RGB_VAD,  /**/ RGB_HUD,  /**/ RGB_HUI   /**/
+        /**/           /**/           /**/           /**/
+        /*=============================================*/
+    ),
+
+    /* clang-format on */
+};
+
+bool suspended = false;
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case EEP_RST:
+            if (record->event.pressed) {
+                eeconfig_init();
+            }
+            return false;
+            break;
+        case RGB_SLD:
+            if (record->event.pressed) {
+                rgblight_mode(1);
+            }
+            return false;
+            break;
+        case HSV_0_255_255:
+            if (record->event.pressed) {
+#ifdef RGBLIGHT_ENABLE
+                rgblight_enable();
+                rgblight_mode(1);
+                rgblight_sethsv(0, 255, 255);
+#endif
+            }
+            return false;
+            break;
+        case HSV_120_255_128:
+            if (record->event.pressed) {
+#ifdef RGBLIGHT_ENABLE
+                rgblight_enable();
+                rgblight_mode(1);
+                rgblight_sethsv(120, 255, 128);
+#endif
+            }
+            return false;
+            break;
+        case HSV_240_255_255:
+            if (record->event.pressed) {
+#ifdef RGBLIGHT_ENABLE
+                rgblight_enable();
+                rgblight_mode(1);
+                rgblight_sethsv(240, 255, 255);
+#endif
+            }
+            return false;
+            break;
+        case MAC_MODE:
+            if (record->event.pressed) {
+                layer_on(_MAC);
+                layer_off(_WINDOWS);
+            }
+            return false;
+            break;
+        case WINDOWS_MODE:
+            if (record->event.pressed) {
+                layer_on(_WINDOWS);
+                layer_off(_MAC);
+            }
+            return false;
+            break;
+    }
+    return true;
+}
+
+uint32_t layer_state_set_user(uint32_t state) {
+    uint8_t layer = biton32(state);
+
+    ergodox_board_led_off();
+    ergodox_right_led_1_off();
+    ergodox_right_led_2_off();
+    ergodox_right_led_3_off();
+
+    if (layer == _ARROWS_MAC || layer == _ARROWS_WINDOWS) {
+        ergodox_right_led_1_on();
+    } else if (layer == _SYMBOLS) {
+        ergodox_right_led_2_on();
+    } else if (layer == _NUMPAD) {
+        ergodox_right_led_1_on();
+        ergodox_right_led_2_on();
+    } else if (layer == _WM_MAC || layer == _WM_WINDOWS) {
+        ergodox_right_led_2_on();
+        ergodox_right_led_3_on();
+    } else if (layer == _MISC) {
+        ergodox_right_led_1_on();
+        ergodox_right_led_2_on();
+        ergodox_right_led_3_on();
+    } else if (layer == _WINDOWS) {
+        ergodox_right_led_3_on();
+    } else if (layer == _MAC) {
+        /* do nothing */
+    }
+
+    return state;
+};
+
+void keyboard_post_init_user(void) {
+    /* This layer is always on */
+    layer_on(_COMMON);
+
+    /* Default to Mac layout */
+    layer_on(_MAC);
+}
diff --git a/qmk/keyboards/ergodox_ez/keymaps/nfriend/readme.md b/qmk/keyboards/ergodox_ez/keymaps/nfriend/readme.md
new file mode 100644
index 00000000..0a19e2d0
--- /dev/null
+++ b/qmk/keyboards/ergodox_ez/keymaps/nfriend/readme.md
@@ -0,0 +1,52 @@
+# [nfriend](https://gitlab.com/nfriend)'s ErgoDox EZ configuration
+
+![nfriend's ErgoDox EZ keymap](https://i.imgur.com/CMMmdBc.png)
+
+[View this keymap on
+keyboard-layout-editor.com.](http://www.keyboard-layout-editor.com/#/gists/01283b322a647c96ef75955a9b0bac68)
+
+Color legend:
+
+-   **Black:** Primary layer.
+-   **Blue:** Symbol layer. Accessed by holding either of the <kbd>to sym</kbd>
+    keys on either end of the keyboard.
+-   **Green:** Numpad layer. Accessed by holding the <kbd>to numpad</kbd> key.
+-   **Red:** Arrow layer. Accessed by holding either of the <kbd>to arrows</kbd>
+    thumb keys.
+-   **Teal:** Window management layer. Accessed by holding either of the <kbd>to
+    WM</kbd> thumb keys.
+    -   Note: this layer is not pictured on this keymap since is tightly coupled
+        to [Magnet](https://magnet.crowdcafe.com/).
+-   **Yellow:** Miscellaneous layer. Includes LED control, layout toggling
+    (Colemak/Dvorak/QWERTY), platform toggling (Windows/Mac), and other
+    experimental features.
+    -   Note: this layer is only partially pictured on this keymap
+
+## Caveats
+
+In its current state, this keymap is fairly Mac-centric. Some of the features
+implemented in the Mac layers have not yet been ported to the corresponding
+Windows layers.
+
+## Building
+
+To build this layout, open a command window in the root directory of this
+repository and run:
+
+```bash
+make ergodox_ez:nfriend
+```
+
+This will create a `.build/ergodox_ez_nfriend.hex` file which can be flashed
+using the [Teensy loader](https://www.pjrc.com/teensy/loader.html). After the
+`.hex` file has been loaded into Teensy, the keyboard can be reprogrammed by
+pressing the bottom-right key of the right half of the keyboard and the
+top-right key of the left half (the <kbd>RESET</kbd> key in the screenshot
+above).
+
+## Developing
+
+Use the template in `./template.c` to help create new layers quickly.
+
+This layout was originally based on [this EZ Configurator
+configuration](https://configure.ergodox-ez.com/ergodox-ez/layouts/x9MWL/latest/0).
diff --git a/qmk/keyboards/ergodox_ez/keymaps/nfriend/rules.mk b/qmk/keyboards/ergodox_ez/keymaps/nfriend/rules.mk
new file mode 100644
index 00000000..7e037f64
--- /dev/null
+++ b/qmk/keyboards/ergodox_ez/keymaps/nfriend/rules.mk
@@ -0,0 +1,8 @@
+# Set any rules.mk overrides for your specific keymap here.
+# See rules at https://docs.qmk.fm/#/config_options?id=the-rulesmk-file
+DEBOUNCE_TYPE = eager_pk
+LTO_ENABLE = yes
+COMMAND_ENABLE = no
+UNICODE_ENABLE = no
+UNICODEMAP_ENABLE = no
+DYNAMIC_MACRO_ENABLE = yes
diff --git a/qmk/keyboards/ergodox_ez/keymaps/nfriend/template.c b/qmk/keyboards/ergodox_ez/keymaps/nfriend/template.c
new file mode 100644
index 00000000..dc4294d5
--- /dev/null
+++ b/qmk/keyboards/ergodox_ez/keymaps/nfriend/template.c
@@ -0,0 +1,92 @@
+/* Copyright (C) 2020 Nathan Friend
+ *
+ * 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 3 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/>.
+ */
+
+/* clang-format off */
+
+[LAYER_NAME] = LAYOUT_ergodox(
+    /* Left hand */
+
+    /*=========================================================================================================*/
+    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+    /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
+    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+    /*=========================================================================================================*/
+    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+    /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
+    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+    /*==========================================================================================*/           /**/
+    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+    /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /*===============*/
+    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+    /*==========================================================================================*/           /**/
+    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+    /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
+    /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+    /*=========================================================================================================*/
+        /**/       /**/           /**/           /**/           /**/           /**/
+        /**/  ___, /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
+        /**/       /**/           /**/           /**/           /**/           /**/
+        /*=======================================================================*/
+                                                                                           /*==============================*/
+                                                                                           /**/           /**/           /**/
+                                                                                           /**/ _______,  /**/ _______,  /**/
+                                                                                           /**/           /**/           /**/
+                                                                            /*=============================================*/
+                                                                            /**/           /**/           /**/           /**/
+                                                                            /**/           /**/           /**/ _______,  /**/
+                                                                            /**/           /**/           /**/           /**/
+                                                                            /**/           /**/           /*===============*/
+                                                                            /**/           /**/           /**/           /**/
+                                                                            /**/ _______,  /**/ _______,  /**/ _______,  /**/
+                                                                            /**/           /**/           /**/           /**/
+                                                                            /*=============================================*/
+    /* Right hand */
+
+                /*=========================================================================================================*/
+                /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
+                /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                /*=========================================================================================================*/
+                /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
+                /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                /**/           /*==========================================================================================*/
+                /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                /*===============*/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
+                /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                /**/           /*==========================================================================================*/
+                /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/
+                /**/           /**/           /**/           /**/           /**/           /**/           /**/           /**/
+                /*=========================================================================================================*/
+                                              /**/           /**/           /**/           /**/           /**/       /**/
+                                              /**/ _______,  /**/ _______,  /**/ _______,  /**/ _______,  /**/  ___, /**/
+                                              /**/           /**/           /**/           /**/           /**/       /**/
+                                              /*=======================================================================*/
+    /*==============================*/
+    /**/           /**/           /**/
+    /**/ _______,  /**/ _______,  /**/
+    /**/           /**/           /**/
+    /*=============================================*/
+    /**/           /**/           /**/           /**/
+    /**/ _______,  /**/           /**/           /**/
+    /**/           /**/           /**/           /**/
+    /*===============*/           /**/           /**/
+    /**/           /**/           /**/           /**/
+    /**/ _______,  /**/ _______,  /**/ _______   /**/
+    /**/           /**/           /**/           /**/
+    /*=============================================*/
+),
diff --git a/qmk/keyboards/ergodox_ez/rules.mk b/qmk/keyboards/ergodox_ez/rules.mk
index b6311aca..b94990a9 100644
--- a/qmk/keyboards/ergodox_ez/rules.mk
+++ b/qmk/keyboards/ergodox_ez/rules.mk
@@ -31,7 +31,8 @@ SWAP_HANDS_ENABLE= yes  # Allow swapping hands of keyboard
 SLEEP_LED_ENABLE = no
 API_SYSEX_ENABLE = no
 
-RGB_MATRIX_ENABLE = no  # enable later
+RGB_MATRIX_ENABLE = no # enable later
+RGB_MATRIX_DRIVER = IS31FL3731
 DEBOUNCE_TYPE = eager_pr
 
 # project specific files
diff --git a/qmk/keyboards/ergodox_infinity/board_st7565.h b/qmk/keyboards/ergodox_infinity/board_st7565.h
index 9ab636c9..875ed9e6 100644
--- a/qmk/keyboards/ergodox_infinity/board_st7565.h
+++ b/qmk/keyboards/ergodox_infinity/board_st7565.h
@@ -8,105 +8,88 @@
 #ifndef _GDISP_LLD_BOARD_H
 #define _GDISP_LLD_BOARD_H
 
-#define ST7565_LCD_BIAS         ST7565_LCD_BIAS_9 // actually 6
-#define ST7565_ADC              ST7565_ADC_NORMAL
-#define ST7565_COM_SCAN         ST7565_COM_SCAN_DEC
-#define ST7565_PAGE_ORDER       0,1,2,3
+#include "quantum.h"
+
+#define ST7565_LCD_BIAS ST7565_LCD_BIAS_7
+#define ST7565_COM_SCAN ST7565_COM_SCAN_DEC
+#define ST7565_PAGE_ORDER 0, 1, 2, 3
 /*
  * Custom page order for several LCD boards, e.g. HEM12864-99
  * #define ST7565_PAGE_ORDER       4,5,6,7,0,1,2,3
  */
 
-#define ST7565_GPIOPORT GPIOC
-#define ST7565_PORT PORTC
-#define ST7565_A0_PIN 7
-#define ST7565_RST_PIN 8
-#define ST7565_MOSI_PIN 6
-#define ST7565_SLCK_PIN 5
-#define ST7565_SS_PIN 4
+#define ST7565_A0_PIN C7
+#define ST7565_RST_PIN C8
+#define ST7565_MOSI_PIN C6
+#define ST7565_SCLK_PIN C5
+#define ST7565_SS_PIN C4
 
-#define palSetPadModeRaw(portname, bits) \
-    ST7565_PORT->PCR[ST7565_##portname##_PIN] = bits
-
-#define palSetPadModeNamed(portname, portmode) \
-    palSetPadMode(ST7565_GPIOPORT, ST7565_##portname##_PIN, portmode)
-
-#define ST7565_SPI_MODE PORTx_PCRn_DSE | PORTx_PCRn_MUX(2)
 // DSPI Clock and Transfer Attributes
 // Frame Size: 8 bits
 // MSB First
 // CLK Low by default
 static const SPIConfig spi1config = {
-   // Operation complete callback or @p NULL.
-  .end_cb = NULL,
-   //The chip select line port - when not using pcs.
-  .ssport = ST7565_GPIOPORT,
-   // brief The chip select line pad number - when not using pcs.
-  .sspad=ST7565_SS_PIN,
-   // SPI initialization data.
-  .tar0 =
-    SPIx_CTARn_FMSZ(7) // Frame size = 8 bytes
-    | SPIx_CTARn_ASC(1) // After SCK Delay Scaler (min 50 ns) = 55.56ns
-    | SPIx_CTARn_DT(0) // Delay After Transfer Scaler (no minimum)= 27.78ns
-    | SPIx_CTARn_CSSCK(0) // PCS to SCK Delay Scaler (min 20 ns) = 27.78ns
-    | SPIx_CTARn_PBR(0) // Baud Rate Prescaler = 2
-    | SPIx_CTARn_BR(0) // Baud rate (min 50ns) = 55.56ns
+    // Operation complete callback or @p NULL.
+    .end_cb = NULL,
+    // The chip select line port - when not using pcs.
+    .ssport = PAL_PORT(ST7565_SS_PIN),
+    // brief The chip select line pad number - when not using pcs.
+    .sspad = PAL_PAD(ST7565_SS_PIN),
+    // SPI initialization data.
+    .tar0 = SPIx_CTARn_FMSZ(7)     // Frame size = 8 bytes
+            | SPIx_CTARn_ASC(1)    // After SCK Delay Scaler (min 50 ns) = 55.56ns
+            | SPIx_CTARn_DT(0)     // Delay After Transfer Scaler (no minimum)= 27.78ns
+            | SPIx_CTARn_CSSCK(0)  // PCS to SCK Delay Scaler (min 20 ns) = 27.78ns
+            | SPIx_CTARn_PBR(0)    // Baud Rate Prescaler = 2
+            | SPIx_CTARn_BR(0)     // Baud rate (min 50ns) = 55.56ns
 };
 
 static GFXINLINE void acquire_bus(GDisplay *g) {
-    (void) g;
+    (void)g;
     // Only the LCD is using the SPI bus, so no need to acquire
     // spiAcquireBus(&SPID1);
     spiSelect(&SPID1);
 }
 
 static GFXINLINE void release_bus(GDisplay *g) {
-    (void) g;
+    (void)g;
     // Only the LCD is using the SPI bus, so no need to release
-    //spiReleaseBus(&SPID1);
+    // spiReleaseBus(&SPID1);
     spiUnselect(&SPID1);
 }
 
 static GFXINLINE void init_board(GDisplay *g) {
-    (void) g;
-    palSetPadModeNamed(A0, PAL_MODE_OUTPUT_PUSHPULL);
-    palSetPad(ST7565_GPIOPORT, ST7565_A0_PIN);
-    palSetPadModeNamed(RST, PAL_MODE_OUTPUT_PUSHPULL);
-    palSetPad(ST7565_GPIOPORT, ST7565_RST_PIN);
-    palSetPadModeRaw(MOSI, ST7565_SPI_MODE);
-    palSetPadModeRaw(SLCK, ST7565_SPI_MODE);
-    palSetPadModeNamed(SS, PAL_MODE_OUTPUT_PUSHPULL);
+    (void)g;
+    setPinOutput(ST7565_A0_PIN);
+    writePinHigh(ST7565_A0_PIN);
+    setPinOutput(ST7565_RST_PIN);
+    writePinHigh(ST7565_RST_PIN);
+    setPinOutput(ST7565_SS_PIN);
+
+    palSetPadMode(PAL_PORT(ST7565_MOSI_PIN), PAL_PAD(ST7565_MOSI_PIN), PAL_MODE_ALTERNATIVE_2);
+    palSetPadMode(PAL_PORT(ST7565_SCLK_PIN), PAL_PAD(ST7565_SCLK_PIN), PAL_MODE_ALTERNATIVE_2);
 
     spiInit();
     spiStart(&SPID1, &spi1config);
     release_bus(g);
 }
 
-static GFXINLINE void post_init_board(GDisplay *g) {
-    (void) g;
-}
+static GFXINLINE void post_init_board(GDisplay *g) { (void)g; }
 
 static GFXINLINE void setpin_reset(GDisplay *g, bool_t state) {
-    (void) g;
-    if (state) {
-        palClearPad(ST7565_GPIOPORT, ST7565_RST_PIN);
-    }
-    else {
-        palSetPad(ST7565_GPIOPORT, ST7565_RST_PIN);
-    }
+    (void)g;
+    writePin(ST7565_RST_PIN, !state);
 }
 
-static GFXINLINE void enter_data_mode(GDisplay *g) {
-    palSetPad(ST7565_GPIOPORT, ST7565_A0_PIN);
+static GFXINLINE void write_cmd(GDisplay *g, gU8 cmd) {
+    (void)g;
+    writePinLow(ST7565_A0_PIN);
+    spiSend(&SPID1, 1, &cmd);
 }
 
-static GFXINLINE void enter_cmd_mode(GDisplay *g) {
-    palClearPad(ST7565_GPIOPORT, ST7565_A0_PIN);
-}
-
-
-static GFXINLINE void write_data(GDisplay *g, uint8_t* data, uint16_t length) {
-    (void) g;
+static GFXINLINE void write_data(GDisplay *g, gU8 *data, gU16 length) {
+    (void)g;
+    writePinHigh(ST7565_A0_PIN);
     spiSend(&SPID1, length, data);
 }
 
diff --git a/qmk/keyboards/ergodox_infinity/ergodox_infinity.c b/qmk/keyboards/ergodox_infinity/ergodox_infinity.c
index c69c1eb3..a9962f96 100644
--- a/qmk/keyboards/ergodox_infinity/ergodox_infinity.c
+++ b/qmk/keyboards/ergodox_infinity/ergodox_infinity.c
@@ -1,6 +1,6 @@
 #include QMK_KEYBOARD_H
-#include "ch.h"
-#include "hal.h"
+#include <ch.h>
+#include <hal.h>
 #include "serial_link/system/serial_link.h"
 #ifdef VISUALIZER_ENABLE
 #include "lcd_backlight.h"
diff --git a/qmk/keyboards/ergodox_infinity/led.c b/qmk/keyboards/ergodox_infinity/led.c
index 8175c1c5..0b50247d 100644
--- a/qmk/keyboards/ergodox_infinity/led.c
+++ b/qmk/keyboards/ergodox_infinity/led.c
@@ -15,7 +15,7 @@ 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 "hal.h"
+#include <hal.h>
 
 #include "led.h"
 
diff --git a/qmk/keyboards/ergodox_infinity/matrix.c b/qmk/keyboards/ergodox_infinity/matrix.c
index 941367a3..7baacd24 100644
--- a/qmk/keyboards/ergodox_infinity/matrix.c
+++ b/qmk/keyboards/ergodox_infinity/matrix.c
@@ -18,7 +18,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <stdint.h>
 #include <stdbool.h>
 #include <string.h>
-#include "hal.h"
+#include <hal.h>
 #include "timer.h"
 #include "wait.h"
 #include "print.h"
diff --git a/qmk/keyboards/ergodox_stm32/boards/ERGODOX_STM32_BOARD/board.c b/qmk/keyboards/ergodox_stm32/boards/ERGODOX_STM32_BOARD/board.c
index d953d6a1..48844e34 100644
--- a/qmk/keyboards/ergodox_stm32/boards/ERGODOX_STM32_BOARD/board.c
+++ b/qmk/keyboards/ergodox_stm32/boards/ERGODOX_STM32_BOARD/board.c
@@ -14,7 +14,7 @@
     limitations under the License.
 */
 
-#include "hal.h"
+#include <hal.h>
 
 /**
  * @brief   PAL setup.
diff --git a/qmk/keyboards/ergodox_stm32/ergodox_stm32.h b/qmk/keyboards/ergodox_stm32/ergodox_stm32.h
index be1c2e9c..b84b101f 100644
--- a/qmk/keyboards/ergodox_stm32/ergodox_stm32.h
+++ b/qmk/keyboards/ergodox_stm32/ergodox_stm32.h
@@ -4,7 +4,7 @@
 #include "action_layer.h"
 #include <stdint.h>
 #include <stdbool.h>
-#include "hal.h"
+#include <hal.h>
 
 // #define I2C_ADDR 0b01000000
 #define I2C_ADDR 0b01000000
diff --git a/qmk/keyboards/ergosaurus/ergosaurus.h b/qmk/keyboards/ergosaurus/ergosaurus.h
index c78a2db3..cef59499 100644
--- a/qmk/keyboards/ergosaurus/ergosaurus.h
+++ b/qmk/keyboards/ergosaurus/ergosaurus.h
@@ -19,7 +19,7 @@
 
 #define KNO KC_NO
 
-#define LAYOUT( \
+#define LAYOUT_alice_split_bs( \
   K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07, K17, \
   K20, K30, K21, K31, K22, K32, K23,      K33, K24, K34, K25, K35, K26, K36, K27, \
   K40, K50, K41, K51, K42, K52, K43,      K53, K44, K54, K45, K55, K46,      K47, \
@@ -36,3 +36,5 @@
   {  KNO, K71, K72, K73, K74, K75, K76, KNO  }, \
   {  K80, K81, K82, K83, K84, K85, KNO, K87  }  \
 }
+
+#define LAYOUT LAYOUT_alice_split_bs
diff --git a/qmk/keyboards/ergosaurus/info.json b/qmk/keyboards/ergosaurus/info.json
index 97873afd..13fda81f 100644
--- a/qmk/keyboards/ergosaurus/info.json
+++ b/qmk/keyboards/ergosaurus/info.json
@@ -4,7 +4,7 @@
     "width": 19.75,
     "height": 5.25,
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_alice_split_bs": {
             "layout": [
                 {"label":"`", "x":0.5, "y":0},
                 {"label":"Esc", "x":1.75, "y":0.25},
diff --git a/qmk/keyboards/ergosaurus/keymaps/default/keymap.c b/qmk/keyboards/ergosaurus/keymaps/default/keymap.c
index 565906e0..42cf9082 100644
--- a/qmk/keyboards/ergosaurus/keymaps/default/keymap.c
+++ b/qmk/keyboards/ergosaurus/keymaps/default/keymap.c
@@ -21,7 +21,7 @@
 
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [BASE] = LAYOUT(
+  [BASE] = LAYOUT_alice_split_bs(
       KC_GRV,  KC_ESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,   KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS,  KC_DEL,
       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_BSPC,
       KC_PGDN, 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,
@@ -29,7 +29,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                KC_LGUI,          KC_LALT, KC_ENT, MO(RAISE),                            KC_SPC,           KC_RALT,                          KC_RCTL
     ),
 
-    [LOWER] = LAYOUT(
+    [LOWER] = LAYOUT_alice_split_bs(
       _______,  KC_GRV, 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_UP, _______, _______,
       _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, KC_LEFT, KC_RIGHT,          _______,
@@ -37,7 +37,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
                 _______,          _______, _______, _______,                            _______,          _______,                              _______
     ),
 
-    [RAISE] = LAYOUT(
+    [RAISE] = LAYOUT_alice_split_bs(
       _______,  _______, _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,  _______,  _______,  _______,  _______,
       _______,  _______,  _______, _______,  _______, _______, _______,          _______, _______, KC_UP, _______, _______, _______, _______, _______,
       _______, _______, _______, _______, _______, _______, _______,          _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______,          _______,
diff --git a/qmk/keyboards/ergosaurus/rules.mk b/qmk/keyboards/ergosaurus/rules.mk
index 62676d1c..f504ffae 100644
--- a/qmk/keyboards/ergosaurus/rules.mk
+++ b/qmk/keyboards/ergosaurus/rules.mk
@@ -30,3 +30,5 @@ 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
+
+LAYOUTS = alice_split_bs
diff --git a/qmk/keyboards/espectro/config.h b/qmk/keyboards/espectro/config.h
index 2736c1d8..b344c641 100644
--- a/qmk/keyboards/espectro/config.h
+++ b/qmk/keyboards/espectro/config.h
@@ -38,6 +38,11 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
+#define LED_NUM_LOCK_PIN B0
+#define LED_CAPS_LOCK_PIN B2
+#define LED_SCROLL_LOCK_PIN B1
+#define LED_PIN_ON_STATE 0
+
 /* number of backlight levels */
 #define BACKLIGHT_PIN B6
 #define BACKLIGHT_LEVELS 5
diff --git a/qmk/keyboards/espectro/espectro.c b/qmk/keyboards/espectro/espectro.c
index 13030cdd..64494c49 100644
--- a/qmk/keyboards/espectro/espectro.c
+++ b/qmk/keyboards/espectro/espectro.c
@@ -14,63 +14,4 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-
-#include QMK_KEYBOARD_H
-#include "quantum.h"
-
-
-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
-
-	led_set_user(usb_led);
-}
-
-__attribute__ ((weak))
-void led_set_user(uint8_t usb_led) {
-
-	if (usb_led & (1 << USB_LED_NUM_LOCK)) {
-		DDRB |= (1 << 0); PORTB &= ~(1 << 0);
-	} else {
-		DDRB &= ~(1 << 0); PORTB &= ~(1 << 0);
-	}
-
-	if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
-		DDRB |= (1 << 2); PORTB &= ~(1 << 2);
-	} else {
-		DDRB &= ~(1 << 2); PORTB &= ~(1 << 2);
-	}
-
-	if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
-		DDRB |= (1 << 1); PORTB &= ~(1 << 1);
-	} else {
-		DDRB &= ~(1 << 1); PORTB &= ~(1 << 1);
-	}
-
-	if (usb_led & (1 << USB_LED_COMPOSE)) {
-
-	} else {
-
-	}
-
-	if (usb_led & (1 << USB_LED_KANA)) {
-
-	} else {
-
-	}
-
-}
-
+#include "espectro.h"
diff --git a/qmk/keyboards/evil80/config.h b/qmk/keyboards/evil80/config.h
index ae507c74..0f0e2452 100644
--- a/qmk/keyboards/evil80/config.h
+++ b/qmk/keyboards/evil80/config.h
@@ -19,16 +19,17 @@
 #define MATRIX_COL_PINS { B2, D0, D1, D2, D3, D5, D4, D6, D7, B4, B1, C6, C7, E6, F6, F7 }
 #define UNUSED_PINS
 
-#define BACKLIGHT_PIN B5
-#define BACKLIGHT_BREATHING
-
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
 /* define if matrix has ghost */
 //#define MATRIX_HAS_GHOST
 
-/* number of backlight levels */
+#define LED_CAPS_LOCK_PIN B6
+#define LED_SCROLL_LOCK_PIN B7
+
+#define BACKLIGHT_PIN B5
+#define BACKLIGHT_BREATHING
 #define BACKLIGHT_LEVELS 3
 
 /* Set 0 if debouncing isn't needed */
diff --git a/qmk/keyboards/evil80/evil80.c b/qmk/keyboards/evil80/evil80.c
index d4653d04..471580fd 100644
--- a/qmk/keyboards/evil80/evil80.c
+++ b/qmk/keyboards/evil80/evil80.c
@@ -1,47 +1 @@
 #include "evil80.h"
-void matrix_init_kb(void) {
-    // put your keyboard start-up code here
-    // runs once when the firmware starts up
-    led_init_ports();
-    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_init_ports(void) {
-    DDRB |= (1<<6) | (1<<7); // OUT
-}
-
-void led_set_kb(uint8_t usb_led) {
-    if (usb_led & (1<<USB_LED_CAPS_LOCK))
-    {
-        PORTB |= (1<<6); // HI
-    }
-    else
-    {
-        PORTB &= ~(1<<6); // LO
-    }
-
-    if (usb_led & (1<<USB_LED_SCROLL_LOCK))
-    {
-        PORTB |= (1<<7); // HI
-    }
-    else
-    {
-        PORTB &= ~(1<<7); // LO
-    }
-
-    led_set_user(usb_led);
-}
diff --git a/qmk/keyboards/evyd13/atom47/keymaps/LEdiodes/keymap.c b/qmk/keyboards/evyd13/atom47/keymaps/LEdiodes/keymap.c
new file mode 100644
index 00000000..87e12442
--- /dev/null
+++ b/qmk/keyboards/evyd13/atom47/keymaps/LEdiodes/keymap.c
@@ -0,0 +1,33 @@
+#include QMK_KEYBOARD_H
+
+// These are all aliases for the  function layers.
+#define _L0 0
+#define _L1 1
+#define _L2 2
+#define _L3 3
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[_L0] = LAYOUT(
+  KC_ESC,		KC_Q,		KC_W,		KC_E,		KC_R,		KC_T,		KC_Y,		KC_U,		KC_I,		KC_O,		KC_P,		KC_DEL,		KC_BSPC,	\
+  KC_TAB,		KC_A,		KC_S,		KC_D,		KC_F,		KC_G,		KC_H,		KC_J,		KC_K,		KC_L,		KC_SCLN,				KC_ENT,  	\
+  KC_LSFT,		KC_Z,		KC_X,		KC_C,		KC_V,		KC_B,		KC_N,		KC_M,		KC_COMM,	KC_DOT,		KC_RSFT,				MO(_L1),	\
+  KC_LCTL,		KC_LGUI,	KC_LALT,	TG(_L3),	KC_SPC, 				KC_SPC,					MO(_L2),	KC_RALT,	KC_APP,					KC_RCTRL),	\
+ 
+[_L2] = LAYOUT(
+  _______,		KC_VOLD,	KC_VOLU,	KC_MUTE,	RESET,		_______,	KC_CALC,	KC_PGUP,	KC_UP,		KC_PGDN,	KC_PSCR,	KC_SLCK,	KC_PAUS,	\
+  KC_CAPS,		KC_MPRV,	KC_MPLY,	KC_MNXT,	_______,	_______,	KC_HOME,	KC_LEFT,	KC_DOWN,	KC_RIGHT,	KC_INS,					_______,	\
+  _______,		_______,	_______,	_______,	_______,	_______,	_______,	BL_TOGG,	BL_DEC,		BL_INC,		_______,				_______,	\
+  _______,		_______,	_______,	_______,	_______, 				_______,				_______,	_______,	_______,				_______),	\
+ 
+[_L1] = LAYOUT(
+  KC_GRV,		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_1,			KC_2,		KC_3,		KC_4,		KC_5,		KC_6,		KC_7,		KC_8,		KC_9,		KC_0,		KC_MINS,				KC_EQL,		\
+  _______,		_______,	_______,	_______,	_______,	KC_QUOT,	KC_SLSH,	KC_LBRC,	KC_RBRC,	KC_BSLS,	KC_RSFT,				_______,	\
+  _______,		_______,	_______,	_______,	_______, 				_______,				_______,	_______,	_______,				_______),	\
+ 
+[_L3] = LAYOUT(
+  _______,		_______,	_______,	   KC_7,	   KC_8,	   KC_9,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	\
+  _______,		_______,	_______,	   KC_4,	   KC_5,	   KC_6,	_______,	_______,	_______,	_______,	_______,				_______,	\
+  _______,		_______,	_______,	   KC_1,	   KC_2,	   KC_3,	_______,	_______,	_______,	_______,	_______,				_______,	\
+  _______,		_______,	_______,	   _______,    KC_0,	  KC_DOT, 	        	            _______,	_______,	_______,				RESET),     \
+};
diff --git a/qmk/keyboards/evyd13/atom47/keymaps/LEdiodes/rules.mk b/qmk/keyboards/evyd13/atom47/keymaps/LEdiodes/rules.mk
new file mode 100644
index 00000000..9334aaf2
--- /dev/null
+++ b/qmk/keyboards/evyd13/atom47/keymaps/LEdiodes/rules.mk
@@ -0,0 +1,64 @@
+# 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
+
+
+# Boot Section Size in *bytes*
+#   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 = no	# Virtual DIP switch configuration(+1000)
+MOUSEKEY_ENABLE = no	# Mouse keys(+4700)
+EXTRAKEY_ENABLE = yes	# Audio control and System control(+450)
+CONSOLE_ENABLE = no	# Console for debug(+400)
+COMMAND_ENABLE = no    # Commands for debug and configuration
+NKRO_ENABLE = yes		# USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+RGBLIGHT_ENABLE = no   # Enable keyboard underlight functionality (+4870)
+BACKLIGHT_ENABLE = yes  # Enable keyboard backlight functionality (+1150)
+MIDI_ENABLE = no 		# MIDI controls
+AUDIO_ENABLE = no
+UNICODE_ENABLE = no 		# Unicode
+BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
diff --git a/qmk/keyboards/evyd13/atom47/keymaps/default/keymap.c b/qmk/keyboards/evyd13/atom47/keymaps/default/keymap.c
new file mode 100644
index 00000000..dc87b5a5
--- /dev/null
+++ b/qmk/keyboards/evyd13/atom47/keymaps/default/keymap.c
@@ -0,0 +1,50 @@
+#include QMK_KEYBOARD_H
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+
+#define _MA 0 //Main layer
+#define _FN 1 //Fn
+#define _FN1 2 //Fn1
+#define _PN 3 //Pn
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[_MA] = LAYOUT(
+  KC_ESC,		KC_Q,		KC_W,		KC_E,		KC_R,		KC_T,		KC_Y,		KC_U,		KC_I,		KC_O,		KC_P,		KC_DEL,		KC_BSPC,	\
+  KC_TAB,		KC_A,		KC_S,		KC_D,		KC_F,		KC_G,		KC_H,		KC_J,		KC_K,		KC_L,		KC_SCLN,				KC_ENT,  	\
+  KC_LSFT,					KC_Z,		KC_X,		KC_C,		KC_V,		KC_B,		KC_N,		KC_M,		KC_COMM,	KC_DOT,		KC_RSFT,	MO(_FN1),	\
+  KC_LCTL,		KC_LGUI,	KC_LALT,	MO(_PN),				KC_SPC, 				KC_SPC,					MO(_FN),	KC_RALT,	KC_APP,		KC_RCTRL),	\
+ 
+[_FN] = LAYOUT(
+  _______,		KC_VOLD,	KC_VOLU,	KC_MUTE,	RESET,		_______,	KC_CALC,	KC_PGUP,	KC_UP,		KC_PGDN,	KC_PSCR,	KC_SLCK,	KC_PAUS,	\
+  KC_CAPS,		KC_MPRV,	KC_MPLY,	KC_MNXT,	_______,	_______,	KC_HOME,	KC_LEFT,	KC_DOWN,	KC_RIGHT,	KC_INS,					_______,	\
+  _______,					_______,	_______,	_______,	_______,	_______,	_______,	BL_TOGG,	BL_DEC,		BL_INC,		_______,	_______,	\
+  _______,		_______,	_______,	_______,				_______, 				_______,				_______,	_______,	_______,	_______),	\
+ 
+[_FN1] = LAYOUT(
+  KC_GRV,		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_1,			KC_2,		KC_3,		KC_4,		KC_5,		KC_6,		KC_7,		KC_8,		KC_9,		KC_0,		KC_MINS,				KC_EQL,		\
+  _______,					_______,	_______,	_______,	_______,	KC_QUOT,	KC_SLSH,	KC_LBRC,	KC_RBRC,	KC_BSLS,	KC_RSFT,	_______,	\
+  _______,		_______,	_______,	_______,				_______, 				_______,				_______,	_______,	_______,	_______),	\
+ 
+[_PN] = LAYOUT(
+  _______,		_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	\
+  RGB_TOG,		RGB_HUI,	RGB_SAI,	RGB_VAI,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	\
+  RGB_MOD,					RGB_HUD,	RGB_SAD,	RGB_VAD,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	\
+  _______,		_______,	_______,	_______,				_______, 				_______,				_______,	_______,	_______,	RESET),
+};
+
+void led_set_user(uint8_t usb_led) {
+    if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
+        // Turn capslock on
+ 	   	PORTE &= ~(1 << 6);
+
+
+    } else {
+        // Turn capslock off
+    	PORTE |= (1 << 6);
+    }
+}
+
diff --git a/qmk/keyboards/evyd13/atom47/keymaps/default/readme.md b/qmk/keyboards/evyd13/atom47/keymaps/default/readme.md
new file mode 100644
index 00000000..67959538
--- /dev/null
+++ b/qmk/keyboards/evyd13/atom47/keymaps/default/readme.md
@@ -0,0 +1 @@
+This is the default keymap as found on the Vortex Core, with some added buttons for RGB and backlight control.
diff --git a/qmk/keyboards/evyd13/atom47/keymaps/evyd13/keymap.c b/qmk/keyboards/evyd13/atom47/keymaps/evyd13/keymap.c
new file mode 100644
index 00000000..c01ace92
--- /dev/null
+++ b/qmk/keyboards/evyd13/atom47/keymaps/evyd13/keymap.c
@@ -0,0 +1,68 @@
+#include QMK_KEYBOARD_H
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+
+#define _MA 0 //Main layer
+#define _LO 1 //FN1
+#define _RA 2 //FN
+
+enum custom_keycodes {
+    CTRLZ = SAFE_RANGE,
+    CTRLX,
+    CTRLC,
+    CTRLV
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[_MA] = LAYOUT(
+  KC_GESC,		KC_Q,		KC_W,		KC_E,		KC_R,		KC_T,		KC_Y,		KC_U,		KC_I,		KC_O,		KC_P,		KC_DEL,		KC_BSPC,	\
+  KC_TAB,		KC_A,		KC_S,		KC_D,		KC_F,		KC_G,		KC_H,		KC_J,		KC_K,		KC_L,		KC_SCLN,				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_LCTL,		KC_LGUI,	KC_LALT,	MO(_LO),				KC_SPC, 				KC_SPC,					MO(_RA),	KC_RALT,	KC_APP,		KC_RCTRL),	\
+
+[_LO] = LAYOUT(
+  KC_GRV,		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_1,			KC_2,		KC_3,		KC_4,		KC_5,		KC_6,		KC_7,		KC_8,		KC_9,		KC_0,		KC_MINS,				KC_EQL,		\
+  _______,					CTRLZ,		CTRLX,		CTRLC,		CTRLV,		_______,	_______,	KC_QUOT,	KC_LBRC,	KC_RBRC,	KC_BSLS,	_______,	\
+  _______,		_______,	_______,	_______,				_______, 				_______,				_______,	_______,	_______,	RESET),	\
+
+[_RA] = LAYOUT(
+  _______,		_______,	_______,	_______,	_______,	_______,	_______,	KC_PGUP,	KC_UP,		KC_PGDN,	_______,	_______,	_______,	\
+  KC_CAPS,		_______,	_______,	_______,	_______,	_______,	_______,	KC_LEFT,	KC_DOWN,	KC_RIGHT,	_______,				_______,	\
+  _______,					_______,	_______,	_______,	_______,	_______,	_______,	_______,	KC_VOLD,	KC_VOLU,	KC_MPLY,	KC_PSCR,	\
+  _______,		_______,	_______,	_______,				_______, 				_______,				_______,	_______,	_______,	_______),	\
+
+};
+
+void led_set_user(uint8_t usb_led) {
+    if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
+        // Turn capslock on
+		PORTE &= ~(1 << 6);
+    } else {
+        // Turn capslock off
+    	PORTE |= (1 << 6);
+    }
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    if (record->event.pressed) {
+        switch(keycode) {
+            case CTRLZ:
+                SEND_STRING(SS_LCTRL("z"));
+                return false;
+            case CTRLX:
+                SEND_STRING(SS_LCTRL("x"));
+                return false;
+            case CTRLC:
+                SEND_STRING(SS_LCTRL("c"));
+                return false;
+            case CTRLV:
+                SEND_STRING(SS_LCTRL("v"));
+                return false;
+        }
+    }
+    return true;
+};
diff --git a/qmk/keyboards/evyd13/atom47/keymaps/evyd13/readme.md b/qmk/keyboards/evyd13/atom47/keymaps/evyd13/readme.md
new file mode 100644
index 00000000..67959538
--- /dev/null
+++ b/qmk/keyboards/evyd13/atom47/keymaps/evyd13/readme.md
@@ -0,0 +1 @@
+This is the default keymap as found on the Vortex Core, with some added buttons for RGB and backlight control.
diff --git a/qmk/keyboards/evyd13/atom47/keymaps/junonum_a47/keymap.c b/qmk/keyboards/evyd13/atom47/keymaps/junonum_a47/keymap.c
new file mode 100644
index 00000000..ebd52ffd
--- /dev/null
+++ b/qmk/keyboards/evyd13/atom47/keymaps/junonum_a47/keymap.c
@@ -0,0 +1,150 @@
+#include QMK_KEYBOARD_H
+
+/* enum custom_keycodes {
+  SHIFTEN = SAFE_RANGE,
+  LOWER,
+  RAISE,
+  SPACFNL,
+  SPACFNR,
+  MAIN,
+  ADJUST
+}; */
+
+#define _MAIN 0
+#define _SPLEFT 1
+#define _SPRIGHT 2
+#define _LOWER 3
+#define _RAISE 4
+#define _ADJUST 5
+
+#define _DPAD 6
+#define _DPADNUM 7
+
+
+#define SHIFTEN RSFT_T(KC_ENT)
+#define LOWER MO(_LOWER)
+#define RAISE MO(_RAISE)
+#define SPACFNL LT(_SPLEFT, KC_SPC)
+#define SPACFNR LT(_SPRIGHT, KC_SPC)
+
+#define DP_ON TO(_DPAD)
+#define DP_OFF TO(_MAIN)
+#define DPADNUM MO(_DPADNUM)
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+	
+	// Primary layer	
+	[_MAIN] = LAYOUT(
+	  KC_ESC,		KC_Q,		KC_W,		KC_E,		KC_R,		KC_T,		KC_Y,		KC_U,		KC_I,		KC_O,		KC_P,		KC_DEL,		KC_BSPC,
+	  KC_TAB,		KC_A,		KC_S,		KC_D,		KC_F,		KC_G,		KC_H,		KC_J,		KC_K,		KC_L,		KC_SCLN,				KC_QUOT,
+	  KC_LSFT,					KC_Z,		KC_X,		KC_C,		KC_V,		KC_B,		KC_N,		KC_M,		KC_COMM,	KC_DOT,		KC_SLSH,	SHIFTEN,
+	  KC_LCTL,		KC_LGUI,	KC_LALT,	LOWER,					SPACFNL, 				SPACFNR,				RAISE,		KC_RALT,	KC_APP,		KC_RCTRL
+	),
+
+	// Main Fn navigation layer
+	[_SPLEFT] = LAYOUT(
+	  _______,		KC_VOLU, 	KC_PGUP, 	KC_UP,   	KC_PGDN, 	KC_INS,  	_______, 	_______, 	KC_UP,   	_______, 	KC_PSCR,	_______,	_______,	
+	  _______,		KC_VOLD, 	KC_LEFT, 	KC_DOWN, 	KC_RGHT, 	KC_HOME, 	_______, 	KC_LEFT, 	KC_DOWN, 	KC_RGHT, 	_______, 				KC_DEL , 	
+	  _______,					_______,    KC_MPRV, 	KC_MPLY, 	KC_MNXT, 	KC_END,  	_______, 	_______, 	KC_VOLD, 	KC_VOLU, 	KC_MUTE,	_______,	
+	  _______,		_______,	_______,	_______,				_______, 				_______,				_______,	_______,	_______,	_______
+	),	
+
+	// Primary numeric layer using right Spacebar
+	[_SPRIGHT] = LAYOUT(
+	  KC_GRV,		_______,	_______,	KC_LBRC, 	KC_RBRC,	_______,	_______,	KC_7,		KC_8,		KC_9,		KC_0,		_______,	_______,	
+	  _______,		_______,	_______,	KC_LCBR, 	KC_RCBR,	_______,	_______,	KC_4,		KC_5,		KC_6,	 	KC_MINUS, 				KC_BSLS, 	
+	  _______,					_______,	_______,	_______,	_______,	_______,	_______,	KC_1,		KC_2,		KC_3,		KC_EQUAL,	_______,	
+	  _______,		_______,	_______,	_______,				_______, 				_______,				_______,	_______,	_______,	_______
+	),	
+
+	// Secondary symbol layer, also Lower
+	[_LOWER] = LAYOUT(
+	  KC_TILD, 		_______,	_______,	_______,	_______,	_______,	_______, 	KC_AMPR, 	KC_ASTR, 	KC_LPRN, 	KC_RPRN,	KC_SLCK,	KC_PAUS,	
+	  KC_CAPS,		KC_F1,   	KC_F2,   	KC_F3,   	KC_F4,   	KC_F5,   	KC_F6,		KC_DLR,  	KC_PERC, 	KC_CIRC, 	KC_UNDS, 				KC_PIPE,	
+	  _______,					KC_F7,   	KC_F8,   	KC_F9,   	KC_F10,  	KC_F11,  	KC_F12,		KC_EXLM, 	KC_AT,   	KC_HASH, 	KC_PLUS,	_______,	
+	  _______,		_______,	_______,	_______,				_______, 				_______,				_______,	KC_VOLD, 	KC_VOLU, 	KC_MPLY
+	),	
+	  
+	// Numpad layer // Also a homage to Planck with the media player/pause button
+	[_RAISE] = LAYOUT(
+	  _______,		_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	
+	  _______,		_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,				_______,
+	  _______,					_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	
+	  _______,		_______,	_______,	_______,				_______, 				_______,				_______,	KC_VOLD, 	KC_VOLU, 	KC_MPLY
+	),	
+
+	// Safety layer for special functions
+	[_ADJUST] = LAYOUT(
+	  _______,		RESET,		_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,
+	  _______,		_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,				_______,
+	  _______,					_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	_______,	DP_ON,
+	  _______,		_______,	_______,	_______,				_______, 				_______,				_______,	_______,	_______,	_______
+	),
+	
+	[_DPAD] = LAYOUT(
+	  KC_ESC,		KC_Q,		KC_W,		KC_E,		KC_R,		KC_T,		KC_Y,		KC_U,		KC_I,		KC_O,		KC_P,		KC_DEL,		KC_BSPC,
+	  KC_TAB,		KC_A,		KC_S,		KC_D,		KC_F,		KC_G,		KC_H,		KC_J,		KC_K,		KC_L,		KC_SCLN,				KC_QUOT,
+	  KC_LSFT,					KC_Z,		KC_X,		KC_C,		KC_V,		KC_B,		KC_N,		KC_M,		KC_COMM,	KC_DOT,		KC_UP,		KC_ENT,
+	  KC_LCTL,		KC_LGUI,	KC_LALT,	XXXXXXX,				DPADNUM, 				KC_SPC,					DP_OFF,		KC_LEFT,	KC_DOWN,	KC_RGHT
+	),
+	
+	[_DPADNUM] = LAYOUT(
+	  _______,		KC_1,		KC_2,		KC_3,		KC_4,		KC_5,		KC_6,		KC_7,		KC_8,		KC_9,		KC_0,		_______,	_______,
+	  _______,		_______,	_______,	_______,	_______,	KC_F1,   	KC_F2,   	KC_F3,   	KC_F4,   	KC_F5,   	KC_F6,					_______,
+	  _______,					_______,	_______,	_______,	_______,	KC_F7,   	KC_F8,   	KC_F9,   	KC_F10,  	KC_F11,  	KC_F12,		_______,
+	  _______,		_______,	_______,	_______,				_______, 				_______,				_______,	_______,	_______,	_______
+	),
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  switch (keycode) {
+/*     case MAIN:
+      if (record->event.pressed) {
+        persistant_default_layer_set(1UL<<_MAIN);
+      }
+      return false;
+      break; */
+    case LOWER:
+      if (record->event.pressed) {
+        layer_on(_LOWER);
+        update_tri_layer(_LOWER, _RAISE, _ADJUST);
+      } else {
+        layer_off(_LOWER);
+        update_tri_layer(_LOWER, _RAISE, _ADJUST);
+      }
+      return false;
+      break;
+    case RAISE:
+      if (record->event.pressed) {
+        layer_on(_RAISE);
+        update_tri_layer(_LOWER, _RAISE, _ADJUST);
+      } else {
+        layer_off(_RAISE);
+        update_tri_layer(_LOWER, _RAISE, _ADJUST);
+      }
+      return false;
+      break;
+/*     case ADJUST:
+      if (record->event.pressed) {
+        layer_on(_ADJUST);
+      } else {
+        layer_off(_ADJUST);
+      }
+      return false;
+      break; */
+  }
+  return true;
+}
+
+void led_set_user(uint8_t usb_led) {
+    if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
+        // Turn capslock on
+ 	   	writePinLow(E6);
+
+
+    } else {
+        // Turn capslock off
+    	writePinHigh(E6);
+    }
+}
diff --git a/qmk/keyboards/evyd13/atom47/keymaps/junonum_a47/readme.md b/qmk/keyboards/evyd13/atom47/keymaps/junonum_a47/readme.md
new file mode 100644
index 00000000..42d83702
--- /dev/null
+++ b/qmk/keyboards/evyd13/atom47/keymaps/junonum_a47/readme.md
@@ -0,0 +1 @@
+Juno's junonum keymap adapted for Atom47.
\ No newline at end of file
diff --git a/qmk/keyboards/evyd13/atom47/readme.md b/qmk/keyboards/evyd13/atom47/readme.md
new file mode 100644
index 00000000..70171c04
--- /dev/null
+++ b/qmk/keyboards/evyd13/atom47/readme.md
@@ -0,0 +1,26 @@
+# Atom47
+
+![Atom47](https://i.imgur.com/Wwflqvt.png)
+
+## Support
+Keyboard Maintainer: [Evyd13](https://github.com/evyd13)  
+Hardware Supported: Atom47 rev2/rev3
+Hardware Availability: [GeekHack.com Group Buy](https://geekhack.org/index.php?topic=93447.msg2545221)  
+
+
+## Features (rev3 and up)
+- QMK Firmware  
+- 6 Underglow RGB leds  
+- In-switch leds  
+- Through-hole micro usb connector (less likely to break off!)  
+- South facing leds for the QMX/Zealencio users  
+- Multiple layouts  
+- Easily reachable reset button under the spacebar  
+- CapsLock indicator  
+
+## Build
+To build the default keymap for the latest revision, simply run `make atom47:default`. Specifiy the revision like so: `make atom47/rev3:default`.
+
+See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
+
+![Atom47](https://i.imgur.com/JfYnOba.jpg)
diff --git a/qmk/keyboards/evyd13/atom47/rev2/config.h b/qmk/keyboards/evyd13/atom47/rev2/config.h
new file mode 100644
index 00000000..74061726
--- /dev/null
+++ b/qmk/keyboards/evyd13/atom47/rev2/config.h
@@ -0,0 +1,68 @@
+/*
+Copyright 2012 Evy Dekkers
+
+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 REV2_CONFIG_H
+#define REV2_CONFIG_H
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0xFEED
+#define PRODUCT_ID      0x6060
+#define DEVICE_VER      0x0003
+#define MANUFACTURER    Vortex
+#define PRODUCT         Core
+#define DESCRIPTION     Atom47 PCB for the Vortex Core Rev.2
+
+/* key matrix size */
+#define MATRIX_ROWS 4
+#define MATRIX_COLS 13
+
+// ROWS: Top to bottom, COLS: Left to right
+
+#define MATRIX_ROW_PINS {B1,B2,B3,B7}
+#define MATRIX_COL_PINS {D7,D5,F0,F1,F4,F6,F7,D4,C7,C6,D6,B5,B4}
+#define UNUSED_PINS
+
+#define BACKLIGHT_PIN B6
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* define if matrix has ghost */
+//#define MATRIX_HAS_GHOST
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+/* Backlight configuration
+ */
+#define BACKLIGHT_LEVELS 4
+
+#define RGB_DI_PIN D0    // The pin the LED strip is connected to
+#define RGBLED_NUM 1     // Number of LEDs in your strip
+
+#define QMK_ESC_OUTPUT D7 // usually COL
+#define QMK_ESC_INPUT B1 // usually ROW
+#define QMK_LED B6
+
+#endif
diff --git a/qmk/keyboards/evyd13/atom47/rev2/info.json b/qmk/keyboards/evyd13/atom47/rev2/info.json
new file mode 100644
index 00000000..aa15e760
--- /dev/null
+++ b/qmk/keyboards/evyd13/atom47/rev2/info.json
@@ -0,0 +1,12 @@
+{
+  "keyboard_name": "Atom47", 
+  "url": "", 
+  "maintainer": "evyd13", 
+  "width": 13, 
+  "height": 4, 
+  "layouts": {
+    "LAYOUT": {
+      "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":0, "y":1, "w":1.25}, {"x":1.25, "y":1}, {"x":2.25, "y":1}, {"x":3.25, "y":1}, {"x":4.25, "y":1}, {"x":5.25, "y":1}, {"x":6.25, "y":1}, {"x":7.25, "y":1}, {"x":8.25, "y":1}, {"x":9.25, "y":1}, {"x":10.25, "y":1}, {"x":11.25, "y":1, "w":1.75}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2, "w":1.25}, {"x":12, "y":2}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3, "w":1.75}, {"x":6, "y":3, "w":2.75}, {"x":8.75, "y":3}, {"x":9.75, "y":3}, {"x":10.75, "y":3}, {"x":11.75, "y":3, "w":1.25}]
+    }
+  }
+}
diff --git a/qmk/keyboards/evyd13/atom47/rev2/readme.md b/qmk/keyboards/evyd13/atom47/rev2/readme.md
new file mode 100644
index 00000000..b63e1bb4
--- /dev/null
+++ b/qmk/keyboards/evyd13/atom47/rev2/readme.md
@@ -0,0 +1,23 @@
+# Atom47 rev2
+
+This is the keymap for rev2 of the Atom47. Only 9 of those have been sold for testing purposes. It had a slightly misaligned usb port and the pcb was too thick (should've been 1.2mm instead of 1.6mm). The pcb only supports the default hardware layout, although /u/ChrisSwires has [modified his](https://www.reddit.com/r/MechanicalKeyboards/comments/7n2dua/not_your_average_core_with_honeywell/) and put a big spacebar in it.
+
+## Support
+Keyboard Maintainer: [Matthew Kerfoot](https://github.com/mkerfoot)  
+Hardware Supported: Atom47 rev2  
+Hardware Availability: None  
+
+
+## Features
+- QMK Firmware  
+- In-switch leds  
+- Through-hole micro usb connector (less likely to break off!)  
+- Easily reachable reset button under the spacebar  
+- In-switch CapsLock indicator  
+
+## Build
+To build the default keymap, simply run `make atom47/rev2:default`.
+
+For an alternative, heavily modified layout you would just need to run `make atom47/rev2:LEdiodes`.
+
+See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
diff --git a/qmk/keyboards/evyd13/atom47/rev2/rev2.c b/qmk/keyboards/evyd13/atom47/rev2/rev2.c
new file mode 100644
index 00000000..06fce06d
--- /dev/null
+++ b/qmk/keyboards/evyd13/atom47/rev2/rev2.c
@@ -0,0 +1,34 @@
+#include "rev2.h"
+#include "led.h"
+
+void matrix_init_kb(void) {
+	// put your keyboard start-up code here
+	// runs once when the firmware starts up
+	matrix_init_user();
+	led_init_ports();
+};
+
+void matrix_scan_kb(void) {
+	// put your looping keyboard code here
+	// runs every cycle (a lot)
+	matrix_scan_user();
+};
+
+void led_init_ports(void) {
+    // * Set our LED pins as output
+    DDRB &= ~(1<<5);
+
+	//Set output high, so the capslock led is off
+	PORTB |= (1 << 5);
+}
+
+void led_set_kb(uint8_t usb_led) {
+	if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
+        // Turn capslock on
+        PORTF |= (1<<5);
+    } else {
+        // Turn capslock off
+        PORTF &= ~(1<<5);
+    }
+	led_set_user(usb_led);
+}
diff --git a/qmk/keyboards/evyd13/atom47/rev2/rev2.h b/qmk/keyboards/evyd13/atom47/rev2/rev2.h
new file mode 100644
index 00000000..bfea34e0
--- /dev/null
+++ b/qmk/keyboards/evyd13/atom47/rev2/rev2.h
@@ -0,0 +1,25 @@
+#ifndef ATOM47_H
+#define ATOM47_H
+
+#include "quantum.h"
+
+// readability
+#define XXX KC_NO
+
+#define LAYOUT( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, \
+	k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a,      k1c, \
+	k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a,      k2c, \
+	k30, k31, k32, k33, k34,      k36,      k38, k39, k3a,      k3c \
+) \
+{ \
+    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c}, \
+	{k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, XXX, k1c}, \
+	{k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, XXX, k2c}, \
+	{k30, k31, k32, k33, k34, XXX, k36, XXX, k38, k39, k3a, XXX, k3c}  \
+}
+
+void matrix_init_user(void);
+void matrix_scan_user(void);
+
+#endif
diff --git a/qmk/keyboards/evyd13/atom47/rev2/rules.mk b/qmk/keyboards/evyd13/atom47/rev2/rules.mk
new file mode 100644
index 00000000..0b6b8799
--- /dev/null
+++ b/qmk/keyboards/evyd13/atom47/rev2/rules.mk
@@ -0,0 +1,2 @@
+NKRO_ENABLE = yes		# USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+RGBLIGHT_ENABLE = no   # Enable keyboard underlight functionality
diff --git a/qmk/keyboards/evyd13/atom47/rev3/config.h b/qmk/keyboards/evyd13/atom47/rev3/config.h
new file mode 100644
index 00000000..f255ee5a
--- /dev/null
+++ b/qmk/keyboards/evyd13/atom47/rev3/config.h
@@ -0,0 +1,63 @@
+/*
+Copyright 2012 Evy Dekkers
+
+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 REV3_CONFIG_H
+#define REV3_CONFIG_H
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0xFEED
+#define PRODUCT_ID      0x6060
+#define DEVICE_VER      0x0003
+#define MANUFACTURER    Vortex
+#define PRODUCT         Core
+#define DESCRIPTION     Atom47 PCB for the Vortex Core Rev.3
+
+/* key matrix size */
+#define MATRIX_ROWS 4
+#define MATRIX_COLS 13
+
+// ROWS: Top to bottom, COLS: Left to right
+
+#define MATRIX_ROW_PINS {B3,B2,B1,B0}
+#define MATRIX_COL_PINS {B7,F0,F1,F4,F6,D4,D6,D7,B4,B5,C6,C7,F7}
+#define UNUSED_PINS
+
+#define BACKLIGHT_PIN B6
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* define if matrix has ghost */
+//#define MATRIX_HAS_GHOST
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/* Backlight configuration
+ */
+#define BACKLIGHT_LEVELS 4
+
+#define RGB_DI_PIN F5    // The pin the LED strip is connected to
+#define RGBLED_NUM 6     // Number of LEDs in your strip
+#define RGBLIGHT_ANIMATIONS
+#define QMK_ESC_OUTPUT B7 // usually COL
+#define QMK_ESC_INPUT B3 // usually ROW
+#define QMK_LED E6
+
+#endif
diff --git a/qmk/keyboards/evyd13/atom47/rev3/info.json b/qmk/keyboards/evyd13/atom47/rev3/info.json
new file mode 100644
index 00000000..aa15e760
--- /dev/null
+++ b/qmk/keyboards/evyd13/atom47/rev3/info.json
@@ -0,0 +1,12 @@
+{
+  "keyboard_name": "Atom47", 
+  "url": "", 
+  "maintainer": "evyd13", 
+  "width": 13, 
+  "height": 4, 
+  "layouts": {
+    "LAYOUT": {
+      "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":0, "y":1, "w":1.25}, {"x":1.25, "y":1}, {"x":2.25, "y":1}, {"x":3.25, "y":1}, {"x":4.25, "y":1}, {"x":5.25, "y":1}, {"x":6.25, "y":1}, {"x":7.25, "y":1}, {"x":8.25, "y":1}, {"x":9.25, "y":1}, {"x":10.25, "y":1}, {"x":11.25, "y":1, "w":1.75}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2, "w":1.25}, {"x":12, "y":2}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3, "w":1.75}, {"x":6, "y":3, "w":2.75}, {"x":8.75, "y":3}, {"x":9.75, "y":3}, {"x":10.75, "y":3}, {"x":11.75, "y":3, "w":1.25}]
+    }
+  }
+}
diff --git a/qmk/keyboards/evyd13/atom47/rev3/rev3.c b/qmk/keyboards/evyd13/atom47/rev3/rev3.c
new file mode 100644
index 00000000..c541ed55
--- /dev/null
+++ b/qmk/keyboards/evyd13/atom47/rev3/rev3.c
@@ -0,0 +1,27 @@
+#include "rev3.h"
+#include "led.h"
+
+void matrix_init_kb(void) {
+	// put your keyboard start-up code here
+	// runs once when the firmware starts up
+	matrix_init_user();
+	led_init_ports();
+};
+
+void matrix_scan_kb(void) {
+	// put your looping keyboard code here
+	// runs every cycle (a lot)
+	matrix_scan_user();
+};
+
+void led_init_ports(void) {
+    // * Set our LED pins as output
+    DDRE |= (1 << 6);
+
+	//Set output high, so the capslock led is off
+	PORTE |= (1 << 6);
+}
+
+void led_set_kb(uint8_t usb_led) {
+    led_set_user(usb_led);
+}
diff --git a/qmk/keyboards/evyd13/atom47/rev3/rev3.h b/qmk/keyboards/evyd13/atom47/rev3/rev3.h
new file mode 100644
index 00000000..ad875bb4
--- /dev/null
+++ b/qmk/keyboards/evyd13/atom47/rev3/rev3.h
@@ -0,0 +1,23 @@
+#ifndef ATOM47_REV3_H
+#define ATOM47_REV3_H
+
+#include "quantum.h"
+
+// readability
+#define XXX KC_NO
+
+#define LAYOUT( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, \
+	k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a,      k1c, \
+	k20,      k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, \
+	k30, k31, k32, k33,      k35,      k37,      k39, k3a, k3b, k3c \
+) \
+{ \
+    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c}, \
+	{k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, XXX, k1c}, \
+	{k20, XXX, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c}, \
+	{k30, k31, k32, k33, XXX, k35, XXX, k37, XXX, k39, k3a, k3b, k3c}  \
+}
+
+
+#endif
diff --git a/qmk/keyboards/evyd13/atom47/rev3/rules.mk b/qmk/keyboards/evyd13/atom47/rev3/rules.mk
new file mode 100644
index 00000000..2df225e3
--- /dev/null
+++ b/qmk/keyboards/evyd13/atom47/rev3/rules.mk
@@ -0,0 +1,2 @@
+NKRO_ENABLE = no		# USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+RGBLIGHT_ENABLE = yes   # Enable keyboard underlight functionality
diff --git a/qmk/keyboards/evyd13/atom47/rules.mk b/qmk/keyboards/evyd13/atom47/rules.mk
new file mode 100644
index 00000000..72c0b219
--- /dev/null
+++ b/qmk/keyboards/evyd13/atom47/rules.mk
@@ -0,0 +1,28 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+#   Teensy       halfkay
+#   Pro Micro    caterina
+#   Atmel DFU    atmel-dfu
+#   LUFA DFU     lufa-dfu
+#   QMK DFU      qmk-dfu
+#   ATmega32A    bootloadHID
+#   ATmega328P   USBasp
+BOOTLOADER = qmk-dfu
+
+# Build Options
+#   comment out to disable the options.
+#
+BOOTMAGIC_ENABLE = no	# Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no	# Mouse keys
+EXTRAKEY_ENABLE = yes	# Audio control and System control
+CONSOLE_ENABLE = no	# Console for debug
+COMMAND_ENABLE = no    # Commands for debug and configuration
+BACKLIGHT_ENABLE = yes  # Enable keyboard backlight functionality
+MIDI_ENABLE = no 		# MIDI controls
+AUDIO_ENABLE = no
+UNICODE_ENABLE = no 		# Unicode
+BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
+
+DEFAULT_FOLDER = evyd13/atom47/rev3
diff --git a/qmk/keyboards/evyd13/eon40/config.h b/qmk/keyboards/evyd13/eon40/config.h
new file mode 100644
index 00000000..0e16c570
--- /dev/null
+++ b/qmk/keyboards/evyd13/eon40/config.h
@@ -0,0 +1,226 @@
+/* Copyright 2019 Evy Dekkers
+ *
+ * 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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x4705
+#define PRODUCT_ID      0x0140
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Evyd13
+#define PRODUCT         Eon40
+#define DESCRIPTION     A 40% ortholinear PCB
+
+/* key matrix size */
+#define MATRIX_ROWS 4
+#define MATRIX_COLS 12
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+*/
+#define MATRIX_ROW_PINS {B7,D5,F5,F6}
+#define MATRIX_COL_PINS {F0,F1,F4,D3,D4,D6,D7,B4,B5,B6,C6,C7}
+#define UNUSED_PINS {B1,B2,B3}
+
+#define ENCODERS_PAD_A { E6, B0, D1 }
+#define ENCODERS_PAD_B { F7, D0, D2 }
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+// #define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6
+
+// #define BACKLIGHT_PIN B7
+// #define BACKLIGHT_BREATHING
+// #define BACKLIGHT_LEVELS 3
+
+// #define RGB_DI_PIN E2
+// #ifdef RGB_DI_PIN
+//   #define RGBLED_NUM 16
+//   #define RGBLIGHT_HUE_STEP 8
+//   #define RGBLIGHT_SAT_STEP 8
+//   #define RGBLIGHT_VAL_STEP 8
+//   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+//   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+// /*== all animations enable ==*/
+//   #define RGBLIGHT_ANIMATIONS
+// /*== or choose animations ==*/
+//   #define RGBLIGHT_EFFECT_BREATHING
+//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
+//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+//   #define RGBLIGHT_EFFECT_SNAKE
+//   #define RGBLIGHT_EFFECT_KNIGHT
+//   #define RGBLIGHT_EFFECT_CHRISTMAS
+//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
+//   #define RGBLIGHT_EFFECT_RGB_TEST
+//   #define RGBLIGHT_EFFECT_ALTERNATING
+// /*== customize breathing effect ==*/
+//   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+//   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+//   /*==== use exp() and sin() ====*/
+//   #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//   #define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+// #endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is userful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+// #define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Magic Key Options
+ *
+ * Magic keys are hotkey commands that allow control over firmware functions of
+ * the keyboard. They are best used in combination with the HID Listen program,
+ * found here: https://www.pjrc.com/teensy/hid_listen.html
+ *
+ * The options below allow the magic key functionality to be changed. This is
+ * useful if your keyboard/keypad is missing keys and you want magic key support.
+ *
+ */
+
+/* key combination for magic key command */
+/* defined by default; to change, uncomment and set to the combination you want */
+// #define IS_COMMAND() (get_mods() == MOD_MASK_SHIFT)
+
+/* control how magic key switches layers */
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS  true
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS  true
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false
+
+/* override magic key keymap */
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM
+//#define MAGIC_KEY_HELP           H
+//#define MAGIC_KEY_HELP_ALT       SLASH
+//#define MAGIC_KEY_DEBUG          D
+//#define MAGIC_KEY_DEBUG_MATRIX   X
+//#define MAGIC_KEY_DEBUG_KBD      K
+//#define MAGIC_KEY_DEBUG_MOUSE    M
+//#define MAGIC_KEY_VERSION        V
+//#define MAGIC_KEY_STATUS         S
+//#define MAGIC_KEY_CONSOLE        C
+//#define MAGIC_KEY_LAYER0         0
+//#define MAGIC_KEY_LAYER0_ALT     GRAVE
+//#define MAGIC_KEY_LAYER1         1
+//#define MAGIC_KEY_LAYER2         2
+//#define MAGIC_KEY_LAYER3         3
+//#define MAGIC_KEY_LAYER4         4
+//#define MAGIC_KEY_LAYER5         5
+//#define MAGIC_KEY_LAYER6         6
+//#define MAGIC_KEY_LAYER7         7
+//#define MAGIC_KEY_LAYER8         8
+//#define MAGIC_KEY_LAYER9         9
+//#define MAGIC_KEY_BOOTLOADER     B
+//#define MAGIC_KEY_BOOTLOADER_ALT ESC
+//#define MAGIC_KEY_LOCK           CAPS
+//#define MAGIC_KEY_EEPROM         E
+//#define MAGIC_KEY_EEPROM_CLEAR   BSPACE
+//#define MAGIC_KEY_NKRO           N
+//#define MAGIC_KEY_SLEEP_LED      Z
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+//#define NO_ACTION_MACRO
+//#define NO_ACTION_FUNCTION
+
+/*
+ * MIDI options
+ */
+
+/* Prevent use of disabled MIDI features in the keymap */
+//#define MIDI_ENABLE_STRICT 1
+
+/* enable basic MIDI features:
+   - MIDI notes can be sent when in Music mode is on
+*/
+//#define MIDI_BASIC
+
+/* enable advanced MIDI features:
+   - MIDI notes can be added to the keymap
+   - Octave shift and transpose
+   - Virtual sustain, portamento, and modulation wheel
+   - etc.
+*/
+//#define MIDI_ADVANCED
+
+/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
+//#define MIDI_TONE_KEYCODE_OCTAVES 1
+
+/* Bootmagic Lite key configuration */
+// #define BOOTMAGIC_LITE_ROW 0
+// #define BOOTMAGIC_LITE_COLUMN 0
+
+#define QMK_ESC_OUTPUT F0 // usually COL
+#define QMK_ESC_INPUT B7 // usually ROW
diff --git a/qmk/keyboards/evyd13/eon40/eon40.c b/qmk/keyboards/evyd13/eon40/eon40.c
new file mode 100644
index 00000000..014fca9d
--- /dev/null
+++ b/qmk/keyboards/evyd13/eon40/eon40.c
@@ -0,0 +1,16 @@
+/* Copyright 2019 Evy Dekkers
+ *
+ * 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 "eon40.h"
diff --git a/qmk/keyboards/evyd13/eon40/eon40.h b/qmk/keyboards/evyd13/eon40/eon40.h
new file mode 100644
index 00000000..03e680d8
--- /dev/null
+++ b/qmk/keyboards/evyd13/eon40/eon40.h
@@ -0,0 +1,67 @@
+/* Copyright 2019 Evy Dekkers
+ *
+ * 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 XXX KC_NO
+
+/* This a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+
+#define LAYOUT_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 \
+) \
+{ \
+	{ 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 } \
+}
+
+#define LAYOUT_planck_mit( \
+	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 \
+) \
+{ \
+	{ 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, k35, k37, k38, k39, k3a, k3b } \
+}
+
+#define LAYOUT_ortho_4x12_2x2u( \
+	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,     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, XXX, XXX, k37, k38, k39, k3a, k3b } \
+}
diff --git a/qmk/keyboards/evyd13/eon40/info.json b/qmk/keyboards/evyd13/eon40/info.json
new file mode 100644
index 00000000..056be65d
--- /dev/null
+++ b/qmk/keyboards/evyd13/eon40/info.json
@@ -0,0 +1,18 @@
+{
+  "keyboard_name": "Eon40", 
+  "url": "https://maartenwut.com/product/eon40/", 
+  "maintainer": "qmk", 
+  "width": 12, 
+  "height": 4, 
+  "layouts": {
+    "LAYOUT_ortho_4x12": {
+      "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}]
+    },
+    "LAYOUT_planck_mit": {
+      "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3, "w":2}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}]
+    },
+    "LAYOUT_ortho_4x12_2x2u": {
+      "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3, "w":2}, {"x":6, "y":3, "w":2}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}]
+    }
+  }
+}
diff --git a/qmk/keyboards/evyd13/eon40/keymaps/default/keymap.c b/qmk/keyboards/evyd13/eon40/keymaps/default/keymap.c
new file mode 100644
index 00000000..2cfb5744
--- /dev/null
+++ b/qmk/keyboards/evyd13/eon40/keymaps/default/keymap.c
@@ -0,0 +1,46 @@
+/* Copyright 2019 Evy Dekkers
+ *
+ * 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
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+
+#define _MA 0 //Main layer
+#define _LO 1 //Low
+#define _HI 2 //High
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[_MA] = LAYOUT_ortho_4x12(
+  KC_GESC,  KC_Q,        KC_W,        KC_E,        KC_R,        KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_DEL,
+  KC_TAB,   KC_A,        KC_S,        KC_D,        KC_F,        KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  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_LCTL,  KC_LGUI,     KC_LALT,     KC_RALT,     MO(_LO),     KC_SPC,   KC_BSPC,  MO(_HI),  KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT),
+
+[_LO] = LAYOUT_ortho_4x12(
+  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_1,     KC_2,        KC_3,        KC_4,        KC_5,        KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,
+  _______,  LCTL(KC_Z),  LCTL(KC_X),  LCTL(KC_C),  LCTL(KC_V),  _______,  _______,  KC_QUOT,  KC_LBRC,  KC_RBRC,  KC_BSLS,  _______,
+  _______,  _______,     _______,     _______,     _______,     _______,  _______,  _______,  _______,  _______,  _______,  RESET),
+
+[_HI] = LAYOUT_ortho_4x12(
+  _______,  _______,     _______,     _______,     _______,     _______,  _______,  KC_PGUP,  KC_UP,    KC_PGDN,  _______,  _______,
+  KC_CAPS,  _______,     _______,     _______,     _______,     _______,  _______,  KC_LEFT,  KC_DOWN,  KC_RIGHT, _______,  _______,
+  _______,  _______,     _______,     _______,     _______,     _______,  _______,  _______,  KC_VOLD,  KC_VOLU,  KC_MPLY,   KC_PSCR,
+  _______,  _______,     _______,     _______,     _______,     _______,  _______,  _______,  _______,  _______,  _______,   _______),
+
+};
\ No newline at end of file
diff --git a/qmk/keyboards/evyd13/eon40/keymaps/default/readme.md b/qmk/keyboards/evyd13/eon40/keymaps/default/readme.md
new file mode 100644
index 00000000..7185afb0
--- /dev/null
+++ b/qmk/keyboards/evyd13/eon40/keymaps/default/readme.md
@@ -0,0 +1 @@
+This is the default keymap for the Eon40.
diff --git a/qmk/keyboards/evyd13/eon40/keymaps/via/keymap.c b/qmk/keyboards/evyd13/eon40/keymaps/via/keymap.c
new file mode 100644
index 00000000..3af6d609
--- /dev/null
+++ b/qmk/keyboards/evyd13/eon40/keymaps/via/keymap.c
@@ -0,0 +1,43 @@
+/* Copyright 2019 Evy Dekkers
+ *
+ * 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_ortho_4x12(
+  KC_GESC,  KC_Q,        KC_W,        KC_E,        KC_R,        KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_DEL,
+  KC_TAB,   KC_A,        KC_S,        KC_D,        KC_F,        KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  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_LCTL,  KC_LGUI,     KC_LALT,     KC_RALT,     MO(1),       KC_SPC,   KC_BSPC,  MO(2),    KC_LEFT,  KC_DOWN,  KC_UP,    KC_MPLY),
+
+[1] = LAYOUT_ortho_4x12(
+  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_1,     KC_2,        KC_3,        KC_4,        KC_5,        KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,
+  _______,  LCTL(KC_Z),  LCTL(KC_X),  LCTL(KC_C),  LCTL(KC_V),  _______,  _______,  KC_QUOT,  KC_LBRC,  KC_RBRC,  KC_BSLS,  _______,
+  _______,  _______,     _______,     _______,     _______,     _______,  _______,  _______,  _______,  _______,  _______,  RESET),
+
+[2] = LAYOUT_ortho_4x12(
+  _______,  _______,     _______,     _______,     _______,     _______,  _______,  KC_PGUP,  KC_UP,    KC_PGDN,  _______,  _______,
+  KC_CAPS,  _______,     _______,     _______,     _______,     _______,  _______,  KC_LEFT,  KC_DOWN,  KC_RIGHT, _______,  _______,
+  _______,  _______,     _______,     _______,     _______,     _______,  _______,  _______,  KC_VOLD,  KC_VOLU,  KC_MPLY,  KC_PSCR,
+  _______,  _______,     _______,     _______,     _______,     _______,  _______,  _______,  _______,  _______,  _______,  _______),
+  
+[3] = LAYOUT_ortho_4x12(
+  _______,  _______,     _______,     _______,     _______,     _______,  _______,  _______,  _______,  _______,  _______,  _______,
+  _______,  _______,     _______,     _______,     _______,     _______,  _______,  _______,  _______,  _______,  _______,  _______,
+  _______,  _______,     _______,     _______,     _______,     _______,  _______,  _______,  _______,  _______,  _______,  _______,
+  _______,  _______,     _______,     _______,     _______,     _______,  _______,  _______,  _______,  _______,  _______,  _______)
+
+};
\ No newline at end of file
diff --git a/qmk/keyboards/evyd13/eon40/keymaps/via/rules.mk b/qmk/keyboards/evyd13/eon40/keymaps/via/rules.mk
new file mode 100644
index 00000000..36b7ba9c
--- /dev/null
+++ b/qmk/keyboards/evyd13/eon40/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/qmk/keyboards/evyd13/eon40/readme.md b/qmk/keyboards/evyd13/eon40/readme.md
new file mode 100644
index 00000000..5a4e8e3f
--- /dev/null
+++ b/qmk/keyboards/evyd13/eon40/readme.md
@@ -0,0 +1,21 @@
+# Eon40
+
+## Support
+* Keyboard Maintainer: [Evyd13](https://github.com/evyd13)
+* Hardware Supported: Eon40
+* Hardware Availability: [maartenwut.com](https://maartenwut.com)
+
+
+## Features
+- QMK Firmware  
+- 19mm switch spacing
+- USB-C Connector  
+- Up to three rotary encoders  
+- No leds  
+
+## Build
+Make example for this keyboard (after setting up your build environment):
+
+    make evyd13/eon40: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).
\ No newline at end of file
diff --git a/qmk/keyboards/evyd13/eon40/rules.mk b/qmk/keyboards/evyd13/eon40/rules.mk
new file mode 100644
index 00000000..a1a2f76d
--- /dev/null
+++ b/qmk/keyboards/evyd13/eon40/rules.mk
@@ -0,0 +1,36 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+#   Teensy       halfkay
+#   Pro Micro    caterina
+#   Atmel DFU    atmel-dfu
+#   LUFA DFU     lufa-dfu
+#   QMK DFU      qmk-dfu
+#   ATmega32A    bootloadHID
+#   ATmega328P   USBasp
+BOOTLOADER = qmk-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = yes        # Console for debug
+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
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+MIDI_ENABLE = no            # MIDI support
+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
+ENCODER_ENABLE = yes
+
+LAYOUTS = ortho_4x12 planck_mit
+LAYOUTS_HAS_RGB = no
diff --git a/qmk/keyboards/evyd13/eon65/config.h b/qmk/keyboards/evyd13/eon65/config.h
new file mode 100644
index 00000000..875ccb26
--- /dev/null
+++ b/qmk/keyboards/evyd13/eon65/config.h
@@ -0,0 +1,220 @@
+/* Copyright 2019 Evy Dekkers
+ *
+ * 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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x4705
+#define PRODUCT_ID      0xAEB4
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Evyd13
+#define PRODUCT         Eon65
+#define DESCRIPTION     A 65% PCB
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 16
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+*/
+#define MATRIX_ROW_PINS {D3,D5,B1,B2,B3}
+#define MATRIX_COL_PINS {B0,D2,D4,D6,D7,B4,B5,B6,C6,C7,F7,F6,F5,F4,F1,F0}
+#define UNUSED_PINS {B7,D0,D1}
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+// #define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6
+
+// #define BACKLIGHT_PIN B7
+// #define BACKLIGHT_BREATHING
+// #define BACKLIGHT_LEVELS 3
+
+ #define RGB_DI_PIN E6
+ #ifdef RGB_DI_PIN
+   #define RGBLED_NUM 10
+//   #define RGBLIGHT_HUE_STEP 8
+//   #define RGBLIGHT_SAT_STEP 8
+//   #define RGBLIGHT_VAL_STEP 8
+//   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+//   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+// /*== all animations enable ==*/
+   #define RGBLIGHT_ANIMATIONS
+// /*== or choose animations ==*/
+//   #define RGBLIGHT_EFFECT_BREATHING
+//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
+//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+//   #define RGBLIGHT_EFFECT_SNAKE
+//   #define RGBLIGHT_EFFECT_KNIGHT
+//   #define RGBLIGHT_EFFECT_CHRISTMAS
+//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
+//   #define RGBLIGHT_EFFECT_RGB_TEST
+//   #define RGBLIGHT_EFFECT_ALTERNATING
+// /*== customize breathing effect ==*/
+//   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+//   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+//   /*==== use exp() and sin() ====*/
+//   #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//   #define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+ #endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is userful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+// #define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Magic Key Options
+ *
+ * Magic keys are hotkey commands that allow control over firmware functions of
+ * the keyboard. They are best used in combination with the HID Listen program,
+ * found here: https://www.pjrc.com/teensy/hid_listen.html
+ *
+ * The options below allow the magic key functionality to be changed. This is
+ * useful if your keyboard/keypad is missing keys and you want magic key support.
+ *
+ */
+
+/* key combination for magic key command */
+/* defined by default; to change, uncomment and set to the combination you want */
+// #define IS_COMMAND() (get_mods() == MOD_MASK_SHIFT)
+
+/* control how magic key switches layers */
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS  true
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS  true
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false
+
+/* override magic key keymap */
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM
+//#define MAGIC_KEY_HELP           H
+//#define MAGIC_KEY_HELP_ALT       SLASH
+//#define MAGIC_KEY_DEBUG          D
+//#define MAGIC_KEY_DEBUG_MATRIX   X
+//#define MAGIC_KEY_DEBUG_KBD      K
+//#define MAGIC_KEY_DEBUG_MOUSE    M
+//#define MAGIC_KEY_VERSION        V
+//#define MAGIC_KEY_STATUS         S
+//#define MAGIC_KEY_CONSOLE        C
+//#define MAGIC_KEY_LAYER0         0
+//#define MAGIC_KEY_LAYER0_ALT     GRAVE
+//#define MAGIC_KEY_LAYER1         1
+//#define MAGIC_KEY_LAYER2         2
+//#define MAGIC_KEY_LAYER3         3
+//#define MAGIC_KEY_LAYER4         4
+//#define MAGIC_KEY_LAYER5         5
+//#define MAGIC_KEY_LAYER6         6
+//#define MAGIC_KEY_LAYER7         7
+//#define MAGIC_KEY_LAYER8         8
+//#define MAGIC_KEY_LAYER9         9
+//#define MAGIC_KEY_BOOTLOADER     B
+//#define MAGIC_KEY_BOOTLOADER_ALT ESC
+//#define MAGIC_KEY_LOCK           CAPS
+//#define MAGIC_KEY_EEPROM         E
+//#define MAGIC_KEY_EEPROM_CLEAR   BSPACE
+//#define MAGIC_KEY_NKRO           N
+//#define MAGIC_KEY_SLEEP_LED      Z
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+//#define NO_ACTION_MACRO
+//#define NO_ACTION_FUNCTION
+
+/*
+ * MIDI options
+ */
+
+/* Prevent use of disabled MIDI features in the keymap */
+//#define MIDI_ENABLE_STRICT 1
+
+/* enable basic MIDI features:
+   - MIDI notes can be sent when in Music mode is on
+*/
+//#define MIDI_BASIC
+
+/* enable advanced MIDI features:
+   - MIDI notes can be added to the keymap
+   - Octave shift and transpose
+   - Virtual sustain, portamento, and modulation wheel
+   - etc.
+*/
+//#define MIDI_ADVANCED
+
+/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
+//#define MIDI_TONE_KEYCODE_OCTAVES 1
+
+/* Bootmagic Lite key configuration */
+// #define BOOTMAGIC_LITE_ROW 0
+// #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/evyd13/eon65/eon65.c b/qmk/keyboards/evyd13/eon65/eon65.c
new file mode 100644
index 00000000..cdbe987e
--- /dev/null
+++ b/qmk/keyboards/evyd13/eon65/eon65.c
@@ -0,0 +1,16 @@
+/* Copyright 2019 Evy Dekkers
+ *
+ * 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 "eon65.h"
diff --git a/qmk/keyboards/evyd13/eon65/eon65.h b/qmk/keyboards/evyd13/eon65/eon65.h
new file mode 100644
index 00000000..21cfd066
--- /dev/null
+++ b/qmk/keyboards/evyd13/eon65/eon65.h
@@ -0,0 +1,103 @@
+/* Copyright 2019 Evy Dekkers
+ *
+ * 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 XXX KC_NO
+
+/* This a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+
+#define LAYOUT_all( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0f, k0d, k0e, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e,      \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e,      \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e,      \
+    k40, k41, k42,                k46,           k49, k4a, k4b, k4c, k4d, k4e       \
+) \
+{ \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, XXX }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, XXX }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, XXX }, \
+    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, k49, k4a, k4b, k4c, k4d, k4e, XXX }  \
+}
+
+#define LAYOUT_65_ansi( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,      k2d, k2e, \
+    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
+    k40, k41, k42,                k46,           k49, k4a, k4b, k4c, k4d, k4e  \
+) \
+{ \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, XXX }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, XXX }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, k2e, XXX }, \
+    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, XXX }, \
+    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, k49, k4a, k4b, k4c, k4d, k4e, XXX }  \
+}
+
+#define LAYOUT_65_ansi_blocker( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,      k2d, k2e, \
+    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
+    k40, k41, k42,                k46,                k49, k4a, k4c, k4d, k4e  \
+) \
+{ \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, XXX }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, XXX }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, k2e, XXX }, \
+    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, XXX }, \
+    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, k49, k4a, XXX, k4c, k4d, k4e, XXX }  \
+}
+
+#define LAYOUT_65_iso( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,      k1e, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
+    k40, k41, k42,                k46,           k49, k4a, k4b, k4c, k4d, k4e  \
+) \
+{ \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, XXX }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, k1e, XXX }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, XXX }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, XXX }, \
+    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, k49, k4a, k4b, k4c, k4d, k4e, XXX }  \
+}
+
+#define LAYOUT_65_iso_blocker( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,      k1e, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
+    k40, k41, k42,                k46,                k49, k4a, k4c, k4d, k4e  \
+) \
+{ \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, XXX }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, k1e, XXX }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, XXX }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, XXX }, \
+    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, k49, k4a, XXX, k4c, k4d, k4e, XXX }  \
+}
diff --git a/qmk/keyboards/evyd13/eon65/info.json b/qmk/keyboards/evyd13/eon65/info.json
new file mode 100644
index 00000000..1a9f7495
--- /dev/null
+++ b/qmk/keyboards/evyd13/eon65/info.json
@@ -0,0 +1,392 @@
+{
+    "keyboard_name": "Eon65", 
+    "url": "", 
+    "maintainer": "qmk", 
+    "width": 16, 
+    "height": 5, 
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
+                {"x":15, "y":0},
+                
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1, "w":1.5},
+                {"x":15, "y":1},
+                
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2},
+                {"x":13.75, "y":2, "w":1.25},
+                {"x":15, "y":2},
+                
+                {"x":0, "y":3, "w":1.25},
+                {"x":1.25, "y":3},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":1.75},
+                {"x":14, "y":3},
+                {"x":15, "y":3},
+                
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":6.25},
+                {"x":10, "y":4},
+                {"x":11, "y":4},
+                {"x":12, "y":4},
+                {"x":13, "y":4},
+                {"x":14, "y":4},
+                {"x":15, "y":4}
+            ]
+        },
+        "LAYOUT_65_ansi": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0, "w":2},
+                {"x":15, "y":0},
+                
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1, "w":1.5},
+                {"x":15, "y":1},
+                
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2, "w":2.25},
+                {"x":15, "y":2},
+                
+                {"x":0, "y":3, "w":2.25},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":1.75},
+                {"x":14, "y":3},
+                {"x":15, "y":3},
+                
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":6.25},
+                {"x":10, "y":4},
+                {"x":11, "y":4},
+                {"x":12, "y":4},
+                {"x":13, "y":4},
+                {"x":14, "y":4},
+                {"x":15, "y":4}
+            ]
+        },
+        "LAYOUT_65_ansi_blocker": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0, "w":2},
+                {"x":15, "y":0},
+                
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1, "w":1.5},
+                {"x":15, "y":1},
+                
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2, "w":2.25},
+                {"x":15, "y":2},
+                
+                {"x":0, "y":3, "w":2.25},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":1.75},
+                {"x":14, "y":3},
+                {"x":15, "y":3},
+                
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":6.25},
+                {"x":10, "y":4, "w":1.25},
+                {"x":11.25, "y":4, "w":1.25},
+                {"x":13, "y":4},
+                {"x":14, "y":4},
+                {"x":15, "y":4}
+            ]
+        },
+        "LAYOUT_65_iso": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0, "w":2},
+                {"x":15, "y":0},
+                
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":15, "y":1},
+                
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2},
+                {"x":13.75, "y":1, "w":1.25, "h":2},
+                {"x":15, "y":2},
+                
+                {"x":0, "y":3, "w":1.25},
+                {"x":1.25, "y":3},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":1.75},
+                {"x":14, "y":3},
+                {"x":15, "y":3},
+                
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":6.25},
+                {"x":10, "y":4},
+                {"x":11, "y":4},
+                {"x":12, "y":4},
+                {"x":13, "y":4},
+                {"x":14, "y":4},
+                {"x":15, "y":4}
+            ]
+        },
+        "LAYOUT_65_iso_blocker": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0, "w":2},
+                {"x":15, "y":0},
+                
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":15, "y":1},
+                
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2},
+                {"x":13.75, "y":1, "w":1.25, "h":2},
+                {"x":15, "y":2},
+                
+                {"x":0, "y":3, "w":1.25},
+                {"x":1.25, "y":3},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":1.75},
+                {"x":14, "y":3},
+                {"x":15, "y":3},
+                
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":6.25},
+                {"x":10, "y":4, "w":1.25},
+                {"x":11.25, "y":4, "w":1.25},
+                {"x":13, "y":4},
+                {"x":14, "y":4},
+                {"x":15, "y":4}
+            ]
+        }
+    }
+}
diff --git a/qmk/keyboards/evyd13/eon65/keymaps/default/keymap.c b/qmk/keyboards/evyd13/eon65/keymaps/default/keymap.c
new file mode 100644
index 00000000..d7fc26de
--- /dev/null
+++ b/qmk/keyboards/evyd13/eon65/keymaps/default/keymap.c
@@ -0,0 +1,32 @@
+/* Copyright 2019 Evy Dekkers
+ *
+ * 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_all(
+    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_BSPC, KC_INS,
+    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_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_PGUP,
+    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_UP,   KC_PGDN,
+    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+[1] = LAYOUT_all(
+    RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______, _______),
+
+};
\ No newline at end of file
diff --git a/qmk/keyboards/evyd13/eon65/keymaps/mrsendyyk/keymap.c b/qmk/keyboards/evyd13/eon65/keymaps/mrsendyyk/keymap.c
new file mode 100644
index 00000000..f9c7178f
--- /dev/null
+++ b/qmk/keyboards/evyd13/eon65/keymaps/mrsendyyk/keymap.c
@@ -0,0 +1,46 @@
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  /*
+   * Default Layer [0]
+   * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+   * │Esc│1  │2  │3  │4  │5  │6  │7  │8  │9  │0  │-  │=  │Bspc   │Del│
+   * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+   * │Tab  │Q  │W  │E  │R  │T  │Y  │U  │I  │O  │P  │[  │]  │\    │P U│
+   * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+   * │Caps L│A  │S  │D  │F  │G  │H  │J  │K  │L  │;  │'  │Return  │P D│
+   * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+   * │Shift   │Z  │X  │C  │V  │B  │N  │M  │,  │.  │/  │Shift │↑  │Fn │
+   * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬┬┬───┼───┼───┤
+   * │Ctrl│Opt │Cmd │          Space         │Cmd │Opt │█│←  │↓  │→  │
+   * └────┴────┴────┴────────────────────────┴────┴────┴┴┴───┴───┴───┘
+   */
+     [0] = LAYOUT_65_ansi_blocker(KC_GESC, 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_DEL,
+	                              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_PGUP,
+							      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_PGDN,
+							      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, MO(1),
+							      KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, KC_RALT, KC_LEFT, KC_DOWN, KC_RGHT
+     ),
+
+  /*
+   * Fn Layer [1]
+   * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+   * │`  │F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│       │   │
+   * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+   * │Bri+ │   │   │End│Rst│   │   │   │Ins│   │P S│   │   │Eject│   │
+   * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+   * │Bri-  │   │S L│   │   │   │Hm │   │   │   │   │   │Mute    │   │
+   * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+   * │Vol+    │   │   │Cal│   │   │N L│Ml │   │   │   │Pause │   │   │
+   * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬┬┬───┼───┼───┤
+   * │Vol-│Rwd │F FD│           Play         │Stp │    │█│Prv│   │Nxt│
+   * └────┴────┴────┴────────────────────────┴────┴────┴┴┴───┴───┴───┘
+   */ 
+     [1] = LAYOUT_65_ansi_blocker(KC_GRV, 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_TRNS, KC_TRNS,
+                                  KC_BRIU, KC_TRNS, KC_TRNS, KC_END, RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_TRNS, KC_PSCR, KC_TRNS, KC_TRNS, KC_EJCT, KC_TRNS,
+							      KC_BRID, KC_TRNS, KC_SLCK, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MUTE, KC_TRNS,
+							      KC_VOLU, KC_TRNS, KC_TRNS, KC_CALC, KC_TRNS, KC_TRNS, KC_NLCK, KC_MAIL, KC_TRNS, KC_TRNS, KC_TRNS, KC_PAUS, KC_TRNS, KC_TRNS,
+							      KC_VOLD, KC_MRWD, KC_MFFD, KC_MPLY, KC_MSTP, KC_NO, KC_MPRV, KC_NO, KC_MNXT
+     )
+};
diff --git a/qmk/keyboards/evyd13/eon65/keymaps/mrsendyyk/readme.md b/qmk/keyboards/evyd13/eon65/keymaps/mrsendyyk/readme.md
new file mode 100644
index 00000000..33357703
--- /dev/null
+++ b/qmk/keyboards/evyd13/eon65/keymaps/mrsendyyk/readme.md
@@ -0,0 +1,38 @@
+# [Sendy YK](https://mr.sendyyk.com)'s Keymap
+`LAYOUT_65_ansi_blocker`
+
+### Default Layer [0]
+```
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+│Esc│1  │2  │3  │4  │5  │6  │7  │8  │9  │0  │-  │=  │Bspc   │Del│
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+│Tab  │Q  │W  │E  │R  │T  │Y  │U  │I  │O  │P  │[  │]  │\    │P U│
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+│Caps L│A  │S  │D  │F  │G  │H  │J  │K  │L  │;  │'  │Return  │P D│
+├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+│Shift   │Z  │X  │C  │V  │B  │N  │M  │,  │.  │/  │Shift │↑  │Fn │
+├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬┬┬───┼───┼───┤
+│Ctrl│Opt │Cmd │          Space         │Cmd │Opt │█│←  │↓  │→  │
+└────┴────┴────┴────────────────────────┴────┴────┴┴┴───┴───┴───┘
+```
+
+### Fn Layer [1]
+```
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+│`  │F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│       │   │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+│Bri+ │   │   │End│Rst│   │   │   │Ins│   │P S│   │   │Eject│   │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+│Bri-  │   │S L│   │   │   │Hm │   │   │   │   │   │Mute    │   │
+├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+│Vol+    │   │   │Cal│   │   │N L│Ml │   │   │   │Pause │   │   │
+├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬┬┬───┼───┼───┤
+│Vol-│Rwd │F FD│           Play         │Stp │    │█│Prv│   │Nxt│
+└────┴────┴────┴────────────────────────┴────┴────┴┴┴───┴───┴───┘
+```
+
+## Build The Firmware
+You will need to build the firmware. To do so go to your terminal window and run the compile command:
+
+    qmk compile -kb evyd13/eon65 -km mrsendyyk
+See [The Complete Newbs Guide To QMK](https://docs.qmk.fm/#/newbs).
diff --git a/qmk/keyboards/evyd13/eon65/keymaps/via/keymap.c b/qmk/keyboards/evyd13/eon65/keymaps/via/keymap.c
new file mode 100644
index 00000000..d341f104
--- /dev/null
+++ b/qmk/keyboards/evyd13/eon65/keymaps/via/keymap.c
@@ -0,0 +1,43 @@
+/* Copyright 2019 Evy Dekkers
+ *
+ * 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_all(
+    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_BSPC, KC_INS,
+    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_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_PGUP,
+    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_UP,   KC_PGDN,
+    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+[1] = LAYOUT_all(
+    RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______, _______),
+[2] = LAYOUT_all(
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______, _______),
+[3] = LAYOUT_all(
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______, _______)
+};
\ No newline at end of file
diff --git a/qmk/keyboards/evyd13/eon65/keymaps/via/rules.mk b/qmk/keyboards/evyd13/eon65/keymaps/via/rules.mk
new file mode 100644
index 00000000..36b7ba9c
--- /dev/null
+++ b/qmk/keyboards/evyd13/eon65/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/qmk/keyboards/evyd13/eon65/readme.md b/qmk/keyboards/evyd13/eon65/readme.md
new file mode 100644
index 00000000..e7487e4c
--- /dev/null
+++ b/qmk/keyboards/evyd13/eon65/readme.md
@@ -0,0 +1,13 @@
+# Eon65
+
+## Support
+* Keyboard Maintainer: [Evyd13](https://github.com/evyd13)
+* Hardware Supported: Eon65
+* Hardware Availability: None
+
+## Build
+Make example for this keyboard (after setting up your build environment):
+
+    make evyd13/eon65: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).
\ No newline at end of file
diff --git a/qmk/keyboards/evyd13/eon65/rules.mk b/qmk/keyboards/evyd13/eon65/rules.mk
new file mode 100644
index 00000000..e34ef747
--- /dev/null
+++ b/qmk/keyboards/evyd13/eon65/rules.mk
@@ -0,0 +1,34 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+#   Teensy       halfkay
+#   Pro Micro    caterina
+#   Atmel DFU    atmel-dfu
+#   LUFA DFU     lufa-dfu
+#   QMK DFU      qmk-dfu
+#   ATmega32A    bootloadHID
+#   ATmega328P   USBasp
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = yes        # Console for debug
+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
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+MIDI_ENABLE = no            # MIDI support
+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
+
+LAYOUTS = 65_ansi 65_ansi_blocker 65_iso 65_iso_blocker
diff --git a/qmk/keyboards/evyd13/eon75/config.h b/qmk/keyboards/evyd13/eon75/config.h
new file mode 100644
index 00000000..504ed118
--- /dev/null
+++ b/qmk/keyboards/evyd13/eon75/config.h
@@ -0,0 +1,221 @@
+/* Copyright 2019 Evy Dekkers
+ *
+ * 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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x4705
+#define PRODUCT_ID      0x5C62
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Evyd13
+#define PRODUCT         Eon75
+#define DESCRIPTION     A 75% PCB
+
+/* key matrix size */
+#define MATRIX_ROWS 12
+#define MATRIX_COLS 8
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+*/
+#define MATRIX_ROW_PINS {D1,D0,D3,D2,D6,D4,D7,B4,B5,B6,C6,C7}
+#define MATRIX_COL_PINS {E6,F0,F1,F4,F5,F6,F7,B3}
+#define UNUSED_PINS {B2,B1}
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+// #define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6
+
+// #define BACKLIGHT_PIN B7
+// #define BACKLIGHT_BREATHING
+// #define BACKLIGHT_LEVELS 3
+
+// #define RGB_DI_PIN D0
+// #ifdef RGB_DI_PIN
+//   #define RGBLED_NUM 12
+//   #define RGBLIGHT_HUE_STEP 8
+//   #define RGBLIGHT_SAT_STEP 8
+//   #define RGBLIGHT_VAL_STEP 8
+//   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+//   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+// /*== all animations enable ==*/
+//   #define RGBLIGHT_ANIMATIONS
+// /*== or choose animations ==*/
+//   #define RGBLIGHT_EFFECT_BREATHING
+//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
+//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+//   #define RGBLIGHT_EFFECT_SNAKE
+//   #define RGBLIGHT_EFFECT_KNIGHT
+//   #define RGBLIGHT_EFFECT_CHRISTMAS
+//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
+//   #define RGBLIGHT_EFFECT_RGB_TEST
+//   #define RGBLIGHT_EFFECT_ALTERNATING
+// /*== customize breathing effect ==*/
+//   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+//   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+//   /*==== use exp() and sin() ====*/
+//   #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//   #define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+// #endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is userful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+// #define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Magic Key Options
+ *
+ * Magic keys are hotkey commands that allow control over firmware functions of
+ * the keyboard. They are best used in combination with the HID Listen program,
+ * found here: https://www.pjrc.com/teensy/hid_listen.html
+ *
+ * The options below allow the magic key functionality to be changed. This is
+ * useful if your keyboard/keypad is missing keys and you want magic key support.
+ *
+ */
+
+/* key combination for magic key command */
+/* defined by default; to change, uncomment and set to the combination you want */
+// #define IS_COMMAND() (get_mods() == MOD_MASK_SHIFT)
+
+/* control how magic key switches layers */
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS  true
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS  true
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false
+
+/* override magic key keymap */
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM
+//#define MAGIC_KEY_HELP           H
+//#define MAGIC_KEY_HELP_ALT       SLASH
+//#define MAGIC_KEY_DEBUG          D
+//#define MAGIC_KEY_DEBUG_MATRIX   X
+//#define MAGIC_KEY_DEBUG_KBD      K
+//#define MAGIC_KEY_DEBUG_MOUSE    M
+//#define MAGIC_KEY_VERSION        V
+//#define MAGIC_KEY_STATUS         S
+//#define MAGIC_KEY_CONSOLE        C
+//#define MAGIC_KEY_LAYER0         0
+//#define MAGIC_KEY_LAYER0_ALT     GRAVE
+//#define MAGIC_KEY_LAYER1         1
+//#define MAGIC_KEY_LAYER2         2
+//#define MAGIC_KEY_LAYER3         3
+//#define MAGIC_KEY_LAYER4         4
+//#define MAGIC_KEY_LAYER5         5
+//#define MAGIC_KEY_LAYER6         6
+//#define MAGIC_KEY_LAYER7         7
+//#define MAGIC_KEY_LAYER8         8
+//#define MAGIC_KEY_LAYER9         9
+//#define MAGIC_KEY_BOOTLOADER     B
+//#define MAGIC_KEY_BOOTLOADER_ALT ESC
+//#define MAGIC_KEY_LOCK           CAPS
+//#define MAGIC_KEY_EEPROM         E
+//#define MAGIC_KEY_EEPROM_CLEAR   BSPACE
+//#define MAGIC_KEY_NKRO           N
+//#define MAGIC_KEY_SLEEP_LED      Z
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+//#define NO_ACTION_MACRO
+//#define NO_ACTION_FUNCTION
+
+/*
+ * MIDI options
+ */
+
+/* Prevent use of disabled MIDI features in the keymap */
+//#define MIDI_ENABLE_STRICT 1
+
+/* enable basic MIDI features:
+   - MIDI notes can be sent when in Music mode is on
+*/
+//#define MIDI_BASIC
+
+/* enable advanced MIDI features:
+   - MIDI notes can be added to the keymap
+   - Octave shift and transpose
+   - Virtual sustain, portamento, and modulation wheel
+   - etc.
+*/
+//#define MIDI_ADVANCED
+
+/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
+//#define MIDI_TONE_KEYCODE_OCTAVES 1
+
+/* Bootmagic Lite key configuration */
+// #define BOOTMAGIC_LITE_ROW 0
+// #define BOOTMAGIC_LITE_COLUMN 0
+
diff --git a/qmk/keyboards/evyd13/eon75/eon75.c b/qmk/keyboards/evyd13/eon75/eon75.c
new file mode 100644
index 00000000..67e9fe66
--- /dev/null
+++ b/qmk/keyboards/evyd13/eon75/eon75.c
@@ -0,0 +1,45 @@
+/* Copyright 2019 Evy Dekkers
+ *
+ * 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 "eon75.h"
+
+void matrix_init_kb(void) {
+    // put your keyboard start-up code here
+    // runs once when the firmware starts up
+    matrix_init_user();
+    led_init_ports();
+};
+
+void led_init_ports(void) {
+    // * Set our LED pins as output and high
+    setPinOutput(D5);
+    writePinHigh(D5);
+    
+    setPinOutput(B7);
+    writePinHigh(B7);
+    
+    setPinOutput(B0);
+    writePinHigh(B0);
+}
+
+bool led_update_kb(led_t led_state) {
+    if(led_update_user(led_state)) {
+        writePin(D5, !led_state.caps_lock);
+        writePin(B7, !led_state.num_lock);
+        writePin(B0, !led_state.scroll_lock);
+    }
+
+    return true;
+}
diff --git a/qmk/keyboards/evyd13/eon75/eon75.h b/qmk/keyboards/evyd13/eon75/eon75.h
new file mode 100644
index 00000000..ee4a91f7
--- /dev/null
+++ b/qmk/keyboards/evyd13/eon75/eon75.h
@@ -0,0 +1,97 @@
+/* Copyright 2019 Evy Dekkers
+ *
+ * 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 XXX KC_NO
+
+/* This a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+
+#define LAYOUT_all( \
+    k00,      k10, k01, k11, k02, k03, k13, k04, k14, k05, k15, k06, k16, k07,     k17, \
+    k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k27,     k37, \
+    k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k47,          k57, \
+    k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k66, k76,          k77, \
+    k80, k90, k81, k91, k82, k92, k83, k93, k84, k94, k85, k95, k86,        k87,   k97, \
+    ka0, kb0, ka1,                     kb3,           ka5, kb5, ka6,   kb6, ka7, kb7 \
+) \
+{ \
+    { k00, k01, k02, k03, k04, k05, k06, k07 }, \
+    { k10, k11, XXX, k13, k14, k15, k16, k17 }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27 }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37 }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47 }, \
+    { k50, k51, k52, k53, k54, k55, XXX, k57 }, \
+    { k60, k61, k62, k63, k64, k65, k66, XXX }, \
+    { k70, k71, k72, k73, k74, k75, k76, k77 }, \
+    { k80, k81, k82, k83, k84, k85, k86, k87 }, \
+    { k90, k91, k92, k93, k94, k95, XXX, k97 }, \
+    { ka0, ka1, XXX, XXX, XXX, ka5, ka6, ka7 }, \
+    { kb0, XXX, XXX, kb3, XXX, kb5, kb6, kb7 }  \
+}
+
+#define LAYOUT_ansi( \
+    k00,      k10, k01, k11, k02, k03, k13, k04, k14, k05, k15, k06, k16, k07,     k17, \
+    k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26,      k27,     k37, \
+    k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k47,          k57, \
+    k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75,      k76,          k77, \
+    k80,      k81, k91, k82, k92, k83, k93, k84, k94, k85, k95, k86,        k87,   k97, \
+    ka0, kb0, ka1,                     kb3,           ka5, kb5, ka6,   kb6, ka7, kb7 \
+) \
+{ \
+    { k00, k01, k02, k03, k04, k05, k06, k07 }, \
+    { k10, k11, XXX, k13, k14, k15, k16, k17 }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27 }, \
+    { k30, k31, k32, k33, k34, k35, XXX, k37 }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47 }, \
+    { k50, k51, k52, k53, k54, k55, XXX, k57 }, \
+    { k60, k61, k62, k63, k64, k65, XXX, XXX }, \
+    { k70, k71, k72, k73, k74, k75, k76, k77 }, \
+    { k80, k81, k82, k83, k84, k85, k86, k87 }, \
+    { XXX, k91, k92, k93, k94, k95, XXX, k97 }, \
+    { ka0, ka1, XXX, XXX, XXX, ka5, ka6, ka7 }, \
+    { kb0, XXX, XXX, kb3, XXX, kb5, kb6, kb7 }  \
+}
+
+#define LAYOUT_iso( \
+    k00,      k10, k01, k11, k02, k03, k13, k04, k14, k05, k15, k06, k16, k07,     k17, \
+    k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26,      k27,     k37, \
+    k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46,               k57, \
+    k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k66, k76,          k77, \
+    k80, k90, k81, k91, k82, k92, k83, k93, k84, k94, k85, k95, k86,        k87,   k97, \
+    ka0, kb0, ka1,                     kb3,           ka5, kb5, ka6,   kb6, ka7, kb7 \
+) \
+{ \
+    { k00, k01, k02, k03, k04, k05, k06, k07 }, \
+    { k10, k11, XXX, k13, k14, k15, k16, k17 }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27 }, \
+    { k30, k31, k32, k33, k34, k35, XXX, k37 }, \
+    { k40, k41, k42, k43, k44, k45, k46, XXX }, \
+    { k50, k51, k52, k53, k54, k55, XXX, k57 }, \
+    { k60, k61, k62, k63, k64, k65, k66, XXX }, \
+    { k70, k71, k72, k73, k74, k75, k76, k77 }, \
+    { k80, k81, k82, k83, k84, k85, k86, k87 }, \
+    { k90, k91, k92, k93, k94, k95, XXX, k97 }, \
+    { ka0, ka1, XXX, XXX, XXX, ka5, ka6, ka7 }, \
+    { kb0, XXX, XXX, kb3, XXX, kb5, kb6, kb7 }  \
+}
diff --git a/qmk/keyboards/evyd13/eon75/info.json b/qmk/keyboards/evyd13/eon75/info.json
new file mode 100644
index 00000000..9066542a
--- /dev/null
+++ b/qmk/keyboards/evyd13/eon75/info.json
@@ -0,0 +1,289 @@
+{
+    "keyboard_name": "Eon75", 
+    "url": "", 
+    "maintainer": "qmk", 
+    "width": 16.5, 
+    "height": 6.5, 
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1.5, "y":0},
+                {"x":2.5, "y":0},
+                {"x":3.5, "y":0},
+                {"x":4.5, "y":0},
+                {"x":5.75, "y":0},
+                {"x":6.75, "y":0},
+                {"x":7.75, "y":0},
+                {"x":8.75, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14.5, "y":0},
+                {"x":15.5, "y":0},
+                
+                {"x":0, "y":1.25},
+                {"x":1, "y":1.25},
+                {"x":2, "y":1.25},
+                {"x":3, "y":1.25},
+                {"x":4, "y":1.25},
+                {"x":5, "y":1.25},
+                {"x":6, "y":1.25},
+                {"x":7, "y":1.25},
+                {"x":8, "y":1.25},
+                {"x":9, "y":1.25},
+                {"x":10, "y":1.25},
+                {"x":11, "y":1.25},
+                {"x":12, "y":1.25},
+                {"x":13, "y":1.25},
+                {"x":14, "y":1.25},
+                {"x":15.5, "y":1.25},
+                
+                {"x":0, "y":2.25, "w":1.5},
+                {"x":1.5, "y":2.25},
+                {"x":2.5, "y":2.25},
+                {"x":3.5, "y":2.25},
+                {"x":4.5, "y":2.25},
+                {"x":5.5, "y":2.25},
+                {"x":6.5, "y":2.25},
+                {"x":7.5, "y":2.25},
+                {"x":8.5, "y":2.25},
+                {"x":9.5, "y":2.25},
+                {"x":10.5, "y":2.25},
+                {"x":11.5, "y":2.25},
+                {"x":12.5, "y":2.25},
+                {"x":13.5, "y":2.25, "w":1.5},
+                {"x":15.5, "y":2.25},
+                
+                {"x":0, "y":3.25, "w":1.75},
+                {"x":1.75, "y":3.25},
+                {"x":2.75, "y":3.25},
+                {"x":3.75, "y":3.25},
+                {"x":4.75, "y":3.25},
+                {"x":5.75, "y":3.25},
+                {"x":6.75, "y":3.25},
+                {"x":7.75, "y":3.25},
+                {"x":8.75, "y":3.25},
+                {"x":9.75, "y":3.25},
+                {"x":10.75, "y":3.25},
+                {"x":11.75, "y":3.25},
+                {"x":12.75, "y":3.25},
+                {"x":13.75, "y":3.25, "w":1.25},
+                {"x":15.5, "y":3.25},
+                
+                {"x":0, "y":4.25, "w":1.25},
+                {"x":1.25, "y":4.25},
+                {"x":2.25, "y":4.25},
+                {"x":3.25, "y":4.25},
+                {"x":4.25, "y":4.25},
+                {"x":5.25, "y":4.25},
+                {"x":6.25, "y":4.25},
+                {"x":7.25, "y":4.25},
+                {"x":8.25, "y":4.25},
+                {"x":9.25, "y":4.25},
+                {"x":10.25, "y":4.25},
+                {"x":11.25, "y":4.25},
+                {"x":12.25, "y":4.25, "w":1.75},
+                {"x":14.25, "y":4.5},
+                {"x":15.5, "y":4.25},
+                
+                {"x":0, "y":5.25, "w":1.25},
+                {"x":1.25, "y":5.25, "w":1.25},
+                {"x":2.5, "y":5.25, "w":1.25},
+                {"x":3.75, "y":5.25, "w":6.25},
+                {"x":10, "y":5.25},
+                {"x":11, "y":5.25},
+                {"x":12, "y":5.25},
+                {"x":13.25, "y":5.5},
+                {"x":14.25, "y":5.5},
+                {"x":15.25, "y":5.5}
+            ]
+        },
+        "LAYOUT_ansi": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1.5, "y":0},
+                {"x":2.5, "y":0},
+                {"x":3.5, "y":0},
+                {"x":4.5, "y":0},
+                {"x":5.75, "y":0},
+                {"x":6.75, "y":0},
+                {"x":7.75, "y":0},
+                {"x":8.75, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14.5, "y":0},
+                {"x":15.5, "y":0},
+                
+                {"x":0, "y":1.25},
+                {"x":1, "y":1.25},
+                {"x":2, "y":1.25},
+                {"x":3, "y":1.25},
+                {"x":4, "y":1.25},
+                {"x":5, "y":1.25},
+                {"x":6, "y":1.25},
+                {"x":7, "y":1.25},
+                {"x":8, "y":1.25},
+                {"x":9, "y":1.25},
+                {"x":10, "y":1.25},
+                {"x":11, "y":1.25},
+                {"x":12, "y":1.25},
+                {"x":13, "y":1.25, "w":2},
+                {"x":15.5, "y":1.25},
+                
+                {"x":0, "y":2.25, "w":1.5},
+                {"x":1.5, "y":2.25},
+                {"x":2.5, "y":2.25},
+                {"x":3.5, "y":2.25},
+                {"x":4.5, "y":2.25},
+                {"x":5.5, "y":2.25},
+                {"x":6.5, "y":2.25},
+                {"x":7.5, "y":2.25},
+                {"x":8.5, "y":2.25},
+                {"x":9.5, "y":2.25},
+                {"x":10.5, "y":2.25},
+                {"x":11.5, "y":2.25},
+                {"x":12.5, "y":2.25},
+                {"x":13.5, "y":2.25, "w":1.5},
+                {"x":15.5, "y":2.25},
+                
+                {"x":0, "y":3.25, "w":1.75},
+                {"x":1.75, "y":3.25},
+                {"x":2.75, "y":3.25},
+                {"x":3.75, "y":3.25},
+                {"x":4.75, "y":3.25},
+                {"x":5.75, "y":3.25},
+                {"x":6.75, "y":3.25},
+                {"x":7.75, "y":3.25},
+                {"x":8.75, "y":3.25},
+                {"x":9.75, "y":3.25},
+                {"x":10.75, "y":3.25},
+                {"x":11.75, "y":3.25},
+                {"x":12.75, "y":3.25, "w":2.25},
+                {"x":15.5, "y":3.25},
+                
+                {"x":0, "y":4.25, "w":2.25},
+                {"x":2.25, "y":4.25},
+                {"x":3.25, "y":4.25},
+                {"x":4.25, "y":4.25},
+                {"x":5.25, "y":4.25},
+                {"x":6.25, "y":4.25},
+                {"x":7.25, "y":4.25},
+                {"x":8.25, "y":4.25},
+                {"x":9.25, "y":4.25},
+                {"x":10.25, "y":4.25},
+                {"x":11.25, "y":4.25},
+                {"x":12.25, "y":4.25, "w":1.75},
+                {"x":14.25, "y":4.5},
+                {"x":15.5, "y":4.25},
+                
+                {"x":0, "y":5.25, "w":1.25},
+                {"x":1.25, "y":5.25, "w":1.25},
+                {"x":2.5, "y":5.25, "w":1.25},
+                {"x":3.75, "y":5.25, "w":6.25},
+                {"x":10, "y":5.25},
+                {"x":11, "y":5.25},
+                {"x":12, "y":5.25},
+                {"x":13.25, "y":5.5},
+                {"x":14.25, "y":5.5},
+                {"x":15.25, "y":5.5}
+            ]
+        },
+        "LAYOUT_iso": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1.5, "y":0},
+                {"x":2.5, "y":0},
+                {"x":3.5, "y":0},
+                {"x":4.5, "y":0},
+                {"x":5.75, "y":0},
+                {"x":6.75, "y":0},
+                {"x":7.75, "y":0},
+                {"x":8.75, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14.5, "y":0},
+                {"x":15.5, "y":0},
+                
+                {"x":0, "y":1.25},
+                {"x":1, "y":1.25},
+                {"x":2, "y":1.25},
+                {"x":3, "y":1.25},
+                {"x":4, "y":1.25},
+                {"x":5, "y":1.25},
+                {"x":6, "y":1.25},
+                {"x":7, "y":1.25},
+                {"x":8, "y":1.25},
+                {"x":9, "y":1.25},
+                {"x":10, "y":1.25},
+                {"x":11, "y":1.25},
+                {"x":12, "y":1.25},
+                {"x":13, "y":1.25, "w":2},
+                {"x":15.5, "y":1.25},
+                
+                {"x":0, "y":2.25, "w":1.5},
+                {"x":1.5, "y":2.25},
+                {"x":2.5, "y":2.25},
+                {"x":3.5, "y":2.25},
+                {"x":4.5, "y":2.25},
+                {"x":5.5, "y":2.25},
+                {"x":6.5, "y":2.25},
+                {"x":7.5, "y":2.25},
+                {"x":8.5, "y":2.25},
+                {"x":9.5, "y":2.25},
+                {"x":10.5, "y":2.25},
+                {"x":11.5, "y":2.25},
+                {"x":12.5, "y":2.25},
+                {"x":15.5, "y":2.25},
+                
+                {"x":0, "y":3.25, "w":1.75},
+                {"x":1.75, "y":3.25},
+                {"x":2.75, "y":3.25},
+                {"x":3.75, "y":3.25},
+                {"x":4.75, "y":3.25},
+                {"x":5.75, "y":3.25},
+                {"x":6.75, "y":3.25},
+                {"x":7.75, "y":3.25},
+                {"x":8.75, "y":3.25},
+                {"x":9.75, "y":3.25},
+                {"x":10.75, "y":3.25},
+                {"x":11.75, "y":3.25},
+                {"x":12.75, "y":3.25},
+                {"x":13.75, "y":2.25, "w":1.25, "h":2},
+                {"x":15.5, "y":3.25},
+                
+                {"x":0, "y":4.25, "w":1.25},
+                {"x":1.25, "y":4.25},
+                {"x":2.25, "y":4.25},
+                {"x":3.25, "y":4.25},
+                {"x":4.25, "y":4.25},
+                {"x":5.25, "y":4.25},
+                {"x":6.25, "y":4.25},
+                {"x":7.25, "y":4.25},
+                {"x":8.25, "y":4.25},
+                {"x":9.25, "y":4.25},
+                {"x":10.25, "y":4.25},
+                {"x":11.25, "y":4.25},
+                {"x":12.25, "y":4.25, "w":1.75},
+                {"x":14.25, "y":4.5},
+                {"x":15.5, "y":4.25},
+                
+                {"x":0, "y":5.25, "w":1.25},
+                {"x":1.25, "y":5.25, "w":1.25},
+                {"x":2.5, "y":5.25, "w":1.25},
+                {"x":3.75, "y":5.25, "w":6.25},
+                {"x":10, "y":5.25},
+                {"x":11, "y":5.25},
+                {"x":12, "y":5.25},
+                {"x":13.25, "y":5.5},
+                {"x":14.25, "y":5.5},
+                {"x":15.25, "y":5.5}
+            ]
+        }
+    }
+}
diff --git a/qmk/keyboards/evyd13/eon75/keymaps/default/keymap.c b/qmk/keyboards/evyd13/eon75/keymaps/default/keymap.c
new file mode 100644
index 00000000..535393cd
--- /dev/null
+++ b/qmk/keyboards/evyd13/eon75/keymaps/default/keymap.c
@@ -0,0 +1,34 @@
+/* Copyright 2019 Evy Dekkers
+ *
+ * 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_all(
+    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_HOME,       KC_END,
+    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_BSLS, KC_BSPC,       KC_INS,
+    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_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_PGUP,
+    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_UP,      KC_PGDN,
+    KC_LCTL, KC_LGUI, KC_LALT,                                     KC_SPC,                    KC_RALT, KC_RGUI, KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT),
+[1] = LAYOUT_all(
+    RESET,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,       _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,       _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______,    _______,
+    _______, _______, _______,                                     _______,                   _______, _______, _______,    _______, _______, _______),
+
+};
\ No newline at end of file
diff --git a/qmk/keyboards/evyd13/eon75/keymaps/via/keymap.c b/qmk/keyboards/evyd13/eon75/keymaps/via/keymap.c
new file mode 100644
index 00000000..106ee970
--- /dev/null
+++ b/qmk/keyboards/evyd13/eon75/keymaps/via/keymap.c
@@ -0,0 +1,47 @@
+/* Copyright 2019 Evy Dekkers
+ *
+ * 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_all(
+    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_HOME,       KC_END,
+    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_BSLS, KC_BSPC,       KC_INS,
+    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_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_PGUP,
+    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_UP,      KC_PGDN,
+    KC_LCTL, KC_LGUI, KC_LALT,                                     KC_SPC,                    KC_RALT, MO(1),   KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT),
+[1] = LAYOUT_all(
+    RESET,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,       _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,       _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______,    _______,
+    _______, _______, _______,                                     _______,                   _______, _______, _______,    _______, _______, _______),
+[2] = LAYOUT_all(
+    _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,       _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,       _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______,    _______,
+    _______, _______, _______,                                     _______,                   _______, _______, _______,    _______, _______, _______),
+[3] = LAYOUT_all(
+    _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,       _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,       _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______,    _______,
+    _______, _______, _______,                                     _______,                   _______, _______, _______,    _______, _______, _______)
+};
\ No newline at end of file
diff --git a/qmk/keyboards/evyd13/eon75/keymaps/via/rules.mk b/qmk/keyboards/evyd13/eon75/keymaps/via/rules.mk
new file mode 100644
index 00000000..36b7ba9c
--- /dev/null
+++ b/qmk/keyboards/evyd13/eon75/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/qmk/keyboards/evyd13/eon75/readme.md b/qmk/keyboards/evyd13/eon75/readme.md
new file mode 100644
index 00000000..7b3ee43f
--- /dev/null
+++ b/qmk/keyboards/evyd13/eon75/readme.md
@@ -0,0 +1,13 @@
+# Eon75
+
+## Support
+* Keyboard Maintainer: [Evyd13](https://github.com/evyd13)
+* Hardware Supported: Eon75
+* Hardware Availability: None
+
+## Build
+Make example for this keyboard (after setting up your build environment):
+
+    make evyd13/eon75: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).
\ No newline at end of file
diff --git a/qmk/keyboards/evyd13/eon75/rules.mk b/qmk/keyboards/evyd13/eon75/rules.mk
new file mode 100644
index 00000000..264e0ea6
--- /dev/null
+++ b/qmk/keyboards/evyd13/eon75/rules.mk
@@ -0,0 +1,32 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+#   Teensy       halfkay
+#   Pro Micro    caterina
+#   Atmel DFU    atmel-dfu
+#   LUFA DFU     lufa-dfu
+#   QMK DFU      qmk-dfu
+#   ATmega32A    bootloadHID
+#   ATmega328P   USBasp
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = yes        # Console for debug
+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
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+MIDI_ENABLE = no            # MIDI support
+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
diff --git a/qmk/keyboards/evyd13/eon87/config.h b/qmk/keyboards/evyd13/eon87/config.h
new file mode 100644
index 00000000..2a03ec6c
--- /dev/null
+++ b/qmk/keyboards/evyd13/eon87/config.h
@@ -0,0 +1,220 @@
+/* Copyright 2019 Evy Dekkers
+ *
+ * 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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x4705
+#define PRODUCT_ID      0xAA6B
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Evyd13
+#define PRODUCT         Eon87
+#define DESCRIPTION     A TKL PCB
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 17
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+*/
+#define MATRIX_ROW_PINS {B1,B2,B3,D4,D1,D5}
+#define MATRIX_COL_PINS {F0,F1,F4,F5,F6,F7,C7,C6,B6,B5,B4,D7,D6,E6,B7,D3,D2}
+#define UNUSED_PINS {B0}
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+// #define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6
+
+// #define BACKLIGHT_PIN B7
+// #define BACKLIGHT_BREATHING
+// #define BACKLIGHT_LEVELS 3
+
+ #define RGB_DI_PIN D0
+// #ifdef RGB_DI_PIN
+   #define RGBLED_NUM 12
+//   #define RGBLIGHT_HUE_STEP 8
+//   #define RGBLIGHT_SAT_STEP 8
+//   #define RGBLIGHT_VAL_STEP 8
+//   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+//   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+// /*== all animations enable ==*/
+   #define RGBLIGHT_ANIMATIONS
+// /*== or choose animations ==*/
+//   #define RGBLIGHT_EFFECT_BREATHING
+//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
+//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+//   #define RGBLIGHT_EFFECT_SNAKE
+//   #define RGBLIGHT_EFFECT_KNIGHT
+//   #define RGBLIGHT_EFFECT_CHRISTMAS
+//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
+//   #define RGBLIGHT_EFFECT_RGB_TEST
+//   #define RGBLIGHT_EFFECT_ALTERNATING
+// /*== customize breathing effect ==*/
+//   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+//   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+//   /*==== use exp() and sin() ====*/
+//   #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//   #define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+// #endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is userful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+// #define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Magic Key Options
+ *
+ * Magic keys are hotkey commands that allow control over firmware functions of
+ * the keyboard. They are best used in combination with the HID Listen program,
+ * found here: https://www.pjrc.com/teensy/hid_listen.html
+ *
+ * The options below allow the magic key functionality to be changed. This is
+ * useful if your keyboard/keypad is missing keys and you want magic key support.
+ *
+ */
+
+/* key combination for magic key command */
+/* defined by default; to change, uncomment and set to the combination you want */
+// #define IS_COMMAND() (get_mods() == MOD_MASK_SHIFT)
+
+/* control how magic key switches layers */
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS  true
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS  true
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false
+
+/* override magic key keymap */
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM
+//#define MAGIC_KEY_HELP           H
+//#define MAGIC_KEY_HELP_ALT       SLASH
+//#define MAGIC_KEY_DEBUG          D
+//#define MAGIC_KEY_DEBUG_MATRIX   X
+//#define MAGIC_KEY_DEBUG_KBD      K
+//#define MAGIC_KEY_DEBUG_MOUSE    M
+//#define MAGIC_KEY_VERSION        V
+//#define MAGIC_KEY_STATUS         S
+//#define MAGIC_KEY_CONSOLE        C
+//#define MAGIC_KEY_LAYER0         0
+//#define MAGIC_KEY_LAYER0_ALT     GRAVE
+//#define MAGIC_KEY_LAYER1         1
+//#define MAGIC_KEY_LAYER2         2
+//#define MAGIC_KEY_LAYER3         3
+//#define MAGIC_KEY_LAYER4         4
+//#define MAGIC_KEY_LAYER5         5
+//#define MAGIC_KEY_LAYER6         6
+//#define MAGIC_KEY_LAYER7         7
+//#define MAGIC_KEY_LAYER8         8
+//#define MAGIC_KEY_LAYER9         9
+//#define MAGIC_KEY_BOOTLOADER     B
+//#define MAGIC_KEY_BOOTLOADER_ALT ESC
+//#define MAGIC_KEY_LOCK           CAPS
+//#define MAGIC_KEY_EEPROM         E
+//#define MAGIC_KEY_EEPROM_CLEAR   BSPACE
+//#define MAGIC_KEY_NKRO           N
+//#define MAGIC_KEY_SLEEP_LED      Z
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+//#define NO_ACTION_MACRO
+//#define NO_ACTION_FUNCTION
+
+/*
+ * MIDI options
+ */
+
+/* Prevent use of disabled MIDI features in the keymap */
+//#define MIDI_ENABLE_STRICT 1
+
+/* enable basic MIDI features:
+   - MIDI notes can be sent when in Music mode is on
+*/
+//#define MIDI_BASIC
+
+/* enable advanced MIDI features:
+   - MIDI notes can be added to the keymap
+   - Octave shift and transpose
+   - Virtual sustain, portamento, and modulation wheel
+   - etc.
+*/
+//#define MIDI_ADVANCED
+
+/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
+//#define MIDI_TONE_KEYCODE_OCTAVES 1
+
+/* Bootmagic Lite key configuration */
+// #define BOOTMAGIC_LITE_ROW 0
+// #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/evyd13/eon87/eon87.c b/qmk/keyboards/evyd13/eon87/eon87.c
new file mode 100644
index 00000000..83a00522
--- /dev/null
+++ b/qmk/keyboards/evyd13/eon87/eon87.c
@@ -0,0 +1,16 @@
+/* Copyright 2019 Evy Dekkers
+ *
+ * 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 "eon87.h"
diff --git a/qmk/keyboards/evyd13/eon87/eon87.h b/qmk/keyboards/evyd13/eon87/eon87.h
new file mode 100644
index 00000000..9e850625
--- /dev/null
+++ b/qmk/keyboards/evyd13/eon87/eon87.h
@@ -0,0 +1,79 @@
+/* Copyright 2019 Evy Dekkers
+ *
+ * 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 XXX KC_NO
+
+/* This a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+
+#define LAYOUT_all( \
+    k00,      k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,      k0e, k0f, k0g, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k0d, k1d, k1e, k1f, k1g, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,      k2e, k2f, k2g, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d,                     \
+    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d,           k4f,      \
+    k50, k51, k52,      k54,      k56,      k58,      k5a, k5b, k5c, k5d,      k5e, k5f, k5g  \
+) \
+{ \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, XXX, XXX, XXX }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, XXX, k4f, XXX }, \
+    { k50, k51, k52, XXX, k54, XXX, k56, XXX, k58, XXX, k5a, k5b, k5c, k5d, k5e, k5f, k5g }  \
+}
+
+#define LAYOUT_tkl_ansi( \
+    k00,      k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,      k0e, k0f, k0g, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,      k1e, k1f, k1g, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,      k2e, k2f, k2g, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3d,                     \
+    k40,      k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b,      k4c,           k4f,      \
+    k50, k51, k52,                k56,                k5a, k5b, k5c, k5d,      k5e, k5f, k5g  \
+) \
+{ \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, XXX, k0e, k0f, k0g }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, XXX, XXX, XXX }, \
+    { k40, XXX, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, XXX, XXX, k4f, XXX }, \
+    { k50, k51, k52, XXX, XXX, XXX, k56, XXX, XXX, XXX, k5a, k5b, k5c, k5d, k5e, k5f, k5g }  \
+}
+
+#define LAYOUT_tkl_iso( \
+    k00,      k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,      k0e, k0f, k0g, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,      k1e, k1f, k1g, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c,           k2e, k2f, k2g, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d,                     \
+    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b,      k4c,           k4f,      \
+    k50, k51, k52,                k56,                k5a, k5b, k5c, k5d,      k5e, k5f, k5g  \
+) \
+{ \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, XXX, k0e, k0f, k0g }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, XXX, k2e, k2f, k2g }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, XXX, XXX, XXX }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, XXX, XXX, k4f, XXX }, \
+    { k50, k51, k52, XXX, XXX, XXX, k56, XXX, XXX, XXX, k5a, k5b, k5c, k5d, k5e, k5f, k5g }  \
+}
diff --git a/qmk/keyboards/evyd13/eon87/info.json b/qmk/keyboards/evyd13/eon87/info.json
new file mode 100644
index 00000000..b0ed86a7
--- /dev/null
+++ b/qmk/keyboards/evyd13/eon87/info.json
@@ -0,0 +1,319 @@
+{
+    "keyboard_name": "Eon87",
+    "url": "",
+    "maintainer": "qmk",
+    "width": 18.25,
+    "height": 6.25,
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6.5, "y": 0},
+                {"x": 7.5, "y": 0},
+                {"x": 8.5, "y": 0},
+                {"x": 9.5, "y": 0},
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0},
+                {"x": 14, "y": 0},
+
+                {"x": 15.25, "y": 0},
+                {"x": 16.25, "y": 0},
+                {"x": 17.25, "y": 0},
+
+                {"x": 0, "y": 1.25},
+                {"x": 1, "y": 1.25},
+                {"x": 2, "y": 1.25},
+                {"x": 3, "y": 1.25},
+                {"x": 4, "y": 1.25},
+                {"x": 5, "y": 1.25},
+                {"x": 6, "y": 1.25},
+                {"x": 7, "y": 1.25},
+                {"x": 8, "y": 1.25},
+                {"x": 9, "y": 1.25},
+                {"x": 10, "y": 1.25},
+                {"x": 11, "y": 1.25},
+                {"x": 12, "y": 1.25},
+                {"x": 13, "y": 1.25},
+                {"x": 14, "y": 1.25},
+
+                {"x": 15.25, "y": 1.25},
+                {"x": 16.25, "y": 1.25},
+                {"x": 17.25, "y": 1.25},
+                
+                {"x": 0, "y": 2.25, "w": 1.5},
+                {"x": 1.5, "y": 2.25},
+                {"x": 2.5, "y": 2.25},
+                {"x": 3.5, "y": 2.25},
+                {"x": 4.5, "y": 2.25},
+                {"x": 5.5, "y": 2.25},
+                {"x": 6.5, "y": 2.25},
+                {"x": 7.5, "y": 2.25},
+                {"x": 8.5, "y": 2.25},
+                {"x": 9.5, "y": 2.25},
+                {"x": 10.5, "y": 2.25},
+                {"x": 11.5, "y": 2.25},
+                {"x": 12.5, "y": 2.25},
+                {"x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"x": 15.25, "y": 2.25},
+                {"x": 16.25, "y": 2.25},
+                {"x": 17.25, "y": 2.25},
+
+                {"x": 0, "y": 3.25, "w": 1.75},
+                {"x": 1.75, "y": 3.25},
+                {"x": 2.75, "y": 3.25},
+                {"x": 3.75, "y": 3.25},
+                {"x": 4.75, "y": 3.25},
+                {"x": 5.75, "y": 3.25},
+                {"x": 6.75, "y": 3.25},
+                {"x": 7.75, "y": 3.25},
+                {"x": 8.75, "y": 3.25},
+                {"x": 9.75, "y": 3.25},
+                {"x": 10.75, "y": 3.25},
+                {"x": 11.75, "y": 3.25},
+                {"x": 12.75, "y": 3.25},
+                {"x": 13.75, "y": 3.25, "w": 1.25},
+
+                {"x": 0, "y": 4.25, "w": 1.25},
+                {"x": 1.25, "y": 4.25},
+                {"x": 2.25, "y": 4.25},
+                {"x": 3.25, "y": 4.25},
+                {"x": 4.25, "y": 4.25},
+                {"x": 5.25, "y": 4.25},
+                {"x": 6.25, "y": 4.25},
+                {"x": 7.25, "y": 4.25},
+                {"x": 8.25, "y": 4.25},
+                {"x": 9.25, "y": 4.25},
+                {"x": 10.25, "y": 4.25},
+                {"x": 11.25, "y": 4.25},
+                {"x": 12.25, "y": 4.25, "w": 1.75},
+                {"x": 14, "y": 4.25},
+
+                {"x": 16.25, "y": 4.25},
+
+                {"x": 0, "y": 5.25, "w": 1.25},
+                {"x": 1.25, "y": 5.25, "w": 1.25},
+                {"x": 2.5, "y": 5.25, "w": 1.25},
+                {"x": 3.75, "y": 5.25, "w": 2.25},
+                {"x": 6, "y": 5.25, "w": 1.25},
+                {"x": 7.25, "y": 5.25, "w": 2.75},
+                {"x": 10, "y": 5.25, "w": 1.25},
+                {"x": 11.25, "y": 5.25, "w": 1.25},
+                {"x": 12.5, "y": 5.25, "w": 1.25},
+                {"x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"x": 15.25, "y": 5.25},
+                {"x": 16.25, "y": 5.25},
+                {"x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_ansi": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6.5, "y": 0},
+                {"x": 7.5, "y": 0},
+                {"x": 8.5, "y": 0},
+                {"x": 9.5, "y": 0},
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0},
+                {"x": 14, "y": 0},
+
+                {"x": 15.25, "y": 0},
+                {"x": 16.25, "y": 0},
+                {"x": 17.25, "y": 0},
+
+                {"x": 0, "y": 1.25},
+                {"x": 1, "y": 1.25},
+                {"x": 2, "y": 1.25},
+                {"x": 3, "y": 1.25},
+                {"x": 4, "y": 1.25},
+                {"x": 5, "y": 1.25},
+                {"x": 6, "y": 1.25},
+                {"x": 7, "y": 1.25},
+                {"x": 8, "y": 1.25},
+                {"x": 9, "y": 1.25},
+                {"x": 10, "y": 1.25},
+                {"x": 11, "y": 1.25},
+                {"x": 12, "y": 1.25},
+                {"x": 13, "y": 1.25, "w": 2},
+
+                {"x": 15.25, "y": 1.25},
+                {"x": 16.25, "y": 1.25},
+                {"x": 17.25, "y": 1.25},
+
+                {"x": 0, "y": 2.25, "w": 1.5},
+                {"x": 1.5, "y": 2.25},
+                {"x": 2.5, "y": 2.25},
+                {"x": 3.5, "y": 2.25},
+                {"x": 4.5, "y": 2.25},
+                {"x": 5.5, "y": 2.25},
+                {"x": 6.5, "y": 2.25},
+                {"x": 7.5, "y": 2.25},
+                {"x": 8.5, "y": 2.25},
+                {"x": 9.5, "y": 2.25},
+                {"x": 10.5, "y": 2.25},
+                {"x": 11.5, "y": 2.25},
+                {"x": 12.5, "y": 2.25},
+                {"x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"x": 15.25, "y": 2.25},
+                {"x": 16.25, "y": 2.25},
+                {"x": 17.25, "y": 2.25},
+
+                {"x": 0, "y": 3.25, "w": 1.75},
+                {"x": 1.75, "y": 3.25},
+                {"x": 2.75, "y": 3.25},
+                {"x": 3.75, "y": 3.25},
+                {"x": 4.75, "y": 3.25},
+                {"x": 5.75, "y": 3.25},
+                {"x": 6.75, "y": 3.25},
+                {"x": 7.75, "y": 3.25},
+                {"x": 8.75, "y": 3.25},
+                {"x": 9.75, "y": 3.25},
+                {"x": 10.75, "y": 3.25},
+                {"x": 11.75, "y": 3.25},
+                {"x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"x": 0, "y": 4.25, "w": 2.25},
+                {"x": 2.25, "y": 4.25},
+                {"x": 3.25, "y": 4.25},
+                {"x": 4.25, "y": 4.25},
+                {"x": 5.25, "y": 4.25},
+                {"x": 6.25, "y": 4.25},
+                {"x": 7.25, "y": 4.25},
+                {"x": 8.25, "y": 4.25},
+                {"x": 9.25, "y": 4.25},
+                {"x": 10.25, "y": 4.25},
+                {"x": 11.25, "y": 4.25},
+                {"x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"x": 16.25, "y": 4.25},
+
+                {"x": 0, "y": 5.25, "w": 1.25},
+                {"x": 1.25, "y": 5.25, "w": 1.25},
+                {"x": 2.5, "y": 5.25, "w": 1.25},
+                {"x": 3.75, "y": 5.25, "w": 6.25},
+                {"x": 10, "y": 5.25, "w": 1.25},
+                {"x": 11.25, "y": 5.25, "w": 1.25},
+                {"x": 12.5, "y": 5.25, "w": 1.25},
+                {"x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"x": 15.25, "y": 5.25},
+                {"x": 16.25, "y": 5.25},
+                {"x": 17.25, "y": 5.25}
+            ]
+        },
+        "LAYOUT_tkl_iso": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6.5, "y": 0},
+                {"x": 7.5, "y": 0},
+                {"x": 8.5, "y": 0},
+                {"x": 9.5, "y": 0},
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0},
+                {"x": 14, "y": 0},
+
+                {"x": 15.25, "y": 0},
+                {"x": 16.25, "y": 0},
+                {"x": 17.25, "y": 0},
+
+                {"x": 0, "y": 1.25},
+                {"x": 1, "y": 1.25},
+                {"x": 2, "y": 1.25},
+                {"x": 3, "y": 1.25},
+                {"x": 4, "y": 1.25},
+                {"x": 5, "y": 1.25},
+                {"x": 6, "y": 1.25},
+                {"x": 7, "y": 1.25},
+                {"x": 8, "y": 1.25},
+                {"x": 9, "y": 1.25},
+                {"x": 10, "y": 1.25},
+                {"x": 11, "y": 1.25},
+                {"x": 12, "y": 1.25},
+                {"x": 13, "y": 1.25, "w": 2},
+
+                {"x": 15.25, "y": 1.25},
+                {"x": 16.25, "y": 1.25},
+                {"x": 17.25, "y": 1.25},
+
+                {"x": 0, "y": 2.25, "w": 1.5},
+                {"x": 1.5, "y": 2.25},
+                {"x": 2.5, "y": 2.25},
+                {"x": 3.5, "y": 2.25},
+                {"x": 4.5, "y": 2.25},
+                {"x": 5.5, "y": 2.25},
+                {"x": 6.5, "y": 2.25},
+                {"x": 7.5, "y": 2.25},
+                {"x": 8.5, "y": 2.25},
+                {"x": 9.5, "y": 2.25},
+                {"x": 10.5, "y": 2.25},
+                {"x": 11.5, "y": 2.25},
+                {"x": 12.5, "y": 2.25},
+
+                {"x": 15.25, "y": 2.25},
+                {"x": 16.25, "y": 2.25},
+                {"x": 17.25, "y": 2.25},
+
+                {"x": 0, "y": 3.25, "w": 1.75},
+                {"x": 1.75, "y": 3.25},
+                {"x": 2.75, "y": 3.25},
+                {"x": 3.75, "y": 3.25},
+                {"x": 4.75, "y": 3.25},
+                {"x": 5.75, "y": 3.25},
+                {"x": 6.75, "y": 3.25},
+                {"x": 7.75, "y": 3.25},
+                {"x": 8.75, "y": 3.25},
+                {"x": 9.75, "y": 3.25},
+                {"x": 10.75, "y": 3.25},
+                {"x": 11.75, "y": 3.25},
+                {"x": 12.75, "y": 3.25},
+                {"x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"x": 0, "y": 4.25, "w": 1.25},
+                {"x": 1.25, "y": 4.25},
+                {"x": 2.25, "y": 4.25},
+                {"x": 3.25, "y": 4.25},
+                {"x": 4.25, "y": 4.25},
+                {"x": 5.25, "y": 4.25},
+                {"x": 6.25, "y": 4.25},
+                {"x": 7.25, "y": 4.25},
+                {"x": 8.25, "y": 4.25},
+                {"x": 9.25, "y": 4.25},
+                {"x": 10.25, "y": 4.25},
+                {"x": 11.25, "y": 4.25},
+                {"x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"x": 16.25, "y": 4.25},
+
+                {"x": 0, "y": 5.25, "w": 1.25},
+                {"x": 1.25, "y": 5.25, "w": 1.25},
+                {"x": 2.5, "y": 5.25, "w": 1.25},
+                {"x": 3.75, "y": 5.25, "w": 6.25},
+                {"x": 10, "y": 5.25, "w": 1.25},
+                {"x": 11.25, "y": 5.25, "w": 1.25},
+                {"x": 12.5, "y": 5.25, "w": 1.25},
+                {"x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"x": 15.25, "y": 5.25},
+                {"x": 16.25, "y": 5.25},
+                {"x": 17.25, "y": 5.25}
+            ]
+        }
+    }
+}
diff --git a/qmk/keyboards/evyd13/eon87/keymaps/default/keymap.c b/qmk/keyboards/evyd13/eon87/keymaps/default/keymap.c
new file mode 100644
index 00000000..c4ba5a86
--- /dev/null
+++ b/qmk/keyboards/evyd13/eon87/keymaps/default/keymap.c
@@ -0,0 +1,42 @@
+/* Copyright 2019 Evy Dekkers
+ *
+ * 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
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+
+#define _MA 0 //Main layer
+#define _FN 1 //Main layer
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[_MA] = LAYOUT_all(
+    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_BSLS,  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_BSLS,            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_RSFT,  MO(_FN),              KC_UP,
+    KC_LCTL,  KC_LGUI,  KC_LALT,            KC_SPC,             KC_SPC,             KC_SPC,                       KC_RALT,  KC_RGUI,  KC_APP,   KC_RCTRL,   KC_LEFT,  KC_DOWN,  KC_RGHT),
+[_FN] = LAYOUT_all(
+    _______,            _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,             _______,   _______,  _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,    KC_VOLD,   KC_MUTE,  KC_VOLU,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,           _______,    KC_MPRV,   KC_MPLY,  KC_MNXT,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,           _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,           _______,  _______,               _______,
+    _______,  _______,  _______,            _______,            _______,            _______,                     _______,  _______,  _______,  _______,    _______,   _______,  _______),
+
+};
\ No newline at end of file
diff --git a/qmk/keyboards/evyd13/eon87/keymaps/default/readme.md b/qmk/keyboards/evyd13/eon87/keymaps/default/readme.md
new file mode 100644
index 00000000..a70270cf
--- /dev/null
+++ b/qmk/keyboards/evyd13/eon87/keymaps/default/readme.md
@@ -0,0 +1 @@
+This is the default keymap for the Eon87.
diff --git a/qmk/keyboards/evyd13/eon87/keymaps/via/keymap.c b/qmk/keyboards/evyd13/eon87/keymaps/via/keymap.c
new file mode 100644
index 00000000..1a6839fb
--- /dev/null
+++ b/qmk/keyboards/evyd13/eon87/keymaps/via/keymap.c
@@ -0,0 +1,50 @@
+/* Copyright 2019 Evy Dekkers
+ *
+ * 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_all(
+    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_BSLS,  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_BSLS,            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_RSFT,  MO(1),                KC_UP,
+    KC_LCTL,  KC_LGUI,  KC_LALT,            KC_SPC,             KC_SPC,             KC_SPC,                       KC_RALT,  KC_RGUI,  KC_APP,   KC_RCTRL,   KC_LEFT,  KC_DOWN,  KC_RGHT),
+[1] = LAYOUT_all(
+    _______,            _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,             _______,   _______,  _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,    KC_VOLD,   KC_MUTE,  KC_VOLU,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,           _______,    KC_MPRV,   KC_MPLY,  KC_MNXT,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,           _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,           _______,  _______,               _______,
+    _______,  _______,  _______,            _______,            _______,            _______,                     _______,  _______,  _______,  _______,    _______,   _______,  _______),
+
+[2] = LAYOUT_all(
+    _______,            _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,             _______,   _______,  _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,    _______,   _______,  _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,           _______,    _______,   _______,  _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,           _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,           _______,  _______,               _______,
+    _______,  _______,  _______,            _______,            _______,            _______,                     _______,  _______,  _______,  _______,    _______,   _______,  _______),
+
+[3] = LAYOUT_all(
+    _______,            _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,             _______,   _______,  _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,    _______,   _______,  _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,           _______,    _______,   _______,  _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,           _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,           _______,  _______,               _______,
+    _______,  _______,  _______,            _______,            _______,            _______,                     _______,  _______,  _______,  _______,    _______,   _______,  _______),
+
+};
\ No newline at end of file
diff --git a/qmk/keyboards/evyd13/eon87/keymaps/via/rules.mk b/qmk/keyboards/evyd13/eon87/keymaps/via/rules.mk
new file mode 100644
index 00000000..36b7ba9c
--- /dev/null
+++ b/qmk/keyboards/evyd13/eon87/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/qmk/keyboards/evyd13/eon87/readme.md b/qmk/keyboards/evyd13/eon87/readme.md
new file mode 100644
index 00000000..6eea6c20
--- /dev/null
+++ b/qmk/keyboards/evyd13/eon87/readme.md
@@ -0,0 +1,13 @@
+# Eon87
+
+## Support
+* Keyboard Maintainer: [Evyd13](https://github.com/evyd13)
+* Hardware Supported: Eon87
+* Hardware Availability: [maartenwut.com](https://maartenwut.com)
+
+## Build
+Make example for this keyboard (after setting up your build environment):
+
+    make evyd13/eon87: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).
\ No newline at end of file
diff --git a/qmk/keyboards/evyd13/eon87/rules.mk b/qmk/keyboards/evyd13/eon87/rules.mk
new file mode 100644
index 00000000..65cfca7d
--- /dev/null
+++ b/qmk/keyboards/evyd13/eon87/rules.mk
@@ -0,0 +1,34 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+#   Teensy       halfkay
+#   Pro Micro    caterina
+#   Atmel DFU    atmel-dfu
+#   LUFA DFU     lufa-dfu
+#   QMK DFU      qmk-dfu
+#   ATmega32A    bootloadHID
+#   ATmega328P   USBasp
+BOOTLOADER = qmk-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = yes        # Console for debug
+COMMAND_ENABLE = no         # 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
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+MIDI_ENABLE = no            # MIDI support
+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
+
+LAYOUTS = tkl_ansi tkl_iso
diff --git a/qmk/keyboards/evyd13/eon95/config.h b/qmk/keyboards/evyd13/eon95/config.h
new file mode 100644
index 00000000..1fabdd51
--- /dev/null
+++ b/qmk/keyboards/evyd13/eon95/config.h
@@ -0,0 +1,222 @@
+/* Copyright 2019 Evy Dekkers
+ *
+ * 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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x4705
+#define PRODUCT_ID      0x8A18
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Evyd13
+#define PRODUCT         Eon95
+#define DESCRIPTION     A 95% PCB
+
+/* key matrix size */
+#define MATRIX_ROWS 12
+#define MATRIX_COLS 10
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+*/
+#define MATRIX_ROW_PINS {D1,D0,D3,D2,D6,D4,D7,B4,B5,B6,C6,C7}
+#define MATRIX_COL_PINS {E6,F0,F1,F4,F5,F6,F7,B3,B2,B1}
+#define UNUSED_PINS {}
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+// #define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6
+
+// #define BACKLIGHT_PIN B7
+// #define BACKLIGHT_BREATHING
+// #define BACKLIGHT_LEVELS 3
+
+// #define RGB_DI_PIN D0
+// #ifdef RGB_DI_PIN
+//   #define RGBLED_NUM 12
+//   #define RGBLIGHT_HUE_STEP 8
+//   #define RGBLIGHT_SAT_STEP 8
+//   #define RGBLIGHT_VAL_STEP 8
+//   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+//   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+// /*== all animations enable ==*/
+//   #define RGBLIGHT_ANIMATIONS
+// /*== or choose animations ==*/
+//   #define RGBLIGHT_EFFECT_BREATHING
+//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
+//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+//   #define RGBLIGHT_EFFECT_SNAKE
+//   #define RGBLIGHT_EFFECT_KNIGHT
+//   #define RGBLIGHT_EFFECT_CHRISTMAS
+//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
+//   #define RGBLIGHT_EFFECT_RGB_TEST
+//   #define RGBLIGHT_EFFECT_ALTERNATING
+// /*== customize breathing effect ==*/
+//   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+//   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+//   /*==== use exp() and sin() ====*/
+//   #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//   #define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+// #endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is userful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+// #define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Magic Key Options
+ *
+ * Magic keys are hotkey commands that allow control over firmware functions of
+ * the keyboard. They are best used in combination with the HID Listen program,
+ * found here: https://www.pjrc.com/teensy/hid_listen.html
+ *
+ * The options below allow the magic key functionality to be changed. This is
+ * useful if your keyboard/keypad is missing keys and you want magic key support.
+ *
+ */
+
+/* key combination for magic key command */
+/* defined by default; to change, uncomment and set to the combination you want */
+// #define IS_COMMAND() (get_mods() == MOD_MASK_SHIFT)
+
+/* control how magic key switches layers */
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS  true
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS  true
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false
+
+/* override magic key keymap */
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM
+//#define MAGIC_KEY_HELP           H
+//#define MAGIC_KEY_HELP_ALT       SLASH
+//#define MAGIC_KEY_DEBUG          D
+//#define MAGIC_KEY_DEBUG_MATRIX   X
+//#define MAGIC_KEY_DEBUG_KBD      K
+//#define MAGIC_KEY_DEBUG_MOUSE    M
+//#define MAGIC_KEY_VERSION        V
+//#define MAGIC_KEY_STATUS         S
+//#define MAGIC_KEY_CONSOLE        C
+//#define MAGIC_KEY_LAYER0         0
+//#define MAGIC_KEY_LAYER0_ALT     GRAVE
+//#define MAGIC_KEY_LAYER1         1
+//#define MAGIC_KEY_LAYER2         2
+//#define MAGIC_KEY_LAYER3         3
+//#define MAGIC_KEY_LAYER4         4
+//#define MAGIC_KEY_LAYER5         5
+//#define MAGIC_KEY_LAYER6         6
+//#define MAGIC_KEY_LAYER7         7
+//#define MAGIC_KEY_LAYER8         8
+//#define MAGIC_KEY_LAYER9         9
+//#define MAGIC_KEY_BOOTLOADER     B
+//#define MAGIC_KEY_BOOTLOADER_ALT ESC
+//#define MAGIC_KEY_LOCK           CAPS
+//#define MAGIC_KEY_EEPROM         E
+//#define MAGIC_KEY_EEPROM_CLEAR   BSPACE
+//#define MAGIC_KEY_NKRO           N
+//#define MAGIC_KEY_SLEEP_LED      Z
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+//#define NO_ACTION_MACRO
+//#define NO_ACTION_FUNCTION
+
+/*
+ * MIDI options
+ */
+
+/* Prevent use of disabled MIDI features in the keymap */
+//#define MIDI_ENABLE_STRICT 1
+
+/* enable basic MIDI features:
+   - MIDI notes can be sent when in Music mode is on
+*/
+//#define MIDI_BASIC
+
+/* enable advanced MIDI features:
+   - MIDI notes can be added to the keymap
+   - Octave shift and transpose
+   - Virtual sustain, portamento, and modulation wheel
+   - etc.
+*/
+//#define MIDI_ADVANCED
+
+/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
+//#define MIDI_TONE_KEYCODE_OCTAVES 1
+
+/* Bootmagic Lite key configuration */
+// #define BOOTMAGIC_LITE_ROW 0
+// #define BOOTMAGIC_LITE_COLUMN 0
+
+#define DYNAMIC_KEYMAP_LAYER_COUNT 3
diff --git a/qmk/keyboards/evyd13/eon95/eon95.c b/qmk/keyboards/evyd13/eon95/eon95.c
new file mode 100644
index 00000000..5eec86cc
--- /dev/null
+++ b/qmk/keyboards/evyd13/eon95/eon95.c
@@ -0,0 +1,45 @@
+/* Copyright 2019 Evy Dekkers
+ *
+ * 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 "eon95.h"
+
+void matrix_init_kb(void) {
+    // put your keyboard start-up code here
+    // runs once when the firmware starts up
+    matrix_init_user();
+    led_init_ports();
+}
+
+void led_init_ports(void) {
+    // * Set our LED pins as output and high
+    setPinOutput(D5);
+    writePinHigh(D5);
+    
+    setPinOutput(B7);
+    writePinHigh(B7);
+    
+    setPinOutput(B0);
+    writePinHigh(B0);
+}
+
+bool led_update_kb(led_t led_state) {
+    if(led_update_user(led_state)) {
+        writePin(D5, !led_state.caps_lock);
+        writePin(B7, !led_state.num_lock);
+        writePin(B0, !led_state.scroll_lock);
+    }
+
+    return true;
+}
diff --git a/qmk/keyboards/evyd13/eon95/eon95.h b/qmk/keyboards/evyd13/eon95/eon95.h
new file mode 100644
index 00000000..bf271318
--- /dev/null
+++ b/qmk/keyboards/evyd13/eon95/eon95.h
@@ -0,0 +1,96 @@
+/* Copyright 2019 Evy Dekkers
+ *
+ * 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 XXX KC_NO
+
+/* This a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+
+#define LAYOUT_all( \
+    k00,      k10, k01, k11, k02, k03, k13, k04, k14, k05, k15, k06, k16, k07,     k17, k08, k18, k09, \
+    k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k27,     k37, k28, k38, k29, \
+    k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k47,          k57, k48, k58, k49, \
+    k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k66, k76,          k77, k68, k78, k69, \
+    k80, k90, k81, k91, k82, k92, k83, k93, k84, k94, k85, k95, k86,        k87,   k97, k88, k98, k89, \
+    ka0, kb0, ka1,                     kb3,           ka5, kb5, ka6,   kb6, ka7, kb7,   ka8, kb8 \
+) \
+{ \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 }, \
+    { k10, k11, XXX, k13, k14, k15, k16, k17, k18, XXX }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, XXX }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49 }, \
+    { k50, k51, k52, k53, k54, k55, XXX, k57, k58, XXX }, \
+    { k60, k61, k62, k63, k64, k65, k66, XXX, k68, k69 }, \
+    { k70, k71, k72, k73, k74, k75, k76, k77, k78, XXX }, \
+    { k80, k81, k82, k83, k84, k85, k86, k87, k88, k89 }, \
+    { k90, k91, k92, k93, k94, k95, XXX, k97, k98, XXX }, \
+    { ka0, ka1, XXX, XXX, XXX, ka5, ka6, ka7, ka8, XXX }, \
+    { kb0, XXX, XXX, kb3, XXX, kb5, kb6, kb7, kb8, XXX }  \
+}
+
+#define LAYOUT_ansi( \
+    k00,      k10, k01, k11, k02, k03, k13, k04, k14, k05, k15, k06, k16, k07,     k17, k08, k18, k09, \
+    k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26,      k27,     k37, k28, k38, k29, \
+    k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k47,          k57, k48, k58,      \
+    k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75,      k76,          k77, k68, k78, k69, \
+    k80,      k81, k91, k82, k92, k83, k93, k84, k94, k85, k95, k86,        k87,   k97, k88, k98, k89, \
+    ka0, kb0, ka1,                     kb3,           ka5, kb5, ka6,   kb6, ka7, kb7,   ka8, kb8 \
+) \
+{ \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 }, \
+    { k10, k11, XXX, k13, k14, k15, k16, k17, k18, XXX }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \
+    { k30, k31, k32, k33, k34, k35, XXX, k37, k38, XXX }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47, k48, XXX }, \
+    { k50, k51, k52, k53, k54, k55, XXX, k57, k58, XXX }, \
+    { k60, k61, k62, k63, k64, k65, XXX, XXX, k68, k69 }, \
+    { k70, k71, k72, k73, k74, k75, k76, k77, k78, XXX }, \
+    { k80, k81, k82, k83, k84, k85, k86, k87, k88, k89 }, \
+    { XXX, k91, k92, k93, k94, k95, XXX, k97, k98, XXX }, \
+    { ka0, ka1, XXX, XXX, XXX, ka5, ka6, ka7, ka8, XXX }, \
+    { kb0, XXX, XXX, kb3, XXX, kb5, kb6, kb7, kb8, XXX }  \
+}
+#define LAYOUT_iso( \
+    k00,      k10, k01, k11, k02, k03, k13, k04, k14, k05, k15, k06, k16, k07,     k17, k08, k18, k09, \
+    k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26,      k27,     k37, k28, k38, k29, \
+    k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46,               k57, k48, k58,      \
+    k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k66, k76,          k77, k68, k78, k69, \
+    k80, k90, k81, k91, k82, k92, k83, k93, k84, k94, k85, k95, k86,        k87,   k97, k88, k98, k89, \
+    ka0, kb0, ka1,                     kb3,           ka5, kb5, ka6,   kb6, ka7, kb7,   ka8, kb8 \
+) \
+{ \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 }, \
+    { k10, k11, XXX, k13, k14, k15, k16, k17, k18, XXX }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \
+    { k30, k31, k32, k33, k34, k35, XXX, k37, k38, XXX }, \
+    { k40, k41, k42, k43, k44, k45, k46, XXX, k48, XXX }, \
+    { k50, k51, k52, k53, k54, k55, XXX, k57, k58, XXX }, \
+    { k60, k61, k62, k63, k64, k65, k66, XXX, k68, k69 }, \
+    { k70, k71, k72, k73, k74, k75, k76, k77, k78, XXX }, \
+    { k80, k81, k82, k83, k84, k85, k86, k87, k88, k89 }, \
+    { k90, k91, k92, k93, k94, k95, XXX, k97, k98, XXX }, \
+    { ka0, ka1, XXX, XXX, XXX, ka5, ka6, ka7, ka8, XXX }, \
+    { kb0, XXX, XXX, kb3, XXX, kb5, kb6, kb7, kb8, XXX }  \
+}
diff --git a/qmk/keyboards/evyd13/eon95/info.json b/qmk/keyboards/evyd13/eon95/info.json
new file mode 100644
index 00000000..6580ef66
--- /dev/null
+++ b/qmk/keyboards/evyd13/eon95/info.json
@@ -0,0 +1,338 @@
+{
+    "keyboard_name": "Eon95", 
+    "url": "", 
+    "maintainer": "qmk", 
+    "width": 19.5, 
+    "height": 6.5, 
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1.5, "y":0},
+                {"x":2.5, "y":0},
+                {"x":3.5, "y":0},
+                {"x":4.5, "y":0},
+                {"x":5.75, "y":0},
+                {"x":6.75, "y":0},
+                {"x":7.75, "y":0},
+                {"x":8.75, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14.5, "y":0},
+                {"x":15.5, "y":0},
+                {"x":16.5, "y":0},
+                {"x":17.5, "y":0},
+                {"x":18.5, "y":0},
+                
+                {"x":0, "y":1.25},
+                {"x":1, "y":1.25},
+                {"x":2, "y":1.25},
+                {"x":3, "y":1.25},
+                {"x":4, "y":1.25},
+                {"x":5, "y":1.25},
+                {"x":6, "y":1.25},
+                {"x":7, "y":1.25},
+                {"x":8, "y":1.25},
+                {"x":9, "y":1.25},
+                {"x":10, "y":1.25},
+                {"x":11, "y":1.25},
+                {"x":12, "y":1.25},
+                {"x":13, "y":1.25},
+                {"x":14, "y":1.25},
+                {"x":15.5, "y":1.25},
+                {"x":16.5, "y":1.25},
+                {"x":17.5, "y":1.25},
+                {"x":18.5, "y":1.25},
+                
+                {"x":0, "y":2.25, "w":1.5},
+                {"x":1.5, "y":2.25},
+                {"x":2.5, "y":2.25},
+                {"x":3.5, "y":2.25},
+                {"x":4.5, "y":2.25},
+                {"x":5.5, "y":2.25},
+                {"x":6.5, "y":2.25},
+                {"x":7.5, "y":2.25},
+                {"x":8.5, "y":2.25},
+                {"x":9.5, "y":2.25},
+                {"x":10.5, "y":2.25},
+                {"x":11.5, "y":2.25},
+                {"x":12.5, "y":2.25},
+                {"x":13.5, "y":2.25, "w":1.5},
+                {"x":15.5, "y":2.25},
+                {"x":16.5, "y":2.25},
+                {"x":17.5, "y":2.25},
+                {"x":18.5, "y":2.25},
+                
+                {"x":0, "y":3.25, "w":1.75},
+                {"x":1.75, "y":3.25},
+                {"x":2.75, "y":3.25},
+                {"x":3.75, "y":3.25},
+                {"x":4.75, "y":3.25},
+                {"x":5.75, "y":3.25},
+                {"x":6.75, "y":3.25},
+                {"x":7.75, "y":3.25},
+                {"x":8.75, "y":3.25},
+                {"x":9.75, "y":3.25},
+                {"x":10.75, "y":3.25},
+                {"x":11.75, "y":3.25},
+                {"x":12.75, "y":3.25},
+                {"x":13.75, "y":3.25, "w":1.25},
+                {"x":15.5, "y":3.25},
+                {"x":16.5, "y":3.25},
+                {"x":17.5, "y":3.25},
+                {"x":18.5, "y":3.25},
+                
+                {"x":0, "y":4.25, "w":1.25},
+                {"x":1.25, "y":4.25},
+                {"x":2.25, "y":4.25},
+                {"x":3.25, "y":4.25},
+                {"x":4.25, "y":4.25},
+                {"x":5.25, "y":4.25},
+                {"x":6.25, "y":4.25},
+                {"x":7.25, "y":4.25},
+                {"x":8.25, "y":4.25},
+                {"x":9.25, "y":4.25},
+                {"x":10.25, "y":4.25},
+                {"x":11.25, "y":4.25},
+                {"x":12.25, "y":4.25, "w":1.75},
+                {"x":14.25, "y":4.5},
+                {"x":15.5, "y":4.25},
+                {"x":16.5, "y":4.25},
+                {"x":17.5, "y":4.25},
+                {"x":18.5, "y":4.25, "h":2},
+                
+                {"x":0, "y":5.25, "w":1.25},
+                {"x":1.25, "y":5.25, "w":1.25},
+                {"x":2.5, "y":5.25, "w":1.25},
+                {"x":3.75, "y":5.25, "w":6.25},
+                {"x":10, "y":5.25},
+                {"x":11, "y":5.25},
+                {"x":12, "y":5.25},
+                {"x":13.25, "y":5.5},
+                {"x":14.25, "y":5.5},
+                {"x":15.25, "y":5.5},
+                {"x":16.5, "y":5.25},
+                {"x":17.5, "y":5.25}
+            ]
+        },
+        "LAYOUT_ansi": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1.5, "y":0},
+                {"x":2.5, "y":0},
+                {"x":3.5, "y":0},
+                {"x":4.5, "y":0},
+                {"x":5.75, "y":0},
+                {"x":6.75, "y":0},
+                {"x":7.75, "y":0},
+                {"x":8.75, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14.5, "y":0},
+                {"x":15.5, "y":0},
+                {"x":16.5, "y":0},
+                {"x":17.5, "y":0},
+                {"x":18.5, "y":0},
+                
+                {"x":0, "y":1.25},
+                {"x":1, "y":1.25},
+                {"x":2, "y":1.25},
+                {"x":3, "y":1.25},
+                {"x":4, "y":1.25},
+                {"x":5, "y":1.25},
+                {"x":6, "y":1.25},
+                {"x":7, "y":1.25},
+                {"x":8, "y":1.25},
+                {"x":9, "y":1.25},
+                {"x":10, "y":1.25},
+                {"x":11, "y":1.25},
+                {"x":12, "y":1.25},
+                {"x":13, "y":1.25, "w":2},
+                {"x":15.5, "y":1.25},
+                {"x":16.5, "y":1.25},
+                {"x":17.5, "y":1.25},
+                {"x":18.5, "y":1.25},
+                
+                {"x":0, "y":2.25, "w":1.5},
+                {"x":1.5, "y":2.25},
+                {"x":2.5, "y":2.25},
+                {"x":3.5, "y":2.25},
+                {"x":4.5, "y":2.25},
+                {"x":5.5, "y":2.25},
+                {"x":6.5, "y":2.25},
+                {"x":7.5, "y":2.25},
+                {"x":8.5, "y":2.25},
+                {"x":9.5, "y":2.25},
+                {"x":10.5, "y":2.25},
+                {"x":11.5, "y":2.25},
+                {"x":12.5, "y":2.25},
+                {"x":13.5, "y":2.25, "w":1.5},
+                {"x":15.5, "y":2.25},
+                {"x":16.5, "y":2.25},
+                {"x":17.5, "y":2.25},
+                
+                {"x":0, "y":3.25, "w":1.75},
+                {"x":1.75, "y":3.25},
+                {"x":2.75, "y":3.25},
+                {"x":3.75, "y":3.25},
+                {"x":4.75, "y":3.25},
+                {"x":5.75, "y":3.25},
+                {"x":6.75, "y":3.25},
+                {"x":7.75, "y":3.25},
+                {"x":8.75, "y":3.25},
+                {"x":9.75, "y":3.25},
+                {"x":10.75, "y":3.25},
+                {"x":11.75, "y":3.25},
+                {"x":12.75, "y":3.25, "w":2.25},
+                {"x":15.5, "y":3.25},
+                {"x":16.5, "y":3.25},
+                {"x":17.5, "y":3.25},
+                {"x":18.5, "y":2.25, "h":2},
+                
+                {"x":0, "y":4.25, "w":2.25},
+                {"x":2.25, "y":4.25},
+                {"x":3.25, "y":4.25},
+                {"x":4.25, "y":4.25},
+                {"x":5.25, "y":4.25},
+                {"x":6.25, "y":4.25},
+                {"x":7.25, "y":4.25},
+                {"x":8.25, "y":4.25},
+                {"x":9.25, "y":4.25},
+                {"x":10.25, "y":4.25},
+                {"x":11.25, "y":4.25},
+                {"x":12.25, "y":4.25, "w":1.75},
+                {"x":14.25, "y":4.5},
+                {"x":15.5, "y":4.25},
+                {"x":16.5, "y":4.25},
+                {"x":17.5, "y":4.25},
+                {"x":18.5, "y":4.25, "h":2},
+                
+                {"x":0, "y":5.25, "w":1.25},
+                {"x":1.25, "y":5.25, "w":1.25},
+                {"x":2.5, "y":5.25, "w":1.25},
+                {"x":3.75, "y":5.25, "w":6.25},
+                {"x":10, "y":5.25},
+                {"x":11, "y":5.25},
+                {"x":12, "y":5.25},
+                {"x":13.25, "y":5.5},
+                {"x":14.25, "y":5.5},
+                {"x":15.25, "y":5.5},
+                {"x":16.5, "y":5.25},
+                {"x":17.5, "y":5.25}
+            ]
+        },
+        "LAYOUT_iso": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1.5, "y":0},
+                {"x":2.5, "y":0},
+                {"x":3.5, "y":0},
+                {"x":4.5, "y":0},
+                {"x":5.75, "y":0},
+                {"x":6.75, "y":0},
+                {"x":7.75, "y":0},
+                {"x":8.75, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14.5, "y":0},
+                {"x":15.5, "y":0},
+                {"x":16.5, "y":0},
+                {"x":17.5, "y":0},
+                {"x":18.5, "y":0},
+                
+                {"x":0, "y":1.25},
+                {"x":1, "y":1.25},
+                {"x":2, "y":1.25},
+                {"x":3, "y":1.25},
+                {"x":4, "y":1.25},
+                {"x":5, "y":1.25},
+                {"x":6, "y":1.25},
+                {"x":7, "y":1.25},
+                {"x":8, "y":1.25},
+                {"x":9, "y":1.25},
+                {"x":10, "y":1.25},
+                {"x":11, "y":1.25},
+                {"x":12, "y":1.25},
+                {"x":13, "y":1.25, "w":2},
+                {"x":15.5, "y":1.25},
+                {"x":16.5, "y":1.25},
+                {"x":17.5, "y":1.25},
+                {"x":18.5, "y":1.25},
+                
+                {"x":0, "y":2.25, "w":1.5},
+                {"x":1.5, "y":2.25},
+                {"x":2.5, "y":2.25},
+                {"x":3.5, "y":2.25},
+                {"x":4.5, "y":2.25},
+                {"x":5.5, "y":2.25},
+                {"x":6.5, "y":2.25},
+                {"x":7.5, "y":2.25},
+                {"x":8.5, "y":2.25},
+                {"x":9.5, "y":2.25},
+                {"x":10.5, "y":2.25},
+                {"x":11.5, "y":2.25},
+                {"x":12.5, "y":2.25},
+                {"x":15.5, "y":2.25},
+                {"x":16.5, "y":2.25},
+                {"x":17.5, "y":2.25},
+                
+                {"x":0, "y":3.25, "w":1.75},
+                {"x":1.75, "y":3.25},
+                {"x":2.75, "y":3.25},
+                {"x":3.75, "y":3.25},
+                {"x":4.75, "y":3.25},
+                {"x":5.75, "y":3.25},
+                {"x":6.75, "y":3.25},
+                {"x":7.75, "y":3.25},
+                {"x":8.75, "y":3.25},
+                {"x":9.75, "y":3.25},
+                {"x":10.75, "y":3.25},
+                {"x":11.75, "y":3.25},
+                {"x":12.75, "y":3.25},
+                {"x":13.75, "y":2.25, "w":1.25, "h":2},
+                {"x":15.5, "y":3.25},
+                {"x":16.5, "y":3.25},
+                {"x":17.5, "y":3.25},
+                {"x":18.5, "y":2.25, "h":2},
+                
+                {"x":0, "y":4.25, "w":1.25},
+                {"x":1.25, "y":4.25},
+                {"x":2.25, "y":4.25},
+                {"x":3.25, "y":4.25},
+                {"x":4.25, "y":4.25},
+                {"x":5.25, "y":4.25},
+                {"x":6.25, "y":4.25},
+                {"x":7.25, "y":4.25},
+                {"x":8.25, "y":4.25},
+                {"x":9.25, "y":4.25},
+                {"x":10.25, "y":4.25},
+                {"x":11.25, "y":4.25},
+                {"x":12.25, "y":4.25, "w":1.75},
+                {"x":14.25, "y":4.5},
+                {"x":15.5, "y":4.25},
+                {"x":16.5, "y":4.25},
+                {"x":17.5, "y":4.25},
+                {"x":18.5, "y":4.25, "h":2},
+                
+                {"x":0, "y":5.25, "w":1.25},
+                {"x":1.25, "y":5.25, "w":1.25},
+                {"x":2.5, "y":5.25, "w":1.25},
+                {"x":3.75, "y":5.25, "w":6.25},
+                {"x":10, "y":5.25},
+                {"x":11, "y":5.25},
+                {"x":12, "y":5.25},
+                {"x":13.25, "y":5.5},
+                {"x":14.25, "y":5.5},
+                {"x":15.25, "y":5.5},
+                {"x":16.5, "y":5.25},
+                {"x":17.5, "y":5.25}
+            ]
+        }
+    }
+}
diff --git a/qmk/keyboards/evyd13/eon95/keymaps/default/keymap.c b/qmk/keyboards/evyd13/eon95/keymaps/default/keymap.c
new file mode 100644
index 00000000..1d61ca55
--- /dev/null
+++ b/qmk/keyboards/evyd13/eon95/keymaps/default/keymap.c
@@ -0,0 +1,34 @@
+/* Copyright 2019 Evy Dekkers
+ *
+ * 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_all(
+    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_DEL,  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_BSLS, KC_BSPC,       KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    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_PPLS,
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,                 KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
+    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_UP,      KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+    KC_LCTL, KC_LGUI, KC_LALT,                                     KC_SPC,                    KC_RALT, KC_RGUI, KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT,    KC_P0,   KC_PDOT),
+[1] = LAYOUT_all(
+    RESET,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,       _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,       _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______,    _______, _______, _______, _______,
+    _______, _______, _______,                                     _______,                   _______, _______, _______,    _______, _______, _______,    _______, _______),
+
+};
\ No newline at end of file
diff --git a/qmk/keyboards/evyd13/eon95/keymaps/via/keymap.c b/qmk/keyboards/evyd13/eon95/keymaps/via/keymap.c
new file mode 100644
index 00000000..5ada354f
--- /dev/null
+++ b/qmk/keyboards/evyd13/eon95/keymaps/via/keymap.c
@@ -0,0 +1,40 @@
+/* Copyright 2019 Evy Dekkers
+ *
+ * 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_all(
+    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_DEL,  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_BSLS, KC_BSPC,       KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+    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_PPLS,
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,                 KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
+    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_UP,      KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+    KC_LCTL, KC_LGUI, KC_LALT,                                     KC_SPC,                    KC_RALT, MO(1),   KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT,    KC_P0,   KC_PDOT),
+[1] = LAYOUT_all(
+    RESET,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,       _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,       _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______,    _______, _______, _______, _______,
+    _______, _______, _______,                                     _______,                   _______, _______, _______,    _______, _______, _______,    _______, _______),
+[2] = LAYOUT_all(
+    _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,       _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,       _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______,    _______, _______, _______, _______,
+    _______, _______, _______,                                     _______,                   _______, _______, _______,    _______, _______, _______,    _______, _______)
+};
\ No newline at end of file
diff --git a/qmk/keyboards/evyd13/eon95/keymaps/via/rules.mk b/qmk/keyboards/evyd13/eon95/keymaps/via/rules.mk
new file mode 100644
index 00000000..36b7ba9c
--- /dev/null
+++ b/qmk/keyboards/evyd13/eon95/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/qmk/keyboards/evyd13/eon95/readme.md b/qmk/keyboards/evyd13/eon95/readme.md
new file mode 100644
index 00000000..0bb43f65
--- /dev/null
+++ b/qmk/keyboards/evyd13/eon95/readme.md
@@ -0,0 +1,13 @@
+# Eon95
+
+## Support
+* Keyboard Maintainer: [Evyd13](https://github.com/evyd13)
+* Hardware Supported: Eon95
+* Hardware Availability: None
+
+## Build
+Make example for this keyboard (after setting up your build environment):
+
+    make evyd13/eon95: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).
\ No newline at end of file
diff --git a/qmk/keyboards/evyd13/eon95/rules.mk b/qmk/keyboards/evyd13/eon95/rules.mk
new file mode 100644
index 00000000..264e0ea6
--- /dev/null
+++ b/qmk/keyboards/evyd13/eon95/rules.mk
@@ -0,0 +1,32 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+#   Teensy       halfkay
+#   Pro Micro    caterina
+#   Atmel DFU    atmel-dfu
+#   LUFA DFU     lufa-dfu
+#   QMK DFU      qmk-dfu
+#   ATmega32A    bootloadHID
+#   ATmega328P   USBasp
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = yes        # Console for debug
+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
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+MIDI_ENABLE = no            # MIDI support
+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
diff --git a/qmk/keyboards/evyd13/gh80_1800/config.h b/qmk/keyboards/evyd13/gh80_1800/config.h
new file mode 100644
index 00000000..c230aa9a
--- /dev/null
+++ b/qmk/keyboards/evyd13/gh80_1800/config.h
@@ -0,0 +1,143 @@
+/* Copyright 2020 Evy Dekkers
+ *
+ * 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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x4705
+#define PRODUCT_ID      0x8B23
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Evyd13
+#define PRODUCT         GH80 1800
+
+/* key matrix size */
+#define MATRIX_ROWS 10
+#define MATRIX_COLS 11
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+*/
+#define MATRIX_ROW_PINS {D5,B4,B5,B6,C6,C7,B0,B2,B1,B3}
+#define MATRIX_COL_PINS {F0,F1,F4,F5,F6,F7,D3,D2,D1,D0,B7}
+#define UNUSED_PINS {E6}
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+// #define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6
+
+// #define BACKLIGHT_PIN B7
+// #define BACKLIGHT_BREATHING
+// #define BACKLIGHT_LEVELS 3
+
+// #define RGB_DI_PIN D0
+// #ifdef RGB_DI_PIN
+//   #define RGBLED_NUM 12
+//   #define RGBLIGHT_HUE_STEP 8
+//   #define RGBLIGHT_SAT_STEP 8
+//   #define RGBLIGHT_VAL_STEP 8
+//   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+//   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+// /*== all animations enable ==*/
+//   #define RGBLIGHT_ANIMATIONS
+// /*== or choose animations ==*/
+//   #define RGBLIGHT_EFFECT_BREATHING
+//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
+//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+//   #define RGBLIGHT_EFFECT_SNAKE
+//   #define RGBLIGHT_EFFECT_KNIGHT
+//   #define RGBLIGHT_EFFECT_CHRISTMAS
+//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
+//   #define RGBLIGHT_EFFECT_RGB_TEST
+//   #define RGBLIGHT_EFFECT_ALTERNATING
+// /*== customize breathing effect ==*/
+//   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+//   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+//   /*==== use exp() and sin() ====*/
+//   #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//   #define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+// #endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is userful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+// #define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+//#define NO_ACTION_MACRO
+//#define NO_ACTION_FUNCTION
+
+/* Bootmagic Lite key configuration */
+// #define BOOTMAGIC_LITE_ROW 0
+// #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/evyd13/gh80_1800/gh80_1800.c b/qmk/keyboards/evyd13/gh80_1800/gh80_1800.c
new file mode 100644
index 00000000..770c6f78
--- /dev/null
+++ b/qmk/keyboards/evyd13/gh80_1800/gh80_1800.c
@@ -0,0 +1,44 @@
+/* Copyright 2020 Evy Dekkers
+ *
+ * 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 "gh80_1800.h"
+
+void matrix_init_kb(void) {
+  // put your keyboard start-up code here
+  // runs once when the firmware starts up
+
+  matrix_init_user();
+  led_init_ports();
+}
+
+void led_init_ports(void) {
+  setPinOutput(D6);
+  setPinOutput(D7);
+  setPinOutput(D4);
+  
+  writePinHigh(D6);
+  writePinHigh(D7);
+  writePinHigh(D4);
+}
+
+bool led_update_kb(led_t led_state) {
+  if(led_update_user(led_state)) {
+    writePin(D6, !led_state.num_lock);
+    writePin(D7, !led_state.caps_lock);
+    writePin(D4, !led_state.scroll_lock);
+  }
+
+  return true;
+}
diff --git a/qmk/keyboards/evyd13/gh80_1800/gh80_1800.h b/qmk/keyboards/evyd13/gh80_1800/gh80_1800.h
new file mode 100644
index 00000000..920aaf37
--- /dev/null
+++ b/qmk/keyboards/evyd13/gh80_1800/gh80_1800.h
@@ -0,0 +1,94 @@
+/* Copyright 2020 Evy Dekkers
+ *
+ * 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 XXX KC_NO
+
+/* This a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+
+#define LAYOUT_all( \
+  k00,      k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06,            k07, k08, k09, k0a, \
+	                                                                                 k17, k18, k19, k1a, \
+	k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k36, k26, k16,       k27, k28, k29, k2a, \
+	k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k56,            k37, k38, k39, k3a, \
+	k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k76, k66,            k47, k48, k49, k4a, \
+	k80, k90, k81, k91, k82, k92, k83, k93, k84, k94, k85, k95,      k86, k97,       k57, k58, k59, k5a, \
+	k77, k87, k78,           k88,           k79, k89, k7a, k8a,      k98, k99, k9a,       k68, k69, k6a  \
+) \
+{ \
+    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a}, \
+    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a}, \
+    {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a}, \
+    {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a}, \
+    {k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a}, \
+    {k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5a}, \
+    {k60, k61, k62, k63, k64, k65, k66, XXX, k68, k69, k6a}, \
+    {k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7a}, \
+    {k80, k81, k82, k83, k84, k85, k86, k87, k88, k89, k8a}, \
+    {k90, k91, k92, k93, k94, k95, XXX, k97, k98, k99, k9a}  \
+}
+
+#define LAYOUT_1800_ansi( \
+  k00,      k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06,            k07, k08, k09, k0a, \
+	                                                                                 k17, k18, k19, k1a, \
+	k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k36, k16,            k27, k28, k29, k2a, \
+	k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k56,            k37, k38, k39, k3a, \
+	k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75,      k66,            k47, k48, k49, k4a, \
+	k80,      k81, k91, k82, k92, k83, k93, k84, k94, k85, k95,      k86, k97,       k57, k58, k59,      \
+	k77, k87, k78,           k88,           k79, k89, k7a, k8a,      k98, k99, k9a,       k68, k69, k6a  \
+) \
+{ \
+    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a}, \
+    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a}, \
+    {k20, k21, k22, k23, k24, k25, XXX, k27, k28, k29, k2a}, \
+    {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a}, \
+    {k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a}, \
+    {k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, XXX}, \
+    {k60, k61, k62, k63, k64, k65, k66, XXX, k68, k69, k6a}, \
+    {k70, k71, k72, k73, k74, k75, XXX, k77, k78, k79, k7a}, \
+    {k80, k81, k82, k83, k84, k85, k86, k87, k88, k89, k8a}, \
+    {XXX, k91, k92, k93, k94, k95, XXX, k97, k98, k99, k9a}  \
+}
+
+#define LAYOUT_1800_iso( \
+  k00,      k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06,            k07, k08, k09, k0a, \
+	                                                                                 k17, k18, k19, k1a, \
+	k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k36, k16,            k27, k28, k29, k2a, \
+	k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46,                 k37, k38, k39, k3a, \
+	k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k76, k66,            k47, k48, k49, k4a, \
+	k80, k90, k81, k91, k82, k92, k83, k93, k84, k94, k85, k95,      k86, k97,       k57, k58, k59,      \
+	k77, k87, k78,           k88,           k79, k89, k7a, k8a,      k98, k99, k9a,       k68, k69, k6a  \
+) \
+{ \
+    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a}, \
+    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a}, \
+    {k20, k21, k22, k23, k24, k25, XXX, k27, k28, k29, k2a}, \
+    {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a}, \
+    {k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a}, \
+    {k50, k51, k52, k53, k54, k55, XXX, k57, k58, k59, XXX}, \
+    {k60, k61, k62, k63, k64, k65, k66, XXX, k68, k69, k6a}, \
+    {k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7a}, \
+    {k80, k81, k82, k83, k84, k85, k86, k87, k88, k89, k8a}, \
+    {k90, k91, k92, k93, k94, k95, XXX, k97, k98, k99, k9a}  \
+}
diff --git a/qmk/keyboards/evyd13/gh80_1800/info.json b/qmk/keyboards/evyd13/gh80_1800/info.json
new file mode 100644
index 00000000..b468320d
--- /dev/null
+++ b/qmk/keyboards/evyd13/gh80_1800/info.json
@@ -0,0 +1,356 @@
+{
+    "keyboard_name": "GH80-1800", 
+    "url": "https://github.com/evyd13/gh80-series/tree/master/GH80-1800", 
+    "maintainer": "evyd13", 
+    "width": 19.5, 
+    "height": 7.25, 
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1.25, "y":0},
+                {"x":2.25, "y":0},
+                {"x":3.25, "y":0},
+                {"x":4.25, "y":0},
+                {"x":5.5, "y":0},
+                {"x":6.5, "y":0},
+                {"x":7.5, "y":0},
+                {"x":8.5, "y":0},
+                {"x":9.75, "y":0},
+                {"x":10.75, "y":0},
+                {"x":11.75, "y":0},
+                {"x":12.75, "y":0},
+                {"x":15.5, "y":0},
+                {"x":16.5, "y":0},
+                {"x":17.5, "y":0},
+                {"x":18.5, "y":0},
+                
+                {"x":15.5, "y":1},
+                {"x":16.5, "y":1},
+                {"x":17.5, "y":1},
+                {"x":18.5, "y":1},
+                
+                {"x":0, "y":2},
+                {"x":1, "y":2},
+                {"x":2, "y":2},
+                {"x":3, "y":2},
+                {"x":4, "y":2},
+                {"x":5, "y":2},
+                {"x":6, "y":2},
+                {"x":7, "y":2},
+                {"x":8, "y":2},
+                {"x":9, "y":2},
+                {"x":10, "y":2},
+                {"x":11, "y":2},
+                {"x":12, "y":2},
+                {"x":13, "y":2},
+                {"x":14, "y":2},
+                {"x":15.5, "y":2},
+                {"x":16.5, "y":2},
+                {"x":17.5, "y":2},
+                {"x":18.5, "y":2},
+                
+                {"x":0, "y":3, "w":1.5},
+                {"x":1.5, "y":3},
+                {"x":2.5, "y":3},
+                {"x":3.5, "y":3},
+                {"x":4.5, "y":3},
+                {"x":5.5, "y":3},
+                {"x":6.5, "y":3},
+                {"x":7.5, "y":3},
+                {"x":8.5, "y":3},
+                {"x":9.5, "y":3},
+                {"x":10.5, "y":3},
+                {"x":11.5, "y":3},
+                {"x":12.5, "y":3},
+                {"x":13.5, "y":3, "w":1.5},
+                {"x":15.5, "y":3},
+                {"x":16.5, "y":3},
+                {"x":17.5, "y":3},
+                {"x":18.5, "y":3},
+                
+                {"x":0, "y":4, "w":1.75},
+                {"x":1.75, "y":4},
+                {"x":2.75, "y":4},
+                {"x":3.75, "y":4},
+                {"x":4.75, "y":4},
+                {"x":5.75, "y":4},
+                {"x":6.75, "y":4},
+                {"x":7.75, "y":4},
+                {"x":8.75, "y":4},
+                {"x":9.75, "y":4},
+                {"x":10.75, "y":4},
+                {"x":11.75, "y":4},
+                {"x":12.75, "y":4},
+                {"x":13.75, "y":4, "w":1.25},
+                {"x":15.5, "y":4},
+                {"x":16.5, "y":4},
+                {"x":17.5, "y":4},
+                {"x":18.5, "y":4},
+                
+                {"x":0, "y":5, "w":1.25},
+                {"x":1.25, "y":5},
+                {"x":2.25, "y":5},
+                {"x":3.25, "y":5},
+                {"x":4.25, "y":5},
+                {"x":5.25, "y":5},
+                {"x":6.25, "y":5},
+                {"x":7.25, "y":5},
+                {"x":8.25, "y":5},
+                {"x":9.25, "y":5},
+                {"x":10.25, "y":5},
+                {"x":11.25, "y":5},
+                {"x":12.25, "y":5, "w":1.75},
+                {"x":14.25, "y":5.25},
+                {"x":15.5, "y":5},
+                {"x":16.5, "y":5},
+                {"x":17.5, "y":5},
+                {"x":18.5, "y":5},
+                
+                {"x":0, "y":6},
+                {"x":1, "y":6},
+                {"x":2, "y":6},
+                {"x":3, "y":6, "w":6},
+                {"x":9, "y":6},
+                {"x":10, "y":6},
+                {"x":11, "y":6},
+                {"x":12, "y":6},
+                {"x":13.25, "y":6.25},
+                {"x":14.25, "y":6.25},
+                {"x":15.25, "y":6.25},
+                {"x":16.5, "y":6},
+                {"x":17.5, "y":6},
+                {"x":18.5, "y":6}
+            ]
+        },
+        "LAYOUT_1800_ansi": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1.25, "y":0},
+                {"x":2.25, "y":0},
+                {"x":3.25, "y":0},
+                {"x":4.25, "y":0},
+                {"x":5.5, "y":0},
+                {"x":6.5, "y":0},
+                {"x":7.5, "y":0},
+                {"x":8.5, "y":0},
+                {"x":9.75, "y":0},
+                {"x":10.75, "y":0},
+                {"x":11.75, "y":0},
+                {"x":12.75, "y":0},
+                {"x":15.5, "y":0},
+                {"x":16.5, "y":0},
+                {"x":17.5, "y":0},
+                {"x":18.5, "y":0},
+                
+                {"x":15.5, "y":1},
+                {"x":16.5, "y":1},
+                {"x":17.5, "y":1},
+                {"x":18.5, "y":1},
+                
+                {"x":0, "y":2},
+                {"x":1, "y":2},
+                {"x":2, "y":2},
+                {"x":3, "y":2},
+                {"x":4, "y":2},
+                {"x":5, "y":2},
+                {"x":6, "y":2},
+                {"x":7, "y":2},
+                {"x":8, "y":2},
+                {"x":9, "y":2},
+                {"x":10, "y":2},
+                {"x":11, "y":2},
+                {"x":12, "y":2},
+                {"x":13, "y":2, "w":2},
+                {"x":15.5, "y":2},
+                {"x":16.5, "y":2},
+                {"x":17.5, "y":2},
+                {"x":18.5, "y":2},
+                
+                {"x":0, "y":3, "w":1.5},
+                {"x":1.5, "y":3},
+                {"x":2.5, "y":3},
+                {"x":3.5, "y":3},
+                {"x":4.5, "y":3},
+                {"x":5.5, "y":3},
+                {"x":6.5, "y":3},
+                {"x":7.5, "y":3},
+                {"x":8.5, "y":3},
+                {"x":9.5, "y":3},
+                {"x":10.5, "y":3},
+                {"x":11.5, "y":3},
+                {"x":12.5, "y":3},
+                {"x":13.5, "y":3, "w":1.5},
+                {"x":15.5, "y":3},
+                {"x":16.5, "y":3},
+                {"x":17.5, "y":3},
+                {"x":18.5, "y":3},
+                
+                {"x":0, "y":4, "w":1.75},
+                {"x":1.75, "y":4},
+                {"x":2.75, "y":4},
+                {"x":3.75, "y":4},
+                {"x":4.75, "y":4},
+                {"x":5.75, "y":4},
+                {"x":6.75, "y":4},
+                {"x":7.75, "y":4},
+                {"x":8.75, "y":4},
+                {"x":9.75, "y":4},
+                {"x":10.75, "y":4},
+                {"x":11.75, "y":4},
+                {"x":12.75, "y":4, "w":2.25},
+                {"x":15.5, "y":4},
+                {"x":16.5, "y":4},
+                {"x":17.5, "y":4},
+                {"x":18.5, "y":4},
+                
+                {"x":0, "y":5, "w":2.25},
+                {"x":2.25, "y":5},
+                {"x":3.25, "y":5},
+                {"x":4.25, "y":5},
+                {"x":5.25, "y":5},
+                {"x":6.25, "y":5},
+                {"x":7.25, "y":5},
+                {"x":8.25, "y":5},
+                {"x":9.25, "y":5},
+                {"x":10.25, "y":5},
+                {"x":11.25, "y":5},
+                {"x":12.25, "y":5, "w":1.75},
+                {"x":14.25, "y":5.25},
+                {"x":15.5, "y":5},
+                {"x":16.5, "y":5},
+                {"x":17.5, "y":5},
+                
+                {"x":0, "y":6},
+                {"x":1, "y":6},
+                {"x":2, "y":6},
+                {"x":3, "y":6, "w":6},
+                {"x":9, "y":6},
+                {"x":10, "y":6},
+                {"x":11, "y":6},
+                {"x":12, "y":6},
+                {"x":13.25, "y":6.25},
+                {"x":14.25, "y":6.25},
+                {"x":15.25, "y":6.25},
+                {"x":16.5, "y":6},
+                {"x":17.5, "y":6},
+                {"x":18.5, "y":5, "h":2}
+            ]
+        },
+        "LAYOUT_1800_iso": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1.25, "y":0},
+                {"x":2.25, "y":0},
+                {"x":3.25, "y":0},
+                {"x":4.25, "y":0},
+                {"x":5.5, "y":0},
+                {"x":6.5, "y":0},
+                {"x":7.5, "y":0},
+                {"x":8.5, "y":0},
+                {"x":9.75, "y":0},
+                {"x":10.75, "y":0},
+                {"x":11.75, "y":0},
+                {"x":12.75, "y":0},
+                {"x":15.5, "y":0},
+                {"x":16.5, "y":0},
+                {"x":17.5, "y":0},
+                {"x":18.5, "y":0},
+                
+                {"x":15.5, "y":1},
+                {"x":16.5, "y":1},
+                {"x":17.5, "y":1},
+                {"x":18.5, "y":1},
+                
+                {"x":0, "y":2},
+                {"x":1, "y":2},
+                {"x":2, "y":2},
+                {"x":3, "y":2},
+                {"x":4, "y":2},
+                {"x":5, "y":2},
+                {"x":6, "y":2},
+                {"x":7, "y":2},
+                {"x":8, "y":2},
+                {"x":9, "y":2},
+                {"x":10, "y":2},
+                {"x":11, "y":2},
+                {"x":12, "y":2},
+                {"x":13, "y":2, "w":2},
+                {"x":15.5, "y":2},
+                {"x":16.5, "y":2},
+                {"x":17.5, "y":2},
+                {"x":18.5, "y":2},
+                
+                {"x":0, "y":3, "w":1.5},
+                {"x":1.5, "y":3},
+                {"x":2.5, "y":3},
+                {"x":3.5, "y":3},
+                {"x":4.5, "y":3},
+                {"x":5.5, "y":3},
+                {"x":6.5, "y":3},
+                {"x":7.5, "y":3},
+                {"x":8.5, "y":3},
+                {"x":9.5, "y":3},
+                {"x":10.5, "y":3},
+                {"x":11.5, "y":3},
+                {"x":12.5, "y":3},
+                {"x":15.5, "y":3},
+                {"x":16.5, "y":3},
+                {"x":17.5, "y":3},
+                {"x":18.5, "y":3},
+                
+                {"x":0, "y":4, "w":1.75},
+                {"x":1.75, "y":4},
+                {"x":2.75, "y":4},
+                {"x":3.75, "y":4},
+                {"x":4.75, "y":4},
+                {"x":5.75, "y":4},
+                {"x":6.75, "y":4},
+                {"x":7.75, "y":4},
+                {"x":8.75, "y":4},
+                {"x":9.75, "y":4},
+                {"x":10.75, "y":4},
+                {"x":11.75, "y":4},
+                {"x":12.75, "y":4},
+                {"x":13.75, "y":3, "w":1.25, "h":2},
+                {"x":15.5, "y":4},
+                {"x":16.5, "y":4},
+                {"x":17.5, "y":4},
+                {"x":18.5, "y":4},
+                
+                {"x":0, "y":5, "w":1.25},
+                {"x":1.25, "y":5},
+                {"x":2.25, "y":5},
+                {"x":3.25, "y":5},
+                {"x":4.25, "y":5},
+                {"x":5.25, "y":5},
+                {"x":6.25, "y":5},
+                {"x":7.25, "y":5},
+                {"x":8.25, "y":5},
+                {"x":9.25, "y":5},
+                {"x":10.25, "y":5},
+                {"x":11.25, "y":5},
+                {"x":12.25, "y":5, "w":1.75},
+                {"x":14.25, "y":5.25},
+                {"x":15.5, "y":5},
+                {"x":16.5, "y":5},
+                {"x":17.5, "y":5},
+                
+                {"x":0, "y":6},
+                {"x":1, "y":6},
+                {"x":2, "y":6},
+                {"x":3, "y":6, "w":6},
+                {"x":9, "y":6},
+                {"x":10, "y":6},
+                {"x":11, "y":6},
+                {"x":12, "y":6},
+                {"x":13.25, "y":6.25},
+                {"x":14.25, "y":6.25},
+                {"x":15.25, "y":6.25},
+                {"x":16.5, "y":6},
+                {"x":17.5, "y":6},
+                {"x":18.5, "y":5, "h":2}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/qmk/keyboards/evyd13/gh80_1800/keymaps/default/keymap.c b/qmk/keyboards/evyd13/gh80_1800/keymaps/default/keymap.c
new file mode 100644
index 00000000..bbd87841
--- /dev/null
+++ b/qmk/keyboards/evyd13/gh80_1800/keymaps/default/keymap.c
@@ -0,0 +1,28 @@
+/* Copyright 2020 Evy Dekkers
+ *
+ * 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_all(
+    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_GRV, 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_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,     KC_L,     KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,              KC_P4,   KC_P5,    KC_P6,   KC_PPLS,
+    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_UP,           KC_P1,   KC_P2,    KC_P3,   KC_PPLS,
+    KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                    KC_RALT,  KC_RGUI,  KC_APP,  KC_RCTL,     KC_LEFT, KC_DOWN, KC_RGHT,         KC_P0,    KC_PDOT, KC_PENT
+  ),
+};
\ No newline at end of file
diff --git a/qmk/keyboards/evyd13/gh80_1800/keymaps/default/readme.md b/qmk/keyboards/evyd13/gh80_1800/keymaps/default/readme.md
new file mode 100644
index 00000000..c90376fe
--- /dev/null
+++ b/qmk/keyboards/evyd13/gh80_1800/keymaps/default/readme.md
@@ -0,0 +1 @@
+This is the default keymap for the GH80-1800.
diff --git a/qmk/keyboards/evyd13/gh80_1800/keymaps/via/keymap.c b/qmk/keyboards/evyd13/gh80_1800/keymaps/via/keymap.c
new file mode 100644
index 00000000..41795e1e
--- /dev/null
+++ b/qmk/keyboards/evyd13/gh80_1800/keymaps/via/keymap.c
@@ -0,0 +1,55 @@
+/* Copyright 2020 Evy Dekkers
+ *
+ * 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_all(
+    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_GRV, 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_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,     KC_L,     KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,              KC_P4,   KC_P5,    KC_P6,   KC_PPLS,
+    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_UP,           KC_P1,   KC_P2,    KC_P3,   KC_PPLS,
+    KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                    KC_RALT,  KC_RGUI,  KC_APP,  KC_RCTL,     KC_LEFT, KC_DOWN, KC_RGHT,         KC_P0,    KC_PDOT, KC_PENT
+  ),
+  [1] = LAYOUT_all(
+    _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,  _______, _______, _______,                      _______, _______,  _______, _______,
+                                                                                                                                                _______, _______,  _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,  _______, _______, _______, _______, _______,    _______, _______,  _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,  _______, _______, _______, _______,             _______, _______,  _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,  _______, _______, _______, _______,             _______, _______,  _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,  _______, _______, _______,     _______,         _______, _______,  _______, _______,
+    _______, _______, _______,                   _______,                   _______,  _______,  _______, _______,     _______, _______, _______,         _______,  _______, _______
+  ),
+  [2] = LAYOUT_all(
+    _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,  _______, _______, _______,                      _______, _______,  _______, _______,
+                                                                                                                                                _______, _______,  _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,  _______, _______, _______, _______, _______,    _______, _______,  _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,  _______, _______, _______, _______,             _______, _______,  _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,  _______, _______, _______, _______,             _______, _______,  _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,  _______, _______, _______,     _______,         _______, _______,  _______, _______,
+    _______, _______, _______,                   _______,                   _______,  _______,  _______, _______,     _______, _______, _______,         _______,  _______, _______
+  ),
+  [3] = LAYOUT_all(
+    _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,  _______, _______, _______,                      _______, _______,  _______, _______,
+                                                                                                                                                _______, _______,  _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,  _______, _______, _______, _______, _______,    _______, _______,  _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,  _______, _______, _______, _______,             _______, _______,  _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,  _______, _______, _______, _______,             _______, _______,  _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,  _______, _______, _______,     _______,         _______, _______,  _______, _______,
+    _______, _______, _______,                   _______,                   _______,  _______,  _______, _______,     _______, _______, _______,         _______,  _______, _______
+  )
+};
\ No newline at end of file
diff --git a/qmk/keyboards/evyd13/gh80_1800/keymaps/via/rules.mk b/qmk/keyboards/evyd13/gh80_1800/keymaps/via/rules.mk
new file mode 100644
index 00000000..36b7ba9c
--- /dev/null
+++ b/qmk/keyboards/evyd13/gh80_1800/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/qmk/keyboards/evyd13/gh80_1800/readme.md b/qmk/keyboards/evyd13/gh80_1800/readme.md
new file mode 100644
index 00000000..fd392988
--- /dev/null
+++ b/qmk/keyboards/evyd13/gh80_1800/readme.md
@@ -0,0 +1,13 @@
+# GH80-1800
+
+## Support
+* Keyboard Maintainer: [Evyd13](https://github.com/evyd13)
+* Hardware Supported: GH80-1800
+* Hardware Availability: [Open source on GitHub](https://github.com/evyd13/gh80-series/tree/master/GH80-1800)
+
+## Build
+Make example for this keyboard (after setting up your build environment):
+
+    make evyd13/gh80_1800: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).
\ No newline at end of file
diff --git a/qmk/keyboards/evyd13/gh80_1800/rules.mk b/qmk/keyboards/evyd13/gh80_1800/rules.mk
new file mode 100644
index 00000000..eaca8443
--- /dev/null
+++ b/qmk/keyboards/evyd13/gh80_1800/rules.mk
@@ -0,0 +1,21 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = qmk-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = yes        # Console for debug
+COMMAND_ENABLE = no         # 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
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
diff --git a/qmk/keyboards/evyd13/gh80_3700/config.h b/qmk/keyboards/evyd13/gh80_3700/config.h
new file mode 100644
index 00000000..200f179c
--- /dev/null
+++ b/qmk/keyboards/evyd13/gh80_3700/config.h
@@ -0,0 +1,143 @@
+/* Copyright 2020 Evy Dekkers
+ *
+ * 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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x4705
+#define PRODUCT_ID      0x633A
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Evyd13
+#define PRODUCT         GH80 3700
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 4
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+*/
+#define MATRIX_ROW_PINS {B3,C7,C6,B6,B5,B4}
+#define MATRIX_COL_PINS {B0,D7,D6,D4}
+#define UNUSED_PINS {}
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+// #define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6
+
+// #define BACKLIGHT_PIN B7
+// #define BACKLIGHT_BREATHING
+// #define BACKLIGHT_LEVELS 3
+
+// #define RGB_DI_PIN B2
+// #ifdef RGB_DI_PIN
+//   #define RGBLED_NUM 8
+//   #define RGBLIGHT_HUE_STEP 8
+//   #define RGBLIGHT_SAT_STEP 8
+//   #define RGBLIGHT_VAL_STEP 8
+//   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+//   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+// /*== all animations enable ==*/
+//   #define RGBLIGHT_ANIMATIONS
+// /*== or choose animations ==*/
+//   #define RGBLIGHT_EFFECT_BREATHING
+//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
+//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+//   #define RGBLIGHT_EFFECT_SNAKE
+//   #define RGBLIGHT_EFFECT_KNIGHT
+//   #define RGBLIGHT_EFFECT_CHRISTMAS
+//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
+//   #define RGBLIGHT_EFFECT_RGB_TEST
+//   #define RGBLIGHT_EFFECT_ALTERNATING
+// /*== customize breathing effect ==*/
+//   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+//   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+//   /*==== use exp() and sin() ====*/
+//   #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//   #define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+// #endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is userful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+// #define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+//#define NO_ACTION_MACRO
+//#define NO_ACTION_FUNCTION
+
+// Define rotary encoder
+#define ENCODERS_PAD_A { F1 }
+#define ENCODERS_PAD_B { F4 }
diff --git a/qmk/keyboards/evyd13/gh80_3700/gh80_3700.c b/qmk/keyboards/evyd13/gh80_3700/gh80_3700.c
new file mode 100644
index 00000000..f607a440
--- /dev/null
+++ b/qmk/keyboards/evyd13/gh80_3700/gh80_3700.c
@@ -0,0 +1,46 @@
+/* Copyright 2020 Evy Dekkers
+ *
+ * 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 "gh80_3700.h"
+
+void matrix_init_kb(void) {
+  // put your keyboard start-up code here
+  // runs once when the firmware starts up
+
+  matrix_init_user();
+  led_init_ports();
+}
+
+void led_init_ports(void) {
+  setPinOutput(E6);
+  setPinOutput(B1);
+  setPinOutput(D0);
+  setPinOutput(D1);
+  setPinOutput(F0);
+  
+  writePinHigh(E6);
+  writePinHigh(B1);
+  writePinHigh(D0);
+  writePinHigh(D1);
+  writePinHigh(F0);
+}
+
+bool led_update_kb(led_t led_state) {
+  if(led_update_user(led_state)) {
+    writePin(E6, !led_state.num_lock);
+  }
+
+  return true;
+}
\ No newline at end of file
diff --git a/qmk/keyboards/evyd13/gh80_3700/gh80_3700.h b/qmk/keyboards/evyd13/gh80_3700/gh80_3700.h
new file mode 100644
index 00000000..4a350a95
--- /dev/null
+++ b/qmk/keyboards/evyd13/gh80_3700/gh80_3700.h
@@ -0,0 +1,63 @@
+/* Copyright 2020 Evy Dekkers
+ *
+ * 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 first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+
+#define LAYOUT_all LAYOUT_ortho_6x4
+
+#define LAYOUT_ortho_6x4( \
+    k00, k01, k02, k03, \
+    k10, k11, k12, k13, \
+    k20, k21, k22, k23, \
+    k30, k31, k32, k33, \
+    k40, k41, k42, k43, \
+    k50, k51, k52, k53  \
+) \
+{ \
+    { k00, k01, k02, k03 }, \
+    { k10, k11, k12, k13 }, \
+    { k20, k21, k22, k23 }, \
+    { k30, k31, k32, k33 }, \
+    { k40, k41, k42, k43 }, \
+    { k50, k51, k52, k53 }  \
+}
+
+#define LAYOUT_numpad_6x4( \
+    k00, k01, k02, k03,    \
+    k10, k11, k12, k13,    \
+    k20, k21, k22,         \
+    k30, k31, k32, k33,    \
+    k40, k41, k42,         \
+    k50,      k52, k53     \
+) \
+{ \
+    { k00, k01, k02, k03 },   \
+    { k10, k11, k12, k13 },   \
+    { k20, k21, k22, KC_NO }, \
+    { k30, k31, k32, k33 },   \
+    { k40, k41, k42, KC_NO }, \
+    { k50, KC_NO, k52, k53 }  \
+}
diff --git a/qmk/keyboards/evyd13/gh80_3700/info.json b/qmk/keyboards/evyd13/gh80_3700/info.json
new file mode 100644
index 00000000..9f3ff6e5
--- /dev/null
+++ b/qmk/keyboards/evyd13/gh80_3700/info.json
@@ -0,0 +1,72 @@
+{
+    "keyboard_name": "GH80-3700", 
+    "url": "https://github.com/evyd13/gh80-series/tree/master/GH80-3700", 
+    "maintainer": "evyd13", 
+    "width": 4, 
+    "height": 7, 
+    "layouts": {
+        "LAYOUT_ortho_6x4": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                
+                {"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},
+                
+                {"x":0, "y":4},
+                {"x":1, "y":4},
+                {"x":2, "y":4},
+                {"x":3, "y":4},
+                
+                {"x":0, "y":5},
+                {"x":1, "y":5},
+                {"x":2, "y":5}, 
+                {"x":3, "y":5},
+                
+                {"x":0, "y":6},
+                {"x":1, "y":6},
+                {"x":2, "y":6},
+                {"x":3, "y":6}
+            ]
+        },
+        "LAYOUT_numpad_6x4": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+
+                {"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":0, "y":4},
+                {"x":1, "y":4},
+                {"x":2, "y":4},
+                {"x":3, "y":3, "h":2},
+
+                {"x":0, "y":5},
+                {"x":1, "y":5},
+                {"x":2, "y":5},
+
+                {"x":0, "y":6, "w":2},
+                {"x":2, "y":6},
+                {"x":3, "y":5, "h":2}
+            ]
+        }
+    }
+}
diff --git a/qmk/keyboards/evyd13/gh80_3700/keymaps/default/keymap.c b/qmk/keyboards/evyd13/gh80_3700/keymaps/default/keymap.c
new file mode 100644
index 00000000..52dc4821
--- /dev/null
+++ b/qmk/keyboards/evyd13/gh80_3700/keymaps/default/keymap.c
@@ -0,0 +1,26 @@
+/* Copyright 2020 Evy Dekkers
+ *
+ * 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_ortho_6x4(
+  KC_ESC,   KC_TAB,   KC_EQL,   KC_BSPC,
+  KC_NLCK,  KC_PSLS,  KC_PAST,  KC_PMNS,
+  KC_P7,    KC_P8,    KC_P9,    KC_PPLS,
+  KC_P4,    KC_P5,    KC_P6,    KC_PPLS,
+  KC_P1,    KC_P2,    KC_P3,    KC_PENT,
+  KC_P0,    KC_P0,    KC_PDOT,  KC_PENT),
+};
diff --git a/qmk/keyboards/evyd13/gh80_3700/keymaps/default/readme.md b/qmk/keyboards/evyd13/gh80_3700/keymaps/default/readme.md
new file mode 100644
index 00000000..8e123219
--- /dev/null
+++ b/qmk/keyboards/evyd13/gh80_3700/keymaps/default/readme.md
@@ -0,0 +1 @@
+This is the default keymap for the GH80-3700.
diff --git a/qmk/keyboards/evyd13/gh80_3700/keymaps/ps2/config.h b/qmk/keyboards/evyd13/gh80_3700/keymaps/ps2/config.h
new file mode 100644
index 00000000..44ac7dcd
--- /dev/null
+++ b/qmk/keyboards/evyd13/gh80_3700/keymaps/ps2/config.h
@@ -0,0 +1,69 @@
+/* Copyright 2020 Evy Dekkers
+ *
+ * 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
+
+#ifdef PS2_USE_USART
+#define PS2_CLOCK_PORT  PORTD
+#define PS2_CLOCK_PIN   PIND
+#define PS2_CLOCK_DDR   DDRD
+#define PS2_CLOCK_BIT   5
+#define PS2_DATA_PORT   PORTD
+#define PS2_DATA_PIN    PIND
+#define PS2_DATA_DDR    DDRD
+#define PS2_DATA_BIT    2
+
+/* synchronous, odd parity, 1-bit stop, 8-bit data, sample at falling edge */
+/* set DDR of CLOCK as input to be slave */
+#define PS2_USART_INIT() do {   \
+    PS2_CLOCK_DDR &= ~(1<<PS2_CLOCK_BIT);   \
+    PS2_DATA_DDR &= ~(1<<PS2_DATA_BIT);     \
+    UCSR1C = ((1 << UMSEL10) |  \
+              (3 << UPM10)   |  \
+              (0 << USBS1)   |  \
+              (3 << UCSZ10)  |  \
+              (0 << UCPOL1));   \
+    UCSR1A = 0;                 \
+    UBRR1H = 0;                 \
+    UBRR1L = 0;                 \
+} while (0)
+#define PS2_USART_RX_INT_ON() do {  \
+    UCSR1B = ((1 << RXCIE1) |       \
+              (1 << RXEN1));        \
+} while (0)
+#define PS2_USART_RX_POLL_ON() do { \
+    UCSR1B = (1 << RXEN1);          \
+} while (0)
+#define PS2_USART_OFF() do {    \
+    UCSR1C = 0;                 \
+    UCSR1B &= ~((1 << RXEN1) |  \
+                (1 << TXEN1));  \
+} while (0)
+#define PS2_USART_RX_READY      (UCSR1A & (1<<RXC1))
+#define PS2_USART_RX_DATA       UDR1
+#define PS2_USART_ERROR         (UCSR1A & ((1<<FE1) | (1<<DOR1) | (1<<UPE1)))
+#define PS2_USART_RX_VECT       USART1_RX_vect
+#define PS2_MOUSE_ENABLE_SCROLLING
+#define PS2_MOUSE_INIT_DELAY 1000 
+#define PS2_MOUSE_BTN_LEFT      0
+#define PS2_MOUSE_BTN_RIGHT     1
+#define PS2_MOUSE_BTN_MIDDLE    2
+#define PS2_MOUSE_X_MULTIPLIER 2
+#define PS2_MOUSE_Y_MULTIPLIER 2
+#define PS2_MOUSE_V_MULTIPLIER 1
+#define PS2_MOUSE_SCROLL_BTN_MASK 0
+#define PS2_MOUSE_USE_REMOTE_MODE
+#endif
diff --git a/qmk/keyboards/evyd13/gh80_3700/keymaps/ps2/keymap.c b/qmk/keyboards/evyd13/gh80_3700/keymaps/ps2/keymap.c
new file mode 100644
index 00000000..52dc4821
--- /dev/null
+++ b/qmk/keyboards/evyd13/gh80_3700/keymaps/ps2/keymap.c
@@ -0,0 +1,26 @@
+/* Copyright 2020 Evy Dekkers
+ *
+ * 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_ortho_6x4(
+  KC_ESC,   KC_TAB,   KC_EQL,   KC_BSPC,
+  KC_NLCK,  KC_PSLS,  KC_PAST,  KC_PMNS,
+  KC_P7,    KC_P8,    KC_P9,    KC_PPLS,
+  KC_P4,    KC_P5,    KC_P6,    KC_PPLS,
+  KC_P1,    KC_P2,    KC_P3,    KC_PENT,
+  KC_P0,    KC_P0,    KC_PDOT,  KC_PENT),
+};
diff --git a/qmk/keyboards/evyd13/gh80_3700/keymaps/ps2/readme.md b/qmk/keyboards/evyd13/gh80_3700/keymaps/ps2/readme.md
new file mode 100644
index 00000000..d434753b
--- /dev/null
+++ b/qmk/keyboards/evyd13/gh80_3700/keymaps/ps2/readme.md
@@ -0,0 +1 @@
+This is a keymap for the GH80-3700 with PS/2 mouse functionality enabled.
\ No newline at end of file
diff --git a/qmk/keyboards/evyd13/gh80_3700/keymaps/ps2/rules.mk b/qmk/keyboards/evyd13/gh80_3700/keymaps/ps2/rules.mk
new file mode 100644
index 00000000..c58a93b7
--- /dev/null
+++ b/qmk/keyboards/evyd13/gh80_3700/keymaps/ps2/rules.mk
@@ -0,0 +1,5 @@
+# Build Options
+#   change yes to no to disable
+#
+PS2_MOUSE_ENABLE = yes
+PS2_USE_USART = yes
diff --git a/qmk/keyboards/evyd13/gh80_3700/keymaps/rgb/config.h b/qmk/keyboards/evyd13/gh80_3700/keymaps/rgb/config.h
new file mode 100644
index 00000000..1def6cc3
--- /dev/null
+++ b/qmk/keyboards/evyd13/gh80_3700/keymaps/rgb/config.h
@@ -0,0 +1,21 @@
+/* Copyright 2020 Evy Dekkers
+ *
+ * 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
+
+#define RGB_DI_PIN B2
+#define RGBLED_NUM 8
+#define RGBLIGHT_ANIMATIONS
diff --git a/qmk/keyboards/evyd13/gh80_3700/keymaps/rgb/keymap.c b/qmk/keyboards/evyd13/gh80_3700/keymaps/rgb/keymap.c
new file mode 100644
index 00000000..52dc4821
--- /dev/null
+++ b/qmk/keyboards/evyd13/gh80_3700/keymaps/rgb/keymap.c
@@ -0,0 +1,26 @@
+/* Copyright 2020 Evy Dekkers
+ *
+ * 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_ortho_6x4(
+  KC_ESC,   KC_TAB,   KC_EQL,   KC_BSPC,
+  KC_NLCK,  KC_PSLS,  KC_PAST,  KC_PMNS,
+  KC_P7,    KC_P8,    KC_P9,    KC_PPLS,
+  KC_P4,    KC_P5,    KC_P6,    KC_PPLS,
+  KC_P1,    KC_P2,    KC_P3,    KC_PENT,
+  KC_P0,    KC_P0,    KC_PDOT,  KC_PENT),
+};
diff --git a/qmk/keyboards/evyd13/gh80_3700/keymaps/rgb/readme.md b/qmk/keyboards/evyd13/gh80_3700/keymaps/rgb/readme.md
new file mode 100644
index 00000000..cac017f4
--- /dev/null
+++ b/qmk/keyboards/evyd13/gh80_3700/keymaps/rgb/readme.md
@@ -0,0 +1 @@
+This is a keymap for the GH80-3700 with RGB enabled.
diff --git a/qmk/keyboards/evyd13/gh80_3700/keymaps/rgb/rules.mk b/qmk/keyboards/evyd13/gh80_3700/keymaps/rgb/rules.mk
new file mode 100644
index 00000000..06d70d58
--- /dev/null
+++ b/qmk/keyboards/evyd13/gh80_3700/keymaps/rgb/rules.mk
@@ -0,0 +1,4 @@
+# Build Options
+#   change yes to no to disable
+#
+RGBLIGHT_ENABLE = yes
diff --git a/qmk/keyboards/evyd13/gh80_3700/keymaps/via/keymap.c b/qmk/keyboards/evyd13/gh80_3700/keymaps/via/keymap.c
new file mode 100644
index 00000000..aaf461e7
--- /dev/null
+++ b/qmk/keyboards/evyd13/gh80_3700/keymaps/via/keymap.c
@@ -0,0 +1,50 @@
+/* Copyright 2020 Evy Dekkers
+ *
+ * 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_ortho_6x4(
+  KC_ESC,   KC_TAB,   KC_EQL,   KC_BSPC,
+  KC_NLCK,  KC_PSLS,  KC_PAST,  KC_PMNS,
+  KC_P7,    KC_P8,    KC_P9,    KC_PPLS,
+  KC_P4,    KC_P5,    KC_P6,    KC_PPLS,
+  KC_P1,    KC_P2,    KC_P3,    KC_PENT,
+  KC_P0,    KC_P0,    KC_PDOT,  KC_PENT),
+  
+[1] = LAYOUT_ortho_6x4(
+  _______,  _______,  _______,  _______,
+  _______,  _______,  _______,  _______,
+  _______,  _______,  _______,  _______,
+  _______,  _______,  _______,  _______,
+  _______,  _______,  _______,  _______,
+  _______,  _______,  _______,  _______),
+  
+[2] = LAYOUT_ortho_6x4(
+  _______,  _______,  _______,  _______,
+  _______,  _______,  _______,  _______,
+  _______,  _______,  _______,  _______,
+  _______,  _______,  _______,  _______,
+  _______,  _______,  _______,  _______,
+  _______,  _______,  _______,  _______),
+  
+[3] = LAYOUT_ortho_6x4(
+  _______,  _______,  _______,  _______,
+  _______,  _______,  _______,  _______,
+  _______,  _______,  _______,  _______,
+  _______,  _______,  _______,  _______,
+  _______,  _______,  _______,  _______,
+  _______,  _______,  _______,  _______),
+};
diff --git a/qmk/keyboards/evyd13/gh80_3700/keymaps/via/rules.mk b/qmk/keyboards/evyd13/gh80_3700/keymaps/via/rules.mk
new file mode 100644
index 00000000..36b7ba9c
--- /dev/null
+++ b/qmk/keyboards/evyd13/gh80_3700/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/qmk/keyboards/evyd13/gh80_3700/readme.md b/qmk/keyboards/evyd13/gh80_3700/readme.md
new file mode 100644
index 00000000..11366f9a
--- /dev/null
+++ b/qmk/keyboards/evyd13/gh80_3700/readme.md
@@ -0,0 +1,15 @@
+# GH80-3700
+
+![GH80-3700](https://i.imgur.com/xMCzb8vl.jpg)
+
+## Support
+* Keyboard Maintainer: [Evyd13](https://github.com/evyd13)
+* Hardware Supported: GH80-3700 PCB
+* Hardware Availability: [maartenwut.com](https://maartenwut.com/product/gh80-3700-numpad-pcb/)
+
+## Build
+Make example for this keyboard (after setting up your build environment):
+
+    make evyd13/gh80_3700: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).
\ No newline at end of file
diff --git a/qmk/keyboards/evyd13/gh80_3700/rules.mk b/qmk/keyboards/evyd13/gh80_3700/rules.mk
new file mode 100644
index 00000000..01ea4754
--- /dev/null
+++ b/qmk/keyboards/evyd13/gh80_3700/rules.mk
@@ -0,0 +1,24 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = qmk-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # 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
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+ENCODER_ENABLE = yes        # Enable support for rotary encoders
+
+LAYOUTS = numpad_6x4 ortho_6x4
diff --git a/qmk/keyboards/evyd13/minitomic/config.h b/qmk/keyboards/evyd13/minitomic/config.h
new file mode 100644
index 00000000..e6b9c80c
--- /dev/null
+++ b/qmk/keyboards/evyd13/minitomic/config.h
@@ -0,0 +1,224 @@
+/* Copyright 2019 Evy Dekkers
+ *
+ * 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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x4705
+#define PRODUCT_ID      0x0145
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Evyd13
+#define PRODUCT         Minitomic
+#define DESCRIPTION     A 45% staggered keyboard
+
+/* key matrix size */
+#define MATRIX_ROWS 4
+#define MATRIX_COLS 13
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+*/
+#define MATRIX_ROW_PINS {B1,B3,D4,D6}
+#define MATRIX_COL_PINS {C6,B6,B5,B4,D7,F0,F1,F4,F5,F6,F7,B7,E6}
+#define UNUSED_PINS {B2,D0,D1,D2,D3,D5}
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+// #define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6
+
+// #define BACKLIGHT_PIN B7
+// #define BACKLIGHT_BREATHING
+// #define BACKLIGHT_LEVELS 3
+
+// #define RGB_DI_PIN E2
+// #ifdef RGB_DI_PIN
+//   #define RGBLED_NUM 16
+//   #define RGBLIGHT_HUE_STEP 8
+//   #define RGBLIGHT_SAT_STEP 8
+//   #define RGBLIGHT_VAL_STEP 8
+//   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+//   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+// /*== all animations enable ==*/
+//   #define RGBLIGHT_ANIMATIONS
+// /*== or choose animations ==*/
+//   #define RGBLIGHT_EFFECT_BREATHING
+//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
+//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+//   #define RGBLIGHT_EFFECT_SNAKE
+//   #define RGBLIGHT_EFFECT_KNIGHT
+//   #define RGBLIGHT_EFFECT_CHRISTMAS
+//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
+//   #define RGBLIGHT_EFFECT_RGB_TEST
+//   #define RGBLIGHT_EFFECT_ALTERNATING
+// /*== customize breathing effect ==*/
+//   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+//   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+//   /*==== use exp() and sin() ====*/
+//   #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//   #define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+// #endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is userful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+// #define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Magic Key Options
+ *
+ * Magic keys are hotkey commands that allow control over firmware functions of
+ * the keyboard. They are best used in combination with the HID Listen program,
+ * found here: https://www.pjrc.com/teensy/hid_listen.html
+ *
+ * The options below allow the magic key functionality to be changed. This is
+ * useful if your keyboard/keypad is missing keys and you want magic key support.
+ *
+ */
+
+/* key combination for magic key command */
+/* defined by default; to change, uncomment and set to the combination you want */
+// #define IS_COMMAND() (get_mods() == MOD_MASK_SHIFT)
+
+/* control how magic key switches layers */
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS  true
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS  true
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false
+
+/* override magic key keymap */
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM
+//#define MAGIC_KEY_HELP           H
+//#define MAGIC_KEY_HELP_ALT       SLASH
+//#define MAGIC_KEY_DEBUG          D
+//#define MAGIC_KEY_DEBUG_MATRIX   X
+//#define MAGIC_KEY_DEBUG_KBD      K
+//#define MAGIC_KEY_DEBUG_MOUSE    M
+//#define MAGIC_KEY_VERSION        V
+//#define MAGIC_KEY_STATUS         S
+//#define MAGIC_KEY_CONSOLE        C
+//#define MAGIC_KEY_LAYER0         0
+//#define MAGIC_KEY_LAYER0_ALT     GRAVE
+//#define MAGIC_KEY_LAYER1         1
+//#define MAGIC_KEY_LAYER2         2
+//#define MAGIC_KEY_LAYER3         3
+//#define MAGIC_KEY_LAYER4         4
+//#define MAGIC_KEY_LAYER5         5
+//#define MAGIC_KEY_LAYER6         6
+//#define MAGIC_KEY_LAYER7         7
+//#define MAGIC_KEY_LAYER8         8
+//#define MAGIC_KEY_LAYER9         9
+//#define MAGIC_KEY_BOOTLOADER     B
+//#define MAGIC_KEY_BOOTLOADER_ALT ESC
+//#define MAGIC_KEY_LOCK           CAPS
+//#define MAGIC_KEY_EEPROM         E
+//#define MAGIC_KEY_EEPROM_CLEAR   BSPACE
+//#define MAGIC_KEY_NKRO           N
+//#define MAGIC_KEY_SLEEP_LED      Z
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+//#define NO_ACTION_MACRO
+//#define NO_ACTION_FUNCTION
+
+/*
+ * MIDI options
+ */
+
+/* Prevent use of disabled MIDI features in the keymap */
+//#define MIDI_ENABLE_STRICT 1
+
+/* enable basic MIDI features:
+   - MIDI notes can be sent when in Music mode is on
+*/
+//#define MIDI_BASIC
+
+/* enable advanced MIDI features:
+   - MIDI notes can be added to the keymap
+   - Octave shift and transpose
+   - Virtual sustain, portamento, and modulation wheel
+   - etc.
+*/
+//#define MIDI_ADVANCED
+
+/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
+//#define MIDI_TONE_KEYCODE_OCTAVES 1
+
+/* Bootmagic Lite key configuration */
+// #define BOOTMAGIC_LITE_ROW 0
+// #define BOOTMAGIC_LITE_COLUMN 0
+
+#define QMK_ESC_OUTPUT C6 // usually COL
+#define QMK_ESC_INPUT B1 // usually ROW
+#define QMK_LED C7
diff --git a/qmk/keyboards/evyd13/minitomic/info.json b/qmk/keyboards/evyd13/minitomic/info.json
new file mode 100644
index 00000000..4af72b36
--- /dev/null
+++ b/qmk/keyboards/evyd13/minitomic/info.json
@@ -0,0 +1,15 @@
+{
+  "keyboard_name": "Minitomic", 
+  "url": "", 
+  "maintainer": "qmk", 
+  "width": 13, 
+  "height": 4, 
+  "layouts": {
+    "LAYOUT_split_space": {
+      "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":0, "y":1, "w":1.25}, {"x":1.25, "y":1}, {"x":2.25, "y":1}, {"x":3.25, "y":1}, {"x":4.25, "y":1}, {"x":5.25, "y":1}, {"x":6.25, "y":1}, {"x":7.25, "y":1}, {"x":8.25, "y":1}, {"x":9.25, "y":1}, {"x":10.25, "y":1}, {"x":11.25, "y":1, "w":1.75}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2, "w":1.25}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3, "w":1.25}, {"x":2.5, "y":3}, {"x":3.5, "y":3}, {"x":4.5, "y":3, "w":1.75}, {"x":6.25, "y":3, "w":2}, {"x":8.25, "y":3}, {"x":9.25, "y":3, "w":1.25}, {"x":10.5, "y":3, "w":1.25}, {"x":11.75, "y":3, "w":1.25}]
+    },
+    "LAYOUT_full_space": {
+      "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":0, "y":1, "w":1.25}, {"x":1.25, "y":1}, {"x":2.25, "y":1}, {"x":3.25, "y":1}, {"x":4.25, "y":1}, {"x":5.25, "y":1}, {"x":6.25, "y":1}, {"x":7.25, "y":1}, {"x":8.25, "y":1}, {"x":9.25, "y":1}, {"x":10.25, "y":1}, {"x":11.25, "y":1, "w":1.75}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2, "w":1.25}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3, "w":6.25}, {"x":9.5, "y":3}, {"x":10.5, "y":3, "w":1.25}, {"x":11.75, "y":3, "w":1.25}]
+    }
+  }
+}
diff --git a/qmk/keyboards/evyd13/minitomic/keymaps/default/keymap.c b/qmk/keyboards/evyd13/minitomic/keymaps/default/keymap.c
new file mode 100644
index 00000000..74c1e502
--- /dev/null
+++ b/qmk/keyboards/evyd13/minitomic/keymaps/default/keymap.c
@@ -0,0 +1,46 @@
+/* Copyright 2019 Evy Dekkers
+ *
+ * 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
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+
+#define _MA 0 //Main layer
+#define _LO 1 //Low
+#define _HI 2 //High
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[_MA] = LAYOUT_split_space(
+  KC_GESC,  KC_Q,     KC_W,        KC_E,        KC_R,        KC_T,        KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_DEL,    KC_BSPC,   \
+  KC_TAB,   KC_A,     KC_S,        KC_D,        KC_F,        KC_G,        KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,             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_LCTL,  KC_LGUI,  KC_LALT,     MO(_LO),                  KC_SPC,                KC_SPC,             MO(_HI),  KC_RALT,  KC_APP,    KC_RCTRL), \
+
+[_LO] = LAYOUT_split_space(
+  KC_GRV,   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_1,     KC_2,     KC_3,        KC_4,        KC_5,        KC_6,        KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,             KC_EQL,    \
+  _______,            LCTL(KC_Z),  LCTL(KC_X),  LCTL(KC_C),	 LCTL(KC_V),  _______,  _______,  KC_QUOT,  KC_LBRC,  KC_RBRC,  KC_BSLS,   _______,   \
+  _______,  _______,  _______,     _______,                  _______,               _______,            _______,  _______,  _______,   RESET),    \
+
+[_HI] = LAYOUT_split_space(
+  _______,  _______,  _______,     _______,     _______,     _______,     _______,  KC_PGUP,  KC_UP,    KC_PGDN,  _______,  _______,   _______,   \
+  KC_CAPS,  _______,  _______,     _______,     _______,     _______,     _______,  KC_LEFT,  KC_DOWN,  KC_RIGHT, _______,             _______,   \
+  _______,            _______,     _______,     _______,     _______,     _______,  _______,  _______,  KC_VOLD,  KC_VOLU,  KC_MPLY,   KC_PSCR,   \
+  _______,  _______,  _______,     _______,                  _______,               _______,            _______,  _______,  _______,   _______),  \
+
+};
\ No newline at end of file
diff --git a/qmk/keyboards/evyd13/minitomic/keymaps/default/readme.md b/qmk/keyboards/evyd13/minitomic/keymaps/default/readme.md
new file mode 100644
index 00000000..0ec508ff
--- /dev/null
+++ b/qmk/keyboards/evyd13/minitomic/keymaps/default/readme.md
@@ -0,0 +1 @@
+This is the default keymap for the Minitomic.
diff --git a/qmk/keyboards/evyd13/minitomic/minitomic.c b/qmk/keyboards/evyd13/minitomic/minitomic.c
new file mode 100644
index 00000000..8d5f11a5
--- /dev/null
+++ b/qmk/keyboards/evyd13/minitomic/minitomic.c
@@ -0,0 +1,50 @@
+/* Copyright 2019 Evy Dekkers
+ *
+ * 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 "minitomic.h"
+
+void matrix_init_kb(void) {
+  // put your keyboard start-up code here
+  // runs once when the firmware starts up
+
+    matrix_init_user();
+    led_init_ports();
+}
+
+void matrix_scan_kb(void) {
+  // put your looping keyboard code here
+  // runs every cycle (a lot)
+
+    matrix_scan_user();
+}
+
+void led_init_ports(void) {
+	//Set led pin as output, then high (off)
+    writePinHigh(C7);
+}
+
+bool led_update_kb(led_t led_state) {
+    bool res = led_update_user(led_state);
+    if(res) {
+        // writePin sets the pin high for 1 and low for 0.
+        // In this example the pins are inverted, setting
+        // it low/0 turns it on, and high/1 turns the LED off.
+        // This behavior depends on whether the LED is between the pin
+        // and VCC or the pin and GND.
+        writePin(C7, !led_state.caps_lock);
+    }
+    return res;
+}
+
diff --git a/qmk/keyboards/evyd13/minitomic/minitomic.h b/qmk/keyboards/evyd13/minitomic/minitomic.h
new file mode 100644
index 00000000..da98ebcf
--- /dev/null
+++ b/qmk/keyboards/evyd13/minitomic/minitomic.h
@@ -0,0 +1,53 @@
+/* Copyright 2019 Evy Dekkers
+ *
+ * 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 XXX KC_NO
+
+/* This a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT_split_space( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,    \
+    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,      k36,      k37, k39, k3a, k3b     \
+) \
+{ \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, XXX }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX }, \
+    { k30, k31, k32, k33, k34, XXX, k36, k37, XXX, k39, k3a, k3b, XXX }  \
+}
+
+#define LAYOUT_full_space( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,    \
+    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,                k36,                k39, k3a, k3b     \
+) \
+{ \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, XXX }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX }, \
+    { k30, k31, k32, XXX, XXX, XXX, k36, XXX, XXX, k39, k3a, k3b, XXX }  \
+}
diff --git a/qmk/keyboards/evyd13/minitomic/readme.md b/qmk/keyboards/evyd13/minitomic/readme.md
new file mode 100644
index 00000000..f4330d4d
--- /dev/null
+++ b/qmk/keyboards/evyd13/minitomic/readme.md
@@ -0,0 +1,23 @@
+# Minitomic
+
+![Minitomic](https://i.imgur.com/wGtNokW.jpg)
+
+## Support
+* Keyboard Maintainer: [Evyd13](https://github.com/evyd13)
+* Hardware Supported: Minitomic
+* Hardware Availability: [maartenwut.com](https://maartenwut.com)
+
+
+## Features
+- QMK Firmware  
+- European switch spacing (19mm)  
+- USB-C Connector  
+- Capslock indicator under tab key  
+- Reset button under left shift key  
+
+## Build
+Make example for this keyboard (after setting up your build environment):
+
+    make evyd13/minitomic: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).
\ No newline at end of file
diff --git a/qmk/keyboards/evyd13/minitomic/rules.mk b/qmk/keyboards/evyd13/minitomic/rules.mk
new file mode 100644
index 00000000..aac492de
--- /dev/null
+++ b/qmk/keyboards/evyd13/minitomic/rules.mk
@@ -0,0 +1,32 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+#   Teensy       halfkay
+#   Pro Micro    caterina
+#   Atmel DFU    atmel-dfu
+#   LUFA DFU     lufa-dfu
+#   QMK DFU      qmk-dfu
+#   ATmega32A    bootloadHID
+#   ATmega328P   USBasp
+BOOTLOADER = qmk-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = yes        # Console for debug
+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
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+MIDI_ENABLE = no            # MIDI support
+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
diff --git a/qmk/keyboards/evyd13/mx5160/config.h b/qmk/keyboards/evyd13/mx5160/config.h
new file mode 100644
index 00000000..0b403e3a
--- /dev/null
+++ b/qmk/keyboards/evyd13/mx5160/config.h
@@ -0,0 +1,224 @@
+/* Copyright 2019 Evy Dekkers
+ *
+ * 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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x4705
+#define PRODUCT_ID      0x5160
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Evyd13
+#define PRODUCT         MX-5160
+#define DESCRIPTION     Replacement PCB for the Chicony 5160c
+
+/* key matrix size */
+#define MATRIX_ROWS 10
+#define MATRIX_COLS 10
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+*/
+#define MATRIX_ROW_PINS {C6,C7,B5,B6,D7,B4,D4,D6,D5,D3}
+#define MATRIX_COL_PINS {D0,D1,D2,F7,F6,F5,F4,F1,F0,E6}
+#define UNUSED_PINS {B7,B0}
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION ROW2COL
+
+// For QMK DFU
+#define QMK_ESC_OUTPUT C6
+#define QMK_ESC_INPUT D1
+#define QMK_LED B1
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+// #define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6
+
+// #define BACKLIGHT_PIN B7
+// #define BACKLIGHT_BREATHING
+// #define BACKLIGHT_LEVELS 3
+
+// #define RGB_DI_PIN E2
+// #ifdef RGB_DI_PIN
+//   #define RGBLED_NUM 16
+//   #define RGBLIGHT_HUE_STEP 8
+//   #define RGBLIGHT_SAT_STEP 8
+//   #define RGBLIGHT_VAL_STEP 8
+//   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+//   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+// /*== all animations enable ==*/
+//   #define RGBLIGHT_ANIMATIONS
+// /*== or choose animations ==*/
+//   #define RGBLIGHT_EFFECT_BREATHING
+//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
+//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+//   #define RGBLIGHT_EFFECT_SNAKE
+//   #define RGBLIGHT_EFFECT_KNIGHT
+//   #define RGBLIGHT_EFFECT_CHRISTMAS
+//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
+//   #define RGBLIGHT_EFFECT_RGB_TEST
+//   #define RGBLIGHT_EFFECT_ALTERNATING
+// /*== customize breathing effect ==*/
+//   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+//   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+//   /*==== use exp() and sin() ====*/
+//   #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//   #define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+// #endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is userful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+// #define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Magic Key Options
+ *
+ * Magic keys are hotkey commands that allow control over firmware functions of
+ * the keyboard. They are best used in combination with the HID Listen program,
+ * found here: https://www.pjrc.com/teensy/hid_listen.html
+ *
+ * The options below allow the magic key functionality to be changed. This is
+ * useful if your keyboard/keypad is missing keys and you want magic key support.
+ *
+ */
+
+/* key combination for magic key command */
+/* defined by default; to change, uncomment and set to the combination you want */
+// #define IS_COMMAND() (get_mods() == MOD_MASK_SHIFT)
+
+/* control how magic key switches layers */
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS  true
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS  true
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false
+
+/* override magic key keymap */
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM
+//#define MAGIC_KEY_HELP           H
+//#define MAGIC_KEY_HELP_ALT       SLASH
+//#define MAGIC_KEY_DEBUG          D
+//#define MAGIC_KEY_DEBUG_MATRIX   X
+//#define MAGIC_KEY_DEBUG_KBD      K
+//#define MAGIC_KEY_DEBUG_MOUSE    M
+//#define MAGIC_KEY_VERSION        V
+//#define MAGIC_KEY_STATUS         S
+//#define MAGIC_KEY_CONSOLE        C
+//#define MAGIC_KEY_LAYER0         0
+//#define MAGIC_KEY_LAYER0_ALT     GRAVE
+//#define MAGIC_KEY_LAYER1         1
+//#define MAGIC_KEY_LAYER2         2
+//#define MAGIC_KEY_LAYER3         3
+//#define MAGIC_KEY_LAYER4         4
+//#define MAGIC_KEY_LAYER5         5
+//#define MAGIC_KEY_LAYER6         6
+//#define MAGIC_KEY_LAYER7         7
+//#define MAGIC_KEY_LAYER8         8
+//#define MAGIC_KEY_LAYER9         9
+//#define MAGIC_KEY_BOOTLOADER     B
+//#define MAGIC_KEY_BOOTLOADER_ALT ESC
+//#define MAGIC_KEY_LOCK           CAPS
+//#define MAGIC_KEY_EEPROM         E
+//#define MAGIC_KEY_EEPROM_CLEAR   BSPACE
+//#define MAGIC_KEY_NKRO           N
+//#define MAGIC_KEY_SLEEP_LED      Z
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+//#define NO_ACTION_MACRO
+//#define NO_ACTION_FUNCTION
+
+/*
+ * MIDI options
+ */
+
+/* Prevent use of disabled MIDI features in the keymap */
+//#define MIDI_ENABLE_STRICT 1
+
+/* enable basic MIDI features:
+   - MIDI notes can be sent when in Music mode is on
+*/
+//#define MIDI_BASIC
+
+/* enable advanced MIDI features:
+   - MIDI notes can be added to the keymap
+   - Octave shift and transpose
+   - Virtual sustain, portamento, and modulation wheel
+   - etc.
+*/
+//#define MIDI_ADVANCED
+
+/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
+//#define MIDI_TONE_KEYCODE_OCTAVES 1
+
+/* Bootmagic Lite key configuration */
+// #define BOOTMAGIC_LITE_ROW 0
+// #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/evyd13/mx5160/info.json b/qmk/keyboards/evyd13/mx5160/info.json
new file mode 100644
index 00000000..af35cd70
--- /dev/null
+++ b/qmk/keyboards/evyd13/mx5160/info.json
@@ -0,0 +1,12 @@
+{
+    "keyboard_name": "mx5160", 
+    "url": "https://github.com/evyd13/mx-5160", 
+    "maintainer": "qmk", 
+    "width": 22, 
+    "height": 5, 
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2.5, "y":0}, {"x":3.5, "y":0}, {"x":4.5, "y":0}, {"x":5.5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":10.5, "y":0}, {"x":11.5, "y":0}, {"x":12.5, "y":0}, {"x":13.5, "y":0}, {"x":14.5, "y":0}, {"x":15.5, "y":0}, {"x":16.5, "y":0}, {"x":18, "y":0}, {"x":19, "y":0}, {"x":20, "y":0}, {"x":21, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2.5, "y":1, "w":1.5}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1}, {"x":13, "y":1}, {"x":14, "y":1}, {"x":15, "y":1}, {"x":16, "y":1, "w":1.5}, {"x":18, "y":1}, {"x":19, "y":1}, {"x":20, "y":1}, {"x":21, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2.5, "y":2, "w":1.75}, {"x":4.25, "y":2}, {"x":5.25, "y":2}, {"x":6.25, "y":2}, {"x":7.25, "y":2}, {"x":8.25, "y":2}, {"x":9.25, "y":2}, {"x":10.25, "y":2}, {"x":11.25, "y":2}, {"x":12.25, "y":2}, {"x":13.25, "y":2}, {"x":14.25, "y":2}, {"x":15.25, "y":2}, {"x":16.25, "y":2, "w":1.25}, {"x":18, "y":2}, {"x":19, "y":2}, {"x":20, "y":2}, {"x":21, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2.5, "y":3, "w":1.25}, {"x":3.75, "y":3}, {"x":4.75, "y":3}, {"x":5.75, "y":3}, {"x":6.75, "y":3}, {"x":7.75, "y":3}, {"x":8.75, "y":3}, {"x":9.75, "y":3}, {"x":10.75, "y":3}, {"x":11.75, "y":3}, {"x":12.75, "y":3}, {"x":13.75, "y":3}, {"x":14.75, "y":3, "w":1.75}, {"x":16.5, "y":3}, {"x":18, "y":3}, {"x":19, "y":3}, {"x":20, "y":3}, {"x":0, "y":4}, {"x":1, "y":4}, {"x":2.5, "y":4, "w":1.5}, {"x":5, "y":4, "w":1.5}, {"x":6.5, "y":4, "w":7}, {"x":13.5, "y":4, "w":1.5}, {"x":16, "y":4, "w":1.5}, {"x":18, "y":4}, {"x":19, "y":4}, {"x":20, "y":4}, {"x":21, "y":3, "h":2}]
+        }
+    }
+}
\ No newline at end of file
diff --git a/qmk/keyboards/evyd13/mx5160/keymaps/default/keymap.c b/qmk/keyboards/evyd13/mx5160/keymaps/default/keymap.c
new file mode 100644
index 00000000..ad198fe2
--- /dev/null
+++ b/qmk/keyboards/evyd13/mx5160/keymaps/default/keymap.c
@@ -0,0 +1,41 @@
+/* Copyright 2019 Evy Dekkers
+ *
+ * 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
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+
+#define _MA 0 //Main layer
+#define _FN 1 //Main layer
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[_MA] = LAYOUT_all(
+    KC_F1,   KC_F2,   KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,     KC_8,     KC_9,      KC_0,      KC_MINS, KC_EQL,  _______, KC_BSPC,    KC_NLCK, KC_PSLS, KC_PAST, KC_PMNS,    \
+    KC_F3,   KC_F4,   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_F5,   KC_F6,   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_P4,   KC_P5,   KC_P6,   KC_PPLS,    \
+    KC_F7,   KC_F8,   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_P1,   KC_P2,   KC_P3,               \
+    KC_F9,   KC_F10,  KC_LCTL,          KC_LALT,                            KC_SPC,                                            KC_RALT,                    MO(_FN),   KC_P0,   _______, KC_PDOT, KC_PENT),   \
+	
+[_FN] = LAYOUT_all(
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,  _______,   _______,   _______, _______, _______, RESET,      KC_PSCR, _______, _______, _______,    \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,  _______,   _______,   _______, _______,          _______,    _______, KC_UP,   _______, _______,    \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,  _______,   _______,   _______, _______,          _______,    KC_LEFT, KC_DOWN, KC_RGHT, _______,    \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,  KC_VOLD,   KC_VOLU,   KC_MPLY, _______,          _______,    _______, _______, _______,             \
+    _______, _______, _______,          _______,                            _______,                                           _______,                   _______,    _______, _______, _______, _______),   \
+
+};
diff --git a/qmk/keyboards/evyd13/mx5160/keymaps/default/readme.md b/qmk/keyboards/evyd13/mx5160/keymaps/default/readme.md
new file mode 100644
index 00000000..c9386773
--- /dev/null
+++ b/qmk/keyboards/evyd13/mx5160/keymaps/default/readme.md
@@ -0,0 +1 @@
+This is the default keymap for the mx-5160 PCB.
\ No newline at end of file
diff --git a/qmk/keyboards/evyd13/mx5160/mx5160.c b/qmk/keyboards/evyd13/mx5160/mx5160.c
new file mode 100644
index 00000000..c9e412da
--- /dev/null
+++ b/qmk/keyboards/evyd13/mx5160/mx5160.c
@@ -0,0 +1,58 @@
+/* Copyright 2019 Evy Dekkers
+ *
+ * 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 "mx5160.h"
+
+
+void matrix_init_kb(void) {
+  // put your keyboard start-up code here
+  // runs once when the firmware starts up
+
+  matrix_init_user();
+  led_init_ports();
+}
+
+void matrix_scan_kb(void) {
+  // put your looping keyboard code here
+  // runs every cycle (a lot)
+
+  matrix_scan_user();
+}
+
+void led_init_ports(void) {
+	//Set led pin as output, then high (off)
+	
+	//Caps lock
+    setPinOutput(B1);
+    writePinHigh(B1);
+	
+	//Num lock
+    setPinOutput(B2);
+    writePinHigh(B2);
+	
+	//Scroll lock
+    setPinOutput(B3);
+    writePinHigh(B3);
+}
+
+bool led_update_kb(led_t led_state) {
+    bool res = led_update_user(led_state);
+    if (res) {
+        writePin(B2, !led_state.num_lock);
+        writePin(B1, !led_state.caps_lock);
+        writePin(B3, !led_state.scroll_lock);
+    }
+    return res;
+}
diff --git a/qmk/keyboards/evyd13/mx5160/mx5160.h b/qmk/keyboards/evyd13/mx5160/mx5160.h
new file mode 100644
index 00000000..7486e626
--- /dev/null
+++ b/qmk/keyboards/evyd13/mx5160/mx5160.h
@@ -0,0 +1,47 @@
+/* Copyright 2019 Evy Dekkers
+ *
+ * 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 XXX KC_NO
+
+/* This a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT_all( \
+    k00, k10,      k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k07, k87, k17,      k08, k18, k09, k19,    \
+    k20, k30,      k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k27, k37,           k28, k38, k29, k39,    \
+    k40, k50,      k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k56, k47, k57,           k48, k58, k49, k59,    \
+    k60, k70,      k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k66, k76, k67, k77,           k68, k78, k69,         \
+    k80, k90,      k81,      k82,                     k94,                k96,      k97,           k88, k98, k89, k99     \
+) \
+{ \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19 }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39 }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49 }, \
+    { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59 }, \
+    { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69 }, \
+    { k70, k71, k72, k73, k74, k75, k76, k77, k78, XXX }, \
+    { k80, k81, k82, XXX, XXX, XXX, XXX, k87, k88, k89 }, \
+    { k90, XXX, XXX, XXX, k94, XXX, k96, k97, k98, k99 }  \
+}
diff --git a/qmk/keyboards/evyd13/mx5160/readme.md b/qmk/keyboards/evyd13/mx5160/readme.md
new file mode 100644
index 00000000..677b1607
--- /dev/null
+++ b/qmk/keyboards/evyd13/mx5160/readme.md
@@ -0,0 +1,15 @@
+# mx5160
+
+![mx5160](https://i.imgur.com/XZ9xUeq.jpg)
+
+## Support
+* Keyboard Maintainer: [Evyd13](https://github.com/evyd13)
+* Hardware Supported: mx-5160 (Chicony 5160c case)
+* Hardware Availability: [GitHub](https://github.com/evyd13/mx-5160)
+
+## Build
+Make example for this keyboard (after setting up your build environment):
+
+    make evyd13/mx5160: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).
\ No newline at end of file
diff --git a/qmk/keyboards/evyd13/mx5160/rules.mk b/qmk/keyboards/evyd13/mx5160/rules.mk
new file mode 100644
index 00000000..400781b0
--- /dev/null
+++ b/qmk/keyboards/evyd13/mx5160/rules.mk
@@ -0,0 +1,32 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+#   Teensy       halfkay
+#   Pro Micro    caterina
+#   Atmel DFU    atmel-dfu
+#   LUFA DFU     lufa-dfu
+#   QMK DFU      qmk-dfu
+#   ATmega32A    bootloadHID
+#   ATmega328P   USBasp
+BOOTLOADER = qmk-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # 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
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+MIDI_ENABLE = no            # MIDI support
+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
diff --git a/qmk/keyboards/evyd13/nt660/config.h b/qmk/keyboards/evyd13/nt660/config.h
new file mode 100644
index 00000000..b29d0d53
--- /dev/null
+++ b/qmk/keyboards/evyd13/nt660/config.h
@@ -0,0 +1,228 @@
+/*
+Copyright 2020 Evy Dekkers
+
+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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x4705
+#define PRODUCT_ID      0x1F02
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Evyd13
+#define PRODUCT         nt660
+#define DESCRIPTION     Replacement PCB for Leopold FC660M
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+ */
+#define MATRIX_ROW_PINS {B7,E6,F6,F7,C7}
+#define MATRIX_COL_PINS {D6,D7,B4,B5,B6,C6,B0,B1,B2,B3,F0,F1,F4,F5,D4}
+#define UNUSED_PINS
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+// #define SOFT_SERIAL_PIN D0  // or D1, D2, D3, E6
+
+// #define BACKLIGHT_PIN B7
+// #define BACKLIGHT_BREATHING
+// #define BACKLIGHT_LEVELS 3
+
+// #define RGB_DI_PIN E2
+// #ifdef RGB_DI_PIN
+//   #define RGBLED_NUM 16
+//   #define RGBLIGHT_HUE_STEP 8
+//   #define RGBLIGHT_SAT_STEP 8
+//   #define RGBLIGHT_VAL_STEP 8
+//   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+//   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+// /*== all animations enable ==*/
+//   #define RGBLIGHT_ANIMATIONS
+// /*== or choose animations ==*/
+//   #define RGBLIGHT_EFFECT_BREATHING
+//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
+//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+//   #define RGBLIGHT_EFFECT_SNAKE
+//   #define RGBLIGHT_EFFECT_KNIGHT
+//   #define RGBLIGHT_EFFECT_CHRISTMAS
+//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
+//   #define RGBLIGHT_EFFECT_RGB_TEST
+//   #define RGBLIGHT_EFFECT_ALTERNATING
+// /*== customize breathing effect ==*/
+//   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+//   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+//   /*==== use exp() and sin() ====*/
+//   #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//   #define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+// #endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is userful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+// #define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Magic Key Options
+ *
+ * Magic keys are hotkey commands that allow control over firmware functions of
+ * the keyboard. They are best used in combination with the HID Listen program,
+ * found here: https://www.pjrc.com/teensy/hid_listen.html
+ *
+ * The options below allow the magic key functionality to be changed. This is
+ * useful if your keyboard/keypad is missing keys and you want magic key support.
+ *
+ */
+
+/* key combination for magic key command */
+/* defined by default; to change, uncomment and set to the combination you want */
+// #define IS_COMMAND() (get_mods() == MOD_MASK_SHIFT)
+
+/* control how magic key switches layers */
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS  true
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS  true
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false
+
+/* override magic key keymap */
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM
+//#define MAGIC_KEY_HELP           H
+//#define MAGIC_KEY_HELP_ALT       SLASH
+//#define MAGIC_KEY_DEBUG          D
+//#define MAGIC_KEY_DEBUG_MATRIX   X
+//#define MAGIC_KEY_DEBUG_KBD      K
+//#define MAGIC_KEY_DEBUG_MOUSE    M
+//#define MAGIC_KEY_VERSION        V
+//#define MAGIC_KEY_STATUS         S
+//#define MAGIC_KEY_CONSOLE        C
+//#define MAGIC_KEY_LAYER0         0
+//#define MAGIC_KEY_LAYER0_ALT     GRAVE
+//#define MAGIC_KEY_LAYER1         1
+//#define MAGIC_KEY_LAYER2         2
+//#define MAGIC_KEY_LAYER3         3
+//#define MAGIC_KEY_LAYER4         4
+//#define MAGIC_KEY_LAYER5         5
+//#define MAGIC_KEY_LAYER6         6
+//#define MAGIC_KEY_LAYER7         7
+//#define MAGIC_KEY_LAYER8         8
+//#define MAGIC_KEY_LAYER9         9
+//#define MAGIC_KEY_BOOTLOADER     B
+//#define MAGIC_KEY_BOOTLOADER_ALT ESC
+//#define MAGIC_KEY_LOCK           CAPS
+//#define MAGIC_KEY_EEPROM         E
+//#define MAGIC_KEY_EEPROM_CLEAR   BSPACE
+//#define MAGIC_KEY_NKRO           N
+//#define MAGIC_KEY_SLEEP_LED      Z
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+/*
+ * MIDI options
+ */
+
+/* Prevent use of disabled MIDI features in the keymap */
+//#define MIDI_ENABLE_STRICT 1
+
+/* enable basic MIDI features:
+   - MIDI notes can be sent when in Music mode is on
+*/
+//#define MIDI_BASIC
+
+/* enable advanced MIDI features:
+   - MIDI notes can be added to the keymap
+   - Octave shift and transpose
+   - Virtual sustain, portamento, and modulation wheel
+   - etc.
+*/
+//#define MIDI_ADVANCED
+
+/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
+//#define MIDI_TONE_KEYCODE_OCTAVES 1
+
+/* Bootmagic Lite key configuration */
+// #define BOOTMAGIC_LITE_ROW 0
+// #define BOOTMAGIC_LITE_COLUMN 0
+
+#define QMK_ESC_OUTPUT D6 // usually COL
+#define QMK_ESC_INPUT B7 // usually ROW
+#define QMK_LED D0
diff --git a/qmk/keyboards/evyd13/nt660/info.json b/qmk/keyboards/evyd13/nt660/info.json
new file mode 100644
index 00000000..371fd9a0
--- /dev/null
+++ b/qmk/keyboards/evyd13/nt660/info.json
@@ -0,0 +1,234 @@
+{
+    "keyboard_name": "nt660", 
+    "url": "", 
+    "maintainer": "evyd13", 
+    "width": 16.5, 
+    "height": 5, 
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label":"k00", "x":0, "y":0},
+                {"label":"k01", "x":1, "y":0},
+                {"label":"k02", "x":2, "y":0},
+                {"label":"k03", "x":3, "y":0},
+                {"label":"k04", "x":4, "y":0},
+                {"label":"k05", "x":5, "y":0},
+                {"label":"k06", "x":6, "y":0},
+                {"label":"k07", "x":7, "y":0},
+                {"label":"k08", "x":8, "y":0},
+                {"label":"k09", "x":9, "y":0},
+                {"label":"k0a", "x":10, "y":0},
+                {"label":"k0b", "x":11, "y":0},
+                {"label":"k0c", "x":12, "y":0},
+                {"label":"k0f", "x":13, "y":0, "w":2},
+                {"label":"k0d", "x":15.5, "y":0},
+
+                {"label":"k10", "x":0, "y":1, "w":1.5},
+                {"label":"k11", "x":1.5, "y":1},
+                {"label":"k12", "x":2.5, "y":1},
+                {"label":"k13", "x":3.5, "y":1},
+                {"label":"k14", "x":4.5, "y":1},
+                {"label":"k15", "x":5.5, "y":1},
+                {"label":"k16", "x":6.5, "y":1},
+                {"label":"k17", "x":7.5, "y":1},
+                {"label":"k18", "x":8.5, "y":1},
+                {"label":"k19", "x":9.5, "y":1},
+                {"label":"k1a", "x":10.5, "y":1},
+                {"label":"k1b", "x":11.5, "y":1},
+                {"label":"k1c", "x":12.5, "y":1},
+                {"label":"k1f", "x":13.5, "y":1, "w":1.5},
+                {"label":"k1d", "x":15.5, "y":1},
+
+                {"label":"k20", "x":0, "y":2, "w":1.75},
+                {"label":"k21", "x":1.75, "y":2},
+                {"label":"k22", "x":2.75, "y":2},
+                {"label":"k23", "x":3.75, "y":2},
+                {"label":"k24", "x":4.75, "y":2},
+                {"label":"k25", "x":5.75, "y":2},
+                {"label":"k26", "x":6.75, "y":2},
+                {"label":"k27", "x":7.75, "y":2},
+                {"label":"k28", "x":8.75, "y":2},
+                {"label":"k29", "x":9.75, "y":2},
+                {"label":"k2a", "x":10.75, "y":2},
+                {"label":"k2b", "x":11.75, "y":2},
+                {"label":"k2c", "x":12.75, "y":2},
+                {"label":"k2f", "x":13.75, "y":2, "w":1.25},
+
+                {"label":"k30", "x":0, "y":3, "w":1.25},
+                {"label":"k31", "x":1.25, "y":3},
+                {"label":"k32", "x":2.25, "y":3},
+                {"label":"k33", "x":3.25, "y":3},
+                {"label":"k34", "x":4.25, "y":3},
+                {"label":"k35", "x":5.25, "y":3},
+                {"label":"k36", "x":6.25, "y":3},
+                {"label":"k37", "x":7.25, "y":3},
+                {"label":"k38", "x":8.25, "y":3},
+                {"label":"k39", "x":9.25, "y":3},
+                {"label":"k3a", "x":10.25, "y":3},
+                {"label":"k3b", "x":11.25, "y":3},
+                {"label":"k3c", "x":12.25, "y":3, "w":2.25},
+                {"label":"k3f", "x":14.5, "y":3},
+
+                {"label":"k40", "x":0, "y":4, "w":1.25},
+                {"label":"k41", "x":1.25, "y":4},
+                {"label":"k42", "x":2.25, "y":4, "w":1.25},
+                {"label":"k46", "x":3.5, "y":4, "w":6.25},
+                {"label":"k49", "x":9.75, "y":4, "w":1.25},
+                {"label":"k4a", "x":11, "y":4, "w":1.25},
+                {"label":"k4b", "x":12.25, "y":4, "w":1.25},
+                {"label":"k4c", "x":13.5, "y":4},
+                {"label":"k4f", "x":14.5, "y":4},
+                {"label":"k4d", "x":15.5, "y":4}
+            ]
+        },
+        "LAYOUT_66_ansi": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"!", "x":1, "y":0},
+                {"label":"@", "x":2, "y":0},
+                {"label":"#", "x":3, "y":0},
+                {"label":"$", "x":4, "y":0},
+                {"label":"%", "x":5, "y":0},
+                {"label":"^", "x":6, "y":0},
+                {"label":"&", "x":7, "y":0},
+                {"label":"*", "x":8, "y":0},
+                {"label":"(", "x":9, "y":0},
+                {"label":")", "x":10, "y":0},
+                {"label":"_", "x":11, "y":0},
+                {"label":"+", "x":12, "y":0},
+                {"label":"Backspace", "x":13, "y":0, "w":2},
+                {"label":"Insert", "x":15.5, "y":0},
+                
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"{", "x":11.5, "y":1},
+                {"label":"}", "x":12.5, "y":1},
+                {"label":"|", "x":13.5, "y":1, "w":1.5},
+                {"label":"Delete", "x":15.5, "y":1},
+                
+                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":":", "x":10.75, "y":2},
+                {"label":"\"", "x":11.75, "y":2},
+                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+                
+                {"label":"Shift", "x":0, "y":3, "w":2.25},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":"<", "x":9.25, "y":3},
+                {"label":">", "x":10.25, "y":3},
+                {"label":"?", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":2.25},
+                {"label":"\u2191", "x":14.5, "y":3},
+                
+                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
+                {"label":"Win", "x":1.25, "y":4},
+                {"label":"Alt", "x":2.25, "y":4, "w":1.25},
+                {"x":3.5, "y":4, "w":6.25},
+                {"label":"Alt", "x":9.75, "y":4, "w":1.25},
+                {"label":"Win", "x":11, "y":4, "w":1.25},
+                {"label":"Menu", "x":12.25, "y":4, "w":1.25},
+                {"label":"\u2190", "x":13.5, "y":4},
+                {"label":"\u2193", "x":14.5, "y":4},
+                {"label":"\u2192", "x":15.5, "y":4}
+            ]
+        },
+        "LAYOUT_66_iso": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"!", "x":1, "y":0},
+                {"label":"@", "x":2, "y":0},
+                {"label":"#", "x":3, "y":0},
+                {"label":"$", "x":4, "y":0},
+                {"label":"%", "x":5, "y":0},
+                {"label":"^", "x":6, "y":0},
+                {"label":"&", "x":7, "y":0},
+                {"label":"*", "x":8, "y":0},
+                {"label":"(", "x":9, "y":0},
+                {"label":")", "x":10, "y":0},
+                {"label":"_", "x":11, "y":0},
+                {"label":"+", "x":12, "y":0},
+                {"label":"Backspace", "x":13, "y":0, "w":2},
+                {"label":"Insert", "x":15.5, "y":0},
+                
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"{", "x":11.5, "y":1},
+                {"label":"}", "x":12.5, "y":1},
+                {"label":"Delete", "x":15.5, "y":1},
+                
+                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":":", "x":10.75, "y":2},
+                {"label":"\"", "x":11.75, "y":2},
+                {"label":"|", "x":12.75, "y":2},
+                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
+                
+                {"label":"Shift", "x":0, "y":3, "w":1.25},
+                {"label":"NUBS", "x":1.25, "y":3},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":"<", "x":9.25, "y":3},
+                {"label":">", "x":10.25, "y":3},
+                {"label":"?", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":2.25},
+                {"label":"\u2191", "x":14.5, "y":3},
+                
+                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
+                {"label":"Win", "x":1.25, "y":4},
+                {"label":"Alt", "x":2.25, "y":4, "w":1.25},
+                {"x":3.5, "y":4, "w":6.25},
+                {"label":"Alt", "x":9.75, "y":4, "w":1.25},
+                {"label":"Win", "x":11, "y":4, "w":1.25},
+                {"label":"Menu", "x":12.25, "y":4, "w":1.25},
+                {"label":"\u2190", "x":13.5, "y":4},
+                {"label":"\u2193", "x":14.5, "y":4},
+                {"label":"\u2192", "x":15.5, "y":4}
+            ]
+        }
+    }
+}
diff --git a/qmk/keyboards/evyd13/nt660/keymaps/default/keymap.c b/qmk/keyboards/evyd13/nt660/keymaps/default/keymap.c
new file mode 100644
index 00000000..5c9e1b22
--- /dev/null
+++ b/qmk/keyboards/evyd13/nt660/keymaps/default/keymap.c
@@ -0,0 +1,26 @@
+/* Copyright 2020 Evy Dekkers
+ *
+ * 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_all(
+  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,
+  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_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, 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_RSFT, KC_UP,
+  KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, KC_APP,  KC_RCTRL,KC_LEFT, KC_DOWN, KC_RGHT),
+};
diff --git a/qmk/keyboards/evyd13/nt660/keymaps/evyd13/config.h b/qmk/keyboards/evyd13/nt660/keymaps/evyd13/config.h
new file mode 100644
index 00000000..9b18f582
--- /dev/null
+++ b/qmk/keyboards/evyd13/nt660/keymaps/evyd13/config.h
@@ -0,0 +1,3 @@
+#pragma once
+
+#define RETRO_TAPPING
diff --git a/qmk/keyboards/evyd13/nt660/keymaps/evyd13/keymap.c b/qmk/keyboards/evyd13/nt660/keymaps/evyd13/keymap.c
new file mode 100644
index 00000000..b7eaa5d6
--- /dev/null
+++ b/qmk/keyboards/evyd13/nt660/keymaps/evyd13/keymap.c
@@ -0,0 +1,58 @@
+/* Copyright 2020 Evy Dekkers
+ *
+ * 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
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+#define _MA 0
+#define _GA 1
+#define _FL 2
+#define _SP 3
+
+#define SPACE LT(_SP, KC_SPC)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[_MA] = LAYOUT_all(
+  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_BSPC, KC_MPLY,
+  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_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_LGUI, KC_LALT,                   SPACE,                              KC_RALT, KC_RCTRL,MO(_FL),  KC_LEFT, KC_DOWN, KC_RGHT),
+  
+[_GA] = LAYOUT_all(
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______,
+  _______, _______, _______,                   KC_SPC,                             _______, _______, _______,  _______, _______, _______),
+  
+[_FL] = LAYOUT_all(
+  KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,  RESET,   KC_PSCR,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, KC_INS,
+  _______, _______, _______, _______, _______, TG(_GA), _______, _______, _______, _______, _______, _______,  _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE,  _______, _______,
+  _______, _______, _______,                   _______,                            _______, _______, _______,  _______, _______, _______),
+  
+[_SP] = LAYOUT_all(
+  KC_GRV,  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_UP,   _______, _______, _______,  _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,  _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______,
+  _______, _______, _______,                   _______,                            _______, _______, _______,  _______, _______, _______),
+};
diff --git a/qmk/keyboards/evyd13/nt660/keymaps/via/keymap.c b/qmk/keyboards/evyd13/nt660/keymaps/via/keymap.c
new file mode 100644
index 00000000..39d37390
--- /dev/null
+++ b/qmk/keyboards/evyd13/nt660/keymaps/via/keymap.c
@@ -0,0 +1,44 @@
+/* Copyright 2020 Evy Dekkers
+ *
+ * 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_all(
+  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_INS,
+  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_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, 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_RSFT, KC_UP,
+  KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, MO(1),   KC_RCTRL,KC_LEFT, KC_DOWN, KC_RGHT),
+[1] = LAYOUT_all(
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______,                   _______,                            _______, _______, _______, _______, _______, _______),
+[2] = LAYOUT_all(
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______,                   _______,                            _______, _______, _______, _______, _______, _______),
+[3] = LAYOUT_all(
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______,                   _______,                            _______, _______, _______, _______, _______, _______),
+};
diff --git a/qmk/keyboards/evyd13/nt660/keymaps/via/rules.mk b/qmk/keyboards/evyd13/nt660/keymaps/via/rules.mk
new file mode 100644
index 00000000..36b7ba9c
--- /dev/null
+++ b/qmk/keyboards/evyd13/nt660/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/qmk/keyboards/evyd13/nt660/nt660.c b/qmk/keyboards/evyd13/nt660/nt660.c
new file mode 100644
index 00000000..2a8ebfb4
--- /dev/null
+++ b/qmk/keyboards/evyd13/nt660/nt660.c
@@ -0,0 +1,32 @@
+/* Copyright 2020 Evy Dekkers
+ *
+ * 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 "nt660.h"
+void matrix_init_kb(void) {
+    matrix_init_user();
+    led_init_ports();
+}
+
+void led_init_ports(void) {
+    setPinOutput(D0);
+}
+
+bool led_update_kb(led_t led_state) {
+    if(led_update_user(led_state)) {
+        writePin(D0, !led_state.caps_lock);
+    }
+
+    return true;
+}
diff --git a/qmk/keyboards/evyd13/nt660/nt660.h b/qmk/keyboards/evyd13/nt660/nt660.h
new file mode 100644
index 00000000..ce9f98f5
--- /dev/null
+++ b/qmk/keyboards/evyd13/nt660/nt660.h
@@ -0,0 +1,73 @@
+/* Copyright 2020 Evy Dekkers
+ *
+ * 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 XXX KC_NO
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+ 
+#define LAYOUT_all( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0f, k0d, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1f, k1d, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2f,      \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3f,      \
+    k40, k41, k42,                k46,           k49, k4a, k4b, k4c, k4f, k4d  \
+) \
+{ \
+    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0f, k0d}, \
+    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1f, k1d}, \
+    {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2f, XXX}, \
+    {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3f, XXX}, \
+    {k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, k49, k4a, k4b, k4c, k4f, k4d}  \
+}
+#define LAYOUT_66_ansi( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0f, k0d, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1f, k1d, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,      k2f,      \
+    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3f,      \
+    k40, k41, k42,                k46,           k49, k4a, k4b, k4c, k4f, k4d  \
+) \
+{ \
+    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0f, k0d}, \
+    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1f, k1d}, \
+    {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2f, XXX}, \
+    {k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3f, XXX}, \
+    {k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, k49, k4a, k4b, k4c, k4f, k4d}  \
+}
+
+#define LAYOUT_66_iso( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0f, k0d, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,      k1d, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2f,      \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3f,      \
+    k40, k41, k42,                k46,           k49, k4a, k4b, k4c, k4f, k4d  \
+) \
+{ \
+    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0f, k0d}, \
+    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, k1d}, \
+    {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2f, XXX}, \
+    {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3f, XXX}, \
+    {k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, k49, k4a, k4b, k4c, k4f, k4d}  \
+}
diff --git a/qmk/keyboards/evyd13/nt660/readme.md b/qmk/keyboards/evyd13/nt660/readme.md
new file mode 100644
index 00000000..ddd2cc71
--- /dev/null
+++ b/qmk/keyboards/evyd13/nt660/readme.md
@@ -0,0 +1,19 @@
+# nt660
+
+A drop-in replacement PCB for the Leopold FC660M.
+
+* Keyboard Maintainer: [Evyd13](https://github.com/evyd13)
+* Hardware Supported: nt660 PCB
+* Hardware Availability: [maartenwut.com](https://maartenwut.com/product/nt-660/)
+
+## Flashing
+
+In place of the DIP switches on the original PCB there is a small button. Press that to jump to the bootloader. 
+
+---
+
+Make example for this keyboard (after setting up your build environment):
+
+    make evyd13/nt660: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).
diff --git a/qmk/keyboards/evyd13/nt660/rules.mk b/qmk/keyboards/evyd13/nt660/rules.mk
new file mode 100644
index 00000000..9f8f0cd8
--- /dev/null
+++ b/qmk/keyboards/evyd13/nt660/rules.mk
@@ -0,0 +1,33 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+#   Teensy       halfkay
+#   Pro Micro    caterina
+#   Atmel DFU    atmel-dfu
+#   LUFA DFU     lufa-dfu
+#   QMK DFU      qmk-dfu
+#   ATmega32A    bootloadHID
+#   ATmega328P   USBasp
+BOOTLOADER = qmk-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # 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
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+MIDI_ENABLE = no            # MIDI support
+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
+
+LAYOUTS = 66_ansi 66_iso
diff --git a/qmk/keyboards/evyd13/nt750/config.h b/qmk/keyboards/evyd13/nt750/config.h
new file mode 100644
index 00000000..35fc0006
--- /dev/null
+++ b/qmk/keyboards/evyd13/nt750/config.h
@@ -0,0 +1,149 @@
+/*
+Copyright 2020 Evy Dekkers
+
+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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x4705
+#define PRODUCT_ID      0x3320
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Evyd13
+#define PRODUCT         nt750
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 17
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+ */
+#define MATRIX_ROW_PINS {B2,B3,B7,D0,D1,D2}
+#define MATRIX_COL_PINS {F0,F1,F4,F5,F6,F7,C7,C6,B6,B5,B4,D7,D6,D4,E6,B1,B0}
+#define UNUSED_PINS
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+#define LED_CAPS_LOCK_PIN D5
+#define LED_PIN_ON_STATE 0
+
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+// #define SOFT_SERIAL_PIN D0  // or D1, D2, D3, E6
+
+// #define BACKLIGHT_PIN B7
+// #define BACKLIGHT_BREATHING
+// #define BACKLIGHT_LEVELS 3
+
+// #define RGB_DI_PIN E2
+// #ifdef RGB_DI_PIN
+//   #define RGBLED_NUM 16
+//   #define RGBLIGHT_HUE_STEP 8
+//   #define RGBLIGHT_SAT_STEP 8
+//   #define RGBLIGHT_VAL_STEP 8
+//   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+//   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+// /*== all animations enable ==*/
+//   #define RGBLIGHT_ANIMATIONS
+// /*== or choose animations ==*/
+//   #define RGBLIGHT_EFFECT_BREATHING
+//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
+//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+//   #define RGBLIGHT_EFFECT_SNAKE
+//   #define RGBLIGHT_EFFECT_KNIGHT
+//   #define RGBLIGHT_EFFECT_CHRISTMAS
+//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
+//   #define RGBLIGHT_EFFECT_RGB_TEST
+//   #define RGBLIGHT_EFFECT_ALTERNATING
+// /*== customize breathing effect ==*/
+//   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+//   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+//   /*==== use exp() and sin() ====*/
+//   #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//   #define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+// #endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is userful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+// #define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+/* Bootmagic Lite key configuration */
+// #define BOOTMAGIC_LITE_ROW 0
+// #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/evyd13/nt750/info.json b/qmk/keyboards/evyd13/nt750/info.json
new file mode 100644
index 00000000..9ac63a9b
--- /dev/null
+++ b/qmk/keyboards/evyd13/nt750/info.json
@@ -0,0 +1,300 @@
+{
+    "keyboard_name": "nt750", 
+    "url": "https://github.com/evyd13/nt-series/tree/main/nt-750", 
+    "maintainer": "evyd13", 
+    "width": 18.25, 
+    "height": 6.5, 
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label":"k00", "x":0, "y":0},
+                {"label":"k02", "x":2, "y":0},
+                {"label":"k03", "x":3, "y":0},
+                {"label":"k04", "x":4, "y":0},
+                {"label":"k05", "x":5, "y":0},
+                {"label":"k06", "x":6.5, "y":0},
+                {"label":"k07", "x":7.5, "y":0},
+                {"label":"k08", "x":8.5, "y":0},
+                {"label":"k09", "x":9.5, "y":0},
+                {"label":"k0a", "x":11, "y":0},
+                {"label":"k0b", "x":12, "y":0},
+                {"label":"k0c", "x":13, "y":0},
+                {"label":"k0d", "x":14, "y":0},
+                {"label":"k0e", "x":15.25, "y":0},
+                {"label":"k0f", "x":16.25, "y":0},
+                {"label":"k0g", "x":17.25, "y":0},
+                
+                {"label":"k10", "x":0, "y":1.5},
+                {"label":"k11", "x":1, "y":1.5},
+                {"label":"k12", "x":2, "y":1.5},
+                {"label":"k13", "x":3, "y":1.5},
+                {"label":"k14", "x":4, "y":1.5},
+                {"label":"k15", "x":5, "y":1.5},
+                {"label":"k16", "x":6, "y":1.5},
+                {"label":"k17", "x":7, "y":1.5},
+                {"label":"k18", "x":8, "y":1.5},
+                {"label":"k19", "x":9, "y":1.5},
+                {"label":"k1a", "x":10, "y":1.5},
+                {"label":"k1b", "x":11, "y":1.5},
+                {"label":"k1c", "x":12, "y":1.5},
+                {"label":"k1d", "x":13, "y":1.5, "w":2},
+                {"label":"k1e", "x":15.25, "y":1.5},
+                {"label":"k1f", "x":16.25, "y":1.5},
+                {"label":"k1g", "x":17.25, "y":1.5},
+                
+                {"label":"k20", "x":0, "y":2.5, "w":1.5},
+                {"label":"k21", "x":1.5, "y":2.5},
+                {"label":"k22", "x":2.5, "y":2.5},
+                {"label":"k23", "x":3.5, "y":2.5},
+                {"label":"k24", "x":4.5, "y":2.5},
+                {"label":"k25", "x":5.5, "y":2.5},
+                {"label":"k26", "x":6.5, "y":2.5},
+                {"label":"k27", "x":7.5, "y":2.5},
+                {"label":"k28", "x":8.5, "y":2.5},
+                {"label":"k29", "x":9.5, "y":2.5},
+                {"label":"k2a", "x":10.5, "y":2.5},
+                {"label":"k2b", "x":11.5, "y":2.5},
+                {"label":"k2c", "x":12.5, "y":2.5},
+                {"label":"k2d", "x":13.5, "y":2.5, "w":1.5},
+                {"label":"k2e", "x":15.25, "y":2.5},
+                {"label":"k2f", "x":16.25, "y":2.5},
+                {"label":"k2g", "x":17.25, "y":2.5},
+                
+                {"label":"k30", "x":0, "y":3.5, "w":1.75},
+                {"label":"k31", "x":1.75, "y":3.5},
+                {"label":"k32", "x":2.75, "y":3.5},
+                {"label":"k33", "x":3.75, "y":3.5},
+                {"label":"k34", "x":4.75, "y":3.5},
+                {"label":"k35", "x":5.75, "y":3.5},
+                {"label":"k36", "x":6.75, "y":3.5},
+                {"label":"k37", "x":7.75, "y":3.5},
+                {"label":"k38", "x":8.75, "y":3.5},
+                {"label":"k39", "x":9.75, "y":3.5},
+                {"label":"k3a", "x":10.75, "y":3.5},
+                {"label":"k3b", "x":11.75, "y":3.5},
+                {"label":"k3c", "x":12.75, "y":3.5},
+                {"label":"k3d", "x":13.75, "y":3.5, "w":1.25},
+                
+                {"label":"k40", "x":0, "y":4.5, "w":1.25},
+                {"label":"k41", "x":1.25, "y":4.5},
+                {"label":"k42", "x":2.25, "y":4.5},
+                {"label":"k43", "x":3.25, "y":4.5},
+                {"label":"k44", "x":4.25, "y":4.5},
+                {"label":"k45", "x":5.25, "y":4.5},
+                {"label":"k46", "x":6.25, "y":4.5},
+                {"label":"k47", "x":7.25, "y":4.5},
+                {"label":"k48", "x":8.25, "y":4.5},
+                {"label":"k49", "x":9.25, "y":4.5},
+                {"label":"k4a", "x":10.25, "y":4.5},
+                {"label":"k4b", "x":11.25, "y":4.5},
+                {"label":"k4d", "x":12.25, "y":4.5, "w":2.75},
+                {"label":"k4f", "x":16.25, "y":4.5},
+                
+                {"label":"k50", "x":0, "y":5.5, "w":1.25},
+                {"label":"k51", "x":1.25, "y":5.5, "w":1.25},
+                {"label":"k52", "x":2.5, "y":5.5, "w":1.25},
+                {"label":"k56", "x":3.75, "y":5.5, "w":6.25},
+                {"label":"k5a", "x":10, "y":5.5, "w":1.25},
+                {"label":"k5b", "x":11.25, "y":5.5, "w":1.25},
+                {"label":"k5c", "x":12.5, "y":5.5, "w":1.25},
+                {"label":"k5d", "x":13.75, "y":5.5, "w":1.25},
+                {"label":"k5e", "x":15.25, "y":5.5},
+                {"label":"k5f", "x":16.25, "y":5.5},
+                {"label":"k5g", "x":17.25, "y":5.5}
+            ]
+        },
+        "LAYOUT_tkl_iso": {
+            "layout": [
+                {"label":"k00", "x":0, "y":0},
+                {"label":"k02", "x":2, "y":0},
+                {"label":"k03", "x":3, "y":0},
+                {"label":"k04", "x":4, "y":0},
+                {"label":"k05", "x":5, "y":0},
+                {"label":"k06", "x":6.5, "y":0},
+                {"label":"k07", "x":7.5, "y":0},
+                {"label":"k08", "x":8.5, "y":0},
+                {"label":"k09", "x":9.5, "y":0},
+                {"label":"k0a", "x":11, "y":0},
+                {"label":"k0b", "x":12, "y":0},
+                {"label":"k0c", "x":13, "y":0},
+                {"label":"k0d", "x":14, "y":0},
+                {"label":"k0e", "x":15.25, "y":0},
+                {"label":"k0f", "x":16.25, "y":0},
+                {"label":"k0g", "x":17.25, "y":0},
+                
+                {"label":"k10", "x":0, "y":1.5},
+                {"label":"k11", "x":1, "y":1.5},
+                {"label":"k12", "x":2, "y":1.5},
+                {"label":"k13", "x":3, "y":1.5},
+                {"label":"k14", "x":4, "y":1.5},
+                {"label":"k15", "x":5, "y":1.5},
+                {"label":"k16", "x":6, "y":1.5},
+                {"label":"k17", "x":7, "y":1.5},
+                {"label":"k18", "x":8, "y":1.5},
+                {"label":"k19", "x":9, "y":1.5},
+                {"label":"k1a", "x":10, "y":1.5},
+                {"label":"k1b", "x":11, "y":1.5},
+                {"label":"k1c", "x":12, "y":1.5},
+                {"label":"k1d", "x":13, "y":1.5, "w":2},
+                {"label":"k1e", "x":15.25, "y":1.5},
+                {"label":"k1f", "x":16.25, "y":1.5},
+                {"label":"k1g", "x":17.25, "y":1.5},
+                
+                {"label":"k20", "x":0, "y":2.5, "w":1.5},
+                {"label":"k21", "x":1.5, "y":2.5},
+                {"label":"k22", "x":2.5, "y":2.5},
+                {"label":"k23", "x":3.5, "y":2.5},
+                {"label":"k24", "x":4.5, "y":2.5},
+                {"label":"k25", "x":5.5, "y":2.5},
+                {"label":"k26", "x":6.5, "y":2.5},
+                {"label":"k27", "x":7.5, "y":2.5},
+                {"label":"k28", "x":8.5, "y":2.5},
+                {"label":"k29", "x":9.5, "y":2.5},
+                {"label":"k2a", "x":10.5, "y":2.5},
+                {"label":"k2b", "x":11.5, "y":2.5},
+                {"label":"k2c", "x":12.5, "y":2.5},
+                {"label":"k2e", "x":15.25, "y":2.5},
+                {"label":"k2f", "x":16.25, "y":2.5},
+                {"label":"k2g", "x":17.25, "y":2.5},
+                
+                {"label":"k30", "x":0, "y":3.5, "w":1.75},
+                {"label":"k31", "x":1.75, "y":3.5},
+                {"label":"k32", "x":2.75, "y":3.5},
+                {"label":"k33", "x":3.75, "y":3.5},
+                {"label":"k34", "x":4.75, "y":3.5},
+                {"label":"k35", "x":5.75, "y":3.5},
+                {"label":"k36", "x":6.75, "y":3.5},
+                {"label":"k37", "x":7.75, "y":3.5},
+                {"label":"k38", "x":8.75, "y":3.5},
+                {"label":"k39", "x":9.75, "y":3.5},
+                {"label":"k3a", "x":10.75, "y":3.5},
+                {"label":"k3b", "x":11.75, "y":3.5},
+                {"label":"k3c", "x":12.75, "y":3.5},
+                {"label":"k3d", "x":13.75, "y":2.5, "w":1.25, "h":2},
+                
+                {"label":"k40", "x":0, "y":4.5, "w":1.25},
+                {"label":"k41", "x":1.25, "y":4.5},
+                {"label":"k42", "x":2.25, "y":4.5},
+                {"label":"k43", "x":3.25, "y":4.5},
+                {"label":"k44", "x":4.25, "y":4.5},
+                {"label":"k45", "x":5.25, "y":4.5},
+                {"label":"k46", "x":6.25, "y":4.5},
+                {"label":"k47", "x":7.25, "y":4.5},
+                {"label":"k48", "x":8.25, "y":4.5},
+                {"label":"k49", "x":9.25, "y":4.5},
+                {"label":"k4a", "x":10.25, "y":4.5},
+                {"label":"k4b", "x":11.25, "y":4.5},
+                {"label":"k4d", "x":12.25, "y":4.5, "w":2.75},
+                {"label":"k4f", "x":16.25, "y":4.5},
+                
+                {"label":"k50", "x":0, "y":5.5, "w":1.25},
+                {"label":"k51", "x":1.25, "y":5.5, "w":1.25},
+                {"label":"k52", "x":2.5, "y":5.5, "w":1.25},
+                {"label":"k56", "x":3.75, "y":5.5, "w":6.25},
+                {"label":"k5a", "x":10, "y":5.5, "w":1.25},
+                {"label":"k5b", "x":11.25, "y":5.5, "w":1.25},
+                {"label":"k5c", "x":12.5, "y":5.5, "w":1.25},
+                {"label":"k5d", "x":13.75, "y":5.5, "w":1.25},
+                {"label":"k5e", "x":15.25, "y":5.5},
+                {"label":"k5f", "x":16.25, "y":5.5},
+                {"label":"k5g", "x":17.25, "y":5.5}
+            ]
+        },
+        "LAYOUT_tkl_ansi": {
+            "layout": [
+                {"label":"k00", "x":0, "y":0},
+                {"label":"k02", "x":2, "y":0},
+                {"label":"k03", "x":3, "y":0},
+                {"label":"k04", "x":4, "y":0},
+                {"label":"k05", "x":5, "y":0},
+                {"label":"k06", "x":6.5, "y":0},
+                {"label":"k07", "x":7.5, "y":0},
+                {"label":"k08", "x":8.5, "y":0},
+                {"label":"k09", "x":9.5, "y":0},
+                {"label":"k0a", "x":11, "y":0},
+                {"label":"k0b", "x":12, "y":0},
+                {"label":"k0c", "x":13, "y":0},
+                {"label":"k0d", "x":14, "y":0},
+                {"label":"k0e", "x":15.25, "y":0},
+                {"label":"k0f", "x":16.25, "y":0},
+                {"label":"k0g", "x":17.25, "y":0},
+                
+                {"label":"k10", "x":0, "y":1.5},
+                {"label":"k11", "x":1, "y":1.5},
+                {"label":"k12", "x":2, "y":1.5},
+                {"label":"k13", "x":3, "y":1.5},
+                {"label":"k14", "x":4, "y":1.5},
+                {"label":"k15", "x":5, "y":1.5},
+                {"label":"k16", "x":6, "y":1.5},
+                {"label":"k17", "x":7, "y":1.5},
+                {"label":"k18", "x":8, "y":1.5},
+                {"label":"k19", "x":9, "y":1.5},
+                {"label":"k1a", "x":10, "y":1.5},
+                {"label":"k1b", "x":11, "y":1.5},
+                {"label":"k1c", "x":12, "y":1.5},
+                {"label":"k1d", "x":13, "y":1.5, "w":2},
+                {"label":"k1e", "x":15.25, "y":1.5},
+                {"label":"k1f", "x":16.25, "y":1.5},
+                {"label":"k1g", "x":17.25, "y":1.5},
+                
+                {"label":"k20", "x":0, "y":2.5, "w":1.5},
+                {"label":"k21", "x":1.5, "y":2.5},
+                {"label":"k22", "x":2.5, "y":2.5},
+                {"label":"k23", "x":3.5, "y":2.5},
+                {"label":"k24", "x":4.5, "y":2.5},
+                {"label":"k25", "x":5.5, "y":2.5},
+                {"label":"k26", "x":6.5, "y":2.5},
+                {"label":"k27", "x":7.5, "y":2.5},
+                {"label":"k28", "x":8.5, "y":2.5},
+                {"label":"k29", "x":9.5, "y":2.5},
+                {"label":"k2a", "x":10.5, "y":2.5},
+                {"label":"k2b", "x":11.5, "y":2.5},
+                {"label":"k2c", "x":12.5, "y":2.5},
+                {"label":"k2d", "x":13.5, "y":2.5, "w":1.5},
+                {"label":"k2e", "x":15.25, "y":2.5},
+                {"label":"k2f", "x":16.25, "y":2.5},
+                {"label":"k2g", "x":17.25, "y":2.5},
+                
+                {"label":"k30", "x":0, "y":3.5, "w":1.75},
+                {"label":"k31", "x":1.75, "y":3.5},
+                {"label":"k32", "x":2.75, "y":3.5},
+                {"label":"k33", "x":3.75, "y":3.5},
+                {"label":"k34", "x":4.75, "y":3.5},
+                {"label":"k35", "x":5.75, "y":3.5},
+                {"label":"k36", "x":6.75, "y":3.5},
+                {"label":"k37", "x":7.75, "y":3.5},
+                {"label":"k38", "x":8.75, "y":3.5},
+                {"label":"k39", "x":9.75, "y":3.5},
+                {"label":"k3a", "x":10.75, "y":3.5},
+                {"label":"k3b", "x":11.75, "y":3.5},
+                {"label":"k3d", "x":12.75, "y":3.5, "w":2.25},
+                
+                {"label":"k40", "x":0, "y":4.5, "w":2.25},
+                {"label":"k42", "x":2.25, "y":4.5},
+                {"label":"k43", "x":3.25, "y":4.5},
+                {"label":"k44", "x":4.25, "y":4.5},
+                {"label":"k45", "x":5.25, "y":4.5},
+                {"label":"k46", "x":6.25, "y":4.5},
+                {"label":"k47", "x":7.25, "y":4.5},
+                {"label":"k48", "x":8.25, "y":4.5},
+                {"label":"k49", "x":9.25, "y":4.5},
+                {"label":"k4a", "x":10.25, "y":4.5},
+                {"label":"k4b", "x":11.25, "y":4.5},
+                {"label":"k4d", "x":12.25, "y":4.5, "w":2.75},
+                {"label":"k4f", "x":16.25, "y":4.5},
+                
+                {"label":"k50", "x":0, "y":5.5, "w":1.25},
+                {"label":"k51", "x":1.25, "y":5.5, "w":1.25},
+                {"label":"k52", "x":2.5, "y":5.5, "w":1.25},
+                {"label":"k56", "x":3.75, "y":5.5, "w":6.25},
+                {"label":"k5a", "x":10, "y":5.5, "w":1.25},
+                {"label":"k5b", "x":11.25, "y":5.5, "w":1.25},
+                {"label":"k5c", "x":12.5, "y":5.5, "w":1.25},
+                {"label":"k5d", "x":13.75, "y":5.5, "w":1.25},
+                {"label":"k5e", "x":15.25, "y":5.5},
+                {"label":"k5f", "x":16.25, "y":5.5},
+                {"label":"k5g", "x":17.25, "y":5.5}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/qmk/keyboards/evyd13/nt750/keymaps/default/keymap.c b/qmk/keyboards/evyd13/nt750/keymaps/default/keymap.c
new file mode 100644
index 00000000..160b2696
--- /dev/null
+++ b/qmk/keyboards/evyd13/nt750/keymaps/default/keymap.c
@@ -0,0 +1,38 @@
+/* Copyright 2020 Evy Dekkers
+ *
+ * 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(
+    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_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   KC_APP,  KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT),
+    
+[1] = LAYOUT_tkl_ansi(
+    _______,          _______, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU,    _______, _______, _______,
+
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+    _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,             _______,
+    _______, _______, _______,                            _______,                            _______, _______, _______, _______,    _______, _______, _______),
+    
+};
diff --git a/qmk/keyboards/evyd13/nt750/keymaps/via/keymap.c b/qmk/keyboards/evyd13/nt750/keymaps/via/keymap.c
new file mode 100644
index 00000000..c42cc1e3
--- /dev/null
+++ b/qmk/keyboards/evyd13/nt750/keymaps/via/keymap.c
@@ -0,0 +1,56 @@
+/* Copyright 2020 Evy Dekkers
+ *
+ * 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_all(
+    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_BSLS, 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_RSFT,             KC_UP,
+    KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   KC_APP,  KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT),
+    
+[1] = LAYOUT_all(
+    _______,          _______, _______, _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP, KC_MUTE, KC_VOLD, KC_VOLU,    _______, _______, _______,
+
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,             _______,
+    _______, _______, _______,                            _______,                            _______, _______, _______, _______,    _______, _______, _______),
+    
+[2] = LAYOUT_all(
+    _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,             _______,
+    _______, _______, _______,                            _______,                            _______, _______, _______, _______,    _______, _______, _______),
+    
+[3] = LAYOUT_all(
+    _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,             _______,
+    _______, _______, _______,                            _______,                            _______, _______, _______, _______,    _______, _______, _______)
+    
+};
\ No newline at end of file
diff --git a/qmk/keyboards/evyd13/nt750/keymaps/via/rules.mk b/qmk/keyboards/evyd13/nt750/keymaps/via/rules.mk
new file mode 100644
index 00000000..36b7ba9c
--- /dev/null
+++ b/qmk/keyboards/evyd13/nt750/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/qmk/keyboards/evyd13/nt750/nt750.c b/qmk/keyboards/evyd13/nt750/nt750.c
new file mode 100644
index 00000000..6ae67cc3
--- /dev/null
+++ b/qmk/keyboards/evyd13/nt750/nt750.c
@@ -0,0 +1,16 @@
+/* Copyright 2020 Evy Dekkers
+ *
+ * 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 "nt750.h"
diff --git a/qmk/keyboards/evyd13/nt750/nt750.h b/qmk/keyboards/evyd13/nt750/nt750.h
new file mode 100644
index 00000000..15b6e459
--- /dev/null
+++ b/qmk/keyboards/evyd13/nt750/nt750.h
@@ -0,0 +1,80 @@
+/* Copyright 2020 Evy Dekkers
+ *
+ * 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 XXX KC_NO
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+ 
+#define LAYOUT_all( \
+    k00,      k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d,                \
+    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b,      k4d,      k4f,      \
+    k50, k51, k52,                k56,                k5a, k5b, k5c, k5d, k5e, k5f, k5g  \
+) \
+{ \
+    { k00, XXX, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, XXX, XXX, XXX }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, XXX, k4d, XXX, k4f, XXX }, \
+    { k50, k51, k52, XXX, XXX, XXX, k56, XXX, XXX, XXX, k5a, k5b, k5c, k5d, k5e, k5f, k5g }  \
+}
+
+#define LAYOUT_tkl_ansi( \
+    k00,      k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3d,                \
+    k40,      k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b,      k4d,      k4f,      \
+    k50, k51, k52,                k56,                k5a, k5b, k5c, k5d, k5e, k5f, k5g  \
+) \
+{ \
+    { k00, XXX, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, XXX, XXX, XXX }, \
+    { k40, XXX, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, XXX, k4d, XXX, k4f, XXX }, \
+    { k50, k51, k52, XXX, XXX, XXX, k56, XXX, XXX, XXX, k5a, k5b, k5c, k5d, k5e, k5f, k5g }  \
+}
+
+#define LAYOUT_tkl_iso( \
+    k00,      k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c,      k2e, k2f, k2g, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d,                \
+    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b,      k4d,      k4f,      \
+    k50, k51, k52,                k56,                k5a, k5b, k5c, k5d, k5e, k5f, k5g  \
+) \
+{ \
+    { k00, XXX, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, XXX, k2e, k2f, k2g }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, XXX, XXX, XXX }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, XXX, k4d, XXX, k4f, XXX }, \
+    { k50, k51, k52, XXX, XXX, XXX, k56, XXX, XXX, XXX, k5a, k5b, k5c, k5d, k5e, k5f, k5g }  \
+}
diff --git a/qmk/keyboards/evyd13/nt750/readme.md b/qmk/keyboards/evyd13/nt750/readme.md
new file mode 100644
index 00000000..977f2925
--- /dev/null
+++ b/qmk/keyboards/evyd13/nt750/readme.md
@@ -0,0 +1,22 @@
+# nt750
+
+A drop-in replacement PCB for the Leopold FC750R.
+
+* Keyboard Maintainer: [Evyd13](https://github.com/Evyd13)
+* Hardware Supported: nt750 PCB
+* Hardware Availability: [GitHub](https://github.com/evyd13/nt-series/tree/main/nt-750)
+
+## Flashing
+
+In place of the DIP switches there is a small button. Press that to jump to the bootloader. 
+
+
+Make example for this keyboard (after setting up your build environment):
+
+    make evyd13/nt750:default
+
+Flashing example for this keyboard:
+
+    make evyd13/nt750:default:flash
+
+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).
diff --git a/qmk/keyboards/evyd13/nt750/rules.mk b/qmk/keyboards/evyd13/nt750/rules.mk
new file mode 100644
index 00000000..e981c14b
--- /dev/null
+++ b/qmk/keyboards/evyd13/nt750/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # 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
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
\ No newline at end of file
diff --git a/qmk/keyboards/evyd13/nt980/config.h b/qmk/keyboards/evyd13/nt980/config.h
new file mode 100644
index 00000000..1509dde0
--- /dev/null
+++ b/qmk/keyboards/evyd13/nt980/config.h
@@ -0,0 +1,151 @@
+/*
+Copyright 2020 Evy Dekkers
+
+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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID    0x4705
+#define PRODUCT_ID   0xAAF8
+#define DEVICE_VER   0x0001
+#define MANUFACTURER Evyd13
+#define PRODUCT      nt980
+
+/* key matrix size */
+#define MATRIX_ROWS 12
+#define MATRIX_COLS 9
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+ */
+#define MATRIX_ROW_PINS { B0, B1, D1, D0, C6, C7, B5, B6, B4, D7, D4, D6 }
+#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, E6, D3, D2 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+#define LED_NUM_LOCK_PIN B2
+#define LED_CAPS_LOCK_PIN B3
+#define LED_SCROLL_LOCK_PIN B7
+#define LED_PIN_ON_STATE 0
+
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+//#define SOFT_SERIAL_PIN D0  // or D1, D2, D3, E6
+
+//#define BACKLIGHT_PIN B7
+//#define BACKLIGHT_LEVELS 3
+//#define BACKLIGHT_BREATHING
+
+//#define RGB_DI_PIN E2
+//#ifdef RGB_DI_PIN
+//#    define RGBLED_NUM 16
+//#    define RGBLIGHT_HUE_STEP 8
+//#    define RGBLIGHT_SAT_STEP 8
+//#    define RGBLIGHT_VAL_STEP 8
+//#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+//#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+/*== all animations enable ==*/
+//#    define RGBLIGHT_ANIMATIONS
+/*== or choose animations ==*/
+//#    define RGBLIGHT_EFFECT_BREATHING
+//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+//#    define RGBLIGHT_EFFECT_SNAKE
+//#    define RGBLIGHT_EFFECT_KNIGHT
+//#    define RGBLIGHT_EFFECT_CHRISTMAS
+//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+//#    define RGBLIGHT_EFFECT_RGB_TEST
+//#    define RGBLIGHT_EFFECT_ALTERNATING
+/*== customize breathing effect ==*/
+/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+//#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+/*==== use exp() and sin() ====*/
+//#    define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//#    define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+//#endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+//#define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+/* Bootmagic Lite key configuration */
+//#define BOOTMAGIC_LITE_ROW 0
+//#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/evyd13/nt980/info.json b/qmk/keyboards/evyd13/nt980/info.json
new file mode 100644
index 00000000..408e1287
--- /dev/null
+++ b/qmk/keyboards/evyd13/nt980/info.json
@@ -0,0 +1,333 @@
+{
+    "keyboard_name": "nt980", 
+    "url": "", 
+    "maintainer": "maartenwut", 
+    "width": 19.5, 
+    "height": 6.75, 
+    "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":"Insert", "x":15.5, "y":0},
+                {"label":"Delete", "x":16.5, "y":0},
+                {"label":"PgUp", "x":17.5, "y":0},
+                {"label":"PgDn", "x":18.5, "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":"Backspace", "x":13, "y":1.5, "w":2},
+                {"label":"Num Lock", "x":15.5, "y":1.5},
+                {"label":"/", "x":16.5, "y":1.5},
+                {"label":"*", "x":17.5, "y":1.5},
+                {"label":"-", "x":18.5, "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":"7", "x":15.5, "y":2.5},
+                {"label":"8", "x":16.5, "y":2.5},
+                {"label":"9", "x":17.5, "y":2.5},
+                {"label":"+", "x":18.5, "y":2.5, "h":2},
+                
+                {"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":"|", "x":12.75, "y":3.5},
+                {"label":"Enter", "x":13.75, "y":3.5, "w":1.25},
+                {"label":"4", "x":15.5, "y":3.5},
+                {"label":"5", "x":16.5, "y":3.5},
+                {"label":"6", "x":17.5, "y":3.5},
+                
+                {"label":"Shift", "x":0, "y":4.5, "w":1.25},
+                {"label":"|", "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},
+                {"label":"\u2191", "x":14.25, "y":4.75},
+                {"label":"1", "x":15.5, "y":4.5},
+                {"label":"2", "x":16.5, "y":4.5},
+                {"label":"3", "x":17.5, "y":4.5},
+                {"label":"Enter", "x":18.5, "y":4.5, "h":2},
+                
+                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
+                {"label":"Win", "x":1.25, "y":5.5},
+                {"label":"Alt", "x":2.25, "y":5.5, "w":1.25},
+                {"x":3.5, "y":5.5, "w":6.25},
+                {"label":"Alt", "x":9.75, "y":5.5},
+                {"label":"Ctrl", "x":10.75, "y":5.5},
+                {"label":"Fn", "x":11.75, "y":5.5, "w":1.25},
+                {"label":"\u2190", "x":13.25, "y":5.75},
+                {"label":"\u2193", "x":14.25, "y":5.75},
+                {"label":"\u2192", "x":15.25, "y":5.75},
+                {"label":"0", "x":16.5, "y":5.5},
+                {"label":".", "x":17.5, "y":5.5}
+            ]
+        },
+        "LAYOUT_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":"Insert", "x":15.5, "y":0},
+                {"label":"Delete", "x":16.5, "y":0},
+                {"label":"PgUp", "x":17.5, "y":0},
+                {"label":"PgDn", "x":18.5, "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":"Backspace", "x":13, "y":1.5, "w":2},
+                {"label":"Num Lock", "x":15.5, "y":1.5},
+                {"label":"/", "x":16.5, "y":1.5},
+                {"label":"*", "x":17.5, "y":1.5},
+                {"label":"-", "x":18.5, "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":"7", "x":15.5, "y":2.5},
+                {"label":"8", "x":16.5, "y":2.5},
+                {"label":"9", "x":17.5, "y":2.5},
+                {"label":"+", "x":18.5, "y":2.5, "h":2},
+                
+                {"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":"4", "x":15.5, "y":3.5},
+                {"label":"5", "x":16.5, "y":3.5},
+                {"label":"6", "x":17.5, "y":3.5},
+                
+                {"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":1.75},
+                {"label":"\u2191", "x":14.25, "y":4.75},
+                {"label":"1", "x":15.5, "y":4.5},
+                {"label":"2", "x":16.5, "y":4.5},
+                {"label":"3", "x":17.5, "y":4.5},
+                {"label":"Enter", "x":18.5, "y":4.5, "h":2},
+                
+                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
+                {"label":"Win", "x":1.25, "y":5.5},
+                {"label":"Alt", "x":2.25, "y":5.5, "w":1.25},
+                {"x":3.5, "y":5.5, "w":6.25},
+                {"label":"Alt", "x":9.75, "y":5.5},
+                {"label":"Ctrl", "x":10.75, "y":5.5},
+                {"label":"Fn", "x":11.75, "y":5.5, "w":1.25},
+                {"label":"\u2190", "x":13.25, "y":5.75},
+                {"label":"\u2193", "x":14.25, "y":5.75},
+                {"label":"\u2192", "x":15.25, "y":5.75},
+                {"label":"0", "x":16.5, "y":5.5},
+                {"label":".", "x":17.5, "y":5.5}
+            ]
+        },
+        "LAYOUT_iso": {
+            "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":"Insert", "x":15.5, "y":0},
+                {"label":"Delete", "x":16.5, "y":0},
+                {"label":"PgUp", "x":17.5, "y":0},
+                {"label":"PgDn", "x":18.5, "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":"Backspace", "x":13, "y":1.5, "w":2},
+                {"label":"Num Lock", "x":15.5, "y":1.5},
+                {"label":"/", "x":16.5, "y":1.5},
+                {"label":"*", "x":17.5, "y":1.5},
+                {"label":"-", "x":18.5, "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":"7", "x":15.5, "y":2.5},
+                {"label":"8", "x":16.5, "y":2.5},
+                {"label":"9", "x":17.5, "y":2.5},
+                {"label":"+", "x":18.5, "y":2.5, "h":2},
+                
+                {"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":"|", "x":12.75, "y":3.5},
+                {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2},
+                {"label":"4", "x":15.5, "y":3.5},
+                {"label":"5", "x":16.5, "y":3.5},
+                {"label":"6", "x":17.5, "y":3.5},
+                
+                {"label":"Shift", "x":0, "y":4.5, "w":1.25},
+                {"label":"|", "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},
+                {"label":"\u2191", "x":14.25, "y":4.75},
+                {"label":"1", "x":15.5, "y":4.5},
+                {"label":"2", "x":16.5, "y":4.5},
+                {"label":"3", "x":17.5, "y":4.5},
+                {"label":"Enter", "x":18.5, "y":4.5, "h":2},
+                
+                {"label":"Ctrl", "x":0, "y":5.5, "w":1.25},
+                {"label":"Win", "x":1.25, "y":5.5},
+                {"label":"Alt", "x":2.25, "y":5.5, "w":1.25},
+                {"x":3.5, "y":5.5, "w":6.25},
+                {"label":"Alt", "x":9.75, "y":5.5},
+                {"label":"Ctrl", "x":10.75, "y":5.5},
+                {"label":"Fn", "x":11.75, "y":5.5, "w":1.25},
+                {"label":"\u2190", "x":13.25, "y":5.75},
+                {"label":"\u2193", "x":14.25, "y":5.75},
+                {"label":"\u2192", "x":15.25, "y":5.75},
+                {"label":"0", "x":16.5, "y":5.5},
+                {"label":".", "x":17.5, "y":5.5}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/qmk/keyboards/evyd13/nt980/keymaps/default/keymap.c b/qmk/keyboards/evyd13/nt980/keymaps/default/keymap.c
new file mode 100644
index 00000000..1aae16b7
--- /dev/null
+++ b/qmk/keyboards/evyd13/nt980/keymaps/default/keymap.c
@@ -0,0 +1,41 @@
+/* Copyright 2020 Evy Dekkers
+ *
+ * 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 names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASE] = LAYOUT_all(
+        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_DEL,  KC_PGUP, KC_PGDN,
+        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_PMNS,
+        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_PPLS,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,      KC_P4,   KC_P5,   KC_P6,
+        KC_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_UP,     KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, KC_RCTL, MO(_FN),   KC_LEFT, KC_DOWN, KC_RGHT,   KC_P0,   KC_PDOT
+    ),
+    [_FN] = LAYOUT_all(
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, KC_HOME, KC_END,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______, _______,     _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______,   _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                   _______, KC_APP,  _______,   _______, _______, _______,   _______, _______
+    )
+};
diff --git a/qmk/keyboards/evyd13/nt980/keymaps/via/keymap.c b/qmk/keyboards/evyd13/nt980/keymaps/via/keymap.c
new file mode 100644
index 00000000..4000be9d
--- /dev/null
+++ b/qmk/keyboards/evyd13/nt980/keymaps/via/keymap.c
@@ -0,0 +1,59 @@
+/* Copyright 2020 Evy Dekkers
+ *
+ * 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 names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _FN1,
+    _FN2,
+    _FN3
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASE] = LAYOUT_all(
+        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_DEL,  KC_PGUP, KC_PGDN,
+        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_PMNS,
+        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_PPLS,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,      KC_P4,   KC_P5,   KC_P6,
+        KC_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_UP,     KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, KC_RCTL, MO(_FN1),  KC_LEFT, KC_DOWN, KC_RGHT,   KC_P0,   KC_PDOT
+    ),
+    [_FN1] = LAYOUT_all(
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, KC_HOME, KC_END,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, _______, _______,     _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______,   _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                   _______, KC_APP,  _______,   _______, _______, _______,   _______, _______
+    ),
+    [_FN2] = LAYOUT_all(
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______,   _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                   _______, _______, _______,   _______, _______, _______,   _______, _______
+    ),
+    [_FN3] = LAYOUT_all(
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______,   _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                   _______, _______, _______,   _______, _______, _______,   _______, _______
+    )
+};
diff --git a/qmk/keyboards/evyd13/nt980/keymaps/via/rules.mk b/qmk/keyboards/evyd13/nt980/keymaps/via/rules.mk
new file mode 100644
index 00000000..36b7ba9c
--- /dev/null
+++ b/qmk/keyboards/evyd13/nt980/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/qmk/keyboards/evyd13/nt980/nt980.c b/qmk/keyboards/evyd13/nt980/nt980.c
new file mode 100644
index 00000000..e0113f12
--- /dev/null
+++ b/qmk/keyboards/evyd13/nt980/nt980.c
@@ -0,0 +1,17 @@
+/* Copyright 2020 Evy Dekkers
+ *
+ * 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 "nt980.h"
diff --git a/qmk/keyboards/evyd13/nt980/nt980.h b/qmk/keyboards/evyd13/nt980/nt980.h
new file mode 100644
index 00000000..7480c653
--- /dev/null
+++ b/qmk/keyboards/evyd13/nt980/nt980.h
@@ -0,0 +1,97 @@
+/* Copyright 2020 Evy Dekkers
+ *
+ * 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 XXX KC_NO
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT_all( \
+    k00,      k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16,     k07, k17, k08, k18, \
+    k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36,     k27, k37, k28, k38, \
+    k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k56,     k47, k57, k48, k58, \
+    k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k66, k76,     k67, k77, k68,      \
+    k80, k90, k81, k91, k82, k92, k83, k93, k84, k94, k85, k95, k86,   k96,   k87, k97, k88, k98, \
+    ka0, kb0, ka1,                ka3,           kb4, ka5, kb5,   ka6, kb6, ka7,   kb7, ka8       \
+) \
+{ \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08 }, \
+    { XXX, k11, k12, k13, k14, k15, k16, k17, k18 }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28 }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38 }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47, k48 }, \
+    { k50, k51, k52, k53, k54, k55, k56, k57, k58 }, \
+    { k60, k61, k62, k63, k64, k65, k66, k67, k68 }, \
+    { k70, k71, k72, k73, k74, k75, k76, k77, XXX }, \
+    { k80, k81, k82, k83, k84, k85, k86, k87, k88 }, \
+    { k90, k91, k92, k93, k94, k95, k96, k97, k98 }, \
+    { ka0, ka1, XXX, ka3, XXX, ka5, ka6, ka7, ka8 }, \
+    { kb0, XXX, XXX, XXX, kb4, kb5, kb6, kb7, XXX }  \
+}
+
+#define LAYOUT_ansi( \
+    k00,      k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16,     k07, k17, k08, k18, \
+    k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36,     k27, k37, k28, k38, \
+    k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k56,     k47, k57, k48, k58, \
+    k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75,      k76,     k67, k77, k68,      \
+    k80,      k81, k91, k82, k92, k83, k93, k84, k94, k85, k95, k86,   k96,   k87, k97, k88, k98, \
+    ka0, kb0, ka1,                ka3,           kb4, ka5, kb5,   ka6, kb6, ka7,   kb7, ka8       \
+) \
+{ \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08 }, \
+    { XXX, k11, k12, k13, k14, k15, k16, k17, k18 }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28 }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38 }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47, k48 }, \
+    { k50, k51, k52, k53, k54, k55, k56, k57, k58 }, \
+    { k60, k61, k62, k63, k64, k65, XXX, k67, k68 }, \
+    { k70, k71, k72, k73, k74, k75, k76, k77, XXX }, \
+    { k80, k81, k82, k83, k84, k85, k86, k87, k88 }, \
+    { XXX, k91, k92, k93, k94, k95, k96, k97, k98 }, \
+    { ka0, ka1, XXX, ka3, XXX, ka5, ka6, ka7, ka8 }, \
+    { kb0, XXX, XXX, XXX, kb4, kb5, kb6, kb7, XXX }  \
+}
+
+#define LAYOUT_iso( \
+    k00,      k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16,     k07, k17, k08, k18, \
+    k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36,     k27, k37, k28, k38, \
+    k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46,          k47, k57, k48, k58, \
+    k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k66, k76,     k67, k77, k68,      \
+    k80, k90, k81, k91, k82, k92, k83, k93, k84, k94, k85, k95, k86,   k96,   k87, k97, k88, k98, \
+    ka0, kb0, ka1,                ka3,           kb4, ka5, kb5,   ka6, kb6, ka7,   kb7, ka8       \
+) \
+{ \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08 }, \
+    { XXX, k11, k12, k13, k14, k15, k16, k17, k18 }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28 }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38 }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47, k48 }, \
+    { k50, k51, k52, k53, k54, k55, XXX, k57, k58 }, \
+    { k60, k61, k62, k63, k64, k65, k66, k67, k68 }, \
+    { k70, k71, k72, k73, k74, k75, k76, k77, XXX }, \
+    { k80, k81, k82, k83, k84, k85, k86, k87, k88 }, \
+    { k90, k91, k92, k93, k94, k95, k96, k97, k98 }, \
+    { ka0, ka1, XXX, ka3, XXX, ka5, ka6, ka7, ka8 }, \
+    { kb0, XXX, XXX, XXX, kb4, kb5, kb6, kb7, XXX }  \
+}
diff --git a/qmk/keyboards/evyd13/nt980/readme.md b/qmk/keyboards/evyd13/nt980/readme.md
new file mode 100644
index 00000000..238d4371
--- /dev/null
+++ b/qmk/keyboards/evyd13/nt980/readme.md
@@ -0,0 +1,17 @@
+# nt980
+
+The nt980 is a direct replacement for the FC980m PCB from Leopold.
+
+* Keyboard Maintainer: [Evyd13](https://github.com/evyd13)
+* Hardware Supported: nt980 PCB
+* Hardware Availability: [GitHub](https://github.com/evyd13/nt-series/tree/main/nt-980)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make evyd13/nt980:default
+
+Flashing example for this keyboard:
+
+    make evyd13/nt980:default:flash
+
+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).
diff --git a/qmk/keyboards/evyd13/nt980/rules.mk b/qmk/keyboards/evyd13/nt980/rules.mk
new file mode 100644
index 00000000..5c0d8f30
--- /dev/null
+++ b/qmk/keyboards/evyd13/nt980/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+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
+# 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
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
diff --git a/qmk/keyboards/evyd13/omrontkl/config.h b/qmk/keyboards/evyd13/omrontkl/config.h
new file mode 100644
index 00000000..a72a6ce5
--- /dev/null
+++ b/qmk/keyboards/evyd13/omrontkl/config.h
@@ -0,0 +1,220 @@
+/* Copyright 2019 Evy Dekkers
+ *
+ * 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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x4705
+#define PRODUCT_ID      0xEA78
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Evyd13
+#define PRODUCT         OmronTKL
+#define DESCRIPTION     A TKL PCB for Omron switches
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 17
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+*/
+#define MATRIX_ROW_PINS {D0,D1,D2,D3,D4,B7}
+#define MATRIX_COL_PINS {F0,C7,F1,C6,F4,B6,F5,B5,F6,B4,F7,D7,D6,D5,B3,B1,B2}
+#define UNUSED_PINS {E6,B0}
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+// #define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6
+
+// #define BACKLIGHT_PIN B7
+// #define BACKLIGHT_BREATHING
+// #define BACKLIGHT_LEVELS 3
+
+// #define RGB_DI_PIN D0
+// #ifdef RGB_DI_PIN
+//   #define RGBLED_NUM 12
+//   #define RGBLIGHT_HUE_STEP 8
+//   #define RGBLIGHT_SAT_STEP 8
+//   #define RGBLIGHT_VAL_STEP 8
+//   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+//   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+// /*== all animations enable ==*/
+//   #define RGBLIGHT_ANIMATIONS
+// /*== or choose animations ==*/
+//   #define RGBLIGHT_EFFECT_BREATHING
+//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
+//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+//   #define RGBLIGHT_EFFECT_SNAKE
+//   #define RGBLIGHT_EFFECT_KNIGHT
+//   #define RGBLIGHT_EFFECT_CHRISTMAS
+//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
+//   #define RGBLIGHT_EFFECT_RGB_TEST
+//   #define RGBLIGHT_EFFECT_ALTERNATING
+// /*== customize breathing effect ==*/
+//   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+//   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+//   /*==== use exp() and sin() ====*/
+//   #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//   #define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+// #endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is userful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+// #define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Magic Key Options
+ *
+ * Magic keys are hotkey commands that allow control over firmware functions of
+ * the keyboard. They are best used in combination with the HID Listen program,
+ * found here: https://www.pjrc.com/teensy/hid_listen.html
+ *
+ * The options below allow the magic key functionality to be changed. This is
+ * useful if your keyboard/keypad is missing keys and you want magic key support.
+ *
+ */
+
+/* key combination for magic key command */
+/* defined by default; to change, uncomment and set to the combination you want */
+// #define IS_COMMAND() (get_mods() == MOD_MASK_SHIFT)
+
+/* control how magic key switches layers */
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS  true
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS  true
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false
+
+/* override magic key keymap */
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM
+//#define MAGIC_KEY_HELP           H
+//#define MAGIC_KEY_HELP_ALT       SLASH
+//#define MAGIC_KEY_DEBUG          D
+//#define MAGIC_KEY_DEBUG_MATRIX   X
+//#define MAGIC_KEY_DEBUG_KBD      K
+//#define MAGIC_KEY_DEBUG_MOUSE    M
+//#define MAGIC_KEY_VERSION        V
+//#define MAGIC_KEY_STATUS         S
+//#define MAGIC_KEY_CONSOLE        C
+//#define MAGIC_KEY_LAYER0         0
+//#define MAGIC_KEY_LAYER0_ALT     GRAVE
+//#define MAGIC_KEY_LAYER1         1
+//#define MAGIC_KEY_LAYER2         2
+//#define MAGIC_KEY_LAYER3         3
+//#define MAGIC_KEY_LAYER4         4
+//#define MAGIC_KEY_LAYER5         5
+//#define MAGIC_KEY_LAYER6         6
+//#define MAGIC_KEY_LAYER7         7
+//#define MAGIC_KEY_LAYER8         8
+//#define MAGIC_KEY_LAYER9         9
+//#define MAGIC_KEY_BOOTLOADER     B
+//#define MAGIC_KEY_BOOTLOADER_ALT ESC
+//#define MAGIC_KEY_LOCK           CAPS
+//#define MAGIC_KEY_EEPROM         E
+//#define MAGIC_KEY_EEPROM_CLEAR   BSPACE
+//#define MAGIC_KEY_NKRO           N
+//#define MAGIC_KEY_SLEEP_LED      Z
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+//#define NO_ACTION_MACRO
+//#define NO_ACTION_FUNCTION
+
+/*
+ * MIDI options
+ */
+
+/* Prevent use of disabled MIDI features in the keymap */
+//#define MIDI_ENABLE_STRICT 1
+
+/* enable basic MIDI features:
+   - MIDI notes can be sent when in Music mode is on
+*/
+//#define MIDI_BASIC
+
+/* enable advanced MIDI features:
+   - MIDI notes can be added to the keymap
+   - Octave shift and transpose
+   - Virtual sustain, portamento, and modulation wheel
+   - etc.
+*/
+//#define MIDI_ADVANCED
+
+/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
+//#define MIDI_TONE_KEYCODE_OCTAVES 1
+
+/* Bootmagic Lite key configuration */
+// #define BOOTMAGIC_LITE_ROW 0
+// #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/evyd13/omrontkl/info.json b/qmk/keyboards/evyd13/omrontkl/info.json
new file mode 100644
index 00000000..faf95696
--- /dev/null
+++ b/qmk/keyboards/evyd13/omrontkl/info.json
@@ -0,0 +1,299 @@
+{
+    "keyboard_name": "OmronTKL",
+    "url": "",
+    "maintainer": "qmk",
+    "width": 18.25,
+    "height": 6.25,
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6.5, "y":0},
+                {"x":7.5, "y":0},
+                {"x":8.5, "y":0},
+                {"x":9.5, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
+                {"x":15.25, "y":0},
+                {"x":16.25, "y":0},
+                {"x":17.25, "y":0},
+                
+                {"x":0, "y":1.25},
+                {"x":1, "y":1.25},
+                {"x":2, "y":1.25},
+                {"x":3, "y":1.25},
+                {"x":4, "y":1.25},
+                {"x":5, "y":1.25},
+                {"x":6, "y":1.25},
+                {"x":7, "y":1.25},
+                {"x":8, "y":1.25},
+                {"x":9, "y":1.25},
+                {"x":10, "y":1.25},
+                {"x":11, "y":1.25},
+                {"x":12, "y":1.25},
+                {"x":13, "y":1.25},
+                {"x":14, "y":1.25},
+                {"x":15.25, "y":1.25},
+                {"x":16.25, "y":1.25},
+                {"x":17.25, "y":1.25},
+                
+                {"x":0, "y":2.25, "w":1.5},
+                {"x":1.5, "y":2.25},
+                {"x":2.5, "y":2.25},
+                {"x":3.5, "y":2.25},
+                {"x":4.5, "y":2.25},
+                {"x":5.5, "y":2.25},
+                {"x":6.5, "y":2.25},
+                {"x":7.5, "y":2.25},
+                {"x":8.5, "y":2.25},
+                {"x":9.5, "y":2.25},
+                {"x":10.5, "y":2.25},
+                {"x":11.5, "y":2.25},
+                {"x":12.5, "y":2.25},
+                {"x":13.5, "y":2.25, "w":1.5},
+                {"x":15.25, "y":2.25},
+                {"x":16.25, "y":2.25},
+                {"x":17.25, "y":2.25},
+                
+                {"x":0, "y":3.25, "w":1.75},
+                {"x":1.75, "y":3.25},
+                {"x":2.75, "y":3.25},
+                {"x":3.75, "y":3.25},
+                {"x":4.75, "y":3.25},
+                {"x":5.75, "y":3.25},
+                {"x":6.75, "y":3.25},
+                {"x":7.75, "y":3.25},
+                {"x":8.75, "y":3.25},
+                {"x":9.75, "y":3.25},
+                {"x":10.75, "y":3.25},
+                {"x":11.75, "y":3.25},
+                {"x":12.75, "y":3.25},
+                {"x":13.75, "y":3.25, "w":1.25},
+                
+                {"x":0, "y":4.25, "w":1.25},
+                {"x":1.25, "y":4.25},
+                {"x":2.25, "y":4.25},
+                {"x":3.25, "y":4.25},
+                {"x":4.25, "y":4.25},
+                {"x":5.25, "y":4.25},
+                {"x":6.25, "y":4.25},
+                {"x":7.25, "y":4.25},
+                {"x":8.25, "y":4.25},
+                {"x":9.25, "y":4.25},
+                {"x":10.25, "y":4.25},
+                {"x":11.25, "y":4.25},
+                {"x":12.25, "y":4.25, "w":1.75},
+                {"x":14, "y":4.25},
+                {"x":16.25, "y":4.25},
+                
+                {"x":0, "y":5.25, "w":1.5},
+                {"x":1.5, "y":5.25, "w":1.25},
+                {"x":2.75, "y":5.25, "w":1.5},
+                {"x":4.25, "y":5.25, "w":6.5},
+                {"x":10.75, "y":5.25, "w":1.5},
+                {"x":12.25, "y":5.25, "w":1.25},
+                {"x":13.5, "y":5.25, "w":1.5},
+                {"x":15.25, "y":5.25},
+                {"x":16.25, "y":5.25},
+                {"x":17.25, "y":5.25}
+            ]
+        },
+        "LAYOUT_ansi": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6.5, "y":0},
+                {"x":7.5, "y":0},
+                {"x":8.5, "y":0},
+                {"x":9.5, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
+                {"x":15.25, "y":0},
+                {"x":16.25, "y":0},
+                {"x":17.25, "y":0},
+                
+                {"x":0, "y":1.25},
+                {"x":1, "y":1.25},
+                {"x":2, "y":1.25},
+                {"x":3, "y":1.25},
+                {"x":4, "y":1.25},
+                {"x":5, "y":1.25},
+                {"x":6, "y":1.25},
+                {"x":7, "y":1.25},
+                {"x":8, "y":1.25},
+                {"x":9, "y":1.25},
+                {"x":10, "y":1.25},
+                {"x":11, "y":1.25},
+                {"x":12, "y":1.25},
+                {"x":13, "y":1.25, "w":2},
+                {"x":15.25, "y":1.25},
+                {"x":16.25, "y":1.25},
+                {"x":17.25, "y":1.25},
+                
+                {"x":0, "y":2.25, "w":1.5},
+                {"x":1.5, "y":2.25},
+                {"x":2.5, "y":2.25},
+                {"x":3.5, "y":2.25},
+                {"x":4.5, "y":2.25},
+                {"x":5.5, "y":2.25},
+                {"x":6.5, "y":2.25},
+                {"x":7.5, "y":2.25},
+                {"x":8.5, "y":2.25},
+                {"x":9.5, "y":2.25},
+                {"x":10.5, "y":2.25},
+                {"x":11.5, "y":2.25},
+                {"x":12.5, "y":2.25},
+                {"x":13.5, "y":2.25, "w":1.5},
+                {"x":15.25, "y":2.25},
+                {"x":16.25, "y":2.25},
+                {"x":17.25, "y":2.25},
+                
+                {"x":0, "y":3.25, "w":1.75},
+                {"x":1.75, "y":3.25},
+                {"x":2.75, "y":3.25},
+                {"x":3.75, "y":3.25},
+                {"x":4.75, "y":3.25},
+                {"x":5.75, "y":3.25},
+                {"x":6.75, "y":3.25},
+                {"x":7.75, "y":3.25},
+                {"x":8.75, "y":3.25},
+                {"x":9.75, "y":3.25},
+                {"x":10.75, "y":3.25},
+                {"x":11.75, "y":3.25},
+                {"x":12.75, "y":3.25, "w":2.25},
+                
+                {"x":0, "y":4.25, "w":2.25},
+                {"x":2.25, "y":4.25},
+                {"x":3.25, "y":4.25},
+                {"x":4.25, "y":4.25},
+                {"x":5.25, "y":4.25},
+                {"x":6.25, "y":4.25},
+                {"x":7.25, "y":4.25},
+                {"x":8.25, "y":4.25},
+                {"x":9.25, "y":4.25},
+                {"x":10.25, "y":4.25},
+                {"x":11.25, "y":4.25},
+                {"x":12.25, "y":4.25, "w":2.75},
+                {"x":16.25, "y":4.25},
+                
+                {"x":0, "y":5.25, "w":1.5},
+                {"x":1.5, "y":5.25, "w":1.25},
+                {"x":2.75, "y":5.25, "w":1.5},
+                {"x":4.25, "y":5.25, "w":6.5},
+                {"x":10.75, "y":5.25, "w":1.5},
+                {"x":12.25, "y":5.25, "w":1.25},
+                {"x":13.5, "y":5.25, "w":1.5},
+                {"x":15.25, "y":5.25},
+                {"x":16.25, "y":5.25},
+                {"x":17.25, "y":5.25}
+            ]
+        },
+        "LAYOUT_iso": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6.5, "y":0},
+                {"x":7.5, "y":0},
+                {"x":8.5, "y":0},
+                {"x":9.5, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
+                {"x":15.25, "y":0},
+                {"x":16.25, "y":0},
+                {"x":17.25, "y":0},
+                
+                {"x":0, "y":1.25},
+                {"x":1, "y":1.25},
+                {"x":2, "y":1.25},
+                {"x":3, "y":1.25},
+                {"x":4, "y":1.25},
+                {"x":5, "y":1.25},
+                {"x":6, "y":1.25},
+                {"x":7, "y":1.25},
+                {"x":8, "y":1.25},
+                {"x":9, "y":1.25},
+                {"x":10, "y":1.25},
+                {"x":11, "y":1.25},
+                {"x":12, "y":1.25},
+                {"x":13, "y":1.25, "w":2},
+                {"x":15.25, "y":1.25},
+                {"x":16.25, "y":1.25},
+                {"x":17.25, "y":1.25},
+                
+                {"x":0, "y":2.25, "w":1.5},
+                {"x":1.5, "y":2.25},
+                {"x":2.5, "y":2.25},
+                {"x":3.5, "y":2.25},
+                {"x":4.5, "y":2.25},
+                {"x":5.5, "y":2.25},
+                {"x":6.5, "y":2.25},
+                {"x":7.5, "y":2.25},
+                {"x":8.5, "y":2.25},
+                {"x":9.5, "y":2.25},
+                {"x":10.5, "y":2.25},
+                {"x":11.5, "y":2.25},
+                {"x":12.5, "y":2.25},
+                {"x":15.25, "y":2.25},
+                {"x":16.25, "y":2.25},
+                {"x":17.25, "y":2.25},
+                
+                {"x":0, "y":3.25, "w":1.75},
+                {"x":1.75, "y":3.25},
+                {"x":2.75, "y":3.25},
+                {"x":3.75, "y":3.25},
+                {"x":4.75, "y":3.25},
+                {"x":5.75, "y":3.25},
+                {"x":6.75, "y":3.25},
+                {"x":7.75, "y":3.25},
+                {"x":8.75, "y":3.25},
+                {"x":9.75, "y":3.25},
+                {"x":10.75, "y":3.25},
+                {"x":11.75, "y":3.25},
+                {"x":12.75, "y":3.25},
+                {"x":13.75, "y":2.25, "w":1.25, "h":2},
+                
+                {"x":0, "y":4.25, "w":1.25},
+                {"x":1.25, "y":4.25},
+                {"x":2.25, "y":4.25},
+                {"x":3.25, "y":4.25},
+                {"x":4.25, "y":4.25},
+                {"x":5.25, "y":4.25},
+                {"x":6.25, "y":4.25},
+                {"x":7.25, "y":4.25},
+                {"x":8.25, "y":4.25},
+                {"x":9.25, "y":4.25},
+                {"x":10.25, "y":4.25},
+                {"x":11.25, "y":4.25},
+                {"x":12.25, "y":4.25, "w":2.75},
+                {"x":16.25, "y":4.25},
+                
+                {"x":0, "y":5.25, "w":1.5},
+                {"x":1.5, "y":5.25, "w":1.25},
+                {"x":2.75, "y":5.25, "w":1.5},
+                {"x":4.25, "y":5.25, "w":6.5},
+                {"x":10.75, "y":5.25, "w":1.5},
+                {"x":12.25, "y":5.25, "w":1.25},
+                {"x":13.5, "y":5.25, "w":1.5},
+                {"x":15.25, "y":5.25},
+                {"x":16.25, "y":5.25},
+                {"x":17.25, "y":5.25}
+            ]
+        }
+    }
+}
diff --git a/qmk/keyboards/evyd13/omrontkl/keymaps/default/keymap.c b/qmk/keyboards/evyd13/omrontkl/keymaps/default/keymap.c
new file mode 100644
index 00000000..c532d60a
--- /dev/null
+++ b/qmk/keyboards/evyd13/omrontkl/keymaps/default/keymap.c
@@ -0,0 +1,42 @@
+/* Copyright 2019 Evy Dekkers
+ *
+ * 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
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+
+#define _MA 0 //Main layer
+#define _FN 1 //Main layer
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[_MA] = LAYOUT_all(
+    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_BSLS,  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_BSLS,            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_RSFT,  MO(_FN),              KC_UP,
+    KC_LCTL,  KC_LGUI,  KC_LALT,                                          KC_SPC,                                           KC_RALT,  KC_RGUI,  KC_RCTRL,   KC_LEFT,  KC_DOWN,  KC_RGHT),
+[_FN] = LAYOUT_all(
+    _______,            _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,             _______,   _______,  _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    KC_VOLD,   KC_MUTE,  KC_VOLU,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,    KC_MPRV,   KC_MPLY,  KC_MNXT,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,  _______,               _______,
+    _______,  _______,  _______,                                          _______,                                          _______,  _______,  _______,    _______,   _______,  _______),
+
+};
\ No newline at end of file
diff --git a/qmk/keyboards/evyd13/omrontkl/omrontkl.c b/qmk/keyboards/evyd13/omrontkl/omrontkl.c
new file mode 100644
index 00000000..26d0344d
--- /dev/null
+++ b/qmk/keyboards/evyd13/omrontkl/omrontkl.c
@@ -0,0 +1,16 @@
+/* Copyright 2019 Evy Dekkers
+ *
+ * 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 "omrontkl.h"
diff --git a/qmk/keyboards/evyd13/omrontkl/omrontkl.h b/qmk/keyboards/evyd13/omrontkl/omrontkl.h
new file mode 100644
index 00000000..207eedfb
--- /dev/null
+++ b/qmk/keyboards/evyd13/omrontkl/omrontkl.h
@@ -0,0 +1,79 @@
+/* Copyright 2019 Evy Dekkers
+ *
+ * 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 XXX KC_NO
+
+/* This a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+
+#define LAYOUT_all( \
+    k00,      k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,      k0e, k0f, k0g, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k0d, k1d, k1e, k1f, k1g, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,      k2e, k2f, k2g, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d,                     \
+    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d,           k4f,      \
+    k50, k51, k52,                k56,                     k5b, k5c, k5d,      k5e, k5f, k5g  \
+) \
+{ \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, k0g }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, XXX, XXX, XXX }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, k4d, XXX, k4f, XXX }, \
+    { k50, k51, k52, XXX, XXX, XXX, k56, XXX, XXX, XXX, XXX, k5b, k5c, k5d, k5e, k5f, k5g }  \
+}
+
+#define LAYOUT_ansi( \
+    k00,      k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,      k0e, k0f, k0g, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,      k1e, k1f, k1g, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,      k2e, k2f, k2g, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3d,                     \
+    k40,      k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b,      k4c,           k4f,      \
+    k50, k51, k52,                k56,                     k5b, k5c, k5d,      k5e, k5f, k5g  \
+) \
+{ \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, XXX, k0e, k0f, k0g }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, k2f, k2g }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, XXX, XXX, XXX }, \
+    { k40, XXX, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, XXX, XXX, k4f, XXX }, \
+    { k50, k51, k52, XXX, XXX, XXX, k56, XXX, XXX, XXX, XXX, k5b, k5c, k5d, k5e, k5f, k5g }  \
+}
+
+#define LAYOUT_iso( \
+    k00,      k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,      k0e, k0f, k0g, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,      k1e, k1f, k1g, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c,           k2e, k2f, k2g, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d,                     \
+    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b,      k4c,           k4f,      \
+    k50, k51, k52,                k56,                     k5b, k5c, k5d,      k5e, k5f, k5g  \
+) \
+{ \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, XXX, k0e, k0f, k0g }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f, k1g }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, XXX, k2e, k2f, k2g }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, XXX, XXX, XXX }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b, k4c, XXX, XXX, k4f, XXX }, \
+    { k50, k51, k52, XXX, XXX, XXX, k56, XXX, XXX, XXX, XXX, k5b, k5c, k5d, k5e, k5f, k5g }  \
+}
diff --git a/qmk/keyboards/evyd13/omrontkl/readme.md b/qmk/keyboards/evyd13/omrontkl/readme.md
new file mode 100644
index 00000000..e45117c2
--- /dev/null
+++ b/qmk/keyboards/evyd13/omrontkl/readme.md
@@ -0,0 +1,13 @@
+# OmronTKL
+
+## Support
+* Keyboard Maintainer: [Evyd13](https://github.com/evyd13)
+* Hardware Supported: OmronTKL
+* Hardware Availability: none
+
+## Build
+Make example for this keyboard (after setting up your build environment):
+
+    make evyd13/omrontkl: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).
\ No newline at end of file
diff --git a/qmk/keyboards/evyd13/omrontkl/rules.mk b/qmk/keyboards/evyd13/omrontkl/rules.mk
new file mode 100644
index 00000000..8fc9b9c7
--- /dev/null
+++ b/qmk/keyboards/evyd13/omrontkl/rules.mk
@@ -0,0 +1,32 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+#   Teensy       halfkay
+#   Pro Micro    caterina
+#   Atmel DFU    atmel-dfu
+#   LUFA DFU     lufa-dfu
+#   QMK DFU      qmk-dfu
+#   ATmega32A    bootloadHID
+#   ATmega328P   USBasp
+BOOTLOADER = qmk-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = yes        # Console for debug
+COMMAND_ENABLE = no         # 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
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+MIDI_ENABLE = no            # MIDI support
+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
diff --git a/qmk/keyboards/evyd13/plain60/config.h b/qmk/keyboards/evyd13/plain60/config.h
new file mode 100644
index 00000000..9eb5d630
--- /dev/null
+++ b/qmk/keyboards/evyd13/plain60/config.h
@@ -0,0 +1,49 @@
+/*
+Copyright 2019 Evy Dekkers
+
+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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x4705
+#define PRODUCT_ID      0x0160
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Evyd13
+#define PRODUCT         Plain60
+#define DESCRIPTION     A plain 60% PCB
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+// ROWS: Top to bottom, COLS: Left to right
+
+#define MATRIX_ROW_PINS {B4,D7,D6,D4,E6}
+#define MATRIX_COL_PINS {D2,D1,D0,D3,D5,B5,F0,B6,C6,C7,F1,F4,F5,F6,F7}
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* define if matrix has ghost */
+//#define MATRIX_HAS_GHOST
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+#define QMK_ESC_OUTPUT D2 // usually COL
+#define QMK_ESC_INPUT B4 // usually ROW
diff --git a/qmk/keyboards/evyd13/plain60/info.json b/qmk/keyboards/evyd13/plain60/info.json
new file mode 100644
index 00000000..48aad441
--- /dev/null
+++ b/qmk/keyboards/evyd13/plain60/info.json
@@ -0,0 +1,502 @@
+{
+    "keyboard_name": "Plain60",
+    "url": "",
+    "maintainer": "evyd13",
+    "width": 15,
+    "height": 5,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6, "y": 0},
+                {"x": 7, "y": 0},
+                {"x": 8, "y": 0},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0},
+                {"x": 14, "y": 0},
+
+                {"x": 0, "y": 1, "w": 1.5},
+                {"x": 1.5, "y": 1},
+                {"x": 2.5, "y": 1},
+                {"x": 3.5, "y": 1},
+                {"x": 4.5, "y": 1},
+                {"x": 5.5, "y": 1},
+                {"x": 6.5, "y": 1},
+                {"x": 7.5, "y": 1},
+                {"x": 8.5, "y": 1},
+                {"x": 9.5, "y": 1},
+                {"x": 10.5, "y": 1},
+                {"x": 11.5, "y": 1},
+                {"x": 12.5, "y": 1},
+                {"x": 13.5, "y": 1, "w": 1.5},
+
+                {"x": 0, "y": 2, "w": 1.75},
+                {"x": 1.75, "y": 2},
+                {"x": 2.75, "y": 2},
+                {"x": 3.75, "y": 2},
+                {"x": 4.75, "y": 2},
+                {"x": 5.75, "y": 2},
+                {"x": 6.75, "y": 2},
+                {"x": 7.75, "y": 2},
+                {"x": 8.75, "y": 2},
+                {"x": 9.75, "y": 2},
+                {"x": 10.75, "y": 2},
+                {"x": 11.75, "y": 2},
+                {"x": 12.75, "y": 2},
+                {"x": 13.75, "y": 2, "w": 1.25},
+
+                {"x": 0, "y": 3, "w": 1.25},
+                {"x": 1.25, "y": 3},
+                {"x": 2.25, "y": 3},
+                {"x": 3.25, "y": 3},
+                {"x": 4.25, "y": 3},
+                {"x": 5.25, "y": 3},
+                {"x": 6.25, "y": 3},
+                {"x": 7.25, "y": 3},
+                {"x": 8.25, "y": 3},
+                {"x": 9.25, "y": 3},
+                {"x": 10.25, "y": 3},
+                {"x": 11.25, "y": 3},
+                {"x": 12.25, "y": 3, "w": 1.75},
+                {"x": 14, "y": 3},
+
+                {"x": 0, "y": 4, "w": 1.25},
+                {"x": 1.25, "y": 4, "w": 1.25},
+                {"x": 2.5, "y": 4, "w": 1.25},
+                {"x": 3.75, "y": 4, "w": 6.25},
+                {"x": 10, "y": 4, "w": 1.25},
+                {"x": 11.25, "y": 4, "w": 1.25},
+                {"x": 12.5, "y": 4, "w": 1.25},
+                {"x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6, "y": 0},
+                {"x": 7, "y": 0},
+                {"x": 8, "y": 0},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0, "w": 2},
+
+                {"x": 0, "y": 1, "w": 1.5},
+                {"x": 1.5, "y": 1},
+                {"x": 2.5, "y": 1},
+                {"x": 3.5, "y": 1},
+                {"x": 4.5, "y": 1},
+                {"x": 5.5, "y": 1},
+                {"x": 6.5, "y": 1},
+                {"x": 7.5, "y": 1},
+                {"x": 8.5, "y": 1},
+                {"x": 9.5, "y": 1},
+                {"x": 10.5, "y": 1},
+                {"x": 11.5, "y": 1},
+                {"x": 12.5, "y": 1},
+                {"x": 13.5, "y": 1, "w": 1.5},
+
+                {"x": 0, "y": 2, "w": 1.75},
+                {"x": 1.75, "y": 2},
+                {"x": 2.75, "y": 2},
+                {"x": 3.75, "y": 2},
+                {"x": 4.75, "y": 2},
+                {"x": 5.75, "y": 2},
+                {"x": 6.75, "y": 2},
+                {"x": 7.75, "y": 2},
+                {"x": 8.75, "y": 2},
+                {"x": 9.75, "y": 2},
+                {"x": 10.75, "y": 2},
+                {"x": 11.75, "y": 2},
+                {"x": 12.75, "y": 2, "w": 2.25},
+
+                {"x": 0, "y": 3, "w": 2.25},
+                {"x": 2.25, "y": 3},
+                {"x": 3.25, "y": 3},
+                {"x": 4.25, "y": 3},
+                {"x": 5.25, "y": 3},
+                {"x": 6.25, "y": 3},
+                {"x": 7.25, "y": 3},
+                {"x": 8.25, "y": 3},
+                {"x": 9.25, "y": 3},
+                {"x": 10.25, "y": 3},
+                {"x": 11.25, "y": 3},
+                {"x": 12.25, "y": 3, "w": 2.75},
+
+                {"x": 0, "y": 4, "w": 1.25},
+                {"x": 1.25, "y": 4, "w": 1.25},
+                {"x": 2.5, "y": 4, "w": 1.25},
+                {"x": 3.75, "y": 4, "w": 6.25},
+                {"x": 10, "y": 4, "w": 1.25},
+                {"x": 11.25, "y": 4, "w": 1.25},
+                {"x": 12.5, "y": 4, "w": 1.25},
+                {"x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_ansi_split_bs_rshift": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6, "y": 0},
+                {"x": 7, "y": 0},
+                {"x": 8, "y": 0},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0},
+                {"x": 14, "y": 0},
+
+                {"x": 0, "y": 1, "w": 1.5},
+                {"x": 1.5, "y": 1},
+                {"x": 2.5, "y": 1},
+                {"x": 3.5, "y": 1},
+                {"x": 4.5, "y": 1},
+                {"x": 5.5, "y": 1},
+                {"x": 6.5, "y": 1},
+                {"x": 7.5, "y": 1},
+                {"x": 8.5, "y": 1},
+                {"x": 9.5, "y": 1},
+                {"x": 10.5, "y": 1},
+                {"x": 11.5, "y": 1},
+                {"x": 12.5, "y": 1},
+                {"x": 13.5, "y": 1, "w": 1.5},
+
+                {"x": 0, "y": 2, "w": 1.75},
+                {"x": 1.75, "y": 2},
+                {"x": 2.75, "y": 2},
+                {"x": 3.75, "y": 2},
+                {"x": 4.75, "y": 2},
+                {"x": 5.75, "y": 2},
+                {"x": 6.75, "y": 2},
+                {"x": 7.75, "y": 2},
+                {"x": 8.75, "y": 2},
+                {"x": 9.75, "y": 2},
+                {"x": 10.75, "y": 2},
+                {"x": 11.75, "y": 2},
+                {"x": 12.75, "y": 2, "w": 2.25},
+
+                {"x": 0, "y": 3, "w": 2.25},
+                {"x": 2.25, "y": 3},
+                {"x": 3.25, "y": 3},
+                {"x": 4.25, "y": 3},
+                {"x": 5.25, "y": 3},
+                {"x": 6.25, "y": 3},
+                {"x": 7.25, "y": 3},
+                {"x": 8.25, "y": 3},
+                {"x": 9.25, "y": 3},
+                {"x": 10.25, "y": 3},
+                {"x": 11.25, "y": 3},
+                {"x": 12.25, "y": 3, "w": 1.75},
+                {"x": 14, "y": 3},
+
+                {"x": 0, "y": 4, "w": 1.25},
+                {"x": 1.25, "y": 4, "w": 1.25},
+                {"x": 2.5, "y": 4, "w": 1.25},
+                {"x": 3.75, "y": 4, "w": 6.25},
+                {"x": 10, "y": 4, "w": 1.25},
+                {"x": 11.25, "y": 4, "w": 1.25},
+                {"x": 12.5, "y": 4, "w": 1.25},
+                {"x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_hhkb": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6, "y": 0},
+                {"x": 7, "y": 0},
+                {"x": 8, "y": 0},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0},
+                {"x": 14, "y": 0},
+
+                {"x": 0, "y": 1, "w": 1.5},
+                {"x": 1.5, "y": 1},
+                {"x": 2.5, "y": 1},
+                {"x": 3.5, "y": 1},
+                {"x": 4.5, "y": 1},
+                {"x": 5.5, "y": 1},
+                {"x": 6.5, "y": 1},
+                {"x": 7.5, "y": 1},
+                {"x": 8.5, "y": 1},
+                {"x": 9.5, "y": 1},
+                {"x": 10.5, "y": 1},
+                {"x": 11.5, "y": 1},
+                {"x": 12.5, "y": 1},
+                {"x": 13.5, "y": 1, "w": 1.5},
+
+                {"x": 0, "y": 2, "w": 1.75},
+                {"x": 1.75, "y": 2},
+                {"x": 2.75, "y": 2},
+                {"x": 3.75, "y": 2},
+                {"x": 4.75, "y": 2},
+                {"x": 5.75, "y": 2},
+                {"x": 6.75, "y": 2},
+                {"x": 7.75, "y": 2},
+                {"x": 8.75, "y": 2},
+                {"x": 9.75, "y": 2},
+                {"x": 10.75, "y": 2},
+                {"x": 11.75, "y": 2},
+                {"x": 12.75, "y": 2, "w": 2.25},
+
+                {"x": 0, "y": 3, "w": 2.25},
+                {"x": 2.25, "y": 3},
+                {"x": 3.25, "y": 3},
+                {"x": 4.25, "y": 3},
+                {"x": 5.25, "y": 3},
+                {"x": 6.25, "y": 3},
+                {"x": 7.25, "y": 3},
+                {"x": 8.25, "y": 3},
+                {"x": 9.25, "y": 3},
+                {"x": 10.25, "y": 3},
+                {"x": 11.25, "y": 3},
+                {"x": 12.25, "y": 3, "w": 1.75},
+                {"x": 14, "y": 3},
+
+                {"x": 1.5, "y": 4},
+                {"x": 2.5, "y": 4, "w": 1.5},
+                {"x": 4, "y": 4, "w": 7},
+                {"x": 11, "y": 4, "w": 1.5},
+                {"x": 12.5, "y": 4}
+            ]
+        },
+        "LAYOUT_60_iso": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6, "y": 0},
+                {"x": 7, "y": 0},
+                {"x": 8, "y": 0},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0, "w": 2},
+
+                {"x": 0, "y": 1, "w": 1.5},
+                {"x": 1.5, "y": 1},
+                {"x": 2.5, "y": 1},
+                {"x": 3.5, "y": 1},
+                {"x": 4.5, "y": 1},
+                {"x": 5.5, "y": 1},
+                {"x": 6.5, "y": 1},
+                {"x": 7.5, "y": 1},
+                {"x": 8.5, "y": 1},
+                {"x": 9.5, "y": 1},
+                {"x": 10.5, "y": 1},
+                {"x": 11.5, "y": 1},
+                {"x": 12.5, "y": 1},
+
+                {"x": 0, "y": 2, "w": 1.75},
+                {"x": 1.75, "y": 2},
+                {"x": 2.75, "y": 2},
+                {"x": 3.75, "y": 2},
+                {"x": 4.75, "y": 2},
+                {"x": 5.75, "y": 2},
+                {"x": 6.75, "y": 2},
+                {"x": 7.75, "y": 2},
+                {"x": 8.75, "y": 2},
+                {"x": 9.75, "y": 2},
+                {"x": 10.75, "y": 2},
+                {"x": 11.75, "y": 2},
+                {"x": 12.75, "y": 2},
+                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"x": 0, "y": 3, "w": 1.25},
+                {"x": 1.25, "y": 3},
+                {"x": 2.25, "y": 3},
+                {"x": 3.25, "y": 3},
+                {"x": 4.25, "y": 3},
+                {"x": 5.25, "y": 3},
+                {"x": 6.25, "y": 3},
+                {"x": 7.25, "y": 3},
+                {"x": 8.25, "y": 3},
+                {"x": 9.25, "y": 3},
+                {"x": 10.25, "y": 3},
+                {"x": 11.25, "y": 3},
+                {"x": 12.25, "y": 3, "w": 2.75},
+
+                {"x": 0, "y": 4, "w": 1.25},
+                {"x": 1.25, "y": 4, "w": 1.25},
+                {"x": 2.5, "y": 4, "w": 1.25},
+                {"x": 3.75, "y": 4, "w": 6.25},
+                {"x": 10, "y": 4, "w": 1.25},
+                {"x": 11.25, "y": 4, "w": 1.25},
+                {"x": 12.5, "y": 4, "w": 1.25},
+                {"x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_iso_split_bs_rshift": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6, "y": 0},
+                {"x": 7, "y": 0},
+                {"x": 8, "y": 0},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0},
+                {"x": 14, "y": 0},
+
+                {"x": 0, "y": 1, "w": 1.5},
+                {"x": 1.5, "y": 1},
+                {"x": 2.5, "y": 1},
+                {"x": 3.5, "y": 1},
+                {"x": 4.5, "y": 1},
+                {"x": 5.5, "y": 1},
+                {"x": 6.5, "y": 1},
+                {"x": 7.5, "y": 1},
+                {"x": 8.5, "y": 1},
+                {"x": 9.5, "y": 1},
+                {"x": 10.5, "y": 1},
+                {"x": 11.5, "y": 1},
+                {"x": 12.5, "y": 1},
+
+                {"x": 0, "y": 2, "w": 1.75},
+                {"x": 1.75, "y": 2},
+                {"x": 2.75, "y": 2},
+                {"x": 3.75, "y": 2},
+                {"x": 4.75, "y": 2},
+                {"x": 5.75, "y": 2},
+                {"x": 6.75, "y": 2},
+                {"x": 7.75, "y": 2},
+                {"x": 8.75, "y": 2},
+                {"x": 9.75, "y": 2},
+                {"x": 10.75, "y": 2},
+                {"x": 11.75, "y": 2},
+                {"x": 12.75, "y": 2},
+                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"x": 0, "y": 3, "w": 1.25},
+                {"x": 1.25, "y": 3},
+                {"x": 2.25, "y": 3},
+                {"x": 3.25, "y": 3},
+                {"x": 4.25, "y": 3},
+                {"x": 5.25, "y": 3},
+                {"x": 6.25, "y": 3},
+                {"x": 7.25, "y": 3},
+                {"x": 8.25, "y": 3},
+                {"x": 9.25, "y": 3},
+                {"x": 10.25, "y": 3},
+                {"x": 11.25, "y": 3},
+                {"x": 12.25, "y": 3, "w": 1.75},
+                {"x": 14, "y": 3},
+
+                {"x": 0, "y": 4, "w": 1.25},
+                {"x": 1.25, "y": 4, "w": 1.25},
+                {"x": 2.5, "y": 4, "w": 1.25},
+                {"x": 3.75, "y": 4, "w": 6.25},
+                {"x": 10, "y": 4, "w": 1.25},
+                {"x": 11.25, "y": 4, "w": 1.25},
+                {"x": 12.5, "y": 4, "w": 1.25},
+                {"x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_tsangan_hhkb": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6, "y": 0},
+                {"x": 7, "y": 0},
+                {"x": 8, "y": 0},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0},
+                {"x": 14, "y": 0},
+
+                {"x": 0, "y": 1, "w": 1.5},
+                {"x": 1.5, "y": 1},
+                {"x": 2.5, "y": 1},
+                {"x": 3.5, "y": 1},
+                {"x": 4.5, "y": 1},
+                {"x": 5.5, "y": 1},
+                {"x": 6.5, "y": 1},
+                {"x": 7.5, "y": 1},
+                {"x": 8.5, "y": 1},
+                {"x": 9.5, "y": 1},
+                {"x": 10.5, "y": 1},
+                {"x": 11.5, "y": 1},
+                {"x": 12.5, "y": 1},
+                {"x": 13.5, "y": 1, "w": 1.5},
+
+                {"x": 0, "y": 2, "w": 1.75},
+                {"x": 1.75, "y": 2},
+                {"x": 2.75, "y": 2},
+                {"x": 3.75, "y": 2},
+                {"x": 4.75, "y": 2},
+                {"x": 5.75, "y": 2},
+                {"x": 6.75, "y": 2},
+                {"x": 7.75, "y": 2},
+                {"x": 8.75, "y": 2},
+                {"x": 9.75, "y": 2},
+                {"x": 10.75, "y": 2},
+                {"x": 11.75, "y": 2},
+                {"x": 12.75, "y": 2, "w": 2.25},
+
+                {"x": 0, "y": 3, "w": 2.25},
+                {"x": 2.25, "y": 3},
+                {"x": 3.25, "y": 3},
+                {"x": 4.25, "y": 3},
+                {"x": 5.25, "y": 3},
+                {"x": 6.25, "y": 3},
+                {"x": 7.25, "y": 3},
+                {"x": 8.25, "y": 3},
+                {"x": 9.25, "y": 3},
+                {"x": 10.25, "y": 3},
+                {"x": 11.25, "y": 3},
+                {"x": 12.25, "y": 3, "w": 1.75},
+                {"x": 14, "y": 3},
+
+                {"x": 0, "y": 4, "w": 1.5},
+                {"x": 1.5, "y": 4},
+                {"x": 2.5, "y": 4, "w": 1.5},
+                {"x": 4, "y": 4, "w": 7},
+                {"x": 11, "y": 4, "w": 1.5},
+                {"x": 12.5, "y": 4},
+                {"x": 13.5, "y": 4, "w": 1.5}
+            ]
+        }
+    }
+}
diff --git a/qmk/keyboards/evyd13/plain60/keymaps/audio/config.h b/qmk/keyboards/evyd13/plain60/keymaps/audio/config.h
new file mode 100644
index 00000000..9a43b7fb
--- /dev/null
+++ b/qmk/keyboards/evyd13/plain60/keymaps/audio/config.h
@@ -0,0 +1,3 @@
+#pragma once
+
+#define B7_AUDIO
diff --git a/qmk/keyboards/evyd13/plain60/keymaps/audio/keymap.c b/qmk/keyboards/evyd13/plain60/keymaps/audio/keymap.c
new file mode 100644
index 00000000..91ac3750
--- /dev/null
+++ b/qmk/keyboards/evyd13/plain60/keymaps/audio/keymap.c
@@ -0,0 +1,27 @@
+#include QMK_KEYBOARD_H
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+enum _layers {
+  _MA,
+  _FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[_MA] = LAYOUT(
+  KC_ESC,  KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_BSPC, \
+  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_CAPS, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, 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_RSFT, LT(_FN, KC_UP),   \
+  KC_LCTL, KC_LGUI, KC_LALT,                        KC_SPC,                          KC_RALT, KC_RGUI, LT(_FN, KC_APP),  KC_RCTRL),
+
+[_FN] = LAYOUT(
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,   \
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  \
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  \
+  AU_TOG,  MU_TOG,  MU_MOD,                             CK_TOGG,                            _______, _______, _______, _______)
+};
diff --git a/qmk/keyboards/evyd13/plain60/keymaps/audio/rules.mk b/qmk/keyboards/evyd13/plain60/keymaps/audio/rules.mk
new file mode 100644
index 00000000..600978d1
--- /dev/null
+++ b/qmk/keyboards/evyd13/plain60/keymaps/audio/rules.mk
@@ -0,0 +1,4 @@
+AUDIO_ENABLE = yes
+RAW_ENABLE = no
+DYNAMIC_KEYMAP_ENABLE = no
+
diff --git a/qmk/keyboards/evyd13/plain60/keymaps/default/keymap.c b/qmk/keyboards/evyd13/plain60/keymaps/default/keymap.c
new file mode 100644
index 00000000..2e23dece
--- /dev/null
+++ b/qmk/keyboards/evyd13/plain60/keymaps/default/keymap.c
@@ -0,0 +1,27 @@
+#include QMK_KEYBOARD_H
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+enum _layer {
+  _MA,
+  _FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[_MA] = LAYOUT(
+  KC_ESC,  KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_BSPC, \
+  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_CAPS, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, 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_RSFT, LT(_FN, KC_UP),   \
+  KC_LCTL, KC_LGUI, KC_LALT,                        KC_SPC,                          KC_RALT, KC_RGUI, LT(_FN, KC_APP),  KC_RCTRL),
+
+[_FN] = LAYOUT(
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,   \
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  \
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  \
+  _______, _______, _______,                            _______,                            _______, _______, _______, _______)
+};
diff --git a/qmk/keyboards/evyd13/plain60/keymaps/kwerdenker/config.h b/qmk/keyboards/evyd13/plain60/keymaps/kwerdenker/config.h
new file mode 100644
index 00000000..5fadcf82
--- /dev/null
+++ b/qmk/keyboards/evyd13/plain60/keymaps/kwerdenker/config.h
@@ -0,0 +1,26 @@
+/*
+Copyright 2019 Sebastian Spindler <sebastian.spindler@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+/* RGB Underglow */
+#define RGB_DI_PIN B7
+#define RGBLIGHT_ANIMATIONS
+#define RGBLED_NUM 30    			// Number of LEDs
+#define RGBLIGHT_HUE_STEP 8
+#define RGBLIGHT_SAT_STEP 8
+#define RGBLIGHT_VAL_STEP 8
diff --git a/qmk/keyboards/evyd13/plain60/keymaps/kwerdenker/keymap.c b/qmk/keyboards/evyd13/plain60/keymaps/kwerdenker/keymap.c
new file mode 100644
index 00000000..25370823
--- /dev/null
+++ b/qmk/keyboards/evyd13/plain60/keymaps/kwerdenker/keymap.c
@@ -0,0 +1,57 @@
+/*
+Copyright 2019 Sebastian Spindler <sebastian.spindler@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+#include "keymap_extras/keymap_german.h"
+
+//Layer renaming
+#define _DL  0                     //default
+#define _FUN 1                     //function layer
+#define _LED 2                     //LED configurations
+
+//Keymapping renaming
+#define ______  KC_TRNS            //renaming KC_TRNS for readability in keymaps
+#define RGB_MI  RGB_MODE_FORWARD   //increase RGB mode
+#define RGB_MD  RGB_MODE_REVERSE   //decrease RGB mode
+#define RGB_ST  RGB_M_P            //rgb static
+#define MONKEY  LCTL(LALT(KC_DEL)) //ctrl+alt+del == monkey grip
+#define SPECIAL LT(_FUN, DE_CIRC)  //
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [_DL] = LAYOUT(
+      KC_ESC,  KC_1,    KC_2,    KC_3,   KC_4,      KC_5,    KC_6,    KC_7,   KC_8,    KC_9, KC_0,   DE_SS,   DE_ACUT, ______, KC_BSPC,   \
+      KC_TAB,  KC_Q,    KC_W,    KC_E,   KC_R,      KC_T,    DE_Z,    KC_U,   KC_I,    KC_O, KC_P,   DE_UE,   DE_PLUS,          ______,   \
+      SPECIAL, KC_A,    KC_S,    KC_D,   KC_F,      KC_G,    KC_H,    KC_J,   KC_K,    KC_L, DE_OE,  DE_AE,   DE_HASH,          KC_ENT,   \
+      KC_LSFT, DE_LESS, DE_Y,    KC_X,   KC_C,      KC_V,    KC_B,    KC_N,   KC_M, KC_COMM, KC_DOT, DE_MINS,          KC_RSFT, MONKEY,   \
+      KC_LCTL, KC_LGUI, KC_LALT,                             KC_SPC                        , ______, KC_ALGR, TG(_LED),         KC_RCTL   ),
+
+  [_FUN] = LAYOUT(
+      ______, 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_DEL,   \
+      ______, KC_PGUP, KC_UP,   KC_PGDN,  ______,  ______, ______, ______, ______, ______, ______, ______,  ______,         ______,   \
+      ______, KC_LEFT, KC_DOWN, KC_RIGHT, KC_HOME, ______, ______, KC_END, ______, ______, ______, ______,  ______,         ______,   \
+      ______, ______, ______,   ______,   ______,  ______, ______, ______, ______, ______, ______, ______,           KC_UP, ______,   \
+      ______, ______, ______,                              ______                        , ______, KC_LEFT, KC_DOWN,        KC_RIGHT  ),
+
+  [_LED] = LAYOUT(
+      ______, ______,  ______,  ______,  ______,  ______,  ______,  ______, ______, ______, ______, ______, ______,   ______, RESET,    \
+      ______, RGB_TOG, RGB_MI,  RGB_MD,  RGB_ST,  ______,  ______,  ______, ______, ______, ______, ______, ______,           ______,   \
+      ______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, ______,  ______,  ______, ______, ______, ______, ______, ______,           ______,   \
+      ______, ______,  RGB_VAI, RGB_VAD, ______,  ______,  ______,  ______, ______, ______, ______, ______,           ______, ______,   \
+      ______, ______,  ______,                             ______                         , ______, ______, TG(_LED),         ______    ),
+};
diff --git a/qmk/keyboards/evyd13/plain60/keymaps/kwerdenker/rules.mk b/qmk/keyboards/evyd13/plain60/keymaps/kwerdenker/rules.mk
new file mode 100644
index 00000000..facc9dc7
--- /dev/null
+++ b/qmk/keyboards/evyd13/plain60/keymaps/kwerdenker/rules.mk
@@ -0,0 +1,22 @@
+#Copyright 2019 Sebastian Spindler <sebastian.spindler@gmail.com>
+
+#This program is free software: you can redistribute it and/or modify
+#it under the terms of the GNU General Public License as published by
+#the Free Software Foundation, either version 2 of the License, or
+#(at your option) any later version.
+
+#This program is distributed in the hope that it will be useful,
+#but WITHOUT ANY WARRANTY; without even the implied warranty of
+#MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#GNU General Public License for more details.
+
+#You should have received a copy of the GNU General Public License
+#along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+# Build Options
+#   comment out to disable the options.
+#
+BOOTMAGIC_ENABLE = lite	# Virtual DIP switch configuration(+1000)
+NKRO_ENABLE = yes		# USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+RGBLIGHT_ENABLE = yes   # Enable keyboard underlight functionality (+4870)
+
diff --git a/qmk/keyboards/evyd13/plain60/keymaps/rgb/config.h b/qmk/keyboards/evyd13/plain60/keymaps/rgb/config.h
new file mode 100644
index 00000000..84269381
--- /dev/null
+++ b/qmk/keyboards/evyd13/plain60/keymaps/rgb/config.h
@@ -0,0 +1,8 @@
+#pragma once
+
+#define RGB_DI_PIN B0
+#define RGBLIGHT_ANIMATIONS
+#define RGBLED_NUM 20    			// limit to 20 otherwise brownouts
+#define RGBLIGHT_HUE_STEP 8
+#define RGBLIGHT_SAT_STEP 8
+#define RGBLIGHT_VAL_STEP 8
diff --git a/qmk/keyboards/evyd13/plain60/keymaps/rgb/keymap.c b/qmk/keyboards/evyd13/plain60/keymaps/rgb/keymap.c
new file mode 100644
index 00000000..abfb5f6b
--- /dev/null
+++ b/qmk/keyboards/evyd13/plain60/keymaps/rgb/keymap.c
@@ -0,0 +1,27 @@
+#include QMK_KEYBOARD_H
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+enum _layers {
+  _MA,
+  _FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[_MA] = LAYOUT(
+  KC_ESC,  KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_BSPC, \
+  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_CAPS, KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, 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_RSFT, LT(_FN, KC_UP),            \
+  KC_LCTL, KC_LGUI, KC_LALT,                        KC_SPC,                          KC_RALT, KC_RGUI, LT(_FN, KC_APP),  KC_RCTRL),
+
+[_FN] = LAYOUT(
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,   \
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  \
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  \
+  RGB_TOG, RGB_MOD, _______,                            _______,                            _______, _______, _______, _______)
+};
diff --git a/qmk/keyboards/evyd13/plain60/keymaps/rgb/rules.mk b/qmk/keyboards/evyd13/plain60/keymaps/rgb/rules.mk
new file mode 100644
index 00000000..b6cd87b7
--- /dev/null
+++ b/qmk/keyboards/evyd13/plain60/keymaps/rgb/rules.mk
@@ -0,0 +1,3 @@
+RGBLIGHT_ENABLE = yes
+RAW_ENABLE = no
+DYNAMIC_KEYMAP_ENABLE = no
diff --git a/qmk/keyboards/evyd13/plain60/keymaps/via/keymap.c b/qmk/keyboards/evyd13/plain60/keymaps/via/keymap.c
new file mode 100644
index 00000000..a500f238
--- /dev/null
+++ b/qmk/keyboards/evyd13/plain60/keymaps/via/keymap.c
@@ -0,0 +1,32 @@
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[0] = LAYOUT(
+  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_BSPC,
+  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_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, 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_RSFT, MO(1),
+  KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, MO(1),   KC_RCTRL),
+  
+[1] = LAYOUT(
+  _______, 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_DEL,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______,                            _______,                            _______, _______, _______, _______),
+
+[2] = LAYOUT(
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______,                            _______,                            _______, _______, _______, _______),
+
+[3] = LAYOUT(
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______,                            _______,                            _______, _______, _______, _______),
+};
diff --git a/qmk/keyboards/evyd13/plain60/keymaps/via/rules.mk b/qmk/keyboards/evyd13/plain60/keymaps/via/rules.mk
new file mode 100644
index 00000000..1e5b9980
--- /dev/null
+++ b/qmk/keyboards/evyd13/plain60/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/qmk/keyboards/evyd13/plain60/plain60.c b/qmk/keyboards/evyd13/plain60/plain60.c
new file mode 100644
index 00000000..d8160641
--- /dev/null
+++ b/qmk/keyboards/evyd13/plain60/plain60.c
@@ -0,0 +1 @@
+#include "plain60.h"
diff --git a/qmk/keyboards/evyd13/plain60/plain60.h b/qmk/keyboards/evyd13/plain60/plain60.h
new file mode 100644
index 00000000..87688e9e
--- /dev/null
+++ b/qmk/keyboards/evyd13/plain60/plain60.h
@@ -0,0 +1,114 @@
+#pragma once
+
+#include "quantum.h"
+
+// readability
+#define XXX KC_NO
+
+#define LAYOUT( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
+    k40, k41, k42,                k46,                k4a, k4b, k4c, k4d  \
+) \
+{ \
+    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e}, \
+    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, XXX}, \
+    {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, XXX}, \
+    {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, XXX}, \
+    {k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4a, k4b, k4c, k4d, XXX}  \
+}
+
+#define LAYOUT_60_ansi( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,      k0e, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,      k2d, \
+    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c,      \
+    k40, k41, k42,                k46,                k4a, k4b, k4c, k4d  \
+) \
+{ \
+    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, XXX, k0e}, \
+    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, XXX}, \
+    {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, XXX}, \
+    {k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, XXX, XXX}, \
+    {k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4a, k4b, k4c, k4d, XXX}  \
+}
+
+#define LAYOUT_60_ansi_split_bs_rshift( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,      k2d, \
+    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
+    k40, k41, k42,                k46,                k4a, k4b, k4c, k4d  \
+) \
+{ \
+    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e}, \
+    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, XXX}, \
+    {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, XXX}, \
+    {k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, XXX}, \
+    {k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4a, k4b, k4c, k4d, XXX}  \
+}
+
+#define LAYOUT_60_hhkb( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,      k2d, \
+    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
+         k41, k42,                k46,                     k4b, k4c       \
+) \
+{ \
+    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e}, \
+    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, XXX}, \
+    {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, XXX}, \
+    {k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, XXX}, \
+    {XXX, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, XXX, k4b, k4c, XXX, XXX}  \
+}
+
+#define LAYOUT_60_tsangan_hhkb( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,      k2d, \
+    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
+    k40, k41, k42,                k46,                     k4b, k4c, k4d  \
+) \
+{ \
+    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e}, \
+    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, XXX}, \
+    {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, XXX}, \
+    {k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, XXX}, \
+    {k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, XXX, k4b, k4c, k4d, XXX}  \
+}
+
+#define LAYOUT_60_iso( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,      k0e, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,      \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c,      \
+    k40, k41, k42,                k46,                k4a, k4b, k4c, k4d  \
+) \
+{ \
+    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, XXX, k0e}, \
+    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, XXX}, \
+    {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, XXX}, \
+    {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, XXX, XXX}, \
+    {k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4a, k4b, k4c, k4d, XXX}  \
+}
+
+#define LAYOUT_60_iso_split_bs_rshift( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,      \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
+    k40, k41, k42,                k46,                k4a, k4b, k4c, k4d  \
+) \
+{ \
+    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e}, \
+    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, XXX}, \
+    {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, XXX}, \
+    {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, XXX}, \
+    {k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4a, k4b, k4c, k4d, XXX}  \
+}
+
+void matrix_init_user(void);
+void matrix_scan_user(void);
diff --git a/qmk/keyboards/evyd13/plain60/readme.md b/qmk/keyboards/evyd13/plain60/readme.md
new file mode 100644
index 00000000..5ed19f0e
--- /dev/null
+++ b/qmk/keyboards/evyd13/plain60/readme.md
@@ -0,0 +1,14 @@
+Plain60-C and Plain60-B
+======
+
+A plain 60% PCB with USB-C.
+
+Keyboard Maintainer: [Evyd13](https://github.com/evyd13)  
+Hardware Supported: Plain60-C and Plain60-B  
+Hardware Availability: https://github.com/evyd13/plain60-c
+
+Make example for this keyboard (after setting up your build environment):
+
+    make plain60: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).
diff --git a/qmk/keyboards/evyd13/plain60/rules.mk b/qmk/keyboards/evyd13/plain60/rules.mk
new file mode 100644
index 00000000..398b5922
--- /dev/null
+++ b/qmk/keyboards/evyd13/plain60/rules.mk
@@ -0,0 +1,30 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+#   Teensy       halfkay
+#   Pro Micro    caterina
+#   Atmel DFU    atmel-dfu
+#   LUFA DFU     lufa-dfu
+#   QMK DFU      qmk-dfu
+#   ATmega32A    bootloadHID
+#   ATmega328P   USBasp
+BOOTLOADER = qmk-dfu
+
+# Build Options
+#   comment out to disable the options.
+#
+BOOTMAGIC_ENABLE = lite	# Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no	# Mouse keys
+EXTRAKEY_ENABLE = yes	# Audio control and System control
+CONSOLE_ENABLE = no	# Console for debug
+COMMAND_ENABLE = no    # Commands for debug and configuration
+NKRO_ENABLE = no		# USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+RGBLIGHT_ENABLE = no   # Enable keyboard underlight functionality
+BACKLIGHT_ENABLE = no  # Enable keyboard backlight functionality
+MIDI_ENABLE = no 		# MIDI controls
+AUDIO_ENABLE = no
+UNICODE_ENABLE = no 		# Unicode
+BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
+
+LAYOUTS = 60_ansi 60_ansi_split_bs_rshift 60_hhkb 60_iso 60_tsangan_hhkb
diff --git a/qmk/keyboards/evyd13/pockettype/config.h b/qmk/keyboards/evyd13/pockettype/config.h
new file mode 100644
index 00000000..fd2e0a8d
--- /dev/null
+++ b/qmk/keyboards/evyd13/pockettype/config.h
@@ -0,0 +1,220 @@
+/* Copyright 2019 Evy Dekkers
+ *
+ * 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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x4705
+#define PRODUCT_ID      0xFA7D
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Evyd13
+#define PRODUCT         PocketType
+#define DESCRIPTION     A small 4x12 ortholinear keyboard
+
+/* key matrix size */
+#define MATRIX_ROWS 4
+#define MATRIX_COLS 12
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+*/
+#define MATRIX_ROW_PINS {D3,D1,D7,B5}
+#define MATRIX_COL_PINS {F6,F7,B1,B3,B2,B6,B4,E6,C6,D4,D0,D2}
+#define UNUSED_PINS {B1,B2,B3}
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+// #define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6
+
+// #define BACKLIGHT_PIN B7
+// #define BACKLIGHT_BREATHING
+// #define BACKLIGHT_LEVELS 3
+
+// #define RGB_DI_PIN E2
+// #ifdef RGB_DI_PIN
+//   #define RGBLED_NUM 16
+//   #define RGBLIGHT_HUE_STEP 8
+//   #define RGBLIGHT_SAT_STEP 8
+//   #define RGBLIGHT_VAL_STEP 8
+//   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+//   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+// /*== all animations enable ==*/
+//   #define RGBLIGHT_ANIMATIONS
+// /*== or choose animations ==*/
+//   #define RGBLIGHT_EFFECT_BREATHING
+//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
+//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+//   #define RGBLIGHT_EFFECT_SNAKE
+//   #define RGBLIGHT_EFFECT_KNIGHT
+//   #define RGBLIGHT_EFFECT_CHRISTMAS
+//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
+//   #define RGBLIGHT_EFFECT_RGB_TEST
+//   #define RGBLIGHT_EFFECT_ALTERNATING
+// /*== customize breathing effect ==*/
+//   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+//   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+//   /*==== use exp() and sin() ====*/
+//   #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//   #define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+// #endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is userful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+// #define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Magic Key Options
+ *
+ * Magic keys are hotkey commands that allow control over firmware functions of
+ * the keyboard. They are best used in combination with the HID Listen program,
+ * found here: https://www.pjrc.com/teensy/hid_listen.html
+ *
+ * The options below allow the magic key functionality to be changed. This is
+ * useful if your keyboard/keypad is missing keys and you want magic key support.
+ *
+ */
+
+/* key combination for magic key command */
+/* defined by default; to change, uncomment and set to the combination you want */
+// #define IS_COMMAND() (get_mods() == MOD_MASK_SHIFT)
+
+/* control how magic key switches layers */
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS  true
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS  true
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false
+
+/* override magic key keymap */
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM
+//#define MAGIC_KEY_HELP           H
+//#define MAGIC_KEY_HELP_ALT       SLASH
+//#define MAGIC_KEY_DEBUG          D
+//#define MAGIC_KEY_DEBUG_MATRIX   X
+//#define MAGIC_KEY_DEBUG_KBD      K
+//#define MAGIC_KEY_DEBUG_MOUSE    M
+//#define MAGIC_KEY_VERSION        V
+//#define MAGIC_KEY_STATUS         S
+//#define MAGIC_KEY_CONSOLE        C
+//#define MAGIC_KEY_LAYER0         0
+//#define MAGIC_KEY_LAYER0_ALT     GRAVE
+//#define MAGIC_KEY_LAYER1         1
+//#define MAGIC_KEY_LAYER2         2
+//#define MAGIC_KEY_LAYER3         3
+//#define MAGIC_KEY_LAYER4         4
+//#define MAGIC_KEY_LAYER5         5
+//#define MAGIC_KEY_LAYER6         6
+//#define MAGIC_KEY_LAYER7         7
+//#define MAGIC_KEY_LAYER8         8
+//#define MAGIC_KEY_LAYER9         9
+//#define MAGIC_KEY_BOOTLOADER     B
+//#define MAGIC_KEY_BOOTLOADER_ALT ESC
+//#define MAGIC_KEY_LOCK           CAPS
+//#define MAGIC_KEY_EEPROM         E
+//#define MAGIC_KEY_EEPROM_CLEAR   BSPACE
+//#define MAGIC_KEY_NKRO           N
+//#define MAGIC_KEY_SLEEP_LED      Z
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+//#define NO_ACTION_MACRO
+//#define NO_ACTION_FUNCTION
+
+/*
+ * MIDI options
+ */
+
+/* Prevent use of disabled MIDI features in the keymap */
+//#define MIDI_ENABLE_STRICT 1
+
+/* enable basic MIDI features:
+   - MIDI notes can be sent when in Music mode is on
+*/
+//#define MIDI_BASIC
+
+/* enable advanced MIDI features:
+   - MIDI notes can be added to the keymap
+   - Octave shift and transpose
+   - Virtual sustain, portamento, and modulation wheel
+   - etc.
+*/
+//#define MIDI_ADVANCED
+
+/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
+//#define MIDI_TONE_KEYCODE_OCTAVES 1
+
+/* Bootmagic Lite key configuration */
+// #define BOOTMAGIC_LITE_ROW 0
+// #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/evyd13/pockettype/info.json b/qmk/keyboards/evyd13/pockettype/info.json
new file mode 100644
index 00000000..d1999273
--- /dev/null
+++ b/qmk/keyboards/evyd13/pockettype/info.json
@@ -0,0 +1,12 @@
+{
+  "keyboard_name": "PocketType", 
+  "url": "https://mechboards.co.uk/shop/kits/pockettype/", 
+  "maintainer": "evyd13", 
+  "width": 12, 
+  "height": 4, 
+  "layouts": {
+    "LAYOUT_ortho_4x12": {
+      "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}]
+    }
+  }
+}
diff --git a/qmk/keyboards/evyd13/pockettype/keymaps/default/keymap.c b/qmk/keyboards/evyd13/pockettype/keymaps/default/keymap.c
new file mode 100644
index 00000000..5ca7326c
--- /dev/null
+++ b/qmk/keyboards/evyd13/pockettype/keymaps/default/keymap.c
@@ -0,0 +1,46 @@
+/* Copyright 2019 Evy Dekkers
+ *
+ * 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
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+
+#define _MA 0 //Main layer
+#define _LO 1 //Low
+#define _HI 2 //High
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[_MA] = LAYOUT_ortho_4x12(
+  KC_GESC,  KC_Q,        KC_W,        KC_E,        KC_R,        KC_T,     KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_DEL,
+  KC_TAB,   KC_A,        KC_S,        KC_D,        KC_F,        KC_G,     KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  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_LCTL,  KC_LGUI,     KC_LALT,     KC_RALT,     MO(_LO),     KC_SPC,   KC_BSPC,  MO(_HI),  KC_LEFT,  KC_DOWN,  KC_UP,    KC_MPLY),
+
+[_LO] = LAYOUT_ortho_4x12(
+  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_1,     KC_2,        KC_3,        KC_4,        KC_5,        KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,  KC_EQL,
+  _______,  LCTL(KC_Z),  LCTL(KC_X),  LCTL(KC_C),  LCTL(KC_V),  _______,  _______,  KC_QUOT,  KC_LBRC,  KC_RBRC,  KC_BSLS,  _______,
+  _______,  _______,     _______,     _______,     _______,     _______,  _______,  _______,  _______,  _______,  _______,  RESET),
+
+[_HI] = LAYOUT_ortho_4x12(
+  _______,  _______,     _______,     _______,     _______,     _______,  _______,  KC_PGUP,  KC_UP,    KC_PGDN,  _______,  _______,
+  KC_CAPS,  _______,     _______,     _______,     _______,     _______,  _______,  KC_LEFT,  KC_DOWN,  KC_RIGHT, _______,  _______,
+  _______,  _______,     _______,     _______,     _______,     _______,  _______,  _______,  KC_VOLD,  KC_VOLU,  KC_MPLY,   KC_PSCR,
+  _______,  _______,     _______,     _______,     _______,     _______,  _______,  _______,  _______,  _______,  _______,   _______),
+
+};
diff --git a/qmk/keyboards/evyd13/pockettype/keymaps/default/readme.md b/qmk/keyboards/evyd13/pockettype/keymaps/default/readme.md
new file mode 100644
index 00000000..281fa648
--- /dev/null
+++ b/qmk/keyboards/evyd13/pockettype/keymaps/default/readme.md
@@ -0,0 +1 @@
+This is the default keymap for the PocketType.
diff --git a/qmk/keyboards/evyd13/pockettype/pockettype.c b/qmk/keyboards/evyd13/pockettype/pockettype.c
new file mode 100644
index 00000000..7404ac82
--- /dev/null
+++ b/qmk/keyboards/evyd13/pockettype/pockettype.c
@@ -0,0 +1,39 @@
+/* Copyright 2019 Evy Dekkers
+ *
+ * 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 "pockettype.h"
+
+void matrix_init_kb(void) {
+	led_init_ports();
+  
+	matrix_init_user();
+};
+
+void led_init_ports(void) {
+    // * Set our LED pins as output and high
+    setPinOutput(F5);
+    writePinHigh(F5);
+    
+    setPinOutput(F4);
+    writePinLow(F4);
+}
+
+bool led_update_kb(led_t led_state) {
+    if(led_update_user(led_state)) {
+        writePin(F5, !led_state.caps_lock);
+    }
+
+    return true;
+}
diff --git a/qmk/keyboards/evyd13/pockettype/pockettype.h b/qmk/keyboards/evyd13/pockettype/pockettype.h
new file mode 100644
index 00000000..8c103dcc
--- /dev/null
+++ b/qmk/keyboards/evyd13/pockettype/pockettype.h
@@ -0,0 +1,40 @@
+/* Copyright 2019 Evy Dekkers
+ *
+ * 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 first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+
+#define LAYOUT_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 \
+) \
+{ \
+	{ 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 } \
+}
diff --git a/qmk/keyboards/evyd13/pockettype/readme.md b/qmk/keyboards/evyd13/pockettype/readme.md
new file mode 100644
index 00000000..c32568a8
--- /dev/null
+++ b/qmk/keyboards/evyd13/pockettype/readme.md
@@ -0,0 +1,13 @@
+# PocketType
+
+## Support
+* Keyboard Maintainer: [Evyd13](https://github.com/evyd13)
+* Hardware Supported: PocketType
+* Hardware Availability: [mechboards.co.uk](https://mechboards.co.uk/shop/kits/pockettype/)
+
+## Build
+Make example for this keyboard (after setting up your build environment):
+
+    make evyd13/pockettype: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).
\ No newline at end of file
diff --git a/qmk/keyboards/evyd13/pockettype/rules.mk b/qmk/keyboards/evyd13/pockettype/rules.mk
new file mode 100644
index 00000000..164bf9ce
--- /dev/null
+++ b/qmk/keyboards/evyd13/pockettype/rules.mk
@@ -0,0 +1,31 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+#   Teensy       halfkay
+#   Pro Micro    caterina
+#   Atmel DFU    atmel-dfu
+#   LUFA DFU     lufa-dfu
+#   QMK DFU      qmk-dfu
+#   ATmega32A    bootloadHID
+#   ATmega328P   USBasp
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # 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
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+
+LAYOUTS = ortho_4x12
diff --git a/qmk/keyboards/evyd13/quackfire/config.h b/qmk/keyboards/evyd13/quackfire/config.h
new file mode 100644
index 00000000..22083e81
--- /dev/null
+++ b/qmk/keyboards/evyd13/quackfire/config.h
@@ -0,0 +1,147 @@
+/*
+Copyright 2020 Evy Dekkers
+
+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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x4705
+#define PRODUCT_ID      0x87C9
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Evyd13
+#define PRODUCT         Quackfire
+
+/* key matrix size */
+#define MATRIX_ROWS 8
+#define MATRIX_COLS 15
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+*/
+#define MATRIX_ROW_PINS {D3,F5,F4,F0,B7,B2,E6,B0}
+#define MATRIX_COL_PINS {B3,F1,B1,D5,D2,D1,D0,D4,D6,D7,B4,B5,B6,C6,C7}
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION ROW2COL
+
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+//#define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6
+
+// #define BACKLIGHT_PIN B7
+// #define BACKLIGHT_BREATHING
+// #define BACKLIGHT_LEVELS 5
+
+// #define RGB_DI_PIN E2
+// #ifdef RGB_DI_PIN
+//   #define RGBLED_NUM 16
+//   #define RGBLIGHT_HUE_STEP 8
+//   #define RGBLIGHT_SAT_STEP 8
+//   #define RGBLIGHT_VAL_STEP 8
+//   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+//   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+// /*== all animations enable ==*/
+//   #define RGBLIGHT_ANIMATIONS
+// /*== or choose animations ==*/
+//   #define RGBLIGHT_EFFECT_BREATHING
+//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
+//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+//   #define RGBLIGHT_EFFECT_SNAKE
+//   #define RGBLIGHT_EFFECT_KNIGHT
+//   #define RGBLIGHT_EFFECT_CHRISTMAS
+//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
+//   #define RGBLIGHT_EFFECT_RGB_TEST
+//   #define RGBLIGHT_EFFECT_ALTERNATING
+// /*== customize breathing effect ==*/
+//   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+//   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+//   /*==== use exp() and sin() ====*/
+//   #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//   #define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+// #endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* number of backlight levels */
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is userful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+// #define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+//#define NO_ACTION_MACRO
+//#define NO_ACTION_FUNCTION
+
+/* Bootmagic Lite key configuration */
+#define BOOTMAGIC_LITE_ROW 6
+#define BOOTMAGIC_LITE_COLUMN 5
+
+#define DYNAMIC_KEYMAP_LAYER_COUNT 3
diff --git a/qmk/keyboards/evyd13/quackfire/info.json b/qmk/keyboards/evyd13/quackfire/info.json
new file mode 100644
index 00000000..de7c9384
--- /dev/null
+++ b/qmk/keyboards/evyd13/quackfire/info.json
@@ -0,0 +1,212 @@
+{
+    "keyboard_name": "Quackfire",
+    "url": "https://github.com/evyd13/quackfire-controller",
+    "maintainer": "evyd13",
+    "width": 18.5,
+    "height": 6.5,
+    "layouts": {
+        "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":"1", "x":1, "y":1.5},
+                {"label":"2", "x":2, "y":1.5},
+                {"label":"3", "x":3, "y":1.5},
+                {"label":"4", "x":4, "y":1.5},
+                {"label":"5", "x":5, "y":1.5},
+                {"label":"6", "x":6, "y":1.5},
+                {"label":"7", "x":7, "y":1.5},
+                {"label":"8", "x":8, "y":1.5},
+                {"label":"9", "x":9, "y":1.5},
+                {"label":"0", "x":10, "y":1.5},
+                {"label":"_", "x":11, "y":1.5},
+                {"label":"+", "x":12, "y":1.5},
+                {"label":"Backspace", "x":13, "y":1.5, "w":2},
+                
+                {"label":"Insert", "x":15.25, "y":1.5},
+                {"label":"Home", "x":16.25, "y":1.5},
+                {"label":"Page Up", "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_iso": {
+            "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":"\u00ac", "x":0, "y":1.5},
+                {"label":"!", "x":1, "y":1.5},
+                {"label":"\"", "x":2, "y":1.5},
+                {"label":"\u00a3", "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":"Backspace", "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":"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":"~", "x":12.75, "y":3.5},
+                {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2},
+
+                {"label":"Shift", "x":0, "y":4.5, "w":1.25},
+                {"label":"|", "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":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":"AltGr", "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}
+            ]
+        }
+    }
+}
diff --git a/qmk/keyboards/evyd13/quackfire/keymaps/default/keymap.c b/qmk/keyboards/evyd13/quackfire/keymaps/default/keymap.c
new file mode 100644
index 00000000..79b0a7eb
--- /dev/null
+++ b/qmk/keyboards/evyd13/quackfire/keymaps/default/keymap.c
@@ -0,0 +1,53 @@
+/* Copyright 2019 Evy Dekkers
+ *
+ * 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] = {
+    /*
+     * ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
+     * │Esc│   │F1 │F2 │F3 │F4 │ │F5 │F6 │F7 │F8 │ │F9 │F10│F11│F12│ │PSc│Slk│Pse│
+     * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐
+     * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│ │Ins│Hom│PgU│
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤
+     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │  \  │ │Del│End│PgD│
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘
+     * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │  Enter │
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤     ┌───┐
+     * │ Shift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │    Shift │     │ ↑ │
+     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───┐
+     * │Ctrl│GUI │Alt │                        │ Alt│ GUI│Menu│Ctrl│ │ ← │ ↓ │ → │
+     * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘
+     */
+    LAYOUT_tkl_ansi(
+        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_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, MO(1),   KC_RCTL,     KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    LAYOUT_tkl_ansi(
+        RESET,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_STEP, BL_TOGG,    _______,  _______, KC_MUTE,
+
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    KC_MPLY,  KC_MSTP, KC_VOLU,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    KC_MPRV,  KC_MNXT, KC_VOLD,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,              _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______,    _______,  _______, _______
+    )
+};
diff --git a/qmk/keyboards/evyd13/quackfire/keymaps/via/keymap.c b/qmk/keyboards/evyd13/quackfire/keymaps/via/keymap.c
new file mode 100644
index 00000000..623e8fdc
--- /dev/null
+++ b/qmk/keyboards/evyd13/quackfire/keymaps/via/keymap.c
@@ -0,0 +1,46 @@
+/* Copyright 2019 Evy Dekkers
+ *
+ * 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_all(
+        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_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_BSLS, 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_RSFT,              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(
+        RESET,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_STEP, BL_TOGG,    _______,  _______, KC_MUTE,
+
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    KC_MPLY,  KC_MSTP, KC_VOLU,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             KC_MPRV,  KC_MNXT, KC_VOLD,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,              _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______,    _______,  _______, _______
+    ),
+    [2] = LAYOUT_all(
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______,  _______, _______,
+
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______,  _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______,  _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,              _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______,    _______,  _______, _______
+    )
+};
diff --git a/qmk/keyboards/evyd13/quackfire/keymaps/via/rules.mk b/qmk/keyboards/evyd13/quackfire/keymaps/via/rules.mk
new file mode 100644
index 00000000..36b7ba9c
--- /dev/null
+++ b/qmk/keyboards/evyd13/quackfire/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/qmk/keyboards/evyd13/quackfire/quackfire.c b/qmk/keyboards/evyd13/quackfire/quackfire.c
new file mode 100644
index 00000000..ab233bd6
--- /dev/null
+++ b/qmk/keyboards/evyd13/quackfire/quackfire.c
@@ -0,0 +1,44 @@
+/* Copyright 2020 Evy Dekkers
+ *
+ * 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 "quackfire.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();
+    led_init_ports();
+}
+
+void led_init_ports(void) {
+    setPinOutput(F6);
+    setPinOutput(F7);
+    writePinHigh(F6);
+    writePinHigh(F7);
+}
+
+bool led_update_kb(led_t led_state) {
+    if(led_update_user(led_state)) {
+        writePin(F7, !led_state.caps_lock);
+        writePin(F6, !led_state.scroll_lock);
+    }
+
+    return true;
+}
diff --git a/qmk/keyboards/evyd13/quackfire/quackfire.h b/qmk/keyboards/evyd13/quackfire/quackfire.h
new file mode 100644
index 00000000..8746f356
--- /dev/null
+++ b/qmk/keyboards/evyd13/quackfire/quackfire.h
@@ -0,0 +1,69 @@
+/* Copyright 2020 Evy Dekkers
+ *
+ * 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 XXX KC_NO
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+ 
+#define LAYOUT_all LAYOUT_tkl_iso
+
+#define LAYOUT_tkl_ansi( \
+    k3e,      k0d, k0b, k4b, k3b, k21, k36, k45, k05, k03, k23, k33, k63,      k28, k18, k11, \
+    k0e, k2e, k2d, k2b, k29, k09, k07, k27, k26, k25, k24, k04, k06, k43,      k02, k0a, k0c, \
+    k4e, k1e, k1d, k1b, k19, k49, k47, k17, k16, k15, k14, k44, k46, k73,      k00, k2a, k2c, \
+    k4d, k7e, k7d, k7b, k79, k39, k37, k77, k76, k75, k74, k34,      k53,                     \
+    k4c,      k5e, k5d, k5b, k59, k69, k67, k57, k56, k55, k64,      k7c,           k3a,      \
+    k01, k4a, k38,                k30,                k68, k71, k65, k51,      k6a, k60, k62  \
+) \
+{ \
+    { k00, k01, k02, k03, k04, k05, k06, k07, XXX, k09, k0a, k0b, k0c, k0d, k0e }, \
+    { XXX, k11, XXX, XXX, k14, k15, k16, k17, k18, k19, XXX, k1b, XXX, k1d, k1e }, \
+    { XXX, k21, XXX, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e }, \
+    { k30, XXX, XXX, k33, k34, XXX, k36, k37, k38, k39, k3a, k3b, XXX, XXX, k3e }, \
+    { XXX, XXX, XXX, k43, k44, k45, k46, k47, XXX, k49, k4a, k4b, k4c, k4d, k4e }, \
+    { XXX, k51, XXX, k53, XXX, k55, k56, k57, XXX, k59, XXX, k5b, XXX, k5d, k5e }, \
+    { k60, XXX, k62, k63, k64, k65, XXX, k67, k68, k69, k6a, XXX, XXX, XXX, XXX }, \
+    { XXX, k71, XXX, k73, k74, k75, k76, k77, XXX, k79, XXX, k7b, k7c, k7d, k7e }  \
+}
+
+#define LAYOUT_tkl_iso( \
+    k3e,      k0d, k0b, k4b, k3b, k21, k36, k45, k05, k03, k23, k33, k63,      k28, k18, k11, \
+    k0e, k2e, k2d, k2b, k29, k09, k07, k27, k26, k25, k24, k04, k06, k43,      k02, k0a, k0c, \
+    k4e, k1e, k1d, k1b, k19, k49, k47, k17, k16, k15, k14, k44, k46,           k00, k2a, k2c, \
+    k4d, k7e, k7d, k7b, k79, k39, k37, k77, k76, k75, k74, k34, k73, k53,                     \
+    k4c, k3d, k5e, k5d, k5b, k59, k69, k67, k57, k56, k55, k64,      k7c,           k3a,      \
+    k01, k4a, k38,                k30,                k68, k71, k65, k51,      k6a, k60, k62  \
+) \
+{ \
+    { k00, k01, k02, k03, k04, k05, k06, k07, XXX, k09, k0a, k0b, k0c, k0d, k0e }, \
+    { XXX, k11, XXX, XXX, k14, k15, k16, k17, k18, k19, XXX, k1b, XXX, k1d, k1e }, \
+    { XXX, k21, XXX, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e }, \
+    { k30, XXX, XXX, k33, k34, XXX, k36, k37, k38, k39, k3a, k3b, XXX, k3d, k3e }, \
+    { XXX, XXX, XXX, k43, k44, k45, k46, k47, XXX, k49, k4a, k4b, k4c, k4d, k4e }, \
+    { XXX, k51, XXX, k53, XXX, k55, k56, k57, XXX, k59, XXX, k5b, XXX, k5d, k5e }, \
+    { k60, XXX, k62, k63, k64, k65, XXX, k67, k68, k69, k6a, XXX, XXX, XXX, XXX }, \
+    { XXX, k71, XXX, k73, k74, k75, k76, k77, XXX, k79, XXX, k7b, k7c, k7d, k7e }  \
+}
diff --git a/qmk/keyboards/evyd13/quackfire/readme.md b/qmk/keyboards/evyd13/quackfire/readme.md
new file mode 100644
index 00000000..38441696
--- /dev/null
+++ b/qmk/keyboards/evyd13/quackfire/readme.md
@@ -0,0 +1,19 @@
+# Quackfire
+
+A drop-in replacement controller for the CM Quickfire Rapid. Not for the Quickfire Rapid-I!
+
+* Keyboard Maintainer: [Evyd13](https://github.com/evyd13)
+* Hardware Supported: Quackfire controller
+* Hardware Availability: [Open source on GitHub](https://github.com/evyd13/quackfire-controller)
+
+## Flashing
+
+To get to the bootloader, hold Fn while plugging in the keyboard. You can also press Fn + Esc on the default layout.
+
+---
+
+Make example for this keyboard (after setting up your build environment):
+
+    make evyd13/quackfire: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).
diff --git a/qmk/keyboards/evyd13/quackfire/rules.mk b/qmk/keyboards/evyd13/quackfire/rules.mk
new file mode 100644
index 00000000..f29136f7
--- /dev/null
+++ b/qmk/keyboards/evyd13/quackfire/rules.mk
@@ -0,0 +1,24 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = qmk-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # 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 = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+
+LAYOUTS = tkl_ansi tkl_iso
diff --git a/qmk/keyboards/evyd13/solheim68/config.h b/qmk/keyboards/evyd13/solheim68/config.h
new file mode 100644
index 00000000..d61e095f
--- /dev/null
+++ b/qmk/keyboards/evyd13/solheim68/config.h
@@ -0,0 +1,143 @@
+/* Copyright 2020 Dekkers
+ *
+ * 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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x4705
+#define PRODUCT_ID      0x7BFF
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Evyd13
+#define PRODUCT         Solheim68
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 16
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+*/
+#define MATRIX_ROW_PINS {E6,B0,B1,B2,B3}
+#define MATRIX_COL_PINS {F0,F1,F4,F5,F6,F7,C7,C6,B6,B5,B4,D7,D6,D4,D5,D3}
+#define UNUSED_PINS {B7,D0,D1,D2}
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+// #define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6
+
+// #define BACKLIGHT_PIN B7
+// #define BACKLIGHT_BREATHING
+// #define BACKLIGHT_LEVELS 3
+
+// #define RGB_DI_PIN E2
+// #ifdef RGB_DI_PIN
+//   #define RGBLED_NUM 16
+//   #define RGBLIGHT_HUE_STEP 8
+//   #define RGBLIGHT_SAT_STEP 8
+//   #define RGBLIGHT_VAL_STEP 8
+//   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+//   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+// /*== all animations enable ==*/
+//   #define RGBLIGHT_ANIMATIONS
+// /*== or choose animations ==*/
+//   #define RGBLIGHT_EFFECT_BREATHING
+//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
+//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+//   #define RGBLIGHT_EFFECT_SNAKE
+//   #define RGBLIGHT_EFFECT_KNIGHT
+//   #define RGBLIGHT_EFFECT_CHRISTMAS
+//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
+//   #define RGBLIGHT_EFFECT_RGB_TEST
+//   #define RGBLIGHT_EFFECT_ALTERNATING
+// /*== customize breathing effect ==*/
+//   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+//   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+//   /*==== use exp() and sin() ====*/
+//   #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//   #define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+// #endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is userful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+// #define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+//#define NO_ACTION_MACRO
+//#define NO_ACTION_FUNCTION
+
+/* Bootmagic Lite key configuration */
+// #define BOOTMAGIC_LITE_ROW 0
+// #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/evyd13/solheim68/info.json b/qmk/keyboards/evyd13/solheim68/info.json
new file mode 100644
index 00000000..dbafbc0d
--- /dev/null
+++ b/qmk/keyboards/evyd13/solheim68/info.json
@@ -0,0 +1,397 @@
+{
+    "keyboard_name": "Solheim68", 
+    "url": "https://github.com/evyd13/solheim68", 
+    "maintainer": "evyd13", 
+    "width": 17.25, 
+    "height": 5, 
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
+                {"x":15.25, "y":0},
+                {"x":16.25, "y":0},
+                
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1, "w":1.5},
+                {"x":15.25, "y":1},
+                {"x":16.25, "y":1},
+                
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2},
+                {"x":13.75, "y":2, "w":1.25},
+                
+                {"x":0, "y":3, "w":1.25},
+                {"x":1.25, "y":3},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":1.75},
+                {"x":14, "y":3},
+                {"x":15.25, "y":3},
+                
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":6.25},
+                {"x":10, "y":4, "w":1.25},
+                {"x":11.25, "y":4, "w":1.25},
+                {"x":12.5, "y":4, "w":1.25},
+                {"x":14.25, "y":4},
+                {"x":15.25, "y":4},
+                {"x":16.25, "y":4}
+            ]
+        },
+        "LAYOUT_68_ansi": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0, "w":2},
+                {"x":15.25, "y":0},
+                {"x":16.25, "y":0},
+                
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1, "w":1.5},
+                {"x":15.25, "y":1},
+                {"x":16.25, "y":1},
+                
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2, "w":2.25},
+                
+                {"x":0, "y":3, "w":2.25},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":2.75},
+                {"x":15.25, "y":3},
+                
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":6.25},
+                {"x":10, "y":4, "w":1.25},
+                {"x":11.25, "y":4, "w":1.25},
+                {"x":12.5, "y":4, "w":1.25},
+                {"x":14.25, "y":4},
+                {"x":15.25, "y":4},
+                {"x":16.25, "y":4}
+            ]
+        },
+        "LAYOUT_68_iso": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0, "w":2},
+                {"x":15.25, "y":0},
+                {"x":16.25, "y":0},
+                
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":15.25, "y":1},
+                {"x":16.25, "y":1},
+                
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2},
+                {"x":13.75, "y":1, "w":1.25, "h":2},
+                
+                {"x":0, "y":3, "w":1.25},
+                {"x":1.25, "y":3},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":2.75},
+                {"x":15.25, "y":3},
+                
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":6.25},
+                {"x":10, "y":4, "w":1.25},
+                {"x":11.25, "y":4, "w":1.25},
+                {"x":12.5, "y":4, "w":1.25},
+                {"x":14.25, "y":4},
+                {"x":15.25, "y":4},
+                {"x":16.25, "y":4}
+            ]
+        },
+        "LAYOUT_68_ansi_split_rshift": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0, "w":2},
+                {"x":15.25, "y":0},
+                {"x":16.25, "y":0},
+                
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1, "w":1.5},
+                {"x":15.25, "y":1},
+                {"x":16.25, "y":1},
+                
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2, "w":2.25},
+                
+                {"x":0, "y":3, "w":2.25},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":1.75},
+                {"x":14, "y":3},
+                {"x":15.25, "y":3},
+                
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":6.25},
+                {"x":10, "y":4, "w":1.25},
+                {"x":11.25, "y":4, "w":1.25},
+                {"x":12.5, "y":4, "w":1.25},
+                {"x":14.25, "y":4},
+                {"x":15.25, "y":4},
+                {"x":16.25, "y":4}
+            ]
+        },
+        "LAYOUT_68_iso_split_rshift": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0, "w":2},
+                {"x":15.25, "y":0},
+                {"x":16.25, "y":0},
+                
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":15.25, "y":1},
+                {"x":16.25, "y":1},
+                
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2},
+                {"x":13.75, "y":1, "w":1.25, "h":2},
+                
+                {"x":0, "y":3, "w":1.25},
+                {"x":1.25, "y":3},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":1.75},
+                {"x":14, "y":3},
+                {"x":15.25, "y":3},
+                
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":6.25},
+                {"x":10, "y":4, "w":1.25},
+                {"x":11.25, "y":4, "w":1.25},
+                {"x":12.5, "y":4, "w":1.25},
+                {"x":14.25, "y":4},
+                {"x":15.25, "y":4},
+                {"x":16.25, "y":4}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/qmk/keyboards/evyd13/solheim68/keymaps/default/keymap.c b/qmk/keyboards/evyd13/solheim68/keymaps/default/keymap.c
new file mode 100644
index 00000000..728e8019
--- /dev/null
+++ b/qmk/keyboards/evyd13/solheim68/keymaps/default/keymap.c
@@ -0,0 +1,31 @@
+/* Copyright 2020 Dekkers
+ *
+ * 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_all(
+    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,		 KC_MINS, KC_EQL,  KC_BSLS,  KC_BSPC,  KC_MPLY, KC_HOME,
+    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_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, 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_RSFT, MO(1),              KC_UP,
+    KC_LCTL, KC_LGUI,	KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_RCTL,           KC_LEFT,  KC_DOWN, KC_RIGHT),
+  [1] = LAYOUT_all(
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, RESET,   KC_PSCR, KC_PGUP,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,          _______, KC_PGDN,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, _______,  _______,          _______,
+    _______, _______, _______,                            _______,                            _______, _______, _______,           _______, _______, _______),
+};
diff --git a/qmk/keyboards/evyd13/solheim68/keymaps/default/readme.md b/qmk/keyboards/evyd13/solheim68/keymaps/default/readme.md
new file mode 100644
index 00000000..6e974540
--- /dev/null
+++ b/qmk/keyboards/evyd13/solheim68/keymaps/default/readme.md
@@ -0,0 +1 @@
+This is the default keymap for the Solheim68.
\ No newline at end of file
diff --git a/qmk/keyboards/evyd13/solheim68/readme.md b/qmk/keyboards/evyd13/solheim68/readme.md
new file mode 100644
index 00000000..5d1d84c8
--- /dev/null
+++ b/qmk/keyboards/evyd13/solheim68/readme.md
@@ -0,0 +1,17 @@
+# Solheim68
+
+A replacement PCB for the VA68M (v2) with Mini-USB.
+
+* Keyboard Maintainer: [Evyd13](https://github.com/evyd13)
+* Hardware Supported: Solheim68 PCB
+* Hardware Availability: [Open source on GitHub](https://github.com/evyd13/solheim68)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make evyd13/solheim68:default
+
+Flashing example for this keyboard:
+
+    make evyd13/solheim68:default:flash
+
+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).
diff --git a/qmk/keyboards/evyd13/solheim68/rules.mk b/qmk/keyboards/evyd13/solheim68/rules.mk
new file mode 100644
index 00000000..a90eef1f
--- /dev/null
+++ b/qmk/keyboards/evyd13/solheim68/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # 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
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
diff --git a/qmk/keyboards/evyd13/solheim68/solheim68.c b/qmk/keyboards/evyd13/solheim68/solheim68.c
new file mode 100644
index 00000000..27f90f4e
--- /dev/null
+++ b/qmk/keyboards/evyd13/solheim68/solheim68.c
@@ -0,0 +1,16 @@
+/* Copyright 2020 Dekkers
+ *
+ * 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 "solheim68.h"
diff --git a/qmk/keyboards/evyd13/solheim68/solheim68.h b/qmk/keyboards/evyd13/solheim68/solheim68.h
new file mode 100644
index 00000000..2f6339bd
--- /dev/null
+++ b/qmk/keyboards/evyd13/solheim68/solheim68.h
@@ -0,0 +1,102 @@
+/* Copyright 2020 Dekkers
+ *
+ * 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 XXX KC_NO
+
+/* This a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT_all( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k2e, k0d, k0e, k0f,    \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,      k1e, k1f,    \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,                  \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d,      k3e,         \
+    k40, k41, k42,                k46,                k4a, k4b, k4c,      k4d, k4e, k4f     \
+) \
+{ \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, XXX }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, XXX }, \
+    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4a, k4b, k4c, k4d, k4e, k4f }  \
+}
+
+#define LAYOUT_68_ansi( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d,      k0e, k0f,    \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,      k1e, k1f,    \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,      k2d,                  \
+    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3c,      k3e,         \
+    k40, k41, k42,                k46,                k4a, k4b, k4c,      k4d, k4e, k4f     \
+) \
+{ \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, XXX, XXX }, \
+    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, XXX, k3e, XXX }, \
+    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4a, k4b, k4c, k4d, k4e, k4f }  \
+}
+
+#define LAYOUT_68_iso( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d,      k0e, k0f,    \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,           k1e, k1f,    \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,                  \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3c,      k3e,         \
+    k40, k41, k42,                k46,                k4a, k4b, k4c,      k4d, k4e, k4f     \
+) \
+{ \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, k1e, k1f }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, XXX, XXX }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, XXX, k3e, XXX }, \
+    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4a, k4b, k4c, k4d, k4e, k4f }  \
+}
+
+#define LAYOUT_68_ansi_split_rshift( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d,      k0e, k0f,    \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,      k1e, k1f,    \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,      k2d,                  \
+    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d,      k3e,         \
+    k40, k41, k42,                k46,                k4a, k4b, k4c,      k4d, k4e, k4f     \
+) \
+{ \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, XXX, XXX }, \
+    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, XXX }, \
+    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4a, k4b, k4c, k4d, k4e, k4f }  \
+}
+
+#define LAYOUT_68_iso_split_rshift( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d,      k0e, k0f,    \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,           k1e, k1f,    \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,                  \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d,      k3e,         \
+    k40, k41, k42,                k46,                k4a, k4b, k4c,      k4d, k4e, k4f     \
+) \
+{ \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, k1e, k1f }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, XXX, XXX }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, XXX }, \
+    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4a, k4b, k4c, k4d, k4e, k4f }  \
+}
diff --git a/qmk/keyboards/evyd13/ta65/config.h b/qmk/keyboards/evyd13/ta65/config.h
new file mode 100644
index 00000000..b73505c0
--- /dev/null
+++ b/qmk/keyboards/evyd13/ta65/config.h
@@ -0,0 +1,68 @@
+/*
+Copyright 2019 Evy Dekkers
+
+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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x4705
+#define PRODUCT_ID      0x7465
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Evyd13
+#define PRODUCT         ta-65
+#define DESCRIPTION     A universal 65% PCB with underglow.
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 16
+
+// ROWS: Top to bottom, COLS: Left to right
+
+#define MATRIX_ROW_PINS {B4,D7,D6,D4,B3}
+#define MATRIX_COL_PINS {D2,D1,D0,D3,D5,C7,C6,B6,B5,F0,F1,F4,F5,F6,F7,B0}
+#define UNUSED_PINS
+
+#define ENCODERS_PAD_A { B2 }
+#define ENCODERS_PAD_B { B1 }
+
+/* Uncomment if your encoder doesn't react to every turn or skips */
+//#define ENCODER_RESOLUTION 2
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* define if matrix has ghost */
+//#define MATRIX_HAS_GHOST
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+/* Backlight configuration
+ */
+#define RGB_DI_PIN E6
+#define RGBLIGHT_ANIMATIONS
+#define RGBLED_NUM 8
+
+#define QMK_ESC_OUTPUT D2 // usually COL
+#define QMK_ESC_INPUT B4 // usually ROW
+#define QMK_LED E6
diff --git a/qmk/keyboards/evyd13/ta65/info.json b/qmk/keyboards/evyd13/ta65/info.json
new file mode 100644
index 00000000..e509521d
--- /dev/null
+++ b/qmk/keyboards/evyd13/ta65/info.json
@@ -0,0 +1,372 @@
+{
+    "keyboard_name": "ta65",
+    "url": "",
+    "maintainer": "qmk",
+    "width": 16,
+    "height": 5,
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"!", "x":1, "y":0},
+                {"label":"@", "x":2, "y":0},
+                {"label":"#", "x":3, "y":0},
+                {"label":"$", "x":4, "y":0},
+                {"label":"%", "x":5, "y":0},
+                {"label":"^", "x":6, "y":0},
+                {"label":"&", "x":7, "y":0},
+                {"label":"*", "x":8, "y":0},
+                {"label":"(", "x":9, "y":0},
+                {"label":")", "x":10, "y":0},
+                {"label":"_", "x":11, "y":0},
+                {"label":"+", "x":12, "y":0},
+                {"label":"|", "x":13, "y":0},
+                {"label":"Backspace", "x":14, "y":0},
+                {"label":"~", "x":15, "y":0},
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"{", "x":11.5, "y":1},
+                {"label":"}", "x":12.5, "y":1},
+                {"label":"|", "x":13.5, "y":1, "w":1.5},
+                {"label":"Delete", "x":15, "y":1},
+                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":":", "x":10.75, "y":2},
+                {"label":"\"", "x":11.75, "y":2},
+                {"label":"Non-US Hash", "x":12.75, "y":2},
+                {"label":"Enter", "x":13.75, "y":2, "w":1.25},
+                {"label":"PgUp", "x":15, "y":2},
+                {"label":"Shift", "x":0, "y":3, "w":1.25},
+                {"label":"Non-US Backslash", "x":1.25, "y":3},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":"<", "x":9.25, "y":3},
+                {"label":">", "x":10.25, "y":3},
+                {"label":"?", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
+                {"label":"Up", "x":14, "y":3},
+                {"label":"PgDn", "x":15, "y":3},
+                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
+                {"label":"Win", "x":1.25, "y":4, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
+                {"label":"Space", "x":3.75, "y":4, "w":6.25},
+                {"label":"Alt", "x":10, "y":4},
+                {"label":"Win", "x":11, "y":4},
+                {"label":"Ctrl", "x":12, "y":4},
+                {"label":"Left", "x":13, "y":4},
+                {"label":"Down", "x":14, "y":4},
+                {"label":"Right", "x":15, "y":4}
+            ]
+        },
+        "LAYOUT_65_ansi": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"!", "x":1, "y":0},
+                {"label":"@", "x":2, "y":0},
+                {"label":"#", "x":3, "y":0},
+                {"label":"$", "x":4, "y":0},
+                {"label":"%", "x":5, "y":0},
+                {"label":"^", "x":6, "y":0},
+                {"label":"&", "x":7, "y":0},
+                {"label":"*", "x":8, "y":0},
+                {"label":"(", "x":9, "y":0},
+                {"label":")", "x":10, "y":0},
+                {"label":"_", "x":11, "y":0},
+                {"label":"+", "x":12, "y":0},
+                {"label":"Backspace", "x":13, "y":0, "w":2},
+                {"label":"~", "x":15, "y":0},
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"{", "x":11.5, "y":1},
+                {"label":"}", "x":12.5, "y":1},
+                {"label":"|", "x":13.5, "y":1, "w":1.5},
+                {"label":"Delete", "x":15, "y":1},
+                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":":", "x":10.75, "y":2},
+                {"label":"\"", "x":11.75, "y":2},
+                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+                {"label":"PgUp", "x":15, "y":2},
+                {"label":"Shift", "x":0, "y":3, "w":2.25},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":"<", "x":9.25, "y":3},
+                {"label":">", "x":10.25, "y":3},
+                {"label":"?", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
+                {"label":"Up", "x":14, "y":3},
+                {"label":"PgDn", "x":15, "y":3},
+                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
+                {"label":"Win", "x":1.25, "y":4, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
+                {"label":"Space", "x":3.75, "y":4, "w":6.25},
+                {"label":"Alt", "x":10, "y":4},
+                {"label":"Win", "x":11, "y":4},
+                {"label":"Ctrl", "x":12, "y":4},
+                {"label":"Left", "x":13, "y":4},
+                {"label":"Down", "x":14, "y":4},
+                {"label":"Right", "x":15, "y":4}
+            ]
+        },
+        "LAYOUT_ansi_tsangan": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"!", "x":1, "y":0},
+                {"label":"@", "x":2, "y":0},
+                {"label":"#", "x":3, "y":0},
+                {"label":"$", "x":4, "y":0},
+                {"label":"%", "x":5, "y":0},
+                {"label":"^", "x":6, "y":0},
+                {"label":"&", "x":7, "y":0},
+                {"label":"*", "x":8, "y":0},
+                {"label":"(", "x":9, "y":0},
+                {"label":")", "x":10, "y":0},
+                {"label":"_", "x":11, "y":0},
+                {"label":"+", "x":12, "y":0},
+                {"label":"|", "x":13, "y":0},
+                {"label":"Backspace", "x":14, "y":0},
+                {"label":"~", "x":15, "y":0},
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"{", "x":11.5, "y":1},
+                {"label":"}", "x":12.5, "y":1},
+                {"label":"|", "x":13.5, "y":1, "w":1.5},
+                {"label":"Delete", "x":15, "y":1},
+                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":":", "x":10.75, "y":2},
+                {"label":"\"", "x":11.75, "y":2},
+                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+                {"label":"PgUp", "x":15, "y":2},
+                {"label":"Shift", "x":0, "y":3, "w":2.25},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":"<", "x":9.25, "y":3},
+                {"label":">", "x":10.25, "y":3},
+                {"label":"?", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
+                {"label":"Up", "x":14, "y":3},
+                {"label":"PgDn", "x":15, "y":3},
+                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
+                {"label":"Win", "x":1.5, "y":4},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
+                {"label":"Space", "x":4, "y":4, "w":7},
+                {"label":"Alt", "x":11, "y":4, "w":1.5},
+                {"label":"Left", "x":13, "y":4},
+                {"label":"Down", "x":14, "y":4},
+                {"label":"Right", "x":15, "y":4}
+            ]
+        },
+        "LAYOUT_65_iso": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"!", "x":1, "y":0},
+                {"label":"\"", "x":2, "y":0},
+                {"label":"\u00a3", "x":3, "y":0},
+                {"label":"$", "x":4, "y":0},
+                {"label":"%", "x":5, "y":0},
+                {"label":"^", "x":6, "y":0},
+                {"label":"&", "x":7, "y":0},
+                {"label":"*", "x":8, "y":0},
+                {"label":"(", "x":9, "y":0},
+                {"label":")", "x":10, "y":0},
+                {"label":"_", "x":11, "y":0},
+                {"label":"+", "x":12, "y":0},
+                {"label":"Backspace", "x":13, "y":0, "w":2},
+                {"label":"\u00ac", "x":15, "y":0},
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"{", "x":11.5, "y":1},
+                {"label":"}", "x":12.5, "y":1},
+                {"label":"Delete", "x":15, "y":1},
+                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":":", "x":10.75, "y":2},
+                {"label":"@", "x":11.75, "y":2},
+                {"label":"~", "x":12.75, "y":2},
+                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
+                {"label":"PgUp", "x":15, "y":2},
+                {"label":"Shift", "x":0, "y":3, "w":1.25},
+                {"label":"|", "x":1.25, "y":3},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":"<", "x":9.25, "y":3},
+                {"label":">", "x":10.25, "y":3},
+                {"label":"?", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
+                {"label":"Up", "x":14, "y":3},
+                {"label":"PgDn", "x":15, "y":3},
+                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
+                {"label":"Win", "x":1.25, "y":4, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
+                {"label":"Space", "x":3.75, "y":4, "w":6.25},
+                {"label":"AltGr", "x":10, "y":4},
+                {"label":"Win", "x":11, "y":4},
+                {"label":"Ctrl", "x":12, "y":4},
+                {"label":"Left", "x":13, "y":4},
+                {"label":"Down", "x":14, "y":4},
+                {"label":"Right", "x":15, "y":4}
+            ]
+        },
+        "LAYOUT_iso_tsangan": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"!", "x":1, "y":0},
+                {"label":"\"", "x":2, "y":0},
+                {"label":"\u00a3", "x":3, "y":0},
+                {"label":"$", "x":4, "y":0},
+                {"label":"%", "x":5, "y":0},
+                {"label":"^", "x":6, "y":0},
+                {"label":"&", "x":7, "y":0},
+                {"label":"*", "x":8, "y":0},
+                {"label":"(", "x":9, "y":0},
+                {"label":")", "x":10, "y":0},
+                {"label":"_", "x":11, "y":0},
+                {"label":"+", "x":12, "y":0},
+                {"label":"~", "x":13, "y":0},
+                {"label":"Backspace", "x":14, "y":0},
+                {"label":"\u00ac", "x":15, "y":0},
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"{", "x":11.5, "y":1},
+                {"label":"}", "x":12.5, "y":1},
+                {"label":"Delete", "x":15, "y":1},
+                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":":", "x":10.75, "y":2},
+                {"label":"@", "x":11.75, "y":2},
+                {"label":"~", "x":12.75, "y":2},
+                {"label":"Enter", "x":13.75, "y":1, "w":1.25, "h":2},
+                {"label":"PgUp", "x":15, "y":2},
+                {"label":"Shift", "x":0, "y":3, "w":1.25},
+                {"label":"|", "x":1.25, "y":3},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":"<", "x":9.25, "y":3},
+                {"label":">", "x":10.25, "y":3},
+                {"label":"?", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
+                {"label":"Up", "x":14, "y":3},
+                {"label":"PgDn", "x":15, "y":3},
+                {"label":"Ctrl", "x":0, "y":4, "w":1.5},
+                {"label":"Win", "x":1.5, "y":4},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.5},
+                {"label":"Space", "x":4, "y":4, "w":7},
+                {"label":"AltGr", "x":11, "y":4, "w":1.5},
+                {"label":"Left", "x":13, "y":4},
+                {"label":"Down", "x":14, "y":4},
+                {"label":"Right", "x":15, "y":4}
+            ]
+        }
+    }
+}
diff --git a/qmk/keyboards/evyd13/ta65/keymaps/default/keymap.c b/qmk/keyboards/evyd13/ta65/keymaps/default/keymap.c
new file mode 100644
index 00000000..8bb8a14b
--- /dev/null
+++ b/qmk/keyboards/evyd13/ta65/keymaps/default/keymap.c
@@ -0,0 +1,38 @@
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[0] = LAYOUT_all(
+  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,   KC_9,     KC_0,    KC_MINS, KC_EQL,   KC_BSLS, KC_BSPC, KC_INS,
+  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_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,   KC_L,     KC_SCLN, KC_QUOT, KC_BSLS,  KC_ENT,           KC_PGUP,
+  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_UP,            KC_PGDN,
+  KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),   KC_RCTRL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+[1] = LAYOUT_all(
+  RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,          _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,          _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,          _______,
+  _______, _______, _______,                            _______,                            _______, _______, _______,  _______, _______, _______),
+
+};
+
+void encoder_update_user(uint8_t index, bool clockwise) {
+  switch(get_highest_layer(layer_state)){
+    case 1: //Layer 1
+      if (!clockwise) { // Remove ! to reverse direction
+        tap_code(KC_WH_U);
+      } else {
+        tap_code(KC_WH_D);
+      }
+      break;
+    default: //Layer 0
+      if (!clockwise) {
+        tap_code(KC_VOLU);
+      } else {
+        tap_code(KC_VOLD);
+      }
+      break;
+  }
+}
diff --git a/qmk/keyboards/evyd13/ta65/keymaps/default_ansi/keymap.c b/qmk/keyboards/evyd13/ta65/keymaps/default_ansi/keymap.c
new file mode 100644
index 00000000..9319d5bb
--- /dev/null
+++ b/qmk/keyboards/evyd13/ta65/keymaps/default_ansi/keymap.c
@@ -0,0 +1,17 @@
+#include QMK_KEYBOARD_H
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+#define _MA 0
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[_MA] = LAYOUT_65_ansi(
+  KC_ESC,  KC_1,    KC_2,    KC_3, KC_4, KC_5, KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS, KC_EQL,           KC_BSPC, KC_GRV,
+  KC_TAB,  KC_Q,    KC_W,    KC_E, KC_R, KC_T, KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSLS, KC_DEL,
+  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_PGUP,
+  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_PGDN,
+  KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                          KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT)
+};
diff --git a/qmk/keyboards/evyd13/ta65/keymaps/default_ansi_tsangan/keymap.c b/qmk/keyboards/evyd13/ta65/keymaps/default_ansi_tsangan/keymap.c
new file mode 100644
index 00000000..5e0cd0b5
--- /dev/null
+++ b/qmk/keyboards/evyd13/ta65/keymaps/default_ansi_tsangan/keymap.c
@@ -0,0 +1,17 @@
+#include QMK_KEYBOARD_H
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+#define _MA 0
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[_MA] = LAYOUT_ansi_tsangan(
+  KC_ESC,  KC_1,    KC_2,    KC_3, KC_4, KC_5, KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS, KC_EQL,   KC_BSLS, KC_BSPC, KC_GRV,
+  KC_TAB,  KC_Q,    KC_W,    KC_E, KC_R, KC_T, KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,    KC_LBRC, KC_RBRC,           KC_BSLS, KC_DEL,
+  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_PGUP,
+  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_PGDN,
+  KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                          KC_RALT,                    KC_LEFT, KC_DOWN, KC_RGHT)
+};
diff --git a/qmk/keyboards/evyd13/ta65/keymaps/default_iso/keymap.c b/qmk/keyboards/evyd13/ta65/keymaps/default_iso/keymap.c
new file mode 100644
index 00000000..1d11ff95
--- /dev/null
+++ b/qmk/keyboards/evyd13/ta65/keymaps/default_iso/keymap.c
@@ -0,0 +1,17 @@
+#include QMK_KEYBOARD_H
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+#define _MA 0
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[_MA] = LAYOUT_65_iso(
+  KC_ESC,  KC_1,    KC_2,    KC_3, KC_4, KC_5, KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS, KC_EQL,           KC_BSPC, KC_GRV,
+  KC_TAB,  KC_Q,    KC_W,    KC_E, KC_R, KC_T, KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,    KC_LBRC, KC_RBRC,                   KC_DEL,
+  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_BSLS,          KC_ENT,  KC_PGUP,
+  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_UP,   KC_PGDN,
+  KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                          KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT)
+};
diff --git a/qmk/keyboards/evyd13/ta65/keymaps/default_iso_tsangan/keymap.c b/qmk/keyboards/evyd13/ta65/keymaps/default_iso_tsangan/keymap.c
new file mode 100644
index 00000000..8505d73a
--- /dev/null
+++ b/qmk/keyboards/evyd13/ta65/keymaps/default_iso_tsangan/keymap.c
@@ -0,0 +1,17 @@
+#include QMK_KEYBOARD_H
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+#define _MA 0
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[_MA] = LAYOUT_iso_tsangan(
+  KC_ESC,  KC_1,    KC_2,    KC_3, KC_4, KC_5, KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_BSPC, KC_GRV,
+  KC_TAB,  KC_Q,    KC_W,    KC_E, KC_R, KC_T, KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,    KC_LBRC, KC_RBRC,                   KC_DEL,
+  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_BSLS,          KC_ENT,  KC_PGUP,
+  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_UP,   KC_PGDN,
+  KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                          KC_RALT,                   KC_LEFT, KC_DOWN, KC_RGHT)
+};
diff --git a/qmk/keyboards/evyd13/ta65/keymaps/evyd13/config.h b/qmk/keyboards/evyd13/ta65/keymaps/evyd13/config.h
new file mode 100644
index 00000000..9b18f582
--- /dev/null
+++ b/qmk/keyboards/evyd13/ta65/keymaps/evyd13/config.h
@@ -0,0 +1,3 @@
+#pragma once
+
+#define RETRO_TAPPING
diff --git a/qmk/keyboards/evyd13/ta65/keymaps/evyd13/keymap.c b/qmk/keyboards/evyd13/ta65/keymaps/evyd13/keymap.c
new file mode 100644
index 00000000..a8ce0f18
--- /dev/null
+++ b/qmk/keyboards/evyd13/ta65/keymaps/evyd13/keymap.c
@@ -0,0 +1,45 @@
+#include QMK_KEYBOARD_H
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+enum {
+  _MA,
+  _GA,
+  _FL,
+  _SP
+};
+
+#define SPACE LT(_SP, KC_SPC)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[_MA] = LAYOUT_65_ansi(
+  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_BSPC, KC_MPLY,
+  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_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_PGUP,
+  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_PGDN,
+  KC_CAPS, KC_LGUI, KC_LALT,                   SPACE,                              KC_RALT, KC_RCTRL,MO(_FL),  KC_LEFT, KC_DOWN, KC_RGHT),
+
+[_GA] = LAYOUT_65_ansi(
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,           _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,           _______, _______,
+  _______, _______, _______,                   KC_SPC,                             _______, _______, _______,  _______, _______, _______),
+
+[_FL] = LAYOUT_65_ansi(
+  KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,  RESET,   KC_PSCR,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, KC_INS,
+  _______, _______, _______, _______, _______, TG(_GA), _______, _______, _______, _______, _______, _______,           _______, KC_HOME,
+  _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE,  _______,          _______, KC_END,
+  _______, _______, _______,                   _______,                            _______, _______, _______,  _______, _______, _______),
+
+[_SP] = LAYOUT_65_ansi(
+  KC_GRV,  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_UP,   _______, _______, _______,  _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,           _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,           _______, _______,
+  _______, _______, _______,                   _______,                            _______, _______, _______,  _______, _______, _______),
+};
diff --git a/qmk/keyboards/evyd13/ta65/keymaps/via/keymap.c b/qmk/keyboards/evyd13/ta65/keymaps/via/keymap.c
new file mode 100644
index 00000000..e2d96eb9
--- /dev/null
+++ b/qmk/keyboards/evyd13/ta65/keymaps/via/keymap.c
@@ -0,0 +1,33 @@
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[0] = LAYOUT_all(
+  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_BSPC, KC_BSLS, KC_INS,
+  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_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,  KC_BSLS, KC_ENT,           KC_PGUP,
+  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_UP,            KC_PGDN,
+  KC_CAPS, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, KC_RCTRL,MO(2),    KC_LEFT, KC_DOWN,          KC_RGHT),
+
+[1] = LAYOUT_all(
+  KC_GRV,  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_UP,   _______, _______, _______,  _______, _______,          KC_INS,
+  _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,  _______, _______,          KC_HOME,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE,  _______, _______,          KC_END,
+  _______, _______, _______,                   _______,                            _______, _______, _______,  _______, _______,          _______),
+
+[2] = LAYOUT_all(
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______,          _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______,          _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______,          _______,
+  _______, _______, _______,                   _______,                            _______, _______, _______,  _______, _______,          _______),
+
+[3] = LAYOUT_all(
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______,          _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______,          _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______,          _______,
+  _______, _______, _______,                   _______,                            _______, _______, _______,  _______, _______,          _______),
+
+};
diff --git a/qmk/keyboards/evyd13/ta65/keymaps/via/rules.mk b/qmk/keyboards/evyd13/ta65/keymaps/via/rules.mk
new file mode 100644
index 00000000..1e5b9980
--- /dev/null
+++ b/qmk/keyboards/evyd13/ta65/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/qmk/keyboards/evyd13/ta65/readme.md b/qmk/keyboards/evyd13/ta65/readme.md
new file mode 100644
index 00000000..ea98161b
--- /dev/null
+++ b/qmk/keyboards/evyd13/ta65/readme.md
@@ -0,0 +1,17 @@
+TA-65
+=====
+
+A 65% PCB designed to fit the TADA68, Kayak and others by [Evyd13](https://github.com/evyd13).
+
+![kle](https://maartenwut.com/wp-content/uploads/2019/02/ta-65-layouts-768x420.png)
+
+Keyboard Maintainer: QMK Community<br>
+Hardware Supported: TA-65 PCB<br>
+Hardware Availability: [maartenwut.com](https://maartenwut.com/product/ta-65/)<br>
+
+Make example for this keyboard (after setting up your build environment):
+
+    make ta65: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).
+
diff --git a/qmk/keyboards/evyd13/ta65/rules.mk b/qmk/keyboards/evyd13/ta65/rules.mk
new file mode 100644
index 00000000..9984f276
--- /dev/null
+++ b/qmk/keyboards/evyd13/ta65/rules.mk
@@ -0,0 +1,34 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+#   Teensy       halfkay
+#   Pro Micro    caterina
+#   Atmel DFU    atmel-dfu
+#   LUFA DFU     lufa-dfu
+#   QMK DFU      qmk-dfu
+#   ATmega32A    bootloadHID
+#   ATmega328P   USBasp
+BOOTLOADER = qmk-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = yes        # Console for debug
+COMMAND_ENABLE = no         # 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
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+MIDI_ENABLE = no            # MIDI support
+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
+ENCODER_ENABLE = yes
+
+LAYOUTS = 65_ansi 65_iso
diff --git a/qmk/keyboards/evyd13/ta65/ta65.c b/qmk/keyboards/evyd13/ta65/ta65.c
new file mode 100644
index 00000000..4f67a020
--- /dev/null
+++ b/qmk/keyboards/evyd13/ta65/ta65.c
@@ -0,0 +1,13 @@
+#include "ta65.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();
+};
diff --git a/qmk/keyboards/evyd13/ta65/ta65.h b/qmk/keyboards/evyd13/ta65/ta65.h
new file mode 100644
index 00000000..40a763b9
--- /dev/null
+++ b/qmk/keyboards/evyd13/ta65/ta65.h
@@ -0,0 +1,82 @@
+#pragma once
+#include "quantum.h"
+
+// readability
+#define ___ KC_NO
+#define LAYOUT_all( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0f, k0d, k0e, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,      k1d, k1e, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c,      k2d, k2e, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c,      k3d, k3e, \
+    k40, k41, k42,                k46,           k49, k4a, k4b, k4c,      k4d, k4e  \
+) \
+{ \
+    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f}, \
+    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, ___}, \
+    {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, ___}, \
+    {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, ___}, \
+    {k40, k41, k42, ___, ___, ___, k46, ___, ___, k49, k4a, k4b, k4c, k4d, k4e, ___}  \
+}
+
+#define LAYOUT_65_ansi( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,      k0d, k0e, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,      k1d, k1e, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,           k2d, k2e, \
+    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c,      k3d, k3e, \
+    k40, k41, k42,                k46,           k49, k4a, k4b, k4c,      k4d, k4e  \
+) \
+{ \
+    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, ___}, \
+    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, ___}, \
+    {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, ___, k2d, k2e, ___}, \
+    {k30, ___, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, ___}, \
+    {k40, k41, k42, ___, ___, ___, k46, ___, ___, k49, k4a, k4b, k4c, k4d, k4e, ___}  \
+}
+
+#define LAYOUT_ansi_tsangan( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0f, k0d, k0e, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,      k1d, k1e, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,           k2d, k2e, \
+    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c,      k3d, k3e, \
+    k40, k41, k42,                k46,                k4a,      k4c,      k4d, k4e  \
+) \
+{ \
+    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f}, \
+    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, ___}, \
+    {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, ___, k2d, k2e, ___}, \
+    {k30, ___, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, ___}, \
+    {k40, k41, k42, ___, ___, ___, k46, ___, ___, ___, k4a, ___, k4c, k4d, k4e, ___}  \
+}
+
+#define LAYOUT_iso_tsangan( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0f, k0d, k0e, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,           k1e, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c,      k2d, k2e, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c,      k3d, k3e, \
+    k40, k41, k42,                k46,                k4a,      k4c,      k4d, k4e  \
+) \
+{ \
+    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f}, \
+    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, ___, k1e, ___}, \
+    {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, ___}, \
+    {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, ___}, \
+    {k40, k41, k42, ___, ___, ___, k46, ___, ___, ___, k4a, ___, k4c, k4d, k4e, ___}  \
+}
+
+#define LAYOUT_65_iso( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,      k0d, k0e, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,           k1e, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c,      k2d, k2e, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c,      k3d, k3e, \
+    k40, k41, k42,                k46,           k49, k4a, k4b, k4c,      k4d, k4e  \
+) \
+{ \
+    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, ___}, \
+    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,      k1e, ___}, \
+    {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, k2e, ___}, \
+    {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, ___}, \
+    {k40, k41, k42, ___, ___, ___, k46, ___, ___, k49, k4a, k4b, k4c, k4d, k4e, ___}  \
+}
+
+void matrix_init_user(void);
+void matrix_scan_user(void);
diff --git a/qmk/keyboards/evyd13/wasdat/config.h b/qmk/keyboards/evyd13/wasdat/config.h
new file mode 100644
index 00000000..534ae71a
--- /dev/null
+++ b/qmk/keyboards/evyd13/wasdat/config.h
@@ -0,0 +1,230 @@
+/*
+Copyright 2019 Evy Dekkers
+
+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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x4705
+#define PRODUCT_ID      0xC474
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Evyd13
+#define PRODUCT         Wasdat
+#define DESCRIPTION     Custom controller for the WASD v2 TKL and 104
+
+/* key matrix size */
+#define MATRIX_ROWS 8
+#define MATRIX_COLS 16
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+*/
+#define MATRIX_ROW_PINS { D6, D4, F6, F7, F4, F5, F0, F1 }
+#define MATRIX_COL_PINS { }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION ROW2COL
+
+// For QMK DFU
+#define QMK_ESC_OUTPUT D6
+#define QMK_ESC_INPUT D7
+#define QMK_LED B0
+
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+//#define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6
+
+// #define BACKLIGHT_PIN B7
+// #define BACKLIGHT_BREATHING
+// #define BACKLIGHT_LEVELS 3
+
+// #define RGB_DI_PIN E2
+// #ifdef RGB_DI_PIN
+//   #define RGBLED_NUM 16
+//   #define RGBLIGHT_HUE_STEP 8
+//   #define RGBLIGHT_SAT_STEP 8
+//   #define RGBLIGHT_VAL_STEP 8
+//   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+//   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+// /*== all animations enable ==*/
+//   #define RGBLIGHT_ANIMATIONS
+// /*== or choose animations ==*/
+//   #define RGBLIGHT_EFFECT_BREATHING
+//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
+//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+//   #define RGBLIGHT_EFFECT_SNAKE
+//   #define RGBLIGHT_EFFECT_KNIGHT
+//   #define RGBLIGHT_EFFECT_CHRISTMAS
+//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
+//   #define RGBLIGHT_EFFECT_RGB_TEST
+//   #define RGBLIGHT_EFFECT_ALTERNATING
+// /*== customize breathing effect ==*/
+//   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+//   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+//   /*==== use exp() and sin() ====*/
+//   #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//   #define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+// #endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* number of backlight levels */
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is userful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+// #define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Magic Key Options
+ *
+ * Magic keys are hotkey commands that allow control over firmware functions of
+ * the keyboard. They are best used in combination with the HID Listen program,
+ * found here: https://www.pjrc.com/teensy/hid_listen.html
+ *
+ * The options below allow the magic key functionality to be changed. This is
+ * useful if your keyboard/keypad is missing keys and you want magic key support.
+ *
+ */
+
+/* key combination for magic key command */
+/* defined by default; to change, uncomment and set to the combination you want */
+// #define IS_COMMAND() (get_mods() == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)))
+
+/* control how magic key switches layers */
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS  true
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS  true
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false
+
+/* override magic key keymap */
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM
+//#define MAGIC_KEY_HELP           H
+//#define MAGIC_KEY_HELP_ALT       SLASH
+//#define MAGIC_KEY_DEBUG          D
+//#define MAGIC_KEY_DEBUG_MATRIX   X
+//#define MAGIC_KEY_DEBUG_KBD      K
+//#define MAGIC_KEY_DEBUG_MOUSE    M
+//#define MAGIC_KEY_VERSION        V
+//#define MAGIC_KEY_STATUS         S
+//#define MAGIC_KEY_CONSOLE        C
+//#define MAGIC_KEY_LAYER0         0
+//#define MAGIC_KEY_LAYER0_ALT     GRAVE
+//#define MAGIC_KEY_LAYER1         1
+//#define MAGIC_KEY_LAYER2         2
+//#define MAGIC_KEY_LAYER3         3
+//#define MAGIC_KEY_LAYER4         4
+//#define MAGIC_KEY_LAYER5         5
+//#define MAGIC_KEY_LAYER6         6
+//#define MAGIC_KEY_LAYER7         7
+//#define MAGIC_KEY_LAYER8         8
+//#define MAGIC_KEY_LAYER9         9
+//#define MAGIC_KEY_BOOTLOADER     B
+//#define MAGIC_KEY_BOOTLOADER_ALT ESC
+//#define MAGIC_KEY_LOCK           CAPS
+//#define MAGIC_KEY_EEPROM         E
+//#define MAGIC_KEY_EEPROM_CLEAR   BSPACE
+//#define MAGIC_KEY_NKRO           N
+//#define MAGIC_KEY_SLEEP_LED      Z
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+//#define NO_ACTION_MACRO
+//#define NO_ACTION_FUNCTION
+
+/*
+ * MIDI options
+ */
+
+/* Prevent use of disabled MIDI features in the keymap */
+//#define MIDI_ENABLE_STRICT 1
+
+/* enable basic MIDI features:
+   - MIDI notes can be sent when in Music mode is on
+*/
+//#define MIDI_BASIC
+
+/* enable advanced MIDI features:
+   - MIDI notes can be added to the keymap
+   - Octave shift and transpose
+   - Virtual sustain, portamento, and modulation wheel
+   - etc.
+*/
+//#define MIDI_ADVANCED
+
+/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
+//#define MIDI_TONE_KEYCODE_OCTAVES 1
+
+/* Bootmagic Lite key configuration */
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 5
+
+#define DYNAMIC_KEYMAP_LAYER_COUNT 3
diff --git a/qmk/keyboards/evyd13/wasdat/info.json b/qmk/keyboards/evyd13/wasdat/info.json
new file mode 100644
index 00000000..83c413ed
--- /dev/null
+++ b/qmk/keyboards/evyd13/wasdat/info.json
@@ -0,0 +1,459 @@
+{
+    "keyboard_name": "Wasdat",
+    "url": "https://maartenwut.com/product/wasdat/",
+    "maintainer": "evyd13",
+    "width": 22.5,
+    "height": 6.5,
+    "layouts": {
+        "LAYOUT_fullsize_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":"1", "x":1, "y":1.5},
+                {"label":"2", "x":2, "y":1.5},
+                {"label":"3", "x":3, "y":1.5},
+                {"label":"4", "x":4, "y":1.5},
+                {"label":"5", "x":5, "y":1.5},
+                {"label":"6", "x":6, "y":1.5},
+                {"label":"7", "x":7, "y":1.5},
+                {"label":"8", "x":8, "y":1.5},
+                {"label":"9", "x":9, "y":1.5},
+                {"label":"0", "x":10, "y":1.5},
+                {"label":"_", "x":11, "y":1.5},
+                {"label":"+", "x":12, "y":1.5},
+                {"label":"Backspace", "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":"Num Lock", "x":18.5, "y":1.5},
+                {"label":"/", "x":19.5, "y":1.5},
+                {"label":"*", "x":20.5, "y":1.5},
+                {"label":"-", "x":21.5, "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":"7", "x":18.5, "y":2.5},
+                {"label":"8", "x":19.5, "y":2.5},
+                {"label":"9", "x":20.5, "y":2.5},
+                {"label":"+", "x":21.5, "y":2.5, "h":2},
+
+                {"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":"4", "x":18.5, "y":3.5},
+                {"label":"5", "x":19.5, "y":3.5},
+                {"label":"6", "x":20.5, "y":3.5},
+
+                {"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":"1", "x":18.5, "y":4.5},
+                {"label":"2", "x":19.5, "y":4.5},
+                {"label":"3", "x":20.5, "y":4.5},
+                {"label":"Enter", "x":21.5, "y":4.5, "h":2},
+
+                {"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},
+
+                {"label":"0", "x":18.5, "y":5.5, "w":2},
+                {"label":".", "x":20.5, "y":5.5}
+            ]
+        },
+        "LAYOUT_fullsize_iso": {
+            "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":"\u00ac", "x":0, "y":1.5},
+                {"label":"!", "x":1, "y":1.5},
+                {"label":"\"", "x":2, "y":1.5},
+                {"label":"\u00a3", "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":"Backspace", "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":"Num Lock", "x":18.5, "y":1.5},
+                {"label":"/", "x":19.5, "y":1.5},
+                {"label":"*", "x":20.5, "y":1.5},
+                {"label":"-", "x":21.5, "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":"Delete", "x":15.25, "y":2.5},
+                {"label":"End", "x":16.25, "y":2.5},
+                {"label":"PgDn", "x":17.25, "y":2.5},
+
+                {"label":"7", "x":18.5, "y":2.5},
+                {"label":"8", "x":19.5, "y":2.5},
+                {"label":"9", "x":20.5, "y":2.5},
+                {"label":"+", "x":21.5, "y":2.5, "h":2},
+
+                {"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":"~", "x":12.75, "y":3.5},
+                {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2},
+
+                {"label":"4", "x":18.5, "y":3.5},
+                {"label":"5", "x":19.5, "y":3.5},
+                {"label":"6", "x":20.5, "y":3.5},
+
+                {"label":"Shift", "x":0, "y":4.5, "w":1.25},
+                {"label":"|", "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":2.75},
+
+                {"label":"\u2191", "x":16.25, "y":4.5},
+
+                {"label":"1", "x":18.5, "y":4.5},
+                {"label":"2", "x":19.5, "y":4.5},
+                {"label":"3", "x":20.5, "y":4.5},
+                {"label":"Enter", "x":21.5, "y":4.5, "h":2},
+
+                {"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":"AltGr", "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},
+
+                {"label":"0", "x":18.5, "y":5.5, "w":2},
+                {"label":".", "x":20.5, "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":"1", "x":1, "y":1.5},
+                {"label":"2", "x":2, "y":1.5},
+                {"label":"3", "x":3, "y":1.5},
+                {"label":"4", "x":4, "y":1.5},
+                {"label":"5", "x":5, "y":1.5},
+                {"label":"6", "x":6, "y":1.5},
+                {"label":"7", "x":7, "y":1.5},
+                {"label":"8", "x":8, "y":1.5},
+                {"label":"9", "x":9, "y":1.5},
+                {"label":"0", "x":10, "y":1.5},
+                {"label":"_", "x":11, "y":1.5},
+                {"label":"+", "x":12, "y":1.5},
+                {"label":"Backspace", "x":13, "y":1.5, "w":2},
+                
+                {"label":"Insert", "x":15.25, "y":1.5},
+                {"label":"Home", "x":16.25, "y":1.5},
+                {"label":"Page Up", "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_iso": {
+            "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":"\u00ac", "x":0, "y":1.5},
+                {"label":"!", "x":1, "y":1.5},
+                {"label":"\"", "x":2, "y":1.5},
+                {"label":"\u00a3", "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":"Backspace", "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":"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":"~", "x":12.75, "y":3.5},
+                {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2},
+
+                {"label":"Shift", "x":0, "y":4.5, "w":1.25},
+                {"label":"|", "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":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":"AltGr", "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}
+            ]
+        }
+    }
+}
diff --git a/qmk/keyboards/evyd13/wasdat/keymaps/default/keymap.c b/qmk/keyboards/evyd13/wasdat/keymaps/default/keymap.c
new file mode 100644
index 00000000..89de85c4
--- /dev/null
+++ b/qmk/keyboards/evyd13/wasdat/keymaps/default/keymap.c
@@ -0,0 +1,44 @@
+/* Copyright 2019 Evy Dekkers
+ *
+ * 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] = {
+    /*
+     * ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
+     * │Esc│   │F1 │F2 │F3 │F4 │ │F5 │F6 │F7 │F8 │ │F9 │F10│F11│F12│ │PSc│Slk│Pse│
+     * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐ ┌───┬───┬───┬───┐
+     * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│ │Ins│Hom│PgU│ │Num│ / │ * │ - │
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤ ├───┼───┼───┼───┤
+     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │  \  │ │Del│End│PgD│ │ 7 │ 8 │ 9 │   │
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘ ├───┼───┼───┤ + │
+     * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │  Enter │               │ 4 │ 5 │ 6 │   │
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤     ┌───┐     ├───┼───┼───┼───┤
+     * │ Shift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │    Shift │     │ ↑ │     │ 1 │ 2 │ 3 │   │
+     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───┐ ├───┴───┼───┤Ent│
+     * │Ctrl│GUI │Alt │                        │ Alt│ GUI│Menu│Ctrl│ │ ← │ ↓ │ → │ │   0   │ . │   │
+     * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘ └───────┴───┴───┘
+     */
+    LAYOUT_fullsize_ansi(
+        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_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,     KC_DEL,  KC_END,  KC_PGDN,     KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
+        KC_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_P4,   KC_P5,   KC_P6,
+        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, KC_APP,  KC_RCTL,     KC_LEFT, KC_DOWN, KC_RGHT,     KC_P0,            KC_PDOT
+    )
+};
diff --git a/qmk/keyboards/evyd13/wasdat/keymaps/default/readme.md b/qmk/keyboards/evyd13/wasdat/keymaps/default/readme.md
new file mode 100644
index 00000000..66cf5938
--- /dev/null
+++ b/qmk/keyboards/evyd13/wasdat/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default ANSI keymap for the Wasdat
diff --git a/qmk/keyboards/evyd13/wasdat/keymaps/default_iso/keymap.c b/qmk/keyboards/evyd13/wasdat/keymaps/default_iso/keymap.c
new file mode 100644
index 00000000..fdc61cea
--- /dev/null
+++ b/qmk/keyboards/evyd13/wasdat/keymaps/default_iso/keymap.c
@@ -0,0 +1,44 @@
+/* Copyright 2019 Evy Dekkers
+ *
+ * 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] = {
+    /*
+     * ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
+     * │Esc│   │F1 │F2 │F3 │F4 │ │F5 │F6 │F7 │F8 │ │F9 │F10│F11│F12│ │PSc│Slk│Pse│
+     * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐ ┌───┬───┬───┬───┐
+     * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│ │Ins│Hom│PgU│ │Num│ / │ * │ - │
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤ ├───┼───┼───┼───┤
+     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │     │ │Del│End│PgD│ │ 7 │ 8 │ 9 │   │
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ Ent│ └───┴───┴───┘ ├───┼───┼───┤ + │
+     * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ # │    │               │ 4 │ 5 │ 6 │   │
+     * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤     ┌───┐     ├───┼───┼───┼───┤
+     * │Shft│ \ │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │    Shift │     │ ↑ │     │ 1 │ 2 │ 3 │   │
+     * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───┐ ├───┴───┼───┤Ent│
+     * │Ctrl│GUI │Alt │                        │AlGr│ GUI│Menu│Ctrl│ │ ← │ ↓ │ → │ │   0   │ . │   │
+     * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘ └───────┴───┴───┘
+     */
+    LAYOUT_fullsize_iso(
+        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_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        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_DEL,  KC_END,  KC_PGDN,     KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,                                     KC_P4,   KC_P5,   KC_P6,
+        KC_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_UP,                KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_APP,  KC_RCTL,     KC_LEFT, KC_DOWN, KC_RGHT,     KC_P0,            KC_PDOT
+    )
+};
diff --git a/qmk/keyboards/evyd13/wasdat/keymaps/default_iso/readme.md b/qmk/keyboards/evyd13/wasdat/keymaps/default_iso/readme.md
new file mode 100644
index 00000000..e36d7642
--- /dev/null
+++ b/qmk/keyboards/evyd13/wasdat/keymaps/default_iso/readme.md
@@ -0,0 +1 @@
+# The default ISO keymap for the Wasdat
diff --git a/qmk/keyboards/evyd13/wasdat/keymaps/konstantin/config.h b/qmk/keyboards/evyd13/wasdat/keymaps/konstantin/config.h
new file mode 100644
index 00000000..1d12c7db
--- /dev/null
+++ b/qmk/keyboards/evyd13/wasdat/keymaps/konstantin/config.h
@@ -0,0 +1,6 @@
+#pragma once
+
+#define DYNAMIC_KEYMAP_LAYER_COUNT 3
+
+#define LAYER_FN
+#define LAYER_NUMPAD
diff --git a/qmk/keyboards/evyd13/wasdat/keymaps/konstantin/keymap.c b/qmk/keyboards/evyd13/wasdat/keymaps/konstantin/keymap.c
new file mode 100644
index 00000000..481c5fd1
--- /dev/null
+++ b/qmk/keyboards/evyd13/wasdat/keymaps/konstantin/keymap.c
@@ -0,0 +1,79 @@
+#include QMK_KEYBOARD_H
+#include "konstantin.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base layer
+     * ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐┌───┬───┬───┐
+     * │Esc│   │F1 │F2 │F3 │F4 │ │F5 │F6 │F7 │F8 │ │F9 │F10│F11│F12││PSc│SLk│Pau│
+     * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘└───┴───┴───┘
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐┌───┬───┬───┐
+     * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │Bspace ││Ins│Hom│PgU│
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤├───┼───┼───┤
+     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │     ││Del│End│PgD│
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐Ent │└───┴───┴───┘
+     * │FnCaps│ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ \ │    │
+     * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤    ┌───┐
+     * │LSft│RAG│ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │  RShift  │    │ ↑ │
+     * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤┌───┼───┼───┐
+     * │LCtl│LGui│LAlt│         Space          │RAlt│RGui│FnFL│RCtl││ ← │ ↓ │ → │
+     * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
+     */
+    [L_BASE] = LAYOUT_tkl_iso(
+        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_DEL,  KC_END,  KC_PGDN,
+        FN_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
+        KC_LSFT, RAL_RGU, 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_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, FN_FNLK, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    /* Fn layer
+     * ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐┌───┬───┬───┐
+     * │   │   │   │   │   │   │ │   │   │   │   │ │   │   │   │   ││   │Num│Mut│
+     * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘└───┴───┴───┘
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐┌───┬───┬───┐
+     * │   │F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│ Clear ││Ply│Stp│Vo+│
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤├───┼───┼───┤
+     * │ M4  │M2 │M↑ │M1 │M3 │M5 │   │UCM│   │   │   │   │   │     ││Prv│Nxt│Vo-│
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    │└───┴───┴───┘
+     * │      │M← │M↓ │M→ │MW↑│   │   │   │   │   │   │   │   │    │
+     * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤    ┌───┐
+     * │    │   │MA0│MA2│MW←│MW→│   │   │App│   │   │   │          │    │PgU│
+     * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤┌───┼───┼───┐
+     * │    │DtPR│DtNA│          MW↓           │    │    │    │    ││Hom│PgD│End│
+     * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
+     */
+    [L_FN] = LAYOUT_tkl_iso(
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, NUMPAD,  KC_MUTE,
+        _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  CLEAR,   KC_MPLY, KC_MSTP, KC_VOLU,
+        KC_BTN4, KC_BTN2, KC_MS_U, KC_BTN1, KC_BTN3, KC_BTN5, _______, UC_MOD,  _______, _______, _______, _______, _______,          KC_MPRV, KC_MNXT, KC_VOLD,
+        _______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_U, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, KC_ACL0, KC_ACL2, KC_WH_L, KC_WH_R, _______, _______, KC_APP,  _______, _______, _______,          _______,          KC_PGUP,
+        _______, DST_P_R, DST_N_A,                            KC_WH_D,                            _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END
+    ),
+
+    /* Numpad layer
+     * ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐┌───┬───┬───┐
+     * │   │   │   │   │   │   │ │   │   │   │   │ │   │   │   │   ││   │Num│   │
+     * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘└───┴───┴───┘
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐┌───┬───┬───┐
+     * │   │   │   │   │   │   │   │P7 │P8 │P9 │P- │ − │ = │       ││   │   │   │
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤├───┼───┼───┤
+     * │     │   │   │   │   │   │   │P4 │P5 │P6 │P+ │ ( │ ) │     ││   │   │   │
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐PEnt│└───┴───┴───┘
+     * │      │   │   │   │   │   │   │P1 │P2 │P3 │P* │ × │   │    │
+     * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤    ┌───┐
+     * │    │   │   │   │   │   │   │P0 │P0 │ , │P. │P/ │    ÷     │    │   │
+     * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤┌───┼───┼───┐
+     * │    │    │    │                        │    │    │    │    ││   │   │   │
+     * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘└───┴───┴───┘
+     */
+    [L_NUMPAD] = LAYOUT_tkl_iso(
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, NUMPAD,  _______,
+        _______, _______, _______, _______, _______, _______, _______, KC_P7,   KC_P8,   KC_P9,   KC_PMNS, MINUS,   EQUALS,  _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, KC_P4,   KC_P5,   KC_P6,   KC_PPLS, L_PAREN, R_PAREN,          _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, KC_P1,   KC_P2,   KC_P3,   KC_PAST, TIMES,   _______, KC_PENT,
+        _______, _______, _______, _______, _______, _______, _______, KC_P0,   KC_P0,   COMMA,   KC_PDOT, KC_PSLS,          DIVIDE,           _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______, _______
+    ),
+};
diff --git a/qmk/keyboards/evyd13/wasdat/keymaps/konstantin/rules.mk b/qmk/keyboards/evyd13/wasdat/keymaps/konstantin/rules.mk
new file mode 100644
index 00000000..f70005d3
--- /dev/null
+++ b/qmk/keyboards/evyd13/wasdat/keymaps/konstantin/rules.mk
@@ -0,0 +1,17 @@
+# Generic features
+BOOTMAGIC_ENABLE   = lite
+COMMAND_ENABLE     = yes
+CONSOLE_ENABLE     = yes
+EXTRAKEY_ENABLE    = yes
+MOUSEKEY_ENABLE    = yes
+NKRO_ENABLE        = yes
+TAP_DANCE_ENABLE   = yes
+UNICODEMAP_ENABLE  = yes
+
+# Keyboard-specific features
+VIA_ENABLE         = yes
+
+# Firmware size reduction
+GRAVE_ESC_ENABLE   = no
+MAGIC_ENABLE       = no
+SPACE_CADET_ENABLE = no
diff --git a/qmk/keyboards/evyd13/wasdat/keymaps/via/keymap.c b/qmk/keyboards/evyd13/wasdat/keymaps/via/keymap.c
new file mode 100644
index 00000000..9ad78d60
--- /dev/null
+++ b/qmk/keyboards/evyd13/wasdat/keymaps/via/keymap.c
@@ -0,0 +1,96 @@
+/* Copyright 2020
+ *
+ * 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] = {
+    /*
+     * ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
+     * │Esc│   │F1 │F2 │F3 │F4 │ │F5 │F6 │F7 │F8 │ │F9 │F10│F11│F12│ │PSc│Slk│Pse│
+     * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐ ┌───┬───┬───┬───┐
+     * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│ │Ins│Hom│PgU│ │Num│ / │ * │ - │
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤ ├───┼───┼───┼───┤
+     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │  \  │ │Del│End│PgD│ │ 7 │ 8 │ 9 │   │
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘ ├───┼───┼───┤ + │
+     * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │  Enter │               │ 4 │ 5 │ 6 │   │
+     * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤     ┌───┐     ├───┼───┼───┼───┤
+     * │Shft│ < │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │    Shift │     │ ↑ │     │ 1 │ 2 │ 3 │   │
+     * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───┐ ├───┴───┼───┤Ent│
+     * │Ctrl│GUI │Alt │                        │ Alt│ GUI│FnMn│Ctrl│ │ ← │ ↓ │ → │ │   0   │ . │   │
+     * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘ └───────┴───┴───┘
+     */
+    LAYOUT_all(
+        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_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,       KC_BSLS,     KC_DEL,  KC_END,  KC_PGDN,     KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
+        KC_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_P4,   KC_P5,   KC_P6,
+        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_UP,                KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, LT(1, KC_APP), KC_RCTL,     KC_LEFT, KC_DOWN, KC_RGHT,     KC_P0,            KC_PDOT
+    ),
+
+    /*
+     * ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
+     * │Rst│   │   │   │   │   │ │   │   │   │   │ │   │   │   │   │ │   │   │   │
+     * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐ ┌───┬───┬───┬───┐
+     * │   │   │   │   │   │   │   │   │   │   │   │   │   │       │ │   │   │   │ │   │   │   │   │
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤ ├───┼───┼───┼───┤
+     * │     │   │   │   │   │   │   │   │   │   │   │   │   │     │ │   │   │   │ │   │   │   │   │
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘ ├───┼───┼───┤   │
+     * │      │   │   │   │   │   │   │   │   │   │   │   │        │               │   │   │   │   │
+     * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤     ┌───┐     ├───┼───┼───┼───┤
+     * │    │   │   │   │   │   │   │   │   │   │   │   │          │     │   │     │   │   │   │   │
+     * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───┐ ├───┴───┼───┤   │
+     * │    │    │    │                        │    │    │    │    │ │   │   │   │ │       │   │   │
+     * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘ └───────┴───┴───┘
+     */
+    LAYOUT_all(
+        RESET,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______,
+
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______,     _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______,     _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,                                    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,              _______,              _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______,     _______, _______, _______,     _______,          _______
+    ),
+
+    /*
+     * ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
+     * │   │   │   │   │   │   │ │   │   │   │   │ │   │   │   │   │ │   │   │   │
+     * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐ ┌───┬───┬───┬───┐
+     * │   │   │   │   │   │   │   │   │   │   │   │   │   │       │ │   │   │   │ │   │   │   │   │
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤ ├───┼───┼───┼───┤
+     * │     │   │   │   │   │   │   │   │   │   │   │   │   │     │ │   │   │   │ │   │   │   │   │
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘ ├───┼───┼───┤   │
+     * │      │   │   │   │   │   │   │   │   │   │   │   │        │               │   │   │   │   │
+     * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤     ┌───┐     ├───┼───┼───┼───┤
+     * │    │   │   │   │   │   │   │   │   │   │   │   │          │     │   │     │   │   │   │   │
+     * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───┐ ├───┴───┼───┤   │
+     * │    │    │    │                        │    │    │    │    │ │   │   │   │ │       │   │   │
+     * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘ └───────┴───┴───┘
+     */
+    LAYOUT_all(
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______,
+
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______,     _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,     _______, _______, _______,     _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,                                    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,              _______,              _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______,     _______, _______, _______,     _______,          _______
+    )
+};
diff --git a/qmk/keyboards/evyd13/wasdat/keymaps/via/rules.mk b/qmk/keyboards/evyd13/wasdat/keymaps/via/rules.mk
new file mode 100644
index 00000000..36b7ba9c
--- /dev/null
+++ b/qmk/keyboards/evyd13/wasdat/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/qmk/keyboards/evyd13/wasdat/matrix.c b/qmk/keyboards/evyd13/wasdat/matrix.c
new file mode 100644
index 00000000..6dd79b53
--- /dev/null
+++ b/qmk/keyboards/evyd13/wasdat/matrix.c
@@ -0,0 +1,344 @@
+/*
+Copyright 2012-2018 Jun Wako, Jack Humbert, Yiancar
+
+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 <stdint.h>
+#include <stdbool.h>
+#include "wait.h"
+#include "util.h"
+#include "matrix.h"
+#include "debounce.h"
+#include "quantum.h"
+
+#ifdef DIRECT_PINS
+static pin_t direct_pins[MATRIX_ROWS][MATRIX_COLS] = DIRECT_PINS;
+#elif (DIODE_DIRECTION == ROW2COL) || (DIODE_DIRECTION == COL2ROW)
+static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
+//static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
+#endif
+
+// matrix code
+
+#ifdef DIRECT_PINS
+
+static void init_pins(void) {
+    for (int row = 0; row < MATRIX_ROWS; row++) {
+        for (int col = 0; col < MATRIX_COLS; col++) {
+            pin_t pin = direct_pins[row][col];
+            if (pin != NO_PIN) {
+                setPinInputHigh(pin);
+            }
+        }
+    }
+}
+
+static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) {
+    matrix_row_t last_row_value = current_matrix[current_row];
+    current_matrix[current_row] = 0;
+
+    for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) {
+        pin_t pin = direct_pins[current_row][col_index];
+        if (pin != NO_PIN) {
+            current_matrix[current_row] |= readPin(pin) ? 0 : (MATRIX_ROW_SHIFTER << col_index);
+        }
+    }
+
+    return (last_row_value != current_matrix[current_row]);
+}
+
+#elif (DIODE_DIRECTION == COL2ROW)
+
+static void select_row(uint8_t row) {
+    setPinOutput(row_pins[row]);
+    writePinLow(row_pins[row]);
+}
+
+static void unselect_row(uint8_t row) { setPinInputHigh(row_pins[row]); }
+
+static void unselect_rows(void) {
+    for (uint8_t x = 0; x < MATRIX_ROWS; x++) {
+        setPinInputHigh(row_pins[x]);
+    }
+}
+
+static void init_pins(void) {
+    unselect_rows();
+    for (uint8_t x = 0; x < MATRIX_COLS; x++) {
+        setPinInputHigh(col_pins[x]);
+    }
+}
+
+static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) {
+    // Store last value of row prior to reading
+    matrix_row_t last_row_value = current_matrix[current_row];
+
+    // Clear data in matrix row
+    current_matrix[current_row] = 0;
+
+    // Select row and wait for row selecton to stabilize
+    select_row(current_row);
+    wait_us(30);
+
+    // For each col...
+    for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) {
+
+        // Select the col pin to read (active low)
+        uint8_t pin_state = readPin(col_pins[col_index]);
+
+        // Populate the matrix row with the state of the col pin
+        current_matrix[current_row] |= pin_state ? 0 : (MATRIX_ROW_SHIFTER << col_index);
+    }
+
+    // Unselect row
+    unselect_row(current_row);
+
+    return (last_row_value != current_matrix[current_row]);
+}
+
+#elif (DIODE_DIRECTION == ROW2COL)
+
+/* Cols 0 - 15
+ * col 0: C7
+ * col 1:  B6
+ * col 2: C6
+ * col 3:  B4
+ * col 4:  B5
+ * col 5:   D7
+ * These columns use a 74HC237D 3 to 8 bit demultiplexer.
+ *                A0   A1   A2
+ * col / pin:    PD2  PD1  PD0
+ * 6:             1    1    1
+ * 7:             0    1    1
+ * 8:             1    0    1
+ * 9:             0    0    1
+ * 10:            1    1    0
+ * 11:            0    1    0
+ * 12:            1    0    0
+ * col 13:  D3
+ * col 14:  B7
+ * col 15:  B3
+ */
+static void select_col(uint8_t col) {
+    switch (col) {
+        case 0:
+            writePinLow(C7);
+            break;
+        case 1:
+            writePinLow(B6);
+            break;
+        case 2:
+            writePinLow(C6);
+            break;
+        case 3:
+            writePinLow(B4);
+            break;
+        case 4:
+            writePinLow(B5);
+            break;
+        case 5:
+            writePinLow(D7);
+            break;
+        case 6:
+            writePinHigh(D0);
+            writePinHigh(D1);
+            writePinHigh(D2);
+            break;
+        case 7:
+            writePinHigh(D0);
+            writePinHigh(D1);
+            break;
+        case 8:
+            writePinHigh(D0);
+            writePinHigh(D2);
+            break;
+        case 9:
+            writePinHigh(D0);
+            break;
+        case 10:
+            writePinHigh(D1);
+            writePinHigh(D2);
+            break;
+        case 11:
+            writePinHigh(D1);
+            break;
+        case 12:
+            writePinHigh(D2);
+            break;
+        case 13:
+            writePinLow(D3);
+            break;
+        case 14:
+            writePinLow(B7);
+            break;
+        case 15:
+            writePinLow(B3);
+            break;
+    }
+}
+
+static void unselect_col(uint8_t col) {
+    switch (col) {
+        case 0:
+            writePinHigh(C7);
+            break;
+        case 1:
+            writePinHigh(B6);
+            break;
+        case 2:
+            writePinHigh(C6);
+            break;
+        case 3:
+            writePinHigh(B4);
+            break;
+        case 4:
+            writePinHigh(B5);
+            break;
+        case 5:
+            writePinHigh(D7);
+            break;
+        case 6:
+            writePinLow(D0);
+            writePinLow(D1);
+            writePinLow(D2);
+            break;
+        case 7:
+            writePinLow(D0);
+            writePinLow(D1);
+            break;
+        case 8:
+            writePinLow(D0);
+            writePinLow(D2);
+            break;
+        case 9:
+            writePinLow(D0);
+            break;
+        case 10:
+            writePinLow(D1);
+            writePinLow(D2);
+            break;
+        case 11:
+            writePinLow(D1);
+            break;
+        case 12:
+            writePinLow(D2);
+            break;
+        case 13:
+            writePinHigh(D3);
+            break;
+        case 14:
+            writePinHigh(B7);
+            break;
+        case 15:
+            writePinHigh(B3);
+            break;
+    }
+}
+
+static void unselect_cols(void) {
+    //Native
+    setPinOutput(D3);
+    setPinOutput(D7);
+    writePinHigh(D3);
+    writePinHigh(D7);
+
+    setPinOutput(C6);
+    setPinOutput(C7);
+    writePinHigh(C6);
+    writePinHigh(C7);
+
+    setPinOutput(B3);
+    setPinOutput(B4);
+    setPinOutput(B5);
+    setPinOutput(B6);
+    setPinOutput(B7);
+    writePinHigh(B3);
+    writePinHigh(B4);
+    writePinHigh(B5);
+    writePinHigh(B6);
+    writePinHigh(B7);
+
+    //Demultiplexer
+    setPinOutput(D0);
+    setPinOutput(D1);
+    setPinOutput(D2);
+    writePinLow(D0);
+    writePinLow(D1);
+    writePinLow(D2);
+}
+
+static void init_pins(void) {
+    unselect_cols();
+    for (uint8_t x = 0; x < MATRIX_ROWS; x++) {
+        setPinInputHigh(row_pins[x]);
+    }
+}
+
+static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) {
+    bool matrix_changed = false;
+
+    // Select col and wait for col selecton to stabilize
+    select_col(current_col);
+    wait_us(30);
+
+    // For each row...
+    for (uint8_t row_index = 0; row_index < MATRIX_ROWS; row_index++) {
+        // Store last value of row prior to reading
+        matrix_row_t last_row_value = current_matrix[row_index];
+
+        // Check row pin state
+        if (readPin(row_pins[row_index]) == 0) {
+            // Pin LO, set col bit
+            current_matrix[row_index] |= (MATRIX_ROW_SHIFTER << current_col);
+        } else {
+            // Pin HI, clear col bit
+            current_matrix[row_index] &= ~(MATRIX_ROW_SHIFTER << current_col);
+        }
+
+        // Determine if the matrix changed state
+        if ((last_row_value != current_matrix[row_index]) && !(matrix_changed)) {
+            matrix_changed = true;
+        }
+    }
+
+    // Unselect col
+    unselect_col(current_col);
+
+    return matrix_changed;
+}
+
+#endif
+
+void matrix_init_custom(void) {
+    // initialize key pins
+    init_pins();
+}
+
+bool matrix_scan_custom(matrix_row_t current_matrix[]) {
+    bool changed = false;
+
+#if defined(DIRECT_PINS) || (DIODE_DIRECTION == COL2ROW)
+    // Set row, read cols
+    for (uint8_t current_row = 0; current_row < MATRIX_ROWS; current_row++) {
+        changed |= read_cols_on_row(current_matrix, current_row);
+    }
+#elif (DIODE_DIRECTION == ROW2COL)
+    // Set col, read rows
+    for (uint8_t current_col = 0; current_col < MATRIX_COLS; current_col++) {
+        changed |= read_rows_on_col(current_matrix, current_col);
+    }
+#endif
+
+    return changed;
+}
diff --git a/qmk/keyboards/evyd13/wasdat/readme.md b/qmk/keyboards/evyd13/wasdat/readme.md
new file mode 100644
index 00000000..40a06b59
--- /dev/null
+++ b/qmk/keyboards/evyd13/wasdat/readme.md
@@ -0,0 +1,21 @@
+# Wasdat
+
+![wasdat](https://maartenwut.com/wp-content/uploads/2019/02/by72xkc5-600x600.jpg)
+
+A drop-in replacement controller for the WASD v2 TKL and fullsize models.
+
+* Keyboard Maintainer: [Evyd13](https://github.com/evyd13)
+* Hardware Supported: WASD v2 TKL/Fullsize ANSI & ISO with Wasdat controller
+* Hardware Availability: [maartenwut.com](https://maartenwut.com/product/wasdat/)
+
+## Flashing
+
+The WASD has no reset button, but it does have a bank of DIP switches on the bottom, so to enter the bootloader on this board, simply toggle the first one on and off.
+
+---
+
+Make example for this keyboard (after setting up your build environment):
+
+    make evyd13/wasdat: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).
diff --git a/qmk/keyboards/evyd13/wasdat/rules.mk b/qmk/keyboards/evyd13/wasdat/rules.mk
new file mode 100644
index 00000000..575e63f5
--- /dev/null
+++ b/qmk/keyboards/evyd13/wasdat/rules.mk
@@ -0,0 +1,36 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+#   Teensy       halfkay
+#   Pro Micro    caterina
+#   Atmel DFU    atmel-dfu
+#   LUFA DFU     lufa-dfu
+#   QMK DFU      qmk-dfu
+#   ATmega32A    bootloadHID
+#   ATmega328P   USBasp
+BOOTLOADER = qmk-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # 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 = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+MIDI_ENABLE = no            # MIDI support
+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
+
+CUSTOM_MATRIX = lite
+SRC += matrix.c
+
+LAYOUTS = fullsize_ansi fullsize_iso tkl_ansi tkl_iso
diff --git a/qmk/keyboards/evyd13/wasdat/wasdat.c b/qmk/keyboards/evyd13/wasdat/wasdat.c
new file mode 100644
index 00000000..2d0e999c
--- /dev/null
+++ b/qmk/keyboards/evyd13/wasdat/wasdat.c
@@ -0,0 +1,47 @@
+/* Copyright 2019 Evy Dekkers
+ *
+ * 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 "wasdat.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();
+    led_init_ports();
+}
+
+void led_init_ports(void) {
+    setPinOutput(B0);
+    writePinHigh(B0);
+    setPinOutput(B1);
+    writePinHigh(B1);
+    setPinOutput(B2);
+    writePinHigh(B2);
+}
+
+bool led_update_kb(led_t led_state) {
+    if(led_update_user(led_state)) {
+        writePin(B0, !led_state.caps_lock);
+        writePin(B1, !led_state.scroll_lock);
+        writePin(B2, !led_state.num_lock);
+    }
+
+    return true;
+}
diff --git a/qmk/keyboards/evyd13/wasdat/wasdat.h b/qmk/keyboards/evyd13/wasdat/wasdat.h
new file mode 100644
index 00000000..be0472f3
--- /dev/null
+++ b/qmk/keyboards/evyd13/wasdat/wasdat.h
@@ -0,0 +1,123 @@
+/* Copyright 2019 Evy Dekkers
+ *
+ * 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 XXX KC_NO
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT_all( \
+    K05,      K44, K42, K32, K02, K21, K0A, K3E, K4E, K4D, K2D, K0D, K7D,      K23, K53, K51, \
+    K45, K25, K24, K22, K20, K40, K48, K28, K2A, K2E, K2F, K4F, K4A, K3D,      K47, K4C, K46,      K69, K67, K66, K76, \
+    K35, K55, K54, K52, K50, K30, K38, K58, K5A, K5E, K5F, K3F, K3A, K1D,      K49, K2C, K26,      K59, K57, K56, K5C, \
+    K34, K15, K14, K12, K10, K00, K08, K18, K1A, K1E, K1F, K0F,      K6D,                          K39, K37, K36, \
+    K3B, K04, K65, K64, K62, K60, K70, K78, K68, K6A, K6E, K7F,      K1B,           K0C,           K19, K17, K16, K1C, \
+    K41, K31, K03,                K09,                K73, K11, K33, K61,      K7C, K79, K77,      K07,      K06 \
+) \
+{ \
+    { K00, XXX, K02, K03, K04, K05, K06, K07, K08, K09, K0A, XXX, K0C, K0D, XXX, K0F }, \
+    { K10, K11, K12, XXX, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
+    { K20, K21, K22, K23, K24, K25, K26, XXX, K28, XXX, K2A, XXX, K2C, K2D, K2E, K2F }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, K3F }, \
+    { K40, K41, K42, XXX, K44, K45, K46, K47, K48, K49, K4A, XXX, K4C, K4D, K4E, K4F }, \
+    { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, XXX, K5C, XXX, K5E, K5F }, \
+    { K60, K61, K62, XXX, K64, K65, K66, K67, K68, K69, K6A, XXX, XXX, K6D, K6E, XXX }, \
+    { K70, XXX, XXX, K73, XXX, XXX, K76, K77, K78, K79, XXX, XXX, K7C, K7D, XXX, K7F } \
+}
+
+#define LAYOUT_fullsize_ansi( \
+    K05,      K44, K42, K32, K02, K21, K0A, K3E, K4E, K4D, K2D, K0D, K7D,      K23, K53, K51, \
+    K45, K25, K24, K22, K20, K40, K48, K28, K2A, K2E, K2F, K4F, K4A, K3D,      K47, K4C, K46,      K69, K67, K66, K76, \
+    K35, K55, K54, K52, K50, K30, K38, K58, K5A, K5E, K5F, K3F, K3A, K1D,      K49, K2C, K26,      K59, K57, K56, K5C, \
+    K34, K15, K14, K12, K10, K00, K08, K18, K1A, K1E, K1F, K0F,      K6D,                          K39, K37, K36, \
+    K3B,      K65, K64, K62, K60, K70, K78, K68, K6A, K6E, K7F,      K1B,           K0C,           K19, K17, K16, K1C, \
+    K41, K31, K03,                K09,                K73, K11, K33, K61,      K7C, K79, K77,      K07,      K06 \
+) \
+{ \
+    { K00, XXX, K02, K03, XXX, K05, K06, K07, K08, K09, K0A, XXX, K0C, K0D, XXX, K0F }, \
+    { K10, K11, K12, XXX, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
+    { K20, K21, K22, K23, K24, K25, K26, XXX, K28, XXX, K2A, XXX, K2C, K2D, K2E, K2F }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, K3F }, \
+    { K40, K41, K42, XXX, K44, K45, K46, K47, K48, K49, K4A, XXX, K4C, K4D, K4E, K4F }, \
+    { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, XXX, K5C, XXX, K5E, K5F }, \
+    { K60, K61, K62, XXX, K64, K65, K66, K67, K68, K69, K6A, XXX, XXX, K6D, K6E, XXX }, \
+    { K70, XXX, XXX, K73, XXX, XXX, K76, K77, K78, K79, XXX, XXX, K7C, K7D, XXX, K7F } \
+}
+
+#define LAYOUT_fullsize_iso( \
+    K05,      K44, K42, K32, K02, K21, K0A, K3E, K4E, K4D, K2D, K0D, K7D,      K23, K53, K51, \
+    K45, K25, K24, K22, K20, K40, K48, K28, K2A, K2E, K2F, K4F, K4A, K3D,      K47, K4C, K46,      K69, K67, K66, K76, \
+    K35, K55, K54, K52, K50, K30, K38, K58, K5A, K5E, K5F, K3F, K3A,           K49, K2C, K26,      K59, K57, K56, K5C, \
+    K34, K15, K14, K12, K10, K00, K08, K18, K1A, K1E, K1F, K0F, K1D, K6D,                          K39, K37, K36, \
+    K3B, K04, K65, K64, K62, K60, K70, K78, K68, K6A, K6E, K7F,      K1B,           K0C,           K19, K17, K16, K1C, \
+    K41, K31, K03,                K09,                K73, K11, K33, K61,      K7C, K79, K77,      K07,      K06 \
+) \
+{ \
+    { K00, XXX, K02, K03, K04, K05, K06, K07, K08, K09, K0A, XXX, K0C, K0D, XXX, K0F }, \
+    { K10, K11, K12, XXX, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F }, \
+    { K20, K21, K22, K23, K24, K25, K26, XXX, K28, XXX, K2A, XXX, K2C, K2D, K2E, K2F }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, XXX, K3D, K3E, K3F }, \
+    { K40, K41, K42, XXX, K44, K45, K46, K47, K48, K49, K4A, XXX, K4C, K4D, K4E, K4F }, \
+    { K50, K51, K52, K53, K54, K55, K56, K57, K58, K59, K5A, XXX, K5C, XXX, K5E, K5F }, \
+    { K60, K61, K62, XXX, K64, K65, K66, K67, K68, K69, K6A, XXX, XXX, K6D, K6E, XXX }, \
+    { K70, XXX, XXX, K73, XXX, XXX, K76, K77, K78, K79, XXX, XXX, K7C, K7D, XXX, K7F } \
+}
+
+#define LAYOUT_tkl_ansi( \
+    K05,      K44, K42, K32, K02, K21, K0A, K3E, K4E, K4D, K2D, K0D, K7D,      K23, K53, K51, \
+    K45, K25, K24, K22, K20, K40, K48, K28, K2A, K2E, K2F, K4F, K4A, K3D,      K47, K4C, K46, \
+    K35, K55, K54, K52, K50, K30, K38, K58, K5A, K5E, K5F, K3F, K3A, K1D,      K49, K2C, K26, \
+    K34, K15, K14, K12, K10, K00, K08, K18, K1A, K1E, K1F, K0F,      K6D, \
+    K3B,      K65, K64, K62, K60, K70, K78, K68, K6A, K6E, K7F,      K1B,           K0C, \
+    K41, K31, K03,                K09,                K73, K11, K33, K61,      K7C, K79, K77 \
+) \
+{ \
+    { K00, XXX, K02, K03, XXX, K05, XXX, XXX, K08, K09, K0A, XXX, K0C, K0D, XXX, K0F }, \
+    { K10, K11, K12, XXX, K14, K15, XXX, XXX, K18, XXX, K1A, K1B, XXX, K1D, K1E, K1F }, \
+    { K20, K21, K22, K23, K24, K25, K26, XXX, K28, XXX, K2A, XXX, K2C, K2D, K2E, K2F }, \
+    { K30, K31, K32, K33, K34, K35, XXX, XXX, K38, XXX, K3A, K3B, XXX, K3D, K3E, K3F }, \
+    { K40, K41, K42, XXX, K44, K45, K46, K47, K48, K49, K4A, XXX, K4C, K4D, K4E, K4F }, \
+    { K50, K51, K52, K53, K54, K55, XXX, XXX, K58, XXX, K5A, XXX, XXX, XXX, K5E, K5F }, \
+    { K60, K61, K62, XXX, K64, K65, XXX, XXX, K68, XXX, K6A, XXX, XXX, K6D, K6E, XXX }, \
+    { K70, XXX, XXX, K73, XXX, XXX, XXX, K77, K78, K79, XXX, XXX, K7C, K7D, XXX, K7F } \
+}
+
+#define LAYOUT_tkl_iso( \
+    K05,      K44, K42, K32, K02, K21, K0A, K3E, K4E, K4D, K2D, K0D, K7D,      K23, K53, K51, \
+    K45, K25, K24, K22, K20, K40, K48, K28, K2A, K2E, K2F, K4F, K4A, K3D,      K47, K4C, K46, \
+    K35, K55, K54, K52, K50, K30, K38, K58, K5A, K5E, K5F, K3F, K3A,           K49, K2C, K26, \
+    K34, K15, K14, K12, K10, K00, K08, K18, K1A, K1E, K1F, K0F, K1D, K6D, \
+    K3B, K04, K65, K64, K62, K60, K70, K78, K68, K6A, K6E, K7F,      K1B,           K0C, \
+    K41, K31, K03,                K09,                K73, K11, K33, K61,      K7C, K79, K77 \
+) \
+{ \
+    { K00, XXX, K02, K03, K04, K05, XXX, XXX, K08, K09, K0A, XXX, K0C, K0D, XXX, K0F }, \
+    { K10, K11, K12, XXX, K14, K15, XXX, XXX, K18, XXX, K1A, K1B, XXX, K1D, K1E, K1F }, \
+    { K20, K21, K22, K23, K24, K25, K26, XXX, K28, XXX, K2A, XXX, K2C, K2D, K2E, K2F }, \
+    { K30, K31, K32, K33, K34, K35, XXX, XXX, K38, XXX, K3A, K3B, XXX, K3D, K3E, K3F }, \
+    { K40, K41, K42, XXX, K44, K45, K46, K47, K48, K49, K4A, XXX, K4C, K4D, K4E, K4F }, \
+    { K50, K51, K52, K53, K54, K55, XXX, XXX, K58, XXX, K5A, XXX, XXX, XXX, K5E, K5F }, \
+    { K60, K61, K62, XXX, K64, K65, XXX, XXX, K68, XXX, K6A, XXX, XXX, K6D, K6E, XXX }, \
+    { K70, XXX, XXX, K73, XXX, XXX, XXX, K77, K78, K79, XXX, XXX, K7C, K7D, XXX, K7F } \
+}
diff --git a/qmk/keyboards/evyd13/wasdat_code/config.h b/qmk/keyboards/evyd13/wasdat_code/config.h
new file mode 100644
index 00000000..f4b15ced
--- /dev/null
+++ b/qmk/keyboards/evyd13/wasdat_code/config.h
@@ -0,0 +1,230 @@
+/*
+Copyright 2019 Evy Dekkers
+
+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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x4705
+#define PRODUCT_ID      0xB00E
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Evyd13
+#define PRODUCT         Wasdat Code
+#define DESCRIPTION     Custom controller for the WASD CODE TKL and 104-key keyboards
+
+/* key matrix size */
+#define MATRIX_ROWS 8
+#define MATRIX_COLS 16
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+*/
+#define MATRIX_ROW_PINS { E6, C7, C6, B6, B5, B4, D7, D6 }
+#define MATRIX_COL_PINS { }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION ROW2COL
+
+// For QMK DFU
+#define QMK_ESC_OUTPUT E6
+#define QMK_ESC_INPUT F0
+#define QMK_LED B1
+
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+//#define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6
+
+#define BACKLIGHT_PIN B7
+#define BACKLIGHT_BREATHING
+#define BACKLIGHT_LEVELS 5
+
+// #define RGB_DI_PIN E2
+// #ifdef RGB_DI_PIN
+//   #define RGBLED_NUM 16
+//   #define RGBLIGHT_HUE_STEP 8
+//   #define RGBLIGHT_SAT_STEP 8
+//   #define RGBLIGHT_VAL_STEP 8
+//   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+//   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+// /*== all animations enable ==*/
+//   #define RGBLIGHT_ANIMATIONS
+// /*== or choose animations ==*/
+//   #define RGBLIGHT_EFFECT_BREATHING
+//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
+//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+//   #define RGBLIGHT_EFFECT_SNAKE
+//   #define RGBLIGHT_EFFECT_KNIGHT
+//   #define RGBLIGHT_EFFECT_CHRISTMAS
+//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
+//   #define RGBLIGHT_EFFECT_RGB_TEST
+//   #define RGBLIGHT_EFFECT_ALTERNATING
+// /*== customize breathing effect ==*/
+//   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+//   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+//   /*==== use exp() and sin() ====*/
+//   #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//   #define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+// #endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* number of backlight levels */
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is userful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+// #define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Magic Key Options
+ *
+ * Magic keys are hotkey commands that allow control over firmware functions of
+ * the keyboard. They are best used in combination with the HID Listen program,
+ * found here: https://www.pjrc.com/teensy/hid_listen.html
+ *
+ * The options below allow the magic key functionality to be changed. This is
+ * useful if your keyboard/keypad is missing keys and you want magic key support.
+ *
+ */
+
+/* key combination for magic key command */
+/* defined by default; to change, uncomment and set to the combination you want */
+// #define IS_COMMAND() (get_mods() == (MOD_BIT(KC_LSHIFT) | MOD_BIT(KC_RSHIFT)))
+
+/* control how magic key switches layers */
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS  true
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS  true
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false
+
+/* override magic key keymap */
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS
+//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM
+//#define MAGIC_KEY_HELP           H
+//#define MAGIC_KEY_HELP_ALT       SLASH
+//#define MAGIC_KEY_DEBUG          D
+//#define MAGIC_KEY_DEBUG_MATRIX   X
+//#define MAGIC_KEY_DEBUG_KBD      K
+//#define MAGIC_KEY_DEBUG_MOUSE    M
+//#define MAGIC_KEY_VERSION        V
+//#define MAGIC_KEY_STATUS         S
+//#define MAGIC_KEY_CONSOLE        C
+//#define MAGIC_KEY_LAYER0         0
+//#define MAGIC_KEY_LAYER0_ALT     GRAVE
+//#define MAGIC_KEY_LAYER1         1
+//#define MAGIC_KEY_LAYER2         2
+//#define MAGIC_KEY_LAYER3         3
+//#define MAGIC_KEY_LAYER4         4
+//#define MAGIC_KEY_LAYER5         5
+//#define MAGIC_KEY_LAYER6         6
+//#define MAGIC_KEY_LAYER7         7
+//#define MAGIC_KEY_LAYER8         8
+//#define MAGIC_KEY_LAYER9         9
+//#define MAGIC_KEY_BOOTLOADER     B
+//#define MAGIC_KEY_BOOTLOADER_ALT ESC
+//#define MAGIC_KEY_LOCK           CAPS
+//#define MAGIC_KEY_EEPROM         E
+//#define MAGIC_KEY_EEPROM_CLEAR   BSPACE
+//#define MAGIC_KEY_NKRO           N
+//#define MAGIC_KEY_SLEEP_LED      Z
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+//#define NO_ACTION_MACRO
+//#define NO_ACTION_FUNCTION
+
+/*
+ * MIDI options
+ */
+
+/* Prevent use of disabled MIDI features in the keymap */
+//#define MIDI_ENABLE_STRICT 1
+
+/* enable basic MIDI features:
+   - MIDI notes can be sent when in Music mode is on
+*/
+//#define MIDI_BASIC
+
+/* enable advanced MIDI features:
+   - MIDI notes can be added to the keymap
+   - Octave shift and transpose
+   - Virtual sustain, portamento, and modulation wheel
+   - etc.
+*/
+//#define MIDI_ADVANCED
+
+/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
+//#define MIDI_TONE_KEYCODE_OCTAVES 1
+
+/* Bootmagic Lite key configuration */
+#define BOOTMAGIC_LITE_ROW 2
+#define BOOTMAGIC_LITE_COLUMN 3
+
+#define DYNAMIC_KEYMAP_LAYER_COUNT 3
diff --git a/qmk/keyboards/evyd13/wasdat_code/info.json b/qmk/keyboards/evyd13/wasdat_code/info.json
new file mode 100644
index 00000000..4e6ed630
--- /dev/null
+++ b/qmk/keyboards/evyd13/wasdat_code/info.json
@@ -0,0 +1,459 @@
+{
+    "keyboard_name": "Wasdat Code",
+    "url": "https://maartenwut.com/product/wasdat-code/",
+    "maintainer": "evyd13",
+    "width": 22.5,
+    "height": 6.5,
+    "layouts": {
+        "LAYOUT_fullsize_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":"1", "x":1, "y":1.5},
+                {"label":"2", "x":2, "y":1.5},
+                {"label":"3", "x":3, "y":1.5},
+                {"label":"4", "x":4, "y":1.5},
+                {"label":"5", "x":5, "y":1.5},
+                {"label":"6", "x":6, "y":1.5},
+                {"label":"7", "x":7, "y":1.5},
+                {"label":"8", "x":8, "y":1.5},
+                {"label":"9", "x":9, "y":1.5},
+                {"label":"0", "x":10, "y":1.5},
+                {"label":"_", "x":11, "y":1.5},
+                {"label":"+", "x":12, "y":1.5},
+                {"label":"Backspace", "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":"Num Lock", "x":18.5, "y":1.5},
+                {"label":"/", "x":19.5, "y":1.5},
+                {"label":"*", "x":20.5, "y":1.5},
+                {"label":"-", "x":21.5, "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":"7", "x":18.5, "y":2.5},
+                {"label":"8", "x":19.5, "y":2.5},
+                {"label":"9", "x":20.5, "y":2.5},
+                {"label":"+", "x":21.5, "y":2.5, "h":2},
+
+                {"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":"4", "x":18.5, "y":3.5},
+                {"label":"5", "x":19.5, "y":3.5},
+                {"label":"6", "x":20.5, "y":3.5},
+
+                {"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":"1", "x":18.5, "y":4.5},
+                {"label":"2", "x":19.5, "y":4.5},
+                {"label":"3", "x":20.5, "y":4.5},
+                {"label":"Enter", "x":21.5, "y":4.5, "h":2},
+
+                {"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},
+
+                {"label":"0", "x":18.5, "y":5.5, "w":2},
+                {"label":".", "x":20.5, "y":5.5}
+            ]
+        },
+        "LAYOUT_fullsize_iso": {
+            "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":"\u00ac", "x":0, "y":1.5},
+                {"label":"!", "x":1, "y":1.5},
+                {"label":"\"", "x":2, "y":1.5},
+                {"label":"\u00a3", "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":"Backspace", "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":"Num Lock", "x":18.5, "y":1.5},
+                {"label":"/", "x":19.5, "y":1.5},
+                {"label":"*", "x":20.5, "y":1.5},
+                {"label":"-", "x":21.5, "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":"Delete", "x":15.25, "y":2.5},
+                {"label":"End", "x":16.25, "y":2.5},
+                {"label":"PgDn", "x":17.25, "y":2.5},
+
+                {"label":"7", "x":18.5, "y":2.5},
+                {"label":"8", "x":19.5, "y":2.5},
+                {"label":"9", "x":20.5, "y":2.5},
+                {"label":"+", "x":21.5, "y":2.5, "h":2},
+
+                {"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":"~", "x":12.75, "y":3.5},
+                {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2},
+
+                {"label":"4", "x":18.5, "y":3.5},
+                {"label":"5", "x":19.5, "y":3.5},
+                {"label":"6", "x":20.5, "y":3.5},
+
+                {"label":"Shift", "x":0, "y":4.5, "w":1.25},
+                {"label":"|", "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":2.75},
+
+                {"label":"\u2191", "x":16.25, "y":4.5},
+
+                {"label":"1", "x":18.5, "y":4.5},
+                {"label":"2", "x":19.5, "y":4.5},
+                {"label":"3", "x":20.5, "y":4.5},
+                {"label":"Enter", "x":21.5, "y":4.5, "h":2},
+
+                {"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":"AltGr", "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},
+
+                {"label":"0", "x":18.5, "y":5.5, "w":2},
+                {"label":".", "x":20.5, "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":"1", "x":1, "y":1.5},
+                {"label":"2", "x":2, "y":1.5},
+                {"label":"3", "x":3, "y":1.5},
+                {"label":"4", "x":4, "y":1.5},
+                {"label":"5", "x":5, "y":1.5},
+                {"label":"6", "x":6, "y":1.5},
+                {"label":"7", "x":7, "y":1.5},
+                {"label":"8", "x":8, "y":1.5},
+                {"label":"9", "x":9, "y":1.5},
+                {"label":"0", "x":10, "y":1.5},
+                {"label":"_", "x":11, "y":1.5},
+                {"label":"+", "x":12, "y":1.5},
+                {"label":"Backspace", "x":13, "y":1.5, "w":2},
+                
+                {"label":"Insert", "x":15.25, "y":1.5},
+                {"label":"Home", "x":16.25, "y":1.5},
+                {"label":"Page Up", "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_iso": {
+            "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":"\u00ac", "x":0, "y":1.5},
+                {"label":"!", "x":1, "y":1.5},
+                {"label":"\"", "x":2, "y":1.5},
+                {"label":"\u00a3", "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":"Backspace", "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":"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":"~", "x":12.75, "y":3.5},
+                {"label":"Enter", "x":13.75, "y":2.5, "w":1.25, "h":2},
+
+                {"label":"Shift", "x":0, "y":4.5, "w":1.25},
+                {"label":"|", "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":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":"AltGr", "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}
+            ]
+        }
+    }
+}
diff --git a/qmk/keyboards/evyd13/wasdat_code/keymaps/default/keymap.c b/qmk/keyboards/evyd13/wasdat_code/keymaps/default/keymap.c
new file mode 100644
index 00000000..c73a2ece
--- /dev/null
+++ b/qmk/keyboards/evyd13/wasdat_code/keymaps/default/keymap.c
@@ -0,0 +1,53 @@
+/* Copyright 2019 Evy Dekkers
+ *
+ * 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] = {
+    /*
+     * ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
+     * │Esc│   │F1 │F2 │F3 │F4 │ │F5 │F6 │F7 │F8 │ │F9 │F10│F11│F12│ │PSc│Slk│Pse│
+     * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐ ┌───┬───┬───┬───┐
+     * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│ │Ins│Hom│PgU│ │Num│ / │ * │ - │
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤ ├───┼───┼───┼───┤
+     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │  \  │ │Del│End│PgD│ │ 7 │ 8 │ 9 │   │
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┘ ├───┼───┼───┤ + │
+     * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │  Enter │               │ 4 │ 5 │ 6 │   │
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤     ┌───┐     ├───┼───┼───┼───┤
+     * │ Shift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │    Shift │     │ ↑ │     │ 1 │ 2 │ 3 │   │
+     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───┐ ├───┴───┼───┤Ent│
+     * │Ctrl│GUI │Alt │                        │ Alt│ GUI│Menu│Ctrl│ │ ← │ ↓ │ → │ │   0   │ . │   │
+     * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘ └───────┴───┴───┘
+     */
+    LAYOUT_fullsize_ansi(
+        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_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,     KC_DEL,  KC_END,  KC_PGDN,     KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
+        KC_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_P4,   KC_P5,   KC_P6,
+        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
+    ),
+    LAYOUT_fullsize_ansi(
+        RESET,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_STEP, BL_TOGG,    _______,  _______, KC_MUTE,
+
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    KC_MPLY,  KC_MSTP, KC_VOLU,     _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    KC_MPRV,  KC_MNXT, KC_VOLD,     _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,                                    _______, _______, _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,              _______,              _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______,    _______,  _______, _______,     _______,          _______
+    )
+};
diff --git a/qmk/keyboards/evyd13/wasdat_code/keymaps/default/readme.md b/qmk/keyboards/evyd13/wasdat_code/keymaps/default/readme.md
new file mode 100644
index 00000000..66cf5938
--- /dev/null
+++ b/qmk/keyboards/evyd13/wasdat_code/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default ANSI keymap for the Wasdat
diff --git a/qmk/keyboards/evyd13/wasdat_code/keymaps/default_iso/keymap.c b/qmk/keyboards/evyd13/wasdat_code/keymaps/default_iso/keymap.c
new file mode 100644
index 00000000..fdc61cea
--- /dev/null
+++ b/qmk/keyboards/evyd13/wasdat_code/keymaps/default_iso/keymap.c
@@ -0,0 +1,44 @@
+/* Copyright 2019 Evy Dekkers
+ *
+ * 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] = {
+    /*
+     * ┌───┐   ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┬───┐ ┌───┬───┬───┐
+     * │Esc│   │F1 │F2 │F3 │F4 │ │F5 │F6 │F7 │F8 │ │F9 │F10│F11│F12│ │PSc│Slk│Pse│
+     * └───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┘
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┐ ┌───┬───┬───┬───┐
+     * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│ │Ins│Hom│PgU│ │Num│ / │ * │ - │
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤ ├───┼───┼───┼───┤
+     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │     │ │Del│End│PgD│ │ 7 │ 8 │ 9 │   │
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ Ent│ └───┴───┴───┘ ├───┼───┼───┤ + │
+     * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ # │    │               │ 4 │ 5 │ 6 │   │
+     * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴────┤     ┌───┐     ├───┼───┼───┼───┤
+     * │Shft│ \ │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │    Shift │     │ ↑ │     │ 1 │ 2 │ 3 │   │
+     * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───┐ ├───┴───┼───┤Ent│
+     * │Ctrl│GUI │Alt │                        │AlGr│ GUI│Menu│Ctrl│ │ ← │ ↓ │ → │ │   0   │ . │   │
+     * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘ └───┴───┴───┘ └───────┴───┴───┘
+     */
+    LAYOUT_fullsize_iso(
+        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_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        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_DEL,  KC_END,  KC_PGDN,     KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,                                     KC_P4,   KC_P5,   KC_P6,
+        KC_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_UP,                KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_APP,  KC_RCTL,     KC_LEFT, KC_DOWN, KC_RGHT,     KC_P0,            KC_PDOT
+    )
+};
diff --git a/qmk/keyboards/evyd13/wasdat_code/keymaps/default_iso/readme.md b/qmk/keyboards/evyd13/wasdat_code/keymaps/default_iso/readme.md
new file mode 100644
index 00000000..e36d7642
--- /dev/null
+++ b/qmk/keyboards/evyd13/wasdat_code/keymaps/default_iso/readme.md
@@ -0,0 +1 @@
+# The default ISO keymap for the Wasdat
diff --git a/qmk/keyboards/evyd13/wasdat_code/keymaps/via/keymap.c b/qmk/keyboards/evyd13/wasdat_code/keymaps/via/keymap.c
new file mode 100644
index 00000000..35445812
--- /dev/null
+++ b/qmk/keyboards/evyd13/wasdat_code/keymaps/via/keymap.c
@@ -0,0 +1,46 @@
+/* Copyright 2019 Evy Dekkers
+ *
+ * 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_all(
+        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_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        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_DEL,  KC_END,  KC_PGDN,     KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
+        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_BSLS, KC_ENT,                                     KC_P4,   KC_P5,   KC_P6,
+        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_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_all(
+        RESET,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, BL_STEP, BL_TOGG,    _______,  _______, KC_MUTE,
+
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    KC_MPLY,  KC_MSTP, KC_VOLU,     _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             KC_MPRV,  KC_MNXT, KC_VOLD,     _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                                    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,              _______,              _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______,    _______,  _______, _______,     _______,          _______
+    ),
+    [2] = LAYOUT_all(
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______,  _______, _______,
+
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______,  _______, _______,     _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,             _______,  _______, _______,     _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                                    _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,              _______,              _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______,    _______,  _______, _______,     _______,          _______
+    )
+};
diff --git a/qmk/keyboards/evyd13/wasdat_code/keymaps/via/rules.mk b/qmk/keyboards/evyd13/wasdat_code/keymaps/via/rules.mk
new file mode 100644
index 00000000..36b7ba9c
--- /dev/null
+++ b/qmk/keyboards/evyd13/wasdat_code/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/qmk/keyboards/evyd13/wasdat_code/matrix.c b/qmk/keyboards/evyd13/wasdat_code/matrix.c
new file mode 100644
index 00000000..7844db7a
--- /dev/null
+++ b/qmk/keyboards/evyd13/wasdat_code/matrix.c
@@ -0,0 +1,369 @@
+/*
+Copyright 2012-2018 Jun Wako, Jack Humbert, Yiancar
+
+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 <stdint.h>
+#include <stdbool.h>
+#include "wait.h"
+#include "util.h"
+#include "matrix.h"
+#include "debounce.h"
+#include "quantum.h"
+
+#ifdef DIRECT_PINS
+static pin_t direct_pins[MATRIX_ROWS][MATRIX_COLS] = DIRECT_PINS;
+#elif (DIODE_DIRECTION == ROW2COL) || (DIODE_DIRECTION == COL2ROW)
+static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
+//static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
+#endif
+
+// matrix code
+
+#ifdef DIRECT_PINS
+
+static void init_pins(void) {
+    for (int row = 0; row < MATRIX_ROWS; row++) {
+        for (int col = 0; col < MATRIX_COLS; col++) {
+            pin_t pin = direct_pins[row][col];
+            if (pin != NO_PIN) {
+                setPinInputHigh(pin);
+            }
+        }
+    }
+}
+
+static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) {
+    matrix_row_t last_row_value = current_matrix[current_row];
+    current_matrix[current_row] = 0;
+
+    for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) {
+        pin_t pin = direct_pins[current_row][col_index];
+        if (pin != NO_PIN) {
+            current_matrix[current_row] |= readPin(pin) ? 0 : (MATRIX_ROW_SHIFTER << col_index);
+        }
+    }
+
+    return (last_row_value != current_matrix[current_row]);
+}
+
+#elif (DIODE_DIRECTION == COL2ROW)
+
+static void select_row(uint8_t row) {
+    setPinOutput(row_pins[row]);
+    writePinLow(row_pins[row]);
+}
+
+static void unselect_row(uint8_t row) { setPinInputHigh(row_pins[row]); }
+
+static void unselect_rows(void) {
+    for (uint8_t x = 0; x < MATRIX_ROWS; x++) {
+        setPinInputHigh(row_pins[x]);
+    }
+}
+
+static void init_pins(void) {
+    unselect_rows();
+    for (uint8_t x = 0; x < MATRIX_COLS; x++) {
+        setPinInputHigh(col_pins[x]);
+    }
+}
+
+static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) {
+    // Store last value of row prior to reading
+    matrix_row_t last_row_value = current_matrix[current_row];
+
+    // Clear data in matrix row
+    current_matrix[current_row] = 0;
+
+    // Select row and wait for row selecton to stabilize
+    select_row(current_row);
+    wait_us(30);
+
+    // For each col...
+    for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) {
+
+        // Select the col pin to read (active low)
+        uint8_t pin_state = readPin(col_pins[col_index]);
+
+        // Populate the matrix row with the state of the col pin
+        current_matrix[current_row] |= pin_state ? 0 : (MATRIX_ROW_SHIFTER << col_index);
+    }
+
+    // Unselect row
+    unselect_row(current_row);
+
+    return (last_row_value != current_matrix[current_row]);
+}
+
+#elif (DIODE_DIRECTION == ROW2COL)
+
+/* Cols 0 - 15
+ * col 0: F7
+ * col 1: F5
+ * col 2: F6
+ * col 3: F1
+ * col 4: F4
+ * col 5: F0
+ * These columns use a 74HC237D 3 to 8 bit demultiplexer. D4 is the enable pin, must be set high to use it.
+ *                A0   A1   A2
+ * col / pin:    PD2  PD1  PD0
+ * 6:             1    1    1
+ * col 7:  D3
+ * col 8:  B7
+ * 9:             0    1    1
+ * 10:            1    0    1
+ * 11:            0    0    1
+ * 12:            1    1    0
+ * 13:            0    1    0
+ * 14:            1    0    0
+ * 15:            0    0    0
+ */
+static void select_col(uint8_t col) {
+    switch (col) {
+        case 0:
+            writePinLow(F7);
+            break;
+        case 1:
+            writePinLow(F5);
+            break;
+        case 2:
+            writePinLow(F6);
+            break;
+        case 3:
+            writePinLow(F1);
+            break;
+        case 4:
+            writePinLow(F4);
+            break;
+        case 5:
+            writePinLow(F0);
+            break;
+        case 6:
+            writePinHigh(D4);
+            writePinHigh(D2);
+            writePinHigh(D1);
+            writePinHigh(D0);
+            break;
+        case 7:
+            writePinLow(D5);
+            break;
+        case 8:
+            writePinLow(D3);
+            break;
+        case 9:
+            writePinHigh(D4);
+            writePinHigh(D1);
+            writePinHigh(D0);
+            break;
+        case 10:
+            writePinHigh(D4);
+            writePinHigh(D2);
+            writePinHigh(D0);
+            break;
+        case 11:
+            writePinHigh(D4);
+            writePinHigh(D0);
+            break;
+        case 12:
+            writePinHigh(D4);
+            writePinHigh(D2);
+            writePinHigh(D1);
+            break;
+        case 13:
+            writePinHigh(D4);
+            writePinHigh(D1);
+            break;
+        case 14:
+            writePinHigh(D4);
+            writePinHigh(D2);
+            break;
+        case 15:
+            writePinHigh(D4);
+            break;
+    }
+}
+
+static void unselect_col(uint8_t col) {
+    switch (col) {
+        case 0:
+            writePinHigh(F7);
+            break;
+        case 1:
+            writePinHigh(F5);
+            break;
+        case 2:
+            writePinHigh(F6);
+            break;
+        case 3:
+            writePinHigh(F1);
+            break;
+        case 4:
+            writePinHigh(F4);
+            break;
+        case 5:
+            writePinHigh(F0);
+            break;
+        case 6:
+            writePinLow(D4);
+            writePinLow(D2);
+            writePinLow(D1);
+            writePinLow(D0);
+            break;
+        case 7:
+            writePinHigh(D5);
+            break;
+        case 8:
+            writePinHigh(D3);
+            break;
+        case 9:
+            writePinLow(D4);
+            writePinLow(D2);
+            writePinLow(D1);
+            writePinLow(D0);
+            break;
+        case 10:
+            writePinLow(D4);
+            writePinLow(D2);
+            writePinLow(D1);
+            writePinLow(D0);
+            break;
+        case 11:
+            writePinLow(D4);
+            writePinLow(D2);
+            writePinLow(D1);
+            writePinLow(D0);
+            break;
+        case 12:
+            writePinLow(D4);
+            writePinLow(D2);
+            writePinLow(D1);
+            writePinLow(D0);
+            break;
+        case 13:
+            writePinLow(D4);
+            writePinLow(D2);
+            writePinLow(D1);
+            writePinLow(D0);
+            break;
+        case 14:
+            writePinLow(D4);
+            writePinLow(D2);
+            writePinLow(D1);
+            writePinLow(D0);
+            break;
+        case 15:
+            writePinLow(D4);
+            writePinLow(D2);
+            writePinLow(D1);
+            writePinLow(D0);
+            break;
+    }
+}
+
+static void unselect_cols(void) {
+    //Native
+    writePinHigh(F7);
+    writePinHigh(F5);
+    writePinHigh(F6);
+    writePinHigh(F1);
+    writePinHigh(F4);
+    writePinHigh(F0);
+    writePinHigh(D3);
+    writePinHigh(D5);
+
+    //Demultiplexer
+    writePinLow(D4);
+    writePinLow(D2);
+    writePinLow(D1);
+    writePinLow(D0);
+}
+
+static void init_pins(void) {
+    unselect_cols();
+    for (uint8_t x = 0; x < MATRIX_ROWS; x++) {
+        setPinInputHigh(row_pins[x]);
+    }
+    setPinOutput(D0);
+    setPinOutput(D1);
+    setPinOutput(D2);
+    setPinOutput(D3);
+    setPinOutput(F7);
+    setPinOutput(F5);
+    setPinOutput(F6);
+    setPinOutput(F1);
+    setPinOutput(F4);
+    setPinOutput(F0);
+    setPinOutput(D3);
+    setPinOutput(D5);
+    setPinOutput(D4);
+}
+
+static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) {
+    bool matrix_changed = false;
+
+    // Select col and wait for col selecton to stabilize
+    select_col(current_col);
+    wait_us(30);
+
+    // For each row...
+    for (uint8_t row_index = 0; row_index < MATRIX_ROWS; row_index++) {
+        // Store last value of row prior to reading
+        matrix_row_t last_row_value = current_matrix[row_index];
+
+        // Check row pin state
+        if (readPin(row_pins[row_index]) == 0) {
+            // Pin LO, set col bit
+            current_matrix[row_index] |= (MATRIX_ROW_SHIFTER << current_col);
+        } else {
+            // Pin HI, clear col bit
+            current_matrix[row_index] &= ~(MATRIX_ROW_SHIFTER << current_col);
+        }
+
+        // Determine if the matrix changed state
+        if ((last_row_value != current_matrix[row_index]) && !(matrix_changed)) {
+            matrix_changed = true;
+        }
+    }
+
+    // Unselect col
+    unselect_col(current_col);
+
+    return matrix_changed;
+}
+
+#endif
+
+void matrix_init_custom(void) {
+    // initialize key pins
+    init_pins();
+}
+
+bool matrix_scan_custom(matrix_row_t current_matrix[]) {
+    bool changed = false;
+
+#if defined(DIRECT_PINS) || (DIODE_DIRECTION == COL2ROW)
+    // Set row, read cols
+    for (uint8_t current_row = 0; current_row < MATRIX_ROWS; current_row++) {
+        changed |= read_cols_on_row(current_matrix, current_row);
+    }
+#elif (DIODE_DIRECTION == ROW2COL)
+    // Set col, read rows
+    for (uint8_t current_col = 0; current_col < MATRIX_COLS; current_col++) {
+        changed |= read_rows_on_col(current_matrix, current_col);
+    }
+#endif
+
+    return changed;
+}
diff --git a/qmk/keyboards/evyd13/wasdat_code/readme.md b/qmk/keyboards/evyd13/wasdat_code/readme.md
new file mode 100644
index 00000000..0467069f
--- /dev/null
+++ b/qmk/keyboards/evyd13/wasdat_code/readme.md
@@ -0,0 +1,19 @@
+# Wasdat Code
+
+A drop-in replacement controller for the WASD CODE TKL and fullsize models.
+
+* Keyboard Maintainer: [Evyd13](https://github.com/evyd13)
+* Hardware Supported: WASD CODE TKL/Fullsize ANSI & ISO with Wasdat Code controller
+* Hardware Availability: [maartenwut.com](https://maartenwut.com/product/wasdat-code/)
+
+## Flashing
+
+The WASD has no reset button, so to put the controller in flashing mode, simply unplug the USB cable and plug it back in while holding the ESC key on the keyboard.
+
+---
+
+Make example for this keyboard (after setting up your build environment):
+
+    make evyd13/wasdat_code: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).
diff --git a/qmk/keyboards/evyd13/wasdat_code/rules.mk b/qmk/keyboards/evyd13/wasdat_code/rules.mk
new file mode 100644
index 00000000..1ff76bab
--- /dev/null
+++ b/qmk/keyboards/evyd13/wasdat_code/rules.mk
@@ -0,0 +1,36 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+#   Teensy       halfkay
+#   Pro Micro    caterina
+#   Atmel DFU    atmel-dfu
+#   LUFA DFU     lufa-dfu
+#   QMK DFU      qmk-dfu
+#   ATmega32A    bootloadHID
+#   ATmega328P   USBasp
+BOOTLOADER = qmk-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # 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 = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+MIDI_ENABLE = no            # MIDI support
+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
+
+CUSTOM_MATRIX = lite
+SRC += matrix.c
+
+LAYOUTS = fullsize_ansi fullsize_iso tkl_ansi tkl_iso
diff --git a/qmk/keyboards/evyd13/wasdat_code/wasdat_code.c b/qmk/keyboards/evyd13/wasdat_code/wasdat_code.c
new file mode 100644
index 00000000..33551c2d
--- /dev/null
+++ b/qmk/keyboards/evyd13/wasdat_code/wasdat_code.c
@@ -0,0 +1,47 @@
+/* Copyright 2019 Evy Dekkers
+ *
+ * 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 "wasdat_code.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();
+    led_init_ports();
+}
+
+void led_init_ports(void) {
+    setPinOutput(B1);
+    setPinOutput(B2);
+    setPinOutput(B3);
+    writePinHigh(B1);
+    writePinHigh(B2);
+    writePinHigh(B3);
+}
+
+bool led_update_kb(led_t led_state) {
+    if(led_update_user(led_state)) {
+        writePin(B1, !led_state.caps_lock);
+        writePin(B2, !led_state.scroll_lock);
+        writePin(B3, !led_state.num_lock);
+    }
+
+    return true;
+}
diff --git a/qmk/keyboards/evyd13/wasdat_code/wasdat_code.h b/qmk/keyboards/evyd13/wasdat_code/wasdat_code.h
new file mode 100644
index 00000000..b586f4aa
--- /dev/null
+++ b/qmk/keyboards/evyd13/wasdat_code/wasdat_code.h
@@ -0,0 +1,107 @@
+/* Copyright 2019 Evy Dekkers
+ *
+ * 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 XXX KC_NO
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+ 
+#define LAYOUT_all LAYOUT_fullsize_iso
+
+#define LAYOUT_fullsize_ansi( \
+    k05,      k64, k62, k22, k02, k31, k0c, k2f, k6f, k6b, k3b, k0b, k5b,      k33, k43, k41,                          \
+    k65, k35, k34, k32, k30, k60, k6a, k3a, k3c, k3f, k3d, k6d, k6c, k2b,      k67, k6e, k66,      k78, k77, k76, k56, \
+    k25, k45, k44, k42, k40, k20, k2a, k4a, k4c, k4f, k4d, k2d, k2c, k1b,      k68, k3e, k36,      k48, k47, k46, k4e, \
+    k24, k15, k14, k12, k10, k00, k0a, k1a, k1c, k1f, k1d, k0d,      k7b,                          k28, k27, k26,      \
+    k29,      k75, k74, k72, k70, k50, k5a, k7a, k7c, k7f, k5d,      k19,           k0e,           k18, k17, k16, k1e, \
+    k61, k21, k03,                k08,                k53, k11, k23, k71,      k5e, k58, k57,      k07,      k06       \
+) \
+{ \
+    { k00, XXX, k02, k03, XXX, k05, k06, k07, k08, XXX, k0a, k0b, k0c, k0d, k0e, XXX }, \
+    { k10, k11, k12, XXX, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, XXX, k2f }, \
+    { k30, k31, k32, k33, k34, k35, k36, XXX, XXX, XXX, k3a, k3b, k3c, k3d, k3e, k3f }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47, k48, XXX, k4a, XXX, k4c, k4d, k4e, k4f }, \
+    { k50, XXX, XXX, k53, XXX, XXX, k56, k57, k58, XXX, k5a, k5b, XXX, k5d, k5e, XXX }, \
+    { k60, k61, k62, XXX, k64, k65, k66, k67, k68, XXX, k6a, k6b, k6c, k6d, k6e, k6f }, \
+    { k70, k71, k72, XXX, k74, k75, k76, k77, k78, XXX, k7a, k7b, k7c, XXX, XXX, k7f }  \
+}
+
+#define LAYOUT_fullsize_iso( \
+    k05,      k64, k62, k22, k02, k31, k0c, k2f, k6f, k6b, k3b, k0b, k5b,      k33, k43, k41,                          \
+    k65, k35, k34, k32, k30, k60, k6a, k3a, k3c, k3f, k3d, k6d, k6c, k2b,      k67, k6e, k66,      k78, k77, k76, k56, \
+    k25, k45, k44, k42, k40, k20, k2a, k4a, k4c, k4f, k4d, k2d, k2c,           k68, k3e, k36,      k48, k47, k46, k4e, \
+    k24, k15, k14, k12, k10, k00, k0a, k1a, k1c, k1f, k1d, k0d, k1b, k7b,                          k28, k27, k26,      \
+    k29, k04, k75, k74, k72, k70, k50, k5a, k7a, k7c, k7f, k5d,      k19,           k0e,           k18, k17, k16, k1e, \
+    k61, k21, k03,                k08,                k53, k11, k23, k71,      k5e, k58, k57,      k07,      k06       \
+) \
+{ \
+    { k00, XXX, k02, k03, k04, k05, k06, k07, k08, XXX, k0a, k0b, k0c, k0d, k0e, XXX }, \
+    { k10, k11, k12, XXX, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, k1f }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d, XXX, k2f }, \
+    { k30, k31, k32, k33, k34, k35, k36, XXX, XXX, XXX, k3a, k3b, k3c, k3d, k3e, k3f }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47, k48, XXX, k4a, XXX, k4c, k4d, k4e, k4f }, \
+    { k50, XXX, XXX, k53, XXX, XXX, k56, k57, k58, XXX, k5a, k5b, XXX, k5d, k5e, XXX }, \
+    { k60, k61, k62, XXX, k64, k65, k66, k67, k68, XXX, k6a, k6b, k6c, k6d, k6e, k6f }, \
+    { k70, k71, k72, XXX, k74, k75, k76, k77, k78, XXX, k7a, k7b, k7c, XXX, XXX, k7f }  \
+}
+
+#define LAYOUT_tkl_ansi( \
+    k05,      k64, k62, k22, k02, k31, k0c, k2f, k6f, k6b, k3b, k0b, k5b,      k33, k43, k41, \
+    k65, k35, k34, k32, k30, k60, k6a, k3a, k3c, k3f, k3d, k6d, k6c, k2b,      k67, k6e, k66, \
+    k25, k45, k44, k42, k40, k20, k2a, k4a, k4c, k4f, k4d, k2d, k2c, k1b,      k68, k3e, k36, \
+    k24, k15, k14, k12, k10, k00, k0a, k1a, k1c, k1f, k1d, k0d,      k7b,                     \
+    k29,      k75, k74, k72, k70, k50, k5a, k7a, k7c, k7f, k5d,      k19,           k0e,      \
+    k61, k21, k03,                k08,                k53, k11, k23, k71,      k5e, k58, k57  \
+) \
+{ \
+    { k00, XXX, k02, k03, XXX, k05, XXX, XXX, k08, XXX, k0a, k0b, k0c, k0d, k0e, XXX }, \
+    { k10, k11, k12, XXX, k14, k15, XXX, XXX, XXX, k19, k1a, k1b, k1c, k1d, XXX, k1f }, \
+    { k20, k21, k22, k23, k24, k25, XXX, XXX, XXX, k29, k2a, k2b, k2c, k2d, XXX, k2f }, \
+    { k30, k31, k32, k33, k34, k35, k36, XXX, XXX, XXX, k3a, k3b, k3c, k3d, k3e, k3f }, \
+    { k40, k41, k42, k43, k44, k45, XXX, XXX, XXX, XXX, k4a, XXX, k4c, k4d, XXX, k4f }, \
+    { k50, XXX, XXX, k53, XXX, XXX, XXX, k57, k58, XXX, k5a, k5b, XXX, k5d, k5e, XXX }, \
+    { k60, k61, k62, XXX, k64, k65, k66, k67, k68, XXX, k6a, k6b, k6c, k6d, k6e, k6f }, \
+    { k70, k71, k72, XXX, k74, k75, XXX, XXX, XXX, XXX, k7a, k7b, k7c, XXX, XXX, k7f }  \
+}
+
+#define LAYOUT_tkl_iso( \
+    k05,      k64, k62, k22, k02, k31, k0c, k2f, k6f, k6b, k3b, k0b, k5b,      k33, k43, k41, \
+    k65, k35, k34, k32, k30, k60, k6a, k3a, k3c, k3f, k3d, k6d, k6c, k2b,      k67, k6e, k66, \
+    k25, k45, k44, k42, k40, k20, k2a, k4a, k4c, k4f, k4d, k2d, k2c,           k68, k3e, k36, \
+    k24, k15, k14, k12, k10, k00, k0a, k1a, k1c, k1f, k1d, k0d, k1b, k7b,                     \
+    k29, k04, k75, k74, k72, k70, k50, k5a, k7a, k7c, k7f, k5d,      k19,           k0e,      \
+    k61, k21, k03,                k08,                k53, k11, k23, k71,      k5e, k58, k57  \
+) \
+{ \
+    { k00, XXX, k02, k03, k04, k05, XXX, XXX, k08, XXX, k0a, k0b, k0c, k0d, k0e, XXX }, \
+    { k10, k11, k12, XXX, k14, k15, XXX, XXX, XXX, k19, k1a, k1b, k1c, k1d, XXX, k1f }, \
+    { k20, k21, k22, k23, k24, k25, XXX, XXX, XXX, k29, k2a, k2b, k2c, k2d, XXX, k2f }, \
+    { k30, k31, k32, k33, k34, k35, k36, XXX, XXX, XXX, k3a, k3b, k3c, k3d, k3e, k3f }, \
+    { k40, k41, k42, k43, k44, k45, XXX, XXX, XXX, XXX, k4a, XXX, k4c, k4d, XXX, k4f }, \
+    { k50, XXX, XXX, k53, XXX, XXX, XXX, k57, k58, XXX, k5a, k5b, XXX, k5d, k5e, XXX }, \
+    { k60, k61, k62, XXX, k64, k65, k66, k67, k68, XXX, k6a, k6b, k6c, k6d, k6e, k6f }, \
+    { k70, k71, k72, XXX, k74, k75, XXX, XXX, XXX, XXX, k7a, k7b, k7c, XXX, XXX, k7f }  \
+}
diff --git a/qmk/keyboards/evyd13/wonderland/config.h b/qmk/keyboards/evyd13/wonderland/config.h
new file mode 100644
index 00000000..a75394b0
--- /dev/null
+++ b/qmk/keyboards/evyd13/wonderland/config.h
@@ -0,0 +1,55 @@
+/*
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x4705
+#define PRODUCT_ID      0xA71C
+#define DEVICE_VER      0x0003
+#define MANUFACTURER    Evyd13
+#define PRODUCT         Wonderland
+#define DESCRIPTION     "QMK Firmware for the Wonderland"
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+// ROWS: Top to bottom, COLS: Left to right
+
+#define MATRIX_ROW_PINS {B0,D1,D2,D3,D5}
+#define MATRIX_COL_PINS {F0,F1,F4,F5,F6,F7,E6,C7,C6,B6,B5,B4,D7,D6,D4}
+#define UNUSED_PINS
+
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/* Backlight configuration
+ */
+#define RGB_DI_PIN B7
+#define RGBLIGHT_ANIMATIONS
+#define RGBLED_NUM 12
+
+#define QMK_ESC_OUTPUT F0 // usually COL
+#define QMK_ESC_INPUT B0 // usually ROW
+#define QMK_LED B1
diff --git a/qmk/keyboards/evyd13/wonderland/info.json b/qmk/keyboards/evyd13/wonderland/info.json
new file mode 100644
index 00000000..a98ee650
--- /dev/null
+++ b/qmk/keyboards/evyd13/wonderland/info.json
@@ -0,0 +1,149 @@
+{
+    "keyboard_name": "Wonderland",
+    "url": "",
+    "maintainer": "evyd13",
+    "width": 18.25,
+    "height": 5,
+    "layouts": {
+        "LAYOUT_alice_split_bs": {
+            "key_count": 66,
+            "layout": [
+                {"label":"k10", "x":0, "y":0},
+                {"label":"k00", "x":1.25, "y":0},
+                {"label":"k01", "x":2.25, "y":0},
+                {"label":"k02", "x":3.25, "y":0},
+                {"label":"k03", "x":4.25, "y":0},
+                {"label":"k04", "x":5.25, "y":0},
+                {"label":"k05", "x":6.25, "y":0},
+                {"label":"k06", "x":7.25, "y":0},
+                {"label":"k07", "x":10.25, "y":0},
+                {"label":"k08", "x":11.25, "y":0},
+                {"label":"k09", "x":12.25, "y":0},
+                {"label":"k0a", "x":13.25, "y":0},
+                {"label":"k0b", "x":14.25, "y":0},
+                {"label":"k0c", "x":15.25, "y":0},
+                {"label":"k0d", "x":16.25, "y":0},
+                {"label":"k0e", "x":17.25, "y":0},
+                {"label":"k20", "x":0, "y":1},
+                {"label":"k11", "x":1.25, "y":1, "w":1.5},
+                {"label":"k12", "x":2.75, "y":1},
+                {"label":"k13", "x":3.75, "y":1},
+                {"label":"k14", "x":4.75, "y":1},
+                {"label":"k15", "x":5.75, "y":1},
+                {"label":"k16", "x":6.75, "y":1},
+                {"label":"k17", "x":9.75, "y":1},
+                {"label":"k18", "x":10.75, "y":1},
+                {"label":"k19", "x":11.75, "y":1},
+                {"label":"k1a", "x":12.75, "y":1},
+                {"label":"k1b", "x":13.75, "y":1},
+                {"label":"k1c", "x":14.75, "y":1},
+                {"label":"k1d", "x":15.75, "y":1},
+                {"label":"k1e", "x":16.75, "y":1, "w":1.5},
+                {"label":"k30", "x":0, "y":2},
+                {"label":"k21", "x":1.25, "y":2, "w":1.75},
+                {"label":"k22", "x":3, "y":2},
+                {"label":"k23", "x":4, "y":2},
+                {"label":"k24", "x":5, "y":2},
+                {"label":"k25", "x":6, "y":2},
+                {"label":"k26", "x":7, "y":2},
+                {"label":"k27", "x":10, "y":2},
+                {"label":"k28", "x":11, "y":2},
+                {"label":"k29", "x":12, "y":2},
+                {"label":"k2a", "x":13, "y":2},
+                {"label":"k2b", "x":14, "y":2},
+                {"label":"k2c", "x":15, "y":2},
+                {"label":"k2e", "x":16, "y":2, "w":2.25},
+                {"label":"k31", "x":1.25, "y":3, "w":2.25},
+                {"label":"k32", "x":3.5, "y":3},
+                {"label":"k33", "x":4.5, "y":3},
+                {"label":"k34", "x":5.5, "y":3},
+                {"label":"k35", "x":6.5, "y":3},
+                {"label":"k36", "x":7.5, "y":3},
+                {"label":"k37", "x":9.5, "y":3},
+                {"label":"k38", "x":10.5, "y":3},
+                {"label":"k39", "x":11.5, "y":3},
+                {"label":"k3a", "x":12.5, "y":3},
+                {"label":"k3b", "x":13.5, "y":3},
+                {"label":"k3c", "x":14.5, "y":3},
+                {"label":"k3d", "x":15.5, "y":3, "w":1.75},
+                {"label":"k3e", "x":17.25, "y":3},
+                {"label":"k41", "x":1.25, "y":4, "w":1.5},
+                {"label":"k43", "x":4.25, "y":4, "w":1.5},
+                {"label":"k45", "x":5.75, "y":4, "w":2},
+                {"label":"k46", "x":7.75, "y":4, "w":1.25},
+                {"label":"k48", "x":9.5, "y":4, "w":2.75},
+                {"label":"k4a", "x":12.25, "y":4, "w":1.5},
+                {"label":"k4e", "x":16.75, "y":4, "w":1.5}
+            ]
+        },
+        "LAYOUT_alice": {
+            "layout": [
+                {"label":"k10", "x":0, "y":0},
+                {"label":"k00", "x":1.25, "y":0},
+                {"label":"k01", "x":2.25, "y":0},
+                {"label":"k02", "x":3.25, "y":0},
+                {"label":"k03", "x":4.25, "y":0},
+                {"label":"k04", "x":5.25, "y":0},
+                {"label":"k05", "x":6.25, "y":0},
+                {"label":"k06", "x":7.25, "y":0},
+                {"label":"k07", "x":10.25, "y":0},
+                {"label":"k08", "x":11.25, "y":0},
+                {"label":"k09", "x":12.25, "y":0},
+                {"label":"k0a", "x":13.25, "y":0},
+                {"label":"k0b", "x":14.25, "y":0},
+                {"label":"k0c", "x":15.25, "y":0},
+                {"label":"k0e", "x":16.25, "y":0, "w":2},
+                {"label":"k20", "x":0, "y":1},
+                {"label":"k11", "x":1.25, "y":1, "w":1.5},
+                {"label":"k12", "x":2.75, "y":1},
+                {"label":"k13", "x":3.75, "y":1},
+                {"label":"k14", "x":4.75, "y":1},
+                {"label":"k15", "x":5.75, "y":1},
+                {"label":"k16", "x":6.75, "y":1},
+                {"label":"k17", "x":9.75, "y":1},
+                {"label":"k18", "x":10.75, "y":1},
+                {"label":"k19", "x":11.75, "y":1},
+                {"label":"k1a", "x":12.75, "y":1},
+                {"label":"k1b", "x":13.75, "y":1},
+                {"label":"k1c", "x":14.75, "y":1},
+                {"label":"k1d", "x":15.75, "y":1},
+                {"label":"k1e", "x":16.75, "y":1, "w":1.5},
+                {"label":"k30", "x":0, "y":2},
+                {"label":"k21", "x":1.25, "y":2, "w":1.75},
+                {"label":"k22", "x":3, "y":2},
+                {"label":"k23", "x":4, "y":2},
+                {"label":"k24", "x":5, "y":2},
+                {"label":"k25", "x":6, "y":2},
+                {"label":"k26", "x":7, "y":2},
+                {"label":"k27", "x":10, "y":2},
+                {"label":"k28", "x":11, "y":2},
+                {"label":"k29", "x":12, "y":2},
+                {"label":"k2a", "x":13, "y":2},
+                {"label":"k2b", "x":14, "y":2},
+                {"label":"k2c", "x":15, "y":2},
+                {"label":"k2e", "x":16, "y":2, "w":2.25},
+                {"label":"k31", "x":1.25, "y":3, "w":2.25},
+                {"label":"k32", "x":3.5, "y":3},
+                {"label":"k33", "x":4.5, "y":3},
+                {"label":"k34", "x":5.5, "y":3},
+                {"label":"k35", "x":6.5, "y":3},
+                {"label":"k36", "x":7.5, "y":3},
+                {"label":"k37", "x":9.5, "y":3},
+                {"label":"k38", "x":10.5, "y":3},
+                {"label":"k39", "x":11.5, "y":3},
+                {"label":"k3a", "x":12.5, "y":3},
+                {"label":"k3b", "x":13.5, "y":3},
+                {"label":"k3c", "x":14.5, "y":3},
+                {"label":"k3d", "x":15.5, "y":3, "w":1.75},
+                {"label":"k3e", "x":17.25, "y":3},
+                {"label":"k41", "x":1.25, "y":4, "w":1.5},
+                {"label":"k43", "x":4.25, "y":4, "w":1.5},
+                {"label":"k45", "x":5.75, "y":4, "w":2},
+                {"label":"k46", "x":7.75, "y":4, "w":1.25},
+                {"label":"k48", "x":9.5, "y":4, "w":2.75},
+                {"label":"k4a", "x":12.25, "y":4, "w":1.5},
+                {"label":"k4e", "x":16.75, "y":4, "w":1.5}
+            ]
+        }
+    }
+}
diff --git a/qmk/keyboards/evyd13/wonderland/keymaps/brandonschlack/config.h b/qmk/keyboards/evyd13/wonderland/keymaps/brandonschlack/config.h
new file mode 100644
index 00000000..38383cff
--- /dev/null
+++ b/qmk/keyboards/evyd13/wonderland/keymaps/brandonschlack/config.h
@@ -0,0 +1,19 @@
+/* Copyright 2019 Brandon Schlack
+ *
+ * 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
+
+#define USE_LEDS_FOR_LAYERS
+#define STOPLIGHT_LED
diff --git a/qmk/keyboards/evyd13/wonderland/keymaps/brandonschlack/keymap.c b/qmk/keyboards/evyd13/wonderland/keymaps/brandonschlack/keymap.c
new file mode 100644
index 00000000..ca7bd773
--- /dev/null
+++ b/qmk/keyboards/evyd13/wonderland/keymaps/brandonschlack/keymap.c
@@ -0,0 +1,170 @@
+/* Copyright 2019 Brandon Schlack
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+#include "brandonschlack.h"
+
+// LEDs
+#define TOP_LED    B1
+#define MIDDLE_LED B2
+#define BOTTOM_LED B3
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[_BASE] = LAYOUT( \
+    KC_HOME, KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,  \
+    KC_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_BSPC, \
+    KC_PGDN, HY_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_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, PLY_FN1, \
+             KC_LOPT,          KC_LCMD,     SPC_RAI,       KC_LCTL,          SPC_RAI,           KC_RCMD,                   KC_ROPT \
+),
+[_FN1] = LAYOUT( \
+    KC_MUTE, QM_MAKE, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  MC_LHPD, MC_SLPD, \
+    KC_VOLU, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, KC_HOME, KC_UP,   KC_END,  KC_DELT, \
+    KC_VOLD, RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, KC_MPRV, KC_MNXT, KC_PGDN, KC_UP,            KC_MPLY, \
+             _______, RGB_LYR, RGB_THM, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, RGT_SFT, _______, \
+             _______,          _______,     _______,      _______,          _______,          _______,                   _______ \
+
+),
+[_FN2] = LAYOUT( \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, \
+             _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+             _______,          _______,     _______,      _______,          _______,          _______,                   _______ \
+
+),
+[_ADJUST] = LAYOUT( \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, \
+             _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+             _______,          _______,     _______,      _______,          _______,          _______,                   _______ \
+
+)
+/*
+[_BLANK] = LAYOUT( \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, \
+             _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+             _______,          _______,     _______,      _______,          _______,          _______,                   _______ \
+
+)
+*/
+};
+
+#ifdef STOPLIGHT_LED
+bool is_led_stoplight_active = false;
+uint8_t led_stoplight_index = 0;
+uint16_t led_stoplight_timer = 0;
+void matrix_scan_led_stoplight(void);
+
+void led_stoplight_start(void) {
+    writePinHigh(TOP_LED);
+    writePinHigh(MIDDLE_LED);
+    writePinHigh(BOTTOM_LED);
+
+    is_led_stoplight_active = true;
+    led_stoplight_timer = timer_read();
+};
+
+void led_stoplight_set(pin_t pin) {
+    writePinLow(pin);
+};
+
+void led_stoplight_end(void) {
+    // Reset timer and status variables
+    led_stoplight_index = 0;
+    is_led_stoplight_active = false;
+    led_stoplight_timer = 0;
+    led_update_kb(host_keyboard_led_state());
+};
+
+void matrix_scan_led_stoplight(void) {
+    if (is_led_stoplight_active) {
+        if (timer_elapsed(led_stoplight_timer) > (1000 * (led_stoplight_index + 1))) {
+            switch (led_stoplight_index){
+                case 0:
+                    led_stoplight_set(TOP_LED);
+                    led_stoplight_index++;
+                    break;
+                case 1:
+                    led_stoplight_set(MIDDLE_LED);
+                    led_stoplight_index++;
+                    break;
+                case 2:
+                    led_stoplight_set(BOTTOM_LED);
+                    led_stoplight_index++;
+                    break;
+                default:
+                    led_stoplight_index = 0;
+                    is_led_stoplight_active = false;
+                    led_stoplight_timer = 0;
+                    led_update_kb(host_keyboard_led_state());
+                    break;
+            }
+        }
+    }
+};
+#endif
+
+void keyboard_post_init_keymap(void) {
+#ifdef STOPLIGHT_LED
+    led_stoplight_start();
+#endif
+};
+
+void matrix_scan_keymap(void) {
+#ifdef STOPLIGHT_LED
+    matrix_scan_led_stoplight();
+#endif
+};
+
+#ifdef USE_LEDS_FOR_LAYERS
+// example of how to use LEDs as layer indicators
+static uint8_t top = 0;
+static uint8_t middle = 0;
+
+layer_state_t layer_state_set_keymap(layer_state_t state) {
+    top = middle = 0;
+    state = update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
+
+    switch (get_highest_layer(state)) {
+    case _FN1:
+        top = 1;
+        break;
+    case _FN2:
+        middle = 1;
+        break;
+    case _ADJUST:
+        top = 1;
+        middle = 1;
+        break;
+    default: //  for any other layers, or the default layer
+        break;
+    }
+  return state;
+}
+
+// override kb level function
+bool led_update_user(led_t usb_led) {
+    if (!is_led_stoplight_active) {
+        writePin(TOP_LED, !top);
+        writePin(MIDDLE_LED, !middle);
+        writePin(BOTTOM_LED, !usb_led.caps_lock); // still use bottom for Caps Lock
+    };
+    return false; // we are using LEDs for something else override kb
+}
+#endif
diff --git a/qmk/keyboards/evyd13/wonderland/keymaps/brandonschlack/rules.mk b/qmk/keyboards/evyd13/wonderland/keymaps/brandonschlack/rules.mk
new file mode 100644
index 00000000..80361c34
--- /dev/null
+++ b/qmk/keyboards/evyd13/wonderland/keymaps/brandonschlack/rules.mk
@@ -0,0 +1,8 @@
+# Build Options
+#   comment out to disable the options.
+#
+MOUSEKEY_ENABLE = yes	# Mouse keys
+CONSOLE_ENABLE = no 	# Console for debug
+COMMAND_ENABLE = no     # Commands for debug and configuration
+VELOCIKEY_ENABLE = no
+
diff --git a/qmk/keyboards/evyd13/wonderland/keymaps/default/keymap.c b/qmk/keyboards/evyd13/wonderland/keymaps/default/keymap.c
new file mode 100644
index 00000000..da03d761
--- /dev/null
+++ b/qmk/keyboards/evyd13/wonderland/keymaps/default/keymap.c
@@ -0,0 +1,54 @@
+#include QMK_KEYBOARD_H
+
+enum layers {
+  _BASE,
+  _FUNC
+};
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[_BASE] = LAYOUT(
+  KC_ESC, 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_DEL,  KC_BSPC, \
+ 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_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_B, KC_N, KC_M, KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1), \
+          KC_LCTL,    KC_LAPO, KC_BSPC, KC_LGUI,     KC_SPC,       KC_RAPC,                   KC_RCTRL \
+   ),
+[_FUNC] = LAYOUT(
+ RGB_TOG, VLK_TOG,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, XXXXXXX, RESET, \
+ RGB_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
+RGB_RMOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   KC_UP, XXXXXXX, \
+          KC_LSFT, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN,KC_RIGHT, XXXXXXX, \
+          _______,          KC_LALT, _______, _______,          _______,                   KC_RALT,                            _______ \
+   )
+};
+
+#ifdef USE_LEDS_FOR_LAYERS
+// example of how to use LEDs as layer indicators
+static uint8_t top = 1;
+static uint8_t middle = 0;
+static uint8_t bottom = 0;
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+    top = middle = bottom = 0;
+    switch (get_highest_layer(state)) {
+    case _BASE:
+        top = 1;
+        break;
+    case _FUNC:
+        middle = 1;
+        break;
+    default: //  for any other layers, or the default layer
+        break;
+    }
+  return state;
+}
+
+// override kb level function
+bool led_update_user(led_t usb_led) {
+    writePin(B1, !top);
+    writePin(B2, !middle);
+    writePin(B3, !bottom);
+    return false; // we are using LEDs for something else override kb
+}
+#endif
diff --git a/qmk/keyboards/evyd13/wonderland/keymaps/keebs/keymap.c b/qmk/keyboards/evyd13/wonderland/keymaps/keebs/keymap.c
new file mode 100644
index 00000000..ceb98560
--- /dev/null
+++ b/qmk/keyboards/evyd13/wonderland/keymaps/keebs/keymap.c
@@ -0,0 +1,23 @@
+#include QMK_KEYBOARD_H
+
+enum layers {
+  _BASE,
+  _FUNC
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[_BASE] = LAYOUT(
+  KC_ESC, 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_DEL,  KC_BSPC, \
+  KC_F10, 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_F11, 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_B, KC_N, KC_M, KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1), \
+          KC_LCTL,    KC_LAPO, KC_LGUI,  RGUI(KC_SPC),     KC_SPC, KC_RAPC,                   KC_RCTRL \
+   ),
+[_FUNC] = LAYOUT(
+ RGB_TOG, VLK_TOG,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, XXXXXXX, RESET, \
+ RGB_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
+RGB_RMOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   KC_UP, XXXXXXX, \
+          KC_LSFT, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN,KC_RIGHT, XXXXXXX, \
+          _______,          KC_LALT, _______, _______,          _______,                   KC_RALT,                   _______ \
+   )
+};
diff --git a/qmk/keyboards/evyd13/wonderland/keymaps/rafael-azevedo/keymap.c b/qmk/keyboards/evyd13/wonderland/keymaps/rafael-azevedo/keymap.c
new file mode 100644
index 00000000..5c59d53a
--- /dev/null
+++ b/qmk/keyboards/evyd13/wonderland/keymaps/rafael-azevedo/keymap.c
@@ -0,0 +1,42 @@
+#include QMK_KEYBOARD_H
+
+#define CAPSTL CTL_T(KC_CAPS)
+
+enum layers {
+  _BASE,
+  _GAME,
+  _FUNC,
+  _RGB
+};
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[_BASE] = LAYOUT(
+  KC_ESC, 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_PGUP,  KC_PGDN,
+ KC_HOME, 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_END,  CAPSTL,  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_B, KC_N, KC_M, KC_COMM, KC_DOT,  KC_SLSH, KC_DEL,  MO(2),
+          TG(1),      KC_LAPO, KC_BSPC, KC_LGUI,     KC_SPC,       KC_RAPC,                   MO(3)
+   ),
+[_GAME] = LAYOUT(
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, KC_BSPC,  _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,
+ _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,          _______,
+          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,
+          _______,          _______, KC_SPC,  _______,          _______,                   _______,                             _______
+   ),
+[_FUNC] = LAYOUT(
+ KC_PSCR, XXXXXXX,   KC_F1,   KC_F2,   KC_F3,    KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, XXXXXXX, XXXXXXX,
+ _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+ _______, _______, KC_VOLU, KC_VOLD, XXXXXXX,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   KC_UP, XXXXXXX,
+          KC_LSFT, KC_BRIU, KC_BRID, _______,  _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN,KC_RIGHT, XXXXXXX,
+          KC_MPLY,          KC_LALT, _______,  _______,          _______,                   KC_RALT,                            XXXXXXX
+   ),
+[_RGB] = LAYOUT(
+ RGB_TOG, VLK_TOG,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, XXXXXXX, RESET,
+ RGB_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+RGB_RMOD, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   KC_UP, XXXXXXX,
+          KC_LSFT, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN,KC_RIGHT, XXXXXXX,
+          _______,          KC_LALT, _______, _______,          _______,                   KC_RALT,                            XXXXXXX
+   )
+};
diff --git a/qmk/keyboards/evyd13/wonderland/keymaps/rafael-azevedo/readme.md b/qmk/keyboards/evyd13/wonderland/keymaps/rafael-azevedo/readme.md
new file mode 100644
index 00000000..a5381fff
--- /dev/null
+++ b/qmk/keyboards/evyd13/wonderland/keymaps/rafael-azevedo/readme.md
@@ -0,0 +1,9 @@
+## Rafael-Azevedo a layout for everyday use and gaming 
+
+### This layout was designed for everyday work with all necessary keys reachable from the home row, while having a toggle layer moving the space and backspace to a more traditional location. 
+
+* The main layer gives you access to home, end, pgup and pgdn. While keeping control, delete, backspace, and enter reachable when your fingers are in the home row. 
+* The main layer also includes capslock key while tapped and it becomes control when pressed. 
+* **Toggle(1)[Game]:** Toggles into a gaming layout that gives you space on your left hand thumb and moves the backspace to the traditional location. That way you can game one handed while using a mouse.  
+* **MO(2)[_FUNC]:** Is a momentary layer for all special functions including F keys , volume control, and print screen. It also keys character C and V, allowing you to copy and paste while using arrow keys. This is an easy to reach location for all special funtionality that is not normally used. 
+* **M(3)[_RGB]:** Is a momentary layer that gives you all the RGB control and keyboard Reset. This moves the funtionality not normally used to a place you won't accidently hit and get annoyed at.
diff --git a/qmk/keyboards/evyd13/wonderland/keymaps/rys/keymap.c b/qmk/keyboards/evyd13/wonderland/keymaps/rys/keymap.c
new file mode 100644
index 00000000..7669df53
--- /dev/null
+++ b/qmk/keyboards/evyd13/wonderland/keymaps/rys/keymap.c
@@ -0,0 +1,23 @@
+#include QMK_KEYBOARD_H
+
+enum layers {
+  _BASE,
+  _FUNC
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[_BASE] = LAYOUT(
+  KC_ESC, 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, XXXXXXX, KC_BSPC,
+ 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_DEL,
+ 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_B,    KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH,  KC_RSFT, MO(1),
+          KC_LCTL,          KC_LGUI, KC_NUBS, KC_LALT,           KC_SPC,                   KC_NUHS,                            KC_RCTRL
+   ),
+[_FUNC] = LAYOUT(
+ RGB_TOG, VLK_TOG,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,   KC_F12, XXXXXXX, RESET,
+ RGB_MOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,   KC_UP, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  XXXXXXX, XXXXXXX,
+RGB_RMOD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT, XXXXXXX, XXXXXXX,   KC_UP,  XXXXXXX,
+          RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN, KC_RIGHT, XXXXXXX,
+          _______,          KC_LALT, _______, _______,          _______,                   KC_RALT,                            _______
+   )
+};
diff --git a/qmk/keyboards/evyd13/wonderland/keymaps/via/keymap.c b/qmk/keyboards/evyd13/wonderland/keymaps/via/keymap.c
new file mode 100644
index 00000000..85fde41a
--- /dev/null
+++ b/qmk/keyboards/evyd13/wonderland/keymaps/via/keymap.c
@@ -0,0 +1,33 @@
+#include QMK_KEYBOARD_H
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+	[0] = LAYOUT(
+        KC_ESC,  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_DEL,  KC_BSPC,
+        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_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_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
+                 KC_LCTL,          KC_LAPO,          KC_BSPC, KC_LGUI, KC_SPC,                    KC_RAPC,                            KC_RCTL
+    ),
+	[1] = LAYOUT(
+        RGB_TOG,  VLK_TOG, 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_NO,   RESET,
+        RGB_MOD,  KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
+        RGB_RMOD, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_UP,            KC_NO,
+                  _______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_NO,   KC_NO,   KC_NO,   KC_LEFT, KC_DOWN, KC_RGHT, _______,
+                  _______,          KC_LALT,          _______, _______, _______,                   KC_RALT,                            _______
+    ),
+	[2] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+                 _______,          _______,          _______, _______, _______,                   _______,                            _______
+    ),
+	[3] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+                 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+                 _______,          _______,          _______, _______, _______,                   _______,                            _______
+    )
+};
diff --git a/qmk/keyboards/evyd13/wonderland/keymaps/via/rules.mk b/qmk/keyboards/evyd13/wonderland/keymaps/via/rules.mk
new file mode 100644
index 00000000..36b7ba9c
--- /dev/null
+++ b/qmk/keyboards/evyd13/wonderland/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/qmk/keyboards/evyd13/wonderland/readme.md b/qmk/keyboards/evyd13/wonderland/readme.md
new file mode 100644
index 00000000..8520908d
--- /dev/null
+++ b/qmk/keyboards/evyd13/wonderland/readme.md
@@ -0,0 +1,14 @@
+Wonderland USB-c and USB-mini
+======
+
+Only the USB-mini part is compatible with the original Alice case. The USB-c version was created for the Lubrigante, a case designed by Zambumon and a GB run by homerowco.
+
+Keyboard Maintainer: [Evyd13](https://github.com/evyd13)<br>
+Hardware Supported: Wonderland-C and Wonderland-Mini<br>
+Hardware Availability: https://maartenwut.com/product/wonderland-mini-usb-only/<br>
+
+Make example for this keyboard (after setting up your build environment):
+
+    make evyd13/wonderland: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).
diff --git a/qmk/keyboards/evyd13/wonderland/rules.mk b/qmk/keyboards/evyd13/wonderland/rules.mk
new file mode 100644
index 00000000..1f671c37
--- /dev/null
+++ b/qmk/keyboards/evyd13/wonderland/rules.mk
@@ -0,0 +1,32 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+#   Teensy       halfkay
+#   Pro Micro    caterina
+#   Atmel DFU    atmel-dfu
+#   LUFA DFU     lufa-dfu
+#   QMK DFU      qmk-dfu
+#   ATmega32A    bootloadHID
+#   ATmega328P   USBasp
+BOOTLOADER = qmk-dfu
+
+# Build Options
+#   comment out to disable the options.
+#
+BOOTMAGIC_ENABLE = lite	# Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no	# Mouse keys
+EXTRAKEY_ENABLE = yes	# Audio control and System control
+CONSOLE_ENABLE = yes	# Console for debug
+COMMAND_ENABLE = yes    # Commands for debug and configuration
+NKRO_ENABLE = yes		# USB Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+RGBLIGHT_ENABLE = yes   # Enable keyboard underlight functionality
+BACKLIGHT_ENABLE = no  # Enable keyboard backlight functionality
+MIDI_ENABLE = no 		# MIDI controls
+AUDIO_ENABLE = no
+UNICODE_ENABLE = no 		# Unicode
+BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
+AUTO_SHIFT_ENABLE = no
+VELOCIKEY_ENABLE = yes
+
+LAYOUTS = alice alice_split_bs
diff --git a/qmk/keyboards/evyd13/wonderland/wonderland.c b/qmk/keyboards/evyd13/wonderland/wonderland.c
new file mode 100644
index 00000000..44154438
--- /dev/null
+++ b/qmk/keyboards/evyd13/wonderland/wonderland.c
@@ -0,0 +1,34 @@
+#include "wonderland.h"
+
+__attribute__ ((weak))
+void matrix_init_kb(void) {
+	// put your keyboard start-up code here
+	// runs once when the firmware starts up
+	matrix_init_user();
+	led_init_ports();
+};
+
+__attribute__ ((weak))
+void matrix_scan_kb(void) {
+	// put your looping keyboard code here
+	// runs every cycle (a lot)
+	matrix_scan_user();
+};
+
+__attribute__ ((weak))
+void led_init_ports(void) {
+    // * Set our LED pins as output
+    setPinOutput(B1);
+    setPinOutput(B2);
+    setPinOutput(B3);
+}
+
+bool led_update_kb(led_t led_state) {
+    bool runDefault = led_update_user(led_state);
+    if (runDefault) {
+      writePin(B1, !led_state.num_lock);
+      writePin(B2, !led_state.caps_lock);
+      writePin(B3, !led_state.scroll_lock);
+    }
+    return runDefault;
+}
diff --git a/qmk/keyboards/evyd13/wonderland/wonderland.h b/qmk/keyboards/evyd13/wonderland/wonderland.h
new file mode 100644
index 00000000..13ea1476
--- /dev/null
+++ b/qmk/keyboards/evyd13/wonderland/wonderland.h
@@ -0,0 +1,39 @@
+#pragma once
+#include "quantum.h"
+
+// readability
+#define XXX KC_NO
+#define LAYOUT_alice_split_bs( \
+    k10, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
+    k20, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \
+    k30, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c,      k2e, \
+         k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
+         k41,           k43, k45, k46,      k48, k4a,                     k4e  \
+) \
+{ \
+    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e}, \
+    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e}, \
+    {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, XXX, k2e}, \
+    {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e}, \
+    {XXX, k41, XXX, k43, XXX, k45, k46, XXX, k48, XXX, k4a, XXX, XXX, XXX, k4e}  \
+}
+
+#define LAYOUT_alice( \
+    k10, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0e, \
+    k20, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \
+    k30, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c,      k2e, \
+         k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
+         k41,           k43, k45, k46,      k48, k4a,                     k4e  \
+) \
+{ \
+    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, XXX, k0e}, \
+    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e}, \
+    {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, XXX, k2e}, \
+    {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e}, \
+    {XXX, k41, XXX, k43, XXX, k45, k46, XXX, k48, XXX, k4a, XXX, XXX, XXX, k4e}  \
+}
+
+#define LAYOUT LAYOUT_alice_split_bs
+
+void matrix_init_user(void);
+void matrix_scan_user(void);
diff --git a/qmk/keyboards/exclusive/e6_rgb/keymaps/allleds/rules.mk b/qmk/keyboards/exclusive/e6_rgb/keymaps/allleds/rules.mk
index f8610f7e..c2a46039 100644
--- a/qmk/keyboards/exclusive/e6_rgb/keymaps/allleds/rules.mk
+++ b/qmk/keyboards/exclusive/e6_rgb/keymaps/allleds/rules.mk
@@ -1 +1 @@
-RGB_MATRIX_ENABLE = IS31FL3733# Use RGB matrix
+RGB_MATRIX_ENABLE = yes # Use RGB matrix
diff --git a/qmk/keyboards/exclusive/e6_rgb/rules.mk b/qmk/keyboards/exclusive/e6_rgb/rules.mk
index 4d8e1c6e..8e3dce6b 100644
--- a/qmk/keyboards/exclusive/e6_rgb/rules.mk
+++ b/qmk/keyboards/exclusive/e6_rgb/rules.mk
@@ -31,4 +31,5 @@ AUDIO_ENABLE = no           # Audio output on port C6
 FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches
 RGBLIGHT_ENABLE = yes       # Use RGB underglow light
 RGB_MATRIX_ENABLE = no      # Use RGB matrix
+RGB_MATRIX_DRIVER = IS31FL3733
 LAYOUTS = 60_ansi 60_hhkb
diff --git a/qmk/keyboards/exclusive/e6v2/le/config.h b/qmk/keyboards/exclusive/e6v2/le/config.h
index 6477d536..71bd66b1 100644
--- a/qmk/keyboards/exclusive/e6v2/le/config.h
+++ b/qmk/keyboards/exclusive/e6v2/le/config.h
@@ -37,6 +37,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COL_PINS { B5, D0, D1, D2, D3, D4, D5, D6, D7, C6, C7, F4, F5, F6, F7 }
 #define UNUSED_PINS
 
+#define LED_CAPS_LOCK_PIN B7
+#define LED_PIN_ON_STATE 0
+
 #define RGB_DI_PIN E6
 #ifdef RGB_DI_PIN
 #define RGBLIGHT_ANIMATIONS
diff --git a/qmk/keyboards/exclusive/e6v2/le/le.c b/qmk/keyboards/exclusive/e6v2/le/le.c
index f27bdc11..dd973fee 100644
--- a/qmk/keyboards/exclusive/e6v2/le/le.c
+++ b/qmk/keyboards/exclusive/e6v2/le/le.c
@@ -1,33 +1 @@
 #include "le.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_user(uint8_t usb_led) {
-	if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
-		DDRB |= (1 << 7); 
-		PORTB &= ~(1 << 7);
-	} else {
-		DDRB &= ~(1 << 7); 
-		PORTB &= ~(1 << 7);
-	}
-}
-
diff --git a/qmk/keyboards/exclusive/e6v2/le_bmc/config.h b/qmk/keyboards/exclusive/e6v2/le_bmc/config.h
index 198e7326..36c1336f 100644
--- a/qmk/keyboards/exclusive/e6v2/le_bmc/config.h
+++ b/qmk/keyboards/exclusive/e6v2/le_bmc/config.h
@@ -18,8 +18,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x0000
+#define VENDOR_ID       0x4558
+#define PRODUCT_ID      0xE62D
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    Exclusive / E-Team
 #define PRODUCT         E6-V2 LE BMC
diff --git a/qmk/keyboards/exclusive/e6v2/le_bmc/keymaps/via/keymap.c b/qmk/keyboards/exclusive/e6v2/le_bmc/keymaps/via/keymap.c
new file mode 100644
index 00000000..33b8aae2
--- /dev/null
+++ b/qmk/keyboards/exclusive/e6v2/le_bmc/keymaps/via/keymap.c
@@ -0,0 +1,48 @@
+/* Copyright 2019 MechMerlin
+ *
+ * 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_60_ansi(
+        KC_GESC, 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_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_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_LCTL, KC_LGUI, KC_LALT,                KC_SPC,                          KC_RALT, KC_RGUI, KC_RCTL, MO(1)
+    ),
+
+[1] = LAYOUT_60_ansi(
+       KC_GRV,  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_DEL,  \
+	     BL_TOGG, BL_INC,   BL_DEC,  BL_STEP, RESET,   EEP_RST, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \
+       RGB_TOG, RGB_MOD,  RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          \
+       KC_TRNS, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS,                   \
+       KC_TRNS, KC_TRNS,  KC_TRNS,       KC_TRNS,                               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+[2] = LAYOUT_60_ansi(
+       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, KC_TRNS, KC_TRNS, KC_TRNS,                   \
+       KC_TRNS, KC_TRNS,  KC_TRNS,       KC_TRNS,                               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+[3] = LAYOUT_60_ansi(
+       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, KC_TRNS, KC_TRNS, KC_TRNS,                   \
+       KC_TRNS, KC_TRNS,  KC_TRNS,       KC_TRNS,                               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+};
+
diff --git a/qmk/keyboards/exclusive/e6v2/le_bmc/keymaps/via/rules.mk b/qmk/keyboards/exclusive/e6v2/le_bmc/keymaps/via/rules.mk
new file mode 100644
index 00000000..43061db1
--- /dev/null
+++ b/qmk/keyboards/exclusive/e6v2/le_bmc/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
\ No newline at end of file
diff --git a/qmk/keyboards/exclusive/e6v2/le_bmc/readme.md b/qmk/keyboards/exclusive/e6v2/le_bmc/readme.md
index 561560a3..d9999826 100644
--- a/qmk/keyboards/exclusive/e6v2/le_bmc/readme.md
+++ b/qmk/keyboards/exclusive/e6v2/le_bmc/readme.md
@@ -2,8 +2,10 @@
 
 These docs are for the BMC version of the E6-V2 PCB sold during Round 2 which has an atmega32a microcontroller. Please do not flash this `.hex` file on your atmega32u4 equipped E6-V2 or your E6V2 BMC from Round 1. 
 
+The Round 2 PCB will be labeled 2.32 on the back of the PCB on the bottom left and will feature the Exclusive logo (with crown) on the front side of the PCB
+
 * Keyboard Maintainer: [MechMerlin](https://github.com/mechmerlin)
-* Hardware Supported: ps2avrgb E6-V2 with atmega32a microcontroller
+* Hardware Supported: ps2avrgb E6-V2 with atmega32a microcontroller rev 2.32
 * Hardware Availability: [geekhack.org/index.php?topic=90787.0](https://geekhack.org/index.php?topic=90787.0)
 
 Make example for this keyboard (after setting up your build environment):
diff --git a/qmk/keyboards/exclusive/e6v2/oe_bmc/config.h b/qmk/keyboards/exclusive/e6v2/oe_bmc/config.h
index c26006b6..17b701f5 100644
--- a/qmk/keyboards/exclusive/e6v2/oe_bmc/config.h
+++ b/qmk/keyboards/exclusive/e6v2/oe_bmc/config.h
@@ -18,8 +18,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x0000
+#define VENDOR_ID       0x4558
+#define PRODUCT_ID      0xE62B
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    Exclusive / E-Team
 #define PRODUCT         E6-V2 OE BMC
diff --git a/qmk/keyboards/exclusive/e6v2/oe_bmc/keymaps/via/keymap.c b/qmk/keyboards/exclusive/e6v2/oe_bmc/keymaps/via/keymap.c
new file mode 100644
index 00000000..9f8752e9
--- /dev/null
+++ b/qmk/keyboards/exclusive/e6v2/oe_bmc/keymaps/via/keymap.c
@@ -0,0 +1,49 @@
+/* Copyright 2019 MechMerlin
+ *
+ * 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_60_ansi(
+        KC_GESC, 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_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_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_LCTL, KC_LGUI, KC_LALT,                KC_SPC,                          KC_RALT, KC_RGUI, KC_RCTL, MO(1)
+    ),
+
+[1] = LAYOUT_60_ansi(
+       KC_GRV,  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_DEL,  \
+	     BL_TOGG, BL_INC,   BL_DEC,  BL_STEP, RESET,   EEP_RST, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, \
+       RGB_TOG, RGB_MOD,  RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          \
+       KC_TRNS, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, KC_TRNS, KC_MUTE, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS,                   \
+       KC_TRNS, KC_TRNS,  KC_TRNS,       KC_TRNS,                               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+[2] = LAYOUT_60_ansi(
+       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, KC_TRNS, KC_TRNS, KC_TRNS,                   \
+       KC_TRNS, KC_TRNS,  KC_TRNS,       KC_TRNS,                               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+[3] = LAYOUT_60_ansi(
+       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, KC_TRNS, KC_TRNS, KC_TRNS,                   \
+       KC_TRNS, KC_TRNS,  KC_TRNS,       KC_TRNS,                               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+
+};
+
diff --git a/qmk/keyboards/exclusive/e6v2/oe_bmc/keymaps/via/rules.mk b/qmk/keyboards/exclusive/e6v2/oe_bmc/keymaps/via/rules.mk
new file mode 100644
index 00000000..43061db1
--- /dev/null
+++ b/qmk/keyboards/exclusive/e6v2/oe_bmc/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
\ No newline at end of file
diff --git a/qmk/keyboards/exclusive/e6v2/oe_bmc/readme.md b/qmk/keyboards/exclusive/e6v2/oe_bmc/readme.md
index cd6da0ff..c259728e 100644
--- a/qmk/keyboards/exclusive/e6v2/oe_bmc/readme.md
+++ b/qmk/keyboards/exclusive/e6v2/oe_bmc/readme.md
@@ -3,7 +3,7 @@
 These docs are for the BMC version of the E6-V2 PCB sold during Round 1 which has an atmega32a microcontroller. Please do not flash this `.hex` file on your atmega32u4 equipped E6-V2 or your E6V2 BMC from Round 2. 
 
 * Keyboard Maintainer: [MechMerlin](https://github.com/mechmerlin)
-* Hardware Supported: ps2avrgb E6-V2 with atmega32a microcontroller
+* Hardware Supported: ps2avrgb E6-V2 with atmega32a microcontroller rev 2.31
 * Hardware Availability: [geekhack.org/index.php?topic=90787.0](https://geekhack.org/index.php?topic=90787.0)
 
 Make example for this keyboard (after setting up your build environment):
diff --git a/qmk/keyboards/exclusive/e7v1/config.h b/qmk/keyboards/exclusive/e7v1/config.h
index c8f15012..11e47c36 100644
--- a/qmk/keyboards/exclusive/e7v1/config.h
+++ b/qmk/keyboards/exclusive/e7v1/config.h
@@ -22,6 +22,8 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
+#define LED_CAPS_LOCK_PIN F0
+
 /* number of backlight levels */
 #define BACKLIGHT_PIN B7
 #ifdef BACKLIGHT_PIN
diff --git a/qmk/keyboards/exclusive/e7v1/e7v1.c b/qmk/keyboards/exclusive/e7v1/e7v1.c
index 381585e6..880121f4 100644
--- a/qmk/keyboards/exclusive/e7v1/e7v1.c
+++ b/qmk/keyboards/exclusive/e7v1/e7v1.c
@@ -1,25 +1 @@
 #include "e7v1.h"
-
-void matrix_init_kb(void) {
-  setPinOutput(F0);
-  matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-  matrix_scan_user();
-}
-
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-  return process_record_user(keycode, record);
-}
-
-void led_set_kb(uint8_t usb_led) {
-  if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
-    writePinHigh(F0);
-  } else {
-    writePinLow(F0);
-  }
-
-  led_set_user(usb_led);
-}
-
diff --git a/qmk/keyboards/exclusive/e85/config.h b/qmk/keyboards/exclusive/e85/config.h
index 758cd8b7..844c9102 100644
--- a/qmk/keyboards/exclusive/e85/config.h
+++ b/qmk/keyboards/exclusive/e85/config.h
@@ -52,9 +52,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define SOFT_SERIAL_PIN D0  // or D1, D2, D3, E6
 
-// #define BACKLIGHT_PIN B6
-// #define BACKLIGHT_BREATHING
-// #define BACKLIGHT_LEVELS 6
+#define BACKLIGHT_PIN B6
+#define BACKLIGHT_BREATHING
+#define BACKLIGHT_LEVELS 6
 
 #define RGB_DI_PIN E2
 #ifdef RGB_DI_PIN
diff --git a/qmk/keyboards/exclusive/e85/hotswap/hotswap.c b/qmk/keyboards/exclusive/e85/hotswap/hotswap.c
index a5893e6b..db14971d 100644
--- a/qmk/keyboards/exclusive/e85/hotswap/hotswap.c
+++ b/qmk/keyboards/exclusive/e85/hotswap/hotswap.c
@@ -15,3 +15,18 @@
  */
 
 #include "hotswap.h"
+
+void keyboard_pre_init_kb(void) {
+    setPinOutput(C7);
+    setPinOutput(B5);
+
+    keyboard_pre_init_user();
+}
+
+bool led_update_kb(led_t led_state) {
+    if (led_update_user(led_state)) {
+        writePin(C7, led_state.caps_lock);
+        writePin(B5, led_state.scroll_lock);
+    }
+    return true;
+}
diff --git a/qmk/keyboards/exclusive/e85/hotswap/keymaps/via/rules.mk b/qmk/keyboards/exclusive/e85/hotswap/keymaps/via/rules.mk
index 29a6f751..45681e1b 100644
--- a/qmk/keyboards/exclusive/e85/hotswap/keymaps/via/rules.mk
+++ b/qmk/keyboards/exclusive/e85/hotswap/keymaps/via/rules.mk
@@ -1,3 +1,4 @@
 VIA_ENABLE = yes
 CONSOLE_ENABLE = no        # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
\ No newline at end of file
+COMMAND_ENABLE = no        # Commands for debug and configuration
+BACKLIGHT_ENABLE = yes
diff --git a/qmk/keyboards/exclusive/e85/soldered/keymaps/via/rules.mk b/qmk/keyboards/exclusive/e85/soldered/keymaps/via/rules.mk
index 29a6f751..45681e1b 100644
--- a/qmk/keyboards/exclusive/e85/soldered/keymaps/via/rules.mk
+++ b/qmk/keyboards/exclusive/e85/soldered/keymaps/via/rules.mk
@@ -1,3 +1,4 @@
 VIA_ENABLE = yes
 CONSOLE_ENABLE = no        # Console for debug
-COMMAND_ENABLE = no        # Commands for debug and configuration
\ No newline at end of file
+COMMAND_ENABLE = no        # Commands for debug and configuration
+BACKLIGHT_ENABLE = yes
diff --git a/qmk/keyboards/exclusive/e85/soldered/soldered.c b/qmk/keyboards/exclusive/e85/soldered/soldered.c
index 0a7de55c..e97a543b 100644
--- a/qmk/keyboards/exclusive/e85/soldered/soldered.c
+++ b/qmk/keyboards/exclusive/e85/soldered/soldered.c
@@ -17,14 +17,16 @@
 #include "soldered.h"
 
 void keyboard_pre_init_kb(void) {
-  setPinOutput(C7);
-  
-  keyboard_pre_init_user();
+    setPinOutput(C7);
+    setPinOutput(B5);
+
+    keyboard_pre_init_user();
 }
 
 bool led_update_kb(led_t led_state) {
     if (led_update_user(led_state)) {
         writePin(C7, led_state.caps_lock);
+        writePin(B5, led_state.scroll_lock);
     }
     return true;
 }
diff --git a/qmk/keyboards/exent/config.h b/qmk/keyboards/exent/config.h
index 86d628c3..6b37bdd1 100644
--- a/qmk/keyboards/exent/config.h
+++ b/qmk/keyboards/exent/config.h
@@ -19,12 +19,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
-#define VENDOR_ID 0x20A0
-#define PRODUCT_ID 0x422D
-#define DEVICE_VER 0x0001
+#define VENDOR_ID    0x5143 // "QC"
+#define PRODUCT_ID   0x4558 // "EX"
+#define DEVICE_VER   0x0001
 #define MANUFACTURER Quadcube
-#define PRODUCT Exent
-#define DESCRIPTION 65% Keyboard
+#define PRODUCT      Exent
 
 #define RGBLED_NUM 18
 
diff --git a/qmk/keyboards/exent/keymaps/via/keymap.c b/qmk/keyboards/exent/keymaps/via/keymap.c
new file mode 100644
index 00000000..7b163759
--- /dev/null
+++ b/qmk/keyboards/exent/keymaps/via/keymap.c
@@ -0,0 +1,33 @@
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* layer 0: qwerty */
+    [0] = LAYOUT_65_ansi(
+        KC_ESC,  KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME,
+        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_PGUP,
+        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_PGDN,
+        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_END,
+        KC_LCTL, KC_LGUI, KC_LALT,                KC_SPC,                                  MO(1), KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT), 
+
+    [1] = LAYOUT_65_ansi(
+        KC_GRV,  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_DEL,  KC_TRNS,
+        BL_TOGG, BL_STEP,  BL_INC,  BL_DEC,  RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        RGB_TOG, RGB_MOD,  RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, RGB_RMOD, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, 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), 
+
+    [2] = LAYOUT_65_ansi(
+        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, 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), 
+
+    
+    [3] = LAYOUT_65_ansi(
+        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, 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), 
+    };
diff --git a/qmk/keyboards/exent/keymaps/via/rules.mk b/qmk/keyboards/exent/keymaps/via/rules.mk
new file mode 100644
index 00000000..36b7ba9c
--- /dev/null
+++ b/qmk/keyboards/exent/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/qmk/keyboards/facew/config.h b/qmk/keyboards/facew/config.h
index ab9130b8..5966429c 100644
--- a/qmk/keyboards/facew/config.h
+++ b/qmk/keyboards/facew/config.h
@@ -31,7 +31,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COLS 11
 
 #define MATRIX_ROW_PINS { B0, B1, B2, B3, B4, B5, B6, B7 }
-#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6}
+#define MATRIX_COL_PINS { A0, A1, A2, A3, A4, A5, A6, A7, C7, C6, C5 }
 #define UNUSED_PINS
 
 #define DIODE_DIRECTION COL2ROW
diff --git a/qmk/keyboards/fallacy/fallacy.h b/qmk/keyboards/fallacy/fallacy.h
index 46480e66..b77c81fa 100644
--- a/qmk/keyboards/fallacy/fallacy.h
+++ b/qmk/keyboards/fallacy/fallacy.h
@@ -21,7 +21,7 @@
  * - Split Backspace
  * - Split Right Shift
  */
-#define LAYOUT_all( \
+#define LAYOUT_alice_split_bs( \
     K100,   K000, K001, K002, K003, K004, K005, K006,       K007, K008, K009, K010, K011, K012, K013, K014, \
     K200,   K101, K102, K103, K104, K105, K106,       K107, K108, K109, K110, K111, K112, K113, K114, \
     K300,   K201, K202, K203, K204, K205, K206,       K207, K208, K209, K210, K211, K212,       K214, \
@@ -39,7 +39,7 @@
  * - Full size Backspace
  * - Full size Right Shift
  */
-#define LAYOUT_default( \
+#define LAYOUT_alice( \
     K100,   K000, K001, K002, K003, K004, K005, K006,       K007, K008, K009, K010, K011, K012,       K014, \
     K200,   K101, K102, K103, K104, K105, K106,       K107, K108, K109, K110, K111, K112, K113, K114, \
     K300,   K201, K202, K203, K204, K205, K206,       K207, K208, K209, K210, K211, K212,       K214, \
@@ -52,3 +52,6 @@
     { K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313,  K314 }, \
     { KC_NO, K401,  KC_NO, K403,  KC_NO, K405,  K406,  KC_NO, K408,  KC_NO, K410,  KC_NO, KC_NO, KC_NO, K414 }  \
 }
+
+#define LAYOUT_default LAYOUT_alice
+#define LAYOUT_all LAYOUT_alice_split_bs
diff --git a/qmk/keyboards/fallacy/info.json b/qmk/keyboards/fallacy/info.json
index fe30e1bf..a8cf6b0a 100644
--- a/qmk/keyboards/fallacy/info.json
+++ b/qmk/keyboards/fallacy/info.json
@@ -4,7 +4,7 @@
     "width": 18.75, 
     "height": 5, 
     "layouts": {
-        "LAYOUT_all": {
+        "LAYOUT_alice_split_bs": {
             "layout": [
                 {"label":"Esc", "x":0.5, "y":0},
                 {"label":"~", "x":1.75, "y":0},
@@ -74,7 +74,7 @@
                 {"label":"RCtl", "x":17, "y":4, "w":1.5}
             ]
         },
-        "LAYOUT_default": {
+        "LAYOUT_alice": {
             "layout": [
                 {"label":"Esc", "x":0.5, "y":0},
                 {"label":"~", "x":1.75, "y":0},
diff --git a/qmk/keyboards/fallacy/keymaps/default/keymap.c b/qmk/keyboards/fallacy/keymaps/default/keymap.c
index d0e32c42..45afc454 100644
--- a/qmk/keyboards/fallacy/keymaps/default/keymap.c
+++ b/qmk/keyboards/fallacy/keymaps/default/keymap.c
@@ -17,14 +17,14 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-    [0] = LAYOUT_default(
+    [0] = LAYOUT_alice(
         KC_ESC,     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_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_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_RGUI, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
                     KC_LCTL,                   KC_LALT, KC_SPC,  KC_LGUI,                   KC_SPC,           KC_RALT,                            KC_RCTL),
 
-    [1] = LAYOUT_default(
+    [1] = LAYOUT_alice(
         KC_TRNS,    RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,            KC_F7,   KC_F8,   KC_F9,   KC_F11,  KC_F12,  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,
diff --git a/qmk/keyboards/fallacy/rules.mk b/qmk/keyboards/fallacy/rules.mk
index 1ab94f77..c3c94521 100644
--- a/qmk/keyboards/fallacy/rules.mk
+++ b/qmk/keyboards/fallacy/rules.mk
@@ -27,3 +27,5 @@ FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches
 SRC += indicators.c \
        drivers/issi/is31fl3731-simple.c
 QUANTUM_LIB_SRC += i2c_master.c
+
+LAYOUTS = alice alice_split_bs
diff --git a/qmk/keyboards/fc660c/config.h b/qmk/keyboards/fc660c/config.h
index bba402ca..a3f90237 100644
--- a/qmk/keyboards/fc660c/config.h
+++ b/qmk/keyboards/fc660c/config.h
@@ -37,6 +37,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* define if matrix has ghost */
 //#define MATRIX_HAS_GHOST
 
+#define LED_CAPS_LOCK_PIN B6
+#define LED_PIN_ON_STATE 0
+
 /* number of backlight levels */
 // #define BACKLIGHT_LEVELS  1
 
diff --git a/qmk/keyboards/fc660c/fc660c.c b/qmk/keyboards/fc660c/fc660c.c
index da6ba9e7..592697cb 100644
--- a/qmk/keyboards/fc660c/fc660c.c
+++ b/qmk/keyboards/fc660c/fc660c.c
@@ -21,36 +21,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #endif
 
 void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
 #ifdef ACTUATION_DEPTH_ADJUSTMENT
     adjust_actuation_point(ACTUATION_DEPTH_ADJUSTMENT);
 #endif
 
 	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) {
-    if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
-        PORTB &= ~(1<<6);
-    } else {
-        PORTB |=  (1<<6);
-    }
-
-	led_set_user(usb_led);
-}
diff --git a/qmk/keyboards/fc980c/config.h b/qmk/keyboards/fc980c/config.h
index f9d3e06d..7e79d8d1 100644
--- a/qmk/keyboards/fc980c/config.h
+++ b/qmk/keyboards/fc980c/config.h
@@ -49,7 +49,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE  0
-#define TAPPING_TERM      175
+
+#define LED_NUM_LOCK_PIN B4
+#define LED_CAPS_LOCK_PIN B5
+#define LED_SCROLL_LOCK_PIN B6
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
 // #define LOCKING_SUPPORT_ENABLE
diff --git a/qmk/keyboards/fc980c/fc980c.c b/qmk/keyboards/fc980c/fc980c.c
index c09eacfa..744a3614 100644
--- a/qmk/keyboards/fc980c/fc980c.c
+++ b/qmk/keyboards/fc980c/fc980c.c
@@ -22,46 +22,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #endif
 
 void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
 #ifdef ACTUATION_DEPTH_ADJUSTMENT
     adjust_actuation_point(ACTUATION_DEPTH_ADJUSTMENT);
 #endif
 
 	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) {
-    if (usb_led & (1<<USB_LED_NUM_LOCK)) {
-        PORTB |=  (1<<4);
-    } else {
-        PORTB &= ~(1<<4);
-    }
-    if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
-        PORTB |=  (1<<5);
-    } else {
-        PORTB &= ~(1<<5);
-    }
-    if (usb_led & (1<<USB_LED_SCROLL_LOCK)) {
-        PORTB |=  (1<<6);
-    } else {
-        PORTB &= ~(1<<6);
-    }
-
-	led_set_user(usb_led);
-}
diff --git a/qmk/keyboards/ferris/keymaps/madhatter/config.h b/qmk/keyboards/ferris/keymaps/madhatter/config.h
new file mode 100644
index 00000000..79496ae7
--- /dev/null
+++ b/qmk/keyboards/ferris/keymaps/madhatter/config.h
@@ -0,0 +1,22 @@
+/*
+Copyright 2020 Pierre Chevalier <pierrechevalier83@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+// Pick good defaults for enabling homerow modifiers
+#define TAPPING_TERM 200
+#define IGNORE_MOD_TAP_INTERRUPT
diff --git a/qmk/keyboards/ferris/keymaps/madhatter/keymap.c b/qmk/keyboards/ferris/keymaps/madhatter/keymap.c
new file mode 100644
index 00000000..5a3f416e
--- /dev/null
+++ b/qmk/keyboards/ferris/keymaps/madhatter/keymap.c
@@ -0,0 +1,57 @@
+// this is the style you want to emulate.
+// This is the canonical layout file for the Quantum project. If you want to add another keyboard,
+
+#include QMK_KEYBOARD_H
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+
+enum ferris_layers {
+  _QWERTY,
+  _LOWER,
+  _RAISE
+};
+
+enum ferris_tap_dances {
+  TD_Q_ESC
+};
+
+#define KC_CTSC RCTL_T(KC_SCLN)
+#define KC_CTLA LCTL_T(KC_A)
+#define KC_LSHZ LSFT_T(KC_Z)
+#define KC_RLSH RSFT_T(KC_SLSH)
+#define KC_SPM2 LT(2, KC_SPC)
+#define KC_BSM1 LT(1, KC_BSPC)
+#define KC_GUTA GUI_T(KC_TAB)
+#define KC_CLGV CTL_T(KC_GRV)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_QWERTY] = LAYOUT( /* QWERTY */
+    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,            KC_Y,    KC_U,  KC_I,    KC_O,   KC_P,
+    KC_CTLA, KC_S,    KC_D,    KC_F,    KC_G,            KC_H,    KC_J,  KC_K,    KC_L,   KC_SCLN,
+    KC_LSHZ, KC_X,    KC_C,    KC_V,    KC_B,            KC_N,    KC_M,  KC_COMM, KC_DOT, KC_RLSH,
+                                    KC_CLGV, KC_BSM1, KC_SPM2, KC_GUTA
+  ),
+
+  [_LOWER] = LAYOUT( /* [> LOWER <] */
+    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,            KC_6,    KC_7,    KC_8,    KC_9,    KC_0,
+    KC_GESC, KC_HOME, KC_PGDN, KC_PGUP, KC_END,          KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_QUOT,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2,         KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_ENT,
+                                    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS  
+  ),
+
+  [_RAISE] = LAYOUT( /* [> RAISE <] */
+    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,           KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,
+    KC_TAB,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_PIPE,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,         KC_UNDS, KC_PLUS, KC_TRNS, KC_TRNS, RESET,
+                                    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+  )
+};
+
+// Tap Dance Definitions
+qk_tap_dance_action_t tap_dance_actions[] = {
+    // Tap once for Q, twice for ESC
+    [TD_Q_ESC] = ACTION_TAP_DANCE_DOUBLE(KC_Q, KC_ESC)
+};
diff --git a/qmk/keyboards/ferris/keymaps/madhatter/rules.mk b/qmk/keyboards/ferris/keymaps/madhatter/rules.mk
new file mode 100644
index 00000000..2631761c
--- /dev/null
+++ b/qmk/keyboards/ferris/keymaps/madhatter/rules.mk
@@ -0,0 +1,2 @@
+BOOTMAGIC_ENABLE = lite
+TAP_DANCE_ENABLE = yes
\ No newline at end of file
diff --git a/qmk/keyboards/fjlabs/bks65/bks65.c b/qmk/keyboards/fjlabs/bks65/bks65.c
new file mode 100644
index 00000000..4a863746
--- /dev/null
+++ b/qmk/keyboards/fjlabs/bks65/bks65.c
@@ -0,0 +1,14 @@
+/*
+Copyright 2020 <me@homedrop.org>
+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 "bks65.h"
diff --git a/qmk/keyboards/fjlabs/bks65/bks65.h b/qmk/keyboards/fjlabs/bks65/bks65.h
new file mode 100644
index 00000000..1e53c540
--- /dev/null
+++ b/qmk/keyboards/fjlabs/bks65/bks65.h
@@ -0,0 +1,32 @@
+/*
+Copyright 2020 <me@homedrop.org>
+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"
+
+/* BKS65 Keymap Definitions */
+#define LAYOUT_65_ansi( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, \
+    K40, K41, K42,           K45,                K49, K4A, K4B, K4C, K4D, K4E \
+) { \
+    { K00, K01, K02, K03,   K04,     K05,   K06,   K07,   K08,   K09, K0A, K0B, K0C,   K0D,   K0E }, \
+    { K10, K11, K12, K13,   K14,     K15,   K16,   K17,   K18,   K19, K1A, K1B, K1C,   K1D,   K1E }, \
+    { K20, K21, K22, K23,   K24,     K25,   K26,   K27,   K28,   K29, K2A, K2B, K2C,   KC_NO, K2E }, \
+    { K30, K31, K32, K33,   K34,     K35,   K36,   K37,   K38,   K39, K3A, K3B, KC_NO, K3D,   K3E }, \
+    { K40, K41, K42, KC_NO, KC_NO,   K45,   KC_NO, KC_NO, KC_NO, K49, K4A, K4B, K4C,   K4D,   K4E }  \
+}
diff --git a/qmk/keyboards/fjlabs/bks65/config.h b/qmk/keyboards/fjlabs/bks65/config.h
new file mode 100644
index 00000000..05bcaa56
--- /dev/null
+++ b/qmk/keyboards/fjlabs/bks65/config.h
@@ -0,0 +1,111 @@
+/*
+Copyright 2020 <me@homedrop.org>
+
+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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID    0x7074 // FJLabs
+#define PRODUCT_ID   0x1001 // BKS65
+#define DEVICE_VER   0x0001 // Version 1
+#define MANUFACTURER    FJLabs
+#define PRODUCT         BKS65
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *         ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+*/
+
+// Checked with Eagle Schematic
+#define MATRIX_ROW_PINS { F4, F1, F7, F6, F5  }
+#define MATRIX_COL_PINS { F0, B1, B2, B3, B7, D0, D1, D2, D3, D5, D7, B4, B5, B6, C6 }
+#define UNUSED_PINS
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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 Underglow */
+#define RGB_DI_PIN B0
+#define RGBLED_NUM 24
+#define RGBLIGHT_ANIMATIONS
+/* #define RGBLIGHT_LAYER_BLINK*/
+
+/* Define Indicator LED's */
+#define LED_CAPS_LOCK_PIN C7
+
+/* Define less important options */
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ * These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
diff --git a/qmk/keyboards/fjlabs/bks65/info.json b/qmk/keyboards/fjlabs/bks65/info.json
new file mode 100644
index 00000000..2c117705
--- /dev/null
+++ b/qmk/keyboards/fjlabs/bks65/info.json
@@ -0,0 +1,85 @@
+{
+    "keyboard_name": "BKS65",
+    "url": "https://www.bolsakeyboardsupply.com",
+    "maintainer": "FJLabs",
+    "width": 16,
+    "height": 5,
+    "layouts": {
+        "LAYOUT_65_ansi": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6, "y": 0},
+                {"x": 7, "y": 0},
+                {"x": 8, "y": 0},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0, "w": 2},
+                {"x": 15, "y": 0},
+
+                {"x": 0, "y": 1, "w": 1.5},
+                {"x": 1.5, "y": 1},
+                {"x": 2.5, "y": 1},
+                {"x": 3.5, "y": 1},
+                {"x": 4.5, "y": 1},
+                {"x": 5.5, "y": 1},
+                {"x": 6.5, "y": 1},
+                {"x": 7.5, "y": 1},
+                {"x": 8.5, "y": 1},
+                {"x": 9.5, "y": 1},
+                {"x": 10.5, "y": 1},
+                {"x": 11.5, "y": 1},
+                {"x": 12.5, "y": 1},
+                {"x": 13.5, "y": 1, "w": 1.5},
+                {"x": 15, "y": 1},
+
+                {"x": 0, "y": 2, "w": 1.75},
+                {"x": 1.75, "y": 2},
+                {"x": 2.75, "y": 2},
+                {"x": 3.75, "y": 2},
+                {"x": 4.75, "y": 2},
+                {"x": 5.75, "y": 2},
+                {"x": 6.75, "y": 2},
+                {"x": 7.75, "y": 2},
+                {"x": 8.75, "y": 2},
+                {"x": 9.75, "y": 2},
+                {"x": 10.75, "y": 2},
+                {"x": 11.75, "y": 2},
+                {"x": 12.75, "y": 2, "w": 2.25},
+                {"x": 15, "y": 2},
+
+                {"x": 0, "y": 3, "w": 2.25},
+                {"x": 2.25, "y": 3},
+                {"x": 3.25, "y": 3},
+                {"x": 4.25, "y": 3},
+                {"x": 5.25, "y": 3},
+                {"x": 6.25, "y": 3},
+                {"x": 7.25, "y": 3},
+                {"x": 8.25, "y": 3},
+                {"x": 9.25, "y": 3},
+                {"x": 10.25, "y": 3},
+                {"x": 11.25, "y": 3},
+                {"x": 12.25, "y": 3, "w": 1.75},
+                {"x": 14, "y": 3},
+                {"x": 15, "y": 3},
+
+                {"x": 0, "y": 4, "w": 1.25},
+                {"x": 1.25, "y": 4, "w": 1.25},
+                {"x": 2.5, "y": 4, "w": 1.25},
+                {"x": 3.75, "y": 4, "w": 6.25},
+                {"x": 10, "y": 4},
+                {"x": 11, "y": 4},
+                {"x": 12, "y": 4},
+                {"x": 13, "y": 4},
+                {"x": 14, "y": 4},
+                {"x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/qmk/keyboards/fjlabs/bks65/keymaps/default/keymap.c b/qmk/keyboards/fjlabs/bks65/keymaps/default/keymap.c
new file mode 100644
index 00000000..8d2c13f3
--- /dev/null
+++ b/qmk/keyboards/fjlabs/bks65/keymaps/default/keymap.c
@@ -0,0 +1,39 @@
+/*
+Copyright 2020 <me@homedrop.org>
+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
+
+enum layers {
+    _LAYER0,
+    _LAYER1,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [_LAYER0] = LAYOUT_65_ansi(
+        KC_GESC, 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_HOME,
+        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_PGUP, 
+        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_PGDN, 
+        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_END, 
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [_LAYER1] = LAYOUT_65_ansi(
+        KC_GESC, 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_DEL, KC_HOME, 
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUSE, RESET, KC_PGUP,
+        KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_AUDIO_VOL_UP, KC_AUDIO_MUTE, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK
+    )
+};
diff --git a/qmk/keyboards/fjlabs/bks65/keymaps/via/keymap.c b/qmk/keyboards/fjlabs/bks65/keymaps/via/keymap.c
new file mode 100644
index 00000000..839991f0
--- /dev/null
+++ b/qmk/keyboards/fjlabs/bks65/keymaps/via/keymap.c
@@ -0,0 +1,58 @@
+/*
+Copyright 2020 <me@homedrop.org>
+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
+
+enum layers {
+    _LAYER0,
+    _LAYER1,
+    _LAYER2,
+    _LAYER3,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [_LAYER0] = LAYOUT_65_ansi(
+        KC_GESC, 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_HOME,
+        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_PGUP, 
+        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_PGDN, 
+        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_END, 
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [_LAYER1] = LAYOUT_65_ansi(
+        KC_GESC, 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_DEL, KC_HOME, 
+        KC_TRNS, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUSE, RESET, KC_PGUP,
+        KC_TRNS, RGB_SPI, RGB_SPD, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_AUDIO_VOL_UP, KC_AUDIO_MUTE, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK
+    ),
+
+    [_LAYER2] = LAYOUT_65_ansi(
+        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, 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
+    ),
+
+    [_LAYER3] = LAYOUT_65_ansi(
+        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, 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
+    ),
+
+};
diff --git a/qmk/keyboards/fjlabs/bks65/keymaps/via/rules.mk b/qmk/keyboards/fjlabs/bks65/keymaps/via/rules.mk
new file mode 100644
index 00000000..1e5b9980
--- /dev/null
+++ b/qmk/keyboards/fjlabs/bks65/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/qmk/keyboards/fjlabs/bks65/readme.md b/qmk/keyboards/fjlabs/bks65/readme.md
new file mode 100644
index 00000000..304a2f23
--- /dev/null
+++ b/qmk/keyboards/fjlabs/bks65/readme.md
@@ -0,0 +1,20 @@
+# bolsa65
+
+The following is the QMK Firmware for the [BolsaKeyboardSupply](https://www.bolsakeyboardsupply.com) BKS65 PCB, a universal, tray mount 65% hotswap PCB. 
+
+The PCB will feature:
+* Kailh Hotswap sockets
+* QMK & VIA compatibility
+* Underglow
+* Some cool bolsa branding
+
+---
+
+* Keyboard Maintainer: FJLabs
+* Hardware Supported: BKS65
+
+Make example for this keyboard (after setting up your build environment):
+
+    make fjlabs/bks65: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).
diff --git a/qmk/keyboards/fjlabs/bks65/rules.mk b/qmk/keyboards/fjlabs/bks65/rules.mk
new file mode 100644
index 00000000..5f75863b
--- /dev/null
+++ b/qmk/keyboards/fjlabs/bks65/rules.mk
@@ -0,0 +1,28 @@
+# MCU name
+MCU = atmega32u4
+
+# Processor frequency
+F_CPU = 8000000
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+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 = 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 = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+KEYBOARD_LOCK_ENABLE = yes
+
+LAYOUTS = 65_ansi
diff --git a/qmk/keyboards/foxlab/leaf60/hotswap/config.h b/qmk/keyboards/foxlab/leaf60/hotswap/config.h
index 26b67586..0934c87b 100644
--- a/qmk/keyboards/foxlab/leaf60/hotswap/config.h
+++ b/qmk/keyboards/foxlab/leaf60/hotswap/config.h
@@ -48,6 +48,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
+#define LED_CAPS_LOCK_PIN E6
+#define LED_PIN_ON_STATE 0
+
 #define BACKLIGHT_PIN B7
 #define BACKLIGHT_BREATHING
 #define BACKLIGHT_LEVELS 4
diff --git a/qmk/keyboards/foxlab/leaf60/hotswap/hotswap.c b/qmk/keyboards/foxlab/leaf60/hotswap/hotswap.c
index 20778d92..e2de4a7e 100644
--- a/qmk/keyboards/foxlab/leaf60/hotswap/hotswap.c
+++ b/qmk/keyboards/foxlab/leaf60/hotswap/hotswap.c
@@ -14,46 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "hotswap.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
-  setPinOutput(E6);
-  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
-
-  led_set_user(usb_led);
-}
-
-*/
-
-void led_set_kb(uint8_t usb_led) {
-  if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
-    writePinLow(E6);
-  } else {
-    writePinHigh(E6);
-  }
-	led_set_user(usb_led);
-}
diff --git a/qmk/keyboards/foxlab/leaf60/universal/config.h b/qmk/keyboards/foxlab/leaf60/universal/config.h
index 9f761f45..f48bae49 100644
--- a/qmk/keyboards/foxlab/leaf60/universal/config.h
+++ b/qmk/keyboards/foxlab/leaf60/universal/config.h
@@ -48,6 +48,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
+#define LED_CAPS_LOCK_PIN E6
+#define LED_PIN_ON_STATE 0
+
 #define BACKLIGHT_PIN B7
 #define BACKLIGHT_BREATHING
 #define BACKLIGHT_LEVELS 3
diff --git a/qmk/keyboards/foxlab/leaf60/universal/universal.c b/qmk/keyboards/foxlab/leaf60/universal/universal.c
index 5fe663a1..197e411d 100644
--- a/qmk/keyboards/foxlab/leaf60/universal/universal.c
+++ b/qmk/keyboards/foxlab/leaf60/universal/universal.c
@@ -14,48 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "universal.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
-  setPinOutput(E6);
-  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
-
-  led_set_user(usb_led);
-}
-
-*/
-
-
-void led_set_kb(uint8_t usb_led) {
-  if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
-    writePinLow(E6);
-  } else {
-    writePinHigh(E6);
-  }
-	led_set_user(usb_led);
-}
diff --git a/qmk/keyboards/foxlab/time80/config.h b/qmk/keyboards/foxlab/time80/config.h
new file mode 100644
index 00000000..8fea3e7e
--- /dev/null
+++ b/qmk/keyboards/foxlab/time80/config.h
@@ -0,0 +1,129 @@
+/*
+Copyright 2020 Lukas Alexander
+
+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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID    0x464C // "FL"
+#define PRODUCT_ID   0x0005
+#define DEVICE_VER   0x0001
+#define MANUFACTURER Fox Lab
+#define PRODUCT      Time80
+
+/* key matrix size */
+#define MATRIX_ROWS 7
+#define MATRIX_COLS 15
+
+//                        0   1   2   3   4   5   6   7   8   9   A   B   C   D   E
+#define MATRIX_ROW_PINS { B1, B2, B3, B5, B6, B7, B0 }
+#define MATRIX_COL_PINS { A1, A2, A3, A4, A5, A6, A7, C7, C6, C5, C4, C3, C2, D7, A0 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+#define BACKLIGHT_PIN D4
+#define BACKLIGHT_LEVELS 3
+//#define BACKLIGHT_BREATHING
+
+#define RGBLED_NUM 16
+//#define RGBLIGHT_HUE_STEP 8
+//#define RGBLIGHT_SAT_STEP 8
+//#define RGBLIGHT_VAL_STEP 8
+//#define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+//#define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+/*== all animations enable ==*/
+//#define RGBLIGHT_ANIMATIONS
+/*== or choose animations ==*/
+//#define RGBLIGHT_EFFECT_BREATHING
+//#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+//#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+//#define RGBLIGHT_EFFECT_SNAKE
+//#define RGBLIGHT_EFFECT_KNIGHT
+//#define RGBLIGHT_EFFECT_CHRISTMAS
+//#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+//#define RGBLIGHT_EFFECT_RGB_TEST
+//#define RGBLIGHT_EFFECT_ALTERNATING
+/*== customize breathing effect ==*/
+/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+//#define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+/*==== use exp() and sin() ====*/
+//#define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//#define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+//#define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+/* Bootmagic Lite key configuration */
+//#define BOOTMAGIC_LITE_ROW 0
+//#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/foxlab/time80/info.json b/qmk/keyboards/foxlab/time80/info.json
new file mode 100644
index 00000000..0919bae5
--- /dev/null
+++ b/qmk/keyboards/foxlab/time80/info.json
@@ -0,0 +1,104 @@
+{
+    "keyboard_name": "Fox Lab Time 80",
+    "url": "",
+    "maintainer": "lukelex",
+    "width": 18.25,
+    "height": 6.25,
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label":"k00", "x":0, "y":0},
+                {"label":"k02", "x":2, "y":0},
+                {"label":"k03", "x":3, "y":0},
+                {"label":"k04", "x":4, "y":0},
+                {"label":"k05", "x":5, "y":0},
+                {"label":"k07", "x":6.5, "y":0},
+                {"label":"k08", "x":7.5, "y":0},
+                {"label":"k09", "x":8.5, "y":0},
+                {"label":"k0A", "x":9.5, "y":0},
+                {"label":"k0B", "x":11, "y":0},
+                {"label":"k0E", "x":12, "y":0},
+                {"label":"k0C", "x":13, "y":0},
+                {"label":"k01", "x":14, "y":0},
+                {"label":"k61", "x":15.25, "y":0},
+                {"label":"k62", "x":16.25, "y":0},
+                {"label":"k6E", "x":17.25, "y":0},
+                {"label":"k10", "x":0, "y":1.25},
+                {"label":"k11", "x":1, "y":1.25},
+                {"label":"k12", "x":2, "y":1.25},
+                {"label":"k13", "x":3, "y":1.25},
+                {"label":"k14", "x":4, "y":1.25},
+                {"label":"k15", "x":5, "y":1.25},
+                {"label":"k16", "x":6, "y":1.25},
+                {"label":"k17", "x":7, "y":1.25},
+                {"label":"k18", "x":8, "y":1.25},
+                {"label":"k19", "x":9, "y":1.25},
+                {"label":"k1A", "x":10, "y":1.25},
+                {"label":"k1B", "x":11, "y":1.25},
+                {"label":"k1E", "x":12, "y":1.25},
+                {"label":"k1C", "x":13, "y":1.25},
+                {"label":"k1D", "x":14, "y":1.25},
+                {"label":"k66", "x":15.25, "y":1.25},
+                {"label":"k65", "x":16.25, "y":1.25},
+                {"label":"k64", "x":17.25, "y":1.25},
+                {"label":"k20", "x":0, "y":2.25, "w":1.5},
+                {"label":"k21", "x":1.5, "y":2.25},
+                {"label":"k22", "x":2.5, "y":2.25},
+                {"label":"k23", "x":3.5, "y":2.25},
+                {"label":"k24", "x":4.5, "y":2.25},
+                {"label":"k25", "x":5.5, "y":2.25},
+                {"label":"k26", "x":6.5, "y":2.25},
+                {"label":"k27", "x":7.5, "y":2.25},
+                {"label":"k28", "x":8.5, "y":2.25},
+                {"label":"k29", "x":9.5, "y":2.25},
+                {"label":"k2A", "x":10.5, "y":2.25},
+                {"label":"k2B", "x":11.5, "y":2.25},
+                {"label":"k2E", "x":12.5, "y":2.25},
+                {"label":"k2C", "x":13.5, "y":2.25, "w":1.5},
+                {"label":"k6C", "x":15.25, "y":2.25},
+                {"label":"k68", "x":16.25, "y":2.25},
+                {"label":"k67", "x":17.25, "y":2.25},
+                {"label":"k30", "x":0, "y":3.25, "w":1.75},
+                {"label":"k31", "x":1.75, "y":3.25},
+                {"label":"k32", "x":2.75, "y":3.25},
+                {"label":"k33", "x":3.75, "y":3.25},
+                {"label":"k34", "x":4.75, "y":3.25},
+                {"label":"k35", "x":5.75, "y":3.25},
+                {"label":"k36", "x":6.75, "y":3.25},
+                {"label":"k37", "x":7.75, "y":3.25},
+                {"label":"k38", "x":8.75, "y":3.25},
+                {"label":"k39", "x":9.75, "y":3.25},
+                {"label":"k3A", "x":10.75, "y":3.25},
+                {"label":"k3B", "x":11.75, "y":3.25},
+                {"label":"k3C", "x":12.75, "y":3.25},
+                {"label":"k3E", "x":13.75, "y":3.25, "w":1.25},
+                {"label":"k40", "x":0, "y":4.25, "w":1.25},
+                {"label":"k4D", "x":1.25, "y":4.25},
+                {"label":"k41", "x":2.25, "y":4.25},
+                {"label":"k42", "x":3.25, "y":4.25},
+                {"label":"k43", "x":4.25, "y":4.25},
+                {"label":"k44", "x":5.25, "y":4.25},
+                {"label":"k45", "x":6.25, "y":4.25},
+                {"label":"k46", "x":7.25, "y":4.25},
+                {"label":"k47", "x":8.25, "y":4.25},
+                {"label":"k48", "x":9.25, "y":4.25},
+                {"label":"k49", "x":10.25, "y":4.25},
+                {"label":"k4A", "x":11.25, "y":4.25},
+                {"label":"k4B", "x":12.25, "y":4.25, "w":1.75},
+                {"label":"k4E", "x":14, "y":4.25},
+                {"label":"k4C", "x":16.25, "y":4.25},
+                {"label":"k50", "x":0, "y":5.25, "w":1.25},
+                {"label":"k51", "x":1.25, "y":5.25, "w":1.25},
+                {"label":"k52", "x":2.5, "y":5.25, "w":1.25},
+                {"label":"k54", "x":3.75, "y":5.25, "w":6.25},
+                {"label":"k58", "x":10, "y":5.25, "w":1.25},
+                {"label":"k59", "x":11.25, "y":5.25, "w":1.25},
+                {"label":"k5A", "x":12.5, "y":5.25, "w":1.25},
+                {"label":"k5B", "x":13.75, "y":5.25, "w":1.25},
+                {"label":"k5E", "x":15.25, "y":5.25},
+                {"label":"k5C", "x":16.25, "y":5.25},
+                {"label":"k57", "x":17.25, "y":5.25}
+            ]
+        }
+    }
+}
diff --git a/qmk/keyboards/foxlab/time80/keymaps/default/keymap.c b/qmk/keyboards/foxlab/time80/keymaps/default/keymap.c
new file mode 100644
index 00000000..eb4facb5
--- /dev/null
+++ b/qmk/keyboards/foxlab/time80/keymaps/default/keymap.c
@@ -0,0 +1,59 @@
+/* Copyright 2020 Lukas Alexander
+ *
+ * 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_all(
+      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_MPRV, KC_MNXT, KC_MPLY,
+      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_BSLS, KC_DEL,  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_BSPC,          KC_DEL,  KC_END,  KC_PGDN,
+      LCTL_T(KC_ESC),   KC_A,       KC_S,    KC_D,          KC_F,    KC_G,    KC_H,    KC_J,       KC_K,    KC_L,       KC_SCLN, KC_QUOT,       XXXXXXX, KC_ENT,
+      KC_LSFT, XXXXXXX, KC_Z,       KC_X,    KC_C,          KC_V,    KC_B,    KC_N,    KC_M,       KC_COMM, KC_DOT,     KC_SLSH,                KC_RSFT, MO(4),                     KC_UP,
+      KC_LALT,          KC_LALT,    KC_LGUI,                                  LT(2, KC_SPC),                            MO(3),   MO(3),         MO(4),   MO(4),            KC_LEFT, KC_DOWN, KC_RGHT
+  ),
+  [1] = LAYOUT_all(
+      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_MPRV, KC_MNXT, KC_MPLY,
+      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_BSLS, KC_DEL,  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_BSPC,          KC_DEL,  KC_END,  KC_PGDN,
+      KC_LCTL,          KC_A,       KC_S,    KC_D,          KC_F,    KC_G,    KC_H,    KC_J,       KC_K,    KC_L,       KC_SCLN, KC_QUOT,       XXXXXXX, KC_ENT,
+      KC_LSFT, XXXXXXX, KC_Z,       KC_X,    KC_C,          KC_V,    KC_B,    KC_N,    KC_M,       KC_COMM, KC_DOT,     KC_SLSH,                KC_RSFT, MO(4),                     KC_UP,
+      KC_LALT,          KC_LALT,    KC_LGUI,                                  KC_SPC,                                   MO(3),   MO(3),         MO(4),   MO(4),            KC_LEFT, KC_DOWN, KC_RGHT
+  ),
+  [2] = LAYOUT_all(
+      KC_ESC,                       XXXXXXX, XXXXXXX,       XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX,       XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX,
+      KC_GRV,           XXXXXXX,    XXXXXXX, XXXXXXX,       XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX,       XXXXXXX, XXXXXXX, KC_DEL,  XXXXXXX, XXXXXXX, XXXXXXX,
+      KC_TAB,           XXXXXXX,    KC_UP,   XXXXXXX,       XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX,    KC_PSCR, KC_VOLD,       KC_VOLU, KC_BSPC,          XXXXXXX, XXXXXXX, XXXXXXX,
+      KC_LCTL,          KC_LEFT,    KC_DOWN, KC_RGHT,       XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN,    KC_UP,   KC_RGHT,    XXXXXXX, XXXXXXX,       XXXXXXX, XXXXXXX,
+      KC_LSFT, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX,       XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    KC_MPRV, KC_MNXT,    KC_MPLY,                XXXXXXX, MO(4),                     KC_UP,
+      KC_LALT,          KC_LALT,    KC_LGUI,                                  _______,                                  XXXXXXX, XXXXXXX,       MO(4),   MO(4),            KC_LEFT, KC_DOWN, KC_RGHT
+  ),
+  [3] = LAYOUT_all(
+      KC_ESC,                       XXXXXXX, XXXXXXX,       XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX,       XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX,
+      RALT(KC_N),       XXXXXXX,    XXXXXXX, XXXXXXX,       XXXXXXX, XXXXXXX, XXXXXXX, RALT(KC_I), XXXXXXX, XXXXXXX,    XXXXXXX, LGUI(KC_MINS), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+      KC_TAB,           XXXXXXX,    XXXXXXX, RALT(KC_SCLN), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, RALT(KC_O), XXXXXXX, XXXXXXX,       XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX,
+      KC_LCTL,          RALT(KC_A), XXXXXXX, XXXXXXX,       XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX,    XXXXXXX, RALT(KC_E),    XXXXXXX, XXXXXXX,
+      KC_LSFT, XXXXXXX, XXXXXXX,    XXXXXXX, RALT(KC_C),    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX,    XXXXXXX,                KC_RSFT, MO(4),                     XXXXXXX,
+      KC_LALT,          KC_LALT,    KC_LGUI,                                  XXXXXXX,                                  _______, _______,       MO(4),   MO(4),            XXXXXXX, XXXXXXX, XXXXXXX
+  ),
+  [4] = LAYOUT_all(
+      RESET,                        XXXXXXX, XXXXXXX,       XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX,       XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX,
+      XXXXXXX,          XXXXXXX,    XXXXXXX, XXXXXXX,       XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX,       XXXXXXX, XXXXXXX, TG(1),   XXXXXXX, XXXXXXX, XXXXXXX,
+      XXXXXXX,          XXXXXXX,    XXXXXXX, XXXXXXX,       XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX,       XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX, XXXXXXX,
+      XXXXXXX,          XXXXXXX,    XXXXXXX, XXXXXXX,       XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX,       XXXXXXX, XXXXXXX,
+      XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX,       XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,    XXXXXXX, XXXXXXX,    XXXXXXX,                XXXXXXX, _______,                   XXXXXXX,
+      XXXXXXX,          XXXXXXX,    XXXXXXX,                                  XXXXXXX,                                  XXXXXXX, XXXXXXX,       _______, _______,          XXXXXXX, XXXXXXX, XXXXXXX
+  )
+};
diff --git a/qmk/keyboards/foxlab/time80/keymaps/default/readme.md b/qmk/keyboards/foxlab/time80/keymaps/default/readme.md
new file mode 100644
index 00000000..bf413628
--- /dev/null
+++ b/qmk/keyboards/foxlab/time80/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for time80
diff --git a/qmk/keyboards/foxlab/time80/readme.md b/qmk/keyboards/foxlab/time80/readme.md
new file mode 100644
index 00000000..66fd66b4
--- /dev/null
+++ b/qmk/keyboards/foxlab/time80/readme.md
@@ -0,0 +1,27 @@
+# time80
+
+![time80](https://i.imgur.com/8HpYStPl.jpg)
+
+Time is an intricate custom keyboard kit from Fox Lab, a group of
+Chinese designers focused on making maximizing the potential for
+design and detail in custom keyboards. Featuring an 18-piece design,
+Time is the custom keyboard with the most number of parts in existence (so far).
+
+* Keyboard Maintainer: [Lukas Alexander](https://github.com/lukelex)
+* Hardware Supported: Time 80 PCB
+* Hardware Availability: [Group Buy](https://geekhack.org/index.php?topic=92349.0)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make foxlab/time80:default
+
+Flashing example for this keyboard ([after setting up the bootloadHID flashing environment](https://docs.qmk.fm/#/flashing_bootloadhid))
+
+    make foxlab/time80:default:flash
+
+**Reset Key**: There are no reset switches or pads. Follow this
+[guide](https://docs.qmk.fm/#/flashing_bootloadhid)
+to have it flashed for the first time. Remember to add a `RESET`
+key on your keymap for future endeavors.
+
+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).
diff --git a/qmk/keyboards/foxlab/time80/rules.mk b/qmk/keyboards/foxlab/time80/rules.mk
new file mode 100644
index 00000000..1b61e953
--- /dev/null
+++ b/qmk/keyboards/foxlab/time80/rules.mk
@@ -0,0 +1,19 @@
+# MCU name
+MCU = atmega32a
+
+# Bootloader selection
+BOOTLOADER = bootloadHID
+
+# Build Options
+#   change yes to no to disable
+#
+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
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+WS2812_DRIVER = i2c
diff --git a/qmk/keyboards/foxlab/time80/time80.c b/qmk/keyboards/foxlab/time80/time80.c
new file mode 100644
index 00000000..d2cf8cef
--- /dev/null
+++ b/qmk/keyboards/foxlab/time80/time80.c
@@ -0,0 +1,17 @@
+/* Copyright 2020 Lukas Alexander
+ *
+ * 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 "time80.h"
diff --git a/qmk/keyboards/foxlab/time80/time80.h b/qmk/keyboards/foxlab/time80/time80.h
new file mode 100644
index 00000000..f451b32f
--- /dev/null
+++ b/qmk/keyboards/foxlab/time80/time80.h
@@ -0,0 +1,44 @@
+/* Copyright 2020 Lukas Alexander
+ *
+ * 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 is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT_all( \
+   k00,      k02, k03, k04, k05,      k07, k08, k09, k0A,      k0B, k0E, k0C, k01,      k61, k62, k6E, \
+   k10,      k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1E, k1C, k1D,      k66, k65, k64, \
+   k20,      k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2E, k2C,           k6C, k68, k67, \
+   k30,      k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3E,                          \
+   k40, k4D, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4E,                     k4C,      \
+   k50,      k51, k52,                k54,                k58, k59, k5A, k5B,           k5E, k5C, k57  \
+) { \
+  { k00,   KC_NO, k02, k03,   k04, k05,   KC_NO, k07, k08, k09,   k0A,   k0B,   k0C, KC_NO, k0E }, \
+  { k10,   k11,   k12, k13,   k14, k15,   k16,   k17, k18, k19,   k1A,   k1B,   k1C, k1D,   k1E }, \
+  { k20,   k21,   k22, k23,   k24, k25,   k26,   k27, k28, k29,   k2A,   k2B,   k2C, KC_NO, k2E }, \
+  { k30,   k31,   k32, k33,   k34, k35,   k36,   k37, k38, k39,   k3A,   k3B,   k3C, KC_NO, k3E }, \
+  { k40,   k41,   k42, k43,   k44, k45,   k46,   k47, k48, k49,   k4A,   k4B,   k4C, k4D,   k4E }, \
+  { k50,   k51,   k52, KC_NO, k54, KC_NO, KC_NO, k57, k58, k59,   k5A,   k5B,   k5C, KC_NO, k5E }, \
+  { KC_NO, k61,   k62, KC_NO, k64, k65,   k66,   k67, k68, KC_NO, KC_NO, KC_NO, k6C, KC_NO, k6E } \
+}
diff --git a/qmk/keyboards/freyr/config.h b/qmk/keyboards/freyr/config.h
index ce30fd53..a4e34ea4 100644
--- a/qmk/keyboards/freyr/config.h
+++ b/qmk/keyboards/freyr/config.h
@@ -20,15 +20,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x0000
-#define DEVICE_VER      0x0002
-#define MANUFACTURER    HnahKB
-#define PRODUCT         Freyr
-#define DESCRIPTION     Custom PCB TKL keyboard 
+#define VENDOR_ID    0xFEED
+#define PRODUCT_ID   0x1895
+#define DEVICE_VER   0x0002
+#define MANUFACTURER HnahKB
+#define PRODUCT      Freyr
 
 /* key matrix size */
-#define MATRIX_ROWS 10  
+#define MATRIX_ROWS 10
 #define MATRIX_COLS 10
 
 /*
@@ -40,26 +39,103 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
  *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
  *
-*/
+ */
 #define MATRIX_ROW_PINS { D3, B2, B1, B0, E6, F0, D2, D5, F4, F1 }
 #define MATRIX_COL_PINS { B4, D7, D6, D4, B5, C7, C6, F5, F6, F7 }
 #define UNUSED_PINS
 
-/* COL2ROW, ROW2COL*/
+/* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-/*
- * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
- */
-
 #define BACKLIGHT_PIN B6
-#define BACKLIGHT_BREATHING
 #define BACKLIGHT_LEVELS 3
+#define BACKLIGHT_BREATHING
 
+//#define RGB_DI_PIN E2
+//#ifdef RGB_DI_PIN
+//#    define RGBLED_NUM 16
+//#    define RGBLIGHT_HUE_STEP 8
+//#    define RGBLIGHT_SAT_STEP 8
+//#    define RGBLIGHT_VAL_STEP 8
+//#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+//#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+/*== all animations enable ==*/
+//#    define RGBLIGHT_ANIMATIONS
+/*== or choose animations ==*/
+//#    define RGBLIGHT_EFFECT_BREATHING
+//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+//#    define RGBLIGHT_EFFECT_SNAKE
+//#    define RGBLIGHT_EFFECT_KNIGHT
+//#    define RGBLIGHT_EFFECT_CHRISTMAS
+//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+//#    define RGBLIGHT_EFFECT_RGB_TEST
+//#    define RGBLIGHT_EFFECT_ALTERNATING
+/*== customize breathing effect ==*/
+/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+//#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+/*==== use exp() and sin() ====*/
+//#    define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//#    define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+//#endif
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
 
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+//#define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
 /* Bootmagic Lite key configuration */
-#define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 0
+//#define BOOTMAGIC_LITE_ROW 0
+//#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/freyr/freyr.c b/qmk/keyboards/freyr/freyr.c
index 68c26294..336b3271 100644
--- a/qmk/keyboards/freyr/freyr.c
+++ b/qmk/keyboards/freyr/freyr.c
@@ -13,33 +13,24 @@
  * 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 "freyr.h"
 
-
 void matrix_init_kb(void) {
-  matrix_init_user();
-  led_init_ports();
-};
+    matrix_init_user();
+    led_init_ports();
+}
 
 void led_init_ports(void) {
-  setPinOutput(B3);     
-  setPinOutput(B7);
+    setPinOutput(B3);
+    setPinOutput(B7);
 }
 
-void led_set_kb(uint8_t usb_led) {
-  if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
-    // Turn Caps Lock LED on
-    writePinLow(B3);
-  } else {
-    // Turn Caps Lock LED off
-    writePinHigh(B3);
-  }
-  if (IS_LED_ON(usb_led, USB_LED_SCROLL_LOCK)) {
-    // Turn Scroll Lock LED on
-    writePinLow(B7);
-  } else {
-    // Turn Scroll Lock LED off
-    writePinHigh(B7);
-  }
-      led_set_user(usb_led);
+bool led_update_kb(led_t led_state) {
+    if (led_update_user(led_state)) {
+        writePin(B3, !led_state.caps_lock);
+        writePin(B7, !led_state.scroll_lock);
+    }
+
+    return true;
 }
diff --git a/qmk/keyboards/freyr/freyr.h b/qmk/keyboards/freyr/freyr.h
index f18e7443..ce41dfd2 100644
--- a/qmk/keyboards/freyr/freyr.h
+++ b/qmk/keyboards/freyr/freyr.h
@@ -13,60 +13,69 @@
  * 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 XXX KC_NO
 
 #define LAYOUT_all( \
-    k00,    k01, k02, k03, k04,     k06, k07, k08,k09,     k60, k61, k62, k63,        k64, k65, k66, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k70, k71, k72, k73, k74,        k75, k76, k67, \
-      k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k80, k81, k82,   k83,         k78, k77, k68, \
-       k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k90, k91, k92, k84,                         \
-     k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k95, k94, k85, k93,                 k79,      \
-     k50,  k51,  k52,                  k53,            k54,  k55,  k56,  k57,         k58, k59, k69  \
+    k00,      k01, k02, k03, k04, k06, k07, k08, k09, k60, k61, k62, k63,        k64, k65, k66, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k70, k71, k72, k73, k74,   k75, k76, k67, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k80, k81, k82, k83,        k78, k77, k68, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k90, k91, k92, k84, \
+    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k95, k94, k85, k93,             k79, \
+    k50, k51, k52,                k53,                k54, k55, k56, k57,        k58, k59, k69 \
 ) { \
-    { k00, k01, k02, k03, k04, KC_NO, k06, k07, k08, k09 }, \
+    { k00, k01, k02, k03, k04, XXX, k06, k07, k08, k09 }, \
     { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19 }, \
     { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \
     { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39 }, \
-    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49}, \
+    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49 }, \
     { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59 }, \
     { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69 }, \
     { k70, k71, k72, k73, k74, k75, k76, k77, k78, k79 }, \
-    { k80, k81, k82, k83, k84, k85, KC_NO, KC_NO, KC_NO, KC_NO }, \
-    { k90, k91, k92, k93, k94, k95, KC_NO, KC_NO, KC_NO, KC_NO } \
+    { k80, k81, k82, k83, k84, k85, XXX, XXX, XXX, XXX }, \
+    { k90, k91, k92, k93, k94, k95, XXX, XXX, XXX, XXX } \
 }
 
 #define LAYOUT_tkl_ansi( \
-    k00,    k01, k02, k03, k04,     k06, k07, k08,k09,     k60, k61, k62, k63,        k64, k65, k66, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k70, k71, k72,   k73,           k75, k76, k67, \
-      k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k80, k81, k82,   k83,         k78, k77, k68, \
-       k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k90, k91,      k84,                         \
-        k40,   k42, k43, k44, k45, k46, k47, k48, k49, k95, k94,     k93,                  k79,      \
-     k50,  k51,  k52,                  k53,            k54,  k55,  k56,  k57,         k58, k59, k69  \
-) LAYOUT_all( \
-    k00,    k01, k02, k03, k04,     k06, k07, k08,k09,     k60, k61, k62, k63,        k64, k65, k66, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k70, k71, k72, k73, KC_NO,      k75, k76, k67, \
-      k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k80, k81, k82,   k83,         k78, k77, k68, \
-       k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k90, k91, KC_NO, k84,                         \
-     k40, KC_NO, k42, k43, k44, k45, k46, k47, k48, k49, k95, k94, KC_NO, k93,             k79,      \
-     k50,  k51,  k52,                  k53,            k54,  k55,  k56,  k57,         k58, k59, k69  \
-) 
+    k00,      k01, k02, k03, k04, k06, k07, k08, k09, k60, k61, k62, k63,   k64, k65, k66, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k70, k71, k72, k73,   k75, k76, k67, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k80, k81, k82, k83,   k78, k77, k68, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k90, k91,      k84, \
+    k40,      k42, k43, k44, k45, k46, k47, k48, k49, k95, k94,      k93,        k79, \
+    k50, k51, k52,                k53,                k54, k55, k56, k57,   k58, k59, k69 \
+) { \
+    { k00, k01, k02, k03, k04, XXX, k06, k07, k08, k09 }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19 }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39 }, \
+    { k40, XXX, k42, k43, k44, k45, k46, k47, k48, k49 }, \
+    { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59 }, \
+    { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69 }, \
+    { k70, k71, k72, k73, XXX, k75, k76, k77, k78, k79 }, \
+    { k80, k81, k82, k83, k84, XXX, XXX, XXX, XXX, XXX }, \
+    { k90, k91, XXX, k93, k94, k95, XXX, XXX, XXX, XXX } \
+}
 
 #define LAYOUT_tkl_iso( \
-    k00,    k01, k02, k03, k04,     k06, k07, k08,k09,     k60, k61, k62, k63,        k64, k65, k66, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k70, k71, k72, k73,             k75, k76, k67, \
-      k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k80, k81, k82,                k78, k77, k68, \
-       k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k90, k91, k92, k84,                         \
-     k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k95, k94,      k93,                 k79,      \
-     k50,  k51,  k52,                  k53,            k54,  k55,  k56,  k57,         k58, k59, k69  \
-) LAYOUT_all( \
-    k00,    k01, k02, k03, k04,     k06, k07, k08,k09,     k60, k61, k62, k63,        k64, k65, k66, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k70, k71, k72, k73, KC_NO,      k75, k76, k67, \
-      k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k80, k81, k82,   KC_NO,       k78, k77, k68, \
-       k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k90, k91, k92, k84,                         \
-     k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k95, k94, KC_NO, k93,               k79,      \
-     k50,  k51,  k52,                  k53,            k54,  k55,  k56,  k57,         k58, k59, k69  \
-) 
-
+    k00,      k01, k02, k03, k04, k06, k07, k08, k09, k60, k61, k62, k63,   k64, k65, k66, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k70, k71, k72, k73,   k75, k76, k67, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k80, k81, k82,        k78, k77, k68, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k90, k91, k92, k84, \
+    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k95, k94,      k93,        k79, \
+    k50, k51, k52,                k53,                k54, k55, k56, k57,   k58, k59, k69 \
+) { \
+    { k00, k01, k02, k03, k04, XXX, k06, k07, k08, k09 }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19 }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39 }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49 }, \
+    { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59 }, \
+    { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69 }, \
+    { k70, k71, k72, k73, XXX, k75, k76, k77, k78, k79 }, \
+    { k80, k81, k82, XXX, k84, XXX, XXX, XXX, XXX, XXX }, \
+    { k90, k91, k92, k93, k94, k95, XXX, XXX, XXX, XXX } \
+}
diff --git a/qmk/keyboards/freyr/info.json b/qmk/keyboards/freyr/info.json
index 22fc96fa..9f1b54d4 100644
--- a/qmk/keyboards/freyr/info.json
+++ b/qmk/keyboards/freyr/info.json
@@ -6,284 +6,320 @@
     "height": 6.25,
     "layouts": {
         "LAYOUT_all": {
-            "key_count": 91,
             "layout": [
-                {"label":"Esc (k00)", "x":0, "y":0},
-                {"label":"F1 (k01)", "x":2, "y":0},
-                {"label":"F2 (k02)", "x":3, "y":0},
-                {"label":"F3 (k03)", "x":4, "y":0},
-                {"label":"F4 (k04)", "x":5, "y":0},
-                {"label":"F5 (k06)", "x":6.5, "y":0},
-                {"label":"F6 (k07)", "x":7.5, "y":0},
-                {"label":"F7 (k08)", "x":8.5, "y":0},
-                {"label":"F8 (k09)", "x":9.5, "y":0},
-                {"label":"F9 (k60)", "x":11, "y":0},
-                {"label":"F10 (k61)", "x":12, "y":0},
-                {"label":"F11 (k62)", "x":13, "y":0},
-                {"label":"F12 (k63)", "x":14, "y":0},
-                {"label":"PrtSc (k64)", "x":15.25, "y":0},
-                {"label":"Scroll Lock (k65)", "x":16.25, "y":0},
-                {"label":"Pause (k66)", "x":17.25, "y":0},
-                {"label":"~ (k10)", "x":0, "y":1.25},
-                {"label":"! (k11)", "x":1, "y":1.25},
-                {"label":"@ (k12)", "x":2, "y":1.25},
-                {"label":"# (k13)", "x":3, "y":1.25},
-                {"label":"$ (k14)", "x":4, "y":1.25},
-                {"label":"% (k15)", "x":5, "y":1.25},
-                {"label":"^ (k16)", "x":6, "y":1.25},
-                {"label":"& (k17)", "x":7, "y":1.25},
-                {"label":"* (k18)", "x":8, "y":1.25},
-                {"label":"( (k19)", "x":9, "y":1.25},
-                {"label":") (k70)", "x":10, "y":1.25},
-                {"label":"_ (k71)", "x":11, "y":1.25},
-                {"label":"+ (k72)", "x":12, "y":1.25},
-                {"label":"Backspace (k73)", "x":13, "y":1.25},
-                {"label":"Backspace2 (k74)", "x":14, "y":1.25},
-                {"label":"Insert (k75)", "x":15.25, "y":1.25},
-                {"label":"Home (k76)", "x":16.25, "y":1.25},
-                {"label":"PgUp (k67)", "x":17.25, "y":1.25},
-                {"label":"Tab (k20)", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q (k21)", "x":1.5, "y":2.25},
-                {"label":"W (k22)", "x":2.5, "y":2.25},
-                {"label":"E (k23)", "x":3.5, "y":2.25},
-                {"label":"R (k24)", "x":4.5, "y":2.25},
-                {"label":"T (k25)", "x":5.5, "y":2.25},
-                {"label":"Y (k26)", "x":6.5, "y":2.25},
-                {"label":"U (k27)", "x":7.5, "y":2.25},
-                {"label":"I (k28)", "x":8.5, "y":2.25},
-                {"label":"O (k29)", "x":9.5, "y":2.25},
-                {"label":"P (k80)", "x":10.5, "y":2.25},
-                {"label":"{ (k81)", "x":11.5, "y":2.25},
-                {"label":"} (k82)", "x":12.5, "y":2.25},
-                {"label":"| (k83)", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"Delete (k78)", "x":15.25, "y":2.25},
-                {"label":"End (k77)", "x":16.25, "y":2.25},
-                {"label":"PgDn (k68)", "x":17.25, "y":2.25},
-                {"label":"Caps Lock (k30)", "x":0, "y":3.25, "w":1.75},
-                {"label":"A (k31)", "x":1.75, "y":3.25},
-                {"label":"S (k32)", "x":2.75, "y":3.25},
-                {"label":"D (k33)", "x":3.75, "y":3.25},
-                {"label":"F (k34)", "x":4.75, "y":3.25},
-                {"label":"G (k35)", "x":5.75, "y":3.25},
-                {"label":"H (k36)", "x":6.75, "y":3.25},
-                {"label":"J (k37)", "x":7.75, "y":3.25},
-                {"label":"K (k38)", "x":8.75, "y":3.25},
-                {"label":"L (k39)", "x":9.75, "y":3.25},
-                {"label":": (k90)", "x":10.75, "y":3.25},
-                {"label":"\" (k91)", "x":11.75, "y":3.25},
-                {"label":"~ (k92)", "x":12.75, "y":3.25},
-                {"label":"Enter (k84)", "x":13.75, "y":3.25, "w":1.25},
-                {"label":"Shift (k40)", "x":0, "y":4.25, "w":1.25},
-                {"label":"| (k41)", "x":1.25, "y":4.25},
-                {"label":"Z (k42)", "x":2.25, "y":4.25},
-                {"label":"X (k43)", "x":3.25, "y":4.25},
-                {"label":"C (k44)", "x":4.25, "y":4.25},
-                {"label":"V (k45)", "x":5.25, "y":4.25},
-                {"label":"B (k46)", "x":6.25, "y":4.25},
-                {"label":"N (k47)", "x":7.25, "y":4.25},
-                {"label":"M (k48)", "x":8.25, "y":4.25},
-                {"label":"< (k49)", "x":9.25, "y":4.25},
-                {"label":"> (k95)", "x":10.25, "y":4.25},
-                {"label":"? (k94)", "x":11.25, "y":4.25},
-                {"label":"JP Ro (k85)", "x":12.25, "y":4.25},
-                {"label":"Shift (k93)", "x":13.25, "y":4.25, "w":1.75},
-                {"label":"Up (k79)", "x":16.25, "y":4.25},
-                {"label":"Ctrl (k50)", "x":0, "y":5.25, "w":1.25},
-                {"label":"Win (k51)", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt (k52)", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"Space (k53)", "x":3.75, "y":5.25, "w":6.25},
-                {"label":"Alt (k54)", "x":10, "y":5.25, "w":1.25},
-                {"label":"Win (k55)", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"Menu (k56)", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"Ctrl (k57)", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"Left (k58)", "x":15.25, "y":5.25},
-                {"label":"Down (k59)", "x":16.25, "y":5.25},
-                {"label":"Right (k69)", "x":17.25, "y":5.25}
+                {"x": 0, "y": 0},
+
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+
+                {"x": 6.5, "y": 0},
+                {"x": 7.5, "y": 0},
+                {"x": 8.5, "y": 0},
+                {"x": 9.5, "y": 0},
+
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0},
+                {"x": 14, "y": 0},
+
+                {"x": 15.25, "y": 0},
+                {"x": 16.25, "y": 0},
+                {"x": 17.25, "y": 0},
+
+                {"x": 0, "y": 1.25},
+                {"x": 1, "y": 1.25},
+                {"x": 2, "y": 1.25},
+                {"x": 3, "y": 1.25},
+                {"x": 4, "y": 1.25},
+                {"x": 5, "y": 1.25},
+                {"x": 6, "y": 1.25},
+                {"x": 7, "y": 1.25},
+                {"x": 8, "y": 1.25},
+                {"x": 9, "y": 1.25},
+                {"x": 10, "y": 1.25},
+                {"x": 11, "y": 1.25},
+                {"x": 12, "y": 1.25},
+                {"x": 13, "y": 1.25},
+                {"x": 14, "y": 1.25},
+
+                {"x": 15.25, "y": 1.25},
+                {"x": 16.25, "y": 1.25},
+                {"x": 17.25, "y": 1.25},
+
+                {"x": 0, "y": 2.25, "w": 1.5},
+                {"x": 1.5, "y": 2.25},
+                {"x": 2.5, "y": 2.25},
+                {"x": 3.5, "y": 2.25},
+                {"x": 4.5, "y": 2.25},
+                {"x": 5.5, "y": 2.25},
+                {"x": 6.5, "y": 2.25},
+                {"x": 7.5, "y": 2.25},
+                {"x": 8.5, "y": 2.25},
+                {"x": 9.5, "y": 2.25},
+                {"x": 10.5, "y": 2.25},
+                {"x": 11.5, "y": 2.25},
+                {"x": 12.5, "y": 2.25},
+                {"x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"x": 15.25, "y": 2.25},
+                {"x": 16.25, "y": 2.25},
+                {"x": 17.25, "y": 2.25},
+
+                {"x": 0, "y": 3.25, "w": 1.75},
+                {"x": 1.75, "y": 3.25},
+                {"x": 2.75, "y": 3.25},
+                {"x": 3.75, "y": 3.25},
+                {"x": 4.75, "y": 3.25},
+                {"x": 5.75, "y": 3.25},
+                {"x": 6.75, "y": 3.25},
+                {"x": 7.75, "y": 3.25},
+                {"x": 8.75, "y": 3.25},
+                {"x": 9.75, "y": 3.25},
+                {"x": 10.75, "y": 3.25},
+                {"x": 11.75, "y": 3.25},
+                {"x": 12.75, "y": 3.25},
+                {"x": 13.75, "y": 3.25, "w": 1.25},
+
+                {"x": 0, "y": 4.25, "w": 1.25},
+                {"x": 1.25, "y": 4.25},
+                {"x": 2.25, "y": 4.25},
+                {"x": 3.25, "y": 4.25},
+                {"x": 4.25, "y": 4.25},
+                {"x": 5.25, "y": 4.25},
+                {"x": 6.25, "y": 4.25},
+                {"x": 7.25, "y": 4.25},
+                {"x": 8.25, "y": 4.25},
+                {"x": 9.25, "y": 4.25},
+                {"x": 10.25, "y": 4.25},
+                {"x": 11.25, "y": 4.25},
+                {"x": 12.25, "y": 4.25},
+                {"x": 13.25, "y": 4.25, "w": 1.75},
+
+                {"x": 16.25, "y": 4.25},
+
+                {"x": 0, "y": 5.25, "w": 1.25},
+                {"x": 1.25, "y": 5.25, "w": 1.25},
+                {"x": 2.5, "y": 5.25, "w": 1.25},
+                {"x": 3.75, "y": 5.25, "w": 6.25},
+                {"x": 10, "y": 5.25, "w": 1.25},
+                {"x": 11.25, "y": 5.25, "w": 1.25},
+                {"x": 12.5, "y": 5.25, "w": 1.25},
+                {"x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"x": 15.25, "y": 5.25},
+                {"x": 16.25, "y": 5.25},
+                {"x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_ansi": {
-            "key_count": 87,
             "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.25},
-                {"label":"!", "x":1, "y":1.25},
-                {"label":"@", "x":2, "y":1.25},
-                {"label":"#", "x":3, "y":1.25},
-                {"label":"$", "x":4, "y":1.25},
-                {"label":"%", "x":5, "y":1.25},
-                {"label":"^", "x":6, "y":1.25},
-                {"label":"&", "x":7, "y":1.25},
-                {"label":"*", "x":8, "y":1.25},
-                {"label":"(", "x":9, "y":1.25},
-                {"label":")", "x":10, "y":1.25},
-                {"label":"_", "x":11, "y":1.25},
-                {"label":"+", "x":12, "y":1.25},
-                {"label":"Backspace", "x":13, "y":1.25, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"PgUp", "x":17.25, "y":1.25},
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"{", "x":11.5, "y":2.25},
-                {"label":"}", "x":12.5, "y":2.25},
-                {"label":"|", "x":13.5, "y":2.25, "w":1.5},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"PgDn", "x":17.25, "y":2.25},
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":":", "x":10.75, "y":3.25},
-                {"label":"\"", "x":11.75, "y":3.25},
-                {"label":"Enter", "x":12.75, "y":3.25, "w":2.25},
-                {"label":"Shift", "x":0, "y":4.25, "w":2.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":"<", "x":9.25, "y":4.25},
-                {"label":">", "x":10.25, "y":4.25},
-                {"label":"?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
-                {"label":"Up", "x":16.25, "y":4.25},
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
-                {"label":"Alt", "x":10, "y":5.25, "w":1.25},
-                {"label":"Win", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"Left", "x":15.25, "y":5.25},
-                {"label":"Down", "x":16.25, "y":5.25},
-                {"label":"Right", "x":17.25, "y":5.25}
+                {"x": 0, "y": 0},
+
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+
+                {"x": 6.5, "y": 0},
+                {"x": 7.5, "y": 0},
+                {"x": 8.5, "y": 0},
+                {"x": 9.5, "y": 0},
+
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0},
+                {"x": 14, "y": 0},
+
+                {"x": 15.25, "y": 0},
+                {"x": 16.25, "y": 0},
+                {"x": 17.25, "y": 0},
+
+                {"x": 0, "y": 1.25},
+                {"x": 1, "y": 1.25},
+                {"x": 2, "y": 1.25},
+                {"x": 3, "y": 1.25},
+                {"x": 4, "y": 1.25},
+                {"x": 5, "y": 1.25},
+                {"x": 6, "y": 1.25},
+                {"x": 7, "y": 1.25},
+                {"x": 8, "y": 1.25},
+                {"x": 9, "y": 1.25},
+                {"x": 10, "y": 1.25},
+                {"x": 11, "y": 1.25},
+                {"x": 12, "y": 1.25},
+                {"x": 13, "y": 1.25, "w": 2},
+
+                {"x": 15.25, "y": 1.25},
+                {"x": 16.25, "y": 1.25},
+                {"x": 17.25, "y": 1.25},
+
+                {"x": 0, "y": 2.25, "w": 1.5},
+                {"x": 1.5, "y": 2.25},
+                {"x": 2.5, "y": 2.25},
+                {"x": 3.5, "y": 2.25},
+                {"x": 4.5, "y": 2.25},
+                {"x": 5.5, "y": 2.25},
+                {"x": 6.5, "y": 2.25},
+                {"x": 7.5, "y": 2.25},
+                {"x": 8.5, "y": 2.25},
+                {"x": 9.5, "y": 2.25},
+                {"x": 10.5, "y": 2.25},
+                {"x": 11.5, "y": 2.25},
+                {"x": 12.5, "y": 2.25},
+                {"x": 13.5, "y": 2.25, "w": 1.5},
+
+                {"x": 15.25, "y": 2.25},
+                {"x": 16.25, "y": 2.25},
+                {"x": 17.25, "y": 2.25},
+
+                {"x": 0, "y": 3.25, "w": 1.75},
+                {"x": 1.75, "y": 3.25},
+                {"x": 2.75, "y": 3.25},
+                {"x": 3.75, "y": 3.25},
+                {"x": 4.75, "y": 3.25},
+                {"x": 5.75, "y": 3.25},
+                {"x": 6.75, "y": 3.25},
+                {"x": 7.75, "y": 3.25},
+                {"x": 8.75, "y": 3.25},
+                {"x": 9.75, "y": 3.25},
+                {"x": 10.75, "y": 3.25},
+                {"x": 11.75, "y": 3.25},
+                {"x": 12.75, "y": 3.25, "w": 2.25},
+
+                {"x": 0, "y": 4.25, "w": 2.25},
+                {"x": 2.25, "y": 4.25},
+                {"x": 3.25, "y": 4.25},
+                {"x": 4.25, "y": 4.25},
+                {"x": 5.25, "y": 4.25},
+                {"x": 6.25, "y": 4.25},
+                {"x": 7.25, "y": 4.25},
+                {"x": 8.25, "y": 4.25},
+                {"x": 9.25, "y": 4.25},
+                {"x": 10.25, "y": 4.25},
+                {"x": 11.25, "y": 4.25},
+                {"x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"x": 16.25, "y": 4.25},
+
+                {"x": 0, "y": 5.25, "w": 1.25},
+                {"x": 1.25, "y": 5.25, "w": 1.25},
+                {"x": 2.5, "y": 5.25, "w": 1.25},
+                {"x": 3.75, "y": 5.25, "w": 6.25},
+                {"x": 10, "y": 5.25, "w": 1.25},
+                {"x": 11.25, "y": 5.25, "w": 1.25},
+                {"x": 12.5, "y": 5.25, "w": 1.25},
+                {"x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"x": 15.25, "y": 5.25},
+                {"x": 16.25, "y": 5.25},
+                {"x": 17.25, "y": 5.25}
             ]
         },
         "LAYOUT_tkl_iso": {
-            "key_count": 88,
             "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":"\u00ac", "x":0, "y":1.25},
-                {"label":"!", "x":1, "y":1.25},
-                {"label":"\"", "x":2, "y":1.25},
-                {"label":"\u00a3", "x":3, "y":1.25},
-                {"label":"$", "x":4, "y":1.25},
-                {"label":"%", "x":5, "y":1.25},
-                {"label":"^", "x":6, "y":1.25},
-                {"label":"&", "x":7, "y":1.25},
-                {"label":"*", "x":8, "y":1.25},
-                {"label":"(", "x":9, "y":1.25},
-                {"label":")", "x":10, "y":1.25},
-                {"label":"_", "x":11, "y":1.25},
-                {"label":"+", "x":12, "y":1.25},
-                {"label":"Backspace", "x":13, "y":1.25, "w":2},
-                {"label":"Insert", "x":15.25, "y":1.25},
-                {"label":"Home", "x":16.25, "y":1.25},
-                {"label":"PgUp", "x":17.25, "y":1.25},
-                {"label":"Tab", "x":0, "y":2.25, "w":1.5},
-                {"label":"Q", "x":1.5, "y":2.25},
-                {"label":"W", "x":2.5, "y":2.25},
-                {"label":"E", "x":3.5, "y":2.25},
-                {"label":"R", "x":4.5, "y":2.25},
-                {"label":"T", "x":5.5, "y":2.25},
-                {"label":"Y", "x":6.5, "y":2.25},
-                {"label":"U", "x":7.5, "y":2.25},
-                {"label":"I", "x":8.5, "y":2.25},
-                {"label":"O", "x":9.5, "y":2.25},
-                {"label":"P", "x":10.5, "y":2.25},
-                {"label":"{", "x":11.5, "y":2.25},
-                {"label":"}", "x":12.5, "y":2.25},
-                {"label":"Delete", "x":15.25, "y":2.25},
-                {"label":"End", "x":16.25, "y":2.25},
-                {"label":"PgDn", "x":17.25, "y":2.25},
-                {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75},
-                {"label":"A", "x":1.75, "y":3.25},
-                {"label":"S", "x":2.75, "y":3.25},
-                {"label":"D", "x":3.75, "y":3.25},
-                {"label":"F", "x":4.75, "y":3.25},
-                {"label":"G", "x":5.75, "y":3.25},
-                {"label":"H", "x":6.75, "y":3.25},
-                {"label":"J", "x":7.75, "y":3.25},
-                {"label":"K", "x":8.75, "y":3.25},
-                {"label":"L", "x":9.75, "y":3.25},
-                {"label":":", "x":10.75, "y":3.25},
-                {"label":"@", "x":11.75, "y":3.25},
-                {"label":"~", "x":12.75, "y":3.25},
-                {"label":"Enter", "x":13.75, "y":2.25, "w":1.25, "h":2},
-                {"label":"Shift", "x":0, "y":4.25, "w":1.25},
-                {"label":"|", "x":1.25, "y":4.25},
-                {"label":"Z", "x":2.25, "y":4.25},
-                {"label":"X", "x":3.25, "y":4.25},
-                {"label":"C", "x":4.25, "y":4.25},
-                {"label":"V", "x":5.25, "y":4.25},
-                {"label":"B", "x":6.25, "y":4.25},
-                {"label":"N", "x":7.25, "y":4.25},
-                {"label":"M", "x":8.25, "y":4.25},
-                {"label":"<", "x":9.25, "y":4.25},
-                {"label":">", "x":10.25, "y":4.25},
-                {"label":"?", "x":11.25, "y":4.25},
-                {"label":"Shift", "x":12.25, "y":4.25, "w":2.75},
-                {"label":"Up", "x":16.25, "y":4.25},
-                {"label":"Ctrl", "x":0, "y":5.25, "w":1.25},
-                {"label":"Win", "x":1.25, "y":5.25, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":5.25, "w":1.25},
-                {"label":"Space", "x":3.75, "y":5.25, "w":6.25},
-                {"label":"AltGr", "x":10, "y":5.25, "w":1.25},
-                {"label":"Win", "x":11.25, "y":5.25, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":5.25, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25},
-                {"label":"Left", "x":15.25, "y":5.25},
-                {"label":"Down", "x":16.25, "y":5.25},
-                {"label":"Right", "x":17.25, "y":5.25}
+                {"x": 0, "y": 0},
+
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+
+                {"x": 6.5, "y": 0},
+                {"x": 7.5, "y": 0},
+                {"x": 8.5, "y": 0},
+                {"x": 9.5, "y": 0},
+
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0},
+                {"x": 14, "y": 0},
+
+                {"x": 15.25, "y": 0},
+                {"x": 16.25, "y": 0},
+                {"x": 17.25, "y": 0},
+
+                {"x": 0, "y": 1.25},
+                {"x": 1, "y": 1.25},
+                {"x": 2, "y": 1.25},
+                {"x": 3, "y": 1.25},
+                {"x": 4, "y": 1.25},
+                {"x": 5, "y": 1.25},
+                {"x": 6, "y": 1.25},
+                {"x": 7, "y": 1.25},
+                {"x": 8, "y": 1.25},
+                {"x": 9, "y": 1.25},
+                {"x": 10, "y": 1.25},
+                {"x": 11, "y": 1.25},
+                {"x": 12, "y": 1.25},
+                {"x": 13, "y": 1.25, "w": 2},
+
+                {"x": 15.25, "y": 1.25},
+                {"x": 16.25, "y": 1.25},
+                {"x": 17.25, "y": 1.25},
+
+                {"x": 0, "y": 2.25, "w": 1.5},
+                {"x": 1.5, "y": 2.25},
+                {"x": 2.5, "y": 2.25},
+                {"x": 3.5, "y": 2.25},
+                {"x": 4.5, "y": 2.25},
+                {"x": 5.5, "y": 2.25},
+                {"x": 6.5, "y": 2.25},
+                {"x": 7.5, "y": 2.25},
+                {"x": 8.5, "y": 2.25},
+                {"x": 9.5, "y": 2.25},
+                {"x": 10.5, "y": 2.25},
+                {"x": 11.5, "y": 2.25},
+                {"x": 12.5, "y": 2.25},
+
+                {"x": 15.25, "y": 2.25},
+                {"x": 16.25, "y": 2.25},
+                {"x": 17.25, "y": 2.25},
+
+                {"x": 0, "y": 3.25, "w": 1.75},
+                {"x": 1.75, "y": 3.25},
+                {"x": 2.75, "y": 3.25},
+                {"x": 3.75, "y": 3.25},
+                {"x": 4.75, "y": 3.25},
+                {"x": 5.75, "y": 3.25},
+                {"x": 6.75, "y": 3.25},
+                {"x": 7.75, "y": 3.25},
+                {"x": 8.75, "y": 3.25},
+                {"x": 9.75, "y": 3.25},
+                {"x": 10.75, "y": 3.25},
+                {"x": 11.75, "y": 3.25},
+                {"x": 12.75, "y": 3.25},
+                {"x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+
+                {"x": 0, "y": 4.25, "w": 1.25},
+                {"x": 1.25, "y": 4.25},
+                {"x": 2.25, "y": 4.25},
+                {"x": 3.25, "y": 4.25},
+                {"x": 4.25, "y": 4.25},
+                {"x": 5.25, "y": 4.25},
+                {"x": 6.25, "y": 4.25},
+                {"x": 7.25, "y": 4.25},
+                {"x": 8.25, "y": 4.25},
+                {"x": 9.25, "y": 4.25},
+                {"x": 10.25, "y": 4.25},
+                {"x": 11.25, "y": 4.25},
+                {"x": 12.25, "y": 4.25, "w": 2.75},
+
+                {"x": 16.25, "y": 4.25},
+
+                {"x": 0, "y": 5.25, "w": 1.25},
+                {"x": 1.25, "y": 5.25, "w": 1.25},
+                {"x": 2.5, "y": 5.25, "w": 1.25},
+                {"x": 3.75, "y": 5.25, "w": 6.25},
+                {"x": 10, "y": 5.25, "w": 1.25},
+                {"x": 11.25, "y": 5.25, "w": 1.25},
+                {"x": 12.5, "y": 5.25, "w": 1.25},
+                {"x": 13.75, "y": 5.25, "w": 1.25},
+
+                {"x": 15.25, "y": 5.25},
+                {"x": 16.25, "y": 5.25},
+                {"x": 17.25, "y": 5.25}
             ]
         }
     }
diff --git a/qmk/keyboards/freyr/keymaps/default/keymap.c b/qmk/keyboards/freyr/keymaps/default/keymap.c
index 008ae47d..f7ade501 100644
--- a/qmk/keyboards/freyr/keymaps/default/keymap.c
+++ b/qmk/keyboards/freyr/keymaps/default/keymap.c
@@ -13,32 +13,33 @@
  * 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
 
-enum hnah_layers{
-  _QWERTY,
-  _LOWER
+enum layer_names {
+    _QWERTY,
+    _LOWER
 };
 
 #define LOWER MO(_LOWER)
 
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_tkl_iso( 
-    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_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_RSFT,              KC_UP,\
-     KC_LCTL,   KC_LGUI,   KC_LALT,            KC_SPACE,             KC_RALT,     KC_APP,   LOWER,  KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT   \
-  ),
-    [_LOWER] = LAYOUT_tkl_iso( 
-    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_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,  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   \
-  )
-};
+    [_QWERTY] = LAYOUT_tkl_iso(
+        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_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_RSFT,            KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_APP,  LOWER,   KC_RCTL,   KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [_LOWER] = LAYOUT_tkl_iso(
+        RESET,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
+
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,            _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______,   _______, _______, _______
+    )
+};
diff --git a/qmk/keyboards/freyr/keymaps/default/readme.md b/qmk/keyboards/freyr/keymaps/default/readme.md
index 7a41bdd7..dfb2794c 100644
--- a/qmk/keyboards/freyr/keymaps/default/readme.md
+++ b/qmk/keyboards/freyr/keymaps/default/readme.md
@@ -1 +1 @@
-# The default keymap for freyr
\ No newline at end of file
+# The default keymap for freyr
diff --git a/qmk/keyboards/freyr/readme.md b/qmk/keyboards/freyr/readme.md
index c6ddc304..20fa484e 100644
--- a/qmk/keyboards/freyr/readme.md
+++ b/qmk/keyboards/freyr/readme.md
@@ -1,15 +1,20 @@
 # freyr
 
-![Freyr](https://i.imgur.com/MeOrzoI.jpg)
+![Freyr](https://i.imgur.com/MeOrzoIl.jpg)
+
+Freyr is a tenkeyless keyboard, support ansi and iso layout.
 
-Freyr is a tenkeyless keyboard, support ansi and iso layout. 
 [Full layout here](http://www.keyboard-layout-editor.com/#/gists/438ef0c58c46ec28c80d9894ffcff177)
 
-Keyboard Maintainer: [HnahKB](https://github.com/vuhopkep)  
-Hardware Supported: Freyr.revB PCB
+* Keyboard Maintainer: [HnahKB](https://github.com/vuhopkep)
+* Hardware Supported: Freyr.revB PCB
 
 Make example for this keyboard (after setting up your build environment):
 
     make freyr:default
 
+Flashing example for this keyboard:
+
+    make freyr:default:flash
+
 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).
diff --git a/qmk/keyboards/freyr/rules.mk b/qmk/keyboards/freyr/rules.mk
index 20f9cd13..bfd0c526 100644
--- a/qmk/keyboards/freyr/rules.mk
+++ b/qmk/keyboards/freyr/rules.mk
@@ -2,34 +2,23 @@
 MCU = atmega32u4
 
 # Bootloader selection
-#   Teensy       halfkay
-#   Pro Micro    caterina
-#   Atmel DFU    atmel-dfu
-#   LUFA DFU     lufa-dfu
-#   QMK DFU      qmk-dfu
-#   ATmega32A    bootloadHID
-#   ATmega328P   USBasp
 BOOTLOADER = atmel-dfu
 
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = lite      # Virtual DIP switch configuration
-MOUSEKEY_ENABLE = no       # Mouse keys
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no        # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = yes        # Console for debug
 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 = yes            # USB Nkey Rollover
-BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality
+NKRO_ENABLE = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-MIDI_ENABLE = no            # MIDI support
-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
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
 
-# Supported layouts
 LAYOUTS = tkl_ansi tkl_iso
diff --git a/qmk/keyboards/gami_studio/lex60/config.h b/qmk/keyboards/gami_studio/lex60/config.h
index 8a038ccc..7b6edb36 100644
--- a/qmk/keyboards/gami_studio/lex60/config.h
+++ b/qmk/keyboards/gami_studio/lex60/config.h
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 Maarten Dekkers <maartenwut@gmail.com>
+Copyright 2019 Evy Dekkers
 
 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
@@ -23,7 +23,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define VENDOR_ID       0x7353
 #define PRODUCT_ID      0x0160
 #define DEVICE_VER      0x0001
-#define MANUFACTURER    Maartenwut
+#define MANUFACTURER    Evyd13
 #define PRODUCT         Lex60
 #define DESCRIPTION     A 60% PCB
 
diff --git a/qmk/keyboards/geekboards/macropad_v2/chconf.h b/qmk/keyboards/geekboards/macropad_v2/chconf.h
new file mode 100644
index 00000000..03f63da3
--- /dev/null
+++ b/qmk/keyboards/geekboards/macropad_v2/chconf.h
@@ -0,0 +1,714 @@
+/*
+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+/**
+ * @file    rt/templates/chconf.h
+ * @brief   Configuration file template.
+ * @details A copy of this file must be placed in each project directory, it
+ *          contains the application specific kernel settings.
+ *
+ * @addtogroup config
+ * @details Kernel related settings and hooks.
+ * @{
+ */
+
+#ifndef CHCONF_H
+#define CHCONF_H
+
+#define _CHIBIOS_RT_CONF_
+#define _CHIBIOS_RT_CONF_VER_6_0_
+
+/*===========================================================================*/
+/**
+ * @name System timers settings
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   System time counter resolution.
+ * @note    Allowed values are 16 or 32 bits.
+ */
+#if !defined(CH_CFG_ST_RESOLUTION)
+#define CH_CFG_ST_RESOLUTION                32
+#endif
+
+/**
+ * @brief   System tick frequency.
+ * @details Frequency of the system timer that drives the system ticks. This
+ *          setting also defines the system tick time unit.
+ */
+#if !defined(CH_CFG_ST_FREQUENCY)
+#define CH_CFG_ST_FREQUENCY                 10000
+#endif
+
+/**
+ * @brief   Time intervals data size.
+ * @note    Allowed values are 16, 32 or 64 bits.
+ */
+#if !defined(CH_CFG_INTERVALS_SIZE)
+#define CH_CFG_INTERVALS_SIZE               32
+#endif
+
+/**
+ * @brief   Time types data size.
+ * @note    Allowed values are 16 or 32 bits.
+ */
+#if !defined(CH_CFG_TIME_TYPES_SIZE)
+#define CH_CFG_TIME_TYPES_SIZE              32
+#endif
+
+/**
+ * @brief   Time delta constant for the tick-less mode.
+ * @note    If this value is zero then the system uses the classic
+ *          periodic tick. This value represents the minimum number
+ *          of ticks that is safe to specify in a timeout directive.
+ *          The value one is not valid, timeouts are rounded up to
+ *          this value.
+ */
+#if !defined(CH_CFG_ST_TIMEDELTA)
+#define CH_CFG_ST_TIMEDELTA                 2
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Kernel parameters and options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   Round robin interval.
+ * @details This constant is the number of system ticks allowed for the
+ *          threads before preemption occurs. Setting this value to zero
+ *          disables the preemption for threads with equal priority and the
+ *          round robin becomes cooperative. Note that higher priority
+ *          threads can still preempt, the kernel is always preemptive.
+ * @note    Disabling the round robin preemption makes the kernel more compact
+ *          and generally faster.
+ * @note    The round robin preemption is not supported in tickless mode and
+ *          must be set to zero in that case.
+ */
+#if !defined(CH_CFG_TIME_QUANTUM)
+#define CH_CFG_TIME_QUANTUM                 0
+#endif
+
+/**
+ * @brief   Managed RAM size.
+ * @details Size of the RAM area to be managed by the OS. If set to zero
+ *          then the whole available RAM is used. The core memory is made
+ *          available to the heap allocator and/or can be used directly through
+ *          the simplified core memory allocator.
+ *
+ * @note    In order to let the OS manage the whole RAM the linker script must
+ *          provide the @p __heap_base__ and @p __heap_end__ symbols.
+ * @note    Requires @p CH_CFG_USE_MEMCORE.
+ */
+#if !defined(CH_CFG_MEMCORE_SIZE)
+#define CH_CFG_MEMCORE_SIZE                 0
+#endif
+
+/**
+ * @brief   Idle thread automatic spawn suppression.
+ * @details When this option is activated the function @p chSysInit()
+ *          does not spawn the idle thread. The application @p main()
+ *          function becomes the idle thread and must implement an
+ *          infinite loop.
+ */
+#if !defined(CH_CFG_NO_IDLE_THREAD)
+#define CH_CFG_NO_IDLE_THREAD               FALSE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Performance options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   OS optimization.
+ * @details If enabled then time efficient rather than space efficient code
+ *          is used when two possible implementations exist.
+ *
+ * @note    This is not related to the compiler optimization options.
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_OPTIMIZE_SPEED)
+#define CH_CFG_OPTIMIZE_SPEED               FALSE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Subsystem options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   Time Measurement APIs.
+ * @details If enabled then the time measurement APIs are included in
+ *          the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_TM)
+#define CH_CFG_USE_TM                       FALSE
+#endif
+
+/**
+ * @brief   Threads registry APIs.
+ * @details If enabled then the registry APIs are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_REGISTRY)
+#define CH_CFG_USE_REGISTRY                 TRUE
+#endif
+
+/**
+ * @brief   Threads synchronization APIs.
+ * @details If enabled then the @p chThdWait() function is included in
+ *          the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_WAITEXIT)
+#define CH_CFG_USE_WAITEXIT                 TRUE
+#endif
+
+/**
+ * @brief   Semaphores APIs.
+ * @details If enabled then the Semaphores APIs are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_SEMAPHORES)
+#define CH_CFG_USE_SEMAPHORES               TRUE
+#endif
+
+/**
+ * @brief   Semaphores queuing mode.
+ * @details If enabled then the threads are enqueued on semaphores by
+ *          priority rather than in FIFO order.
+ *
+ * @note    The default is @p FALSE. Enable this if you have special
+ *          requirements.
+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.
+ */
+#if !defined(CH_CFG_USE_SEMAPHORES_PRIORITY)
+#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE
+#endif
+
+/**
+ * @brief   Mutexes APIs.
+ * @details If enabled then the mutexes APIs are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_MUTEXES)
+#define CH_CFG_USE_MUTEXES                  TRUE
+#endif
+
+/**
+ * @brief   Enables recursive behavior on mutexes.
+ * @note    Recursive mutexes are heavier and have an increased
+ *          memory footprint.
+ *
+ * @note    The default is @p FALSE.
+ * @note    Requires @p CH_CFG_USE_MUTEXES.
+ */
+#if !defined(CH_CFG_USE_MUTEXES_RECURSIVE)
+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE
+#endif
+
+/**
+ * @brief   Conditional Variables APIs.
+ * @details If enabled then the conditional variables APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_MUTEXES.
+ */
+#if !defined(CH_CFG_USE_CONDVARS)
+#define CH_CFG_USE_CONDVARS                 TRUE
+#endif
+
+/**
+ * @brief   Conditional Variables APIs with timeout.
+ * @details If enabled then the conditional variables APIs with timeout
+ *          specification are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_CONDVARS.
+ */
+#if !defined(CH_CFG_USE_CONDVARS_TIMEOUT)
+#define CH_CFG_USE_CONDVARS_TIMEOUT         FALSE
+#endif
+
+/**
+ * @brief   Events Flags APIs.
+ * @details If enabled then the event flags APIs are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_EVENTS)
+#define CH_CFG_USE_EVENTS                   TRUE
+#endif
+
+/**
+ * @brief   Events Flags APIs with timeout.
+ * @details If enabled then the events APIs with timeout specification
+ *          are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_EVENTS.
+ */
+#if !defined(CH_CFG_USE_EVENTS_TIMEOUT)
+#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE
+#endif
+
+/**
+ * @brief   Synchronous Messages APIs.
+ * @details If enabled then the synchronous messages APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_MESSAGES)
+#define CH_CFG_USE_MESSAGES                 TRUE
+#endif
+
+/**
+ * @brief   Synchronous Messages queuing mode.
+ * @details If enabled then messages are served by priority rather than in
+ *          FIFO order.
+ *
+ * @note    The default is @p FALSE. Enable this if you have special
+ *          requirements.
+ * @note    Requires @p CH_CFG_USE_MESSAGES.
+ */
+#if !defined(CH_CFG_USE_MESSAGES_PRIORITY)
+#define CH_CFG_USE_MESSAGES_PRIORITY        FALSE
+#endif
+
+/**
+ * @brief   Mailboxes APIs.
+ * @details If enabled then the asynchronous messages (mailboxes) APIs are
+ *          included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.
+ */
+#if !defined(CH_CFG_USE_MAILBOXES)
+#define CH_CFG_USE_MAILBOXES                TRUE
+#endif
+
+/**
+ * @brief   Core Memory Manager APIs.
+ * @details If enabled then the core memory manager APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_MEMCORE)
+#define CH_CFG_USE_MEMCORE                  TRUE
+#endif
+
+/**
+ * @brief   Heap Allocator APIs.
+ * @details If enabled then the memory heap allocator APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_MEMCORE and either @p CH_CFG_USE_MUTEXES or
+ *          @p CH_CFG_USE_SEMAPHORES.
+ * @note    Mutexes are recommended.
+ */
+#if !defined(CH_CFG_USE_HEAP)
+#define CH_CFG_USE_HEAP                     FALSE
+#endif
+
+/**
+ * @brief   Memory Pools Allocator APIs.
+ * @details If enabled then the memory pools allocator APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_MEMPOOLS)
+#define CH_CFG_USE_MEMPOOLS                 FALSE
+#endif
+
+/**
+ * @brief   Objects FIFOs APIs.
+ * @details If enabled then the objects FIFOs APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_OBJ_FIFOS)
+#define CH_CFG_USE_OBJ_FIFOS                FALSE
+#endif
+
+/**
+ * @brief   Pipes APIs.
+ * @details If enabled then the pipes APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_PIPES)
+#define CH_CFG_USE_PIPES                    FALSE
+#endif
+
+/**
+ * @brief   Dynamic Threads APIs.
+ * @details If enabled then the dynamic threads creation APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_WAITEXIT.
+ * @note    Requires @p CH_CFG_USE_HEAP and/or @p CH_CFG_USE_MEMPOOLS.
+ */
+#if !defined(CH_CFG_USE_DYNAMIC)
+#define CH_CFG_USE_DYNAMIC                  FALSE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Objects factory options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   Objects Factory APIs.
+ * @details If enabled then the objects factory APIs are included in the
+ *          kernel.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_CFG_USE_FACTORY)
+#define CH_CFG_USE_FACTORY                  FALSE
+#endif
+
+/**
+ * @brief   Maximum length for object names.
+ * @details If the specified length is zero then the name is stored by
+ *          pointer but this could have unintended side effects.
+ */
+#if !defined(CH_CFG_FACTORY_MAX_NAMES_LENGTH)
+#define CH_CFG_FACTORY_MAX_NAMES_LENGTH     8
+#endif
+
+/**
+ * @brief   Enables the registry of generic objects.
+ */
+#if !defined(CH_CFG_FACTORY_OBJECTS_REGISTRY)
+#define CH_CFG_FACTORY_OBJECTS_REGISTRY     FALSE
+#endif
+
+/**
+ * @brief   Enables factory for generic buffers.
+ */
+#if !defined(CH_CFG_FACTORY_GENERIC_BUFFERS)
+#define CH_CFG_FACTORY_GENERIC_BUFFERS      FALSE
+#endif
+
+/**
+ * @brief   Enables factory for semaphores.
+ */
+#if !defined(CH_CFG_FACTORY_SEMAPHORES)
+#define CH_CFG_FACTORY_SEMAPHORES           FALSE
+#endif
+
+/**
+ * @brief   Enables factory for mailboxes.
+ */
+#if !defined(CH_CFG_FACTORY_MAILBOXES)
+#define CH_CFG_FACTORY_MAILBOXES            FALSE
+#endif
+
+/**
+ * @brief   Enables factory for objects FIFOs.
+ */
+#if !defined(CH_CFG_FACTORY_OBJ_FIFOS)
+#define CH_CFG_FACTORY_OBJ_FIFOS            FALSE
+#endif
+
+/**
+ * @brief   Enables factory for Pipes.
+ */
+#if !defined(CH_CFG_FACTORY_PIPES) || defined(__DOXYGEN__)
+#define CH_CFG_FACTORY_PIPES                FALSE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Debug options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   Debug option, kernel statistics.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_STATISTICS)
+#define CH_DBG_STATISTICS                   FALSE
+#endif
+
+/**
+ * @brief   Debug option, system state check.
+ * @details If enabled the correct call protocol for system APIs is checked
+ *          at runtime.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_SYSTEM_STATE_CHECK)
+#define CH_DBG_SYSTEM_STATE_CHECK           FALSE
+#endif
+
+/**
+ * @brief   Debug option, parameters checks.
+ * @details If enabled then the checks on the API functions input
+ *          parameters are activated.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_ENABLE_CHECKS)
+#define CH_DBG_ENABLE_CHECKS                FALSE
+#endif
+
+/**
+ * @brief   Debug option, consistency checks.
+ * @details If enabled then all the assertions in the kernel code are
+ *          activated. This includes consistency checks inside the kernel,
+ *          runtime anomalies and port-defined checks.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_ENABLE_ASSERTS)
+#define CH_DBG_ENABLE_ASSERTS               FALSE
+#endif
+
+/**
+ * @brief   Debug option, trace buffer.
+ * @details If enabled then the trace buffer is activated.
+ *
+ * @note    The default is @p CH_DBG_TRACE_MASK_DISABLED.
+ */
+#if !defined(CH_DBG_TRACE_MASK)
+#define CH_DBG_TRACE_MASK                   CH_DBG_TRACE_MASK_DISABLED
+#endif
+
+/**
+ * @brief   Trace buffer entries.
+ * @note    The trace buffer is only allocated if @p CH_DBG_TRACE_MASK is
+ *          different from @p CH_DBG_TRACE_MASK_DISABLED.
+ */
+#if !defined(CH_DBG_TRACE_BUFFER_SIZE)
+#define CH_DBG_TRACE_BUFFER_SIZE            128
+#endif
+
+/**
+ * @brief   Debug option, stack checks.
+ * @details If enabled then a runtime stack check is performed.
+ *
+ * @note    The default is @p FALSE.
+ * @note    The stack check is performed in a architecture/port dependent way.
+ *          It may not be implemented or some ports.
+ * @note    The default failure mode is to halt the system with the global
+ *          @p panic_msg variable set to @p NULL.
+ */
+#if !defined(CH_DBG_ENABLE_STACK_CHECK)
+#define CH_DBG_ENABLE_STACK_CHECK           FALSE
+#endif
+
+/**
+ * @brief   Debug option, stacks initialization.
+ * @details If enabled then the threads working area is filled with a byte
+ *          value when a thread is created. This can be useful for the
+ *          runtime measurement of the used stack.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_FILL_THREADS)
+#define CH_DBG_FILL_THREADS                 FALSE
+#endif
+
+/**
+ * @brief   Debug option, threads profiling.
+ * @details If enabled then a field is added to the @p thread_t structure that
+ *          counts the system ticks occurred while executing the thread.
+ *
+ * @note    The default is @p FALSE.
+ * @note    This debug option is not currently compatible with the
+ *          tickless mode.
+ */
+#if !defined(CH_DBG_THREADS_PROFILING)
+#define CH_DBG_THREADS_PROFILING            FALSE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Kernel hooks
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   System structure extension.
+ * @details User fields added to the end of the @p ch_system_t structure.
+ */
+#define CH_CFG_SYSTEM_EXTRA_FIELDS                                          \
+  /* Add threads custom fields here.*/
+
+/**
+ * @brief   System initialization hook.
+ * @details User initialization code added to the @p chSysInit() function
+ *          just before interrupts are enabled globally.
+ */
+#define CH_CFG_SYSTEM_INIT_HOOK() {                                         \
+  /* Add threads initialization code here.*/                                \
+}
+
+/**
+ * @brief   Threads descriptor structure extension.
+ * @details User fields added to the end of the @p thread_t structure.
+ */
+#define CH_CFG_THREAD_EXTRA_FIELDS                                          \
+  /* Add threads custom fields here.*/
+
+/**
+ * @brief   Threads initialization hook.
+ * @details User initialization code added to the @p _thread_init() function.
+ *
+ * @note    It is invoked from within @p _thread_init() and implicitly from all
+ *          the threads creation APIs.
+ */
+#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \
+  /* Add threads initialization code here.*/                                \
+}
+
+/**
+ * @brief   Threads finalization hook.
+ * @details User finalization code added to the @p chThdExit() API.
+ */
+#define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \
+  /* Add threads finalization code here.*/                                  \
+}
+
+/**
+ * @brief   Context switch hook.
+ * @details This hook is invoked just before switching between threads.
+ */
+#define CH_CFG_CONTEXT_SWITCH_HOOK(ntp, otp) {                              \
+  /* Context switch code here.*/                                            \
+}
+
+/**
+ * @brief   ISR enter hook.
+ */
+#define CH_CFG_IRQ_PROLOGUE_HOOK() {                                        \
+  /* IRQ prologue code here.*/                                              \
+}
+
+/**
+ * @brief   ISR exit hook.
+ */
+#define CH_CFG_IRQ_EPILOGUE_HOOK() {                                        \
+  /* IRQ epilogue code here.*/                                              \
+}
+
+/**
+ * @brief   Idle thread enter hook.
+ * @note    This hook is invoked within a critical zone, no OS functions
+ *          should be invoked from here.
+ * @note    This macro can be used to activate a power saving mode.
+ */
+#define CH_CFG_IDLE_ENTER_HOOK() {                                          \
+  /* Idle-enter code here.*/                                                \
+}
+
+/**
+ * @brief   Idle thread leave hook.
+ * @note    This hook is invoked within a critical zone, no OS functions
+ *          should be invoked from here.
+ * @note    This macro can be used to deactivate a power saving mode.
+ */
+#define CH_CFG_IDLE_LEAVE_HOOK() {                                          \
+  /* Idle-leave code here.*/                                                \
+}
+
+/**
+ * @brief   Idle Loop hook.
+ * @details This hook is continuously invoked by the idle thread loop.
+ */
+#define CH_CFG_IDLE_LOOP_HOOK() {                                           \
+  /* Idle loop code here.*/                                                 \
+}
+
+/**
+ * @brief   System tick event hook.
+ * @details This hook is invoked in the system tick handler immediately
+ *          after processing the virtual timers queue.
+ */
+#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \
+  /* System tick event code here.*/                                         \
+}
+
+/**
+ * @brief   System halt hook.
+ * @details This hook is invoked in case to a system halting error before
+ *          the system is halted.
+ */
+#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \
+  /* System halt code here.*/                                               \
+}
+
+/**
+ * @brief   Trace hook.
+ * @details This hook is invoked each time a new record is written in the
+ *          trace buffer.
+ */
+#define CH_CFG_TRACE_HOOK(tep) {                                            \
+  /* Trace code here.*/                                                     \
+}
+
+/** @} */
+
+/*===========================================================================*/
+/* Port-specific settings (override port settings defaulted in chcore.h).    */
+/*===========================================================================*/
+
+#endif  /* CHCONF_H */
+
+/** @} */
diff --git a/qmk/keyboards/geekboards/macropad_v2/config.h b/qmk/keyboards/geekboards/macropad_v2/config.h
new file mode 100644
index 00000000..5f11cddd
--- /dev/null
+++ b/qmk/keyboards/geekboards/macropad_v2/config.h
@@ -0,0 +1,78 @@
+/* Copyright 2020 Geekboards ltd. (geekboards.ru / geekboards.de)
+ *
+ * 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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x0483
+#define PRODUCT_ID      0xA372
+#define DEVICE_VER      0x0002
+#define MANUFACTURER    GeekBoards
+#define PRODUCT         Macropad v2
+
+/* key matrix size */
+#define MATRIX_ROWS 2
+#define MATRIX_COLS 4
+
+#define DIRECT_PINS {{B13, B15, B3, B5}, {B12, B14, A13, B7}}
+#define UNUSED_PINS
+
+#define RGBLED_NUM 42
+#define DRIVER_LED_TOTAL 42
+#define RGB_DI_PIN A7
+
+// PWM RGB Underglow Defines
+#define WS2812_PWM_DRIVER PWMD3
+#define WS2812_PWM_CHANNEL 2
+#define WS2812_PWM_PAL_MODE 1
+#define WS2812_DMA_STREAM STM32_DMA1_STREAM3
+#define WS2812_DMA_CHANNEL 3
+
+#ifdef RGB_MATRIX_ENABLE
+#define RGB_MATRIX_KEYPRESSES 
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#define DISABLE_RGB_MATRIX_ALPHAS_MODS
+#define DISABLE_RGB_MATRIX_BAND_SAT
+#define DISABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#define DISABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#define DISABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#define DISABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#define DISABLE_RGB_MATRIX_CYCLE_OUT_IN
+#define DISABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#define DISABLE_RGB_MATRIX_CYCLE_SPIRAL
+#define DISABLE_RGB_MATRIX_RAINBOW_BEACON
+#define DISABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#define DISABLE_RGB_MATRIX_RAINDROPS
+#define DISABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#define DISABLE_RGB_MATRIX_DIGITAL_RAIN
+#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+
+#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_UP_DOWN
+#define RGB_MATRIX_STARTUP_SAT 255
+#define RGB_MATRIX_STARTUP_VAL 192
+#define RGB_MATRIX_STARTUP_SPD 30
+#endif //RGB_MATRIX_ENABLE
+
+#define RGB_DISABLE_WHEN_USB_SUSPENDED true
+#define WAIT_FOR_USB
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 3
+
+/* Bootmagic Lite key configuration */
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/geekboards/macropad_v2/halconf.h b/qmk/keyboards/geekboards/macropad_v2/halconf.h
new file mode 100644
index 00000000..adb1a907
--- /dev/null
+++ b/qmk/keyboards/geekboards/macropad_v2/halconf.h
@@ -0,0 +1,525 @@
+/*
+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+/**
+ * @file    templates/halconf.h
+ * @brief   HAL configuration header.
+ * @details HAL configuration file, this file allows to enable or disable the
+ *          various device drivers from your application. You may also use
+ *          this file in order to override the device drivers default settings.
+ *
+ * @addtogroup HAL_CONF
+ * @{
+ */
+
+#ifndef HALCONF_H
+#define HALCONF_H
+
+#define _CHIBIOS_HAL_CONF_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
+
+#include "mcuconf.h"
+
+/**
+ * @brief   Enables the PAL subsystem.
+ */
+#if !defined(HAL_USE_PAL) || defined(__DOXYGEN__)
+#define HAL_USE_PAL                         TRUE
+#endif
+
+/**
+ * @brief   Enables the ADC subsystem.
+ */
+#if !defined(HAL_USE_ADC) || defined(__DOXYGEN__)
+#define HAL_USE_ADC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the CAN subsystem.
+ */
+#if !defined(HAL_USE_CAN) || defined(__DOXYGEN__)
+#define HAL_USE_CAN                         FALSE
+#endif
+
+/**
+ * @brief   Enables the cryptographic subsystem.
+ */
+#if !defined(HAL_USE_CRY) || defined(__DOXYGEN__)
+#define HAL_USE_CRY                         FALSE
+#endif
+
+/**
+ * @brief   Enables the DAC subsystem.
+ */
+#if !defined(HAL_USE_DAC) || defined(__DOXYGEN__)
+#define HAL_USE_DAC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the GPT subsystem.
+ */
+#if !defined(HAL_USE_GPT) || defined(__DOXYGEN__)
+#define HAL_USE_GPT                         FALSE
+#endif
+
+/**
+ * @brief   Enables the I2C subsystem.
+ */
+#if !defined(HAL_USE_I2C) || defined(__DOXYGEN__)
+#define HAL_USE_I2C                         TRUE
+#endif
+
+/**
+ * @brief   Enables the I2S subsystem.
+ */
+#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)
+#define HAL_USE_I2S                         FALSE
+#endif
+
+/**
+ * @brief   Enables the ICU subsystem.
+ */
+#if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)
+#define HAL_USE_ICU                         FALSE
+#endif
+
+/**
+ * @brief   Enables the MAC subsystem.
+ */
+#if !defined(HAL_USE_MAC) || defined(__DOXYGEN__)
+#define HAL_USE_MAC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the MMC_SPI subsystem.
+ */
+#if !defined(HAL_USE_MMC_SPI) || defined(__DOXYGEN__)
+#define HAL_USE_MMC_SPI                     FALSE
+#endif
+
+/**
+ * @brief   Enables the PWM subsystem.
+ */
+#if !defined(HAL_USE_PWM) || defined(__DOXYGEN__)
+#define HAL_USE_PWM                         TRUE
+#endif
+
+/**
+ * @brief   Enables the RTC subsystem.
+ */
+#if !defined(HAL_USE_RTC) || defined(__DOXYGEN__)
+#define HAL_USE_RTC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the SDC subsystem.
+ */
+#if !defined(HAL_USE_SDC) || defined(__DOXYGEN__)
+#define HAL_USE_SDC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the SERIAL subsystem.
+ */
+#if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__)
+#define HAL_USE_SERIAL                      FALSE
+#endif
+
+/**
+ * @brief   Enables the SERIAL over USB subsystem.
+ */
+#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)
+#define HAL_USE_SERIAL_USB                  FALSE
+#endif
+
+/**
+ * @brief   Enables the SIO subsystem.
+ */
+#if !defined(HAL_USE_SIO) || defined(__DOXYGEN__)
+#define HAL_USE_SIO                         FALSE
+#endif
+
+/**
+ * @brief   Enables the SPI subsystem.
+ */
+#if !defined(HAL_USE_SPI) || defined(__DOXYGEN__)
+#define HAL_USE_SPI                         TRUE
+#endif
+
+/**
+ * @brief   Enables the TRNG subsystem.
+ */
+#if !defined(HAL_USE_TRNG) || defined(__DOXYGEN__)
+#define HAL_USE_TRNG                        FALSE
+#endif
+
+/**
+ * @brief   Enables the UART subsystem.
+ */
+#if !defined(HAL_USE_UART) || defined(__DOXYGEN__)
+#define HAL_USE_UART                        FALSE
+#endif
+
+/**
+ * @brief   Enables the USB subsystem.
+ */
+#if !defined(HAL_USE_USB) || defined(__DOXYGEN__)
+#define HAL_USE_USB                         TRUE
+#endif
+
+/**
+ * @brief   Enables the WDG subsystem.
+ */
+#if !defined(HAL_USE_WDG) || defined(__DOXYGEN__)
+#define HAL_USE_WDG                         FALSE
+#endif
+
+/**
+ * @brief   Enables the WSPI subsystem.
+ */
+#if !defined(HAL_USE_WSPI) || defined(__DOXYGEN__)
+#define HAL_USE_WSPI                        FALSE
+#endif
+
+/*===========================================================================*/
+/* PAL driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(PAL_USE_CALLBACKS) || defined(__DOXYGEN__)
+#define PAL_USE_CALLBACKS                   FALSE
+#endif
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(PAL_USE_WAIT) || defined(__DOXYGEN__)
+#define PAL_USE_WAIT                        FALSE
+#endif
+
+/*===========================================================================*/
+/* ADC driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(ADC_USE_WAIT) || defined(__DOXYGEN__)
+#define ADC_USE_WAIT                        TRUE
+#endif
+
+/**
+ * @brief   Enables the @p adcAcquireBus() and @p adcReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(ADC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define ADC_USE_MUTUAL_EXCLUSION            TRUE
+#endif
+
+/*===========================================================================*/
+/* CAN driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Sleep mode related APIs inclusion switch.
+ */
+#if !defined(CAN_USE_SLEEP_MODE) || defined(__DOXYGEN__)
+#define CAN_USE_SLEEP_MODE                  TRUE
+#endif
+
+/**
+ * @brief   Enforces the driver to use direct callbacks rather than OSAL events.
+ */
+#if !defined(CAN_ENFORCE_USE_CALLBACKS) || defined(__DOXYGEN__)
+#define CAN_ENFORCE_USE_CALLBACKS           FALSE
+#endif
+
+/*===========================================================================*/
+/* CRY driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables the SW fall-back of the cryptographic driver.
+ * @details When enabled, this option, activates a fall-back software
+ *          implementation for algorithms not supported by the underlying
+ *          hardware.
+ * @note    Fall-back implementations may not be present for all algorithms.
+ */
+#if !defined(HAL_CRY_USE_FALLBACK) || defined(__DOXYGEN__)
+#define HAL_CRY_USE_FALLBACK                FALSE
+#endif
+
+/**
+ * @brief   Makes the driver forcibly use the fall-back implementations.
+ */
+#if !defined(HAL_CRY_ENFORCE_FALLBACK) || defined(__DOXYGEN__)
+#define HAL_CRY_ENFORCE_FALLBACK            FALSE
+#endif
+
+/*===========================================================================*/
+/* DAC driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(DAC_USE_WAIT) || defined(__DOXYGEN__)
+#define DAC_USE_WAIT                        TRUE
+#endif
+
+/**
+ * @brief   Enables the @p dacAcquireBus() and @p dacReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(DAC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define DAC_USE_MUTUAL_EXCLUSION            TRUE
+#endif
+
+/*===========================================================================*/
+/* I2C driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables the mutual exclusion APIs on the I2C bus.
+ */
+#if !defined(I2C_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define I2C_USE_MUTUAL_EXCLUSION            TRUE
+#endif
+
+/*===========================================================================*/
+/* MAC driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables the zero-copy API.
+ */
+#if !defined(MAC_USE_ZERO_COPY) || defined(__DOXYGEN__)
+#define MAC_USE_ZERO_COPY                   FALSE
+#endif
+
+/**
+ * @brief   Enables an event sources for incoming packets.
+ */
+#if !defined(MAC_USE_EVENTS) || defined(__DOXYGEN__)
+#define MAC_USE_EVENTS                      TRUE
+#endif
+
+/*===========================================================================*/
+/* MMC_SPI driver related settings.                                          */
+/*===========================================================================*/
+
+/**
+ * @brief   Delays insertions.
+ * @details If enabled this options inserts delays into the MMC waiting
+ *          routines releasing some extra CPU time for the threads with
+ *          lower priority, this may slow down the driver a bit however.
+ *          This option is recommended also if the SPI driver does not
+ *          use a DMA channel and heavily loads the CPU.
+ */
+#if !defined(MMC_NICE_WAITING) || defined(__DOXYGEN__)
+#define MMC_NICE_WAITING                    TRUE
+#endif
+
+/*===========================================================================*/
+/* SDC driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Number of initialization attempts before rejecting the card.
+ * @note    Attempts are performed at 10mS intervals.
+ */
+#if !defined(SDC_INIT_RETRY) || defined(__DOXYGEN__)
+#define SDC_INIT_RETRY                      100
+#endif
+
+/**
+ * @brief   Include support for MMC cards.
+ * @note    MMC support is not yet implemented so this option must be kept
+ *          at @p FALSE.
+ */
+#if !defined(SDC_MMC_SUPPORT) || defined(__DOXYGEN__)
+#define SDC_MMC_SUPPORT                     FALSE
+#endif
+
+/**
+ * @brief   Delays insertions.
+ * @details If enabled this options inserts delays into the MMC waiting
+ *          routines releasing some extra CPU time for the threads with
+ *          lower priority, this may slow down the driver a bit however.
+ */
+#if !defined(SDC_NICE_WAITING) || defined(__DOXYGEN__)
+#define SDC_NICE_WAITING                    TRUE
+#endif
+
+/**
+ * @brief   OCR initialization constant for V20 cards.
+ */
+#if !defined(SDC_INIT_OCR_V20) || defined(__DOXYGEN__)
+#define SDC_INIT_OCR_V20                    0x50FF8000U
+#endif
+
+/**
+ * @brief   OCR initialization constant for non-V20 cards.
+ */
+#if !defined(SDC_INIT_OCR) || defined(__DOXYGEN__)
+#define SDC_INIT_OCR                        0x80100000U
+#endif
+
+/*===========================================================================*/
+/* SERIAL driver related settings.                                           */
+/*===========================================================================*/
+
+/**
+ * @brief   Default bit rate.
+ * @details Configuration parameter, this is the baud rate selected for the
+ *          default configuration.
+ */
+#if !defined(SERIAL_DEFAULT_BITRATE) || defined(__DOXYGEN__)
+#define SERIAL_DEFAULT_BITRATE              38400
+#endif
+
+/**
+ * @brief   Serial buffers size.
+ * @details Configuration parameter, you can change the depth of the queue
+ *          buffers depending on the requirements of your application.
+ * @note    The default is 16 bytes for both the transmission and receive
+ *          buffers.
+ */
+#if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__)
+#define SERIAL_BUFFERS_SIZE                 16
+#endif
+
+/*===========================================================================*/
+/* SERIAL_USB driver related setting.                                        */
+/*===========================================================================*/
+
+/**
+ * @brief   Serial over USB buffers size.
+ * @details Configuration parameter, the buffer size must be a multiple of
+ *          the USB data endpoint maximum packet size.
+ * @note    The default is 256 bytes for both the transmission and receive
+ *          buffers.
+ */
+#if !defined(SERIAL_USB_BUFFERS_SIZE) || defined(__DOXYGEN__)
+#define SERIAL_USB_BUFFERS_SIZE             1
+#endif
+
+/**
+ * @brief   Serial over USB number of buffers.
+ * @note    The default is 2 buffers.
+ */
+#if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
+#define SERIAL_USB_BUFFERS_NUMBER           2
+#endif
+
+/*===========================================================================*/
+/* SPI driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(SPI_USE_WAIT) || defined(__DOXYGEN__)
+#define SPI_USE_WAIT                        TRUE
+#endif
+
+/**
+ * @brief   Enables circular transfers APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(SPI_USE_CIRCULAR) || defined(__DOXYGEN__)
+#define SPI_USE_CIRCULAR                    FALSE
+#endif
+
+
+/**
+ * @brief   Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(SPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define SPI_USE_MUTUAL_EXCLUSION            TRUE
+#endif
+
+/**
+ * @brief   Handling method for SPI CS line.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(SPI_SELECT_MODE) || defined(__DOXYGEN__)
+#define SPI_SELECT_MODE                     SPI_SELECT_MODE_PAD
+#endif
+
+/*===========================================================================*/
+/* UART driver related settings.                                             */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(UART_USE_WAIT) || defined(__DOXYGEN__)
+#define UART_USE_WAIT                       FALSE
+#endif
+
+/**
+ * @brief   Enables the @p uartAcquireBus() and @p uartReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(UART_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define UART_USE_MUTUAL_EXCLUSION           FALSE
+#endif
+
+/*===========================================================================*/
+/* USB driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(USB_USE_WAIT) || defined(__DOXYGEN__)
+#define USB_USE_WAIT                        TRUE
+#endif
+
+/*===========================================================================*/
+/* WSPI driver related settings.                                             */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(WSPI_USE_WAIT) || defined(__DOXYGEN__)
+#define WSPI_USE_WAIT                       TRUE
+#endif
+
+/**
+ * @brief   Enables the @p wspiAcquireBus() and @p wspiReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(WSPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define WSPI_USE_MUTUAL_EXCLUSION           TRUE
+#endif
+
+#endif /* HALCONF_H */
+
+/** @} */
diff --git a/qmk/keyboards/geekboards/macropad_v2/info.json b/qmk/keyboards/geekboards/macropad_v2/info.json
new file mode 100644
index 00000000..144fbde1
--- /dev/null
+++ b/qmk/keyboards/geekboards/macropad_v2/info.json
@@ -0,0 +1,53 @@
+{
+  "keyboard_name": "macropad_v2",
+  "url": "https://geekboards.ru/",
+  "maintainer": "ruddy17",
+  "width": 4,
+  "height": 2,
+  "layouts": {
+    "LAYOUT": {
+      "layout": [
+        {
+          "label": "K0",
+          "x": 0,
+          "y": 0
+        },
+        {
+          "label": "K1",
+          "x": 1,
+          "y": 0
+        },
+        {
+          "label": "K2",
+          "x": 2,
+          "y": 0
+        },
+        {
+          "label": "K3",
+          "x": 3,
+          "y": 0
+        },
+        {
+          "label": "K4",
+          "x": 0,
+          "y": 1
+        },
+        {
+          "label": "K5",
+          "x": 1,
+          "y": 1
+        },
+        {
+          "label": "K6",
+          "x": 2,
+          "y": 1
+        },
+        {
+          "label": "K7",
+          "x": 3,
+          "y": 1
+        }
+      ]
+    }
+  }
+}
diff --git a/qmk/keyboards/geekboards/macropad_v2/keymaps/default/keymap.c b/qmk/keyboards/geekboards/macropad_v2/keymaps/default/keymap.c
new file mode 100644
index 00000000..26ba55e6
--- /dev/null
+++ b/qmk/keyboards/geekboards/macropad_v2/keymaps/default/keymap.c
@@ -0,0 +1,23 @@
+/* Copyright 2020 Geekboards ltd. (geekboards.ru / geekboards.de)
+ *
+ * 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 keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    LAYOUT_ortho_2x4(
+        KC_1, KC_2, KC_3, KC_4,
+        KC_5, KC_6, KC_7, KC_8
+    )
+};
diff --git a/qmk/keyboards/geekboards/macropad_v2/keymaps/default/readme.md b/qmk/keyboards/geekboards/macropad_v2/keymaps/default/readme.md
new file mode 100644
index 00000000..8846bd59
--- /dev/null
+++ b/qmk/keyboards/geekboards/macropad_v2/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for Geekboards Macropad v2
diff --git a/qmk/keyboards/geekboards/macropad_v2/keymaps/via/config.h b/qmk/keyboards/geekboards/macropad_v2/keymaps/via/config.h
new file mode 100644
index 00000000..9d75edbe
--- /dev/null
+++ b/qmk/keyboards/geekboards/macropad_v2/keymaps/via/config.h
@@ -0,0 +1,2 @@
+#define DYNAMIC_KEYMAP_LAYER_COUNT 4
+#define VIA_QMK_RGBLIGHT_ENABLE
diff --git a/qmk/keyboards/geekboards/macropad_v2/keymaps/via/keymap.c b/qmk/keyboards/geekboards/macropad_v2/keymaps/via/keymap.c
new file mode 100644
index 00000000..b0e5b932
--- /dev/null
+++ b/qmk/keyboards/geekboards/macropad_v2/keymaps/via/keymap.c
@@ -0,0 +1,83 @@
+/* Copyright 2020 Geekboards ltd. (geekboards.ru / geekboards.de)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+#include <string.h>
+
+bool is_alt_tab_active = false;
+uint16_t alt_tab_timer = 0;
+
+enum custom_keycodes {
+  ALT_TAB = USER00,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT_ortho_2x4(
+        LT(1, KC_MUTE), KC_VOLD, KC_VOLU, MACRO00,
+        ALT_TAB,        KC_MPRV, KC_MNXT, KC_MPLY
+    ),
+    [1] = LAYOUT_ortho_2x4(
+        KC_TRNS, RGB_VAI, RGB_HUI, RGB_SPI,
+        RGB_MOD, RGB_VAD, RGB_HUD, RGB_SPD
+    ),
+    [2] = LAYOUT_ortho_2x4(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [3] = LAYOUT_ortho_2x4(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
+
+//------------ SUPER ALTTAB ---------------
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {               
+        case ALT_TAB:
+            if (record->event.pressed) {
+                if (!is_alt_tab_active) {
+                    is_alt_tab_active = true;
+                    register_code(KC_LALT);
+                }
+                alt_tab_timer = timer_read();
+                register_code(KC_TAB);
+            } else {
+                unregister_code(KC_TAB);
+            }
+            break;
+    }
+    return true;
+}
+
+void matrix_scan_user(void) {     
+    if (is_alt_tab_active) {
+        if (timer_elapsed(alt_tab_timer) > 1000) {
+            unregister_code(KC_LALT);
+            is_alt_tab_active = false;
+        }
+    }
+}
+
+void keyboard_post_init_user(void) {
+    // set default macro after reset (alt-tab)
+    uint8_t get[16] = {0};
+    uint8_t zero[16] = {0};
+    dynamic_keymap_macro_get_buffer(0,16,get);
+    if(memcmp(get, zero, 16) == 0)
+    {
+        uint8_t set[] = {2, 0xe2, 2, 0xe1, 3, 0xe1, 3, 0xe2, 0};
+        dynamic_keymap_macro_set_buffer(0, 9, set);
+    }
+}
\ No newline at end of file
diff --git a/qmk/keyboards/geekboards/macropad_v2/keymaps/via/readme.md b/qmk/keyboards/geekboards/macropad_v2/keymaps/via/readme.md
new file mode 100644
index 00000000..79130f4d
--- /dev/null
+++ b/qmk/keyboards/geekboards/macropad_v2/keymaps/via/readme.md
@@ -0,0 +1,3 @@
+# Geekboards Macropad v2 - VIA layout
+
+Flash with this layout to use [VIA](https://caniusevia.com/) for customising layout.
diff --git a/qmk/keyboards/geekboards/macropad_v2/keymaps/via/rules.mk b/qmk/keyboards/geekboards/macropad_v2/keymaps/via/rules.mk
new file mode 100644
index 00000000..f2208a3b
--- /dev/null
+++ b/qmk/keyboards/geekboards/macropad_v2/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+# LTO_ENABLE = yes
diff --git a/qmk/keyboards/geekboards/macropad_v2/macropad_v2.c b/qmk/keyboards/geekboards/macropad_v2/macropad_v2.c
new file mode 100644
index 00000000..df8581cc
--- /dev/null
+++ b/qmk/keyboards/geekboards/macropad_v2/macropad_v2.c
@@ -0,0 +1,65 @@
+/* Copyright 2020 Geekboards ltd. (geekboards.ru / geekboards.de)
+ *
+ * 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
+
+#ifdef RGB_MATRIX_ENABLE
+led_config_t g_led_config = { {
+    // Key Matrix to LED Index
+    {13,19,20,26}, {6,0,38,33},
+}, {
+    // LED Index to Physical Position
+    {85,46},
+    {85,64},{67,64},{49,64},{31,64},{13,64},
+    {31,46},
+    {0,55},{0,46},{0,37},{0,27},{0,18},{0,9},
+    {31,18},
+    {13,0},{31,0},{49,0},{67,0},{85,0},
+    {85,18},{139,18},
+    {139,0},{157,0},{175,0},{193,0},{211,0},
+    {193,18},
+    {224,9},{224,18},{224,27},{224,37},{224,46},{224,55},
+    {193,46},
+    {211,64},{193,64},{175,64},{157,64},
+    {139,46},
+    {139,64},{121,64},{103,64},
+}, {
+    // LED Index to Flag, 2=backlight, 4=key
+    4,
+    2, 2, 2, 2, 2, 
+    4, 
+    2, 2, 2, 2, 2, 2,
+    4, 
+    2, 2, 2, 2, 2,
+    4, 4,
+    2, 2, 2, 2, 2,
+    4,
+    2, 2, 2, 2, 2, 2,
+    4, 
+    2, 2, 2, 2,
+    4,
+    2, 2, 2
+} };
+
+void suspend_power_down_kb(void) {
+    rgb_matrix_set_suspend_state(true);
+    suspend_power_down_user();
+}
+
+void suspend_wakeup_init_kb(void) {
+    rgb_matrix_set_suspend_state(false);
+    suspend_wakeup_init_user();
+}
+#endif
diff --git a/qmk/keyboards/geekboards/macropad_v2/macropad_v2.h b/qmk/keyboards/geekboards/macropad_v2/macropad_v2.h
new file mode 100644
index 00000000..7fe684de
--- /dev/null
+++ b/qmk/keyboards/geekboards/macropad_v2/macropad_v2.h
@@ -0,0 +1,26 @@
+/* Copyright 2020 Geekboards ltd. (geekboards.ru / geekboards.de)
+ *
+ * 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_ortho_2x4( \
+    k00, k01, k02, k03, \
+    k10, k11, k12, k13  \
+) { \
+    { k00, k01, k02, k03 }, \
+    { k10, k11, k12, k13 } \
+}
diff --git a/qmk/keyboards/geekboards/macropad_v2/mcuconf.h b/qmk/keyboards/geekboards/macropad_v2/mcuconf.h
new file mode 100644
index 00000000..271bd570
--- /dev/null
+++ b/qmk/keyboards/geekboards/macropad_v2/mcuconf.h
@@ -0,0 +1,178 @@
+/*
+    ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
+/*
+ * STM32F0xx drivers configuration.
+ * The following settings override the default settings present in
+ * the various device driver implementation headers.
+ * Note that the settings for each driver only have effect if the whole
+ * driver is enabled in halconf.h.
+ *
+ * IRQ priorities:
+ * 3...0       Lowest...Highest.
+ *
+ * DMA priorities:
+ * 0...3        Lowest...Highest.
+ */
+
+#define STM32F0xx_MCUCONF
+// #define STM32F070xB
+
+/*
+ * HAL driver system settings.
+ */
+#define STM32_NO_INIT                       FALSE
+#define STM32_PVD_ENABLE                    FALSE
+#define STM32_PLS                           STM32_PLS_LEV0
+#define STM32_HSI_ENABLED                   TRUE
+#define STM32_HSI14_ENABLED                 TRUE
+#define STM32_HSI48_ENABLED                 FALSE
+#define STM32_LSI_ENABLED                   TRUE
+#define STM32_HSE_ENABLED                   FALSE
+#define STM32_LSE_ENABLED                   FALSE
+#define STM32_SW                            STM32_SW_PLL
+#define STM32_PLLSRC                        STM32_PLLSRC_HSI_DIV2
+#define STM32_PREDIV_VALUE                  1
+#define STM32_PLLMUL_VALUE                  12
+#define STM32_HPRE                          STM32_HPRE_DIV1
+#define STM32_PPRE                          STM32_PPRE_DIV1
+#define STM32_ADCSW                         STM32_ADCSW_HSI14
+#define STM32_ADCPRE                        STM32_ADCPRE_DIV4
+#define STM32_MCOSEL                        STM32_MCOSEL_NOCLOCK
+#define STM32_ADCPRE                        STM32_ADCPRE_DIV4
+#define STM32_ADCSW                         STM32_ADCSW_HSI14
+#define STM32_USBSW                         STM32_USBSW_HSI48
+#define STM32_CECSW                         STM32_CECSW_HSI
+#define STM32_I2C1SW                        STM32_I2C1SW_HSI
+#define STM32_USART1SW                      STM32_USART1SW_PCLK
+#define STM32_RTCSEL                        STM32_RTCSEL_LSI
+
+/*
+ * ADC driver system settings.
+ */
+#define STM32_ADC_USE_ADC1                  FALSE
+#define STM32_ADC_ADC1_DMA_PRIORITY         2
+#define STM32_ADC_IRQ_PRIORITY              2
+#define STM32_ADC_ADC1_DMA_IRQ_PRIORITY     2
+
+/*
+ * EXT driver system settings.
+ */
+#define STM32_EXT_EXTI0_1_IRQ_PRIORITY      3
+#define STM32_EXT_EXTI2_3_IRQ_PRIORITY      3
+#define STM32_EXT_EXTI4_15_IRQ_PRIORITY     3
+#define STM32_EXT_EXTI16_IRQ_PRIORITY       3
+#define STM32_EXT_EXTI17_IRQ_PRIORITY       3
+
+/*
+ * GPT driver system settings.
+ */
+#define STM32_GPT_USE_TIM1                  FALSE
+#define STM32_GPT_USE_TIM2                  FALSE
+#define STM32_GPT_USE_TIM3                  FALSE
+#define STM32_GPT_USE_TIM14                 FALSE
+#define STM32_GPT_TIM1_IRQ_PRIORITY         2
+#define STM32_GPT_TIM2_IRQ_PRIORITY         2
+#define STM32_GPT_TIM3_IRQ_PRIORITY         2
+#define STM32_GPT_TIM14_IRQ_PRIORITY        2
+
+/*
+ * I2C driver system settings.
+ */
+#define STM32_I2C_USE_I2C1                  TRUE
+#define STM32_I2C_USE_I2C2                  FALSE
+#define STM32_I2C_BUSY_TIMEOUT              50
+#define STM32_I2C_I2C1_IRQ_PRIORITY         3
+#define STM32_I2C_I2C2_IRQ_PRIORITY         3
+#define STM32_I2C_USE_DMA                   TRUE
+#define STM32_I2C_I2C1_DMA_PRIORITY         1
+#define STM32_I2C_I2C2_DMA_PRIORITY         1
+#define STM32_I2C_I2C1_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 7)
+#define STM32_I2C_I2C1_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 6)
+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")
+
+/*
+ * ICU driver system settings.
+ */
+#define STM32_ICU_USE_TIM1                  FALSE
+#define STM32_ICU_USE_TIM2                  FALSE
+#define STM32_ICU_USE_TIM3                  FALSE
+#define STM32_ICU_TIM1_IRQ_PRIORITY         3
+#define STM32_ICU_TIM2_IRQ_PRIORITY         3
+#define STM32_ICU_TIM3_IRQ_PRIORITY         3
+
+/*
+ * PWM driver system settings.
+ */
+#define STM32_PWM_USE_ADVANCED              FALSE
+#define STM32_PWM_USE_TIM1                  FALSE
+#define STM32_PWM_USE_TIM2                  FALSE
+#define STM32_PWM_USE_TIM3                  TRUE
+#define STM32_PWM_TIM1_IRQ_PRIORITY         3
+#define STM32_PWM_TIM2_IRQ_PRIORITY         3
+#define STM32_PWM_TIM3_IRQ_PRIORITY         3
+
+/*
+ * SERIAL driver system settings.
+ */
+#define STM32_SERIAL_USE_USART1             FALSE
+#define STM32_SERIAL_USE_USART2             FALSE
+#define STM32_SERIAL_USART1_PRIORITY        3
+#define STM32_SERIAL_USART2_PRIORITY        3
+
+/*
+ * SPI driver system settings.
+ */
+#define STM32_SPI_USE_SPI1                  TRUE
+#define STM32_SPI_USE_SPI2                  FALSE
+#define STM32_SPI_SPI1_DMA_PRIORITY         1
+#define STM32_SPI_SPI2_DMA_PRIORITY         1
+#define STM32_SPI_SPI1_IRQ_PRIORITY         2
+#define STM32_SPI_SPI2_IRQ_PRIORITY         2
+#define STM32_SPI_SPI1_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 2)
+#define STM32_SPI_SPI1_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 3)
+// #define STM32_SPI_SPI2_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 4)
+// #define STM32_SPI_SPI2_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 5)
+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")
+
+/*
+ * ST driver system settings.
+ */
+#define STM32_ST_IRQ_PRIORITY               2
+#define STM32_ST_USE_TIMER                  2
+
+/*
+ * UART driver system settings.
+ */
+#define STM32_UART_USE_USART1               FALSE
+#define STM32_UART_USE_USART2               FALSE
+#define STM32_UART_USART1_IRQ_PRIORITY      3
+#define STM32_UART_USART2_IRQ_PRIORITY      3
+#define STM32_UART_USART1_DMA_PRIORITY      0
+#define STM32_UART_USART2_DMA_PRIORITY      0
+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")
+
+/*
+ * USB driver system settings.
+ */
+#define STM32_USB_USE_USB1                  TRUE
+#define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE
+#define STM32_USB_USB1_LP_IRQ_PRIORITY      3
+
+#endif /* _MCUCONF_H_ */
diff --git a/qmk/keyboards/geekboards/macropad_v2/readme.md b/qmk/keyboards/geekboards/macropad_v2/readme.md
new file mode 100644
index 00000000..45bb7df6
--- /dev/null
+++ b/qmk/keyboards/geekboards/macropad_v2/readme.md
@@ -0,0 +1,32 @@
+# geekboards/macropad_v2
+
+![Geekboards Macropad v2](https://github.com/ruddy17/my_files/blob/main/macropad_v2.jpg)
+
+8-keys macropad with CNC aluminium case, RGB LEDs for both backlight and switches, hot-swap connectors.
+
+Keyboard Maintainer: [ruddy17](https://github.com/ruddy17)  
+Hardware Supported: Geekboards Macropad v2, STM32F072C8T6  
+Hardware Availability: https://geekboards.ru
+
+Compile instruction for this keyboard (after setting up your build environment):
+
+    make geekboards/macropad_v2:via
+
+## Update firmware
+### Enter bootloader
+1. Press and hold leftmost button on top row (where ESC usually is)
+2. Plug in USB
+3. Keep holding the button for 3 more seconds
+4. Release the button
+
+Alternatively:
+1. Remove bottom cover
+1. On the pcb short together two contacts labeled BOOT0
+2. Plug in USB
+3. Release BOOT0
+
+### Flash
+
+    make geekboards/macropad_v2:via:flash
+
+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).
diff --git a/qmk/keyboards/geekboards/macropad_v2/rules.mk b/qmk/keyboards/geekboards/macropad_v2/rules.mk
new file mode 100644
index 00000000..73575b67
--- /dev/null
+++ b/qmk/keyboards/geekboards/macropad_v2/rules.mk
@@ -0,0 +1,25 @@
+# MCU name
+MCU = STM32F072
+
+# Build Options
+#   change yes to no to disable
+#
+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
+# 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 = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = WS2812
+WS2812_DRIVER = pwm
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/qmk/keyboards/geekboards/tester/rules.mk b/qmk/keyboards/geekboards/tester/rules.mk
index 03b4e839..396cfdf2 100644
--- a/qmk/keyboards/geekboards/tester/rules.mk
+++ b/qmk/keyboards/geekboards/tester/rules.mk
@@ -30,3 +30,4 @@ 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
 RGB_MATRIX_ENABLE = yes     # Use RGB matrix
+RGB_MATRIX_DRIVER = IS31FL3731
diff --git a/qmk/keyboards/georgi/sten.h b/qmk/keyboards/georgi/sten.h
index e94f10fc..320c4951 100644
--- a/qmk/keyboards/georgi/sten.h
+++ b/qmk/keyboards/georgi/sten.h
@@ -15,7 +15,6 @@ extern size_t keymapsCount;			// Total keymaps
 extern uint32_t cChord;				// Current Chord
 extern uint32_t stenoLayers[];		// Chords that simulate QMK layers
 extern size_t stenoLayerCount;		// Number of simulated layers
-uint32_t refChord;					// Reference chord for PC macro
 
 // Function defs
 void 			processChord(bool useFakeSteno);
@@ -35,7 +34,7 @@ void 			CLICK_MOUSE(uint8_t);
 #define P(chord, act) if (cChord == (chord)) { if (!lookup) {act;} return chord;}
 #define PC(chord, act) if (cChord == (chord)) { if (!lookup) {act;} return chord;} \
 	for(int i = 0; i < stenoLayerCount; i++) { \
-		refChord = stenoLayers[i] | chord; \
+		uint32_t refChord = stenoLayers[i] | chord; \
 		if (cChord == (refChord)) { if (!lookup) {act;} return refChord;}; \
 }
 
diff --git a/qmk/keyboards/gergo/matrix.c b/qmk/keyboards/gergo/matrix.c
index f659ed52..080eaea4 100644
--- a/qmk/keyboards/gergo/matrix.c
+++ b/qmk/keyboards/gergo/matrix.c
@@ -38,37 +38,37 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #endif
 
 // MCP Pin Defs
-#define RROW1 (1<<3)
-#define RROW2 (1<<2)
-#define RROW3 (1<<1)
-#define RROW4 (1<<0)
-#define COL0 (1<<0)
-#define COL1 (1<<1)
-#define COL2 (1<<2)
-#define COL3 (1<<3)
-#define COL4 (1<<4)
-#define COL5 (1<<5)
-#define COL6 (1<<6)
+#define RROW1 (1u<<3)
+#define RROW2 (1u<<2)
+#define RROW3 (1u<<1)
+#define RROW4 (1u<<0)
+#define COL0 (1u<<0)
+#define COL1 (1u<<1)
+#define COL2 (1u<<2)
+#define COL3 (1u<<3)
+#define COL4 (1u<<4)
+#define COL5 (1u<<5)
+#define COL6 (1u<<6)
 
 // ATmega pin defs
-#define ROW1  (1<<6)
-#define ROW2  (1<<5)
-#define ROW3  (1<<4)
-#define ROW4  (1<<1)
-#define COL7 (1<<0)
-#define COL8 (1<<1)
-#define COL9 (1<<2)
-#define COL10 (1<<3)
-#define COL11 (1<<2)
-#define COL12 (1<<3)
-#define COL13 (1<<6)
+#define ROW1  (1u<<6)
+#define ROW2  (1u<<5)
+#define ROW3  (1u<<4)
+#define ROW4  (1u<<1)
+#define COL7 (1u<<0)
+#define COL8 (1u<<1)
+#define COL9 (1u<<2)
+#define COL10 (1u<<3)
+#define COL11 (1u<<2)
+#define COL12 (1u<<3)
+#define COL13 (1u<<6)
 
 //Trackball pin defs
-#define TRKUP (1<<4)
-#define TRKDN (1<<5)
-#define TRKLT (1<<6)
-#define TRKRT (1<<7)
-#define TRKBTN (1<<6)
+#define TRKUP (1u<<4)
+#define TRKDN (1u<<5)
+#define TRKLT (1u<<6)
+#define TRKRT (1u<<7)
+#define TRKBTN (1u<<6)
 
 
 // Multiple for mouse moves
diff --git a/qmk/keyboards/gh60/revc/config.h b/qmk/keyboards/gh60/revc/config.h
index 8c24b1e7..ccb95a98 100644
--- a/qmk/keyboards/gh60/revc/config.h
+++ b/qmk/keyboards/gh60/revc/config.h
@@ -57,6 +57,9 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 /* define if matrix has ghost (lacks anti-ghosting diodes) */
 //#define MATRIX_HAS_GHOST
 
+#define LED_CAPS_LOCK_PIN B2
+#define LED_PIN_ON_STATE 0
+
 /* number of backlight levels */
 #define BACKLIGHT_LEVELS 3
 
diff --git a/qmk/keyboards/gh60/revc/revc.c b/qmk/keyboards/gh60/revc/revc.c
index e06739d2..47dd5410 100644
--- a/qmk/keyboards/gh60/revc/revc.c
+++ b/qmk/keyboards/gh60/revc/revc.c
@@ -1,27 +1 @@
 #include "revc.h"
-
-
-extern inline void gh60_caps_led_on(void);
-extern inline void gh60_poker_leds_on(void);
-extern inline void gh60_fn_led_on(void);
-extern inline void gh60_esc_led_on(void);
-extern inline void gh60_wasd_leds_on(void);
-
-extern inline void gh60_caps_led_off(void);
-extern inline void gh60_poker_leds_off(void);
-extern inline void gh60_fn_led_off(void);
-extern inline void gh60_esc_led_off(void);
-extern inline void gh60_wasd_leds_off(void);
-
-
-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_CAPS_LOCK)) {
-        gh60_caps_led_on();
-    } else {
-        gh60_caps_led_off();
-    }
-
-    led_set_user(usb_led);
-}
diff --git a/qmk/keyboards/gh60/revc/revc.h b/qmk/keyboards/gh60/revc/revc.h
index 450c5902..a94322ad 100644
--- a/qmk/keyboards/gh60/revc/revc.h
+++ b/qmk/keyboards/gh60/revc/revc.h
@@ -12,17 +12,17 @@
  *   B2 Capslock LED
  *   B0 not connected
  */
-inline void gh60_caps_led_on(void)      { setPinOutput(B2); writePinLow(B2); }
-inline void gh60_poker_leds_on(void)    { setPinOutput(F4); writePinLow(F4); }
-inline void gh60_fn_led_on(void)        { setPinOutput(F5); writePinLow(F5); }
-inline void gh60_esc_led_on(void)       { setPinOutput(F6); writePinLow(F6); }
-inline void gh60_wasd_leds_on(void)     { setPinOutput(F7); writePinLow(F7); }
+static inline void gh60_caps_led_on(void)      { setPinOutput(B2); writePinLow(B2); }
+static inline void gh60_poker_leds_on(void)    { setPinOutput(F4); writePinLow(F4); }
+static inline void gh60_fn_led_on(void)        { setPinOutput(F5); writePinLow(F5); }
+static inline void gh60_esc_led_on(void)       { setPinOutput(F6); writePinLow(F6); }
+static inline void gh60_wasd_leds_on(void)     { setPinOutput(F7); writePinLow(F7); }
 
-inline void gh60_caps_led_off(void)     { setPinInput(B2); }
-inline void gh60_poker_leds_off(void)   { setPinInput(F4); }
-inline void gh60_fn_led_off(void)       { setPinInput(F5); }
-inline void gh60_esc_led_off(void)      { setPinInput(F6); }
-inline void gh60_wasd_leds_off(void)    { setPinInput(F7); }
+static inline void gh60_caps_led_off(void)     { setPinInput(B2); }
+static inline void gh60_poker_leds_off(void)   { setPinInput(F4); }
+static inline void gh60_fn_led_off(void)       { setPinInput(F5); }
+static inline void gh60_esc_led_off(void)      { setPinInput(F6); }
+static inline void gh60_wasd_leds_off(void)    { setPinInput(F7); }
 
 /* GH60 keymap definition macro
  * K2C, K31 and  K3C are extra keys for ISO
diff --git a/qmk/keyboards/gh60/satan/config.h b/qmk/keyboards/gh60/satan/config.h
index 8c172314..0efbcd79 100644
--- a/qmk/keyboards/gh60/satan/config.h
+++ b/qmk/keyboards/gh60/satan/config.h
@@ -37,6 +37,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B7, D4, B1, B0, B5, B4, D7, D6, B3 }
 #define UNUSED_PINS
 
+#define LED_CAPS_LOCK_PIN B2
+#define LED_PIN_ON_STATE 0
+
 #define BACKLIGHT_PIN B6
 
 /* COL2ROW or ROW2COL */
diff --git a/qmk/keyboards/gh60/satan/satan.c b/qmk/keyboards/gh60/satan/satan.c
index 8542a57c..cd650844 100644
--- a/qmk/keyboards/gh60/satan/satan.c
+++ b/qmk/keyboards/gh60/satan/satan.c
@@ -1,24 +1 @@
 #include "satan.h"
-
-void matrix_init_kb(void) {
-  matrix_init_user();
-  led_init_ports();
-};
-
-void matrix_scan_kb(void) {
-  matrix_scan_user();
-};
-
-void led_init_ports(void) {
-  setPinOutput(B2);
-}
-
-void led_set_kb(uint8_t usb_led) {
-  if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
-    // Turn Caps Lock LED on
-    writePinLow(B2);
-  } else {
-    // Turn Caps Lock LED off
-    writePinHigh(B2);
-  }
-}
diff --git a/qmk/keyboards/gray_studio/space65/config.h b/qmk/keyboards/gray_studio/space65/config.h
index 2e3928e6..5f0817ba 100644
--- a/qmk/keyboards/gray_studio/space65/config.h
+++ b/qmk/keyboards/gray_studio/space65/config.h
@@ -48,10 +48,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
-/*
- * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
- */
-#define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6
+#define LED_CAPS_LOCK_PIN E6
+#define LED_PIN_ON_STATE 0
 
 #define BACKLIGHT_PIN B7
 #define BACKLIGHT_BREATHING
diff --git a/qmk/keyboards/gray_studio/space65/keymaps/via/rules.mk b/qmk/keyboards/gray_studio/space65/keymaps/via/rules.mk
index 96d2d189..1e5b9980 100644
--- a/qmk/keyboards/gray_studio/space65/keymaps/via/rules.mk
+++ b/qmk/keyboards/gray_studio/space65/keymaps/via/rules.mk
@@ -1,2 +1 @@
 VIA_ENABLE = yes
-MOUSEKEY_ENABLE = no
diff --git a/qmk/keyboards/gray_studio/space65/space65.c b/qmk/keyboards/gray_studio/space65/space65.c
index 74a86a20..d27a1f38 100644
--- a/qmk/keyboards/gray_studio/space65/space65.c
+++ b/qmk/keyboards/gray_studio/space65/space65.c
@@ -14,36 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "space65.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	setPinOutput(E6);
-	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_CAPS_LOCK)) {
-    writePinLow(E6);
-  } else {
-    writePinHigh(E6);
-  }
-
-	led_set_user(usb_led);
-}
diff --git a/qmk/keyboards/gray_studio/think65/hotswap/config.h b/qmk/keyboards/gray_studio/think65/hotswap/config.h
index 05a818a7..5fe35201 100644
--- a/qmk/keyboards/gray_studio/think65/hotswap/config.h
+++ b/qmk/keyboards/gray_studio/think65/hotswap/config.h
@@ -46,6 +46,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define DIODE_DIRECTION COL2ROW
 
+#define LED_NUM_LOCK_PIN C6
+#define LED_CAPS_LOCK_PIN C7
+#define LED_SCROLL_LOCK_PIN F7
+#define LED_PIN_ON_STATE 0
+
 #define RGB_DI_PIN E2
 #ifdef RGB_DI_PIN
     #define RGBLED_NUM 22
diff --git a/qmk/keyboards/gray_studio/think65/hotswap/hotswap.c b/qmk/keyboards/gray_studio/think65/hotswap/hotswap.c
index 07cdc8b1..60808979 100644
--- a/qmk/keyboards/gray_studio/think65/hotswap/hotswap.c
+++ b/qmk/keyboards/gray_studio/think65/hotswap/hotswap.c
@@ -14,58 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "hotswap.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
-
-  setPinOutput(C6);
-  setPinOutput(C7);
-  setPinOutput(F7);
-  
-  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_CAPS_LOCK)) {
-    writePinLow(C7);
-  } else {
-    writePinHigh(C7);
-  }
-
-  if (IS_LED_ON(usb_led, USB_LED_NUM_LOCK)) {
-    writePinLow(C6);
-  } else {
-    writePinHigh(C6);
-  }
-
-  if (IS_LED_ON(usb_led, USB_LED_SCROLL_LOCK)) {
-    writePinLow(F7);
-  } else {
-    writePinHigh(F7);
-  }
-
-  led_set_user(usb_led);
-}
-
diff --git a/qmk/keyboards/gray_studio/think65/hotswap/keymaps/via/rules.mk b/qmk/keyboards/gray_studio/think65/hotswap/keymaps/via/rules.mk
index 96d2d189..e9977d2f 100644
--- a/qmk/keyboards/gray_studio/think65/hotswap/keymaps/via/rules.mk
+++ b/qmk/keyboards/gray_studio/think65/hotswap/keymaps/via/rules.mk
@@ -1,2 +1,3 @@
 VIA_ENABLE = yes
-MOUSEKEY_ENABLE = no
+
+CONSOLE_ENABLE = no
diff --git a/qmk/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/config.h b/qmk/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/config.h
new file mode 100644
index 00000000..157b55d7
--- /dev/null
+++ b/qmk/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/config.h
@@ -0,0 +1,20 @@
+/* Copyright 2019 Brandon Schlack
+ *
+ * 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
+
+#undef RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING // Only have Breathing Animation
diff --git a/qmk/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/keymap.c b/qmk/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/keymap.c
new file mode 100644
index 00000000..59554019
--- /dev/null
+++ b/qmk/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/keymap.c
@@ -0,0 +1,80 @@
+/* Copyright 2019 Brandon Schlack
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+#include "brandonschlack.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/* Base Layer
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+ * │Esc│! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│_ -│+ =│ Bckspc│PgU│
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+ * │Tab  │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │{ [│} ]│|   \│PgD│
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+ * │HyCaps│ A │ S │ D │ F │ G │ H │ J │ K │ L │: ;│" '│   Enter│   │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤   │
+ * │Shift   │ Z │ X │ C │ V │ B │ N │ M │< ,│> .│? /│ Shift│ Up│   │
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+ * │Ctrl│ Opt│ Cmd│          Space         │Cmd │FnPy│ │Lef│Dow│Rig│
+ * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘
+ */
+[_BASE] = LAYOUT_65_ansi_blocker( \
+    KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, 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_PGDN, \
+    HY_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,  XXXXXXX, \
+    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,   XXXXXXX, \
+    KC_LCTL, KC_LOPT, KC_LCMD,                            KC_SPC,                             KC_RCMD, PLY_FN1, KC_LEFT, KC_DOWN, KC_RGHT  \
+),
+/* Function Layer
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+ * │` ~│ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│ Delete│VlU│
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+ * │RMod │RH+│RS+│RV+│   │   │   │   │   │   │F13│F14│F15│ SlpD│VlD│
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+ * │RTgl  │RH-│RS-│RV-│   │   │   │   │   │   │MNC│LHP│        │   │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤   │
+ * │        │LYR│Thm│   │   │RST│   │Mke│Prv│Nxt│Ply│MteSft│PgU│   │
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+ * │    │    │    │                        │    │    │ │Hom│PgD│End│
+ * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘
+ */
+[_FN1] = LAYOUT_65_ansi_blocker( \
+    KC_GRV,  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_DELT, KC_VOLU, \
+    RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______, _______, _______, _______, _______, KC_F13,  KC_F14,  KC_F15,  MC_SLPD, KC_VOLD, \
+    RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______, MC_MSSN, MC_LHPD,          _______, XXXXXXX, \
+    _______,          RGB_LYR, RGB_THM, _______, _______, RESET,   _______, QM_MAKE, KC_MPRV, KC_MNXT, KC_MPLY, MUT_SFT, KC_PGUP, XXXXXXX, \
+    _______, _______, _______,                            _______,                            _______, _______, KC_HOME, KC_PGDN, KC_END   \
+),
+/* Blank Layout
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+ * │   │   │   │   │   │   │   │   │   │   │   │   │   │       │   │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+ * │     │   │   │   │   │   │   │   │   │   │   │   │   │     │   │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+ * │      │   │   │   │   │   │   │   │   │   │   │   │        │   │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤   │
+ * │        │   │   │   │   │   │   │   │   │   │   │      │   │   │
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+ * │    │    │    │                        │    │    │ │   │   │   │
+ * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘
+[X] = LAYOUT_65_ansi_blocker( \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, _______, \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______, \
+    _______, XXXXXXX, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, \
+    _______, _______, _______,                            _______,                            _______, _______,          _______, _______, _______  \
+),
+*/
+};
diff --git a/qmk/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/readme.md b/qmk/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/readme.md
new file mode 100644
index 00000000..76174061
--- /dev/null
+++ b/qmk/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/readme.md
@@ -0,0 +1,9 @@
+# brandonschlack's Think6.5 keymap
+
+My keymap for the Think6.5. Using the `LAYOUT_65_ansi_blocker` LAYOUT and based on my keyboard-agnostic layout, some small changes for the navigation keys not present due to the badge.
+
+## [Base Layer](http://www.keyboard-layout-editor.com/#/gists/b396fee9f49d6e9493876e82a8ee99ac)
+![Base Layer](https://i.imgur.com/AZYVuZS.jpg)
+
+## [Function Layer](http://www.keyboard-layout-editor.com/#/gists/06e684133399bb63d8b72ac6982e0e68)
+![Function Layer](https://i.imgur.com/GbOOxME.jpg)
diff --git a/qmk/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/rules.mk b/qmk/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/rules.mk
new file mode 100644
index 00000000..4ce80104
--- /dev/null
+++ b/qmk/keyboards/gray_studio/think65/solder/keymaps/brandonschlack/rules.mk
@@ -0,0 +1,2 @@
+# Build Options
+MOUSEKEY_ENABLE = no         # Don't need mouse keys
diff --git a/qmk/keyboards/gray_studio/think65/solder/keymaps/via/rules.mk b/qmk/keyboards/gray_studio/think65/solder/keymaps/via/rules.mk
index 96d2d189..44a2bc49 100644
--- a/qmk/keyboards/gray_studio/think65/solder/keymaps/via/rules.mk
+++ b/qmk/keyboards/gray_studio/think65/solder/keymaps/via/rules.mk
@@ -1,2 +1,4 @@
 VIA_ENABLE = yes
-MOUSEKEY_ENABLE = no
+LTO_ENABLE = yes
+
+CONSOLE_ENABLE = no
diff --git a/qmk/keyboards/hadron/ver2/keymaps/default/keymap.c b/qmk/keyboards/hadron/ver2/keymaps/default/keymap.c
index 3b3dd58e..8e3d50d3 100644
--- a/qmk/keyboards/hadron/ver2/keymaps/default/keymap.c
+++ b/qmk/keyboards/hadron/ver2/keymaps/default/keymap.c
@@ -309,7 +309,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
 //Functions for ver2
 #ifdef KEYBOARD_hadron_ver2
-#include "LUFA/Drivers/Peripheral/TWI.h"
+#include <LUFA/Drivers/Peripheral/TWI.h>
 void matrix_init_user(void) {
   #ifdef USE_I2C
     i2c_master_init();
diff --git a/qmk/keyboards/hadron/ver2/keymaps/side_numpad/keymap.c b/qmk/keyboards/hadron/ver2/keymaps/side_numpad/keymap.c
index 0e5ab745..c63ae938 100644
--- a/qmk/keyboards/hadron/ver2/keymaps/side_numpad/keymap.c
+++ b/qmk/keyboards/hadron/ver2/keymaps/side_numpad/keymap.c
@@ -1,5 +1,5 @@
 #include QMK_KEYBOARD_H
-#include "LUFA/Drivers/Peripheral/TWI.h"
+#include <LUFA/Drivers/Peripheral/TWI.h>
 #ifdef AUDIO_ENABLE
   #include "audio.h"
 #endif
diff --git a/qmk/keyboards/hadron/ver3/rules.mk b/qmk/keyboards/hadron/ver3/rules.mk
index 8ce0d77b..6c13bd2b 100644
--- a/qmk/keyboards/hadron/ver3/rules.mk
+++ b/qmk/keyboards/hadron/ver3/rules.mk
@@ -16,7 +16,8 @@ NKRO_ENABLE = yes	    # USB Nkey Rollover
 CUSTOM_MATRIX = no # Custom matrix file
 AUDIO_ENABLE = yes
 RGBLIGHT_ENABLE = yes
-RGB_MATRIX_ENABLE = no #WS2812 once arm_rgb is implemented
+RGB_MATRIX_ENABLE = no # once arm_rgb is implemented
+RGB_MATRIX_DRIVER = WS2812
 HAPTIC_ENABLE += DRV2605L
 QWIIC_ENABLE += MICRO_OLED
 ENCODER_ENABLER = yes
diff --git a/qmk/keyboards/handwired/6macro/config.h b/qmk/keyboards/handwired/6macro/config.h
index 7919c3c7..0443e2ce 100644
--- a/qmk/keyboards/handwired/6macro/config.h
+++ b/qmk/keyboards/handwired/6macro/config.h
@@ -41,6 +41,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define RGB_DI_PIN D2
 #define RGBLED_NUM 10
+#define DRIVER_LED_TOTAL RGBLED_NUM
 #define RGBLIGHT_HUE_STEP 10
 #define RGBLIGHT_SAT_STEP 17
 #define RGBLIGHT_VAL_STEP 17
@@ -67,4 +68,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 5
\ No newline at end of file
+#define DEBOUNCE 5
diff --git a/qmk/keyboards/handwired/6macro/rules.mk b/qmk/keyboards/handwired/6macro/rules.mk
index 9add0e5a..253720ad 100644
--- a/qmk/keyboards/handwired/6macro/rules.mk
+++ b/qmk/keyboards/handwired/6macro/rules.mk
@@ -2,32 +2,24 @@
 MCU = atmega32u2
 
 # Bootloader selection
-#   Teensy       halfkay
-#   Pro Micro    caterina
-#   Atmel DFU    atmel-dfu
-#   LUFA DFU     lufa-dfu
-#   QMK DFU      qmk-dfu
-#   ATmega32A    bootloadHID
-#   ATmega328P   USBasp
 BOOTLOADER = atmel-dfu
 
 # 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 = no        	# Console for debug(+400)
+BOOTMAGIC_ENABLE = no      	# 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
 # 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 = yes          	# USB Nkey Rollover
-#RGB_MATRIX_ENABLE = WS2812  # Enable per-key coordinate based RGB effects. Do not enable with RGBlight (+8500)
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality on B7 by default
+RGB_MATRIX_ENABLE = no     # Enable per-key coordinate based RGB effects. Do not enable with RGBlight
+RGB_MATRIX_DRIVER = WS2812
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-MIDI_ENABLE = no            # MIDI support (+2400 to 4200, depending on config)
 UNICODE_ENABLE = yes        # 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
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
diff --git a/qmk/keyboards/handwired/bluepill/bluepill70/bootloader_defs.h b/qmk/keyboards/handwired/bluepill/bluepill70/bootloader_defs.h
index 0f45203c..46c37a25 100644
--- a/qmk/keyboards/handwired/bluepill/bluepill70/bootloader_defs.h
+++ b/qmk/keyboards/handwired/bluepill/bluepill70/bootloader_defs.h
@@ -1,8 +1,6 @@
 /* Address for jumping to bootloader on STM32 chips. */
 /* It is chip dependent, the correct number can be looked up here (page 175):
  * http://www.st.com/web/en/resource/technical/document/application_note/CD00167594.pdf
- * This also requires a patch to chibios:
- *  <tmk_dir>/tmk_core/tool/chibios/ch-bootloader-jump.patch
  */
 
 // STM32F103* does NOT have an USB bootloader in ROM (only serial),
diff --git a/qmk/keyboards/handwired/bluepill/bluepill70/led.c b/qmk/keyboards/handwired/bluepill/bluepill70/led.c
index 5c557bbe..81437fb5 100644
--- a/qmk/keyboards/handwired/bluepill/bluepill70/led.c
+++ b/qmk/keyboards/handwired/bluepill/bluepill70/led.c
@@ -15,7 +15,7 @@ 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 "hal.h"
+#include <hal.h>
 #include "led.h"
 
 
diff --git a/qmk/keyboards/handwired/bluepill/bluepill70/matrix.c b/qmk/keyboards/handwired/bluepill/bluepill70/matrix.c
index b2c38e52..4d281fe2 100644
--- a/qmk/keyboards/handwired/bluepill/bluepill70/matrix.c
+++ b/qmk/keyboards/handwired/bluepill/bluepill70/matrix.c
@@ -15,8 +15,8 @@ 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 "ch.h"
-#include "hal.h"
+#include <ch.h>
+#include <hal.h>
 
 /*
  * scan matrix
diff --git a/qmk/keyboards/handwired/bluepill/boards/GENERIC_STM32_F103/board.c b/qmk/keyboards/handwired/bluepill/boards/GENERIC_STM32_F103/board.c
index 2809c9d1..64da2421 100644
--- a/qmk/keyboards/handwired/bluepill/boards/GENERIC_STM32_F103/board.c
+++ b/qmk/keyboards/handwired/bluepill/boards/GENERIC_STM32_F103/board.c
@@ -14,7 +14,7 @@
     limitations under the License.
 */
 
-#include "hal.h"
+#include <hal.h>
 
 /**
  * @brief   PAL setup.
diff --git a/qmk/keyboards/handwired/colorlice/colorlice.h b/qmk/keyboards/handwired/colorlice/colorlice.h
index c1e88abe..dbf31f56 100644
--- a/qmk/keyboards/handwired/colorlice/colorlice.h
+++ b/qmk/keyboards/handwired/colorlice/colorlice.h
@@ -26,7 +26,7 @@
  * The second converts the arguments into a two-dimensional array which
  * represents the switch matrix.
  */
-#define LAYOUT( \
+#define LAYOUT_alice_split_bs( \
     k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, \
     k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e,      \
     k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c,      K2e,      \
@@ -40,3 +40,4 @@
     { k40,  KC_NO, k42,   k43,  k44,  KC_NO, KC_NO, k47, KC_NO,  KC_NO, k4a,  KC_NO,KC_NO,  KC_NO,  k4e, KC_NO  }, \
 }
 
+#define LAYOUT LAYOUT_alice_split_bs
diff --git a/qmk/keyboards/handwired/colorlice/info.json b/qmk/keyboards/handwired/colorlice/info.json
index 0b288762..85deaed4 100644
--- a/qmk/keyboards/handwired/colorlice/info.json
+++ b/qmk/keyboards/handwired/colorlice/info.json
@@ -5,7 +5,7 @@
     "width": 17.75,
     "height": 5,
     "layouts": {
-      "LAYOUT": {
+      "LAYOUT_alice_split_bs": {
         "layout": [
           {"label":"K63", "x":0, "y":0},
           {"label":"K00", "x":1.25, "y":0},
diff --git a/qmk/keyboards/handwired/colorlice/keymaps/default/keymap.c b/qmk/keyboards/handwired/colorlice/keymaps/default/keymap.c
index 84257a12..e94aeaae 100644
--- a/qmk/keyboards/handwired/colorlice/keymaps/default/keymap.c
+++ b/qmk/keyboards/handwired/colorlice/keymaps/default/keymap.c
@@ -17,14 +17,14 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-	[0] = LAYOUT(
+	[0] = LAYOUT_alice_split_bs(
         RGB_TOG,    KC_GESC,    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_GRV, KC_BSLS,
         RGB_MOD,    KC_TAB,     KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,       KC_O,   KC_P,       KC_LBRC,    KC_RBRC,        KC_BSPC,
 		KC_PGDN,    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_LSFT,    KC_Z,       KC_X,   KC_C,   KC_V,   KC_B,   KC_B,   KC_N,   KC_M,   KC_COMM,    KC_DOT, KC_SLSH,    KC_RSFT,    MO(1),
 		KC_LGUI,    KC_LALT,    KC_SPC, KC_LGUI,        KC_SPC,         KC_RALT,        KC_RCTL),
 
-	[1] = LAYOUT(
+	[1] = LAYOUT_alice_split_bs(
         _______,    _______, 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_DEL, KC_DEL,
         _______,    _______, _______,   KC_UP, _______, _______, _______, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD  , _______, _______,
         _______,    _______, KC_LEFT,   KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,          RESET,
diff --git a/qmk/keyboards/handwired/colorlice/rules.mk b/qmk/keyboards/handwired/colorlice/rules.mk
index f41304b2..1c0ec5c9 100644
--- a/qmk/keyboards/handwired/colorlice/rules.mk
+++ b/qmk/keyboards/handwired/colorlice/rules.mk
@@ -30,5 +30,8 @@ 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
 LTO_ENABLE = no             # Use link time optimization
-RGB_MATRIX_ENABLE = WS2812  # Enable keyboard RGB backlight functionality with ws2812 driver
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = WS2812
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+
+LAYOUTS = alice_split_bs
diff --git a/qmk/keyboards/handwired/dactyl/twimaster.c b/qmk/keyboards/handwired/dactyl/twimaster.c
index 2557f7e2..41684d3a 100644
--- a/qmk/keyboards/handwired/dactyl/twimaster.c
+++ b/qmk/keyboards/handwired/dactyl/twimaster.c
@@ -9,7 +9,7 @@
 #include <inttypes.h>
 #include <compat/twi.h>
 
-#include <i2cmaster.h>
+#include "i2cmaster.h"
 
 /* define CPU frequency in Hz here if not defined in Makefile */
 #ifndef F_CPU
diff --git a/qmk/keyboards/handwired/dactyl_manuform/5x6_right_trackball/5x6_right_trackball.c b/qmk/keyboards/handwired/dactyl_manuform/5x6_right_trackball/5x6_right_trackball.c
new file mode 100644
index 00000000..c40e4173
--- /dev/null
+++ b/qmk/keyboards/handwired/dactyl_manuform/5x6_right_trackball/5x6_right_trackball.c
@@ -0,0 +1,221 @@
+/* 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 "5x6_right_trackball.h"
+
+#ifndef TRACKBALL_DPI_OPTIONS
+#    define TRACKBALL_DPI_OPTIONS { 1200, 1600, 2400 }
+#    ifndef TRACKBALL_DPI_DEFAULT
+#        define TRACKBALL_DPI_DEFAULT 1
+#    endif
+#endif
+#ifndef TRACKBALL_DPI_DEFAULT
+#    define TRACKBALL_DPI_DEFAULT 0
+#endif
+
+keyboard_config_t keyboard_config;
+uint16_t dpi_array[] = TRACKBALL_DPI_OPTIONS;
+#define DPI_OPTION_SIZE (sizeof(dpi_array) / sizeof(uint16_t))
+
+bool     BurstState        = false;  // init burst state for Trackball module
+uint16_t MotionStart       = 0;      // Timer for accel, 0 is resting state
+
+__attribute__((weak)) void process_mouse_user(report_mouse_t* mouse_report, int16_t x, int16_t y) {
+    mouse_report->x = x;
+    mouse_report->y = y;
+}
+
+__attribute__((weak)) void process_mouse(report_mouse_t* mouse_report) {
+    report_pmw_t data = pmw_read_burst();
+    if (data.isOnSurface && data.isMotion) {
+        // Reset timer if stopped moving
+        if (!data.isMotion) {
+            if (MotionStart != 0) MotionStart = 0;
+            return;
+        }
+
+        // Set timer if new motion
+        if ((MotionStart == 0) && data.isMotion) {
+            if (debug_mouse) dprintf("Starting motion.\n");
+            MotionStart = timer_read();
+        }
+
+        if (debug_mouse) {
+            dprintf("Delt] d: %d t: %u\n", abs(data.dx) + abs(data.dy), MotionStart);
+        }
+        if (debug_mouse) {
+            dprintf("Pre ] X: %d, Y: %d\n", data.dx, data.dy);
+        }
+#if defined(PROFILE_LINEAR)
+        float scale = float(timer_elaspsed(MotionStart)) / 1000.0;
+        data.dx *= scale;
+        data.dy *= scale;
+#elif defined(PROFILE_INVERSE)
+        // TODO
+#else
+        // no post processing
+#endif
+
+        // Wrap to HID size
+        data.dx = constrain(data.dx, -127, 127);
+        data.dy = constrain(data.dy, -127, 127);
+        if (debug_mouse) dprintf("Cons] X: %d, Y: %d\n", data.dx, data.dy);
+        // dprintf("Elapsed:%u, X: %f Y: %\n", i, pgm_read_byte(firmware_data+i));
+
+        mouse_report->x = -data.dx;
+        mouse_report->y = data.dy;
+    }
+}
+
+bool process_record_kb(uint16_t keycode, keyrecord_t* record) {
+    if (!process_record_user(keycode, record)) { return false; }
+
+#ifdef POINTING_DEVICE_ENABLE
+    if (keycode == DPI_CONFIG && record->event.pressed) {
+        keyboard_config.dpi_config = (keyboard_config.dpi_config + 1) % DPI_OPTION_SIZE;
+        eeconfig_update_kb(keyboard_config.raw);
+        trackball_set_cpi(dpi_array[keyboard_config.dpi_config]);
+    }
+#endif
+
+/* If Mousekeys is disabled, then use handle the mouse button
+ * keycodes.  This makes things simpler, and allows usage of
+ * the keycodes in a consistent manner.  But only do this if
+ * Mousekeys is not enable, so it's not handled twice.
+ */
+#ifndef MOUSEKEY_ENABLE
+    if (IS_MOUSEKEY_BUTTON(keycode)) {
+        report_mouse_t currentReport = pointing_device_get_report();
+        if (record->event.pressed) {
+            currentReport.buttons |= 1 << (keycode - KC_MS_BTN1);
+        } else {
+            currentReport.buttons &= ~(1 << (keycode - KC_MS_BTN1));
+        }
+        pointing_device_set_report(currentReport);
+        pointing_device_send();
+    }
+#endif
+
+    return true;
+}
+
+// Hardware Setup
+void keyboard_pre_init_kb(void) {
+    // debug_enable  = true;
+    // debug_matrix  = true;
+    // debug_mouse   = true;
+    // debug_encoder = true;
+
+    /* Ground all output pins connected to ground. This provides additional
+     * pathways to ground. If you're messing with this, know this: driving ANY
+     * of these pins high will cause a short. On the MCU. Ka-blooey.
+     */
+
+    // This is the debug LED.
+#if defined(DEBUG_LED_PIN)
+    setPinOutput(DEBUG_LED_PIN);
+    writePin(DEBUG_LED_PIN, debug_enable);
+#endif
+
+    keyboard_pre_init_user();
+}
+
+#ifdef POINTING_DEVICE_ENABLE
+void pointing_device_init(void) {
+    if (!is_keyboard_left()) {
+        // initialize ball sensor
+        pmw_spi_init();
+    }
+    trackball_set_cpi(dpi_array[keyboard_config.dpi_config]);
+}
+
+static bool has_mouse_report_changed(report_mouse_t new, report_mouse_t old) {
+    return (new.buttons != old.buttons) ||
+           (new.x && new.x != old.x) ||
+           (new.y && new.y != old.y) ||
+           (new.h && new.h != old.h) ||
+           (new.v && new.v != old.v);
+}
+
+void pointing_device_task(void) {
+    report_mouse_t mouse_report = pointing_device_get_report();
+    if (!is_keyboard_left()) {
+        process_mouse(&mouse_report);
+    }
+
+    pointing_device_set_report(mouse_report);
+    pointing_device_send();
+}
+#endif
+
+void eeconfig_init_kb(void) {
+    keyboard_config.dpi_config = TRACKBALL_DPI_DEFAULT;
+    trackball_set_cpi(dpi_array[keyboard_config.dpi_config]);
+    eeconfig_update_kb(keyboard_config.raw);
+}
+
+void matrix_init_kb(void) {
+    // is safe to just read DPI setting since matrix init
+    // comes before pointing device init.
+    keyboard_config.raw = eeconfig_read_kb();
+    if (keyboard_config.dpi_config > DPI_OPTION_SIZE) {
+        eeconfig_init_kb();
+    }
+    matrix_init_user();
+}
+
+#ifdef POINTING_DEVICE_ENABLE
+void pointing_device_send(void) {
+    static report_mouse_t old_report = {};
+    report_mouse_t mouseReport = pointing_device_get_report();
+    if (is_keyboard_master()) {
+        int8_t x = mouseReport.x, y = mouseReport.y;
+        mouseReport.x = 0;
+        mouseReport.y = 0;
+        process_mouse_user(&mouseReport, x, y);
+        if (has_mouse_report_changed(mouseReport, old_report)) {
+            host_mouse_send(&mouseReport);
+        }
+    } else {
+        master_mouse_send(mouseReport.x, mouseReport.y);
+    }
+    mouseReport.x = 0;
+    mouseReport.y = 0;
+    mouseReport.v = 0;
+    mouseReport.h = 0;
+    old_report = mouseReport;
+    pointing_device_set_report(mouseReport);
+}
+#endif
+
+#ifdef SWAP_HANDS_ENABLE
+const keypos_t hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {
+    /* Left hand, matrix positions */
+    {{5, 6}, {4, 6}, {3, 6}, {2, 6}, {1, 6}, {0, 6}},
+    {{5, 7}, {4, 7}, {3, 7}, {2, 7}, {1, 7}, {0, 7}},
+    {{5, 8}, {4, 8}, {3, 8}, {2, 8}, {1, 8}, {0, 8}},
+    {{5, 9}, {4, 9}, {3, 9}, {2, 9}, {1, 9}, {0, 9}},
+    {{5, 10}, {4, 10}, {3, 10}, {2, 10}, {1, 10}, {0, 10}},
+    {{5, 11}, {4, 11}, {3, 11}, {2, 11}, {1, 11}, {0, 11}},
+    /* Right hand, matrix positions */
+    {{5, 0}, {4, 0}, {3, 0}, {2, 0}, {1, 0}, {0, 0}},
+    {{5, 1}, {4, 1}, {3, 1}, {2, 1}, {1, 1}, {0, 1}},
+    {{5, 2}, {4, 2}, {3, 2}, {2, 2}, {1, 2}, {0, 2}},
+    {{5, 3}, {4, 3}, {3, 3}, {2, 3}, {1, 3}, {0, 3}},
+    {{5, 4}, {4, 4}, {3, 4}, {2, 4}, {1, 4}, {0, 4}},
+    {{5, 5}, {4, 5}, {3, 5}, {2, 5}, {1, 5}, {0, 5}}
+};
+#endif
diff --git a/qmk/keyboards/handwired/dactyl_manuform/5x6_right_trackball/5x6_right_trackball.h b/qmk/keyboards/handwired/dactyl_manuform/5x6_right_trackball/5x6_right_trackball.h
new file mode 100644
index 00000000..c8650f73
--- /dev/null
+++ b/qmk/keyboards/handwired/dactyl_manuform/5x6_right_trackball/5x6_right_trackball.h
@@ -0,0 +1,73 @@
+/* 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 "dactyl_manuform.h"
+#include "quantum.h"
+#include "spi_master.h"
+#include "pmw3360.h"
+#include "pointing_device.h"
+
+
+#define ___ KC_NO
+
+#define LAYOUT_5x6_right_trackball(\
+  L00, L01, L02, L03, L04, L05,                          R00, R01, R02, R03, R04, R05, \
+  L10, L11, L12, L13, L14, L15,                          R10, R11, R12, R13, R14, R15, \
+  L20, L21, L22, L23, L24, L25,                          R20, R21, R22, R23, R24, R25, \
+  L30, L31, L32, L33, L34, L35,                          R30, R31, R32, R33, R34, R35, \
+            L42, L43,                                              R42, R43,           \
+                      L44, L45,                               R41,                     \
+                                L54, L55,           R51,                               \
+                                L52, L53,      R52, R53                                \
+  ) \
+  { \
+    { L00, L01, L02, L03, L04, L05 }, \
+    { L10, L11, L12, L13, L14, L15 }, \
+    { L20, L21, L22, L23, L24, L25 }, \
+    { L30, L31, L32, L33, L34, L35 }, \
+    { ___, ___, L42, L43, L44, L45 }, \
+    { ___, ___, L52, L53, L54, L55 }, \
+                                      \
+    { R00, R01, R02, R03, R04, R05 }, \
+    { R10, R11, R12, R13, R14, R15 }, \
+    { R20, R21, R22, R23, R24, R25 }, \
+    { R30, R31, R32, R33, R34, R35 }, \
+    { ___, R41, R42, R43, ___, ___ }, \
+    { ___, R51, R52, R53, ___, ___ }  \
+}
+
+
+void process_wheel(report_mouse_t* mouse_report);
+void process_wheel_user(report_mouse_t* mouse_report, int16_t h, int16_t v);
+
+typedef union {
+  uint32_t raw;
+  struct {
+    uint8_t    dpi_config;
+  };
+} keyboard_config_t;
+
+extern keyboard_config_t keyboard_config;
+
+enum ploopy_keycodes {
+    DPI_CONFIG = SAFE_RANGE,
+    KEYMAP_SAFE_RANGE,
+};
+
+void master_mouse_send(int8_t x, int8_t y);
+void trackball_set_cpi(uint16_t cpi);
diff --git a/qmk/keyboards/handwired/dactyl_manuform/5x6_right_trackball/config.h b/qmk/keyboards/handwired/dactyl_manuform/5x6_right_trackball/config.h
new file mode 100644
index 00000000..147f1260
--- /dev/null
+++ b/qmk/keyboards/handwired/dactyl_manuform/5x6_right_trackball/config.h
@@ -0,0 +1,67 @@
+/*
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+Copyright 2015 Jack Humbert
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+#define PRODUCT_ID      0x3536
+#define DEVICE_VER      0x0001
+#define PRODUCT         Tractyl-Manuform (5x6 with right side Trackball)
+
+/* key matrix size */
+// Rows are doubled-up
+#define MATRIX_ROWS 12
+#define MATRIX_COLS 6
+
+// wiring of each half
+#define MATRIX_COL_PINS { C0, C1, C2, C3, C4, C5 }
+#define MATRIX_ROW_PINS { F7, F6, F5, F4, F3, F2 }
+
+#define DIODE_DIRECTION COL2ROW
+
+// WS2812 RGB LED strip input and number of LEDs
+#define RGB_DI_PIN D3
+#define RGBLED_NUM 8
+#define RGBLIGHT_SPLIT
+#define RGBLED_SPLIT { 0 , 8 }
+#define RGBLIGHT_SLEEP
+#define RGBW
+#define RGBLIGHT_LIMIT_VAL 150
+/* define if matrix has ghost */
+//#define MATRIX_HAS_GHOST
+
+/* number of backlight levels */
+// #define BACKLIGHT_LEVELS 3
+
+#define DEBUG_LED_PIN D6
+
+#define USB_POLLING_INTERVAL_MS 1
+
+#define ROTATIONAL_TRANSFORM_ANGLE -25
+
+/* Bootmagic Lite key configuration */
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 0
+#define BOOTMAGIC_LITE_ROW_RIGHT 6
+#define BOOTMAGIC_LITE_COLUMN_RIGHT 5
+
+#define C6_AUDIO
+
+#define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR 4095
+#define DYNAMIC_KEYMAP_LAYER_COUNT 16
diff --git a/qmk/keyboards/handwired/dactyl_manuform/5x6_right_trackball/info.json b/qmk/keyboards/handwired/dactyl_manuform/5x6_right_trackball/info.json
new file mode 100644
index 00000000..89f99dc2
--- /dev/null
+++ b/qmk/keyboards/handwired/dactyl_manuform/5x6_right_trackball/info.json
@@ -0,0 +1,75 @@
+{
+    "keyboard_name": "Dactyl Manuform 5x6",
+    "url": "",
+    "maintainer": "qmk",
+    "width": 17,
+    "height": 8,
+    "layouts": {
+        "LAYOUT_5x6": {
+            "layout": [
+                {"label":"L00", "x":0, "y":0},
+                {"label":"L01", "x":1, "y":0},
+                {"label":"L02", "x":2, "y":0},
+                {"label":"L03", "x":3, "y":0},
+                {"label":"L04", "x":4, "y":0},
+                {"label":"L05", "x":5, "y":0},
+                {"label":"R00", "x":11, "y":0},
+                {"label":"R01", "x":12, "y":0},
+                {"label":"R02", "x":13, "y":0},
+                {"label":"R03", "x":14, "y":0},
+                {"label":"R04", "x":15, "y":0},
+                {"label":"R05", "x":16, "y":0},
+                {"label":"L10", "x":0, "y":1},
+                {"label":"L11", "x":1, "y":1},
+                {"label":"L12", "x":2, "y":1},
+                {"label":"L13", "x":3, "y":1},
+                {"label":"L14", "x":4, "y":1},
+                {"label":"L15", "x":5, "y":1},
+                {"label":"R10", "x":11, "y":1},
+                {"label":"R11", "x":12, "y":1},
+                {"label":"R12", "x":13, "y":1},
+                {"label":"R13", "x":14, "y":1},
+                {"label":"R14", "x":15, "y":1},
+                {"label":"R15", "x":16, "y":1},
+                {"label":"L20", "x":0, "y":2},
+                {"label":"L21", "x":1, "y":2},
+                {"label":"L22", "x":2, "y":2},
+                {"label":"L23", "x":3, "y":2},
+                {"label":"L24", "x":4, "y":2},
+                {"label":"L25", "x":5, "y":2},
+                {"label":"R20", "x":11, "y":2},
+                {"label":"R21", "x":12, "y":2},
+                {"label":"R22", "x":13, "y":2},
+                {"label":"R23", "x":14, "y":2},
+                {"label":"R24", "x":15, "y":2},
+                {"label":"R25", "x":16, "y":2},
+                {"label":"L30", "x":0, "y":3},
+                {"label":"L31", "x":1, "y":3},
+                {"label":"L32", "x":2, "y":3},
+                {"label":"L33", "x":3, "y":3},
+                {"label":"L34", "x":4, "y":3},
+                {"label":"L35", "x":5, "y":3},
+                {"label":"R30", "x":11, "y":3},
+                {"label":"R31", "x":12, "y":3},
+                {"label":"R32", "x":13, "y":3},
+                {"label":"R33", "x":14, "y":3},
+                {"label":"R34", "x":15, "y":3},
+                {"label":"R35", "x":16, "y":3},
+                {"label":"L42", "x":2, "y":4},
+                {"label":"L43", "x":3, "y":4},
+                {"label":"R42", "x":13, "y":4},
+                {"label":"R43", "x":14, "y":4},
+                {"label":"L44", "x":4, "y":5},
+                {"label":"L45", "x":5, "y":5},
+                {"label":"R41", "x":12, "y":5},
+                {"label":"L54", "x":6, "y":6},
+                {"label":"L55", "x":7, "y":6},
+                {"label":"R51", "x":10, "y":6},
+                {"label":"L52", "x":6, "y":7},
+                {"label":"L53", "x":7, "y":7},
+                {"label":"R52", "x":9, "y":7},
+                {"label":"R53", "x":10, "y":7}
+            ]
+        }
+    }
+}
diff --git a/qmk/keyboards/handwired/dactyl_manuform/5x6_right_trackball/keymaps/default/config.h b/qmk/keyboards/handwired/dactyl_manuform/5x6_right_trackball/keymaps/default/config.h
new file mode 100644
index 00000000..4e35d4c4
--- /dev/null
+++ b/qmk/keyboards/handwired/dactyl_manuform/5x6_right_trackball/keymaps/default/config.h
@@ -0,0 +1,27 @@
+/* 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
+
+
+#define USE_SERIAL
+
+#define MASTER_LEFT
+// #define MASTER_RIGHT
+//#define EE_HANDS
+// Rows are doubled-up
diff --git a/qmk/keyboards/handwired/dactyl_manuform/5x6_right_trackball/keymaps/default/keymap.c b/qmk/keyboards/handwired/dactyl_manuform/5x6_right_trackball/keymaps/default/keymap.c
new file mode 100644
index 00000000..7550b1fd
--- /dev/null
+++ b/qmk/keyboards/handwired/dactyl_manuform/5x6_right_trackball/keymaps/default/keymap.c
@@ -0,0 +1,63 @@
+/* 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 QMK_KEYBOARD_H
+
+
+#define _QWERTY 0
+#define _LOWER 1
+#define _RAISE 2
+
+#define RAISE MO(_RAISE)
+#define LOWER MO(_LOWER)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [_QWERTY] = LAYOUT_5x6_right_trackball(
+     KC_ESC , KC_1  , KC_2  , KC_3  , KC_4  , KC_5  ,                         KC_6  , KC_7  , KC_8  , KC_9  , KC_0  ,KC_BSPC,
+     KC_TAB , KC_Q  , KC_W  , KC_E  , KC_R  , KC_T  ,                         KC_Y  , KC_U  , KC_I  , KC_O  , KC_P  ,KC_MINS,
+     KC_LSFT, KC_A  , KC_S  , KC_D  , KC_F  , KC_G  ,                         KC_H  , KC_J  , KC_K  , KC_L  ,KC_SCLN,KC_QUOT,
+     KC_LCTL, KC_Z  , KC_X  , KC_C  , KC_V  , KC_B  ,                         KC_N  , KC_M  ,KC_COMM,KC_DOT ,KC_SLSH,KC_BSLASH,
+                      KC_LBRC,KC_RBRC,                                                        KC_EQL,
+                                      RAISE,KC_SPC,                                    LOWER,
+                                      KC_TAB,KC_HOME,                         KC_END,  KC_DEL,
+                                      KC_BSPC, KC_GRV,                        KC_LGUI, KC_LALT
+  ),
+
+  [_LOWER] = LAYOUT_5x6_right_trackball(
+
+     KC_TILD,KC_EXLM, KC_AT ,KC_HASH,KC_DLR ,KC_PERC,                        KC_CIRC,KC_AMPR,KC_ASTR,KC_LPRN,KC_RPRN,KC_DEL,
+     _______,_______,_______,_______,_______,KC_LBRC,                        KC_RBRC, KC_P7 , KC_P8 , KC_P9 ,_______,KC_PLUS,
+     _______,KC_HOME,KC_PGUP,KC_PGDN,KC_END ,KC_LPRN,                        KC_RPRN, KC_P4 , KC_P5 , KC_P6 ,KC_MINS,KC_PIPE,
+     _______,_______,_______,_______,_______,_______,                        _______, KC_P1 , KC_P2 , KC_P3 ,KC_EQL ,KC_UNDS,
+                                             _______,KC_PSCR,                    KC_P0,
+                                             _______,_______,                    _______,
+                                             _______,_______,            _______,_______,
+                                             _______,_______,            _______,_______
+
+  ),
+
+  [_RAISE] = LAYOUT_5x6_right_trackball(
+       KC_F12 , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_F5 ,                        KC_F6  , KC_F7 , KC_F8 , KC_F9 ,KC_F10 ,KC_F11 ,
+       _______,_______,_______,_______,_______,KC_LBRC,                        KC_RBRC,_______,KC_NLCK,KC_INS ,KC_SLCK,KC_MUTE,
+       _______,KC_LEFT,KC_UP  ,KC_DOWN,KC_RGHT,KC_LPRN,                        KC_RPRN,KC_MPRV,KC_MPLY,KC_MNXT,_______,KC_VOLU,
+       _______,_______,_______,_______,_______,_______,                        _______,_______,_______,_______,_______,KC_VOLD,
+                                               _______,_______,                    _______,
+                                               _______,_______,                    _______,
+                                               _______,_______,            _______,_______,
+                                               _______,_______,            _______,_______
+  ),
+};
diff --git a/qmk/keyboards/handwired/dactyl_manuform/5x6_right_trackball/keymaps/drashna/config.h b/qmk/keyboards/handwired/dactyl_manuform/5x6_right_trackball/keymaps/drashna/config.h
new file mode 100644
index 00000000..78dff389
--- /dev/null
+++ b/qmk/keyboards/handwired/dactyl_manuform/5x6_right_trackball/keymaps/drashna/config.h
@@ -0,0 +1,28 @@
+/* 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
+
+// #define USE_I2C
+
+#define EE_HANDS
+#define TRACKBALL_DPI_OPTIONS \
+    { 1200, 1800, 2600, 3400 }
+
+#define RGBLIGHT_EFFECT_TWINKLE_LIFE  50
+#define RGBLIGHT_EFFECT_TWINKLE_PROBABILITY 1/63
+
+#define SOLENOID_PIN F1
diff --git a/qmk/keyboards/handwired/dactyl_manuform/5x6_right_trackball/keymaps/drashna/keymap.c b/qmk/keyboards/handwired/dactyl_manuform/5x6_right_trackball/keymaps/drashna/keymap.c
new file mode 100644
index 00000000..ca9733b6
--- /dev/null
+++ b/qmk/keyboards/handwired/dactyl_manuform/5x6_right_trackball/keymaps/drashna/keymap.c
@@ -0,0 +1,197 @@
+/* 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"
+
+#define TG_DBLO TG(_DIABLO)
+#define _MOUSE _MEDIA
+
+
+// clang-format off
+#define LAYOUT_5x6_right_trackball_wrapper(...) LAYOUT_5x6_right_trackball(__VA_ARGS__)
+#define LAYOUT_5x6_right_trackball_base( \
+    K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \
+    K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \
+    K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A  \
+  ) \
+  LAYOUT_5x6_right_trackball_wrapper( \
+     KC_GRV,  ________________NUMBER_LEFT________________,            ________________NUMBER_RIGHT_______________, KC_MINS, \
+     KC_ESC,  K01,    K02,      K03,     K04,     K05,                K06,     K07,     K08,     K09,     K0A,     KC_BSLS, \
+     LALT_T(KC_TAB), K11, K12,  K13,     K14,     K15,                K16,     K17,     K18,     K19,     K1A,     RALT_T(KC_QUOT), \
+     OS_LSFT, CTL_T(K21), K22,  K23,     K24,     K25,                K26,     K27,     K28,     K29, RCTL_T(K2A), OS_RSFT, \
+                       OS_LALT, OS_LGUI,                                                TG_GAME, TG_DBLO, \
+                                OS_LGUI, KC_GRV,                                        OS_RGUI,  \
+                                         KC_SPC,  _______,                     KC_ENT,  \
+                                         BK_LWER, MO(_MOUSE),      MO(_MOUSE), DL_RAIS  \
+  )
+#define LAYOUT_5x6_right_trackball_base_wrapper(...)       LAYOUT_5x6_right_trackball_base(__VA_ARGS__)
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_QWERTY] = LAYOUT_5x6_right_trackball_base_wrapper(
+        _________________QWERTY_L1_________________, _________________QWERTY_R1_________________,
+        _________________QWERTY_L2_________________, _________________QWERTY_R2_________________,
+        _________________QWERTY_L3_________________, _________________QWERTY_R3_________________
+    ),
+
+    [_COLEMAK] = LAYOUT_5x6_right_trackball_base_wrapper(
+        _________________COLEMAK_L1________________, _________________COLEMAK_R1________________,
+        _________________COLEMAK_L2________________, _________________COLEMAK_R2________________,
+        _________________COLEMAK_L3________________, _________________COLEMAK_R3________________
+    ),
+
+    [_DVORAK] = LAYOUT_5x6_right_trackball_base_wrapper(
+        _________________DVORAK_L1_________________, _________________DVORAK_R1_________________,
+        _________________DVORAK_L2_________________, _________________DVORAK_R2_________________,
+        _________________DVORAK_L3_________________, _________________DVORAK_R3_________________
+    ),
+
+    [_WORKMAN] = LAYOUT_5x6_right_trackball_base_wrapper(
+        _________________WORKMAN_L1________________, _________________WORKMAN_R1________________,
+        _________________WORKMAN_L2________________, _________________WORKMAN_R2________________,
+        _________________WORKMAN_L3________________, _________________WORKMAN_R3________________
+    ),
+
+    [_NORMAN] = LAYOUT_5x6_right_trackball_base_wrapper(
+        _________________NORMAN_L1_________________, _________________NORMAN_L1_________________,
+        _________________NORMAN_L2_________________, _________________NORMAN_R2_________________,
+        _________________NORMAN_L3_________________, _________________NORMAN_R3_________________
+    ),
+
+    [_MALTRON] = LAYOUT_5x6_right_trackball_base_wrapper(
+        _________________MALTRON_L1________________, _________________MALTRON_R1________________,
+        _________________MALTRON_L2________________, _________________MALTRON_R2________________,
+        _________________MALTRON_L3________________, _________________MALTRON_R3________________
+    ),
+
+    [_EUCALYN] = LAYOUT_5x6_right_trackball_base_wrapper(
+        _________________EUCALYN_L1________________, _________________EUCALYN_R1________________,
+        _________________EUCALYN_L2________________, _________________EUCALYN_R2________________,
+        _________________EUCALYN_L3________________, _________________EUCALYN_R3________________
+    ),
+
+    [_CARPLAX] = LAYOUT_5x6_right_trackball_base_wrapper(
+        _____________CARPLAX_QFMLWY_L1_____________, _____________CARPLAX_QFMLWY_R1_____________,
+        _____________CARPLAX_QFMLWY_L2_____________, _____________CARPLAX_QFMLWY_R2_____________,
+        _____________CARPLAX_QFMLWY_L3_____________, _____________CARPLAX_QFMLWY_R3_____________
+    ),
+
+    [_MOUSE] = LAYOUT_5x6_right_trackball(
+        _______, _______, _______, _______, _______, _______,                     DPI_CONFIG, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______,                        KC_WH_U, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______,                        KC_WH_D, KC_BTN1, KC_BTN3, KC_BTN2, _______, _______,
+        _______, _______, _______, _______, _______, _______,                        _______, KC_BTN4, KC_BTN5, _______, _______, _______,
+                          _______, _______,                                                            _______, _______,
+                                            _______, _______,                                 _______,
+                                                     _______, _______,               _______,
+                                                     _______, _______,      _______, _______
+    ),
+    [_GAMEPAD] = LAYOUT_5x6_right_trackball(
+        KC_ESC,  KC_NO,   KC_1,    KC_2,    KC_3,    KC_4,                        DPI_CONFIG, _______, _______, _______, _______, _______,
+        KC_F1,   KC_K,    KC_Q,    KC_W,    KC_E,    KC_R,                           KC_WH_U, _______, _______, _______, _______, _______,
+        KC_TAB,  KC_G,    KC_A,    KC_S,    KC_D,    KC_F,                           KC_WH_D, KC_BTN1, KC_BTN3, KC_BTN2, _______, _______,
+        KC_LCTL, KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_H,                           _______, KC_BTN4, KC_BTN5, _______, _______, _______,
+                          KC_I,    KC_T,                                                               TG_GAME, KC_NO,
+                                            KC_V,    KC_O,                                    _______,
+                                                     KC_SPC,  KC_P,                  _______,
+                                                     KC_H,    KC_LGUI,      _______, _______
+    ),
+    [_DIABLO] = LAYOUT_5x6_right_trackball(
+        KC_ESC,  KC_V,    KC_D,    KC_LALT, KC_NO,   KC_NO,                          KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_NO,   KC_NO,
+        KC_TAB,  KC_S,    KC_I,    KC_F,    KC_M,    KC_T,                           KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
+        KC_Q,    KC_1,    KC_2,    KC_3,    KC_4,    KC_G,                           KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
+        KC_LCTL, KC_D3_1, KC_D3_2, KC_D3_3, KC_D3_4, KC_Z,                           KC_NO,   KC_N,    KC_M,    KC_NO,   KC_NO,   KC_NO,
+                          KC_F,    KC_L,                                                               KC_NO,   TG_DBLO,
+                                      SFT_T(KC_SPC), KC_F,                                    _______,
+                                               ALT_T(KC_Q),   KC_J,                  _______,
+                                             KC_DIABLO_CLEAR, KC_LGUI,      _______, _______
+    ),
+    [_LOWER] = LAYOUT_5x6_right_trackball_wrapper(
+        KC_F12,  _________________FUNC_LEFT_________________,                        _________________FUNC_RIGHT________________, KC_F11,
+        _______, _________________LOWER_L1__________________,                        _________________LOWER_R1__________________, _______,
+        _______, _________________LOWER_L2__________________,                        _________________LOWER_R2__________________, KC_PIPE,
+        _______, _________________LOWER_L3__________________,                        _________________LOWER_R3__________________, _______,
+                          _______, _______,                                                          _______, _______,
+                                            _______, _______,                               _______,
+                                                     _______, _______,             _______,
+                                                     _______, _______,    _______, _______
+    ),
+    [_RAISE] = LAYOUT_5x6_right_trackball_wrapper(
+        KC_F12,  _________________FUNC_LEFT_________________,                      _________________FUNC_RIGHT________________, KC_F11,
+        KC_GRV,  _________________RAISE_L1__________________,                      _________________RAISE_R1__________________, _______,
+        _______, _________________RAISE_L2__________________,                      _________________RAISE_R2__________________, KC_BSLS,
+        _______, _________________RAISE_L3__________________,                      _________________RAISE_R3__________________, _______,
+                          _______, _______,                                                          _______, _______,
+                                            _______, _______,                               _______,
+                                                     _______, _______,             _______,
+                                                     _______, _______,    _______, _______
+    ),
+    [_ADJUST] = LAYOUT_5x6_right_trackball_wrapper(
+        KC_MAKE, ___________________BLANK___________________,                      _________________ADJUST_R1_________________, KC_RST,
+        VRSN,    _________________ADJUST_L1_________________,                      _________________ADJUST_R1_________________, EEP_RST,
+        _______, _________________ADJUST_L2_________________,                      _________________ADJUST_R2_________________, TG_MODS,
+        _______, _________________ADJUST_L3_________________,                      _________________ADJUST_R3_________________, KC_MPLY,
+                          HPT_DWLI, HPT_DWLD,                                                        _______, _______,
+                                            HPT_TOG, HPT_BUZ,                               KC_NUKE,
+                                                     _______, _______,             _______,
+                                                     _______, _______,    KC_NUKE, _______
+    ),
+};
+// clang-format off
+
+
+#ifdef POINTING_DEVICE_ENABLE
+static uint16_t mouse_timer = 0;
+static uint16_t mouse_debounce_timer = 0;
+static uint8_t  mouse_keycode_tracker = 0;
+
+void process_mouse_user(report_mouse_t* mouse_report, int16_t x, int16_t y) {
+    if ((x || y) && timer_elapsed(mouse_timer) > 125) {
+        mouse_timer = timer_read();
+        if (!layer_state_is(_MOUSE) && !layer_state_is(_GAMEPAD) && timer_elapsed(mouse_debounce_timer) > 125) {
+            layer_on(_MOUSE);
+        }
+    }
+    if (timer_elapsed(mouse_debounce_timer) > 125 || layer_state_is(_GAMEPAD) ) {
+        mouse_report->x = x;
+        mouse_report->y = y;
+    }
+}
+
+void matrix_scan_keymap(void) {
+    if (timer_elapsed(mouse_timer) > 750 && layer_state_is(_MOUSE) && !mouse_keycode_tracker) {
+        layer_off(_MOUSE);
+    }
+}
+
+bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
+    switch(keycode){
+        case MO(_MOUSE):
+        case DPI_CONFIG:
+        case KC_MS_UP...KC_MS_WH_RIGHT:
+            record->event.pressed ? mouse_keycode_tracker++ : mouse_keycode_tracker--;
+            mouse_timer = timer_read();
+            break;
+        default:
+            if (layer_state_is(_MOUSE) && !mouse_keycode_tracker) {
+                layer_off(_MOUSE);
+            }
+            mouse_debounce_timer = timer_read();
+            break;
+    }
+    return true;
+}
+#endif
diff --git a/qmk/keyboards/handwired/dactyl_manuform/5x6_right_trackball/keymaps/drashna/rules.mk b/qmk/keyboards/handwired/dactyl_manuform/5x6_right_trackball/keymaps/drashna/rules.mk
new file mode 100644
index 00000000..2e3e9607
--- /dev/null
+++ b/qmk/keyboards/handwired/dactyl_manuform/5x6_right_trackball/keymaps/drashna/rules.mk
@@ -0,0 +1,2 @@
+RGBLIGHT_STARTUP_ANIMATION = yes
+HAPTIC_ENABLE = SOLENOID
diff --git a/qmk/keyboards/handwired/dactyl_manuform/5x6_right_trackball/pmw3360.c b/qmk/keyboards/handwired/dactyl_manuform/5x6_right_trackball/pmw3360.c
new file mode 100644
index 00000000..8007fece
--- /dev/null
+++ b/qmk/keyboards/handwired/dactyl_manuform/5x6_right_trackball/pmw3360.c
@@ -0,0 +1,225 @@
+/* Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+ * Copyright 2019 Sunjun Kim
+ * Copyright 2020 Ploopy Corporation
+ *
+ * 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 "pmw3360.h"
+#include "pmw3360_firmware.h"
+
+#ifdef CONSOLE_ENABLE
+#    include "print.h"
+#endif
+bool _inBurst = false;
+
+#ifndef PMW_CPI
+#    define PMW_CPI 1600
+#endif
+#ifndef SPI_DIVISOR
+#    define SPI_DIVISOR 2
+#endif
+#ifndef ROTATIONAL_TRANSFORM_ANGLE
+#    define ROTATIONAL_TRANSFORM_ANGLE 0x00
+#endif
+
+#ifdef CONSOLE_ENABLE
+void print_byte(uint8_t byte) { dprintf("%c%c%c%c%c%c%c%c|", (byte & 0x80 ? '1' : '0'), (byte & 0x40 ? '1' : '0'), (byte & 0x20 ? '1' : '0'), (byte & 0x10 ? '1' : '0'), (byte & 0x08 ? '1' : '0'), (byte & 0x04 ? '1' : '0'), (byte & 0x02 ? '1' : '0'), (byte & 0x01 ? '1' : '0')); }
+#endif
+
+
+bool spi_start_adv(void) {
+    bool status = spi_start(SPI_SS_PIN, false, 3, SPI_DIVISOR);
+    wait_us(1);
+    return status;
+}
+
+void spi_stop_adv(void) {
+    wait_us(1);
+    spi_stop();
+}
+
+spi_status_t spi_write_adv(uint8_t reg_addr, uint8_t data) {
+    if (reg_addr != REG_Motion_Burst) {
+        _inBurst = false;
+    }
+
+    spi_start_adv();
+    // send address of the register, with MSBit = 1 to indicate it's a write
+    spi_status_t status = spi_write(reg_addr | 0x80);
+    status = spi_write(data);
+
+    // tSCLK-NCS for write operation
+    wait_us(20);
+
+    // tSWW/tSWR (=120us) minus tSCLK-NCS. Could be shortened, but is looks like a safe lower bound
+    wait_us(100);
+    spi_stop();
+    return status;
+}
+
+uint8_t spi_read_adv(uint8_t reg_addr) {
+    spi_start_adv();
+    // send adress of the register, with MSBit = 0 to indicate it's a read
+    spi_write(reg_addr & 0x7f);
+
+    uint8_t data = spi_read();
+
+    // tSCLK-NCS for read operation is 120ns
+    wait_us(1);
+
+    //  tSRW/tSRR (=20us) minus tSCLK-NCS
+    wait_us(19);
+
+    spi_stop();
+    return data;
+}
+
+void pmw_set_cpi(uint16_t cpi) {
+    int cpival = constrain((cpi / 100) - 1, 0, 0x77);  // limits to 0--119
+
+    spi_start_adv();
+    spi_write_adv(REG_Config1, cpival);
+    spi_stop();
+}
+
+bool pmw_spi_init(void) {
+    spi_init();
+    _inBurst = false;
+
+    spi_stop();
+    spi_start_adv();
+    spi_stop();
+
+    spi_write_adv(REG_Shutdown, 0xb6); // Shutdown first
+    wait_ms(300);
+
+    spi_start_adv();
+    wait_us(40);
+    spi_stop_adv();
+    wait_us(40);
+
+    spi_write_adv(REG_Power_Up_Reset, 0x5a);
+    wait_ms(50);
+
+    spi_read_adv(REG_Motion);
+    spi_read_adv(REG_Delta_X_L);
+    spi_read_adv(REG_Delta_X_H);
+    spi_read_adv(REG_Delta_Y_L);
+    spi_read_adv(REG_Delta_Y_H);
+
+    pmw_upload_firmware();
+
+    spi_stop_adv();
+
+    wait_ms(10);
+    pmw_set_cpi(PMW_CPI);
+
+    wait_ms(1);
+
+    return pmw_check_signature();
+}
+
+void pmw_upload_firmware(void) {
+    spi_write_adv(REG_Config2, 0x00);
+
+    spi_write_adv(REG_Angle_Tune, constrain(ROTATIONAL_TRANSFORM_ANGLE, -30, 30));
+
+    spi_write_adv(REG_SROM_Enable, 0x1d);
+
+    wait_ms(10);
+
+    spi_write_adv(REG_SROM_Enable, 0x18);
+
+    spi_start_adv();
+    spi_write(REG_SROM_Load_Burst | 0x80);
+    wait_us(15);
+
+    unsigned char c;
+    for (int i = 0; i < firmware_length; i++) {
+        c = (unsigned char)pgm_read_byte(firmware_data + i);
+        spi_write(c);
+        wait_us(15);
+    }
+    wait_us(200);
+
+    spi_read_adv(REG_SROM_ID);
+
+    spi_write_adv(REG_Config2, 0x00);
+
+    spi_stop();
+    wait_ms(10);
+}
+
+bool pmw_check_signature(void) {
+    uint8_t pid      = spi_read_adv(REG_Product_ID);
+    uint8_t iv_pid   = spi_read_adv(REG_Inverse_Product_ID);
+    uint8_t SROM_ver = spi_read_adv(REG_SROM_ID);
+    return (pid == 0x42 && iv_pid == 0xBD && SROM_ver == 0x04);  // signature for SROM 0x04
+}
+
+report_pmw_t pmw_read_burst(void) {
+    if (!_inBurst) {
+#ifdef CONSOLE_ENABLE
+        dprintf("burst on");
+#endif
+        spi_write_adv(REG_Motion_Burst, 0x00);
+        _inBurst = true;
+    }
+
+    spi_start_adv();
+    spi_write(REG_Motion_Burst);
+    wait_us(35);  // waits for tSRAD
+
+    report_pmw_t data;
+    data.motion = 0;
+    data.dx     = 0;
+    data.mdx    = 0;
+    data.dy     = 0;
+    data.mdx    = 0;
+
+    data.motion = spi_read();
+    spi_write(0x00);  // skip Observation
+    data.dx  = spi_read();
+    data.mdx = spi_read();
+    data.dy  = spi_read();
+    data.mdy = spi_read();
+
+    spi_stop();
+
+#ifdef CONSOLE_ENABLE
+    print_byte(data.motion);
+    print_byte(data.dx);
+    print_byte(data.mdx);
+    print_byte(data.dy);
+    print_byte(data.mdy);
+    dprintf("\n");
+#endif
+
+    data.isMotion    = (data.motion & 0x80) != 0;
+    data.isOnSurface = (data.motion & 0x08) == 0;
+    data.dx |= (data.mdx << 8);
+    data.dx = data.dx * -1;
+    data.dy |= (data.mdy << 8);
+    data.dy = data.dy * -1;
+
+    spi_stop();
+
+    if (data.motion & 0b111) {  // panic recovery, sometimes burst mode works weird.
+        _inBurst = false;
+    }
+
+    return data;
+}
diff --git a/qmk/keyboards/handwired/dactyl_manuform/5x6_right_trackball/pmw3360.h b/qmk/keyboards/handwired/dactyl_manuform/5x6_right_trackball/pmw3360.h
new file mode 100644
index 00000000..c1d5e3ba
--- /dev/null
+++ b/qmk/keyboards/handwired/dactyl_manuform/5x6_right_trackball/pmw3360.h
@@ -0,0 +1,103 @@
+/* Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+ * Copyright 2019 Sunjun Kim
+ * Copyright 2020 Ploopy Corporation
+ *
+ * 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 "spi_master.h"
+
+// Registers
+#define REG_Product_ID  0x00
+#define REG_Revision_ID 0x01
+#define REG_Motion  0x02
+#define REG_Delta_X_L 0x03
+#define REG_Delta_X_H 0x04
+#define REG_Delta_Y_L 0x05
+#define REG_Delta_Y_H 0x06
+#define REG_SQUAL 0x07
+#define REG_Raw_Data_Sum  0x08
+#define REG_Maximum_Raw_data  0x09
+#define REG_Minimum_Raw_data  0x0A
+#define REG_Shutter_Lower 0x0B
+#define REG_Shutter_Upper 0x0C
+#define REG_Control 0x0D
+#define REG_Config1 0x0F
+#define REG_Config2 0x10
+#define REG_Angle_Tune  0x11
+#define REG_Frame_Capture 0x12
+#define REG_SROM_Enable 0x13
+#define REG_Run_Downshift 0x14
+#define REG_Rest1_Rate_Lower  0x15
+#define REG_Rest1_Rate_Upper  0x16
+#define REG_Rest1_Downshift 0x17
+#define REG_Rest2_Rate_Lower  0x18
+#define REG_Rest2_Rate_Upper  0x19
+#define REG_Rest2_Downshift 0x1A
+#define REG_Rest3_Rate_Lower  0x1B
+#define REG_Rest3_Rate_Upper  0x1C
+#define REG_Observation 0x24
+#define REG_Data_Out_Lower  0x25
+#define REG_Data_Out_Upper  0x26
+#define REG_Raw_Data_Dump 0x29
+#define REG_SROM_ID 0x2A
+#define REG_Min_SQ_Run  0x2B
+#define REG_Raw_Data_Threshold  0x2C
+#define REG_Config5 0x2F
+#define REG_Power_Up_Reset  0x3A
+#define REG_Shutdown  0x3B
+#define REG_Inverse_Product_ID  0x3F
+#define REG_LiftCutoff_Tune3  0x41
+#define REG_Angle_Snap  0x42
+#define REG_LiftCutoff_Tune1  0x4A
+#define REG_Motion_Burst  0x50
+#define REG_LiftCutoff_Tune_Timeout 0x58
+#define REG_LiftCutoff_Tune_Min_Length  0x5A
+#define REG_SROM_Load_Burst 0x62
+#define REG_Lift_Config 0x63
+#define REG_Raw_Data_Burst  0x64
+#define REG_LiftCutoff_Tune2  0x65
+
+#ifdef CONSOLE_ENABLE
+void print_byte(uint8_t byte);
+#endif
+
+typedef struct {
+    int8_t  motion;
+    bool    isMotion;     // True if a motion is detected.
+    bool    isOnSurface;  // True when a chip is on a surface
+    int16_t dx;           // displacement on x directions. Unit: Count. (CPI * Count = Inch value)
+    int8_t  mdx;
+    int16_t dy;  // displacement on y directions.
+    int8_t  mdy;
+} report_pmw_t;
+
+
+
+bool spi_start_adv(void);
+void spi_stop_adv(void);
+spi_status_t spi_write_adv(uint8_t reg_addr, uint8_t data);
+uint8_t spi_read_adv(uint8_t reg_addr);
+bool pmw_spi_init(void);
+void pmw_set_cpi(uint16_t cpi);
+void pmw_upload_firmware(void);
+bool pmw_check_signature(void);
+report_pmw_t pmw_read_burst(void);
+
+
+#define degToRad(angleInDegrees) ((angleInDegrees)*M_PI / 180.0)
+#define radToDeg(angleInRadians) ((angleInRadians)*180.0 / M_PI)
+#define constrain(amt, low, high) ((amt) < (low) ? (low) : ((amt) > (high) ? (high) : (amt)))
diff --git a/qmk/keyboards/handwired/dactyl_manuform/5x6_right_trackball/pmw3360_firmware.h b/qmk/keyboards/handwired/dactyl_manuform/5x6_right_trackball/pmw3360_firmware.h
new file mode 100644
index 00000000..cca5a6a4
--- /dev/null
+++ b/qmk/keyboards/handwired/dactyl_manuform/5x6_right_trackball/pmw3360_firmware.h
@@ -0,0 +1,300 @@
+/* Copyright 2020 Christopher Courtney, aka Drashna Jael're  (@drashna) <drashna@live.com>
+ * Copyright 2019 Sunjun Kim
+ * Copyright 2020 Ploopy Corporation
+ *
+ * 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
+
+// clang-format off
+// Firmware Blob foor PMW3360
+const uint16_t firmware_length = 4094;
+// clang-format off
+const uint8_t firmware_data[] PROGMEM = {    // SROM 0x04
+0x01, 0x04, 0x8e, 0x96, 0x6e, 0x77, 0x3e, 0xfe, 0x7e, 0x5f, 0x1d, 0xb8, 0xf2, 0x66, 0x4e,
+0xff, 0x5d, 0x19, 0xb0, 0xc2, 0x04, 0x69, 0x54, 0x2a, 0xd6, 0x2e, 0xbf, 0xdd, 0x19, 0xb0,
+0xc3, 0xe5, 0x29, 0xb1, 0xe0, 0x23, 0xa5, 0xa9, 0xb1, 0xc1, 0x00, 0x82, 0x67, 0x4c, 0x1a,
+0x97, 0x8d, 0x79, 0x51, 0x20, 0xc7, 0x06, 0x8e, 0x7c, 0x7c, 0x7a, 0x76, 0x4f, 0xfd, 0x59,
+0x30, 0xe2, 0x46, 0x0e, 0x9e, 0xbe, 0xdf, 0x1d, 0x99, 0x91, 0xa0, 0xa5, 0xa1, 0xa9, 0xd0,
+0x22, 0xc6, 0xef, 0x5c, 0x1b, 0x95, 0x89, 0x90, 0xa2, 0xa7, 0xcc, 0xfb, 0x55, 0x28, 0xb3,
+0xe4, 0x4a, 0xf7, 0x6c, 0x3b, 0xf4, 0x6a, 0x56, 0x2e, 0xde, 0x1f, 0x9d, 0xb8, 0xd3, 0x05,
+0x88, 0x92, 0xa6, 0xce, 0x1e, 0xbe, 0xdf, 0x1d, 0x99, 0xb0, 0xe2, 0x46, 0xef, 0x5c, 0x07,
+0x11, 0x5d, 0x98, 0x0b, 0x9d, 0x94, 0x97, 0xee, 0x4e, 0x45, 0x33, 0x6b, 0x44, 0xc7, 0x29,
+0x56, 0x27, 0x30, 0xc6, 0xa7, 0xd5, 0xf2, 0x56, 0xdf, 0xb4, 0x38, 0x62, 0xcb, 0xa0, 0xb6,
+0xe3, 0x0f, 0x84, 0x06, 0x24, 0x05, 0x65, 0x6f, 0x76, 0x89, 0xb5, 0x77, 0x41, 0x27, 0x82,
+0x66, 0x65, 0x82, 0xcc, 0xd5, 0xe6, 0x20, 0xd5, 0x27, 0x17, 0xc5, 0xf8, 0x03, 0x23, 0x7c,
+0x5f, 0x64, 0xa5, 0x1d, 0xc1, 0xd6, 0x36, 0xcb, 0x4c, 0xd4, 0xdb, 0x66, 0xd7, 0x8b, 0xb1,
+0x99, 0x7e, 0x6f, 0x4c, 0x36, 0x40, 0x06, 0xd6, 0xeb, 0xd7, 0xa2, 0xe4, 0xf4, 0x95, 0x51,
+0x5a, 0x54, 0x96, 0xd5, 0x53, 0x44, 0xd7, 0x8c, 0xe0, 0xb9, 0x40, 0x68, 0xd2, 0x18, 0xe9,
+0xdd, 0x9a, 0x23, 0x92, 0x48, 0xee, 0x7f, 0x43, 0xaf, 0xea, 0x77, 0x38, 0x84, 0x8c, 0x0a,
+0x72, 0xaf, 0x69, 0xf8, 0xdd, 0xf1, 0x24, 0x83, 0xa3, 0xf8, 0x4a, 0xbf, 0xf5, 0x94, 0x13,
+0xdb, 0xbb, 0xd8, 0xb4, 0xb3, 0xa0, 0xfb, 0x45, 0x50, 0x60, 0x30, 0x59, 0x12, 0x31, 0x71,
+0xa2, 0xd3, 0x13, 0xe7, 0xfa, 0xe7, 0xce, 0x0f, 0x63, 0x15, 0x0b, 0x6b, 0x94, 0xbb, 0x37,
+0x83, 0x26, 0x05, 0x9d, 0xfb, 0x46, 0x92, 0xfc, 0x0a, 0x15, 0xd1, 0x0d, 0x73, 0x92, 0xd6,
+0x8c, 0x1b, 0x8c, 0xb8, 0x55, 0x8a, 0xce, 0xbd, 0xfe, 0x8e, 0xfc, 0xed, 0x09, 0x12, 0x83,
+0x91, 0x82, 0x51, 0x31, 0x23, 0xfb, 0xb4, 0x0c, 0x76, 0xad, 0x7c, 0xd9, 0xb4, 0x4b, 0xb2,
+0x67, 0x14, 0x09, 0x9c, 0x7f, 0x0c, 0x18, 0xba, 0x3b, 0xd6, 0x8e, 0x14, 0x2a, 0xe4, 0x1b,
+0x52, 0x9f, 0x2b, 0x7d, 0xe1, 0xfb, 0x6a, 0x33, 0x02, 0xfa, 0xac, 0x5a, 0xf2, 0x3e, 0x88,
+0x7e, 0xae, 0xd1, 0xf3, 0x78, 0xe8, 0x05, 0xd1, 0xe3, 0xdc, 0x21, 0xf6, 0xe1, 0x9a, 0xbd,
+0x17, 0x0e, 0xd9, 0x46, 0x9b, 0x88, 0x03, 0xea, 0xf6, 0x66, 0xbe, 0x0e, 0x1b, 0x50, 0x49,
+0x96, 0x40, 0x97, 0xf1, 0xf1, 0xe4, 0x80, 0xa6, 0x6e, 0xe8, 0x77, 0x34, 0xbf, 0x29, 0x40,
+0x44, 0xc2, 0xff, 0x4e, 0x98, 0xd3, 0x9c, 0xa3, 0x32, 0x2b, 0x76, 0x51, 0x04, 0x09, 0xe7,
+0xa9, 0xd1, 0xa6, 0x32, 0xb1, 0x23, 0x53, 0xe2, 0x47, 0xab, 0xd6, 0xf5, 0x69, 0x5c, 0x3e,
+0x5f, 0xfa, 0xae, 0x45, 0x20, 0xe5, 0xd2, 0x44, 0xff, 0x39, 0x32, 0x6d, 0xfd, 0x27, 0x57,
+0x5c, 0xfd, 0xf0, 0xde, 0xc1, 0xb5, 0x99, 0xe5, 0xf5, 0x1c, 0x77, 0x01, 0x75, 0xc5, 0x6d,
+0x58, 0x92, 0xf2, 0xb2, 0x47, 0x00, 0x01, 0x26, 0x96, 0x7a, 0x30, 0xff, 0xb7, 0xf0, 0xef,
+0x77, 0xc1, 0x8a, 0x5d, 0xdc, 0xc0, 0xd1, 0x29, 0x30, 0x1e, 0x77, 0x38, 0x7a, 0x94, 0xf1,
+0xb8, 0x7a, 0x7e, 0xef, 0xa4, 0xd1, 0xac, 0x31, 0x4a, 0xf2, 0x5d, 0x64, 0x3d, 0xb2, 0xe2,
+0xf0, 0x08, 0x99, 0xfc, 0x70, 0xee, 0x24, 0xa7, 0x7e, 0xee, 0x1e, 0x20, 0x69, 0x7d, 0x44,
+0xbf, 0x87, 0x42, 0xdf, 0x88, 0x3b, 0x0c, 0xda, 0x42, 0xc9, 0x04, 0xf9, 0x45, 0x50, 0xfc,
+0x83, 0x8f, 0x11, 0x6a, 0x72, 0xbc, 0x99, 0x95, 0xf0, 0xac, 0x3d, 0xa7, 0x3b, 0xcd, 0x1c,
+0xe2, 0x88, 0x79, 0x37, 0x11, 0x5f, 0x39, 0x89, 0x95, 0x0a, 0x16, 0x84, 0x7a, 0xf6, 0x8a,
+0xa4, 0x28, 0xe4, 0xed, 0x83, 0x80, 0x3b, 0xb1, 0x23, 0xa5, 0x03, 0x10, 0xf4, 0x66, 0xea,
+0xbb, 0x0c, 0x0f, 0xc5, 0xec, 0x6c, 0x69, 0xc5, 0xd3, 0x24, 0xab, 0xd4, 0x2a, 0xb7, 0x99,
+0x88, 0x76, 0x08, 0xa0, 0xa8, 0x95, 0x7c, 0xd8, 0x38, 0x6d, 0xcd, 0x59, 0x02, 0x51, 0x4b,
+0xf1, 0xb5, 0x2b, 0x50, 0xe3, 0xb6, 0xbd, 0xd0, 0x72, 0xcf, 0x9e, 0xfd, 0x6e, 0xbb, 0x44,
+0xc8, 0x24, 0x8a, 0x77, 0x18, 0x8a, 0x13, 0x06, 0xef, 0x97, 0x7d, 0xfa, 0x81, 0xf0, 0x31,
+0xe6, 0xfa, 0x77, 0xed, 0x31, 0x06, 0x31, 0x5b, 0x54, 0x8a, 0x9f, 0x30, 0x68, 0xdb, 0xe2,
+0x40, 0xf8, 0x4e, 0x73, 0xfa, 0xab, 0x74, 0x8b, 0x10, 0x58, 0x13, 0xdc, 0xd2, 0xe6, 0x78,
+0xd1, 0x32, 0x2e, 0x8a, 0x9f, 0x2c, 0x58, 0x06, 0x48, 0x27, 0xc5, 0xa9, 0x5e, 0x81, 0x47,
+0x89, 0x46, 0x21, 0x91, 0x03, 0x70, 0xa4, 0x3e, 0x88, 0x9c, 0xda, 0x33, 0x0a, 0xce, 0xbc,
+0x8b, 0x8e, 0xcf, 0x9f, 0xd3, 0x71, 0x80, 0x43, 0xcf, 0x6b, 0xa9, 0x51, 0x83, 0x76, 0x30,
+0x82, 0xc5, 0x6a, 0x85, 0x39, 0x11, 0x50, 0x1a, 0x82, 0xdc, 0x1e, 0x1c, 0xd5, 0x7d, 0xa9,
+0x71, 0x99, 0x33, 0x47, 0x19, 0x97, 0xb3, 0x5a, 0xb1, 0xdf, 0xed, 0xa4, 0xf2, 0xe6, 0x26,
+0x84, 0xa2, 0x28, 0x9a, 0x9e, 0xdf, 0xa6, 0x6a, 0xf4, 0xd6, 0xfc, 0x2e, 0x5b, 0x9d, 0x1a,
+0x2a, 0x27, 0x68, 0xfb, 0xc1, 0x83, 0x21, 0x4b, 0x90, 0xe0, 0x36, 0xdd, 0x5b, 0x31, 0x42,
+0x55, 0xa0, 0x13, 0xf7, 0xd0, 0x89, 0x53, 0x71, 0x99, 0x57, 0x09, 0x29, 0xc5, 0xf3, 0x21,
+0xf8, 0x37, 0x2f, 0x40, 0xf3, 0xd4, 0xaf, 0x16, 0x08, 0x36, 0x02, 0xfc, 0x77, 0xc5, 0x8b,
+0x04, 0x90, 0x56, 0xb9, 0xc9, 0x67, 0x9a, 0x99, 0xe8, 0x00, 0xd3, 0x86, 0xff, 0x97, 0x2d,
+0x08, 0xe9, 0xb7, 0xb3, 0x91, 0xbc, 0xdf, 0x45, 0xc6, 0xed, 0x0f, 0x8c, 0x4c, 0x1e, 0xe6,
+0x5b, 0x6e, 0x38, 0x30, 0xe4, 0xaa, 0xe3, 0x95, 0xde, 0xb9, 0xe4, 0x9a, 0xf5, 0xb2, 0x55,
+0x9a, 0x87, 0x9b, 0xf6, 0x6a, 0xb2, 0xf2, 0x77, 0x9a, 0x31, 0xf4, 0x7a, 0x31, 0xd1, 0x1d,
+0x04, 0xc0, 0x7c, 0x32, 0xa2, 0x9e, 0x9a, 0xf5, 0x62, 0xf8, 0x27, 0x8d, 0xbf, 0x51, 0xff,
+0xd3, 0xdf, 0x64, 0x37, 0x3f, 0x2a, 0x6f, 0x76, 0x3a, 0x7d, 0x77, 0x06, 0x9e, 0x77, 0x7f,
+0x5e, 0xeb, 0x32, 0x51, 0xf9, 0x16, 0x66, 0x9a, 0x09, 0xf3, 0xb0, 0x08, 0xa4, 0x70, 0x96,
+0x46, 0x30, 0xff, 0xda, 0x4f, 0xe9, 0x1b, 0xed, 0x8d, 0xf8, 0x74, 0x1f, 0x31, 0x92, 0xb3,
+0x73, 0x17, 0x36, 0xdb, 0x91, 0x30, 0xd6, 0x88, 0x55, 0x6b, 0x34, 0x77, 0x87, 0x7a, 0xe7,
+0xee, 0x06, 0xc6, 0x1c, 0x8c, 0x19, 0x0c, 0x48, 0x46, 0x23, 0x5e, 0x9c, 0x07, 0x5c, 0xbf,
+0xb4, 0x7e, 0xd6, 0x4f, 0x74, 0x9c, 0xe2, 0xc5, 0x50, 0x8b, 0xc5, 0x8b, 0x15, 0x90, 0x60,
+0x62, 0x57, 0x29, 0xd0, 0x13, 0x43, 0xa1, 0x80, 0x88, 0x91, 0x00, 0x44, 0xc7, 0x4d, 0x19,
+0x86, 0xcc, 0x2f, 0x2a, 0x75, 0x5a, 0xfc, 0xeb, 0x97, 0x2a, 0x70, 0xe3, 0x78, 0xd8, 0x91,
+0xb0, 0x4f, 0x99, 0x07, 0xa3, 0x95, 0xea, 0x24, 0x21, 0xd5, 0xde, 0x51, 0x20, 0x93, 0x27,
+0x0a, 0x30, 0x73, 0xa8, 0xff, 0x8a, 0x97, 0xe9, 0xa7, 0x6a, 0x8e, 0x0d, 0xe8, 0xf0, 0xdf,
+0xec, 0xea, 0xb4, 0x6c, 0x1d, 0x39, 0x2a, 0x62, 0x2d, 0x3d, 0x5a, 0x8b, 0x65, 0xf8, 0x90,
+0x05, 0x2e, 0x7e, 0x91, 0x2c, 0x78, 0xef, 0x8e, 0x7a, 0xc1, 0x2f, 0xac, 0x78, 0xee, 0xaf,
+0x28, 0x45, 0x06, 0x4c, 0x26, 0xaf, 0x3b, 0xa2, 0xdb, 0xa3, 0x93, 0x06, 0xb5, 0x3c, 0xa5,
+0xd8, 0xee, 0x8f, 0xaf, 0x25, 0xcc, 0x3f, 0x85, 0x68, 0x48, 0xa9, 0x62, 0xcc, 0x97, 0x8f,
+0x7f, 0x2a, 0xea, 0xe0, 0x15, 0x0a, 0xad, 0x62, 0x07, 0xbd, 0x45, 0xf8, 0x41, 0xd8, 0x36,
+0xcb, 0x4c, 0xdb, 0x6e, 0xe6, 0x3a, 0xe7, 0xda, 0x15, 0xe9, 0x29, 0x1e, 0x12, 0x10, 0xa0,
+0x14, 0x2c, 0x0e, 0x3d, 0xf4, 0xbf, 0x39, 0x41, 0x92, 0x75, 0x0b, 0x25, 0x7b, 0xa3, 0xce,
+0x39, 0x9c, 0x15, 0x64, 0xc8, 0xfa, 0x3d, 0xef, 0x73, 0x27, 0xfe, 0x26, 0x2e, 0xce, 0xda,
+0x6e, 0xfd, 0x71, 0x8e, 0xdd, 0xfe, 0x76, 0xee, 0xdc, 0x12, 0x5c, 0x02, 0xc5, 0x3a, 0x4e,
+0x4e, 0x4f, 0xbf, 0xca, 0x40, 0x15, 0xc7, 0x6e, 0x8d, 0x41, 0xf1, 0x10, 0xe0, 0x4f, 0x7e,
+0x97, 0x7f, 0x1c, 0xae, 0x47, 0x8e, 0x6b, 0xb1, 0x25, 0x31, 0xb0, 0x73, 0xc7, 0x1b, 0x97,
+0x79, 0xf9, 0x80, 0xd3, 0x66, 0x22, 0x30, 0x07, 0x74, 0x1e, 0xe4, 0xd0, 0x80, 0x21, 0xd6,
+0xee, 0x6b, 0x6c, 0x4f, 0xbf, 0xf5, 0xb7, 0xd9, 0x09, 0x87, 0x2f, 0xa9, 0x14, 0xbe, 0x27,
+0xd9, 0x72, 0x50, 0x01, 0xd4, 0x13, 0x73, 0xa6, 0xa7, 0x51, 0x02, 0x75, 0x25, 0xe1, 0xb3,
+0x45, 0x34, 0x7d, 0xa8, 0x8e, 0xeb, 0xf3, 0x16, 0x49, 0xcb, 0x4f, 0x8c, 0xa1, 0xb9, 0x36,
+0x85, 0x39, 0x75, 0x5d, 0x08, 0x00, 0xae, 0xeb, 0xf6, 0xea, 0xd7, 0x13, 0x3a, 0x21, 0x5a,
+0x5f, 0x30, 0x84, 0x52, 0x26, 0x95, 0xc9, 0x14, 0xf2, 0x57, 0x55, 0x6b, 0xb1, 0x10, 0xc2,
+0xe1, 0xbd, 0x3b, 0x51, 0xc0, 0xb7, 0x55, 0x4c, 0x71, 0x12, 0x26, 0xc7, 0x0d, 0xf9, 0x51,
+0xa4, 0x38, 0x02, 0x05, 0x7f, 0xb8, 0xf1, 0x72, 0x4b, 0xbf, 0x71, 0x89, 0x14, 0xf3, 0x77,
+0x38, 0xd9, 0x71, 0x24, 0xf3, 0x00, 0x11, 0xa1, 0xd8, 0xd4, 0x69, 0x27, 0x08, 0x37, 0x35,
+0xc9, 0x11, 0x9d, 0x90, 0x1c, 0x0e, 0xe7, 0x1c, 0xff, 0x2d, 0x1e, 0xe8, 0x92, 0xe1, 0x18,
+0x10, 0x95, 0x7c, 0xe0, 0x80, 0xf4, 0x96, 0x43, 0x21, 0xf9, 0x75, 0x21, 0x64, 0x38, 0xdd,
+0x9f, 0x1e, 0x95, 0x16, 0xda, 0x56, 0x1d, 0x4f, 0x9a, 0x53, 0xb2, 0xe2, 0xe4, 0x18, 0xcb,
+0x6b, 0x1a, 0x65, 0xeb, 0x56, 0xc6, 0x3b, 0xe5, 0xfe, 0xd8, 0x26, 0x3f, 0x3a, 0x84, 0x59,
+0x72, 0x66, 0xa2, 0xf3, 0x75, 0xff, 0xfb, 0x60, 0xb3, 0x22, 0xad, 0x3f, 0x2d, 0x6b, 0xf9,
+0xeb, 0xea, 0x05, 0x7c, 0xd8, 0x8f, 0x6d, 0x2c, 0x98, 0x9e, 0x2b, 0x93, 0xf1, 0x5e, 0x46,
+0xf0, 0x87, 0x49, 0x29, 0x73, 0x68, 0xd7, 0x7f, 0xf9, 0xf0, 0xe5, 0x7d, 0xdb, 0x1d, 0x75,
+0x19, 0xf3, 0xc4, 0x58, 0x9b, 0x17, 0x88, 0xa8, 0x92, 0xe0, 0xbe, 0xbd, 0x8b, 0x1d, 0x8d,
+0x9f, 0x56, 0x76, 0xad, 0xaf, 0x29, 0xe2, 0xd9, 0xd5, 0x52, 0xf6, 0xb5, 0x56, 0x35, 0x57,
+0x3a, 0xc8, 0xe1, 0x56, 0x43, 0x19, 0x94, 0xd3, 0x04, 0x9b, 0x6d, 0x35, 0xd8, 0x0b, 0x5f,
+0x4d, 0x19, 0x8e, 0xec, 0xfa, 0x64, 0x91, 0x0a, 0x72, 0x20, 0x2b, 0xbc, 0x1a, 0x4a, 0xfe,
+0x8b, 0xfd, 0xbb, 0xed, 0x1b, 0x23, 0xea, 0xad, 0x72, 0x82, 0xa1, 0x29, 0x99, 0x71, 0xbd,
+0xf0, 0x95, 0xc1, 0x03, 0xdd, 0x7b, 0xc2, 0xb2, 0x3c, 0x28, 0x54, 0xd3, 0x68, 0xa4, 0x72,
+0xc8, 0x66, 0x96, 0xe0, 0xd1, 0xd8, 0x7f, 0xf8, 0xd1, 0x26, 0x2b, 0xf7, 0xad, 0xba, 0x55,
+0xca, 0x15, 0xb9, 0x32, 0xc3, 0xe5, 0x88, 0x97, 0x8e, 0x5c, 0xfb, 0x92, 0x25, 0x8b, 0xbf,
+0xa2, 0x45, 0x55, 0x7a, 0xa7, 0x6f, 0x8b, 0x57, 0x5b, 0xcf, 0x0e, 0xcb, 0x1d, 0xfb, 0x20,
+0x82, 0x77, 0xa8, 0x8c, 0xcc, 0x16, 0xce, 0x1d, 0xfa, 0xde, 0xcc, 0x0b, 0x62, 0xfe, 0xcc,
+0xe1, 0xb7, 0xf0, 0xc3, 0x81, 0x64, 0x73, 0x40, 0xa0, 0xc2, 0x4d, 0x89, 0x11, 0x75, 0x33,
+0x55, 0x33, 0x8d, 0xe8, 0x4a, 0xfd, 0xea, 0x6e, 0x30, 0x0b, 0xd7, 0x31, 0x2c, 0xde, 0x47,
+0xe3, 0xbf, 0xf8, 0x55, 0x42, 0xe2, 0x7f, 0x59, 0xe5, 0x17, 0xef, 0x99, 0x34, 0x69, 0x91,
+0xb1, 0x23, 0x8e, 0x20, 0x87, 0x2d, 0xa8, 0xfe, 0xd5, 0x8a, 0xf3, 0x84, 0x3a, 0xf0, 0x37,
+0xe4, 0x09, 0x00, 0x54, 0xee, 0x67, 0x49, 0x93, 0xe4, 0x81, 0x70, 0xe3, 0x90, 0x4d, 0xef,
+0xfe, 0x41, 0xb7, 0x99, 0x7b, 0xc1, 0x83, 0xba, 0x62, 0x12, 0x6f, 0x7d, 0xde, 0x6b, 0xaf,
+0xda, 0x16, 0xf9, 0x55, 0x51, 0xee, 0xa6, 0x0c, 0x2b, 0x02, 0xa3, 0xfd, 0x8d, 0xfb, 0x30,
+0x17, 0xe4, 0x6f, 0xdf, 0x36, 0x71, 0xc4, 0xca, 0x87, 0x25, 0x48, 0xb0, 0x47, 0xec, 0xea,
+0xb4, 0xbf, 0xa5, 0x4d, 0x9b, 0x9f, 0x02, 0x93, 0xc4, 0xe3, 0xe4, 0xe8, 0x42, 0x2d, 0x68,
+0x81, 0x15, 0x0a, 0xeb, 0x84, 0x5b, 0xd6, 0xa8, 0x74, 0xfb, 0x7d, 0x1d, 0xcb, 0x2c, 0xda,
+0x46, 0x2a, 0x76, 0x62, 0xce, 0xbc, 0x5c, 0x9e, 0x8b, 0xe7, 0xcf, 0xbe, 0x78, 0xf5, 0x7c,
+0xeb, 0xb3, 0x3a, 0x9c, 0xaa, 0x6f, 0xcc, 0x72, 0xd1, 0x59, 0xf2, 0x11, 0x23, 0xd6, 0x3f,
+0x48, 0xd1, 0xb7, 0xce, 0xb0, 0xbf, 0xcb, 0xea, 0x80, 0xde, 0x57, 0xd4, 0x5e, 0x97, 0x2f,
+0x75, 0xd1, 0x50, 0x8e, 0x80, 0x2c, 0x66, 0x79, 0xbf, 0x72, 0x4b, 0xbd, 0x8a, 0x81, 0x6c,
+0xd3, 0xe1, 0x01, 0xdc, 0xd2, 0x15, 0x26, 0xc5, 0x36, 0xda, 0x2c, 0x1a, 0xc0, 0x27, 0x94,
+0xed, 0xb7, 0x9b, 0x85, 0x0b, 0x5e, 0x80, 0x97, 0xc5, 0xec, 0x4f, 0xec, 0x88, 0x5d, 0x50,
+0x07, 0x35, 0x47, 0xdc, 0x0b, 0x3b, 0x3d, 0xdd, 0x60, 0xaf, 0xa8, 0x5d, 0x81, 0x38, 0x24,
+0x25, 0x5d, 0x5c, 0x15, 0xd1, 0xde, 0xb3, 0xab, 0xec, 0x05, 0x69, 0xef, 0x83, 0xed, 0x57,
+0x54, 0xb8, 0x64, 0x64, 0x11, 0x16, 0x32, 0x69, 0xda, 0x9f, 0x2d, 0x7f, 0x36, 0xbb, 0x44,
+0x5a, 0x34, 0xe8, 0x7f, 0xbf, 0x03, 0xeb, 0x00, 0x7f, 0x59, 0x68, 0x22, 0x79, 0xcf, 0x73,
+0x6c, 0x2c, 0x29, 0xa7, 0xa1, 0x5f, 0x38, 0xa1, 0x1d, 0xf0, 0x20, 0x53, 0xe0, 0x1a, 0x63,
+0x14, 0x58, 0x71, 0x10, 0xaa, 0x08, 0x0c, 0x3e, 0x16, 0x1a, 0x60, 0x22, 0x82, 0x7f, 0xba,
+0xa4, 0x43, 0xa0, 0xd0, 0xac, 0x1b, 0xd5, 0x6b, 0x64, 0xb5, 0x14, 0x93, 0x31, 0x9e, 0x53,
+0x50, 0xd0, 0x57, 0x66, 0xee, 0x5a, 0x4f, 0xfb, 0x03, 0x2a, 0x69, 0x58, 0x76, 0xf1, 0x83,
+0xf7, 0x4e, 0xba, 0x8c, 0x42, 0x06, 0x60, 0x5d, 0x6d, 0xce, 0x60, 0x88, 0xae, 0xa4, 0xc3,
+0xf1, 0x03, 0xa5, 0x4b, 0x98, 0xa1, 0xff, 0x67, 0xe1, 0xac, 0xa2, 0xb8, 0x62, 0xd7, 0x6f,
+0xa0, 0x31, 0xb4, 0xd2, 0x77, 0xaf, 0x21, 0x10, 0x06, 0xc6, 0x9a, 0xff, 0x1d, 0x09, 0x17,
+0x0e, 0x5f, 0xf1, 0xaa, 0x54, 0x34, 0x4b, 0x45, 0x8a, 0x87, 0x63, 0xa6, 0xdc, 0xf9, 0x24,
+0x30, 0x67, 0xc6, 0xb2, 0xd6, 0x61, 0x33, 0x69, 0xee, 0x50, 0x61, 0x57, 0x28, 0xe7, 0x7e,
+0xee, 0xec, 0x3a, 0x5a, 0x73, 0x4e, 0xa8, 0x8d, 0xe4, 0x18, 0xea, 0xec, 0x41, 0x64, 0xc8,
+0xe2, 0xe8, 0x66, 0xb6, 0x2d, 0xb6, 0xfb, 0x6a, 0x6c, 0x16, 0xb3, 0xdd, 0x46, 0x43, 0xb9,
+0x73, 0x00, 0x6a, 0x71, 0xed, 0x4e, 0x9d, 0x25, 0x1a, 0xc3, 0x3c, 0x4a, 0x95, 0x15, 0x99,
+0x35, 0x81, 0x14, 0x02, 0xd6, 0x98, 0x9b, 0xec, 0xd8, 0x23, 0x3b, 0x84, 0x29, 0xaf, 0x0c,
+0x99, 0x83, 0xa6, 0x9a, 0x34, 0x4f, 0xfa, 0xe8, 0xd0, 0x3c, 0x4b, 0xd0, 0xfb, 0xb6, 0x68,
+0xb8, 0x9e, 0x8f, 0xcd, 0xf7, 0x60, 0x2d, 0x7a, 0x22, 0xe5, 0x7d, 0xab, 0x65, 0x1b, 0x95,
+0xa7, 0xa8, 0x7f, 0xb6, 0x77, 0x47, 0x7b, 0x5f, 0x8b, 0x12, 0x72, 0xd0, 0xd4, 0x91, 0xef,
+0xde, 0x19, 0x50, 0x3c, 0xa7, 0x8b, 0xc4, 0xa9, 0xb3, 0x23, 0xcb, 0x76, 0xe6, 0x81, 0xf0,
+0xc1, 0x04, 0x8f, 0xa3, 0xb8, 0x54, 0x5b, 0x97, 0xac, 0x19, 0xff, 0x3f, 0x55, 0x27, 0x2f,
+0xe0, 0x1d, 0x42, 0x9b, 0x57, 0xfc, 0x4b, 0x4e, 0x0f, 0xce, 0x98, 0xa9, 0x43, 0x57, 0x03,
+0xbd, 0xe7, 0xc8, 0x94, 0xdf, 0x6e, 0x36, 0x73, 0x32, 0xb4, 0xef, 0x2e, 0x85, 0x7a, 0x6e,
+0xfc, 0x6c, 0x18, 0x82, 0x75, 0x35, 0x90, 0x07, 0xf3, 0xe4, 0x9f, 0x3e, 0xdc, 0x68, 0xf3,
+0xb5, 0xf3, 0x19, 0x80, 0x92, 0x06, 0x99, 0xa2, 0xe8, 0x6f, 0xff, 0x2e, 0x7f, 0xae, 0x42,
+0xa4, 0x5f, 0xfb, 0xd4, 0x0e, 0x81, 0x2b, 0xc3, 0x04, 0xff, 0x2b, 0xb3, 0x74, 0x4e, 0x36,
+0x5b, 0x9c, 0x15, 0x00, 0xc6, 0x47, 0x2b, 0xe8, 0x8b, 0x3d, 0xf1, 0x9c, 0x03, 0x9a, 0x58,
+0x7f, 0x9b, 0x9c, 0xbf, 0x85, 0x49, 0x79, 0x35, 0x2e, 0x56, 0x7b, 0x41, 0x14, 0x39, 0x47,
+0x83, 0x26, 0xaa, 0x07, 0x89, 0x98, 0x11, 0x1b, 0x86, 0xe7, 0x73, 0x7a, 0xd8, 0x7d, 0x78,
+0x61, 0x53, 0xe9, 0x79, 0xf5, 0x36, 0x8d, 0x44, 0x92, 0x84, 0xf9, 0x13, 0x50, 0x58, 0x3b,
+0xa4, 0x6a, 0x36, 0x65, 0x49, 0x8e, 0x3c, 0x0e, 0xf1, 0x6f, 0xd2, 0x84, 0xc4, 0x7e, 0x8e,
+0x3f, 0x39, 0xae, 0x7c, 0x84, 0xf1, 0x63, 0x37, 0x8e, 0x3c, 0xcc, 0x3e, 0x44, 0x81, 0x45,
+0xf1, 0x4b, 0xb9, 0xed, 0x6b, 0x36, 0x5d, 0xbb, 0x20, 0x60, 0x1a, 0x0f, 0xa3, 0xaa, 0x55,
+0x77, 0x3a, 0xa9, 0xae, 0x37, 0x4d, 0xba, 0xb8, 0x86, 0x6b, 0xbc, 0x08, 0x50, 0xf6, 0xcc,
+0xa4, 0xbd, 0x1d, 0x40, 0x72, 0xa5, 0x86, 0xfa, 0xe2, 0x10, 0xae, 0x3d, 0x58, 0x4b, 0x97,
+0xf3, 0x43, 0x74, 0xa9, 0x9e, 0xeb, 0x21, 0xb7, 0x01, 0xa4, 0x86, 0x93, 0x97, 0xee, 0x2f,
+0x4f, 0x3b, 0x86, 0xa1, 0x41, 0x6f, 0x41, 0x26, 0x90, 0x78, 0x5c, 0x7f, 0x30, 0x38, 0x4b,
+0x3f, 0xaa, 0xec, 0xed, 0x5c, 0x6f, 0x0e, 0xad, 0x43, 0x87, 0xfd, 0x93, 0x35, 0xe6, 0x01,
+0xef, 0x41, 0x26, 0x90, 0x99, 0x9e, 0xfb, 0x19, 0x5b, 0xad, 0xd2, 0x91, 0x8a, 0xe0, 0x46,
+0xaf, 0x65, 0xfa, 0x4f, 0x84, 0xc1, 0xa1, 0x2d, 0xcf, 0x45, 0x8b, 0xd3, 0x85, 0x50, 0x55,
+0x7c, 0xf9, 0x67, 0x88, 0xd4, 0x4e, 0xe9, 0xd7, 0x6b, 0x61, 0x54, 0xa1, 0xa4, 0xa6, 0xa2,
+0xc2, 0xbf, 0x30, 0x9c, 0x40, 0x9f, 0x5f, 0xd7, 0x69, 0x2b, 0x24, 0x82, 0x5e, 0xd9, 0xd6,
+0xa7, 0x12, 0x54, 0x1a, 0xf7, 0x55, 0x9f, 0x76, 0x50, 0xa9, 0x95, 0x84, 0xe6, 0x6b, 0x6d,
+0xb5, 0x96, 0x54, 0xd6, 0xcd, 0xb3, 0xa1, 0x9b, 0x46, 0xa7, 0x94, 0x4d, 0xc4, 0x94, 0xb4,
+0x98, 0xe3, 0xe1, 0xe2, 0x34, 0xd5, 0x33, 0x16, 0x07, 0x54, 0xcd, 0xb7, 0x77, 0x53, 0xdb,
+0x4f, 0x4d, 0x46, 0x9d, 0xe9, 0xd4, 0x9c, 0x8a, 0x36, 0xb6, 0xb8, 0x38, 0x26, 0x6c, 0x0e,
+0xff, 0x9c, 0x1b, 0x43, 0x8b, 0x80, 0xcc, 0xb9, 0x3d, 0xda, 0xc7, 0xf1, 0x8a, 0xf2, 0x6d,
+0xb8, 0xd7, 0x74, 0x2f, 0x7e, 0x1e, 0xb7, 0xd3, 0x4a, 0xb4, 0xac, 0xfc, 0x79, 0x48, 0x6c,
+0xbc, 0x96, 0xb6, 0x94, 0x46, 0x57, 0x2d, 0xb0, 0xa3, 0xfc, 0x1e, 0xb9, 0x52, 0x60, 0x85,
+0x2d, 0x41, 0xd0, 0x43, 0x01, 0x1e, 0x1c, 0xd5, 0x7d, 0xfc, 0xf3, 0x96, 0x0d, 0xc7, 0xcb,
+0x2a, 0x29, 0x9a, 0x93, 0xdd, 0x88, 0x2d, 0x37, 0x5d, 0xaa, 0xfb, 0x49, 0x68, 0xa0, 0x9c,
+0x50, 0x86, 0x7f, 0x68, 0x56, 0x57, 0xf9, 0x79, 0x18, 0x39, 0xd4, 0xe0, 0x01, 0x84, 0x33,
+0x61, 0xca, 0xa5, 0xd2, 0xd6, 0xe4, 0xc9, 0x8a, 0x4a, 0x23, 0x44, 0x4e, 0xbc, 0xf0, 0xdc,
+0x24, 0xa1, 0xa0, 0xc4, 0xe2, 0x07, 0x3c, 0x10, 0xc4, 0xb5, 0x25, 0x4b, 0x65, 0x63, 0xf4,
+0x80, 0xe7, 0xcf, 0x61, 0xb1, 0x71, 0x82, 0x21, 0x87, 0x2c, 0xf5, 0x91, 0x00, 0x32, 0x0c,
+0xec, 0xa9, 0xb5, 0x9a, 0x74, 0x85, 0xe3, 0x36, 0x8f, 0x76, 0x4f, 0x9c, 0x6d, 0xce, 0xbc,
+0xad, 0x0a, 0x4b, 0xed, 0x76, 0x04, 0xcb, 0xc3, 0xb9, 0x33, 0x9e, 0x01, 0x93, 0x96, 0x69,
+0x7d, 0xc5, 0xa2, 0x45, 0x79, 0x9b, 0x04, 0x5c, 0x84, 0x09, 0xed, 0x88, 0x43, 0xc7, 0xab,
+0x93, 0x14, 0x26, 0xa1, 0x40, 0xb5, 0xce, 0x4e, 0xbf, 0x2a, 0x42, 0x85, 0x3e, 0x2c, 0x3b,
+0x54, 0xe8, 0x12, 0x1f, 0x0e, 0x97, 0x59, 0xb2, 0x27, 0x89, 0xfa, 0xf2, 0xdf, 0x8e, 0x68,
+0x59, 0xdc, 0x06, 0xbc, 0xb6, 0x85, 0x0d, 0x06, 0x22, 0xec, 0xb1, 0xcb, 0xe5, 0x04, 0xe6,
+0x3d, 0xb3, 0xb0, 0x41, 0x73, 0x08, 0x3f, 0x3c, 0x58, 0x86, 0x63, 0xeb, 0x50, 0xee, 0x1d,
+0x2c, 0x37, 0x74, 0xa9, 0xd3, 0x18, 0xa3, 0x47, 0x6e, 0x93, 0x54, 0xad, 0x0a, 0x5d, 0xb8,
+0x2a, 0x55, 0x5d, 0x78, 0xf6, 0xee, 0xbe, 0x8e, 0x3c, 0x76, 0x69, 0xb9, 0x40, 0xc2, 0x34,
+0xec, 0x2a, 0xb9, 0xed, 0x7e, 0x20, 0xe4, 0x8d, 0x00, 0x38, 0xc7, 0xe6, 0x8f, 0x44, 0xa8,
+0x86, 0xce, 0xeb, 0x2a, 0xe9, 0x90, 0xf1, 0x4c, 0xdf, 0x32, 0xfb, 0x73, 0x1b, 0x6d, 0x92,
+0x1e, 0x95, 0xfe, 0xb4, 0xdb, 0x65, 0xdf, 0x4d, 0x23, 0x54, 0x89, 0x48, 0xbf, 0x4a, 0x2e,
+0x70, 0xd6, 0xd7, 0x62, 0xb4, 0x33, 0x29, 0xb1, 0x3a, 0x33, 0x4c, 0x23, 0x6d, 0xa6, 0x76,
+0xa5, 0x21, 0x63, 0x48, 0xe6, 0x90, 0x5d, 0xed, 0x90, 0x95, 0x0b, 0x7a, 0x84, 0xbe, 0xb8,
+0x0d, 0x5e, 0x63, 0x0c, 0x62, 0x26, 0x4c, 0x14, 0x5a, 0xb3, 0xac, 0x23, 0xa4, 0x74, 0xa7,
+0x6f, 0x33, 0x30, 0x05, 0x60, 0x01, 0x42, 0xa0, 0x28, 0xb7, 0xee, 0x19, 0x38, 0xf1, 0x64,
+0x80, 0x82, 0x43, 0xe1, 0x41, 0x27, 0x1f, 0x1f, 0x90, 0x54, 0x7a, 0xd5, 0x23, 0x2e, 0xd1,
+0x3d, 0xcb, 0x28, 0xba, 0x58, 0x7f, 0xdc, 0x7c, 0x91, 0x24, 0xe9, 0x28, 0x51, 0x83, 0x6e,
+0xc5, 0x56, 0x21, 0x42, 0xed, 0xa0, 0x56, 0x22, 0xa1, 0x40, 0x80, 0x6b, 0xa8, 0xf7, 0x94,
+0xca, 0x13, 0x6b, 0x0c, 0x39, 0xd9, 0xfd, 0xe9, 0xf3, 0x6f, 0xa6, 0x9e, 0xfc, 0x70, 0x8a,
+0xb3, 0xbc, 0x59, 0x3c, 0x1e, 0x1d, 0x6c, 0xf9, 0x7c, 0xaf, 0xf9, 0x88, 0x71, 0x95, 0xeb,
+0x57, 0x00, 0xbd, 0x9f, 0x8c, 0x4f, 0xe1, 0x24, 0x83, 0xc5, 0x22, 0xea, 0xfd, 0xd3, 0x0c,
+0xe2, 0x17, 0x18, 0x7c, 0x6a, 0x4c, 0xde, 0x77, 0xb4, 0x53, 0x9b, 0x4c, 0x81, 0xcd, 0x23,
+0x60, 0xaa, 0x0e, 0x25, 0x73, 0x9c, 0x02, 0x79, 0x32, 0x30, 0xdf, 0x74, 0xdf, 0x75, 0x19,
+0xf4, 0xa5, 0x14, 0x5c, 0xf7, 0x7a, 0xa8, 0xa5, 0x91, 0x84, 0x7c, 0x60, 0x03, 0x06, 0x3b,
+0xcd, 0x50, 0xb6, 0x27, 0x9c, 0xfe, 0xb1, 0xdd, 0xcc, 0xd3, 0xb0, 0x59, 0x24, 0xb2, 0xca,
+0xe2, 0x1c, 0x81, 0x22, 0x9d, 0x07, 0x8f, 0x8e, 0xb9, 0xbe, 0x4e, 0xfa, 0xfc, 0x39, 0x65,
+0xba, 0xbf, 0x9d, 0x12, 0x37, 0x5e, 0x97, 0x7e, 0xf3, 0x89, 0xf5, 0x5d, 0xf5, 0xe3, 0x09,
+0x8c, 0x62, 0xb5, 0x20, 0x9d, 0x0c, 0x53, 0x8a, 0x68, 0x1b, 0xd2, 0x8f, 0x75, 0x17, 0x5d,
+0xd4, 0xe5, 0xda, 0x75, 0x62, 0x19, 0x14, 0x6a, 0x26, 0x2d, 0xeb, 0xf8, 0xaf, 0x37, 0xf0,
+0x6c, 0xa4, 0x55, 0xb1, 0xbc, 0xe2, 0x33, 0xc0, 0x9a, 0xca, 0xb0, 0x11, 0x49, 0x4f, 0x68,
+0x9b, 0x3b, 0x6b, 0x3c, 0xcc, 0x13, 0xf6, 0xc7, 0x85, 0x61, 0x68, 0x42, 0xae, 0xbb, 0xdd,
+0xcd, 0x45, 0x16, 0x29, 0x1d, 0xea, 0xdb, 0xc8, 0x03, 0x94, 0x3c, 0xee, 0x4f, 0x82, 0x11,
+0xc3, 0xec, 0x28, 0xbd, 0x97, 0x05, 0x99, 0xde, 0xd7, 0xbb, 0x5e, 0x22, 0x1f, 0xd4, 0xeb,
+0x64, 0xd9, 0x92, 0xd9, 0x85, 0xb7, 0x6a, 0x05, 0x6a, 0xe4, 0x24, 0x41, 0xf1, 0xcd, 0xf0,
+0xd8, 0x3f, 0xf8, 0x9e, 0x0e, 0xcd, 0x0b, 0x7a, 0x70, 0x6b, 0x5a, 0x75, 0x0a, 0x6a, 0x33,
+0x88, 0xec, 0x17, 0x75, 0x08, 0x70, 0x10, 0x2f, 0x24, 0xcf, 0xc4, 0xe9, 0x42, 0x00, 0x61,
+0x94, 0xca, 0x1f, 0x3a, 0x76, 0x06, 0xfa, 0xd2, 0x48, 0x81, 0xf0, 0x77, 0x60, 0x03, 0x45,
+0xd9, 0x61, 0xf4, 0xa4, 0x6f, 0x3d, 0xd9, 0x30, 0xc3, 0x04, 0x6b, 0x54, 0x2a, 0xb7, 0xec,
+0x3b, 0xf4, 0x4b, 0xf5, 0x68, 0x52, 0x26, 0xce, 0xff, 0x5d, 0x19, 0x91, 0xa0, 0xa3, 0xa5,
+0xa9, 0xb1, 0xe0, 0x23, 0xc4, 0x0a, 0x77, 0x4d, 0xf9, 0x51, 0x20, 0xa3, 0xa5, 0xa9, 0xb1,
+0xc1, 0x00, 0x82, 0x86, 0x8e, 0x7f, 0x5d, 0x19, 0x91, 0xa0, 0xa3, 0xc4, 0xeb, 0x54, 0x0b,
+0x75, 0x68, 0x52, 0x07, 0x8c, 0x9a, 0x97, 0x8d, 0x79, 0x70, 0x62, 0x46, 0xef, 0x5c, 0x1b,
+0x95, 0x89, 0x71, 0x41, 0xe1, 0x21, 0xa1, 0xa1, 0xa1, 0xc0, 0x02, 0x67, 0x4c, 0x1a, 0xb6,
+0xcf, 0xfd, 0x78, 0x53, 0x24, 0xab, 0xb5, 0xc9, 0xf1, 0x60, 0x23, 0xa5, 0xc8, 0x12, 0x87,
+0x6d, 0x58, 0x13, 0x85, 0x88, 0x92, 0x87, 0x6d, 0x58, 0x32, 0xc7, 0x0c, 0x9a, 0x97, 0xac,
+0xda, 0x36, 0xee, 0x5e, 0x3e, 0xdf, 0x1d, 0xb8, 0xf2, 0x66, 0x2f, 0xbd, 0xf8, 0x72, 0x47,
+0xed, 0x58, 0x13, 0x85, 0x88, 0x92, 0x87, 0x8c, 0x7b, 0x55, 0x09, 0x90, 0xa2, 0xc6, 0xef,
+0x3d, 0xf8, 0x53, 0x24, 0xab, 0xd4, 0x2a, 0xb7, 0xec, 0x5a, 0x36, 0xee, 0x5e, 0x3e, 0xdf,
+0x3c, 0xfa, 0x76, 0x4f, 0xfd, 0x59, 0x30, 0xe2, 0x46, 0xef, 0x3d, 0xf8, 0x53, 0x05, 0x69,
+0x31, 0xc1, 0x00, 0x82, 0x86, 0x8e, 0x7f, 0x5d, 0x19, 0xb0, 0xe2, 0x27, 0xcc, 0xfb, 0x74,
+0x4b, 0x14, 0x8b, 0x94, 0x8b, 0x75, 0x68, 0x33, 0xc5, 0x08, 0x92, 0x87, 0x8c, 0x9a, 0xb6,
+0xcf, 0x1c, 0xba, 0xd7, 0x0d, 0x98, 0xb2, 0xe6, 0x2f, 0xdc, 0x1b, 0x95, 0x89, 0x71, 0x60,
+0x23, 0xc4, 0x0a, 0x96, 0x8f, 0x9c, 0xba, 0xf6, 0x6e, 0x3f, 0xfc, 0x5b, 0x15, 0xa8, 0xd2,
+0x26, 0xaf, 0xbd, 0xf8, 0x72, 0x66, 0x2f, 0xdc, 0x1b, 0xb4, 0xcb, 0x14, 0x8b, 0x94, 0xaa,
+0xb7, 0xcd, 0xf9, 0x51, 0x01, 0x80, 0x82, 0x86, 0x6f, 0x3d, 0xd9, 0x30, 0xe2, 0x27, 0xcc,
+0xfb, 0x74, 0x4b, 0x14, 0xaa, 0xb7, 0xcd, 0xf9, 0x70, 0x43, 0x04, 0x6b, 0x35, 0xc9, 0xf1,
+0x60, 0x23, 0xa5, 0xc8, 0xf3, 0x45, 0x08, 0x92, 0x87, 0x6d, 0x58, 0x32, 0xe6, 0x2f, 0xbd,
+0xf8, 0x72, 0x66, 0x4e, 0x1e, 0xbe, 0xfe, 0x7e, 0x7e, 0x7e, 0x5f, 0x1d, 0x99, 0x91, 0xa0,
+0xa3, 0xc4, 0x0a, 0x77, 0x4d, 0x18, 0x93, 0xa4, 0xab, 0xd4, 0x0b, 0x75, 0x49, 0x10, 0xa2,
+0xc6, 0xef, 0x3d, 0xf8, 0x53, 0x24, 0xab, 0xb5, 0xe8, 0x33, 0xe4, 0x4a, 0x16, 0xae, 0xde,
+0x1f, 0xbc, 0xdb, 0x15, 0xa8, 0xb3, 0xc5, 0x08, 0x73, 0x45, 0xe9, 0x31, 0xc1, 0xe1, 0x21,
+0xa1, 0xa1, 0xa1, 0xc0, 0x02, 0x86, 0x6f, 0x5c, 0x3a, 0xd7, 0x0d, 0x98, 0x93, 0xa4, 0xca,
+0x16, 0xae, 0xde, 0x1f, 0x9d, 0x99, 0xb0, 0xe2, 0x46, 0xef, 0x3d, 0xf8, 0x72, 0x47, 0x0c,
+0x9a, 0xb6, 0xcf, 0xfd, 0x59, 0x11, 0xa0, 0xa3, 0xa5, 0xc8, 0xf3, 0x45, 0x08, 0x92, 0x87,
+0x6d, 0x39, 0xf0, 0x43, 0x04, 0x8a, 0x96, 0xae, 0xde, 0x3e, 0xdf, 0x1d, 0x99, 0x91, 0xa0,
+0xc2, 0x06, 0x6f, 0x3d, 0xf8, 0x72, 0x47, 0x0c, 0x9a, 0x97, 0x8d, 0x98, 0x93, 0x85, 0x88,
+0x73, 0x45, 0xe9, 0x31, 0xe0, 0x23, 0xa5, 0xa9, 0xd0, 0x03, 0x84, 0x8a, 0x96, 0xae, 0xde,
+0x1f, 0xbc, 0xdb, 0x15, 0xa8, 0xd2, 0x26, 0xce, 0xff, 0x5d, 0x19, 0x91, 0x81, 0x80, 0x82,
+0x67, 0x2d, 0xd8, 0x13, 0xa4, 0xab, 0xd4, 0x0b, 0x94, 0xaa, 0xb7, 0xcd, 0xf9, 0x51, 0x20,
+0xa3, 0xa5, 0xc8, 0xf3, 0x45, 0xe9, 0x50, 0x22, 0xc6, 0xef, 0x5c, 0x3a, 0xd7, 0x0d, 0x98,
+0x93, 0x85, 0x88, 0x73, 0x64, 0x4a, 0xf7, 0x4d, 0xf9, 0x51, 0x20, 0xa3, 0xc4, 0x0a, 0x96,
+0xae, 0xde, 0x3e, 0xfe, 0x7e, 0x7e, 0x7e, 0x5f, 0x3c, 0xfa, 0x76, 0x4f, 0xfd, 0x78, 0x72,
+0x66, 0x2f, 0xbd, 0xd9, 0x30, 0xc3, 0xe5, 0x48, 0x12, 0x87, 0x8c, 0x7b, 0x55, 0x28, 0xd2,
+0x07, 0x8c, 0x9a, 0x97, 0xac, 0xda, 0x17, 0x8d, 0x79, 0x51, 0x20, 0xa3, 0xc4, 0xeb, 0x54,
+0x0b, 0x94, 0x8b, 0x94, 0xaa, 0xd6, 0x2e, 0xbf, 0xfc, 0x5b, 0x15, 0xa8, 0xd2, 0x26, 0xaf,
+0xdc, 0x1b, 0xb4, 0xea, 0x37, 0xec, 0x3b, 0xf4, 0x6a, 0x37, 0xcd, 0x18, 0x93, 0x85, 0x69,
+0x31, 0xc1, 0xe1, 0x40, 0xe3, 0x25, 0xc8, 0x12, 0x87, 0x8c, 0x9a, 0xb6, 0xcf, 0xfd, 0x59,
+0x11, 0xa0, 0xc2, 0x06, 0x8e, 0x7f, 0x5d, 0x38, 0xf2, 0x47, 0x0c, 0x7b, 0x74, 0x6a, 0x37,
+0xec, 0x5a, 0x36, 0xee, 0x3f, 0xfc, 0x7a, 0x76, 0x4f, 0x1c, 0x9b, 0x95, 0x89, 0x71, 0x41,
+0x00, 0x63, 0x44, 0xeb, 0x54, 0x2a, 0xd6, 0x0f, 0x9c, 0xba, 0xd7, 0x0d, 0x98, 0x93, 0x85,
+0x69, 0x31, 0xc1, 0x00, 0x82, 0x86, 0x8e, 0x9e, 0xbe, 0xdf, 0x3c, 0xfa, 0x57, 0x2c, 0xda,
+0x36, 0xee, 0x3f, 0xfc, 0x5b, 0x15, 0x89, 0x71, 0x41, 0x00, 0x82, 0x86, 0x8e, 0x7f, 0x5d,
+0x38, 0xf2, 0x47, 0xed, 0x58, 0x13, 0xa4, 0xca, 0xf7, 0x4d, 0xf9, 0x51, 0x01, 0x80, 0x63,
+0x44, 0xeb, 0x54, 0x2a, 0xd6, 0x2e, 0xbf, 0xdd, 0x19, 0x91, 0xa0, 0xa3, 0xa5, 0xa9, 0xb1,
+0xe0, 0x42, 0x06, 0x8e, 0x7f, 0x5d, 0x19, 0x91, 0xa0, 0xa3, 0xc4, 0x0a, 0x96, 0x8f, 0x7d,
+0x78, 0x72, 0x47, 0x0c, 0x7b, 0x74, 0x6a, 0x56, 0x2e, 0xde, 0x1f, 0xbc, 0xfa, 0x57, 0x0d,
+0x79, 0x51, 0x01, 0x61, 0x21, 0xa1, 0xc0, 0xe3, 0x25, 0xa9, 0xb1, 0xc1, 0xe1, 0x40, 0x02,
+0x67, 0x4c, 0x1a, 0x97, 0x8d, 0x98, 0x93, 0xa4, 0xab, 0xd4, 0x2a, 0xd6, 0x0f, 0x9c, 0x9b,
+0xb4, 0xcb, 0x14, 0xaa, 0xb7, 0xcd, 0xf9, 0x51, 0x20, 0xa3, 0xc4, 0xeb, 0x35, 0xc9, 0xf1,
+0x60, 0x42, 0x06, 0x8e, 0x7f, 0x7c, 0x7a, 0x76, 0x6e, 0x3f, 0xfc, 0x7a, 0x76, 0x6e, 0x5e,
+0x3e, 0xfe, 0x7e, 0x5f, 0x3c, 0xdb, 0x15, 0x89, 0x71, 0x41, 0xe1, 0x21, 0xc0, 0xe3, 0x44,
+0xeb, 0x54, 0x2a, 0xb7, 0xcd, 0xf9, 0x70, 0x62, 0x27, 0xad, 0xd8, 0x32, 0xc7, 0x0c, 0x7b,
+0x74, 0x4b, 0x14, 0xaa, 0xb7, 0xec, 0x3b, 0xd5, 0x28, 0xd2, 0x07, 0x6d, 0x39, 0xd1, 0x20,
+0xc2, 0xe7, 0x4c, 0x1a, 0x97, 0x8d, 0x98, 0xb2, 0xc7, 0x0c, 0x59, 0x28, 0xf3, 0x9b };
+
+// clang-format off
diff --git a/qmk/keyboards/handwired/dactyl_manuform/5x6_right_trackball/pointer_transport.c b/qmk/keyboards/handwired/dactyl_manuform/5x6_right_trackball/pointer_transport.c
new file mode 100644
index 00000000..003468c8
--- /dev/null
+++ b/qmk/keyboards/handwired/dactyl_manuform/5x6_right_trackball/pointer_transport.c
@@ -0,0 +1,375 @@
+/* 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 <string.h>
+#include <stddef.h>
+
+#include "matrix.h"
+#include QMK_KEYBOARD_H
+
+#define ROWS_PER_HAND (MATRIX_ROWS / 2)
+
+#ifdef RGBLIGHT_ENABLE
+#    include "rgblight.h"
+#endif
+
+#ifdef BACKLIGHT_ENABLE
+#    include "backlight.h"
+#endif
+
+#ifdef ENCODER_ENABLE
+#    include "encoder.h"
+static pin_t encoders_pad[] = ENCODERS_PAD_A;
+#    define NUMBER_OF_ENCODERS (sizeof(encoders_pad) / sizeof(pin_t))
+#endif
+
+#ifdef POINTING_DEVICE_ENABLE
+static uint16_t device_cpi    = 0;
+static int8_t   split_mouse_x = 0, split_mouse_y = 0;
+#endif
+
+#if defined(USE_I2C)
+
+#    include "i2c_master.h"
+#    include "i2c_slave.h"
+
+typedef struct _I2C_slave_buffer_t {
+    matrix_row_t smatrix[ROWS_PER_HAND];
+    uint8_t      backlight_level;
+#    if defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_SPLIT)
+    rgblight_syncinfo_t rgblight_sync;
+#    endif
+#    ifdef ENCODER_ENABLE
+    uint8_t encoder_state[NUMBER_OF_ENCODERS];
+#    endif
+#    ifdef WPM_ENABLE
+    uint8_t current_wpm;
+#    endif
+    int8_t   mouse_x;
+    int8_t   mouse_y;
+    uint16_t device_cpi;
+} I2C_slave_buffer_t;
+
+static I2C_slave_buffer_t *const i2c_buffer = (I2C_slave_buffer_t *)i2c_slave_reg;
+
+#    define I2C_BACKLIGHT_START offsetof(I2C_slave_buffer_t, backlight_level)
+#    define I2C_RGB_START offsetof(I2C_slave_buffer_t, rgblight_sync)
+#    define I2C_KEYMAP_START offsetof(I2C_slave_buffer_t, mmatrix)
+#    define I2C_ENCODER_START offsetof(I2C_slave_buffer_t, encoder_state)
+#    define I2C_WPM_START offsetof(I2C_slave_buffer_t, current_wpm)
+#    define I2C_MOUSE_X_START offsetof(I2C_slave_buffer_t, mouse_x)
+#    define I2C_MOUSE_Y_START offsetof(I2C_slave_buffer_t, mouse_y)
+#    define I2C_MOUSE_DPI_START offsetof(I2C_slave_buffer_t, device_cpi)
+#    define TIMEOUT 100
+
+#    ifndef SLAVE_I2C_ADDRESS
+#        define SLAVE_I2C_ADDRESS 0x32
+#    endif
+
+// Get rows from other half over i2c
+bool transport_master(matrix_row_t matrix[]) {
+    i2c_readReg(SLAVE_I2C_ADDRESS, I2C_KEYMAP_START, (void *)matrix, sizeof(i2c_buffer->smatrix), TIMEOUT);
+
+    // write backlight info
+#    ifdef BACKLIGHT_ENABLE
+    uint8_t level = is_backlight_enabled() ? get_backlight_level() : 0;
+    if (level != i2c_buffer->backlight_level) {
+        if (i2c_writeReg(SLAVE_I2C_ADDRESS, I2C_BACKLIGHT_START, (void *)&level, sizeof(level), TIMEOUT) >= 0) {
+            i2c_buffer->backlight_level = level;
+        }
+    }
+#    endif
+
+#    if defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_SPLIT)
+    if (rgblight_get_change_flags()) {
+        rgblight_syncinfo_t rgblight_sync;
+        rgblight_get_syncinfo(&rgblight_sync);
+        if (i2c_writeReg(SLAVE_I2C_ADDRESS, I2C_RGB_START, (void *)&rgblight_sync, sizeof(rgblight_sync), TIMEOUT) >= 0) {
+            rgblight_clear_change_flags();
+        }
+    }
+#    endif
+
+#    ifdef ENCODER_ENABLE
+    i2c_readReg(SLAVE_I2C_ADDRESS, I2C_ENCODER_START, (void *)i2c_buffer->encoder_state, sizeof(i2c_buffer->encoder_state), TIMEOUT);
+    encoder_update_raw(i2c_buffer->encoder_state);
+#    endif
+
+#    ifdef WPM_ENABLE
+    uint8_t current_wpm = get_current_wpm();
+    if (current_wpm != i2c_buffer->current_wpm) {
+        if (i2c_writeReg(SLAVE_I2C_ADDRESS, I2C_WPM_START, (void *)&current_wpm, sizeof(current_wpm), TIMEOUT) >= 0) {
+            i2c_buffer->current_wpm = current_wpm;
+        }
+    }
+#    endif
+
+#    ifdef POINTING_DEVICE_ENABLE
+    if (is_keyboard_left()) {
+        report_mouse_t temp_report = pointing_device_get_report();
+        i2c_readReg(SLAVE_I2C_ADDRESS, I2C_MOUSE_X_START, (void *)&i2c_buffer->mouse_x, sizeof(i2c_buffer->mouse_x), TIMEOUT);
+        temp_report.x = i2c_buffer->mouse_x;
+        i2c_readReg(SLAVE_I2C_ADDRESS, I2C_MOUSE_Y_START, (void *)&i2c_buffer->mouse_y, sizeof(i2c_buffer->mouse_y), TIMEOUT);
+        temp_report.y = i2c_buffer->mouse_y;
+        pointing_device_set_report(temp_report);
+
+        if (device_cpi != i2c_buffer->device_cpi) {
+            if(i2c_writeReg(SLAVE_I2C_ADDRESS, I2C_MOUSE_DPI_START, (void *)&device_cpi, sizeof(device_cpi), TIMEOUT) >= 0) {
+                i2c_buffer->device_cpi = device_cpi
+            }
+        }
+    }
+#    endif
+
+    return true;
+}
+
+void transport_slave(matrix_row_t matrix[]) {
+    // Copy matrix to I2C buffer
+    memcpy((void *)i2c_buffer->smatrix, (void *)matrix, sizeof(i2c_buffer->smatrix));
+
+// Read Backlight Info
+#    ifdef BACKLIGHT_ENABLE
+    backlight_set(i2c_buffer->backlight_level);
+#    endif
+
+#    if defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_SPLIT)
+    // Update the RGB with the new data
+    if (i2c_buffer->rgblight_sync.status.change_flags != 0) {
+        rgblight_update_sync(&i2c_buffer->rgblight_sync, false);
+        i2c_buffer->rgblight_sync.status.change_flags = 0;
+    }
+#    endif
+
+#    ifdef ENCODER_ENABLE
+    encoder_state_raw(i2c_buffer->encoder_state);
+#    endif
+
+#    ifdef WPM_ENABLE
+    set_current_wpm(i2c_buffer->current_wpm);
+#    endif
+
+#    ifdef POINTING_DEVICE_ENABLE
+    if (!is_keyboard_left()) {
+        static uint16_t cpi;
+        if (cpi != i2c_buffer->device_cpi) {
+            cpi = i2c_buffer->device_cpi;
+            pmw_set_cpi(cpi);
+        }
+        i2c_buffer->mouse_x = split_mouse_x;
+        i2c_writeReg(SLAVE_I2C_ADDRESS, I2C_MOUSE_X_START, (void *)&i2c_buffer->mouse_x, sizeof(i2c_buffer->mouse_x), TIMEOUT);
+        i2c_buffer->mouse_y = split_mouse_y;
+        i2c_writeReg(SLAVE_I2C_ADDRESS, I2C_MOUSE_Y_START, (void *)&i2c_buffer->mouse_y, sizeof(i2c_buffer->mouse_y), TIMEOUT);
+    }
+
+#    endif
+}
+
+void transport_master_init(void) { i2c_init(); }
+
+void transport_slave_init(void) { i2c_slave_init(SLAVE_I2C_ADDRESS); }
+
+#else  // USE_SERIAL
+
+#    include "serial.h"
+
+typedef struct _Serial_s2m_buffer_t {
+    // TODO: if MATRIX_COLS > 8 change to uint8_t packed_matrix[] for pack/unpack
+    matrix_row_t smatrix[ROWS_PER_HAND];
+#    ifdef ENCODER_ENABLE
+    uint8_t encoder_state[NUMBER_OF_ENCODERS];
+#    endif
+    int8_t mouse_x;
+    int8_t mouse_y;
+} Serial_s2m_buffer_t;
+
+typedef struct _Serial_m2s_buffer_t {
+#    ifdef BACKLIGHT_ENABLE
+    uint8_t backlight_level;
+#    endif
+#    ifdef WPM_ENABLE
+    uint8_t current_wpm;
+#    endif
+    uint16_t device_cpi;
+} Serial_m2s_buffer_t;
+
+#    if defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_SPLIT)
+// When MCUs on both sides drive their respective RGB LED chains,
+// it is necessary to synchronize, so it is necessary to communicate RGB
+// information. In that case, define RGBLIGHT_SPLIT with info on the number
+// of LEDs on each half.
+//
+// Otherwise, if the master side MCU drives both sides RGB LED chains,
+// there is no need to communicate.
+
+typedef struct _Serial_rgblight_t {
+    rgblight_syncinfo_t rgblight_sync;
+} Serial_rgblight_t;
+
+volatile Serial_rgblight_t serial_rgblight = {};
+uint8_t volatile status_rgblight           = 0;
+#    endif
+
+volatile Serial_s2m_buffer_t serial_s2m_buffer = {};
+volatile Serial_m2s_buffer_t serial_m2s_buffer = {};
+uint8_t volatile status0                       = 0;
+
+enum serial_transaction_id {
+    GET_SLAVE_MATRIX = 0,
+#    if defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_SPLIT)
+    PUT_RGBLIGHT,
+#    endif
+};
+
+SSTD_t transactions[] = {
+    [GET_SLAVE_MATRIX] =
+        {
+            (uint8_t *)&status0,
+            sizeof(serial_m2s_buffer),
+            (uint8_t *)&serial_m2s_buffer,
+            sizeof(serial_s2m_buffer),
+            (uint8_t *)&serial_s2m_buffer,
+        },
+#    if defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_SPLIT)
+    [PUT_RGBLIGHT] =
+        {
+            (uint8_t *)&status_rgblight, sizeof(serial_rgblight), (uint8_t *)&serial_rgblight, 0, NULL  // no slave to master transfer
+        },
+#    endif
+};
+
+void transport_master_init(void) { soft_serial_initiator_init(transactions, TID_LIMIT(transactions)); }
+
+void transport_slave_init(void) { soft_serial_target_init(transactions, TID_LIMIT(transactions)); }
+
+#    if defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_SPLIT)
+
+// rgblight synchronization information communication.
+
+void transport_rgblight_master(void) {
+    if (rgblight_get_change_flags()) {
+        rgblight_get_syncinfo((rgblight_syncinfo_t *)&serial_rgblight.rgblight_sync);
+        if (soft_serial_transaction(PUT_RGBLIGHT) == TRANSACTION_END) {
+            rgblight_clear_change_flags();
+        }
+    }
+}
+
+void transport_rgblight_slave(void) {
+    if (status_rgblight == TRANSACTION_ACCEPTED) {
+        rgblight_update_sync((rgblight_syncinfo_t *)&serial_rgblight.rgblight_sync, false);
+        status_rgblight = TRANSACTION_END;
+    }
+}
+
+#    else
+#        define transport_rgblight_master()
+#        define transport_rgblight_slave()
+#    endif
+
+bool transport_master(matrix_row_t matrix[]) {
+#    ifndef SERIAL_USE_MULTI_TRANSACTION
+    if (soft_serial_transaction() != TRANSACTION_END) {
+        return false;
+    }
+#    else
+    transport_rgblight_master();
+    if (soft_serial_transaction(GET_SLAVE_MATRIX) != TRANSACTION_END) {
+        return false;
+    }
+#    endif
+
+    // TODO:  if MATRIX_COLS > 8 change to unpack()
+    for (int i = 0; i < ROWS_PER_HAND; ++i) {
+        matrix[i] = serial_s2m_buffer.smatrix[i];
+    }
+
+#    ifdef BACKLIGHT_ENABLE
+    // Write backlight level for slave to read
+    serial_m2s_buffer.backlight_level = is_backlight_enabled() ? get_backlight_level() : 0;
+#    endif
+
+#    ifdef ENCODER_ENABLE
+    encoder_update_raw((uint8_t *)serial_s2m_buffer.encoder_state);
+#    endif
+
+#    ifdef WPM_ENABLE
+    // Write wpm to slave
+    serial_m2s_buffer.current_wpm = get_current_wpm();
+#    endif
+
+#    ifdef POINTING_DEVICE_ENABLE
+    if (is_keyboard_left()) {
+        report_mouse_t temp_report = pointing_device_get_report();
+        temp_report.x              = serial_s2m_buffer.mouse_x;
+        temp_report.y              = serial_s2m_buffer.mouse_y;
+        pointing_device_set_report(temp_report);
+        serial_m2s_buffer.device_cpi = device_cpi;
+    }
+#    endif
+
+    return true;
+}
+
+void transport_slave(matrix_row_t matrix[]) {
+    transport_rgblight_slave();
+
+    // TODO: if MATRIX_COLS > 8 change to pack()
+    for (int i = 0; i < ROWS_PER_HAND; ++i) {
+        serial_s2m_buffer.smatrix[i] = matrix[i];
+    }
+
+#    ifdef BACKLIGHT_ENABLE
+    backlight_set(serial_m2s_buffer.backlight_level);
+#    endif
+
+#    ifdef ENCODER_ENABLE
+    encoder_state_raw((uint8_t *)serial_s2m_buffer.encoder_state);
+#    endif
+
+#    ifdef WPM_ENABLE
+    set_current_wpm(serial_m2s_buffer.current_wpm);
+#    endif
+
+#    ifdef POINTING_DEVICE_ENABLE
+    if (!is_keyboard_left()) {
+        static uint16_t cpi;
+        if (cpi != serial_m2s_buffer.device_cpi) {
+            cpi = serial_m2s_buffer.device_cpi;
+            pmw_set_cpi(cpi);
+        }
+        serial_s2m_buffer.mouse_x = split_mouse_x;
+        serial_s2m_buffer.mouse_y = split_mouse_y;
+    }
+
+#    endif
+}
+
+#endif
+
+#ifdef POINTING_DEVICE_ENABLE
+void master_mouse_send(int8_t x, int8_t y) {
+    split_mouse_x = x;
+    split_mouse_y = y;
+}
+void trackball_set_cpi(uint16_t cpi) {
+    if (!is_keyboard_left()) {
+        pmw_set_cpi(cpi);
+    } else {
+        device_cpi = cpi * 1.5;
+    }
+}
+#endif
diff --git a/qmk/keyboards/handwired/dactyl_manuform/5x6_right_trackball/post_config.h b/qmk/keyboards/handwired/dactyl_manuform/5x6_right_trackball/post_config.h
new file mode 100644
index 00000000..40f1029b
--- /dev/null
+++ b/qmk/keyboards/handwired/dactyl_manuform/5x6_right_trackball/post_config.h
@@ -0,0 +1,33 @@
+/* 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
+
+#ifndef MOUSEKEY_WHEEL_DELTA
+#    define MOUSEKEY_WHEEL_DELTA 1
+#endif
+#ifndef MOUSEKEY_WHEEL_DELAY
+#    define MOUSEKEY_WHEEL_DELAY 200
+#endif
+#ifndef MOUSEKEY_WHEEL_INTERVAL
+#    define MOUSEKEY_WHEEL_INTERVAL 50
+#endif
+#ifndef MOUSEKEY_WHEEL_MAX_SPEED
+#    define MOUSEKEY_WHEEL_MAX_SPEED 8
+#endif
+#ifndef MOUSEKEY_WHEEL_TIME_TO_MAX
+#    define MOUSEKEY_WHEEL_TIME_TO_MAX 80
+#endif
diff --git a/qmk/keyboards/handwired/dactyl_manuform/5x6_right_trackball/readme.md b/qmk/keyboards/handwired/dactyl_manuform/5x6_right_trackball/readme.md
new file mode 100644
index 00000000..b6e38dc8
--- /dev/null
+++ b/qmk/keyboards/handwired/dactyl_manuform/5x6_right_trackball/readme.md
@@ -0,0 +1,21 @@
+# Drashna's Dactyl Manuform (5x6) with a right side trackball
+
+![](https://preview.redd.it/zwt91036m3y51.jpg?width=960&crop=smart&auto=webp&s=e030deb7d8285c95a1a30c69a7e7a71f750e87bb)
+
+It's a Dactyl Manuform with an integrated thumb based trackball, using the pmw3360 optical sensor.
+
+It's powered by 2x Teensy++ 2.0's, using Drashna's [Teensy VBUS Hack](https://docs.qmk.fm/#/feature_split_keyboard?id=hardware-considerations-and-mods) for better detection.
+
+
+* Keyboard Maintainer: [Drashna Jael're](https://github.com/drashna)
+* Hardware Supported: [Design files](https://gitlab.com/keyboards1/dm_r_track/-/tree/master/boolean), [Teensy++ 2.0 (2x)](https://www.pjrc.com/store/teensypp.html), [PMW3360 Optical Sensor](https://www.tindie.com/products/jkicklighter/pmw3360-motion-sensor/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/dactyl_manuform/5x6_right_trackball:default
+
+Flashing example for this keyboard:
+
+    make handwired/dactyl_manuform/5x6_right_trackball:default:flash
+
+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).
diff --git a/qmk/keyboards/handwired/dactyl_manuform/5x6_right_trackball/rules.mk b/qmk/keyboards/handwired/dactyl_manuform/5x6_right_trackball/rules.mk
new file mode 100644
index 00000000..19b330cd
--- /dev/null
+++ b/qmk/keyboards/handwired/dactyl_manuform/5x6_right_trackball/rules.mk
@@ -0,0 +1,30 @@
+# MCU name
+MCU = at90usb1286
+
+# Bootloader selection
+BOOTLOADER = halfkay
+
+# Build Options
+#   change yes to no to disable
+#
+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 = 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
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+SWAP_HANDS_ENABLE = yes
+POINTING_DEVICE_ENABLE = yes
+
+SPLIT_KEYBOARD = yes
+SPLIT_TRANSPORT = custom
+
+SRC += pointer_transport.c pmw3360.c
+QUANTUM_LIB_SRC += serial.c i2c_master.c i2c_slave.c spi_master.c
diff --git a/qmk/keyboards/handwired/dactyl_manuform/dactyl_manuform.h b/qmk/keyboards/handwired/dactyl_manuform/dactyl_manuform.h
index c91b247f..7352b5e8 100644
--- a/qmk/keyboards/handwired/dactyl_manuform/dactyl_manuform.h
+++ b/qmk/keyboards/handwired/dactyl_manuform/dactyl_manuform.h
@@ -14,6 +14,8 @@
     #include "6x6.h"
 #elif KEYBOARD_handwired_dactyl_manuform_dmote_62key
     #include "62key.h"
+#elif KEYBOARD_handwired_dactyl_manuform_5x6_right_trackball
+#    include "5x6_right_trackball.h"
 #endif
 
 #include "quantum.h"
diff --git a/qmk/keyboards/handwired/dactyl_manuform/dmote/62key/keymaps/default/keymap.c b/qmk/keyboards/handwired/dactyl_manuform/dmote/62key/keymaps/default/keymap.c
index 3770a6d6..25bd7da3 100644
--- a/qmk/keyboards/handwired/dactyl_manuform/dmote/62key/keymaps/default/keymap.c
+++ b/qmk/keyboards/handwired/dactyl_manuform/dmote/62key/keymaps/default/keymap.c
@@ -1,7 +1,7 @@
 #include "62key.h"
 #include "rgblight.h"
-#include <keymap_colemak.h>
-#include <sendstring_colemak.h>
+#include "keymap_colemak.h"
+#include "sendstring_colemak.h"
 
 
 // Automatic Layer ID:
diff --git a/qmk/keyboards/handwired/dactyl_rah/config.h b/qmk/keyboards/handwired/dactyl_rah/config.h
new file mode 100644
index 00000000..2ffe4e8a
--- /dev/null
+++ b/qmk/keyboards/handwired/dactyl_rah/config.h
@@ -0,0 +1,78 @@
+/*
+Copyright 2020 Ralph Azucena <ralphie02@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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0xFEED
+#define PRODUCT_ID      0x3060
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    ralphie02
+#define PRODUCT         DACTYL_RAH
+
+/* key matrix size */
+// Rows are doubled-up
+#define MATRIX_ROWS 12
+#define MATRIX_COLS 6
+
+// wiring of each half
+#define MATRIX_COL_PINS { D4, C6, D7, E6, B4, B5 }
+#define MATRIX_ROW_PINS { F6, F7, B1, B3, B2, B6 }
+
+#define DIODE_DIRECTION COL2ROW
+
+/* mouse config */
+#define MOUSEKEY_DELAY          0
+// Lowering MOUSEKEY_INTERVAL raises the cursor speed significantly, you may want to lower MOUSEKEY_MAX_SPEED (default: 10)
+#define MOUSEKEY_INTERVAL       20
+#define MOUSEKEY_MAX_SPEED       7
+#define MOUSEKEY_WHEEL_DELAY 0
+
+/* layer config */
+#define TAPPING_TOGGLE 1
+
+/* serial.c configuration for split keyboard */
+#define SOFT_SERIAL_PIN D0
+
+/* 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
+
+/* Enables This makes it easier for fast typists to use dual-function keys */
+#define PERMISSIVE_HOLD
+
+// Feature disable options
+// These options are also useful to firmware size reduction.
+
+/* disable print */
+// #define NO_DEBUG
+// #define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
diff --git a/qmk/keyboards/handwired/dactyl_rah/dactyl_rah.c b/qmk/keyboards/handwired/dactyl_rah/dactyl_rah.c
new file mode 100644
index 00000000..0058d879
--- /dev/null
+++ b/qmk/keyboards/handwired/dactyl_rah/dactyl_rah.c
@@ -0,0 +1,16 @@
+ /* Copyright 2020 Ralph Azucena <ralphie02@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 "dactyl_rah.h"
diff --git a/qmk/keyboards/handwired/dactyl_rah/dactyl_rah.h b/qmk/keyboards/handwired/dactyl_rah/dactyl_rah.h
new file mode 100644
index 00000000..27302d3e
--- /dev/null
+++ b/qmk/keyboards/handwired/dactyl_rah/dactyl_rah.h
@@ -0,0 +1,44 @@
+ /* Copyright 2020 Ralph Azucena <ralphie02@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"
+
+#define LAYOUT_6x6(\
+    L00, L01, L02, L03, L04, L05,                       R00, R01, R02, R03, R04, R05, \
+    L10, L11, L12, L13, L14, L15,                       R10, R11, R12, R13, R14, R15, \
+    L20, L21, L22, L23, L24, L25,                       R20, R21, R22, R23, R24, R25, \
+    L30, L31, L32, L33, L34, L35,                       R30, R31, R32, R33, R34, R35, \
+    L40, L41, L42, L43, L44,                                 R41, R42, R43, R44, R45, \
+                                  L55, L54,  R51, R50,                                \
+                                       L53,  R52,                                     \
+                             L50, L51, L52,  R53, R54, R55                            \
+    )\
+    {\
+        { L00, L01, L02, L03, L04, L05 },   \
+        { L10, L11, L12, L13, L14, L15 },   \
+        { L20, L21, L22, L23, L24, L25 },   \
+        { L30, L31, L32, L33, L34, L35 },   \
+        { L40, L41, L42, L43, L44, KC_NO }, \
+        { L50, L51, L52, L53, L54, L55 },   \
+                                            \
+        { R00, R01, R02, R03, R04, R05 },   \
+        { R10, R11, R12, R13, R14, R15 },   \
+        { R20, R21, R22, R23, R24, R25 },   \
+        { R30, R31, R32, R33, R34, R35 },   \
+      { KC_NO, R41, R42, R43, R44, R45 },   \
+        { R50, R51, R52, R53, R54, R55 }    \
+}
diff --git a/qmk/keyboards/handwired/dactyl_rah/info.json b/qmk/keyboards/handwired/dactyl_rah/info.json
new file mode 100644
index 00000000..7841988d
--- /dev/null
+++ b/qmk/keyboards/handwired/dactyl_rah/info.json
@@ -0,0 +1,83 @@
+{
+  "keyboard_name": "Dactyl RAH",
+  "url": "https://qmk.fm/keyboards/",
+  "maintainer": "ralphie02",
+  "width": 17,
+  "height": 8,
+  "layouts": {
+      "LAYOUT_6x6": {
+          "layout": [
+              {"label":"L00", "x":0, "y":0},
+              {"label":"L01", "x":1, "y":0},
+              {"label":"L02", "x":2, "y":0},
+              {"label":"L03", "x":3, "y":0},
+              {"label":"L04", "x":4, "y":0},
+              {"label":"L05", "x":5, "y":0},
+              {"label":"R00", "x":11, "y":0},
+              {"label":"R01", "x":12, "y":0},
+              {"label":"R02", "x":13, "y":0},
+              {"label":"R03", "x":14, "y":0},
+              {"label":"R04", "x":15, "y":0},
+              {"label":"R05", "x":16, "y":0},
+              {"label":"L10", "x":0, "y":1},
+              {"label":"L11", "x":1, "y":1},
+              {"label":"L12", "x":2, "y":1},
+              {"label":"L13", "x":3, "y":1},
+              {"label":"L14", "x":4, "y":1},
+              {"label":"L15", "x":5, "y":1},
+              {"label":"R10", "x":11, "y":1},
+              {"label":"R11", "x":12, "y":1},
+              {"label":"R12", "x":13, "y":1},
+              {"label":"R13", "x":14, "y":1},
+              {"label":"R14", "x":15, "y":1},
+              {"label":"R15", "x":16, "y":1},
+              {"label":"L20", "x":0, "y":2},
+              {"label":"L21", "x":1, "y":2},
+              {"label":"L22", "x":2, "y":2},
+              {"label":"L23", "x":3, "y":2},
+              {"label":"L24", "x":4, "y":2},
+              {"label":"L25", "x":5, "y":2},
+              {"label":"R20", "x":11, "y":2},
+              {"label":"R21", "x":12, "y":2},
+              {"label":"R22", "x":13, "y":2},
+              {"label":"R23", "x":14, "y":2},
+              {"label":"R24", "x":15, "y":2},
+              {"label":"R25", "x":16, "y":2},
+              {"label":"L30", "x":0, "y":3},
+              {"label":"L31", "x":1, "y":3},
+              {"label":"L32", "x":2, "y":3},
+              {"label":"L33", "x":3, "y":3},
+              {"label":"L34", "x":4, "y":3},
+              {"label":"L35", "x":5, "y":3},
+              {"label":"R30", "x":11, "y":3},
+              {"label":"R31", "x":12, "y":3},
+              {"label":"R32", "x":13, "y":3},
+              {"label":"R33", "x":14, "y":3},
+              {"label":"R34", "x":15, "y":3},
+              {"label":"R35", "x":16, "y":3},
+              {"label":"L40", "x":0, "y":4},
+              {"label":"L41", "x":1, "y":4},
+              {"label":"L42", "x":2, "y":4},
+              {"label":"L43", "x":3, "y":4},
+              {"label":"L44", "x":4, "y":4},
+              {"label":"R41", "x":12, "y":4},
+              {"label":"R42", "x":13, "y":4},
+              {"label":"R43", "x":14, "y":4},
+              {"label":"R44", "x":15, "y":4},
+              {"label":"R45", "x":16, "y":4},
+              {"label":"L55", "x":6, "y":5},
+              {"label":"L54", "x":7, "y":5},
+              {"label":"R51", "x":9, "y":5},
+              {"label":"R50", "x":10, "y":5},
+              {"label":"L53", "x":7, "y":6},
+              {"label":"R52", "x":9, "y":6},
+              {"label":"L50", "x":5, "y":7, "h":2},
+              {"label":"L51", "x":6, "y":7, "h":2},
+              {"label":"L52", "x":7, "y":7},
+              {"label":"R53", "x":9, "y":7},
+              {"label":"R54", "x":10, "y":7, "h":2},
+              {"label":"R55", "x":11, "y":7, "h":2}
+          ]
+      }
+  }
+}
diff --git a/qmk/keyboards/handwired/dactyl_rah/keymaps/default/keymap.c b/qmk/keyboards/handwired/dactyl_rah/keymaps/default/keymap.c
new file mode 100644
index 00000000..6b07051c
--- /dev/null
+++ b/qmk/keyboards/handwired/dactyl_rah/keymaps/default/keymap.c
@@ -0,0 +1,47 @@
+ /* Copyright 2020 Ralph Azucena <ralphie02@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 QMK_KEYBOARD_H
+
+#define BASE 0
+#define NAV 1
+
+#define CTL_ESC LCTL_T(KC_ESC)
+#define CTL_CAP LCTL_T(KC_CAPS)
+#define ALT_BSP LALT_T(KC_BSPC)
+#define LT_SCLN LT(NAV, KC_SCLN)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [BASE] = LAYOUT_6x6(
+        KC_GRV , KC_1  ,KC_2   , KC_3  , KC_4  , KC_5  ,                                         KC_6  , KC_7  , KC_8  , KC_9  , KC_0  ,KC_HOME,
+        KC_TAB , KC_Q  ,KC_W   , KC_E  , KC_R  , KC_T  ,                                         KC_Y  , KC_U  , KC_I  , KC_O  , KC_P  ,KC_BSLS,
+        CTL_CAP, KC_A  ,KC_S   , KC_D  , KC_F  , KC_G  ,                                         KC_H  , KC_J  , KC_K  , KC_L  ,LT_SCLN,KC_QUOT,
+        KC_LSFT, KC_Z  ,KC_X   , KC_C  , KC_V  , KC_B  ,                                         KC_N  , KC_M  ,KC_COMM, KC_DOT,KC_SLSH,KC_RSFT,
+        CTL_ESC,KC_MINS,KC_EQL ,KC_LBRC,KC_RBRC,                                                        KC_LEFT,KC_DOWN, KC_UP ,KC_RGHT,KC_END ,
+                                                        TT(NAV),KC_DEL ,        KC_PGUP,KC_RCTL,
+                                                                KC_LGUI,        KC_PGDN,
+                                                KC_BSPC,CTL_ESC,KC_LALT,        KC_RALT,KC_ENT ,KC_SPC
+    ),
+    [NAV] = LAYOUT_6x6(
+         RESET , KC_NO ,KC_MPRV,KC_MPLY,KC_MNXT, KC_NO ,                                        KC_BRIU,  KC_7 , KC_8  , KC_9  , KC_NO , RESET ,
+        _______,KC_VOLU,KC_WBAK,KC_MS_U,KC_WFWD,KC_WH_U,                                        KC_BRID,  KC_4 , KC_5  , KC_6  , KC_NO , KC_F9 ,
+        _______,KC_VOLD,KC_MS_L,KC_MS_D,KC_MS_R,KC_WH_D,                                        KC_PPLS,  KC_1 , KC_2  , KC_3  ,KC_PMNS, KC_F10,
+         KC_NO , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_NO ,                                        KC_PAST,  KC_0 , KC_NO ,_______,KC_PSLS, KC_F11,
+        _______, KC_F5 , KC_F6 , KC_F7 , KC_F8 ,                                                        _______,_______,_______,_______, KC_F12,
+                                                        _______,_______,        KC_HOME,_______,
+                                                                _______,        KC_END ,
+                                                KC_BTN1,KC_BTN2,_______,        ALT_BSP,_______,_______
+    )
+};
diff --git a/qmk/keyboards/handwired/dactyl_rah/keymaps/right/config.h b/qmk/keyboards/handwired/dactyl_rah/keymaps/right/config.h
new file mode 100644
index 00000000..faac5d11
--- /dev/null
+++ b/qmk/keyboards/handwired/dactyl_rah/keymaps/right/config.h
@@ -0,0 +1,19 @@
+/*
+Copyright 2020 Ralph Azucena <ralphie02@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
+#define MASTER_RIGHT
diff --git a/qmk/keyboards/handwired/dactyl_rah/keymaps/right/keymap.c b/qmk/keyboards/handwired/dactyl_rah/keymaps/right/keymap.c
new file mode 100644
index 00000000..6b07051c
--- /dev/null
+++ b/qmk/keyboards/handwired/dactyl_rah/keymaps/right/keymap.c
@@ -0,0 +1,47 @@
+ /* Copyright 2020 Ralph Azucena <ralphie02@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 QMK_KEYBOARD_H
+
+#define BASE 0
+#define NAV 1
+
+#define CTL_ESC LCTL_T(KC_ESC)
+#define CTL_CAP LCTL_T(KC_CAPS)
+#define ALT_BSP LALT_T(KC_BSPC)
+#define LT_SCLN LT(NAV, KC_SCLN)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [BASE] = LAYOUT_6x6(
+        KC_GRV , KC_1  ,KC_2   , KC_3  , KC_4  , KC_5  ,                                         KC_6  , KC_7  , KC_8  , KC_9  , KC_0  ,KC_HOME,
+        KC_TAB , KC_Q  ,KC_W   , KC_E  , KC_R  , KC_T  ,                                         KC_Y  , KC_U  , KC_I  , KC_O  , KC_P  ,KC_BSLS,
+        CTL_CAP, KC_A  ,KC_S   , KC_D  , KC_F  , KC_G  ,                                         KC_H  , KC_J  , KC_K  , KC_L  ,LT_SCLN,KC_QUOT,
+        KC_LSFT, KC_Z  ,KC_X   , KC_C  , KC_V  , KC_B  ,                                         KC_N  , KC_M  ,KC_COMM, KC_DOT,KC_SLSH,KC_RSFT,
+        CTL_ESC,KC_MINS,KC_EQL ,KC_LBRC,KC_RBRC,                                                        KC_LEFT,KC_DOWN, KC_UP ,KC_RGHT,KC_END ,
+                                                        TT(NAV),KC_DEL ,        KC_PGUP,KC_RCTL,
+                                                                KC_LGUI,        KC_PGDN,
+                                                KC_BSPC,CTL_ESC,KC_LALT,        KC_RALT,KC_ENT ,KC_SPC
+    ),
+    [NAV] = LAYOUT_6x6(
+         RESET , KC_NO ,KC_MPRV,KC_MPLY,KC_MNXT, KC_NO ,                                        KC_BRIU,  KC_7 , KC_8  , KC_9  , KC_NO , RESET ,
+        _______,KC_VOLU,KC_WBAK,KC_MS_U,KC_WFWD,KC_WH_U,                                        KC_BRID,  KC_4 , KC_5  , KC_6  , KC_NO , KC_F9 ,
+        _______,KC_VOLD,KC_MS_L,KC_MS_D,KC_MS_R,KC_WH_D,                                        KC_PPLS,  KC_1 , KC_2  , KC_3  ,KC_PMNS, KC_F10,
+         KC_NO , KC_F1 , KC_F2 , KC_F3 , KC_F4 , KC_NO ,                                        KC_PAST,  KC_0 , KC_NO ,_______,KC_PSLS, KC_F11,
+        _______, KC_F5 , KC_F6 , KC_F7 , KC_F8 ,                                                        _______,_______,_______,_______, KC_F12,
+                                                        _______,_______,        KC_HOME,_______,
+                                                                _______,        KC_END ,
+                                                KC_BTN1,KC_BTN2,_______,        ALT_BSP,_______,_______
+    )
+};
diff --git a/qmk/keyboards/handwired/dactyl_rah/readme.md b/qmk/keyboards/handwired/dactyl_rah/readme.md
new file mode 100644
index 00000000..5c351de9
--- /dev/null
+++ b/qmk/keyboards/handwired/dactyl_rah/readme.md
@@ -0,0 +1 @@
+For reference, visite dactyl_micro [readme](https://github.com/qmk/qmk_firmware/blob/master/keyboards/handwired/dactyl_promicro/readme.md)
diff --git a/qmk/keyboards/handwired/dactyl_rah/rules.mk b/qmk/keyboards/handwired/dactyl_rah/rules.mk
new file mode 100644
index 00000000..9a9bf7d6
--- /dev/null
+++ b/qmk/keyboards/handwired/dactyl_rah/rules.mk
@@ -0,0 +1,23 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no       # 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 = 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
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+SPLIT_KEYBOARD = yes
diff --git a/qmk/keyboards/handwired/hnah108/config.h b/qmk/keyboards/handwired/hnah108/config.h
index a0c20706..b21ba109 100644
--- a/qmk/keyboards/handwired/hnah108/config.h
+++ b/qmk/keyboards/handwired/hnah108/config.h
@@ -20,12 +20,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID 0xFEED
-#define PRODUCT_ID 0x0000
-#define DEVICE_VER 0x0002
+#define VENDOR_ID    0xFEED
+#define PRODUCT_ID   0x0000
+#define DEVICE_VER   0x0002
 #define MANUFACTURER HnahKB
-#define PRODUCT Hnah108
-#define DESCRIPTION Fullsize PCB keyboard 
+#define PRODUCT      Hnah108
 
 /* key matrix size */
 #define MATRIX_ROWS 10
@@ -41,21 +40,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
  *
  */
-#define MATRIX_ROW_PINS \
-    { F7, F6, F5, F4, F1, C7, B4, B5, B6, C6 }
-#define MATRIX_COL_PINS \
-    { F0, E6, B0, D0, D1, D2, D3, D5, D4, D6, D7 }
+#define MATRIX_ROW_PINS { F7, F6, F5, F4, F1, C7, B4, B5, B6, C6 }
+#define MATRIX_COL_PINS { F0, E6, B0, D0, D1, D2, D3, D5, D4, D6, D7 }
 #define UNUSED_PINS
 
-/* COL2ROW, ROW2COL*/
+/* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
-
 #define ENCODERS_PAD_A { B2 }
 #define ENCODERS_PAD_B { B3 }
 
-#define ENCODER_RESOLUTION 4
-
 #define BACKLIGHT_PIN B7
 #define BACKLIGHT_BREATHING
 #define BACKLIGHT_LEVELS 4
@@ -63,28 +57,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RGB_DI_PIN E2
 #define DRIVER_LED_TOTAL 31
 
-//   #define RGBLIGHT_HUE_STEP 8
-//   #define RGBLIGHT_SAT_STEP 8
-//   #define RGBLIGHT_VAL_STEP 8
-//   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
-//   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== or choose animations ==*/
-//   #define RGBLIGHT_EFFECT_BREATHING
-//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
-//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-//   #define RGBLIGHT_EFFECT_SNAKE
-//   #define RGBLIGHT_EFFECT_KNIGHT
-//   #define RGBLIGHT_EFFECT_CHRISTMAS
-//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
-//   #define RGBLIGHT_EFFECT_RGB_TEST
-//   #define RGBLIGHT_EFFECT_ALTERNATING
-// /*== customize breathing effect ==*/
-//   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
-//   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
-//   /*==== use exp() and sin() ====*/
-//   #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
-//   #define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
-
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
 
@@ -97,9 +69,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_RESYNC_ENABLE
 
 /* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
- * This is userful for the Windows task manager shortcut (ctrl+shift+esc).
+ * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
  */
-// #define GRAVE_ESC_CTRL_OVERRIDE
+//#define GRAVE_ESC_CTRL_OVERRIDE
 
 /*
  * Force NKRO
@@ -122,59 +94,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 //#define FORCE_NKRO
 
-/*
- * Magic Key Options
- *
- * Magic keys are hotkey commands that allow control over firmware functions of
- * the keyboard. They are best used in combination with the HID Listen program,
- * found here: https://www.pjrc.com/teensy/hid_listen.html
- *
- * The options below allow the magic key functionality to be changed. This is
- * useful if your keyboard/keypad is missing keys and you want magic key support.
- *
- */
-
-/* key combination for magic key command */
-/* defined by default; to change, uncomment and set to the combination you want */
-// #define IS_COMMAND() (get_mods() == MOD_MASK_SHIFT)
-
-/* control how magic key switches layers */
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS  true
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS  true
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false
-
-/* override magic key keymap */
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM
-//#define MAGIC_KEY_HELP           H
-//#define MAGIC_KEY_HELP_ALT       SLASH
-//#define MAGIC_KEY_DEBUG          D
-//#define MAGIC_KEY_DEBUG_MATRIX   X
-//#define MAGIC_KEY_DEBUG_KBD      K
-//#define MAGIC_KEY_DEBUG_MOUSE    M
-//#define MAGIC_KEY_VERSION        V
-//#define MAGIC_KEY_STATUS         S
-//#define MAGIC_KEY_CONSOLE        C
-//#define MAGIC_KEY_LAYER0         0
-//#define MAGIC_KEY_LAYER0_ALT     GRAVE
-//#define MAGIC_KEY_LAYER1         1
-//#define MAGIC_KEY_LAYER2         2
-//#define MAGIC_KEY_LAYER3         3
-//#define MAGIC_KEY_LAYER4         4
-//#define MAGIC_KEY_LAYER5         5
-//#define MAGIC_KEY_LAYER6         6
-//#define MAGIC_KEY_LAYER7         7
-//#define MAGIC_KEY_LAYER8         8
-//#define MAGIC_KEY_LAYER9         9
-//#define MAGIC_KEY_BOOTLOADER     B
-//#define MAGIC_KEY_BOOTLOADER_ALT ESC
-//#define MAGIC_KEY_LOCK           CAPS
-//#define MAGIC_KEY_EEPROM         E
-//#define MAGIC_KEY_EEPROM_CLEAR   BSPACE
-//#define MAGIC_KEY_NKRO           N
-//#define MAGIC_KEY_SLEEP_LED      Z
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
@@ -190,29 +109,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
-/*
- * MIDI options
- */
-
-/* Prevent use of disabled MIDI features in the keymap */
-//#define MIDI_ENABLE_STRICT 1
-
-/* enable basic MIDI features:
-   - MIDI notes can be sent when in Music mode is on
-*/
-//#define MIDI_BASIC
-
-/* enable advanced MIDI features:
-   - MIDI notes can be added to the keymap
-   - Octave shift and transpose
-   - Virtual sustain, portamento, and modulation wheel
-   - etc.
-*/
-//#define MIDI_ADVANCED
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 1
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
 
+/* Bootmagic Lite key configuration */
+//#define BOOTMAGIC_LITE_ROW 0
+//#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/handwired/hnah108/hnah108.c b/qmk/keyboards/handwired/hnah108/hnah108.c
index a05cc4fe..f8e8c7a3 100644
--- a/qmk/keyboards/handwired/hnah108/hnah108.c
+++ b/qmk/keyboards/handwired/hnah108/hnah108.c
@@ -13,31 +13,35 @@
  * 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 "hnah108.h"
 
-
-
-led_config_t g_led_config = { {
-  //Key Matrix to LED Index
-  {    18,    17,    16,NO_LED,    15,    14,NO_LED,NO_LED,    13,    12,NO_LED},
-  {NO_LED,NO_LED,NO_LED,NO_LED,NO_LED,NO_LED,NO_LED,NO_LED,NO_LED,NO_LED,NO_LED},
-  {19,    NO_LED,NO_LED,NO_LED,NO_LED,NO_LED,NO_LED,NO_LED,NO_LED,NO_LED,NO_LED},
-  {NO_LED,NO_LED,NO_LED,NO_LED,NO_LED,NO_LED,NO_LED,NO_LED,NO_LED,NO_LED,NO_LED},
-  {20,    NO_LED,NO_LED,NO_LED,NO_LED,24    ,NO_LED,NO_LED,26    ,NO_LED,NO_LED},
-  {    21,    22,    23,    25,    27,NO_LED,    28,    29,NO_LED,     0,     1},    
-  {    11,    10,NO_LED,     9,NO_LED,     8,NO_LED,     7,     6,NO_LED,     5},
-  {NO_LED,NO_LED,NO_LED,NO_LED,NO_LED,NO_LED,NO_LED,NO_LED,NO_LED,NO_LED,     4},
-  {NO_LED,NO_LED,NO_LED,NO_LED,NO_LED,NO_LED,NO_LED,NO_LED,NO_LED,NO_LED,     3},
-  {NO_LED,NO_LED,NO_LED,NO_LED,NO_LED,NO_LED,NO_LED,NO_LED,NO_LED,NO_LED,     2}
-}, {
-  //LED Index to Physical Positon
-  {   0,   0},  { 18,  0},  { 37,  0 }, { 56,   0}, {  74,  0},  { 93,  0}, { 112, 0 }, { 130, 0}, { 149,  0}, { 168,  0}, { 186, 0 },  { 205, 0},
-  {   0,  25} ,                                                                                                                         { 205, 25},
-  {   0,  51} ,                                                                                                                         { 205, 51},
-  {   0,  63} , { 18,  63}, { 37, 63},  { 56,  63}, { 74,  63},  { 93, 63}, { 112, 63}, { 130, 63},{ 149, 63}, { 168, 63}, { 186, 63 }, { 205, 63},
-}, {
-  1,1,1,1,1,1,1,1,1,1,1,1,1,
-  1,1,
-  1,1,
-  1,1,1,1,1,1,1,1,1,1,1,1,1,
-} };
\ No newline at end of file
+#ifdef RGB_MATRIX_ENABLE
+led_config_t g_led_config = {
+    {
+        // Key Matrix to LED Index
+        {     18,     17,     16, NO_LED,     15,     14, NO_LED, NO_LED,     13,     12, NO_LED },
+        { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED },
+        {     19, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED },
+        { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED },
+        {     20, NO_LED, NO_LED, NO_LED, NO_LED,     24, NO_LED, NO_LED,     26, NO_LED, NO_LED },
+        {     21,     22,     23,     25,     27, NO_LED,     28,     29, NO_LED,      0,      1 },
+        {     11,     10, NO_LED,      9, NO_LED,      8, NO_LED,      7,      6, NO_LED,      5 },
+        { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED,      4 },
+        { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED,      3 },
+        { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED,      2 }
+    }, {
+        // LED Index to Physical Position
+        {   0,   0 }, {  18,   0 }, {  37,   0 }, {  56,   0 }, {  74,   0 }, {  93,   0 }, { 112,   0 }, { 130,   0 }, { 149,   0 }, { 168,   0 }, { 186,   0 }, { 205,   0 },
+        {   0,  25 },                                                                                                                                             { 205,  25 },
+        {   0,  51 },                                                                                                                                             { 205,  51 },
+        {   0,  63 }, {  18,  63 }, {  37,  63 }, {  56,  63 }, {  74,  63 }, {  93,  63 }, { 112,  63 }, { 130,  63 }, { 149,  63 }, { 168,  63 }, { 186,  63 }, { 205,  63 }
+    }, {
+        // LED Index to Flag
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
+        1,                                  1,
+        1,                                  1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
+    }
+};
+#endif
diff --git a/qmk/keyboards/handwired/hnah108/hnah108.h b/qmk/keyboards/handwired/hnah108/hnah108.h
index 9ea34b83..a11f9fc6 100644
--- a/qmk/keyboards/handwired/hnah108/hnah108.h
+++ b/qmk/keyboards/handwired/hnah108/hnah108.h
@@ -13,20 +13,21 @@
  * 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 XXX KC_NO
 
 #define LAYOUT_all( \
-    k00,      k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k60, k61,     k62, k63, k64,      k65, k66, k67, k68, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k70, k71, k72,     k73, k74, k75,      k76, k77, k78, k69,  \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k80, k81, k82,     k83, k84, k85,      k86, k87, k79, k6A, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k91, k93, k94,                         k96, k97, k88, \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k90,      k92,          k95,           k98, k99, k89, k7A, \
-    k50, k51, k52,                k53,                k54, k55, k56, k57,     k58, k59, k5A,      k9A,      k8A \
-) \
-{ \
+    k00,      k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k60, k61,   k62, k63, k64,   k65, k66, k67, k68, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k70, k71, k72,   k73, k74, k75,   k76, k77, k78, k69, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k80, k81, k82,   k83, k84, k85,   k86, k87, k79, k6A, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k91, k93, k94,                    k96, k97, k88, \
+    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k90,      k92,        k95,        k98, k99, k89, k7A, \
+    k50, k51, k52,                k53,                k54, k55, k56, k57,   k58, k59, k5A,   k9A,      k8A \
+) { \
     { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A }, \
     { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A }, \
     { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A }, \
@@ -36,37 +37,45 @@
     { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6A }, \
     { k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7A }, \
     { k80, k81, k82, k83, k84, k85, k86, k87, k88, k89, k8A }, \
-    { k90, k91, k92, k93, k94, k95, k96, k97, k98, k99, k9A }, \
+    { k90, k91, k92, k93, k94, k95, k96, k97, k98, k99, k9A } \
 }
 
 #define LAYOUT_fullsize_iso( \
-    k00,      k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k60, k61,     k62, k63, k64,      k65, k66, k67, k68, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k70, k71, k72,     k73, k74, k75,      k76, k77, k78, k69,  \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k80, k81,          k83, k84, k85,      k86, k87, k79, k6A, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k91, k93, k94,                         k96, k97, k88, \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k90,      k92,          k95,           k98, k99, k89, k7A, \
-    k50, k51, k52,                k53,                k54, k55, k56, k57,     k58, k59, k5A,      k9A,      k8A \
-) LAYOUT_all( \
-    k00,      k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k60, k61,     k62, k63, k64,      k65, k66, k67, k68, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k70, k71, k72,     k73, k74, k75,      k76, k77, k78, k69,  \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k80, k81, KC_NO,   k83, k84, k85,      k86, k87, k79, k6A, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k91, k93, k94,                         k96, k97, k88, \
-    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k90,      k92,          k95,           k98, k99, k89, k7A, \
-    k50, k51, k52,                k53,                k54, k55, k56, k57,     k58, k59, k5A,      k9A,      k8A \
-)
+    k00,      k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k60, k61,   k62, k63, k64,   k65, k66, k67, k68, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k70, k71, k72,   k73, k74, k75,   k76, k77, k78, k69, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k80, k81,        k83, k84, k85,   k86, k87, k79, k6A, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k91, k93, k94,                    k96, k97, k88, \
+    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k90,      k92,        k95,        k98, k99, k89, k7A, \
+    k50, k51, k52,                k53,                k54, k55, k56, k57,   k58, k59, k5A,   k9A,      k8A \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A }, \
+    { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A }, \
+    { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6A }, \
+    { k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7A }, \
+    { k80, k81, XXX, k83, k84, k85, k86, k87, k88, k89, k8A }, \
+    { k90, k91, k92, k93, k94, k95, k96, k97, k98, k99, k9A } \
+}
 
 #define LAYOUT_fullsize_ansi( \
-    k00,      k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k60, k61,     k62, k63, k64,      k65, k66, k67, k68,  \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k70, k71, k72,     k73, k74, k75,      k76, k77, k78, k69,  \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k80, k81, k82,     k83, k84, k85,      k86, k87, k79, k6A, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k91,      k94,                         k96, k97, k88, \
-    k40,      k42, k43, k44, k45, k46, k47, k48, k49, k4A, k90,      k92,          k95,           k98, k99, k89, k7A, \
-    k50, k51, k52,                k53,                k54, k55, k56, k57,     k58, k59, k5A,      k9A,      k8A \
-) LAYOUT_all( \
-    k00,      k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k60, k61,     k62, k63, k64,      k65, k66, k67, k68, \
-    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k70, k71, k72,     k73, k74, k75,      k76, k77, k78, k69,  \
-    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k80, k81, k82,     k83, k84, k85,      k86, k87, k79, k6A, \
-    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k91,KC_NO,k94,                         k96, k97, k88, \
-    k40,KC_NO,k42, k43, k44, k45, k46, k47, k48, k49, k4A, k90,      k92,          k95,           k98, k99, k89, k7A, \
-    k50, k51, k52,                k53,                k54, k55, k56, k57,     k58, k59, k5A,      k9A,      k8A \
-)
+    k00,      k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k60, k61,   k62, k63, k64,   k65, k66, k67, k68, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k70, k71, k72,   k73, k74, k75,   k76, k77, k78, k69, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k80, k81, k82,   k83, k84, k85,   k86, k87, k79, k6A, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k91,      k94,                    k96, k97, k88, \
+    k40,      k42, k43, k44, k45, k46, k47, k48, k49, k4A, k90,      k92,        k95,        k98, k99, k89, k7A, \
+    k50, k51, k52,                k53,                k54, k55, k56, k57,   k58, k59, k5A,   k9A,      k8A \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A }, \
+    { k40, XXX, k42, k43, k44, k45, k46, k47, k48, k49, k4A }, \
+    { k50, k51, k52, k53, k54, k55, k56, k57, k58, k59, k5A }, \
+    { k60, k61, k62, k63, k64, k65, k66, k67, k68, k69, k6A }, \
+    { k70, k71, k72, k73, k74, k75, k76, k77, k78, k79, k7A }, \
+    { k80, k81, k82, k83, k84, k85, k86, k87, k88, k89, k8A }, \
+    { k90, k91, k92, XXX, k94, k95, k96, k97, k98, k99, k9A } \
+}
diff --git a/qmk/keyboards/handwired/hnah108/info.json b/qmk/keyboards/handwired/hnah108/info.json
index a8671a87..79581950 100644
--- a/qmk/keyboards/handwired/hnah108/info.json
+++ b/qmk/keyboards/handwired/hnah108/info.json
@@ -1,18 +1,348 @@
 {
-    "keyboard_name": "hnah108", 
-    "url": "", 
-    "maintainer": "HnahKB", 
-    "width": 22.5, 
-    "height": 6.25, 
+    "keyboard_name": "hnah108",
+    "url": "",
+    "maintainer": "HnahKB",
+    "width": 22.5,
+    "height": 6.25,
     "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}, {"x":18.5, "y":0}, {"x":19.5, "y":0}, {"x":20.5, "y":0}, {"x":21.5, "y":0}, {"label":"~", "x":0, "y":1.25}, {"label":"!", "x":1, "y":1.25}, {"label":"@", "x":2, "y":1.25}, {"label":"#", "x":3, "y":1.25}, {"label":"$", "x":4, "y":1.25}, {"label":"%", "x":5, "y":1.25}, {"label":"^", "x":6, "y":1.25}, {"label":"&", "x":7, "y":1.25}, {"label":"*", "x":8, "y":1.25}, {"label":"(", "x":9, "y":1.25}, {"label":")", "x":10, "y":1.25}, {"label":"_", "x":11, "y":1.25}, {"label":"+", "x":12, "y":1.25}, {"label":"Backspace", "x":13, "y":1.25, "w":2}, {"label":"Insert", "x":15.25, "y":1.25}, {"label":"Home", "x":16.25, "y":1.25}, {"label":"PgUp", "x":17.25, "y":1.25}, {"label":"Num Lock", "x":18.5, "y":1.25}, {"label":"/", "x":19.5, "y":1.25}, {"label":"*", "x":20.5, "y":1.25}, {"label":"-", "x":21.5, "y":1.25}, {"label":"Tab", "x":0, "y":2.25, "w":1.5}, {"label":"Q", "x":1.5, "y":2.25}, {"label":"W", "x":2.5, "y":2.25}, {"label":"E", "x":3.5, "y":2.25}, {"label":"R", "x":4.5, "y":2.25}, {"label":"T", "x":5.5, "y":2.25}, {"label":"Y", "x":6.5, "y":2.25}, {"label":"U", "x":7.5, "y":2.25}, {"label":"I", "x":8.5, "y":2.25}, {"label":"O", "x":9.5, "y":2.25}, {"label":"P", "x":10.5, "y":2.25}, {"label":"{", "x":11.5, "y":2.25}, {"label":"}", "x":12.5, "y":2.25}, {"label":"|", "x":13.5, "y":2.25, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.25}, {"label":"End", "x":16.25, "y":2.25}, {"label":"PgDn", "x":17.25, "y":2.25}, {"label":"7", "x":18.5, "y":2.25}, {"label":"8", "x":19.5, "y":2.25}, {"label":"9", "x":20.5, "y":2.25}, {"label":"+", "x":21.5, "y":2.25, "h":2}, {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, {"label":"A", "x":1.75, "y":3.25}, {"label":"S", "x":2.75, "y":3.25}, {"label":"D", "x":3.75, "y":3.25}, {"label":"F", "x":4.75, "y":3.25}, {"label":"G", "x":5.75, "y":3.25}, {"label":"H", "x":6.75, "y":3.25}, {"label":"J", "x":7.75, "y":3.25}, {"label":"K", "x":8.75, "y":3.25}, {"label":"L", "x":9.75, "y":3.25}, {"label":":", "x":10.75, "y":3.25}, {"label":"@", "x":11.75, "y":3.25}, {"label":"~", "x":12.75, "y":3.25}, {"label":"Enter", "x":13.75, "y":3.25, "w":1.25}, {"label":"4", "x":18.5, "y":3.25}, {"label":"5", "x":19.5, "y":3.25}, {"label":"6", "x":20.5, "y":3.25}, {"label":"Shift", "x":0, "y":4.25, "w":1.25}, {"label":"|", "x":1.25, "y":4.25}, {"label":"Z", "x":2.25, "y":4.25}, {"label":"X", "x":3.25, "y":4.25}, {"label":"C", "x":4.25, "y":4.25}, {"label":"V", "x":5.25, "y":4.25}, {"label":"B", "x":6.25, "y":4.25}, {"label":"N", "x":7.25, "y":4.25}, {"label":"M", "x":8.25, "y":4.25}, {"label":"<", "x":9.25, "y":4.25}, {"label":">", "x":10.25, "y":4.25}, {"label":"?", "x":11.25, "y":4.25}, {"label":"Shift", "x":12.25, "y":4.25, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.25}, {"label":"1", "x":18.5, "y":4.25}, {"label":"2", "x":19.5, "y":4.25}, {"label":"3", "x":20.5, "y":4.25}, {"label":"Enter", "x":21.5, "y":4.25, "h":2}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, {"label":"Win", "x":1.25, "y":5.25, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"label":"Alt", "x":10, "y":5.25, "w":1.25}, {"label":"Win", "x":11.25, "y":5.25, "w":1.25}, {"label":"Menu", "x":12.5, "y":5.25, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25}, {"label":"\u2190", "x":15.25, "y":5.25}, {"label":"\u2193", "x":16.25, "y":5.25}, {"label":"\u2192", "x":17.25, "y":5.25}, {"label":"0", "x":18.5, "y":5.25, "w":2}, {"label":".", "x":20.5, "y":5.25}]
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6.5, "y": 0},
+                {"x": 7.5, "y": 0},
+                {"x": 8.5, "y": 0},
+                {"x": 9.5, "y": 0},
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0},
+                {"x": 14, "y": 0},
+                {"x": 15.25, "y": 0},
+                {"x": 16.25, "y": 0},
+                {"x": 17.25, "y": 0},
+                {"x": 18.5, "y": 0},
+                {"x": 19.5, "y": 0},
+                {"x": 20.5, "y": 0},
+                {"x": 21.5, "y": 0},
+                {"x": 0, "y": 1.25},
+                {"x": 1, "y": 1.25},
+                {"x": 2, "y": 1.25},
+                {"x": 3, "y": 1.25},
+                {"x": 4, "y": 1.25},
+                {"x": 5, "y": 1.25},
+                {"x": 6, "y": 1.25},
+                {"x": 7, "y": 1.25},
+                {"x": 8, "y": 1.25},
+                {"x": 9, "y": 1.25},
+                {"x": 10, "y": 1.25},
+                {"x": 11, "y": 1.25},
+                {"x": 12, "y": 1.25},
+                {"x": 13, "y": 1.25, "w": 2},
+                {"x": 15.25, "y": 1.25},
+                {"x": 16.25, "y": 1.25},
+                {"x": 17.25, "y": 1.25},
+                {"x": 18.5, "y": 1.25},
+                {"x": 19.5, "y": 1.25},
+                {"x": 20.5, "y": 1.25},
+                {"x": 21.5, "y": 1.25},
+                {"x": 0, "y": 2.25, "w": 1.5},
+                {"x": 1.5, "y": 2.25},
+                {"x": 2.5, "y": 2.25},
+                {"x": 3.5, "y": 2.25},
+                {"x": 4.5, "y": 2.25},
+                {"x": 5.5, "y": 2.25},
+                {"x": 6.5, "y": 2.25},
+                {"x": 7.5, "y": 2.25},
+                {"x": 8.5, "y": 2.25},
+                {"x": 9.5, "y": 2.25},
+                {"x": 10.5, "y": 2.25},
+                {"x": 11.5, "y": 2.25},
+                {"x": 12.5, "y": 2.25},
+                {"x": 13.5, "y": 2.25, "w": 1.5},
+                {"x": 15.25, "y": 2.25},
+                {"x": 16.25, "y": 2.25},
+                {"x": 17.25, "y": 2.25},
+                {"x": 18.5, "y": 2.25},
+                {"x": 19.5, "y": 2.25},
+                {"x": 20.5, "y": 2.25},
+                {"x": 21.5, "y": 2.25, "h": 2},
+                {"x": 0, "y": 3.25, "w": 1.75},
+                {"x": 1.75, "y": 3.25},
+                {"x": 2.75, "y": 3.25},
+                {"x": 3.75, "y": 3.25},
+                {"x": 4.75, "y": 3.25},
+                {"x": 5.75, "y": 3.25},
+                {"x": 6.75, "y": 3.25},
+                {"x": 7.75, "y": 3.25},
+                {"x": 8.75, "y": 3.25},
+                {"x": 9.75, "y": 3.25},
+                {"x": 10.75, "y": 3.25},
+                {"x": 11.75, "y": 3.25},
+                {"x": 12.75, "y": 3.25},
+                {"x": 13.75, "y": 3.25, "w": 1.25},
+                {"x": 18.5, "y": 3.25},
+                {"x": 19.5, "y": 3.25},
+                {"x": 20.5, "y": 3.25},
+                {"x": 0, "y": 4.25, "w": 1.25},
+                {"x": 1.25, "y": 4.25},
+                {"x": 2.25, "y": 4.25},
+                {"x": 3.25, "y": 4.25},
+                {"x": 4.25, "y": 4.25},
+                {"x": 5.25, "y": 4.25},
+                {"x": 6.25, "y": 4.25},
+                {"x": 7.25, "y": 4.25},
+                {"x": 8.25, "y": 4.25},
+                {"x": 9.25, "y": 4.25},
+                {"x": 10.25, "y": 4.25},
+                {"x": 11.25, "y": 4.25},
+                {"x": 12.25, "y": 4.25, "w": 2.75},
+                {"x": 16.25, "y": 4.25},
+                {"x": 18.5, "y": 4.25},
+                {"x": 19.5, "y": 4.25},
+                {"x": 20.5, "y": 4.25},
+                {"x": 21.5, "y": 4.25, "h": 2},
+                {"x": 0, "y": 5.25, "w": 1.25},
+                {"x": 1.25, "y": 5.25, "w": 1.25},
+                {"x": 2.5, "y": 5.25, "w": 1.25},
+                {"x": 3.75, "y": 5.25, "w": 6.25},
+                {"x": 10, "y": 5.25, "w": 1.25},
+                {"x": 11.25, "y": 5.25, "w": 1.25},
+                {"x": 12.5, "y": 5.25, "w": 1.25},
+                {"x": 13.75, "y": 5.25, "w": 1.25},
+                {"x": 15.25, "y": 5.25},
+                {"x": 16.25, "y": 5.25},
+                {"x": 17.25, "y": 5.25},
+                {"x": 18.5, "y": 5.25, "w": 2},
+                {"x": 20.5, "y": 5.25}
+            ]
         },
         "LAYOUT_fullsize_iso": {
-            "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}, {"x":18.5, "y":0}, {"x":19.5, "y":0}, {"x":20.5, "y":0}, {"x":21.5, "y":0}, {"label":"~", "x":0, "y":1.25}, {"label":"!", "x":1, "y":1.25}, {"label":"@", "x":2, "y":1.25}, {"label":"#", "x":3, "y":1.25}, {"label":"$", "x":4, "y":1.25}, {"label":"%", "x":5, "y":1.25}, {"label":"^", "x":6, "y":1.25}, {"label":"&", "x":7, "y":1.25}, {"label":"*", "x":8, "y":1.25}, {"label":"(", "x":9, "y":1.25}, {"label":")", "x":10, "y":1.25}, {"label":"_", "x":11, "y":1.25}, {"label":"+", "x":12, "y":1.25}, {"label":"Backspace", "x":13, "y":1.25, "w":2}, {"label":"Insert", "x":15.25, "y":1.25}, {"label":"Home", "x":16.25, "y":1.25}, {"label":"PgUp", "x":17.25, "y":1.25}, {"label":"Num Lock", "x":18.5, "y":1.25}, {"label":"/", "x":19.5, "y":1.25}, {"label":"*", "x":20.5, "y":1.25}, {"label":"-", "x":21.5, "y":1.25}, {"label":"Tab", "x":0, "y":2.25, "w":1.5}, {"label":"Q", "x":1.5, "y":2.25}, {"label":"W", "x":2.5, "y":2.25}, {"label":"E", "x":3.5, "y":2.25}, {"label":"R", "x":4.5, "y":2.25}, {"label":"T", "x":5.5, "y":2.25}, {"label":"Y", "x":6.5, "y":2.25}, {"label":"U", "x":7.5, "y":2.25}, {"label":"I", "x":8.5, "y":2.25}, {"label":"O", "x":9.5, "y":2.25}, {"label":"P", "x":10.5, "y":2.25}, {"label":"{", "x":11.5, "y":2.25}, {"label":"}", "x":12.5, "y":2.25}, {"label":"Enter", "x":13.75, "y":2.25, "w":1.25, "h":2}, {"label":"Delete", "x":15.25, "y":2.25}, {"label":"End", "x":16.25, "y":2.25}, {"label":"PgDn", "x":17.25, "y":2.25}, {"label":"7", "x":18.5, "y":2.25}, {"label":"8", "x":19.5, "y":2.25}, {"label":"9", "x":20.5, "y":2.25}, {"label":"+", "x":21.5, "y":2.25, "h":2}, {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, {"label":"A", "x":1.75, "y":3.25}, {"label":"S", "x":2.75, "y":3.25}, {"label":"D", "x":3.75, "y":3.25}, {"label":"F", "x":4.75, "y":3.25}, {"label":"G", "x":5.75, "y":3.25}, {"label":"H", "x":6.75, "y":3.25}, {"label":"J", "x":7.75, "y":3.25}, {"label":"K", "x":8.75, "y":3.25}, {"label":"L", "x":9.75, "y":3.25}, {"label":":", "x":10.75, "y":3.25}, {"label":"@", "x":11.75, "y":3.25}, {"label":"~", "x":12.75, "y":3.25}, {"label":"4", "x":18.5, "y":3.25}, {"label":"5", "x":19.5, "y":3.25}, {"label":"6", "x":20.5, "y":3.25}, {"label":"Shift", "x":0, "y":4.25, "w":1.25}, {"label":"|", "x":1.25, "y":4.25}, {"label":"Z", "x":2.25, "y":4.25}, {"label":"X", "x":3.25, "y":4.25}, {"label":"C", "x":4.25, "y":4.25}, {"label":"V", "x":5.25, "y":4.25}, {"label":"B", "x":6.25, "y":4.25}, {"label":"N", "x":7.25, "y":4.25}, {"label":"M", "x":8.25, "y":4.25}, {"label":"<", "x":9.25, "y":4.25}, {"label":">", "x":10.25, "y":4.25}, {"label":"?", "x":11.25, "y":4.25}, {"label":"Shift", "x":12.25, "y":4.25, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.25}, {"label":"1", "x":18.5, "y":4.25}, {"label":"2", "x":19.5, "y":4.25}, {"label":"3", "x":20.5, "y":4.25}, {"label":"Enter", "x":21.5, "y":4.25, "h":2}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, {"label":"Win", "x":1.25, "y":5.25, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"label":"Alt", "x":10, "y":5.25, "w":1.25}, {"label":"Win", "x":11.25, "y":5.25, "w":1.25}, {"label":"Menu", "x":12.5, "y":5.25, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25}, {"label":"\u2190", "x":15.25, "y":5.25}, {"label":"\u2193", "x":16.25, "y":5.25}, {"label":"\u2192", "x":17.25, "y":5.25}, {"label":"0", "x":18.5, "y":5.25, "w":2}, {"label":".", "x":20.5, "y":5.25}]
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6.5, "y": 0},
+                {"x": 7.5, "y": 0},
+                {"x": 8.5, "y": 0},
+                {"x": 9.5, "y": 0},
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0},
+                {"x": 14, "y": 0},
+                {"x": 15.25, "y": 0},
+                {"x": 16.25, "y": 0},
+                {"x": 17.25, "y": 0},
+                {"x": 18.5, "y": 0},
+                {"x": 19.5, "y": 0},
+                {"x": 20.5, "y": 0},
+                {"x": 21.5, "y": 0},
+                {"x": 0, "y": 1.25},
+                {"x": 1, "y": 1.25},
+                {"x": 2, "y": 1.25},
+                {"x": 3, "y": 1.25},
+                {"x": 4, "y": 1.25},
+                {"x": 5, "y": 1.25},
+                {"x": 6, "y": 1.25},
+                {"x": 7, "y": 1.25},
+                {"x": 8, "y": 1.25},
+                {"x": 9, "y": 1.25},
+                {"x": 10, "y": 1.25},
+                {"x": 11, "y": 1.25},
+                {"x": 12, "y": 1.25},
+                {"x": 13, "y": 1.25, "w": 2},
+                {"x": 15.25, "y": 1.25},
+                {"x": 16.25, "y": 1.25},
+                {"x": 17.25, "y": 1.25},
+                {"x": 18.5, "y": 1.25},
+                {"x": 19.5, "y": 1.25},
+                {"x": 20.5, "y": 1.25},
+                {"x": 21.5, "y": 1.25},
+                {"x": 0, "y": 2.25, "w": 1.5},
+                {"x": 1.5, "y": 2.25},
+                {"x": 2.5, "y": 2.25},
+                {"x": 3.5, "y": 2.25},
+                {"x": 4.5, "y": 2.25},
+                {"x": 5.5, "y": 2.25},
+                {"x": 6.5, "y": 2.25},
+                {"x": 7.5, "y": 2.25},
+                {"x": 8.5, "y": 2.25},
+                {"x": 9.5, "y": 2.25},
+                {"x": 10.5, "y": 2.25},
+                {"x": 11.5, "y": 2.25},
+                {"x": 12.5, "y": 2.25},
+                {"x": 13.75, "y": 2.25, "w": 1.25, "h": 2},
+                {"x": 15.25, "y": 2.25},
+                {"x": 16.25, "y": 2.25},
+                {"x": 17.25, "y": 2.25},
+                {"x": 18.5, "y": 2.25},
+                {"x": 19.5, "y": 2.25},
+                {"x": 20.5, "y": 2.25},
+                {"x": 21.5, "y": 2.25, "h": 2},
+                {"x": 0, "y": 3.25, "w": 1.75},
+                {"x": 1.75, "y": 3.25},
+                {"x": 2.75, "y": 3.25},
+                {"x": 3.75, "y": 3.25},
+                {"x": 4.75, "y": 3.25},
+                {"x": 5.75, "y": 3.25},
+                {"x": 6.75, "y": 3.25},
+                {"x": 7.75, "y": 3.25},
+                {"x": 8.75, "y": 3.25},
+                {"x": 9.75, "y": 3.25},
+                {"x": 10.75, "y": 3.25},
+                {"x": 11.75, "y": 3.25},
+                {"x": 12.75, "y": 3.25},
+                {"x": 18.5, "y": 3.25},
+                {"x": 19.5, "y": 3.25},
+                {"x": 20.5, "y": 3.25},
+                {"x": 0, "y": 4.25, "w": 1.25},
+                {"x": 1.25, "y": 4.25},
+                {"x": 2.25, "y": 4.25},
+                {"x": 3.25, "y": 4.25},
+                {"x": 4.25, "y": 4.25},
+                {"x": 5.25, "y": 4.25},
+                {"x": 6.25, "y": 4.25},
+                {"x": 7.25, "y": 4.25},
+                {"x": 8.25, "y": 4.25},
+                {"x": 9.25, "y": 4.25},
+                {"x": 10.25, "y": 4.25},
+                {"x": 11.25, "y": 4.25},
+                {"x": 12.25, "y": 4.25, "w": 2.75},
+                {"x": 16.25, "y": 4.25},
+                {"x": 18.5, "y": 4.25},
+                {"x": 19.5, "y": 4.25},
+                {"x": 20.5, "y": 4.25},
+                {"x": 21.5, "y": 4.25, "h": 2},
+                {"x": 0, "y": 5.25, "w": 1.25},
+                {"x": 1.25, "y": 5.25, "w": 1.25},
+                {"x": 2.5, "y": 5.25, "w": 1.25},
+                {"x": 3.75, "y": 5.25, "w": 6.25},
+                {"x": 10, "y": 5.25, "w": 1.25},
+                {"x": 11.25, "y": 5.25, "w": 1.25},
+                {"x": 12.5, "y": 5.25, "w": 1.25},
+                {"x": 13.75, "y": 5.25, "w": 1.25},
+                {"x": 15.25, "y": 5.25},
+                {"x": 16.25, "y": 5.25},
+                {"x": 17.25, "y": 5.25},
+                {"x": 18.5, "y": 5.25, "w": 2},
+                {"x": 20.5, "y": 5.25}
+            ]
         },
         "LAYOUT_fullsize_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}, {"x":18.5, "y":0}, {"x":19.5, "y":0}, {"x":20.5, "y":0}, {"x":21.5, "y":0}, {"label":"~", "x":0, "y":1.25}, {"label":"!", "x":1, "y":1.25}, {"label":"@", "x":2, "y":1.25}, {"label":"#", "x":3, "y":1.25}, {"label":"$", "x":4, "y":1.25}, {"label":"%", "x":5, "y":1.25}, {"label":"^", "x":6, "y":1.25}, {"label":"&", "x":7, "y":1.25}, {"label":"*", "x":8, "y":1.25}, {"label":"(", "x":9, "y":1.25}, {"label":")", "x":10, "y":1.25}, {"label":"_", "x":11, "y":1.25}, {"label":"+", "x":12, "y":1.25}, {"label":"Backspace", "x":13, "y":1.25, "w":2}, {"label":"Insert", "x":15.25, "y":1.25}, {"label":"Home", "x":16.25, "y":1.25}, {"label":"PgUp", "x":17.25, "y":1.25}, {"label":"Num Lock", "x":18.5, "y":1.25}, {"label":"/", "x":19.5, "y":1.25}, {"label":"*", "x":20.5, "y":1.25}, {"label":"-", "x":21.5, "y":1.25}, {"label":"Tab", "x":0, "y":2.25, "w":1.5}, {"label":"Q", "x":1.5, "y":2.25}, {"label":"W", "x":2.5, "y":2.25}, {"label":"E", "x":3.5, "y":2.25}, {"label":"R", "x":4.5, "y":2.25}, {"label":"T", "x":5.5, "y":2.25}, {"label":"Y", "x":6.5, "y":2.25}, {"label":"U", "x":7.5, "y":2.25}, {"label":"I", "x":8.5, "y":2.25}, {"label":"O", "x":9.5, "y":2.25}, {"label":"P", "x":10.5, "y":2.25}, {"label":"{", "x":11.5, "y":2.25}, {"label":"}", "x":12.5, "y":2.25}, {"label":"|", "x":13.5, "y":2.25, "w":1.5}, {"label":"Delete", "x":15.25, "y":2.25}, {"label":"End", "x":16.25, "y":2.25}, {"label":"PgDn", "x":17.25, "y":2.25}, {"label":"7", "x":18.5, "y":2.25}, {"label":"8", "x":19.5, "y":2.25}, {"label":"9", "x":20.5, "y":2.25}, {"label":"+", "x":21.5, "y":2.25, "h":2}, {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, {"label":"A", "x":1.75, "y":3.25}, {"label":"S", "x":2.75, "y":3.25}, {"label":"D", "x":3.75, "y":3.25}, {"label":"F", "x":4.75, "y":3.25}, {"label":"G", "x":5.75, "y":3.25}, {"label":"H", "x":6.75, "y":3.25}, {"label":"J", "x":7.75, "y":3.25}, {"label":"K", "x":8.75, "y":3.25}, {"label":"L", "x":9.75, "y":3.25}, {"label":":", "x":10.75, "y":3.25}, {"label":"\"", "x":11.75, "y":3.25}, {"label":"Enter", "x":12.75, "y":3.25, "w":2.25}, {"label":"4", "x":18.5, "y":3.25}, {"label":"5", "x":19.5, "y":3.25}, {"label":"6", "x":20.5, "y":3.25}, {"label":"Shift", "x":0, "y":4.25, "w":2.25}, {"label":"Z", "x":2.25, "y":4.25}, {"label":"X", "x":3.25, "y":4.25}, {"label":"C", "x":4.25, "y":4.25}, {"label":"V", "x":5.25, "y":4.25}, {"label":"B", "x":6.25, "y":4.25}, {"label":"N", "x":7.25, "y":4.25}, {"label":"M", "x":8.25, "y":4.25}, {"label":"<", "x":9.25, "y":4.25}, {"label":">", "x":10.25, "y":4.25}, {"label":"?", "x":11.25, "y":4.25}, {"label":"Shift", "x":12.25, "y":4.25, "w":2.75}, {"label":"\u2191", "x":16.25, "y":4.25}, {"label":"1", "x":18.5, "y":4.25}, {"label":"2", "x":19.5, "y":4.25}, {"label":"3", "x":20.5, "y":4.25}, {"label":"Enter", "x":21.5, "y":4.25, "h":2}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, {"label":"Win", "x":1.25, "y":5.25, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"label":"Alt", "x":10, "y":5.25, "w":1.25}, {"label":"Win", "x":11.25, "y":5.25, "w":1.25}, {"label":"Menu", "x":12.5, "y":5.25, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":5.25, "w":1.25}, {"label":"\u2190", "x":15.25, "y":5.25}, {"label":"\u2193", "x":16.25, "y":5.25}, {"label":"\u2192", "x":17.25, "y":5.25}, {"label":"0", "x":18.5, "y":5.25, "w":2}, {"label":".", "x":20.5, "y":5.25}]
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6.5, "y": 0},
+                {"x": 7.5, "y": 0},
+                {"x": 8.5, "y": 0},
+                {"x": 9.5, "y": 0},
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0},
+                {"x": 14, "y": 0},
+                {"x": 15.25, "y": 0},
+                {"x": 16.25, "y": 0},
+                {"x": 17.25, "y": 0},
+                {"x": 18.5, "y": 0},
+                {"x": 19.5, "y": 0},
+                {"x": 20.5, "y": 0},
+                {"x": 21.5, "y": 0},
+                {"x": 0, "y": 1.25},
+                {"x": 1, "y": 1.25},
+                {"x": 2, "y": 1.25},
+                {"x": 3, "y": 1.25},
+                {"x": 4, "y": 1.25},
+                {"x": 5, "y": 1.25},
+                {"x": 6, "y": 1.25},
+                {"x": 7, "y": 1.25},
+                {"x": 8, "y": 1.25},
+                {"x": 9, "y": 1.25},
+                {"x": 10, "y": 1.25},
+                {"x": 11, "y": 1.25},
+                {"x": 12, "y": 1.25},
+                {"x": 13, "y": 1.25, "w": 2},
+                {"x": 15.25, "y": 1.25},
+                {"x": 16.25, "y": 1.25},
+                {"x": 17.25, "y": 1.25},
+                {"x": 18.5, "y": 1.25},
+                {"x": 19.5, "y": 1.25},
+                {"x": 20.5, "y": 1.25},
+                {"x": 21.5, "y": 1.25},
+                {"x": 0, "y": 2.25, "w": 1.5},
+                {"x": 1.5, "y": 2.25},
+                {"x": 2.5, "y": 2.25},
+                {"x": 3.5, "y": 2.25},
+                {"x": 4.5, "y": 2.25},
+                {"x": 5.5, "y": 2.25},
+                {"x": 6.5, "y": 2.25},
+                {"x": 7.5, "y": 2.25},
+                {"x": 8.5, "y": 2.25},
+                {"x": 9.5, "y": 2.25},
+                {"x": 10.5, "y": 2.25},
+                {"x": 11.5, "y": 2.25},
+                {"x": 12.5, "y": 2.25},
+                {"x": 13.5, "y": 2.25, "w": 1.5},
+                {"x": 15.25, "y": 2.25},
+                {"x": 16.25, "y": 2.25},
+                {"x": 17.25, "y": 2.25},
+                {"x": 18.5, "y": 2.25},
+                {"x": 19.5, "y": 2.25},
+                {"x": 20.5, "y": 2.25},
+                {"x": 21.5, "y": 2.25, "h": 2},
+                {"x": 0, "y": 3.25, "w": 1.75},
+                {"x": 1.75, "y": 3.25},
+                {"x": 2.75, "y": 3.25},
+                {"x": 3.75, "y": 3.25},
+                {"x": 4.75, "y": 3.25},
+                {"x": 5.75, "y": 3.25},
+                {"x": 6.75, "y": 3.25},
+                {"x": 7.75, "y": 3.25},
+                {"x": 8.75, "y": 3.25},
+                {"x": 9.75, "y": 3.25},
+                {"x": 10.75, "y": 3.25},
+                {"x": 11.75, "y": 3.25},
+                {"x": 12.75, "y": 3.25, "w": 2.25},
+                {"x": 18.5, "y": 3.25},
+                {"x": 19.5, "y": 3.25},
+                {"x": 20.5, "y": 3.25},
+                {"x": 0, "y": 4.25, "w": 2.25},
+                {"x": 2.25, "y": 4.25},
+                {"x": 3.25, "y": 4.25},
+                {"x": 4.25, "y": 4.25},
+                {"x": 5.25, "y": 4.25},
+                {"x": 6.25, "y": 4.25},
+                {"x": 7.25, "y": 4.25},
+                {"x": 8.25, "y": 4.25},
+                {"x": 9.25, "y": 4.25},
+                {"x": 10.25, "y": 4.25},
+                {"x": 11.25, "y": 4.25},
+                {"x": 12.25, "y": 4.25, "w": 2.75},
+                {"x": 16.25, "y": 4.25},
+                {"x": 18.5, "y": 4.25},
+                {"x": 19.5, "y": 4.25},
+                {"x": 20.5, "y": 4.25},
+                {"x": 21.5, "y": 4.25, "h": 2},
+                {"x": 0, "y": 5.25, "w": 1.25},
+                {"x": 1.25, "y": 5.25, "w": 1.25},
+                {"x": 2.5, "y": 5.25, "w": 1.25},
+                {"x": 3.75, "y": 5.25, "w": 6.25},
+                {"x": 10, "y": 5.25, "w": 1.25},
+                {"x": 11.25, "y": 5.25, "w": 1.25},
+                {"x": 12.5, "y": 5.25, "w": 1.25},
+                {"x": 13.75, "y": 5.25, "w": 1.25},
+                {"x": 15.25, "y": 5.25},
+                {"x": 16.25, "y": 5.25},
+                {"x": 17.25, "y": 5.25},
+                {"x": 18.5, "y": 5.25, "w": 2},
+                {"x": 20.5, "y": 5.25}
+            ]
         }
     }
-}
\ No newline at end of file
+}
diff --git a/qmk/keyboards/handwired/hnah108/keymaps/default/keymap.c b/qmk/keyboards/handwired/hnah108/keymaps/default/keymap.c
index 6d8fe072..682ca081 100644
--- a/qmk/keyboards/handwired/hnah108/keymaps/default/keymap.c
+++ b/qmk/keyboards/handwired/hnah108/keymaps/default/keymap.c
@@ -13,67 +13,67 @@
  * 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
 
-enum hnah_layers{
-  _QWERTY,
-  _FN
+enum layer_names {
+    _QWERTY,
+    _FN
 };
 
 #define LOWER MO(_FN)
 #define RAISE MO(_QWERTY)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_QWERTY] = LAYOUT_all( /* 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_PSCR, KC_SLCK, KC_PAUS,    KC_MYCM, KC_CALC, KC_MPLY, LOWER,
-    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_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
-     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_SLSH,    KC_DEL,  KC_END,  KC_PGDN,    KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
-      KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,                                 KC_P4,   KC_P5,   KC_P6, 
-     KC_LSFT, KC_NUBS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_BSLS,   KC_RSFT,              KC_UP,               KC_P1,   KC_P2,    KC_P3,   KC_PENT,
-     KC_LCTL,  KC_LGUI,  KC_LALT,               KC_SPC,             KC_RALT,  KC_APP,  KC_RGUI, KC_RCTL,  KC_LEFT, KC_DOWN, KC_RGHT,        KC_P0,  KC_PDOT 
-  ),
+    [_QWERTY] = LAYOUT_all(
+        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_MYCM, KC_CALC, KC_MPLY, LOWER,
 
-  [_FN] = LAYOUT_all( /* Base */
-    RESET,       BL_STEP,RGB_TOG, RGB_MOD, RGB_RMOD,     RGB_HUI, RGB_HUD, RGB_VAI, RGB_VAD,     RGB_SPI, RGB_SPD, _______, _______,    _______, _______, _______,    _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU,   _______,     _______, _______, _______,    _______, _______, _______, _______,
-     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,    _______,   _______, _______, _______,    _______,   _______,   _______,   _______,
-      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                                   _______,   _______,   _______, 
-     _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        _______,                KC_BRIU,             _______,   _______,   _______,   _______,
-     _______,    _______,    _______,                      _______,                   _______,    _______,    _______,   _______,       _______, KC_BRID, _______,          _______,        _______ 
-  ),
+        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_NLCK, KC_PSLS, KC_PAST, KC_PMNS,
+        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_SLSH,   KC_DEL,  KC_END,  KC_PGDN,   KC_P7,   KC_P8,   KC_P9,   KC_PPLS,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_NUHS, KC_ENT,                                 KC_P4,   KC_P5,   KC_P6,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_BSLS,          KC_RSFT,            KC_UP,              KC_P1,   KC_P2,   KC_P3,   KC_PENT,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_APP,  KC_RGUI, KC_RCTL,   KC_LEFT, KC_DOWN, KC_RGHT,   KC_P0,            KC_PDOT
+    ),
+
+    [_FN] = LAYOUT_all(
+        RESET,            BL_STEP, RGB_TOG, RGB_MOD, RGB_RMOD,RGB_HUI, RGB_HUD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, _______, _______,   _______, _______, _______,   _______, _______, _______, _______,
+
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, KC_VOLU, _______,   _______, _______, _______,   _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,   _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                                _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,            KC_BRIU,            _______, _______, _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______,   _______, KC_BRID, _______,   _______,          _______
+    )
 };
 
 void encoder_update_user(uint8_t index, bool clockwise) {
-  if (index == 0) {
-    if (IS_LAYER_ON(_FN)) { 
-    if (clockwise) {
-            tap_code(KC_BRIU);
-    } else {
-            tap_code(KC_BRID);
+    if (index == 0) {
+        if (IS_LAYER_ON(_FN)) {
+            if (clockwise) {
+                tap_code(KC_BRIU);
+            } else {
+                tap_code(KC_BRID);
+            }
+        } else {
+            if (clockwise) {
+                tap_code(KC_VOLU);
+            } else {
+                tap_code(KC_VOLD);
+            }
+        }
     }
-  } else {
-    if (clockwise) {
-            tap_code(KC_VOLU);
-
-    } else {
-            tap_code(KC_VOLD);
-      }
-    }
-  }
 }
 
-void rgb_matrix_indicators_user(void)
-{
-        if IS_HOST_LED_ON(USB_LED_CAPS_LOCK)
-        {
-            rgb_matrix_set_color(30, 0x00, 0xFF, 0x00);
-        } else if IS_HOST_LED_ON(USB_LED_NUM_LOCK)
-        {
-            rgb_matrix_set_color(30, 0xFF, 0x00, 0x00);
-        } else if IS_HOST_LED_ON(USB_LED_SCROLL_LOCK)
-        {
-            rgb_matrix_set_color(30, 0x00, 0x00, 0xFF);
-        } else {
-            rgb_matrix_set_color(30, 0x00, 0x00, 0x00);
-        }
-}
\ No newline at end of file
+void rgb_matrix_indicators_user(void) {
+    led_t led_state = host_keyboard_led_state();
+
+    if (led_state.caps_lock) {
+        rgb_matrix_set_color(30, 0x00, 0xFF, 0x00);
+    } else if (led_state.num_lock) {
+        rgb_matrix_set_color(30, 0xFF, 0x00, 0x00);
+    } else if (led_state.scroll_lock) {
+        rgb_matrix_set_color(30, 0x00, 0x00, 0xFF);
+    } else {
+        rgb_matrix_set_color(30, 0x00, 0x00, 0x00);
+    }
+}
diff --git a/qmk/keyboards/handwired/hnah108/keymaps/default/readme.md b/qmk/keyboards/handwired/hnah108/keymaps/default/readme.md
index 37477efd..21d49073 100644
--- a/qmk/keyboards/handwired/hnah108/keymaps/default/readme.md
+++ b/qmk/keyboards/handwired/hnah108/keymaps/default/readme.md
@@ -1 +1 @@
-# The default keymap for hnah108
\ No newline at end of file
+# The default keymap for hnah108
diff --git a/qmk/keyboards/handwired/hnah108/readme.md b/qmk/keyboards/handwired/hnah108/readme.md
index d4cd6a18..47096ecd 100644
--- a/qmk/keyboards/handwired/hnah108/readme.md
+++ b/qmk/keyboards/handwired/hnah108/readme.md
@@ -1,14 +1,18 @@
 # hnah108
 
-![hnah108](https://i.imgur.com/rV0lM8M.jpg)  
+![hnah108](https://i.imgur.com/rV0lM8Ml.jpg)
 
-A Full size keyboard pcb with rotary encoder. Used ws2811 IC as a indicator LED driver 
+A full size keyboard pcb with rotary encoder. Uses WS2811 IC as an indicator LED driver.
 
-Keyboard Maintainer: [HnahKB](https://github.com/vuhopkep)  
-Hardware Supported: Hnah108 v1  
+* Keyboard Maintainer: [HnahKB](https://github.com/vuhopkep)
+* Hardware Supported: Hnah108 v1
 
 Make example for this keyboard (after setting up your build environment):
 
     make handwired/hnah108:default
 
+Flashing example for this keyboard:
+
+    make handwired/hnah108:default:flash
+
 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).
diff --git a/qmk/keyboards/handwired/hnah108/rules.mk b/qmk/keyboards/handwired/hnah108/rules.mk
index fa28a1cc..f0a39fae 100644
--- a/qmk/keyboards/handwired/hnah108/rules.mk
+++ b/qmk/keyboards/handwired/hnah108/rules.mk
@@ -2,33 +2,24 @@
 MCU = atmega32u4
 
 # Bootloader selection
-#   Teensy       halfkay
-#   Pro Micro    caterina
-#   Atmel DFU    atmel-dfu
-#   LUFA DFU     lufa-dfu
-#   QMK DFU      qmk-dfu
-#   ATmega32A    bootloadHID
-#   ATmega328P   USBasp
 BOOTLOADER = atmel-dfu
 
 # Build Options
 #   change yes to no to disable
 #
-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 = no        # Console for debug(+400)
-COMMAND_ENABLE = no        # Commands for debug and configuration
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # 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 = yes       # Enable keyboard backlight functionality
+BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 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
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
-RGB_MATRIX_ENABLE = WS2812
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = WS2812
diff --git a/qmk/keyboards/handwired/hnah40rgb/rules.mk b/qmk/keyboards/handwired/hnah40rgb/rules.mk
index 658a74d1..d4586014 100644
--- a/qmk/keyboards/handwired/hnah40rgb/rules.mk
+++ b/qmk/keyboards/handwired/hnah40rgb/rules.mk
@@ -29,4 +29,5 @@ 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
-RGB_MATRIX_ENABLE = WS2812
\ No newline at end of file
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = WS2812
\ No newline at end of file
diff --git a/qmk/keyboards/handwired/onekey/blackpill_f401/blackpill_f401.c b/qmk/keyboards/handwired/onekey/blackpill_f401/blackpill_f401.c
new file mode 100644
index 00000000..95693232
--- /dev/null
+++ b/qmk/keyboards/handwired/onekey/blackpill_f401/blackpill_f401.c
@@ -0,0 +1,23 @@
+/* Copyright 2020 Sergey Vlasov (sigprof)
+ *
+ * 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
+
+void board_init(void) {
+    // B9 is configured as I2C1_SDA in the board file; that function must be
+    // disabled before using B7 as I2C1_SDA.
+    setPinInputHigh(B9);
+}
diff --git a/qmk/keyboards/handwired/owlet60/info.json b/qmk/keyboards/handwired/owlet60/info.json
index 6e5345c3..7163bd45 100644
--- a/qmk/keyboards/handwired/owlet60/info.json
+++ b/qmk/keyboards/handwired/owlet60/info.json
@@ -13,11 +13,11 @@
             "key_count": 72,
             "layout": [{"label":"F1", "x":0.5, "y":0}, {"label":"~", "x":1.75, "y":0}, {"label":"!", "x":2.75, "y":0}, {"label":"@", "x":3.75, "y":0}, {"label":"#", "x":4.75, "y":0}, {"label":"$", "x":5.75, "y":0}, {"label":"%", "x":6.75, "y":0}, {"label":"^", "x":7.75, "y":0}, {"label":"&", "x":9.25, "y":0}, {"label":"*", "x":10.25, "y":0}, {"label":"(", "x":11.25, "y":0}, {"label":")", "x":12.25, "y":0}, {"label":"_", "x":13.25, "y":0}, {"label":"+", "x":14.25, "y":0}, {"label":"Bsp", "x":15.25, "y":0}, {"label":"Del", "x":16.25, "y":0}, {"label":"PgUp", "x":17.25, "y":0}, {"label":"F2", "x":0.25, "y":1}, {"label":"Tab", "x":1.5, "y":1, "w":1.5}, {"label":"Q", "x":3, "y":1}, {"label":"W", "x":4, "y":1}, {"label":"E", "x":5, "y":1}, {"label":"R", "x":6, "y":1}, {"label":"T", "x":7, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15, "y":1}, {"label":"|", "x":16, "y":1, "w":1.5}, {"label":"PgDn", "x":17.5, "y":1}, {"label":"F3", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":9.5, "y":2}, {"label":"J", "x":10.5, "y":2}, {"label":"K", "x":11.5, "y":2}, {"label":"L", "x":12.5, "y":2}, {"label":":", "x":13.5, "y":2}, {"label":"\"", "x":14.5, "y":2}, {"label":"Enter", "x":15.5, "y":2, "w":2.25}, {"label":"Home", "x":17.75, "y":2}, {"label":"Shift", "x":1, "y":3, "w":2.25}, {"label":"Z", "x":3.25, "y":3}, {"label":"X", "x":4.25, "y":3}, {"label":"C", "x":5.25, "y":3}, {"label":"V", "x":6.25, "y":3}, {"label":"B", "x":7.25, "y":3}, {"label":"B", "x":9.25, "y":3}, {"label":"N", "x":10.25, "y":3}, {"label":"M", "x":11.25, "y":3}, {"label":"<", "x":12.25, "y":3}, {"label":">", "x":13.25, "y":3}, {"label":"?", "x":14.25, "y":3}, {"label":"Shift", "x":15.25, "y":3, "w":1.75}, {"label":"Up", "x":17, "y":3}, {"label":"End", "x":18, "y":3}, {"label":"Ctrl", "x":1, "y":4, "w":1.5}, {"label":"Alt", "x":3.5, "y":4, "w":1.5}, {"x":5, "y":4, "w":2.25}, {"label":"Super", "x":7.25, "y":4, "w":1.25}, {"x":9.25, "y":4, "w":2}, {"label":"Alt", "x":11.25, "y":4, "w":1.5}, {"label":"Left", "x":16, "y":4}, {"label":"Down", "x":17, "y":4}, {"label":"Right", "x":18, "y":4}]
         },
-        "LAYOUT_owlet60_60_percent_split_bsp": {
+        "LAYOUT_alice_split_bs": {
             "key_count": 66,
             "layout": [{"label":"F1", "x":0.5, "y":0}, {"label":"~", "x":1.75, "y":0}, {"label":"!", "x":2.75, "y":0}, {"label":"@", "x":3.75, "y":0}, {"label":"#", "x":4.75, "y":0}, {"label":"$", "x":5.75, "y":0}, {"label":"%", "x":6.75, "y":0}, {"label":"^", "x":7.75, "y":0}, {"label":"&", "x":9.25, "y":0}, {"label":"*", "x":10.25, "y":0}, {"label":"(", "x":11.25, "y":0}, {"label":")", "x":12.25, "y":0}, {"label":"_", "x":13.25, "y":0}, {"label":"+", "x":14.25, "y":0}, {"label":"Bsp", "x":15.25, "y":0}, {"label":"Del", "x":16.25, "y":0}, {"label":"F2", "x":0.25, "y":1}, {"label":"Tab", "x":1.5, "y":1, "w":1.5}, {"label":"Q", "x":3, "y":1}, {"label":"W", "x":4, "y":1}, {"label":"E", "x":5, "y":1}, {"label":"R", "x":6, "y":1}, {"label":"T", "x":7, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15, "y":1}, {"label":"|", "x":16, "y":1, "w":1.5}, {"label":"F3", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":9.5, "y":2}, {"label":"J", "x":10.5, "y":2}, {"label":"K", "x":11.5, "y":2}, {"label":"L", "x":12.5, "y":2}, {"label":":", "x":13.5, "y":2}, {"label":"\"", "x":14.5, "y":2}, {"label":"Enter", "x":15.5, "y":2, "w":2.25}, {"label":"Shift", "x":1, "y":3, "w":2.25}, {"label":"Z", "x":3.25, "y":3}, {"label":"X", "x":4.25, "y":3}, {"label":"C", "x":5.25, "y":3}, {"label":"V", "x":6.25, "y":3}, {"label":"B", "x":7.25, "y":3}, {"label":"B", "x":9.25, "y":3}, {"label":"N", "x":10.25, "y":3}, {"label":"M", "x":11.25, "y":3}, {"label":"<", "x":12.25, "y":3}, {"label":">", "x":13.25, "y":3}, {"label":"?", "x":14.25, "y":3}, {"label":"Shift", "x":15.25, "y":3, "w":1.75}, {"label":"Up", "x":17, "y":3}, {"label":"Ctrl", "x":1, "y":4, "w":1.5}, {"label":"Alt", "x":3.5, "y":4, "w":1.5}, {"x":5, "y":4, "w":2.25}, {"label":"Super", "x":7.25, "y":4, "w":1.25}, {"x":9.25, "y":4, "w":2}, {"label":"Alt", "x":11.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":16.25, "y":4, "w":1.5}]
         },
-        "LAYOUT_owlet60_60_percent_full_bsp": {
+        "LAYOUT_alice": {
             "key_count": 65,
             "layout": [{"label":"F1", "x":0.5, "y":0}, {"label":"~", "x":1.75, "y":0}, {"label":"!", "x":2.75, "y":0}, {"label":"@", "x":3.75, "y":0}, {"label":"#", "x":4.75, "y":0}, {"label":"$", "x":5.75, "y":0}, {"label":"%", "x":6.75, "y":0}, {"label":"^", "x":7.75, "y":0}, {"label":"&", "x":9.25, "y":0}, {"label":"*", "x":10.25, "y":0}, {"label":"(", "x":11.25, "y":0}, {"label":")", "x":12.25, "y":0}, {"label":"_", "x":13.25, "y":0}, {"label":"+", "x":14.25, "y":0}, {"label":"Bsp", "x":15.25, "y":0, "w":2}, {"label":"F2", "x":0.25, "y":1}, {"label":"Tab", "x":1.5, "y":1, "w":1.5}, {"label":"Q", "x":3, "y":1}, {"label":"W", "x":4, "y":1}, {"label":"E", "x":5, "y":1}, {"label":"R", "x":6, "y":1}, {"label":"T", "x":7, "y":1}, {"label":"Y", "x":9, "y":1}, {"label":"U", "x":10, "y":1}, {"label":"I", "x":11, "y":1}, {"label":"O", "x":12, "y":1}, {"label":"P", "x":13, "y":1}, {"label":"{", "x":14, "y":1}, {"label":"}", "x":15, "y":1}, {"label":"|", "x":16, "y":1, "w":1.5}, {"label":"F3", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":9.5, "y":2}, {"label":"J", "x":10.5, "y":2}, {"label":"K", "x":11.5, "y":2}, {"label":"L", "x":12.5, "y":2}, {"label":":", "x":13.5, "y":2}, {"label":"\"", "x":14.5, "y":2}, {"label":"Enter", "x":15.5, "y":2, "w":2.25}, {"label":"Shift", "x":1, "y":3, "w":2.25}, {"label":"Z", "x":3.25, "y":3}, {"label":"X", "x":4.25, "y":3}, {"label":"C", "x":5.25, "y":3}, {"label":"V", "x":6.25, "y":3}, {"label":"B", "x":7.25, "y":3}, {"label":"B", "x":9.25, "y":3}, {"label":"N", "x":10.25, "y":3}, {"label":"M", "x":11.25, "y":3}, {"label":"<", "x":12.25, "y":3}, {"label":">", "x":13.25, "y":3}, {"label":"?", "x":14.25, "y":3}, {"label":"Shift", "x":15.25, "y":3, "w":1.75}, {"label":"Up", "x":17, "y":3}, {"label":"Ctrl", "x":1, "y":4, "w":1.5}, {"label":"Alt", "x":3.5, "y":4, "w":1.5}, {"x":5, "y":4, "w":2.25}, {"label":"Super", "x":7.25, "y":4, "w":1.25}, {"x":9.25, "y":4, "w":2}, {"label":"Alt", "x":11.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":16.25, "y":4, "w":1.5}]
         }
diff --git a/qmk/keyboards/handwired/owlet60/owlet60.h b/qmk/keyboards/handwired/owlet60/owlet60.h
index f17f40fd..b54c3df0 100644
--- a/qmk/keyboards/handwired/owlet60/owlet60.h
+++ b/qmk/keyboards/handwired/owlet60/owlet60.h
@@ -61,7 +61,7 @@
     { k01, k03, k05, k06, k09, k0b, k0d, KC_NO} \
 }
 
-#define LAYOUT_owlet60_60_percent_split_bsp( \
+#define LAYOUT_alice_split_bs( \
     k50, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
     k51, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,      \
     k52, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c,           \
@@ -79,7 +79,7 @@
     { k01, k03, k05, k06, k09, k0b, k0d, k0e} \
 }
 
-#define LAYOUT_owlet60_60_percent_full_bsp( \
+#define LAYOUT_alice( \
     k50, k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d,  \
     k51, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,  \
     k52, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c,       \
@@ -96,3 +96,6 @@
     { k00, k02, k04, k16, k08, k0a, k0c, KC_NO}, \
     { k01, k03, k05, k06, k09, k0b, k0d, KC_NO} \
 }
+
+#define LAYOUT_owlet60_60_percent_split_bsp LAYOUT_alice_split_bs
+#define LAYOUT_owlet60_60_percent_full_bsp LAYOUT_alice
diff --git a/qmk/keyboards/handwired/owlet60/rules.mk b/qmk/keyboards/handwired/owlet60/rules.mk
index c3c94c91..126ec896 100644
--- a/qmk/keyboards/handwired/owlet60/rules.mk
+++ b/qmk/keyboards/handwired/owlet60/rules.mk
@@ -33,4 +33,6 @@ FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches
 CUSTOM_MATRIX = yes
 OLED_DRIVER_ENABLE = no
 
-SRC += matrix.c
\ No newline at end of file
+SRC += matrix.c
+
+LAYOUTS = alice alice_split_bs
diff --git a/qmk/keyboards/handwired/p65rgb/rules.mk b/qmk/keyboards/handwired/p65rgb/rules.mk
index 5eeaf976..f70d945c 100644
--- a/qmk/keyboards/handwired/p65rgb/rules.mk
+++ b/qmk/keyboards/handwired/p65rgb/rules.mk
@@ -25,7 +25,8 @@ SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 NKRO_ENABLE = yes           # USB Nkey Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-RGB_MATRIX_ENABLE = WS2812  # Enable keyboard RGB backlight functionality with ws2812 driver
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = WS2812
 MIDI_ENABLE = no            # MIDI support
 BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 AUDIO_ENABLE = no           # Audio output on port C6
diff --git a/qmk/keyboards/handwired/pill60/blackpill_f401/config.h b/qmk/keyboards/handwired/pill60/blackpill_f401/config.h
new file mode 100644
index 00000000..d56ba94e
--- /dev/null
+++ b/qmk/keyboards/handwired/pill60/blackpill_f401/config.h
@@ -0,0 +1,24 @@
+/* Copyright 2019
+ *
+ * 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
+
+#define MATRIX_COL_PINS \
+    { A8, B2, B1, B15, A10, A0, A1, A2, A3, A4, A5, A6, A7, B0 }
+#define MATRIX_ROW_PINS \
+    { B4, B3, A15, B13, B5 }
+#define UNUSED_PINS \
+    { A9, A11, A12, C13, C14, C15, B10 }
diff --git a/qmk/keyboards/handwired/pill60/blackpill_f401/halconf.h b/qmk/keyboards/handwired/pill60/blackpill_f401/halconf.h
new file mode 100644
index 00000000..f1230634
--- /dev/null
+++ b/qmk/keyboards/handwired/pill60/blackpill_f401/halconf.h
@@ -0,0 +1,21 @@
+/* Copyright 2020 Nick Brassel (tzarc)
+ *
+ *  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 3 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 <https://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#define HAL_USE_I2C TRUE
+#define HAL_USE_PWM TRUE
+
+#include_next "halconf.h"
\ No newline at end of file
diff --git a/qmk/keyboards/handwired/pill60/blackpill_f401/mcuconf.h b/qmk/keyboards/handwired/pill60/blackpill_f401/mcuconf.h
new file mode 100644
index 00000000..a8b0a566
--- /dev/null
+++ b/qmk/keyboards/handwired/pill60/blackpill_f401/mcuconf.h
@@ -0,0 +1,24 @@
+/* Copyright 2020 Nick Brassel (tzarc)
+ *
+ *  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 3 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 <https://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include_next "mcuconf.h"
+
+#undef STM32_I2C_USE_I2C1
+#define STM32_I2C_USE_I2C1 TRUE
+
+#undef STM32_PWM_USE_TIM5
+#define STM32_PWM_USE_TIM5 TRUE
\ No newline at end of file
diff --git a/qmk/keyboards/handwired/pill60/blackpill_f401/rules.mk b/qmk/keyboards/handwired/pill60/blackpill_f401/rules.mk
new file mode 100644
index 00000000..8c514309
--- /dev/null
+++ b/qmk/keyboards/handwired/pill60/blackpill_f401/rules.mk
@@ -0,0 +1,14 @@
+# MCU name
+MCU = STM32F401
+
+# Address of the bootloader in system memory
+STM32_BOOTLOADER_ADDRESS = 0x1FFF0000
+
+# Options to pass to dfu-util when flashing
+DFU_ARGS = -d 0483:DF11 -a 0 -s 0x08000000:leave
+DFU_SUFFIX_ARGS = -v 0483 -p DF11
+
+# Build Options
+#   change yes to no to disable
+#
+KEYBOARD_SHARED_EP       = yes
diff --git a/qmk/keyboards/handwired/pill60/blackpill_f411/config.h b/qmk/keyboards/handwired/pill60/blackpill_f411/config.h
new file mode 100644
index 00000000..b106c2d2
--- /dev/null
+++ b/qmk/keyboards/handwired/pill60/blackpill_f411/config.h
@@ -0,0 +1,25 @@
+/* Copyright 2019
+ *
+ * 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
+
+#define MATRIX_COL_PINS \
+    { A8, B2, B1, B15, A10, A0, A1, A2, A3, A4, A5, A6, A7, B0 }
+#define MATRIX_ROW_PINS \
+    { B4, B3, A15, B13, B5 }
+#define UNUSED_PINS \
+    { A9, A11, A12, C13, C14, C15, B10 }
+
diff --git a/qmk/keyboards/handwired/pill60/blackpill_f411/halconf.h b/qmk/keyboards/handwired/pill60/blackpill_f411/halconf.h
new file mode 100644
index 00000000..f1230634
--- /dev/null
+++ b/qmk/keyboards/handwired/pill60/blackpill_f411/halconf.h
@@ -0,0 +1,21 @@
+/* Copyright 2020 Nick Brassel (tzarc)
+ *
+ *  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 3 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 <https://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#define HAL_USE_I2C TRUE
+#define HAL_USE_PWM TRUE
+
+#include_next "halconf.h"
\ No newline at end of file
diff --git a/qmk/keyboards/handwired/pill60/blackpill_f411/mcuconf.h b/qmk/keyboards/handwired/pill60/blackpill_f411/mcuconf.h
new file mode 100644
index 00000000..a8b0a566
--- /dev/null
+++ b/qmk/keyboards/handwired/pill60/blackpill_f411/mcuconf.h
@@ -0,0 +1,24 @@
+/* Copyright 2020 Nick Brassel (tzarc)
+ *
+ *  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 3 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 <https://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include_next "mcuconf.h"
+
+#undef STM32_I2C_USE_I2C1
+#define STM32_I2C_USE_I2C1 TRUE
+
+#undef STM32_PWM_USE_TIM5
+#define STM32_PWM_USE_TIM5 TRUE
\ No newline at end of file
diff --git a/qmk/keyboards/handwired/pill60/blackpill_f411/rules.mk b/qmk/keyboards/handwired/pill60/blackpill_f411/rules.mk
new file mode 100644
index 00000000..84dd584e
--- /dev/null
+++ b/qmk/keyboards/handwired/pill60/blackpill_f411/rules.mk
@@ -0,0 +1,14 @@
+# MCU name
+MCU = STM32F411
+
+# Address of the bootloader in system memory
+STM32_BOOTLOADER_ADDRESS = 0x1FFF0000
+
+# Options to pass to dfu-util when flashing
+DFU_ARGS = -d 0483:DF11 -a 0 -s 0x08000000:leave
+DFU_SUFFIX_ARGS = -v 0483 -p DF11
+
+# Build Options
+#   change yes to no to disable
+#
+KEYBOARD_SHARED_EP = yes
diff --git a/qmk/keyboards/handwired/pill60/bluepill/chconf.h b/qmk/keyboards/handwired/pill60/bluepill/chconf.h
new file mode 100644
index 00000000..d8442f1b
--- /dev/null
+++ b/qmk/keyboards/handwired/pill60/bluepill/chconf.h
@@ -0,0 +1,711 @@
+/*
+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+        http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+/**
+ * @file    rt/templates/chconf.h
+ * @brief   Configuration file template.
+ * @details A copy of this file must be placed in each project directory, it
+ *          contains the application specific kernel settings.
+ *
+ * @addtogroup config
+ * @details Kernel related settings and hooks.
+ * @{
+ */
+
+#ifndef CHCONF_H
+#define CHCONF_H
+
+#define _CHIBIOS_RT_CONF_
+#define _CHIBIOS_RT_CONF_VER_6_0_
+
+/*===========================================================================*/
+/**
+ * @name System timers settings
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   System time counter resolution.
+ * @note    Allowed values are 16 or 32 bits.
+ */
+#if !defined(CH_CFG_ST_RESOLUTION)
+#define CH_CFG_ST_RESOLUTION                32
+#endif
+
+/**
+ * @brief   System tick frequency.
+ * @details Frequency of the system timer that drives the system ticks. This
+ *          setting also defines the system tick time unit.
+ */
+#if !defined(CH_CFG_ST_FREQUENCY)
+#define CH_CFG_ST_FREQUENCY                 100000
+#endif
+
+/**
+ * @brief   Time intervals data size.
+ * @note    Allowed values are 16, 32 or 64 bits.
+ */
+#if !defined(CH_CFG_INTERVALS_SIZE)
+#define CH_CFG_INTERVALS_SIZE               32
+#endif
+
+/**
+ * @brief   Time types data size.
+ * @note    Allowed values are 16 or 32 bits.
+ */
+#if !defined(CH_CFG_TIME_TYPES_SIZE)
+#define CH_CFG_TIME_TYPES_SIZE              32
+#endif
+
+/**
+ * @brief   Time delta constant for the tick-less mode.
+ * @note    If this value is zero then the system uses the classic
+ *          periodic tick. This value represents the minimum number
+ *          of ticks that is safe to specify in a timeout directive.
+ *          The value one is not valid, timeouts are rounded up to
+ *          this value.
+ */
+#if !defined(CH_CFG_ST_TIMEDELTA)
+#define CH_CFG_ST_TIMEDELTA                 0
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Kernel parameters and options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   Round robin interval.
+ * @details This constant is the number of system ticks allowed for the
+ *          threads before preemption occurs. Setting this value to zero
+ *          disables the preemption for threads with equal priority and the
+ *          round robin becomes cooperative. Note that higher priority
+ *          threads can still preempt, the kernel is always preemptive.
+ * @note    Disabling the round robin preemption makes the kernel more compact
+ *          and generally faster.
+ * @note    The round robin preemption is not supported in tickless mode and
+ *          must be set to zero in that case.
+ */
+#if !defined(CH_CFG_TIME_QUANTUM)
+#define CH_CFG_TIME_QUANTUM                 0
+#endif
+
+/**
+ * @brief   Managed RAM size.
+ * @details Size of the RAM area to be managed by the OS. If set to zero
+ *          then the whole available RAM is used. The core memory is made
+ *          available to the heap allocator and/or can be used directly through
+ *          the simplified core memory allocator.
+ *
+ * @note    In order to let the OS manage the whole RAM the linker script must
+ *          provide the @p __heap_base__ and @p __heap_end__ symbols.
+ * @note    Requires @p CH_CFG_USE_MEMCORE.
+ */
+#if !defined(CH_CFG_MEMCORE_SIZE)
+#define CH_CFG_MEMCORE_SIZE                 0
+#endif
+
+/**
+ * @brief   Idle thread automatic spawn suppression.
+ * @details When this option is activated the function @p chSysInit()
+ *          does not spawn the idle thread. The application @p main()
+ *          function becomes the idle thread and must implement an
+ *          infinite loop.
+ */
+#if !defined(CH_CFG_NO_IDLE_THREAD)
+#define CH_CFG_NO_IDLE_THREAD               FALSE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Performance options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   OS optimization.
+ * @details If enabled then time efficient rather than space efficient code
+ *          is used when two possible implementations exist.
+ *
+ * @note    This is not related to the compiler optimization options.
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_OPTIMIZE_SPEED)
+#define CH_CFG_OPTIMIZE_SPEED               TRUE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Subsystem options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   Time Measurement APIs.
+ * @details If enabled then the time measurement APIs are included in
+ *          the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_TM)
+#define CH_CFG_USE_TM                       FALSE
+#endif
+
+/**
+ * @brief   Threads registry APIs.
+ * @details If enabled then the registry APIs are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_REGISTRY)
+#define CH_CFG_USE_REGISTRY                 TRUE
+#endif
+
+/**
+ * @brief   Threads synchronization APIs.
+ * @details If enabled then the @p chThdWait() function is included in
+ *          the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_WAITEXIT)
+#define CH_CFG_USE_WAITEXIT                 TRUE
+#endif
+
+/**
+ * @brief   Semaphores APIs.
+ * @details If enabled then the Semaphores APIs are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_SEMAPHORES)
+#define CH_CFG_USE_SEMAPHORES               TRUE
+#endif
+
+/**
+ * @brief   Semaphores queuing mode.
+ * @details If enabled then the threads are enqueued on semaphores by
+ *          priority rather than in FIFO order.
+ *
+ * @note    The default is @p FALSE. Enable this if you have special
+ *          requirements.
+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.
+ */
+#if !defined(CH_CFG_USE_SEMAPHORES_PRIORITY)
+#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE
+#endif
+
+/**
+ * @brief   Mutexes APIs.
+ * @details If enabled then the mutexes APIs are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_MUTEXES)
+#define CH_CFG_USE_MUTEXES                  TRUE
+#endif
+
+/**
+ * @brief   Enables recursive behavior on mutexes.
+ * @note    Recursive mutexes are heavier and have an increased
+ *          memory footprint.
+ *
+ * @note    The default is @p FALSE.
+ * @note    Requires @p CH_CFG_USE_MUTEXES.
+ */
+#if !defined(CH_CFG_USE_MUTEXES_RECURSIVE)
+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE
+#endif
+
+/**
+ * @brief   Conditional Variables APIs.
+ * @details If enabled then the conditional variables APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_MUTEXES.
+ */
+#if !defined(CH_CFG_USE_CONDVARS)
+#define CH_CFG_USE_CONDVARS                 TRUE
+#endif
+
+/**
+ * @brief   Conditional Variables APIs with timeout.
+ * @details If enabled then the conditional variables APIs with timeout
+ *          specification are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_CONDVARS.
+ */
+#if !defined(CH_CFG_USE_CONDVARS_TIMEOUT)
+#define CH_CFG_USE_CONDVARS_TIMEOUT         FALSE
+#endif
+
+/**
+ * @brief   Events Flags APIs.
+ * @details If enabled then the event flags APIs are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_EVENTS)
+#define CH_CFG_USE_EVENTS                   TRUE
+#endif
+
+/**
+ * @brief   Events Flags APIs with timeout.
+ * @details If enabled then the events APIs with timeout specification
+ *          are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_EVENTS.
+ */
+#if !defined(CH_CFG_USE_EVENTS_TIMEOUT)
+#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE
+#endif
+
+/**
+ * @brief   Synchronous Messages APIs.
+ * @details If enabled then the synchronous messages APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_MESSAGES)
+#define CH_CFG_USE_MESSAGES                 TRUE
+#endif
+
+/**
+ * @brief   Synchronous Messages queuing mode.
+ * @details If enabled then messages are served by priority rather than in
+ *          FIFO order.
+ *
+ * @note    The default is @p FALSE. Enable this if you have special
+ *          requirements.
+ * @note    Requires @p CH_CFG_USE_MESSAGES.
+ */
+#if !defined(CH_CFG_USE_MESSAGES_PRIORITY)
+#define CH_CFG_USE_MESSAGES_PRIORITY        FALSE
+#endif
+
+/**
+ * @brief   Mailboxes APIs.
+ * @details If enabled then the asynchronous messages (mailboxes) APIs are
+ *          included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.
+ */
+#if !defined(CH_CFG_USE_MAILBOXES)
+#define CH_CFG_USE_MAILBOXES                TRUE
+#endif
+
+/**
+ * @brief   Core Memory Manager APIs.
+ * @details If enabled then the core memory manager APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_MEMCORE)
+#define CH_CFG_USE_MEMCORE                  TRUE
+#endif
+
+/**
+ * @brief   Heap Allocator APIs.
+ * @details If enabled then the memory heap allocator APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_MEMCORE and either @p CH_CFG_USE_MUTEXES or
+ *          @p CH_CFG_USE_SEMAPHORES.
+ * @note    Mutexes are recommended.
+ */
+#if !defined(CH_CFG_USE_HEAP)
+#define CH_CFG_USE_HEAP                     TRUE
+#endif
+
+/**
+ * @brief   Memory Pools Allocator APIs.
+ * @details If enabled then the memory pools allocator APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_MEMPOOLS)
+#define CH_CFG_USE_MEMPOOLS                 FALSE
+#endif
+
+/**
+ * @brief   Objects FIFOs APIs.
+ * @details If enabled then the objects FIFOs APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_OBJ_FIFOS)
+#define CH_CFG_USE_OBJ_FIFOS                FALSE
+#endif
+
+/**
+ * @brief   Pipes APIs.
+ * @details If enabled then the pipes APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_PIPES)
+#define CH_CFG_USE_PIPES                    FALSE
+#endif
+
+/**
+ * @brief   Dynamic Threads APIs.
+ * @details If enabled then the dynamic threads creation APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_WAITEXIT.
+ * @note    Requires @p CH_CFG_USE_HEAP and/or @p CH_CFG_USE_MEMPOOLS.
+ */
+#if !defined(CH_CFG_USE_DYNAMIC)
+#define CH_CFG_USE_DYNAMIC                  FALSE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Objects factory options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   Objects Factory APIs.
+ * @details If enabled then the objects factory APIs are included in the
+ *          kernel.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_CFG_USE_FACTORY)
+#define CH_CFG_USE_FACTORY                  FALSE
+#endif
+
+/**
+ * @brief   Maximum length for object names.
+ * @details If the specified length is zero then the name is stored by
+ *          pointer but this could have unintended side effects.
+ */
+#if !defined(CH_CFG_FACTORY_MAX_NAMES_LENGTH)
+#define CH_CFG_FACTORY_MAX_NAMES_LENGTH     8
+#endif
+
+/**
+ * @brief   Enables the registry of generic objects.
+ */
+#if !defined(CH_CFG_FACTORY_OBJECTS_REGISTRY)
+#define CH_CFG_FACTORY_OBJECTS_REGISTRY     FALSE
+#endif
+
+/**
+ * @brief   Enables factory for generic buffers.
+ */
+#if !defined(CH_CFG_FACTORY_GENERIC_BUFFERS)
+#define CH_CFG_FACTORY_GENERIC_BUFFERS      FALSE
+#endif
+
+/**
+ * @brief   Enables factory for semaphores.
+ */
+#if !defined(CH_CFG_FACTORY_SEMAPHORES)
+#define CH_CFG_FACTORY_SEMAPHORES           FALSE
+#endif
+
+/**
+ * @brief   Enables factory for mailboxes.
+ */
+#if !defined(CH_CFG_FACTORY_MAILBOXES)
+#define CH_CFG_FACTORY_MAILBOXES            FALSE
+#endif
+
+/**
+ * @brief   Enables factory for objects FIFOs.
+ */
+#if !defined(CH_CFG_FACTORY_OBJ_FIFOS)
+#define CH_CFG_FACTORY_OBJ_FIFOS            FALSE
+#endif
+
+/**
+ * @brief   Enables factory for Pipes.
+ */
+#if !defined(CH_CFG_FACTORY_PIPES) || defined(__DOXYGEN__)
+#define CH_CFG_FACTORY_PIPES                FALSE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Debug options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   Debug option, kernel statistics.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_STATISTICS)
+#define CH_DBG_STATISTICS                   FALSE
+#endif
+
+/**
+ * @brief   Debug option, system state check.
+ * @details If enabled the correct call protocol for system APIs is checked
+ *          at runtime.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_SYSTEM_STATE_CHECK)
+#define CH_DBG_SYSTEM_STATE_CHECK           FALSE
+#endif
+
+/**
+ * @brief   Debug option, parameters checks.
+ * @details If enabled then the checks on the API functions input
+ *          parameters are activated.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_ENABLE_CHECKS)
+#define CH_DBG_ENABLE_CHECKS                FALSE
+#endif
+
+/**
+ * @brief   Debug option, consistency checks.
+ * @details If enabled then all the assertions in the kernel code are
+ *          activated. This includes consistency checks inside the kernel,
+ *          runtime anomalies and port-defined checks.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_ENABLE_ASSERTS)
+#define CH_DBG_ENABLE_ASSERTS               FALSE
+#endif
+
+/**
+ * @brief   Debug option, trace buffer.
+ * @details If enabled then the trace buffer is activated.
+ *
+ * @note    The default is @p CH_DBG_TRACE_MASK_DISABLED.
+ */
+#if !defined(CH_DBG_TRACE_MASK)
+#define CH_DBG_TRACE_MASK                   CH_DBG_TRACE_MASK_DISABLED
+#endif
+
+/**
+ * @brief   Trace buffer entries.
+ * @note    The trace buffer is only allocated if @p CH_DBG_TRACE_MASK is
+ *          different from @p CH_DBG_TRACE_MASK_DISABLED.
+ */
+#if !defined(CH_DBG_TRACE_BUFFER_SIZE)
+#define CH_DBG_TRACE_BUFFER_SIZE            128
+#endif
+
+/**
+ * @brief   Debug option, stack checks.
+ * @details If enabled then a runtime stack check is performed.
+ *
+ * @note    The default is @p FALSE.
+ * @note    The stack check is performed in a architecture/port dependent way.
+ *          It may not be implemented or some ports.
+ * @note    The default failure mode is to halt the system with the global
+ *          @p panic_msg variable set to @p NULL.
+ */
+#if !defined(CH_DBG_ENABLE_STACK_CHECK)
+#define CH_DBG_ENABLE_STACK_CHECK           FALSE
+#endif
+
+/**
+ * @brief   Debug option, stacks initialization.
+ * @details If enabled then the threads working area is filled with a byte
+ *          value when a thread is created. This can be useful for the
+ *          runtime measurement of the used stack.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_FILL_THREADS)
+#define CH_DBG_FILL_THREADS                 FALSE
+#endif
+
+/**
+ * @brief   Debug option, threads profiling.
+ * @details If enabled then a field is added to the @p thread_t structure that
+ *          counts the system ticks occurred while executing the thread.
+ *
+ * @note    The default is @p FALSE.
+ * @note    This debug option is not currently compatible with the
+ *          tickless mode.
+ */
+#if !defined(CH_DBG_THREADS_PROFILING)
+#define CH_DBG_THREADS_PROFILING            FALSE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Kernel hooks
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   System structure extension.
+ * @details User fields added to the end of the @p ch_system_t structure.
+ */
+#define CH_CFG_SYSTEM_EXTRA_FIELDS                                          \
+  /* Add threads custom fields here.*/
+
+/**
+ * @brief   System initialization hook.
+ * @details User initialization code added to the @p chSysInit() function
+ *          just before interrupts are enabled globally.
+ */
+#define CH_CFG_SYSTEM_INIT_HOOK() {                                         \
+  /* Add threads initialization code here.*/                                \
+}
+
+/**
+ * @brief   Threads descriptor structure extension.
+ * @details User fields added to the end of the @p thread_t structure.
+ */
+#define CH_CFG_THREAD_EXTRA_FIELDS                                          \
+  /* Add threads custom fields here.*/
+
+/**
+ * @brief   Threads initialization hook.
+ * @details User initialization code added to the @p _thread_init() function.
+ *
+ * @note    It is invoked from within @p _thread_init() and implicitly from all
+ *          the threads creation APIs.
+ */
+#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \
+  /* Add threads initialization code here.*/                                \
+}
+
+/**
+ * @brief   Threads finalization hook.
+ * @details User finalization code added to the @p chThdExit() API.
+ */
+#define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \
+  /* Add threads finalization code here.*/                                  \
+}
+
+/**
+ * @brief   Context switch hook.
+ * @details This hook is invoked just before switching between threads.
+ */
+#define CH_CFG_CONTEXT_SWITCH_HOOK(ntp, otp) {                              \
+  /* Context switch code here.*/                                            \
+}
+
+/**
+ * @brief   ISR enter hook.
+ */
+#define CH_CFG_IRQ_PROLOGUE_HOOK() {                                        \
+  /* IRQ prologue code here.*/                                              \
+}
+
+/**
+ * @brief   ISR exit hook.
+ */
+#define CH_CFG_IRQ_EPILOGUE_HOOK() {                                        \
+  /* IRQ epilogue code here.*/                                              \
+}
+
+/**
+ * @brief   Idle thread enter hook.
+ * @note    This hook is invoked within a critical zone, no OS functions
+ *          should be invoked from here.
+ * @note    This macro can be used to activate a power saving mode.
+ */
+#define CH_CFG_IDLE_ENTER_HOOK() {                                          \
+  /* Idle-enter code here.*/                                                \
+}
+
+/**
+ * @brief   Idle thread leave hook.
+ * @note    This hook is invoked within a critical zone, no OS functions
+ *          should be invoked from here.
+ * @note    This macro can be used to deactivate a power saving mode.
+ */
+#define CH_CFG_IDLE_LEAVE_HOOK() {                                          \
+  /* Idle-leave code here.*/                                                \
+}
+
+/**
+ * @brief   Idle Loop hook.
+ * @details This hook is continuously invoked by the idle thread loop.
+ */
+#define CH_CFG_IDLE_LOOP_HOOK() {                                           \
+  /* Idle loop code here.*/                                                 \
+}
+
+/**
+ * @brief   System tick event hook.
+ * @details This hook is invoked in the system tick handler immediately
+ *          after processing the virtual timers queue.
+ */
+#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \
+  /* System tick event code here.*/                                         \
+}
+
+/**
+ * @brief   System halt hook.
+ * @details This hook is invoked in case to a system halting error before
+ *          the system is halted.
+ */
+#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \
+  /* System halt code here.*/                                               \
+}
+
+/**
+ * @brief   Trace hook.
+ * @details This hook is invoked each time a new record is written in the
+ *          trace buffer.
+ */
+#define CH_CFG_TRACE_HOOK(tep) {                                            \
+  /* Trace code here.*/                                                     \
+}
+
+/** @} */
+
+/*===========================================================================*/
+/* Port-specific settings (override port settings defaulted in chcore.h).    */
+/*===========================================================================*/
+
+#endif  /* CHCONF_H */
+
+/** @} */
\ No newline at end of file
diff --git a/qmk/keyboards/handwired/pill60/bluepill/config.h b/qmk/keyboards/handwired/pill60/bluepill/config.h
new file mode 100644
index 00000000..f68f518b
--- /dev/null
+++ b/qmk/keyboards/handwired/pill60/bluepill/config.h
@@ -0,0 +1,24 @@
+/* Copyright 2019
+ *
+ * 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
+
+#define MATRIX_COL_PINS \
+    { A8, B11, B10, B15, A10, A1, A2, A3, A4, A5, A6, A7, B0, B1 }
+#define MATRIX_ROW_PINS \
+    { B4, B3, A15, B13, B5 }
+#define UNUSED_PINS \
+    { A0, A9, A11, A12, C13, C14, C15 }
diff --git a/qmk/keyboards/handwired/pill60/bluepill/halconf.h b/qmk/keyboards/handwired/pill60/bluepill/halconf.h
new file mode 100644
index 00000000..a4061667
--- /dev/null
+++ b/qmk/keyboards/handwired/pill60/bluepill/halconf.h
@@ -0,0 +1,525 @@
+/*
+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+/**
+ * @file    templates/halconf.h
+ * @brief   HAL configuration header.
+ * @details HAL configuration file, this file allows to enable or disable the
+ *          various device drivers from your application. You may also use
+ *          this file in order to override the device drivers default settings.
+ *
+ * @addtogroup HAL_CONF
+ * @{
+ */
+
+#ifndef HALCONF_H
+#define HALCONF_H
+
+#define _CHIBIOS_HAL_CONF_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
+
+#include "mcuconf.h"
+
+/**
+ * @brief   Enables the PAL subsystem.
+ */
+#if !defined(HAL_USE_PAL) || defined(__DOXYGEN__)
+#define HAL_USE_PAL                         TRUE
+#endif
+
+/**
+ * @brief   Enables the ADC subsystem.
+ */
+#if !defined(HAL_USE_ADC) || defined(__DOXYGEN__)
+#define HAL_USE_ADC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the CAN subsystem.
+ */
+#if !defined(HAL_USE_CAN) || defined(__DOXYGEN__)
+#define HAL_USE_CAN                         FALSE
+#endif
+
+/**
+ * @brief   Enables the cryptographic subsystem.
+ */
+#if !defined(HAL_USE_CRY) || defined(__DOXYGEN__)
+#define HAL_USE_CRY                         FALSE
+#endif
+
+/**
+ * @brief   Enables the DAC subsystem.
+ */
+#if !defined(HAL_USE_DAC) || defined(__DOXYGEN__)
+#define HAL_USE_DAC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the GPT subsystem.
+ */
+#if !defined(HAL_USE_GPT) || defined(__DOXYGEN__)
+#define HAL_USE_GPT                         FALSE
+#endif
+
+/**
+ * @brief   Enables the I2C subsystem.
+ */
+#if !defined(HAL_USE_I2C) || defined(__DOXYGEN__)
+#define HAL_USE_I2C                         TRUE
+#endif
+
+/**
+ * @brief   Enables the I2S subsystem.
+ */
+#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)
+#define HAL_USE_I2S                         FALSE
+#endif
+
+/**
+ * @brief   Enables the ICU subsystem.
+ */
+#if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)
+#define HAL_USE_ICU                         FALSE
+#endif
+
+/**
+ * @brief   Enables the MAC subsystem.
+ */
+#if !defined(HAL_USE_MAC) || defined(__DOXYGEN__)
+#define HAL_USE_MAC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the MMC_SPI subsystem.
+ */
+#if !defined(HAL_USE_MMC_SPI) || defined(__DOXYGEN__)
+#define HAL_USE_MMC_SPI                     FALSE
+#endif
+
+/**
+ * @brief   Enables the PWM subsystem.
+ */
+#if !defined(HAL_USE_PWM) || defined(__DOXYGEN__)
+#define HAL_USE_PWM                         TRUE
+#endif
+
+/**
+ * @brief   Enables the RTC subsystem.
+ */
+#if !defined(HAL_USE_RTC) || defined(__DOXYGEN__)
+#define HAL_USE_RTC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the SDC subsystem.
+ */
+#if !defined(HAL_USE_SDC) || defined(__DOXYGEN__)
+#define HAL_USE_SDC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the SERIAL subsystem.
+ */
+#if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__)
+#define HAL_USE_SERIAL                      FALSE
+#endif
+
+/**
+ * @brief   Enables the SERIAL over USB subsystem.
+ */
+#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)
+#define HAL_USE_SERIAL_USB                  FALSE
+#endif
+
+/**
+ * @brief   Enables the SIO subsystem.
+ */
+#if !defined(HAL_USE_SIO) || defined(__DOXYGEN__)
+#define HAL_USE_SIO                         FALSE
+#endif
+
+/**
+ * @brief   Enables the SPI subsystem.
+ */
+#if !defined(HAL_USE_SPI) || defined(__DOXYGEN__)
+#define HAL_USE_SPI                         FALSE
+#endif
+
+/**
+ * @brief   Enables the TRNG subsystem.
+ */
+#if !defined(HAL_USE_TRNG) || defined(__DOXYGEN__)
+#define HAL_USE_TRNG                        FALSE
+#endif
+
+/**
+ * @brief   Enables the UART subsystem.
+ */
+#if !defined(HAL_USE_UART) || defined(__DOXYGEN__)
+#define HAL_USE_UART                        FALSE
+#endif
+
+/**
+ * @brief   Enables the USB subsystem.
+ */
+#if !defined(HAL_USE_USB) || defined(__DOXYGEN__)
+#define HAL_USE_USB                         TRUE
+#endif
+
+/**
+ * @brief   Enables the WDG subsystem.
+ */
+#if !defined(HAL_USE_WDG) || defined(__DOXYGEN__)
+#define HAL_USE_WDG                         FALSE
+#endif
+
+/**
+ * @brief   Enables the WSPI subsystem.
+ */
+#if !defined(HAL_USE_WSPI) || defined(__DOXYGEN__)
+#define HAL_USE_WSPI                        FALSE
+#endif
+
+/*===========================================================================*/
+/* PAL driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(PAL_USE_CALLBACKS) || defined(__DOXYGEN__)
+#define PAL_USE_CALLBACKS                   FALSE
+#endif
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(PAL_USE_WAIT) || defined(__DOXYGEN__)
+#define PAL_USE_WAIT                        FALSE
+#endif
+
+/*===========================================================================*/
+/* ADC driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(ADC_USE_WAIT) || defined(__DOXYGEN__)
+#define ADC_USE_WAIT                        TRUE
+#endif
+
+/**
+ * @brief   Enables the @p adcAcquireBus() and @p adcReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(ADC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define ADC_USE_MUTUAL_EXCLUSION            TRUE
+#endif
+
+/*===========================================================================*/
+/* CAN driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Sleep mode related APIs inclusion switch.
+ */
+#if !defined(CAN_USE_SLEEP_MODE) || defined(__DOXYGEN__)
+#define CAN_USE_SLEEP_MODE                  TRUE
+#endif
+
+/**
+ * @brief   Enforces the driver to use direct callbacks rather than OSAL events.
+ */
+#if !defined(CAN_ENFORCE_USE_CALLBACKS) || defined(__DOXYGEN__)
+#define CAN_ENFORCE_USE_CALLBACKS           FALSE
+#endif
+
+/*===========================================================================*/
+/* CRY driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables the SW fall-back of the cryptographic driver.
+ * @details When enabled, this option, activates a fall-back software
+ *          implementation for algorithms not supported by the underlying
+ *          hardware.
+ * @note    Fall-back implementations may not be present for all algorithms.
+ */
+#if !defined(HAL_CRY_USE_FALLBACK) || defined(__DOXYGEN__)
+#define HAL_CRY_USE_FALLBACK                FALSE
+#endif
+
+/**
+ * @brief   Makes the driver forcibly use the fall-back implementations.
+ */
+#if !defined(HAL_CRY_ENFORCE_FALLBACK) || defined(__DOXYGEN__)
+#define HAL_CRY_ENFORCE_FALLBACK            FALSE
+#endif
+
+/*===========================================================================*/
+/* DAC driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(DAC_USE_WAIT) || defined(__DOXYGEN__)
+#define DAC_USE_WAIT                        TRUE
+#endif
+
+/**
+ * @brief   Enables the @p dacAcquireBus() and @p dacReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(DAC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define DAC_USE_MUTUAL_EXCLUSION            TRUE
+#endif
+
+/*===========================================================================*/
+/* I2C driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables the mutual exclusion APIs on the I2C bus.
+ */
+#if !defined(I2C_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define I2C_USE_MUTUAL_EXCLUSION            TRUE
+#endif
+
+/*===========================================================================*/
+/* MAC driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables the zero-copy API.
+ */
+#if !defined(MAC_USE_ZERO_COPY) || defined(__DOXYGEN__)
+#define MAC_USE_ZERO_COPY                   FALSE
+#endif
+
+/**
+ * @brief   Enables an event sources for incoming packets.
+ */
+#if !defined(MAC_USE_EVENTS) || defined(__DOXYGEN__)
+#define MAC_USE_EVENTS                      TRUE
+#endif
+
+/*===========================================================================*/
+/* MMC_SPI driver related settings.                                          */
+/*===========================================================================*/
+
+/**
+ * @brief   Delays insertions.
+ * @details If enabled this options inserts delays into the MMC waiting
+ *          routines releasing some extra CPU time for the threads with
+ *          lower priority, this may slow down the driver a bit however.
+ *          This option is recommended also if the SPI driver does not
+ *          use a DMA channel and heavily loads the CPU.
+ */
+#if !defined(MMC_NICE_WAITING) || defined(__DOXYGEN__)
+#define MMC_NICE_WAITING                    TRUE
+#endif
+
+/*===========================================================================*/
+/* SDC driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Number of initialization attempts before rejecting the card.
+ * @note    Attempts are performed at 10mS intervals.
+ */
+#if !defined(SDC_INIT_RETRY) || defined(__DOXYGEN__)
+#define SDC_INIT_RETRY                      100
+#endif
+
+/**
+ * @brief   Include support for MMC cards.
+ * @note    MMC support is not yet implemented so this option must be kept
+ *          at @p FALSE.
+ */
+#if !defined(SDC_MMC_SUPPORT) || defined(__DOXYGEN__)
+#define SDC_MMC_SUPPORT                     FALSE
+#endif
+
+/**
+ * @brief   Delays insertions.
+ * @details If enabled this options inserts delays into the MMC waiting
+ *          routines releasing some extra CPU time for the threads with
+ *          lower priority, this may slow down the driver a bit however.
+ */
+#if !defined(SDC_NICE_WAITING) || defined(__DOXYGEN__)
+#define SDC_NICE_WAITING                    TRUE
+#endif
+
+/**
+ * @brief   OCR initialization constant for V20 cards.
+ */
+#if !defined(SDC_INIT_OCR_V20) || defined(__DOXYGEN__)
+#define SDC_INIT_OCR_V20                    0x50FF8000U
+#endif
+
+/**
+ * @brief   OCR initialization constant for non-V20 cards.
+ */
+#if !defined(SDC_INIT_OCR) || defined(__DOXYGEN__)
+#define SDC_INIT_OCR                        0x80100000U
+#endif
+
+/*===========================================================================*/
+/* SERIAL driver related settings.                                           */
+/*===========================================================================*/
+
+/**
+ * @brief   Default bit rate.
+ * @details Configuration parameter, this is the baud rate selected for the
+ *          default configuration.
+ */
+#if !defined(SERIAL_DEFAULT_BITRATE) || defined(__DOXYGEN__)
+#define SERIAL_DEFAULT_BITRATE              38400
+#endif
+
+/**
+ * @brief   Serial buffers size.
+ * @details Configuration parameter, you can change the depth of the queue
+ *          buffers depending on the requirements of your application.
+ * @note    The default is 16 bytes for both the transmission and receive
+ *          buffers.
+ */
+#if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__)
+#define SERIAL_BUFFERS_SIZE                 16
+#endif
+
+/*===========================================================================*/
+/* SERIAL_USB driver related setting.                                        */
+/*===========================================================================*/
+
+/**
+ * @brief   Serial over USB buffers size.
+ * @details Configuration parameter, the buffer size must be a multiple of
+ *          the USB data endpoint maximum packet size.
+ * @note    The default is 256 bytes for both the transmission and receive
+ *          buffers.
+ */
+#if !defined(SERIAL_USB_BUFFERS_SIZE) || defined(__DOXYGEN__)
+#define SERIAL_USB_BUFFERS_SIZE             1
+#endif
+
+/**
+ * @brief   Serial over USB number of buffers.
+ * @note    The default is 2 buffers.
+ */
+#if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
+#define SERIAL_USB_BUFFERS_NUMBER           2
+#endif
+
+/*===========================================================================*/
+/* SPI driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(SPI_USE_WAIT) || defined(__DOXYGEN__)
+#define SPI_USE_WAIT                        TRUE
+#endif
+
+/**
+ * @brief   Enables circular transfers APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(SPI_USE_CIRCULAR) || defined(__DOXYGEN__)
+#define SPI_USE_CIRCULAR                    FALSE
+#endif
+
+
+/**
+ * @brief   Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(SPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define SPI_USE_MUTUAL_EXCLUSION            TRUE
+#endif
+
+/**
+ * @brief   Handling method for SPI CS line.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(SPI_SELECT_MODE) || defined(__DOXYGEN__)
+#define SPI_SELECT_MODE                     SPI_SELECT_MODE_PAD
+#endif
+
+/*===========================================================================*/
+/* UART driver related settings.                                             */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(UART_USE_WAIT) || defined(__DOXYGEN__)
+#define UART_USE_WAIT                       FALSE
+#endif
+
+/**
+ * @brief   Enables the @p uartAcquireBus() and @p uartReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(UART_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define UART_USE_MUTUAL_EXCLUSION           FALSE
+#endif
+
+/*===========================================================================*/
+/* USB driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(USB_USE_WAIT) || defined(__DOXYGEN__)
+#define USB_USE_WAIT                        TRUE
+#endif
+
+/*===========================================================================*/
+/* WSPI driver related settings.                                             */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(WSPI_USE_WAIT) || defined(__DOXYGEN__)
+#define WSPI_USE_WAIT                       TRUE
+#endif
+
+/**
+ * @brief   Enables the @p wspiAcquireBus() and @p wspiReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(WSPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define WSPI_USE_MUTUAL_EXCLUSION           TRUE
+#endif
+
+#endif /* HALCONF_H */
+
+/** @} */
diff --git a/qmk/keyboards/handwired/pill60/bluepill/mcuconf.h b/qmk/keyboards/handwired/pill60/bluepill/mcuconf.h
new file mode 100644
index 00000000..841b6899
--- /dev/null
+++ b/qmk/keyboards/handwired/pill60/bluepill/mcuconf.h
@@ -0,0 +1,209 @@
+/*
+    ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
+#define STM32F103_MCUCONF
+
+/*
+ * STM32F103 drivers configuration.
+ * The following settings override the default settings present in
+ * the various device driver implementation headers.
+ * Note that the settings for each driver only have effect if the whole
+ * driver is enabled in halconf.h.
+ *
+ * IRQ priorities:
+ * 15...0       Lowest...Highest.
+ *
+ * DMA priorities:
+ * 0...3        Lowest...Highest.
+ */
+
+/*
+ * HAL driver system settings.
+ */
+#define STM32_NO_INIT                       FALSE
+#define STM32_HSI_ENABLED                   TRUE
+#define STM32_LSI_ENABLED                   FALSE
+#define STM32_HSE_ENABLED                   TRUE
+#define STM32_LSE_ENABLED                   FALSE
+#define STM32_SW                            STM32_SW_PLL
+#define STM32_PLLSRC                        STM32_PLLSRC_HSE
+#define STM32_PLLXTPRE                      STM32_PLLXTPRE_DIV1
+#define STM32_PLLMUL_VALUE                  9
+#define STM32_HPRE                          STM32_HPRE_DIV1
+#define STM32_PPRE1                         STM32_PPRE1_DIV2
+#define STM32_PPRE2                         STM32_PPRE2_DIV2
+#define STM32_ADCPRE                        STM32_ADCPRE_DIV4
+#define STM32_USB_CLOCK_REQUIRED            TRUE
+#define STM32_USBPRE                        STM32_USBPRE_DIV1P5
+#define STM32_MCOSEL                        STM32_MCOSEL_NOCLOCK
+#define STM32_RTCSEL                        STM32_RTCSEL_HSEDIV
+#define STM32_PVD_ENABLE                    FALSE
+#define STM32_PLS                           STM32_PLS_LEV0
+
+/*
+ * ADC driver system settings.
+ */
+#define STM32_ADC_USE_ADC1                  FALSE
+#define STM32_ADC_ADC1_DMA_PRIORITY         2
+#define STM32_ADC_ADC1_IRQ_PRIORITY         6
+
+/*
+ * CAN driver system settings.
+ */
+#define STM32_CAN_USE_CAN1                  FALSE
+#define STM32_CAN_CAN1_IRQ_PRIORITY         11
+
+/*
+ * EXT driver system settings.
+ */
+#define STM32_EXT_EXTI0_IRQ_PRIORITY        6
+#define STM32_EXT_EXTI1_IRQ_PRIORITY        6
+#define STM32_EXT_EXTI2_IRQ_PRIORITY        6
+#define STM32_EXT_EXTI3_IRQ_PRIORITY        6
+#define STM32_EXT_EXTI4_IRQ_PRIORITY        6
+#define STM32_EXT_EXTI5_9_IRQ_PRIORITY      6
+#define STM32_EXT_EXTI10_15_IRQ_PRIORITY    6
+#define STM32_EXT_EXTI16_IRQ_PRIORITY       6
+#define STM32_EXT_EXTI17_IRQ_PRIORITY       6
+#define STM32_EXT_EXTI18_IRQ_PRIORITY       6
+#define STM32_EXT_EXTI19_IRQ_PRIORITY       6
+
+/*
+ * GPT driver system settings.
+ */
+#define STM32_GPT_USE_TIM1                  FALSE
+#define STM32_GPT_USE_TIM2                  FALSE
+#define STM32_GPT_USE_TIM3                  FALSE
+#define STM32_GPT_USE_TIM4                  FALSE
+#define STM32_GPT_USE_TIM5                  FALSE
+#define STM32_GPT_USE_TIM8                  FALSE
+#define STM32_GPT_TIM1_IRQ_PRIORITY         7
+#define STM32_GPT_TIM2_IRQ_PRIORITY         7
+#define STM32_GPT_TIM3_IRQ_PRIORITY         7
+#define STM32_GPT_TIM4_IRQ_PRIORITY         7
+#define STM32_GPT_TIM5_IRQ_PRIORITY         7
+#define STM32_GPT_TIM8_IRQ_PRIORITY         7
+
+/*
+ * I2C driver system settings.
+ */
+#define STM32_I2C_USE_I2C1                  TRUE
+#define STM32_I2C_USE_I2C2                  FALSE
+#define STM32_I2C_BUSY_TIMEOUT              50
+#define STM32_I2C_I2C1_IRQ_PRIORITY         5
+#define STM32_I2C_I2C2_IRQ_PRIORITY         5
+#define STM32_I2C_I2C1_DMA_PRIORITY         3
+#define STM32_I2C_I2C2_DMA_PRIORITY         3
+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")
+
+/*
+ * ICU driver system settings.
+ */
+#define STM32_ICU_USE_TIM1                  FALSE
+#define STM32_ICU_USE_TIM2                  FALSE
+#define STM32_ICU_USE_TIM3                  FALSE
+#define STM32_ICU_USE_TIM4                  FALSE
+#define STM32_ICU_USE_TIM5                  FALSE
+#define STM32_ICU_USE_TIM8                  FALSE
+#define STM32_ICU_TIM1_IRQ_PRIORITY         7
+#define STM32_ICU_TIM2_IRQ_PRIORITY         7
+#define STM32_ICU_TIM3_IRQ_PRIORITY         7
+#define STM32_ICU_TIM4_IRQ_PRIORITY         7
+#define STM32_ICU_TIM5_IRQ_PRIORITY         7
+#define STM32_ICU_TIM8_IRQ_PRIORITY         7
+
+/*
+ * PWM driver system settings.
+ */
+#define STM32_PWM_USE_ADVANCED              FALSE
+#define STM32_PWM_USE_TIM1                  FALSE
+#define STM32_PWM_USE_TIM2                  TRUE
+#define STM32_PWM_USE_TIM3                  FALSE
+#define STM32_PWM_USE_TIM4                  FALSE
+#define STM32_PWM_USE_TIM5                  FALSE
+#define STM32_PWM_USE_TIM8                  FALSE
+#define STM32_PWM_TIM1_IRQ_PRIORITY         7
+#define STM32_PWM_TIM2_IRQ_PRIORITY         7
+#define STM32_PWM_TIM3_IRQ_PRIORITY         7
+#define STM32_PWM_TIM4_IRQ_PRIORITY         7
+#define STM32_PWM_TIM5_IRQ_PRIORITY         7
+#define STM32_PWM_TIM8_IRQ_PRIORITY         7
+
+/*
+ * RTC driver system settings.
+ */
+#define STM32_RTC_IRQ_PRIORITY              15
+
+/*
+ * SERIAL driver system settings.
+ */
+#define STM32_SERIAL_USE_USART1             FALSE
+#define STM32_SERIAL_USE_USART2             FALSE
+#define STM32_SERIAL_USE_USART3             FALSE
+#define STM32_SERIAL_USE_UART4              FALSE
+#define STM32_SERIAL_USE_UART5              FALSE
+#define STM32_SERIAL_USART1_PRIORITY        12
+#define STM32_SERIAL_USART2_PRIORITY        12
+#define STM32_SERIAL_USART3_PRIORITY        12
+#define STM32_SERIAL_UART4_PRIORITY         12
+#define STM32_SERIAL_UART5_PRIORITY         12
+
+/*
+ * SPI driver system settings.
+ */
+#define STM32_SPI_USE_SPI1                  FALSE
+#define STM32_SPI_USE_SPI2                  FALSE
+#define STM32_SPI_USE_SPI3                  FALSE
+#define STM32_SPI_SPI1_DMA_PRIORITY         1
+#define STM32_SPI_SPI2_DMA_PRIORITY         1
+#define STM32_SPI_SPI3_DMA_PRIORITY         1
+#define STM32_SPI_SPI1_IRQ_PRIORITY         10
+#define STM32_SPI_SPI2_IRQ_PRIORITY         10
+#define STM32_SPI_SPI3_IRQ_PRIORITY         10
+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")
+
+/*
+ * ST driver system settings.
+ */
+#define STM32_ST_IRQ_PRIORITY               8
+#define STM32_ST_USE_TIMER                  2
+
+/*
+ * UART driver system settings.
+ */
+#define STM32_UART_USE_USART1               FALSE
+#define STM32_UART_USE_USART2               FALSE
+#define STM32_UART_USE_USART3               FALSE
+#define STM32_UART_USART1_IRQ_PRIORITY      12
+#define STM32_UART_USART2_IRQ_PRIORITY      12
+#define STM32_UART_USART3_IRQ_PRIORITY      12
+#define STM32_UART_USART1_DMA_PRIORITY      0
+#define STM32_UART_USART2_DMA_PRIORITY      0
+#define STM32_UART_USART3_DMA_PRIORITY      0
+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")
+
+/*
+ * USB driver system settings.
+ */
+#define STM32_USB_USE_USB1                  TRUE
+#define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE
+#define STM32_USB_USB1_HP_IRQ_PRIORITY      13
+#define STM32_USB_USB1_LP_IRQ_PRIORITY      14
+
+#endif /* _MCUCONF_H_ */
diff --git a/qmk/keyboards/handwired/pill60/bluepill/rules.mk b/qmk/keyboards/handwired/pill60/bluepill/rules.mk
new file mode 100644
index 00000000..019b1130
--- /dev/null
+++ b/qmk/keyboards/handwired/pill60/bluepill/rules.mk
@@ -0,0 +1,8 @@
+# MCU name
+MCU = STM32F103
+
+# Bootloader selection
+BOOTLOADER = stm32duino
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/qmk/keyboards/handwired/pill60/config.h b/qmk/keyboards/handwired/pill60/config.h
new file mode 100644
index 00000000..d9940c77
--- /dev/null
+++ b/qmk/keyboards/handwired/pill60/config.h
@@ -0,0 +1,53 @@
+ /* Copyright 2020 Imam Rafii 
+  * 
+  * 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 "config_common.h"
+
+#define VENDOR_ID 0x4454
+#define PRODUCT_ID 0x5444
+#define DEVICE_VER 0x0001
+
+#define MANUFACTURER "IktaS"
+#define PRODUCT "Pill60"
+
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 14
+#define DIODE_DIRECTION COL2ROW
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 1
+
+/* Backlighting include */
+#define BACKLIGHT_PIN           B14
+#define BACKLIGHT_PWM_DRIVER    PWMD5
+#define BACKLIGHT_PWM_CHANNEL   1
+#define BACKLIGHT_LEVELS        5
+#define BREATHING_PERIOD        6
+
+/* Encoder */
+#define ENCODERS_PAD_A \
+    { B9 }
+#define ENCODERS_PAD_B \
+    { B8 }
+#define ENCODER_RESOLUTION 2
+
+/* OLED */
+#define I2C_DRIVER I2CD1
+#define I2C1_SCL_BANK GPIOB
+#define I2C1_SDA_BANK GPIOB
+#define I2C1_SCL 6
+#define I2C1_SDA 7
diff --git a/qmk/keyboards/handwired/pill60/info.json b/qmk/keyboards/handwired/pill60/info.json
new file mode 100644
index 00000000..bb44c9eb
--- /dev/null
+++ b/qmk/keyboards/handwired/pill60/info.json
@@ -0,0 +1,82 @@
+{
+    "keyboard_name": "Pill60",
+    "url": "https://github.com/IktaS/Pill60",
+    "maintainer": "IktaS <imamrafiiia@gmail.com>",
+    "width": 15,
+    "height": 5,
+    "layouts": {
+        "layout_default": {
+            "layout": [
+                {"label": "Encoder", "x": 0, "y": 0},
+
+                {"label": "Esc", "x": 0, "y": 1},
+                {"label": "1","x": 1, "y": 1},
+                {"label": "2","x": 2, "y": 1},
+                {"label": "3","x": 3, "y": 1},
+                {"label": "4","x": 4, "y": 1},
+                {"label": "5","x": 5, "y": 1},
+                {"label": "6","x": 6, "y": 1},
+                {"label": "7","x": 7, "y": 1},
+                {"label": "8","x": 8, "y": 1},
+                {"label": "9","x": 9, "y": 1},
+                {"label": "0","x": 10, "y": 1},
+                {"label": "-","x": 11, "y": 1},
+                {"label": "=","x": 12, "y": 1},
+                {"label": "Backspace","x": 13, "y": 1},
+                {"label": "Delete","x": 14, "y": 1},
+
+                {"label": "Tab","x": 0, "y": 2, "w": 1.5},
+                {"label": "Q","x": 1.5, "y": 2},
+                {"label": "W","x": 2.5, "y": 2},
+                {"label": "E","x": 3.5, "y": 2},
+                {"label": "R","x": 4.5, "y": 2},
+                {"label": "T","x": 5.5, "y": 2},
+                {"label": "Y","x": 6.5, "y": 2},
+                {"label": "U","x": 7.5, "y": 2},
+                {"label": "I","x": 8.5, "y": 2},
+                {"label": "O","x": 9.5, "y": 2},
+                {"label": "P","x": 10.5, "y": 2},
+                {"label": "[","x": 11.5, "y": 2},
+                {"label": "]","x": 12.5, "y": 2},
+                {"label": "\\","x": 13.5, "y": 2, "w": 1.5},
+
+                {"label": "Caps","x": 0, "y": 3, "w": 1.75},
+                {"label": "A","x": 1.75, "y": 3},
+                {"label": "S","x": 2.75, "y": 3},
+                {"label": "D","x": 3.75, "y": 3},
+                {"label": "F","x": 4.75, "y": 3},
+                {"label": "G","x": 5.75, "y": 3},
+                {"label": "H","x": 6.75, "y": 3},
+                {"label": "J","x": 7.75, "y": 3},
+                {"label": "K","x": 8.75, "y": 3},
+                {"label": "L","x": 9.75, "y": 3},
+                {"label": ";","x": 10.75, "y": 3},
+                {"label": "'","x": 11.75, "y": 3},
+                {"label": "Enter","x": 12.75, "y": 3, "w": 2.25},
+
+                {"label": "L Shift","x": 0, "y": 4, "w": 2.25},
+                {"label": "Z","x": 2.25, "y": 4},
+                {"label": "X","x": 3.25, "y": 4},
+                {"label": "C","x": 4.25, "y": 4},
+                {"label": "V","x": 5.25, "y": 4},
+                {"label": "B","x": 6.25, "y": 4},
+                {"label": "N","x": 7.25, "y": 4},
+                {"label": "M","x": 8.25, "y": 4},
+                {"label": ",","x": 9.25, "y": 4},
+                {"label": ".","x": 10.25, "y": 4},
+                {"label": "/","x": 11.25, "y": 4},
+                {"label": "R Shift","x": 12.25, "y": 4, "w": 1.75},
+                {"label": "FN","x": 14, "y": 4},
+
+                {"label": "L CTRL","x": 0, "y": 5, "w": 1.25},
+                {"label": "L GUI","x": 1.25, "y": 5, "w": 1.25},
+                {"label": "L ALT","x": 2.5, "y": 5, "w": 1.25},
+                {"label": "Space","x": 3.75, "y": 5, "w": 6.25},
+                {"label": "R ALT","x": 10, "y": 5, "w": 1.25},
+                {"label": "R GUI","x": 11.25, "y": 5, "w": 1.25},
+                {"label": "R MENU","x": 12.5, "y": 5, "w": 1.25},
+                {"label": "R CTRL","x": 13.75, "y": 5, "w": 1.25}
+            ]
+        }
+    }
+}
diff --git a/qmk/keyboards/handwired/pill60/keymaps/default/keymap.c b/qmk/keyboards/handwired/pill60/keymaps/default/keymap.c
new file mode 100644
index 00000000..6edcb0c2
--- /dev/null
+++ b/qmk/keyboards/handwired/pill60/keymaps/default/keymap.c
@@ -0,0 +1,87 @@
+ /* Copyright 2020 Imam Rafii 
+  * 
+  * 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
+
+enum layers {
+    _BL,
+    _FL
+};
+
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BL] = LAYOUT(
+        KC_F1,
+        KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_DEL,
+        KC_TAB,  KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC,   KC_BSPC,
+        KC_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_RSFT,   KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,    KC_LSFT, MO(_FL),
+        MO(_FL),  KC_LGUI,  KC_LALT,               KC_SPC,                KC_RALT, KC_RGUI, MO(_FL), KC_RCTL
+    ),
+    [_FL] = LAYOUT(
+        KC_TRNS,
+        KC_GRV,   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_INS,
+        KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS,   KC_TRNS,
+        KC_CAPS,  KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT,    KC_TRNS,
+        KC_TRNS,  KC_HOME, XXXXXXX, KC_END, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_HOME, XXXXXXX, KC_END,    KC_TRNS, KC_TRNS,
+        KC_TRNS,  KC_TRNS,  KC_TRNS,                     KC_TRNS,                                KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+};
+
+#ifdef OLED_DRIVER_ENABLE
+
+static void render_oled(void) {
+    oled_write_P(PSTR("Ikta's Pill60"), false);
+    oled_write_P(PSTR("\n\n"), false);
+    led_t led_usb_state = host_keyboard_led_state();
+    oled_write_ln_P(PSTR("CPSLK"), led_usb_state.caps_lock);
+    oled_write_P(PSTR("   "), false);
+    switch (get_highest_layer(layer_state)) {
+        case _BL:
+            oled_write_P(PSTR("Base"), false);
+            break;
+        case _FL:
+            oled_write_P(PSTR("Function"), false);
+            break;
+        default:
+            oled_write_ln_P(PSTR("Base"), false);
+    }
+    oled_write_P(PSTR("       "), false);
+}
+
+oled_rotation_t oled_init_user(oled_rotation_t rotation) {
+    return rotation;
+}
+
+void oled_task_user(void) {
+    render_oled();
+}
+
+#endif
+
+#ifdef ENCODER_ENABLE
+
+void encoder_update_user(uint8_t index, bool clockwise) {
+    if (index == 0) { /* First encoder */
+        if (clockwise) {
+            tap_code(KC_A);
+        } else {
+            tap_code(KC_B);
+        }
+    }
+}
+
+#endif
diff --git a/qmk/keyboards/handwired/pill60/keymaps/default/readme.md b/qmk/keyboards/handwired/pill60/keymaps/default/readme.md
new file mode 100644
index 00000000..b1c3f1d7
--- /dev/null
+++ b/qmk/keyboards/handwired/pill60/keymaps/default/readme.md
@@ -0,0 +1,6 @@
+![Pill60 Layout Image](https://i.imgur.com/LIW18XJ.png)
+
+# Default Pill 60 Layout
+
+This is the default layout that comes flashed on every 60% board. For the most
+part it's a straightforward and easy to follow layout. Except the backspace is split, and right shift is split.
\ No newline at end of file
diff --git a/qmk/keyboards/handwired/pill60/pill60.c b/qmk/keyboards/handwired/pill60/pill60.c
new file mode 100644
index 00000000..928685a9
--- /dev/null
+++ b/qmk/keyboards/handwired/pill60/pill60.c
@@ -0,0 +1,16 @@
+ /* Copyright 2020 Imam Rafii 
+  * 
+  * 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 "pill60.h"
\ No newline at end of file
diff --git a/qmk/keyboards/handwired/pill60/pill60.h b/qmk/keyboards/handwired/pill60/pill60.h
new file mode 100644
index 00000000..e020f1eb
--- /dev/null
+++ b/qmk/keyboards/handwired/pill60/pill60.h
@@ -0,0 +1,42 @@
+ /* Copyright 2020 Imam Rafii 
+  * 
+  * 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"
+
+/*   LAYOUT
+  ENCODER
+  ESC| 1  | 2  | 3  | 4  | 5  | 6  | 7  | 8  | 9  | 0  | -  | =  |BCKS | DEL  
+  TAB| Q  | W  | E  | R  | T  | Y  | U  | I  | O  | P  | [  | ]  |     \    
+  CAP| A  | S  | D  | F  | G  | H  | J  | K  | L  | ;  | '  |    ENTER 
+  LSHFT| Z  | X  | C  | V  | B  | N  | M  | ,  | .  | /  |   RSHIF | FN 
+  LCT| WIN| ALT|               ESPACE             | ALT| WIN | MN| RCT| 
+*/
+
+#define LAYOUT( \
+    e00, \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
+    k10,  k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,   k1e, \
+    k20,   k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,    k2e, \
+    k30,    k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,     k3c, k3e, \
+    k40,  k41,  k42,               k47,                 k4a, k4b, k4c, k4e \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1e }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2e, k0e }, \
+    { k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3e, KC_NO }, \
+    { k40, k41, k42, e00, KC_NO, KC_NO, k47, KC_NO, KC_NO, KC_NO, k4a, k4b, k4c, k4e }\
+}
diff --git a/qmk/keyboards/handwired/pill60/readme.md b/qmk/keyboards/handwired/pill60/readme.md
new file mode 100644
index 00000000..3d1d142e
--- /dev/null
+++ b/qmk/keyboards/handwired/pill60/readme.md
@@ -0,0 +1,25 @@
+# Pill60
+
+![Pill60](https://i.imgur.com/7WmHa6ml.png)
+
+A 60% open source keyboard with rotary encoder, OLED screen, and Hotswap socket, using STM32F103 / Blue Pill.
+
+* Keyboard Maintainer: [Ikta](https://github.com/IktaS)#8871 (Discord)
+* Hardware Supported: Pill60 PCB, STM32F103C8T6
+* Hardware Availability: [github](https://github.com/IktaS/Pill60)
+
+Step by step guide on how to install a bootloader if your bluepill don't have one :  
+1. Download [this bootloader]( https://github.com/rogerclarkmelbourne/STM32duino-bootloader/blob/master/bootloader_only_binaries/generic_boot20_pc13_fastboot.bin)
+2. Flash Using FTDI Serial to USB converter or an ST-Link, as in [this](https://www.youtube.com/watch?v=Myon8H111PQ) video, but replacing the bootloader file
+3. Put Boot 1 to 1, then reset the board, if you're using the same bootloader, the LED should blink
+4. Flash your .bin file using dfu-util
+5. Put Boot 1 back to 0, then reset again
+
+Building Guide :
+- Use `qmk compile -kb handwired/pill60 -km default` to compile default keymap and using STM32F103 as an MCU
+- Use `qmk compile -kb handwired/pill60/blackpill_f401 -km default` to compile default keymap and using STM32F401 as an MCU
+- Use `qmk compile -kb handwired/pill60/blackpill_f411 -km default` to compile default keymap and using STM32F411 as an MCU
+
+## Warning: currently tested MCU is STM32F103, I am still waiting for f401 and f411 to arrive
+
+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).
diff --git a/qmk/keyboards/handwired/pill60/rules.mk b/qmk/keyboards/handwired/pill60/rules.mk
new file mode 100644
index 00000000..7658a814
--- /dev/null
+++ b/qmk/keyboards/handwired/pill60/rules.mk
@@ -0,0 +1,21 @@
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = yes        # Console for debug
+COMMAND_ENABLE = yes        # Commands for debug and configuration
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = yes      # 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 = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
+BACKLIGHT_DRIVER = software
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+OLED_DRIVER_ENABLE = yes
+ENCODER_ENABLE = yes
+
+DEFAULT_FOLDER = handwired/pill60/bluepill
diff --git a/qmk/keyboards/handwired/promethium/promethium.h b/qmk/keyboards/handwired/promethium/promethium.h
index b8d63522..f35e5429 100644
--- a/qmk/keyboards/handwired/promethium/promethium.h
+++ b/qmk/keyboards/handwired/promethium/promethium.h
@@ -1,7 +1,7 @@
 #ifndef PROMETHIUM_H
 #define PROMETHIUM_H
 
-#include "stdint.h"
+#include <stdint.h>
 
 void battery_poll(uint8_t level);
 void led_set_kb(uint8_t usb_led);
diff --git a/qmk/keyboards/handwired/riblee_f411/config.h b/qmk/keyboards/handwired/riblee_f411/config.h
index a1aa122e..67399aaf 100644
--- a/qmk/keyboards/handwired/riblee_f411/config.h
+++ b/qmk/keyboards/handwired/riblee_f411/config.h
@@ -28,7 +28,7 @@
 #define MATRIX_COLS 12
 
 #define MATRIX_ROW_PINS { A6, A5, A4, A3, A2 }
-#define MATRIX_COL_PINS { B10, B1, B0, B15, A8, B3, B4, B5, B6, B7, B8, B9 }
+#define MATRIX_COL_PINS { B10, B1, B0, B15, A8, B3, B4, B5, B14, A0, B8, B9 }
 #define UNUSED_PINS
 
 #define DIODE_DIRECTION COL2ROW
@@ -38,4 +38,6 @@
 
 #define MOUSEKEY_INTERVAL 32
 
-#define TAPPING_TERM 175
\ No newline at end of file
+#define TAPPING_TERM 175
+
+#define OLED_DISPLAY_128X64
diff --git a/qmk/keyboards/handwired/riblee_f411/halconf.h b/qmk/keyboards/handwired/riblee_f411/halconf.h
new file mode 100644
index 00000000..d65408a1
--- /dev/null
+++ b/qmk/keyboards/handwired/riblee_f411/halconf.h
@@ -0,0 +1,20 @@
+/* Copyright 2020 Janos Daniel Reibl <janos.daniel.reibl@protonmail.com> @riblee
+ *
+ *  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 3 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 <https://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#define HAL_USE_I2C TRUE
+
+#include_next "halconf.h"
diff --git a/qmk/keyboards/handwired/riblee_f411/mcuconf.h b/qmk/keyboards/handwired/riblee_f411/mcuconf.h
new file mode 100644
index 00000000..51561d37
--- /dev/null
+++ b/qmk/keyboards/handwired/riblee_f411/mcuconf.h
@@ -0,0 +1,25 @@
+/* Copyright 2020 Nick Brassel (tzarc)
+ * Copyright 2020 Janos Daniel Reibl <janos.daniel.reibl@protonmail.com> @riblee
+ *
+ *  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 3 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 <https://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include_next "mcuconf.h"
+
+#undef STM32_I2C_USE_I2C1
+#define STM32_I2C_USE_I2C1 TRUE
+
+#undef I2C_DRIVER
+#define I2C_DRIVER I2CD1
diff --git a/qmk/keyboards/handwired/riblee_f411/rules.mk b/qmk/keyboards/handwired/riblee_f411/rules.mk
index 40a72bdc..a44b2b05 100644
--- a/qmk/keyboards/handwired/riblee_f411/rules.mk
+++ b/qmk/keyboards/handwired/riblee_f411/rules.mk
@@ -24,3 +24,6 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth
 AUDIO_ENABLE = no           # Audio output
 
 LAYOUTS = ortho_5x12
+
+OLED_DRIVER_ENABLE = yes
+RAW_ENABLE = yes
diff --git a/qmk/keyboards/handwired/swiftrax/bebol/bebol.c b/qmk/keyboards/handwired/swiftrax/bebol/bebol.c
new file mode 100644
index 00000000..9894f84c
--- /dev/null
+++ b/qmk/keyboards/handwired/swiftrax/bebol/bebol.c
@@ -0,0 +1,17 @@
+/*
+Copyright 2020 Swiftrax <swiftrax@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include "bebol.h"
diff --git a/qmk/keyboards/handwired/swiftrax/bebol/bebol.h b/qmk/keyboards/handwired/swiftrax/bebol/bebol.h
new file mode 100644
index 00000000..4bd6974c
--- /dev/null
+++ b/qmk/keyboards/handwired/swiftrax/bebol/bebol.h
@@ -0,0 +1,35 @@
+/*
+Copyright 2020 Swiftrax <swiftrax@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#pragma once
+
+#include "quantum.h"
+
+#define XXX KC_NO
+
+#define LAYOUT_all( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c,      k1e, k1f, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,           k2e, k2f, \
+    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3d, k3e, k3f, \
+    k40, k41, k42,                k46,                k4a, k4b, k4c, k4d, k4e, k4f  \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, k0f }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, XXX, k1e, k1f }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, XXX, k2e, k2f }, \
+    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, XXX, k3d, k3e, k3f }, \
+    { k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, k4a, k4b, k4c, k4d, k4e, k4f }  \
+}
diff --git a/qmk/keyboards/handwired/swiftrax/bebol/config.h b/qmk/keyboards/handwired/swiftrax/bebol/config.h
new file mode 100644
index 00000000..44345f81
--- /dev/null
+++ b/qmk/keyboards/handwired/swiftrax/bebol/config.h
@@ -0,0 +1,44 @@
+/*
+Copyright 2020 Swiftrax <swiftrax@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x04D8
+#define PRODUCT_ID      0xEAC4
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Swiftrax
+#define PRODUCT         Bebol
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 16
+
+// ROWS: Top to bottom, COLS: Left to right
+
+#define MATRIX_ROW_PINS { B2, B3, F7, F0, B7 }
+#define MATRIX_COL_PINS { B1, D2, D3, F1, F4, F5, F6, C7, C6, B6, B5, B4, D7, D6, D4, D5 }
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* define if matrix has ghost */
+//#define MATRIX_HAS_GHOST
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
diff --git a/qmk/keyboards/handwired/swiftrax/bebol/info.json b/qmk/keyboards/handwired/swiftrax/bebol/info.json
new file mode 100644
index 00000000..48e6d8d5
--- /dev/null
+++ b/qmk/keyboards/handwired/swiftrax/bebol/info.json
@@ -0,0 +1,12 @@
+{
+    "keyboard_name": "Bebol", 
+    "url": "https://github.com/swiftrax", 
+    "maintainer": "Swiftrax", 
+    "width": 16, 
+    "height": 5, 
+    "layouts": {
+        "LAYOUT": {
+            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}]
+        }
+    }
+}
\ No newline at end of file
diff --git a/qmk/keyboards/handwired/swiftrax/bebol/keymaps/default/keymap.c b/qmk/keyboards/handwired/swiftrax/bebol/keymaps/default/keymap.c
new file mode 100644
index 00000000..7f89e773
--- /dev/null
+++ b/qmk/keyboards/handwired/swiftrax/bebol/keymaps/default/keymap.c
@@ -0,0 +1,35 @@
+/*
+Copyright 2020 Swiftrax <swiftrax@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[0] = LAYOUT_all(
+    KC_ESC,  KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,  KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_BSLS, KC_BSPC, KC_INS,
+    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_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_PGUP,
+    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_PGDN,
+    KC_LCTL, KC_LGUI, KC_LALT,                  KC_SPC,              KC_RALT, MO(1),   KC_RCTL,           KC_LEFT, KC_DOWN, KC_RGHT),
+
+[1] = LAYOUT_all(
+    KC_GRV,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10,  KC_F11,  KC_F12,    _______, _______,          _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,  _______, _______,          _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,  _______,                   _______,
+    _______,          _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,  _______,          _______, _______,
+    _______, _______, _______,                  _______,                              _______, _______, _______,           _______, _______, _______),
+};
diff --git a/qmk/keyboards/handwired/swiftrax/bebol/keymaps/via/keymap.c b/qmk/keyboards/handwired/swiftrax/bebol/keymaps/via/keymap.c
new file mode 100644
index 00000000..6aee4811
--- /dev/null
+++ b/qmk/keyboards/handwired/swiftrax/bebol/keymaps/via/keymap.c
@@ -0,0 +1,49 @@
+/*
+Copyright 2020 Swiftrax <swiftrax@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[0] = LAYOUT_all(
+    KC_ESC,  KC_1,  KC_2,  KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,  KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_BSLS, KC_BSPC, KC_INS,
+    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_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_PGUP,
+    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_PGDN,
+    KC_LCTL, KC_LGUI, KC_LALT,                  KC_SPC,              KC_RALT, MO(1),   KC_RCTL,           KC_LEFT, KC_DOWN, KC_RGHT),
+
+[1] = LAYOUT_all(
+    KC_GRV,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10,  KC_F11,  KC_F12,    _______, _______,          _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,  _______, _______,          _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,  _______,                   _______,
+    _______,          _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,  _______,          _______, _______,
+    _______, _______, _______,                  _______,              _______, _______, _______,                           _______, _______, _______),
+
+[2] = LAYOUT_all(
+    KC_GRV,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10,  KC_F11,  KC_F12,    _______, _______,          _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,  _______, _______,          _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,  _______,                   _______,
+    _______,          _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,  _______,          _______, _______,
+    _______, _______, _______,                  _______,              _______, _______, _______,                           _______, _______, _______),
+
+[3] = LAYOUT_all(
+    KC_GRV,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,  KC_F10,  KC_F11,  KC_F12,    _______, _______,          _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,  _______, _______,          _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,  _______,                   _______,
+    _______,          _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,  _______,          _______, _______,
+    _______, _______, _______,                  _______,              _______, _______, _______,                           _______, _______, _______),
+};
diff --git a/qmk/keyboards/handwired/swiftrax/bebol/keymaps/via/rules.mk b/qmk/keyboards/handwired/swiftrax/bebol/keymaps/via/rules.mk
new file mode 100644
index 00000000..036bd6d1
--- /dev/null
+++ b/qmk/keyboards/handwired/swiftrax/bebol/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/qmk/keyboards/handwired/swiftrax/bebol/readme.md b/qmk/keyboards/handwired/swiftrax/bebol/readme.md
new file mode 100644
index 00000000..54261899
--- /dev/null
+++ b/qmk/keyboards/handwired/swiftrax/bebol/readme.md
@@ -0,0 +1,13 @@
+# Bebol
+
+A 65% keyboard
+
+* Keyboard Maintainer: Swiftrax
+* Hardware Supported: Bebol
+* Hardware Availability: https://github.com/swiftrax
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/swiftrax/bebol: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).
diff --git a/qmk/keyboards/handwired/swiftrax/bebol/rules.mk b/qmk/keyboards/handwired/swiftrax/bebol/rules.mk
new file mode 100644
index 00000000..5c0d8f30
--- /dev/null
+++ b/qmk/keyboards/handwired/swiftrax/bebol/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+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
+# 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
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
diff --git a/qmk/keyboards/handwired/swiftrax/beegboy/beegboy.c b/qmk/keyboards/handwired/swiftrax/beegboy/beegboy.c
new file mode 100644
index 00000000..6923d502
--- /dev/null
+++ b/qmk/keyboards/handwired/swiftrax/beegboy/beegboy.c
@@ -0,0 +1,16 @@
+/* Copyright 2020 swiftrax
+ *
+ * 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 "beegboy.h"
diff --git a/qmk/keyboards/handwired/swiftrax/beegboy/beegboy.h b/qmk/keyboards/handwired/swiftrax/beegboy/beegboy.h
new file mode 100644
index 00000000..0b95ddc2
--- /dev/null
+++ b/qmk/keyboards/handwired/swiftrax/beegboy/beegboy.h
@@ -0,0 +1,42 @@
+/* Copyright 2020 swiftrax
+ *
+ * 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 XXX KC_NO
+
+#define LAYOUT( \
+    k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16,   k07, k17, k08, k18, \
+    k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36,   k27, k37, k28, k38, \
+    k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k56,   k47, k57, k48, k58, \
+    k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k76,        k67, k77, k68,      \
+    k80, k90, k81, k91, k82, k92, k83, k93, k84, k94, k85, k86,      k96,   k87, k97, k88, k98, \
+    ka0, kb0, ka1,           ka2,                ka4, ka5,      ka6, kb6, ka7,   kb7, ka8       \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08 }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18 }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28 }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38 }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47, k48 }, \
+    { k50, k51, k52, k53, k54, k55, k56, k57, k58 }, \
+    { k60, k61, k62, k63, k64, k65, XXX, k67, k68 }, \
+    { k70, k71, k72, k73, k74, k75, k76, k77, XXX }, \
+    { k80, k81, k82, k83, k84, k85, k86, k87, k88 }, \
+    { k90, k91, k92, k93, k94, XXX, k96, k97, k98 }, \
+    { ka0, ka1, ka2, XXX, ka4, ka5, ka6, ka7, ka8 }, \
+    { kb0, XXX, XXX, XXX, XXX, XXX, kb6, kb7, XXX }  \
+}
diff --git a/qmk/keyboards/handwired/swiftrax/beegboy/config.h b/qmk/keyboards/handwired/swiftrax/beegboy/config.h
new file mode 100644
index 00000000..a211573b
--- /dev/null
+++ b/qmk/keyboards/handwired/swiftrax/beegboy/config.h
@@ -0,0 +1,49 @@
+/*
+Copyright 2020 Swiftrax <swiftrax@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x04D8
+#define PRODUCT_ID      0xEAC5
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Swiftrax
+#define PRODUCT         Beegboy
+
+/* key matrix size */
+#define MATRIX_ROWS 12
+#define MATRIX_COLS 9
+
+// ROWS: Top to bottom, COLS: Left to right
+
+#define MATRIX_ROW_PINS { B1, B0, B3, B2, D0, B7, D2, D1, B5, B4, C6, B6 }
+#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, D5, D3 }
+
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION ROW2COL
+
+/* define if matrix has ghost */
+//#define MATRIX_HAS_GHOST
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/*EEPROM for via*/
+#define DYNAMIC_KEYMAP_LAYER_COUNT 3
diff --git a/qmk/keyboards/handwired/swiftrax/beegboy/info.json b/qmk/keyboards/handwired/swiftrax/beegboy/info.json
new file mode 100644
index 00000000..93c61628
--- /dev/null
+++ b/qmk/keyboards/handwired/swiftrax/beegboy/info.json
@@ -0,0 +1,12 @@
+{
+    "keyboard_name": "Beegboy", 
+    "url": "https://github.com/swiftrax", 
+    "maintainer": "swiftrax", 
+    "width": 19.5, 
+    "height": 6.5, 
+    "layouts": {
+        "LAYOUT": {
+            "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"1,0", "x":1.25, "y":0}, {"label":"0,1", "x":2.25, "y":0}, {"label":"1,1", "x":3.25, "y":0}, {"label":"0,2", "x":4.25, "y":0}, {"label":"1,2", "x":5.5, "y":0}, {"label":"0,3", "x":6.5, "y":0}, {"label":"1,3", "x":7.5, "y":0}, {"label":"0,4", "x":8.5, "y":0}, {"label":"1,4", "x":9.75, "y":0}, {"label":"0,5", "x":10.75, "y":0}, {"label":"1,5", "x":11.75, "y":0}, {"label":"0,6", "x":12.75, "y":0}, {"label":"1,6", "x":14, "y":0}, {"label":"0,7", "x":15.5, "y":0}, {"label":"1,7", "x":16.5, "y":0}, {"label":"0,8", "x":17.5, "y":0}, {"label":"1,8", "x":18.5, "y":0}, {"label":"2,0", "x":0, "y":1.25}, {"label":"3,0", "x":1, "y":1.25}, {"label":"2,1", "x":2, "y":1.25}, {"label":"3,1", "x":3, "y":1.25}, {"label":"2,2", "x":4, "y":1.25}, {"label":"3,2", "x":5, "y":1.25}, {"label":"2,3", "x":6, "y":1.25}, {"label":"3,3", "x":7, "y":1.25}, {"label":"2,4", "x":8, "y":1.25}, {"label":"3,4", "x":9, "y":1.25}, {"label":"2,5", "x":10, "y":1.25}, {"label":"3,5", "x":11, "y":1.25}, {"label":"2,6", "x":12, "y":1.25}, {"label":"3,6", "x":13, "y":1.25, "w":2}, {"label":"2,7", "x":15.5, "y":1.25}, {"label":"3,7", "x":16.5, "y":1.25}, {"label":"2,8", "x":17.5, "y":1.25}, {"label":"3,8", "x":18.5, "y":1.25}, {"label":"4,0", "x":0, "y":2.25, "w":1.5}, {"label":"5,0", "x":1.5, "y":2.25}, {"label":"4,1", "x":2.5, "y":2.25}, {"label":"5,1", "x":3.5, "y":2.25}, {"label":"4,2", "x":4.5, "y":2.25}, {"label":"5,2", "x":5.5, "y":2.25}, {"label":"4,3", "x":6.5, "y":2.25}, {"label":"5,3", "x":7.5, "y":2.25}, {"label":"4,4", "x":8.5, "y":2.25}, {"label":"5,4", "x":9.5, "y":2.25}, {"label":"4,5", "x":10.5, "y":2.25}, {"label":"5,5", "x":11.5, "y":2.25}, {"label":"4,6", "x":12.5, "y":2.25}, {"label":"5,6", "x":13.5, "y":2.25, "w":1.5}, {"label":"4,7", "x":15.5, "y":2.25}, {"label":"5,7", "x":16.5, "y":2.25}, {"label":"4,8", "x":17.5, "y":2.25}, {"label":"5,8", "x":18.5, "y":2.25, "h":2}, {"label":"6,0", "x":0, "y":3.25, "w":1.75}, {"label":"7,0", "x":1.75, "y":3.25}, {"label":"6,1", "x":2.75, "y":3.25}, {"label":"7,1", "x":3.75, "y":3.25}, {"label":"6,2", "x":4.75, "y":3.25}, {"label":"7,2", "x":5.75, "y":3.25}, {"label":"6,3", "x":6.75, "y":3.25}, {"label":"7,3", "x":7.75, "y":3.25}, {"label":"6,4", "x":8.75, "y":3.25}, {"label":"7,4", "x":9.75, "y":3.25}, {"label":"6,5", "x":10.75, "y":3.25}, {"label":"7,5", "x":11.75, "y":3.25}, {"label":"7,6", "x":12.75, "y":3.25, "w":2.25}, {"label":"6,7", "x":15.5, "y":3.25}, {"label":"7,7", "x":16.5, "y":3.25}, {"label":"6,8", "x":17.5, "y":3.25}, {"label":"8,0", "x":0, "y":4.25, "w":2.25}, {"label":"9,0", "x":2.25, "y":4.25}, {"label":"8,1", "x":3.25, "y":4.25}, {"label":"9,1", "x":4.25, "y":4.25}, {"label":"8,2", "x":5.25, "y":4.25}, {"label":"9,2", "x":6.25, "y":4.25}, {"label":"8,3", "x":7.25, "y":4.25}, {"label":"9,3", "x":8.25, "y":4.25}, {"label":"8,4", "x":9.25, "y":4.25}, {"label":"9,4", "x":10.25, "y":4.25}, {"label":"8,5", "x":11.25, "y":4.25}, {"label":"8,6", "x":12.25, "y":4.25, "w":1.75}, {"label":"8,7", "x":15.5, "y":4.25}, {"label":"9,7", "x":16.5, "y":4.25}, {"label":"8,8", "x":17.5, "y":4.25}, {"label":"9,8", "x":18.5, "y":4.25, "h":2}, {"label":"9,6", "x":14.25, "y":4.5}, {"label":"10,0", "x":0, "y":5.25, "w":1.25}, {"label":"11,0", "x":1.25, "y":5.25, "w":1.25}, {"label":"10,1", "x":2.5, "y":5.25, "w":1.25}, {"label":"10,2", "x":3.75, "y":5.25, "w":6.25}, {"label":"10,4", "x":10, "y":5.25, "w":1.5}, {"label":"10,5", "x":11.5, "y":5.25, "w":1.5}, {"label":"11,7", "x":16.5, "y":5.25}, {"label":"10,8", "x":17.5, "y":5.25}, {"label":"10,6", "x":13.25, "y":5.5}, {"label":"11,6", "x":14.25, "y":5.5}, {"label":"10,7", "x":15.25, "y":5.5}]
+        }
+    }
+}
\ No newline at end of file
diff --git a/qmk/keyboards/handwired/swiftrax/beegboy/keymaps/default/keymap.c b/qmk/keyboards/handwired/swiftrax/beegboy/keymaps/default/keymap.c
new file mode 100644
index 00000000..1bdad95f
--- /dev/null
+++ b/qmk/keyboards/handwired/swiftrax/beegboy/keymaps/default/keymap.c
@@ -0,0 +1,42 @@
+/* Copyright 2020 swiftrax
+ *
+ * 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
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+enum _layer {
+  _MA,
+  _FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[_MA] = LAYOUT(
+    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_F13,      KC_HOME, KC_PGUP, KC_PGDN, KC_END, 
+    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_PMNS, 
+    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_PPLS, 
+    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_P4,   KC_P5,   KC_P6,      
+    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_RGUI, KC_RCTL,                   KC_LEFT, KC_DOWN, KC_RGHT,   KC_P0,   KC_PDOT),      
+[_FN] = LAYOUT(
+    _______,   _______,   _______,   _______,   _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,    _______,   _______,      _______, _______, _______, _______, 
+    _______,   _______,   _______,   _______,   _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,    _______,   _______,      _______, _______, _______, _______, 
+    _______,   _______,   _______,   _______,   _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,    _______,   _______,      _______, _______, _______, _______, 
+    _______,   _______,   _______,   _______,   _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,    _______,                 _______, _______, _______,      
+    _______,   _______,   _______,   _______,   _______,  _______,  _______,  _______,  _______,   _______, _______,   _______,          _______,           _______, _______, _______, _______, 
+    _______,   _______,   _______,                        _______,                   _______,   _______,                        _______, _______, _______,     _______,   _______),
+};
diff --git a/qmk/keyboards/handwired/swiftrax/beegboy/keymaps/via/keymap.c b/qmk/keyboards/handwired/swiftrax/beegboy/keymaps/via/keymap.c
new file mode 100644
index 00000000..262a03bf
--- /dev/null
+++ b/qmk/keyboards/handwired/swiftrax/beegboy/keymaps/via/keymap.c
@@ -0,0 +1,41 @@
+/* Copyright 2020 swiftrax
+ *
+ * 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(
+    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_F13,      KC_HOME, KC_PGUP, KC_PGDN, KC_END, 
+    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_PMNS, 
+    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_PPLS, 
+    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_P4,   KC_P5,   KC_P6,      
+    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_RGUI, KC_RCTL,                   KC_LEFT, KC_DOWN, KC_RGHT,   KC_P0,   KC_PDOT), 
+[1] = LAYOUT(
+    _______,   _______,   _______,   _______,   _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,    _______,   _______,      _______, _______, _______, _______, 
+    _______,   _______,   _______,   _______,   _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,    _______,   _______,      _______, _______, _______, _______, 
+    _______,   _______,   _______,   _______,   _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,    _______,   _______,      _______, _______, _______, _______, 
+    _______,   _______,   _______,   _______,   _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,    _______,                 _______, _______, _______,      
+    _______,   _______,   _______,   _______,   _______,  _______,  _______,  _______,  _______,   _______, _______,   _______,          _______,           _______, _______, _______, _______, 
+    _______,   _______,   _______,                        _______,                   _______,   _______,                        _______, _______, _______,     _______,   _______), 
+[2] = LAYOUT(
+    _______,   _______,   _______,   _______,   _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,    _______,   _______,      _______, _______, _______, _______, 
+    _______,   _______,   _______,   _______,   _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,    _______,   _______,      _______, _______, _______, _______, 
+    _______,   _______,   _______,   _______,   _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,    _______,   _______,      _______, _______, _______, _______, 
+    _______,   _______,   _______,   _______,   _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,    _______,                 _______, _______, _______,      
+    _______,   _______,   _______,   _______,   _______,  _______,  _______,  _______,  _______,   _______, _______,   _______,          _______,           _______, _______, _______, _______, 
+    _______,   _______,   _______,                        _______,                   _______,   _______,                        _______, _______, _______,     _______,   _______),
+};
diff --git a/qmk/keyboards/handwired/swiftrax/beegboy/keymaps/via/rules.mk b/qmk/keyboards/handwired/swiftrax/beegboy/keymaps/via/rules.mk
new file mode 100644
index 00000000..036bd6d1
--- /dev/null
+++ b/qmk/keyboards/handwired/swiftrax/beegboy/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/qmk/keyboards/handwired/swiftrax/beegboy/readme.md b/qmk/keyboards/handwired/swiftrax/beegboy/readme.md
new file mode 100644
index 00000000..3deb4a12
--- /dev/null
+++ b/qmk/keyboards/handwired/swiftrax/beegboy/readme.md
@@ -0,0 +1,13 @@
+# Beegboy
+
+96% with a gap
+
+* Keyboard Maintainer: [Swiftrax](https://github.com/swiftrax)
+* Hardware Supported: beegboy
+* Hardware Availability: [GitHub.com](https://github.com/swiftrax)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/swiftrax/beegboy: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).
diff --git a/qmk/keyboards/handwired/swiftrax/beegboy/rules.mk b/qmk/keyboards/handwired/swiftrax/beegboy/rules.mk
new file mode 100644
index 00000000..eefa7d85
--- /dev/null
+++ b/qmk/keyboards/handwired/swiftrax/beegboy/rules.mk
@@ -0,0 +1,23 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # 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
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = no         # Rotary Encoder
diff --git a/qmk/keyboards/handwired/swiftrax/unsplit/config.h b/qmk/keyboards/handwired/swiftrax/unsplit/config.h
new file mode 100644
index 00000000..95fdab28
--- /dev/null
+++ b/qmk/keyboards/handwired/swiftrax/unsplit/config.h
@@ -0,0 +1,45 @@
+/*
+Copyright 2020 Swiftrax <swiftrax@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x04D8
+#define PRODUCT_ID      0xEAB1
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Swiftrax
+#define PRODUCT         UnSplit
+
+/* key matrix size */
+#define MATRIX_ROWS 4
+#define MATRIX_COLS 12
+
+// ROWS: Top to bottom, COLS: Left to right
+
+#define MATRIX_ROW_PINS { B6, D7, B5, B4  }
+#define MATRIX_COL_PINS { D1, D2, D3, D5, D4, D6, C6, C7, F6, F5, F4, F1 }
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* define if matrix has ghost */
+//#define MATRIX_HAS_GHOST
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
diff --git a/qmk/keyboards/handwired/swiftrax/unsplit/info.json b/qmk/keyboards/handwired/swiftrax/unsplit/info.json
new file mode 100644
index 00000000..4dd3b58e
--- /dev/null
+++ b/qmk/keyboards/handwired/swiftrax/unsplit/info.json
@@ -0,0 +1,12 @@
+{
+    "keyboard_name": "UnSplit", 
+    "url": "github.com/swiftrax", 
+    "maintainer": "swiftrax", 
+    "width": 17, 
+    "height": 5, 
+    "layouts": {
+        "LAYOUT": {
+            "layout": [{"x":3, "y":0.25}, {"x":13, "y":0.25}, {"x":2, "y":0.5}, {"x":4, "y":0.5}, {"x":12, "y":0.5}, {"x":14, "y":0.5}, {"x":5, "y":0.625}, {"x":11, "y":0.625}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":15, "y":1}, {"x":16, "y":1}, {"x":3, "y":1.25}, {"x":13, "y":1.25}, {"x":2, "y":1.5}, {"x":4, "y":1.5}, {"x":12, "y":1.5}, {"x":14, "y":1.5}, {"x":5, "y":1.625}, {"x":11, "y":1.625}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":15, "y":2}, {"x":16, "y":2}, {"x":3, "y":2.25}, {"x":13, "y":2.25}, {"x":2, "y":2.5}, {"x":4, "y":2.5}, {"x":12, "y":2.5}, {"x":14, "y":2.5}, {"x":5, "y":2.625}, {"x":11, "y":2.625}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":15, "y":3}, {"x":16, "y":3}, {"x":2.5, "y":3.5}, {"x":13.5, "y":3.5}, {"x":3.5, "y":3.5}, {"x":12.5, "y":3.5}, {"x":4.5, "y":3.75}, {"x":11.5, "y":3.75}, {"x":5.5, "y":4}, {"x":10.5, "y":4}]
+        }
+    }
+}
\ No newline at end of file
diff --git a/qmk/keyboards/handwired/swiftrax/unsplit/keymaps/default/keymap.c b/qmk/keyboards/handwired/swiftrax/unsplit/keymaps/default/keymap.c
new file mode 100644
index 00000000..3430353b
--- /dev/null
+++ b/qmk/keyboards/handwired/swiftrax/unsplit/keymaps/default/keymap.c
@@ -0,0 +1,37 @@
+/*
+Copyright 2020 Swiftrax <swiftrax@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[0] = LAYOUT(
+  KC_ESC,   KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,       KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_BSPC,
+  KC_TAB,   KC_A,   KC_S,   KC_D,   KC_F,   KC_G,       KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,
+  KC_LSFT,  KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,       KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,KC_RSFT,
+                 KC_LCTL,KC_LALT, KC_SPC, KC_SPC,     KC_SPC, KC_SPC,   KC_RGUI,KC_RALT),
+[1] = LAYOUT(
+  _______,_______,_______,_______,_______,_______,     _______,_______,_______,_______,_______,_______,
+  _______,_______,_______,_______,_______,_______,     _______,_______,_______,_______,_______,_______,
+  _______,_______,_______,_______,_______,_______,     _______,_______,_______,_______,_______,_______,
+                  _______,_______,_______,_______,     _______,_______,_______,_______),
+[2] = LAYOUT(
+  _______,_______,_______,_______,_______,_______,     _______,_______,_______,_______,_______,_______,
+  _______,_______,_______,_______,_______,_______,     _______,_______,_______,_______,_______,_______,
+  _______,_______,_______,_______,_______,_______,     _______,_______,_______,_______,_______,_______,
+                  _______,_______,_______,_______,     _______,_______,_______,_______),
+};
diff --git a/qmk/keyboards/handwired/swiftrax/unsplit/keymaps/via/keymap.c b/qmk/keyboards/handwired/swiftrax/unsplit/keymaps/via/keymap.c
new file mode 100644
index 00000000..94c31570
--- /dev/null
+++ b/qmk/keyboards/handwired/swiftrax/unsplit/keymaps/via/keymap.c
@@ -0,0 +1,41 @@
+/*
+Copyright 2020 Swiftrax <swiftrax@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[0] = LAYOUT(
+  KC_ESC,   KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,       KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_BSPC,
+  KC_TAB,   KC_A,   KC_S,   KC_D,   KC_F,   KC_G,       KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,
+  KC_LSFT,  KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,       KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,KC_RSFT,
+                 KC_LCTL,KC_LALT, KC_SPC, KC_SPC,     KC_SPC, KC_SPC,   KC_RGUI,KC_RALT),
+[1] = LAYOUT(
+  _______,_______,_______,_______,_______,_______,     _______,_______,_______,_______,_______,_______,
+  _______,_______,_______,_______,_______,_______,     _______,_______,_______,_______,_______,_______,
+  _______,_______,_______,_______,_______,_______,     _______,_______,_______,_______,_______,_______,
+                  _______,_______,_______,_______,     _______,_______,_______,_______),
+[2] = LAYOUT(
+  _______,_______,_______,_______,_______,_______,     _______,_______,_______,_______,_______,_______,
+  _______,_______,_______,_______,_______,_______,     _______,_______,_______,_______,_______,_______,
+  _______,_______,_______,_______,_______,_______,     _______,_______,_______,_______,_______,_______,
+                  _______,_______,_______,_______,     _______,_______,_______,_______),
+[3] = LAYOUT(
+  _______,_______,_______,_______,_______,_______,     _______,_______,_______,_______,_______,_______,
+  _______,_______,_______,_______,_______,_______,     _______,_______,_______,_______,_______,_______,
+  _______,_______,_______,_______,_______,_______,     _______,_______,_______,_______,_______,_______,
+                  _______,_______,_______,_______,     _______,_______,_______,_______),
+};
diff --git a/qmk/keyboards/handwired/swiftrax/unsplit/keymaps/via/rules.mk b/qmk/keyboards/handwired/swiftrax/unsplit/keymaps/via/rules.mk
new file mode 100644
index 00000000..036bd6d1
--- /dev/null
+++ b/qmk/keyboards/handwired/swiftrax/unsplit/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/qmk/keyboards/handwired/swiftrax/unsplit/readme.md b/qmk/keyboards/handwired/swiftrax/unsplit/readme.md
new file mode 100644
index 00000000..8c88b54a
--- /dev/null
+++ b/qmk/keyboards/handwired/swiftrax/unsplit/readme.md
@@ -0,0 +1,13 @@
+# UnSplit
+
+A 44 key fixed split keyboard
+
+* Keyboard Maintainer: Swiftrax
+* Hardware Supported: UnSplit
+* Hardware Availability: https://github.com/swiftrax/unsplit
+
+Make example for this keyboard (after setting up your build environment):
+
+    make handwired/swiftrax/unpslit: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).
diff --git a/qmk/keyboards/handwired/swiftrax/unsplit/rules.mk b/qmk/keyboards/handwired/swiftrax/unsplit/rules.mk
new file mode 100644
index 00000000..dc796be5
--- /dev/null
+++ b/qmk/keyboards/handwired/swiftrax/unsplit/rules.mk
@@ -0,0 +1,23 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+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
+# 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
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = no         # Rotary Encoder
\ No newline at end of file
diff --git a/qmk/keyboards/handwired/swiftrax/unsplit/unsplit.c b/qmk/keyboards/handwired/swiftrax/unsplit/unsplit.c
new file mode 100644
index 00000000..41d548c0
--- /dev/null
+++ b/qmk/keyboards/handwired/swiftrax/unsplit/unsplit.c
@@ -0,0 +1 @@
+#include "unsplit.h"
diff --git a/qmk/keyboards/handwired/swiftrax/unsplit/unsplit.h b/qmk/keyboards/handwired/swiftrax/unsplit/unsplit.h
new file mode 100644
index 00000000..79109edb
--- /dev/null
+++ b/qmk/keyboards/handwired/swiftrax/unsplit/unsplit.h
@@ -0,0 +1,35 @@
+/*
+Copyright 2020 Swiftrax <swiftrax@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "quantum.h"
+
+// readability
+#define XXX KC_NO
+
+#define LAYOUT( \
+    K000, K001, K002, K003, K004, K005,                               K011, K012, K013, K014, K015, K016, \
+    K100, K101, K102, K103, K104, K105,                               K111, K112, K113, K114, K115, K116, \
+    K200, K201, K202, K203, K204, K205,                               K211, K212, K213, K214, K215, K216, \
+                K402, K403, K404, K405,                               K411, K412, K413, K414  \
+) { \
+    { K000,  K001,  K002,  K003,  K004,  K005,  K011,  K012,  K013,  K014,  K015,  K016 }, \
+    { K100,  K101,  K102,  K103,  K104,  K105,  K111,  K112,  K113,  K114,  K115,  K116 }, \
+    { K200,  K201,  K202,  K203,  K204,  K205,  K211,  K212,  K213,  K214,  K215,  K216 }, \
+    { XXX,    XXX,  K402,  K403,  K404,  K405,  K411,  K412,  K413,  K414,   XXX,   XXX }  \
+}
diff --git a/qmk/keyboards/handwired/symmetric70_proto/config.h b/qmk/keyboards/handwired/symmetric70_proto/config.h
new file mode 100644
index 00000000..2cdce580
--- /dev/null
+++ b/qmk/keyboards/handwired/symmetric70_proto/config.h
@@ -0,0 +1,150 @@
+/*
+Copyright 2020 mtei
+
+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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID    0xFEED
+#define PRODUCT_ID   0x2BE5
+#define DEVICE_VER   0x0001
+#define MANUFACTURER mtei
+#define PRODUCT      Symmetric70 prototype
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 16
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+ */
+#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
+#define MATRIX_COL_PINS { F4,F4,F5,F5, F6,F6,F7,F7,  B6,B6,B2,B2, B3,B3,B1,B1 }
+#define UNUSED_PINS
+
+#define MATRIX_MUL_SEL  {  0, 1, 0, 1,  0, 1, 0, 1,   1, 0, 1, 0,  1, 0, 1, 0 }
+/* use 74HC157: quadruple 2-line to 1-line data selectors / multiplexers */
+#define MATRIX_MUL_SELECT  B5 /* 74HC157 pin1:~A/B */
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+#define SOFT_SERIAL_PIN D0  // or D1, D2, D3, E6
+
+//#define BACKLIGHT_PIN B7
+//#define BACKLIGHT_LEVELS 3
+//#define BACKLIGHT_BREATHING
+
+//#define RGB_DI_PIN E2
+//#ifdef RGB_DI_PIN
+//#    define RGBLED_NUM 16
+//#    define RGBLIGHT_HUE_STEP 8
+//#    define RGBLIGHT_SAT_STEP 8
+//#    define RGBLIGHT_VAL_STEP 8
+//#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+//#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+/*== all animations enable ==*/
+//#    define RGBLIGHT_ANIMATIONS
+/*== or choose animations ==*/
+//#    define RGBLIGHT_EFFECT_BREATHING
+//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+//#    define RGBLIGHT_EFFECT_SNAKE
+//#    define RGBLIGHT_EFFECT_KNIGHT
+//#    define RGBLIGHT_EFFECT_CHRISTMAS
+//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+//#    define RGBLIGHT_EFFECT_RGB_TEST
+//#    define RGBLIGHT_EFFECT_ALTERNATING
+/*== customize breathing effect ==*/
+/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+//#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+/*==== use exp() and sin() ====*/
+//#    define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//#    define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+//#endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+//#define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+/* Bootmagic Lite key configuration */
+//#define BOOTMAGIC_LITE_ROW 0
+//#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/handwired/symmetric70_proto/info.json b/qmk/keyboards/handwired/symmetric70_proto/info.json
new file mode 100644
index 00000000..abb0976a
--- /dev/null
+++ b/qmk/keyboards/handwired/symmetric70_proto/info.json
@@ -0,0 +1,87 @@
+{
+    "keyboard_name": "symmetric70_proto",
+    "url": "",
+    "maintainer": "mtei",
+    "width": 16,
+    "height": 5,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+		{"label":"L00", "x":0, "y":0, "w":1.25},
+		{"label":"L01", "x":1.25, "y":0},
+		{"label":"L02", "x":2.25, "y":0},
+		{"label":"L03", "x":3.25, "y":0},
+		{"label":"L04", "x":4.25, "y":0},
+		{"label":"L05", "x":5.25, "y":0},
+		{"label":"L06", "x":6.25, "y":0},
+		{"label":"R06", "x":8.75, "y":0},
+		{"label":"R05", "x":9.75, "y":0},
+		{"label":"R04", "x":10.75, "y":0},
+		{"label":"R03", "x":11.75, "y":0},
+		{"label":"R02", "x":12.75, "y":0},
+		{"label":"R01", "x":13.75, "y":0},
+		{"label":"R00", "x":14.75, "y":0, "w":1.25},
+
+		{"label":"L10", "x":0, "y":1, "w":1.5},
+		{"label":"L11", "x":1.5, "y":1},
+		{"label":"L12", "x":2.5, "y":1},
+		{"label":"L13", "x":3.5, "y":1},
+		{"label":"L14", "x":4.5, "y":1},
+		{"label":"L15", "x":5.5, "y":1},
+		{"label":"L16", "x":6.5, "y":1},
+		{"label":"R16", "x":8.5, "y":1},
+		{"label":"R15", "x":9.5, "y":1},
+		{"label":"R14", "x":10.5, "y":1},
+		{"label":"R13", "x":11.5, "y":1},
+		{"label":"R12", "x":12.5, "y":1},
+		{"label":"R11", "x":13.5, "y":1},
+		{"label":"R10", "x":14.5, "y":1, "w":1.5},
+
+		{"label":"L20", "x":0, "y":2, "w":1.25},
+		{"label":"L21", "x":1.25, "y":2},
+		{"label":"L22", "x":2.25, "y":2},
+		{"label":"L23", "x":3.25, "y":2},
+		{"label":"L24", "x":4.25, "y":2},
+		{"label":"L25", "x":5.25, "y":2},
+		{"label":"L26", "x":6.25, "y":2},
+		{"label":"R26", "x":8.75, "y":2},
+		{"label":"R25", "x":9.75, "y":2},
+		{"label":"R24", "x":10.75, "y":2},
+		{"label":"R23", "x":11.75, "y":2},
+		{"label":"R22", "x":12.75, "y":2},
+		{"label":"R21", "x":13.75, "y":2},
+		{"label":"R20", "x":14.75, "y":2, "w":1.25},
+
+		{"label":"L30", "x":0, "y":3},
+		{"label":"L31", "x":1, "y":3},
+		{"label":"L32", "x":2, "y":3},
+		{"label":"L33", "x":3, "y":3},
+		{"label":"L34", "x":4, "y":3},
+		{"label":"L35", "x":5, "y":3},
+		{"label":"L36", "x":6, "y":3},
+		{"label":"L37", "x":7, "y":3},
+		{"label":"R37", "x":8, "y":3},
+		{"label":"R36", "x":9, "y":3},
+		{"label":"R35", "x":10, "y":3},
+		{"label":"R34", "x":11, "y":3},
+		{"label":"R33", "x":12, "y":3},
+		{"label":"R32", "x":13, "y":3},
+		{"label":"R31", "x":14, "y":3},
+		{"label":"R30", "x":15, "y":3},
+
+		{"label":"L40", "x":0, "y":4, "w":1.75},
+		{"label":"L42", "x":1.75, "y":4, "w":1.25},
+		{"label":"L43", "x":3, "y":4, "w":1.25},
+		{"label":"L44", "x":4.25, "y":4},
+		{"label":"L45", "x":5.25, "y":4, "w":1.25},
+		{"label":"L47", "x":6.5, "y":4, "w":1.5},
+		{"label":"R47", "x":8, "y":4, "w":1.5},
+		{"label":"R45", "x":9.5, "y":4, "w":1.25},
+		{"label":"R44", "x":10.75, "y":4},
+		{"label":"R43", "x":11.75, "y":4, "w":1.25},
+		{"label":"R42", "x":13, "y":4, "w":1.25},
+		{"label":"R40", "x":14.25, "y":4, "w":1.75}
+            ]
+        }
+    }
+}
diff --git a/qmk/keyboards/handwired/symmetric70_proto/keymaps/default/keymap.c b/qmk/keyboards/handwired/symmetric70_proto/keymaps/default/keymap.c
new file mode 100644
index 00000000..d3969071
--- /dev/null
+++ b/qmk/keyboards/handwired/symmetric70_proto/keymaps/default/keymap.c
@@ -0,0 +1,54 @@
+/* Copyright 2020 mtei
+ *
+ * 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 names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _FN
+};
+
+#define KC_FUNC MO(_FN)
+
+// clang-format off
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [_BASE] = LAYOUT(
+     //_ESC_1_2_3_4_5_NO              _NO_6_7_8_9_0_BSPC
+     //_TAB_Q_W_E_R_T_MINS            _EQL_Y_U_I_O_P_BSLS
+     //_LCTL_A_S_D_F_G_LBRC           _RBRC_H_J_K_L_SCLN_RCTL
+     //_LSFT_Z_X_C_V_B_GRV_NO         _NO_QUOT_N_M_COMM_DOT_SLSH_RSFT
+     //_FUNC_CAPS_LALT_LGUI_SPC_BSPC  _ENT_SPC_RGUI_RALT_APP_FUNC
+      KC_ESC,  KC_1, KC_2, KC_3, KC_4, KC_5, KC_NO,                 KC_NO,   KC_6, KC_7, KC_8,    KC_9,   KC_0,    KC_BSPC,
+       KC_TAB,  KC_Q, KC_W, KC_E, KC_R, KC_T, KC_MINS,             KC_EQL,  KC_Y, KC_U, KC_I,    KC_O,   KC_P,    KC_BSLS,
+      KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_LBRC,               KC_RBRC, KC_H, KC_J, KC_K,    KC_L,   KC_SCLN, KC_RCTL,
+     KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_GRV, KC_NO,   KC_NO,  KC_QUOT, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
+     KC_FUNC,    KC_CAPS, KC_LALT, KC_LGUI, KC_SPC, KC_BSPC, KC_ENT,   KC_SPC,  KC_RGUI, KC_RALT,  KC_APP,          KC_FUNC
+    ),
+    [_FN] = LAYOUT(
+     //_NO_F1_F2_F3_F4_F5_NO                   _NO_F6_F7_F8_F9_F10_F11
+     //_NO_NO_PAUS_SLCK_NO_NO_NO               _NO_NO_NO_SLCK_PAUS_NO_F12
+     //_TRNS_HOME_NO_UP_NO_PGUP_INS            _INS_PGUP_NO_UP_NO_HOME_TRNS
+     //_TRNS_END_LEFT_DOWN_RGHT_PGDN_DEL_TRNS  _TRNS_DEL_PGDN_LEFT_DOWN_RGHT_END_TRNS
+     //_TRNS_PSCR_TRNS_TRNS_NO_NO              _NO_NO_TRNS_TRNS_PSCR_TRNS
+       KC_NO, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_NO,               KC_NO,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
+       KC_NO, KC_NO,   KC_PAUS, KC_SLCK, KC_NO,   KC_NO,   KC_NO,               KC_NO,  KC_NO,   KC_NO,   KC_SLCK, KC_PAUS, KC_NO,   KC_F12,
+     _______, KC_HOME, KC_NO,   KC_UP,   KC_NO,   KC_PGUP, KC_INS,              KC_INS, KC_PGUP, KC_NO,   KC_UP,   KC_NO,   KC_HOME, _______,
+     _______, KC_END,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_DEL, KC_NO,KC_NO, KC_DEL, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_END,  _______,
+     _______,          KC_PSCR, _______, _______, KC_NO,           KC_NO,KC_NO,         KC_NO,   _______, _______, KC_PSCR,          _______
+    )
+};
diff --git a/qmk/keyboards/handwired/symmetric70_proto/keymaps/default/readme.md b/qmk/keyboards/handwired/symmetric70_proto/keymaps/default/readme.md
new file mode 100644
index 00000000..f9bb5bf6
--- /dev/null
+++ b/qmk/keyboards/handwired/symmetric70_proto/keymaps/default/readme.md
@@ -0,0 +1,9 @@
+# The default keymap for symmetric70_proto
+
+```
+  ESC   1  2  3  4  5              6  7  8  9  0   BS
+  TAB    Q  W  E  R  T  -      =  Y  U  I  O  P  \
+  CTL   A  S  D  F  G  [        ]  H  J  K  L  ;   CTL
+  SFT  Z  X  C  V  B  `          '  N  M  ,  .  /  SFT
+  FUNC CAPS ALT GUI SPC BS   ENT SPC GUI RALT APP FUNC
+```
diff --git a/qmk/keyboards/handwired/symmetric70_proto/keymaps/default_mac/keymap.c b/qmk/keyboards/handwired/symmetric70_proto/keymaps/default_mac/keymap.c
new file mode 100644
index 00000000..30f42e70
--- /dev/null
+++ b/qmk/keyboards/handwired/symmetric70_proto/keymaps/default_mac/keymap.c
@@ -0,0 +1,54 @@
+/* Copyright 2020 mtei
+ *
+ * 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 names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _FN
+};
+
+#define KC_FUNC MO(_FN)
+
+// clang-format off
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [_BASE] = LAYOUT(
+     //_ESC_1_2_3_4_5_NO              _NO_6_7_8_9_0_BSPC
+     //_TAB_Q_W_E_R_T_MINS            _EQL_Y_U_I_O_P_BSLS
+     //_LCTL_A_S_D_F_G_LBRC           _RBRC_H_J_K_L_SCLN_RCTL
+     //_LSFT_Z_X_C_V_B_GRV_NO         _NO_QUOT_N_M_COMM_DOT_SLSH_RSFT
+     //_FUNC_CAPS_LALT_LGUI_SPC_BSPC  _ENT_SPC_RGUI_RALT_APP_FUNC
+      KC_ESC,  KC_1, KC_2, KC_3, KC_4, KC_5, KC_NO,                    KC_NO,   KC_6, KC_7, KC_8,    KC_9,   KC_0,    KC_BSPC,
+       KC_TAB,  KC_Q, KC_W, KC_E, KC_R, KC_T, KC_MINS,                KC_EQL,  KC_Y, KC_U, KC_I,    KC_O,   KC_P,    KC_BSLS,
+      KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_LBRC,                  KC_RBRC, KC_H, KC_J, KC_K,    KC_L,   KC_SCLN, KC_RCTL,
+     KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_GRV, KC_LANG2, KC_LANG1, KC_QUOT, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT,
+     KC_FUNC,    KC_CAPS, KC_LALT, KC_LGUI, KC_SPC, KC_BSPC,   KC_ENT,   KC_SPC,  KC_RGUI, KC_RALT,  KC_APP,          KC_FUNC
+    ),
+    [_FN] = LAYOUT(
+     //_NO_F1_F2_F3_F4_F5_NO                   _NO_F6_F7_F8_F9_F10_F11
+     //_NO_NO_PAUS_SLCK_NO_NO_NO               _NO_NO_NO_SLCK_PAUS_NO_F12
+     //_TRNS_HOME_NO_UP_NO_PGUP_INS            _INS_PGUP_NO_UP_NO_HOME_TRNS
+     //_TRNS_END_LEFT_DOWN_RGHT_PGDN_DEL_TRNS  _TRNS_DEL_PGDN_LEFT_DOWN_RGHT_END_TRNS
+     //_TRNS_PSCR_TRNS_TRNS_NO_NO              _NO_NO_TRNS_TRNS_PSCR_TRNS
+       KC_NO, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_NO,               KC_NO,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
+       KC_NO, KC_NO,   KC_PAUS, KC_SLCK, KC_NO,   KC_NO,   KC_NO,               KC_NO,  KC_NO,   KC_NO,   KC_SLCK, KC_PAUS, KC_NO,   KC_F12,
+     _______, KC_HOME, KC_NO,   KC_UP,   KC_NO,   KC_PGUP, KC_INS,              KC_INS, KC_PGUP, KC_NO,   KC_UP,   KC_NO,   KC_HOME, _______,
+     _______, KC_END,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_DEL, KC_NO,KC_NO, KC_DEL, KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_END,  _______,
+     _______,          KC_PSCR, _______, _______, KC_NO,           KC_NO,KC_NO,         KC_NO,   _______, _______, KC_PSCR,          _______
+    )
+};
diff --git a/qmk/keyboards/handwired/symmetric70_proto/keymaps/default_mac/readme.md b/qmk/keyboards/handwired/symmetric70_proto/keymaps/default_mac/readme.md
new file mode 100644
index 00000000..c533e328
--- /dev/null
+++ b/qmk/keyboards/handwired/symmetric70_proto/keymaps/default_mac/readme.md
@@ -0,0 +1,9 @@
+# The default_mac keymap for symmetric70_proto
+
+```
+  ESC   1  2  3  4  5                  6  7  8  9  0   BS
+  TAB    Q  W  E  R  T  -          =  Y  U  I  O  P    \
+  CTL   A  S  D  F  G  [            ]  H  J  K  L  ;   CTL
+  SFT  Z  X  C  V  B  ` LANG2 LANG1  '  N  M  ,  .  /  SFT
+  FUNC CAPS ALT GUI SPC BS      ENT SPC GUI RALT APP FUNC
+```
diff --git a/qmk/keyboards/handwired/symmetric70_proto/matrix.c b/qmk/keyboards/handwired/symmetric70_proto/matrix.c
new file mode 100644
index 00000000..c0161207
--- /dev/null
+++ b/qmk/keyboards/handwired/symmetric70_proto/matrix.c
@@ -0,0 +1,226 @@
+/*
+Copyright 2012-2018 Jun Wako, Jack Humbert, Yiancar
+
+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 <stdint.h>
+#include <stdbool.h>
+#include "util.h"
+#include "matrix.h"
+#include "debounce.h"
+#include "quantum.h"
+
+#ifdef DIRECT_PINS
+static pin_t direct_pins[MATRIX_ROWS][MATRIX_COLS] = DIRECT_PINS;
+#elif (DIODE_DIRECTION == ROW2COL) || (DIODE_DIRECTION == COL2ROW)
+static const pin_t row_pins[MATRIX_ROWS] = MATRIX_ROW_PINS;
+static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
+#  ifdef MATRIX_MUL_SELECT
+static const pin_t col_sel[MATRIX_COLS] = MATRIX_MUL_SEL;
+#    ifndef MATRIX_MUL_SELECT_DELAY
+#      define MATRIX_MUL_SELECT_DELAY 1
+#    endif
+#  endif
+#endif
+
+/* matrix state(1:on, 0:off) */
+extern matrix_row_t raw_matrix[MATRIX_ROWS];  // raw values
+extern matrix_row_t matrix[MATRIX_ROWS];      // debounced values
+
+// matrix code
+
+#ifdef DIRECT_PINS
+
+static void init_pins(void) {
+    for (int row = 0; row < MATRIX_ROWS; row++) {
+        for (int col = 0; col < MATRIX_COLS; col++) {
+            pin_t pin = direct_pins[row][col];
+            if (pin != NO_PIN) {
+                setPinInputHigh(pin);
+            }
+        }
+    }
+}
+
+static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) {
+    // Start with a clear matrix row
+    matrix_row_t current_row_value = 0;
+
+    for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) {
+        pin_t pin = direct_pins[current_row][col_index];
+        if (pin != NO_PIN) {
+            current_row_value |= readPin(pin) ? 0 : (MATRIX_ROW_SHIFTER << col_index);
+        }
+    }
+
+    // If the row has changed, store the row and return the changed flag.
+    if (current_matrix[current_row] != current_row_value) {
+        current_matrix[current_row] = current_row_value;
+        return true;
+    }
+    return false;
+}
+
+#elif defined(DIODE_DIRECTION)
+#    if (DIODE_DIRECTION == COL2ROW)
+
+static void select_row(uint8_t row) {
+    setPinOutput(row_pins[row]);
+    writePinLow(row_pins[row]);
+}
+
+static void unselect_row(uint8_t row) { setPinInputHigh(row_pins[row]); }
+
+static void unselect_rows(void) {
+    for (uint8_t x = 0; x < MATRIX_ROWS; x++) {
+        setPinInputHigh(row_pins[x]);
+    }
+}
+
+static void init_pins(void) {
+#ifdef MATRIX_MUL_SELECT
+    setPinOutput(MATRIX_MUL_SELECT);
+    writePinLow(MATRIX_MUL_SELECT);
+#endif
+    unselect_rows();
+    for (uint8_t x = 0; x < MATRIX_COLS; x++) {
+        setPinInputHigh(col_pins[x]);
+    }
+}
+
+static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row) {
+    // Start with a clear matrix row
+    matrix_row_t current_row_value = 0;
+
+    // Select row and wait for row selecton to stabilize
+    select_row(current_row);
+    matrix_io_delay();
+
+    // For each col...
+    for (uint8_t col_index = 0; col_index < MATRIX_COLS; col_index++) {
+        // Select the col pin to read (active low)
+#ifdef MATRIX_MUL_SELECT
+        writePin(MATRIX_MUL_SELECT,col_sel[col_index]);
+        __builtin_avr_delay_cycles(MATRIX_MUL_SELECT_DELAY);
+#endif
+        uint8_t pin_state = readPin(col_pins[col_index]);
+
+        // Populate the matrix row with the state of the col pin
+        current_row_value |= pin_state ? 0 : (MATRIX_ROW_SHIFTER << col_index);
+    }
+
+    // Unselect row
+    unselect_row(current_row);
+
+    // If the row has changed, store the row and return the changed flag.
+    if (current_matrix[current_row] != current_row_value) {
+        current_matrix[current_row] = current_row_value;
+        return true;
+    }
+    return false;
+}
+
+#    elif (DIODE_DIRECTION == ROW2COL)
+
+static void select_col(uint8_t col) {
+    setPinOutput(col_pins[col]);
+    writePinLow(col_pins[col]);
+}
+
+static void unselect_col(uint8_t col) { setPinInputHigh(col_pins[col]); }
+
+static void unselect_cols(void) {
+    for (uint8_t x = 0; x < MATRIX_COLS; x++) {
+        setPinInputHigh(col_pins[x]);
+    }
+}
+
+static void init_pins(void) {
+    unselect_cols();
+    for (uint8_t x = 0; x < MATRIX_ROWS; x++) {
+        setPinInputHigh(row_pins[x]);
+    }
+}
+
+static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col) {
+    bool matrix_changed = false;
+
+    // Select col and wait for col selecton to stabilize
+    select_col(current_col);
+    matrix_io_delay();
+
+    // For each row...
+    for (uint8_t row_index = 0; row_index < MATRIX_ROWS; row_index++) {
+        // Store last value of row prior to reading
+        matrix_row_t last_row_value    = current_matrix[row_index];
+        matrix_row_t current_row_value = last_row_value;
+
+        // Check row pin state
+        if (readPin(row_pins[row_index]) == 0) {
+            // Pin LO, set col bit
+            current_row_value |= (MATRIX_ROW_SHIFTER << current_col);
+        } else {
+            // Pin HI, clear col bit
+            current_row_value &= ~(MATRIX_ROW_SHIFTER << current_col);
+        }
+
+        // Determine if the matrix changed state
+        if ((last_row_value != current_row_value)) {
+            matrix_changed |= true;
+            current_matrix[row_index] = current_row_value;
+        }
+    }
+
+    // Unselect col
+    unselect_col(current_col);
+
+    return matrix_changed;
+}
+
+#    else
+#        error DIODE_DIRECTION must be one of COL2ROW or ROW2COL!
+#    endif
+#else
+#    error DIODE_DIRECTION is not defined!
+#endif
+
+void matrix_init_custom(void) {
+    // initialize key pins
+    init_pins();
+
+    // initialize matrix state: all keys off
+    for (uint8_t i = 0; i < MATRIX_ROWS; i++) {
+        raw_matrix[i] = 0;
+        matrix[i]     = 0;
+    }
+
+}
+
+bool matrix_scan_custom(matrix_row_t current_matrix[]) {
+    bool changed = false;
+
+#if defined(DIRECT_PINS) || (DIODE_DIRECTION == COL2ROW)
+    // Set row, read cols
+    for (uint8_t current_row = 0; current_row < MATRIX_ROWS; current_row++) {
+        changed |= read_cols_on_row(current_matrix, current_row);
+    }
+#elif (DIODE_DIRECTION == ROW2COL)
+    // Set col, read rows
+    for (uint8_t current_col = 0; current_col < MATRIX_COLS; current_col++) {
+        changed |= read_rows_on_col(current_matrix, current_col);
+    }
+#endif
+
+    return changed;
+}
diff --git a/qmk/keyboards/handwired/symmetric70_proto/readme.md b/qmk/keyboards/handwired/symmetric70_proto/readme.md
new file mode 100644
index 00000000..01c2889c
--- /dev/null
+++ b/qmk/keyboards/handwired/symmetric70_proto/readme.md
@@ -0,0 +1,20 @@
+# symmetric70_proto
+
+![symmetric70_proto](https://i.imgur.com/Br4pH9ol.jpg)
+![74HC157_schematic](https://i.imgur.com/8IU8Jgcl.jpg)
+
+A compact 70keys keyboard (prototype) designed by mtei
+
+* Keyboard Maintainer: [mtei](https://github.com/mtei)
+* Hardware Supported: Pro Micro (ATmega32U4) & 74HC157
+* Hardware Availability: This is just prototype
+
+Make example for this keyboard (after setting up your build environment):
+
+    make symmetric70_proto:default
+
+Flashing example for this keyboard:
+
+    make symmetric70_proto:default:flash
+
+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).
diff --git a/qmk/keyboards/handwired/symmetric70_proto/rules.mk b/qmk/keyboards/handwired/symmetric70_proto/rules.mk
new file mode 100644
index 00000000..494dc6fb
--- /dev/null
+++ b/qmk/keyboards/handwired/symmetric70_proto/rules.mk
@@ -0,0 +1,27 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = no        # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # 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
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+
+CUSTOM_MATRIX = lite
+SRC += matrix.c
+
+## CONSOLE_ENABLE = yes # matrix dump
diff --git a/qmk/keyboards/handwired/symmetric70_proto/symmetric70_proto.c b/qmk/keyboards/handwired/symmetric70_proto/symmetric70_proto.c
new file mode 100644
index 00000000..daab4f09
--- /dev/null
+++ b/qmk/keyboards/handwired/symmetric70_proto/symmetric70_proto.c
@@ -0,0 +1,25 @@
+/* Copyright 2020 mtei
+ *
+ * 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 "symmetric70_proto.h"
+
+__attribute__((weak)) void keyboard_post_init_user(void) {
+  // Customise these values to desired behaviour
+  debug_enable=true;
+  debug_matrix=true;
+  //debug_keyboard=true;
+  //debug_mouse=true;
+}
diff --git a/qmk/keyboards/handwired/symmetric70_proto/symmetric70_proto.h b/qmk/keyboards/handwired/symmetric70_proto/symmetric70_proto.h
new file mode 100644
index 00000000..4a8539b5
--- /dev/null
+++ b/qmk/keyboards/handwired/symmetric70_proto/symmetric70_proto.h
@@ -0,0 +1,41 @@
+/* Copyright 2020 mtei
+ *
+ * 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 is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT( \
+     L00, L01, L02, L03, L04, L05, L06,            R06, R05, R04, R03, R02, R01, R00, \
+      L10, L11, L12, L13, L14, L15, L16,          R16, R15, R14, R13, R12, R11, R10, \
+     L20, L21, L22, L23, L24, L25, L26,            R26, R25, R24, R23, R22, R21, R20, \
+    L30, L31, L32, L33, L34, L35, L36, L37,    R37, R36, R35, R34, R33, R32, R31, R30, \
+    L40,      L42, L43, L44, L45,      L47,    R47,      R45, R44, R43, R42,      R40  \
+) { \
+    { L00, L01,   L02, L03, L04, L05, L06,   KC_NO,   KC_NO, R06, R05, R04, R03, R02, R01,   R00 }, \
+    { L10, L11,   L12, L13, L14, L15, L16,   KC_NO,   KC_NO, R16, R15, R14, R13, R12, R11,   R10 }, \
+    { L20, L21,   L22, L23, L24, L25, L26,   KC_NO,   KC_NO, R26, R25, R24, R23, R22, R21,   R20 }, \
+    { L30, L31,   L32, L33, L34, L35, L36,   L37,     R37,   R36, R35, R34, R33, R32, R31,   R30 }, \
+    { L40, KC_NO, L42, L43, L44, L45, KC_NO, L47,     R47, KC_NO, R45, R44, R43, R42, KC_NO, R40 }  \
+}
diff --git a/qmk/keyboards/handwired/videowriter/config.h b/qmk/keyboards/handwired/videowriter/config.h
index bcf059b6..73162b6d 100644
--- a/qmk/keyboards/handwired/videowriter/config.h
+++ b/qmk/keyboards/handwired/videowriter/config.h
@@ -20,12 +20,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID 0xFEED
-#define PRODUCT_ID 0x0000
+#define VENDOR_ID 0x515A // "QZ"
+#define PRODUCT_ID 0x5657 // "VW"
 #define DEVICE_VER 0x0001
 #define MANUFACTURER Magnavox
 #define PRODUCT Videowriter
-#define DESCRIPTION Keyboard
 
 /* key matrix size */
 #define MATRIX_ROWS 10
@@ -59,80 +58,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
-
-/*
- * Magic Key Options
- *
- * Magic keys are hotkey commands that allow control over firmware functions of
- * the keyboard. They are best used in combination with the HID Listen program,
- * found here: https://www.pjrc.com/teensy/hid_listen.html
- *
- * The options below allow the magic key functionality to be changed. This is
- * useful if your keyboard/keypad is missing keys and you want magic key support.
- *
- */
-
-/* key combination for magic key command */
-/* defined by default; to change, uncomment and set to the combination you want */
-//#define IS_COMMAND() (get_mods() == MOD_MASK_SHIFT)
-
-/* control how magic key switches layers */
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS  true
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS  true
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false
-
-/* override magic key keymap */
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM
-//#define MAGIC_KEY_HELP           H
-//#define MAGIC_KEY_HELP_ALT       SLASH
-//#define MAGIC_KEY_DEBUG          D
-//#define MAGIC_KEY_DEBUG_MATRIX   X
-//#define MAGIC_KEY_DEBUG_KBD      K
-//#define MAGIC_KEY_DEBUG_MOUSE    M
-//#define MAGIC_KEY_VERSION        V
-//#define MAGIC_KEY_STATUS         S
-//#define MAGIC_KEY_CONSOLE        C
-//#define MAGIC_KEY_LAYER0         0
-//#define MAGIC_KEY_LAYER0_ALT     GRAVE
-//#define MAGIC_KEY_LAYER1         1
-//#define MAGIC_KEY_LAYER2         2
-//#define MAGIC_KEY_LAYER3         3
-//#define MAGIC_KEY_LAYER4         4
-//#define MAGIC_KEY_LAYER5         5
-//#define MAGIC_KEY_LAYER6         6
-//#define MAGIC_KEY_LAYER7         7
-//#define MAGIC_KEY_LAYER8         8
-//#define MAGIC_KEY_LAYER9         9
-//#define MAGIC_KEY_BOOTLOADER     B
-//#define MAGIC_KEY_BOOTLOADER_ALT ESC
-//#define MAGIC_KEY_LOCK           CAPS
-//#define MAGIC_KEY_EEPROM         E
-//#define MAGIC_KEY_EEPROM_CLEAR   BSPACE
-//#define MAGIC_KEY_NKRO           N
-//#define MAGIC_KEY_SLEEP_LED      Z
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-/* disable debug print */
-//#define NO_DEBUG
-
-/* disable print */
-//#define NO_PRINT
-
-/* disable action features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
-
 /* disable these deprecated features by default */
 #define NO_ACTION_MACRO
 #define NO_ACTION_FUNCTION
 
 /* Bootmagic Lite key configuration */
-// #define BOOTMAGIC_LITE_ROW 0
-// #define BOOTMAGIC_LITE_COLUMN 0
+#define BOOTMAGIC_LITE_ROW 1
+#define BOOTMAGIC_LITE_COLUMN 7
diff --git a/qmk/keyboards/handwired/videowriter/keymaps/oleg/keymap.c b/qmk/keyboards/handwired/videowriter/keymaps/oleg/keymap.c
index 76587f6f..fec2ed31 100644
--- a/qmk/keyboards/handwired/videowriter/keymaps/oleg/keymap.c
+++ b/qmk/keyboards/handwired/videowriter/keymaps/oleg/keymap.c
@@ -38,9 +38,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |---------------------------------------------------------------------------------------|
  * | ~`|  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  = |   BSp| fn1 |
  * |---------------------------------------------------------------------------------------|
- * |Tab/fn1| Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |  | menu|
+ * |Tab/fn1| Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |  |  \| |
  * |---------------------------------------------------------------------------------------|
- * |Ctrl  |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  "  | enter ||\ctrl|
+ * |Ctrl  |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  "  | enter  | gui |
  * |---------------------------------------------------------------------------------------'
  * |  Shift  |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  <  |  >  |  ?  |   Shift   |
  * `---------------------------------------------------------------------------------'
@@ -51,8 +51,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT(
 		        KC_VOLD, KC_VOLU, KC_MUTE,      KC_MPRV, KC_MPLY, KC_MSTP, KC_MNXT,    KC_PSCR, KC_SLCK, KC_INS,      KC_LEFT, KC_DOWN, KC_UP, KC_RGHT,
 		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, MO(_FN1),
-		LT(_FN1, 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_APP,
-		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,              RCTL_T(KC_BSLS),
+		LT(_FN1, 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_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_RGUI,
 		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_LALT,                              KC_SPC,                                          KC_CAPS
   ),
@@ -61,11 +61,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * sect = section sign, Unicode 0x00A7
  * ,---------------------------------------------------------------------------------------.
  * |   ,----------------.  ,-----------------------.  ,--------------.          |pgup|     |
- * |   |     |    |     |  |     |     |      |sect|  |  |reset|pause|     |home|pgdn| end |
+ * |   |     |    |     |  |     |     |      |    |  |  |reset|pause|     |home|pgdn| end |
  * |---------------------------------------------------------------------------------------|
  * |Esc| F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9 | F10 | F11 | F12 |  del |     |
  * |---------------------------------------------------------------------------------------|
- * |      | mlb | mup | mrb | ms+ |     |     |     |  up |     |     |     |     |  | gui |
+ * |      | mlb | mup | mrb | ms+ |     |     |     |  up |     |     |     |     |  |ctrl |
  * |---------------------------------------------------------------------------------------|
  * |      |  ml | mdn | mr  | ms- |     |     | left| down|right|     |     |        |     |
  * |---------------------------------------------------------------------------------------'
@@ -76,9 +76,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
  
   [_FN1] = LAYOUT(
-		      	_______, _______, _______,      _______, _______, _______, UC(0x00A7),    _______, RESET,  KC_PAUS,    KC_HOME, KC_PGDN, KC_PGUP, KC_END,
+		      	_______, _______, _______,      _______, _______, _______, _______,    _______, RESET,  KC_PAUS,    KC_HOME, KC_PGDN, KC_PGUP, KC_END,
 		_______, 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_DEL,  _______,
-		_______, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U ,_______, _______, _______, KC_UP,   _______, _______, _______, _______,          KC_RGUI,
+		_______, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U ,_______, _______, _______, KC_UP,   _______, _______, _______, _______,          KC_RCTRL,
 		_______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______,          _______,
 		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
 		  _______,                                _______,                                          _______
diff --git a/qmk/keyboards/handwired/videowriter/keymaps/via/config.h b/qmk/keyboards/handwired/videowriter/keymaps/via/config.h
new file mode 100644
index 00000000..3f2896a6
--- /dev/null
+++ b/qmk/keyboards/handwired/videowriter/keymaps/via/config.h
@@ -0,0 +1,20 @@
+/* Copyright 2019 DmNosachev
+ *
+ * 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
+
+// Have't added any diodes in this particular convertion project
+#define MATRIX_HAS_GHOST
diff --git a/qmk/keyboards/handwired/videowriter/keymaps/via/keymap.c b/qmk/keyboards/handwired/videowriter/keymaps/via/keymap.c
new file mode 100644
index 00000000..e75ab170
--- /dev/null
+++ b/qmk/keyboards/handwired/videowriter/keymaps/via/keymap.c
@@ -0,0 +1,89 @@
+/* Copyright 2019 DmNosachev
+ *
+ * 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] = {
+
+/* 
+ * ,---------------------------------------------------------------------------------------.
+ * |   ,----------------.  ,-----------------------.  ,--------------.          | up |     |
+ * |   |vol- |vol+| mute|  | prev| play| stop| next|  |prsc|scrlk|ins|     |left|down|right|
+ * |---------------------------------------------------------------------------------------|
+ * | ~`|  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  = |   BSp| L1  |
+ * |---------------------------------------------------------------------------------------|
+ * |Tab/L1 | Q  |  W  |  E  |  R  |  T  |  Y  |  U  |  I  |  O  |  P  |  [  |  ]  |  |  \| |
+ * |---------------------------------------------------------------------------------------|
+ * |Ctrl  |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  ;  |  "  | enter  | gui |
+ * |---------------------------------------------------------------------------------------'
+ * |  Shift  |  Z  |  X  |  C  |  V  |  B  |  N  |  M  |  <  |  >  |  ?  |   Shift   |
+ * `---------------------------------------------------------------------------------'
+ *        | Alt  |                     Space                         | Caps  |
+ *        `------------------------------------------------------------------'
+ */
+ 
+  [0] = LAYOUT(
+		        KC_VOLD, KC_VOLU, KC_MUTE,      KC_MPRV, KC_MPLY, KC_MSTP, KC_MNXT,    KC_PSCR, KC_SLCK, KC_INS,      KC_LEFT, KC_DOWN, KC_UP, KC_RGHT,
+		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, MO(1),
+		LT(1, 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_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_RGUI,
+		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_LALT,                              KC_SPC,                                          KC_CAPS
+  ),
+
+/* 
+ * sect = section sign, Unicode 0x00A7
+ * ,---------------------------------------------------------------------------------------.
+ * |   ,----------------.  ,-----------------------.  ,--------------.          |pgup|     |
+ * |   |     |    |     |  |     |     |      |    |  |  |reset|pause|     |home|pgdn| end |
+ * |---------------------------------------------------------------------------------------|
+ * |Esc| F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9 | F10 | F11 | F12 |  del |     |
+ * |---------------------------------------------------------------------------------------|
+ * |      | mlb | mup | mrb | ms+ |     |     |     |  up |     |     |     |     |  |ctrl |
+ * |---------------------------------------------------------------------------------------|
+ * |      |  ml | mdn | mr  | ms- |     |     | left| down|right|     |     |        |     |
+ * |---------------------------------------------------------------------------------------'
+ * |         |     |     |     |     |     |     |     |     |     |     |           |   
+ * `---------------------------------------------------------------------------------'
+ *       |      |                                                   |       |
+ *       `------------------------------------------------------------------'
+ */
+ 
+  [1] = LAYOUT(
+		      	_______, _______, _______,      _______, _______, _______, _______,    _______, RESET,  KC_PAUS,    KC_HOME, KC_PGDN, KC_PGUP, KC_END,
+		_______, 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_DEL,  _______,
+		_______, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U ,_______, _______, _______, KC_UP,   _______, _______, _______, _______,          KC_RCTRL,
+		_______, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______,          _______,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		  _______,                                _______,                                          _______
+  ),
+  [2] = LAYOUT(
+		      	 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		  _______,                                _______,                                          _______
+  ),
+  [3] = LAYOUT(
+		      	 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+		_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+		  _______,                                _______,                                          _______
+  )
+};
diff --git a/qmk/keyboards/handwired/videowriter/keymaps/via/rules.mk b/qmk/keyboards/handwired/videowriter/keymaps/via/rules.mk
new file mode 100644
index 00000000..43061db1
--- /dev/null
+++ b/qmk/keyboards/handwired/videowriter/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
\ No newline at end of file
diff --git a/qmk/keyboards/handwired/videowriter/rules.mk b/qmk/keyboards/handwired/videowriter/rules.mk
index 99931790..b75d3784 100644
--- a/qmk/keyboards/handwired/videowriter/rules.mk
+++ b/qmk/keyboards/handwired/videowriter/rules.mk
@@ -14,11 +14,11 @@ BOOTLOADER = caterina
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = lite       # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
+CONSOLE_ENABLE = no        # Console for debug
+COMMAND_ENABLE = no        # 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
diff --git a/qmk/keyboards/helix/local_drivers/ssd1306.c b/qmk/keyboards/helix/local_drivers/ssd1306.c
index c6fc4b78..1cfb3803 100644
--- a/qmk/keyboards/helix/local_drivers/ssd1306.c
+++ b/qmk/keyboards/helix/local_drivers/ssd1306.c
@@ -8,7 +8,7 @@
 #ifndef LOCAL_GLCDFONT
 #include "common/glcdfont.c"
 #else
-#include <helixfont.h>
+#include "helixfont.h"
 #endif
 #ifdef PROTOCOL_LUFA
 #include "lufa.h"
diff --git a/qmk/keyboards/helix/pico/keymaps/default/readme.md b/qmk/keyboards/helix/pico/keymaps/default/readme.md
index 3c097247..78909702 100644
--- a/qmk/keyboards/helix/pico/keymaps/default/readme.md
+++ b/qmk/keyboards/helix/pico/keymaps/default/readme.md
@@ -116,15 +116,13 @@ build
 ```
 $ make helix/pico:default
 $ make helix/pico/back:default               # with backlight
-$ make HELIX=no_ani helix/pico/back:default  # with backlight without animation
+$ make HELIX=no-ani helix/pico/back:default  # with backlight without animation
 $ make helix/pico/under:default              # with underglow
 ```
 
-build (experimental use of split_common)
+build (experimental use of split_common with backlight)
 ```
 $ make helix/pico/sc:default
-$ make helix/pico/sc/back:default
-$ make helix/pico/sc/under:default
 ```
 
 flash to keyboard
diff --git a/qmk/keyboards/helix/pico/local_features.mk b/qmk/keyboards/helix/pico/local_features.mk
index a9844468..25dcb8b6 100644
--- a/qmk/keyboards/helix/pico/local_features.mk
+++ b/qmk/keyboards/helix/pico/local_features.mk
@@ -5,6 +5,8 @@
 #   combinations of standard options) into QMK standard options.
 #
 
+KEYBOARD_LOCAL_FEATURES_MK :=
+
 define HELIX_CUSTOMISE_MSG
   $(info Helix Spacific Build Options)
   $(info -  OLED_ENABLE          = $(OLED_ENABLE))
@@ -15,42 +17,61 @@ define HELIX_CUSTOMISE_MSG
   $(info )
 endef
 
+define HELIX_HELP_MSG
+  $(info Helix keyboard convenient command line option)
+  $(info -    make HELIX=<options> helix/pico:<keymap>)
+  $(info -    option= oled | back | under | na | no-ani)
+  $(info -             ios | sc | split-common | scan | verbose)
+  $(info -    ex.)
+  $(info -      make HELIX=oled     helix/pico:<keymap>)
+  $(info -      make HELIX=back     helix/pico:<keymap>)
+  $(info -      make HELIX=under    helix/pico:<keymap>)
+  $(info -      make HELIX=back,na  helix/pico:<keymap>)
+  $(info -      make HELIX=back,ios helix/pico:<keymap>)
+  $(info )
+endef
+
   ifneq ($(strip $(HELIX)),)
-    ### Helix keyboard keymap: convenient command line option
-    ##    make HELIX=<options> helix/pico:<keymap>
-    ##    option= oled | back | under | no_ani | na | ios | verbose
-    ##    ex.
-    ##      make HELIX=oled          helix/pico:<keymap>
-    ##      make HELIX=oled,back     helix/pico:<keymap>
-    ##      make HELIX=oled,under    helix/pico:<keymap>
-    ##      make HELIX=oled,back,na  helix/pico:<keymap>
-    ##      make HELIX=oled,back,ios helix/pico:<keymap>
-    ##
-    ifeq ($(findstring oled,$(HELIX)), oled)
+    COMMA=,
+    helix_option := $(subst $(COMMA), , $(HELIX))
+    ifneq ($(filter help,$(helix_option)),)
+      $(eval $(call HELIX_HELP_MSG))
+      $(error )
+    endif
+    ifneq ($(filter oled,$(helix_option)),)
       OLED_ENABLE = yes
     endif
-    ifeq ($(findstring back,$(HELIX)), back)
+    ifneq ($(filter back,$(helix_option)),)
       LED_BACK_ENABLE = yes
-    else ifeq ($(findstring under,$(HELIX)), under)
+    else ifneq ($(filter under,$(helix_option)),)
       LED_UNDERGLOW_ENABLE = yes
     endif
-    ifeq ($(findstring na,$(HELIX)), na)
+    ifneq ($(filter na,$(helix_option)),)
       LED_ANIMATIONS = no
     endif
-    ifeq ($(findstring no_ani,$(HELIX)), no_ani)
+    ifneq ($(filter no_ani,$(helix_option)),)
       LED_ANIMATIONS = no
     endif
-    ifeq ($(findstring ios,$(HELIX)), ios)
+    ifneq ($(filter no-ani,$(helix_option)),)
+      LED_ANIMATIONS = no
+    endif
+    ifneq ($(filter ios,$(helix_option)),)
       IOS_DEVICE_ENABLE = yes
     endif
-    ifeq ($(findstring scan,$(HELIX)), scan)
+    ifneq ($(filter sc,$(helix_option)),)
+      SPLIT_KEYBOARD = yes
+    endif
+    ifneq ($(filter split-common,$(helix_option)),)
+      SPLIT_KEYBOARD = yes
+    endif
+    ifneq ($(filter scan,$(helix_option)),)
       # use DEBUG_MATRIX_SCAN_RATE
       # see docs/newbs_testing_debugging.md
       OPT_DEFS +=  -DDEBUG_MATRIX_SCAN_RATE
       CONSOLE_ENABLE = yes
       SHOW_VERBOSE_INFO = yes
     endif
-    ifeq ($(findstring verbose,$(HELIX)), verbose)
+    ifneq ($(filter verbose,$(helix_option)),)
       SHOW_VERBOSE_INFO = yes
     endif
     SHOW_HELIX_OPTIONS = yes
@@ -120,7 +141,8 @@ ifneq ($(strip $(SHOW_HELIX_OPTIONS)),)
      $(info -- OLED_DRIVER_ENABLE = $(OLED_DRIVER_ENABLE))
      $(info -- CONSOLE_ENABLE     = $(CONSOLE_ENABLE))
      $(info -- OPT_DEFS           = $(OPT_DEFS))
-     $(info -- LTO_ENABLE = $(LTO_ENABLE))
+     $(info -- SPLIT_KEYBOARD     = $(SPLIT_KEYBOARD))
+     $(info -- LTO_ENABLE         = $(LTO_ENABLE))
      $(info )
   endif
 endif
diff --git a/qmk/keyboards/helix/pico/qmk_conf/config.h b/qmk/keyboards/helix/pico/qmk_conf/config.h
new file mode 100644
index 00000000..76531851
--- /dev/null
+++ b/qmk/keyboards/helix/pico/qmk_conf/config.h
@@ -0,0 +1,43 @@
+/*
+This is the c configuration file for the keymap
+
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+Copyright 2015 Jack Humbert
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+// place overrides here
+
+#ifdef AUDIO_ENABLE
+  #define STARTUP_SONG SONG(STARTUP_SOUND)
+  #define AUDIO_CLICKY
+#endif
+
+// If you need more program area, try select and reduce rgblight modes to use.
+
+// Selection of RGBLIGHT MODE to use.
+#if defined(LED_ANIMATIONS)
+   #define RGBLIGHT_EFFECT_BREATHING
+   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
+   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+   #define RGBLIGHT_EFFECT_SNAKE
+   #define RGBLIGHT_EFFECT_KNIGHT
+   #define RGBLIGHT_EFFECT_CHRISTMAS
+   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
+   //#define RGBLIGHT_EFFECT_RGB_TEST
+   //#define RGBLIGHT_EFFECT_ALTERNATING
+#endif
diff --git a/qmk/keyboards/helix/pico/qmk_conf/rules.mk b/qmk/keyboards/helix/pico/qmk_conf/rules.mk
new file mode 100644
index 00000000..966e64d6
--- /dev/null
+++ b/qmk/keyboards/helix/pico/qmk_conf/rules.mk
@@ -0,0 +1,4 @@
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+AUDIO_ENABLE = yes          # Audio output on port B5
+
+include $(strip $(KEYBOARD_LOCAL_FEATURES_MK))
diff --git a/qmk/keyboards/helix/pico/sc/rules.mk b/qmk/keyboards/helix/pico/sc/rules.mk
index d38a6180..4ed0672a 100644
--- a/qmk/keyboards/helix/pico/sc/rules.mk
+++ b/qmk/keyboards/helix/pico/sc/rules.mk
@@ -1 +1,2 @@
 SPLIT_KEYBOARD = yes
+LED_BACK_ENABLE = yes
diff --git a/qmk/keyboards/helix/rev1/config.h b/qmk/keyboards/helix/rev1/config.h
index 6c6ebea6..7e9616ba 100644
--- a/qmk/keyboards/helix/rev1/config.h
+++ b/qmk/keyboards/helix/rev1/config.h
@@ -26,7 +26,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define PRODUCT         Helix Alpha
 #define DESCRIPTION     A split keyboard for the cheap makers
 
-#include <serial_config.h>
+#include "serial_config.h"
 
 #define HELIX_ROWS 5
 
diff --git a/qmk/keyboards/helix/rev1/keymaps/OLED_sample/keymap.c b/qmk/keyboards/helix/rev1/keymaps/OLED_sample/keymap.c
index cc73e36f..6838b90e 100644
--- a/qmk/keyboards/helix/rev1/keymaps/OLED_sample/keymap.c
+++ b/qmk/keyboards/helix/rev1/keymaps/OLED_sample/keymap.c
@@ -1,6 +1,6 @@
 #include QMK_KEYBOARD_H
 #include "bootloader.h"
-#include "LUFA/Drivers/Peripheral/TWI.h"
+#include <LUFA/Drivers/Peripheral/TWI.h>
 #ifdef AUDIO_ENABLE
   #include "audio.h"
 #endif
diff --git a/qmk/keyboards/helix/rev2/config.h b/qmk/keyboards/helix/rev2/config.h
index f85896fb..e4ddf949 100644
--- a/qmk/keyboards/helix/rev2/config.h
+++ b/qmk/keyboards/helix/rev2/config.h
@@ -48,6 +48,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   #define SSD1306OLED
 #endif
 
+#define OLED_UPDATE_INTERVAL 50
+
 /* Select rows configuration */
 // Rows are 4 or 5
 // #define HELIX_ROWS 5 see ./rules.mk
diff --git a/qmk/keyboards/helix/rev2/keymaps/default/keymap.c b/qmk/keyboards/helix/rev2/keymaps/default/keymap.c
index c575287e..d5209d85 100644
--- a/qmk/keyboards/helix/rev2/keymaps/default/keymap.c
+++ b/qmk/keyboards/helix/rev2/keymaps/default/keymap.c
@@ -1,3 +1,19 @@
+/* Copyright 2020 yushakobo
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include QMK_KEYBOARD_H
 #include "bootloader.h"
 #ifdef PROTOCOL_LUFA
@@ -7,17 +23,6 @@
 #ifdef AUDIO_ENABLE
   #include "audio.h"
 #endif
-#ifdef SSD1306OLED
-  #include "ssd1306.h"
-#endif
-
-
-#ifdef RGBLIGHT_ENABLE
-//Following line allows macro to read current RGB settings
-extern rgblight_config_t rgblight_config;
-#endif
-
-extern uint8_t is_master;
 
 // Each layer gets a name for readability, which is then used in the keymap matrix below.
 // The underscores don't mean anything - you can have a layer called STUFF or any other name.
@@ -420,16 +425,16 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         if (record->event.pressed) {
           rgblight_mode(RGB_current_mode);
           rgblight_step();
-          RGB_current_mode = rgblight_config.mode;
+          RGB_current_mode = rgblight_get_mode();
         }
       #endif
       return false;
       break;
     case EISU:
       if (record->event.pressed) {
-        if(keymap_config.swap_lalt_lgui==false){
+        if (is_mac_mode()) {
           register_code(KC_LANG2);
-        }else{
+        } else {
           SEND_STRING(SS_LALT("`"));
         }
       } else {
@@ -439,9 +444,9 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       break;
     case KANA:
       if (record->event.pressed) {
-        if(keymap_config.swap_lalt_lgui==false){
+        if (is_mac_mode()) {
           register_code(KC_LANG1);
-        }else{
+        } else {
           SEND_STRING(SS_LALT("`"));
         }
       } else {
@@ -454,7 +459,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
         if (record->event.pressed) {
           eeconfig_update_rgblight_default();
           rgblight_enable();
-          RGB_current_mode = rgblight_config.mode;
+          RGB_current_mode = rgblight_get_mode();
         }
       #endif
       break;
@@ -462,12 +467,16 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   return true;
 }
 
+#ifdef SSD1306OLED
+  #include "ssd1306.h"
+#endif
+
 void matrix_init_user(void) {
     #ifdef AUDIO_ENABLE
         startup_user();
     #endif
     #ifdef RGBLIGHT_ENABLE
-      RGB_current_mode = rgblight_config.mode;
+      RGB_current_mode = rgblight_get_mode();
     #endif
     //SSD1306 OLED init, make sure to add #define SSD1306OLED in config.h
     #ifdef SSD1306OLED
@@ -500,132 +509,3 @@ void music_scale_user(void)
 }
 
 #endif
-
-
-//SSD1306 OLED update loop, make sure to add #define SSD1306OLED in config.h
-#ifdef SSD1306OLED
-
-void matrix_scan_user(void) {
-     iota_gfx_task();  // this is what updates the display continuously
-}
-
-void matrix_update(struct CharacterMatrix *dest,
-                          const struct CharacterMatrix *source) {
-  if (memcmp(dest->display, source->display, sizeof(dest->display))) {
-    memcpy(dest->display, source->display, sizeof(dest->display));
-    dest->dirty = true;
-  }
-}
-
-//assign the right code to your layers for OLED display
-#define L_BASE 0
-#define L_LOWER (1<<_LOWER)
-#define L_RAISE (1<<_RAISE)
-#define L_ADJUST (1<<_ADJUST)
-#define L_ADJUST_TRI (L_ADJUST|L_RAISE|L_LOWER)
-
-static void render_logo(struct CharacterMatrix *matrix) {
-
-  static const char helix_logo[] PROGMEM ={
-    0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94,
-    0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4,
-    0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0xd4,
-    0};
-  matrix_write_P(matrix, helix_logo);
-  //matrix_write_P(&matrix, PSTR(" Split keyboard kit"));
-}
-
-static void render_rgbled_status(bool full, struct CharacterMatrix *matrix) {
-#ifdef RGBLIGHT_ENABLE
-  char buf[30];
-  if (RGBLIGHT_MODES > 1 && rgblight_config.enable) {
-      if (full) {
-          snprintf(buf, sizeof(buf), " LED %2d: %d,%d,%d ",
-                   rgblight_config.mode,
-                   rgblight_config.hue/RGBLIGHT_HUE_STEP,
-                   rgblight_config.sat/RGBLIGHT_SAT_STEP,
-                   rgblight_config.val/RGBLIGHT_VAL_STEP);
-      } else {
-          snprintf(buf, sizeof(buf), "[%2d] ",rgblight_config.mode);
-      }
-      matrix_write(matrix, buf);
-  }
-#endif
-}
-
-static void render_layer_status(struct CharacterMatrix *matrix) {
-  // Define layers here, Have not worked out how to have text displayed for each layer. Copy down the number you see and add a case for it below
-  char buf[10];
-  matrix_write_P(matrix, PSTR("Layer: "));
-    switch (layer_state) {
-        case L_BASE:
-           matrix_write_P(matrix, PSTR("Default"));
-           break;
-        case L_RAISE:
-           matrix_write_P(matrix, PSTR("Raise"));
-           break;
-        case L_LOWER:
-           matrix_write_P(matrix, PSTR("Lower"));
-           break;
-        case L_ADJUST:
-        case L_ADJUST_TRI:
-           matrix_write_P(matrix, PSTR("Adjust"));
-           break;
-        default:
-           matrix_write_P(matrix, PSTR("Undef-"));
-           snprintf(buf,sizeof(buf), "%ld", layer_state);
-           matrix_write(matrix, buf);
-    }
-}
-
-void render_status(struct CharacterMatrix *matrix) {
-
-  // Render to mode icon
-  static const char os_logo[][2][3] PROGMEM  ={{{0x95,0x96,0},{0xb5,0xb6,0}},{{0x97,0x98,0},{0xb7,0xb8,0}}};
-  if(keymap_config.swap_lalt_lgui==false){
-    matrix_write_P(matrix, os_logo[0][0]);
-    matrix_write_P(matrix, PSTR("\n"));
-    matrix_write_P(matrix, os_logo[0][1]);
-  }else{
-    matrix_write_P(matrix, os_logo[1][0]);
-    matrix_write_P(matrix, PSTR("\n"));
-    matrix_write_P(matrix, os_logo[1][1]);
-  }
-
-  matrix_write_P(matrix, PSTR(" "));
-  render_layer_status(matrix);
-  matrix_write_P(matrix, PSTR("\n"));
-
-  // Host Keyboard LED Status
-  matrix_write_P(matrix, (host_keyboard_leds() & (1<<USB_LED_NUM_LOCK)) ?
-                 PSTR("NUMLOCK") : PSTR("       "));
-  matrix_write_P(matrix, (host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK)) ?
-                 PSTR("CAPS") : PSTR("    "));
-  matrix_write_P(matrix, (host_keyboard_leds() & (1<<USB_LED_SCROLL_LOCK)) ?
-                 PSTR("SCLK") : PSTR("    "));
-  matrix_write_P(matrix, PSTR("\n"));
-  render_rgbled_status(true, matrix);
-}
-
-
-void iota_gfx_task_user(void) {
-  struct CharacterMatrix matrix;
-
-#if DEBUG_TO_SCREEN
-  if (debug_enable) {
-    return;
-  }
-#endif
-
-  matrix_clear(&matrix);
-  if(is_master){
-    render_status(&matrix);
-  }else{
-    render_logo(&matrix);
-    render_rgbled_status(false, &matrix);
-    render_layer_status(&matrix);
-  }
-  matrix_update(&display, &matrix);
-}
-
-#endif
diff --git a/qmk/keyboards/helix/rev2/keymaps/default/oled_display.c b/qmk/keyboards/helix/rev2/keymaps/default/oled_display.c
new file mode 100644
index 00000000..04d6408c
--- /dev/null
+++ b/qmk/keyboards/helix/rev2/keymaps/default/oled_display.c
@@ -0,0 +1,228 @@
+/* Copyright 2020 yushakobo
+ *
+ * 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 <stdio.h>
+#include <string.h>
+#include QMK_KEYBOARD_H
+
+#ifdef SSD1306OLED
+  #include "ssd1306.h"
+#endif
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+enum layer_number {
+    _QWERTY = 0,
+    _COLEMAK,
+    _DVORAK,
+    _LOWER,
+    _RAISE,
+    _ADJUST
+};
+
+//SSD1306 OLED update loop, make sure to add #define SSD1306OLED in config.h
+#if defined(SSD1306OLED) || defined(OLED_DRIVER_ENABLE)
+
+#    if defined(OLED_DRIVER_ENABLE)
+oled_rotation_t oled_init_user(oled_rotation_t rotation) {
+    if (is_keyboard_master()) {
+        return OLED_ROTATION_0;
+    } else {
+        return OLED_ROTATION_180;
+    }
+}
+#    else
+#        define oled_write(data,flag)    matrix_write(matrix, data)
+#        define oled_write_P(data,flag)  matrix_write_P(matrix, data)
+#    endif
+
+#    ifdef SSD1306OLED
+void matrix_scan_user(void) {
+    iota_gfx_task();  // this is what updates the display continuously
+}
+
+void matrix_update(struct CharacterMatrix *dest,
+                   const struct CharacterMatrix *source) {
+    if (memcmp(dest->display, source->display, sizeof(dest->display))) {
+        memcpy(dest->display, source->display, sizeof(dest->display));
+        dest->dirty = true;
+    }
+}
+#    endif
+
+//assign the right code to your layers for OLED display
+#define L_BASE 0
+#define L_LOWER (1<<_LOWER)
+#define L_RAISE (1<<_RAISE)
+#define L_ADJUST (1<<_ADJUST)
+#define L_ADJUST_TRI (L_ADJUST|L_RAISE|L_LOWER)
+
+#    ifdef SSD1306OLED
+static void render_logo(struct CharacterMatrix *matrix) {
+#    else
+static void render_logo(void) {
+#    endif
+
+    static const char helix_logo[] PROGMEM ={
+        0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94,
+        0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4,
+        0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0xd4,
+        0};
+    oled_write_P(helix_logo, false);
+}
+
+#    ifdef SSD1306OLED
+static void render_rgbled_status(bool full, struct CharacterMatrix *matrix) {
+#    else
+static void render_rgbled_status(bool full) {
+#    endif
+#    ifdef RGBLIGHT_ENABLE
+    char buf[30];
+    if (RGBLIGHT_MODES > 1 && rgblight_is_enabled()) {
+        if (full) {
+            snprintf(buf, sizeof(buf), " LED %2d: %d,%d,%d ",
+                     rgblight_get_mode(),
+                     rgblight_get_hue()/RGBLIGHT_HUE_STEP,
+                     rgblight_get_sat()/RGBLIGHT_SAT_STEP,
+                     rgblight_get_val()/RGBLIGHT_VAL_STEP);
+        } else {
+            snprintf(buf, sizeof(buf), "[%2d] ", rgblight_get_mode());
+        }
+        oled_write(buf, false);
+    }
+#    endif
+}
+
+#    ifdef SSD1306OLED
+static void render_layer_status(struct CharacterMatrix *matrix) {
+#    else
+static void render_layer_status(void) {
+#    endif
+  // Define layers here, Have not worked out how to have text displayed for each layer. Copy down the number you see and add a case for it below
+    char buf[10];
+    oled_write_P(PSTR("Layer: "), false);
+    switch (layer_state) {
+    case L_BASE:
+        oled_write_P(PSTR("Default"), false);
+        break;
+    case L_RAISE:
+        oled_write_P(PSTR("Raise"), false);
+        break;
+    case L_LOWER:
+        oled_write_P(PSTR("Lower"), false);
+        break;
+    case L_ADJUST:
+    case L_ADJUST_TRI:
+        oled_write_P(PSTR("Adjust"), false);
+        break;
+    default:
+        oled_write_P(PSTR("Undef-"), false);
+        snprintf(buf,sizeof(buf), "%ld", layer_state);
+        oled_write(buf, false);
+    }
+    oled_write_P(PSTR("\n"), false);
+}
+
+#    ifdef SSD1306OLED
+void render_status(struct CharacterMatrix *matrix) {
+#    else
+void render_status(void) {
+#    endif
+  // Render to mode icon
+    static const char os_logo[][2][3] PROGMEM = {{{0x95,0x96,0},{0xb5,0xb6,0}},{{0x97,0x98,0},{0xb7,0xb8,0}}};
+    if (is_mac_mode()) {
+        oled_write_P(os_logo[0][0], false);
+        oled_write_P(PSTR("\n"), false);
+        oled_write_P(os_logo[0][1], false);
+    } else {
+        oled_write_P(os_logo[1][0], false);
+        oled_write_P(PSTR("\n"), false);
+        oled_write_P(os_logo[1][1], false);
+    }
+
+    oled_write_P(PSTR(" "), false);
+#    ifdef SSD1306OLED
+    render_layer_status(matrix);
+#    else
+    render_layer_status();
+#    endif
+
+    // Host Keyboard LED Status
+    led_t led_state = host_keyboard_led_state();
+    oled_write_P(led_state.num_lock ? PSTR("NUMLOCK") : PSTR("       "), false);
+    oled_write_P(led_state.caps_lock ? PSTR("CAPS") : PSTR("    "), false);
+    oled_write_P(led_state.scroll_lock ? PSTR("SCLK") : PSTR("    "), false);
+    oled_write_P(PSTR("\n"), false);
+#    ifdef SSD1306OLED
+    render_rgbled_status(true, matrix);
+#    else
+    render_rgbled_status(true);
+    oled_write_P(PSTR("\n"), false);
+#    endif
+}
+
+
+#    ifdef SSD1306OLED
+#        if OLED_UPDATE_INTERVAL > 0
+uint16_t oled_update_timeout;
+#        endif
+
+void iota_gfx_task_user(void) {
+    struct CharacterMatrix matrix;
+
+#        if DEBUG_TO_SCREEN
+    if (debug_enable) {
+        return;
+    }
+#        endif
+
+#if      OLED_UPDATE_INTERVAL > 0
+    if (timer_elapsed(oled_update_timeout) < OLED_UPDATE_INTERVAL) {
+        return;
+    }
+    oled_update_timeout = timer_read();
+#endif
+    matrix_clear(&matrix);
+    if (is_keyboard_master()) {
+        render_status(&matrix);
+    } else {
+        render_logo(&matrix);
+        render_rgbled_status(false, &matrix);
+        render_layer_status(&matrix);
+    }
+    matrix_update(&display, &matrix);
+}
+#    else
+void oled_task_user(void) {
+
+#        if DEBUG_TO_SCREEN
+    if (debug_enable) {
+        return;
+    }
+#        endif
+
+    if (is_keyboard_master()) {
+        render_status();
+    } else {
+        render_logo();
+        render_rgbled_status(false);
+        render_layer_status();
+    }
+}
+#    endif
+#endif
diff --git a/qmk/keyboards/helix/rev2/keymaps/default/readme.md b/qmk/keyboards/helix/rev2/keymaps/default/readme.md
index 1237e5d5..8614fce5 100644
--- a/qmk/keyboards/helix/rev2/keymaps/default/readme.md
+++ b/qmk/keyboards/helix/rev2/keymaps/default/readme.md
@@ -112,7 +112,7 @@ see `qmk_firmware/keyboards/helix/rev2/keymaps/default/rules.mk`
 # you can uncomment and edit follows 7 Variables
 #  jp: 以下の7つの変数を必要に応じて編集し、コメントアウトをはずします。
 # HELIX_ROWS = 5              # Helix Rows is 4 or 5
-# OLED_ENABLE = no            # OLED_ENABLE
+# OLED_ENABLE = yes           # OLED_ENABLE
 # LOCAL_GLCDFONT = no         # use each keymaps "helixfont.h" insted of "common/glcdfont.c"
 # LED_BACK_ENABLE = no        # LED backlight (Enable WS2812 RGB underlight.)
 # LED_UNDERGLOW_ENABLE = no   # LED underglow (Enable WS2812 RGB underlight.)
@@ -128,35 +128,25 @@ $ cd qmk_firmware
 
 build
 ```
-$ make helix:default
-$ make helix/rev2/back:default               # with backlight
-$ make HELIX=no_ani helix/rev2/back:default  # with backlight without animation
-$ make helix/rev2/under:default              # with underglow
-$ make helix/rev2/oled:default               # with oled
-$ make helix/rev2/oled/back:default          # with oled and backlight
-$ make helix/rev2/oled/under:default         # with oled and underglow
+$ make helix:default                         # with oled
+$ make helix/rev2/back:default               # with oled and backlight
+$ make HELIX=no-ani helix/rev2/back:default  # with oled and backlight without animation
+$ make helix/rev2/under:default              # with oled and underglow
+$ make HELIX=no-oled helix:default           # without oled
 ```
 
-build (experimental use of split_common)
+build (experimental use of split_common with backlight and oled)
 ```
 $ make helix/rev2/sc:default
-$ make helix/rev2/sc/back:default
-$ make helix/rev2/sc/under:default
-$ make helix/rev2/sc/oled:default
-$ make helix/rev2/sc/oledback:default
-$ make helix/rev2/sc/oledunder:default
 ```
 
 flash to keyboard
 ```
-$ make helix:default:flash
-$ make helix/rev2/back:default:flash               # with backlight
-$ make HELIX=no_ani helix/rev2/back:default:flash  # with backlight without animation
-$ make helix/rev2/under:default:flash              # with underglow
-$ make helix/rev2/oled:default:flash               # with oled
-$ make helix/rev2/oled/back:default:flash          # with oled and backlight
-$ make helix/rev2/oled/under:default:flash         # with oled and underglow
-
+$ make helix:default:flash                         # with oled
+$ make helix/rev2/back:default:flash               # with oled and backlight
+$ make HELIX=no-ani helix/rev2/back:default:flash  # with oled and backlight without animation
+$ make helix/rev2/under:default:flash              # with oled and underglow
+$ make HELIX=no-oled helix:default:flash           # without oled
 ```
 
 ## Link
diff --git a/qmk/keyboards/helix/rev2/keymaps/default/readme_jp.md b/qmk/keyboards/helix/rev2/keymaps/default/readme_jp.md
index 2dfab351..5f0295f8 100644
--- a/qmk/keyboards/helix/rev2/keymaps/default/readme_jp.md
+++ b/qmk/keyboards/helix/rev2/keymaps/default/readme_jp.md
@@ -30,7 +30,7 @@ RGB バックライトまたは、RGB Underglow をつけた場合は、
 # you can uncomment and edit follows 7 Variables
 #  jp: 以下の7つの変数を必要に応じて編集し、コメントアウトをはずします。
 # HELIX_ROWS = 5              # Helix Rows is 4 or 5
-# OLED_ENABLE = no            # OLED_ENABLE
+# OLED_ENABLE = yes            # OLED_ENABLE
 # LOCAL_GLCDFONT = no         # use each keymaps "helixfont.h" insted of "common/glcdfont.c"
 # LED_BACK_ENABLE = no        # LED backlight (Enable WS2812 RGB underlight.)
 # LED_UNDERGLOW_ENABLE = no   # LED underglow (Enable WS2812 RGB underlight.)
@@ -61,11 +61,12 @@ rules.mk の下記の部分を編集して no を yes に変更してくださ
 LED_UNDERGLOW_ENABLE = yes   # LED underglow (Enable WS2812 RGB underlight.)
 ```
 
-## OLEDを有効にする
+## OLEDを無効にする
 
-rules.mk の下記の部分を編集して no を yes に変更してください。
+OLED はデフォルトで有効になっています。
+無効にしたいときは rules.mk の下記の部分を編集して yes を no に変更してください。
 ```
-OLED_ENABLE = yes            # OLED_ENABLE
+OLED_ENABLE = no            # OLED_ENABLE
 ```
 
 ## iPad/iPhoneサポートを有効にする。
@@ -104,9 +105,9 @@ $ make helix:default:clean
 
 上記の、rules.mk によるカスタマイズ項目の一部は下記のようにコマンド上で直接指定することも可能です。
 
-OLED を有効にしてコンパイルしてキーボードへの書き込む。
+OLED を無効にしてコンパイルしてキーボードへの書き込む。
 ```
-$ make helix/rev2/oled:default:flash
+$ make HELIX=no-oled helix/rev2:default:flash
 ```
 
 RGB バックライトを有効にしてコンパイルしてキーボードへ書き込む。
@@ -119,14 +120,14 @@ RGB Underglow を有効にしてコンパイルしてキーボードへ書き込
 $ make helix/rev2/under:default:flash
 ```
 
-OLED とRGB バックライトを有効にしてコンパイルしてキーボードへ書き込む。
+OLED を無効にして、RGB バックライトを有効にしてコンパイルしてキーボードへ書き込む。
 ```
-$ make helix/rev2/oled/back:default:flash
+$ make HELIX=no-oled helix/rev2/back:default:flash
 ```
 
-OLED とRGB Underglowを有効にしてコンパイルしてキーボードへ書き込む。
+OLED を無効にして、RGB Underglowを有効にしてコンパイルしてキーボードへ書き込む。
 ```
-$ make helix/rev2/oled/under:default:flash
+$ make HELIX=no-oled helix/rev2/under:default:flash
 ```
 
 ## リンク
diff --git a/qmk/keyboards/helix/rev2/keymaps/default/rules.mk b/qmk/keyboards/helix/rev2/keymaps/default/rules.mk
index 9801648d..206e836e 100644
--- a/qmk/keyboards/helix/rev2/keymaps/default/rules.mk
+++ b/qmk/keyboards/helix/rev2/keymaps/default/rules.mk
@@ -18,6 +18,18 @@ LTO_ENABLE = no  # if firmware size over limit, try this option
 # LED_ANIMATIONS = yes        # LED animations
 # IOS_DEVICE_ENABLE = no      # connect to IOS device (iPad,iPhone)
 
+# OLED_ENABLE が yes のとき
+#   OLED_SELECT が core ならば QMK 標準の oled_dirver.c を使用します。
+#   OLED_SELECT が core 以外ならば従来どおり helix/local_drivers/ssd1306.c を使用します。
+# If OLED_ENABLE is 'yes'
+#   If OLED_SELECT is 'core', use QMK standard oled_dirver.c.
+#   If OLED_SELECT is other than 'core', use helix/local_drivers/ssd1306.c.
+OLED_SELECT = core
+
+ifeq ($(strip $(OLED_ENABLE)), yes)
+    SRC += oled_display.c
+endif
+
 # convert Helix-specific options (that represent combinations of standard options)
 #   into QMK standard options.
 include $(strip $(KEYBOARD_LOCAL_FEATURES_MK))
diff --git a/qmk/keyboards/helix/rev2/keymaps/five_rows/keymap.c b/qmk/keyboards/helix/rev2/keymaps/five_rows/keymap.c
index fcc5c4bb..a2ec1086 100644
--- a/qmk/keyboards/helix/rev2/keymaps/five_rows/keymap.c
+++ b/qmk/keyboards/helix/rev2/keymaps/five_rows/keymap.c
@@ -1,199 +1,234 @@
+/* Copyright 2020 mtei
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include QMK_KEYBOARD_H
+#include "util.h"
 #include "bootloader.h"
 #ifdef PROTOCOL_LUFA
 #include "lufa.h"
 #include "split_util.h"
 #endif
-#ifdef AUDIO_ENABLE
-  #include "audio.h"
-#endif
-#ifdef SSD1306OLED
-  #include "ssd1306.h"
-#endif
 #ifdef CONSOLE_ENABLE
   #include <print.h>
 #endif
+#include "layer_number.h"
 
 extern keymap_config_t keymap_config;
 
-#ifdef RGBLIGHT_ENABLE
-//Following line allows macro to read current RGB settings
-extern rgblight_config_t rgblight_config;
-#endif
-
 extern uint8_t is_master;
 
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-enum layer_number {
-    _QWERTY = 0,
-    _COLEMAK,
-    _DVORAK,
-    _EUCALYN,
-    _KEYPAD,
-    _AUX,
-    _KAUX,
-    _LOWER,
-    _RAISE,
-    _PADFUNC,
-    _ADJUST,
-};
-
 enum custom_keycodes {
   QWERTY = SAFE_RANGE,
   COLEMAK,
   DVORAK,
   EUCALYN,
   KEYPAD,
-  KC_xEISU,
-  KC_xKANA,
-  KC_ZERO2,
+  xEISU,
+  xKANA,
+  ZERO2,
   RGBRST
 };
 
+#define LAYOUT_wrapper(...)    LAYOUT(__VA_ARGS__)
+
 //Macros
 #define KC_LOWER  MO(_LOWER)
-#define KC_RABS   LT(_RAISE,KC_BSPC)
-#define KC_RAEN   LT(_RAISE,KC_ENT)
-#define KC_FF12   LT(_PADFUNC,KC_F12)
-#define KC_____   _______
-#define KC_XXXX   XXXXXXX
+#define XXXX      XXXXXXX
+#define ____      _______
 #define KC_ADJ    MO(_ADJUST)
 #define KC_LSMI   LSFT(KC_MINS)
 #define KC_LSEQ   LSFT(KC_EQL)
 #define KC_LSRB   LSFT(KC_RBRC)
 #define KC_LSLB   LSFT(KC_LBRC)
-#define ___       _______
+
+#define _1_2_3_4_5           KC_1, KC_2, KC_3, KC_4, KC_5
+#define _6_7_8_9_0           KC_6, KC_7, KC_8, KC_9, KC_0
+#define L_LOWER2_CAPS_LALT_LGUI_SPC_RABS \
+    KC_LOWER, KC_LOWER, KC_CAPS, KC_LALT, KC_LGUI, KC_SPC, LT(_RAISE,KC_BSPC)
+#define R_RAEN_SPC_RGUI_RALT_APP_LOWER2 \
+    LT(_RAISE,KC_ENT), KC_SPC, KC_RGUI, KC_RALT,  KC_APP, KC_LOWER, KC_LOWER
+
 
 #if MATRIX_ROWS == 10 // HELIX_ROWS == 5
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   /* Qwerty
-   * ,-----------------------------------------.             ,-----------------------------------------.
-   * | ESC  |   1  |   2  |   3  |   4  |   5  |             |   6  |   7  |   8  |   9  |   0  |  BS  |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * | Tab  |   Q  |   W  |   E  |   R  |   T  |             |   Y  |   U  |   I  |   O  |   P  |  \   |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * | Ctrl |   A  |   S  |   D  |   F  |   G  |             |   H  |   J  |   K  |   L  |   ;  | Ctrl |
-   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * | Shift|   Z  |   X  |   C  |   V  |   B  |   `  |   '  |   N  |   M  |   ,  |   .  |   /  | Shift|
-   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * |Lower | Lower| Caps |  Alt |  GUI | Space|  BS  | Enter| Space| GUI  | Alt  | Menu |Lower |Lower |
-   * `-------------------------------------------------------------------------------------------------'
+   * ,-----------------------------------.           ,-----------------------------------.
+   * | ESC |  1  |  2  |  3  |  4  |  5  |           |  6  |  7  |  8  |  9  |  0  | BS  |
+   * |-----+-----+-----+-----+-----+-----|           |-----+-----+-----+-----+-----+-----|
+   * | Tab |  Q  |  W  |  E  |  R  |  T  |           |  Y  |  U  |  I  |  O  |  P  |  \  |
+   * |-----+-----+-----+-----+-----+-----|           |-----+-----+-----+-----+-----+-----|
+   * | Ctrl|  A  |  S  |  D  |  F  |  G  |           |  H  |  J  |  K  |  L  |  ;  |Ctrl |
+   * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
+   * |Shift|  Z  |  X  |  C  |  V  |  B  |  `  |  '  |  N  |  M  |  ,  |  .  |  /  |Shift|
+   * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
+   * |Lower|Lower|Caps | Alt | GUI |Space|  BS |Enter|Space| GUI | Alt |Menu |Lower|Lower|
+   * `-----------------------------------------------------------------------------------'
    */
-  [_QWERTY] = LAYOUT_kc( \
-      ESC,    1,    2,    3,    4,    5,                  6,    7,    8,    9,    0,  BSPC, \
-      TAB,    Q,    W,    E,    R,    T,                  Y,    U,    I,    O,    P,  BSLS, \
-      LCTL,   A,    S,    D,    F,    G,                  H,    J,    K,    L, SCLN,  RCTL, \
-      LSFT,   Z,    X,    C,    V,    B,    GRV,  QUOT,   N,    M, COMM,  DOT, SLSH,  RSFT, \
-      LOWER, LOWER, CAPS, LALT, LGUI, SPC, RABS,  RAEN, SPC, RGUI, RALT,  APP,LOWER, LOWER \
-      ),
+#define _Q_W_E_R_T           KC_Q, KC_W, KC_E, KC_R, KC_T
+#define _Y_U_I_O_P           KC_Y, KC_U, KC_I, KC_O, KC_P
+#define _A_S_D_F_G           KC_A, KC_S, KC_D, KC_F, KC_G
+#define _H_J_K_L_SCLN        KC_H, KC_J, KC_K, KC_L, KC_SCLN
+#define _Z_X_C_V_B           KC_Z, KC_X, KC_C, KC_V, KC_B
+#define _N_M_COMM_DOT_SLSH   KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH
+
+  [_QWERTY] = LAYOUT_wrapper( \
+    KC_ESC,   _1_2_3_4_5,                       _6_7_8_9_0,         KC_BSPC, \
+    KC_TAB,   _Q_W_E_R_T,                       _Y_U_I_O_P,         KC_BSLS, \
+    KC_LCTL,  _A_S_D_F_G,                       _H_J_K_L_SCLN,      KC_RCTL, \
+    KC_LSFT,  _Z_X_C_V_B,     KC_GRV,  KC_QUOT, _N_M_COMM_DOT_SLSH, KC_RSFT, \
+    L_LOWER2_CAPS_LALT_LGUI_SPC_RABS,  R_RAEN_SPC_RGUI_RALT_APP_LOWER2  \
+   ),
 
   /* Colemak
-   * ,-----------------------------------------.             ,-----------------------------------------.
-   * | ESC  |   1  |   2  |   3  |   4  |   5  |             |   6  |   7  |   8  |   9  |   0  | Bksp |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * | Tab  |   Q  |   W  |   F  |   P  |   G  |             |   J  |   L  |   U  |   Y  |   ;  | \    |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * | Ctrl |   A  |   R  |   S  |   T  |   D  |             |   H  |   N  |   E  |   I  |   O  | Ctrl |
-   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * | Shift|   Z  |   X  |   C  |   V  |   B  |   `  |   '  |   K  |   M  |   ,  |   .  |   /  | Shift|
-   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * |Lower | Lower| Caps |  Alt |  GUI | Space|  BS  | Enter| Space| GUI  | Alt  | Menu |Lower |Lower |
-   * `-------------------------------------------------------------------------------------------------'
+   * ,-----------------------------------.           ,-----------------------------------.
+   * | ESC |  1  |  2  |  3  |  4  |  5  |           |  6  |  7  |  8  |  9  |  0  | BS  |
+   * |-----+-----+-----+-----+-----+-----|           |-----+-----+-----+-----+-----+-----|
+   * | Tab |  Q  |  W  |  F  |  P  |  G  |           |  J  |  L  |  U  |  Y  |  ;  |  \  |
+   * |-----+-----+-----+-----+-----+-----|           |-----+-----+-----+-----+-----+-----|
+   * | Ctrl|  A  |  R  |  S  |  T  |  D  |           |  H  |  N  |  E  |  I  |  O  |Ctrl |
+   * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
+   * |Shift|  Z  |  X  |  C  |  V  |  B  |  `  |  '  |  K  |  M  |  ,  |  .  |  /  |Shift|
+   * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
+   * |Lower|Lower|Caps | Alt | GUI |Space|  BS |Enter|Space| GUI | Alt |Menu |Lower|Lower|
+   * `-----------------------------------------------------------------------------------'
    */
-  [_COLEMAK] = LAYOUT_kc( \
-      ESC,    1,    2,    3,    4,    5,                  6,    7,    8,    9,    0,  BSPC, \
-      TAB,    Q,    W,    F,    P,    G,                  J,    L,    U,    Y, SCLN,  BSLS, \
-      LCTL,   A,    R,    S,    T,    D,                  H,    N,    E,    I,    O,  RCTL, \
-      LSFT,   Z,    X,    C,    V,    B,    GRV,  QUOT,   K,    M, COMM,  DOT, SLSH,  RSFT, \
-      LOWER, LOWER, CAPS, LALT, LGUI, SPC, RABS,  RAEN, SPC, RGUI, RALT,  APP,LOWER, LOWER \
-      ),
+#define _Q_W_F_P_G           KC_Q, KC_W, KC_F, KC_P, KC_G
+#define _J_L_U_Y_SCLN        KC_J, KC_L, KC_U, KC_Y, KC_SCLN
+#define _A_R_S_T_D           KC_A, KC_R, KC_S, KC_T, KC_D
+#define _H_N_E_I_O           KC_H, KC_N, KC_E, KC_I, KC_O
+#define _Z_X_C_V_B           KC_Z, KC_X, KC_C, KC_V, KC_B
+#define _K_M_COMM_DOT_SLSH   KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH
+
+  [_COLEMAK] = LAYOUT_wrapper( \
+    KC_ESC,   _1_2_3_4_5,                       _6_7_8_9_0,         KC_BSPC, \
+    KC_TAB,   _Q_W_F_P_G,                       _J_L_U_Y_SCLN,      KC_BSLS, \
+    KC_LCTL,  _A_R_S_T_D,                       _H_N_E_I_O,         KC_RCTL, \
+    KC_LSFT,  _Z_X_C_V_B,     KC_GRV,  KC_QUOT, _K_M_COMM_DOT_SLSH, KC_RSFT, \
+    L_LOWER2_CAPS_LALT_LGUI_SPC_RABS,  R_RAEN_SPC_RGUI_RALT_APP_LOWER2  \
+  ),
 
   /* Dvorak
-   * ,-----------------------------------------.             ,-----------------------------------------.
-   * | ESC  |   1  |   2  |   3  |   4  |   5  |             |   6  |   7  |   8  |   9  |   0  | Bksp |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * | Tab  |   '  |   ,  |   .  |   P  |   Y  |             |   F  |   G  |   C  |   R  |   L  |  \   |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * | Ctrl |   A  |   O  |   E  |   U  |   I  |             |   D  |   H  |   T  |   N  |   S  | Ctrl |
-   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * | Shift|   ;  |   Q  |   J  |   K  |   X  |   `  |   /  |   B  |   M  |   W  |   V  |   Z  | Shift|
-   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * |Lower | Lower| Caps |  Alt |  GUI | Space|  BS  | Enter| Space| GUI  | Alt  | Menu |Lower |Lower |
-   * `-------------------------------------------------------------------------------------------------'
+   * ,-----------------------------------.           ,-----------------------------------.
+   * | ESC |  1  |  2  |  3  |  4  |  5  |           |  6  |  7  |  8  |  9  |  0  | BS  |
+   * |-----+-----+-----+-----+-----+-----|           |-----+-----+-----+-----+-----+-----|
+   * | Tab |  '  |  ,  |  .  |  P  |  Y  |           |  F  |  G  |  C  |  R  |  L  |  \  |
+   * |-----+-----+-----+-----+-----+-----|           |-----+-----+-----+-----+-----+-----|
+   * | Ctrl|  A  |  O  |  E  |  U  |  I  |           |  D  |  H  |  T  |  N  |  S  |Ctrl |
+   * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
+   * |Shift|  ;  |  Q  |  J  |  K  |  X  |  `  |  /  |  B  |  M  |  W  |  V  |  Z  |Shift|
+   * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
+   * |Lower|Lower|Caps | Alt | GUI |Space|  BS |Enter|Space| GUI | Alt |Menu |Lower|Lower|
+   * `-----------------------------------------------------------------------------------'
    */
-  [_DVORAK] = LAYOUT_kc( \
-      ESC,    1,    2,    3,    4,    5,                  6,    7,    8,    9,    0,  BSPC, \
-      TAB, QUOT, COMM,  DOT,    P,    Y,                  F,    G,    C,    R,    L,  BSLS, \
-      LCTL,   A,    O,    E,    U,    I,                  D,    H,    T,    N,    S,  RCTL, \
-      LSFT, SCLN,   Q,    J,    K,    X,    GRV,  SLSH,   B,    M,    W,    V,    Z,  RSFT, \
-      LOWER, LOWER, CAPS, LALT, LGUI, SPC, RABS,  RAEN, SPC, RGUI, RALT,  APP,LOWER, LOWER \
-      ),
+#define _QUOT_COMM_DOT_P_Y   KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y
+#define _F_G_C_R_L           KC_F, KC_G, KC_C, KC_R, KC_L
+#define _A_O_E_U_I           KC_A, KC_O, KC_E, KC_U, KC_I
+#define _D_H_T_N_S           KC_D, KC_H, KC_T, KC_N, KC_S
+#define _SCLN_Q_J_K_X        KC_SCLN, KC_Q, KC_J, KC_K, KC_X
+#define _B_M_W_V_Z           KC_B, KC_M, KC_W, KC_V, KC_Z
+
+  [_DVORAK] = LAYOUT_wrapper( \
+    KC_ESC,   _1_2_3_4_5,                       _6_7_8_9_0,    KC_BSPC, \
+    KC_TAB,   _QUOT_COMM_DOT_P_Y,               _F_G_C_R_L,    KC_BSLS, \
+    KC_LCTL,  _A_O_E_U_I,                       _D_H_T_N_S,    KC_RCTL, \
+    KC_LSFT,  _SCLN_Q_J_K_X,  KC_GRV,  KC_SLSH, _B_M_W_V_Z,    KC_RSFT, \
+    L_LOWER2_CAPS_LALT_LGUI_SPC_RABS,  R_RAEN_SPC_RGUI_RALT_APP_LOWER2  \
+   ),
 
   /* Eucalyn (http://eucalyn.hatenadiary.jp/entry/about-eucalyn-layout)
-   * ,-----------------------------------------.             ,-----------------------------------------.
-   * | ESC  |   1  |   2  |   3  |   4  |   5  |             |   6  |   7  |   8  |   9  |   0  | Bksp |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * | Tab  |   Q  |   W  |   ,  |   .  |   ;  |             |   M  |   R  |   D  |   Y  |   P  |  \   |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * | Ctrl |   A  |   O  |   E  |   I  |   U  |             |   G  |   T  |   K  |   S  |   N  | Ctrl |
-   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * | Shift|   Z  |   X  |   C  |   V  |   F  |   `  |   '  |   B  |   H  |   J  |   L  |   /  | Shift|
-   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * |Lower | Lower| Caps |  Alt |  GUI | Space|  BS  | Enter| Space| GUI  | Alt  | Menu |Lower |Lower |
-   * `-------------------------------------------------------------------------------------------------'
+   * ,-----------------------------------.           ,-----------------------------------.
+   * | ESC |  1  |  2  |  3  |  4  |  5  |           |  6  |  7  |  8  |  9  |  0  | BS  |
+   * |-----+-----+-----+-----+-----+-----|           |-----+-----+-----+-----+-----+-----|
+   * | Tab |  Q  |  W  |  ,  |  .  |  ;  |           |  M  |  R  |  D  |  Y  |  P  |  \  |
+   * |-----+-----+-----+-----+-----+-----|           |-----+-----+-----+-----+-----+-----|
+   * | Ctrl|  A  |  O  |  E  |  I  |  U  |           |  G  |  T  |  K  |  S  |  N  |Ctrl |
+   * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
+   * |Shift|  Z  |  X  |  C  |  V  |  F  |  `  |  '  |  B  |  H  |  J  |  L  |  /  |Shift|
+   * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
+   * |Lower|Lower|Caps | Alt | GUI |Space|  BS |Enter|Space| GUI | Alt |Menu |Lower|Lower|
+   * `-----------------------------------------------------------------------------------'
    */
-  [_EUCALYN] = LAYOUT_kc( \
-      ESC,    1,    2,    3,    4,    5,                  6,    7,    8,    9,    0,  BSPC, \
-      TAB,    Q,    W, COMM,  DOT, SCLN,                  M,    R,    D,    Y,    P,  BSLS, \
-      LCTL,   A,    O,    E,    I,    U,                  G,    T,    K,    S,    N,  RCTL, \
-      LSFT,   Z,    X,    C,    V,    F,    GRV,  QUOT,   B,    H,    J,    L, SLSH,  RSFT, \
-      LOWER, LOWER, CAPS, LALT, LGUI, SPC, RABS,  RAEN, SPC, RGUI, RALT,  APP,LOWER, LOWER \
-      ),
+#define _Q_W_COMM_DOT_SCLN   KC_Q, KC_W, KC_COMM, KC_DOT, KC_SCLN
+#define _M_R_D_Y_P           KC_M, KC_R, KC_D, KC_Y, KC_P
+#define _A_O_E_I_U           KC_A, KC_O, KC_E, KC_I, KC_U
+#define _G_T_K_S_N           KC_G, KC_T, KC_K, KC_S, KC_N
+#define _Z_X_C_V_F           KC_Z, KC_X, KC_C, KC_V, KC_F
+#define _B_H_J_L_SLSH        KC_B, KC_H, KC_J, KC_L, KC_SLSH
+
+  [_EUCALYN] = LAYOUT_wrapper( \
+    KC_ESC,   _1_2_3_4_5,                       _6_7_8_9_0,     KC_BSPC, \
+    KC_TAB,   _Q_W_COMM_DOT_SCLN,               _M_R_D_Y_P,     KC_BSLS, \
+    KC_LCTL,  _A_O_E_I_U,                       _G_T_K_S_N,     KC_RCTL, \
+    KC_LSFT,  _Z_X_C_V_F,     KC_GRV,  KC_QUOT, _B_H_J_L_SLSH,  KC_RSFT, \
+    L_LOWER2_CAPS_LALT_LGUI_SPC_RABS,  R_RAEN_SPC_RGUI_RALT_APP_LOWER2  \
+  ),
 
   /* Keypad
-   * ,-----------------------------------------.             ,-----------------------------------------.
-   * | Tab  |   /  |   *  | Del  |  F1  |  F6  |             |  F1  |  F6  | Del  | Tab  |   /  |   *  |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * |   7  |   8  |   9  | BS   |  F2  |  F7  |             |  F2  |  F7  | BS   |   7  |   8  |   9  |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * |   4  |   5  |   6  |  -   |  F3  |  F8  |             |  F3  |  F8  |  -   |   4  |   5  |   6  |
-   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * |   1  |   2  |   3  |  +   |  F4  |  F9  |  F11 |  F11 |  F4  |  F9  |  +   |   1  |   2  |   3  |
-   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * |   0  |   ,  |   .  | Enter|  F5  |  F10 |  F12 |  F12 |  F5  |  F10 | Enter|   0  |  ,   |   .  |
-   * `-------------------------------------------------------------------------------------------------'
+   * ,-----------------------------------.           ,-----------------------------------.
+   * | Tab |  /  |  *  | Del |  F1 |  F6 |           |  F1 |  F6 | Del | Tab |  /  |  *  |
+   * |-----+-----+-----+-----+-----+-----|           |-----+-----+-----+-----+-----+-----|
+   * |  7  |  8  |  9  | BS  |  F2 |  F7 |           |  F2 |  F7 | BS  |  7  |  8  |  9  |
+   * |-----+-----+-----+-----+-----+-----|           |-----+-----+-----+-----+-----+-----|
+   * |  4  |  5  |  6  |  -  |  F3 |  F8 |           |  F3 |  F8 |  -  |  4  |  5  |  6  |
+   * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
+   * |  1  |  2  |  3  |  +  |  F4 |  F9 | F11 | F11 |  F4 |  F9 |  +  |  1  |  2  |  3  |
+   * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
+   * |  0  |  ,  |  .  |Enter|  F5 |  F10| F12 | F12 |  F5 |  F10|Enter|  0  |  ,  |  .  |
+   * `-----------------------------------------------------------------------------------'
    */
-  [_KEYPAD] = LAYOUT_kc( \
-      TAB,  PSLS, PAST, DEL,    F1,   F6,               F1,   F6,  DEL,  TAB, PSLS, PAST, \
-      KP_7, KP_8, KP_9, BSPC,   F2,   F7,               F2,   F7, BSPC, KP_7, KP_8, KP_9, \
-      KP_4, KP_5, KP_6, PMNS,   F3,   F8,               F3,   F8, PMNS, KP_4, KP_5, KP_6, \
-      KP_1, KP_2, KP_3, PPLS,   F4,   F9,  F11,  F11,   F4,   F9, PPLS, KP_1, KP_2, KP_3, \
-      KP_0, COMM, PDOT, PENT,   F5,  F10, FF12, FF12,   F5,  F10, PENT, KP_0, COMM, PDOT \
-      ),
+#define KP_TOP KC_TAB,  KC_PSLS, KC_PAST
+#define KP_789 KC_KP_7, KC_KP_8, KC_KP_9
+#define KP_456 KC_KP_4, KC_KP_5, KC_KP_6
+#define KP_123 KC_KP_1, KC_KP_2, KC_KP_3
+#define KP_BTM KC_KP_0, KC_COMM, KC_PDOT
+#define F_1_6  KC_F1, KC_F6
+#define F_2_7  KC_F2, KC_F7
+#define F_3_8  KC_F3, KC_F8
+#define F_4_9  KC_F4, KC_F9
+#define F_510  KC_F5, KC_F10
+#define FF12   LT(_PADFUNC,KC_F12)
+
+  [_KEYPAD] = LAYOUT_wrapper( \
+    KP_TOP, KC_DEL,  F_1_6,                     F_1_6,  KC_DEL, KP_TOP, \
+    KP_789, KC_BSPC, F_2_7,                     F_2_7, KC_BSPC, KP_789, \
+    KP_456, KC_PMNS, F_3_8,                     F_3_8, KC_PMNS, KP_456, \
+    KP_123, KC_PPLS, F_4_9,  KC_F11,  KC_F11,  F_4_9, KC_PPLS, KP_123, \
+    KP_BTM, KC_PENT, F_510,    FF12,    FF12,  F_510, KC_PENT, KP_BTM  \
+  ),
 
   /*  AUX modifier key layer
-   * ,-----------------------------------------.             ,-----------------------------------------.
-   * |      |      |      |      |      |      |             |      |      |      |      |      |      |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * |      |      |      |      |      |      |             |      |      |      |      |      |      |
-   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
-   * |      |      |      |      |      |      |             |      |      |      |      |      |      |
-   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
-   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
-   * |      |  00  |      |      |      |      |      |      |      |      |      |      |  00  |      |
-   * `-------------------------------------------------------------------------------------------------'
+   * ,-----------------------------------.           ,-----------------------------------.
+   * |     |     |     |     |     |     |           |     |     |     |     |     |     |
+   * |-----+-----+-----+-----+-----+-----|           |-----+-----+-----+-----+-----+-----|
+   * |     |     |     |     |     |     |           |     |     |     |     |     |     |
+   * |-----+-----+-----+-----+-----+-----|           |-----+-----+-----+-----+-----+-----|
+   * |     |     |     |     |     |     |           |     |     |     |     |     |     |
+   * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
+   * |     |     |     |     |     |     |     |     |     |     |     |     |     |     |
+   * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
+   * |     | 00  |     |     |     |     |     |     |     |     |     |     | 00  |     |
+   * `-----------------------------------------------------------------------------------'
    */
-  [_KAUX] = LAYOUT_kc( \
+  [_KAUX] = LAYOUT( \
       ____, ____, ____, ____, ____, ____,             ____, ____, ____, ____, ____, ____, \
       ____, ____, ____, ____, ____, ____,             ____, ____, ____, ____, ____, ____, \
       ____, ____, ____, ____, ____, ____,             ____, ____, ____, ____, ____, ____, \
       ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, \
-      ____,ZERO2, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ZERO2,____ \
+      ____,ZERO2, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,ZERO2, ____ \
    ),
 
   /*  Keypad function layer
@@ -209,12 +244,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
    * `-------------------------------------------------------------------------------------------------'
    */
-  [_PADFUNC] = LAYOUT_kc( \
-      XXXX, XXXX, XXXX, PAUS, SLCK, PSCR,             PSCR, SLCK, PAUS, XXXX, XXXX, XXXX, \
-      XXXX, XXXX, XXXX, HOME, UP,   PGUP,             PGUP, UP,   HOME, XXXX, XXXX, XXXX, \
-      XXXX,  DEL,  INS, LEFT, DOWN, RGHT,             LEFT, DOWN, RGHT, INS,  DEL,  XXXX, \
-      XXXX, XXXX, XXXX, END,  XXXX, PGDN,  ADJ,  ADJ, PGDN, XXXX, END,  XXXX, XXXX, XXXX, \
-      XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, ____, ____, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX \
+#define _PAUS_SLCK_PSCR           KC_PAUS, KC_SLCK, KC_PSCR
+#define _PSCR_SLCK_PAUS           KC_PSCR, KC_SLCK, KC_PAUS
+#define _HOME_UP_PGUP             KC_HOME, KC_UP,   KC_PGUP
+#define _PGUP_UP_HOME             KC_PGUP, KC_UP,   KC_HOME
+#define _DEL_INS_LEFT_DOWN_RGHT   KC_DEL,  KC_INS,  KC_LEFT, KC_DOWN, KC_RGHT
+#define _LEFT_DOWN_RGHT_INS_DEL   KC_LEFT, KC_DOWN, KC_RGHT, KC_INS,  KC_DEL
+#define _PGDN_ADJ_ADJ_PGDN        KC_PGDN, KC_ADJ,  KC_ADJ,  KC_PGDN
+
+  [_PADFUNC] = LAYOUT_wrapper( \
+      XXXX, XXXX, XXXX, _PAUS_SLCK_PSCR,               _PSCR_SLCK_PAUS,       XXXX, XXXX, XXXX, \
+      XXXX, XXXX, XXXX,   _HOME_UP_PGUP,               _PGUP_UP_HOME,         XXXX, XXXX, XXXX, \
+      XXXX,     _DEL_INS_LEFT_DOWN_RGHT,               _LEFT_DOWN_RGHT_INS_DEL,           XXXX, \
+      XXXX, XXXX, XXXX, KC_END, XXXX,   _PGDN_ADJ_ADJ_PGDN,     XXXX, KC_END, XXXX, XXXX, XXXX, \
+      XXXX, XXXX, XXXX, XXXX,   XXXX, XXXX, ____, ____,   XXXX, XXXX,   XXXX, XXXX, XXXX, XXXX \
    ),
 
   /* Lower
@@ -230,12 +273,22 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |      |      | PrtSc|      |      |      |      |      |      |      |      | PrtSc|      |      |
    * `-------------------------------------------------------------------------------------------------'
    */
-  [_LOWER] = LAYOUT_kc( \
-      XXXX,  F1,   F2,   F3,   F4,   F5,                F6,   F7,   F8,   F9,  F10,  F11, \
-      XXXX, XXXX, PAUS, SLCK, INS,  XXXX,             XXXX,  INS, SLCK, PAUS, XXXX,  F12, \
-      ____, HOME, XXXX, UP,   DEL,  PGUP,             PGUP,  DEL,   UP, XXXX, HOME, ____, \
-      ____, END,  LEFT, DOWN, RGHT, PGDN, XXXX, XXXX, PGDN, LEFT, DOWN, RGHT,  END, ____, \
-      ____, ____, PSCR, ____, ____, ____,  ADJ,  ADJ, ____, ____, ____, PSCR, ____, ____ \
+#define _F1_F2_F3_F4_F5           KC_F1, KC_F2, KC_F3, KC_F4, KC_F5
+#define _F6_F7_F8_F9_F10_F11      KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11
+#define _PAUS_SLCK_INS            KC_PAUS, KC_SLCK, KC_INS
+#define _INS_SLCK_PAUS            KC_INS,  KC_SLCK, KC_PAUS
+#define _ADJ_ADJ                  KC_ADJ,  KC_ADJ
+#define _UP_DEL_PGUP              KC_UP,   KC_DEL,  KC_PGUP
+#define _PGUP_DEL_UP              KC_PGUP, KC_DEL,  KC_UP
+#define _END_LEFT_DOWN_RGHT_PGDN  KC_END,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN
+#define _PGDN_LEFT_DOWN_RGHT_END  KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_END
+
+  [_LOWER] = LAYOUT_wrapper( \
+      XXXX, _F1_F2_F3_F4_F5,                             _F6_F7_F8_F9_F10_F11, \
+      XXXX, XXXX,    _PAUS_SLCK_INS,   XXXX,             XXXX,  _INS_SLCK_PAUS,    XXXX, KC_F12, \
+      ____, KC_HOME, XXXX, _UP_DEL_PGUP,                 _PGUP_DEL_UP,      XXXX, KC_HOME, ____, \
+      ____, _END_LEFT_DOWN_RGHT_PGDN,        XXXX, XXXX, _PGDN_LEFT_DOWN_RGHT_END,         ____, \
+      ____, ____, KC_PSCR, ____, ____, ____,  _ADJ_ADJ,  ____, ____, ____, KC_PSCR, ____, ____ \
       ),
 
   /* Raise
@@ -251,12 +304,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
    * `-------------------------------------------------------------------------------------------------'
    */
-  [_RAISE] = LAYOUT_kc( \
+#define _LSMI_MINS             KC_LSMI, KC_MINS
+#define _EQL_LSEQ              KC_EQL,  KC_LSEQ
+#define _LSLB_LBRC             KC_LSLB, KC_LBRC
+#define _RBRC_LSRB             KC_RBRC, KC_LSRB
+#define _MNXT_VOLD_VOLU_MPLY   KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+
+  [_RAISE] = LAYOUT_wrapper( \
       XXXX, XXXX, XXXX, XXXX, XXXX, XXXX,             XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, \
-      XXXX, XXXX, XXXX, XXXX, LSMI, MINS,              EQL, LSEQ, XXXX, XXXX, XXXX, XXXX, \
-      ____, XXXX, XXXX, XXXX, LSLB, LBRC,             RBRC, LSRB, XXXX, XXXX, XXXX, ____, \
-      ____, XXXX, XXXX, XXXX, XXXX,xEISU,xEISU, xKANA,xKANA,MNXT, VOLD, VOLU, MPLY, ____, \
-      ADJ,   ADJ, XXXX, ____, ____, XXXX, ____, ____, XXXX, ____, ____, XXXX,  ADJ,  ADJ \
+      XXXX, XXXX, XXXX, XXXX, _LSMI_MINS,             _EQL_LSEQ,  XXXX, XXXX, XXXX, XXXX, \
+      ____, XXXX, XXXX, XXXX, _LSLB_LBRC,             _RBRC_LSRB, XXXX, XXXX, XXXX, ____, \
+      ____, XXXX, XXXX, XXXX, XXXX,xEISU,xEISU, xKANA,xKANA, _MNXT_VOLD_VOLU_MPLY,  ____, \
+      _ADJ_ADJ,   XXXX, ____, ____, XXXX, ____, ____, XXXX, ____, ____, XXXX,   _ADJ_ADJ \
       ),
 
   /* Adjust (Lower + Raise)
@@ -276,8 +335,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       XXXXXXX, KEYPAD,  DVORAK,  COLEMAK, EUCALYN,  QWERTY,          QWERTY,  EUCALYN, COLEMAK,  DVORAK,  KEYPAD, XXXXXXX, \
       XXXXXXX, RESET,   RGBRST,  RGB_TOG,   AU_ON, AG_SWAP,          AG_SWAP,   AU_ON, RGB_TOG,  RGBRST, XXXXXXX, XXXXXXX, \
       RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD,  AU_OFF, AG_NORM,          AG_NORM,  AU_OFF, RGB_MOD, RGB_VAI, RGB_SAI, RGB_HUI, \
-      RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX, ___,___, XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD, RGB_SAD, RGB_HUD, \
-      _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, ___,___, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______ \
+      RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX,____,____,XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD, RGB_SAD, RGB_HUD, \
+      _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,____,____,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______ \
    ),
 
   /*  AUX modifier key layer
@@ -293,12 +352,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * |      |      |      |      |      |  BS  | Enter|      |      |      |      |      |      |      |
    * `-------------------------------------------------------------------------------------------------'
    */
-  [_AUX] = LAYOUT_kc( \
+#define _BSPC_RAEN KC_BSPC, LT(_RAISE,KC_ENT)
+  [_AUX] = LAYOUT_wrapper( \
       ____, ____, ____, ____, ____, ____,             ____, ____, ____, ____, ____, ____, \
       ____, ____, ____, ____, ____, ____,             ____, ____, ____, ____, ____, ____, \
       ____, ____, ____, ____, ____, ____,             ____, ____, ____, ____, ____, ____, \
       ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, \
-      ____, ____, ____, ____, ____, BSPC, RAEN, ____, ____, ____, ____, ____, ____, ____ \
+      ____, ____, ____, ____, ____, _BSPC_RAEN, ____, ____, ____, ____, ____, ____, ____ \
       )
 };
 
@@ -307,28 +367,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 #endif
 
 
-#ifdef AUDIO_ENABLE
+int current_default_layer;
 
-float tone_qwerty[][2]     = SONG(QWERTY_SOUND);
-float tone_dvorak[][2]     = SONG(DVORAK_SOUND);
-float tone_colemak[][2]    = SONG(COLEMAK_SOUND);
-float tone_plover[][2]     = SONG(PLOVER_SOUND);
-float tone_plover_gb[][2]  = SONG(PLOVER_GOODBYE_SOUND);
-float music_scale[][2]     = SONG(MUSIC_SCALE_SOUND);
-#endif
-
-static int current_default_layer;
-
-uint32_t default_layer_state_set_kb(uint32_t state) {
-    // 1<<_QWERTY  - 1 == 1 - 1 == _QWERTY (=0)
-    // 1<<_COLEMAK - 1 == 2 - 1 == _COLEMAK (=1)
-    current_default_layer = state - 1;
-    // 1<<_DVORAK  - 2 == 4 - 2 == _DVORAK (=2)
-    if ( current_default_layer == 3 ) current_default_layer -= 1;
-    // 1<<_EUCALYN - 5 == 8 - 5 == _EUCALYN (=3)
-    if ( current_default_layer == 7 ) current_default_layer -= 4;
-    // 1<<_KEYPAD  - 12 == 16 - 12 == _KEYPAD (=4)
-    if ( current_default_layer == 15 ) current_default_layer -= 11;
+uint32_t default_layer_state_set_user(uint32_t state) {
+    current_default_layer = biton32(state);
     return state;
 }
 
@@ -351,56 +393,41 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   switch (keycode) {
     case QWERTY:
       if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_qwerty);
-        #endif
         update_base_layer(_QWERTY);
       }
       return false;
       break;
     case COLEMAK:
       if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_colemak);
-        #endif
         update_base_layer(_COLEMAK);
       }
       return false;
       break;
     case DVORAK:
       if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_dvorak);
-        #endif
         update_base_layer(_DVORAK);
       }
       return false;
       break;
     case EUCALYN:
       if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_dvorak);
-        #endif
         update_base_layer(_EUCALYN);
       }
       return false;
       break;
     case KEYPAD:
       if (record->event.pressed) {
-        #ifdef AUDIO_ENABLE
-          PLAY_SONG(tone_dvorak);
-        #endif
         update_base_layer(_KEYPAD);
       }
       return false;
       break;
-    case KC_ZERO2:
+    case ZERO2:
       if (record->event.pressed) {
           SEND_STRING("00");
       }
       return false;
       break;
-    case KC_xEISU:
+    case xEISU:
       if (record->event.pressed) {
         if(keymap_config.swap_lalt_lgui==false){
           register_code(KC_LANG2);
@@ -412,7 +439,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
       }
       return false;
       break;
-    case KC_xKANA:
+    case xKANA:
       if (record->event.pressed) {
         if(keymap_config.swap_lalt_lgui==false){
           register_code(KC_LANG1);
@@ -437,161 +464,5 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 }
 
 void matrix_init_user(void) {
-    #ifdef AUDIO_ENABLE
-        startup_user();
-    #endif
-    //SSD1306 OLED init, make sure to add #define SSD1306OLED in config.h
-    #ifdef SSD1306OLED
-        iota_gfx_init(!has_usb());   // turns on the display
-    #endif
+    INIT_HELIX_OLED(); /* define in layer_number.h */
 }
-
-
-#ifdef AUDIO_ENABLE
-
-void startup_user()
-{
-    _delay_ms(20); // gets rid of tick
-}
-
-void shutdown_user()
-{
-    _delay_ms(150);
-    stop_all_notes();
-}
-
-void music_on_user(void)
-{
-    music_scale_user();
-}
-
-void music_scale_user(void)
-{
-    PLAY_SONG(music_scale);
-}
-
-#endif
-
-
-//SSD1306 OLED update loop, make sure to add #define SSD1306OLED in config.h
-#ifdef SSD1306OLED
-
-void matrix_scan_user(void) {
-     iota_gfx_task();  // this is what updates the display continuously
-}
-
-void matrix_update(struct CharacterMatrix *dest,
-                          const struct CharacterMatrix *source) {
-  if (memcmp(dest->display, source->display, sizeof(dest->display))) {
-    memcpy(dest->display, source->display, sizeof(dest->display));
-    dest->dirty = true;
-  }
-}
-
-static void render_logo(struct CharacterMatrix *matrix) {
-
-  static char logo[]={
-    0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94,
-    0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4,
-    0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0xd4,
-    0};
-  matrix_write(matrix, logo);
-#ifdef RGBLIGHT_ENABLE
-  char buf[30];
-  if (RGBLIGHT_MODES > 1 && rgblight_config.enable) {
-      snprintf(buf, sizeof(buf), " LED %2d: %d,%d,%d ",
-               rgblight_config.mode,
-               rgblight_config.hue/RGBLIGHT_HUE_STEP,
-               rgblight_config.sat/RGBLIGHT_SAT_STEP,
-               rgblight_config.val/RGBLIGHT_VAL_STEP);
-      matrix_write(matrix, buf);
-  }
-#endif
-  //matrix_write_P(&matrix, PSTR(" Split keyboard kit"));
-}
-
-static const char Qwerty_name[]  PROGMEM = " Qwerty";
-static const char Colemak_name[] PROGMEM = " Colemak";
-static const char Dvorak_name[]  PROGMEM = " Dvorak";
-static const char Eucalyn_name[] PROGMEM = " Eucalyn";
-static const char Keypad_name[]  PROGMEM = " Keypad";
-
-static const char AUX_name[]     PROGMEM = ":AUX";
-static const char KAUX_name[]    PROGMEM = ":00";
-static const char Padfunc_name[] PROGMEM = ":PadFunc";
-static const char Lower_name[]   PROGMEM = ":Func";
-static const char Raise_name[]   PROGMEM = ":Extra";
-static const char Adjust_name[]  PROGMEM = ":Adjust";
-
-static const char *layer_names[] = {
-    [_QWERTY] = Qwerty_name,
-    [_COLEMAK] = Colemak_name,
-    [_DVORAK] = Dvorak_name,
-    [_EUCALYN]= Eucalyn_name,
-    [_KEYPAD] = Keypad_name,
-    [_AUX]    = AUX_name,
-    [_KAUX]   = KAUX_name,
-    [_LOWER]  = Lower_name,
-    [_RAISE]  = Raise_name,
-    [_PADFUNC]= Padfunc_name,
-    [_ADJUST] = Adjust_name
-};
-
-void render_status(struct CharacterMatrix *matrix) {
-
-  // Render to mode icon
-  static char logo[][2][3]={{{0x95,0x96,0},{0xb5,0xb6,0}},{{0x97,0x98,0},{0xb7,0xb8,0}}};
-  if(keymap_config.swap_lalt_lgui==false){
-    matrix_write(matrix, logo[0][0]);
-    matrix_write_P(matrix, PSTR("\n"));
-    matrix_write(matrix, logo[0][1]);
-  }else{
-    matrix_write(matrix, logo[1][0]);
-    matrix_write_P(matrix, PSTR("\n"));
-    matrix_write(matrix, logo[1][1]);
-  }
-
-  // Define layers here, Have not worked out how to have text displayed for each layer. Copy down the number you see and add a case for it below
-  int name_num;
-  uint32_t lstate;
-  matrix_write_P(matrix, layer_names[current_default_layer]);
-  matrix_write_P(matrix, PSTR("\n"));
-  for( lstate = layer_state, name_num = 0;
-       lstate && name_num < sizeof(layer_names)/sizeof(char *);
-       lstate >>=1, name_num++ ) {
-      if( (lstate & 1) != 0 ) {
-          if( layer_names[name_num] ) {
-              matrix_write_P(matrix, layer_names[name_num]);
-          }
-      }
-  }
-
-  // Host Keyboard LED Status
-  char led[40];
-    snprintf(led, sizeof(led), "\n%s  %s  %s",
-             (host_keyboard_leds() & (1<<USB_LED_NUM_LOCK)) ? "NUMLOCK" : "       ",
-             (host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK)) ? "CAPS" : "    ",
-             (host_keyboard_leds() & (1<<USB_LED_SCROLL_LOCK)) ? "SCLK" : "    ");
-  matrix_write(matrix, led);
-}
-
-
-void iota_gfx_task_user(void) {
-  struct CharacterMatrix matrix;
-
-#if DEBUG_TO_SCREEN
-  if (debug_enable) {
-    return;
-  }
-#endif
-
-  matrix_clear(&matrix);
-  if(is_master){
-    render_status(&matrix);
-  }else{
-    render_logo(&matrix);
-  }
-  matrix_update(&display, &matrix);
-}
-
-#endif
diff --git a/qmk/keyboards/helix/rev2/keymaps/five_rows/layer_number.h b/qmk/keyboards/helix/rev2/keymaps/five_rows/layer_number.h
new file mode 100644
index 00000000..1272feba
--- /dev/null
+++ b/qmk/keyboards/helix/rev2/keymaps/five_rows/layer_number.h
@@ -0,0 +1,26 @@
+#pragma once
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+enum layer_number {
+    _QWERTY = 0,
+    _COLEMAK,
+    _DVORAK,
+    _EUCALYN,
+    _KEYPAD,
+    _AUX,
+    _KAUX,
+    _LOWER,
+    _RAISE,
+    _PADFUNC,
+    _ADJUST,
+};
+
+#if defined(SSD1306OLED)
+extern void init_helix_oled(void);
+#   define INIT_HELIX_OLED() init_helix_oled();
+#else
+#   define INIT_HELIX_OLED()
+#endif
diff --git a/qmk/keyboards/helix/rev2/keymaps/five_rows/oled_display.c b/qmk/keyboards/helix/rev2/keymaps/five_rows/oled_display.c
new file mode 100644
index 00000000..127d80cc
--- /dev/null
+++ b/qmk/keyboards/helix/rev2/keymaps/five_rows/oled_display.c
@@ -0,0 +1,200 @@
+/* Copyright 2020 mtei
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+#include <stdio.h>
+#ifdef CONSOLE_ENABLE
+  #include "print.h"
+#endif
+#ifdef SSD1306OLED
+  #include "ssd1306.h"
+#endif
+#include <string.h>
+#include "layer_number.h"
+
+extern int current_default_layer;
+
+void init_helix_oled(void) {
+#ifdef SSD1306OLED
+    //SSD1306 OLED init, make sure to add #define SSD1306OLED in config.h
+    iota_gfx_init(!has_usb());   // turns on the display
+#endif
+}
+
+//SSD1306 OLED update loop, make sure to add #define SSD1306OLED in config.h
+#if defined(SSD1306OLED) || defined(OLED_DRIVER_ENABLE)
+
+#    if defined(OLED_DRIVER_ENABLE)
+oled_rotation_t oled_init_user(oled_rotation_t rotation) {
+    if (is_keyboard_master()) {
+        return OLED_ROTATION_0;
+    } else {
+        return OLED_ROTATION_180;
+    }
+}
+#    else
+#    define oled_write(data,flag)    matrix_write(matrix, data)
+#    define oled_write_P(data,flag)  matrix_write_P(matrix, data)
+#    endif
+
+#    ifdef SSD1306OLED
+void matrix_scan_user(void) {
+    iota_gfx_task();  // this is what updates the display continuously
+}
+
+void matrix_update(struct CharacterMatrix *dest,
+                   const struct CharacterMatrix *source) {
+    if (memcmp(dest->display, source->display, sizeof(dest->display))) {
+        memcpy(dest->display, source->display, sizeof(dest->display));
+        dest->dirty = true;
+    }
+}
+#    endif
+
+#    ifdef SSD1306OLED
+static void render_logo(struct CharacterMatrix *matrix) {
+#    else
+static void render_logo(void) {
+#    endif
+
+    static const char helix_logo[] PROGMEM = {
+        0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94,
+        0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4,
+        0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0xd4,
+        0};
+    oled_write_P(helix_logo, false);
+#    ifdef RGBLIGHT_ENABLE
+    char buf[30];
+    if (RGBLIGHT_MODES > 1 && rgblight_is_enabled()) {
+        snprintf(buf, sizeof(buf), " LED %2d: %d,%d,%d ",
+                 rgblight_get_mode(),
+                 rgblight_get_hue()/RGBLIGHT_HUE_STEP,
+                 rgblight_get_sat()/RGBLIGHT_SAT_STEP,
+                 rgblight_get_val()/RGBLIGHT_VAL_STEP);
+        oled_write(buf, false);
+#        ifndef SSD1306OLED
+    } else {
+        oled_write_P( PSTR("\n"), false);
+#        endif
+    }
+#    endif
+}
+
+static const char Qwerty_name[]  PROGMEM = " Qwerty";
+static const char Colemak_name[] PROGMEM = " Colemak";
+static const char Dvorak_name[]  PROGMEM = " Dvorak";
+static const char Eucalyn_name[] PROGMEM = " Eucalyn";
+static const char Keypad_name[]  PROGMEM = " Keypad";
+
+static const char AUX_name[]     PROGMEM = ":AUX";
+static const char KAUX_name[]    PROGMEM = ":00";
+static const char Padfunc_name[] PROGMEM = ":PadFunc";
+static const char Lower_name[]   PROGMEM = ":Func";
+static const char Raise_name[]   PROGMEM = ":Extra";
+static const char Adjust_name[]  PROGMEM = ":Adjust";
+
+static const char *layer_names[] = {
+    [_QWERTY] = Qwerty_name,
+    [_COLEMAK] = Colemak_name,
+    [_DVORAK] = Dvorak_name,
+    [_EUCALYN]= Eucalyn_name,
+    [_KEYPAD] = Keypad_name,
+    [_AUX]    = AUX_name,
+    [_KAUX]   = KAUX_name,
+    [_LOWER]  = Lower_name,
+    [_RAISE]  = Raise_name,
+    [_PADFUNC]= Padfunc_name,
+    [_ADJUST] = Adjust_name
+};
+
+#    ifdef SSD1306OLED
+void render_status(struct CharacterMatrix *matrix) {
+#    else
+void render_status(void) {
+#    endif
+
+    // Render to mode icon
+    static const char os_logo[][2][3] PROGMEM ={{{0x95,0x96,0},{0xb5,0xb6,0}},{{0x97,0x98,0},{0xb7,0xb8,0}}};
+    if(keymap_config.swap_lalt_lgui==false){
+        oled_write_P(os_logo[0][0], false);
+        oled_write_P(PSTR("\n"), false);
+        oled_write_P(os_logo[0][1], false);
+    } else {
+        oled_write_P(os_logo[1][0], false);
+        oled_write_P(PSTR("\n"), false);
+        oled_write_P(os_logo[1][1], false);
+    }
+
+    // Define layers here, Have not worked out how to have text displayed for each layer. Copy down the number you see and add a case for it below
+    int name_num;
+    uint32_t lstate;
+    oled_write_P(layer_names[current_default_layer], false);
+    oled_write_P(PSTR("\n"), false);
+    for (lstate = layer_state, name_num = 0;
+         lstate && name_num < sizeof(layer_names)/sizeof(char *);
+         lstate >>=1, name_num++) {
+        if ((lstate & 1) != 0) {
+            if (layer_names[name_num]) {
+                oled_write_P(layer_names[name_num], false);
+            }
+        }
+    }
+
+    // Host Keyboard LED Status
+    char led[40];
+    snprintf(led, sizeof(led), "\n%s  %s  %s",
+             (host_keyboard_leds() & (1<<USB_LED_NUM_LOCK)) ? "NUMLOCK" : "       ",
+             (host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK)) ? "CAPS" : "    ",
+             (host_keyboard_leds() & (1<<USB_LED_SCROLL_LOCK)) ? "SCLK" : "    ");
+    oled_write(led, false);
+}
+
+#    ifdef SSD1306OLED
+void iota_gfx_task_user(void) {
+    struct CharacterMatrix matrix;
+
+#        if DEBUG_TO_SCREEN
+    if (debug_enable) {
+        return;
+    }
+#        endif
+
+    matrix_clear(&matrix);
+    if (is_keyboard_master()) {
+        render_status(&matrix);
+    } else {
+        render_logo(&matrix);
+    }
+    matrix_update(&display, &matrix);
+}
+#    else
+void oled_task_user(void) {
+
+#        if DEBUG_TO_SCREEN
+    if (debug_enable) {
+        return;
+    }
+#        endif
+
+    if(is_keyboard_master()){
+        render_status();
+    }else{
+        render_logo();
+    }
+}
+#    endif
+
+#endif
diff --git a/qmk/keyboards/helix/rev2/keymaps/five_rows/rules.mk b/qmk/keyboards/helix/rev2/keymaps/five_rows/rules.mk
index 8c4239de..83cdb30d 100644
--- a/qmk/keyboards/helix/rev2/keymaps/five_rows/rules.mk
+++ b/qmk/keyboards/helix/rev2/keymaps/five_rows/rules.mk
@@ -25,9 +25,51 @@ HELIX_ROWS = 5              # Helix Rows is 4 or 5
 # IOS_DEVICE_ENABLE = no      # connect to IOS device (iPad,iPhone)
 
 ifneq ($(strip $(HELIX)),)
-  ifeq ($(findstring console,$(HELIX)), console)
-    CONSOLE_ENABLE = yes
-  endif
+  define KEYMAP_OPTION_PARSE
+    # $xinfo .$1.x #debug
+    # parse  'dispoff', 'consle', 'stdole', 'oled', 'sc'
+    ifeq ($(strip $1),dispoff)
+        OLED_ENABLE = no
+        OLED_DRIVER_ENABLE = no
+        LED_BACK_ENABLE = no
+        LED_UNDERGLOW_ENABLE = no
+    endif
+    ifeq ($(strip $1),console)
+        CONSOLE_ENABLE = yes
+    endif
+    ifeq ($(strip $1),stdole)
+        ## make HELIX=stdole helix:five_rows -- use TOP/drivers/oled/oled_driver.c
+        OLED_ENABLE = new
+    endif
+    ifeq ($(strip $1),oled)
+         ## make HELIX=oled helix:five_rows -- use helix/local_drivers/ssd1306.c
+        OLED_ENABLE = yes
+    endif
+    ifeq ($(strip $1),back)
+        LED_BACK_ENABLE = yes
+    endif
+    ifeq ($(strip $1),sc)
+        SPLIT_KEYBOARD = yes
+    endif
+  endef # end of KEYMAP_OPTION_PARSE
+
+  COMMA=,
+  $(eval $(foreach A_OPTION_NAME,$(subst $(COMMA), ,$(HELIX)),  \
+      $(call KEYMAP_OPTION_PARSE,$(A_OPTION_NAME))))
+endif
+
+ifeq ($(strip $(OLED_ENABLE)), new)
+    OLED_DRIVER_ENABLE = yes
+    OLED_ENABLE = no
+    SRC += oled_display.c
+    ifeq ($(strip $(LOCAL_GLCDFONT)), yes)
+       OPT_DEFS += -DOLED_FONT_H=\<helixfont.h\>
+    else
+       OPT_DEFS += -DOLED_FONT_H=\"common/glcdfont.c\"
+    endif
+endif
+ifeq ($(strip $(OLED_ENABLE)), yes)
+    SRC += oled_display.c
 endif
 
 # convert Helix-specific options (that represent combinations of standard options)
diff --git a/qmk/keyboards/helix/rev2/keymaps/led_test/oled_display.c b/qmk/keyboards/helix/rev2/keymaps/led_test/oled_display.c
new file mode 100644
index 00000000..3261b6c5
--- /dev/null
+++ b/qmk/keyboards/helix/rev2/keymaps/led_test/oled_display.c
@@ -0,0 +1 @@
+#include "../default/oled_display.c"
diff --git a/qmk/keyboards/helix/rev2/keymaps/led_test/rules.mk b/qmk/keyboards/helix/rev2/keymaps/led_test/rules.mk
index 013ef148..8b590eee 100644
--- a/qmk/keyboards/helix/rev2/keymaps/led_test/rules.mk
+++ b/qmk/keyboards/helix/rev2/keymaps/led_test/rules.mk
@@ -14,10 +14,14 @@ LTO_ENABLE = no  # if firmware size over limit, try this option
 OLED_ENABLE = yes            # OLED_ENABLE
 # LOCAL_GLCDFONT = no         # use each keymaps "helixfont.h" insted of "common/glcdfont.c"
 LED_BACK_ENABLE = yes        # LED backlight (Enable WS2812 RGB underlight.)
-# LED_UNDERGLOW_ENABLE = no   # LED underglow (Enable WS2812 RGB underlight.)
-LED_ANIMATIONS = yes        # LED animations
+LED_UNDERGLOW_ENABLE = no    # LED underglow (Enable WS2812 RGB underlight.)
+LED_ANIMATIONS = yes         # LED animations
 # IOS_DEVICE_ENABLE = no      # connect to IOS device (iPad,iPhone)
 
+OLED_SELECT = core
+ifeq ($(strip $(OLED_ENABLE)), yes)
+    SRC += oled_display.c
+endif
 SRC += led_test_init.c
 
 # convert Helix-specific options (that represent combinations of standard options)
diff --git a/qmk/keyboards/helix/rev2/keymaps/xulkal/rules.mk b/qmk/keyboards/helix/rev2/keymaps/xulkal/rules.mk
index 03800f9b..7fac4df7 100644
--- a/qmk/keyboards/helix/rev2/keymaps/xulkal/rules.mk
+++ b/qmk/keyboards/helix/rev2/keymaps/xulkal/rules.mk
@@ -11,3 +11,6 @@ OPT_DEFS += -DOLED_FONT_H=\"common/glcdfont.c\"
 OPT_DEFS += -DOLED_90ROTATION
 
 SPLIT_KEYBOARD = yes
+
+# Explicitly disable helix standard post-processing
+KEYBOARD_LOCAL_FEATURES_MK :=
diff --git a/qmk/keyboards/helix/rev2/local_features.mk b/qmk/keyboards/helix/rev2/local_features.mk
index 3f8a7216..ce3853a0 100644
--- a/qmk/keyboards/helix/rev2/local_features.mk
+++ b/qmk/keyboards/helix/rev2/local_features.mk
@@ -5,9 +5,12 @@
 #   combinations of standard options) into QMK standard options.
 #
 
+KEYBOARD_LOCAL_FEATURES_MK :=
+
 define HELIX_CUSTOMISE_MSG
   $(info Helix Spacific Build Options)
   $(info -  OLED_ENABLE          = $(OLED_ENABLE))
+  $(info -  OLED_SELECT          = $(OLED_SELECT))
   $(info -  LED_BACK_ENABLE      = $(LED_BACK_ENABLE))
   $(info -  LED_UNDERGLOW_ENABLE = $(LED_UNDERGLOW_ENABLE))
   $(info -  LED_ANIMATIONS       = $(LED_ANIMATIONS))
@@ -15,43 +18,92 @@ define HELIX_CUSTOMISE_MSG
   $(info )
 endef
 
+define HELIX_HELP_MSG
+  $(info Helix keyboard convenient command line option)
+  $(info -    make HELIX=<options> helix:<keymap>)
+  $(info -    option= oled | core-oled | local-oled | no-oled )
+  $(info -            back | no-back   | under      | na   | no-ani )
+  $(info -             ios | sc        | split-common | scan | verbose)
+  $(info -    eg.)
+  $(info -      make HELIX=no-oled       helix:<keymap>)
+  $(info -      make HELIX=oled,no-back  helix:<keymap>)
+  $(info -      make HELIX=oled,under    helix:<keymap>)
+  $(info -      make HELIX=oled,back,na  helix:<keymap>)
+  $(info -      make HELIX=oled,back,ios helix:<keymap>)
+  $(info )
+endef
+
   ifneq ($(strip $(HELIX)),)
-    ### Helix keyboard keymap: convenient command line option
-    ##    make HELIX=<options> helix:<keymap>
-    ##    option= oled | back | under | na | ios
-    ##    ex.
-    ##      make HELIX=oled          helix:<keymap>
-    ##      make HELIX=oled,back     helix:<keymap>
-    ##      make HELIX=oled,under    helix:<keymap>
-    ##      make HELIX=oled,back,na  helix:<keymap>
-    ##      make HELIX=oled,back,ios helix:<keymap>
-    ##
-    ifeq ($(findstring oled,$(HELIX)), oled)
-      OLED_ENABLE = yes
-    endif
-    ifeq ($(findstring back,$(HELIX)), back)
-      LED_BACK_ENABLE = yes
-    else ifeq ($(findstring under,$(HELIX)), under)
-      LED_UNDERGLOW_ENABLE = yes
-    endif
-    ifeq ($(findstring na,$(HELIX)), na)
-      LED_ANIMATIONS = no
-    endif
-    ifeq ($(findstring no_ani,$(HELIX)), no_ani)
-      LED_ANIMATIONS = no
-    endif
-    ifeq ($(findstring ios,$(HELIX)), ios)
-      IOS_DEVICE_ENABLE = yes
-    endif
-    ifeq ($(findstring scan,$(HELIX)), scan)
-      # use DEBUG_MATRIX_SCAN_RATE
-      # see docs/newbs_testing_debugging.md
-      OPT_DEFS +=  -DDEBUG_MATRIX_SCAN_RATE
-      CONSOLE_ENABLE = yes
-      SHOW_VERBOSE_INFO = yes
-    endif
-    ifeq ($(findstring verbose,$(HELIX)), verbose)
-      SHOW_VERBOSE_INFO = yes
+    define HELIX_OPTION_PARSE
+      # parce 'oled' 'back' 'under' 'ios' etc.
+      $(if $(SHOW_PARCE),$(info parse .$1.))  #debug
+
+      ifeq ($(strip $1),help)
+        HELP=on
+      endif
+      ifneq ($(filter nooled no-oled,$(strip $1)),)
+        OLED_ENABLE = no
+      endif
+      ifeq ($(strip $1),oled)
+        OLED_ENABLE = yes
+      endif
+      ifneq ($(filter core-oled core_oled newoled new-oled olednew oled-new,$(strip $1)),)
+        OLED_ENABLE = yes
+        OLED_SELECT = core
+      endif
+      ifneq ($(filter local-oled local_oled oldoled old-oled oledold oled-old,$(strip $1)),)
+        OLED_ENABLE = yes
+        OLED_SELECT = local
+      endif
+      ifneq ($(filter noback no-back nounder no-under,$(strip $1)),)
+        LED_BACK_ENABLE = no
+        LED_UNDERGLOW_ENABLE = no
+      endif
+      ifeq ($(strip $1),back)
+        LED_BACK_ENABLE = yes
+        LED_UNDERGLOW_ENABLE = no
+      endif
+      ifeq ($(strip $1),under)
+        LED_BACK_ENABLE = no
+        LED_UNDERGLOW_ENABLE = yes
+      endif
+      ifneq ($(filter na no_ani no-ani,$(strip $1)),)
+        LED_ANIMATIONS = no
+      endif
+      ifeq ($(strip $1),ios)
+        IOS_DEVICE_ENABLE = yes
+      endif
+      ifneq ($(filter sc split-common split_common,$(strip $1)),)
+        SPLIT_KEYBOARD = yes
+      endif
+      ifneq ($(filter nosc no-sc no-split-common no-split_common,$(strip $1)),)
+        SPLIT_KEYBOARD = no
+      endif
+      ifeq ($(strip $1),scan)
+        # use DEBUG_MATRIX_SCAN_RATE
+        # see docs/newbs_testing_debugging.md
+        OPT_DEFS +=  -DDEBUG_MATRIX_SCAN_RATE
+        CONSOLE_ENABLE = yes
+        SHOW_VERBOSE_INFO = yes
+      endif
+      ifeq ($(strip $1),verbose)
+        SHOW_VERBOSE_INFO = yes
+      endif
+      ifeq ($(strip $1),lto)
+        LTO_ENABLE = yes
+      endif
+      ifneq ($(filter nolto no-lto no_lto,$(strip $1)),)
+        LTO_ENABLE = no
+      endif
+    endef # end of HELIX_OPTION_PARSE
+
+    COMMA=,
+    $(eval $(foreach A_OPTION_NAME,$(subst $(COMMA), ,$(HELIX)),  \
+        $(call HELIX_OPTION_PARSE,$(A_OPTION_NAME))))
+
+    ifeq ($(strip $(HELP)),on)
+       $(eval $(call HELIX_HELP_MSG))
+       $(error )
     endif
     SHOW_HELIX_OPTIONS = yes
   endif
@@ -103,12 +155,21 @@ ifeq ($(strip $(LED_ANIMATIONS)), yes)
 endif
 
 ifeq ($(strip $(OLED_ENABLE)), yes)
-    SRC += local_drivers/i2c.c
-    SRC += local_drivers/ssd1306.c
-    KEYBOARD_PATHS += $(HELIX_TOP_DIR)/local_drivers
-    OPT_DEFS += -DOLED_ENABLE
-    ifeq ($(strip $(LOCAL_GLCDFONT)), yes)
-        OPT_DEFS += -DLOCAL_GLCDFONT
+    ifeq ($(strip $(OLED_SELECT)),core)
+        OLED_DRIVER_ENABLE = yes
+        ifeq ($(strip $(LOCAL_GLCDFONT)), yes)
+           OPT_DEFS += -DOLED_FONT_H=\<helixfont.h\>
+        else
+           OPT_DEFS += -DOLED_FONT_H=\"common/glcdfont.c\"
+        endif
+    else
+        SRC += local_drivers/i2c.c
+        SRC += local_drivers/ssd1306.c
+        KEYBOARD_PATHS += $(HELIX_TOP_DIR)/local_drivers
+        OPT_DEFS += -DOLED_ENABLE
+        ifeq ($(strip $(LOCAL_GLCDFONT)), yes)
+            OPT_DEFS += -DLOCAL_GLCDFONT
+        endif
     endif
 endif
 
@@ -119,7 +180,8 @@ ifneq ($(strip $(SHOW_HELIX_OPTIONS)),)
      $(info -- OLED_DRIVER_ENABLE = $(OLED_DRIVER_ENABLE))
      $(info -- CONSOLE_ENABLE     = $(CONSOLE_ENABLE))
      $(info -- OPT_DEFS           = $(OPT_DEFS))
-     $(info -- LTO_ENABLE = $(LTO_ENABLE))
+     $(info -- SPLIT_KEYBOARD     = $(SPLIT_KEYBOARD))
+     $(info -- LTO_ENABLE         = $(LTO_ENABLE))
      $(info )
   endif
 endif
diff --git a/qmk/keyboards/helix/rev2/qmk_conf/config.h b/qmk/keyboards/helix/rev2/qmk_conf/config.h
new file mode 100644
index 00000000..b8c1041c
--- /dev/null
+++ b/qmk/keyboards/helix/rev2/qmk_conf/config.h
@@ -0,0 +1,38 @@
+/*
+This is the c configuration file for the keymap
+
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+Copyright 2015 Jack Humbert
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+// place overrides here
+
+// If you need more program area, try select and reduce rgblight modes to use.
+
+// Selection of RGBLIGHT MODE to use.
+#if defined(LED_ANIMATIONS)
+   #define RGBLIGHT_EFFECT_BREATHING
+   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
+   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+   #define RGBLIGHT_EFFECT_SNAKE
+   #define RGBLIGHT_EFFECT_KNIGHT
+   #define RGBLIGHT_EFFECT_CHRISTMAS
+   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
+   //#define RGBLIGHT_EFFECT_RGB_TEST
+   //#define RGBLIGHT_EFFECT_ALTERNATING
+#endif
diff --git a/qmk/keyboards/helix/rev2/qmk_conf/rules.mk b/qmk/keyboards/helix/rev2/qmk_conf/rules.mk
new file mode 100644
index 00000000..67caab1c
--- /dev/null
+++ b/qmk/keyboards/helix/rev2/qmk_conf/rules.mk
@@ -0,0 +1,4 @@
+LED_BACK_ENABLE = yes       # LED backlight (Enable WS2812 RGB underlight.)
+LED_ANIMATIONS = yes        # LED animations
+
+include $(strip $(KEYBOARD_LOCAL_FEATURES_MK))
diff --git a/qmk/keyboards/helix/rev2/readme.md b/qmk/keyboards/helix/rev2/readme.md
new file mode 100644
index 00000000..e6a6f2e9
--- /dev/null
+++ b/qmk/keyboards/helix/rev2/readme.md
@@ -0,0 +1,13 @@
+# Helix rev2
+
+A compact split ortholinear keyboard.
+
+* Keyboard Maintainer: [yushakobo](https://github.com/yushakobo)
+* Hardware Supported: Helix rev2 PCBs, Pro Micro
+* Hardware Availability: [PCB & Case Data](https://github.com/MakotoKurauchi/helix)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make helix/rev2:default:flash
+
+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).
diff --git a/qmk/keyboards/helix/rev2/rev2.c b/qmk/keyboards/helix/rev2/rev2.c
index 12b8ae9e..d2b3143d 100644
--- a/qmk/keyboards/helix/rev2/rev2.c
+++ b/qmk/keyboards/helix/rev2/rev2.c
@@ -18,13 +18,28 @@ void led_set_kb(uint8_t usb_led) {
 }
 #endif
 
+bool is_mac_mode(void) {
+    // This is the opposite of the QMK standard, but we'll leave it for backwards compatibility.
+    return keymap_config.swap_lalt_lgui == false;
+}
+
+void set_mac_mode_kb(bool macmode) {
+    /* The result is the same as pressing the AG_NORM(=MAGIC_UNSWAP_ALT_GUI)/AG_SWAP(=MAGIC_SWAP_ALT_GUI) keys.
+     * see
+     *   https://github.com/qmk/qmk_firmware/blob/fb4a6ad30ea7a648acd59793ed4a30c3a8d8dc32/quantum/process_keycode/process_magic.c#L123-L124
+     *   https://github.com/qmk/qmk_firmware/blob/fb4a6ad30ea7a648acd59793ed4a30c3a8d8dc32/quantum/process_keycode/process_magic.c#L80-L81
+     */
+    keymap_config.swap_lalt_lgui = keymap_config.swap_ralt_rgui = !macmode;
+    eeconfig_update_keymap(keymap_config.raw);
+}
+
 void matrix_init_kb(void) {
     // Each keymap.c should use is_keyboard_master() instead of is_master.
     // But keep is_master for a while for backwards compatibility
     //  for the old keymap.c.
     is_master = is_keyboard_master();
 
-	matrix_init_user();
+    matrix_init_user();
 };
 
 void keyboard_post_init_kb(void) {
diff --git a/qmk/keyboards/helix/rev2/rev2.h b/qmk/keyboards/helix/rev2/rev2.h
index 42f215fd..bab841fe 100644
--- a/qmk/keyboards/helix/rev2/rev2.h
+++ b/qmk/keyboards/helix/rev2/rev2.h
@@ -2,6 +2,9 @@
 
 #include "helix.h"
 
+bool is_mac_mode(void);
+void set_mac_mode_kb(bool macmode);
+
 #ifndef SPLIT_KEYBOARD
     extern bool is_helix_master(void);
     #define is_keyboard_master() is_helix_master()
diff --git a/qmk/keyboards/helix/rev2/rules.mk b/qmk/keyboards/helix/rev2/rules.mk
index db584c0b..a31e9d9b 100644
--- a/qmk/keyboards/helix/rev2/rules.mk
+++ b/qmk/keyboards/helix/rev2/rules.mk
@@ -2,9 +2,14 @@ KEYBOARD_LOCAL_FEATURES_MK := $(dir $(lastword $(MAKEFILE_LIST)))local_features.
 
 # Helix Spacific Build Options default values
 HELIX_ROWS = 5              # Helix Rows is 4 or 5
-OLED_ENABLE = no            # OLED_ENABLE
+OLED_ENABLE = yes           # OLED_ENABLE
 LOCAL_GLCDFONT = no         # use each keymaps "helixfont.h" insted of "common/glcdfont.c"
 LED_BACK_ENABLE = no        # LED backlight (Enable WS2812 RGB underlight.)
 LED_UNDERGLOW_ENABLE = no   # LED underglow (Enable WS2812 RGB underlight.)
 LED_ANIMATIONS = yes        # LED animations
 IOS_DEVICE_ENABLE = no      # connect to IOS device (iPad,iPhone)
+
+# If OLED_ENABLE is 'yes'
+#   If OLED_SELECT is 'core', use QMK standard oled_dirver.c.
+#   If OLED_SELECT is other than 'core', use helix/local_drivers/ssd1306.c.
+OLED_SELECT = local
diff --git a/qmk/keyboards/helix/rev2/sc/rules.mk b/qmk/keyboards/helix/rev2/sc/rules.mk
index d38a6180..4ed0672a 100644
--- a/qmk/keyboards/helix/rev2/sc/rules.mk
+++ b/qmk/keyboards/helix/rev2/sc/rules.mk
@@ -1 +1,2 @@
 SPLIT_KEYBOARD = yes
+LED_BACK_ENABLE = yes
diff --git a/qmk/keyboards/helix/rev2/split_scomm.c b/qmk/keyboards/helix/rev2/split_scomm.c
index ada78679..378781b9 100644
--- a/qmk/keyboards/helix/rev2/split_scomm.c
+++ b/qmk/keyboards/helix/rev2/split_scomm.c
@@ -5,10 +5,10 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <stddef.h>
-#include <split_scomm.h>
+#include "split_scomm.h"
 #include "serial.h"
 #ifdef CONSOLE_ENABLE
-  #include <print.h>
+  #include "print.h"
 #endif
 
 uint8_t volatile serial_slave_buffer[SERIAL_SLAVE_BUFFER_LENGTH] = {0};
diff --git a/qmk/keyboards/helix/rev3_4rows/rev3_4rows.c b/qmk/keyboards/helix/rev3_4rows/rev3_4rows.c
index cf183366..c034c833 100644
--- a/qmk/keyboards/helix/rev3_4rows/rev3_4rows.c
+++ b/qmk/keyboards/helix/rev3_4rows/rev3_4rows.c
@@ -21,15 +21,13 @@ bool is_mac_mode(void) {
 }
 
 void set_mac_mode(bool macmode) {
-    if (macmode) {
-        /* The result is the same as pressing the AG_NORM(=MAGIC_UNSWAP_ALT_GUI) key. */
-        /* https://github.com/qmk/qmk_firmware/blob/fb4a6ad30ea7a648acd59793ed4a30c3a8d8dc32/quantum/process_keycode/process_magic.c#L123-L124 */
-        keymap_config.swap_lalt_lgui = keymap_config.swap_ralt_rgui = false;
-    } else {
-        /* The result is the same as pressing the AG_SWAP(=MAGIC_SWAP_ALT_GUI) key. */
-        /* https://github.com/qmk/qmk_firmware/blob/fb4a6ad30ea7a648acd59793ed4a30c3a8d8dc32/quantum/process_keycode/process_magic.c#L80-L81 */
-        keymap_config.swap_lalt_lgui = keymap_config.swap_ralt_rgui = true;
-    }
+    /* The result is the same as pressing the AG_NORM(=MAGIC_UNSWAP_ALT_GUI)/AG_SWAP(=MAGIC_SWAP_ALT_GUI) keys.
+     * see
+     *   https://github.com/qmk/qmk_firmware/blob/fb4a6ad30ea7a648acd59793ed4a30c3a8d8dc32/quantum/process_keycode/process_magic.c#L123-L124
+     *   https://github.com/qmk/qmk_firmware/blob/fb4a6ad30ea7a648acd59793ed4a30c3a8d8dc32/quantum/process_keycode/process_magic.c#L80-L81
+     */
+    keymap_config.swap_lalt_lgui = keymap_config.swap_ralt_rgui = !macmode;
+    eeconfig_update_keymap(keymap_config.raw);
 }
 
 void dip_switch_update_kb(uint8_t index, bool active) {
diff --git a/qmk/keyboards/helix/rev3_4rows/rules.mk b/qmk/keyboards/helix/rev3_4rows/rules.mk
index 7168f174..a5916c11 100644
--- a/qmk/keyboards/helix/rev3_4rows/rules.mk
+++ b/qmk/keyboards/helix/rev3_4rows/rules.mk
@@ -1,7 +1,8 @@
 EXTRAKEY_ENABLE = yes    # Audio control and System control
 RGBLIGHT_ENABLE = yes   # Enable keyboard RGB underglow
 SPLIT_KEYBOARD = yes
-#RGB_MATRIX_ENABLE = WS2812
+RGB_MATRIX_ENABLE = no
+RGB_MATRIX_DRIVER = WS2812
 OLED_DRIVER_ENABLE = yes
 ENCODER_ENABLE = yes
 DIP_SWITCH_ENABLE = yes
diff --git a/qmk/keyboards/helix/rev3_5rows/keymaps/five_rows/config.h b/qmk/keyboards/helix/rev3_5rows/keymaps/five_rows/config.h
new file mode 100644
index 00000000..416e8fd7
--- /dev/null
+++ b/qmk/keyboards/helix/rev3_5rows/keymaps/five_rows/config.h
@@ -0,0 +1,48 @@
+/*
+This is the c configuration file for the keymap
+
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+Copyright 2015 Jack Humbert
+Copyright 2020 mtei
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef CONFIG_USER_H
+#define CONFIG_USER_H
+
+#undef TAPPING_TERM
+#define TAPPING_TERM 300
+#define PERMISSIVE_HOLD
+/* when TAPPING_TERM >= 500 same effect PERMISSIVE_HOLD.
+   see tmk_core/common/action_tapping.c */
+
+// place overrides here
+
+// If you need more program area, try select and reduce rgblight modes to use.
+
+// Selection of RGBLIGHT MODE to use.
+#if defined(LED_ANIMATIONS)
+   #define RGBLIGHT_EFFECT_BREATHING
+   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
+   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+   //#define RGBLIGHT_EFFECT_SNAKE
+   //#define RGBLIGHT_EFFECT_KNIGHT
+   #define RGBLIGHT_EFFECT_CHRISTMAS
+   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
+   //#define RGBLIGHT_EFFECT_RGB_TEST
+   //#define RGBLIGHT_EFFECT_ALTERNATING
+#endif
+
+#endif /* CONFIG_USER_H */
diff --git a/qmk/keyboards/helix/rev3_5rows/keymaps/five_rows/keyboard_post_init_user_scan.c b/qmk/keyboards/helix/rev3_5rows/keymaps/five_rows/keyboard_post_init_user_scan.c
new file mode 100644
index 00000000..7c84e1ed
--- /dev/null
+++ b/qmk/keyboards/helix/rev3_5rows/keymaps/five_rows/keyboard_post_init_user_scan.c
@@ -0,0 +1,7 @@
+#include QMK_KEYBOARD_H
+
+void keyboard_post_init_user(void) {
+#if defined(DEBUG_MATRIX_SCAN_RATE)
+    debug_enable = true;
+#endif
+}
diff --git a/qmk/keyboards/helix/rev3_5rows/keymaps/five_rows/keymap.c b/qmk/keyboards/helix/rev3_5rows/keymaps/five_rows/keymap.c
new file mode 100644
index 00000000..a2ec1086
--- /dev/null
+++ b/qmk/keyboards/helix/rev3_5rows/keymaps/five_rows/keymap.c
@@ -0,0 +1,468 @@
+/* Copyright 2020 mtei
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+#include "util.h"
+#include "bootloader.h"
+#ifdef PROTOCOL_LUFA
+#include "lufa.h"
+#include "split_util.h"
+#endif
+#ifdef CONSOLE_ENABLE
+  #include <print.h>
+#endif
+#include "layer_number.h"
+
+extern keymap_config_t keymap_config;
+
+extern uint8_t is_master;
+
+enum custom_keycodes {
+  QWERTY = SAFE_RANGE,
+  COLEMAK,
+  DVORAK,
+  EUCALYN,
+  KEYPAD,
+  xEISU,
+  xKANA,
+  ZERO2,
+  RGBRST
+};
+
+#define LAYOUT_wrapper(...)    LAYOUT(__VA_ARGS__)
+
+//Macros
+#define KC_LOWER  MO(_LOWER)
+#define XXXX      XXXXXXX
+#define ____      _______
+#define KC_ADJ    MO(_ADJUST)
+#define KC_LSMI   LSFT(KC_MINS)
+#define KC_LSEQ   LSFT(KC_EQL)
+#define KC_LSRB   LSFT(KC_RBRC)
+#define KC_LSLB   LSFT(KC_LBRC)
+
+#define _1_2_3_4_5           KC_1, KC_2, KC_3, KC_4, KC_5
+#define _6_7_8_9_0           KC_6, KC_7, KC_8, KC_9, KC_0
+#define L_LOWER2_CAPS_LALT_LGUI_SPC_RABS \
+    KC_LOWER, KC_LOWER, KC_CAPS, KC_LALT, KC_LGUI, KC_SPC, LT(_RAISE,KC_BSPC)
+#define R_RAEN_SPC_RGUI_RALT_APP_LOWER2 \
+    LT(_RAISE,KC_ENT), KC_SPC, KC_RGUI, KC_RALT,  KC_APP, KC_LOWER, KC_LOWER
+
+
+#if MATRIX_ROWS == 10 // HELIX_ROWS == 5
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  /* Qwerty
+   * ,-----------------------------------.           ,-----------------------------------.
+   * | ESC |  1  |  2  |  3  |  4  |  5  |           |  6  |  7  |  8  |  9  |  0  | BS  |
+   * |-----+-----+-----+-----+-----+-----|           |-----+-----+-----+-----+-----+-----|
+   * | Tab |  Q  |  W  |  E  |  R  |  T  |           |  Y  |  U  |  I  |  O  |  P  |  \  |
+   * |-----+-----+-----+-----+-----+-----|           |-----+-----+-----+-----+-----+-----|
+   * | Ctrl|  A  |  S  |  D  |  F  |  G  |           |  H  |  J  |  K  |  L  |  ;  |Ctrl |
+   * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
+   * |Shift|  Z  |  X  |  C  |  V  |  B  |  `  |  '  |  N  |  M  |  ,  |  .  |  /  |Shift|
+   * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
+   * |Lower|Lower|Caps | Alt | GUI |Space|  BS |Enter|Space| GUI | Alt |Menu |Lower|Lower|
+   * `-----------------------------------------------------------------------------------'
+   */
+#define _Q_W_E_R_T           KC_Q, KC_W, KC_E, KC_R, KC_T
+#define _Y_U_I_O_P           KC_Y, KC_U, KC_I, KC_O, KC_P
+#define _A_S_D_F_G           KC_A, KC_S, KC_D, KC_F, KC_G
+#define _H_J_K_L_SCLN        KC_H, KC_J, KC_K, KC_L, KC_SCLN
+#define _Z_X_C_V_B           KC_Z, KC_X, KC_C, KC_V, KC_B
+#define _N_M_COMM_DOT_SLSH   KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH
+
+  [_QWERTY] = LAYOUT_wrapper( \
+    KC_ESC,   _1_2_3_4_5,                       _6_7_8_9_0,         KC_BSPC, \
+    KC_TAB,   _Q_W_E_R_T,                       _Y_U_I_O_P,         KC_BSLS, \
+    KC_LCTL,  _A_S_D_F_G,                       _H_J_K_L_SCLN,      KC_RCTL, \
+    KC_LSFT,  _Z_X_C_V_B,     KC_GRV,  KC_QUOT, _N_M_COMM_DOT_SLSH, KC_RSFT, \
+    L_LOWER2_CAPS_LALT_LGUI_SPC_RABS,  R_RAEN_SPC_RGUI_RALT_APP_LOWER2  \
+   ),
+
+  /* Colemak
+   * ,-----------------------------------.           ,-----------------------------------.
+   * | ESC |  1  |  2  |  3  |  4  |  5  |           |  6  |  7  |  8  |  9  |  0  | BS  |
+   * |-----+-----+-----+-----+-----+-----|           |-----+-----+-----+-----+-----+-----|
+   * | Tab |  Q  |  W  |  F  |  P  |  G  |           |  J  |  L  |  U  |  Y  |  ;  |  \  |
+   * |-----+-----+-----+-----+-----+-----|           |-----+-----+-----+-----+-----+-----|
+   * | Ctrl|  A  |  R  |  S  |  T  |  D  |           |  H  |  N  |  E  |  I  |  O  |Ctrl |
+   * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
+   * |Shift|  Z  |  X  |  C  |  V  |  B  |  `  |  '  |  K  |  M  |  ,  |  .  |  /  |Shift|
+   * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
+   * |Lower|Lower|Caps | Alt | GUI |Space|  BS |Enter|Space| GUI | Alt |Menu |Lower|Lower|
+   * `-----------------------------------------------------------------------------------'
+   */
+#define _Q_W_F_P_G           KC_Q, KC_W, KC_F, KC_P, KC_G
+#define _J_L_U_Y_SCLN        KC_J, KC_L, KC_U, KC_Y, KC_SCLN
+#define _A_R_S_T_D           KC_A, KC_R, KC_S, KC_T, KC_D
+#define _H_N_E_I_O           KC_H, KC_N, KC_E, KC_I, KC_O
+#define _Z_X_C_V_B           KC_Z, KC_X, KC_C, KC_V, KC_B
+#define _K_M_COMM_DOT_SLSH   KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH
+
+  [_COLEMAK] = LAYOUT_wrapper( \
+    KC_ESC,   _1_2_3_4_5,                       _6_7_8_9_0,         KC_BSPC, \
+    KC_TAB,   _Q_W_F_P_G,                       _J_L_U_Y_SCLN,      KC_BSLS, \
+    KC_LCTL,  _A_R_S_T_D,                       _H_N_E_I_O,         KC_RCTL, \
+    KC_LSFT,  _Z_X_C_V_B,     KC_GRV,  KC_QUOT, _K_M_COMM_DOT_SLSH, KC_RSFT, \
+    L_LOWER2_CAPS_LALT_LGUI_SPC_RABS,  R_RAEN_SPC_RGUI_RALT_APP_LOWER2  \
+  ),
+
+  /* Dvorak
+   * ,-----------------------------------.           ,-----------------------------------.
+   * | ESC |  1  |  2  |  3  |  4  |  5  |           |  6  |  7  |  8  |  9  |  0  | BS  |
+   * |-----+-----+-----+-----+-----+-----|           |-----+-----+-----+-----+-----+-----|
+   * | Tab |  '  |  ,  |  .  |  P  |  Y  |           |  F  |  G  |  C  |  R  |  L  |  \  |
+   * |-----+-----+-----+-----+-----+-----|           |-----+-----+-----+-----+-----+-----|
+   * | Ctrl|  A  |  O  |  E  |  U  |  I  |           |  D  |  H  |  T  |  N  |  S  |Ctrl |
+   * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
+   * |Shift|  ;  |  Q  |  J  |  K  |  X  |  `  |  /  |  B  |  M  |  W  |  V  |  Z  |Shift|
+   * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
+   * |Lower|Lower|Caps | Alt | GUI |Space|  BS |Enter|Space| GUI | Alt |Menu |Lower|Lower|
+   * `-----------------------------------------------------------------------------------'
+   */
+#define _QUOT_COMM_DOT_P_Y   KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y
+#define _F_G_C_R_L           KC_F, KC_G, KC_C, KC_R, KC_L
+#define _A_O_E_U_I           KC_A, KC_O, KC_E, KC_U, KC_I
+#define _D_H_T_N_S           KC_D, KC_H, KC_T, KC_N, KC_S
+#define _SCLN_Q_J_K_X        KC_SCLN, KC_Q, KC_J, KC_K, KC_X
+#define _B_M_W_V_Z           KC_B, KC_M, KC_W, KC_V, KC_Z
+
+  [_DVORAK] = LAYOUT_wrapper( \
+    KC_ESC,   _1_2_3_4_5,                       _6_7_8_9_0,    KC_BSPC, \
+    KC_TAB,   _QUOT_COMM_DOT_P_Y,               _F_G_C_R_L,    KC_BSLS, \
+    KC_LCTL,  _A_O_E_U_I,                       _D_H_T_N_S,    KC_RCTL, \
+    KC_LSFT,  _SCLN_Q_J_K_X,  KC_GRV,  KC_SLSH, _B_M_W_V_Z,    KC_RSFT, \
+    L_LOWER2_CAPS_LALT_LGUI_SPC_RABS,  R_RAEN_SPC_RGUI_RALT_APP_LOWER2  \
+   ),
+
+  /* Eucalyn (http://eucalyn.hatenadiary.jp/entry/about-eucalyn-layout)
+   * ,-----------------------------------.           ,-----------------------------------.
+   * | ESC |  1  |  2  |  3  |  4  |  5  |           |  6  |  7  |  8  |  9  |  0  | BS  |
+   * |-----+-----+-----+-----+-----+-----|           |-----+-----+-----+-----+-----+-----|
+   * | Tab |  Q  |  W  |  ,  |  .  |  ;  |           |  M  |  R  |  D  |  Y  |  P  |  \  |
+   * |-----+-----+-----+-----+-----+-----|           |-----+-----+-----+-----+-----+-----|
+   * | Ctrl|  A  |  O  |  E  |  I  |  U  |           |  G  |  T  |  K  |  S  |  N  |Ctrl |
+   * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
+   * |Shift|  Z  |  X  |  C  |  V  |  F  |  `  |  '  |  B  |  H  |  J  |  L  |  /  |Shift|
+   * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
+   * |Lower|Lower|Caps | Alt | GUI |Space|  BS |Enter|Space| GUI | Alt |Menu |Lower|Lower|
+   * `-----------------------------------------------------------------------------------'
+   */
+#define _Q_W_COMM_DOT_SCLN   KC_Q, KC_W, KC_COMM, KC_DOT, KC_SCLN
+#define _M_R_D_Y_P           KC_M, KC_R, KC_D, KC_Y, KC_P
+#define _A_O_E_I_U           KC_A, KC_O, KC_E, KC_I, KC_U
+#define _G_T_K_S_N           KC_G, KC_T, KC_K, KC_S, KC_N
+#define _Z_X_C_V_F           KC_Z, KC_X, KC_C, KC_V, KC_F
+#define _B_H_J_L_SLSH        KC_B, KC_H, KC_J, KC_L, KC_SLSH
+
+  [_EUCALYN] = LAYOUT_wrapper( \
+    KC_ESC,   _1_2_3_4_5,                       _6_7_8_9_0,     KC_BSPC, \
+    KC_TAB,   _Q_W_COMM_DOT_SCLN,               _M_R_D_Y_P,     KC_BSLS, \
+    KC_LCTL,  _A_O_E_I_U,                       _G_T_K_S_N,     KC_RCTL, \
+    KC_LSFT,  _Z_X_C_V_F,     KC_GRV,  KC_QUOT, _B_H_J_L_SLSH,  KC_RSFT, \
+    L_LOWER2_CAPS_LALT_LGUI_SPC_RABS,  R_RAEN_SPC_RGUI_RALT_APP_LOWER2  \
+  ),
+
+  /* Keypad
+   * ,-----------------------------------.           ,-----------------------------------.
+   * | Tab |  /  |  *  | Del |  F1 |  F6 |           |  F1 |  F6 | Del | Tab |  /  |  *  |
+   * |-----+-----+-----+-----+-----+-----|           |-----+-----+-----+-----+-----+-----|
+   * |  7  |  8  |  9  | BS  |  F2 |  F7 |           |  F2 |  F7 | BS  |  7  |  8  |  9  |
+   * |-----+-----+-----+-----+-----+-----|           |-----+-----+-----+-----+-----+-----|
+   * |  4  |  5  |  6  |  -  |  F3 |  F8 |           |  F3 |  F8 |  -  |  4  |  5  |  6  |
+   * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
+   * |  1  |  2  |  3  |  +  |  F4 |  F9 | F11 | F11 |  F4 |  F9 |  +  |  1  |  2  |  3  |
+   * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
+   * |  0  |  ,  |  .  |Enter|  F5 |  F10| F12 | F12 |  F5 |  F10|Enter|  0  |  ,  |  .  |
+   * `-----------------------------------------------------------------------------------'
+   */
+#define KP_TOP KC_TAB,  KC_PSLS, KC_PAST
+#define KP_789 KC_KP_7, KC_KP_8, KC_KP_9
+#define KP_456 KC_KP_4, KC_KP_5, KC_KP_6
+#define KP_123 KC_KP_1, KC_KP_2, KC_KP_3
+#define KP_BTM KC_KP_0, KC_COMM, KC_PDOT
+#define F_1_6  KC_F1, KC_F6
+#define F_2_7  KC_F2, KC_F7
+#define F_3_8  KC_F3, KC_F8
+#define F_4_9  KC_F4, KC_F9
+#define F_510  KC_F5, KC_F10
+#define FF12   LT(_PADFUNC,KC_F12)
+
+  [_KEYPAD] = LAYOUT_wrapper( \
+    KP_TOP, KC_DEL,  F_1_6,                     F_1_6,  KC_DEL, KP_TOP, \
+    KP_789, KC_BSPC, F_2_7,                     F_2_7, KC_BSPC, KP_789, \
+    KP_456, KC_PMNS, F_3_8,                     F_3_8, KC_PMNS, KP_456, \
+    KP_123, KC_PPLS, F_4_9,  KC_F11,  KC_F11,  F_4_9, KC_PPLS, KP_123, \
+    KP_BTM, KC_PENT, F_510,    FF12,    FF12,  F_510, KC_PENT, KP_BTM  \
+  ),
+
+  /*  AUX modifier key layer
+   * ,-----------------------------------.           ,-----------------------------------.
+   * |     |     |     |     |     |     |           |     |     |     |     |     |     |
+   * |-----+-----+-----+-----+-----+-----|           |-----+-----+-----+-----+-----+-----|
+   * |     |     |     |     |     |     |           |     |     |     |     |     |     |
+   * |-----+-----+-----+-----+-----+-----|           |-----+-----+-----+-----+-----+-----|
+   * |     |     |     |     |     |     |           |     |     |     |     |     |     |
+   * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
+   * |     |     |     |     |     |     |     |     |     |     |     |     |     |     |
+   * |-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----|
+   * |     | 00  |     |     |     |     |     |     |     |     |     |     | 00  |     |
+   * `-----------------------------------------------------------------------------------'
+   */
+  [_KAUX] = LAYOUT( \
+      ____, ____, ____, ____, ____, ____,             ____, ____, ____, ____, ____, ____, \
+      ____, ____, ____, ____, ____, ____,             ____, ____, ____, ____, ____, ____, \
+      ____, ____, ____, ____, ____, ____,             ____, ____, ____, ____, ____, ____, \
+      ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, \
+      ____,ZERO2, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,ZERO2, ____ \
+   ),
+
+  /*  Keypad function layer
+   * ,-----------------------------------------.             ,-----------------------------------------.
+   * |      |      |      | Pause| ScrLk| PtrSc|             | PtrSc| ScrLk| Pause|      |      |      |
+   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
+   * |      |      |      | Home |  Up  | PgUp |             | PgUp |  Up  | Home |      |      |      |
+   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
+   * |      |Delete|Insert| Left | Down | Right|             | Left | Down | Right|Insert|Delete|      |
+   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+   * |      |      |      | End  |      | PgDn |Adjust|Adjust| PgDn |      | End  |      |      |      |
+   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+   * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
+   * `-------------------------------------------------------------------------------------------------'
+   */
+#define _PAUS_SLCK_PSCR           KC_PAUS, KC_SLCK, KC_PSCR
+#define _PSCR_SLCK_PAUS           KC_PSCR, KC_SLCK, KC_PAUS
+#define _HOME_UP_PGUP             KC_HOME, KC_UP,   KC_PGUP
+#define _PGUP_UP_HOME             KC_PGUP, KC_UP,   KC_HOME
+#define _DEL_INS_LEFT_DOWN_RGHT   KC_DEL,  KC_INS,  KC_LEFT, KC_DOWN, KC_RGHT
+#define _LEFT_DOWN_RGHT_INS_DEL   KC_LEFT, KC_DOWN, KC_RGHT, KC_INS,  KC_DEL
+#define _PGDN_ADJ_ADJ_PGDN        KC_PGDN, KC_ADJ,  KC_ADJ,  KC_PGDN
+
+  [_PADFUNC] = LAYOUT_wrapper( \
+      XXXX, XXXX, XXXX, _PAUS_SLCK_PSCR,               _PSCR_SLCK_PAUS,       XXXX, XXXX, XXXX, \
+      XXXX, XXXX, XXXX,   _HOME_UP_PGUP,               _PGUP_UP_HOME,         XXXX, XXXX, XXXX, \
+      XXXX,     _DEL_INS_LEFT_DOWN_RGHT,               _LEFT_DOWN_RGHT_INS_DEL,           XXXX, \
+      XXXX, XXXX, XXXX, KC_END, XXXX,   _PGDN_ADJ_ADJ_PGDN,     XXXX, KC_END, XXXX, XXXX, XXXX, \
+      XXXX, XXXX, XXXX, XXXX,   XXXX, XXXX, ____, ____,   XXXX, XXXX,   XXXX, XXXX, XXXX, XXXX \
+   ),
+
+  /* Lower
+   * ,-----------------------------------------.             ,-----------------------------------------.
+   * |      |  F1  |  F2  |  F3  |  F4  |  F5  |             |  F6  |  F7  |  F8  |  F9  |  F10 | F11  |
+   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
+   * |      |      |Pause | ScrLk| Ins  |      |             |      | Ins  | ScrLk|Pause |      | F12  |
+   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
+   * |      | PgUp |      | Up   |Delete| Home |             | Home |Delete| Up   |      | PgUp |      |
+   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+   * |      | PgDn | Left | Down | Right| End  |Adjust|Adjust| End  | Left | Down | Right| PgDn |      |
+   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+   * |      |      | PrtSc|      |      |      |      |      |      |      |      | PrtSc|      |      |
+   * `-------------------------------------------------------------------------------------------------'
+   */
+#define _F1_F2_F3_F4_F5           KC_F1, KC_F2, KC_F3, KC_F4, KC_F5
+#define _F6_F7_F8_F9_F10_F11      KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11
+#define _PAUS_SLCK_INS            KC_PAUS, KC_SLCK, KC_INS
+#define _INS_SLCK_PAUS            KC_INS,  KC_SLCK, KC_PAUS
+#define _ADJ_ADJ                  KC_ADJ,  KC_ADJ
+#define _UP_DEL_PGUP              KC_UP,   KC_DEL,  KC_PGUP
+#define _PGUP_DEL_UP              KC_PGUP, KC_DEL,  KC_UP
+#define _END_LEFT_DOWN_RGHT_PGDN  KC_END,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN
+#define _PGDN_LEFT_DOWN_RGHT_END  KC_PGDN, KC_LEFT, KC_DOWN, KC_RGHT, KC_END
+
+  [_LOWER] = LAYOUT_wrapper( \
+      XXXX, _F1_F2_F3_F4_F5,                             _F6_F7_F8_F9_F10_F11, \
+      XXXX, XXXX,    _PAUS_SLCK_INS,   XXXX,             XXXX,  _INS_SLCK_PAUS,    XXXX, KC_F12, \
+      ____, KC_HOME, XXXX, _UP_DEL_PGUP,                 _PGUP_DEL_UP,      XXXX, KC_HOME, ____, \
+      ____, _END_LEFT_DOWN_RGHT_PGDN,        XXXX, XXXX, _PGDN_LEFT_DOWN_RGHT_END,         ____, \
+      ____, ____, KC_PSCR, ____, ____, ____,  _ADJ_ADJ,  ____, ____, ____, KC_PSCR, ____, ____ \
+      ),
+
+  /* Raise
+   * ,-----------------------------------------.             ,-----------------------------------------.
+   * |      |      |      |      |      |      |             |      |      |      |      |      |      |
+   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
+   * |      |      |      |      |  _   |  -   |             |  =   |  +   |      |      |      |      |
+   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
+   * |      |      |      |      |  {   |  [   |             |  ]   |  }   |      |      |      |      |
+   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+   * |      |      |      |      |      | EISU | EISU | KANA | KANA | Next | Vol- | Vol+ | Play |      |
+   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+   * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
+   * `-------------------------------------------------------------------------------------------------'
+   */
+#define _LSMI_MINS             KC_LSMI, KC_MINS
+#define _EQL_LSEQ              KC_EQL,  KC_LSEQ
+#define _LSLB_LBRC             KC_LSLB, KC_LBRC
+#define _RBRC_LSRB             KC_RBRC, KC_LSRB
+#define _MNXT_VOLD_VOLU_MPLY   KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+
+  [_RAISE] = LAYOUT_wrapper( \
+      XXXX, XXXX, XXXX, XXXX, XXXX, XXXX,             XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, \
+      XXXX, XXXX, XXXX, XXXX, _LSMI_MINS,             _EQL_LSEQ,  XXXX, XXXX, XXXX, XXXX, \
+      ____, XXXX, XXXX, XXXX, _LSLB_LBRC,             _RBRC_LSRB, XXXX, XXXX, XXXX, ____, \
+      ____, XXXX, XXXX, XXXX, XXXX,xEISU,xEISU, xKANA,xKANA, _MNXT_VOLD_VOLU_MPLY,  ____, \
+      _ADJ_ADJ,   XXXX, ____, ____, XXXX, ____, ____, XXXX, ____, ____, XXXX,   _ADJ_ADJ \
+      ),
+
+  /* Adjust (Lower + Raise)
+   * ,-----------------------------------------.             ,-----------------------------------------.
+   * |      |Keypad|Dvorak|Colemk|Euclyn|Qwerty|             |Qwerty|Euclyn|Colemk|Dvorak|Keypad|      |
+   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
+   * |      | Reset|RGBRST|RGB ON|Aud on| Win  |             | Win  |Aud on|RGB ON|RGBRST|      |      |
+   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
+   * | HUE+ | SAT+ | VAL+ |RGB md|Audoff| Mac  |             | Mac  |Audoff|RGB md| VAL+ | SAT+ | HUE+ |
+   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+   * | HUE- | SAT- | VAL- |      |      |      |      |      |      |      |      | VAL- | SAT- | HUE- |
+   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+   * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
+   * `-------------------------------------------------------------------------------------------------'
+   */
+  [_ADJUST] =  LAYOUT( \
+      XXXXXXX, KEYPAD,  DVORAK,  COLEMAK, EUCALYN,  QWERTY,          QWERTY,  EUCALYN, COLEMAK,  DVORAK,  KEYPAD, XXXXXXX, \
+      XXXXXXX, RESET,   RGBRST,  RGB_TOG,   AU_ON, AG_SWAP,          AG_SWAP,   AU_ON, RGB_TOG,  RGBRST, XXXXXXX, XXXXXXX, \
+      RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD,  AU_OFF, AG_NORM,          AG_NORM,  AU_OFF, RGB_MOD, RGB_VAI, RGB_SAI, RGB_HUI, \
+      RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, XXXXXXX, XXXXXXX,____,____,XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAD, RGB_SAD, RGB_HUD, \
+      _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,____,____,XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______ \
+   ),
+
+  /*  AUX modifier key layer
+   * ,-----------------------------------------.             ,-----------------------------------------.
+   * |      |      |      |      |      |      |             |      |      |      |      |      |      |
+   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
+   * |      |      |      |      |      |      |             |      |      |      |      |      |      |
+   * |------+------+------+------+------+------|             |------+------+------+------+------+------|
+   * |      |      |      |      |      |      |             |      |      |      |      |      |      |
+   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+   * |      |      |      |      |      |      |      |      |      |      |      |      |      |      |
+   * |------+------+------+------+------+------+------+------+------+------+------+------+------+------|
+   * |      |      |      |      |      |  BS  | Enter|      |      |      |      |      |      |      |
+   * `-------------------------------------------------------------------------------------------------'
+   */
+#define _BSPC_RAEN KC_BSPC, LT(_RAISE,KC_ENT)
+  [_AUX] = LAYOUT_wrapper( \
+      ____, ____, ____, ____, ____, ____,             ____, ____, ____, ____, ____, ____, \
+      ____, ____, ____, ____, ____, ____,             ____, ____, ____, ____, ____, ____, \
+      ____, ____, ____, ____, ____, ____,             ____, ____, ____, ____, ____, ____, \
+      ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, \
+      ____, ____, ____, ____, ____, _BSPC_RAEN, ____, ____, ____, ____, ____, ____, ____ \
+      )
+};
+
+#else
+#error "undefined keymaps"
+#endif
+
+
+int current_default_layer;
+
+uint32_t default_layer_state_set_user(uint32_t state) {
+    current_default_layer = biton32(state);
+    return state;
+}
+
+void update_base_layer(int base)
+{
+    if( current_default_layer != base ) {
+        eeconfig_update_default_layer(1UL<<base);
+        default_layer_set(1UL<<base);
+        layer_off(_AUX);
+        layer_off(_KAUX);
+    } else {
+        if( base < _KEYPAD )
+            layer_invert(_AUX);
+        else
+            layer_invert(_KAUX);
+    }
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  switch (keycode) {
+    case QWERTY:
+      if (record->event.pressed) {
+        update_base_layer(_QWERTY);
+      }
+      return false;
+      break;
+    case COLEMAK:
+      if (record->event.pressed) {
+        update_base_layer(_COLEMAK);
+      }
+      return false;
+      break;
+    case DVORAK:
+      if (record->event.pressed) {
+        update_base_layer(_DVORAK);
+      }
+      return false;
+      break;
+    case EUCALYN:
+      if (record->event.pressed) {
+        update_base_layer(_EUCALYN);
+      }
+      return false;
+      break;
+    case KEYPAD:
+      if (record->event.pressed) {
+        update_base_layer(_KEYPAD);
+      }
+      return false;
+      break;
+    case ZERO2:
+      if (record->event.pressed) {
+          SEND_STRING("00");
+      }
+      return false;
+      break;
+    case xEISU:
+      if (record->event.pressed) {
+        if(keymap_config.swap_lalt_lgui==false){
+          register_code(KC_LANG2);
+        }else{
+          SEND_STRING(SS_LALT("`"));
+        }
+      } else {
+        unregister_code(KC_LANG2);
+      }
+      return false;
+      break;
+    case xKANA:
+      if (record->event.pressed) {
+        if(keymap_config.swap_lalt_lgui==false){
+          register_code(KC_LANG1);
+        }else{
+          SEND_STRING(SS_LALT("`"));
+        }
+      } else {
+        unregister_code(KC_LANG1);
+      }
+      return false;
+      break;
+    case RGBRST:
+      #ifdef RGBLIGHT_ENABLE
+        if (record->event.pressed) {
+          eeconfig_update_rgblight_default();
+          rgblight_enable();
+        }
+      #endif
+      break;
+  }
+  return true;
+}
+
+void matrix_init_user(void) {
+    INIT_HELIX_OLED(); /* define in layer_number.h */
+}
diff --git a/qmk/keyboards/helix/rev3_5rows/keymaps/five_rows/layer_number.h b/qmk/keyboards/helix/rev3_5rows/keymaps/five_rows/layer_number.h
new file mode 100644
index 00000000..1272feba
--- /dev/null
+++ b/qmk/keyboards/helix/rev3_5rows/keymaps/five_rows/layer_number.h
@@ -0,0 +1,26 @@
+#pragma once
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+enum layer_number {
+    _QWERTY = 0,
+    _COLEMAK,
+    _DVORAK,
+    _EUCALYN,
+    _KEYPAD,
+    _AUX,
+    _KAUX,
+    _LOWER,
+    _RAISE,
+    _PADFUNC,
+    _ADJUST,
+};
+
+#if defined(SSD1306OLED)
+extern void init_helix_oled(void);
+#   define INIT_HELIX_OLED() init_helix_oled();
+#else
+#   define INIT_HELIX_OLED()
+#endif
diff --git a/qmk/keyboards/helix/rev3_5rows/keymaps/five_rows/oled_display.c b/qmk/keyboards/helix/rev3_5rows/keymaps/five_rows/oled_display.c
new file mode 100644
index 00000000..127d80cc
--- /dev/null
+++ b/qmk/keyboards/helix/rev3_5rows/keymaps/five_rows/oled_display.c
@@ -0,0 +1,200 @@
+/* Copyright 2020 mtei
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+#include <stdio.h>
+#ifdef CONSOLE_ENABLE
+  #include "print.h"
+#endif
+#ifdef SSD1306OLED
+  #include "ssd1306.h"
+#endif
+#include <string.h>
+#include "layer_number.h"
+
+extern int current_default_layer;
+
+void init_helix_oled(void) {
+#ifdef SSD1306OLED
+    //SSD1306 OLED init, make sure to add #define SSD1306OLED in config.h
+    iota_gfx_init(!has_usb());   // turns on the display
+#endif
+}
+
+//SSD1306 OLED update loop, make sure to add #define SSD1306OLED in config.h
+#if defined(SSD1306OLED) || defined(OLED_DRIVER_ENABLE)
+
+#    if defined(OLED_DRIVER_ENABLE)
+oled_rotation_t oled_init_user(oled_rotation_t rotation) {
+    if (is_keyboard_master()) {
+        return OLED_ROTATION_0;
+    } else {
+        return OLED_ROTATION_180;
+    }
+}
+#    else
+#    define oled_write(data,flag)    matrix_write(matrix, data)
+#    define oled_write_P(data,flag)  matrix_write_P(matrix, data)
+#    endif
+
+#    ifdef SSD1306OLED
+void matrix_scan_user(void) {
+    iota_gfx_task();  // this is what updates the display continuously
+}
+
+void matrix_update(struct CharacterMatrix *dest,
+                   const struct CharacterMatrix *source) {
+    if (memcmp(dest->display, source->display, sizeof(dest->display))) {
+        memcpy(dest->display, source->display, sizeof(dest->display));
+        dest->dirty = true;
+    }
+}
+#    endif
+
+#    ifdef SSD1306OLED
+static void render_logo(struct CharacterMatrix *matrix) {
+#    else
+static void render_logo(void) {
+#    endif
+
+    static const char helix_logo[] PROGMEM = {
+        0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8a,0x8b,0x8c,0x8d,0x8e,0x8f,0x90,0x91,0x92,0x93,0x94,
+        0xa0,0xa1,0xa2,0xa3,0xa4,0xa5,0xa6,0xa7,0xa8,0xa9,0xaa,0xab,0xac,0xad,0xae,0xaf,0xb0,0xb1,0xb2,0xb3,0xb4,
+        0xc0,0xc1,0xc2,0xc3,0xc4,0xc5,0xc6,0xc7,0xc8,0xc9,0xca,0xcb,0xcc,0xcd,0xce,0xcf,0xd0,0xd1,0xd2,0xd3,0xd4,
+        0};
+    oled_write_P(helix_logo, false);
+#    ifdef RGBLIGHT_ENABLE
+    char buf[30];
+    if (RGBLIGHT_MODES > 1 && rgblight_is_enabled()) {
+        snprintf(buf, sizeof(buf), " LED %2d: %d,%d,%d ",
+                 rgblight_get_mode(),
+                 rgblight_get_hue()/RGBLIGHT_HUE_STEP,
+                 rgblight_get_sat()/RGBLIGHT_SAT_STEP,
+                 rgblight_get_val()/RGBLIGHT_VAL_STEP);
+        oled_write(buf, false);
+#        ifndef SSD1306OLED
+    } else {
+        oled_write_P( PSTR("\n"), false);
+#        endif
+    }
+#    endif
+}
+
+static const char Qwerty_name[]  PROGMEM = " Qwerty";
+static const char Colemak_name[] PROGMEM = " Colemak";
+static const char Dvorak_name[]  PROGMEM = " Dvorak";
+static const char Eucalyn_name[] PROGMEM = " Eucalyn";
+static const char Keypad_name[]  PROGMEM = " Keypad";
+
+static const char AUX_name[]     PROGMEM = ":AUX";
+static const char KAUX_name[]    PROGMEM = ":00";
+static const char Padfunc_name[] PROGMEM = ":PadFunc";
+static const char Lower_name[]   PROGMEM = ":Func";
+static const char Raise_name[]   PROGMEM = ":Extra";
+static const char Adjust_name[]  PROGMEM = ":Adjust";
+
+static const char *layer_names[] = {
+    [_QWERTY] = Qwerty_name,
+    [_COLEMAK] = Colemak_name,
+    [_DVORAK] = Dvorak_name,
+    [_EUCALYN]= Eucalyn_name,
+    [_KEYPAD] = Keypad_name,
+    [_AUX]    = AUX_name,
+    [_KAUX]   = KAUX_name,
+    [_LOWER]  = Lower_name,
+    [_RAISE]  = Raise_name,
+    [_PADFUNC]= Padfunc_name,
+    [_ADJUST] = Adjust_name
+};
+
+#    ifdef SSD1306OLED
+void render_status(struct CharacterMatrix *matrix) {
+#    else
+void render_status(void) {
+#    endif
+
+    // Render to mode icon
+    static const char os_logo[][2][3] PROGMEM ={{{0x95,0x96,0},{0xb5,0xb6,0}},{{0x97,0x98,0},{0xb7,0xb8,0}}};
+    if(keymap_config.swap_lalt_lgui==false){
+        oled_write_P(os_logo[0][0], false);
+        oled_write_P(PSTR("\n"), false);
+        oled_write_P(os_logo[0][1], false);
+    } else {
+        oled_write_P(os_logo[1][0], false);
+        oled_write_P(PSTR("\n"), false);
+        oled_write_P(os_logo[1][1], false);
+    }
+
+    // Define layers here, Have not worked out how to have text displayed for each layer. Copy down the number you see and add a case for it below
+    int name_num;
+    uint32_t lstate;
+    oled_write_P(layer_names[current_default_layer], false);
+    oled_write_P(PSTR("\n"), false);
+    for (lstate = layer_state, name_num = 0;
+         lstate && name_num < sizeof(layer_names)/sizeof(char *);
+         lstate >>=1, name_num++) {
+        if ((lstate & 1) != 0) {
+            if (layer_names[name_num]) {
+                oled_write_P(layer_names[name_num], false);
+            }
+        }
+    }
+
+    // Host Keyboard LED Status
+    char led[40];
+    snprintf(led, sizeof(led), "\n%s  %s  %s",
+             (host_keyboard_leds() & (1<<USB_LED_NUM_LOCK)) ? "NUMLOCK" : "       ",
+             (host_keyboard_leds() & (1<<USB_LED_CAPS_LOCK)) ? "CAPS" : "    ",
+             (host_keyboard_leds() & (1<<USB_LED_SCROLL_LOCK)) ? "SCLK" : "    ");
+    oled_write(led, false);
+}
+
+#    ifdef SSD1306OLED
+void iota_gfx_task_user(void) {
+    struct CharacterMatrix matrix;
+
+#        if DEBUG_TO_SCREEN
+    if (debug_enable) {
+        return;
+    }
+#        endif
+
+    matrix_clear(&matrix);
+    if (is_keyboard_master()) {
+        render_status(&matrix);
+    } else {
+        render_logo(&matrix);
+    }
+    matrix_update(&display, &matrix);
+}
+#    else
+void oled_task_user(void) {
+
+#        if DEBUG_TO_SCREEN
+    if (debug_enable) {
+        return;
+    }
+#        endif
+
+    if(is_keyboard_master()){
+        render_status();
+    }else{
+        render_logo();
+    }
+}
+#    endif
+
+#endif
diff --git a/qmk/keyboards/helix/rev3_5rows/keymaps/five_rows/rules.mk b/qmk/keyboards/helix/rev3_5rows/keymaps/five_rows/rules.mk
new file mode 100644
index 00000000..21261fa2
--- /dev/null
+++ b/qmk/keyboards/helix/rev3_5rows/keymaps/five_rows/rules.mk
@@ -0,0 +1,44 @@
+# QMK Standard Build Options
+#   change to "no" to disable the options, or define them in the Makefile in
+#   the appropriate keymap folder that will get included automatically
+#
+#   See TOP/docs/config_options.md for more information.
+#
+ CONSOLE_ENABLE = no        # Console for debug
+ COMMAND_ENABLE = no        # Commands for debug and configuration
+ # CONSOLE_ENABLE and COMMAND_ENABLE
+ #      yes, no  +1500
+ #      yes, yes +3200
+ #      no,  yes +400
+LTO_ENABLE = no  # if firmware size over limit, try this option
+
+ifneq ($(strip $(HELIX)),)
+  define KEYMAP_OPTION_PARSE
+    # $xinfo .$1.x #debug
+    # parse  'dispoff', 'consle', 'back', 'oled'
+    ifeq ($(strip $1),dispoff)
+        OLED_DRIVER_ENABLE = no
+        RGBLIGHT_ENABLE = no
+    endif
+    ifeq ($(strip $1),console)
+        CONSOLE_ENABLE = yes
+    endif
+    ifeq ($(strip $1),oled)
+        OLED_DRIVER_ENABLE = yes
+    endif
+    ifeq ($(strip $1),back)
+        RGBLIGHT_ENABLE = yes
+    endif
+    ifeq ($(strip $1),scan)
+        # use DEBUG_MATRIX_SCAN_RATE
+        # see docs/newbs_testing_debugging.md
+        OPT_DEFS +=  -DDEBUG_MATRIX_SCAN_RATE
+        CONSOLE_ENABLE = yes
+        SRC += keyboard_post_init_user_scan.c
+    endif
+  endef # end of KEYMAP_OPTION_PARSE
+
+  COMMA=,
+  $(eval $(foreach A_OPTION_NAME,$(subst $(COMMA), ,$(HELIX)),  \
+      $(call KEYMAP_OPTION_PARSE,$(A_OPTION_NAME))))
+endif
diff --git a/qmk/keyboards/helix/rev3_5rows/rev3_5rows.c b/qmk/keyboards/helix/rev3_5rows/rev3_5rows.c
index cf183366..c034c833 100644
--- a/qmk/keyboards/helix/rev3_5rows/rev3_5rows.c
+++ b/qmk/keyboards/helix/rev3_5rows/rev3_5rows.c
@@ -21,15 +21,13 @@ bool is_mac_mode(void) {
 }
 
 void set_mac_mode(bool macmode) {
-    if (macmode) {
-        /* The result is the same as pressing the AG_NORM(=MAGIC_UNSWAP_ALT_GUI) key. */
-        /* https://github.com/qmk/qmk_firmware/blob/fb4a6ad30ea7a648acd59793ed4a30c3a8d8dc32/quantum/process_keycode/process_magic.c#L123-L124 */
-        keymap_config.swap_lalt_lgui = keymap_config.swap_ralt_rgui = false;
-    } else {
-        /* The result is the same as pressing the AG_SWAP(=MAGIC_SWAP_ALT_GUI) key. */
-        /* https://github.com/qmk/qmk_firmware/blob/fb4a6ad30ea7a648acd59793ed4a30c3a8d8dc32/quantum/process_keycode/process_magic.c#L80-L81 */
-        keymap_config.swap_lalt_lgui = keymap_config.swap_ralt_rgui = true;
-    }
+    /* The result is the same as pressing the AG_NORM(=MAGIC_UNSWAP_ALT_GUI)/AG_SWAP(=MAGIC_SWAP_ALT_GUI) keys.
+     * see
+     *   https://github.com/qmk/qmk_firmware/blob/fb4a6ad30ea7a648acd59793ed4a30c3a8d8dc32/quantum/process_keycode/process_magic.c#L123-L124
+     *   https://github.com/qmk/qmk_firmware/blob/fb4a6ad30ea7a648acd59793ed4a30c3a8d8dc32/quantum/process_keycode/process_magic.c#L80-L81
+     */
+    keymap_config.swap_lalt_lgui = keymap_config.swap_ralt_rgui = !macmode;
+    eeconfig_update_keymap(keymap_config.raw);
 }
 
 void dip_switch_update_kb(uint8_t index, bool active) {
diff --git a/qmk/keyboards/helix/rev3_5rows/rules.mk b/qmk/keyboards/helix/rev3_5rows/rules.mk
index 7168f174..a5916c11 100644
--- a/qmk/keyboards/helix/rev3_5rows/rules.mk
+++ b/qmk/keyboards/helix/rev3_5rows/rules.mk
@@ -1,7 +1,8 @@
 EXTRAKEY_ENABLE = yes    # Audio control and System control
 RGBLIGHT_ENABLE = yes   # Enable keyboard RGB underglow
 SPLIT_KEYBOARD = yes
-#RGB_MATRIX_ENABLE = WS2812
+RGB_MATRIX_ENABLE = no
+RGB_MATRIX_DRIVER = WS2812
 OLED_DRIVER_ENABLE = yes
 ENCODER_ENABLE = yes
 DIP_SWITCH_ENABLE = yes
diff --git a/qmk/keyboards/hidtech/bastyl/bastyl.c b/qmk/keyboards/hidtech/bastyl/bastyl.c
new file mode 100644
index 00000000..637af1ff
--- /dev/null
+++ b/qmk/keyboards/hidtech/bastyl/bastyl.c
@@ -0,0 +1,19 @@
+/* 
+ * Copyright 2020 Quentin LEBASTARD <qlebastard@gmail.com>
+ * Copyright 2020 Anthony MARIN <anthony@hidtech.ca>
+ *
+ * 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 "bastyl.h"
diff --git a/qmk/keyboards/hidtech/bastyl/bastyl.h b/qmk/keyboards/hidtech/bastyl/bastyl.h
new file mode 100644
index 00000000..5bacb8bb
--- /dev/null
+++ b/qmk/keyboards/hidtech/bastyl/bastyl.h
@@ -0,0 +1,43 @@
+/* 
+ * Copyright 2020 Quentin LEBASTARD <qlebastard@gmail.com>
+ * Copyright 2020 Anthony MARIN <anthony@hidtech.ca>
+ *
+ * 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"
+
+// SWITCHED 91 and 95 - check on left ?
+#define LAYOUT( \
+	k00, k01, k02, k03, k04, k05,			k55, k54, k53, k52, k51, k50, \
+	k10, k11, k12, k13, k14, k15,			k65, k64, k63, k62, k61, k60, \
+	k20, k21, k22, k23, k24, k25,			k75, k74, k73, k72, k71, k70, \
+	k30, k31, k32, k33, k34, k35,			k85, k84, k83, k82, k81, k80, \
+		       k43, k44, k41,		        k91, k94, k93, \
+		            k45, k42,                   k92, k95 \
+)\
+{\
+	{ k00, k01, k02, k03, k04, k05 }, \
+	{ k10, k11, k12, k13, k14, k15 }, \
+	{ k20, k21, k22, k23, k24, k25 }, \
+	{ k30, k31, k32, k33, k34, k35 }, \
+	{ KC_NO, k41, k42, k43, k44, k45 }, \
+	{ k50, k51, k52, k53, k54, k55 }, \
+	{ k60, k61, k62, k63, k64, k65 }, \
+	{ k70, k71, k72, k73, k74, k75 }, \
+	{ k80, k81, k82, k83, k84, k85 }, \
+	{ KC_NO, k91, k92, k93, k94, k95 }, \
+}
diff --git a/qmk/keyboards/hidtech/bastyl/config.h b/qmk/keyboards/hidtech/bastyl/config.h
new file mode 100644
index 00000000..ed33d845
--- /dev/null
+++ b/qmk/keyboards/hidtech/bastyl/config.h
@@ -0,0 +1,40 @@
+/* 
+ * Copyright 2020 Quentin LEBASTARD <qlebastard@gmail.com>
+ * Copyright 2020 Anthony MARIN <anthony@hidtech.ca>
+ *
+ * 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 "config_common.h"
+#define VENDOR_ID 0xA76A
+#define PRODUCT_ID 0x1827
+#define DEVICE_VER 0x0001
+#define MANUFACTURER HID Technologies
+#define PRODUCT Bastyl
+
+#define MATRIX_ROWS 10
+#define MATRIX_COLS 6
+#define DIODE_DIRECTION ROW2COL
+#define MATRIX_ROW_PINS { D7, B5, F7, F6, B6 }
+#define MATRIX_COL_PINS { B4, E6, C6, B1, B3, B2 }
+#define RGB_DI_PIN D2
+#define RGBLED_NUM 38
+#define RGBLIGHT_SPLIT
+#define RGBLIGHT_ANIMATIONS
+#define DEBOUNCE 5
+#define SOFT_SERIAL_PIN D0
+#define LOCKING_SUPPORT_ENABLE
+#define LOCKING_RESYNC_ENABLE
+#define MASTER_RIGHT
diff --git a/qmk/keyboards/hidtech/bastyl/info.json b/qmk/keyboards/hidtech/bastyl/info.json
new file mode 100644
index 00000000..e8115794
--- /dev/null
+++ b/qmk/keyboards/hidtech/bastyl/info.json
@@ -0,0 +1,71 @@
+{
+    "keyboard_name": "Bastyl",
+    "url": "https://www.hidtech.ca/?product=bastyl-black",
+    "maintainer": "HID-Technologies",
+    "width": 17,
+    "height": 8,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"L00", "x":0, "y":0},
+                {"label":"L01", "x":1, "y":0},
+                {"label":"L02", "x":2, "y":0},
+                {"label":"L03", "x":3, "y":0},
+                {"label":"L04", "x":4, "y":0},
+                {"label":"L05", "x":5, "y":0},
+                {"label":"R00", "x":11, "y":0},
+                {"label":"R01", "x":12, "y":0},
+                {"label":"R02", "x":13, "y":0},
+                {"label":"R03", "x":14, "y":0},
+                {"label":"R04", "x":15, "y":0},
+                {"label":"R05", "x":16, "y":0},
+                {"label":"L10", "x":0, "y":1},
+                {"label":"L11", "x":1, "y":1},
+                {"label":"L12", "x":2, "y":1},
+                {"label":"L13", "x":3, "y":1},
+                {"label":"L14", "x":4, "y":1},
+                {"label":"L15", "x":5, "y":1},
+                {"label":"R10", "x":11, "y":1},
+                {"label":"R11", "x":12, "y":1},
+                {"label":"R12", "x":13, "y":1},
+                {"label":"R13", "x":14, "y":1},
+                {"label":"R14", "x":15, "y":1},
+                {"label":"R15", "x":16, "y":1},
+                {"label":"L20", "x":0, "y":2},
+                {"label":"L21", "x":1, "y":2},
+                {"label":"L22", "x":2, "y":2},
+                {"label":"L23", "x":3, "y":2},
+                {"label":"L24", "x":4, "y":2},
+                {"label":"L25", "x":5, "y":2},
+                {"label":"R20", "x":11, "y":2},
+                {"label":"R21", "x":12, "y":2},
+                {"label":"R22", "x":13, "y":2},
+                {"label":"R23", "x":14, "y":2},
+                {"label":"R24", "x":15, "y":2},
+                {"label":"R25", "x":16, "y":2},
+                {"label":"L30", "x":0, "y":3},
+                {"label":"L31", "x":1, "y":3},
+                {"label":"L32", "x":2, "y":3},
+                {"label":"L33", "x":3, "y":3},
+                {"label":"L34", "x":4, "y":3},
+                {"label":"L35", "x":5, "y":3},
+                {"label":"R30", "x":11, "y":3},
+                {"label":"R31", "x":12, "y":3},
+                {"label":"R32", "x":13, "y":3},
+                {"label":"R33", "x":14, "y":3},
+                {"label":"R34", "x":15, "y":3},
+                {"label":"R35", "x":16, "y":3},
+                {"label":"L43", "x":5, "y":4},
+                {"label":"L44", "x":6, "y":4},
+                {"label":"L45", "x":7, "y":4},
+                {"label":"R40", "x":9, "y":4},
+                {"label":"R41", "x":10, "y":4},
+                {"label":"R40", "x":11, "y":4},
+                {"label":"L52", "x":6, "y":5},
+                {"label":"L53", "x":7, "y":5},
+                {"label":"R52", "x":9, "y":5},
+                {"label":"R53", "x":10, "y":5}
+            ]
+        }
+    }
+}
diff --git a/qmk/keyboards/hidtech/bastyl/keymaps/default/keymap.c b/qmk/keyboards/hidtech/bastyl/keymaps/default/keymap.c
new file mode 100644
index 00000000..d6d291af
--- /dev/null
+++ b/qmk/keyboards/hidtech/bastyl/keymaps/default/keymap.c
@@ -0,0 +1,61 @@
+/* 
+ * Copyright 2020 Quentin LEBASTARD <qlebastard@gmail.com>
+ * Copyright 2020 Anthony MARIN <anthony@hidtech.ca>
+ *
+ * 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(
+    KC_ESC,  KC_1, KC_2, KC_3, KC_4, KC_5,			            KC_6, KC_7, KC_8,    KC_9,   KC_0,     KC_BSPC,
+//-------------------------------------------------//-----------------------------------------------------------//
+    KC_TAB,  KC_Q, KC_W, KC_E, KC_R, KC_T,			            KC_Y, KC_U, KC_I,    KC_O,   KC_P,     KC_MINS,
+//-------------------------------------------------//-----------------------------------------------------------//
+    KC_LSFT, KC_A, KC_S, KC_D, KC_F, KC_G,	                KC_H, KC_J, KC_K,    KC_L,   KC_SCLN,  KC_QUOT,
+//-------------------------------------------------//-----------------------------------------------------------//
+    KC_LCTL, KC_Z, KC_X, KC_C, KC_V, KC_B,                  KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,  KC_BSLS,
+//-------------------------------------------------//-----------------------------------------------------------//
+                        KC_LCTL, KC_SPC, MO(1),		     MO(2),  KC_ENT, KC_RGUI,
+                                 KC_HOME,  KC_BSPC,      KC_DEL, KC_RALT
+  ),
+
+  [1] = LAYOUT(
+    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,			  KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,  KC_DEL,
+//---------------------------------------------------------//-----------------------------------------------------------//
+    RESET,   _______, _______, _______, _______, KC_LBRC,			  KC_RBRC, KC_P7,   KC_P8,   KC_P9,   _______,  KC_PLUS,
+//---------------------------------------------------------//-----------------------------------------------------------//
+    _______, KC_HOME, KC_PGUP, KC_PGDN, KC_END,  KC_LPRN,	      KC_RPRN, KC_P4,   KC_P5,   KC_P6,   KC_MINS,  KC_PIPE,
+//---------------------------------------------------------//-----------------------------------------------------------//
+    _______, _______, _______, _______, _______, _______,       _______, KC_P1,   KC_P2,   KC_P3,   KC_EQL,   KC_UNDS,
+//---------------------------------------------------------//-----------------------------------------------------------//
+                               KC_LCTL, KC_HOME, KC_TRNS,		    KC_TRNS, KC_RALT, KC_RGUI,
+                                        KC_SPC,  KC_BSPC,       KC_RCTL, KC_ENT
+  ),
+
+  [2] = LAYOUT(
+    KC_F12,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,			    KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,
+//---------------------------------------------------------//--------------------------------------------------------------//
+    _______, _______, RGB_RMOD, RGB_TOG, RGB_MOD, KC_LBRC,			  KC_RBRC, _______, KC_NLCK, KC_INS,  KC_SLCK,  KC_MUTE,
+//---------------------------------------------------------//--------------------------------------------------------------//
+    _______, KC_LEFT, KC_UP,    KC_DOWN, KC_RGHT, KC_LPRN,	      KC_RPRN, KC_MPRV, KC_MPLY, KC_MNXT, _______,  KC_VOLU,
+//---------------------------------------------------------//--------------------------------------------------------------//
+    _______, _______, _______,  _______, _______, _______,        _______, _______, _______, _______, _______,  KC_VOLD,
+//---------------------------------------------------------//--------------------------------------------------------------//
+                               KC_LCTL, KC_HOME, KC_TRNS,		    KC_TRNS, KC_RALT, RESET,
+                                        KC_SPC,  KC_BSPC,       KC_RCTL, KC_ENT
+  ),
+};
diff --git a/qmk/keyboards/hidtech/bastyl/readme.md b/qmk/keyboards/hidtech/bastyl/readme.md
new file mode 100644
index 00000000..f21f030a
--- /dev/null
+++ b/qmk/keyboards/hidtech/bastyl/readme.md
@@ -0,0 +1,22 @@
+# Bastyl
+
+A split ergonomic keyboard.
+
+* Keyboard Maintainer: [HID Technologies](https://github.com/HID-Technologies)
+* Hardware Supported: elite-C V4
+* Hardware Availability: [Hidtech.ca](https://www.hidtech.ca/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make hidtech/bastyl: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).
+
+See the [keyboard build instructions](https://hid-technologies.github.io/Bastyl-DIY-instructions/)
+
+
+## Important information regarding the reset
+
+If you modify this firmware, make sure to always have a RESET key that can be triggered using only the master side ! This way you ensure that you can always flash the keyboard, even if you mess up.
+
+Otherwise if you're stuck, open the case and reset manually by shorting Gnd and Rst, or pressing the RST button.
diff --git a/qmk/keyboards/hidtech/bastyl/rules.mk b/qmk/keyboards/hidtech/bastyl/rules.mk
new file mode 100644
index 00000000..cc88208e
--- /dev/null
+++ b/qmk/keyboards/hidtech/bastyl/rules.mk
@@ -0,0 +1,23 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+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
+# 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
+RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+SPLIT_KEYBOARD = yes
diff --git a/qmk/keyboards/hineybush/h660s/config.h b/qmk/keyboards/hineybush/h660s/config.h
new file mode 100644
index 00000000..8f33fe3e
--- /dev/null
+++ b/qmk/keyboards/hineybush/h660s/config.h
@@ -0,0 +1,141 @@
+/*
+Copyright 2020 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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID    0x04D8
+#define PRODUCT_ID   0xEB1B
+#define DEVICE_VER   0x0001
+#define MANUFACTURER hineybush keyboards
+#define PRODUCT      h660s
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+ */
+#define MATRIX_ROW_PINS { B1, E6, B3, D3, D2 }
+#define MATRIX_COL_PINS { F0, F1, F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, D5 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+#define BACKLIGHT_PIN B7
+#define BACKLIGHT_LEVELS 3
+#define BACKLIGHT_BREATHING
+
+#define RGB_DI_PIN B0
+#ifdef RGB_DI_PIN
+#    define RGBLED_NUM 16
+#    define RGBLIGHT_HUE_STEP 8
+#    define RGBLIGHT_SAT_STEP 8
+#    define RGBLIGHT_VAL_STEP 8
+#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+/*== all animations enable ==*/
+//#    define RGBLIGHT_ANIMATIONS
+/*== or choose animations ==*/
+#    define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+//#    define RGBLIGHT_EFFECT_SNAKE
+//#    define RGBLIGHT_EFFECT_KNIGHT
+//#    define RGBLIGHT_EFFECT_CHRISTMAS
+#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#    define RGBLIGHT_EFFECT_RGB_TEST
+#    define RGBLIGHT_EFFECT_ALTERNATING
+/*== customize breathing effect ==*/
+/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+//#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+/*==== use exp() and sin() ====*/
+//#    define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//#    define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+#endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+//#define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+/* Bootmagic Lite key configuration */
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/hineybush/h660s/h660s.c b/qmk/keyboards/hineybush/h660s/h660s.c
new file mode 100644
index 00000000..e8e50048
--- /dev/null
+++ b/qmk/keyboards/hineybush/h660s/h660s.c
@@ -0,0 +1,27 @@
+/* Copyright 2020 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 "h660s.h"
+
+void eeconfig_init_kb(void) {  // EEPROM is getting reset!
+  rgblight_enable(); // Enable RGB by default
+  rgblight_sethsv(0, 255, 128);  // Set default HSV - red hue, full saturation, medium brightness
+  rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL + 2); // set to RGB_RAINBOW_SWIRL by default
+
+  eeconfig_update_kb(0);
+  eeconfig_init_user();
+}
+
diff --git a/qmk/keyboards/hineybush/h660s/h660s.h b/qmk/keyboards/hineybush/h660s/h660s.h
new file mode 100644
index 00000000..32099d4b
--- /dev/null
+++ b/qmk/keyboards/hineybush/h660s/h660s.h
@@ -0,0 +1,153 @@
+/* Copyright 2020 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 is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT_all( \
+    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k113,     k014, \
+    k100,   k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112,  k213,        k114, \
+    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k313,                 \
+    k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312,           k314,       \
+    k400, k401, k402,       k407,                    k409, k410, k411,                k412, k413, k414  \
+) { \
+    {k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014}, \
+    {k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114}, \
+    {k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213,KC_NO}, \
+    {k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, k314}, \
+    {k400, k401, k402, KC_NO,KC_NO,KC_NO,KC_NO,k407, KC_NO,k409, k410, k411, k412, k413, k414}  \
+}
+
+#define LAYOUT_66_ansi( \
+    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012,    k013,        k014, \
+    k100,   k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112,  k213,        k114, \
+    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211,       k313,                 \
+    k300,       k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312,           k314,       \
+    k400, k401, k402,       k407,                   k409, k410, k411,                k412, k413, k414  \
+) { \
+    {k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014}, \
+    {k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, KC_NO,k114}, \
+    {k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211,KC_NO, k213,KC_NO}, \
+    {k300,KC_NO, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, k314}, \
+    {k400, k401, k402, KC_NO,KC_NO,KC_NO,KC_NO,k407, KC_NO,k409, k410, k411, k412, k413, k414}  \
+}
+
+#define LAYOUT_66_ansi_split_bs( \
+    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k113,     k014, \
+    k100,   k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112,  k213,        k114, \
+    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211,       k313,                 \
+    k300,       k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312,           k314,       \
+    k400, k401, k402,       k407,                    k409, k410, k411,                k412, k413, k414  \
+) { \
+    {k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014}, \
+    {k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114}, \
+    {k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211,KC_NO, k213,KC_NO}, \
+    {k300,KC_NO, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, k314}, \
+    {k400, k401, k402, KC_NO,KC_NO,KC_NO,KC_NO,k407, KC_NO,k409, k410, k411, k412, k413, k414}  \
+}
+
+#define LAYOUT_66_ansi_rwkl( \
+    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012,    k013,        k014, \
+    k100,   k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112,  k213,        k114, \
+    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211,       k313,                 \
+    k300,       k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312,           k314,       \
+    k400, k401, k402,       k407,                         k410, k411,                 k412, k413, k414  \
+) { \
+    {k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014}, \
+    {k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112,KC_NO, k114}, \
+    {k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211,KC_NO, k213,KC_NO}, \
+    {k300,KC_NO, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, k314}, \
+    {k400, k401, k402, KC_NO,KC_NO,KC_NO,KC_NO,k407,KC_NO, KC_NO, k410, k411,k412, k413, k414}  \
+}
+
+#define LAYOUT_66_ansi_rwkl_split_bs( \
+    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k113,     k014, \
+    k100,   k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112,  k213,        k114, \
+    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211,       k313,                 \
+    k300,       k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312,           k314,       \
+    k400, k401, k402,       k407,                         k410, k411,                 k412, k413, k414  \
+) { \
+    {k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014}, \
+    {k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114}, \
+    {k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211,KC_NO, k213,KC_NO}, \
+    {k300,KC_NO, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, k314}, \
+    {k400, k401, k402, KC_NO,KC_NO,KC_NO,KC_NO,k407,KC_NO, KC_NO, k410, k411,k412, k413, k414}  \
+}
+
+#define LAYOUT_66_iso( \
+    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012,    k013,        k014, \
+    k100,   k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112,               k114, \
+    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k313,                 \
+    k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312,           k314,       \
+    k400, k401, k402,       k407,                    k409, k410, k411,                k412, k413, k414  \
+) { \
+    {k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014}, \
+    {k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112,KC_NO, k114}, \
+    {k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212,KC_NO,KC_NO}, \
+    {k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, k314}, \
+    {k400, k401, k402, KC_NO,KC_NO,KC_NO,KC_NO,k407, KC_NO,k409, k410, k411, k412, k413, k414}  \
+}
+
+#define LAYOUT_66_iso_split_bs( \
+    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k113,     k014, \
+    k100,   k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112,               k114, \
+    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k313,                 \
+    k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312,           k314,       \
+    k400, k401, k402,       k407,                    k409, k410, k411,                k412, k413, k414  \
+) { \
+    {k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014}, \
+    {k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114}, \
+    {k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212,KC_NO,KC_NO}, \
+    {k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, k314}, \
+    {k400, k401, k402, KC_NO,KC_NO,KC_NO,KC_NO,k407, KC_NO,k409, k410, k411, k412, k413, k414}  \
+}
+
+#define LAYOUT_66_iso_rwkl( \
+    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012,    k013,        k014, \
+    k100,   k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112,               k114, \
+    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k313,                 \
+    k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312,           k314,       \
+    k400, k401, k402,       k407,                         k410, k411,                 k412, k413, k414  \
+) { \
+    {k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014}, \
+    {k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112,KC_NO, k114}, \
+    {k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212,KC_NO,KC_NO}, \
+    {k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, k314}, \
+    {k400, k401, k402, KC_NO,KC_NO,KC_NO,KC_NO,k407,KC_NO, KC_NO, k410, k411,k412, k413, k414}  \
+}
+
+#define LAYOUT_66_iso_rwkl_split_bs( \
+    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k113,     k014, \
+    k100,   k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112,               k114, \
+    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k313,                 \
+    k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312,           k314,       \
+    k400, k401, k402,       k407,                         k410, k411,                 k412, k413, k414  \
+) { \
+    {k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014}, \
+    {k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114}, \
+    {k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212,KC_NO,KC_NO}, \
+    {k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, k314}, \
+    {k400, k401, k402, KC_NO,KC_NO,KC_NO,KC_NO,k407,KC_NO, KC_NO, k410, k411,k412, k413, k414}  \
+}
diff --git a/qmk/keyboards/hineybush/h660s/info.json b/qmk/keyboards/hineybush/h660s/info.json
new file mode 100644
index 00000000..552aed2c
--- /dev/null
+++ b/qmk/keyboards/hineybush/h660s/info.json
@@ -0,0 +1,637 @@
+{
+    "keyboard_name": "h660-s",
+    "url": "",
+    "maintainer": "Josh Hinnebusch",
+    "width": 17.25,
+    "height": 5.25,
+    "layouts": {
+        "LAYOUT_66_ansi": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6, "y": 0},
+                {"x": 7, "y": 0},
+                {"x": 8, "y": 0},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0, "w": 2},
+
+                {"x": 16.25, "y": 0},
+
+                {"x": 0, "y": 1, "w": 1.5},
+                {"x": 1.5, "y": 1},
+                {"x": 2.5, "y": 1},
+                {"x": 3.5, "y": 1},
+                {"x": 4.5, "y": 1},
+                {"x": 5.5, "y": 1},
+                {"x": 6.5, "y": 1},
+                {"x": 7.5, "y": 1},
+                {"x": 8.5, "y": 1},
+                {"x": 9.5, "y": 1},
+                {"x": 10.5, "y": 1},
+                {"x": 11.5, "y": 1},
+                {"x": 12.5, "y": 1},
+                {"x": 13.5, "y": 1, "w": 1.5},
+
+                {"x": 16.25, "y": 1},
+
+                {"x": 0, "y": 2, "w": 1.75},
+                {"x": 1.75, "y": 2},
+                {"x": 2.75, "y": 2},
+                {"x": 3.75, "y": 2},
+                {"x": 4.75, "y": 2},
+                {"x": 5.75, "y": 2},
+                {"x": 6.75, "y": 2},
+                {"x": 7.75, "y": 2},
+                {"x": 8.75, "y": 2},
+                {"x": 9.75, "y": 2},
+                {"x": 10.75, "y": 2},
+                {"x": 11.75, "y": 2},
+                {"x": 12.75, "y": 2, "w": 2.25},
+
+                {"x": 0, "y": 3, "w": 2.25},
+                {"x": 2.25, "y": 3},
+                {"x": 3.25, "y": 3},
+                {"x": 4.25, "y": 3},
+                {"x": 5.25, "y": 3},
+                {"x": 6.25, "y": 3},
+                {"x": 7.25, "y": 3},
+                {"x": 8.25, "y": 3},
+                {"x": 9.25, "y": 3},
+                {"x": 10.25, "y": 3},
+                {"x": 11.25, "y": 3},
+                {"x": 12.25, "y": 3, "w": 2.75},
+
+                {"x": 15.25, "y": 3.25},
+
+                {"x": 0, "y": 4, "w": 1.25},
+                {"x": 1.25, "y": 4, "w": 1.25},
+                {"x": 2.5, "y": 4, "w": 1.25},
+                {"x": 3.75, "y": 4, "w": 6.25},
+                {"x": 10, "y": 4, "w": 1.25},
+                {"x": 11.25, "y": 4, "w": 1.25},
+                {"x": 12.5, "y": 4, "w": 1.25},
+
+                {"x": 14.25, "y": 4.25},
+                {"x": 15.25, "y": 4.25},
+                {"x": 16.25, "y": 4.25}
+            ]
+        },
+        "LAYOUT_66_ansi_split_bs": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6, "y": 0},
+                {"x": 7, "y": 0},
+                {"x": 8, "y": 0},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0},
+                {"x": 14, "y": 0},
+
+                {"x": 16.25, "y": 0},
+
+                {"x": 0, "y": 1, "w": 1.5},
+                {"x": 1.5, "y": 1},
+                {"x": 2.5, "y": 1},
+                {"x": 3.5, "y": 1},
+                {"x": 4.5, "y": 1},
+                {"x": 5.5, "y": 1},
+                {"x": 6.5, "y": 1},
+                {"x": 7.5, "y": 1},
+                {"x": 8.5, "y": 1},
+                {"x": 9.5, "y": 1},
+                {"x": 10.5, "y": 1},
+                {"x": 11.5, "y": 1},
+                {"x": 12.5, "y": 1},
+                {"x": 13.5, "y": 1, "w": 1.5},
+
+                {"x": 16.25, "y": 1},
+
+                {"x": 0, "y": 2, "w": 1.75},
+                {"x": 1.75, "y": 2},
+                {"x": 2.75, "y": 2},
+                {"x": 3.75, "y": 2},
+                {"x": 4.75, "y": 2},
+                {"x": 5.75, "y": 2},
+                {"x": 6.75, "y": 2},
+                {"x": 7.75, "y": 2},
+                {"x": 8.75, "y": 2},
+                {"x": 9.75, "y": 2},
+                {"x": 10.75, "y": 2},
+                {"x": 11.75, "y": 2},
+                {"x": 12.75, "y": 2, "w": 2.25},
+
+                {"x": 0, "y": 3, "w": 2.25},
+                {"x": 2.25, "y": 3},
+                {"x": 3.25, "y": 3},
+                {"x": 4.25, "y": 3},
+                {"x": 5.25, "y": 3},
+                {"x": 6.25, "y": 3},
+                {"x": 7.25, "y": 3},
+                {"x": 8.25, "y": 3},
+                {"x": 9.25, "y": 3},
+                {"x": 10.25, "y": 3},
+                {"x": 11.25, "y": 3},
+                {"x": 12.25, "y": 3, "w": 2.75},
+
+                {"x": 15.25, "y": 3.25},
+
+                {"x": 0, "y": 4, "w": 1.25},
+                {"x": 1.25, "y": 4, "w": 1.25},
+                {"x": 2.5, "y": 4, "w": 1.25},
+                {"x": 3.75, "y": 4, "w": 6.25},
+                {"x": 10, "y": 4, "w": 1.25},
+                {"x": 11.25, "y": 4, "w": 1.25},
+                {"x": 12.5, "y": 4, "w": 1.25},
+
+                {"x": 14.25, "y": 4.25},
+                {"x": 15.25, "y": 4.25},
+                {"x": 16.25, "y": 4.25}
+            ]
+        },
+        "LAYOUT_66_ansi_rwkl": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6, "y": 0},
+                {"x": 7, "y": 0},
+                {"x": 8, "y": 0},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0, "w": 2},
+
+                {"x": 16.25, "y": 0},
+
+                {"x": 0, "y": 1, "w": 1.5},
+                {"x": 1.5, "y": 1},
+                {"x": 2.5, "y": 1},
+                {"x": 3.5, "y": 1},
+                {"x": 4.5, "y": 1},
+                {"x": 5.5, "y": 1},
+                {"x": 6.5, "y": 1},
+                {"x": 7.5, "y": 1},
+                {"x": 8.5, "y": 1},
+                {"x": 9.5, "y": 1},
+                {"x": 10.5, "y": 1},
+                {"x": 11.5, "y": 1},
+                {"x": 12.5, "y": 1},
+                {"x": 13.5, "y": 1, "w": 1.5},
+
+                {"x": 16.25, "y": 1},
+
+                {"x": 0, "y": 2, "w": 1.75},
+                {"x": 1.75, "y": 2},
+                {"x": 2.75, "y": 2},
+                {"x": 3.75, "y": 2},
+                {"x": 4.75, "y": 2},
+                {"x": 5.75, "y": 2},
+                {"x": 6.75, "y": 2},
+                {"x": 7.75, "y": 2},
+                {"x": 8.75, "y": 2},
+                {"x": 9.75, "y": 2},
+                {"x": 10.75, "y": 2},
+                {"x": 11.75, "y": 2},
+                {"x": 12.75, "y": 2, "w": 2.25},
+
+                {"x": 0, "y": 3, "w": 2.25},
+                {"x": 2.25, "y": 3},
+                {"x": 3.25, "y": 3},
+                {"x": 4.25, "y": 3},
+                {"x": 5.25, "y": 3},
+                {"x": 6.25, "y": 3},
+                {"x": 7.25, "y": 3},
+                {"x": 8.25, "y": 3},
+                {"x": 9.25, "y": 3},
+                {"x": 10.25, "y": 3},
+                {"x": 11.25, "y": 3},
+                {"x": 12.25, "y": 3, "w": 2.75},
+
+                {"x": 15.25, "y": 3.25},
+
+                {"x": 0, "y": 4, "w": 1.25},
+                {"x": 1.25, "y": 4},
+                {"x": 2.25, "y": 4, "w": 1.25},
+                {"x": 3.5, "y": 4, "w": 7},
+                {"x": 10.5, "y": 4, "w": 1.25},
+                {"x": 12.75, "y": 4, "w": 1.25},
+
+                {"x": 14.25, "y": 4.25},
+                {"x": 15.25, "y": 4.25},
+                {"x": 16.25, "y": 4.25}
+            ]
+        },
+        "LAYOUT_66_ansi_rwkl_split_bs": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6, "y": 0},
+                {"x": 7, "y": 0},
+                {"x": 8, "y": 0},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0},
+                {"x": 14, "y": 0},
+
+                {"x": 16.25, "y": 0},
+
+                {"x": 0, "y": 1, "w": 1.5},
+                {"x": 1.5, "y": 1},
+                {"x": 2.5, "y": 1},
+                {"x": 3.5, "y": 1},
+                {"x": 4.5, "y": 1},
+                {"x": 5.5, "y": 1},
+                {"x": 6.5, "y": 1},
+                {"x": 7.5, "y": 1},
+                {"x": 8.5, "y": 1},
+                {"x": 9.5, "y": 1},
+                {"x": 10.5, "y": 1},
+                {"x": 11.5, "y": 1},
+                {"x": 12.5, "y": 1},
+                {"x": 13.5, "y": 1, "w": 1.5},
+
+                {"x": 16.25, "y": 1},
+
+                {"x": 0, "y": 2, "w": 1.75},
+                {"x": 1.75, "y": 2},
+                {"x": 2.75, "y": 2},
+                {"x": 3.75, "y": 2},
+                {"x": 4.75, "y": 2},
+                {"x": 5.75, "y": 2},
+                {"x": 6.75, "y": 2},
+                {"x": 7.75, "y": 2},
+                {"x": 8.75, "y": 2},
+                {"x": 9.75, "y": 2},
+                {"x": 10.75, "y": 2},
+                {"x": 11.75, "y": 2},
+                {"x": 12.75, "y": 2, "w": 2.25},
+
+                {"x": 0, "y": 3, "w": 2.25},
+                {"x": 2.25, "y": 3},
+                {"x": 3.25, "y": 3},
+                {"x": 4.25, "y": 3},
+                {"x": 5.25, "y": 3},
+                {"x": 6.25, "y": 3},
+                {"x": 7.25, "y": 3},
+                {"x": 8.25, "y": 3},
+                {"x": 9.25, "y": 3},
+                {"x": 10.25, "y": 3},
+                {"x": 11.25, "y": 3},
+                {"x": 12.25, "y": 3, "w": 2.75},
+
+                {"x": 15.25, "y": 3.25},
+
+                {"x": 0, "y": 4, "w": 1.25},
+                {"x": 1.25, "y": 4},
+                {"x": 2.25, "y": 4, "w": 1.25},
+                {"x": 3.5, "y": 4, "w": 7},
+                {"x": 10.5, "y": 4, "w": 1.25},
+                {"x": 12.75, "y": 4, "w": 1.25},
+
+                {"x": 14.25, "y": 4.25},
+                {"x": 15.25, "y": 4.25},
+                {"x": 16.25, "y": 4.25}
+            ]
+        },
+        "LAYOUT_66_iso": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6, "y": 0},
+                {"x": 7, "y": 0},
+                {"x": 8, "y": 0},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0, "w": 2},
+
+                {"x": 16.25, "y": 0},
+
+                {"x": 0, "y": 1, "w": 1.5},
+                {"x": 1.5, "y": 1},
+                {"x": 2.5, "y": 1},
+                {"x": 3.5, "y": 1},
+                {"x": 4.5, "y": 1},
+                {"x": 5.5, "y": 1},
+                {"x": 6.5, "y": 1},
+                {"x": 7.5, "y": 1},
+                {"x": 8.5, "y": 1},
+                {"x": 9.5, "y": 1},
+                {"x": 10.5, "y": 1},
+                {"x": 11.5, "y": 1},
+                {"x": 12.5, "y": 1},
+
+                {"x": 16.25, "y": 1},
+
+                {"x": 0, "y": 2, "w": 1.75},
+                {"x": 1.75, "y": 2},
+                {"x": 2.75, "y": 2},
+                {"x": 3.75, "y": 2},
+                {"x": 4.75, "y": 2},
+                {"x": 5.75, "y": 2},
+                {"x": 6.75, "y": 2},
+                {"x": 7.75, "y": 2},
+                {"x": 8.75, "y": 2},
+                {"x": 9.75, "y": 2},
+                {"x": 10.75, "y": 2},
+                {"x": 11.75, "y": 2},
+                {"x": 12.75, "y": 2},
+                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"x": 0, "y": 3, "w": 1.25},
+                {"x": 1.25, "y": 3},
+                {"x": 2.25, "y": 3},
+                {"x": 3.25, "y": 3},
+                {"x": 4.25, "y": 3},
+                {"x": 5.25, "y": 3},
+                {"x": 6.25, "y": 3},
+                {"x": 7.25, "y": 3},
+                {"x": 8.25, "y": 3},
+                {"x": 9.25, "y": 3},
+                {"x": 10.25, "y": 3},
+                {"x": 11.25, "y": 3},
+                {"x": 12.25, "y": 3, "w": 2.75},
+
+                {"x": 15.25, "y": 3.25},
+
+                {"x": 0, "y": 4, "w": 1.25},
+                {"x": 1.25, "y": 4, "w": 1.25},
+                {"x": 2.5, "y": 4, "w": 1.25},
+                {"x": 3.75, "y": 4, "w": 6.25},
+                {"x": 10, "y": 4, "w": 1.25},
+                {"x": 11.25, "y": 4, "w": 1.25},
+                {"x": 12.5, "y": 4, "w": 1.25},
+
+                {"x": 14.25, "y": 4.25},
+                {"x": 15.25, "y": 4.25},
+                {"x": 16.25, "y": 4.25}
+            ]
+        },
+        "LAYOUT_66_iso_split_bs": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6, "y": 0},
+                {"x": 7, "y": 0},
+                {"x": 8, "y": 0},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0},
+                {"x": 14, "y": 0},
+
+                {"x": 16.25, "y": 0},
+
+                {"x": 0, "y": 1, "w": 1.5},
+                {"x": 1.5, "y": 1},
+                {"x": 2.5, "y": 1},
+                {"x": 3.5, "y": 1},
+                {"x": 4.5, "y": 1},
+                {"x": 5.5, "y": 1},
+                {"x": 6.5, "y": 1},
+                {"x": 7.5, "y": 1},
+                {"x": 8.5, "y": 1},
+                {"x": 9.5, "y": 1},
+                {"x": 10.5, "y": 1},
+                {"x": 11.5, "y": 1},
+                {"x": 12.5, "y": 1},
+
+                {"x": 16.25, "y": 1},
+
+                {"x": 0, "y": 2, "w": 1.75},
+                {"x": 1.75, "y": 2},
+                {"x": 2.75, "y": 2},
+                {"x": 3.75, "y": 2},
+                {"x": 4.75, "y": 2},
+                {"x": 5.75, "y": 2},
+                {"x": 6.75, "y": 2},
+                {"x": 7.75, "y": 2},
+                {"x": 8.75, "y": 2},
+                {"x": 9.75, "y": 2},
+                {"x": 10.75, "y": 2},
+                {"x": 11.75, "y": 2},
+                {"x": 12.75, "y": 2},
+                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"x": 0, "y": 3, "w": 1.25},
+                {"x": 1.25, "y": 3},
+                {"x": 2.25, "y": 3},
+                {"x": 3.25, "y": 3},
+                {"x": 4.25, "y": 3},
+                {"x": 5.25, "y": 3},
+                {"x": 6.25, "y": 3},
+                {"x": 7.25, "y": 3},
+                {"x": 8.25, "y": 3},
+                {"x": 9.25, "y": 3},
+                {"x": 10.25, "y": 3},
+                {"x": 11.25, "y": 3},
+                {"x": 12.25, "y": 3, "w": 2.75},
+
+                {"x": 15.25, "y": 3.25},
+
+                {"x": 0, "y": 4, "w": 1.25},
+                {"x": 1.25, "y": 4, "w": 1.25},
+                {"x": 2.5, "y": 4, "w": 1.25},
+                {"x": 3.75, "y": 4, "w": 6.25},
+                {"x": 10, "y": 4, "w": 1.25},
+                {"x": 11.25, "y": 4, "w": 1.25},
+                {"x": 12.5, "y": 4, "w": 1.25},
+
+                {"x": 14.25, "y": 4.25},
+                {"x": 15.25, "y": 4.25},
+                {"x": 16.25, "y": 4.25}
+            ]
+        },
+        "LAYOUT_66_iso_rwkl": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6, "y": 0},
+                {"x": 7, "y": 0},
+                {"x": 8, "y": 0},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0, "w": 2},
+
+                {"x": 16.25, "y": 0},
+
+                {"x": 0, "y": 1, "w": 1.5},
+                {"x": 1.5, "y": 1},
+                {"x": 2.5, "y": 1},
+                {"x": 3.5, "y": 1},
+                {"x": 4.5, "y": 1},
+                {"x": 5.5, "y": 1},
+                {"x": 6.5, "y": 1},
+                {"x": 7.5, "y": 1},
+                {"x": 8.5, "y": 1},
+                {"x": 9.5, "y": 1},
+                {"x": 10.5, "y": 1},
+                {"x": 11.5, "y": 1},
+                {"x": 12.5, "y": 1},
+
+                {"x": 16.25, "y": 1},
+
+                {"x": 0, "y": 2, "w": 1.75},
+                {"x": 1.75, "y": 2},
+                {"x": 2.75, "y": 2},
+                {"x": 3.75, "y": 2},
+                {"x": 4.75, "y": 2},
+                {"x": 5.75, "y": 2},
+                {"x": 6.75, "y": 2},
+                {"x": 7.75, "y": 2},
+                {"x": 8.75, "y": 2},
+                {"x": 9.75, "y": 2},
+                {"x": 10.75, "y": 2},
+                {"x": 11.75, "y": 2},
+                {"x": 12.75, "y": 2},
+                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"x": 0, "y": 3, "w": 1.25},
+                {"x": 1.25, "y": 3},
+                {"x": 2.25, "y": 3},
+                {"x": 3.25, "y": 3},
+                {"x": 4.25, "y": 3},
+                {"x": 5.25, "y": 3},
+                {"x": 6.25, "y": 3},
+                {"x": 7.25, "y": 3},
+                {"x": 8.25, "y": 3},
+                {"x": 9.25, "y": 3},
+                {"x": 10.25, "y": 3},
+                {"x": 11.25, "y": 3},
+                {"x": 12.25, "y": 3, "w": 2.75},
+
+                {"x": 15.25, "y": 3.25},
+
+                {"x": 0, "y": 4, "w": 1.25},
+                {"x": 1.25, "y": 4},
+                {"x": 2.25, "y": 4, "w": 1.25},
+                {"x": 3.5, "y": 4, "w": 7},
+                {"x": 10.5, "y": 4, "w": 1.25},
+                {"x": 12.75, "y": 4, "w": 1.25},
+
+                {"x": 14.25, "y": 4.25},
+                {"x": 15.25, "y": 4.25},
+                {"x": 16.25, "y": 4.25}
+            ]
+        },
+        "LAYOUT_66_iso_rwkl_split_bs": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6, "y": 0},
+                {"x": 7, "y": 0},
+                {"x": 8, "y": 0},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0},
+                {"x": 14, "y": 0},
+
+                {"x": 16.25, "y": 0},
+
+                {"x": 0, "y": 1, "w": 1.5},
+                {"x": 1.5, "y": 1},
+                {"x": 2.5, "y": 1},
+                {"x": 3.5, "y": 1},
+                {"x": 4.5, "y": 1},
+                {"x": 5.5, "y": 1},
+                {"x": 6.5, "y": 1},
+                {"x": 7.5, "y": 1},
+                {"x": 8.5, "y": 1},
+                {"x": 9.5, "y": 1},
+                {"x": 10.5, "y": 1},
+                {"x": 11.5, "y": 1},
+                {"x": 12.5, "y": 1},
+
+                {"x": 16.25, "y": 1},
+
+                {"x": 0, "y": 2, "w": 1.75},
+                {"x": 1.75, "y": 2},
+                {"x": 2.75, "y": 2},
+                {"x": 3.75, "y": 2},
+                {"x": 4.75, "y": 2},
+                {"x": 5.75, "y": 2},
+                {"x": 6.75, "y": 2},
+                {"x": 7.75, "y": 2},
+                {"x": 8.75, "y": 2},
+                {"x": 9.75, "y": 2},
+                {"x": 10.75, "y": 2},
+                {"x": 11.75, "y": 2},
+                {"x": 12.75, "y": 2},
+                {"x": 13.75, "y": 1, "w": 1.25, "h": 2},
+
+                {"x": 0, "y": 3, "w": 1.25},
+                {"x": 1.25, "y": 3},
+                {"x": 2.25, "y": 3},
+                {"x": 3.25, "y": 3},
+                {"x": 4.25, "y": 3},
+                {"x": 5.25, "y": 3},
+                {"x": 6.25, "y": 3},
+                {"x": 7.25, "y": 3},
+                {"x": 8.25, "y": 3},
+                {"x": 9.25, "y": 3},
+                {"x": 10.25, "y": 3},
+                {"x": 11.25, "y": 3},
+                {"x": 12.25, "y": 3, "w": 2.75},
+
+                {"x": 15.25, "y": 3.25},
+
+                {"x": 0, "y": 4, "w": 1.25},
+                {"x": 1.25, "y": 4},
+                {"x": 2.25, "y": 4, "w": 1.25},
+                {"x": 3.5, "y": 4, "w": 7},
+                {"x": 10.5, "y": 4, "w": 1.25},
+                {"x": 12.75, "y": 4, "w": 1.25},
+
+                {"x": 14.25, "y": 4.25},
+                {"x": 15.25, "y": 4.25},
+                {"x": 16.25, "y": 4.25}
+            ]
+        }
+    }
+}
diff --git a/qmk/keyboards/hineybush/h660s/keymaps/default/keymap.c b/qmk/keyboards/hineybush/h660s/keymaps/default/keymap.c
new file mode 100644
index 00000000..b87ac711
--- /dev/null
+++ b/qmk/keyboards/hineybush/h660s/keymaps/default/keymap.c
@@ -0,0 +1,45 @@
+/* Copyright 2020 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 names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012,    k013,        k014, \
+    k100,   k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112,  k213,        k114, \
+    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211,       k313,                 \
+    k300,       k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312,           k314,       \
+    k400, k401, k402,       k404,                         k409, k410,                 k412, k413, k414  \
+    */
+
+    [_BASE] = LAYOUT_66_ansi_rwkl(
+    KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,    KC_EQL,     KC_BSPC,      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_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_LGUI, KC_LALT,                   KC_SPC,                                      MO(1),    KC_RCTL,                     KC_LEFT, KC_DOWN, KC_RGHT),
+    [_FN] = LAYOUT_66_ansi_rwkl(
+    KC_TRNS,  RGB_TOG, RGB_MOD, 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,  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_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)
+};
diff --git a/qmk/keyboards/hineybush/h660s/keymaps/default/readme.md b/qmk/keyboards/hineybush/h660s/keymaps/default/readme.md
new file mode 100644
index 00000000..0487cfb1
--- /dev/null
+++ b/qmk/keyboards/hineybush/h660s/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for h660-s
diff --git a/qmk/keyboards/hineybush/h660s/keymaps/via/keymap.c b/qmk/keyboards/hineybush/h660s/keymaps/via/keymap.c
new file mode 100644
index 00000000..c4376600
--- /dev/null
+++ b/qmk/keyboards/hineybush/h660s/keymaps/via/keymap.c
@@ -0,0 +1,59 @@
+/* Copyright 2020 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 names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _FN,
+    _FN2,
+    _FN3
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k113, k013,     k014, \
+    k100,   k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112,  k213,        k114, \
+    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k313,                 \
+    k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312,           k314,       \
+    k400, k401, k402,       k407,                    k409, k410, k411,                k412, k413, k414  \
+    */
+
+    [_BASE] = LAYOUT_all(
+    KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,     KC_MINS,    KC_EQL,     KC_BSPC,  KC_BSPC,     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_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_RSFT,                  KC_UP,
+    KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, MO(1),    KC_RCTL,                     KC_LEFT, KC_DOWN, KC_RGHT),
+    [_FN] = LAYOUT_all(
+    KC_TRNS, RGB_TOG, RGB_MOD, 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, 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_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),
+    [_FN2] = LAYOUT_all(
+    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,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),
+    [_FN3] = LAYOUT_all(
+    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,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)
+};
diff --git a/qmk/keyboards/hineybush/h660s/keymaps/via/readme.md b/qmk/keyboards/hineybush/h660s/keymaps/via/readme.md
new file mode 100644
index 00000000..fd91fc8e
--- /dev/null
+++ b/qmk/keyboards/hineybush/h660s/keymaps/via/readme.md
@@ -0,0 +1 @@
+# The VIA keymap for h660-s
diff --git a/qmk/keyboards/hineybush/h660s/keymaps/via/rules.mk b/qmk/keyboards/hineybush/h660s/keymaps/via/rules.mk
new file mode 100644
index 00000000..1e5b9980
--- /dev/null
+++ b/qmk/keyboards/hineybush/h660s/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/qmk/keyboards/hineybush/h660s/readme.md b/qmk/keyboards/hineybush/h660s/readme.md
new file mode 100644
index 00000000..5b1129b7
--- /dev/null
+++ b/qmk/keyboards/hineybush/h660s/readme.md
@@ -0,0 +1,19 @@
+# h660s
+
+![h660s](https://i.imgur.com/U7s0xJL.png)
+
+A 65% layout for the Sakura660.
+
+* Keyboard Maintainer: [hineybush](https://github.com/hineybush)
+* Hardware Supported: Sakura660 by Fropsie and Proto[Typist]
+* Hardware Availability: Prototypes, upcoming group buy
+
+Make example for this keyboard (after setting up your build environment):
+
+    make hineybush/h660s:default
+
+Flashing example for this keyboard:
+
+    make hineybush/h660s:default:flash
+
+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).
diff --git a/qmk/keyboards/hineybush/h660s/rules.mk b/qmk/keyboards/hineybush/h660s/rules.mk
new file mode 100644
index 00000000..bfa9a933
--- /dev/null
+++ b/qmk/keyboards/hineybush/h660s/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+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
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = yes       # 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 = yes       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
diff --git a/qmk/keyboards/hineybush/hineyg80/config.h b/qmk/keyboards/hineybush/hineyg80/config.h
index 4072def2..81bf6227 100644
--- a/qmk/keyboards/hineybush/hineyg80/config.h
+++ b/qmk/keyboards/hineybush/hineyg80/config.h
@@ -22,6 +22,11 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
+
+#define LED_NUM_LOCK_PIN C6
+#define LED_CAPS_LOCK_PIN B6
+#define LED_SCROLL_LOCK_PIN B5
+
 /* number of backlight levels */
 
 #ifdef BACKLIGHT_PIN
diff --git a/qmk/keyboards/hineybush/hineyg80/hineyg80.c b/qmk/keyboards/hineybush/hineyg80/hineyg80.c
index 236c646b..a56e46e9 100644
--- a/qmk/keyboards/hineybush/hineyg80/hineyg80.c
+++ b/qmk/keyboards/hineybush/hineyg80/hineyg80.c
@@ -14,50 +14,3 @@
  * 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);
-}
diff --git a/qmk/keyboards/hs60/v1/rules.mk b/qmk/keyboards/hs60/v1/rules.mk
index 81c86813..d344d256 100644
--- a/qmk/keyboards/hs60/v1/rules.mk
+++ b/qmk/keyboards/hs60/v1/rules.mk
@@ -35,6 +35,7 @@ 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
 RGB_MATRIX_ENABLE = yes     # Use RGB matrix
+RGB_MATRIX_DRIVER = IS31FL3731
 RAW_ENABLE = yes
 
 LAYOUTS = 60_ansi 60_iso
diff --git a/qmk/keyboards/id80/rules.mk b/qmk/keyboards/id80/rules.mk
index 81d15e5e..b376b26a 100644
--- a/qmk/keyboards/id80/rules.mk
+++ b/qmk/keyboards/id80/rules.mk
@@ -30,7 +30,6 @@ 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
 
 # partially generated by KBFirmware JSON to QMK Parser
 # https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/qmk/keyboards/idb/idb_60/idb_60.c b/qmk/keyboards/idb/idb_60/idb_60.c
index 18ce6904..1ca4b879 100644
--- a/qmk/keyboards/idb/idb_60/idb_60.c
+++ b/qmk/keyboards/idb/idb_60/idb_60.c
@@ -5,13 +5,43 @@ void keyboard_pre_init_kb(void) {
     setPinOutput(C5);
 }
 
-void led_set_kb(uint8_t usb_led) {
-
-    if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
-		_idb_60_caps_led_on();
-		} else {
-		_idb_60_caps_led_off();
-    }
-
-	led_set_user(usb_led);
+inline void _idb_60_caps_led_on(void) {
+    writePinLow(C5);
+}
+
+inline void _idb_60_fn_led_on(void) {
+    writePinLow(C4);
+}
+
+inline void _idb_60_caps_led_off(void) {
+    writePinHigh(C5);
+}
+
+inline void _idb_60_fn_led_off(void) {
+    writePinHigh(C4);
+}
+
+// Capslock LED indicator
+
+bool led_update_kb(led_t led_state) {
+    bool res = led_update_user(led_state);
+    if (res) {
+        if (led_state.caps_lock) {
+            _idb_60_caps_led_on();
+        } else {
+            _idb_60_caps_led_off();
+        }
+    }
+    return res;
+}
+
+// Layer LED indicator - drive LED when not on base layer
+
+__attribute__((weak)) layer_state_t layer_state_set_user(layer_state_t state) {
+    if (get_highest_layer(state) == 0) {
+        _idb_60_fn_led_off();
+    } else {
+        _idb_60_fn_led_on();
+    }
+    return state;
 }
diff --git a/qmk/keyboards/idb/idb_60/idb_60.h b/qmk/keyboards/idb/idb_60/idb_60.h
index 5d61ac46..069f4bcf 100644
--- a/qmk/keyboards/idb/idb_60/idb_60.h
+++ b/qmk/keyboards/idb/idb_60/idb_60.h
@@ -2,61 +2,50 @@
 
 #include "quantum.h"
 
-inline void _idb_60_caps_led_on(void) {
-    writePinHigh(C5);
-}
+void _idb_60_caps_led_on(void);
+void _idb_60_fn_led_on(void);
+void _idb_60_caps_led_off(void);
+void _idb_60_fn_led_off(void);
 
-inline void _idb_60_fn_led_on(void) {
-    writePinHigh(C4);
-}
-
-inline void _idb_60_caps_led_off(void) {
-    writePinLow(C5);
-}
-
-inline void _idb_60_fn_led_off(void) {
-    writePinLow(C4);
-}
-
-#define _idb_60_esc_led_on _idb_60_fn_led_on
-#define _idb_60_esc_led_off _idb_60_fn_led_off
+#define _idb_60_esc_led_on() _idb_60_fn_led_on()
+#define _idb_60_esc_led_off() _idb_60_fn_led_off()
 
 #define LAYOUT( \
-	K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07,\
-	K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36,\
-	K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K56,\
-	K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K66, K76,\
-	K80, K90, K81,                     K93,                K95, K86, K96\
+        K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07, \
+        K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, \
+        K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K56, \
+        K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K66, K76, \
+        K80, K90, K81,                     K93,                K95, K86, K96 \
 ) { \
-	{ K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07 }, \
-	{ K10,   K11,   K12,   K13,   K14,   K15,   K16        }, \
-	{ K20,   K21,   K22,   K23,   K24,   K25,   K26        }, \
-	{ K30,   K31,   K32,   K33,   K34,   K35,   K36        }, \
-	{ K40,   K41,   K42,   K43,   K44,   K45,   KC_NO      }, \
-	{ K50,   K51,   K52,   K53,   K54,   K55,   K56        }, \
-	{ K60,   K61,   K62,   K63,   K64,   K65,   K66        }, \
-	{ K70,   K71,   K72,   K73,   K74,   K75,   K76        }, \
-	{ K80,   K81,   KC_NO, KC_NO, KC_NO, KC_NO, K86        }, \
-	{ K90,   KC_NO, KC_NO, K93,   KC_NO, K95,   K96        } \
+        { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07 }, \
+        { K10,   K11,   K12,   K13,   K14,   K15,   K16        }, \
+        { K20,   K21,   K22,   K23,   K24,   K25,   K26        }, \
+        { K30,   K31,   K32,   K33,   K34,   K35,   K36        }, \
+        { K40,   K41,   K42,   K43,   K44,   K45,   KC_NO      }, \
+        { K50,   K51,   K52,   K53,   K54,   K55,   K56        }, \
+        { K60,   K61,   K62,   K63,   K64,   K65,   K66        }, \
+        { K70,   K71,   K72,   K73,   K74,   K75,   K76        }, \
+        { K80,   K81,   KC_NO, KC_NO, KC_NO, KC_NO, K86        }, \
+        { K90,   KC_NO, KC_NO, K93,   KC_NO, K95,   K96        } \
 }
 
 #define LAYOUT_all LAYOUT
 
 #define LAYOUT_default( \
-	K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16,\
-	K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36,\
-	K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K56,\
-	K60,      K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K66, K76,\
-	K80,      K81,                     K93,                K95,      K96\
+        K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, \
+        K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, \
+        K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55,      K56, \
+        K60,      K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K66, K76, \
+        K80,      K81,                     K93,                K95,      K96 \
 ) { \
-	{ K00,   K01,   K02,   K03,   K04,   K05,   K06,	KC_NO }, \
-	{ K10,   K11,   K12,   K13,   K14,   K15,   K16        	  }, \
-	{ K20,   K21,   K22,   K23,   K24,   K25,   K26           }, \
-	{ K30,   K31,   K32,   K33,   K34,   K35,   K36           }, \
-	{ K40,   K41,   K42,   K43,   K44,   K45,   KC_NO         }, \
-	{ K50,   K51,   K52,   K53,   K54,   K55,   K56           }, \
-	{ K60,   K61,   K62,   K63,   K64,   K65,   K66           }, \
-	{ KC_NO, K71,   K72,   K73,   K74,   K75,   K76           }, \
-	{ K80,   K81,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO         }, \
-	{ KC_NO, KC_NO, KC_NO, K93,   KC_NO, K95,   K96           } \
+        { K00,   K01,   K02,   K03,   K04,   K05,   K06,	KC_NO }, \
+        { K10,   K11,   K12,   K13,   K14,   K15,   K16        	  }, \
+        { K20,   K21,   K22,   K23,   K24,   K25,   K26           }, \
+        { K30,   K31,   K32,   K33,   K34,   K35,   K36           }, \
+        { K40,   K41,   K42,   K43,   K44,   K45,   KC_NO         }, \
+        { K50,   K51,   K52,   K53,   K54,   K55,   K56           }, \
+        { K60,   K61,   K62,   K63,   K64,   K65,   K66           }, \
+        { KC_NO, K71,   K72,   K73,   K74,   K75,   K76           }, \
+        { K80,   K81,   KC_NO, KC_NO, KC_NO, KC_NO, KC_NO         }, \
+        { KC_NO, KC_NO, KC_NO, K93,   KC_NO, K95,   K96           } \
 }
diff --git a/qmk/keyboards/idb/idb_60/keymaps/all_keys/keymap.c b/qmk/keyboards/idb/idb_60/keymaps/all_keys/keymap.c
index 2edde98c..87a66920 100644
--- a/qmk/keyboards/idb/idb_60/keymaps/all_keys/keymap.c
+++ b/qmk/keyboards/idb/idb_60/keymaps/all_keys/keymap.c
@@ -2,45 +2,33 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-  [0] = LAYOUT_all(
-    KC_GESC, 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_NO,
-    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_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_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
-    KC_LCTL, KC_LGUI, KC_LALT,                                     KC_SPC,                             KC_RALT, KC_MENU, KC_RCTL
-  ),
-  [1] = LAYOUT_all(
-	RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,  _______,
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-	_______, _______, _______,                                     _______,                            _______, _______, _______
-  ),
-  [2] = LAYOUT_all(
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-	_______, _______, _______,                                     _______,                            _______, _______, _______
-  ),
-  [3] = LAYOUT_all(
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-	_______, _______, _______,                                     _______,                            _______, _______, _______
-  ),
+    [0] = LAYOUT_all(
+        KC_GESC, 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_NO,
+        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_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_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
+        KC_LCTL, KC_LGUI, KC_LALT,                                     KC_SPC,                             KC_RALT, KC_MENU, KC_RCTL
+    ),
+    [1] = LAYOUT_all(
+        RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,  _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                                     _______,                            _______, _______, _______
+    ),
+    [2] = LAYOUT_all(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                                     _______,                            _______, _______, _______
+    ),
+    [3] = LAYOUT_all(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                                     _______,                            _______, _______, _______
+    ),
 
 };
-
-// Layer LED indicators
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    if (layer_state_cmp(state, 1)) {
-        _idb_60_fn_led_on();
-    } else {
-        _idb_60_fn_led_off();
-    }
-
-	return state;
-}
diff --git a/qmk/keyboards/idb/idb_60/keymaps/default/keymap.c b/qmk/keyboards/idb/idb_60/keymaps/default/keymap.c
index 1bf25867..373ff8ce 100644
--- a/qmk/keyboards/idb/idb_60/keymaps/default/keymap.c
+++ b/qmk/keyboards/idb/idb_60/keymaps/default/keymap.c
@@ -2,45 +2,33 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-  [0] = LAYOUT_default(
-    KC_GESC, 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_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_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, MO(1),
-    KC_LCTL,          KC_LALT,                                     KC_SPC,                             KC_RALT,          KC_RCTL
-  ),
-  [1] = LAYOUT_default(
-	RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-	_______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-	_______,          _______,                                     _______,                            _______,          _______
-  ),
-  [2] = LAYOUT_default(
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-	_______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-	_______,          _______,                                     _______,                            _______,          _______
-  ),
-  [3] = LAYOUT_default(
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-	_______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-	_______,          _______,                                     _______,                            _______,          _______
-  ),
+    [0] = LAYOUT_default(
+        KC_GESC, 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_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_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, MO(1),
+        KC_LCTL,          KC_LALT,                                     KC_SPC,                             KC_RALT,          KC_RCTL
+    ),
+    [1] = LAYOUT_default(
+        RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,          _______,                                     _______,                            _______,          _______
+    ),
+    [2] = LAYOUT_default(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,          _______,                                     _______,                            _______,          _______
+    ),
+    [3] = LAYOUT_default(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,          _______,                                     _______,                            _______,          _______
+    ),
 
 };
-
-// Layer LED indicators
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    if (layer_state_cmp(state, 1)) {
-        _idb_60_fn_led_on();
-    } else {
-        _idb_60_fn_led_off();
-    }
-
-	return state;
-}
diff --git a/qmk/keyboards/idb/idb_60/keymaps/pngu/keymap.c b/qmk/keyboards/idb/idb_60/keymaps/pngu/keymap.c
index ac0ad10d..c34d1774 100644
--- a/qmk/keyboards/idb/idb_60/keymaps/pngu/keymap.c
+++ b/qmk/keyboards/idb/idb_60/keymaps/pngu/keymap.c
@@ -2,38 +2,26 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-  [0] = LAYOUT(
-    KC_GESC, 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_NO,
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Z,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
-    LT(2, 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_NUBS, KC_Y,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
-    KC_LCTL, KC_LGUI, KC_LALT,                                     KC_SPC,                             KC_RALT, KC_MENU, KC_RGUI
-  ),
-   [1] = LAYOUT(
-	RESET,   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_DEL,  _______,
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, _______,
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_INS,
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-	_______, _______, _______,                                     _______,                            _______, _______, _______
-  ),
-  [2] = LAYOUT(
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-	_______, _______, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-	_______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______,          _______,
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-	_______, _______, _______,                                     _______,                            _______, _______, _______
-  )
+    [0] = LAYOUT(
+        KC_GESC,          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_NO,
+        KC_TAB,           KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Z,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+        LT(2, 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_NUBS, KC_Y,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
+        KC_LCTL,          KC_LGUI, KC_LALT,                                     KC_SPC,                             KC_RALT, KC_MENU, KC_RGUI
+    ),
+    [1] = LAYOUT(
+        RESET,   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_DEL,  _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_INS,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                                     _______,                            _______, _______, _______
+    ),
+    [2] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                                     _______,                            _______, _______, _______
+    )
 
 };
-
-// Layer LED indicators
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    if (layer_state_cmp(state, 1)) {
-        _idb_60_fn_led_on();
-    } else {
-        _idb_60_fn_led_off();
-    }
-
-	return state;
-}
diff --git a/qmk/keyboards/idb/idb_60/keymaps/via/keymap.c b/qmk/keyboards/idb/idb_60/keymaps/via/keymap.c
index 1bf25867..373ff8ce 100644
--- a/qmk/keyboards/idb/idb_60/keymaps/via/keymap.c
+++ b/qmk/keyboards/idb/idb_60/keymaps/via/keymap.c
@@ -2,45 +2,33 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-  [0] = LAYOUT_default(
-    KC_GESC, 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_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_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, MO(1),
-    KC_LCTL,          KC_LALT,                                     KC_SPC,                             KC_RALT,          KC_RCTL
-  ),
-  [1] = LAYOUT_default(
-	RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-	_______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-	_______,          _______,                                     _______,                            _______,          _______
-  ),
-  [2] = LAYOUT_default(
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-	_______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-	_______,          _______,                                     _______,                            _______,          _______
-  ),
-  [3] = LAYOUT_default(
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
-	_______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-	_______,          _______,                                     _______,                            _______,          _______
-  ),
+    [0] = LAYOUT_default(
+        KC_GESC, 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_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_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, MO(1),
+        KC_LCTL,          KC_LALT,                                     KC_SPC,                             KC_RALT,          KC_RCTL
+    ),
+    [1] = LAYOUT_default(
+        RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,          _______,                                     _______,                            _______,          _______
+    ),
+    [2] = LAYOUT_default(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,          _______,                                     _______,                            _______,          _______
+    ),
+    [3] = LAYOUT_default(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______,          _______,                                     _______,                            _______,          _______
+    ),
 
 };
-
-// Layer LED indicators
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-    if (layer_state_cmp(state, 1)) {
-        _idb_60_fn_led_on();
-    } else {
-        _idb_60_fn_led_off();
-    }
-
-	return state;
-}
diff --git a/qmk/keyboards/idb/idb_60/keymaps/via/rules.mk b/qmk/keyboards/idb/idb_60/keymaps/via/rules.mk
index 36b7ba9c..1e5b9980 100644
--- a/qmk/keyboards/idb/idb_60/keymaps/via/rules.mk
+++ b/qmk/keyboards/idb/idb_60/keymaps/via/rules.mk
@@ -1,2 +1 @@
 VIA_ENABLE = yes
-LTO_ENABLE = yes
diff --git a/qmk/keyboards/idb/idb_60/rules.mk b/qmk/keyboards/idb/idb_60/rules.mk
index 7e11d4be..607993b9 100644
--- a/qmk/keyboards/idb/idb_60/rules.mk
+++ b/qmk/keyboards/idb/idb_60/rules.mk
@@ -16,12 +16,10 @@ BOOTLOADER = atmel-dfu
 BOOTMAGIC_ENABLE = lite
 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
+CONSOLE_ENABLE = no			# Console for debug
+COMMAND_ENABLE = no			# Commands for debug and configuration
 KEYBOARD_LOCK_ENABLE = no		# Allow locking of keyboard via magic key
 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
+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
-MIDI_ENABLE = no				# MIDI controls
-UNICODE_ENABLE = no				# Unicode
-BLUETOOTH_ENABLE = no			# Enable Bluetooth with the Adafruit EZ-Key HID
+BLUETOOTH_ENABLE = no			# Enable Bluetooth
diff --git a/qmk/keyboards/idobo/config.h b/qmk/keyboards/idobo/config.h
index d764512d..bd9f7da1 100644
--- a/qmk/keyboards/idobo/config.h
+++ b/qmk/keyboards/idobo/config.h
@@ -189,34 +189,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/idobo/keymaps/egstad/config.h b/qmk/keyboards/idobo/keymaps/egstad/config.h
new file mode 100644
index 00000000..45dbd3df
--- /dev/null
+++ b/qmk/keyboards/idobo/keymaps/egstad/config.h
@@ -0,0 +1,68 @@
+/* Copyright 2020 Jordan Egstad
+ *
+ * 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
+#define TAPPING_TERM 200
+#define IGNORE_MOD_TAP_INTERRUPT
+#define RGBLIGHT_SLEEP
+
+
+
+/* Leader Key
+   ========================================================================== */
+
+// Activates the leader key
+// #define LEADER_PER_KEY_TIMING
+// resets the timeout after each key is tapped
+// #define LEADER_TIMEOUT 240
+
+
+
+
+
+
+/* Autoshifting
+   ========================================================================== */
+
+// This controls how long you have to hold a key before you get the shifted state.
+#define AUTO_SHIFT_TIMEOUT 150
+
+// Do not Auto Shift special keys -_, =+, [{, ]}, ;:, '", ,<, .>, and /?
+// #define NO_AUTO_SHIFT_SPECIAL
+
+// Do not Auto Shift numeric keys, zero through nine.
+#define NO_AUTO_SHIFT_NUMERIC
+
+// Do not Auto Shift alpha characters, which include A through Z.
+// #define NO_AUTO_SHIFT_ALPHA
+
+// Lower the Auto Shift timeout variable (down)
+// KC_ASDN
+
+// Raise the Auto Shift timeout variable (up)
+// KC_ASUP
+
+// Report your current Auto Shift timeout value
+// KC_ASRP
+
+// Turns on the Auto Shift Function
+// KC_ASON
+
+// Turns off the Auto Shift Function
+// KC_ASOFF
+
+// Toggles the state of the Auto Shift feature
+// KC_ASTG
diff --git a/qmk/keyboards/idobo/keymaps/egstad/keymap.c b/qmk/keyboards/idobo/keymaps/egstad/keymap.c
new file mode 100644
index 00000000..febbad7c
--- /dev/null
+++ b/qmk/keyboards/idobo/keymaps/egstad/keymap.c
@@ -0,0 +1,267 @@
+/* Copyright 2020 Jordan Egstad
+ *
+ * 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
+
+
+
+
+
+
+/* ==========================================================================
+    LAYERS
+   ========================================================================== */
+
+// qwerty
+#define _QW 0
+// functions
+#define _FN 1
+
+
+
+
+
+
+/* ==========================================================================
+    CUSTOM KEYS
+   ========================================================================== */
+
+// Tap dances
+#define TD_ESCP TD(TD_GV_ESC)           // Tap for grave, twice for escape
+#define TD_MINS TD(TD_MIN)              // Tap for minus, twice for equal
+#define TD_BRAC TD(TD_BRC)              // Tap for open brace, twice for close
+
+// Layers
+#define FN_SPC LT(_FN, KC_SPC)          // Tap for space, hold for _FN
+
+// Modifiers
+#define LG_ZMIN LGUI(KC_EQUAL)          // Command + plus (zoom in)
+#define LG_ZMOT LGUI(KC_MINUS)          // Command + minus (zoom out)
+#define MT_SHFT MT(MOD_RSFT, KC_ENT)    // Tap for enter, hold for shift
+
+// Tap Dances
+enum {
+  TD_BRC = 0,
+  TD_MIN,
+  TD_GV_ESC,
+  TD_BS
+};
+
+// Tap Dance Definitions
+qk_tap_dance_action_t tap_dance_actions[] = {
+  // Tap once for Left Brace, twice for Right Brace
+  [TD_BRC]  = ACTION_TAP_DANCE_DOUBLE(KC_LBRC, KC_RBRC),
+  //Tap once for Minus, twice for Equal
+  [TD_MIN]  = ACTION_TAP_DANCE_DOUBLE(KC_MINUS, KC_EQUAL),
+  // Tap once for Grave, tap twice for Escape
+  [TD_GV_ESC]  = ACTION_TAP_DANCE_DOUBLE(KC_GRAVE, KC_ESCAPE)
+};
+
+
+
+
+
+
+/* ==========================================================================
+    KEYMAPS
+   ========================================================================== */
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/* QWERTY (_QW)
+ * .--------------------------------------------------------------------------------------------------------------------------------------.
+ * | ESC    | 1      | 2      | 3      | 4      | 5      | -      | `      |   \|   | 6      | 7      | 8      | 9      | 0      |  -  +  |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
+ * | TAB    | Q      | W      | E      | R      | T      | [      | \      | ]      | Y      | U      | I      | O      | P      |  [  ]  |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
+ * | CAP LK | A      | S      | D      | F      | G      |        |        |        | H      | J      | K      | L      | ;      | '      |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
+ * | LSHIFT | Z      | X      | C      | V      | B      |        |        |        | N      | M      | ,      | .      | /      | RSHIFT |
+ * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+-----------------+--------+--------|
+ * | ZOOM-  | ZOOM+  | LALT   | FN     | CMD    | BSPC   |        |        | FN     | SPACE  | ENTER  | LEFT   | UP     | DOWN   | RIGHT  |
+ * '--------------------------------------------------------------------------------------------------------------------------------------'
+ */
+
+ [_QW] = LAYOUT_ortho_5x15( /* QWERTY */
+    TD_ESCP, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_MINS, KC_GRV,  KC_PIPE, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    TD_MINS, \
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_LBRC, KC_BSLS, KC_RBRC, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    TD_BRAC, \
+    _______, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    _______, _______, _______, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,  \
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    _______, _______, _______, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, MT_SHFT, \
+    LG_ZMOT, LG_ZMIN, KC_LCTL, KC_LALT, KC_LGUI, KC_BSPC, _______, RESET,   _______, FN_SPC,  KC_ENT,  KC_LEFT, KC_UP,   KC_DOWN, KC_RGHT  \
+ ),
+
+
+/* FUNCTION (_FN)
+ * .--------------------------------------------------------------------------------------------------------------------------------------.
+ * | F1     | F2     | F3     | F4     | F5     | F6     |        | P      |        | F7     | F8     | F9     | F10    | F11    | F12    |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * |        |        |        |        |        |        | RGB HD | RGB HI |        |        |        |        |        |        |        |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * | A-SFT  |        |        |        |        |        | RGB SD | RGB SI |        |        | LEFT   | UP     | DOWN   | RIGHT  |        |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * | RGB    |        |        |        |        |        | RGB VD | RGB VI |        |        |        |        |        |        |        |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * | RESET  |        |        |        |        |        | RGB RMD| RGB MD |        |        | PLAY   | PREV   | VOL UP | VOL DN | NEXT   |
+ * '--------------------------------------------------------------------------------------------------------------------------------------'
+ */
+
+ [_FN] = LAYOUT_ortho_5x15( /* FUNCTION */
+    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   _______, _______, _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  \
+    _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_HUI, _______, _______, _______, _______, _______, _______, _______, \
+    KC_ASTG, _______, _______, _______, _______, _______, RGB_SAD, RGB_SAI, _______, _______, KC_LEFT, KC_UP,   KC_DOWN, KC_RGHT, _______, \
+    RGB_TOG, _______, _______, _______, _______, _______, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, \
+    RESET,   _______, _______, _______, _______, _______, RGB_RMOD,RGB_MOD, _______, _______, KC_MPLY, KC_MRWD, KC_VOLU, KC_VOLD, KC_MFFD  \
+ ),
+};
+
+
+
+
+
+
+/* ==========================================================================
+    LEDs
+   ========================================================================== */
+
+// RGB MODES
+// 1 = Static
+// 2-5 = Breathing
+// 6-8 = Rainbow
+// 9-14 = Swirl
+// 15-20 = Snake
+// 21-24 = Nightrider
+// 25 = Christmas
+// 26-30 = Static Gradient
+
+// Default LED colors
+uint8_t h = 170;
+uint8_t s = 255;
+uint8_t v;
+
+// default animation
+uint8_t rgbMode = RGBLIGHT_MODE_STATIC_LIGHT;
+// boot animation
+uint8_t rgbBootMode = RGBLIGHT_MODE_SNAKE;
+// boot timeout vars
+uint8_t bootComplete = 0;
+int bootTimeoutDuration = 2000;
+int bootTimeout;
+
+
+void init_hsv(void) {
+    // fetch what the brightness was last sesion
+	v = rgblight_get_val();
+    rgblight_sethsv(h,s,v);
+}
+
+// fetch current HSV vals
+void get_hsv(void) {
+	h = rgblight_get_hue();
+	s = rgblight_get_sat();
+	v = rgblight_get_val();
+}
+
+// reset HSV vals
+void reset_hsv(void) {
+    int currentV = rgblight_get_val();
+	rgblight_sethsv(h,s,currentV);
+}
+
+// deterimes when to stop bootup animation
+void bootupAnimation(void) {
+  bootComplete = (timer_elapsed(bootTimeout) > bootTimeoutDuration) ? 1 : 0;
+
+  if (bootComplete) {
+    rgblight_mode(rgbMode);
+  }
+}
+
+
+
+
+
+
+/* ==========================================================================
+    INITIALIZATION FUNCTION
+   ========================================================================== */
+
+void keyboard_post_init_user(void) {
+  // start a timeout
+  bootTimeout = timer_read();
+  // set rgb color
+  init_hsv();
+  // init rgb
+  rgblight_enable();
+  // animate in snake ledGreende
+  rgblight_mode(rgbBootMode);
+};
+
+
+
+
+
+
+/* ==========================================================================
+    ALWAYS RUNNING
+   ========================================================================== */
+void matrix_scan_user(void) {
+    // keep an eye on these layers
+    uint8_t layer = get_highest_layer(layer_state);
+    // handle boot-up sequence
+    bootupAnimation();
+    // watch the brightness for changes
+    v = rgblight_get_val();
+
+    switch (layer) {
+      case _FN:
+        // set leds to white
+        rgblight_sethsv_noeeprom(h,0,v);
+        break;
+      default:
+        break;
+    }
+};
+
+
+
+
+
+
+/* ==========================================================================
+    KEYPRESS CALLBACKS
+   ========================================================================== */
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  // keep an eye on these layers
+  uint8_t layer = get_highest_layer(layer_state);
+
+  switch (keycode) {
+    case FN_SPC:
+      // stash and pop color on key down and key up
+      (record->event.pressed) ? get_hsv() : reset_hsv();
+      return true;
+    default:
+      switch (layer) {
+          case _QW:
+            // tick the hue up with each keypress
+            rgblight_increase_hue();
+            break;
+          default:
+            break;
+      }
+      return true; // Process all other keycodes normally
+  }
+}
diff --git a/qmk/keyboards/idobo/keymaps/egstad/readme.md b/qmk/keyboards/idobo/keymaps/egstad/readme.md
new file mode 100644
index 00000000..2de44ad9
--- /dev/null
+++ b/qmk/keyboards/idobo/keymaps/egstad/readme.md
@@ -0,0 +1,17 @@
+# Egstad's Idobo
+
+## LEDs
+By default, LEDs are enabled. There is a short bootup animation (`bootupAnimation()`) to indicate that the keyboard has powered up correctly.
+
+On each keypress, the LEDs hue increases. This increase is determined the the `RGBLIGHT_HUE_STEP` value, which is assigned in `../config.h` (parent idobo directory). My local copy has this value set to `1`, so the incremental color shift is rather slow.
+
+
+## Keeping up to date
+To update your fork’s master, run the following, hitting the Enter key after each line:
+
+```bash
+git checkout master
+git fetch upstream
+git pull upstream master
+git push origin master
+```
diff --git a/qmk/keyboards/idobo/keymaps/egstad/rules.mk b/qmk/keyboards/idobo/keymaps/egstad/rules.mk
new file mode 100644
index 00000000..ca3becc3
--- /dev/null
+++ b/qmk/keyboards/idobo/keymaps/egstad/rules.mk
@@ -0,0 +1,3 @@
+TAP_DANCE_ENABLE = yes
+AUTO_SHIFT_ENABLE = yes
+RGBLIGHT_ENABLE = yes
diff --git a/qmk/keyboards/idobo/rules.mk b/qmk/keyboards/idobo/rules.mk
index 62fe37fb..b52603ea 100644
--- a/qmk/keyboards/idobo/rules.mk
+++ b/qmk/keyboards/idobo/rules.mk
@@ -30,7 +30,6 @@ 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
 EXTRAFLAGS += -flto        # Use link time optimization
 
-LAYOUTS = ortho_5x15    
+LAYOUTS = ortho_5x15
diff --git a/qmk/keyboards/illuminati/is0/config.h b/qmk/keyboards/illuminati/is0/config.h
index e35b1500..46aba6a8 100644
--- a/qmk/keyboards/illuminati/is0/config.h
+++ b/qmk/keyboards/illuminati/is0/config.h
@@ -218,34 +218,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/illuminati/is0/rules.mk b/qmk/keyboards/illuminati/is0/rules.mk
index 9c19f7d2..85cec5e9 100644
--- a/qmk/keyboards/illuminati/is0/rules.mk
+++ b/qmk/keyboards/illuminati/is0/rules.mk
@@ -30,4 +30,3 @@ 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
diff --git a/qmk/keyboards/inett_studio/sqx/hotswap/rules.mk b/qmk/keyboards/inett_studio/sqx/hotswap/rules.mk
index 80968787..47793919 100644
--- a/qmk/keyboards/inett_studio/sqx/hotswap/rules.mk
+++ b/qmk/keyboards/inett_studio/sqx/hotswap/rules.mk
@@ -18,7 +18,8 @@ SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 NKRO_ENABLE = yes           # USB Nkey Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-RGB_MATRIX_ENABLE = yes     # Use RGB per key light
+RGB_MATRIX_ENABLE = yes     # Use RGB matrix
+RGB_MATRIX_DRIVER = IS31FL3731
 BLUETOOTH_ENABLE = no       # Enable Bluetooth
 AUDIO_ENABLE = no           # Audio output
 
diff --git a/qmk/keyboards/inett_studio/sqx/universal/rules.mk b/qmk/keyboards/inett_studio/sqx/universal/rules.mk
index cf3a64ba..c9965b06 100644
--- a/qmk/keyboards/inett_studio/sqx/universal/rules.mk
+++ b/qmk/keyboards/inett_studio/sqx/universal/rules.mk
@@ -18,7 +18,8 @@ SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 NKRO_ENABLE = yes           # USB Nkey Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-RGB_MATRIX_ENABLE = yes     # Use RGB per key light
+RGB_MATRIX_ENABLE = yes     # Use RGB matrix
+RGB_MATRIX_DRIVER = IS31FL3731
 
 LTO_ENABLE = yes            # Reducing firmware size
 
diff --git a/qmk/keyboards/infinity60/led.c b/qmk/keyboards/infinity60/led.c
index bef1f862..8effcea8 100644
--- a/qmk/keyboards/infinity60/led.c
+++ b/qmk/keyboards/infinity60/led.c
@@ -16,7 +16,7 @@ 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 "hal.h"
+#include <hal.h>
 
 #include "led.h"
 
diff --git a/qmk/keyboards/infinity60/led_controller.c b/qmk/keyboards/infinity60/led_controller.c
index bc245745..cf3edf20 100644
--- a/qmk/keyboards/infinity60/led_controller.c
+++ b/qmk/keyboards/infinity60/led_controller.c
@@ -22,8 +22,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  * datasheet: http://www.issi.com/WW/pdf/31FL3731C.pdf
  */
 
-#include "ch.h"
-#include "hal.h"
+#include <ch.h>
+#include <hal.h>
 #include "print.h"
 #include "led.h"
 #include "host.h"
diff --git a/qmk/keyboards/infinity60/matrix.c b/qmk/keyboards/infinity60/matrix.c
index ba16e690..c147ceec 100644
--- a/qmk/keyboards/infinity60/matrix.c
+++ b/qmk/keyboards/infinity60/matrix.c
@@ -1,7 +1,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <string.h>
-#include "hal.h"
+#include <hal.h>
 #include "timer.h"
 #include "wait.h"
 #include "print.h"
diff --git a/qmk/keyboards/iron180/chconf.h b/qmk/keyboards/iron180/chconf.h
new file mode 100644
index 00000000..4640ff53
--- /dev/null
+++ b/qmk/keyboards/iron180/chconf.h
@@ -0,0 +1,714 @@
+/*
+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+/**
+ * @file    rt/templates/chconf.h
+ * @brief   Configuration file template.
+ * @details A copy of this file must be placed in each project directory, it
+ *          contains the application specific kernel settings.
+ *
+ * @addtogroup config
+ * @details Kernel related settings and hooks.
+ * @{
+ */
+
+#ifndef CHCONF_H
+#define CHCONF_H
+
+#define _CHIBIOS_RT_CONF_
+#define _CHIBIOS_RT_CONF_VER_6_0_
+
+/*===========================================================================*/
+/**
+ * @name System timers settings
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   System time counter resolution.
+ * @note    Allowed values are 16 or 32 bits.
+ */
+#if !defined(CH_CFG_ST_RESOLUTION)
+#define CH_CFG_ST_RESOLUTION                32
+#endif
+
+/**
+ * @brief   System tick frequency.
+ * @details Frequency of the system timer that drives the system ticks. This
+ *          setting also defines the system tick time unit.
+ */
+#if !defined(CH_CFG_ST_FREQUENCY)
+#define CH_CFG_ST_FREQUENCY                 10000
+#endif
+
+/**
+ * @brief   Time intervals data size.
+ * @note    Allowed values are 16, 32 or 64 bits.
+ */
+#if !defined(CH_CFG_INTERVALS_SIZE)
+#define CH_CFG_INTERVALS_SIZE               32
+#endif
+
+/**
+ * @brief   Time types data size.
+ * @note    Allowed values are 16 or 32 bits.
+ */
+#if !defined(CH_CFG_TIME_TYPES_SIZE)
+#define CH_CFG_TIME_TYPES_SIZE              32
+#endif
+
+/**
+ * @brief   Time delta constant for the tick-less mode.
+ * @note    If this value is zero then the system uses the classic
+ *          periodic tick. This value represents the minimum number
+ *          of ticks that is safe to specify in a timeout directive.
+ *          The value one is not valid, timeouts are rounded up to
+ *          this value.
+ */
+#if !defined(CH_CFG_ST_TIMEDELTA)
+#define CH_CFG_ST_TIMEDELTA                 2
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Kernel parameters and options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   Round robin interval.
+ * @details This constant is the number of system ticks allowed for the
+ *          threads before preemption occurs. Setting this value to zero
+ *          disables the preemption for threads with equal priority and the
+ *          round robin becomes cooperative. Note that higher priority
+ *          threads can still preempt, the kernel is always preemptive.
+ * @note    Disabling the round robin preemption makes the kernel more compact
+ *          and generally faster.
+ * @note    The round robin preemption is not supported in tickless mode and
+ *          must be set to zero in that case.
+ */
+#if !defined(CH_CFG_TIME_QUANTUM)
+#define CH_CFG_TIME_QUANTUM                 0
+#endif
+
+/**
+ * @brief   Managed RAM size.
+ * @details Size of the RAM area to be managed by the OS. If set to zero
+ *          then the whole available RAM is used. The core memory is made
+ *          available to the heap allocator and/or can be used directly through
+ *          the simplified core memory allocator.
+ *
+ * @note    In order to let the OS manage the whole RAM the linker script must
+ *          provide the @p __heap_base__ and @p __heap_end__ symbols.
+ * @note    Requires @p CH_CFG_USE_MEMCORE.
+ */
+#if !defined(CH_CFG_MEMCORE_SIZE)
+#define CH_CFG_MEMCORE_SIZE                 0
+#endif
+
+/**
+ * @brief   Idle thread automatic spawn suppression.
+ * @details When this option is activated the function @p chSysInit()
+ *          does not spawn the idle thread. The application @p main()
+ *          function becomes the idle thread and must implement an
+ *          infinite loop.
+ */
+#if !defined(CH_CFG_NO_IDLE_THREAD)
+#define CH_CFG_NO_IDLE_THREAD               FALSE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Performance options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   OS optimization.
+ * @details If enabled then time efficient rather than space efficient code
+ *          is used when two possible implementations exist.
+ *
+ * @note    This is not related to the compiler optimization options.
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_OPTIMIZE_SPEED)
+#define CH_CFG_OPTIMIZE_SPEED               FALSE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Subsystem options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   Time Measurement APIs.
+ * @details If enabled then the time measurement APIs are included in
+ *          the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_TM)
+#define CH_CFG_USE_TM                       FALSE
+#endif
+
+/**
+ * @brief   Threads registry APIs.
+ * @details If enabled then the registry APIs are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_REGISTRY)
+#define CH_CFG_USE_REGISTRY                 TRUE
+#endif
+
+/**
+ * @brief   Threads synchronization APIs.
+ * @details If enabled then the @p chThdWait() function is included in
+ *          the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_WAITEXIT)
+#define CH_CFG_USE_WAITEXIT                 TRUE
+#endif
+
+/**
+ * @brief   Semaphores APIs.
+ * @details If enabled then the Semaphores APIs are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_SEMAPHORES)
+#define CH_CFG_USE_SEMAPHORES               TRUE
+#endif
+
+/**
+ * @brief   Semaphores queuing mode.
+ * @details If enabled then the threads are enqueued on semaphores by
+ *          priority rather than in FIFO order.
+ *
+ * @note    The default is @p FALSE. Enable this if you have special
+ *          requirements.
+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.
+ */
+#if !defined(CH_CFG_USE_SEMAPHORES_PRIORITY)
+#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE
+#endif
+
+/**
+ * @brief   Mutexes APIs.
+ * @details If enabled then the mutexes APIs are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_MUTEXES)
+#define CH_CFG_USE_MUTEXES                  TRUE
+#endif
+
+/**
+ * @brief   Enables recursive behavior on mutexes.
+ * @note    Recursive mutexes are heavier and have an increased
+ *          memory footprint.
+ *
+ * @note    The default is @p FALSE.
+ * @note    Requires @p CH_CFG_USE_MUTEXES.
+ */
+#if !defined(CH_CFG_USE_MUTEXES_RECURSIVE)
+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE
+#endif
+
+/**
+ * @brief   Conditional Variables APIs.
+ * @details If enabled then the conditional variables APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_MUTEXES.
+ */
+#if !defined(CH_CFG_USE_CONDVARS)
+#define CH_CFG_USE_CONDVARS                 TRUE
+#endif
+
+/**
+ * @brief   Conditional Variables APIs with timeout.
+ * @details If enabled then the conditional variables APIs with timeout
+ *          specification are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_CONDVARS.
+ */
+#if !defined(CH_CFG_USE_CONDVARS_TIMEOUT)
+#define CH_CFG_USE_CONDVARS_TIMEOUT         FALSE
+#endif
+
+/**
+ * @brief   Events Flags APIs.
+ * @details If enabled then the event flags APIs are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_EVENTS)
+#define CH_CFG_USE_EVENTS                   TRUE
+#endif
+
+/**
+ * @brief   Events Flags APIs with timeout.
+ * @details If enabled then the events APIs with timeout specification
+ *          are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_EVENTS.
+ */
+#if !defined(CH_CFG_USE_EVENTS_TIMEOUT)
+#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE
+#endif
+
+/**
+ * @brief   Synchronous Messages APIs.
+ * @details If enabled then the synchronous messages APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_MESSAGES)
+#define CH_CFG_USE_MESSAGES                 TRUE
+#endif
+
+/**
+ * @brief   Synchronous Messages queuing mode.
+ * @details If enabled then messages are served by priority rather than in
+ *          FIFO order.
+ *
+ * @note    The default is @p FALSE. Enable this if you have special
+ *          requirements.
+ * @note    Requires @p CH_CFG_USE_MESSAGES.
+ */
+#if !defined(CH_CFG_USE_MESSAGES_PRIORITY)
+#define CH_CFG_USE_MESSAGES_PRIORITY        FALSE
+#endif
+
+/**
+ * @brief   Mailboxes APIs.
+ * @details If enabled then the asynchronous messages (mailboxes) APIs are
+ *          included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.
+ */
+#if !defined(CH_CFG_USE_MAILBOXES)
+#define CH_CFG_USE_MAILBOXES                TRUE
+#endif
+
+/**
+ * @brief   Core Memory Manager APIs.
+ * @details If enabled then the core memory manager APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_MEMCORE)
+#define CH_CFG_USE_MEMCORE                  FALSE
+#endif
+
+/**
+ * @brief   Heap Allocator APIs.
+ * @details If enabled then the memory heap allocator APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_MEMCORE and either @p CH_CFG_USE_MUTEXES or
+ *          @p CH_CFG_USE_SEMAPHORES.
+ * @note    Mutexes are recommended.
+ */
+#if !defined(CH_CFG_USE_HEAP)
+#define CH_CFG_USE_HEAP                     FALSE
+#endif
+
+/**
+ * @brief   Memory Pools Allocator APIs.
+ * @details If enabled then the memory pools allocator APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_MEMPOOLS)
+#define CH_CFG_USE_MEMPOOLS                 FALSE
+#endif
+
+/**
+ * @brief   Objects FIFOs APIs.
+ * @details If enabled then the objects FIFOs APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_OBJ_FIFOS)
+#define CH_CFG_USE_OBJ_FIFOS                FALSE
+#endif
+
+/**
+ * @brief   Pipes APIs.
+ * @details If enabled then the pipes APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_PIPES)
+#define CH_CFG_USE_PIPES                    FALSE
+#endif
+
+/**
+ * @brief   Dynamic Threads APIs.
+ * @details If enabled then the dynamic threads creation APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_WAITEXIT.
+ * @note    Requires @p CH_CFG_USE_HEAP and/or @p CH_CFG_USE_MEMPOOLS.
+ */
+#if !defined(CH_CFG_USE_DYNAMIC)
+#define CH_CFG_USE_DYNAMIC                  FALSE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Objects factory options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   Objects Factory APIs.
+ * @details If enabled then the objects factory APIs are included in the
+ *          kernel.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_CFG_USE_FACTORY)
+#define CH_CFG_USE_FACTORY                  FALSE
+#endif
+
+/**
+ * @brief   Maximum length for object names.
+ * @details If the specified length is zero then the name is stored by
+ *          pointer but this could have unintended side effects.
+ */
+#if !defined(CH_CFG_FACTORY_MAX_NAMES_LENGTH)
+#define CH_CFG_FACTORY_MAX_NAMES_LENGTH     8
+#endif
+
+/**
+ * @brief   Enables the registry of generic objects.
+ */
+#if !defined(CH_CFG_FACTORY_OBJECTS_REGISTRY)
+#define CH_CFG_FACTORY_OBJECTS_REGISTRY     FALSE
+#endif
+
+/**
+ * @brief   Enables factory for generic buffers.
+ */
+#if !defined(CH_CFG_FACTORY_GENERIC_BUFFERS)
+#define CH_CFG_FACTORY_GENERIC_BUFFERS      FALSE
+#endif
+
+/**
+ * @brief   Enables factory for semaphores.
+ */
+#if !defined(CH_CFG_FACTORY_SEMAPHORES)
+#define CH_CFG_FACTORY_SEMAPHORES           FALSE
+#endif
+
+/**
+ * @brief   Enables factory for mailboxes.
+ */
+#if !defined(CH_CFG_FACTORY_MAILBOXES)
+#define CH_CFG_FACTORY_MAILBOXES            FALSE
+#endif
+
+/**
+ * @brief   Enables factory for objects FIFOs.
+ */
+#if !defined(CH_CFG_FACTORY_OBJ_FIFOS)
+#define CH_CFG_FACTORY_OBJ_FIFOS            FALSE
+#endif
+
+/**
+ * @brief   Enables factory for Pipes.
+ */
+#if !defined(CH_CFG_FACTORY_PIPES) || defined(__DOXYGEN__)
+#define CH_CFG_FACTORY_PIPES                FALSE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Debug options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   Debug option, kernel statistics.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_STATISTICS)
+#define CH_DBG_STATISTICS                   FALSE
+#endif
+
+/**
+ * @brief   Debug option, system state check.
+ * @details If enabled the correct call protocol for system APIs is checked
+ *          at runtime.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_SYSTEM_STATE_CHECK)
+#define CH_DBG_SYSTEM_STATE_CHECK           FALSE
+#endif
+
+/**
+ * @brief   Debug option, parameters checks.
+ * @details If enabled then the checks on the API functions input
+ *          parameters are activated.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_ENABLE_CHECKS)
+#define CH_DBG_ENABLE_CHECKS                FALSE
+#endif
+
+/**
+ * @brief   Debug option, consistency checks.
+ * @details If enabled then all the assertions in the kernel code are
+ *          activated. This includes consistency checks inside the kernel,
+ *          runtime anomalies and port-defined checks.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_ENABLE_ASSERTS)
+#define CH_DBG_ENABLE_ASSERTS               FALSE
+#endif
+
+/**
+ * @brief   Debug option, trace buffer.
+ * @details If enabled then the trace buffer is activated.
+ *
+ * @note    The default is @p CH_DBG_TRACE_MASK_DISABLED.
+ */
+#if !defined(CH_DBG_TRACE_MASK)
+#define CH_DBG_TRACE_MASK                   CH_DBG_TRACE_MASK_DISABLED
+#endif
+
+/**
+ * @brief   Trace buffer entries.
+ * @note    The trace buffer is only allocated if @p CH_DBG_TRACE_MASK is
+ *          different from @p CH_DBG_TRACE_MASK_DISABLED.
+ */
+#if !defined(CH_DBG_TRACE_BUFFER_SIZE)
+#define CH_DBG_TRACE_BUFFER_SIZE            128
+#endif
+
+/**
+ * @brief   Debug option, stack checks.
+ * @details If enabled then a runtime stack check is performed.
+ *
+ * @note    The default is @p FALSE.
+ * @note    The stack check is performed in a architecture/port dependent way.
+ *          It may not be implemented or some ports.
+ * @note    The default failure mode is to halt the system with the global
+ *          @p panic_msg variable set to @p NULL.
+ */
+#if !defined(CH_DBG_ENABLE_STACK_CHECK)
+#define CH_DBG_ENABLE_STACK_CHECK           FALSE
+#endif
+
+/**
+ * @brief   Debug option, stacks initialization.
+ * @details If enabled then the threads working area is filled with a byte
+ *          value when a thread is created. This can be useful for the
+ *          runtime measurement of the used stack.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_FILL_THREADS)
+#define CH_DBG_FILL_THREADS                 FALSE
+#endif
+
+/**
+ * @brief   Debug option, threads profiling.
+ * @details If enabled then a field is added to the @p thread_t structure that
+ *          counts the system ticks occurred while executing the thread.
+ *
+ * @note    The default is @p FALSE.
+ * @note    This debug option is not currently compatible with the
+ *          tickless mode.
+ */
+#if !defined(CH_DBG_THREADS_PROFILING)
+#define CH_DBG_THREADS_PROFILING            FALSE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Kernel hooks
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   System structure extension.
+ * @details User fields added to the end of the @p ch_system_t structure.
+ */
+#define CH_CFG_SYSTEM_EXTRA_FIELDS                                          \
+  /* Add threads custom fields here.*/
+
+/**
+ * @brief   System initialization hook.
+ * @details User initialization code added to the @p chSysInit() function
+ *          just before interrupts are enabled globally.
+ */
+#define CH_CFG_SYSTEM_INIT_HOOK() {                                         \
+  /* Add threads initialization code here.*/                                \
+}
+
+/**
+ * @brief   Threads descriptor structure extension.
+ * @details User fields added to the end of the @p thread_t structure.
+ */
+#define CH_CFG_THREAD_EXTRA_FIELDS                                          \
+  /* Add threads custom fields here.*/
+
+/**
+ * @brief   Threads initialization hook.
+ * @details User initialization code added to the @p _thread_init() function.
+ *
+ * @note    It is invoked from within @p _thread_init() and implicitly from all
+ *          the threads creation APIs.
+ */
+#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \
+  /* Add threads initialization code here.*/                                \
+}
+
+/**
+ * @brief   Threads finalization hook.
+ * @details User finalization code added to the @p chThdExit() API.
+ */
+#define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \
+  /* Add threads finalization code here.*/                                  \
+}
+
+/**
+ * @brief   Context switch hook.
+ * @details This hook is invoked just before switching between threads.
+ */
+#define CH_CFG_CONTEXT_SWITCH_HOOK(ntp, otp) {                              \
+  /* Context switch code here.*/                                            \
+}
+
+/**
+ * @brief   ISR enter hook.
+ */
+#define CH_CFG_IRQ_PROLOGUE_HOOK() {                                        \
+  /* IRQ prologue code here.*/                                              \
+}
+
+/**
+ * @brief   ISR exit hook.
+ */
+#define CH_CFG_IRQ_EPILOGUE_HOOK() {                                        \
+  /* IRQ epilogue code here.*/                                              \
+}
+
+/**
+ * @brief   Idle thread enter hook.
+ * @note    This hook is invoked within a critical zone, no OS functions
+ *          should be invoked from here.
+ * @note    This macro can be used to activate a power saving mode.
+ */
+#define CH_CFG_IDLE_ENTER_HOOK() {                                          \
+  /* Idle-enter code here.*/                                                \
+}
+
+/**
+ * @brief   Idle thread leave hook.
+ * @note    This hook is invoked within a critical zone, no OS functions
+ *          should be invoked from here.
+ * @note    This macro can be used to deactivate a power saving mode.
+ */
+#define CH_CFG_IDLE_LEAVE_HOOK() {                                          \
+  /* Idle-leave code here.*/                                                \
+}
+
+/**
+ * @brief   Idle Loop hook.
+ * @details This hook is continuously invoked by the idle thread loop.
+ */
+#define CH_CFG_IDLE_LOOP_HOOK() {                                           \
+  /* Idle loop code here.*/                                                 \
+}
+
+/**
+ * @brief   System tick event hook.
+ * @details This hook is invoked in the system tick handler immediately
+ *          after processing the virtual timers queue.
+ */
+#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \
+  /* System tick event code here.*/                                         \
+}
+
+/**
+ * @brief   System halt hook.
+ * @details This hook is invoked in case to a system halting error before
+ *          the system is halted.
+ */
+#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \
+  /* System halt code here.*/                                               \
+}
+
+/**
+ * @brief   Trace hook.
+ * @details This hook is invoked each time a new record is written in the
+ *          trace buffer.
+ */
+#define CH_CFG_TRACE_HOOK(tep) {                                            \
+  /* Trace code here.*/                                                     \
+}
+
+/** @} */
+
+/*===========================================================================*/
+/* Port-specific settings (override port settings defaulted in chcore.h).    */
+/*===========================================================================*/
+
+#endif  /* CHCONF_H */
+
+/** @} */
diff --git a/qmk/keyboards/iron180/config.h b/qmk/keyboards/iron180/config.h
new file mode 100644
index 00000000..b7b6cb65
--- /dev/null
+++ b/qmk/keyboards/iron180/config.h
@@ -0,0 +1,70 @@
+/*
+Copyright 2015 Álvaro "Gondolindrim" Volpato  <gondolindrim@acheronproject.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
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x8384 //SR for Smith and Rune
+#define PRODUCT_ID      0x1180
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    SmithRune
+#define PRODUCT         IRON180
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 17
+
+#define MATRIX_COL_PINS { B7 , B6 , B5 , B4 , B3 , A10, A9 , A8 , B15, B14, B13, B12, B11, B2 , A4 , B1 , A3 }
+#define MATRIX_ROW_PINS { B9 , B8 , A15, B0 , A7 , A5 }
+#define DIODE_DIRECTION COL2ROW
+
+#define BACKLIGHT_PIN           A6
+#define BACKLIGHT_PWM_DRIVER    PWMD3
+#define BACKLIGHT_PWM_CHANNEL   1
+#define BACKLIGHT_PAL_MODE      1
+#define BACKLIGHT_LEVELS 6
+#define BACKLIGHT_BREATHING
+#define BREATHING_PERIOD 6
+
+/* define if matrix has ghost */
+//#define MATRIX_HAS_GHOST
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE    5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+//#define NO_ACTION_MACRO
+//#define NO_ACTION_FUNCTION
diff --git a/qmk/keyboards/iron180/halconf.h b/qmk/keyboards/iron180/halconf.h
new file mode 100644
index 00000000..92065d07
--- /dev/null
+++ b/qmk/keyboards/iron180/halconf.h
@@ -0,0 +1,525 @@
+/*
+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+/**
+ * @file    templates/halconf.h
+ * @brief   HAL configuration header.
+ * @details HAL configuration file, this file allows to enable or disable the
+ *          various device drivers from your application. You may also use
+ *          this file in order to override the device drivers default settings.
+ *
+ * @addtogroup HAL_CONF
+ * @{
+ */
+
+#ifndef HALCONF_H
+#define HALCONF_H
+
+#define _CHIBIOS_HAL_CONF_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
+
+#include "mcuconf.h"
+
+/**
+ * @brief   Enables the PAL subsystem.
+ */
+#if !defined(HAL_USE_PAL) || defined(__DOXYGEN__)
+#define HAL_USE_PAL                         TRUE
+#endif
+
+/**
+ * @brief   Enables the ADC subsystem.
+ */
+#if !defined(HAL_USE_ADC) || defined(__DOXYGEN__)
+#define HAL_USE_ADC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the CAN subsystem.
+ */
+#if !defined(HAL_USE_CAN) || defined(__DOXYGEN__)
+#define HAL_USE_CAN                         FALSE
+#endif
+
+/**
+ * @brief   Enables the cryptographic subsystem.
+ */
+#if !defined(HAL_USE_CRY) || defined(__DOXYGEN__)
+#define HAL_USE_CRY                         FALSE
+#endif
+
+/**
+ * @brief   Enables the DAC subsystem.
+ */
+#if !defined(HAL_USE_DAC) || defined(__DOXYGEN__)
+#define HAL_USE_DAC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the GPT subsystem.
+ */
+#if !defined(HAL_USE_GPT) || defined(__DOXYGEN__)
+#define HAL_USE_GPT                         FALSE
+#endif
+
+/**
+ * @brief   Enables the I2C subsystem.
+ */
+#if !defined(HAL_USE_I2C) || defined(__DOXYGEN__)
+#define HAL_USE_I2C                         FALSE
+#endif
+
+/**
+ * @brief   Enables the I2S subsystem.
+ */
+#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)
+#define HAL_USE_I2S                         FALSE
+#endif
+
+/**
+ * @brief   Enables the ICU subsystem.
+ */
+#if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)
+#define HAL_USE_ICU                         FALSE
+#endif
+
+/**
+ * @brief   Enables the MAC subsystem.
+ */
+#if !defined(HAL_USE_MAC) || defined(__DOXYGEN__)
+#define HAL_USE_MAC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the MMC_SPI subsystem.
+ */
+#if !defined(HAL_USE_MMC_SPI) || defined(__DOXYGEN__)
+#define HAL_USE_MMC_SPI                     FALSE
+#endif
+
+/**
+ * @brief   Enables the PWM subsystem.
+ */
+#if !defined(HAL_USE_PWM) || defined(__DOXYGEN__)
+#define HAL_USE_PWM                         YES
+#endif
+
+/**
+ * @brief   Enables the RTC subsystem.
+ */
+#if !defined(HAL_USE_RTC) || defined(__DOXYGEN__)
+#define HAL_USE_RTC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the SDC subsystem.
+ */
+#if !defined(HAL_USE_SDC) || defined(__DOXYGEN__)
+#define HAL_USE_SDC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the SERIAL subsystem.
+ */
+#if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__)
+#define HAL_USE_SERIAL                      FALSE
+#endif
+
+/**
+ * @brief   Enables the SERIAL over USB subsystem.
+ */
+#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)
+#define HAL_USE_SERIAL_USB                  FALSE
+#endif
+
+/**
+ * @brief   Enables the SIO subsystem.
+ */
+#if !defined(HAL_USE_SIO) || defined(__DOXYGEN__)
+#define HAL_USE_SIO                         FALSE
+#endif
+
+/**
+ * @brief   Enables the SPI subsystem.
+ */
+#if !defined(HAL_USE_SPI) || defined(__DOXYGEN__)
+#define HAL_USE_SPI                         FALSE
+#endif
+
+/**
+ * @brief   Enables the TRNG subsystem.
+ */
+#if !defined(HAL_USE_TRNG) || defined(__DOXYGEN__)
+#define HAL_USE_TRNG                        FALSE
+#endif
+
+/**
+ * @brief   Enables the UART subsystem.
+ */
+#if !defined(HAL_USE_UART) || defined(__DOXYGEN__)
+#define HAL_USE_UART                        FALSE
+#endif
+
+/**
+ * @brief   Enables the USB subsystem.
+ */
+#if !defined(HAL_USE_USB) || defined(__DOXYGEN__)
+#define HAL_USE_USB                         TRUE
+#endif
+
+/**
+ * @brief   Enables the WDG subsystem.
+ */
+#if !defined(HAL_USE_WDG) || defined(__DOXYGEN__)
+#define HAL_USE_WDG                         FALSE
+#endif
+
+/**
+ * @brief   Enables the WSPI subsystem.
+ */
+#if !defined(HAL_USE_WSPI) || defined(__DOXYGEN__)
+#define HAL_USE_WSPI                        FALSE
+#endif
+
+/*===========================================================================*/
+/* PAL driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(PAL_USE_CALLBACKS) || defined(__DOXYGEN__)
+#define PAL_USE_CALLBACKS                   FALSE
+#endif
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(PAL_USE_WAIT) || defined(__DOXYGEN__)
+#define PAL_USE_WAIT                        FALSE
+#endif
+
+/*===========================================================================*/
+/* ADC driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(ADC_USE_WAIT) || defined(__DOXYGEN__)
+#define ADC_USE_WAIT                        TRUE
+#endif
+
+/**
+ * @brief   Enables the @p adcAcquireBus() and @p adcReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(ADC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define ADC_USE_MUTUAL_EXCLUSION            TRUE
+#endif
+
+/*===========================================================================*/
+/* CAN driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Sleep mode related APIs inclusion switch.
+ */
+#if !defined(CAN_USE_SLEEP_MODE) || defined(__DOXYGEN__)
+#define CAN_USE_SLEEP_MODE                  TRUE
+#endif
+
+/**
+ * @brief   Enforces the driver to use direct callbacks rather than OSAL events.
+ */
+#if !defined(CAN_ENFORCE_USE_CALLBACKS) || defined(__DOXYGEN__)
+#define CAN_ENFORCE_USE_CALLBACKS           FALSE
+#endif
+
+/*===========================================================================*/
+/* CRY driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables the SW fall-back of the cryptographic driver.
+ * @details When enabled, this option, activates a fall-back software
+ *          implementation for algorithms not supported by the underlying
+ *          hardware.
+ * @note    Fall-back implementations may not be present for all algorithms.
+ */
+#if !defined(HAL_CRY_USE_FALLBACK) || defined(__DOXYGEN__)
+#define HAL_CRY_USE_FALLBACK                FALSE
+#endif
+
+/**
+ * @brief   Makes the driver forcibly use the fall-back implementations.
+ */
+#if !defined(HAL_CRY_ENFORCE_FALLBACK) || defined(__DOXYGEN__)
+#define HAL_CRY_ENFORCE_FALLBACK            FALSE
+#endif
+
+/*===========================================================================*/
+/* DAC driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(DAC_USE_WAIT) || defined(__DOXYGEN__)
+#define DAC_USE_WAIT                        TRUE
+#endif
+
+/**
+ * @brief   Enables the @p dacAcquireBus() and @p dacReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(DAC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define DAC_USE_MUTUAL_EXCLUSION            TRUE
+#endif
+
+/*===========================================================================*/
+/* I2C driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables the mutual exclusion APIs on the I2C bus.
+ */
+#if !defined(I2C_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define I2C_USE_MUTUAL_EXCLUSION            TRUE
+#endif
+
+/*===========================================================================*/
+/* MAC driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables the zero-copy API.
+ */
+#if !defined(MAC_USE_ZERO_COPY) || defined(__DOXYGEN__)
+#define MAC_USE_ZERO_COPY                   FALSE
+#endif
+
+/**
+ * @brief   Enables an event sources for incoming packets.
+ */
+#if !defined(MAC_USE_EVENTS) || defined(__DOXYGEN__)
+#define MAC_USE_EVENTS                      TRUE
+#endif
+
+/*===========================================================================*/
+/* MMC_SPI driver related settings.                                          */
+/*===========================================================================*/
+
+/**
+ * @brief   Delays insertions.
+ * @details If enabled this options inserts delays into the MMC waiting
+ *          routines releasing some extra CPU time for the threads with
+ *          lower priority, this may slow down the driver a bit however.
+ *          This option is recommended also if the SPI driver does not
+ *          use a DMA channel and heavily loads the CPU.
+ */
+#if !defined(MMC_NICE_WAITING) || defined(__DOXYGEN__)
+#define MMC_NICE_WAITING                    TRUE
+#endif
+
+/*===========================================================================*/
+/* SDC driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Number of initialization attempts before rejecting the card.
+ * @note    Attempts are performed at 10mS intervals.
+ */
+#if !defined(SDC_INIT_RETRY) || defined(__DOXYGEN__)
+#define SDC_INIT_RETRY                      100
+#endif
+
+/**
+ * @brief   Include support for MMC cards.
+ * @note    MMC support is not yet implemented so this option must be kept
+ *          at @p FALSE.
+ */
+#if !defined(SDC_MMC_SUPPORT) || defined(__DOXYGEN__)
+#define SDC_MMC_SUPPORT                     FALSE
+#endif
+
+/**
+ * @brief   Delays insertions.
+ * @details If enabled this options inserts delays into the MMC waiting
+ *          routines releasing some extra CPU time for the threads with
+ *          lower priority, this may slow down the driver a bit however.
+ */
+#if !defined(SDC_NICE_WAITING) || defined(__DOXYGEN__)
+#define SDC_NICE_WAITING                    TRUE
+#endif
+
+/**
+ * @brief   OCR initialization constant for V20 cards.
+ */
+#if !defined(SDC_INIT_OCR_V20) || defined(__DOXYGEN__)
+#define SDC_INIT_OCR_V20                    0x50FF8000U
+#endif
+
+/**
+ * @brief   OCR initialization constant for non-V20 cards.
+ */
+#if !defined(SDC_INIT_OCR) || defined(__DOXYGEN__)
+#define SDC_INIT_OCR                        0x80100000U
+#endif
+
+/*===========================================================================*/
+/* SERIAL driver related settings.                                           */
+/*===========================================================================*/
+
+/**
+ * @brief   Default bit rate.
+ * @details Configuration parameter, this is the baud rate selected for the
+ *          default configuration.
+ */
+#if !defined(SERIAL_DEFAULT_BITRATE) || defined(__DOXYGEN__)
+#define SERIAL_DEFAULT_BITRATE              38400
+#endif
+
+/**
+ * @brief   Serial buffers size.
+ * @details Configuration parameter, you can change the depth of the queue
+ *          buffers depending on the requirements of your application.
+ * @note    The default is 16 bytes for both the transmission and receive
+ *          buffers.
+ */
+#if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__)
+#define SERIAL_BUFFERS_SIZE                 16
+#endif
+
+/*===========================================================================*/
+/* SERIAL_USB driver related setting.                                        */
+/*===========================================================================*/
+
+/**
+ * @brief   Serial over USB buffers size.
+ * @details Configuration parameter, the buffer size must be a multiple of
+ *          the USB data endpoint maximum packet size.
+ * @note    The default is 256 bytes for both the transmission and receive
+ *          buffers.
+ */
+#if !defined(SERIAL_USB_BUFFERS_SIZE) || defined(__DOXYGEN__)
+#define SERIAL_USB_BUFFERS_SIZE             1
+#endif
+
+/**
+ * @brief   Serial over USB number of buffers.
+ * @note    The default is 2 buffers.
+ */
+#if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
+#define SERIAL_USB_BUFFERS_NUMBER           2
+#endif
+
+/*===========================================================================*/
+/* SPI driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(SPI_USE_WAIT) || defined(__DOXYGEN__)
+#define SPI_USE_WAIT                        TRUE
+#endif
+
+/**
+ * @brief   Enables circular transfers APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(SPI_USE_CIRCULAR) || defined(__DOXYGEN__)
+#define SPI_USE_CIRCULAR                    FALSE
+#endif
+
+
+/**
+ * @brief   Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(SPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define SPI_USE_MUTUAL_EXCLUSION            TRUE
+#endif
+
+/**
+ * @brief   Handling method for SPI CS line.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(SPI_SELECT_MODE) || defined(__DOXYGEN__)
+#define SPI_SELECT_MODE                     SPI_SELECT_MODE_PAD
+#endif
+
+/*===========================================================================*/
+/* UART driver related settings.                                             */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(UART_USE_WAIT) || defined(__DOXYGEN__)
+#define UART_USE_WAIT                       FALSE
+#endif
+
+/**
+ * @brief   Enables the @p uartAcquireBus() and @p uartReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(UART_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define UART_USE_MUTUAL_EXCLUSION           FALSE
+#endif
+
+/*===========================================================================*/
+/* USB driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(USB_USE_WAIT) || defined(__DOXYGEN__)
+#define USB_USE_WAIT                        TRUE
+#endif
+
+/*===========================================================================*/
+/* WSPI driver related settings.                                             */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(WSPI_USE_WAIT) || defined(__DOXYGEN__)
+#define WSPI_USE_WAIT                       TRUE
+#endif
+
+/**
+ * @brief   Enables the @p wspiAcquireBus() and @p wspiReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(WSPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define WSPI_USE_MUTUAL_EXCLUSION           TRUE
+#endif
+
+#endif /* HALCONF_H */
+
+/** @} */
diff --git a/qmk/keyboards/iron180/iron180.c b/qmk/keyboards/iron180/iron180.c
new file mode 100644
index 00000000..236f8176
--- /dev/null
+++ b/qmk/keyboards/iron180/iron180.c
@@ -0,0 +1,18 @@
+/*
+Copyright 2020 Álvaro "Gondolindrim" Volpato  <gondolindrim@acheronproject.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 "iron180.h"
diff --git a/qmk/keyboards/iron180/iron180.h b/qmk/keyboards/iron180/iron180.h
new file mode 100644
index 00000000..5a73f725
--- /dev/null
+++ b/qmk/keyboards/iron180/iron180.h
@@ -0,0 +1,38 @@
+/*
+Copyright 2015 Álvaro "Gondolindrim" Volpato  <gondolindrim@acheronproject.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
+
+#define ___ KC_NO
+
+#include "quantum.h"
+
+#define LAYOUT( \
+	K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, \
+	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, \
+	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G, \
+	K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,           K3G, \
+	K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D,      K4F,      \
+	K50, K51, K52,                K56,           K59, K5A, K5B, K5C,      K5D, K5E, K5F  \
+) { \
+      { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G }, \
+      { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G }, \
+      { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E, K2F, K2G }, \
+      { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, ___, ___, K3G }, \
+      { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, ___, K4F, ___ }, \
+      { K50, K51, K52, ___, ___, ___, K56, ___, ___, K59, K5A, K5B, K5C, ___, K5D, K5E, K5F } \
+}
diff --git a/qmk/keyboards/iron180/keymaps/default/keymap.c b/qmk/keyboards/iron180/keymaps/default/keymap.c
new file mode 100644
index 00000000..93e343d9
--- /dev/null
+++ b/qmk/keyboards/iron180/keymaps/default/keymap.c
@@ -0,0 +1,49 @@
+/*
+Copyright 2012,2013 Jun Wako <wakojun@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+   [0] = LAYOUT(
+        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_F13 , 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_BSPC, KC_INS , KC_HOME,
+        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_PGUP,
+        KC_LSFT, KC_BSLS, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, MO(1)  ,          KC_UP  , 
+        KC_LCTL, KC_LWIN, KC_LALT,                            KC_SPC ,                   KC_RALT, KC_RWIN, MO(1)  , KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT),
+   [1] = LAYOUT(
+	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
+	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+	_______, _______, _______,                            _______,                   _______, _______, _______, _______,          _______, _______, _______),
+   [2] = LAYOUT(
+	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
+	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+	_______, _______, _______,                            _______,                   _______, _______, _______, _______,          _______, _______, _______),
+   [3] = LAYOUT(
+	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
+	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+	_______, _______, _______,                            _______,                   _______, _______, _______, _______,          _______, _______, _______),
+};
diff --git a/qmk/keyboards/iron180/keymaps/via/keymap.c b/qmk/keyboards/iron180/keymaps/via/keymap.c
new file mode 100644
index 00000000..93e343d9
--- /dev/null
+++ b/qmk/keyboards/iron180/keymaps/via/keymap.c
@@ -0,0 +1,49 @@
+/*
+Copyright 2012,2013 Jun Wako <wakojun@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+   [0] = LAYOUT(
+        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_F13 , 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_BSPC, KC_INS , KC_HOME,
+        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_PGUP,
+        KC_LSFT, KC_BSLS, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, MO(1)  ,          KC_UP  , 
+        KC_LCTL, KC_LWIN, KC_LALT,                            KC_SPC ,                   KC_RALT, KC_RWIN, MO(1)  , KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT),
+   [1] = LAYOUT(
+	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
+	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+	_______, _______, _______,                            _______,                   _______, _______, _______, _______,          _______, _______, _______),
+   [2] = LAYOUT(
+	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
+	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+	_______, _______, _______,                            _______,                   _______, _______, _______, _______,          _______, _______, _______),
+   [3] = LAYOUT(
+	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______,
+	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+	_______, _______, _______,                            _______,                   _______, _______, _______, _______,          _______, _______, _______),
+};
diff --git a/qmk/keyboards/iron180/keymaps/via/rules.mk b/qmk/keyboards/iron180/keymaps/via/rules.mk
new file mode 100644
index 00000000..1e5b9980
--- /dev/null
+++ b/qmk/keyboards/iron180/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/qmk/keyboards/iron180/mcuconf.h b/qmk/keyboards/iron180/mcuconf.h
new file mode 100644
index 00000000..93a1c1ad
--- /dev/null
+++ b/qmk/keyboards/iron180/mcuconf.h
@@ -0,0 +1,176 @@
+/*
+    ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
+/*
+ * STM32F0xx drivers configuration.
+ * The following settings override the default settings present in
+ * the various device driver implementation headers.
+ * Note that the settings for each driver only have effect if the whole
+ * driver is enabled in halconf.h.
+ *
+ * IRQ priorities:
+ * 3...0       Lowest...Highest.
+ *
+ * DMA priorities:
+ * 0...3        Lowest...Highest.
+ */
+
+#define STM32F0xx_MCUCONF
+// #define STM32F070xB
+
+/*
+ * HAL driver system settings.
+ */
+#define STM32_NO_INIT                       FALSE
+#define STM32_PVD_ENABLE                    FALSE
+#define STM32_PLS                           STM32_PLS_LEV0
+#define STM32_HSI_ENABLED                   TRUE
+#define STM32_HSI14_ENABLED                 TRUE
+#define STM32_HSI48_ENABLED                 FALSE
+#define STM32_LSI_ENABLED                   TRUE
+#define STM32_HSE_ENABLED                   FALSE
+#define STM32_LSE_ENABLED                   FALSE
+#define STM32_SW                            STM32_SW_PLL
+#define STM32_PLLSRC                        STM32_PLLSRC_HSI_DIV2
+#define STM32_PREDIV_VALUE                  1
+#define STM32_PLLMUL_VALUE                  12
+#define STM32_HPRE                          STM32_HPRE_DIV1
+#define STM32_PPRE                          STM32_PPRE_DIV1
+#define STM32_ADCSW                         STM32_ADCSW_HSI14
+#define STM32_ADCPRE                        STM32_ADCPRE_DIV4
+#define STM32_MCOSEL                        STM32_MCOSEL_NOCLOCK
+#define STM32_ADCPRE                        STM32_ADCPRE_DIV4
+#define STM32_ADCSW                         STM32_ADCSW_HSI14
+#define STM32_USBSW                         STM32_USBSW_HSI48
+#define STM32_CECSW                         STM32_CECSW_HSI
+#define STM32_I2C1SW                        STM32_I2C1SW_HSI
+#define STM32_USART1SW                      STM32_USART1SW_PCLK
+#define STM32_RTCSEL                        STM32_RTCSEL_LSI
+
+/*
+ * ADC driver system settings.
+ */
+#define STM32_ADC_USE_ADC1                  FALSE
+#define STM32_ADC_ADC1_DMA_PRIORITY         2
+#define STM32_ADC_IRQ_PRIORITY              2
+#define STM32_ADC_ADC1_DMA_IRQ_PRIORITY     2
+
+/*
+ * EXT driver system settings.
+ */
+#define STM32_EXT_EXTI0_1_IRQ_PRIORITY      3
+#define STM32_EXT_EXTI2_3_IRQ_PRIORITY      3
+#define STM32_EXT_EXTI4_15_IRQ_PRIORITY     3
+#define STM32_EXT_EXTI16_IRQ_PRIORITY       3
+#define STM32_EXT_EXTI17_IRQ_PRIORITY       3
+
+/*
+ * GPT driver system settings.
+ */
+#define STM32_GPT_USE_TIM1                  FALSE
+#define STM32_GPT_USE_TIM2                  FALSE
+#define STM32_GPT_USE_TIM3                  FALSE
+#define STM32_GPT_USE_TIM14                 FALSE
+#define STM32_GPT_TIM1_IRQ_PRIORITY         2
+#define STM32_GPT_TIM2_IRQ_PRIORITY         2
+#define STM32_GPT_TIM3_IRQ_PRIORITY         2
+#define STM32_GPT_TIM14_IRQ_PRIORITY        2
+
+/*
+ * I2C driver system settings.
+ */
+#define STM32_I2C_USE_I2C1                  FALSE
+#define STM32_I2C_USE_I2C2                  FALSE
+#define STM32_I2C_BUSY_TIMEOUT              50
+#define STM32_I2C_I2C1_IRQ_PRIORITY         3
+#define STM32_I2C_I2C2_IRQ_PRIORITY         3
+#define STM32_I2C_USE_DMA                   FALSE
+#define STM32_I2C_I2C1_DMA_PRIORITY         1
+#define STM32_I2C_I2C2_DMA_PRIORITY         1
+#define STM32_I2C_I2C1_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 7)
+#define STM32_I2C_I2C1_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 6)
+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")
+
+/*
+ * ICU driver system settings.
+ */
+#define STM32_ICU_USE_TIM1                  FALSE
+#define STM32_ICU_USE_TIM2                  FALSE
+#define STM32_ICU_USE_TIM3                  FALSE
+#define STM32_ICU_TIM1_IRQ_PRIORITY         3
+#define STM32_ICU_TIM2_IRQ_PRIORITY         3
+#define STM32_ICU_TIM3_IRQ_PRIORITY         3
+
+/*
+ * PWM driver system settings.
+ */
+#define STM32_PWM_USE_ADVANCED              FALSE
+#define STM32_PWM_USE_TIM1                  FALSE
+#define STM32_PWM_USE_TIM2                  FALSE
+#define STM32_PWM_USE_TIM3                  YES
+#define STM32_PWM_TIM1_IRQ_PRIORITY         3
+#define STM32_PWM_TIM2_IRQ_PRIORITY         3
+#define STM32_PWM_TIM3_IRQ_PRIORITY         3
+
+/*
+ * SERIAL driver system settings.
+ */
+#define STM32_SERIAL_USE_USART1             FALSE
+#define STM32_SERIAL_USE_USART2             FALSE
+#define STM32_SERIAL_USART1_PRIORITY        3
+#define STM32_SERIAL_USART2_PRIORITY        3
+
+/*
+ * SPI driver system settings.
+ */
+#define STM32_SPI_USE_SPI1                  FALSE
+#define STM32_SPI_USE_SPI2                  FALSE
+#define STM32_SPI_SPI1_DMA_PRIORITY         1
+#define STM32_SPI_SPI2_DMA_PRIORITY         1
+#define STM32_SPI_SPI1_IRQ_PRIORITY         2
+#define STM32_SPI_SPI2_IRQ_PRIORITY         2
+#define STM32_SPI_SPI2_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 4)
+#define STM32_SPI_SPI2_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 5)
+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")
+
+/*
+ * ST driver system settings.
+ */
+#define STM32_ST_IRQ_PRIORITY               2
+#define STM32_ST_USE_TIMER                  2
+
+/*
+ * UART driver system settings.
+ */
+#define STM32_UART_USE_USART1               FALSE
+#define STM32_UART_USE_USART2               FALSE
+#define STM32_UART_USART1_IRQ_PRIORITY      3
+#define STM32_UART_USART2_IRQ_PRIORITY      3
+#define STM32_UART_USART1_DMA_PRIORITY      0
+#define STM32_UART_USART2_DMA_PRIORITY      0
+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")
+
+/*
+ * USB driver system settings.
+ */
+#define STM32_USB_USE_USB1                  TRUE
+#define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE
+#define STM32_USB_USB1_LP_IRQ_PRIORITY      3
+
+#endif /* _MCUCONF_H_ */
diff --git a/qmk/keyboards/iron180/readme.md b/qmk/keyboards/iron180/readme.md
new file mode 100644
index 00000000..00275d68
--- /dev/null
+++ b/qmk/keyboards/iron180/readme.md
@@ -0,0 +1,18 @@
+# Iron180 QMK folder
+
+## Introduction
+
+This is the QMK firmware repository for the Iron180 PCB, a keyboard designed by [Smith and Rune](https://smithrune.com/) and PCB designed by [Gondolindrim](http://github.com/Gondolindrim).
+
+The Iron180 PCb is a F13 TKL PCB with ALPS switches support. It also supports in-switch single-color LEDs and a multi-layout design for default or 7U bottom row, ISO layout, split backspace and right shift.
+
+As of november 2020, the only way to obtain an Iron180 was through the [Group Buy](https://geekhack.org/index.php?topic=109513) which is already over and all spots were filled.
+
+## How to compile
+
+After setting up your build environment, you can compile the Iron180 default keymap by using:
+
+    make iron180: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).
+
diff --git a/qmk/keyboards/iron180/rules.mk b/qmk/keyboards/iron180/rules.mk
new file mode 100644
index 00000000..2d2f71e1
--- /dev/null
+++ b/qmk/keyboards/iron180/rules.mk
@@ -0,0 +1,23 @@
+# MCU name
+MCU = STM32F072
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = yes        # Console for debug
+COMMAND_ENABLE = yes        # Commands for debug and configuration
+# 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 = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = no
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/qmk/keyboards/jae/j01/config.h b/qmk/keyboards/jae/j01/config.h
index 9c05a987..3d5ccee2 100644
--- a/qmk/keyboards/jae/j01/config.h
+++ b/qmk/keyboards/jae/j01/config.h
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 Maarten Dekkers <maartenwut@gmail.com>
+Copyright 2019 Evy Dekkers
 
 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
@@ -23,7 +23,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define VENDOR_ID       0x4705
 #define PRODUCT_ID      0x0143
 #define DEVICE_VER      0x0001
-#define MANUFACTURER    Maartenwut
+#define MANUFACTURER    Evyd13
 #define PRODUCT         J-01
 #define DESCRIPTION     A custom 65%ish keyboard
 
@@ -191,34 +191,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
-
 /* Bootmagic Lite key configuration */
 #define BOOTMAGIC_LITE_ROW 0
 #define BOOTMAGIC_LITE_COLUMN 2
diff --git a/qmk/keyboards/jae/j01/j01.c b/qmk/keyboards/jae/j01/j01.c
index a72279b3..351ddc49 100644
--- a/qmk/keyboards/jae/j01/j01.c
+++ b/qmk/keyboards/jae/j01/j01.c
@@ -1,4 +1,4 @@
-/* Copyright Maarten Dekkers <maartenwut@gmail.com>
+/* Copyright Evy Dekkers
  *
  * 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
diff --git a/qmk/keyboards/jae/j01/j01.h b/qmk/keyboards/jae/j01/j01.h
index b5636c38..3d35f185 100644
--- a/qmk/keyboards/jae/j01/j01.h
+++ b/qmk/keyboards/jae/j01/j01.h
@@ -1,4 +1,4 @@
-/* Copyright 2019 Maarten Dekkers <maartenwut@gmail.com>
+/* Copyright 2019 Evy Dekkers
  *
  * 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
diff --git a/qmk/keyboards/jae/j01/keymaps/default/keymap.c b/qmk/keyboards/jae/j01/keymaps/default/keymap.c
index edb195b2..53fba7a0 100644
--- a/qmk/keyboards/jae/j01/keymaps/default/keymap.c
+++ b/qmk/keyboards/jae/j01/keymaps/default/keymap.c
@@ -1,4 +1,4 @@
-/* Copyright 2019 Maarten Dekkers <maartenwut@gmail.com>
+/* Copyright 2019 Evy Dekkers
  *
  * 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
diff --git a/qmk/keyboards/jae/j01/readme.md b/qmk/keyboards/jae/j01/readme.md
index 8ed94f04..8801da65 100644
--- a/qmk/keyboards/jae/j01/readme.md
+++ b/qmk/keyboards/jae/j01/readme.md
@@ -2,7 +2,7 @@
 
 A 65% with the arrow keys and right most column exploded away, with macro keys on the left hand side. Only 15 manufactured. 
 
-* Keyboard Maintainer: [Maartenwut](https://github.com/maartenwut)
+* Keyboard Maintainer: [Evyd13](https://github.com/evyd13)
 * Hardware Supported: J-01 PCB
 * Hardware Availability: Private Group Buy and [Charity Raffle](https://novelkeys.xyz/collections/frontpage/products/j-01-raffle-ticket)
 
diff --git a/qmk/keyboards/jae/j01/rules.mk b/qmk/keyboards/jae/j01/rules.mk
index b45d822c..2b3fd311 100644
--- a/qmk/keyboards/jae/j01/rules.mk
+++ b/qmk/keyboards/jae/j01/rules.mk
@@ -29,4 +29,3 @@ MIDI_ENABLE = no            # MIDI support
 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
diff --git a/qmk/keyboards/jc65/v32u4/config.h b/qmk/keyboards/jc65/v32u4/config.h
index 8233dd1e..a00f64a1 100644
--- a/qmk/keyboards/jc65/v32u4/config.h
+++ b/qmk/keyboards/jc65/v32u4/config.h
@@ -37,6 +37,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B7, D4, B1, B0, B5, B4, D7, D6, B3, F4, F5 }
 #define UNUSED_PINS
 
+#define LED_CAPS_LOCK_PIN B2
+#define LED_PIN_ON_STATE 0
+
 #define RGB_DI_PIN E2
 #ifdef RGB_DI_PIN
 #define RGBLIGHT_ANIMATIONS
diff --git a/qmk/keyboards/jc65/v32u4/v32u4.c b/qmk/keyboards/jc65/v32u4/v32u4.c
index c69c5d53..a6837268 100644
--- a/qmk/keyboards/jc65/v32u4/v32u4.c
+++ b/qmk/keyboards/jc65/v32u4/v32u4.c
@@ -1,36 +1 @@
 #include "v32u4.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 (usb_led & (1<<USB_LED_CAPS_LOCK)) {
-        // output low
-        DDRB |= (1<<2);
-        PORTB &= ~(1<<2);
-    } else {
-        // Hi-Z
-        DDRB &= ~(1<<2);
-        PORTB &= ~(1<<2);
-    }
-	led_set_user(usb_led);
-}
diff --git a/qmk/keyboards/jd40/jd40.c b/qmk/keyboards/jd40/jd40.c
index fa06356d..1b68ddd4 100644
--- a/qmk/keyboards/jd40/jd40.c
+++ b/qmk/keyboards/jd40/jd40.c
@@ -1,26 +1 @@
 #include "jd40.h"
-
-void led_set_kb(uint8_t usb_led) {
-	// put your keyboard LED indicator (ex: Caps Lock LED) toggling code here
-	
-
-  //  if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
-	//	gh60_caps_led_on();
-	//	} else {
-	//	gh60_caps_led_off(); 
-  //  }
-	
-    // if (usb_led & (1<<USB_LED_NUM_LOCK)) {
-		// gh60_esc_led_on();
-		// } else {
-		// gh60_esc_led_off(); 
-    // }
-	
-    // if (usb_led & (1<<USB_LED_SCROLL_LOCK)) {
-		// gh60_fn_led_on();
-		// } else {
-		// gh60_fn_led_off(); 	
-    // }
-
-	led_set_user(usb_led);	
-}
diff --git a/qmk/keyboards/jd45/keymaps/talljoe/config.h b/qmk/keyboards/jd45/keymaps/talljoe/config.h
index f8b0333c..8b06cefd 100644
--- a/qmk/keyboards/jd45/keymaps/talljoe/config.h
+++ b/qmk/keyboards/jd45/keymaps/talljoe/config.h
@@ -1,7 +1,19 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
-
-#include QMK_KEYBOARD_CONFIG_H
+/* Copyright 2020 Joseph Wasson
+ *
+ * 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
 
 #define PREVENT_STUCK_MODIFIERS
 #define SPACE_COUNT 2
@@ -14,9 +26,7 @@
     K40, K41, K42,      K44, K45, K46,      K48, K49,      K4B, K4C                 \
 ) { \
     { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K0D,   K1D    }, \
-    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2C,   KC_NO  }, \
+    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   KC_NO  }, \
     { K30,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   KC_NO  }, \
-    { K40,   K00,   K41,   K42,   K44,   KC_NO, K45,   KC_NO, K48,   K49,   K3D,   K4C,   KC_NO  }  \
+    { K40,   K00,   K41,   K42,   K44,   KC_NO, K46,   KC_NO, K48,   K49,   K3D,   K4C,   KC_NO  }  \
 }
-
-#endif
diff --git a/qmk/keyboards/jisplit89/keymaps/default/keymap.c b/qmk/keyboards/jisplit89/keymaps/default/keymap.c
index bfbb0989..e782a4b4 100644
--- a/qmk/keyboards/jisplit89/keymaps/default/keymap.c
+++ b/qmk/keyboards/jisplit89/keymaps/default/keymap.c
@@ -35,11 +35,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //,-----------------------------------------------------|   |--------------------------------------------------------------------------------.
        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_PSCR,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-LT(_ADJUST,KC_ZKHK),KC_1,  KC_2,    KC_3,    KC_4,    KC_5,        KC_6,    KC_7,    KC_8,    KC_9,    KC_0, JP_MINS,  JP_EQL,  JP_YEN, KC_BSPC,  KC_DEL,
+LT(_ADJUST,KC_ZKHK),KC_1,  KC_2,    KC_3,    KC_4,    KC_5,        KC_6,    KC_7,    KC_8,    KC_9,    KC_0, JP_MINS, JP_CIRC,  JP_YEN, KC_BSPC,  KC_DEL,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
        KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,        KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,   JP_AT, JP_LBRC,  KC_ENT, KC_HOME,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      KC_CAPS,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,        KC_H,    KC_J,    KC_K,    KC_L, JP_SCLN, JP_QUOT, JP_RBRC,           KC_END,
+      KC_CAPS,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,        KC_H,    KC_J,    KC_K,    KC_L, JP_SCLN, JP_COLN, JP_RBRC,           KC_END,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
       KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,        KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH, JP_BSLS, KC_PGDN,   KC_UP, KC_PGUP,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
diff --git a/qmk/keyboards/jisplit89/keymaps/salicylic/keymap.c b/qmk/keyboards/jisplit89/keymaps/salicylic/keymap.c
index e4102796..a4c7c99f 100644
--- a/qmk/keyboards/jisplit89/keymaps/salicylic/keymap.c
+++ b/qmk/keyboards/jisplit89/keymaps/salicylic/keymap.c
@@ -48,7 +48,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //,-----------------------------------------------------|   |--------------------------------------------------------------------------------.
   TD(TD_ESMS),   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_PSCR,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      KC_ZKHK,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,        KC_6,    KC_7,    KC_8,    KC_9,    KC_0, JP_MINS,  JP_EQL,  JP_YEN, KC_BSPC,  KC_DEL,
+      KC_ZKHK,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,        KC_6,    KC_7,    KC_8,    KC_9,    KC_0, JP_MINS, JP_CIRC,  JP_YEN, KC_BSPC,  KC_DEL,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
        KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,        KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,   JP_AT, JP_LBRC,  KC_ENT, KC_HOME,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
diff --git a/qmk/keyboards/jisplit89/keymaps/via/keymap.c b/qmk/keyboards/jisplit89/keymaps/via/keymap.c
index 61bcadbc..b2ceacb0 100644
--- a/qmk/keyboards/jisplit89/keymaps/via/keymap.c
+++ b/qmk/keyboards/jisplit89/keymaps/via/keymap.c
@@ -27,11 +27,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   //,-----------------------------------------------------|   |--------------------------------------------------------------------------------.
        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_PSCR,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-LT(1,KC_ZKHK),KC_1,  KC_2,    KC_3,    KC_4,    KC_5,        KC_6,    KC_7,    KC_8,    KC_9,    KC_0, JP_MINS,  JP_EQL,  JP_YEN, KC_BSPC,  KC_DEL,
+LT(1,KC_ZKHK),    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,        KC_6,    KC_7,    KC_8,    KC_9,    KC_0, JP_MINS, JP_CIRC,  JP_YEN, KC_BSPC,  KC_DEL,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
        KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,        KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,   JP_AT, JP_LBRC,  KC_ENT, KC_HOME,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
-      KC_CAPS,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,        KC_H,    KC_J,    KC_K,    KC_L, JP_SCLN, JP_QUOT, JP_RBRC,           KC_END,
+      KC_CAPS,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,        KC_H,    KC_J,    KC_K,    KC_L, JP_SCLN, JP_COLN, JP_RBRC,           KC_END,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
       KC_LSFT,    KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,        KC_N,    KC_M, KC_COMM,  KC_DOT, KC_SLSH, JP_BSLS, KC_PGDN,   KC_UP, KC_PGUP,
   //|--------+--------+--------+--------+--------+--------|   |--------+--------+--------+--------+--------+--------+--------+--------+--------|
diff --git a/qmk/keyboards/jisplit89/rules.mk b/qmk/keyboards/jisplit89/rules.mk
index 9c714e88..3c602ad4 100644
--- a/qmk/keyboards/jisplit89/rules.mk
+++ b/qmk/keyboards/jisplit89/rules.mk
@@ -22,7 +22,6 @@ MIDI_ENABLE = no            # MIDI support
 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
 UNICODE_ENABLE = no         # Unicode
 
 SPLIT_KEYBOARD = yes
diff --git a/qmk/keyboards/jj40/keymaps/stevexyz/rules.mk b/qmk/keyboards/jj40/keymaps/stevexyz/rules.mk
index 1e4d0ded..289ed40e 100644
--- a/qmk/keyboards/jj40/keymaps/stevexyz/rules.mk
+++ b/qmk/keyboards/jj40/keymaps/stevexyz/rules.mk
@@ -13,7 +13,6 @@ 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)
 
 TAP_DANCE_ENABLE = yes
 
diff --git a/qmk/keyboards/jj40/rules.mk b/qmk/keyboards/jj40/rules.mk
index 767ebb93..0a912cfa 100644
--- a/qmk/keyboards/jj40/rules.mk
+++ b/qmk/keyboards/jj40/rules.mk
@@ -31,6 +31,5 @@ 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
 
 LAYOUTS = ortho_4x12 planck_mit
diff --git a/qmk/keyboards/jj4x4/keymaps/via/rules.mk b/qmk/keyboards/jj4x4/keymaps/via/rules.mk
index 82fb80d5..1e5b9980 100644
--- a/qmk/keyboards/jj4x4/keymaps/via/rules.mk
+++ b/qmk/keyboards/jj4x4/keymaps/via/rules.mk
@@ -1,3 +1 @@
 VIA_ENABLE = yes
-EXTRAKEY_ENABLE = no
-MOUSEKEY_ENABLE = no
diff --git a/qmk/keyboards/jj4x4/rules.mk b/qmk/keyboards/jj4x4/rules.mk
index 5ff5c376..7b237619 100644
--- a/qmk/keyboards/jj4x4/rules.mk
+++ b/qmk/keyboards/jj4x4/rules.mk
@@ -31,6 +31,5 @@ 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
 
 LAYOUTS = ortho_4x4
diff --git a/qmk/keyboards/jm60/boards/JM60_BOARD/board.c b/qmk/keyboards/jm60/boards/JM60_BOARD/board.c
index d953d6a1..48844e34 100644
--- a/qmk/keyboards/jm60/boards/JM60_BOARD/board.c
+++ b/qmk/keyboards/jm60/boards/JM60_BOARD/board.c
@@ -14,7 +14,7 @@
     limitations under the License.
 */
 
-#include "hal.h"
+#include <hal.h>
 
 /**
  * @brief   PAL setup.
diff --git a/qmk/keyboards/jm60/led.c b/qmk/keyboards/jm60/led.c
index aed66c7c..4ce0b3e2 100644
--- a/qmk/keyboards/jm60/led.c
+++ b/qmk/keyboards/jm60/led.c
@@ -15,7 +15,7 @@ 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 "hal.h"
+#include <hal.h>
 
 #include "led.h"
 
diff --git a/qmk/keyboards/jm60/matrix.c b/qmk/keyboards/jm60/matrix.c
index 01bb4a80..e19d4f02 100644
--- a/qmk/keyboards/jm60/matrix.c
+++ b/qmk/keyboards/jm60/matrix.c
@@ -1,7 +1,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <string.h>
-#include "hal.h"
+#include <hal.h>
 #include "timer.h"
 #include "wait.h"
 #include "print.h"
diff --git a/qmk/keyboards/jnao/config.h b/qmk/keyboards/jnao/config.h
index f14aa4bb..1890f32d 100644
--- a/qmk/keyboards/jnao/config.h
+++ b/qmk/keyboards/jnao/config.h
@@ -50,3 +50,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
+
diff --git a/qmk/keyboards/jnao/keymaps/via/keymap.c b/qmk/keyboards/jnao/keymaps/via/keymap.c
new file mode 100644
index 00000000..00305db8
--- /dev/null
+++ b/qmk/keyboards/jnao/keymaps/via/keymap.c
@@ -0,0 +1,145 @@
+ /* Copyright 2020 Matthew Dias
+  * 
+  * 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
+
+enum layer_names {
+    _QWERTY,
+    _LOWER,
+    _RAISE,
+    _ADJUST,
+};
+
+enum jnao_keycodes {
+  QWERTY = SAFE_RANGE,
+  LOWER,
+  RAISE,
+};
+
+// Defines for task manager and such
+#define CALTDEL LCTL(LALT(KC_DEL))
+#define TSKMGR LCTL(LSFT(KC_ESC))
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/* Qwerty
+ * ,-----------------------------------------------------------------------------------.
+ * |  Esc |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Del  |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Bksp |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * | Caps |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  | Enter|
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |  '   |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Ctrl |  `   | GUI  | ALT  |Lower |    Space    |Raise | Left | Down |  Up  |Right |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_QWERTY] = LAYOUT_ortho_5x12(
+  KC_ESC,        KC_1,   KC_2,    KC_3,    KC_4,  KC_5,   KC_6,   KC_7,  KC_8,    KC_9,    KC_0,    KC_DEL,
+  KC_TAB,        KC_Q,   KC_W,    KC_E,    KC_R,  KC_T,   KC_Y,   KC_U,  KC_I,    KC_O,    KC_P,    KC_BSPC,
+  KC_CAPS,       KC_A,   KC_S,    KC_D,    KC_F,  KC_G,   KC_H,   KC_J,  KC_K,    KC_L,    KC_SCLN, KC_ENT,
+  OSM(MOD_LSFT), KC_Z,   KC_X,    KC_C,    KC_V,  KC_B,   KC_N,   KC_M,  KC_COMM, KC_DOT,  KC_SLSH, KC_QUOT,
+  KC_LCTL,       KC_GRV, KC_LGUI, KC_LALT, LOWER, KC_SPC, KC_SPC, RAISE, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+),
+
+/* Lower
+ * ,-----------------------------------------------------------------------------------.
+ * |   ~  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * | Esc  |   !  |   @  |   #  |   $  |   %  |   ^  |   &  |   *  |   (  |   )  | Del  |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * |      |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |   _  |   +  |   {  |   }  |Enter |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * |      |  F7  |  F8  |  F9  |  F10 |  F11 |  F12 |      |      | Mute |      |  |   |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |Lower |    Bksp     |Raise | Next | Vol- | Vol+ | Play |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_LOWER] = LAYOUT_ortho_5x12(
+  KC_TILD, KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
+  KC_ESC,  KC_EXLM,  KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL,
+  _______, KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, _______,
+  _______, KC_F7,    KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, KC_MUTE, _______, KC_PIPE,
+  _______, _______,  _______, _______, _______, KC_BSPC, KC_BSPC, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+),
+
+/* Raise
+ * ,-----------------------------------------------------------------------------------.
+ * |   `  |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Esc  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Del  |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * |      |   4  |   5  |   6  |   +  |  F5  |  F6  |   -  |   =  |   [  |   ]  |Enter |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * |Enter |   7  |   8  |   9  |   -  |  F11 |  F12 |ISO # |ISO / | Mute |      |   \  |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |   ,  |   0  |  .   |Lower |    Bksp     |Raise | Next | Vol- | Vol+ | Play |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_RAISE] = LAYOUT_ortho_5x12(
+  KC_GRV,  KC_F1,   KC_F2, KC_F3,  KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
+  KC_ESC,  KC_1,    KC_2,  KC_3,   KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,
+  _______, KC_4,    KC_5,  KC_6,   KC_PLUS, KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, _______,
+  KC_ENT,  KC_7,    KC_8,  KC_9,   KC_MINS, KC_F11,  KC_F12,  KC_NUHS, KC_NUBS, KC_MUTE, _______, KC_BSLS,
+  _______, KC_COMM, KC_0,  KC_DOT, _______, KC_BSPC, KC_BSPC, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+),
+
+/* Adjust (Lower + Raise)
+ * ,-----------------------------------------------------------------------------------.
+ * |  ESC |  F1  |  F2  |  F3  |ALTF4 |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 |  F11 |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |Taskmg|      |      |      |      |      |      |      |      |      |      |caltde|
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * |      |      |      |Aud on|Audoff|AGnorm|AGswap|Qwerty|      |      |      |      |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * |      |Voice-|Voice+|Mus on|Musoff|MIDIon|MIDIof|      |      |      |      |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |      |      |      |      |      |      |RESET |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_ADJUST] = LAYOUT_ortho_5x12(
+  KC_ESC,  KC_F1,   KC_F2,   KC_F3,   LALT(KC_F4), KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,
+  TSKMGR,  _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, CALTDEL,
+  _______, _______, _______, AU_ON,   AU_OFF,      AG_NORM, AG_SWAP, QWERTY,  _______, _______, _______, _______,
+  _______,  MUV_DE, MUV_IN,  MU_ON,   MU_OFF,      MI_ON,   MI_OFF,  _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______,     _______, _______, _______, _______, _______, _______, RESET
+)
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  switch (keycode) {
+        case LOWER:
+          if (record->event.pressed) {
+            layer_on(_LOWER);
+            update_tri_layer(_LOWER, _RAISE, _ADJUST);
+          } else {
+            layer_off(_LOWER);
+            update_tri_layer(_LOWER, _RAISE, _ADJUST);
+          }
+          return false;
+        case RAISE:
+          if (record->event.pressed) {
+            layer_on(_RAISE);
+            update_tri_layer(_LOWER, _RAISE, _ADJUST);
+          } else {
+            layer_off(_RAISE);
+            update_tri_layer(_LOWER, _RAISE, _ADJUST);
+          }
+          return false;
+      }
+    return true;
+};
diff --git a/qmk/keyboards/jnao/keymaps/via/rules.mk b/qmk/keyboards/jnao/keymaps/via/rules.mk
new file mode 100644
index 00000000..1e5b9980
--- /dev/null
+++ b/qmk/keyboards/jnao/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/qmk/keyboards/jnao/rules.mk b/qmk/keyboards/jnao/rules.mk
index 0dcd2114..ac8bb366 100644
--- a/qmk/keyboards/jnao/rules.mk
+++ b/qmk/keyboards/jnao/rules.mk
@@ -30,7 +30,6 @@ 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
 
 LAYOUTS = ortho_5x12 ortho_4x12
 LAYOUTS_HAS_RGB = no
diff --git a/qmk/keyboards/just60/rules.mk b/qmk/keyboards/just60/rules.mk
index 3aaf1015..7e96c8d7 100644
--- a/qmk/keyboards/just60/rules.mk
+++ b/qmk/keyboards/just60/rules.mk
@@ -32,4 +32,3 @@ MIDI_ENABLE = no            # MIDI support
 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
diff --git a/qmk/keyboards/k_type/keymaps/rgb/rules.mk b/qmk/keyboards/k_type/keymaps/rgb/rules.mk
index a4206a1a..aad92997 100644
--- a/qmk/keyboards/k_type/keymaps/rgb/rules.mk
+++ b/qmk/keyboards/k_type/keymaps/rgb/rules.mk
@@ -1 +1 @@
-RGB_MATRIX_ENABLE = IS31FL3733
+RGB_MATRIX_ENABLE = yes
diff --git a/qmk/keyboards/k_type/rules.mk b/qmk/keyboards/k_type/rules.mk
index 5d2991c8..18b6e3c8 100644
--- a/qmk/keyboards/k_type/rules.mk
+++ b/qmk/keyboards/k_type/rules.mk
@@ -26,6 +26,8 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 BLUETOOTH_ENABLE = no       # Enable Bluetooth
 AUDIO_ENABLE = no           # Audio output
+RGB_MATRIX_ENABLE = no
+RGB_MATRIX_DRIVER = IS31FL3733
 
 LAYOUTS = tkl_ansi
 
diff --git a/qmk/keyboards/kagamidget/config.h b/qmk/keyboards/kagamidget/config.h
index c8873021..32e045fa 100644
--- a/qmk/keyboards/kagamidget/config.h
+++ b/qmk/keyboards/kagamidget/config.h
@@ -184,34 +184,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/kagamidget/rules.mk b/qmk/keyboards/kagamidget/rules.mk
index a803d1f7..0037b3d1 100644
--- a/qmk/keyboards/kagamidget/rules.mk
+++ b/qmk/keyboards/kagamidget/rules.mk
@@ -30,6 +30,5 @@ 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
 
 RGBLIGHT_ENABLE = yes
diff --git a/qmk/keyboards/kb_elmo/aek2_usb/config.h b/qmk/keyboards/kb_elmo/aek2_usb/config.h
index f7b347f1..e0fc83f1 100644
--- a/qmk/keyboards/kb_elmo/aek2_usb/config.h
+++ b/qmk/keyboards/kb_elmo/aek2_usb/config.h
@@ -47,3 +47,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LOCKING_SUPPORT_ENABLE
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
+
+/* reduce VIA layer count because of EEPROM size */
+#define DYNAMIC_KEYMAP_LAYER_COUNT 2
diff --git a/qmk/keyboards/kb_elmo/aek2_usb/keymaps/via/keymap.c b/qmk/keyboards/kb_elmo/aek2_usb/keymaps/via/keymap.c
new file mode 100644
index 00000000..c5ff48e2
--- /dev/null
+++ b/qmk/keyboards/kb_elmo/aek2_usb/keymaps/via/keymap.c
@@ -0,0 +1,36 @@
+/* Copyright 2020 kb-elmo<mail@elmo.space>
+ *
+ * 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] = {
+    /* Base */
+    [0] = LAYOUT(
+        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_MPLY,
+        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_NLCK, KC_PEQL, KC_PSLS, KC_PAST,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,    KC_DEL,  KC_END,  KC_PGDN,    KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
+        KC_LCAP, 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_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      KC_RALT, MO(1),   KC_RCTL,    KC_LEFT, KC_DOWN, KC_RGHT,    KC_P0,            KC_PDOT, KC_PENT
+    ),
+    [1] = LAYOUT(
+        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, 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_VOLD, KC_VOLU, KC_MUTE, KC_MPRV, KC_MNXT, KC_MPLY,                   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
+    )
+};
diff --git a/qmk/keyboards/kb_elmo/aek2_usb/keymaps/via/rules.mk b/qmk/keyboards/kb_elmo/aek2_usb/keymaps/via/rules.mk
new file mode 100644
index 00000000..1e5b9980
--- /dev/null
+++ b/qmk/keyboards/kb_elmo/aek2_usb/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/qmk/keyboards/kb_elmo/sesame/info.json b/qmk/keyboards/kb_elmo/sesame/info.json
index b371b3d5..b738a376 100644
--- a/qmk/keyboards/kb_elmo/sesame/info.json
+++ b/qmk/keyboards/kb_elmo/sesame/info.json
@@ -5,7 +5,7 @@
   "width": 17.75,
   "height": 5,
   "layouts": {
-    "LAYOUT": {
+    "LAYOUT_alice": {
       "layout": [
         {"x":0, "y":0},
         {"x":1.25, "y":0},
@@ -73,6 +73,213 @@
         {"x":12.25, "y":4, "w":1.5},
         {"x":16.75, "y":4, "w":1.5}
       ]
+    },
+    "LAYOUT_alice_split_bs": {
+      "layout": [
+        {"x":0, "y":0},
+        {"x":1.25, "y":0},
+        {"x":2.25, "y":0},
+        {"x":3.25, "y":0},
+        {"x":4.25, "y":0},
+        {"x":5.25, "y":0},
+        {"x":6.25, "y":0},
+        {"x":7.25, "y":0},
+        {"x":10.25, "y":0},
+        {"x":11.25, "y":0},
+        {"x":12.25, "y":0},
+        {"x":13.25, "y":0},
+        {"x":14.25, "y":0},
+        {"x":15.25, "y":0},
+        {"x":16.25, "y":0},
+        {"x":17.25, "y":0},
+        {"x":0, "y":1},
+        {"x":1.25, "y":1, "w":1.5},
+        {"x":2.75, "y":1},
+        {"x":3.75, "y":1},
+        {"x":4.75, "y":1},
+        {"x":5.75, "y":1},
+        {"x":6.75, "y":1},
+        {"x":9.75, "y":1},
+        {"x":10.75, "y":1},
+        {"x":11.75, "y":1},
+        {"x":12.75, "y":1},
+        {"x":13.75, "y":1},
+        {"x":14.75, "y":1},
+        {"x":15.75, "y":1},
+        {"x":16.75, "y":1, "w":1.5},
+        {"x":0, "y":2},
+        {"x":1.25, "y":2, "w":1.75},
+        {"x":3, "y":2},
+        {"x":4, "y":2},
+        {"x":5, "y":2},
+        {"x":6, "y":2},
+        {"x":7, "y":2},
+        {"x":10, "y":2},
+        {"x":11, "y":2},
+        {"x":12, "y":2},
+        {"x":13, "y":2},
+        {"x":14, "y":2},
+        {"x":15, "y":2},
+        {"x":16, "y":2, "w":2.25},
+        {"x":1.25, "y":3, "w":2.25},
+        {"x":3.5, "y":3},
+        {"x":4.5, "y":3},
+        {"x":5.5, "y":3},
+        {"x":6.5, "y":3},
+        {"x":7.5, "y":3},
+        {"x":9.5, "y":3},
+        {"x":10.5, "y":3},
+        {"x":11.5, "y":3},
+        {"x":12.5, "y":3},
+        {"x":13.5, "y":3},
+        {"x":14.5, "y":3},
+        {"x":15.5, "y":3, "w":1.75},
+        {"x":17.25, "y":3},
+        {"x":1.25, "y":4, "w":1.5},
+        {"x":4.25, "y":4, "w":1.5},
+        {"x":5.75, "y":4, "w":2},
+        {"x":7.75, "y":4, "w":1.25},
+        {"x":9.5, "y":4, "w":2.75},
+        {"x":12.25, "y":4, "w":1.5},
+        {"x":16.75, "y":4, "w":1.5}
+      ]
+    },
+    "LAYOUT_long_rshift": {
+      "layout": [
+        {"x":0, "y":0},
+        {"x":1.25, "y":0},
+        {"x":2.25, "y":0},
+        {"x":3.25, "y":0},
+        {"x":4.25, "y":0},
+        {"x":5.25, "y":0},
+        {"x":6.25, "y":0},
+        {"x":7.25, "y":0},
+        {"x":10.25, "y":0},
+        {"x":11.25, "y":0},
+        {"x":12.25, "y":0},
+        {"x":13.25, "y":0},
+        {"x":14.25, "y":0},
+        {"x":15.25, "y":0},
+        {"x":16.25, "y":0, "w":2},
+        {"x":0, "y":1},
+        {"x":1.25, "y":1, "w":1.5},
+        {"x":2.75, "y":1},
+        {"x":3.75, "y":1},
+        {"x":4.75, "y":1},
+        {"x":5.75, "y":1},
+        {"x":6.75, "y":1},
+        {"x":9.75, "y":1},
+        {"x":10.75, "y":1},
+        {"x":11.75, "y":1},
+        {"x":12.75, "y":1},
+        {"x":13.75, "y":1},
+        {"x":14.75, "y":1},
+        {"x":15.75, "y":1},
+        {"x":16.75, "y":1, "w":1.5},
+        {"x":0, "y":2},
+        {"x":1.25, "y":2, "w":1.75},
+        {"x":3, "y":2},
+        {"x":4, "y":2},
+        {"x":5, "y":2},
+        {"x":6, "y":2},
+        {"x":7, "y":2},
+        {"x":10, "y":2},
+        {"x":11, "y":2},
+        {"x":12, "y":2},
+        {"x":13, "y":2},
+        {"x":14, "y":2},
+        {"x":15, "y":2},
+        {"x":16, "y":2, "w":2.25},
+        {"x":1.25, "y":3, "w":2.25},
+        {"x":3.5, "y":3},
+        {"x":4.5, "y":3},
+        {"x":5.5, "y":3},
+        {"x":6.5, "y":3},
+        {"x":7.5, "y":3},
+        {"x":9.5, "y":3},
+        {"x":10.5, "y":3},
+        {"x":11.5, "y":3},
+        {"x":12.5, "y":3},
+        {"x":13.5, "y":3},
+        {"x":14.5, "y":3},
+        {"x":15.5, "y":3, "w":2.75},
+        {"x":1.25, "y":4, "w":1.5},
+        {"x":4.25, "y":4, "w":1.5},
+        {"x":5.75, "y":4, "w":2},
+        {"x":7.75, "y":4, "w":1.25},
+        {"x":9.5, "y":4, "w":2.75},
+        {"x":12.25, "y":4, "w":1.5},
+        {"x":16.75, "y":4, "w":1.5}
+      ]
+    },
+    "LAYOUT_split_bs": {
+      "layout": [
+        {"x":0, "y":0},
+        {"x":1.25, "y":0},
+        {"x":2.25, "y":0},
+        {"x":3.25, "y":0},
+        {"x":4.25, "y":0},
+        {"x":5.25, "y":0},
+        {"x":6.25, "y":0},
+        {"x":7.25, "y":0},
+        {"x":10.25, "y":0},
+        {"x":11.25, "y":0},
+        {"x":12.25, "y":0},
+        {"x":13.25, "y":0},
+        {"x":14.25, "y":0},
+        {"x":15.25, "y":0},
+        {"x":16.25, "y":0},
+        {"x":17.25, "y":0},
+        {"x":0, "y":1},
+        {"x":1.25, "y":1, "w":1.5},
+        {"x":2.75, "y":1},
+        {"x":3.75, "y":1},
+        {"x":4.75, "y":1},
+        {"x":5.75, "y":1},
+        {"x":6.75, "y":1},
+        {"x":9.75, "y":1},
+        {"x":10.75, "y":1},
+        {"x":11.75, "y":1},
+        {"x":12.75, "y":1},
+        {"x":13.75, "y":1},
+        {"x":14.75, "y":1},
+        {"x":15.75, "y":1},
+        {"x":16.75, "y":1, "w":1.5},
+        {"x":0, "y":2},
+        {"x":1.25, "y":2, "w":1.75},
+        {"x":3, "y":2},
+        {"x":4, "y":2},
+        {"x":5, "y":2},
+        {"x":6, "y":2},
+        {"x":7, "y":2},
+        {"x":10, "y":2},
+        {"x":11, "y":2},
+        {"x":12, "y":2},
+        {"x":13, "y":2},
+        {"x":14, "y":2},
+        {"x":15, "y":2},
+        {"x":16, "y":2, "w":2.25},
+        {"x":1.25, "y":3, "w":2.25},
+        {"x":3.5, "y":3},
+        {"x":4.5, "y":3},
+        {"x":5.5, "y":3},
+        {"x":6.5, "y":3},
+        {"x":7.5, "y":3},
+        {"x":9.5, "y":3},
+        {"x":10.5, "y":3},
+        {"x":11.5, "y":3},
+        {"x":12.5, "y":3},
+        {"x":13.5, "y":3},
+        {"x":14.5, "y":3},
+        {"x":15.5, "y":3, "w":2.75},
+        {"x":1.25, "y":4, "w":1.5},
+        {"x":4.25, "y":4, "w":1.5},
+        {"x":5.75, "y":4, "w":2},
+        {"x":7.75, "y":4, "w":1.25},
+        {"x":9.5, "y":4, "w":2.75},
+        {"x":12.25, "y":4, "w":1.5},
+        {"x":16.75, "y":4, "w":1.5}
+      ]
     }
   }
 }
diff --git a/qmk/keyboards/kb_elmo/sesame/keymaps/default/keymap.c b/qmk/keyboards/kb_elmo/sesame/keymaps/default/keymap.c
index e1c74203..0236edb9 100644
--- a/qmk/keyboards/kb_elmo/sesame/keymaps/default/keymap.c
+++ b/qmk/keyboards/kb_elmo/sesame/keymaps/default/keymap.c
@@ -17,14 +17,14 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     /* Base */
-    [0] = LAYOUT(
+    [0] = LAYOUT_alice(
         KC_PAUS, KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
         KC_PSCR, 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_F5,   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_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
                  KC_LCTL,          KC_LALT,          KC_SPC,           KC_LGUI,  KC_SPC,           KC_RALT,                   KC_RCTL
     ),
-    [1] = LAYOUT(
+    [1] = LAYOUT_alice(
         KC_TRNS, KC_GRV,  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_DEL,
         KC_TRNS, KC_TRNS, KC_HOME, KC_UP,   KC_END,  KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
         KC_TRNS, KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
diff --git a/qmk/keyboards/kb_elmo/sesame/keymaps/via/keymap.c b/qmk/keyboards/kb_elmo/sesame/keymaps/via/keymap.c
new file mode 100644
index 00000000..e0dcde86
--- /dev/null
+++ b/qmk/keyboards/kb_elmo/sesame/keymaps/via/keymap.c
@@ -0,0 +1,48 @@
+/* Copyright 2020 kb-elmo<mail@elmo.space>
+ *
+ * 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] = {
+    /* Base */
+    [0] = LAYOUT_all(
+        KC_PAUS, KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,  KC_BSPC,
+        KC_PSCR, 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_F5,   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_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
+                 KC_LCTL,          KC_LALT,          KC_SPC,           KC_LGUI,  KC_SPC,           KC_RALT,                   KC_RCTL
+    ),
+    [1] = LAYOUT_all(
+        KC_TRNS, KC_GRV,  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_DEL,  KC_DEL,
+        KC_TRNS, KC_TRNS, KC_HOME, KC_UP,   KC_END,  KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, 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_VOLD, KC_VOLU, KC_MUTE, KC_MPRV, KC_MNXT, KC_MPLY, KC_TRNS, KC_TRNS,
+                 KC_TRNS,          KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS,                   KC_TRNS
+    ),
+    [2] = LAYOUT_all(
+        KC_TRNS, KC_GRV,  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_DEL,  KC_DEL,
+        KC_TRNS, KC_TRNS, KC_HOME, KC_UP,   KC_END,  KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, 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_VOLD, KC_VOLU, KC_MUTE, KC_MPRV, KC_MNXT, KC_MPLY, KC_TRNS, KC_TRNS,
+                 KC_TRNS,          KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS,                   KC_TRNS
+    ),
+    [3] = LAYOUT_all(
+        KC_TRNS, KC_GRV,  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_DEL,  KC_DEL,
+        KC_TRNS, KC_TRNS, KC_HOME, KC_UP,   KC_END,  KC_PGUP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, 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_VOLD, KC_VOLU, KC_MUTE, KC_MPRV, KC_MNXT, KC_MPLY, KC_TRNS, KC_TRNS,
+                 KC_TRNS,          KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS,                   KC_TRNS
+    )
+};
diff --git a/qmk/keyboards/kb_elmo/sesame/keymaps/via/rules.mk b/qmk/keyboards/kb_elmo/sesame/keymaps/via/rules.mk
new file mode 100644
index 00000000..1e5b9980
--- /dev/null
+++ b/qmk/keyboards/kb_elmo/sesame/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/qmk/keyboards/kb_elmo/sesame/rules.mk b/qmk/keyboards/kb_elmo/sesame/rules.mk
index e5b427e5..0198f303 100644
--- a/qmk/keyboards/kb_elmo/sesame/rules.mk
+++ b/qmk/keyboards/kb_elmo/sesame/rules.mk
@@ -23,3 +23,5 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 BLUETOOTH_ENABLE = no       # Enable Bluetooth
 AUDIO_ENABLE = no           # Audio output
+
+LAYOUTS = alice alice_split_bs
diff --git a/qmk/keyboards/kb_elmo/sesame/sesame.h b/qmk/keyboards/kb_elmo/sesame/sesame.h
index 512bce6e..d596619c 100644
--- a/qmk/keyboards/kb_elmo/sesame/sesame.h
+++ b/qmk/keyboards/kb_elmo/sesame/sesame.h
@@ -26,7 +26,7 @@
  * The second converts the arguments into a two-dimensional array which
  * represents the switch matrix.
  */
-#define LAYOUT( \
+#define LAYOUT_alice( \
     k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14, \
     k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \
     k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42,      k44, \
@@ -39,3 +39,48 @@
     { KC_NO, k45,   k46,   k47,   k48,   k49,   k50,   k51,   k52,   k53,   k54,   k55,   k56,   k57,   k58   }, \
     { KC_NO, k59,   KC_NO, k60,   KC_NO, k61,   k62,  KC_NO,  k63,   KC_NO, k64,   KC_NO, KC_NO, k65,   KC_NO }  \
 }
+
+#define LAYOUT_alice_split_bs( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k43, k14, \
+    k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42,      k44, \
+         k45, k46, k47, k48, k49, k50, k51, k52, k53, k54, k55, k56, k57, k58, \
+         k59,      k60,      k61, k62,      k63,      k64,           k65       \
+) { \
+    { k00,   k01,   k02,   k03,   k04,   k05,   k06,   k07,   k08,   k09,   k10,   k11,   k12,   k13,   k14   }, \
+    { k15,   k16,   k17,   k18,   k19,   k20,   k21,   k22,   k23,   k24,   k25,   k26,   k27,   k28,   k29   }, \
+    { k30,   k31,   k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k40,   k41,   k42,   k43,   k44   }, \
+    { KC_NO, k45,   k46,   k47,   k48,   k49,   k50,   k51,   k52,   k53,   k54,   k55,   k56,   k57,   k58   }, \
+    { KC_NO, k59,   KC_NO, k60,   KC_NO, k61,   k62,  KC_NO,  k63,   KC_NO, k64,   KC_NO, KC_NO, k65,   KC_NO }  \
+}
+
+#define LAYOUT_long_rshift( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k14, \
+    k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42,      k44, \
+         k45, k46, k47, k48, k49, k50, k51, k52, k53, k54, k55, k56, k57,      \
+         k59,      k60,      k61, k62,      k63,      k64,           k65       \
+) { \
+    { k00,   k01,   k02,   k03,   k04,   k05,   k06,   k07,   k08,   k09,   k10,   k11,   k12,   k13,   k14   }, \
+    { k15,   k16,   k17,   k18,   k19,   k20,   k21,   k22,   k23,   k24,   k25,   k26,   k27,   k28,   k29   }, \
+    { k30,   k31,   k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k40,   k41,   k42,   KC_NO, k44   }, \
+    { KC_NO, k45,   k46,   k47,   k48,   k49,   k50,   k51,   k52,   k53,   k54,   k55,   k56,   k57,   KC_NO }, \
+    { KC_NO, k59,   KC_NO, k60,   KC_NO, k61,   k62,  KC_NO,  k63,   KC_NO, k64,   KC_NO, KC_NO, k65,   KC_NO }  \
+}
+
+#define LAYOUT_split_bs( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, k13, k43, k14, \
+    k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k40, k41, k42,      k44, \
+         k45, k46, k47, k48, k49, k50, k51, k52, k53, k54, k55, k56, k57,      \
+         k59,      k60,      k61, k62,      k63,      k64,           k65       \
+) { \
+    { k00,   k01,   k02,   k03,   k04,   k05,   k06,   k07,   k08,   k09,   k10,   k11,   k12,   k13,   k14   }, \
+    { k15,   k16,   k17,   k18,   k19,   k20,   k21,   k22,   k23,   k24,   k25,   k26,   k27,   k28,   k29   }, \
+    { k30,   k31,   k32,   k33,   k34,   k35,   k36,   k37,   k38,   k39,   k40,   k41,   k42,   k43,   k44   }, \
+    { KC_NO, k45,   k46,   k47,   k48,   k49,   k50,   k51,   k52,   k53,   k54,   k55,   k56,   k57,   KC_NO }, \
+    { KC_NO, k59,   KC_NO, k60,   KC_NO, k61,   k62,  KC_NO,  k63,   KC_NO, k64,   KC_NO, KC_NO, k65,   KC_NO }  \
+}
+
+#define LAYOUT LAYOUT_alice
+#define LAYOUT_all LAYOUT_alice_split_bs
diff --git a/qmk/keyboards/kbdclack/kaishi65/config.h b/qmk/keyboards/kbdclack/kaishi65/config.h
index 3ea67aae..ff8eb57e 100644
--- a/qmk/keyboards/kbdclack/kaishi65/config.h
+++ b/qmk/keyboards/kbdclack/kaishi65/config.h
@@ -218,34 +218,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/kbdfans/kbd19x/config.h b/qmk/keyboards/kbdfans/kbd19x/config.h
index 1146afa6..edaf5121 100644
--- a/qmk/keyboards/kbdfans/kbd19x/config.h
+++ b/qmk/keyboards/kbdfans/kbd19x/config.h
@@ -47,6 +47,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
+
+#define LED_NUM_LOCK_PIN B2
+#define LED_CAPS_LOCK_PIN B0
+#define LED_SCROLL_LOCK_PIN B1
+
 #define BACKLIGHT_PIN B6
 #ifdef BACKLIGHT_PIN
 #define BACKLIGHT_LEVELS 3
@@ -189,30 +194,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
diff --git a/qmk/keyboards/kbdfans/kbd19x/kbd19x.c b/qmk/keyboards/kbdfans/kbd19x/kbd19x.c
index e6cd77d6..bdaf1a50 100644
--- a/qmk/keyboards/kbdfans/kbd19x/kbd19x.c
+++ b/qmk/keyboards/kbdfans/kbd19x/kbd19x.c
@@ -16,57 +16,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include "kbd19x.h"
-
-extern inline void kbd19x_caps_led_on(void);
-extern inline void kbd19x_caps_led_off(void);
-
-extern inline void kbd19x_sclk_led_on(void);
-extern inline void kbd19x_sclk_led_off(void);
-
-extern inline void kbd19x_nmlk_led_on(void);
-extern inline void kbd19x_nmlk_led_off(void);
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
-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 (usb_led & (1<<USB_LED_NUM_LOCK)) {
-    kbd19x_nmlk_led_on();
-  } else {
-    kbd19x_nmlk_led_off();
-  }
-
-  if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
-    kbd19x_caps_led_on();
-  } else {
-    kbd19x_caps_led_off();
-  }
-
-  if (usb_led & (1<<USB_LED_SCROLL_LOCK)) {
-    kbd19x_sclk_led_on();
-  } else {
-    kbd19x_sclk_led_off();
-  }
-
-  led_set_user(usb_led);
-}
diff --git a/qmk/keyboards/kbdfans/kbd19x/kbd19x.h b/qmk/keyboards/kbdfans/kbd19x/kbd19x.h
index 28ad8315..41c27230 100644
--- a/qmk/keyboards/kbdfans/kbd19x/kbd19x.h
+++ b/qmk/keyboards/kbdfans/kbd19x/kbd19x.h
@@ -20,14 +20,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "quantum.h"
 #include "led.h"
 
-inline void kbd19x_caps_led_on(void)    { DDRB |=  (1<<0); PORTB &= ~(1<<0); }
-inline void kbd19x_caps_led_off(void)   { DDRB &= ~(1<<0); PORTB &= ~(1<<0); }
+inline void kbd19x_caps_led_on(void)    { writePinHigh(LED_CAPS_LOCK_PIN); }
+inline void kbd19x_caps_led_off(void)   { writePinLow(LED_CAPS_LOCK_PIN); }
 
-inline void kbd19x_sclk_led_on(void)    { DDRB |=  (1<<1); PORTB &= ~(1<<1); }
-inline void kbd19x_sclk_led_off(void)   { DDRB &= ~(1<<1); PORTB &= ~(1<<1); }
+inline void kbd19x_sclk_led_on(void)    { writePinHigh(LED_SCROLL_LOCK_PIN); }
+inline void kbd19x_sclk_led_off(void)   { writePinLow(LED_SCROLL_LOCK_PIN); }
 
-inline void kbd19x_nmlk_led_on(void)    { DDRB |=  (1<<2); PORTB &= ~(1<<2); }
-inline void kbd19x_nmlk_led_off(void)   { DDRB &= ~(1<<2); PORTB &= ~(1<<2); }
+inline void kbd19x_nmlk_led_on(void)    { writePinHigh(LED_NUM_LOCK_PIN); }
+inline void kbd19x_nmlk_led_off(void)   { writePinLow(LED_NUM_LOCK_PIN); }
 
 // readability
 #define XXX KC_NO
diff --git a/qmk/keyboards/kbdfans/kbd19x/rules.mk b/qmk/keyboards/kbdfans/kbd19x/rules.mk
index 1c76790f..39c3a621 100644
--- a/qmk/keyboards/kbdfans/kbd19x/rules.mk
+++ b/qmk/keyboards/kbdfans/kbd19x/rules.mk
@@ -30,4 +30,3 @@ 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
diff --git a/qmk/keyboards/kbdfans/kbd4x/config.h b/qmk/keyboards/kbdfans/kbd4x/config.h
index 6928ea8f..e7f570c6 100644
--- a/qmk/keyboards/kbdfans/kbd4x/config.h
+++ b/qmk/keyboards/kbdfans/kbd4x/config.h
@@ -190,30 +190,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
diff --git a/qmk/keyboards/kbdfans/kbd4x/rules.mk b/qmk/keyboards/kbdfans/kbd4x/rules.mk
index 7c7b490f..1e209692 100644
--- a/qmk/keyboards/kbdfans/kbd4x/rules.mk
+++ b/qmk/keyboards/kbdfans/kbd4x/rules.mk
@@ -30,6 +30,5 @@ 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
 
 LAYOUTS = ortho_4x12 planck_mit
diff --git a/qmk/keyboards/kbdfans/kbd67/hotswap/config.h b/qmk/keyboards/kbdfans/kbd67/hotswap/config.h
index 589d76da..55522313 100644
--- a/qmk/keyboards/kbdfans/kbd67/hotswap/config.h
+++ b/qmk/keyboards/kbdfans/kbd67/hotswap/config.h
@@ -209,34 +209,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c b/qmk/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c
new file mode 100644
index 00000000..a73c961d
--- /dev/null
+++ b/qmk/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/keymap.c
@@ -0,0 +1,102 @@
+/* Copyright 2019 Brandon Schlack
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+#include "brandonschlack.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/* Base Layer
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │Esc│! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│_ -│+ =│| \│~ `│Hom│
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
+ * │Tab  │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │{ [│} ]│ Bspc│PgU│
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+ * │Caps  │ A │ S │ D │ F │ G │ H │ J │ K │ L │: ;│" '│   Enter│PgD│
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+ * │Shift   │ Z │ X │ C │ V │ B │ N │ M │< ,│> .│? /│ Shift│ Up│End│
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+ * │Ctrl│ Opt│ Cmd│          Space         │Cmd │FnPy│ │Lef│Dow│Rig│
+ * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘
+ */
+[_BASE] = LAYOUT(
+  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,  KC_HOME, \
+  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,          KC_PGUP, \
+  HY_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_PGDN, \
+  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_END,  \
+  KC_LCTL, KC_LOPT, KC_LCMD,                   KC_SPC,                             KC_RCMD, PLY_FN1,                   KC_LEFT, KC_DOWN, KC_RGHT),
+
+/* Function Layer
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │MKE│ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│LHP│MSN│SLP│
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
+ * │     │   │   │   │RST│   │   │   │   │   │F13│F14│F15│  Del│VlU│
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+ * │      │   │   │   │   │   │   │   │KMP│   │   │   │ Adjust │VlD│
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+ * │        │   │   │   │VRN│   │   │   │Prv│Nxt│Ply│      │PgU│Mut│
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+ * │    │    │    │                        │    │    │ │Hom│PgD│End│
+ * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘
+ */
+[_FN1] = LAYOUT(
+  QM_MAKE, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  MC_LHPD, MC_MSSN, MC_SLPD, \
+  _______, _______, _______, _______, RESET,   _______, _______, _______, _______, _______, KC_F13,  KC_F14,  KC_F15,  KC_DEL,           KC_VOLU, \
+  _______, _______, _______, _______, _______, _______, _______, _______, QM_KYMP, _______, _______, _______,          TG_ADJT,          KC_VOLD, \
+  _______, _______, _______, _______, QM_VRSN, _______, _______, _______, KC_MPRV, KC_MNXT, KC_MPLY, _______,                   KC_PGUP, KC_MUTE, \
+  _______, _______, _______,                   _______,                            _______, _______,                   KC_HOME, KC_PGDN, KC_END ),
+
+/* Adjust Layer Layer
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
+ * │     │   │   │EEP│RST│   │   │   │   │   │   │   │   │     │   │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+ * │      │   │   │   │   │   │   │   │   │   │   │   │ Adjust │   │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+ * │        │   │   │   │   │   │   │   │   │   │   │      │   │   │
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+ * │    │    │    │                        │    │    │ │   │   │   │
+ * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘
+ */
+[_ADJUST] = LAYOUT(
+  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
+  XXXXXXX, XXXXXXX, XXXXXXX, EEP_RST, RESET,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, \
+  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          TG_ADJT,          XXXXXXX, \
+  _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,                   XXXXXXX, XXXXXXX, \
+  _______, _______, _______,                   XXXXXXX,                            _______, _______,                   XXXXXXX, XXXXXXX, XXXXXXX),
+};
+
+/* Blank Template
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
+ * │     │   │   │   │   │   │   │   │   │   │   │   │   │     │   │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+ * │      │   │   │   │   │   │   │   │   │   │   │   │        │   │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+ * │        │   │   │   │   │   │   │   │   │   │   │      │   │   │
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+ * │    │    │    │                        │    │    │ │   │   │   │
+ * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘
+ */
+/*
+[_BLANK] = LAYOUT(
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, \
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______, \
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______, \
+  _______, _______, _______,                   _______,                            _______, _______,                   _______, _______, _______),
+};
+*/
diff --git a/qmk/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/rules.mk b/qmk/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/rules.mk
new file mode 100644
index 00000000..f2424644
--- /dev/null
+++ b/qmk/keyboards/kbdfans/kbd67/hotswap/keymaps/brandonschlack/rules.mk
@@ -0,0 +1,2 @@
+# Build Options
+BOOTMAGIC_ENABLE = full     # Use full Bootmagic
diff --git a/qmk/keyboards/kbdfans/kbd67/hotswap/rules.mk b/qmk/keyboards/kbdfans/kbd67/hotswap/rules.mk
index 7739b69c..921458df 100644
--- a/qmk/keyboards/kbdfans/kbd67/hotswap/rules.mk
+++ b/qmk/keyboards/kbdfans/kbd67/hotswap/rules.mk
@@ -30,6 +30,5 @@ 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
 
 LAYOUTS = 65_ansi_blocker_split_bs
diff --git a/qmk/keyboards/kbdfans/kbd67/mkii_soldered/rules.mk b/qmk/keyboards/kbdfans/kbd67/mkii_soldered/rules.mk
index 9fa82184..7f3e239a 100644
--- a/qmk/keyboards/kbdfans/kbd67/mkii_soldered/rules.mk
+++ b/qmk/keyboards/kbdfans/kbd67/mkii_soldered/rules.mk
@@ -30,6 +30,5 @@ 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
 
-LAYOUTS = 65_ansi_blocker 65_ansi_blocker_split_bs 65_iso_blocker 65_iso_blocker_split_bs
\ No newline at end of file
+LAYOUTS = 65_ansi_blocker 65_ansi_blocker_split_bs 65_iso_blocker 65_iso_blocker_split_bs
diff --git a/qmk/keyboards/kbdfans/kbd67/mkiirgb/v1/rules.mk b/qmk/keyboards/kbdfans/kbd67/mkiirgb/v1/rules.mk
index ea374606..4e9bcf21 100644
--- a/qmk/keyboards/kbdfans/kbd67/mkiirgb/v1/rules.mk
+++ b/qmk/keyboards/kbdfans/kbd67/mkiirgb/v1/rules.mk
@@ -9,6 +9,7 @@ CONSOLE_ENABLE = no                # Console for debug
 COMMAND_ENABLE = no                # Commands for debug and configuration
 NKRO_ENABLE = yes                 # USB Nkey Rollover
 AUDIO_ENABLE = no
-RGB_MATRIX_ENABLE = yes     # Use RGB matrix
+RGB_MATRIX_ENABLE = yes            # Use RGB matrix
+RGB_MATRIX_DRIVER = IS31FL3731
 
 LAYOUTS = 65_ansi_blocker
diff --git a/qmk/keyboards/kbdfans/kbd67/mkiirgb/v2/rules.mk b/qmk/keyboards/kbdfans/kbd67/mkiirgb/v2/rules.mk
index 65ee5ae3..02fadb46 100644
--- a/qmk/keyboards/kbdfans/kbd67/mkiirgb/v2/rules.mk
+++ b/qmk/keyboards/kbdfans/kbd67/mkiirgb/v2/rules.mk
@@ -30,6 +30,7 @@ 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
 RGB_MATRIX_ENABLE = yes     # Use RGB matrix
+RGB_MATRIX_DRIVER = IS31FL3731
 NO_USB_STARTUP_CHECK = no          # Disable initialization only when usb is plugged in
 
 LAYOUTS = 65_ansi_blocker
diff --git a/qmk/keyboards/kbdfans/kbd67/rev1/config.h b/qmk/keyboards/kbdfans/kbd67/rev1/config.h
index 86ef3b81..b2fffff2 100644
--- a/qmk/keyboards/kbdfans/kbd67/rev1/config.h
+++ b/qmk/keyboards/kbdfans/kbd67/rev1/config.h
@@ -48,6 +48,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
+#define LED_CAPS_LOCK_PIN B2
+
 #define BACKLIGHT_PIN B6
 #ifdef BACKLIGHT_PIN
 #define BACKLIGHT_BREATHING
@@ -204,34 +206,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/kbdfans/kbd67/rev1/rev1.c b/qmk/keyboards/kbdfans/kbd67/rev1/rev1.c
index 94cb9e55..489e8568 100644
--- a/qmk/keyboards/kbdfans/kbd67/rev1/rev1.c
+++ b/qmk/keyboards/kbdfans/kbd67/rev1/rev1.c
@@ -14,38 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "rev1.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 (usb_led & (1 << USB_LED_CAPS_LOCK)) {
-		DDRB |= (1 << 2);
-		PORTB &= ~(1 << 2);
-	} else {
-		DDRB &= ~(1 << 2);
-		PORTB &= ~(1 << 2);
-	}
-
-	led_set_user(usb_led);
-}
diff --git a/qmk/keyboards/kbdfans/kbd67/rev1/rules.mk b/qmk/keyboards/kbdfans/kbd67/rev1/rules.mk
index 8e96199b..5ba40c0e 100644
--- a/qmk/keyboards/kbdfans/kbd67/rev1/rules.mk
+++ b/qmk/keyboards/kbdfans/kbd67/rev1/rules.mk
@@ -30,6 +30,5 @@ 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
 
 LAYOUTS = 65_ansi
diff --git a/qmk/keyboards/kbdfans/kbd67/rev2/keymaps/brandonschlack/keymap.c b/qmk/keyboards/kbdfans/kbd67/rev2/keymaps/brandonschlack/keymap.c
new file mode 100644
index 00000000..235cb2e8
--- /dev/null
+++ b/qmk/keyboards/kbdfans/kbd67/rev2/keymaps/brandonschlack/keymap.c
@@ -0,0 +1,102 @@
+/* Copyright 2019 Brandon Schlack
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+#include "brandonschlack.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/* Base Layer
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │Esc│! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│_ -│+ =│| \│~ `│Hom│
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
+ * │Tab  │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │{ [│} ]│ Bspc│PgU│
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+ * │Caps  │ A │ S │ D │ F │ G │ H │ J │ K │ L │: ;│" '│   Enter│PgD│
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+ * │Shift   │ Z │ X │ C │ V │ B │ N │ M │< ,│> .│? /│ Shift│ Up│End│
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+ * │Ctrl│ Opt│ Cmd│          Space         │Cmd │FnPy│ │Lef│Dow│Rig│
+ * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘
+ */
+[_BASE] = LAYOUT_all(
+  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,  KC_HOME, \
+  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,          KC_PGUP, \
+  HY_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_PGDN, \
+  KC_LSFT, XXXXXXX, 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_END,  \
+  KC_LCTL, KC_LOPT, KC_LCMD,                   XXXXXXX, KC_SPC,  XXXXXXX,                   KC_RCMD, PLY_FN1, XXXXXXX, KC_LEFT, KC_DOWN, KC_RGHT),
+
+/* Function Layer
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │MKE│ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│LHP│MSN│SLP│
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
+ * │RMod │RH+│RS+│RV+│RST│   │   │   │   │   │F13│F14│F15│  Del│VlU│
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+ * │      │RH-│RS-│RV-│   │   │   │   │KMP│   │   │   │ Adjust │VlD│
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+ * │        │RTg│RLy│RTh│VRN│   │   │   │Prv│Nxt│Ply│      │PgU│Mut│
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+ * │    │    │    │                        │    │    │ │Hom│PgD│End│
+ * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘
+ */
+[_FN1] = LAYOUT_all(
+  QM_MAKE, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  MC_LHPD, MC_MSSN, MC_SLPD, \
+  RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RESET,   _______, _______, _______, _______, _______, KC_F13,  KC_F14,  KC_F15,  KC_DEL,           KC_VOLU, \
+  _______, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, QM_KYMP, _______, _______, _______,          TG_ADJT,          KC_VOLD, \
+  _______, XXXXXXX, RGB_TOG, RGB_LYR, RGB_THM, QM_VRSN, _______, _______, _______, KC_MPRV, KC_MNXT, KC_MPLY, _______,          KC_PGUP, KC_MUTE, \
+  _______, _______, _______,                   XXXXXXX, _______, XXXXXXX,                   _______, _______, XXXXXXX, KC_HOME, KC_PGDN, KC_END ),
+
+/* Adjust Layer Layer
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
+ * │     │   │   │EEP│RST│   │   │   │   │   │   │   │   │     │   │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+ * │      │   │   │   │   │   │   │   │   │   │   │   │ Adjust │   │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+ * │        │   │   │   │   │   │   │   │   │   │   │      │   │   │
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+ * │    │    │    │                        │    │    │ │   │   │   │
+ * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘
+ */
+[_ADJUST] = LAYOUT_all(
+  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, \
+  XXXXXXX, XXXXXXX, XXXXXXX, EEP_RST, RESET,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, \
+  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          TG_ADJT,          XXXXXXX, \
+  _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,          XXXXXXX, XXXXXXX, \
+  _______, _______, _______,                   XXXXXXX, XXXXXXX, XXXXXXX,                   _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX),
+};
+
+/* Blank Template
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
+ * │     │   │   │   │   │   │   │   │   │   │   │   │   │     │   │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+ * │      │   │   │   │   │   │   │   │   │   │   │   │        │   │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+ * │        │   │   │   │   │   │   │   │   │   │   │      │   │   │
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+ * │    │    │    │                        │    │    │ │   │   │   │
+ * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘
+ */
+/*
+[_BLANK] = LAYOUT(
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, \
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          _______, \
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______, \
+  _______, _______, _______,                   _______,                            _______, _______,                   _______, _______, _______),
+};
+*/
diff --git a/qmk/keyboards/kbdfans/kbd67/rev2/keymaps/brandonschlack/rules.mk b/qmk/keyboards/kbdfans/kbd67/rev2/keymaps/brandonschlack/rules.mk
new file mode 100644
index 00000000..348eeaee
--- /dev/null
+++ b/qmk/keyboards/kbdfans/kbd67/rev2/keymaps/brandonschlack/rules.mk
@@ -0,0 +1,3 @@
+# Build Options
+MOUSEKEY_ENABLE = no         # Don't need mouse keys
+BACKLIGHT_ENABLE = no        # Backlights not installed
diff --git a/qmk/keyboards/kbdfans/kbd67/rev2/keymaps/iso/keymap.c b/qmk/keyboards/kbdfans/kbd67/rev2/keymaps/iso/keymap.c
new file mode 100644
index 00000000..0b0e9fb5
--- /dev/null
+++ b/qmk/keyboards/kbdfans/kbd67/rev2/keymaps/iso/keymap.c
@@ -0,0 +1,62 @@
+ /* Copyright 2020 Hekeke 
+  * 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] = {
+        
+    /* Base layer
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+     * │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│ ` │
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ Å │ ^ │     │Del│
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ Ent├───┤
+     * │ FN   │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │ # │    │PUp│
+     * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤
+     * │Shft│ \ │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Shift│ ↑ │PDn│
+     * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┼───┴┬──┴─┬─┴──┬───┼───┼───┤
+     * │Ctrl│LAlt│LGUI│        Space        │RAlt│App │RCtl│ ← │ ↓ │ → │
+     * └────┴────┴────┴─────────────────────┴────┴────┴────┴───┴───┴───┘
+     */
+    [0] = LAYOUT_65_iso(
+        KC_GESC, 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_GRV,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_DEL,
+        MO(1),   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_PGUP,
+        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_UP,   KC_PGDN,
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, KC_APP,  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    /* Function layer
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬────┐
+     * │§  │ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│Delete │PrtS│
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼────┤
+     * │Caps │Prv│Pau│Nxt│   │   │   │   │   │   │BL+│BL-│BL │RESET│Ins │
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    ├────┤
+     * │      │V- │V0 │V+ │   │   │   │   │   │   │   │   │   │    │Home│
+     * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼────┤
+     * │    │TOG│MOD│HU+│HU-│SA+│SA-│   │   │   │   │   │LClick│MUp│End │
+     * ├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┼───┴┬──┴─┬─┴──┬───┼───┼────┤
+     * │    │    │    │                     │    │    │    │MLt│MDw│MRgt│
+     * └────┴────┴────┴─────────────────────┴────┴────┴────┴───┴───┴────┘
+     */
+
+    [1] = LAYOUT_65_iso(
+        KC_GRV,  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_DEL,  KC_PSCR,
+        KC_CAPS, KC_MPRV, KC_MPLY, KC_MNXT, _______, _______, _______, _______, _______, _______, BL_INC,  BL_DEC,  BL_TOGG,          KC_INS,
+        _______, KC_VOLD, KC_MUTE, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, KC_HOME,
+        _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, _______, _______, _______, _______, _______, KC_BTN1, KC_MS_U, KC_END,
+        _______, _______, _______,                   _______,                            _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R
+    ),
+};
+
+
diff --git a/qmk/keyboards/kbdfans/kbd67/rev2/keymaps/iso/readme.md b/qmk/keyboards/kbdfans/kbd67/rev2/keymaps/iso/readme.md
new file mode 100644
index 00000000..bc5d7d93
--- /dev/null
+++ b/qmk/keyboards/kbdfans/kbd67/rev2/keymaps/iso/readme.md
@@ -0,0 +1,33 @@
+# Keymap by Hekeke
+
+Almost a default ISO layout, except Caps Lock swapped `MO(1)`.
+
+Made with `LAYOUT_65_iso`
+
+```
+Base layer
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+│Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│ ` │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+│ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ Å │ ^ │     │Del│
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐ Ent├───┤
+│ FN   │ A │ S │ D │ F │ G │ H │ J │ K │ L │ Ö │ Ä │ ' │    │PUp│
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼───┤
+│Shft│ < │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ - │ Shift│ ↑ │PDn│
+├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┼───┴┬──┴─┬─┴──┬───┼───┼───┤
+│Ctrl│LAlt│LGUI│        Space        │RAlt│App │RCtl│ ← │ ↓ │ → │
+└────┴────┴────┴─────────────────────┴────┴────┴────┴───┴───┴───┘
+
+Function layer
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬────┐
+│§  │ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│Delete │PrtS│
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼────┤
+│Caps │Prv│Pau│Nxt│   │   │   │   │   │   │BL+│BL-│BL │RESET│Ins │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┐    ├────┤
+│      │V- │V0 │V+ │   │   │   │   │   │   │   │   │   │    │Home│
+├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┬───┼────┤
+│    │TOG│MOD│HU+│HU-│SA+│SA-│   │   │   │   │   │LClick│MUp│End │
+├────┼───┴┬──┴─┬─┴───┴───┴───┴───┴───┼───┴┬──┴─┬─┴──┬───┼───┼────┤
+│    │    │    │                     │    │    │    │MLt│MDw│MRgt│
+└────┴────┴────┴─────────────────────┴────┴────┴────┴───┴───┴────┘
+```
diff --git a/qmk/keyboards/kbdfans/kbd67/rev2/keymaps/tucznak/rules.mk b/qmk/keyboards/kbdfans/kbd67/rev2/keymaps/tucznak/rules.mk
index 277af2b1..a46023d8 100644
--- a/qmk/keyboards/kbdfans/kbd67/rev2/keymaps/tucznak/rules.mk
+++ b/qmk/keyboards/kbdfans/kbd67/rev2/keymaps/tucznak/rules.mk
@@ -14,7 +14,6 @@ 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)
 
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
\ No newline at end of file
diff --git a/qmk/keyboards/kbdfans/kbd67/rev2/keymaps/via/keymap.c b/qmk/keyboards/kbdfans/kbd67/rev2/keymaps/via/keymap.c
index e2f3a664..c8705dfa 100644
--- a/qmk/keyboards/kbdfans/kbd67/rev2/keymaps/via/keymap.c
+++ b/qmk/keyboards/kbdfans/kbd67/rev2/keymaps/via/keymap.c
@@ -1,3 +1,19 @@
+/* Copyright 2020 MechMerlin 
+  * 
+  * 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] = {
@@ -41,5 +57,21 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          _______, _______,
   _______,          _______, _______, _______, _______, _______, _______, _______, KC_END,  KC_PGDN, KC_DOWN, _______, KC_PGUP, _______,
   _______, _______, _______,                            _______,                   _______, _______, _______, KC_HOME, KC_PGDN, KC_END
-)
+),
+
+[2] = LAYOUT_65_ansi(
+  _______, _______,   _______, _______,   _______, _______,   _______, _______,   _______, _______,   _______, _______,  _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+  _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______, _______
+), 
+
+[3] = LAYOUT_65_ansi(
+  _______, _______,   _______, _______,   _______, _______,   _______, _______,   _______, _______,   _______, _______,  _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+  _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______, _______
+), 
 };
diff --git a/qmk/keyboards/kbdfans/kbd67/rev2/rules.mk b/qmk/keyboards/kbdfans/kbd67/rev2/rules.mk
index de55438d..bc9b3828 100644
--- a/qmk/keyboards/kbdfans/kbd67/rev2/rules.mk
+++ b/qmk/keyboards/kbdfans/kbd67/rev2/rules.mk
@@ -30,6 +30,5 @@ 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
 
 LAYOUTS = 65_ansi 65_iso 65_ansi_blocker 65_ansi_blocker_split_bs
diff --git a/qmk/keyboards/kbdfans/kbd6x/config.h b/qmk/keyboards/kbdfans/kbd6x/config.h
index 32a625f7..8d3d4562 100644
--- a/qmk/keyboards/kbdfans/kbd6x/config.h
+++ b/qmk/keyboards/kbdfans/kbd6x/config.h
@@ -47,6 +47,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
+
+#define LED_CAPS_LOCK_PIN B6
+
 #define BACKLIGHT_PIN B7
 #ifdef BACKLIGHT_PIN
 #define BACKLIGHT_BREATHING
@@ -190,30 +193,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
diff --git a/qmk/keyboards/kbdfans/kbd6x/kbd6x.c b/qmk/keyboards/kbdfans/kbd6x/kbd6x.c
index f558af03..3797822d 100644
--- a/qmk/keyboards/kbdfans/kbd6x/kbd6x.c
+++ b/qmk/keyboards/kbdfans/kbd6x/kbd6x.c
@@ -14,36 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "kbd6x.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) {
-	if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
-		DDRB |= (1 << 6); 
-		PORTB &= ~(1 << 6);
-	} else {
-		DDRB &= ~(1 << 6); 
-		PORTB &= ~(1 << 6);
-	}
-	
-	led_set_user(usb_led);
-}
\ No newline at end of file
diff --git a/qmk/keyboards/kbdfans/kbd6x/keymaps/othi/rules.mk b/qmk/keyboards/kbdfans/kbd6x/keymaps/othi/rules.mk
index 9cda4109..20d0ca20 100644
--- a/qmk/keyboards/kbdfans/kbd6x/keymaps/othi/rules.mk
+++ b/qmk/keyboards/kbdfans/kbd6x/keymaps/othi/rules.mk
@@ -14,6 +14,5 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = yes
 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)
 TAP_DANCE_ENABLE=yes
 
diff --git a/qmk/keyboards/kbdfans/kbd6x/rules.mk b/qmk/keyboards/kbdfans/kbd6x/rules.mk
index ca46832c..fae8f142 100644
--- a/qmk/keyboards/kbdfans/kbd6x/rules.mk
+++ b/qmk/keyboards/kbdfans/kbd6x/rules.mk
@@ -30,4 +30,3 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = yes
 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
diff --git a/qmk/keyboards/kbdfans/kbd75/config.h b/qmk/keyboards/kbdfans/kbd75/config.h
index d46ca753..1d30d7ab 100644
--- a/qmk/keyboards/kbdfans/kbd75/config.h
+++ b/qmk/keyboards/kbdfans/kbd75/config.h
@@ -20,6 +20,9 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
+#define LED_CAPS_LOCK_PIN B2
+#define LED_PIN_ON_STATE 0
+
 /* number of backlight levels */
 #define BACKLIGHT_PIN B6
 #ifdef BACKLIGHT_PIN
diff --git a/qmk/keyboards/kbdfans/kbd75/rev1/rev1.c b/qmk/keyboards/kbdfans/kbd75/rev1/rev1.c
index 151e395e..520a869e 100644
--- a/qmk/keyboards/kbdfans/kbd75/rev1/rev1.c
+++ b/qmk/keyboards/kbdfans/kbd75/rev1/rev1.c
@@ -1,17 +1 @@
 #include "rev1.h"
-
-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_CAPS_LOCK)) {
-    writePinLow(B2);
-  } else {
-    writePinHigh(B2);
-  }
-
-  led_set_user(usb_led);
-}
-
-void matrix_init_kb(void) {
-  setPinOutput(B2);
-  matrix_init_user();
-}
diff --git a/qmk/keyboards/kbdfans/kbd75/rev2/rev2.c b/qmk/keyboards/kbdfans/kbd75/rev2/rev2.c
index bf91d400..b1af8170 100644
--- a/qmk/keyboards/kbdfans/kbd75/rev2/rev2.c
+++ b/qmk/keyboards/kbdfans/kbd75/rev2/rev2.c
@@ -1,17 +1 @@
 #include "rev2.h"
-
-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_CAPS_LOCK)) {
-    writePinLow(B2);
-  } else {
-    writePinHigh(B2);
-  }
-
-  led_set_user(usb_led);
-}
-
-void matrix_init_kb(void) {
-  setPinOutput(B2);
-  matrix_init_user();
-}
diff --git a/qmk/keyboards/kbdfans/kbd8x/config.h b/qmk/keyboards/kbdfans/kbd8x/config.h
index 5c162749..71daac15 100644
--- a/qmk/keyboards/kbdfans/kbd8x/config.h
+++ b/qmk/keyboards/kbdfans/kbd8x/config.h
@@ -47,6 +47,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
+
+#define LED_NUM_LOCK_PIN B1
+#define LED_CAPS_LOCK_PIN B3
+#define LED_SCROLL_LOCK_PIN B2
+
 #define BACKLIGHT_PIN B6
 #ifdef BACKLIGHT_PIN
 #define BACKLIGHT_BREATHING
diff --git a/qmk/keyboards/kbdfans/kbd8x/kbd8x.c b/qmk/keyboards/kbdfans/kbd8x/kbd8x.c
index 97c2e74e..c19981db 100644
--- a/qmk/keyboards/kbdfans/kbd8x/kbd8x.c
+++ b/qmk/keyboards/kbdfans/kbd8x/kbd8x.c
@@ -15,58 +15,3 @@
  */
 
 #include "kbd8x.h"
-
-extern inline void caps_led_off(void);
-extern inline void caps_led_on(void);
-extern inline void num_led_off(void);
-extern inline void num_led_on(void);
-extern inline void scroll_led_off(void);
-extern inline void scroll_led_on(void);
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-
-	matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-
-	matrix_scan_user();
-}
-
-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(usb_led & (1<<USB_LED_NUM_LOCK))
-    {
-        num_led_on();
-    } else {
-        num_led_off();
-    }
-
-    if(usb_led & (1<<USB_LED_CAPS_LOCK))
-    {
-        caps_led_on();
-    } else {
-        caps_led_off();
-    }
-
-    if(usb_led & (1<<USB_LED_SCROLL_LOCK))
-    {
-        scroll_led_on();
-    } else {
-        scroll_led_off();
-    }
-
-	led_set_user(usb_led);
-}
diff --git a/qmk/keyboards/kbdfans/kbd8x/kbd8x.h b/qmk/keyboards/kbdfans/kbd8x/kbd8x.h
index f28b8ca7..4433722c 100644
--- a/qmk/keyboards/kbdfans/kbd8x/kbd8x.h
+++ b/qmk/keyboards/kbdfans/kbd8x/kbd8x.h
@@ -19,15 +19,14 @@
 #include "led.h"
 
 // Functions for setting LEDs on toggle keys
-inline void caps_led_on(void)     { DDRB |=  (1<<3); PORTB &= ~(1<<3); }
-inline void caps_led_off(void)    { DDRB &= ~(1<<3); PORTB &= ~(1<<3); }
+inline void caps_led_on(void)     { writePinHigh(LED_CAPS_LOCK_PIN); }
+inline void caps_led_off(void)    { writePinLow(LED_CAPS_LOCK_PIN); }
 
-inline void num_led_on(void)      { DDRB |=  (1<<1); PORTB &= ~(1<<1); }
-inline void num_led_off(void)     { DDRB &= ~(1<<1); PORTB &= ~(1<<1); }
-
-inline void scroll_led_on(void)   { DDRB |=  (1<<2); PORTB &= ~(1<<2); }
-inline void scroll_led_off(void)  { DDRB &= ~(1<<2); PORTB &= ~(1<<2); }
+inline void num_led_on(void)      { writePinHigh(LED_NUM_LOCK_PIN); }
+inline void num_led_off(void)     { writePinLow(LED_NUM_LOCK_PIN); }
 
+inline void scroll_led_on(void)   { writePinHigh(LED_SCROLL_LOCK_PIN); }
+inline void scroll_led_off(void)  { writePinLow(LED_SCROLL_LOCK_PIN); }
 
 // LAYOUT depicting all possible switch positions.
 // LAYOUT_all supports ISO, split backspace and split left/right shift.
diff --git a/qmk/keyboards/kbdfans/kbd8x_mk2/config.h b/qmk/keyboards/kbdfans/kbd8x_mk2/config.h
index 3e07ad60..9585e230 100644
--- a/qmk/keyboards/kbdfans/kbd8x_mk2/config.h
+++ b/qmk/keyboards/kbdfans/kbd8x_mk2/config.h
@@ -48,10 +48,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
-/*
- * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
- */
-#define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6
+#define LED_CAPS_LOCK_PIN E6
+#define LED_SCROLL_LOCK_PIN B2
+#define LED_PIN_ON_STATE 0
+
 #define BACKLIGHT_PIN B7
 #ifdef BACKLIGHT_PIN
 #define BACKLIGHT_BREATHING
@@ -218,34 +218,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/kbdfans/kbd8x_mk2/kbd8x_mk2.c b/qmk/keyboards/kbdfans/kbd8x_mk2/kbd8x_mk2.c
index 14727072..0a36e310 100644
--- a/qmk/keyboards/kbdfans/kbd8x_mk2/kbd8x_mk2.c
+++ b/qmk/keyboards/kbdfans/kbd8x_mk2/kbd8x_mk2.c
@@ -14,58 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "kbd8x_mk2.h"
-
-void matrix_init_kb(void) {  
-
-  // Indicator pins
-  // B2 - Scroll Lock
-  // E6 - Caps Lock
-  // Sinking setup - 5V -> LED/Resistor -> Pin
-  
-  setPinOutput(B2);
-  setPinOutput(E6);
-
-  matrix_init_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-  
-  // Toggle indicator LEDs
-  // Since they are a sinking setup, write HIGH to DISABLE, LOW to ENABLE
-  
-  if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
-    writePinLow(E6);
-  } else {
-    writePinHigh(E6);
-  }
-  
-  if (IS_LED_ON(usb_led, USB_LED_SCROLL_LOCK)) {
-    writePinLow(B2);
-  } else {
-    writePinHigh(B2);
-  }
-
-  led_set_user(usb_led);
-}
-
-// 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_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);
-}
-
-*/
diff --git a/qmk/keyboards/kbdfans/kbd8x_mk2/rules.mk b/qmk/keyboards/kbdfans/kbd8x_mk2/rules.mk
index 97261bec..c5f1e286 100644
--- a/qmk/keyboards/kbdfans/kbd8x_mk2/rules.mk
+++ b/qmk/keyboards/kbdfans/kbd8x_mk2/rules.mk
@@ -30,6 +30,5 @@ 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
 
 LAYOUTS = tkl_ansi tkl_iso
diff --git a/qmk/keyboards/kbdfans/kbdmini/rules.mk b/qmk/keyboards/kbdfans/kbdmini/rules.mk
index 28178d65..0fd579c4 100644
--- a/qmk/keyboards/kbdfans/kbdmini/rules.mk
+++ b/qmk/keyboards/kbdfans/kbdmini/rules.mk
@@ -29,5 +29,6 @@ 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
-RGB_MATRIX_ENABLE = IS31FL3733     # Use RGB matrix
+RGB_MATRIX_ENABLE = yes     # Use RGB matrix
+RGB_MATRIX_DRIVER = IS31FL3733
 NO_USB_STARTUP_CHECK = no          # Disable initialization only when usb is plugged in
diff --git a/qmk/keyboards/kbdfans/kbdpad_mk2/config.h b/qmk/keyboards/kbdfans/kbdpad_mk2/config.h
index a7dae0a7..b3de693d 100644
--- a/qmk/keyboards/kbdfans/kbdpad_mk2/config.h
+++ b/qmk/keyboards/kbdfans/kbdpad_mk2/config.h
@@ -48,10 +48,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
-/*
- * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
- */
-#define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6
+#define LED_CAPS_LOCK_PIN B4
+#define LED_PIN_ON_STATE 0
 
 #define BACKLIGHT_PIN B7
 #ifdef BACKLIGHT_PIN
@@ -219,34 +217,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/kbdfans/kbdpad_mk2/kbdpad_mk2.c b/qmk/keyboards/kbdfans/kbdpad_mk2/kbdpad_mk2.c
index 3ca8e0c7..1d6e1642 100644
--- a/qmk/keyboards/kbdfans/kbdpad_mk2/kbdpad_mk2.c
+++ b/qmk/keyboards/kbdfans/kbdpad_mk2/kbdpad_mk2.c
@@ -14,48 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "kbdpad_mk2.h"
-
-void matrix_init_kb(void) {
-	
-  // Num Lock LED = B4
-  // Sinking setup (5V -> LED/Res -> Pin)
-  
-  setPinOutput(B4);
-
-  matrix_init_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-  
-  // Sinking setup. Write HIGH to turn OFF, LOW to turn ON.
-  
-  if (IS_LED_ON(usb_led, USB_LED_NUM_LOCK)) {
-    writePinLow(B4);
-  } else {
-    writePinHigh(B4);
-  }
-
-  led_set_user(usb_led);
-}
-
-// 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_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);
-}
-
-*/
diff --git a/qmk/keyboards/kbdfans/kbdpad_mk2/rules.mk b/qmk/keyboards/kbdfans/kbdpad_mk2/rules.mk
index 0b86b590..c53ca99e 100644
--- a/qmk/keyboards/kbdfans/kbdpad_mk2/rules.mk
+++ b/qmk/keyboards/kbdfans/kbdpad_mk2/rules.mk
@@ -30,6 +30,5 @@ 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
 
 LAYOUTS = ortho_6x4
diff --git a/qmk/keyboards/kbdfans/maja/rules.mk b/qmk/keyboards/kbdfans/maja/rules.mk
index 2b097c3d..47fe6a92 100644
--- a/qmk/keyboards/kbdfans/maja/rules.mk
+++ b/qmk/keyboards/kbdfans/maja/rules.mk
@@ -30,4 +30,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
 RGB_MATRIX_ENABLE = yes     # Use RGB matrix
+RGB_MATRIX_DRIVER = IS31FL3731
 NO_USB_STARTUP_CHECK = no   # Disable initialization only when usb is plugged in
diff --git a/qmk/keyboards/kc60/config.h b/qmk/keyboards/kc60/config.h
index 7c6e695a..c58aedd7 100644
--- a/qmk/keyboards/kc60/config.h
+++ b/qmk/keyboards/kc60/config.h
@@ -20,12 +20,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0x530A
-#define PRODUCT_ID      0x6FFC
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    NPKC
-#define PRODUCT         KC60
-#define DESCRIPTION     QMK Firmware: KC60
+#define VENDOR_ID    0x530A
+#define PRODUCT_ID   0x6FFC
+#define DEVICE_VER   0x0001
+#define MANUFACTURER NPKC
+#define PRODUCT      KC60
 
 /* key matrix size */
 #define MATRIX_ROWS 5
@@ -45,39 +44,39 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B7, D4, B1, B0, B5, B4, D7, D6, B3 }
 #define UNUSED_PINS
 
-/* COL2ROW, ROW2COL*/
+/* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
 #define BACKLIGHT_PIN B6
-#define BACKLIGHT_BREATHING
 #define BACKLIGHT_LEVELS 5
+#define BACKLIGHT_BREATHING
 
-#ifdef RGBLIGHT_ENABLE
-#    define RGB_DI_PIN F5
-#    define RGBLED_NUM 16  // Number of LEDs. Change this to match your use case.
+#define RGB_DI_PIN F5
+#ifdef RGB_DI_PIN
+#    define RGBLED_NUM 16
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 8
 #    define RGBLIGHT_VAL_STEP 8
 #    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
-#    define RGBLIGHT_SLEEP         /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
 /*== all animations enable ==*/
 #    define RGBLIGHT_ANIMATIONS
 /*== or choose animations ==*/
-// #    define RGBLIGHT_EFFECT_BREATHING
-// #    define RGBLIGHT_EFFECT_RAINBOW_MOOD
-// #    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
-// #    define RGBLIGHT_EFFECT_SNAKE
-// #    define RGBLIGHT_EFFECT_KNIGHT
-// #    define RGBLIGHT_EFFECT_CHRISTMAS
-// #    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-// #    define RGBLIGHT_EFFECT_RGB_TEST
-// #    define RGBLIGHT_EFFECT_ALTERNATING
+//#    define RGBLIGHT_EFFECT_BREATHING
+//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+//#    define RGBLIGHT_EFFECT_SNAKE
+//#    define RGBLIGHT_EFFECT_KNIGHT
+//#    define RGBLIGHT_EFFECT_CHRISTMAS
+//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+//#    define RGBLIGHT_EFFECT_RGB_TEST
+//#    define RGBLIGHT_EFFECT_ALTERNATING
 /*== customize breathing effect ==*/
 /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
 #    define RGBLIGHT_BREATHE_TABLE_SIZE 256  // 256(default) or 128 or 64
 /*==== use exp() and sin() ====*/
-// #    define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
-// #    define RGBLIGHT_EFFECT_BREATHE_MAX 255      // 0 to 255
+//#    define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//#    define RGBLIGHT_EFFECT_BREATHE_MAX 255      // 0 to 255
 #endif
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
@@ -91,9 +90,52 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+//#define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
 /* disable action features */
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+/* Bootmagic Lite key configuration */
+//#define BOOTMAGIC_LITE_ROW 0
+//#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/kc60/info.json b/qmk/keyboards/kc60/info.json
index bd21b6a6..b6bdfe87 100644
--- a/qmk/keyboards/kc60/info.json
+++ b/qmk/keyboards/kc60/info.json
@@ -7,205 +7,217 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {"label":"Esc", "x":0, "y":0},
-                {"label":"1", "x":1, "y":0},
-                {"label":"2", "x":2, "y":0},
-                {"label":"3", "x":3, "y":0},
-                {"label":"4", "x":4, "y":0},
-                {"label":"5", "x":5, "y":0},
-                {"label":"6", "x":6, "y":0},
-                {"label":"7", "x":7, "y":0},
-                {"label":"8", "x":8, "y":0},
-                {"label":"9", "x":9, "y":0},
-                {"label":"0", "x":10, "y":0},
-                {"label":"-", "x":11, "y":0},
-                {"label":"=", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0},
-                {"label":"`", "x":14, "y":0},
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[", "x":11.5, "y":1},
-                {"label":"]", "x":12.5, "y":1},
-                {"label":"\\", "x":13.5, "y":1, "w":1.5},
-                {"label":"CapsLock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"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},
-                {"label":"Shift", "x":0, "y":3, "w":1.25},
-                {"label":"ISO\\", "x":1.25, "y":3},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",", "x":9.25, "y":3},
-                {"label":".", "x":10.25, "y":3},
-                {"label":"/", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
-                {"label":"HHKBFn", "x":14, "y":3},
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4, "w":1.25},
-                {"label":"GUI", "x":11.25, "y":4, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":4, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6, "y": 0},
+                {"x": 7, "y": 0},
+                {"x": 8, "y": 0},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0},
+                {"x": 14, "y": 0},
+
+                {"x": 0, "y": 1, "w": 1.5},
+                {"x": 1.5, "y": 1},
+                {"x": 2.5, "y": 1},
+                {"x": 3.5, "y": 1},
+                {"x": 4.5, "y": 1},
+                {"x": 5.5, "y": 1},
+                {"x": 6.5, "y": 1},
+                {"x": 7.5, "y": 1},
+                {"x": 8.5, "y": 1},
+                {"x": 9.5, "y": 1},
+                {"x": 10.5, "y": 1},
+                {"x": 11.5, "y": 1},
+                {"x": 12.5, "y": 1},
+                {"x": 13.5, "y": 1, "w": 1.5},
+
+                {"x": 0, "y": 2, "w": 1.75},
+                {"x": 1.75, "y": 2},
+                {"x": 2.75, "y": 2},
+                {"x": 3.75, "y": 2},
+                {"x": 4.75, "y": 2},
+                {"x": 5.75, "y": 2},
+                {"x": 6.75, "y": 2},
+                {"x": 7.75, "y": 2},
+                {"x": 8.75, "y": 2},
+                {"x": 9.75, "y": 2},
+                {"x": 10.75, "y": 2},
+                {"x": 11.75, "y": 2},
+                {"x": 12.75, "y": 2},
+                {"x": 13.75, "y": 2, "w": 1.25},
+
+                {"x": 0, "y": 3, "w": 1.25},
+                {"x": 1.25, "y": 3},
+                {"x": 2.25, "y": 3},
+                {"x": 3.25, "y": 3},
+                {"x": 4.25, "y": 3},
+                {"x": 5.25, "y": 3},
+                {"x": 6.25, "y": 3},
+                {"x": 7.25, "y": 3},
+                {"x": 8.25, "y": 3},
+                {"x": 9.25, "y": 3},
+                {"x": 10.25, "y": 3},
+                {"x": 11.25, "y": 3},
+                {"x": 12.25, "y": 3, "w": 1.75},
+                {"x": 14, "y": 3},
+
+                {"x": 0, "y": 4, "w": 1.25},
+                {"x": 1.25, "y": 4, "w": 1.25},
+                {"x": 2.5, "y": 4, "w": 1.25},
+                {"x": 3.75, "y": 4, "w": 6.25},
+                {"x": 10, "y": 4, "w": 1.25},
+                {"x": 11.25, "y": 4, "w": 1.25},
+                {"x": 12.5, "y": 4, "w": 1.25},
+                {"x": 13.75, "y": 4, "w": 1.25}
             ]
         },
         "LAYOUT": {
             "layout": [
-                {"label":"K00", "x":0, "y":0},
-                {"label":"K01", "x":1, "y":0},
-                {"label":"K02", "x":2, "y":0},
-                {"label":"K03", "x":3, "y":0},
-                {"label":"K04", "x":4, "y":0},
-                {"label":"K05", "x":5, "y":0},
-                {"label":"K06", "x":6, "y":0},
-                {"label":"K07", "x":7, "y":0},
-                {"label":"K08", "x":8, "y":0},
-                {"label":"K09", "x":9, "y":0},
-                {"label":"K0A", "x":10, "y":0},
-                {"label":"K0B", "x":11, "y":0},
-                {"label":"K0C", "x":12, "y":0},
-                {"label":"K0D", "x":13, "y":0},
-                {"label":"K10", "x":0, "y":1, "w":1.5},
-                {"label":"K11", "x":1.5, "y":1},
-                {"label":"K12", "x":2.5, "y":1},
-                {"label":"K13", "x":3.5, "y":1},
-                {"label":"K14", "x":4.5, "y":1},
-                {"label":"K15", "x":5.5, "y":1},
-                {"label":"K16", "x":6.5, "y":1},
-                {"label":"K17", "x":7.5, "y":1},
-                {"label":"K18", "x":8.5, "y":1},
-                {"label":"K19", "x":9.5, "y":1},
-                {"label":"K1A", "x":10.5, "y":1},
-                {"label":"K1B", "x":11.5, "y":1},
-                {"label":"K1C", "x":12.5, "y":1},
-                {"label":"K1D", "x":13.5, "y":1, "w":1.5},
-                {"label":"K20", "x":0, "y":2, "w":1.75},
-                {"label":"K21", "x":1.75, "y":2},
-                {"label":"K22", "x":2.75, "y":2},
-                {"label":"K23", "x":3.75, "y":2},
-                {"label":"K24", "x":4.75, "y":2},
-                {"label":"K25", "x":5.75, "y":2},
-                {"label":"K26", "x":6.75, "y":2},
-                {"label":"K27", "x":7.75, "y":2},
-                {"label":"K28", "x":8.75, "y":2},
-                {"label":"K29", "x":9.75, "y":2},
-                {"label":"K2A", "x":10.75, "y":2},
-                {"label":"K2B", "x":11.75, "y":2},
-                {"label":"K2C", "x":12.75, "y":2},
-                {"label":"K2D", "x":13.75, "y":2, "w":1.25},
-                {"label":"K30", "x":0, "y":3, "w":1.25},
-                {"label":"K31", "x":1.25, "y":3},
-                {"label":"K32", "x":2.25, "y":3},
-                {"label":"K33", "x":3.25, "y":3},
-                {"label":"K34", "x":4.25, "y":3},
-                {"label":"K35", "x":5.25, "y":3},
-                {"label":"K36", "x":6.25, "y":3},
-                {"label":"K37", "x":7.25, "y":3},
-                {"label":"K38", "x":8.25, "y":3},
-                {"label":"K39", "x":9.25, "y":3},
-                {"label":"K3A", "x":10.25, "y":3},
-                {"label":"K3B", "x":11.25, "y":3},
-                {"label":"K3C", "x":12.25, "y":3, "w":1.75},
-                {"label":"K3D", "x":14, "y":3},
-                {"label":"K40", "x":0, "y":4, "w":1.25},
-                {"label":"K41", "x":1.25, "y":4, "w":1.25},
-                {"label":"K42", "x":2.5, "y":4, "w":1.25},
-                {"label":"K45", "x":3.75, "y":4, "w":6.25},
-                {"label":"K49", "x":14, "y":0},
-                {"label":"K4A", "x":10, "y":4, "w":1.25},
-                {"label":"K4B", "x":11.25, "y":4, "w":1.25},
-                {"label":"K4C", "x":12.5, "y":4, "w":1.25},
-                {"label":"K4D", "x":13.75, "y":4, "w":1.25}
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6, "y": 0},
+                {"x": 7, "y": 0},
+                {"x": 8, "y": 0},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0},
+
+                {"x": 0, "y": 1, "w": 1.5},
+                {"x": 1.5, "y": 1},
+                {"x": 2.5, "y": 1},
+                {"x": 3.5, "y": 1},
+                {"x": 4.5, "y": 1},
+                {"x": 5.5, "y": 1},
+                {"x": 6.5, "y": 1},
+                {"x": 7.5, "y": 1},
+                {"x": 8.5, "y": 1},
+                {"x": 9.5, "y": 1},
+                {"x": 10.5, "y": 1},
+                {"x": 11.5, "y": 1},
+                {"x": 12.5, "y": 1},
+                {"x": 13.5, "y": 1, "w": 1.5},
+
+                {"x": 0, "y": 2, "w": 1.75},
+                {"x": 1.75, "y": 2},
+                {"x": 2.75, "y": 2},
+                {"x": 3.75, "y": 2},
+                {"x": 4.75, "y": 2},
+                {"x": 5.75, "y": 2},
+                {"x": 6.75, "y": 2},
+                {"x": 7.75, "y": 2},
+                {"x": 8.75, "y": 2},
+                {"x": 9.75, "y": 2},
+                {"x": 10.75, "y": 2},
+                {"x": 11.75, "y": 2},
+                {"x": 12.75, "y": 2},
+                {"x": 13.75, "y": 2, "w": 1.25},
+
+                {"x": 0, "y": 3, "w": 1.25},
+                {"x": 1.25, "y": 3},
+                {"x": 2.25, "y": 3},
+                {"x": 3.25, "y": 3},
+                {"x": 4.25, "y": 3},
+                {"x": 5.25, "y": 3},
+                {"x": 6.25, "y": 3},
+                {"x": 7.25, "y": 3},
+                {"x": 8.25, "y": 3},
+                {"x": 9.25, "y": 3},
+                {"x": 10.25, "y": 3},
+                {"x": 11.25, "y": 3},
+                {"x": 12.25, "y": 3, "w": 1.75},
+                {"x": 14, "y": 3},
+
+                {"x": 0, "y": 4, "w": 1.25},
+                {"x": 1.25, "y": 4, "w": 1.25},
+                {"x": 2.5, "y": 4, "w": 1.25},
+                {"x": 3.75, "y": 4, "w": 6.25},
+                {"x": 14, "y": 0},
+                {"x": 10, "y": 4, "w": 1.25},
+                {"x": 11.25, "y": 4, "w": 1.25},
+                {"x": 12.5, "y": 4, "w": 1.25},
+                {"x": 13.75, "y": 4, "w": 1.25}
             ]
         },
         "LAYOUT_60_ansi": {
             "layout": [
-                {"label":"~", "x":0, "y":0},
-                {"label":"1", "x":1, "y":0},
-                {"label":"2", "x":2, "y":0},
-                {"label":"3", "x":3, "y":0},
-                {"label":"4", "x":4, "y":0},
-                {"label":"5", "x":5, "y":0},
-                {"label":"6", "x":6, "y":0},
-                {"label":"7", "x":7, "y":0},
-                {"label":"8", "x":8, "y":0},
-                {"label":"9", "x":9, "y":0},
-                {"label":"0", "x":10, "y":0},
-                {"label":"-", "x":11, "y":0},
-                {"label":"=", "x":12, "y":0},
-                {"label":"Backspace", "x":13, "y":0, "w":2},
-                {"label":"Tab", "x":0, "y":1, "w":1.5},
-                {"label":"Q", "x":1.5, "y":1},
-                {"label":"W", "x":2.5, "y":1},
-                {"label":"E", "x":3.5, "y":1},
-                {"label":"R", "x":4.5, "y":1},
-                {"label":"T", "x":5.5, "y":1},
-                {"label":"Y", "x":6.5, "y":1},
-                {"label":"U", "x":7.5, "y":1},
-                {"label":"I", "x":8.5, "y":1},
-                {"label":"O", "x":9.5, "y":1},
-                {"label":"P", "x":10.5, "y":1},
-                {"label":"[", "x":11.5, "y":1},
-                {"label":"]", "x":12.5, "y":1},
-                {"label":"\\", "x":13.5, "y":1, "w":1.5},
-                {"label":"CapsLock", "x":0, "y":2, "w":1.75},
-                {"label":"A", "x":1.75, "y":2},
-                {"label":"S", "x":2.75, "y":2},
-                {"label":"D", "x":3.75, "y":2},
-                {"label":"F", "x":4.75, "y":2},
-                {"label":"G", "x":5.75, "y":2},
-                {"label":"H", "x":6.75, "y":2},
-                {"label":"J", "x":7.75, "y":2},
-                {"label":"K", "x":8.75, "y":2},
-                {"label":"L", "x":9.75, "y":2},
-                {"label":";", "x":10.75, "y":2},
-                {"label":"'", "x":11.75, "y":2},
-                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
-                {"label":"Shift", "x":0, "y":3, "w":2.25},
-                {"label":"Z", "x":2.25, "y":3},
-                {"label":"X", "x":3.25, "y":3},
-                {"label":"C", "x":4.25, "y":3},
-                {"label":"V", "x":5.25, "y":3},
-                {"label":"B", "x":6.25, "y":3},
-                {"label":"N", "x":7.25, "y":3},
-                {"label":"M", "x":8.25, "y":3},
-                {"label":",", "x":9.25, "y":3},
-                {"label":".", "x":10.25, "y":3},
-                {"label":"/", "x":11.25, "y":3},
-                {"label":"Shift", "x":12.25, "y":3, "w":2.75},
-                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
-                {"label":"Win", "x":1.25, "y":4, "w":1.25},
-                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
-                {"label":"Space", "x":3.75, "y":4, "w":6.25},
-                {"label":"Alt", "x":10, "y":4, "w":1.25},
-                {"label":"Win", "x":11.25, "y":4, "w":1.25},
-                {"label":"Menu", "x":12.5, "y":4, "w":1.25},
-                {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6, "y": 0},
+                {"x": 7, "y": 0},
+                {"x": 8, "y": 0},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0, "w": 2},
+
+                {"x": 0, "y": 1, "w": 1.5},
+                {"x": 1.5, "y": 1},
+                {"x": 2.5, "y": 1},
+                {"x": 3.5, "y": 1},
+                {"x": 4.5, "y": 1},
+                {"x": 5.5, "y": 1},
+                {"x": 6.5, "y": 1},
+                {"x": 7.5, "y": 1},
+                {"x": 8.5, "y": 1},
+                {"x": 9.5, "y": 1},
+                {"x": 10.5, "y": 1},
+                {"x": 11.5, "y": 1},
+                {"x": 12.5, "y": 1},
+                {"x": 13.5, "y": 1, "w": 1.5},
+
+                {"x": 0, "y": 2, "w": 1.75},
+                {"x": 1.75, "y": 2},
+                {"x": 2.75, "y": 2},
+                {"x": 3.75, "y": 2},
+                {"x": 4.75, "y": 2},
+                {"x": 5.75, "y": 2},
+                {"x": 6.75, "y": 2},
+                {"x": 7.75, "y": 2},
+                {"x": 8.75, "y": 2},
+                {"x": 9.75, "y": 2},
+                {"x": 10.75, "y": 2},
+                {"x": 11.75, "y": 2},
+                {"x": 12.75, "y": 2, "w": 2.25},
+
+                {"x": 0, "y": 3, "w": 2.25},
+                {"x": 2.25, "y": 3},
+                {"x": 3.25, "y": 3},
+                {"x": 4.25, "y": 3},
+                {"x": 5.25, "y": 3},
+                {"x": 6.25, "y": 3},
+                {"x": 7.25, "y": 3},
+                {"x": 8.25, "y": 3},
+                {"x": 9.25, "y": 3},
+                {"x": 10.25, "y": 3},
+                {"x": 11.25, "y": 3},
+                {"x": 12.25, "y": 3, "w": 2.75},
+
+                {"x": 0, "y": 4, "w": 1.25},
+                {"x": 1.25, "y": 4, "w": 1.25},
+                {"x": 2.5, "y": 4, "w": 1.25},
+                {"x": 3.75, "y": 4, "w": 6.25},
+                {"x": 10, "y": 4, "w": 1.25},
+                {"x": 11.25, "y": 4, "w": 1.25},
+                {"x": 12.5, "y": 4, "w": 1.25},
+                {"x": 13.75, "y": 4, "w": 1.25}
             ]
         }
     }
diff --git a/qmk/keyboards/kc60/kc60.c b/qmk/keyboards/kc60/kc60.c
index 09b924b2..52059a8c 100644
--- a/qmk/keyboards/kc60/kc60.c
+++ b/qmk/keyboards/kc60/kc60.c
@@ -1,16 +1,13 @@
 #include "kc60.h"
 
-void led_set_kb(uint8_t usb_led)
-{
-    if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
-        // output low
-        DDRB |= (1<<2);
-        PORTB &= ~(1<<2);
-    } else {
-        // Hi-Z
-        DDRB &= ~(1<<2);
-        PORTB &= ~(1<<2);
+bool led_update_kb(led_t led_state) {
+    if (led_update_user(led_state)) {
+        if (led_state.caps_lock) {
+            setPinOutput(B2);
+        } else {
+            setPinInput(B2);
+        }
     }
 
-     led_set_user(usb_led);
-}
\ No newline at end of file
+    return true;
+}
diff --git a/qmk/keyboards/kc60/kc60.h b/qmk/keyboards/kc60/kc60.h
index 2f26b2c0..79bdbd2a 100644
--- a/qmk/keyboards/kc60/kc60.h
+++ b/qmk/keyboards/kc60/kc60.h
@@ -2,6 +2,8 @@
 
 #include "quantum.h"
 
+#define XXX KC_NO
+
 /* LAYOUT_all
  * ,-----------------------------------------------------------.
  * |00 |01 |02 |03 |04 |05 |06 |07 |08 |09 |0A |0B |0C |0D |49 |
@@ -14,22 +16,22 @@
  * |-----------------------------------------------------------|
  * |40  |41  |42  |           45           |4A  |4B  |4C  |4D  |
  * `-----------------------------------------------------------'
- * 2u Backspace = K0D
- * 2.25u left Shift = K30
- * 2.75u right Shift = K3D
+ * 2u Backspace = k0D
+ * 2.25u left Shift = k30
+ * 2.75u right Shift = k3D
  */
 #define LAYOUT_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K49, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3C,      \
-    K40, K41, K42,                K45,                K4A, K4B, K4C, K4D       \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k49, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3D, k3C, \
+    k40, k41, k42,                k45,                k4A, k4B, k4C, k4D \
 ) { \
-    { K00,  K01,  K02,  K03,    K04,    K05,  K06,    K07,    K08,    K09,  K0A,  K0B,  K0C,  K0D }, \
-    { K10,  K11,  K12,  K13,    K14,    K15,  K16,    K17,    K18,    K19,  K1A,  K1B,  K1C,  K1D }, \
-    { K20,  K21,  K22,  K23,    K24,    K25,  K26,    K27,    K28,    K29,  K2A,  K2B,  K2C,  K2D }, \
-    { K30,  K31,  K32,  K33,    K34,    K35,  K36,    K37,    K38,    K39,  K3A,  K3B,  K3C,  K3D }, \
-    { K40,  K41,  K42,  KC_NO,  KC_NO,  K45,  KC_NO,  KC_NO,  KC_NO,  K49,  K4A,  K4B,  K4C,  K4D }  \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D }, \
+    { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, k49, k4A, k4B, k4C, k4D } \
 }
 
 /* LAYOUT
@@ -50,18 +52,18 @@
  * `-----------------------------------------------------------'
  */
 #define LAYOUT( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, \
-    K40, K41, K42,           K45,                K49, K4A, K4B, K4C, K4D  \
-) LAYOUT_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K49, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3D, K3C,      \
-    K40, K41, K42,                K45,                K4A, K4B, K4C, K4D       \
-)
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, \
+    k40, k41, k42,           k45,                k49, k4A, k4B, k4C, k4D \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D }, \
+    { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, k49, k4A, k4B, k4C, k4D } \
+}
 
 /* LAYOUT_60_ansi
  * ,-----------------------------------------------------------.
@@ -77,15 +79,15 @@
  * `-----------------------------------------------------------'
  */
 #define LAYOUT_60_ansi( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, \
-    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, \
-    K40, K41, K42,                K45,                K4A, K4B, K4C, K4D  \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B,      k2D, \
+    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D, \
+    k40, k41, k42,                k45,                k4A, k4B, k4C, k4D \
 ) { \
-    { K00,  K01,   K02,  K03,    K04,    K05,  K06,    K07,    K08,    K09,   K0A,  K0B,  K0C,   K0D }, \
-    { K10,  K11,   K12,  K13,    K14,    K15,  K16,    K17,    K18,    K19,   K1A,  K1B,  K1C,   K1D }, \
-    { K20,  K21,   K22,  K23,    K24,    K25,  K26,    K27,    K28,    K29,   K2A,  K2B,  KC_NO, K2D }, \
-    { K30,  KC_NO, K32,  K33,    K34,    K35,  K36,    K37,    K38,    K39,   K3A,  K3B,  KC_NO, K3D }, \
-    { K40,  K41,   K42,  KC_NO,  KC_NO,  K45,  KC_NO,  KC_NO,  KC_NO,  KC_NO, K4A,  K4B,  K4C,   K4D }  \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, XXX, k2D }, \
+    { k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D }, \
+    { k40, k41, k42, XXX, XXX, k45, XXX, XXX, XXX, XXX, k4A, k4B, k4C, k4D } \
 }
diff --git a/qmk/keyboards/kc60/keymaps/default/keymap.c b/qmk/keyboards/kc60/keymaps/default/keymap.c
index d5286e35..d7d6d6ea 100644
--- a/qmk/keyboards/kc60/keymaps/default/keymap.c
+++ b/qmk/keyboards/kc60/keymaps/default/keymap.c
@@ -2,11 +2,11 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,       KC_BSLS,      KC_GRV,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,      KC_BSPC,
-        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_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_RSFT,      LT(1,KC_APP),
-        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, LT(1,KC_APP), KC_RCTL
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,        KC_BSLS,       KC_GRV,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,       KC_BSPC,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_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_RSFT,       LT(1, KC_APP),
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, LT(1, KC_APP), KC_RCTL
     ),
     [1] = LAYOUT_all(
         RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  XXXXXXX, XXXXXXX,
diff --git a/qmk/keyboards/kc60/keymaps/via/keymap.c b/qmk/keyboards/kc60/keymaps/via/keymap.c
index 5623f233..eefa81e1 100644
--- a/qmk/keyboards/kc60/keymaps/via/keymap.c
+++ b/qmk/keyboards/kc60/keymaps/via/keymap.c
@@ -2,11 +2,11 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,       KC_BSLS,      KC_GRV,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,      KC_BSPC,
-        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_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_RSFT,      LT(1,KC_APP),
-        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, LT(1,KC_APP), KC_RCTL
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,        KC_BSLS,       KC_GRV,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,       KC_BSPC,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_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_RSFT,       LT(1, KC_APP),
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, LT(1, KC_APP), KC_RCTL
     ),
     [1] = LAYOUT_all(
         RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  XXXXXXX, XXXXXXX,
diff --git a/qmk/keyboards/kc60/keymaps/ws2812/keymap.c b/qmk/keyboards/kc60/keymaps/ws2812/keymap.c
index aaefb61c..e0a5f600 100644
--- a/qmk/keyboards/kc60/keymaps/ws2812/keymap.c
+++ b/qmk/keyboards/kc60/keymaps/ws2812/keymap.c
@@ -2,11 +2,11 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT_all(
-        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,       KC_BSLS,      KC_GRV,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,      KC_BSPC,
-        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_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_RSFT,      LT(1,KC_APP),
-        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, LT(1,KC_APP), KC_RCTL
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,        KC_BSLS,       KC_GRV,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,       KC_BSPC,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_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_RSFT,       LT(1, KC_APP),
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, LT(1, KC_APP), KC_RCTL
     ),
     [1] = LAYOUT_all(
         RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  XXXXXXX, XXXXXXX,
@@ -14,5 +14,5 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         XXXXXXX, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, XXXXXXX, KC_DEL,  KC_LEFT, KC_DOWN, KC_RGHT, KC_PGDN, XXXXXXX, XXXXXXX, XXXXXXX,
         _______, XXXXXXX, XXXXXXX, BL_DEC,  BL_TOGG, BL_INC,  BL_BRTG, XXXXXXX, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX, _______, _______,
         _______, _______, _______,                            XXXXXXX,                            _______, _______, _______, _______
-    ),
+    )
 };
diff --git a/qmk/keyboards/kc60/readme.md b/qmk/keyboards/kc60/readme.md
index 71888e75..e1a999c0 100644
--- a/qmk/keyboards/kc60/readme.md
+++ b/qmk/keyboards/kc60/readme.md
@@ -12,6 +12,10 @@ Make example for this keyboard (after setting up your build environment):
 
     make kc60:default
 
+Flashing example for this keyboard:
+
+    make kc60:default:flash
+
 ## RGB Underglow Support
 
 To add RGB Underglow to the KC60, see [Adding RGB Underglow to the KC60](mod_rgb_underglow.md).
diff --git a/qmk/keyboards/kc60/rules.mk b/qmk/keyboards/kc60/rules.mk
index 044233e4..8f3ab9eb 100644
--- a/qmk/keyboards/kc60/rules.mk
+++ b/qmk/keyboards/kc60/rules.mk
@@ -2,13 +2,6 @@
 MCU = atmega32u4
 
 # Bootloader selection
-#   Teensy       halfkay
-#   Pro Micro    caterina
-#   Atmel DFU    atmel-dfu
-#   LUFA DFU     lufa-dfu
-#   QMK DFU      qmk-dfu
-#   ATmega32A    bootloadHID
-#   ATmega328P   USBasp
 BOOTLOADER = atmel-dfu
 
 # Build Options
@@ -25,11 +18,8 @@ SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 NKRO_ENABLE = no            # USB Nkey Rollover
 BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-MIDI_ENABLE = no            # MIDI support
-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
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
 KEYBOARD_LOCK_ENABLE = yes  # Allow locking of keyboard via magic key
 
 LAYOUTS = 60_ansi
diff --git a/qmk/keyboards/keebio/bdn9/keymaps/brandonschlack/config.h b/qmk/keyboards/keebio/bdn9/keymaps/brandonschlack/config.h
new file mode 100644
index 00000000..cde5051c
--- /dev/null
+++ b/qmk/keyboards/keebio/bdn9/keymaps/brandonschlack/config.h
@@ -0,0 +1,25 @@
+/* Copyright 2020 Brandon Schlack
+ *
+ * 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
+
+#define ENCODER_DIRECTION_FLIP
+
+#undef RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING // Only have Breathing Animation
+
+/* Mouse Keys Configuration */
+#define MK_3_SPEED
+#define MK_W_INTERVAL_UNMOD 20
diff --git a/qmk/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c b/qmk/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c
new file mode 100644
index 00000000..443e8d0a
--- /dev/null
+++ b/qmk/keyboards/keebio/bdn9/keymaps/brandonschlack/keymap.c
@@ -0,0 +1,393 @@
+/* Copyright 2020 Brandon Schlack
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+#include "brandonschlack.h"
+
+/**
+ * Layer Names
+ */
+enum bdn9_layers {
+    _REEDER = 0,
+    _MEDIA,
+    _NAVI,
+    _KARABINER,
+    LR_NAV,
+    LR_REVIEW,
+    LR_EDIT
+};
+
+#define _AUDIO   13
+#define _LIGHT   14
+
+/**
+ * Keycodes & Macros
+ */
+#define DF_REDR   DF(_REEDER)          // Set Default Layer to Reeder shortcuts
+#define DF_MEDA   DF(_MEDIA)           // Set Default Layer to Media controls
+#define DF_NAVI   DF(_NAVI)            // Set Default Layer to Navigation shortcuts
+#define DF_KBNR   DF(_KARABINER)       // Set Default Layer to Basic Macro keys
+
+enum bdn9_keycodes {
+    TG_LNAV = KEYMAP_SAFE_RANGE,
+    TG_REVW,
+    TG_EDIT
+};
+
+/**
+ * Tap Dances
+ *
+ * Use tap dance for layer changes
+ */
+enum bdn9_dances {
+    TD_DTAP_ADIO = 0,
+    TD_DTAP_LGHT,
+    TD_DTAP_ADJT
+};
+// Tap Dance Definitions
+qk_tap_dance_action_t tap_dance_actions[] = {
+    [TD_DTAP_ADIO] = ACTION_TAP_DANCE_TRIGGER_LAYER(DOUBLE_TAP, _AUDIO),
+    [TD_DTAP_LGHT] = ACTION_TAP_DANCE_TRIGGER_LAYER(DOUBLE_TAP, _LIGHT),
+    [TD_DTAP_ADJT] = ACTION_TAP_DANCE_TRIGGER_LAYER(DOUBLE_TAP, _ADJUST),
+};
+// Tap Dance Aliases
+#if defined(RGBLIGHT_ENABLE)
+#define DTP_AVC   TD(TD_DTAP_LGHT)   //
+#elif defined(AUDIO_ENABLE)
+#define DTP_AVC   TD(TD_DTAP_ADIO)
+#endif
+#define DTP_ADJ   TD(TD_DTAP_ADJT)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+        Layer: Reeder
+        ┌───────────┐  ┌───────────┐
+        │   Items   │  │    Subs   │
+        │  Prv  Nxt │  │  Prv  Nxt │
+        ├────────┬──┴──┴──┬────────┤
+        │ VwBrsw │  Star  │  Sync  │
+        ├────────┼────────┼────────┤
+        │ CmdTab │ TgRead │  Clear │
+        ├────────┼────────┼────────┤
+        │ VwStard│ VwUnrd │  VwAll │
+        └────────┴────────┴────────┘
+     */
+    [_REEDER] = LAYOUT(
+        KC_H, KC_S, KC_R,
+        CMD_TAB, KC_M, DTP_AVC,
+        G(KC_1), G(KC_2), DTP_ADJ
+    ),
+    /*
+        Layer: Media
+        ┌───────────┐  ┌───────────┐
+        │    Vol    │  │   Track   │
+        │  Prv  Nxt │  │  Prv  Nxt │
+        ├────────┬──┴──┴──┬────────┤
+        │  Mute  │ Player │  Sync  │
+        ├────────┼────────┼────────┤
+        │ YT<10s │ YT Ply │ YT>10s │
+        ├────────┼────────┼────────┤
+        │  Left  │  Spce  │  Rght  │
+        └────────┴────────┴────────┘
+     */
+    [_MEDIA] = LAYOUT(
+        KC_MUTE, MC_PLYR, KC_MPLY,
+        KC_J, KC_K, DTP_AVC,
+        KC_LEFT, KC_SPC, DTP_ADJ
+    ),
+    /*
+        Layer: Navigation
+        ┌───────────┐  ┌───────────┐
+        │  Scroll   │  │    Tab    │
+        │  Up   Dn  │  │  Prv  Nxt │
+        ├────────┬──┴──┴──┬────────┤
+        │ ReOTab │ CmdTab │ ClsTab │
+        ├────────┼────────┼────────┤
+        │  PgDn  │   Up   │  PgUp  │
+        ├────────┼────────┼────────┤
+        │  Left  │  Down  │  Rght  │
+        └────────┴────────┴────────┘
+     */
+    [_NAVI] = LAYOUT(
+        REO_TAB, CMD_TAB, CLS_TAB,
+        KC_PGDN, KC_UP, DTP_AVC,
+        KC_LEFT, KC_DOWN, DTP_ADJ
+    ),
+    /*
+        Layer: Macro/Karabiner
+        ┌───────────┐  ┌───────────┐
+        │           │  │           │
+        │   -    +  │  │   .    =  │
+        ├────────┬──┴──┴──┬────────┤
+        │    1   │    2   │    3   │
+        ├────────┼────────┼────────┤
+        │    4   │    5   │    6   │
+        ├────────┼────────┼────────┤
+        │    7   │    8   │    9   │
+        └────────┴────────┴────────┘
+     */
+    [_KARABINER] = LAYOUT(
+        KC_P1, KC_P2, KC_P3,
+        KC_P4, KC_P5, DTP_AVC,
+        KC_P7, KC_P8, DTP_ADJ
+    ),
+    /*
+        Layer: Lightroom Navigation
+        ┌───────────┐  ┌───────────┐
+        │ Thumbnail │  │ Scrl Grid │
+        │ Dec   Inc │  │ Up     Dn │
+        ├────────┬──┴──┴──┬────────┤
+        │ TgRevw │CylGrdVw│ TgEdit │
+        ├────────┼────────┼────────┤
+        │  Start │   Up   │  End   │
+        ├────────┼────────┼────────┤
+        │  Left  │  Down  │  Rght  │
+        └────────┴────────┴────────┘
+     */
+    [LR_NAV] = LAYOUT(
+        TG_REVW, KC_J,    TG_EDIT,
+        KC_HOME, KC_UP,   DTP_AVC,
+        KC_LEFT, KC_DOWN, DTP_ADJ
+    ),
+    /*
+        Layer: Review/Rate
+        ┌───────────┐  ┌───────────┐
+        │   Stars   │  │   Flag    │
+        │ Dec   Inc │  │ Dec   Inc │
+        ├────────┬──┴──┴──┬────────┤
+        │ TgLNav │ Yellow │ TgEdit │
+        ├────────┼────────┼────────┤
+        │ NoStar │  Green │ UnFlag │
+        ├────────┼────────┼────────┤
+        │  Left  │  Blue  │  Rght  │
+        └────────┴────────┴────────┘
+     */
+    [LR_REVIEW] = LAYOUT(
+        TG_LNAV, KC_7,    TG_EDIT,
+        KC_0,    KC_8,    DTP_AVC,
+        KC_LEFT, KC_6,    DTP_ADJ
+    ),
+    /*
+        Layer: Edit/Develop
+        ┌───────────┐  ┌───────────┐
+        │  Sliders  │  │   Value   │
+        │ Prv   Nxt │  │ Dec   Inc │
+        ├────────┬──┴──┴──┬────────┤
+        │ TgRevw │ Bf/Aft │ TgLNav │
+        ├────────┼────────┼────────┤
+        │ FlgRjt │  Undo  │ FlgPkd │
+        ├────────┼────────┼────────┤
+        │  Left  │  Redo  │  Rght  │
+        └────────┴────────┴────────┘
+     */
+    [LR_EDIT] = LAYOUT(
+        TG_REVW, KC_BSLS, TG_LNAV,
+        KC_X,    MC_UNDO, DTP_AVC,
+        KC_LEFT, MC_REDO, DTP_ADJ
+    ),
+    /*
+        Layer: Light
+        ┌───────────┐  ┌───────────┐
+        │  RGB Hue  │  │  RGB Sat  │
+        │ Prv   Nxt │  │ Dec   Inc │
+        ├────────┬──┴──┴──┬────────┤
+        │ RGBTgl │  Val+  │ TgLNav │
+        ├────────┼────────┼────────┤
+        │  Mode- │  Val-  │  Mode+ │
+        ├────────┼────────┼────────┤
+        │ LyrTgl │ NxtThm │  XXXX  │
+        └────────┴────────┴────────┘
+     */
+    [_LIGHT] = LAYOUT(
+        RGB_TOG, RGB_VAI, TG_LGHT,
+        RGB_RMOD,RGB_VAD, RGB_MOD,
+        RGB_LYR, RGB_THM, XXXXXXX
+    ),
+    /*
+        Layer: ADJUST
+        ┌───────────┐  ┌───────────┐
+        │    XXXX   │  │   XXXX    │
+        │           │  │           │
+        ├────────┬──┴──┴──┬────────┤
+        │  MAKE  │ Reeder │  Light │
+        ├────────┼────────┼────────┤
+        │  Media │  Navi  │  Macro │
+        ├────────┼────────┼────────┤
+        │ LR Rvw │ LR Nav │ LR Edt │
+        └────────┴────────┴────────┘
+     */
+    [_ADJUST] = LAYOUT(
+        QM_MAKE, DF_REDR, TG_LGHT,
+        DF_MEDA, DF_NAVI, DF_KBNR,
+        TG_REVW, TG_LNAV, TG_EDIT
+    ),
+};
+
+void keyboard_post_init_keymap(void){
+    // Debug to Console by default
+    debug_enable = true;
+}
+
+/**
+ * Encoder
+ */
+const uint16_t PROGMEM encoders[][2][2] = {
+    [_REEDER] = {{ KC_K, KC_J }, { KC_P, KC_N }},
+    [_MEDIA] = {{ KC_VOLD, KC_VOLU }, { KC_MPRV, KC_MNXT }},
+    [_NAVI] = {{ MC_WH_U, MC_WH_D }, { PRV_TAB, NXT_TAB }},
+    [_KARABINER] = {{ KC_PMNS, KC_PPLS }, { KC_PDOT, KC_PEQL }},
+    [LR_NAV] = {{ KC_MINS, KC_EQL }, { KC_PGDN, KC_PGUP }},
+    [LR_REVIEW] = {{ KC_LBRC, KC_RBRC }, { G(KC_DOWN), G(KC_UP) }},
+    [LR_EDIT] = {{ KC_COMM, KC_DOT }, { KC_MINS, KC_EQL }},
+};
+
+void encoder_update_user(uint8_t index, bool clockwise) {
+    uint8_t layer = get_highest_layer(layer_state);
+
+    switch (layer) {
+        case _AUDIO:
+            #ifdef AUDIO_ENABLE
+            #endif
+            break;
+        case _LIGHT:
+            #ifdef RGBLIGHT_ENABLE
+            switch (index) {
+                case 0:
+                    if (clockwise) {
+                        rgblight_increase_hue();
+                    } else {
+                        rgblight_decrease_hue();
+                    }
+                    break;
+                case 1:
+                    if (clockwise) {
+                        rgblight_increase_sat();
+                    } else {
+                        rgblight_decrease_sat();
+                    }
+                    break;
+            }
+            #endif
+            break;
+        default:
+            tap_code16(pgm_read_word(&encoders[layer][index][clockwise]));
+            break;
+    }
+}
+
+/**
+ * Keycodes
+ */
+bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case TG_LNAV:
+            if (!record->event.pressed) {
+                tap_code(KC_G);
+                layer_move(LR_NAV);
+            }
+            break;
+        case TG_REVW:
+            if (!record->event.pressed) {
+                tap_code(KC_E);
+                layer_move(LR_REVIEW);
+            }
+            break;
+        case TG_EDIT:
+            if (!record->event.pressed) {
+                tap_code(KC_D);
+                layer_move(LR_EDIT);
+            }
+            break;
+    }
+    return true;
+}
+
+/**
+ * Layer Switch
+ */
+layer_state_t layer_state_set_keymap (layer_state_t state) {
+    switch (get_highest_layer(state)) {
+        case LR_NAV:
+        #if defined(RGBLIGHT_ENABLE)
+            rgb_layer_helper(HSV_TEAL);
+        #endif
+            break;
+        case LR_REVIEW:
+        #if defined(RGBLIGHT_ENABLE)
+            rgb_layer_helper(HSV_CYAN);
+        #endif
+            break;
+        case LR_EDIT:
+        #if defined(RGBLIGHT_ENABLE)
+            rgb_layer_helper(HSV_AZURE);
+        #endif
+            break;
+        default:
+            break;
+    }
+    return state;
+}
+
+/**
+ * Tap Dances
+ */
+void process_tap_dance_keycode (bool reset, uint8_t toggle_layer) {
+    uint16_t keycode = 0;
+    switch (toggle_layer) {
+        case _LIGHT:
+            switch (get_highest_layer(layer_state)) {
+                case _REEDER:
+                case _MEDIA:
+                    keycode = KC_L;
+                    break;
+                case _NAVI:
+                    keycode = KC_PGUP;
+                    break;
+                case _KARABINER:
+                    keycode = KC_P6;
+                    break;
+                case LR_NAV:
+                    keycode = KC_END;
+                case LR_REVIEW:
+                    keycode = KC_U;
+                case LR_EDIT:
+                    keycode = KC_P;
+                    break;
+            }
+            break;
+        case _ADJUST:
+            switch (get_highest_layer(layer_state)) {
+                case _REEDER:
+                    keycode = G(KC_3);
+                    break;
+                case _KARABINER:
+                    keycode = KC_P9;
+                    break;
+                case _MEDIA:
+                case _NAVI:
+                case LR_NAV:
+                case LR_REVIEW:
+                case LR_EDIT:
+                    keycode = KC_RGHT;
+                    break;
+            }
+            break;
+    }
+    if (!reset) {
+        register_code16(keycode);
+    } else {
+        unregister_code16(keycode);
+    }
+}
diff --git a/qmk/keyboards/keebio/bdn9/keymaps/brandonschlack/readme.md b/qmk/keyboards/keebio/bdn9/keymaps/brandonschlack/readme.md
new file mode 100644
index 00000000..54e460c2
--- /dev/null
+++ b/qmk/keyboards/keebio/bdn9/keymaps/brandonschlack/readme.md
@@ -0,0 +1,107 @@
+# brandonschlack's Macropad/Lightroom layout for BDN9
+##### 2 encoders required
+
+![brandonschlack BDN9](https://i.imgur.com/pai9M0m.jpg)
+
+I built this pad to match my Lightroom photo editing workflow using
+[Lightroom Classic Keyboard shortcuts](https://helpx.adobe.com/lightroom-classic/help/keyboard-shortcuts.html), and added on general macropad layers along the way.
+
+I use macOS, so shortcuts and macros are configured as such. Encoder functionality is in the header of the tables, as clockwise/counterclockwise.
+
+---
+
+## Macropad Layers
+
+### Reeder Layer
+This layer is used for browsing [Reeder](https://reederapp.com/), an awesome RSS reader for Mac
+
+| Prev/Next Item | **Knobs** | Prev/Next Subscription |
+| --- | --- | --- |
+| Open Item in Browser | Star Item/Save for Later | Sync  |
+| Command+Tab | Toggle Read Status | Clear Read Items |
+| Starred Items | Unread Items | All Items |
+
+
+### Media Layer
+This layer is used for media controls. Player button is a hotkey to focus the current media player with [BeardedSpice](https://beardedspice.github.io/)
+
+| Volume Down/Up | **Knobs** | Prev/Next Track |
+| --- | --- | --- |
+| Mute | Current Player | Play/Pause |
+| YouTube Rewind 10s (J) | YouTube Play/Pause (K) | YouTube Forward 10s (L) |
+| Left | Space | Right |
+
+
+### Navigation Layer
+This layer is used for general window navigation around macOS
+
+| Scroll Up/Down | **Knobs** | Next/Prev Tab |
+| --- | --- | --- |
+| Reopen Tab | Cmd+Tab | Close Tab |
+| Page Down | Up | Page Up |
+| Left | Down | Right |
+
+
+### Macro Layer
+This layer is used to send generic macro keys, meant to be remapped based on current app with [Karabiner](https://pqrs.org/osx/karabiner/)
+
+| +/- | **Knobs** | =/. |
+| --- | --- | --- |
+| 1 | 2 | 3 |
+| 4 | 5 | 6 |
+| 7 | 8 | 9 |
+
+
+## Lightroom Layers
+
+### LR Navigation Layer
+This layer is used for navigating Grid View in the Library Module.
+
+| Inc/Dec Thumbnail Size | **Knobs** | Scroll Up/Dn Grid Thumbnails |
+| --- | --- | --- |
+| Review Layer | Cycle Grid View options | Edit Layer |
+| Start of Grid View | Up | End of Grid View |
+| Left | Down | Right |
+
+
+### Lightroom Review Layer
+This layer is used for Reviewing, Rating, and Culling images with the Loupe View in the Library Module.
+
+| Inc/Dec Star Rating | **Knobs** | Inc/Dec Flag Status |
+| --- | --- | --- |
+| LR Navigation Layer | Yellow Label | Edit Layer |
+| Remove Star Rating | Green Label | Unflag Photo |
+| Left | Blue Label | Right |
+
+
+### Lightroom Edit Layer
+This layer is used for editing photos in the Develop Module
+
+| Next/Prev Basic Panel Settings | **Knobs** | Inc/Dec Selected Slider |
+| --- | --- | --- |
+| Review Layer | Toggle Before View | LR Navigation Layer  |
+| Flag Rejected | Undo | Flag Picked |
+| Left | Redo | Right |
+
+
+## Meta Layers
+
+### Light Layer
+This layer is used to control lighting for the pad. Currently nothing is saved in EEPROM, so it will reset after power loss. Also currently my userspace layer colors take priority until I build out that feature. This layer is accessed with a double tap of the middle right key via [tap dance](https://docs.qmk.fm/#/feature_tap_dance). A triple tap of the middle right key will also toggle lights on/off.
+
+| Inc/Dec RGB Hue | **Knobs** | Inc/Dec RGB Saturation |
+| --- | --- | --- |
+| RGB Toggle | RGB Value Increase | Toggle Layer Off |
+| RGB Mode Prev | RGB Value Decrease | RGB Mode Next |
+| RGB Layer Indication | Cycle RGB Themes | XXX |
+
+
+### Adjust Layer
+This layer is used as a meta layer for the pad. This layer is accessed with a double tap of the bottom right key via [tap dance](https://docs.qmk.fm/#/feature_tap_dance).
+
+| XXX | **Knobs** | XXX |
+| --- | --- | --- |
+| MAKE | **Reeder** Layer | **Light** Layer |
+| **Media** Layer  | **Navigation** Layer | **Keypad** Layer |
+| **Lightroom Review** Layer | **Lightroom Navigation** Layer | **Lightroom Edit** Layer |
+
diff --git a/qmk/keyboards/keebio/bdn9/keymaps/brandonschlack/rules.mk b/qmk/keyboards/keebio/bdn9/keymaps/brandonschlack/rules.mk
new file mode 100644
index 00000000..847ef9d3
--- /dev/null
+++ b/qmk/keyboards/keebio/bdn9/keymaps/brandonschlack/rules.mk
@@ -0,0 +1,11 @@
+# Use macropad-specific defines, layers, functions. Flash bootloader with QM_MAKE
+IS_MACROPAD = yes
+
+# Use dfu bootloader for Elite-C
+BOOTLOADER = atmel-dfu
+
+# Build Options
+MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
+COMMAND_ENABLE = no         # Disable Command, breaks with Mouse Keys set to constant.
+BACKLIGHT_ENABLE = no       # No backlights installed
+TAP_DANCE_ENABLE = yes      # Use tap dance
diff --git a/qmk/keyboards/keebio/bdn9/rev1/config.h b/qmk/keyboards/keebio/bdn9/rev1/config.h
index 678be9fe..e4814d66 100644
--- a/qmk/keyboards/keebio/bdn9/rev1/config.h
+++ b/qmk/keyboards/keebio/bdn9/rev1/config.h
@@ -38,8 +38,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     { E6, B4, B2 } \
 }
 
-#define ENCODERS_PAD_A { D1, F5 }
-#define ENCODERS_PAD_B { D0, F6 }
+#define ENCODERS_PAD_A { D0, F6, B6 }
+#define ENCODERS_PAD_B { D1, F5, F7 }
 
 #define BACKLIGHT_PIN B5
 // #define BACKLIGHT_BREATHING
diff --git a/qmk/keyboards/keebio/bdn9/rev1/rules.mk b/qmk/keyboards/keebio/bdn9/rev1/rules.mk
index 176175ca..f2a0fa02 100644
--- a/qmk/keyboards/keebio/bdn9/rev1/rules.mk
+++ b/qmk/keyboards/keebio/bdn9/rev1/rules.mk
@@ -30,5 +30,4 @@ 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
 ENCODER_ENABLE = yes
\ No newline at end of file
diff --git a/qmk/keyboards/keebio/bdn9/rev2/rules.mk b/qmk/keyboards/keebio/bdn9/rev2/rules.mk
index 5e5fa2ff..ab70fdf7 100644
--- a/qmk/keyboards/keebio/bdn9/rev2/rules.mk
+++ b/qmk/keyboards/keebio/bdn9/rev2/rules.mk
@@ -19,9 +19,9 @@ MIDI_ENABLE = no            # MIDI support
 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
 ENCODER_ENABLE = yes
-RGB_MATRIX_ENABLE = WS2812
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = WS2812
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/qmk/keyboards/keebio/choconum/config.h b/qmk/keyboards/keebio/choconum/config.h
index d3a0da16..42a16135 100644
--- a/qmk/keyboards/keebio/choconum/config.h
+++ b/qmk/keyboards/keebio/choconum/config.h
@@ -173,34 +173,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/keebio/choconum/rules.mk b/qmk/keyboards/keebio/choconum/rules.mk
index 9e754e09..e7df89bf 100644
--- a/qmk/keyboards/keebio/choconum/rules.mk
+++ b/qmk/keyboards/keebio/choconum/rules.mk
@@ -19,7 +19,6 @@ MIDI_ENABLE = no            # MIDI support
 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
 
 LAYOUTS = ortho_5x4 numpad_5x4
 
diff --git a/qmk/keyboards/keebio/ergodicity/config.h b/qmk/keyboards/keebio/ergodicity/config.h
index a7438162..18a3c6d7 100644
--- a/qmk/keyboards/keebio/ergodicity/config.h
+++ b/qmk/keyboards/keebio/ergodicity/config.h
@@ -200,34 +200,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/keebio/ergodicity/rules.mk b/qmk/keyboards/keebio/ergodicity/rules.mk
index 3d318fc7..4a7ff60c 100644
--- a/qmk/keyboards/keebio/ergodicity/rules.mk
+++ b/qmk/keyboards/keebio/ergodicity/rules.mk
@@ -30,4 +30,3 @@ 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
diff --git a/qmk/keyboards/keebio/tukey/rules.mk b/qmk/keyboards/keebio/tukey/rules.mk
index af163a0d..3642bbdb 100644
--- a/qmk/keyboards/keebio/tukey/rules.mk
+++ b/qmk/keyboards/keebio/tukey/rules.mk
@@ -30,4 +30,3 @@ 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
diff --git a/qmk/keyboards/keebsforall/freebird60/config.h b/qmk/keyboards/keebsforall/freebird60/config.h
new file mode 100644
index 00000000..81b468bb
--- /dev/null
+++ b/qmk/keyboards/keebsforall/freebird60/config.h
@@ -0,0 +1,54 @@
+/*
+Copyright 2020 KnoblesseOblige
+
+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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID    0xADAD
+#define PRODUCT_ID   0xFB60
+#define DEVICE_VER   0x0001
+#define MANUFACTURER KnoblesseOblige
+#define PRODUCT      Freebird60
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 14
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+ */
+#define MATRIX_ROW_PINS { F5, F4, F1, F0, F6 }
+#define MATRIX_COL_PINS { F7, C7, C6, B6, B5, B4, D7, D6, D4, D0, D1, D2, D3, D5 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+#define DEBOUNCE 5
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
diff --git a/qmk/keyboards/keebsforall/freebird60/freebird60.c b/qmk/keyboards/keebsforall/freebird60/freebird60.c
new file mode 100644
index 00000000..abbb209d
--- /dev/null
+++ b/qmk/keyboards/keebsforall/freebird60/freebird60.c
@@ -0,0 +1,17 @@
+/* Copyright 2020 KnoblesseOblige
+ *
+ * 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 "freebird60.h"
diff --git a/qmk/keyboards/keebsforall/freebird60/freebird60.h b/qmk/keyboards/keebsforall/freebird60/freebird60.h
new file mode 100644
index 00000000..84a9fa3f
--- /dev/null
+++ b/qmk/keyboards/keebsforall/freebird60/freebird60.h
@@ -0,0 +1,57 @@
+/* Copyright 2020 KnoblesseOblige
+ *
+ * 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 kxx KC_NO
+
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,      k2d, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a,      k3c,      \
+    k40, k41, k42,           k45,                k49, k4a, k4b,      k4d  \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, kxx, k2d }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, kxx, k3c, kxx }, \
+    { k40, k41, k42, kxx, kxx, k45, kxx, kxx, kxx, k49, k4a, k4b, kxx, k4d } \
+}
+
+#define LAYOUT_all( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,      k2d, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a,      k3c, k3d, \
+    k40, k41, k42,           k45,                k49, k4a, k4b, k4c, k4d  \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, kxx, k2d }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, kxx, k3c, k3d }, \
+    { k40, k41, k42, kxx, kxx, k45, kxx, kxx, kxx, k49, k4a, k4b, k4c, k4d } \
+}
diff --git a/qmk/keyboards/keebsforall/freebird60/info.json b/qmk/keyboards/keebsforall/freebird60/info.json
new file mode 100644
index 00000000..4f013290
--- /dev/null
+++ b/qmk/keyboards/keebsforall/freebird60/info.json
@@ -0,0 +1,15 @@
+{
+    "keyboard_name": "freebird60",
+    "url": "",
+    "maintainer": "KnoblesseOblige",
+    "width": 14,
+    "height": 5,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":2.75}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1.25}, {"label":"Win", "x":11.25, "y":4, "w":1.25}, {"label":"Menu", "x":12.5, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.75, "y":4, "w":1.25}]
+        },
+        "LAYOUT_all": {
+            "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3, "w":1.75}, {"label":"Up", "x":13, "y":3, "w":1}, {"label":"Shift", "x":14, "y":3, "w":1}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4, "w":1}, {"label":"Ctrl", "x":11, "y":4, "w":1}, {"label":"Left", "x":12, "y":4, "w":1}, {"label":"Down", "x":13, "y":4, "w":1}, {"label":"Right", "x":14, "y":4, "w":1}]
+        }
+    }
+}
diff --git a/qmk/keyboards/keebsforall/freebird60/keymaps/default/keymap.c b/qmk/keyboards/keebsforall/freebird60/keymaps/default/keymap.c
new file mode 100644
index 00000000..d2540ee9
--- /dev/null
+++ b/qmk/keyboards/keebsforall/freebird60/keymaps/default/keymap.c
@@ -0,0 +1,34 @@
+/* Copyright 2020 KnoblesseOblige
+ *
+ * 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] = {
+    /* Base */
+    [0] = LAYOUT(
+        KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
+        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_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENTER,
+        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLSH, KC_RSFT,
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL
+    ),
+    [1] = LAYOUT(
+        RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______
+    ),
+};
diff --git a/qmk/keyboards/keebsforall/freebird60/keymaps/via/keymap.c b/qmk/keyboards/keebsforall/freebird60/keymaps/via/keymap.c
new file mode 100644
index 00000000..d2540ee9
--- /dev/null
+++ b/qmk/keyboards/keebsforall/freebird60/keymaps/via/keymap.c
@@ -0,0 +1,34 @@
+/* Copyright 2020 KnoblesseOblige
+ *
+ * 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] = {
+    /* Base */
+    [0] = LAYOUT(
+        KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
+        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_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENTER,
+        KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_SLSH, KC_RSFT,
+        KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL
+    ),
+    [1] = LAYOUT(
+        RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______
+    ),
+};
diff --git a/qmk/keyboards/keebsforall/freebird60/keymaps/via/rules.mk b/qmk/keyboards/keebsforall/freebird60/keymaps/via/rules.mk
new file mode 100644
index 00000000..1e5b9980
--- /dev/null
+++ b/qmk/keyboards/keebsforall/freebird60/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/qmk/keyboards/keebsforall/freebird60/readme.md b/qmk/keyboards/keebsforall/freebird60/readme.md
new file mode 100644
index 00000000..aaf2b64a
--- /dev/null
+++ b/qmk/keyboards/keebsforall/freebird60/readme.md
@@ -0,0 +1,19 @@
+# Freebird60
+
+![freebird60](https://i.imgur.com/qGtVVbyl.jpeg)
+
+A 60% hotswap keyboard with multiple layout compatibility.
+
+* Keyboard Maintainer: [KnoblesseOblige](https://github.com/KnoblesseOblige)
+* Hardware Supported: Freebird60
+* Hardware Availability: TBD
+
+Make example for this keyboard (after setting up your build environment):
+
+    make keebsforall/freebird60:default
+
+Flashing example for this keyboard:
+
+    make keebsforall/freebird60:default:flash
+
+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).
diff --git a/qmk/keyboards/keebsforall/freebird60/rules.mk b/qmk/keyboards/keebsforall/freebird60/rules.mk
new file mode 100644
index 00000000..5c0d8f30
--- /dev/null
+++ b/qmk/keyboards/keebsforall/freebird60/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+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
+# 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
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
diff --git a/qmk/keyboards/keebwerk/mega/ansi/ansi.c b/qmk/keyboards/keebwerk/mega/ansi/ansi.c
new file mode 100644
index 00000000..b5eb0bba
--- /dev/null
+++ b/qmk/keyboards/keebwerk/mega/ansi/ansi.c
@@ -0,0 +1,59 @@
+/* Copyright 2020 Yiancar
+ *
+ * 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 RGB_BACKLIGHT_KW_MEGA
+#error RGB_BACKLIGHT_KW_MEGA not defined, recheck config.h
+#endif
+
+#include "ansi.h"
+#include "drivers/issi/is31fl3733.h"
+
+uint8_t R = 0;
+uint8_t G = 0;
+uint8_t B = 0;
+
+/* Indicator LEDs are part of the LED driver
+ * Here the LEDs are used to indicate layers 1, 2 and 3.
+ * Below there is a commented out example of how to use the indicators for capslock.
+ */
+// bool led_update_kb(led_t led_state) {
+//     bool res = led_update_user(led_state);
+//     if(res) {
+//         if (led_state.caps_lock) {
+//             G = 255;
+//         } else {
+//             G = 0;
+//         }
+//         IS31FL3733_set_color( 6+64-1, R, G, B );
+//     }
+//     return res;
+// }
+
+__attribute__((weak)) layer_state_t layer_state_set_user(layer_state_t state) {
+    R = 0;
+    G = 0;
+    B = 0;
+    if (IS_LAYER_ON_STATE(layer_state, 1)) {
+        G = 255;
+    }
+    if (IS_LAYER_ON_STATE(layer_state, 2)) {
+        R = 255;
+    }
+    if (IS_LAYER_ON_STATE(layer_state, 3)) {
+        B = 255;
+    }
+    IS31FL3733_set_color( 6+64-1, R, G, B );
+  return state;
+}
diff --git a/qmk/keyboards/keebwerk/mega/ansi/ansi.h b/qmk/keyboards/keebwerk/mega/ansi/ansi.h
new file mode 100644
index 00000000..daba3627
--- /dev/null
+++ b/qmk/keyboards/keebwerk/mega/ansi/ansi.h
@@ -0,0 +1,38 @@
+/* Copyright 2020 Yiancar
+ *
+ * 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
+
+#define XXX KC_NO
+
+#include "quantum.h"
+#include "../wilba_tech/wt_rgb_backlight_keycodes.h"
+#include "via.h"
+
+// This a shortcut to help you visually see your layout.
+
+#define LAYOUT_65_ansi( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K2C, K1E, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, K2E, \
+    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E, \
+    K40, K41, K42,                K46,           K49, K4A, K4B, K4C, K4D, K4E  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, XXX, K1E }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
+    { K30, XXX, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
+    { K40, K41, K42, XXX, XXX, XXX, K46, XXX, XXX, K49, K4A, K4B, K4C, K4D, K4E }  \
+}
diff --git a/qmk/keyboards/keebwerk/mega/ansi/config.h b/qmk/keyboards/keebwerk/mega/ansi/config.h
new file mode 100644
index 00000000..9f9a225e
--- /dev/null
+++ b/qmk/keyboards/keebwerk/mega/ansi/config.h
@@ -0,0 +1,145 @@
+/*
+Copyright 2020 Yiancar
+
+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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x8968
+#define PRODUCT_ID      0x4B41
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Yiancar-Designs
+#define PRODUCT         Keebwerk Mega ANSI
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+#define MATRIX_ROW_PINS { B3, B4, B5, A8, A4 }
+#define MATRIX_COL_PINS { A13, A10, A9, A14, A15, B8, B9, C13, C14, C15, A0, A1, A2, A3, A5 }
+// To enable debugger set A13 A14 -> A5 A7
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is userful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+// #define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Magic Key Options
+ *
+ * Magic keys are hotkey commands that allow control over firmware functions of
+ * the keyboard. They are best used in combination with the HID Listen program,
+ * found here: https://www.pjrc.com/teensy/hid_listen.html
+ *
+ * The options below allow the magic key functionality to be changed. This is
+ * useful if your keyboard/keypad is missing keys and you want magic key support.
+ *
+ */
+
+/* Bootmagic Lite key configuration */
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 0
+
+/* Backlight options */
+
+#define RGB_BACKLIGHT_ENABLED 1
+
+#define RGB_BACKLIGHT_KW_MEGA
+
+// they aren't really used if RGB_BACKLIGHT_HS60 defined
+#define RGB_BACKLIGHT_USE_SPLIT_BACKSPACE 0
+#define RGB_BACKLIGHT_USE_SPLIT_LEFT_SHIFT 0
+#define RGB_BACKLIGHT_USE_SPLIT_RIGHT_SHIFT 0
+#define RGB_BACKLIGHT_USE_7U_SPACEBAR 0
+#define RGB_BACKLIGHT_USE_ISO_ENTER 0
+#define RGB_BACKLIGHT_DISABLE_HHKB_BLOCKER_LEDS 0
+
+// disable backlight when USB suspended (PC sleep/hibernate/shutdown)
+#define RGB_BACKLIGHT_DISABLE_WHEN_USB_SUSPENDED 0
+
+// disable backlight after timeout in minutes, 0 = no timeout
+#define RGB_BACKLIGHT_DISABLE_AFTER_TIMEOUT 0
+
+// the default brightness
+#define RGB_BACKLIGHT_BRIGHTNESS 255
+
+// the default effect (RGB test)
+#define RGB_BACKLIGHT_EFFECT 6
+
+// the default effect speed (0-3)
+#define RGB_BACKLIGHT_EFFECT_SPEED 0
+
+// the default color1 and color2
+#define RGB_BACKLIGHT_COLOR_1 { .h = 0, .s = 255 }
+#define RGB_BACKLIGHT_COLOR_2 { .h = 127, .s = 255 }
+
+#define DRIVER_COUNT 2
+#define DRIVER_LED_TOTAL 128
+
+// These define which keys in the matrix are alphas/mods
+// Used for backlight effects so colors are different for
+// alphas vs. mods
+// Each value is for a row, bit 0 is column 0
+// Alpha=0 Mod=1
+#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_0 0b0110000000000001
+#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_1 0b0100000000000001
+#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_2 0b0110000000000001
+#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_3 0b0111000000000001
+#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_4 0b0111111000000111
+
+#define RGB_BACKLIGHT_CAPS_LOCK_INDICATOR { .color = { .h = 0, .s = 0 }, .index = 255 }
+#define RGB_BACKLIGHT_LAYER_1_INDICATOR { .color = { .h = 0, .s = 0 }, .index = 255 }
+#define RGB_BACKLIGHT_LAYER_2_INDICATOR { .color = { .h = 0, .s = 0 }, .index = 255 }
+#define RGB_BACKLIGHT_LAYER_3_INDICATOR { .color = { .h = 0, .s = 0 }, .index = 255 }
+
+// Backlight config starts after VIA's EEPROM usage,
+// dynamic keymaps start after this.
+#define VIA_EEPROM_CUSTOM_CONFIG_SIZE 32
+
+// VIA lighting is handled by the keyboard-level code
+#define VIA_CUSTOM_LIGHTING_ENABLE
diff --git a/qmk/keyboards/keebwerk/mega/ansi/info.json b/qmk/keyboards/keebwerk/mega/ansi/info.json
new file mode 100644
index 00000000..a9bbf797
--- /dev/null
+++ b/qmk/keyboards/keebwerk/mega/ansi/info.json
@@ -0,0 +1,12 @@
+{
+    "keyboard_name": "Keebwerk Mega",
+    "url": "",
+    "maintainer": "Yiancar",
+    "width": 16,
+    "height": 5,
+    "layouts": {
+        "LAYOUT_65_ansi": {
+            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Home", "x":15, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Page Up", "x":15, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Page Down", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"\u2191", "x":14, "y":3}, {"label":"End", "x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"label":"Alt", "x":10, "y":4}, {"label":"Fn", "x":11, "y":4}, {"label":"Ctrl", "x":12, "y":4}, {"label":"\u2190", "x":13, "y":4}, {"label":"\u2193", "x":14, "y":4}, {"label":"\u2192", "x":15, "y":4}]
+        }
+    }
+}
\ No newline at end of file
diff --git a/qmk/keyboards/keebwerk/mega/ansi/keymaps/default/keymap.c b/qmk/keyboards/keebwerk/mega/ansi/keymaps/default/keymap.c
new file mode 100644
index 00000000..1d95e13c
--- /dev/null
+++ b/qmk/keyboards/keebwerk/mega/ansi/keymaps/default/keymap.c
@@ -0,0 +1,32 @@
+/* Copyright 2020 Yiancar
+ *
+ * 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_65_ansi( /* Base */
+    KC_GESC, 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_HOME,
+    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_PGUP,
+    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_PGDN,
+    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_END,
+    KC_LCTL, KC_LGUI, KC_LALT,                KC_SPC,                          KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+[1] = LAYOUT_65_ansi( /* FN */
+    KC_GRV,  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_DEL,  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, RESET,   KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, S1_DEC,  S1_INC,  S2_DEC,  S2_INC,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+    KC_TRNS, EF_DEC,  EF_INC,  H1_DEC,  H1_INC,  H2_DEC,  H2_INC,  BR_DEC,  BR_INC,  ES_DEC,  ES_INC,  KC_TRNS,          KC_TRNS, KC_TRNS,
+    KC_VOLU, KC_VOLD, KC_MUTE,                KC_TRNS,                               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+};
diff --git a/qmk/keyboards/keebwerk/mega/ansi/keymaps/default/readme.md b/qmk/keyboards/keebwerk/mega/ansi/keymaps/default/readme.md
new file mode 100644
index 00000000..ec43a9e1
--- /dev/null
+++ b/qmk/keyboards/keebwerk/mega/ansi/keymaps/default/readme.md
@@ -0,0 +1,7 @@
+# The default keymap for ANSI Keebwerk Mega. VIA support disabled.
+
+![Layer 0](https://i.imgur.com/RcuLofrl.png)
+
+![Layer 1](https://i.imgur.com/NJOORcdl.png)
+
+Default layer is normal ANSI 65%
diff --git a/qmk/keyboards/keebwerk/mega/ansi/keymaps/via/keymap.c b/qmk/keyboards/keebwerk/mega/ansi/keymaps/via/keymap.c
new file mode 100644
index 00000000..59ccdf68
--- /dev/null
+++ b/qmk/keyboards/keebwerk/mega/ansi/keymaps/via/keymap.c
@@ -0,0 +1,46 @@
+/* Copyright 2020 Yiancar
+ *
+ * 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_65_ansi( /* Base */
+    KC_GESC, 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_HOME,
+    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_PGUP,
+    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_PGDN,
+    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_END,
+    KC_LCTL, KC_LGUI, KC_LALT,                KC_SPC,                          KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+
+[1] = LAYOUT_65_ansi( /* FN */
+    KC_GRV,  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_DEL,  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, RESET,   KC_TRNS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, S1_DEC,  S1_INC,  S2_DEC,  S2_INC,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS, KC_TRNS,
+    KC_TRNS, EF_DEC,  EF_INC,  H1_DEC,  H1_INC,  H2_DEC,  H2_INC,  BR_DEC,  BR_INC,  ES_DEC,  ES_INC,  KC_TRNS,          KC_TRNS, KC_TRNS,
+    KC_VOLU, KC_VOLD, KC_MUTE,                KC_TRNS,                               KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+[2] = LAYOUT_65_ansi( /* Empty for dynamic keymaps */
+    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, 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),
+
+[3] = LAYOUT_65_ansi( /* Empty for dynamic keymaps */
+    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, 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),
+};
diff --git a/qmk/keyboards/keebwerk/mega/ansi/keymaps/via/readme.md b/qmk/keyboards/keebwerk/mega/ansi/keymaps/via/readme.md
new file mode 100644
index 00000000..e78684fa
--- /dev/null
+++ b/qmk/keyboards/keebwerk/mega/ansi/keymaps/via/readme.md
@@ -0,0 +1,7 @@
+# The default keymap for ANSI Keebwerk Mega. VIA support enabled.
+
+![Layer 0](https://i.imgur.com/RcuLofrl.png)
+
+![Layer 1](https://i.imgur.com/NJOORcdl.png)
+
+Default layer is normal ANSI 65%
diff --git a/qmk/keyboards/keebwerk/mega/ansi/keymaps/via/rules.mk b/qmk/keyboards/keebwerk/mega/ansi/keymaps/via/rules.mk
new file mode 100644
index 00000000..1e5b9980
--- /dev/null
+++ b/qmk/keyboards/keebwerk/mega/ansi/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/qmk/keyboards/keebwerk/mega/ansi/rules.mk b/qmk/keyboards/keebwerk/mega/ansi/rules.mk
new file mode 100644
index 00000000..5e664cb8
--- /dev/null
+++ b/qmk/keyboards/keebwerk/mega/ansi/rules.mk
@@ -0,0 +1,36 @@
+# MCU name
+MCU = STM32F303
+
+# Do not put the microcontroller into power saving mode
+# when we get USB suspend event. We want it to keep updating
+# backlight effects.
+OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
+
+# Build Options
+#   change yes to no to disable
+#
+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
+# 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 = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+NO_USB_STARTUP_CHECK = no   # Disable initialization only when usb is plugged in
+
+CIE1931_CURVE = yes
+
+LAYOUTS = 65_ansi
+
+# project specific files
+SRC +=  keyboards/wilba_tech/wt_main.c \
+        keyboards/wilba_tech/wt_rgb_backlight.c \
+        drivers/issi/is31fl3733.c \
+        quantum/color.c
+QUANTUM_LIB_SRC += drivers/chibios/i2c_master.c
diff --git a/qmk/keyboards/keebwerk/mega/chconf.h b/qmk/keyboards/keebwerk/mega/chconf.h
new file mode 100644
index 00000000..aac33037
--- /dev/null
+++ b/qmk/keyboards/keebwerk/mega/chconf.h
@@ -0,0 +1,714 @@
+/*
+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+/**
+ * @file    rt/templates/chconf.h
+ * @brief   Configuration file template.
+ * @details A copy of this file must be placed in each project directory, it
+ *          contains the application specific kernel settings.
+ *
+ * @addtogroup config
+ * @details Kernel related settings and hooks.
+ * @{
+ */
+
+#ifndef CHCONF_H
+#define CHCONF_H
+
+#define _CHIBIOS_RT_CONF_
+#define _CHIBIOS_RT_CONF_VER_6_0_
+
+/*===========================================================================*/
+/**
+ * @name System timers settings
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   System time counter resolution.
+ * @note    Allowed values are 16 or 32 bits.
+ */
+#if !defined(CH_CFG_ST_RESOLUTION)
+#define CH_CFG_ST_RESOLUTION                32
+#endif
+
+/**
+ * @brief   System tick frequency.
+ * @details Frequency of the system timer that drives the system ticks. This
+ *          setting also defines the system tick time unit.
+ */
+#if !defined(CH_CFG_ST_FREQUENCY)
+#define CH_CFG_ST_FREQUENCY                 100000
+#endif
+
+/**
+ * @brief   Time intervals data size.
+ * @note    Allowed values are 16, 32 or 64 bits.
+ */
+#if !defined(CH_CFG_INTERVALS_SIZE)
+#define CH_CFG_INTERVALS_SIZE               32
+#endif
+
+/**
+ * @brief   Time types data size.
+ * @note    Allowed values are 16 or 32 bits.
+ */
+#if !defined(CH_CFG_TIME_TYPES_SIZE)
+#define CH_CFG_TIME_TYPES_SIZE              32
+#endif
+
+/**
+ * @brief   Time delta constant for the tick-less mode.
+ * @note    If this value is zero then the system uses the classic
+ *          periodic tick. This value represents the minimum number
+ *          of ticks that is safe to specify in a timeout directive.
+ *          The value one is not valid, timeouts are rounded up to
+ *          this value.
+ */
+#if !defined(CH_CFG_ST_TIMEDELTA)
+#define CH_CFG_ST_TIMEDELTA                 2
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Kernel parameters and options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   Round robin interval.
+ * @details This constant is the number of system ticks allowed for the
+ *          threads before preemption occurs. Setting this value to zero
+ *          disables the preemption for threads with equal priority and the
+ *          round robin becomes cooperative. Note that higher priority
+ *          threads can still preempt, the kernel is always preemptive.
+ * @note    Disabling the round robin preemption makes the kernel more compact
+ *          and generally faster.
+ * @note    The round robin preemption is not supported in tickless mode and
+ *          must be set to zero in that case.
+ */
+#if !defined(CH_CFG_TIME_QUANTUM)
+#define CH_CFG_TIME_QUANTUM                 0
+#endif
+
+/**
+ * @brief   Managed RAM size.
+ * @details Size of the RAM area to be managed by the OS. If set to zero
+ *          then the whole available RAM is used. The core memory is made
+ *          available to the heap allocator and/or can be used directly through
+ *          the simplified core memory allocator.
+ *
+ * @note    In order to let the OS manage the whole RAM the linker script must
+ *          provide the @p __heap_base__ and @p __heap_end__ symbols.
+ * @note    Requires @p CH_CFG_USE_MEMCORE.
+ */
+#if !defined(CH_CFG_MEMCORE_SIZE)
+#define CH_CFG_MEMCORE_SIZE                 0
+#endif
+
+/**
+ * @brief   Idle thread automatic spawn suppression.
+ * @details When this option is activated the function @p chSysInit()
+ *          does not spawn the idle thread. The application @p main()
+ *          function becomes the idle thread and must implement an
+ *          infinite loop.
+ */
+#if !defined(CH_CFG_NO_IDLE_THREAD)
+#define CH_CFG_NO_IDLE_THREAD               FALSE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Performance options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   OS optimization.
+ * @details If enabled then time efficient rather than space efficient code
+ *          is used when two possible implementations exist.
+ *
+ * @note    This is not related to the compiler optimization options.
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_OPTIMIZE_SPEED)
+#define CH_CFG_OPTIMIZE_SPEED               TRUE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Subsystem options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   Time Measurement APIs.
+ * @details If enabled then the time measurement APIs are included in
+ *          the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_TM)
+#define CH_CFG_USE_TM                       TRUE
+#endif
+
+/**
+ * @brief   Threads registry APIs.
+ * @details If enabled then the registry APIs are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_REGISTRY)
+#define CH_CFG_USE_REGISTRY                 TRUE
+#endif
+
+/**
+ * @brief   Threads synchronization APIs.
+ * @details If enabled then the @p chThdWait() function is included in
+ *          the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_WAITEXIT)
+#define CH_CFG_USE_WAITEXIT                 TRUE
+#endif
+
+/**
+ * @brief   Semaphores APIs.
+ * @details If enabled then the Semaphores APIs are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_SEMAPHORES)
+#define CH_CFG_USE_SEMAPHORES               TRUE
+#endif
+
+/**
+ * @brief   Semaphores queuing mode.
+ * @details If enabled then the threads are enqueued on semaphores by
+ *          priority rather than in FIFO order.
+ *
+ * @note    The default is @p FALSE. Enable this if you have special
+ *          requirements.
+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.
+ */
+#if !defined(CH_CFG_USE_SEMAPHORES_PRIORITY)
+#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE
+#endif
+
+/**
+ * @brief   Mutexes APIs.
+ * @details If enabled then the mutexes APIs are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_MUTEXES)
+#define CH_CFG_USE_MUTEXES                  TRUE
+#endif
+
+/**
+ * @brief   Enables recursive behavior on mutexes.
+ * @note    Recursive mutexes are heavier and have an increased
+ *          memory footprint.
+ *
+ * @note    The default is @p FALSE.
+ * @note    Requires @p CH_CFG_USE_MUTEXES.
+ */
+#if !defined(CH_CFG_USE_MUTEXES_RECURSIVE)
+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE
+#endif
+
+/**
+ * @brief   Conditional Variables APIs.
+ * @details If enabled then the conditional variables APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_MUTEXES.
+ */
+#if !defined(CH_CFG_USE_CONDVARS)
+#define CH_CFG_USE_CONDVARS                 TRUE
+#endif
+
+/**
+ * @brief   Conditional Variables APIs with timeout.
+ * @details If enabled then the conditional variables APIs with timeout
+ *          specification are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_CONDVARS.
+ */
+#if !defined(CH_CFG_USE_CONDVARS_TIMEOUT)
+#define CH_CFG_USE_CONDVARS_TIMEOUT         TRUE
+#endif
+
+/**
+ * @brief   Events Flags APIs.
+ * @details If enabled then the event flags APIs are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_EVENTS)
+#define CH_CFG_USE_EVENTS                   TRUE
+#endif
+
+/**
+ * @brief   Events Flags APIs with timeout.
+ * @details If enabled then the events APIs with timeout specification
+ *          are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_EVENTS.
+ */
+#if !defined(CH_CFG_USE_EVENTS_TIMEOUT)
+#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE
+#endif
+
+/**
+ * @brief   Synchronous Messages APIs.
+ * @details If enabled then the synchronous messages APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_MESSAGES)
+#define CH_CFG_USE_MESSAGES                 TRUE
+#endif
+
+/**
+ * @brief   Synchronous Messages queuing mode.
+ * @details If enabled then messages are served by priority rather than in
+ *          FIFO order.
+ *
+ * @note    The default is @p FALSE. Enable this if you have special
+ *          requirements.
+ * @note    Requires @p CH_CFG_USE_MESSAGES.
+ */
+#if !defined(CH_CFG_USE_MESSAGES_PRIORITY)
+#define CH_CFG_USE_MESSAGES_PRIORITY        TRUE
+#endif
+
+/**
+ * @brief   Mailboxes APIs.
+ * @details If enabled then the asynchronous messages (mailboxes) APIs are
+ *          included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.
+ */
+#if !defined(CH_CFG_USE_MAILBOXES)
+#define CH_CFG_USE_MAILBOXES                TRUE
+#endif
+
+/**
+ * @brief   Core Memory Manager APIs.
+ * @details If enabled then the core memory manager APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_MEMCORE)
+#define CH_CFG_USE_MEMCORE                  TRUE
+#endif
+
+/**
+ * @brief   Heap Allocator APIs.
+ * @details If enabled then the memory heap allocator APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_MEMCORE and either @p CH_CFG_USE_MUTEXES or
+ *          @p CH_CFG_USE_SEMAPHORES.
+ * @note    Mutexes are recommended.
+ */
+#if !defined(CH_CFG_USE_HEAP)
+#define CH_CFG_USE_HEAP                     TRUE
+#endif
+
+/**
+ * @brief   Memory Pools Allocator APIs.
+ * @details If enabled then the memory pools allocator APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_MEMPOOLS)
+#define CH_CFG_USE_MEMPOOLS                 TRUE
+#endif
+
+/**
+ * @brief   Objects FIFOs APIs.
+ * @details If enabled then the objects FIFOs APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_OBJ_FIFOS)
+#define CH_CFG_USE_OBJ_FIFOS                TRUE
+#endif
+
+/**
+ * @brief   Pipes APIs.
+ * @details If enabled then the pipes APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_PIPES)
+#define CH_CFG_USE_PIPES                    TRUE
+#endif
+
+/**
+ * @brief   Dynamic Threads APIs.
+ * @details If enabled then the dynamic threads creation APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_WAITEXIT.
+ * @note    Requires @p CH_CFG_USE_HEAP and/or @p CH_CFG_USE_MEMPOOLS.
+ */
+#if !defined(CH_CFG_USE_DYNAMIC)
+#define CH_CFG_USE_DYNAMIC                  TRUE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Objects factory options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   Objects Factory APIs.
+ * @details If enabled then the objects factory APIs are included in the
+ *          kernel.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_CFG_USE_FACTORY)
+#define CH_CFG_USE_FACTORY                  TRUE
+#endif
+
+/**
+ * @brief   Maximum length for object names.
+ * @details If the specified length is zero then the name is stored by
+ *          pointer but this could have unintended side effects.
+ */
+#if !defined(CH_CFG_FACTORY_MAX_NAMES_LENGTH)
+#define CH_CFG_FACTORY_MAX_NAMES_LENGTH     8
+#endif
+
+/**
+ * @brief   Enables the registry of generic objects.
+ */
+#if !defined(CH_CFG_FACTORY_OBJECTS_REGISTRY)
+#define CH_CFG_FACTORY_OBJECTS_REGISTRY     TRUE
+#endif
+
+/**
+ * @brief   Enables factory for generic buffers.
+ */
+#if !defined(CH_CFG_FACTORY_GENERIC_BUFFERS)
+#define CH_CFG_FACTORY_GENERIC_BUFFERS      TRUE
+#endif
+
+/**
+ * @brief   Enables factory for semaphores.
+ */
+#if !defined(CH_CFG_FACTORY_SEMAPHORES)
+#define CH_CFG_FACTORY_SEMAPHORES           TRUE
+#endif
+
+/**
+ * @brief   Enables factory for mailboxes.
+ */
+#if !defined(CH_CFG_FACTORY_MAILBOXES)
+#define CH_CFG_FACTORY_MAILBOXES            TRUE
+#endif
+
+/**
+ * @brief   Enables factory for objects FIFOs.
+ */
+#if !defined(CH_CFG_FACTORY_OBJ_FIFOS)
+#define CH_CFG_FACTORY_OBJ_FIFOS            TRUE
+#endif
+
+/**
+ * @brief   Enables factory for Pipes.
+ */
+#if !defined(CH_CFG_FACTORY_PIPES) || defined(__DOXYGEN__)
+#define CH_CFG_FACTORY_PIPES                TRUE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Debug options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   Debug option, kernel statistics.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_STATISTICS)
+#define CH_DBG_STATISTICS                   FALSE
+#endif
+
+/**
+ * @brief   Debug option, system state check.
+ * @details If enabled the correct call protocol for system APIs is checked
+ *          at runtime.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_SYSTEM_STATE_CHECK)
+#define CH_DBG_SYSTEM_STATE_CHECK           FALSE
+#endif
+
+/**
+ * @brief   Debug option, parameters checks.
+ * @details If enabled then the checks on the API functions input
+ *          parameters are activated.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_ENABLE_CHECKS)
+#define CH_DBG_ENABLE_CHECKS                FALSE
+#endif
+
+/**
+ * @brief   Debug option, consistency checks.
+ * @details If enabled then all the assertions in the kernel code are
+ *          activated. This includes consistency checks inside the kernel,
+ *          runtime anomalies and port-defined checks.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_ENABLE_ASSERTS)
+#define CH_DBG_ENABLE_ASSERTS               FALSE
+#endif
+
+/**
+ * @brief   Debug option, trace buffer.
+ * @details If enabled then the trace buffer is activated.
+ *
+ * @note    The default is @p CH_DBG_TRACE_MASK_DISABLED.
+ */
+#if !defined(CH_DBG_TRACE_MASK)
+#define CH_DBG_TRACE_MASK                   CH_DBG_TRACE_MASK_DISABLED
+#endif
+
+/**
+ * @brief   Trace buffer entries.
+ * @note    The trace buffer is only allocated if @p CH_DBG_TRACE_MASK is
+ *          different from @p CH_DBG_TRACE_MASK_DISABLED.
+ */
+#if !defined(CH_DBG_TRACE_BUFFER_SIZE)
+#define CH_DBG_TRACE_BUFFER_SIZE            128
+#endif
+
+/**
+ * @brief   Debug option, stack checks.
+ * @details If enabled then a runtime stack check is performed.
+ *
+ * @note    The default is @p FALSE.
+ * @note    The stack check is performed in a architecture/port dependent way.
+ *          It may not be implemented or some ports.
+ * @note    The default failure mode is to halt the system with the global
+ *          @p panic_msg variable set to @p NULL.
+ */
+#if !defined(CH_DBG_ENABLE_STACK_CHECK)
+#define CH_DBG_ENABLE_STACK_CHECK           TRUE
+#endif
+
+/**
+ * @brief   Debug option, stacks initialization.
+ * @details If enabled then the threads working area is filled with a byte
+ *          value when a thread is created. This can be useful for the
+ *          runtime measurement of the used stack.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_FILL_THREADS)
+#define CH_DBG_FILL_THREADS                 FALSE
+#endif
+
+/**
+ * @brief   Debug option, threads profiling.
+ * @details If enabled then a field is added to the @p thread_t structure that
+ *          counts the system ticks occurred while executing the thread.
+ *
+ * @note    The default is @p FALSE.
+ * @note    This debug option is not currently compatible with the
+ *          tickless mode.
+ */
+#if !defined(CH_DBG_THREADS_PROFILING)
+#define CH_DBG_THREADS_PROFILING            FALSE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Kernel hooks
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   System structure extension.
+ * @details User fields added to the end of the @p ch_system_t structure.
+ */
+#define CH_CFG_SYSTEM_EXTRA_FIELDS                                          \
+  /* Add threads custom fields here.*/
+
+/**
+ * @brief   System initialization hook.
+ * @details User initialization code added to the @p chSysInit() function
+ *          just before interrupts are enabled globally.
+ */
+#define CH_CFG_SYSTEM_INIT_HOOK() {                                         \
+  /* Add threads initialization code here.*/                                \
+}
+
+/**
+ * @brief   Threads descriptor structure extension.
+ * @details User fields added to the end of the @p thread_t structure.
+ */
+#define CH_CFG_THREAD_EXTRA_FIELDS                                          \
+  /* Add threads custom fields here.*/
+
+/**
+ * @brief   Threads initialization hook.
+ * @details User initialization code added to the @p _thread_init() function.
+ *
+ * @note    It is invoked from within @p _thread_init() and implicitly from all
+ *          the threads creation APIs.
+ */
+#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \
+  /* Add threads initialization code here.*/                                \
+}
+
+/**
+ * @brief   Threads finalization hook.
+ * @details User finalization code added to the @p chThdExit() API.
+ */
+#define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \
+  /* Add threads finalization code here.*/                                  \
+}
+
+/**
+ * @brief   Context switch hook.
+ * @details This hook is invoked just before switching between threads.
+ */
+#define CH_CFG_CONTEXT_SWITCH_HOOK(ntp, otp) {                              \
+  /* Context switch code here.*/                                            \
+}
+
+/**
+ * @brief   ISR enter hook.
+ */
+#define CH_CFG_IRQ_PROLOGUE_HOOK() {                                        \
+  /* IRQ prologue code here.*/                                              \
+}
+
+/**
+ * @brief   ISR exit hook.
+ */
+#define CH_CFG_IRQ_EPILOGUE_HOOK() {                                        \
+  /* IRQ epilogue code here.*/                                              \
+}
+
+/**
+ * @brief   Idle thread enter hook.
+ * @note    This hook is invoked within a critical zone, no OS functions
+ *          should be invoked from here.
+ * @note    This macro can be used to activate a power saving mode.
+ */
+#define CH_CFG_IDLE_ENTER_HOOK() {                                          \
+  /* Idle-enter code here.*/                                                \
+}
+
+/**
+ * @brief   Idle thread leave hook.
+ * @note    This hook is invoked within a critical zone, no OS functions
+ *          should be invoked from here.
+ * @note    This macro can be used to deactivate a power saving mode.
+ */
+#define CH_CFG_IDLE_LEAVE_HOOK() {                                          \
+  /* Idle-leave code here.*/                                                \
+}
+
+/**
+ * @brief   Idle Loop hook.
+ * @details This hook is continuously invoked by the idle thread loop.
+ */
+#define CH_CFG_IDLE_LOOP_HOOK() {                                           \
+  /* Idle loop code here.*/                                                 \
+}
+
+/**
+ * @brief   System tick event hook.
+ * @details This hook is invoked in the system tick handler immediately
+ *          after processing the virtual timers queue.
+ */
+#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \
+  /* System tick event code here.*/                                         \
+}
+
+/**
+ * @brief   System halt hook.
+ * @details This hook is invoked in case to a system halting error before
+ *          the system is halted.
+ */
+#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \
+  /* System halt code here.*/                                               \
+}
+
+/**
+ * @brief   Trace hook.
+ * @details This hook is invoked each time a new record is written in the
+ *          trace buffer.
+ */
+#define CH_CFG_TRACE_HOOK(tep) {                                            \
+  /* Trace code here.*/                                                     \
+}
+
+/** @} */
+
+/*===========================================================================*/
+/* Port-specific settings (override port settings defaulted in chcore.h).    */
+/*===========================================================================*/
+
+#endif  /* CHCONF_H */
+
+/** @} */
diff --git a/qmk/keyboards/keebwerk/mega/halconf.h b/qmk/keyboards/keebwerk/mega/halconf.h
new file mode 100644
index 00000000..9306b2cf
--- /dev/null
+++ b/qmk/keyboards/keebwerk/mega/halconf.h
@@ -0,0 +1,525 @@
+/*
+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+/**
+ * @file    templates/halconf.h
+ * @brief   HAL configuration header.
+ * @details HAL configuration file, this file allows to enable or disable the
+ *          various device drivers from your application. You may also use
+ *          this file in order to override the device drivers default settings.
+ *
+ * @addtogroup HAL_CONF
+ * @{
+ */
+
+#ifndef HALCONF_H
+#define HALCONF_H
+
+#define _CHIBIOS_HAL_CONF_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
+
+#include "mcuconf.h"
+
+/**
+ * @brief   Enables the PAL subsystem.
+ */
+#if !defined(HAL_USE_PAL) || defined(__DOXYGEN__)
+#define HAL_USE_PAL                         TRUE
+#endif
+
+/**
+ * @brief   Enables the ADC subsystem.
+ */
+#if !defined(HAL_USE_ADC) || defined(__DOXYGEN__)
+#define HAL_USE_ADC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the CAN subsystem.
+ */
+#if !defined(HAL_USE_CAN) || defined(__DOXYGEN__)
+#define HAL_USE_CAN                         FALSE
+#endif
+
+/**
+ * @brief   Enables the cryptographic subsystem.
+ */
+#if !defined(HAL_USE_CRY) || defined(__DOXYGEN__)
+#define HAL_USE_CRY                         FALSE
+#endif
+
+/**
+ * @brief   Enables the DAC subsystem.
+ */
+#if !defined(HAL_USE_DAC) || defined(__DOXYGEN__)
+#define HAL_USE_DAC                         TRUE
+#endif
+
+/**
+ * @brief   Enables the GPT subsystem.
+ */
+#if !defined(HAL_USE_GPT) || defined(__DOXYGEN__)
+#define HAL_USE_GPT                         TRUE
+#endif
+
+/**
+ * @brief   Enables the I2C subsystem.
+ */
+#if !defined(HAL_USE_I2C) || defined(__DOXYGEN__)
+#define HAL_USE_I2C                         TRUE
+#endif
+
+/**
+ * @brief   Enables the I2S subsystem.
+ */
+#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)
+#define HAL_USE_I2S                         FALSE
+#endif
+
+/**
+ * @brief   Enables the ICU subsystem.
+ */
+#if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)
+#define HAL_USE_ICU                         FALSE
+#endif
+
+/**
+ * @brief   Enables the MAC subsystem.
+ */
+#if !defined(HAL_USE_MAC) || defined(__DOXYGEN__)
+#define HAL_USE_MAC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the MMC_SPI subsystem.
+ */
+#if !defined(HAL_USE_MMC_SPI) || defined(__DOXYGEN__)
+#define HAL_USE_MMC_SPI                     FALSE
+#endif
+
+/**
+ * @brief   Enables the PWM subsystem.
+ */
+#if !defined(HAL_USE_PWM) || defined(__DOXYGEN__)
+#define HAL_USE_PWM                         FALSE
+#endif
+
+/**
+ * @brief   Enables the RTC subsystem.
+ */
+#if !defined(HAL_USE_RTC) || defined(__DOXYGEN__)
+#define HAL_USE_RTC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the SDC subsystem.
+ */
+#if !defined(HAL_USE_SDC) || defined(__DOXYGEN__)
+#define HAL_USE_SDC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the SERIAL subsystem.
+ */
+#if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__)
+#define HAL_USE_SERIAL                      FALSE
+#endif
+
+/**
+ * @brief   Enables the SERIAL over USB subsystem.
+ */
+#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)
+#define HAL_USE_SERIAL_USB                  TRUE
+#endif
+
+/**
+ * @brief   Enables the SIO subsystem.
+ */
+#if !defined(HAL_USE_SIO) || defined(__DOXYGEN__)
+#define HAL_USE_SIO                         FALSE
+#endif
+
+/**
+ * @brief   Enables the SPI subsystem.
+ */
+#if !defined(HAL_USE_SPI) || defined(__DOXYGEN__)
+#define HAL_USE_SPI                         FALSE
+#endif
+
+/**
+ * @brief   Enables the TRNG subsystem.
+ */
+#if !defined(HAL_USE_TRNG) || defined(__DOXYGEN__)
+#define HAL_USE_TRNG                        FALSE
+#endif
+
+/**
+ * @brief   Enables the UART subsystem.
+ */
+#if !defined(HAL_USE_UART) || defined(__DOXYGEN__)
+#define HAL_USE_UART                        FALSE
+#endif
+
+/**
+ * @brief   Enables the USB subsystem.
+ */
+#if !defined(HAL_USE_USB) || defined(__DOXYGEN__)
+#define HAL_USE_USB                         TRUE
+#endif
+
+/**
+ * @brief   Enables the WDG subsystem.
+ */
+#if !defined(HAL_USE_WDG) || defined(__DOXYGEN__)
+#define HAL_USE_WDG                         FALSE
+#endif
+
+/**
+ * @brief   Enables the WSPI subsystem.
+ */
+#if !defined(HAL_USE_WSPI) || defined(__DOXYGEN__)
+#define HAL_USE_WSPI                        FALSE
+#endif
+
+/*===========================================================================*/
+/* PAL driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(PAL_USE_CALLBACKS) || defined(__DOXYGEN__)
+#define PAL_USE_CALLBACKS                   FALSE
+#endif
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(PAL_USE_WAIT) || defined(__DOXYGEN__)
+#define PAL_USE_WAIT                        FALSE
+#endif
+
+/*===========================================================================*/
+/* ADC driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(ADC_USE_WAIT) || defined(__DOXYGEN__)
+#define ADC_USE_WAIT                        TRUE
+#endif
+
+/**
+ * @brief   Enables the @p adcAcquireBus() and @p adcReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(ADC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define ADC_USE_MUTUAL_EXCLUSION            TRUE
+#endif
+
+/*===========================================================================*/
+/* CAN driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Sleep mode related APIs inclusion switch.
+ */
+#if !defined(CAN_USE_SLEEP_MODE) || defined(__DOXYGEN__)
+#define CAN_USE_SLEEP_MODE                  TRUE
+#endif
+
+/**
+ * @brief   Enforces the driver to use direct callbacks rather than OSAL events.
+ */
+#if !defined(CAN_ENFORCE_USE_CALLBACKS) || defined(__DOXYGEN__)
+#define CAN_ENFORCE_USE_CALLBACKS           FALSE
+#endif
+
+/*===========================================================================*/
+/* CRY driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables the SW fall-back of the cryptographic driver.
+ * @details When enabled, this option, activates a fall-back software
+ *          implementation for algorithms not supported by the underlying
+ *          hardware.
+ * @note    Fall-back implementations may not be present for all algorithms.
+ */
+#if !defined(HAL_CRY_USE_FALLBACK) || defined(__DOXYGEN__)
+#define HAL_CRY_USE_FALLBACK                FALSE
+#endif
+
+/**
+ * @brief   Makes the driver forcibly use the fall-back implementations.
+ */
+#if !defined(HAL_CRY_ENFORCE_FALLBACK) || defined(__DOXYGEN__)
+#define HAL_CRY_ENFORCE_FALLBACK            FALSE
+#endif
+
+/*===========================================================================*/
+/* DAC driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(DAC_USE_WAIT) || defined(__DOXYGEN__)
+#define DAC_USE_WAIT                        TRUE
+#endif
+
+/**
+ * @brief   Enables the @p dacAcquireBus() and @p dacReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(DAC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define DAC_USE_MUTUAL_EXCLUSION            TRUE
+#endif
+
+/*===========================================================================*/
+/* I2C driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables the mutual exclusion APIs on the I2C bus.
+ */
+#if !defined(I2C_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define I2C_USE_MUTUAL_EXCLUSION            TRUE
+#endif
+
+/*===========================================================================*/
+/* MAC driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables the zero-copy API.
+ */
+#if !defined(MAC_USE_ZERO_COPY) || defined(__DOXYGEN__)
+#define MAC_USE_ZERO_COPY                   FALSE
+#endif
+
+/**
+ * @brief   Enables an event sources for incoming packets.
+ */
+#if !defined(MAC_USE_EVENTS) || defined(__DOXYGEN__)
+#define MAC_USE_EVENTS                      TRUE
+#endif
+
+/*===========================================================================*/
+/* MMC_SPI driver related settings.                                          */
+/*===========================================================================*/
+
+/**
+ * @brief   Delays insertions.
+ * @details If enabled this options inserts delays into the MMC waiting
+ *          routines releasing some extra CPU time for the threads with
+ *          lower priority, this may slow down the driver a bit however.
+ *          This option is recommended also if the SPI driver does not
+ *          use a DMA channel and heavily loads the CPU.
+ */
+#if !defined(MMC_NICE_WAITING) || defined(__DOXYGEN__)
+#define MMC_NICE_WAITING                    TRUE
+#endif
+
+/*===========================================================================*/
+/* SDC driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Number of initialization attempts before rejecting the card.
+ * @note    Attempts are performed at 10mS intervals.
+ */
+#if !defined(SDC_INIT_RETRY) || defined(__DOXYGEN__)
+#define SDC_INIT_RETRY                      100
+#endif
+
+/**
+ * @brief   Include support for MMC cards.
+ * @note    MMC support is not yet implemented so this option must be kept
+ *          at @p FALSE.
+ */
+#if !defined(SDC_MMC_SUPPORT) || defined(__DOXYGEN__)
+#define SDC_MMC_SUPPORT                     FALSE
+#endif
+
+/**
+ * @brief   Delays insertions.
+ * @details If enabled this options inserts delays into the MMC waiting
+ *          routines releasing some extra CPU time for the threads with
+ *          lower priority, this may slow down the driver a bit however.
+ */
+#if !defined(SDC_NICE_WAITING) || defined(__DOXYGEN__)
+#define SDC_NICE_WAITING                    TRUE
+#endif
+
+/**
+ * @brief   OCR initialization constant for V20 cards.
+ */
+#if !defined(SDC_INIT_OCR_V20) || defined(__DOXYGEN__)
+#define SDC_INIT_OCR_V20                    0x50FF8000U
+#endif
+
+/**
+ * @brief   OCR initialization constant for non-V20 cards.
+ */
+#if !defined(SDC_INIT_OCR) || defined(__DOXYGEN__)
+#define SDC_INIT_OCR                        0x80100000U
+#endif
+
+/*===========================================================================*/
+/* SERIAL driver related settings.                                           */
+/*===========================================================================*/
+
+/**
+ * @brief   Default bit rate.
+ * @details Configuration parameter, this is the baud rate selected for the
+ *          default configuration.
+ */
+#if !defined(SERIAL_DEFAULT_BITRATE) || defined(__DOXYGEN__)
+#define SERIAL_DEFAULT_BITRATE              38400
+#endif
+
+/**
+ * @brief   Serial buffers size.
+ * @details Configuration parameter, you can change the depth of the queue
+ *          buffers depending on the requirements of your application.
+ * @note    The default is 16 bytes for both the transmission and receive
+ *          buffers.
+ */
+#if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__)
+#define SERIAL_BUFFERS_SIZE                 16
+#endif
+
+/*===========================================================================*/
+/* SERIAL_USB driver related setting.                                        */
+/*===========================================================================*/
+
+/**
+ * @brief   Serial over USB buffers size.
+ * @details Configuration parameter, the buffer size must be a multiple of
+ *          the USB data endpoint maximum packet size.
+ * @note    The default is 256 bytes for both the transmission and receive
+ *          buffers.
+ */
+#if !defined(SERIAL_USB_BUFFERS_SIZE) || defined(__DOXYGEN__)
+#define SERIAL_USB_BUFFERS_SIZE             1
+#endif
+
+/**
+ * @brief   Serial over USB number of buffers.
+ * @note    The default is 2 buffers.
+ */
+#if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
+#define SERIAL_USB_BUFFERS_NUMBER           2
+#endif
+
+/*===========================================================================*/
+/* SPI driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(SPI_USE_WAIT) || defined(__DOXYGEN__)
+#define SPI_USE_WAIT                        TRUE
+#endif
+
+/**
+ * @brief   Enables circular transfers APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(SPI_USE_CIRCULAR) || defined(__DOXYGEN__)
+#define SPI_USE_CIRCULAR                    FALSE
+#endif
+
+
+/**
+ * @brief   Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(SPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define SPI_USE_MUTUAL_EXCLUSION            TRUE
+#endif
+
+/**
+ * @brief   Handling method for SPI CS line.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(SPI_SELECT_MODE) || defined(__DOXYGEN__)
+#define SPI_SELECT_MODE                     SPI_SELECT_MODE_PAD
+#endif
+
+/*===========================================================================*/
+/* UART driver related settings.                                             */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(UART_USE_WAIT) || defined(__DOXYGEN__)
+#define UART_USE_WAIT                       FALSE
+#endif
+
+/**
+ * @brief   Enables the @p uartAcquireBus() and @p uartReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(UART_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define UART_USE_MUTUAL_EXCLUSION           FALSE
+#endif
+
+/*===========================================================================*/
+/* USB driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(USB_USE_WAIT) || defined(__DOXYGEN__)
+#define USB_USE_WAIT                        TRUE
+#endif
+
+/*===========================================================================*/
+/* WSPI driver related settings.                                             */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(WSPI_USE_WAIT) || defined(__DOXYGEN__)
+#define WSPI_USE_WAIT                       TRUE
+#endif
+
+/**
+ * @brief   Enables the @p wspiAcquireBus() and @p wspiReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(WSPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define WSPI_USE_MUTUAL_EXCLUSION           TRUE
+#endif
+
+#endif /* HALCONF_H */
+
+/** @} */
diff --git a/qmk/keyboards/keebwerk/mega/keebwork_mega.c b/qmk/keyboards/keebwerk/mega/keebwork_mega.c
new file mode 100644
index 00000000..dc800b63
--- /dev/null
+++ b/qmk/keyboards/keebwerk/mega/keebwork_mega.c
@@ -0,0 +1,19 @@
+/* Copyright 2020 Yiancar
+ *
+ * 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 RGB_BACKLIGHT_KW_MEGA
+#error RGB_BACKLIGHT_KW_MEGA not defined, recheck config.h
+#endif
diff --git a/qmk/keyboards/keebwerk/mega/mcuconf.h b/qmk/keyboards/keebwerk/mega/mcuconf.h
new file mode 100644
index 00000000..ed227b79
--- /dev/null
+++ b/qmk/keyboards/keebwerk/mega/mcuconf.h
@@ -0,0 +1,273 @@
+/*
+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#ifndef MCUCONF_H
+#define MCUCONF_H
+
+/*
+ * STM32F3xx drivers configuration.
+ * The following settings override the default settings present in
+ * the various device driver implementation headers.
+ * Note that the settings for each driver only have effect if the whole
+ * driver is enabled in halconf.h.
+ *
+ * IRQ priorities:
+ * 15...0       Lowest...Highest.
+ *
+ * DMA priorities:
+ * 0...3        Lowest...Highest.
+ */
+
+#define STM32F3xx_MCUCONF
+#define STM32F303_MCUCONF
+
+/*
+ * HAL driver system settings.
+ */
+#define STM32_NO_INIT                       FALSE
+#define STM32_PVD_ENABLE                    FALSE
+#define STM32_PLS                           STM32_PLS_LEV0
+#define STM32_HSI_ENABLED                   TRUE
+#define STM32_LSI_ENABLED                   TRUE
+#define STM32_HSE_ENABLED                   TRUE
+#define STM32_LSE_ENABLED                   FALSE
+#define STM32_SW                            STM32_SW_PLL
+#define STM32_PLLSRC                        STM32_PLLSRC_HSE
+#define STM32_PREDIV_VALUE                  1
+#define STM32_PLLMUL_VALUE                  9
+#define STM32_HPRE                          STM32_HPRE_DIV1
+#define STM32_PPRE1                         STM32_PPRE1_DIV2
+#define STM32_PPRE2                         STM32_PPRE2_DIV2
+#define STM32_MCOSEL                        STM32_MCOSEL_NOCLOCK
+#define STM32_ADC12PRES                     STM32_ADC12PRES_DIV1
+#define STM32_ADC34PRES                     STM32_ADC34PRES_DIV1
+#define STM32_USART1SW                      STM32_USART1SW_PCLK
+#define STM32_USART2SW                      STM32_USART2SW_PCLK
+#define STM32_USART3SW                      STM32_USART3SW_PCLK
+#define STM32_UART4SW                       STM32_UART4SW_PCLK
+#define STM32_UART5SW                       STM32_UART5SW_PCLK
+#define STM32_I2C1SW                        STM32_I2C1SW_SYSCLK
+#define STM32_I2C2SW                        STM32_I2C2SW_SYSCLK
+#define STM32_TIM1SW                        STM32_TIM1SW_PCLK2
+#define STM32_TIM8SW                        STM32_TIM8SW_PCLK2
+#define STM32_RTCSEL                        STM32_RTCSEL_LSI
+#define STM32_USB_CLOCK_REQUIRED            TRUE
+#define STM32_USBPRE                        STM32_USBPRE_DIV1P5
+
+/*
+ * IRQ system settings.
+ */
+#define STM32_IRQ_EXTI0_PRIORITY            6
+#define STM32_IRQ_EXTI1_PRIORITY            6
+#define STM32_IRQ_EXTI2_PRIORITY            6
+#define STM32_IRQ_EXTI3_PRIORITY            6
+#define STM32_IRQ_EXTI4_PRIORITY            6
+#define STM32_IRQ_EXTI5_9_PRIORITY          6
+#define STM32_IRQ_EXTI10_15_PRIORITY        6
+#define STM32_IRQ_EXTI16_PRIORITY           6
+#define STM32_IRQ_EXTI17_PRIORITY           15
+#define STM32_IRQ_EXTI18_PRIORITY           6
+#define STM32_IRQ_EXTI19_PRIORITY           15
+#define STM32_IRQ_EXTI20_PRIORITY           15
+#define STM32_IRQ_EXTI21_22_29_PRIORITY     6
+#define STM32_IRQ_EXTI30_32_PRIORITY        6
+#define STM32_IRQ_EXTI33_PRIORITY           6
+#define STM32_IRQ_TIM1_BRK_TIM15_PRIORITY   7
+#define STM32_IRQ_TIM1_UP_TIM16_PRIORITY    7
+#define STM32_IRQ_TIM1_TRGCO_TIM17_PRIORITY 7
+#define STM32_IRQ_TIM1_CC_PRIORITY          7
+
+/*
+ * ADC driver system settings.
+ */
+#define STM32_ADC_DUAL_MODE                 FALSE
+#define STM32_ADC_COMPACT_SAMPLES           FALSE
+#define STM32_ADC_USE_ADC1                  FALSE
+#define STM32_ADC_USE_ADC2                  FALSE
+#define STM32_ADC_USE_ADC3                  FALSE
+#define STM32_ADC_USE_ADC4                  FALSE
+#define STM32_ADC_ADC1_DMA_STREAM           STM32_DMA_STREAM_ID(1, 1)
+#define STM32_ADC_ADC2_DMA_STREAM           STM32_DMA_STREAM_ID(2, 1)
+#define STM32_ADC_ADC3_DMA_STREAM           STM32_DMA_STREAM_ID(2, 5)
+#define STM32_ADC_ADC4_DMA_STREAM           STM32_DMA_STREAM_ID(2, 2)
+#define STM32_ADC_ADC1_DMA_PRIORITY         2
+#define STM32_ADC_ADC2_DMA_PRIORITY         2
+#define STM32_ADC_ADC3_DMA_PRIORITY         2
+#define STM32_ADC_ADC4_DMA_PRIORITY         2
+#define STM32_ADC_ADC12_IRQ_PRIORITY        5
+#define STM32_ADC_ADC3_IRQ_PRIORITY         5
+#define STM32_ADC_ADC4_IRQ_PRIORITY         5
+#define STM32_ADC_ADC1_DMA_IRQ_PRIORITY     5
+#define STM32_ADC_ADC2_DMA_IRQ_PRIORITY     5
+#define STM32_ADC_ADC3_DMA_IRQ_PRIORITY     5
+#define STM32_ADC_ADC4_DMA_IRQ_PRIORITY     5
+#define STM32_ADC_ADC12_CLOCK_MODE          ADC_CCR_CKMODE_AHB_DIV1
+#define STM32_ADC_ADC34_CLOCK_MODE          ADC_CCR_CKMODE_AHB_DIV1
+
+/*
+ * CAN driver system settings.
+ */
+#define STM32_CAN_USE_CAN1                  FALSE
+#define STM32_CAN_CAN1_IRQ_PRIORITY         11
+
+/*
+ * DAC driver system settings.
+ */
+#define STM32_DAC_DUAL_MODE                 FALSE
+#define STM32_DAC_USE_DAC1_CH1              TRUE
+#define STM32_DAC_USE_DAC1_CH2              TRUE
+#define STM32_DAC_DAC1_CH1_IRQ_PRIORITY     10
+#define STM32_DAC_DAC1_CH2_IRQ_PRIORITY     10
+#define STM32_DAC_DAC1_CH1_DMA_PRIORITY     2
+#define STM32_DAC_DAC1_CH2_DMA_PRIORITY     2
+
+/*
+ * GPT driver system settings.
+ */
+#define STM32_GPT_USE_TIM1                  FALSE
+#define STM32_GPT_USE_TIM2                  FALSE
+#define STM32_GPT_USE_TIM3                  FALSE
+#define STM32_GPT_USE_TIM4                  TRUE
+#define STM32_GPT_USE_TIM6                  TRUE
+#define STM32_GPT_USE_TIM7                  TRUE
+#define STM32_GPT_USE_TIM8                  TRUE
+#define STM32_GPT_USE_TIM15                 FALSE
+#define STM32_GPT_USE_TIM16                 FALSE
+#define STM32_GPT_USE_TIM17                 FALSE
+#define STM32_GPT_TIM1_IRQ_PRIORITY         7
+#define STM32_GPT_TIM2_IRQ_PRIORITY         7
+#define STM32_GPT_TIM3_IRQ_PRIORITY         7
+#define STM32_GPT_TIM4_IRQ_PRIORITY         7
+#define STM32_GPT_TIM6_IRQ_PRIORITY         7
+#define STM32_GPT_TIM7_IRQ_PRIORITY         7
+#define STM32_GPT_TIM8_IRQ_PRIORITY         7
+
+/*
+ * I2C driver system settings.
+ */
+#define STM32_I2C_USE_I2C1                  TRUE
+#define STM32_I2C_USE_I2C2                  FALSE
+#define STM32_I2C_BUSY_TIMEOUT              50
+#define STM32_I2C_I2C1_IRQ_PRIORITY         10
+#define STM32_I2C_I2C2_IRQ_PRIORITY         10
+#define STM32_I2C_USE_DMA                   TRUE
+#define STM32_I2C_I2C1_DMA_PRIORITY         1
+#define STM32_I2C_I2C2_DMA_PRIORITY         1
+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")
+
+/*
+ * ICU driver system settings.
+ */
+#define STM32_ICU_USE_TIM1                  FALSE
+#define STM32_ICU_USE_TIM2                  FALSE
+#define STM32_ICU_USE_TIM3                  FALSE
+#define STM32_ICU_USE_TIM4                  FALSE
+#define STM32_ICU_USE_TIM8                  FALSE
+#define STM32_ICU_USE_TIM15                 FALSE
+#define STM32_ICU_TIM1_IRQ_PRIORITY         7
+#define STM32_ICU_TIM2_IRQ_PRIORITY         7
+#define STM32_ICU_TIM3_IRQ_PRIORITY         7
+#define STM32_ICU_TIM4_IRQ_PRIORITY         7
+#define STM32_ICU_TIM8_IRQ_PRIORITY         7
+
+/*
+ * PWM driver system settings.
+ */
+#define STM32_PWM_USE_ADVANCED              FALSE
+#define STM32_PWM_USE_TIM1                  FALSE
+#define STM32_PWM_USE_TIM2                  FALSE
+#define STM32_PWM_USE_TIM3                  FALSE
+#define STM32_PWM_USE_TIM4                  FALSE
+#define STM32_PWM_USE_TIM8                  FALSE
+#define STM32_PWM_USE_TIM15                 FALSE
+#define STM32_PWM_USE_TIM16                 FALSE
+#define STM32_PWM_USE_TIM17                 FALSE
+#define STM32_PWM_TIM1_IRQ_PRIORITY         7
+#define STM32_PWM_TIM2_IRQ_PRIORITY         7
+#define STM32_PWM_TIM3_IRQ_PRIORITY         7
+#define STM32_PWM_TIM4_IRQ_PRIORITY         7
+#define STM32_PWM_TIM8_IRQ_PRIORITY         7
+
+/*
+ * RTC driver system settings.
+ */
+#define STM32_RTC_PRESA_VALUE               32
+#define STM32_RTC_PRESS_VALUE               1024
+#define STM32_RTC_CR_INIT                   0
+#define STM32_RTC_TAMPCR_INIT               0
+
+/*
+ * SERIAL driver system settings.
+ */
+#define STM32_SERIAL_USE_USART1             FALSE
+#define STM32_SERIAL_USE_USART2             FALSE
+#define STM32_SERIAL_USE_USART3             FALSE
+#define STM32_SERIAL_USE_UART4              FALSE
+#define STM32_SERIAL_USE_UART5              FALSE
+#define STM32_SERIAL_USART1_PRIORITY        12
+#define STM32_SERIAL_USART2_PRIORITY        12
+#define STM32_SERIAL_USART3_PRIORITY        12
+#define STM32_SERIAL_UART4_PRIORITY         12
+#define STM32_SERIAL_UART5_PRIORITY         12
+
+/*
+ * SPI driver system settings.
+ */
+#define STM32_SPI_USE_SPI1                  FALSE
+#define STM32_SPI_USE_SPI2                  FALSE
+#define STM32_SPI_USE_SPI3                  FALSE
+#define STM32_SPI_SPI1_DMA_PRIORITY         1
+#define STM32_SPI_SPI2_DMA_PRIORITY         1
+#define STM32_SPI_SPI3_DMA_PRIORITY         1
+#define STM32_SPI_SPI1_IRQ_PRIORITY         10
+#define STM32_SPI_SPI2_IRQ_PRIORITY         10
+#define STM32_SPI_SPI3_IRQ_PRIORITY         10
+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")
+
+/*
+ * ST driver system settings.
+ */
+#define STM32_ST_IRQ_PRIORITY               8
+#define STM32_ST_USE_TIMER                  2
+
+/*
+ * UART driver system settings.
+ */
+#define STM32_UART_USE_USART1               FALSE
+#define STM32_UART_USE_USART2               FALSE
+#define STM32_UART_USE_USART3               FALSE
+#define STM32_UART_USART1_IRQ_PRIORITY      12
+#define STM32_UART_USART2_IRQ_PRIORITY      12
+#define STM32_UART_USART3_IRQ_PRIORITY      12
+#define STM32_UART_USART1_DMA_PRIORITY      0
+#define STM32_UART_USART2_DMA_PRIORITY      0
+#define STM32_UART_USART3_DMA_PRIORITY      0
+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")
+
+/*
+ * USB driver system settings.
+ */
+#define STM32_USB_USE_USB1                  TRUE
+#define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE
+#define STM32_USB_USB1_HP_IRQ_PRIORITY      13
+#define STM32_USB_USB1_LP_IRQ_PRIORITY      14
+
+/*
+ * WDG driver system settings.
+ */
+#define STM32_WDG_USE_IWDG                  FALSE
+
+#endif /* MCUCONF_H */
diff --git a/qmk/keyboards/keebwerk/mega/readme.md b/qmk/keyboards/keebwerk/mega/readme.md
new file mode 100644
index 00000000..6f179829
--- /dev/null
+++ b/qmk/keyboards/keebwerk/mega/readme.md
@@ -0,0 +1,32 @@
+# Keebwerk Mega
+
+This is a standard fixed layout 65% PCB in ANSI and soon in ISO. It supports VIA and full per-key RGB.
+
+* Keyboard Maintainer: [Yiancar](http://yiancar-designs.com/) and on [github](https://github.com/yiancar)
+* Hardware Supported: A 65% keyboard with STM32F303CC
+* Hardware Availability: https://candykeys.com/
+
+## Instructions
+
+### Build
+
+Make example for this keyboard (after setting up your build environment):
+
+    make keebwerk/mega/ansi:via
+
+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).
+
+### Reset
+
+- Unplug
+- Hold Escape
+- Plug In
+- Unplug
+- Release Escape
+
+### Flash
+
+- Unplug
+- Hold Escape
+- Plug In
+- Flash using QMK Toolbox or dfu-util (`make keebwerk/mega/ansi:<keymap>:flash`)
diff --git a/qmk/keyboards/keebwerk/nano_slider/config.h b/qmk/keyboards/keebwerk/nano_slider/config.h
index 3ed356b8..dc8d91c2 100644
--- a/qmk/keyboards/keebwerk/nano_slider/config.h
+++ b/qmk/keyboards/keebwerk/nano_slider/config.h
@@ -187,34 +187,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/keyboardio/atreus/keymaps/xyverz/keymap.c b/qmk/keyboards/keyboardio/atreus/keymaps/xyverz/keymap.c
new file mode 100644
index 00000000..2bd30bc5
--- /dev/null
+++ b/qmk/keyboards/keyboardio/atreus/keymaps/xyverz/keymap.c
@@ -0,0 +1,207 @@
+ /* Copyright 2020 Ian Sterling 
+  * 
+  * 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/>. 
+  */ 
+
+// This is the personal keymap of Ian Sterling (@xyverz). It is based on the keymap by
+// Chris Gerber (@gerbercj), with the addition of persistent layers like the Planck and
+// Preonic keyboards by Jack Humbert.
+
+#include QMK_KEYBOARD_H
+
+// Initial keymap for Xyverz's Keyboardio Atreus
+
+enum layer_names {
+  _DVORAK,
+  _QWERTY,
+  _COLEMAK,
+  _DVORMAC,
+  _LOWER,
+  _RAISE,
+  _ADJUST
+};
+
+enum planck_keycodes {
+  DVORAK = SAFE_RANGE,
+  QWERTY,
+  COLEMAK,
+  DVORMAC,
+  LOWER,
+  RAISE,
+  ADJUST
+};
+
+// Adding macros to make the keymaps below much easier to read.
+#define SFTSCLN SFT_T(KC_SCLN)
+#define SFTSLSH SFT_T(KC_SLSH)
+#define SFTZED SFT_T(KC_Z)
+#define ALTENT ALT_T(KC_ENT)
+#define ESCTRL CTL_T(KC_ESC)
+#define TABALT ALT_T(KC_TAB)
+#define DELGUI GUI_T(KC_DEL)
+#define DELCTL CTL_T(KC_DEL)
+#define MACLOCK LGUI(LCTL(KC_Q))
+#define ADJUST MO(_ADJUST)
+#define LOWER MO(_LOWER)
+#define RAISE MO(_RAISE)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  /* Dvorak Layer
+	,----------------------------------.              ,----------------------------------.
+	|   '  |   ,  |   .  |   P  |   Y  |              |   F  |   G  |   C  |   R  |   L  |
+	|------+------+------+------+------|              |------+------+------+------+------|
+	|   A  |   O  |   E  |   U  |   I  |              |   D  |   H  |   T  |   N  |   S  |
+	|------+------+------+------+------+------.,------+------+------+------+------+------|
+	|SFT/ ;|   Q  |   J  |   K  |   X  | Home || End  |   B  |   M  |   W  |   V  |SFT/ Z|
+	|------+------+------+------+------+------||------+------+------+------+------+------|
+	|  Esc |  Tab |  GUI | LOWER| BkSp |DELCTL||ALTENT|  Spc | RAISE|   -  |   /  |   \  |
+	`-----------------------------------------'`-----------------------------------------' */
+  [_DVORAK] = LAYOUT(
+    KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,                      KC_F,    KC_G,    KC_C,    KC_R,    KC_L   ,
+    KC_A,    KC_O,    KC_E,    KC_U,    KC_I,                      KC_D,    KC_H,    KC_T,    KC_N,    KC_S   ,
+    SFTSCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_HOME, KC_END,  KC_B,    KC_M,    KC_W,    KC_V,    SFTZED ,
+    ESCTRL,  TABALT,  KC_LGUI, LOWER,   KC_BSPC, DELCTL,  ALTENT,  KC_SPC,  RAISE,   KC_MINS, KC_SLSH, KC_BSLS
+  ),
+
+  /* QWERTY Layer
+	,----------------------------------.              ,----------------------------------.
+	|   Q  |   W  |   E  |   R  |   T  |              |   Y  |   U  |   I  |   O  |   P  |
+	|------+------+------+------+------|              |------+------+------+------+------|
+	|   A  |   S  |   D  |   F  |   G  |              |   H  |   J  |   K  |   L  |   ;  |
+	|------+------+------+------+------+------.,------+------+------+------+------+------|
+	|SFT/ Z|   X  |   C  |   V  |   B  | Home || End  |   N  |   M  |   ,  |   .  |SFT/ /|
+	|------+------+------+------+------+------||------+------+------+------+------+------|
+	|  Esc |  Tab |  GUI | LOWER| BkSp | LCTL ||ALTENT|  Spc | RAISE|   -  |   '  |   \  |
+	`-----------------------------------------'`-----------------------------------------' */
+  [_QWERTY] = LAYOUT(
+    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P   ,
+    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,                      KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN,
+    SFTZED,  KC_X,    KC_C,    KC_V,    KC_B,    KC_HOME, KC_END,  KC_N,    KC_M,    KC_COMM, KC_DOT,  SFTSLSH,
+    ESCTRL,  TABALT,  KC_LGUI, LOWER,   KC_BSPC, KC_LCTL, ALTENT,  KC_SPC,  RAISE,   KC_MINS, KC_QUOT, KC_BSLS
+  ),
+
+  /* Colemak Layer
+	,----------------------------------.              ,----------------------------------.
+	|   Q  |   W  |   F  |   P  |   G  |              |   J  |   L  |   U  |   Y  |   L  |
+	|------+------+------+------+------|              |------+------+------+------+------|
+	|   A  |   R  |   S  |   T  |   D  |              |   H  |   N  |   E  |   I  |   S  |
+	|------+------+------+------+------+------.,------+------+------+------+------+------|
+	|SFT/ Z|   X  |   C  |   V  |   B  | Home || End  |   K  |   M  |   ,  |   .  |SFT/ /|
+	|------+------+------+------+------+------||------+------+------+------+------+------|
+	|  Esc |  Tab |  GUI | LOWER| BkSp | LCTL ||ALTENT|  Spc | RAISE|   -  |   '  |   \  |
+	`-----------------------------------------'`-----------------------------------------'*/
+  [_COLEMAK] = LAYOUT(
+    KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,                      KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN,
+    KC_A,    KC_R,    KC_S,    KC_T,    KC_D,                      KC_H,    KC_N,    KC_E,    KC_I,    KC_O   ,
+    SFTZED,  KC_X,    KC_C,    KC_V,    KC_B,    KC_HOME, KC_END,  KC_K,    KC_M,    KC_COMM, KC_DOT,  SFTSLSH,
+    ESCTRL,  TABALT,  KC_LGUI, LOWER,   KC_BSPC, KC_LCTL, ALTENT,  KC_SPC,  RAISE,   KC_MINS, KC_QUOT, KC_BSLS
+  ),
+
+  /* Dvorak Layer with Command key on left thumb instead of Control
+	,----------------------------------.              ,----------------------------------.
+	|   '  |   ,  |   .  |   P  |   Y  |              |   F  |   G  |   C  |   R  |   L  |
+	|------+------+------+------+------|              |------+------+------+------+------|
+	|   A  |   O  |   E  |   U  |   I  |              |   D  |   H  |   T  |   N  |   S  |
+	|------+------+------+------+------+------.,------+------+------+------+------+------|
+	|SFT/ ;|   Q  |   J  |   K  |   X  | Home || End  |   B  |   M  |   W  |   V  |SFT/ Z|
+	|------+------+------+------+------+------||------+------+------+------+------+------|
+	|  Esc |  Tab |  GUI | LOWER| BkSp | LGUI ||ALTENT|  Spc | RAISE|   -  |   /  |   \  |
+	`-----------------------------------------'`-----------------------------------------' */
+  [_DVORMAC] = LAYOUT(
+    KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,                      KC_F,    KC_G,    KC_C,    KC_R,    KC_L   ,
+    KC_A,    KC_O,    KC_E,    KC_U,    KC_I,                      KC_D,    KC_H,    KC_T,    KC_N,    KC_S   ,
+    SFTSCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_HOME, KC_END,  KC_B,    KC_M,    KC_W,    KC_V,    SFTZED ,
+    ESCTRL,  TABALT,  KC_LGUI, LOWER,   KC_BSPC, DELGUI,  ALTENT,  KC_SPC,  RAISE,   KC_MINS, KC_SLSH, KC_BSLS
+  ),
+
+  /* LOWER Layer
+	,----------------------------------.              ,----------------------------------.
+	|   !  |   @  |   #  |   $  |   %  |              |   ^  |   &  |   *  |   (  |   )  |
+	|------+------+------+------+------|              |------+------+------+------+------|
+	| CAPS |      |  UP  |      | Home |              | PgDn |      |   +  |   {  |   }  |
+	|------+------+------+------+------+------.,------+------+------+------+------+------|
+	|      | Left | Down | Right| End  |      ||      | PgUp | Mute | Vol- | Vol+ |      |
+	|------+------+------+------+------+------||------+------+------+------+------+------|
+	|   ~  |      |      |      | Del  |      ||      | Ins  |      |      |      |      |
+	`-----------------------------------------'`-----------------------------------------'*/
+  [_LOWER] = LAYOUT(
+    KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                   KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,
+    KC_CAPS, _______, KC_UP,   _______, KC_HOME,                   KC_PGUP, _______, KC_PLUS, KC_LCBR, KC_RCBR,
+    _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_END,  _______, _______, KC_PGDN, KC_MUTE, KC_VOLD, KC_VOLU, _______,
+    KC_TILD, KC_LEFT, KC_RGHT, _______, KC_DEL,  _______, _______, KC_INS,  _______, KC_UP,   KC_DOWN, _______
+  ),
+
+  /* RAISE Layer
+	,----------------------------------.              ,----------------------------------.
+	|   1  |   2  |   3  |   4  |   5  |              |   6  |   7  |   8  |   9  |   0  |
+	|------+------+------+------+------|              |------+------+------+------+------|
+	| CAPS |      |  UP  |      | Home |              | PgDn |      |   =  |   [  |   ]  |
+	|------+------+------+------+------+------.,------+------+------+------+------+------|
+	|      | Left | Down | Right| End  |MacLck||      | PgUp | Prev | Play | Next |      |
+	|------+------+------+------+------+------||------+------+------+------+------+------|
+	|   `  |      |      |      | Del  |      ||      | Ins  |      |      |      |      |
+	`-----------------------------------------'`-----------------------------------------'*/
+  [_RAISE] = LAYOUT(
+    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                      KC_6,    KC_7,    KC_8,    KC_9,    KC_0   ,
+    KC_CAPS, _______, KC_UP,   _______, KC_HOME,                   KC_PGUP, _______, KC_EQL,  KC_LBRC, KC_RBRC,
+    _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_END,  MACLOCK, _______, KC_PGDN, KC_MPRV, KC_MPLY, KC_MNXT, _______,
+    KC_GRV,  KC_LEFT, KC_RGHT, _______, KC_DEL,  _______, _______, KC_INS,  _______, KC_UP,   KC_DOWN, _______
+  ),
+
+  /* ADJUST Layer
+	,----------------------------------.              ,----------------------------------.
+	|  F1  |  F2  |  F3  |  F4  |  F5  |              |  F6  |  F7  |  F8  |  F9  | F10  |
+	|------+------+------+------+------|              |------+------+------+------+------|
+	|  F11 |      |      |      |      |              |      | PrSc | ScLk | Paus | F12  |
+	|------+------+------+------+------+------.,------+------+------+------+------+------|
+	|      |QWERTY|COLEMK|DVORAK|DVORMC|      ||      |      |      |      |      |      |
+	|------+------+------+------+------+------||------+------+------+------+------+------|
+	|      |      |      |      |      |      ||      |      |      |      |      | RESET|
+	`-----------------------------------------'`-----------------------------------------'*/
+  [_ADJUST] = LAYOUT(
+    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,                     KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10 ,
+    KC_F11,  _______, _______, _______, _______,                   _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_F12 ,
+    _______, QWERTY,  COLEMAK, DVORAK,  DVORMAC, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET  
+  ),
+};
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
+}
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  switch (keycode) {
+    case DVORAK:
+      if (record->event.pressed) {
+        set_single_persistent_default_layer(_DVORAK);
+      }
+      return false;
+    case COLEMAK:
+      if (record->event.pressed) {
+        set_single_persistent_default_layer(_COLEMAK);
+      }
+      return false;
+    case QWERTY:
+      if (record->event.pressed) {
+        set_single_persistent_default_layer(_QWERTY);
+      }
+      return false;
+    case DVORMAC:
+      if (record->event.pressed) {
+        set_single_persistent_default_layer(_DVORMAC);
+      }
+      return false;
+  }
+  return true;
+}
\ No newline at end of file
diff --git a/qmk/keyboards/keyboardio/atreus/keymaps/xyverz/readme.md b/qmk/keyboards/keyboardio/atreus/keymaps/xyverz/readme.md
new file mode 100644
index 00000000..f9749bb3
--- /dev/null
+++ b/qmk/keyboards/keyboardio/atreus/keymaps/xyverz/readme.md
@@ -0,0 +1,105 @@
+# Xyverz's Keyboardio Atreus Keymap
+
+## About this keymap:
+
+This is the first iteration of my Keyboardio Atreus keymap. This is entirely based on my original Atreus keymap
+with a few changes added to reflect the extra two keys, and a code update to current standards.
+
+I'm using MOD_TAP quite a bit in this keymap. On all layers, R4 pinky keys use mod-tap and are SHIFT when held
+and their normal keys when tapped. In addition, ESC and TAB are also set as Ctrl and ALT respectively when held,
+and Enter/ALT on the right thumb key for all alpha layers.
+
+I've enabled persistent keymaps for Qwerty, Dvorak and Colemak layers, similar to the default Planck layouts.
+
+Recently added: Documentation, Formatting, and another Dvorak layer that has Command on the left thumb, instead of
+Control.
+
+## Still to do:
+
+ * Enjoy this revision; figure out new things later.
+
+### Layer 0: Dvorak layer
+
+	,----------------------------------.              ,----------------------------------.
+	|   '  |   ,  |   .  |   P  |   Y  |              |   F  |   G  |   C  |   R  |   L  |
+	|------+------+------+------+------|              |------+------+------+------+------|
+	|   A  |   O  |   E  |   U  |   I  |              |   D  |   H  |   T  |   N  |   S  |
+	|------+------+------+------+------+------.,------+------+------+------+------+------|
+	|SFT/ ;|   Q  |   J  |   K  |   X  | Home || End  |   B  |   M  |   W  |   V  |SFT/ Z|
+	|------+------+------+------+------+------||------+------+------+------+------+------|
+	|  Esc |  Tab |  GUI | LOWER| BkSp | LCTL ||ALTENT|  Spc | RAISE|   -  |   /  |   \  |
+	`-----------------------------------------'`-----------------------------------------'
+
+### Layer 1: QWERTY layer
+
+	,----------------------------------.              ,----------------------------------.
+	|   Q  |   W  |   E  |   R  |   T  |              |   Y  |   U  |   I  |   O  |   P  |
+	|------+------+------+------+------|              |------+------+------+------+------|
+	|   A  |   S  |   D  |   F  |   G  |              |   H  |   J  |   K  |   L  |   ;  |
+	|------+------+------+------+------+------.,------+------+------+------+------+------|
+	|SFT/ Z|   X  |   C  |   V  |   B  | Home || End  |   N  |   M  |   ,  |   .  |SFT/ /|
+	|------+------+------+------+------+------||------+------+------+------+------+------|
+	|  Esc |  Tab |  GUI | LOWER| BkSp | LCTL ||ALTENT|  Spc | RAISE|   -  |   '  |   \  |
+	`-----------------------------------------'`-----------------------------------------'
+	 
+### Layer 2: Colemak layer
+
+	,----------------------------------.              ,----------------------------------.
+	|   Q  |   W  |   F  |   P  |   G  |              |   J  |   L  |   U  |   Y  |   L  |
+	|------+------+------+------+------|              |------+------+------+------+------|
+	|   A  |   R  |   S  |   T  |   D  |              |   H  |   N  |   E  |   I  |   S  |
+	|------+------+------+------+------+------.,------+------+------+------+------+------|
+	|SFT/ Z|   X  |   C  |   V  |   B  | Home || End  |   K  |   M  |   ,  |   .  |SFT/ /|
+	|------+------+------+------+------+------||------+------+------+------+------+------|
+	|  Esc |  Tab |  GUI | LOWER| BkSp | LCTL ||ALTENT|  Spc | RAISE|   -  |   '  |   \  |
+	`-----------------------------------------'`-----------------------------------------'
+
+### Layer 3: Dvorak for Mac layer
+
+	,----------------------------------.              ,----------------------------------.
+	|   '  |   ,  |   .  |   P  |   Y  |              |   F  |   G  |   C  |   R  |   L  |
+	|------+------+------+------+------|              |------+------+------+------+------|
+	|   A  |   O  |   E  |   U  |   I  |              |   D  |   H  |   T  |   N  |   S  |
+	|------+------+------+------+------+------.,------+------+------+------+------+------|
+	|SFT/ ;|   Q  |   J  |   K  |   X  | Home || End  |   B  |   M  |   W  |   V  |SFT/ Z|
+	|------+------+------+------+------+------||------+------+------+------+------+------|
+	|  Esc |  Tab |  GUI | LOWER| BkSp | LGUI ||ALTENT|  Spc | RAISE|   -  |   /  |   \  |
+	`-----------------------------------------'`-----------------------------------------'
+
+### Layer 4: LOWER layer
+
+	,----------------------------------.              ,----------------------------------.
+	|   !  |   @  |   #  |   $  |   %  |              |   ^  |   &  |   *  |   (  |   )  |
+	|------+------+------+------+------|              |------+------+------+------+------|
+	| CAPS |      |  UP  |      | Home |              | PgDn |      |   +  |   {  |   }  |
+	|------+------+------+------+------+------.,------+------+------+------+------+------|
+	|      | Left | Down | Right| End  |      ||      | PgUp | Mute | Vol- | Vol+ |      |
+	|------+------+------+------+------+------||------+------+------+------+------+------|
+	|   ~  |      |      |      | Del  |      ||      | Ins  |      |      |      |      |
+	`-----------------------------------------'`-----------------------------------------'
+
+
+### Layer 5: RAISE layer
+
+	,----------------------------------.              ,----------------------------------.
+	|   1  |   2  |   3  |   4  |   5  |              |   6  |   7  |   8  |   9  |   0  |
+	|------+------+------+------+------|              |------+------+------+------+------|
+	| CAPS |      |  UP  |      | Home |              | PgDn |      |   =  |   [  |   ]  |
+	|------+------+------+------+------+------.,------+------+------+------+------+------|
+	|      | Left | Down | Right| End  |MacLck||      | PgUp | Prev | Play | Next |      |
+	|------+------+------+------+------+------||------+------+------+------+------+------|
+	|   `  |      |      |      | Del  |      ||      | Ins  |      |      |      |      |
+	`-----------------------------------------'`-----------------------------------------'
+
+### Layer 6: ADJUST layer
+
+	,----------------------------------.              ,----------------------------------.
+	|  F1  |  F2  |  F3  |  F4  |  F5  |              |  F6  |  F7  |  F8  |  F9  | F10  |
+	|------+------+------+------+------|              |------+------+------+------+------|
+	|  F11 |      |      |      |      |              |      | PrSc | ScLk | Paus | F12  |
+	|------+------+------+------+------+------.,------+------+------+------+------+------|
+	|      |QWERTY|COLEMK|DVORAK|DVORMC|      ||      |      |      |      |      |      |
+	|------+------+------+------+------+------||------+------+------+------+------+------|
+	|      |      |      |      |      |      ||      |      |      |      |      | RESET|
+	`-----------------------------------------'`-----------------------------------------'
+
diff --git a/qmk/keyboards/keyboardio/model01/config.h b/qmk/keyboards/keyboardio/model01/config.h
index c2160979..043e21cf 100644
--- a/qmk/keyboards/keyboardio/model01/config.h
+++ b/qmk/keyboards/keyboardio/model01/config.h
@@ -17,7 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#include <config_common.h>
+#include "config_common.h"
 
 /* USB Device descriptor parameter */
 #define VENDOR_ID       0x1209
diff --git a/qmk/keyboards/keyboardio/model01/leds.c b/qmk/keyboards/keyboardio/model01/leds.c
index b21c1a5c..0308887d 100644
--- a/qmk/keyboards/keyboardio/model01/leds.c
+++ b/qmk/keyboards/keyboardio/model01/leds.c
@@ -13,10 +13,10 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include <quantum.h>
-#include <i2c_master.h>
-#include <led_tables.h>
-#include <rgb_matrix.h>
+#include "quantum.h"
+#include "i2c_master.h"
+#include "led_tables.h"
+#include "rgb_matrix.h"
 #include <string.h>
 #include "model01.h"
 
diff --git a/qmk/keyboards/keyboardio/model01/leds.h b/qmk/keyboards/keyboardio/model01/leds.h
index 405bdf32..4d185919 100644
--- a/qmk/keyboards/keyboardio/model01/leds.h
+++ b/qmk/keyboards/keyboardio/model01/leds.h
@@ -15,8 +15,8 @@
  */
 #pragma once
 
-#include <quantum.h>
-#include <rgb_matrix.h>
+#include "quantum.h"
+#include "rgb_matrix.h"
 
 void set_all_leds_to(uint8_t r, uint8_t g, uint8_t b);
 void set_led_to(int led, uint8_t r, uint8_t g, uint8_t b);
diff --git a/qmk/keyboards/keyboardio/model01/matrix.c b/qmk/keyboards/keyboardio/model01/matrix.c
index f1f9024c..92cca991 100644
--- a/qmk/keyboards/keyboardio/model01/matrix.c
+++ b/qmk/keyboards/keyboardio/model01/matrix.c
@@ -13,8 +13,8 @@
  * 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 <quantum.h>
-#include <i2c_master.h>
+#include "quantum.h"
+#include "i2c_master.h"
 #include <string.h>
 #include "model01.h"
 
diff --git a/qmk/keyboards/keyboardio/model01/model01.c b/qmk/keyboards/keyboardio/model01/model01.c
index 29615ca8..d9fac1cf 100644
--- a/qmk/keyboards/keyboardio/model01/model01.c
+++ b/qmk/keyboards/keyboardio/model01/model01.c
@@ -13,8 +13,8 @@
  * 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 <quantum.h>
-#include <i2c_master.h>
+#include "quantum.h"
+#include "i2c_master.h"
 #include <string.h>
 #include "model01.h"
 
diff --git a/qmk/keyboards/keyboardio/model01/model01.h b/qmk/keyboards/keyboardio/model01/model01.h
index a83e33cd..870cb441 100644
--- a/qmk/keyboards/keyboardio/model01/model01.h
+++ b/qmk/keyboards/keyboardio/model01/model01.h
@@ -15,7 +15,7 @@
  */
 #pragma once
 
-#include <quantum.h>
+#include "quantum.h"
 
 #define LAYOUT( \
   L07, L06, L05, L04, L03, L02,                    R05, R04, R03, R02, R01, R00, \
diff --git a/qmk/keyboards/keyboardio/model01/rules.mk b/qmk/keyboards/keyboardio/model01/rules.mk
index 29c028ac..a8c62756 100644
--- a/qmk/keyboards/keyboardio/model01/rules.mk
+++ b/qmk/keyboards/keyboardio/model01/rules.mk
@@ -32,4 +32,5 @@ SRC += leds.c \
 	   matrix.c
 
 # You can set RGB_MATRIX_ENABLE = no in your rules.mk to disable this and save the Flash
-RGB_MATRIX_ENABLE = custom	# Enable RGB matrix effects.
+RGB_MATRIX_ENABLE = yes # Enable RGB matrix effects.
+RGB_MATRIX_DRIVER = custom
diff --git a/qmk/keyboards/keycapsss/plaid_pad/keymaps/via/rules.mk b/qmk/keyboards/keycapsss/plaid_pad/keymaps/via/rules.mk
index 00c11acc..36b7ba9c 100644
--- a/qmk/keyboards/keycapsss/plaid_pad/keymaps/via/rules.mk
+++ b/qmk/keyboards/keycapsss/plaid_pad/keymaps/via/rules.mk
@@ -1,4 +1,2 @@
 VIA_ENABLE = yes
 LTO_ENABLE = yes
-EXTRAKEY_ENABLE = no
-MOUSEKEY_ENABLE = no
diff --git a/qmk/keyboards/keyhive/maypad/config.h b/qmk/keyboards/keyhive/maypad/config.h
index 00a46daf..22c434df 100644
--- a/qmk/keyboards/keyhive/maypad/config.h
+++ b/qmk/keyboards/keyhive/maypad/config.h
@@ -215,32 +215,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/keyhive/maypad/rules.mk b/qmk/keyboards/keyhive/maypad/rules.mk
index 1e6415d4..6f912dbb 100644
--- a/qmk/keyboards/keyhive/maypad/rules.mk
+++ b/qmk/keyboards/keyhive/maypad/rules.mk
@@ -30,6 +30,5 @@ 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
 
 LAYOUTS = ortho_5x4 numpad_5x4
diff --git a/qmk/keyboards/keysofkings/twokey/config.h b/qmk/keyboards/keysofkings/twokey/config.h
new file mode 100644
index 00000000..d7f4c3cf
--- /dev/null
+++ b/qmk/keyboards/keysofkings/twokey/config.h
@@ -0,0 +1,68 @@
+ /* Copyright 2020 Keys of Kings
+  * 
+  * 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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0xFEED
+#define PRODUCT_ID      0xAE12
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Keys of Kings
+#define PRODUCT         Twokey
+
+/* key matrix size */
+#define MATRIX_ROWS 2
+#define MATRIX_COLS 2
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { B4, B5 }
+#define MATRIX_COL_PINS { B3, B2 }
+#define UNUSED_PINS
+
+
+#define ENCODERS_PAD_A { E6 }
+#define ENCODERS_PAD_B { D7 }
+#define ENCODER_RESOLUTION 1
+#define ENCODER_DIRECTION_FLIP
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+#ifdef RGBLIGHT_ENABLE
+#define RGB_DI_PIN D3
+#define RGBLIGHT_ANIMATIONS
+#define RGBLED_NUM 5
+#define RGBLIGHT_HUE_STEP 4
+#define RGBLIGHT_SAT_STEP 4
+#define RGBLIGHT_VAL_STEP 4
+#define B6_AUDIO
+#define AUDIO_CLICKY
+#endif
+
+#ifdef AUDIO_ENABLE
+#define STARTUP_SONG SONG(MAJOR_SOUND)
+#endif
diff --git a/qmk/keyboards/keysofkings/twokey/info.json b/qmk/keyboards/keysofkings/twokey/info.json
new file mode 100644
index 00000000..d7dabbc9
--- /dev/null
+++ b/qmk/keyboards/keysofkings/twokey/info.json
@@ -0,0 +1,16 @@
+{
+    "keyboard_name": "Twokey",
+    "url": "",
+    "maintainer": "Keys of Kings",
+    "width": 2,
+    "height": 2.5,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"x": 0.5, "y": 0},
+                {"x": 0, "y": 1.5},
+                {"x": 1, "y": 1.5}
+            ]
+        }
+    }
+}
diff --git a/qmk/keyboards/keysofkings/twokey/keymaps/default/keymap.c b/qmk/keyboards/keysofkings/twokey/keymaps/default/keymap.c
new file mode 100644
index 00000000..eaa4f88d
--- /dev/null
+++ b/qmk/keyboards/keysofkings/twokey/keymaps/default/keymap.c
@@ -0,0 +1,79 @@
+ /* Copyright 2020 Keys of Kings
+  * 
+  * 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] = {
+	LAYOUT(
+		LT(1, KC_MUTE), 
+		LT(4, KC_MPLY), LT(7, KC_MNXT)),		
+
+	LAYOUT(
+		KC_TRNS, 
+		TO(2), TO(3)),
+
+	LAYOUT(
+		TO(0), 
+		RGB_TOG, RGB_MOD),
+
+	LAYOUT(
+		TO(0), 
+		RGB_VAI, RGB_VAD),
+    
+    LAYOUT(
+		TO(0), 
+		RGB_HUI, RGB_HUD),
+
+	LAYOUT(
+		TO(5), 
+		KC_TRNS, TO(6)),
+
+	LAYOUT(
+		TO(0), 
+		RGB_SAI, RGB_SAD),
+
+	LAYOUT(
+		TO(8), 
+		TO(9), KC_TRNS),
+
+	LAYOUT(
+		TO(0), 
+		CK_TOGG, MU_TOG),
+
+	LAYOUT(
+		TO(0), 
+		RESET, EEPROM_RESET),
+};
+
+void matrix_init_user(void) {
+  debug_config.matrix = 1;
+  debug_config.keyboard = 1;
+  debug_config.enable = 1;
+}
+
+void encoder_update_user(int8_t index, bool clockwise) {
+  if (index == 0) {
+    if (clockwise) {
+      tap_code(KC_VOLD);
+    } else {
+      tap_code(KC_VOLU);
+    }
+    #    ifdef AUDIO_CLICKY
+            clockwise ? clicky_freq_up() : clicky_freq_down();
+#    endif
+  }
+}
+
diff --git a/qmk/keyboards/keysofkings/twokey/readme.md b/qmk/keyboards/keysofkings/twokey/readme.md
new file mode 100644
index 00000000..18394f8f
--- /dev/null
+++ b/qmk/keyboards/keysofkings/twokey/readme.md
@@ -0,0 +1,16 @@
+# TWOKEY
+
+![Twokey](https://i.imgur.com/UiLwPldl.jpeg)
+
+A Two Key mini keyboard with Rotary Encoder/Switch along with Backlight keys, RGB Underglow, and Piezo Buzzer. Supports Cherry, Choc, Matias switches.
+
+* Keyboard Maintainer: Keys of Kings
+* Keyboard Designer: King Icewind
+* Hardware Supported: Twokey PCB, Pro Micro
+* Hardware Availability: www.keysofkings.com
+
+Make example for this keyboard (after setting up your build environment):
+
+    make keysofkings/twokey: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).
diff --git a/qmk/keyboards/keysofkings/twokey/rules.mk b/qmk/keyboards/keysofkings/twokey/rules.mk
new file mode 100644
index 00000000..d892fd2b
--- /dev/null
+++ b/qmk/keyboards/keysofkings/twokey/rules.mk
@@ -0,0 +1,23 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # 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
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = yes          # Audio output
+ENCODER_ENABLE = yes
diff --git a/qmk/keyboards/keysofkings/twokey/twokey.c b/qmk/keyboards/keysofkings/twokey/twokey.c
new file mode 100644
index 00000000..1668092b
--- /dev/null
+++ b/qmk/keyboards/keysofkings/twokey/twokey.c
@@ -0,0 +1,17 @@
+ /* Copyright 2020 Keys of Kings
+  * 
+  * 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 "twokey.h"
diff --git a/qmk/keyboards/keysofkings/twokey/twokey.h b/qmk/keyboards/keysofkings/twokey/twokey.h
new file mode 100644
index 00000000..169bc9eb
--- /dev/null
+++ b/qmk/keyboards/keysofkings/twokey/twokey.h
@@ -0,0 +1,28 @@
+ /* Copyright 2020 Keys of Kings
+  * 
+  * 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( \
+	K00,      \
+	K10, K11  \
+) { \
+	{ K00,   KC_NO }, \
+	{ K10,   K11 }  \
+}
+
diff --git a/qmk/keyboards/kinesis/keymaps/dvorak/keymap.c b/qmk/keyboards/kinesis/keymaps/dvorak/keymap.c
index 9e44c10c..868c9ad5 100644
--- a/qmk/keyboards/kinesis/keymaps/dvorak/keymap.c
+++ b/qmk/keyboards/kinesis/keymaps/dvorak/keymap.c
@@ -7,26 +7,26 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 [_DVORAK] = LAYOUT(
         // left hand
         KC_ESC,   KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5, KC_F6, KC_F7, KC_F8,
-        KC_GRV,   KC_1,    KC_2,    KC_3,    KC_4,   KC_5,
+        KC_EQL,   KC_1,    KC_2,    KC_3,    KC_4,   KC_5,
         KC_TAB,   KC_QUOT, KC_COMM, KC_DOT,  KC_P,   KC_Y,
-        KC_BSPC,  KC_A,    KC_O,    KC_E,    KC_U,   KC_I,
+        KC_CAPS,  KC_A,    KC_O,    KC_E,    KC_U,   KC_I,
         KC_LSFT,  KC_SCLN, KC_Q,    KC_J,    KC_K,   KC_X,
-                  KC_ESC,  KC_LBRC, KC_DOWN, KC_UP,
+                  KC_GRV,  KC_INS, KC_LEFT, KC_RIGHT,
         // left thumb
-                            KC_LGUI, KC_LCTL,
-                                     KC_LALT,
-                   KC_BSPC, KC_DEL,  TG(_MEDIA),
+                            KC_LCTL, KC_LALT,
+                                     KC_HOME,
+                   KC_BSPC, KC_DEL,  KC_END,
         // right hand
         KC_F9,  KC_F10,   KC_F11,   KC_F12,   KC_PSCR, KC_SLCK, KC_PAUS, KC_FN0, KC_1,
-        KC_6,   KC_7,     KC_8,     KC_9,     KC_0,    KC_EQL,
+        KC_6,   KC_7,     KC_8,     KC_9,     KC_0,    KC_MINS,
         KC_F,   KC_G,     KC_C,     KC_R,     KC_L,    KC_SLSH,
-        KC_D,   KC_H,     KC_T,     KC_N,     KC_S,    KC_MINS,
+        KC_D,   KC_H,     KC_T,     KC_N,     KC_S,    KC_BSLS,
         KC_B,   KC_M,     KC_W,     KC_V,     KC_Z,    KC_RSFT,
-                          KC_LEFT,  KC_RIGHT, KC_RBRC, KC_BSLS,
+                          KC_UP,  KC_DOWN, KC_LBRC, KC_RBRC,
         // right thumb
-        KC_RCTL,    KC_RGUI,
-        KC_RALT,
-        TG(_MEDIA), KC_ENT, KC_SPC
+        KC_RGUI,    KC_RCTL,
+        KC_PGUP,
+        KC_PGDN, KC_ENT, KC_SPC
     ),
 
 [_MEDIA] = LAYOUT(
diff --git a/qmk/keyboards/kinesis/stapelberg/config.h b/qmk/keyboards/kinesis/stapelberg/config.h
index 99248019..5037baeb 100644
--- a/qmk/keyboards/kinesis/stapelberg/config.h
+++ b/qmk/keyboards/kinesis/stapelberg/config.h
@@ -27,7 +27,12 @@
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
- 
+
+#define LED_NUM_LOCK_PIN F2
+#define LED_CAPS_LOCK_PIN F3
+#define LED_SCROLL_LOCK_PIN F1
+#define LED_COMPOSE_PIN F0
+#define LED_PIN_ON_STATE 0
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
diff --git a/qmk/keyboards/kinesis/stapelberg/stapelberg.c b/qmk/keyboards/kinesis/stapelberg/stapelberg.c
index af407ac4..a69679ee 100644
--- a/qmk/keyboards/kinesis/stapelberg/stapelberg.c
+++ b/qmk/keyboards/kinesis/stapelberg/stapelberg.c
@@ -1,61 +1 @@
 #include "stapelberg.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-    // * Set our LED pins as output
-    DDRF |= (1<<0); // Keypad LED
-    DDRF |= (1<<1); // ScrLock LED
-    DDRF |= (1<<2); // NumLock LED
-    DDRF |= (1<<3); // CapsLock LED
-
-	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_init_ports() {
-  // * Set our LED pins as output
-  DDRF |= (1<<0); // Keypad LED
-  DDRF |= (1<<1); // ScrLock LED
-  DDRF |= (1<<2); // NumLock LED
-  DDRF |= (1<<3); // CapsLock LED
-}
-
-void led_set_kb(uint8_t usb_led) {
-  if (usb_led & (1<<USB_LED_COMPOSE)) {
-      PORTF &= ~(1<<0);
-  } else {
-      PORTF |= (1<<0);
-  }
-
-  if (usb_led & (1<<USB_LED_SCROLL_LOCK)) {
-      PORTF &= ~(1<<1);
-  } else {
-      PORTF |= (1<<1);
-  }
-
-  if (usb_led & (1<<USB_LED_NUM_LOCK)) {
-      PORTF &= ~(1<<2);
-  } else {
-      PORTF |= (1<<2);
-  }
-
-  if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
-      PORTF &= ~(1<<3);
-  } else {
-      PORTF |= (1<<3);
-  }
-}
diff --git a/qmk/keyboards/kingly_keys/ave/config.h b/qmk/keyboards/kingly_keys/ave/config.h
new file mode 100644
index 00000000..06fda4c2
--- /dev/null
+++ b/qmk/keyboards/kingly_keys/ave/config.h
@@ -0,0 +1,50 @@
+ /* 
+ Copyright 2020 Garret Gartner
+  
+ 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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x4B4B // "KK"
+#define PRODUCT_ID      0x1225
+#define DEVICE_VER      0x0011
+#define MANUFACTURER    Kingly-Keys
+#define PRODUCT         The Ave.
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 13
+
+
+#define ENCODERS_PAD_A { B2 }
+#define ENCODERS_PAD_B { B1 }
+
+#define MATRIX_ROW_PINS { B3, F4, F7, F6, F5 }
+#define MATRIX_COL_PINS { C7, C6, B6, B5, B4, D7, D6, D4, D5, D3, D2, D1, D0}
+#define UNUSED_PINS
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
diff --git a/qmk/keyboards/kingly_keys/ave/ortho/info.json b/qmk/keyboards/kingly_keys/ave/ortho/info.json
new file mode 100644
index 00000000..9853fcd7
--- /dev/null
+++ b/qmk/keyboards/kingly_keys/ave/ortho/info.json
@@ -0,0 +1,183 @@
+{
+  "keyboard_name": "The Ave. (Ortholinear Ed. PCB)",
+  "url": "",
+  "maintainer": "the-royal",
+  "width": 13.5,
+  "height": 5.5,
+  "layouts": {
+    "LAYOUT_ortho_all": {
+       "layout": [
+        {"label":"k001", "x":0.00, "y":0.00},
+        {"label":"k002", "x":1.50, "y":0.00},
+        {"label":"k011", "x":10.5, "y":0.00},
+        {"label":"k012", "x":11.5, "y":0.00},
+        {"label":"k013", "x":12.5, "y":0.00},
+        {"label":"k101", "x":0.00, "y":1.50},
+        {"label":"k102", "x":1.50, "y":1.50},
+        {"label":"k103", "x":2.50, "y":1.50},
+        {"label":"k104", "x":3.50, "y":1.50},
+        {"label":"k105", "x":4.50, "y":1.50},
+        {"label":"k106", "x":5.50, "y":1.50},
+        {"label":"k107", "x":6.50, "y":1.50},
+        {"label":"k108", "x":7.50, "y":1.50},
+        {"label":"k109", "x":8.50, "y":1.50},
+        {"label":"k110", "x":9.50, "y":1.50},
+        {"label":"k111", "x":10.5, "y":1.50},
+        {"label":"k112", "x":11.5, "y":1.50},
+        {"label":"k113", "x":12.5, "y":1.50},
+        {"label":"k201", "x":0.00, "y":2.50},
+        {"label":"k202", "x":1.50, "y":2.50},
+        {"label":"k203", "x":2.50, "y":2.50},
+        {"label":"k204", "x":3.50, "y":2.50},
+        {"label":"k205", "x":4.50, "y":2.50},
+        {"label":"k206", "x":5.50, "y":2.50},
+        {"label":"k207", "x":6.50, "y":2.50},
+        {"label":"k208", "x":7.50, "y":2.50},
+        {"label":"k209", "x":8.50, "y":2.50},
+        {"label":"k210", "x":9.50, "y":2.50},
+        {"label":"k211", "x":10.5, "y":2.50},
+        {"label":"k212", "x":11.5, "y":2.50},
+        {"label":"k213", "x":12.5, "y":2.50},
+        {"label":"k301", "x":0.00, "y":3.50},
+        {"label":"k302", "x":1.50, "y":3.50},
+        {"label":"k303", "x":2.50, "y":3.50},
+        {"label":"k304", "x":3.50, "y":3.50},
+        {"label":"k305", "x":4.50, "y":3.50},
+        {"label":"k306", "x":5.50, "y":3.50},
+        {"label":"k307", "x":6.50, "y":3.50},
+        {"label":"k308", "x":7.50, "y":3.50},
+        {"label":"k309", "x":8.50, "y":3.50},
+        {"label":"k310", "x":9.50, "y":3.50},
+        {"label":"k311", "x":10.5, "y":3.50},
+        {"label":"k312", "x":11.5, "y":3.50},
+        {"label":"k313", "x":12.5, "y":3.50},
+        {"label":"k401", "x":0.00, "y":4.50},
+        {"label":"k402", "x":1.50, "y":4.50},
+        {"label":"k403", "x":2.50, "y":4.50},
+        {"label":"k404", "x":3.50, "y":4.50},
+        {"label":"k405", "x":4.50, "y":4.50},
+        {"label":"k406", "x":5.50, "y":4.50},
+        {"label":"k407", "x":6.50, "y":4.50},
+        {"label":"k408", "x":7.50, "y":4.50},
+        {"label":"k409", "x":8.50, "y":4.50},
+        {"label":"k410", "x":9.50, "y":4.50},
+        {"label":"k411", "x":10.5, "y":4.50},
+        {"label":"k412", "x":11.5, "y":4.50},
+        {"label":"k413", "x":12.5, "y":4.50}
+      ]
+    },
+    "LAYOUT_ortho_2x2u": {
+        "layout": [
+         {"label":"k001", "x":0.00, "y":0.00},
+         {"label":"k002", "x":1.50, "y":0.00},
+         {"label":"k011", "x":10.5, "y":0.00},
+         {"label":"k012", "x":11.5, "y":0.00},
+         {"label":"k013", "x":12.5, "y":0.00},
+         {"label":"k101", "x":0.00, "y":1.50},
+         {"label":"k102", "x":1.50, "y":1.50},
+         {"label":"k103", "x":2.50, "y":1.50},
+         {"label":"k104", "x":3.50, "y":1.50},
+         {"label":"k105", "x":4.50, "y":1.50},
+         {"label":"k106", "x":5.50, "y":1.50},
+         {"label":"k107", "x":6.50, "y":1.50},
+         {"label":"k108", "x":7.50, "y":1.50},
+         {"label":"k109", "x":8.50, "y":1.50},
+         {"label":"k110", "x":9.50, "y":1.50},
+         {"label":"k111", "x":10.5, "y":1.50},
+         {"label":"k112", "x":11.5, "y":1.50},
+         {"label":"k113", "x":12.5, "y":1.50},
+         {"label":"k201", "x":0.00, "y":2.50},
+         {"label":"k202", "x":1.50, "y":2.50},
+         {"label":"k203", "x":2.50, "y":2.50},
+         {"label":"k204", "x":3.50, "y":2.50},
+         {"label":"k205", "x":4.50, "y":2.50},
+         {"label":"k206", "x":5.50, "y":2.50},
+         {"label":"k207", "x":6.50, "y":2.50},
+         {"label":"k208", "x":7.50, "y":2.50},
+         {"label":"k209", "x":8.50, "y":2.50},
+         {"label":"k210", "x":9.50, "y":2.50},
+         {"label":"k211", "x":10.5, "y":2.50},
+         {"label":"k212", "x":11.5, "y":2.50},
+         {"label":"k213", "x":12.5, "y":2.50},
+         {"label":"k301", "x":0.00, "y":3.50},
+         {"label":"k302", "x":1.50, "y":3.50},
+         {"label":"k303", "x":2.50, "y":3.50},
+         {"label":"k304", "x":3.50, "y":3.50},
+         {"label":"k305", "x":4.50, "y":3.50},
+         {"label":"k306", "x":5.50, "y":3.50},
+         {"label":"k307", "x":6.50, "y":3.50},
+         {"label":"k308", "x":7.50, "y":3.50},
+         {"label":"k309", "x":8.50, "y":3.50},
+         {"label":"k310", "x":9.50, "y":3.50},
+         {"label":"k311", "x":10.5, "y":3.50},
+         {"label":"k312", "x":11.5, "y":3.50},
+         {"label":"k313", "x":12.5, "y":3.50},
+         {"label":"k401", "x":0.00, "y":4.50},
+         {"label":"k402", "x":1.50, "y":4.50},
+         {"label":"k403", "x":2.50, "y":4.50},
+         {"label":"k404", "x":3.50, "y":4.50},
+         {"label":"k405", "x":4.50, "y":4.50},
+         {"label":"k406", "x":5.50, "y":4.50, "w":2.00},
+         {"label":"k409", "x":7.50, "y":4.50, "w":2.00},
+         {"label":"k410", "x":9.50, "y":4.50},
+         {"label":"k411", "x":10.5, "y":4.50},
+         {"label":"k412", "x":11.5, "y":4.50},
+         {"label":"k413", "x":12.5, "y":4.50}
+       ]
+     },
+     "LAYOUT_ortho_big_boy": {
+        "layout": [
+         {"label":"k001", "x":0.00, "y":0.00},
+         {"label":"k002", "x":1.50, "y":0.00},
+         {"label":"k011", "x":10.5, "y":0.00},
+         {"label":"k012", "x":11.5, "y":0.00},
+         {"label":"k013", "x":12.5, "y":0.00},
+         {"label":"k101", "x":0.00, "y":1.50},
+         {"label":"k102", "x":1.50, "y":1.50},
+         {"label":"k103", "x":2.50, "y":1.50},
+         {"label":"k104", "x":3.50, "y":1.50},
+         {"label":"k105", "x":4.50, "y":1.50},
+         {"label":"k106", "x":5.50, "y":1.50},
+         {"label":"k107", "x":6.50, "y":1.50},
+         {"label":"k108", "x":7.50, "y":1.50},
+         {"label":"k109", "x":8.50, "y":1.50},
+         {"label":"k110", "x":9.50, "y":1.50},
+         {"label":"k111", "x":10.5, "y":1.50},
+         {"label":"k112", "x":11.5, "y":1.50},
+         {"label":"k113", "x":12.5, "y":1.50},
+         {"label":"k201", "x":0.00, "y":2.50},
+         {"label":"k202", "x":1.50, "y":2.50},
+         {"label":"k203", "x":2.50, "y":2.50},
+         {"label":"k204", "x":3.50, "y":2.50},
+         {"label":"k205", "x":4.50, "y":2.50},
+         {"label":"k206", "x":5.50, "y":2.50},
+         {"label":"k207", "x":6.50, "y":2.50},
+         {"label":"k208", "x":7.50, "y":2.50},
+         {"label":"k209", "x":8.50, "y":2.50},
+         {"label":"k210", "x":9.50, "y":2.50},
+         {"label":"k211", "x":10.5, "y":2.50},
+         {"label":"k212", "x":11.5, "y":2.50},
+         {"label":"k213", "x":12.5, "y":2.50},
+         {"label":"k301", "x":0.00, "y":3.50},
+         {"label":"k302", "x":1.50, "y":3.50},
+         {"label":"k303", "x":2.50, "y":3.50},
+         {"label":"k304", "x":3.50, "y":3.50},
+         {"label":"k305", "x":4.50, "y":3.50},
+         {"label":"k306", "x":5.50, "y":3.50},
+         {"label":"k307", "x":6.50, "y":3.50},
+         {"label":"k308", "x":7.50, "y":3.50},
+         {"label":"k309", "x":8.50, "y":3.50},
+         {"label":"k310", "x":9.50, "y":3.50},
+         {"label":"k311", "x":10.5, "y":3.50},
+         {"label":"k312", "x":11.5, "y":3.50},
+         {"label":"k313", "x":12.5, "y":3.50},
+         {"label":"k401", "x":0.00, "y":4.50},
+         {"label":"k402", "x":1.50, "y":4.50},
+         {"label":"k403", "x":2.50, "y":4.50, "w":1.50},
+         {"label":"k404", "x":4.00, "y":4.50, "w":7.00},
+         {"label":"k405", "x":11.0, "y":4.50, "w":1.50},
+         {"label":"k413", "x":12.5, "y":4.50}
+       ]
+     }
+   }
+}
diff --git a/qmk/keyboards/kingly_keys/ave/ortho/keymaps/default/config.h b/qmk/keyboards/kingly_keys/ave/ortho/keymaps/default/config.h
new file mode 100644
index 00000000..6fba9d2b
--- /dev/null
+++ b/qmk/keyboards/kingly_keys/ave/ortho/keymaps/default/config.h
@@ -0,0 +1,32 @@
+ /* 
+ Copyright 2020 Garret Gartner
+  
+ 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
+
+#define TAPPING_TERM_PER_KEY
+
+#ifdef RGBLIGHT_ENABLE
+    /* ws2812 RGB LED */
+    #define RGB_DI_PIN B7
+    #define RGBLED_NUM 2   // Number of LEDs
+    
+    #define RGBLIGHT_EFFECT_BREATHING
+/*  #define RGBLIGHT_HUE_STEP 6
+*   #define RGBLIGHT_SAT_STEP 4
+*   #define RGBLIGHT_VAL_STEP 4
+*/
+#endif
diff --git a/qmk/keyboards/kingly_keys/ave/ortho/keymaps/default/keymap.c b/qmk/keyboards/kingly_keys/ave/ortho/keymaps/default/keymap.c
new file mode 100644
index 00000000..4e195d43
--- /dev/null
+++ b/qmk/keyboards/kingly_keys/ave/ortho/keymaps/default/keymap.c
@@ -0,0 +1,239 @@
+ /* 
+ Copyright 2020 Garret Gartner
+  
+ 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
+
+enum avenue_layers {
+  _QWERTY,
+  _LOWER,
+  _RAISE,
+  _FUNCTION
+};
+
+
+
+//Tap Dance Declarations:
+enum avenue_tapcodes {
+  TD_RST,
+  TD_DBQT,
+};
+
+void dance_rst_reset (qk_tap_dance_state_t *state, void *user_data) { // *Line_Note.001
+  if (state->count >= 2) {
+    reset_keyboard();
+    reset_tap_dance(state);
+  }
+}
+
+//Tap Dance Functions:
+qk_tap_dance_action_t tap_dance_actions[] = {
+ [TD_RST] = ACTION_TAP_DANCE_FN_ADVANCED (NULL, NULL, dance_rst_reset), // References "dance_rst_reset" (*Line_Note.001)
+ [TD_DBQT] = ACTION_TAP_DANCE_DOUBLE (KC_QUOTE, KC_DQT)
+};
+
+
+
+// Keymap Customization:
+#define LOWR  MO(_LOWER)
+#define RISE  MO(_RAISE)
+#define FN    MO(_FUNCTION)
+#define GUI   KC_LGUI
+#define ALT   KC_LALT
+#define SPACE KC_SPACE
+
+    /*
+    *   ┌────┐
+    *   │    │ = "TRANSPARENT" KEY LOCATION
+    *   └────┘
+    */
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    /* _QWERTY (Base)
+    *
+    * ┌────┐ ┌────┐                                       ┌────┬────┬────┐
+    * │MUTE│ │Esc │                                       │ \  │ -  │ =  │
+    * └────┘ └────┘                                       └────┴────┴────┘
+    * ┌────┐ ┌────┬────┬────┬────┬────┬────┬────┬────┬────┬────┬────┬────┐
+    * │Home│ │Tab │ Q  │ W  │ E  │ R  │ T  │ Y  │ U  │ I  │ O  │ P  │BkSp│
+    * ├────┤ ├────┼────┼────┼────┼────┼────┼────┼────┼────┼────┼────┼────┤
+    * │PgUp│ │CAPS│ A  │ S  │ D  │ F  │ G  │ H  │ J  │ K  │ L  │ ;  │ '  │
+    * ├────┤ ├────┼────┼────┼────┼────┼────┼────┼────┼────┼────┼────┼────┤
+    * │PgDn│ │Shft│ Z  │ X  │ C  │ V  │ B  │ N  │ M  │ ,  │ .  │ /  │Entr│
+    * ├────┤ ├────┼────┼────┼────┼────┼────┴────┼────┼────┼────┼────┼────┤
+    * │End │ │CTL │GUI │ALT │FUNC│LOWR│    │    │RISE│Left│Down│ Up │Rght│
+    * └────┘ └────┴────┴────┴────┴────┴─────────┴────┴────┴────┴────┴────┘
+    */
+    [_QWERTY] = LAYOUT_ortho_all(
+        KC_MUTE,      KC_ESC,                                                                       KC_BSLS,   KC_MINUS,   KC_EQUAL,
+        KC_HOME,      KC_TAB,    KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,      KC_O,      KC_P,       KC_BSPC,
+        KC_PGUP,      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_PGDN,      KC_LSFT,   KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,   KC_DOT,    KC_SLSH,    KC_ENT,
+        KC_END,       KC_DEL,    GUI,    ALT,    FN,     LOWR,   SPACE,  SPACE,  RISE,   KC_LEFT,   KC_DOWN,   KC_UP,      KC_RIGHT
+    ),
+
+    /* _LOWER (Media / Symbols / Punctuation)
+    *
+    * ┌────┐ ┌────┐                                       ┌────┬────┬────┐
+    * │ // │ │PRNT│                                       │ [  │ ]  │ `  │
+    * └────┘ └────┘                                       └────┴────┴────┘
+    * ┌────┐ ┌────┬────┬────┬────┬────┬────┬────┬────┬────┬────┬────┬────┐
+    * │PLAY│ │    │ 1  │ 2  │ 3  │ 4  │ 5  │ 6  │ 7  │ 8  │ 9  │ 0  │    │
+    * ├────┤ ├────┼────┼────┼────┼────┼────┼────┼────┼────┼────┼────┼────┤
+    * │NEXT│ │    │ !  │ @  │ #  │ $  │ %  │ ^  │ &  │ *  │ (  │ )  │ "  │
+    * ├────┤ ├────┼────┼────┼────┼────┼────┼────┼────┼────┼────┼────┼────┤
+    * │PREV│ │    │    │    │    │    │    │    │    │    │    │    │    │
+    * ├────┤ ├────┼────┼────┼────┼────┼────┴────┼────┼────┼────┼────┼────┤
+    * │STOP│ │    │    │    │    │    │    │    │    │    │    │    │    │
+    * └────┘ └────┴────┴────┴────┴────┴─────────┴────┴────┴────┴────┴────┘
+    */
+    [_LOWER] = LAYOUT_ortho_all(
+        _______,      _______,                                                                                           KC_LBRC,   KC_RBRC,   KC_GRAVE,
+        KC_MPLY,      _______,   KC_1,      KC_2,      KC_3,      KC_4,      KC_5,      KC_6,      KC_7,      KC_8,      KC_9,      KC_0,      _______,
+        KC_MNXT,      _______,   KC_EXLM,   KC_AT,     KC_HASH,   KC_DLR,    KC_PERC,   KC_CIRC,   KC_AMPR,   KC_ASTR,   KC_LPRN,   KC_RPRN,   KC_DQT,
+        KC_MPRV,      _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,
+        KC_MSTP,      _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______
+    ),
+
+    /* _RAISE (Misc Modifiers / Extended Punctuation)
+    *
+    * ┌────┐ ┌────┐                                       ┌────┬────┬────┐
+    * │PRNT│ │    │                                       │ {  │ }  │ ~  │
+    * └────┘ └────┘                                       └────┴────┴────┘
+    * ┌────┐ ┌────┬────┬────┬────┬────┬────┬────┬────┬────┬────┬────┬────┐
+    * │    │ │    │    │    │    │    │    │    │    │    │    │    │    │
+    * ├────┤ ├────┼────┼────┼────┼────┼────┼────┼────┼────┼────┼────┼────┤
+    * │    │ │CAPS│    │    │    │    │    │    │    │    │    │    │    │
+    * ├────┤ ├────┼────┼────┼────┼────┼────┼────┼────┼────┼────┼────┼────┤
+    * │    │ │    │    │    │    │    │    │    │    │    │    │    │    │
+    * ├────┤ ├────┼────┼────┼────┼────┼────┴────┼────┼────┼────┼────┼────┤
+    * │    │ │    │    │    │    │    │    │    │    │    │    │    │    │
+    * └────┘ └────┴────┴────┴────┴────┴─────────┴────┴────┴────┴────┴────┘
+    */
+    [_RAISE] = LAYOUT_ortho_all(
+        KC_PSCR,      _______,                                                                                           KC_LCBR,   KC_RCBR,   KC_TILD,
+        _______,      _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,
+        _______,      KC_CAPS,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,
+        _______,      _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,
+        _______,      _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______
+    ),
+
+    /* _FUNCTION (F-Row / DFU Reset / RGB Toggle)
+    *
+    * ┌────┐ ┌────┐                                       ┌────┬────┬────┐
+    * │RSET│ │RGB │                                       │F11 │F12 │F13 │
+    * └────┘ └────┘                                       └────┴────┴────┘
+    * ┌────┐ ┌────┬────┬────┬────┬────┬────┬────┬────┬────┬────┬────┬────┐
+    * │    │ │    │ F1 │ F2 │ F3 │ F4 │ F5 │ F6 │ F7 │ F8 │ F9 │F10 │    │
+    * ├────┤ ├────┼────┼────┼────┼────┼────┼────┼────┼────┼────┼────┼────┤
+    * │    │ │    │    │    │    │    │    │    │    │    │    │    │    │
+    * ├────┤ ├────┼────┼────┼────┼────┼────┼────┼────┼────┼────┼────┼────┤
+    * │    │ │    │    │    │    │    │    │    │    │    │    │    │    │
+    * ├────┤ ├────┼────┼────┼────┼────┼────┴────┼────┼────┼────┼────┼────┤
+    * │    │ │    │    │    │    │    │    │    │    │    │    │    │    │
+    * └────┘ └────┴────┴────┴────┴────┴─────────┴────┴────┴────┴────┴────┘
+    */
+    [_FUNCTION] = LAYOUT_ortho_all(
+        TD(TD_RST),   RGB_TOG,                                                                                           KC_F11,    KC_F12,    KC_F13,
+        _______,      _______,   KC_F1,     KC_F2,     KC_F3,     KC_F4,     KC_F5,     KC_F6,     KC_F7,     KC_F8,     KC_F9,     KC_F10,    _______,
+        _______,      _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,
+        _______,      _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,
+        _______,      _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______
+    )
+};
+
+
+
+//  KEYMAP TEMPLATE:
+//  
+//  /* <_LAYER>:
+//  *
+//  * ┌────┐ ┌────┐                                       ┌────┬────┬────┐
+//  * │    │ │    │                                       │    │    │    │
+//  * └────┘ └────┘                                       └────┴────┴────┘
+//  * ┌────┐ ┌────┬────┬────┬────┬────┬────┬────┬────┬────┬────┬────┬────┐
+//  * │    │ │    │    │    │    │    │    │    │    │    │    │    │    │
+//  * ├────┤ ├────┼────┼────┼────┼────┼────┼────┼────┼────┼────┼────┼────┤
+//  * │    │ │    │    │    │    │    │    │    │    │    │    │    │    │
+//  * ├────┤ ├────┼────┼────┼────┼────┼────┼────┼────┼────┼────┼────┼────┤
+//  * │    │ │    │    │    │    │    │    │    │    │    │    │    │    │
+//  * ├────┤ ├────┼────┼────┼────┼────┼────┴────┼────┼────┼────┼────┼────┤
+//  * │    │ │    │    │    │    │    │    │    │    │    │    │    │    │
+//  * └────┘ └────┴────┴────┴────┴────┴─────────┴────┴────┴────┴────┴────┘
+//  */
+//  [<LAYER>] = LAYOUT_ortho_all(
+//      _______,      _______,                                                                                           _______,   _______,   _______,
+//      _______,      _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,
+//      _______,      _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,
+//      _______,      _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,
+//      _______,      _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______
+//  )
+
+
+// Per-Key Tapping Term Definitions:
+uint16_t get_tapping_term(uint16_t keycode) {
+  switch (keycode) {
+    case TD(TD_DBQT):
+      return 235;
+    default:
+      return TAPPING_TERM;
+  }
+}
+
+
+// Encoder Customization: (*Order-of-Keycode Specific)
+void encoder_update_user(uint8_t index, bool clockwise) {
+    if (index == 0) {
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    }
+}
+
+
+
+// RGB Indicator Customization: (100% stolen from Jetpacktuxedo)
+void keyboard_post_init_user(void) {
+  #ifdef RGBLIGHT_ENABLE
+// Set up RGB effects on _only_ the first LED (index 0):
+        rgblight_set_effect_range(0, 1);
+// Set LED effects to breathing mode in a "terminal-green" type color:
+        rgblight_sethsv_noeeprom(50, 255, 100);
+        rgblight_mode_noeeprom(RGBLIGHT_EFFECT_BREATHING + 2);
+// Init the second LED to a static color:
+        setrgb(225, 185, 0, (LED_TYPE *)&led[1]);
+    rgblight_set();
+  #endif // RGBLIGHT_ENABLE
+}
+
+// RGB Indicator Customization: (cont.)
+layer_state_t layer_state_set_user(layer_state_t state){
+    #ifdef RGBLIGHT_ENABLE
+        uint8_t led1r = 0; uint8_t led1g = 0; uint8_t led1b = 0;
+            if (layer_state_cmp(state, 1)) {
+                led1b = 255;
+            }
+            if (layer_state_cmp(state, 3)) {
+                led1r = 200;
+            }
+            setrgb(led1r, led1g, led1b, (LED_TYPE *)&led[1]);
+        rgblight_set();
+    #endif //RGBLIGHT_ENABLE
+  return state;
+}
diff --git a/qmk/keyboards/kingly_keys/ave/ortho/keymaps/default/rules.mk b/qmk/keyboards/kingly_keys/ave/ortho/keymaps/default/rules.mk
new file mode 100644
index 00000000..a6be46d7
--- /dev/null
+++ b/qmk/keyboards/kingly_keys/ave/ortho/keymaps/default/rules.mk
@@ -0,0 +1,2 @@
+# Keymap-Specific Functions
+TAP_DANCE_ENABLE  =  yes
diff --git a/qmk/keyboards/kingly_keys/ave/ortho/ortho.c b/qmk/keyboards/kingly_keys/ave/ortho/ortho.c
new file mode 100644
index 00000000..4fb95e76
--- /dev/null
+++ b/qmk/keyboards/kingly_keys/ave/ortho/ortho.c
@@ -0,0 +1,18 @@
+ /* 
+ Copyright 2020 Garret Gartner
+  
+ 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 "ortho.h"
diff --git a/qmk/keyboards/kingly_keys/ave/ortho/ortho.h b/qmk/keyboards/kingly_keys/ave/ortho/ortho.h
new file mode 100644
index 00000000..12cdede5
--- /dev/null
+++ b/qmk/keyboards/kingly_keys/ave/ortho/ortho.h
@@ -0,0 +1,67 @@
+ /* 
+ Copyright 2020 Garret Gartner
+  
+ 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 XXXX KC_NO
+
+#define LAYOUT_ortho_all( \
+    k001,    k002,                                                 k011, k012, k013, \
+    k101,    k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, \
+    k201,    k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, \
+    k301,    k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, \
+    k401,    k402, k403, k404, k405, k406, k407, k408, k409, k410, k411, k412, k413 \
+) \
+{ \
+    { k001, k002, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, k011, k012, k013 }, \
+    { k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113 }, \
+    { k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213 }, \
+    { k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313 }, \
+    { k401, k402, k403, k404, k405, k406, k407, k408, k409, k410, k411, k412, k413 } \
+}
+
+#define LAYOUT_ortho_2x2u( \
+    k001,    k002,                                                 k011, k012, k013, \
+    k101,    k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, \
+    k201,    k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, \
+    k301,    k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, \
+    k401,    k402, k403, k404, k405,    k406,       k409,    k410, k411, k412, k413 \
+) \
+{ \
+    { k001, k002, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, k011, k012, k013 }, \
+    { k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113 }, \
+    { k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213 }, \
+    { k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313 }, \
+    { k401, k402, k403, k404, k405, k406, XXXX, XXXX, k409, k410, k411, k412, k413 } \
+}
+
+#define LAYOUT_ortho_big_boy( \
+    k001,    k002,                                                 k011, k012, k013, \
+    k101,    k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, \
+    k201,    k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213, \
+    k301,    k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, \
+    k401,    k402,    k403,                k407,                      k412,    k413 \
+) \
+{ \
+    { k001, k002, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, k011, k012, k013 }, \
+    { k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113 }, \
+    { k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k212, k213 }, \
+    { k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313 }, \
+    { k401, k402, k403, XXXX, XXXX, XXXX, k407, XXXX, XXXX, XXXX, XXXX, k412, k413 } \
+}
diff --git a/qmk/keyboards/kingly_keys/ave/ortho/rules.mk b/qmk/keyboards/kingly_keys/ave/ortho/rules.mk
new file mode 100644
index 00000000..611eb0ce
--- /dev/null
+++ b/qmk/keyboards/kingly_keys/ave/ortho/rules.mk
@@ -0,0 +1,23 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+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
+# 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
+RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = yes
diff --git a/qmk/keyboards/kingly_keys/ave/readme.md b/qmk/keyboards/kingly_keys/ave/readme.md
new file mode 100644
index 00000000..080edf49
--- /dev/null
+++ b/qmk/keyboards/kingly_keys/ave/readme.md
@@ -0,0 +1,21 @@
+# The Ave. (Avenue)
+
+![ave-img-1](https://i.imgur.com/l5ah6uMl.png)
+
+A Compact Battlestation.
+
+- Keyboard Maintainer: [The-Royal](https://github.com/the-royal)
+- Hardware Supported: Rev10.0 Avenue PCBs *(Ortholinear & Staggered)*
+- Hardware Availability: Through group-buy or self procurement via open-source files. 
+
+Make examples for this keyboard (after setting up your build environment):
+
+**Ortholinear:**
+
+    make kingly_keys/ave/ortho:default
+
+**Staggered:**
+
+    make kingly_keys/ave/staggered: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).
diff --git a/qmk/keyboards/kingly_keys/ave/staggered/info.json b/qmk/keyboards/kingly_keys/ave/staggered/info.json
new file mode 100644
index 00000000..9a64cdeb
--- /dev/null
+++ b/qmk/keyboards/kingly_keys/ave/staggered/info.json
@@ -0,0 +1,117 @@
+{
+  "keyboard_name": "The Ave. (Staggered Ed. PCB)",
+  "url": "",
+  "maintainer": "the-royal",
+  "width": 13.5,
+  "height": 5.5,
+  "layouts": {
+     "LAYOUT_staggered": {
+        "layout": [
+         {"label":"k001", "x":0.00, "y":0.00},
+         {"label":"k002", "x":1.50, "y":0.00},
+         {"label":"k011", "x":10.5, "y":0.00},
+         {"label":"k012", "x":11.5, "y":0.00},
+         {"label":"k013", "x":12.5, "y":0.00},
+         {"label":"k101", "x":0.00, "y":1.50},
+         {"label":"k102", "x":1.50, "y":1.50},
+         {"label":"k103", "x":2.50, "y":1.50},
+         {"label":"k104", "x":3.50, "y":1.50},
+         {"label":"k105", "x":4.50, "y":1.50},
+         {"label":"k106", "x":5.50, "y":1.50},
+         {"label":"k107", "x":6.50, "y":1.50},
+         {"label":"k108", "x":7.50, "y":1.50},
+         {"label":"k109", "x":8.50, "y":1.50},
+         {"label":"k110", "x":9.50, "y":1.50},
+         {"label":"k111", "x":10.5, "y":1.50},
+         {"label":"k112", "x":11.5, "y":1.50},
+         {"label":"k113", "x":12.5, "y":1.50},
+         {"label":"k201", "x":0.00, "y":2.50},
+         {"label":"k202", "x":1.50, "y":2.50, "w":1.25},
+         {"label":"k203", "x":2.75, "y":2.50},
+         {"label":"k204", "x":3.75, "y":2.50},
+         {"label":"k205", "x":4.75, "y":2.50},
+         {"label":"k206", "x":5.75, "y":2.50},
+         {"label":"k207", "x":6.75, "y":2.50},
+         {"label":"k208", "x":7.75, "y":2.50},
+         {"label":"k209", "x":8.75, "y":2.50},
+         {"label":"k210", "x":9.75, "y":2.50},
+         {"label":"k211", "x":10.75, "y":2.5},
+         {"label":"k213", "x":11.75, "y":2.5, "w":1.75},
+         {"label":"k301", "x":0.00, "y":3.50},
+         {"label":"k302", "x":1.50, "y":3.50, "w":1.75},
+         {"label":"k303", "x":3.25, "y":3.50},
+         {"label":"k304", "x":4.25, "y":3.50},
+         {"label":"k305", "x":5.25, "y":3.50},
+         {"label":"k306", "x":6.25, "y":3.50},
+         {"label":"k307", "x":7.25, "y":3.50},
+         {"label":"k308", "x":8.25, "y":3.50},
+         {"label":"k309", "x":9.25, "y":3.50},
+         {"label":"k310", "x":10.25, "y":3.50},
+         {"label":"k312", "x":11.25, "y":3.50},
+         {"label":"k313", "x":12.25, "y":3.50, "w":1.25},
+         {"label":"k401", "x":0.00, "y":4.50},
+         {"label":"k402", "x":1.50, "y":4.50, "w":1.25},
+         {"label":"k403", "x":2.75, "y":4.50},
+         {"label":"k404", "x":3.75, "y":4.50, "w":1.25},
+         {"label":"k406", "x":5.00, "y":4.50, "w":2.75},
+         {"label":"k408", "x":7.75, "y":4.50, "w":2.25},
+         {"label":"k411", "x":10.0, "y":4.50, "w":1.25},
+         {"label":"k412", "x":11.25, "y":4.50},
+         {"label":"k413", "x":12.25, "y":4.50, "w":1.25}
+       ]
+     },
+     "LAYOUT_staggered_big_boy": {
+        "layout": [
+         {"label":"k001", "x":0.00, "y":0.00},
+         {"label":"k002", "x":1.50, "y":0.00},
+         {"label":"k011", "x":10.5, "y":0.00},
+         {"label":"k012", "x":11.5, "y":0.00},
+         {"label":"k013", "x":12.5, "y":0.00},
+         {"label":"k101", "x":0.00, "y":1.50},
+         {"label":"k102", "x":1.50, "y":1.50},
+         {"label":"k103", "x":2.50, "y":1.50},
+         {"label":"k104", "x":3.50, "y":1.50},
+         {"label":"k105", "x":4.50, "y":1.50},
+         {"label":"k106", "x":5.50, "y":1.50},
+         {"label":"k107", "x":6.50, "y":1.50},
+         {"label":"k108", "x":7.50, "y":1.50},
+         {"label":"k109", "x":8.50, "y":1.50},
+         {"label":"k110", "x":9.50, "y":1.50},
+         {"label":"k111", "x":10.5, "y":1.50},
+         {"label":"k112", "x":11.5, "y":1.50},
+         {"label":"k113", "x":12.5, "y":1.50},
+         {"label":"k201", "x":0.00, "y":2.50},
+         {"label":"k202", "x":1.50, "y":2.50, "w":1.25},
+         {"label":"k203", "x":2.75, "y":2.50},
+         {"label":"k204", "x":3.75, "y":2.50},
+         {"label":"k205", "x":4.75, "y":2.50},
+         {"label":"k206", "x":5.75, "y":2.50},
+         {"label":"k207", "x":6.75, "y":2.50},
+         {"label":"k208", "x":7.75, "y":2.50},
+         {"label":"k209", "x":8.75, "y":2.50},
+         {"label":"k210", "x":9.75, "y":2.50},
+         {"label":"k211", "x":10.75, "y":2.5},
+         {"label":"k213", "x":11.75, "y":2.5, "w":1.75},
+         {"label":"k301", "x":0.00, "y":3.50},
+         {"label":"k302", "x":1.50, "y":3.50, "w":1.75},
+         {"label":"k303", "x":3.25, "y":3.50},
+         {"label":"k304", "x":4.25, "y":3.50},
+         {"label":"k305", "x":5.25, "y":3.50},
+         {"label":"k306", "x":6.25, "y":3.50},
+         {"label":"k307", "x":7.25, "y":3.50},
+         {"label":"k308", "x":8.25, "y":3.50},
+         {"label":"k309", "x":9.25, "y":3.50},
+         {"label":"k310", "x":10.25, "y":3.50},
+         {"label":"k312", "x":11.25, "y":3.50},
+         {"label":"k313", "x":12.25, "y":3.50, "w":1.25},
+         {"label":"k401", "x":0.00, "y":4.50},
+         {"label":"k402", "x":1.50, "y":4.50, "w":1.25},
+         {"label":"k403", "x":2.75, "y":4.50},
+         {"label":"k406", "x":3.75, "y":4.50, "w":6.25},
+         {"label":"k411", "x":10.0, "y":4.50, "w":1.25},
+         {"label":"k412", "x":11.25, "y":4.50},
+         {"label":"k413", "x":12.25, "y":4.50, "w":1.25}
+       ]
+    }
+  }
+}
diff --git a/qmk/keyboards/kingly_keys/ave/staggered/keymaps/default/config.h b/qmk/keyboards/kingly_keys/ave/staggered/keymaps/default/config.h
new file mode 100644
index 00000000..6fba9d2b
--- /dev/null
+++ b/qmk/keyboards/kingly_keys/ave/staggered/keymaps/default/config.h
@@ -0,0 +1,32 @@
+ /* 
+ Copyright 2020 Garret Gartner
+  
+ 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
+
+#define TAPPING_TERM_PER_KEY
+
+#ifdef RGBLIGHT_ENABLE
+    /* ws2812 RGB LED */
+    #define RGB_DI_PIN B7
+    #define RGBLED_NUM 2   // Number of LEDs
+    
+    #define RGBLIGHT_EFFECT_BREATHING
+/*  #define RGBLIGHT_HUE_STEP 6
+*   #define RGBLIGHT_SAT_STEP 4
+*   #define RGBLIGHT_VAL_STEP 4
+*/
+#endif
diff --git a/qmk/keyboards/kingly_keys/ave/staggered/keymaps/default/keymap.c b/qmk/keyboards/kingly_keys/ave/staggered/keymaps/default/keymap.c
new file mode 100644
index 00000000..16f469b5
--- /dev/null
+++ b/qmk/keyboards/kingly_keys/ave/staggered/keymaps/default/keymap.c
@@ -0,0 +1,241 @@
+ /* 
+ Copyright 2020 Garret Gartner
+  
+ 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
+
+enum avenue_layers {
+  _QWERTY,
+  _LOWER,
+  _RAISE,
+  _FUNCTION
+};
+
+
+
+//Tap Dance Declarations:
+enum avenue_tapcodes {
+  TD_RST,
+  TD_DBQT,
+};
+
+void dance_rst_reset (qk_tap_dance_state_t *state, void *user_data) { // *Line_Note.001
+  if (state->count >= 2) {
+    reset_keyboard();
+    reset_tap_dance(state);
+  }
+}
+
+//Tap Dance Functions:
+qk_tap_dance_action_t tap_dance_actions[] = {
+ [TD_RST] = ACTION_TAP_DANCE_FN_ADVANCED (NULL, NULL, dance_rst_reset), // References "dance_rst_reset" (*Line_Note.001)
+ [TD_DBQT] = ACTION_TAP_DANCE_DOUBLE (KC_QUOTE, KC_DQT)
+};
+
+
+
+// Keymap Customization:
+#define LOWR  MO(_LOWER)
+#define RISE  MO(_RAISE)
+#define FN    MO(_FUNCTION)
+#define GUI   KC_LGUI
+#define ALT   KC_LALT
+#define SPACE KC_SPACE
+
+    /*
+    *   ┌────┐
+    *   │    │ = "TRANSPARENT" KEY LOCATION
+    *   └────┘
+    */
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    /* _QWERTY (Base)
+    *
+    * ┌────┐ ┌────┐                                       ┌────┬────┬────┐
+    * │MUTE│ │Esc │                                       │ (  │ )  │ ;  │
+    * └────┘ └────┘                                       └────┴────┴────┘
+    * ┌────┐ ┌────┬────┬────┬────┬────┬────┬────┬────┬────┬────┬────┬────┐
+    * │Home│ │Tab │ Q  │ W  │ E  │ R  │ T  │ Y  │ U  │ I  │ O  │ P  │BkSp│
+    * ├────┤ ├────┴┬───┴┬───┴┬───┴┬───┴┬───┴┬───┴┬───┴┬───┴┬───┴┬───┴────┤
+    * │PgUp│ │CAPS │ A  │ S  │ D  │ F  │ G  │ H  │ J  │ K  │ L  │ Enter  │
+    * ├────┤ ├─────┴──┬─┴──┬─┴──┬─┴──┬─┴──┬─┴──┬─┴──┬─┴──┬─┴──┬─┴──┬─────┤
+    * │PgDn│ │LShft   │ Z  │ X  │ C  │ V  │ B  │ N  │ M  │ ,  │ .  │RISE │
+    * ├────┤ ├─────┬──┴─┬──┴──┬─┴────┴────┴──┬─┴────┴───┬┴────┼────┼─────┤
+    * │End │ │LCtrl│GUI │ALT  │    LOWR      │          │RAlt │RCTL│FUNC │
+    * └────┘ └─────┴────┴─────┴──────────────┴──────────┴─────┴────┴─────┘
+    */
+    [_QWERTY] = LAYOUT_staggered(
+        KC_MUTE,      KC_ESC,                                                                       KC_LPRN,   KC_RPRN,   KC_SCLN,
+        KC_HOME,      KC_TAB,    KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,      KC_O,      KC_P,      KC_BSPC,
+        KC_PGUP,      KC_CAPS,   KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,      KC_L,           KC_ENT,
+        KC_PGDN,      KC_LSFT,   KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,   KC_DOT,               RISE,
+        KC_END,       KC_LCTL,        GUI,       ALT,            LOWR,   SPACE,               KC_RALT,      KC_RCTL,      FN
+    ),
+
+    /* _LOWER (Symbols / Punctuation)
+    *
+    * ┌────┐ ┌────┐                                       ┌────┬────┬────┐
+    * │    │ │    │                                       │ [  │ ]  │ :  │
+    * └────┘ └────┘                                       └────┴────┴────┘
+    * ┌────┐ ┌────┬────┬────┬────┬────┬────┬────┬────┬────┬────┬────┬────┐
+    * │ -  │ │    │ 1  │ 2  │ 3  │ 4  │ 5  │ 6  │ 7  │ 8  │ 9  │ 0  │    │
+    * ├────┤ ├────┴┬───┴┬───┴┬───┴┬───┴┬───┴┬───┴┬───┴┬───┴┬───┴┬───┴────┤
+    * │ \  │ │     │ !  │ @  │ #  │ $  │ %  │ ^  │ &  │ *  │    │  '/"   │
+    * ├────┤ ├─────┴──┬─┴──┬─┴──┬─┴──┬─┴──┬─┴──┬─┴──┬─┴──┬─┴──┬─┴──┬─────┤
+    * │ │  │ │        │    │    │    │    │    │    │    │    │    │     │
+    * ├────┤ ├─────┬──┴─┬──┴──┬─┴────┴────┴──┬─┴────┴───┬┴────┼────┼─────┤
+    * │ _  │ │     │    │     │              │          │     │    │     │
+    * └────┘ └─────┴────┴─────┴──────────────┴──────────┴─────┴────┴─────┘
+    */
+    [_LOWER] = LAYOUT_staggered(
+        _______,      _______,                                                                                           KC_LBRC,   KC_RBRC,    KC_COLON,
+        KC_MINUS,     KC_GRAVE,   KC_1,      KC_2,      KC_3,      KC_4,      KC_5,      KC_6,      KC_7,      KC_8,     KC_9,      KC_0,       _______,
+        KC_BSLS,      KC_TILD,    KC_EXLM,   KC_AT,     KC_HASH,   KC_DLR,    KC_PERC,   KC_CIRC,   KC_AMPR,   KC_ASTR,   _______,      TD(TD_DBQT),
+        KC_PIPE,      _______,    _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,              _______,
+        KC_UNDS,      _______,    _______,   _______,                    _______,   _______,                              _______,   _______,   _______
+    ),
+
+    /* _RAISE (Misc Modifiers / Extended Punctuation)
+    *
+    * ┌────┐ ┌────┐                                       ┌────┬────┬────┐
+    * │PRNT│ │    │                                       │ {  │ }  │ +  │
+    * └────┘ └────┘                                       └────┴────┴────┘
+    * ┌────┐ ┌────┬────┬────┬────┬────┬────┬────┬────┬────┬────┬────┬────┐
+    * │    │ │    │    │    │    │    │    │    │    │    │ Up │    │    │
+    * ├────┤ ├────┴┬───┴┬───┴┬───┴┬───┴┬───┴┬───┴┬───┴┬───┴┬───┴┬───┴────┤
+    * │    │ │CAPS │    │    │    │    │    │    │    │Left│Rght│        │
+    * ├────┤ ├─────┴──┬─┴──┬─┴──┬─┴──┬─┴──┬─┴──┬─┴──┬─┴──┬─┴──┬─┴──┬─────┤
+    * │    │ │        │    │    │    │    │    │    │    │Down│ /  │     │
+    * ├────┤ ├─────┬──┴─┬──┴──┬─┴────┴────┴──┬─┴────┴───┬┴────┼────┼─────┤
+    * │    │ │     │    │     │              │          │     │ ?  │     │
+    * └────┘ └─────┴────┴─────┴──────────────┴──────────┴─────┴────┴─────┘
+    */
+    [_RAISE] = LAYOUT_staggered(
+        KC_PSCR,      _______,                                                                                           KC_LCBR,   KC_RCBR,   KC_PLUS,
+        _______,      _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   KC_UP,     _______,   _______,
+        _______,      KC_CAPS,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   KC_LEFT,   KC_RIGHT,        _______,
+        _______,      _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   KC_DOWN,   KC_SLSH,              _______,
+        _______,      _______,   _______,   _______,                    _______,   _______,                              _______,   KC_QUES,   _______
+    ),
+
+    /* _FUNCTION (F-Row / DFU Reset / RGB Toggle)
+    *
+    * ┌────┐ ┌────┐                                       ┌────┬────┬────┐
+    * │RSET│ │RGB │                                       │F11 │F12 │F13 │
+    * └────┘ └────┘                                       └────┴────┴────┘
+    * ┌────┐ ┌────┬────┬────┬────┬────┬────┬────┬────┬────┬────┬────┬────┐
+    * │    │ │    │ F1 │ F2 │ F3 │ F4 │ F5 │ F6 │ F7 │ F8 │ F9 │F10 │    │
+    * ├────┤ ├────┴┬───┴┬───┴┬───┴┬───┴┬───┴┬───┴┬───┴┬───┴┬───┴┬───┴────┤
+    * │    │ │     │    │    │    │    │    │    │    │    │    │   =    │
+    * ├────┤ ├─────┴──┬─┴──┬─┴──┬─┴──┬─┴──┬─┴──┬─┴──┬─┴──┬─┴──┬─┴──┬─────┤
+    * │    │ │        │    │    │    │    │    │    │    │    │    │     │
+    * ├────┤ ├─────┬──┴─┬──┴──┬─┴────┴────┴──┬─┴────┴───┬┴────┼────┼─────┤
+    * │    │ │     │    │     │              │          │     │    │     │
+    * └────┘ └─────┴────┴─────┴──────────────┴──────────┴─────┴────┴─────┘
+    */
+    [_FUNCTION] = LAYOUT_staggered(
+        TD(TD_RST),   RGB_TOG,                                                                                           KC_F11,    KC_F12,    KC_F13,
+        _______,      _______,   KC_F1,     KC_F2,     KC_F3,     KC_F4,     KC_F5,     KC_F6,     KC_F7,     KC_F8,     KC_F9,     KC_F10,    _______,
+        _______,      _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,       KC_EQUAL,
+        _______,      _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,              _______,
+        _______,      _______,   _______,   _______,                    _______,   _______,                              _______,   _______,   _______
+    )
+};
+
+
+
+//  KEYMAP TEMPLATE:
+//
+//  /* <_LAYER>:
+//  *
+//  * ┌────┐ ┌────┐                                       ┌────┬────┬────┐
+//  * │    │ │    │                                       │    │    │    │
+//  * └────┘ └────┘                                       └────┴────┴────┘
+//  * ┌────┐ ┌────┬────┬────┬────┬────┬────┬────┬────┬────┬────┬────┬────┐
+//  * │    │ │    │    │    │    │    │    │    │    │    │    │    │    │
+//  * ├────┤ ├────┴┬───┴┬───┴┬───┴┬───┴┬───┴┬───┴┬───┴┬───┴┬───┴┬───┴────┤
+//  * │    │ │     │    │    │    │    │    │    │    │    │    │        │
+//  * ├────┤ ├─────┴──┬─┴──┬─┴──┬─┴──┬─┴──┬─┴──┬─┴──┬─┴──┬─┴──┬─┴──┬─────┤
+//  * │    │ │        │    │    │    │    │    │    │    │    │    │     │
+//  * ├────┤ ├─────┬──┴─┬──┴──┬─┴────┴────┴──┬─┴────┴───┬┴────┼────┼─────┤
+//  * │    │ │     │    │     │              │          │     │    │     │
+//  * └────┘ └─────┴────┴─────┴──────────────┴──────────┴─────┴────┴─────┘
+//  */
+//  [<_LAYER>] = LAYOUT_staggered(
+//      _______,      _______,                                                                                           _______,   _______,   _______,
+//      _______,      _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,
+//      _______,      _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,         _______,
+//      _______,      _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,              _______,
+//      _______,      _______,   _______,   _______,                    _______,   _______,                              _______,   _______,   _______
+//  )
+
+
+
+// Per-Key Tapping Term Definitions:
+uint16_t get_tapping_term(uint16_t keycode) {
+  switch (keycode) {
+    case TD(TD_DBQT):
+      return 235;
+    default:
+      return TAPPING_TERM;
+  }
+}
+
+
+
+// Encoder Customization: (*Order-of-Keycode Specific)
+void encoder_update_user(uint8_t index, bool clockwise) {
+    if (index == 0) {
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    }
+}
+
+
+
+// RGB Indicator Customization: (100% stolen from Jetpacktuxedo)
+void keyboard_post_init_user(void) {
+  #ifdef RGBLIGHT_ENABLE
+// Set up RGB effects on _only_ the first LED (index 0):
+        rgblight_set_effect_range(0, 1);
+// Set LED effects to breathing mode in a "terminal-green" type color:
+        rgblight_sethsv_noeeprom(50, 255, 100);
+        rgblight_mode_noeeprom(RGBLIGHT_EFFECT_BREATHING + 2);
+// Init the second LED to a static color:
+        setrgb(225, 185, 0, (LED_TYPE *)&led[1]);
+    rgblight_set();
+  #endif // RGBLIGHT_ENABLE
+}
+
+// RGB Indicator Customization: (cont.)
+layer_state_t layer_state_set_user(layer_state_t state){
+    #ifdef RGBLIGHT_ENABLE
+        uint8_t led1r = 0; uint8_t led1g = 0; uint8_t led1b = 0;
+            if (layer_state_cmp(state, 1)) {
+                led1b = 255;
+            }
+            if (layer_state_cmp(state, 3)) {
+                led1r = 200;
+            }
+            setrgb(led1r, led1g, led1b, (LED_TYPE *)&led[1]);
+        rgblight_set();
+    #endif //RGBLIGHT_ENABLE
+  return state;
+}
diff --git a/qmk/keyboards/kingly_keys/ave/staggered/keymaps/default/rules.mk b/qmk/keyboards/kingly_keys/ave/staggered/keymaps/default/rules.mk
new file mode 100644
index 00000000..a6be46d7
--- /dev/null
+++ b/qmk/keyboards/kingly_keys/ave/staggered/keymaps/default/rules.mk
@@ -0,0 +1,2 @@
+# Keymap-Specific Functions
+TAP_DANCE_ENABLE  =  yes
diff --git a/qmk/keyboards/kingly_keys/ave/staggered/rules.mk b/qmk/keyboards/kingly_keys/ave/staggered/rules.mk
new file mode 100644
index 00000000..611eb0ce
--- /dev/null
+++ b/qmk/keyboards/kingly_keys/ave/staggered/rules.mk
@@ -0,0 +1,23 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+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
+# 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
+RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = yes
diff --git a/qmk/keyboards/kingly_keys/ave/staggered/staggered.c b/qmk/keyboards/kingly_keys/ave/staggered/staggered.c
new file mode 100644
index 00000000..4aa0d45e
--- /dev/null
+++ b/qmk/keyboards/kingly_keys/ave/staggered/staggered.c
@@ -0,0 +1,18 @@
+ /* 
+ Copyright 2020 Garret Gartner
+  
+ 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 "staggered.h"
diff --git a/qmk/keyboards/kingly_keys/ave/staggered/staggered.h b/qmk/keyboards/kingly_keys/ave/staggered/staggered.h
new file mode 100644
index 00000000..674122bc
--- /dev/null
+++ b/qmk/keyboards/kingly_keys/ave/staggered/staggered.h
@@ -0,0 +1,52 @@
+ /* 
+ Copyright 2020 Garret Gartner
+  
+ 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 XXXX KC_NO
+
+#define LAYOUT_staggered( \
+    k001,    k002,                                                 k011, k012, k013, \
+    k101,    k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, \
+    k201,    k202, k203, k204, k205, k206, k207, k208, k209, k210, k211,       k213, \
+    k301,    k302, k303, k304, k305, k306, k307, k308, k309, k310,       k312, k313, \
+    k401,    k402, k403, k404,       k406,       k408,             k411, k412, k413 \
+) \
+{ \
+    { k001, k002, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, k011, k012, k013 }, \
+    { k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113 }, \
+    { k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, XXXX, k213 }, \
+    { k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, XXXX, k312, k313 }, \
+    { k401, k402, k403, k404, XXXX, k406, XXXX, k408, XXXX, XXXX, k411, k412, k413 } \
+}
+
+#define LAYOUT_staggered_big_boy( \
+    k001,    k002,                                                 k011, k012, k013, \
+    k101,    k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, \
+    k201,    k202, k203, k204, k205, k206, k207, k208, k209, k210, k211,       k213, \
+    k301,    k302, k303, k304, k305, k306, k307, k308, k309, k310,       k312, k313, \
+    k401,    k402, k403,                k406,                      k411, k412, k413 \
+) \
+{ \
+    { k001, k002, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, XXXX, k011, k012, k013 }, \
+    { k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113 }, \
+    { k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, XXXX, k213 }, \
+    { k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, XXXX, k312, k313 }, \
+    { k401, k402, k403, XXXX, XXXX, k406, XXXX, XXXX, XXXX, XXXX, k411, k412, k413 } \
+}
diff --git a/qmk/keyboards/kingly_keys/little_foot/config.h b/qmk/keyboards/kingly_keys/little_foot/config.h
index e0bd0daf..a872579c 100644
--- a/qmk/keyboards/kingly_keys/little_foot/config.h
+++ b/qmk/keyboards/kingly_keys/little_foot/config.h
@@ -11,7 +11,7 @@
  * 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 
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #pragma once
@@ -24,7 +24,6 @@
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    Kingly-Keys
 #define PRODUCT         The Little Foot
-#define DESCRIPTION     A Mighty Small, 45-Percent, Ortholinear Keyboard.
 
 /* key matrix size */
 #define MATRIX_ROWS 5
diff --git a/qmk/keyboards/kingly_keys/little_foot/keymaps/yanfali/config.h b/qmk/keyboards/kingly_keys/little_foot/keymaps/yanfali/config.h
new file mode 100644
index 00000000..72892851
--- /dev/null
+++ b/qmk/keyboards/kingly_keys/little_foot/keymaps/yanfali/config.h
@@ -0,0 +1,10 @@
+#pragma once
+
+#define TAPPING_TERM 150
+#define RETRO_TAPPING
+
+#ifdef AUDIO_ENABLE
+  #define STARTUP_SONG SONG(NOCTURNE_OP_9_NO_1)
+  #define AUDIO_CLICKY
+  #define AUDIO_CLICKY_FREQ_RANDOMNESS 0.8f
+#endif
diff --git a/qmk/keyboards/kingly_keys/little_foot/keymaps/yanfali/keymap.c b/qmk/keyboards/kingly_keys/little_foot/keymaps/yanfali/keymap.c
new file mode 100644
index 00000000..2ce2babf
--- /dev/null
+++ b/qmk/keyboards/kingly_keys/little_foot/keymaps/yanfali/keymap.c
@@ -0,0 +1,40 @@
+
+#include QMK_KEYBOARD_H
+
+// Layer names
+enum{
+  // - Base layer:
+  _BASE,
+  // - Symbols, numbers, and functions:
+  _FN,
+  // - Alternate Function layer:
+  _LN
+};
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [_BASE] = LAYOUT_split_space_base(
+    KC_1,   KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,             KC_0,
+    KC_Q,   KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,             KC_P,
+    LCTL_T(KC_A),   KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,          KC_SCLN,
+    KC_Z,   KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,         KC_SLSH,
+                LSFT_T(KC_ESC),          LGUI_T(KC_SPACE),          LT(_LN, KC_BSPC),                 LT(_FN, KC_ENT)
+  ),
+
+  [_FN] = LAYOUT_split_space_base(
+    LT(_LN, KC_ESC), _______, _______, _______, _______, _______, _______,  _______, KC_MINS, RESET,
+    KC_TAB,  _______, _______, _______, _______, _______, _______, _______, LSFT(KC_MINS),    KC_BSLS,
+    KC_LSFT, _______, _______, _______, _______, _______, _______, KC_LBRC, KC_RBRC,          KC_QUOT,
+    AU_TOG,  CK_TOGG , _______, _______, _______, _______, _______, _______, _______,          _______,
+                  _______,            KC_LALT,        RGB_MOD,              _______
+  ),
+
+  [_LN] = LAYOUT_split_space_base(
+    _______,   KC_F1,   KC_F2,  KC_F3,    _______,    _______,   _______,    KC_7,    KC_8,    KC_9,
+    _______,   KC_F4,   KC_F5,  KC_F6,    _______,    _______,   _______,    KC_4,    KC_5,    KC_6,
+    _______,   KC_F7,   KC_F8,  KC_F9,    _______,    _______,   _______,    KC_1,    KC_2,    KC_3,
+    _______,   KC_F10,  KC_F11, KC_F12,   _______,    _______,   _______,   _______,  KC_0, _______,
+                  _______,             _______,          _______,                _______
+  )
+};
diff --git a/qmk/keyboards/kingly_keys/little_foot/keymaps/yanfali/rules.mk b/qmk/keyboards/kingly_keys/little_foot/keymaps/yanfali/rules.mk
new file mode 100644
index 00000000..a61cff27
--- /dev/null
+++ b/qmk/keyboards/kingly_keys/little_foot/keymaps/yanfali/rules.mk
@@ -0,0 +1,4 @@
+CTPC=yes
+CONSOLE_ENABLE = yes    # Console for debug
+COMMAND_ENABLE = yes     # Commands for debug and configuration
+AUDIO_ENABLE = yes
diff --git a/qmk/keyboards/kingly_keys/romac/keymaps/brandonschlack/keymap.c b/qmk/keyboards/kingly_keys/romac/keymaps/brandonschlack/keymap.c
new file mode 100644
index 00000000..b0e4d521
--- /dev/null
+++ b/qmk/keyboards/kingly_keys/romac/keymaps/brandonschlack/keymap.c
@@ -0,0 +1,67 @@
+/* Copyright 2019 Brandon Schlack
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+#include "brandonschlack.h"
+
+enum romac_layers {
+    NUMPAD = 0,
+    FN,
+    NUMLOCK,
+    KARABINER
+};
+
+#define DF_NMPD   DF(NUMPAD)
+#define DF_NMLK   DF(NUMLOCK)
+#undef  DF_KBNR
+#define DF_KBNR   DF(KARABINER)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[NUMPAD] = LAYOUT(
+		KC_P7, KC_P8, KC_P9, \
+		KC_P4, KC_P5, KC_P6, \
+		KC_P1, KC_P2, KC_P3, \
+		OSL(FN), KC_P0, KC_PDOT \
+	),
+
+	[FN] = LAYOUT(
+		KC_PSLS, KC_PAST, KC_BSPC, \
+		KC_TRNS, KC_TRNS, KC_PMNS, \
+		DF_NMLK, DF_KBNR, KC_PPLS, \
+		KC_TRNS, TG_ADJT, KC_PENT \
+	),
+
+    [NUMLOCK] = LAYOUT(
+		KC_HOME, KC_UP, KC_PGUP, \
+		KC_LEFT, CMD_TAB, KC_RGHT, \
+		KC_END, KC_DOWN, KC_PGDN, \
+		DF_NMPD, KC_INS, KC_DEL  \
+	),
+
+    [KARABINER] = LAYOUT(
+		KC_F13, KC_F14, KC_F15, \
+		KC_F16, KC_F17, KC_F18, \
+		KC_F19, KC_F20, KC_F21, \
+		LT(_ADJUST,KC_F22), KC_F23, KC_F24  \
+	),
+
+    [_ADJUST] = LAYOUT(
+		QM_MAKE, EEP_RST, XXXXXXX, \
+		XXXXXXX, XXXXXXX, XXXXXXX, \
+		DF_NMPD, DF_NMLK, DF_KBNR, \
+		KC_TRNS, XXXXXXX, XXXXXXX  \
+	)
+};
diff --git a/qmk/keyboards/kingly_keys/romac/keymaps/brandonschlack/rules.mk b/qmk/keyboards/kingly_keys/romac/keymaps/brandonschlack/rules.mk
new file mode 100644
index 00000000..719dbee4
--- /dev/null
+++ b/qmk/keyboards/kingly_keys/romac/keymaps/brandonschlack/rules.mk
@@ -0,0 +1,8 @@
+# Use macropad-specific defines, layers, functions. Flash bootloader with QM_MAKE
+IS_MACROPAD = yes
+
+# Use dfu bootloader for Elite-C
+BOOTLOADER = atmel-dfu
+
+# Build Options
+# TAP_DANCE_ENABLE = yes      # Use tap dance
diff --git a/qmk/keyboards/kingly_keys/romac_plus/rules.mk b/qmk/keyboards/kingly_keys/romac_plus/rules.mk
index 24aa01c5..811be595 100644
--- a/qmk/keyboards/kingly_keys/romac_plus/rules.mk
+++ b/qmk/keyboards/kingly_keys/romac_plus/rules.mk
@@ -28,6 +28,5 @@ 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
 ENCODER_ENABLE = yes        # Enable support for EC11 Rotary Encoder
 OLED_DRIVER_ENABLE = yes    # Enable Support for SSD1306 or SH1106 OLED Displays; Communicating over I2C
diff --git a/qmk/keyboards/kira80/keymaps/via/rules.mk b/qmk/keyboards/kira80/keymaps/via/rules.mk
index 981c7ad4..36b7ba9c 100644
--- a/qmk/keyboards/kira80/keymaps/via/rules.mk
+++ b/qmk/keyboards/kira80/keymaps/via/rules.mk
@@ -1,3 +1,2 @@
 VIA_ENABLE = yes
 LTO_ENABLE = yes
-EXTRAKEY_ENABLE = no
diff --git a/qmk/keyboards/kmac/config.h b/qmk/keyboards/kmac/config.h
index b2c7f4d4..e924a4b1 100644
--- a/qmk/keyboards/kmac/config.h
+++ b/qmk/keyboards/kmac/config.h
@@ -45,6 +45,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 //#define DIODE_DIRECTION
 
+#define LED_CAPS_LOCK_PIN B0
+#define LED_SCROLL_LOCK_PIN E6
+#define LED_PIN_ON_STATE 0
+
 /* number of backlight levels */
 //#define BACKLIGHT_LEVELS 3
 // #define BACKLIGHT_PIN B7
diff --git a/qmk/keyboards/kmac/kmac.c b/qmk/keyboards/kmac/kmac.c
index dcbbc2f1..78334cb7 100644
--- a/qmk/keyboards/kmac/kmac.c
+++ b/qmk/keyboards/kmac/kmac.c
@@ -15,62 +15,9 @@
  */
 #include "kmac.h"
 
-#define CAPS_PIN B0
-#define SCROLL_PIN E6
 #define F_ROW_MASK 0b01
 #define WASD_MASK 0b10
 
-// 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
-    setPinOutput(CAPS_PIN);
-    setPinOutput(SCROLL_PIN);
-
-    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);
-}
-
-*/
-
-/* LED pin configuration
- * Scroll Lock: Low PE6
- * Caps Lock: Low PB0
- */
-void led_set_kb(uint8_t usb_led) {
-    if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
-        writePinLow(CAPS_PIN);
-    } else {
-        writePinHigh(CAPS_PIN);
-    }
-
-    if (IS_LED_ON(usb_led, USB_LED_SCROLL_LOCK)) {
-        writePinLow(SCROLL_PIN);
-    } else {
-        writePinHigh(SCROLL_PIN);
-    }
-
-    led_set_user(usb_led);
-}
-
 void backlight_init_ports(void) {
     setPinOutput(B1);
     setPinOutput(B2);
diff --git a/qmk/keyboards/kmini/config.h b/qmk/keyboards/kmini/config.h
index 6224a739..3b947acc 100644
--- a/qmk/keyboards/kmini/config.h
+++ b/qmk/keyboards/kmini/config.h
@@ -1,4 +1,4 @@
-/* Copyright 2018 Maarten Dekkers <maartenwut@gmail.com>
+/* Copyright 2018 Evy Dekkers
  *
  * 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
diff --git a/qmk/keyboards/kmini/info.json b/qmk/keyboards/kmini/info.json
index 13d8176a..8d31f04f 100644
--- a/qmk/keyboards/kmini/info.json
+++ b/qmk/keyboards/kmini/info.json
@@ -1,7 +1,7 @@
 {
   "keyboard_name": "KMAC Mini",
   "url": "http://kbdmodadmin.cafe24.com/product/detail.html?product_no=12&cate_no=4&display_group=1",
-  "maintainer": "maartenwut",
+  "maintainer": "evyd13",
   "width": 18.25,
   "height": 5,
   "layouts": {
diff --git a/qmk/keyboards/kmini/keymaps/default/keymap.c b/qmk/keyboards/kmini/keymaps/default/keymap.c
index 9f931448..6f793a01 100644
--- a/qmk/keyboards/kmini/keymaps/default/keymap.c
+++ b/qmk/keyboards/kmini/keymaps/default/keymap.c
@@ -1,4 +1,4 @@
-/* Copyright 2018 Maarten Dekkers <maartenwut@gmail.com>
+/* Copyright 2018 Evy Dekkers
  *
  * 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
diff --git a/qmk/keyboards/kmini/kmini.c b/qmk/keyboards/kmini/kmini.c
index 08a120b6..f6723187 100644
--- a/qmk/keyboards/kmini/kmini.c
+++ b/qmk/keyboards/kmini/kmini.c
@@ -1,4 +1,4 @@
-/* Copyright 2018 Maarten Dekkers <maartenwut@gmail.com>
+/* Copyright 2018 Evy Dekkers
  *
  * 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
diff --git a/qmk/keyboards/kmini/kmini.h b/qmk/keyboards/kmini/kmini.h
index 0576425e..3d54c39d 100644
--- a/qmk/keyboards/kmini/kmini.h
+++ b/qmk/keyboards/kmini/kmini.h
@@ -1,4 +1,4 @@
-/* Copyright 2018 Maarten Dekkers <maartenwut@gmail.com>
+/* Copyright 2018 Evy Dekkers
  *
  * 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
diff --git a/qmk/keyboards/kmini/matrix.c b/qmk/keyboards/kmini/matrix.c
index 9888f1a7..7bfb6503 100644
--- a/qmk/keyboards/kmini/matrix.c
+++ b/qmk/keyboards/kmini/matrix.c
@@ -1,4 +1,4 @@
-/* Copyright 2018 Maarten Dekkers <maartenwut@gmail.com>
+/* Copyright 2018 Evy Dekkers
  *
  * 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
diff --git a/qmk/keyboards/kv/revt/rules.mk b/qmk/keyboards/kv/revt/rules.mk
index 3a09683c..d97369b1 100644
--- a/qmk/keyboards/kv/revt/rules.mk
+++ b/qmk/keyboards/kv/revt/rules.mk
@@ -19,4 +19,3 @@ MIDI_ENABLE = no            # MIDI support
 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
diff --git a/qmk/keyboards/kyria/keymaps/default/config.h b/qmk/keyboards/kyria/keymaps/default/config.h
index f00bfa8e..9c2fb52a 100644
--- a/qmk/keyboards/kyria/keymaps/default/config.h
+++ b/qmk/keyboards/kyria/keymaps/default/config.h
@@ -25,6 +25,7 @@
   #define RGBLIGHT_HUE_STEP 8
   #define RGBLIGHT_SAT_STEP 8
   #define RGBLIGHT_VAL_STEP 8
+  #define RGBLIGHT_LIMIT_VAL 150
 #endif
 
 // If you are using an Elite C rev3 on the slave side, uncomment the lines below:
diff --git a/qmk/keyboards/kyria/keymaps/drashna/rules.mk b/qmk/keyboards/kyria/keymaps/drashna/rules.mk
index 0604c84b..e11a1148 100644
--- a/qmk/keyboards/kyria/keymaps/drashna/rules.mk
+++ b/qmk/keyboards/kyria/keymaps/drashna/rules.mk
@@ -15,7 +15,6 @@ 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
 
 BOOTLOADER = atmel-dfu
 
diff --git a/qmk/keyboards/kyria/rules.mk b/qmk/keyboards/kyria/rules.mk
index 96f76241..65007538 100644
--- a/qmk/keyboards/kyria/rules.mk
+++ b/qmk/keyboards/kyria/rules.mk
@@ -29,7 +29,6 @@ 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
 SPLIT_KEYBOARD = yes       # Split common
 LTO_ENABLE = yes
 
diff --git a/qmk/keyboards/labyrinth75/config.h b/qmk/keyboards/labyrinth75/config.h
new file mode 100644
index 00000000..cb952048
--- /dev/null
+++ b/qmk/keyboards/labyrinth75/config.h
@@ -0,0 +1,146 @@
+/*
+Copyright 2020 Livi
+
+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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID    0x4F53
+#define PRODUCT_ID   0x464B
+#define DEVICE_VER   0x0001
+#define MANUFACTURER Livi
+#define PRODUCT      labyrinth75
+
+/* key matrix size */
+#define MATRIX_ROWS 9
+#define MATRIX_COLS 9
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+ */
+#define MATRIX_ROW_PINS { B4, E6, D7, C6, D4, D0, D1, D2, D3 }
+#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3, B2, B6, B5 }
+#define UNUSED_PINS 
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+#define SOFT_SERIAL_PIN D0  // or D1, D2, D3, E6
+
+//#define BACKLIGHT_PIN B7
+//#define BACKLIGHT_LEVELS 3
+//#define BACKLIGHT_BREATHING
+
+#define RGB_DI_PIN B0 //D5 could also be the other pin maybe
+//#ifdef RGB_DI_PIN
+#define RGBLED_NUM 6 
+//#    define RGBLIGHT_HUE_STEP 8
+//#    define RGBLIGHT_SAT_STEP 8
+//#    define RGBLIGHT_VAL_STEP 8
+//#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+//#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+/*== all animations enable ==*/
+#define RGBLIGHT_ANIMATIONS
+/*== or choose animations ==*/
+//#    define RGBLIGHT_EFFECT_BREATHING
+//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+//#    define RGBLIGHT_EFFECT_SNAKE
+//#    define RGBLIGHT_EFFECT_KNIGHT
+//#    define RGBLIGHT_EFFECT_CHRISTMAS
+//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+//#    define RGBLIGHT_EFFECT_RGB_TEST
+//#    define RGBLIGHT_EFFECT_ALTERNATING
+/*== customize breathing effect ==*/
+/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+//#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+/*==== use exp() and sin() ====*/
+//#    define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//#    define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+//#endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+//#define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+/* Bootmagic Lite key configuration */
+#define BOOTMAGIC_LITE_ROW 0
+#define BOOTMAGIC_LITE_COLUMN 2
diff --git a/qmk/keyboards/labyrinth75/info.json b/qmk/keyboards/labyrinth75/info.json
new file mode 100644
index 00000000..f3ce4eb2
--- /dev/null
+++ b/qmk/keyboards/labyrinth75/info.json
@@ -0,0 +1,12 @@
+{
+    "keyboard_name": "labyrinth75", 
+    "url": "", 
+    "maintainer": "qmk", 
+    "width": 16, 
+    "height": 6.25, 
+    "layouts": {
+        "LAYOUT": {
+            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1.5, "y":0}, {"label":"F2", "x":2.5, "y":0}, {"label":"F3", "x":3.5, "y":0}, {"label":"F4", "x":4.5, "y":0}, {"label":"F5", "x":5.75, "y":0}, {"label":"F6", "x":6.75, "y":0}, {"label":"F7", "x":7.75, "y":0}, {"label":"F8", "x":8.75, "y":0}, {"label":"F9", "x":10, "y":0}, {"label":"F10", "x":11, "y":0}, {"label":"F11", "x":12, "y":0}, {"label":"F12", "x":13, "y":0}, {"label":"PrtSc", "x":15, "y":0}, {"label":"~", "x":0, "y":1.25}, {"label":"!", "x":1, "y":1.25}, {"label":"@", "x":2, "y":1.25}, {"label":"#", "x":3, "y":1.25}, {"label":"$", "x":4, "y":1.25}, {"label":"%", "x":5, "y":1.25}, {"label":"^", "x":6, "y":1.25}, {"label":"&", "x":7, "y":1.25}, {"label":"*", "x":8, "y":1.25}, {"label":"(", "x":9, "y":1.25}, {"label":")", "x":10, "y":1.25}, {"label":"_", "x":11, "y":1.25}, {"label":"+", "x":12, "y":1.25}, {"label":"Backspace", "x":13, "y":1.25, "w":2}, {"label":"Delete", "x":15, "y":1.25}, {"label":"Tab", "x":0, "y":2.25, "w":1.5}, {"label":"Q", "x":1.5, "y":2.25}, {"label":"W", "x":2.5, "y":2.25}, {"label":"E", "x":3.5, "y":2.25}, {"label":"R", "x":4.5, "y":2.25}, {"label":"T", "x":5.5, "y":2.25}, {"label":"Y", "x":6.5, "y":2.25}, {"label":"U", "x":7.5, "y":2.25}, {"label":"I", "x":8.5, "y":2.25}, {"label":"O", "x":9.5, "y":2.25}, {"label":"P", "x":10.5, "y":2.25}, {"label":"{", "x":11.5, "y":2.25}, {"label":"}", "x":12.5, "y":2.25}, {"label":"|", "x":13.5, "y":2.25, "w":1.5}, {"label":"Page Up", "x":15, "y":2.25}, {"label":"Caps Lock", "x":0, "y":3.25, "w":1.75}, {"label":"A", "x":1.75, "y":3.25}, {"label":"S", "x":2.75, "y":3.25}, {"label":"D", "x":3.75, "y":3.25}, {"label":"F", "x":4.75, "y":3.25}, {"label":"G", "x":5.75, "y":3.25}, {"label":"H", "x":6.75, "y":3.25}, {"label":"J", "x":7.75, "y":3.25}, {"label":"K", "x":8.75, "y":3.25}, {"label":"L", "x":9.75, "y":3.25}, {"label":":", "x":10.75, "y":3.25}, {"label":"\"", "x":11.75, "y":3.25}, {"label":"Enter", "x":12.75, "y":3.25, "w":2.25}, {"label":"Page Down", "x":15, "y":3.25}, {"label":"Shift", "x":0, "y":4.25, "w":2.25}, {"label":"Z", "x":2.25, "y":4.25}, {"label":"X", "x":3.25, "y":4.25}, {"label":"C", "x":4.25, "y":4.25}, {"label":"V", "x":5.25, "y":4.25}, {"label":"B", "x":6.25, "y":4.25}, {"label":"N", "x":7.25, "y":4.25}, {"label":"M", "x":8.25, "y":4.25}, {"label":"<", "x":9.25, "y":4.25}, {"label":">", "x":10.25, "y":4.25}, {"label":"?", "x":11.25, "y":4.25}, {"label":"Shift", "x":12.25, "y":4.25, "w":1.75}, {"label":"\u2191", "x":14, "y":4.25}, {"label":"End", "x":15, "y":4.25}, {"label":"Ctrl", "x":0, "y":5.25, "w":1.25}, {"label":"Win", "x":1.25, "y":5.25, "w":1.25}, {"label":"Alt", "x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"label":"Alt", "x":10, "y":5.25, "w":1.25}, {"label":"Ctrl", "x":11.25, "y":5.25, "w":1.25}, {"label":"\u2190", "x":13, "y":5.25}, {"label":"\u2193", "x":14, "y":5.25}, {"label":"\u2192", "x":15, "y":5.25}]
+        }
+    }
+}
\ No newline at end of file
diff --git a/qmk/keyboards/labyrinth75/keymaps/default/keymap.c b/qmk/keyboards/labyrinth75/keymaps/default/keymap.c
new file mode 100644
index 00000000..7ac93ae1
--- /dev/null
+++ b/qmk/keyboards/labyrinth75/keymaps/default/keymap.c
@@ -0,0 +1,28 @@
+/* Copyright 2020 Livi
+ *
+ * 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] = {
+    /* Base */
+    [0] = LAYOUT(
+        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_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, KC_EQUAL,   KC_BSPACE,  KC_DEL, \
+        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_PGUP, \
+        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_PGDN, \
+        KC_LSHIFT,     KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,   KC_RSHIFT,   KC_UP, KC_END, \
+        KC_LCTL,  KC_LWIN,  KC_LALT,               KC_SPACE,              KC_RALT,  KC_RCTL,    KC_LEFT, KC_DOWN, KC_RIGHT  \
+    ),
+};
diff --git a/qmk/keyboards/labyrinth75/keymaps/via/keymap.c b/qmk/keyboards/labyrinth75/keymaps/via/keymap.c
new file mode 100644
index 00000000..a29c88e0
--- /dev/null
+++ b/qmk/keyboards/labyrinth75/keymaps/via/keymap.c
@@ -0,0 +1,55 @@
+/* Copyright 2020 Livi
+ *
+ * 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] = {
+    /* Base */
+    [0] = LAYOUT(
+        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_GRAVE, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINUS, KC_EQUAL,   KC_BSPACE,  KC_DEL, 
+        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_PGUP, 
+        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_PGDN, 
+        KC_LSHIFT,     KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH,   KC_RSHIFT,   KC_UP, KC_END, 
+        KC_LCTL,  KC_LWIN,  KC_LALT,               KC_SPACE,              KC_RALT,  KC_RCTL,    KC_LEFT, KC_DOWN, KC_RIGHT  
+    ),
+    [1] = LAYOUT(
+        _______, _______, _______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______, _______,\
+        _______, _______, _______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______, _______,  _______, \
+        _______, _______, _______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______, _______,  _______,\
+        _______, _______, _______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______, _______, \
+        _______, _______, _______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______, _______,\
+        _______, _______, _______,_______,_______,_______,_______,_______,_______ \
+    
+    ),
+    [2] = LAYOUT(
+        _______, _______, _______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______, _______,\
+        _______, _______, _______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______, _______,  _______, \
+        _______, _______, _______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______, _______,  _______,\
+        _______, _______, _______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______, _______,\
+        _______, _______, _______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______, _______,\
+        _______, _______, _______,_______,_______,_______,_______,_______,_______ \
+    
+    ),
+    [3] = LAYOUT(
+        _______, _______, _______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______, _______,\
+        _______, _______, _______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______, _______,  _______, \
+        _______, _______, _______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______, _______,  _______,\
+        _______, _______, _______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______, _______,\
+        _______, _______, _______,_______,_______,_______,_______,_______,_______, _______,  _______,  _______,  _______, _______,\
+        _______, _______, _______,_______,_______,_______,_______,_______,_______ \
+    
+    ),
+};
diff --git a/qmk/keyboards/labyrinth75/keymaps/via/rules.mk b/qmk/keyboards/labyrinth75/keymaps/via/rules.mk
new file mode 100644
index 00000000..43061db1
--- /dev/null
+++ b/qmk/keyboards/labyrinth75/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
\ No newline at end of file
diff --git a/qmk/keyboards/labyrinth75/labyrinth75.c b/qmk/keyboards/labyrinth75/labyrinth75.c
new file mode 100644
index 00000000..1bfe2095
--- /dev/null
+++ b/qmk/keyboards/labyrinth75/labyrinth75.c
@@ -0,0 +1,17 @@
+/* Copyright 2020 Livi
+ *
+ * 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 "labyrinth75.h"
diff --git a/qmk/keyboards/labyrinth75/labyrinth75.h b/qmk/keyboards/labyrinth75/labyrinth75.h
new file mode 100644
index 00000000..8955a6a8
--- /dev/null
+++ b/qmk/keyboards/labyrinth75/labyrinth75.h
@@ -0,0 +1,47 @@
+/* Copyright 2020 Livi
+ *
+ * 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 is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+
+#define LAYOUT( \
+    k02,k12, k03, k13, k04,   k14, k05, k15, k06,   k16, k07, k17, k08,   k18, \
+    k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36, k27, k37,   k28,  k38, \
+    k51,   k42, k52, k43, k53, k44, k54, k45, k55, k46, k56, k47, k57, k48,  k58, \
+    k62,    k72, k63, k73, k64, k74, k65, k75, k66, k76, k67, k77,    k68,   k78, \
+    k01,     k11, k21, k41, k61, k71, k81, k82, k83, k84, k85,   k86,   k87, k88, \
+    k50,  k30,  k00,               k10,              k20,  k40,    k60, k70, k80  \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08 }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18 }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28 }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38 }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47, k48 }, \
+    { k50, k51, k52, k53, k54, k55, k56, k57, k58 }, \
+    { k60, k61, k62, k63, k64, k65, k66, k67, k68 }, \
+    { k70, k71, k72, k73, k74, k75, k76, k77, k78 }, \
+    { k80, k81, k82, k83, k84, k85, k86, k87, k88 } \
+}
diff --git a/qmk/keyboards/labyrinth75/readme.md b/qmk/keyboards/labyrinth75/readme.md
new file mode 100644
index 00000000..89ddd05b
--- /dev/null
+++ b/qmk/keyboards/labyrinth75/readme.md
@@ -0,0 +1,19 @@
+# labyrinth75
+
+![labyrinth75](https://i.imgur.com/D6jQaNz.jpg)
+
+A through hole 75% FR4 sandwich keyboard using a Pro Micro or Elite C
+
+* Keyboard Maintainer: [Livi](https://github.com/Liviturte)
+* Hardware Supported: labyrinth75 Pro Micro powered PCB
+* Hardware Availability: Keyboard groupbuy run on r/MechMarket
+
+Make example for this keyboard (after setting up your build environment):
+
+    make labyrinth75:default
+
+Flashing example for this keyboard:
+
+    make labyrinth75:default:flash
+
+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).
diff --git a/qmk/keyboards/labyrinth75/rules.mk b/qmk/keyboards/labyrinth75/rules.mk
new file mode 100644
index 00000000..f7bb5a29
--- /dev/null
+++ b/qmk/keyboards/labyrinth75/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # 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 = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
diff --git a/qmk/keyboards/latin47ble/config.h b/qmk/keyboards/latin47ble/config.h
new file mode 100644
index 00000000..716ab52f
--- /dev/null
+++ b/qmk/keyboards/latin47ble/config.h
@@ -0,0 +1,123 @@
+ /* Copyright 2020 haierwangwei2005
+  * 
+  * 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 "config_common.h"
+
+/* USB Device descriptor parameter */ 
+#define VENDOR_ID       0x6C63 // "lc" = latincompass
+#define PRODUCT_ID      0x6C62 // "lb" = latin47BLE
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    latincompass
+#define PRODUCT         Latin47BLE
+
+/* key matrix size */
+#define MATRIX_ROWS 4
+#define MATRIX_COLS 12
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+*/
+#define MATRIX_ROW_PINS { D0, D1, D2, D3 }
+#define MATRIX_COL_PINS { D6, D7, B5, B6 ,C6, C7, F7, F6, F5, F4, F1, F0 }
+#define UNUSED_PINS
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+#define RGB_DI_PIN B7
+#ifdef RGB_DI_PIN
+     #define RGBLED_NUM 3
+     #define RGBLIGHT_HUE_STEP 8
+     #define RGBLIGHT_SAT_STEP 8
+     #define RGBLIGHT_VAL_STEP 8
+//   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+//   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+// /*== all animations enable ==*/
+     #define RGBLIGHT_ANIMATIONS
+// /*== or choose animations ==*/
+//   #define RGBLIGHT_EFFECT_BREATHING
+//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
+//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+//   #define RGBLIGHT_EFFECT_SNAKE
+//   #define RGBLIGHT_EFFECT_KNIGHT
+//   #define RGBLIGHT_EFFECT_CHRISTMAS
+//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
+//   #define RGBLIGHT_EFFECT_RGB_TEST
+//   #define RGBLIGHT_EFFECT_ALTERNATING
+#endif
+
+#define TAPPING_TERM 250
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* number of backlight levels */
+
+/* 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
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+//#define NO_ACTION_MACRO
+//#define NO_ACTION_FUNCTION
diff --git a/qmk/keyboards/latin47ble/keymaps/default/keymap.c b/qmk/keyboards/latin47ble/keymaps/default/keymap.c
new file mode 100644
index 00000000..3827c61f
--- /dev/null
+++ b/qmk/keyboards/latin47ble/keymaps/default/keymap.c
@@ -0,0 +1,47 @@
+ /* Copyright 2020 haierwangwei2005
+  * 
+  * 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
+
+enum layers {
+    _QWERTY,
+    _FN1,
+    _FN2,
+};
+#define KC_X0 LT(_FN2, KC_GRV)
+#define KC_X1 MO(_FN1)
+#define KC_X2 MO(_FN2)
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_QWERTY] = LAYOUT_planck_mit(
+        KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+        KC_X0,   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_X2,   KC_DEL,
+        KC_LCTL, KC_LGUI, KC_LALT, KC_PGUP, KC_PGDN,     KC_SPC,       KC_X1,   KC_1,    KC_2,    KC_3,    KC_4
+    ),
+    [_FN1] = LAYOUT_planck_mit(
+        OUT_AUTO, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_EQL,
+        KC_X0,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
+        KC_LSFT,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  RGB_TOG, KC_DEL,
+        KC_LCTL,  KC_LGUI, KC_LALT, KC_PGUP, KC_PGDN,     KC_SPC,       KC_X1,   RGB_TOG, RGB_MOD, KC_MYCM, KC_CALC
+    ),
+    [_FN2] = LAYOUT_planck_mit(
+        KC_NLCK, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_BSPC,
+        KC_X0,   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  RGB_TOG, KC_DEL,
+        KC_LCTL, KC_LGUI, KC_LALT, KC_PGUP, KC_PGDN,     KC_SPC,       KC_X1,   RGB_TOG, RGB_MOD, KC_MYCM, KC_CALC
+    ),
+};
diff --git a/qmk/keyboards/latin47ble/keymaps/via/keymap.c b/qmk/keyboards/latin47ble/keymaps/via/keymap.c
new file mode 100644
index 00000000..6dd3a723
--- /dev/null
+++ b/qmk/keyboards/latin47ble/keymaps/via/keymap.c
@@ -0,0 +1,54 @@
+ /* Copyright 2020 haierwangwei2005
+  * 
+  * 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
+
+enum layers {
+    _QWERTY,
+    _FN1,
+    _FN2,
+};
+
+#define KC_X0 LT(_FN2, KC_CAPS)
+#define KC_X1 MO(_FN1)
+#define KC_X2 MO(_FN2)
+
+
+   const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_QWERTY] = LAYOUT_planck_mit(
+        KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+        KC_X0,   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_X2,   KC_DEL,
+        KC_LCTL, KC_LGUI, KC_LALT, KC_PGUP, KC_PGDN,     KC_SPC,       KC_X1,   KC_1,    KC_2,    KC_3,    KC_4
+    ),
+    [_FN1] = LAYOUT_planck_mit(
+        OUT_AUTO, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_EQL,
+        KC_X0,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
+        KC_LSFT,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  RGB_TOG, KC_DEL,
+        KC_LCTL,  KC_LGUI, KC_LALT, KC_PGUP, KC_PGDN,     KC_SPC,       KC_X1,   RGB_TOG, RGB_MOD, KC_MYCM, KC_CALC
+    ),
+    [_FN2] = LAYOUT_planck_mit(
+        KC_NLCK, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_BSPC,
+        KC_X0,   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  RGB_TOG, KC_DEL,
+        KC_LCTL, KC_LGUI, KC_LALT, KC_PGUP, KC_PGDN,     KC_SPC,       KC_X1,   RGB_TOG, RGB_MOD, KC_MYCM, KC_CALC
+    ),
+    [3] = LAYOUT_planck_mit(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______,     _______,      _______, _______, _______, _______, _______
+    ),
+};
diff --git a/qmk/keyboards/latin47ble/keymaps/via/rules.mk b/qmk/keyboards/latin47ble/keymaps/via/rules.mk
new file mode 100644
index 00000000..36b7ba9c
--- /dev/null
+++ b/qmk/keyboards/latin47ble/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/qmk/keyboards/latin47ble/latin47ble.c b/qmk/keyboards/latin47ble/latin47ble.c
new file mode 100644
index 00000000..c207b422
--- /dev/null
+++ b/qmk/keyboards/latin47ble/latin47ble.c
@@ -0,0 +1,16 @@
+ /* Copyright 2020 haierwangwei2005
+  * 
+  * 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 "latin47ble.h"
diff --git a/qmk/keyboards/latin47ble/latin47ble.h b/qmk/keyboards/latin47ble/latin47ble.h
new file mode 100644
index 00000000..87ecaad6
--- /dev/null
+++ b/qmk/keyboards/latin47ble/latin47ble.h
@@ -0,0 +1,30 @@
+ /* Copyright 2020 haierwangwei2005
+  * 
+  * 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_planck_mit( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K10, K11, \
+    K12, K13, K14, K15, K16, K17, K18, K19, K20, K21, K22, K23, \
+    K24, K25, K26, K27, K28, K29, K30, K31, K32, K33, K34, K35, \
+	K36, K37, K38, K39, K40, K41, K42, K43, K44, K45, K46  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K10, K11}, \
+    { K12, K13, K14, K15, K16, K17, K18, K19, K20, K21, K22, K23}, \
+    { K24, K25, K26, K27, K28, K29, K30, K31, K32, K33, K34, K35}, \
+    { K36, K37, K38, K39, K40, K41, K42, K43, K44, K45, K46 } \
+}
diff --git a/qmk/keyboards/latin47ble/readme.md b/qmk/keyboards/latin47ble/readme.md
new file mode 100644
index 00000000..cc8e9e6a
--- /dev/null
+++ b/qmk/keyboards/latin47ble/readme.md
@@ -0,0 +1,14 @@
+# Latin47ble
+
+![Latin47ble](https://github.com/latincompass/latin64BLE-kb)
+
+macro 47 ble 4.0 RGB keyboard
+
+* Keyboard Maintainer: [latincompass](https://github.com/latincompass)
+* Hardware Availability: https://github.com/haierwangwei2005/latin47blekeyboard-/blob/main/1%20(2).png
+
+Make example for this keyboard (after setting up your build environment):
+
+    make latin47ble: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).
diff --git a/qmk/keyboards/latin47ble/rules.mk b/qmk/keyboards/latin47ble/rules.mk
new file mode 100644
index 00000000..c9cdfc91
--- /dev/null
+++ b/qmk/keyboards/latin47ble/rules.mk
@@ -0,0 +1,28 @@
+# MCU name
+MCU = atmega32u4
+
+# Processor frequency
+F_CPU = 8000000
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = full     # 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
+# 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
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+BLUETOOTH = AdafruitBLE
+
+LAYOUTS = planck_mit
diff --git a/qmk/keyboards/latinpad/rules.mk b/qmk/keyboards/latinpad/rules.mk
index 8d948b70..20ed0693 100644
--- a/qmk/keyboards/latinpad/rules.mk
+++ b/qmk/keyboards/latinpad/rules.mk
@@ -25,4 +25,5 @@ AUDIO_ENABLE = no
 RGBLIGHT_ENABLE = no
 OLED_DRIVER_ENABLE = yes
 ENCODER_ENABLE = yes
-RGB_MATRIX_ENABLE = WS2812
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = WS2812
diff --git a/qmk/keyboards/lattice60/rules.mk b/qmk/keyboards/lattice60/rules.mk
index 66cede79..1547be6a 100644
--- a/qmk/keyboards/lattice60/rules.mk
+++ b/qmk/keyboards/lattice60/rules.mk
@@ -32,6 +32,5 @@ MIDI_ENABLE = no            # MIDI support
 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
 
 LAYOUTS = 60_hhkb
diff --git a/qmk/keyboards/launchpad/keymaps/brandonschlack/config.h b/qmk/keyboards/launchpad/keymaps/brandonschlack/config.h
new file mode 100644
index 00000000..6aaf996e
--- /dev/null
+++ b/qmk/keyboards/launchpad/keymaps/brandonschlack/config.h
@@ -0,0 +1,32 @@
+/* Copyright 2020 Brandon Schlack
+ *
+ * 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
+
+/* Underlight Configuration */
+#ifdef RGB_DI_PIN
+    #undef RGB_DI_PIN
+    #define RGB_DI_PIN F4
+    #undef RGBLED_NUM
+    #define RGBLED_NUM 2  // Number of LEDs
+#endif
+#define RGBLIGHT_EFFECT_BREATHING // Only have Breathing Animation
+#define RGBLIGHT_HUE_STEP 10
+#define RGBLIGHT_SAT_STEP 17
+#define RGBLIGHT_VAL_STEP 17
+
+/* Mouse Keys Configuration */
+#define MK_3_SPEED
+#define MK_W_INTERVAL_UNMOD 20
diff --git a/qmk/keyboards/launchpad/keymaps/brandonschlack/keymap.c b/qmk/keyboards/launchpad/keymaps/brandonschlack/keymap.c
new file mode 100644
index 00000000..1ef77ccc
--- /dev/null
+++ b/qmk/keyboards/launchpad/keymaps/brandonschlack/keymap.c
@@ -0,0 +1,213 @@
+/* Copyright 2020 Brandon Schlack
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+#include "brandonschlack.h"
+
+/**
+ * Layer Names
+ */
+#define _REEDER   _BASE
+enum bdn9_layers {
+    _MEDIA = KEYMAP_LAYERS,
+    _NAVI,
+    _KARABINER
+};
+
+/**
+ * Keycodes & Macros
+ */
+#define DF_REDR   DF(_REEDER)          // Set Default Layer to Reeder shortcuts
+#define DF_MEDA   DF(_MEDIA)           // Set Default Layer to Media controls
+#define DF_NAVI   DF(_NAVI)            // Set Default Layer to Navigation shortcuts
+#define DF_KBNR   DF(_KARABINER)       // Set Default Layer to Basic Macro keys
+
+// Tap Dances
+enum launchpad_dances {
+    TD_SHLD_LGHT = 0,
+    TD_SHLD_ADJT,
+    TD_REDR_H
+};
+//Tap Dance Definitions
+qk_tap_dance_action_t tap_dance_actions[] = {
+    [TD_SHLD_LGHT] = ACTION_TAP_DANCE_TRIGGER_LAYER(SINGLE_HOLD, _LIGHT),
+    [TD_SHLD_ADJT] = ACTION_TAP_DANCE_TRIGGER_LAYER(SINGLE_HOLD, _ADJUST),
+    [TD_REDR_H] = ACTION_TAP_DANCE_DOUBLE(KC_H, KC_R)
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/* Reeder
+ * ┌──────┬──────┐
+ * │CmdTab│ View │
+ * ├──────┼──────┤
+ * │PrvSub│PrvItm│
+ * ├──────┼──────┤
+ * │NxtSub│NxtItm│
+ * ├──────┼──────┤
+ * │  Clr │ Sync │
+ * └──────┴──────┘
+ */
+[_REEDER] = LAYOUT( \
+    CMD_TAB, TD(TD_REDR_H), \
+    KC_P, KC_K, \
+    KC_N, KC_J, \
+    TD(TD_SHLD_LGHT), TD(TD_SHLD_ADJT) \
+),
+
+/* Media
+ * ┌──────┬──────┐
+ * │ Mute │ Play │
+ * ├──────┼──────┤
+ * │ Vol+ │PrvTrk│
+ * ├──────┼──────┤
+ * │ Vol- │NxtTrk│
+ * ├──────┼──────┤
+ * │ Spce │ Plyr │
+ * └──────┴──────┘
+ */
+[_MEDIA] = LAYOUT( \
+    KC_MUTE, KC_MPLY, \
+    KC_VOLU, KC_MNXT, \
+    KC_VOLD, KC_MPRV, \
+    TD(TD_SHLD_LGHT), TD(TD_SHLD_ADJT) \
+),
+
+/* Navigation
+ * ┌──────┬──────┐
+ * │ PTab │ NTab │
+ * ├──────┼──────┤
+ * │ SclL │ SclU │
+ * ├──────┼──────┤
+ * │ SclR │ SclD │
+ * ├──────┼──────┤
+ * │LstTab│ClsTab│
+ * └──────┴──────┘
+ */
+[_NAVI] = LAYOUT( \
+    PRV_TAB, NXT_TAB, \
+    MC_WH_L, MC_WH_U, \
+    MC_WH_R, MC_WH_D, \
+    TD(TD_SHLD_LGHT), TD(TD_SHLD_ADJT) \
+),
+
+/* Macro
+ * ┌──────┬──────┐
+ * │   1  │  2   │
+ * ├──────┼──────┤
+ * │   3  │  4   │
+ * ├──────┼──────┤
+ * │   5  │  6   │
+ * ├──────┼──────┤
+ * │   7  │  8   │
+ * └──────┴──────┘
+ */
+[_KARABINER] = LAYOUT( \
+    KC_P1,     KC_P2, \
+    KC_P3,     KC_P4, \
+    KC_P5,     KC_P6, \
+    TD(TD_SHLD_LGHT), TD(TD_SHLD_ADJT) \
+),
+
+/* Lights
+ * ┌──────┬──────┐
+ * │ THM+ │ HUE+ │
+ * ├──────┼──────┤
+ * │ SAT- │ SAT+ │
+ * ├──────┼──────┤
+ * │ VAL- │ VAL+ │
+ * ├──────┼──────┤
+ * │ XXXX │ Mde+ │
+ * └──────┴──────┘
+ */
+[_LIGHT] = LAYOUT( \
+    RGB_THM, RGB_HUI, \
+    RGB_SAD, RGB_SAI, \
+    RGB_VAD, RGB_VAI, \
+    XXXXXXX, RGB_MOD \
+),
+
+/* Adjust
+ * ┌──────┬──────┐
+ * │ Make │ Rset │
+ * ├──────┼──────┤
+ * │ Redr │ Meda │
+ * ├──────┼──────┤
+ * │ Navi │ Mcro │
+ * ├──────┼──────┤
+ * │ Lght │ XXXX │
+ * └──────┴──────┘
+ */
+[_ADJUST] = LAYOUT( \
+    QM_MAKE, RESET, \
+    DF_REDR, DF_MEDA, \
+    DF_NAVI, DF_KBNR, \
+    TG_LGHT, XXXXXXX \
+)
+
+};
+
+void matrix_init_keymap(void) {
+}
+
+// Runs once after keyboard initializes
+void keyboard_post_init_keymap(void) {
+};
+
+/**
+ * Tap Dances
+ */
+void process_tap_dance_keycode (bool reset, uint8_t toggle_layer) {
+    uint16_t keycode = 0;
+    switch (toggle_layer) {
+        case _LIGHT:
+            switch (get_highest_layer(layer_state)) {
+                case _REEDER:
+                    keycode = KC_L;
+                    break;
+                case _MEDIA:
+                    keycode = KC_SPC;
+                    break;
+                case _NAVI:
+                    keycode = REO_TAB;
+                    break;
+                case _KARABINER:
+                    keycode = KC_P7;
+                    break;
+            }
+            break;
+        case _ADJUST:
+            switch (get_highest_layer(layer_state)) {
+                case _REEDER:
+                    keycode = KC_R;
+                    break;
+                case _MEDIA:
+                    keycode = MC_PLYR;
+                    break;
+                case _NAVI:
+                    keycode = CLS_TAB;
+                    break;
+                case _KARABINER:
+                    keycode = KC_P8;
+                    break;
+            }
+            break;
+    }
+    if (!reset) {
+        register_code16(keycode);
+    } else {
+        unregister_code16(keycode);
+    }
+}
diff --git a/qmk/keyboards/launchpad/keymaps/brandonschlack/readme.md b/qmk/keyboards/launchpad/keymaps/brandonschlack/readme.md
new file mode 100644
index 00000000..a91a1b80
--- /dev/null
+++ b/qmk/keyboards/launchpad/keymaps/brandonschlack/readme.md
@@ -0,0 +1,31 @@
+# brandonschlack's layout for Launchpad
+Fun little macropad build, with an awesome case from [StrataKB](https://stratakb.com/store/cases/launchpad-v2-full-case).
+
+## Media Layer
+This layer is used for media controls. Player button is a hotkey to focus the current media player with [BeardedSpice](https://beardedspice.github.io/)
+|   |   |
+|:-:|:-:|
+| Mute | Play/Pause |
+| Vol + | Next Track |
+| Vol - | Prev Track |
+|   | Current Player |
+---
+
+## Keypad Layer
+This layer is used to send keypad keys, meant to be remapped based on current app with [Karabiner](https://pqrs.org/osx/karabiner/)
+|   |   |
+|:-:|:-:|
+| 1 | 2 |
+| 3 | 4 |
+| 5 | 6 |
+| 7 | 8 |
+---
+
+## Magic Layer
+This layer is used as a meta layer for the pad. This layer is accessed by holding key in Row 3, Col 0
+|   |   |
+|:-:|:-:|
+| MAKE | RESET |
+| **Media** Layer | **Keypad** Layer|
+| XXX | XXX |
+| ___ | XXX |
diff --git a/qmk/keyboards/launchpad/keymaps/brandonschlack/rules.mk b/qmk/keyboards/launchpad/keymaps/brandonschlack/rules.mk
new file mode 100644
index 00000000..ac92af92
--- /dev/null
+++ b/qmk/keyboards/launchpad/keymaps/brandonschlack/rules.mk
@@ -0,0 +1,13 @@
+# Use macropad-specific defines, layers, functions. Flash bootloader with QM_MAKE
+IS_MACROPAD = yes
+
+# Use dfu bootloader for Elite-C
+BOOTLOADER = atmel-dfu
+
+# Build Options
+BOOTMAGIC_ENABLE = lite
+RGBLIGHT_ENABLE = yes        # Enable WS2812 RGB underlight.
+CONSOLE_ENABLE = yes         # Console for debug(+400)
+MOUSEKEY_ENABLE = yes        # Use mouse keys for scrolling.
+COMMAND_ENABLE = no          # Disable Command, breaks with Mouse Keys set to constant.
+TAP_DANCE_ENABLE = yes       # Use tap dance
diff --git a/qmk/keyboards/launchpad/keymaps/drashna/rules.mk b/qmk/keyboards/launchpad/keymaps/drashna/rules.mk
index 463b8559..3eb1694a 100644
--- a/qmk/keyboards/launchpad/keymaps/drashna/rules.mk
+++ b/qmk/keyboards/launchpad/keymaps/drashna/rules.mk
@@ -3,4 +3,5 @@ BOOTLOADER = atmel-dfu
 RGBLIGHT_ENABLE  = no
 AUDIO_ENABLE     = no
 BOOTMAGIC_ENABLE = lite
-RGB_MATRIX_ENABLE = WS2812
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = WS2812
diff --git a/qmk/keyboards/lazydesigners/dimple/keymaps/via/rules.mk b/qmk/keyboards/lazydesigners/dimple/keymaps/via/rules.mk
index f2e549c7..36b7ba9c 100644
--- a/qmk/keyboards/lazydesigners/dimple/keymaps/via/rules.mk
+++ b/qmk/keyboards/lazydesigners/dimple/keymaps/via/rules.mk
@@ -1,10 +1,2 @@
 VIA_ENABLE = yes
 LTO_ENABLE = yes
-# These features are not (yet) supported by VIA
-LEADER_ENABLE = no
-FAUXCLICKY_ENABLE = no
-MIDI_ENABLE = no
-BLUETOOTH_ENABLE = no
-KEY_LOCK_ENABLE = no
-TERMINAL_ENABLE = no
-MOUSEKEY_ENABLE = no
diff --git a/qmk/keyboards/lazydesigners/dimpleplus/config.h b/qmk/keyboards/lazydesigners/dimpleplus/config.h
new file mode 100644
index 00000000..d85d7241
--- /dev/null
+++ b/qmk/keyboards/lazydesigners/dimpleplus/config.h
@@ -0,0 +1,51 @@
+/*
+Copyright 2020 LAZYDESIGNERS
+
+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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x4C44 // "LD"
+#define PRODUCT_ID      0x0061
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    LAZYDESIGNERS
+#define PRODUCT         Dimpleplus
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 12
+
+#define MATRIX_ROW_PINS { B3, F0, E6, F4, F5 }
+#define MATRIX_COL_PINS { F1, D5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4 }
+
+#define DIODE_DIRECTION COL2ROW
+
+#define BACKLIGHT_PIN B7
+// #define BACKLIGHT_BREATHING
+#define BACKLIGHT_LEVELS 3
+
+/* RBG underglow */
+#define RGB_DI_PIN D2
+#ifdef RGB_DI_PIN
+	#define RGBLIGHT_ANIMATIONS
+	#define RGBLIGHT_SLEEP
+	#define RGBLED_NUM 8
+	/* #define RGBLIGHT_HUE_STEP 8 */
+	/* #define RGBLIGHT_SAT_STEP 8 */
+	/* #define RGBLIGHT_VAL_STEP 8 */
+#endif
diff --git a/qmk/keyboards/lazydesigners/dimpleplus/dimpleplus.c b/qmk/keyboards/lazydesigners/dimpleplus/dimpleplus.c
new file mode 100644
index 00000000..36eed8cc
--- /dev/null
+++ b/qmk/keyboards/lazydesigners/dimpleplus/dimpleplus.c
@@ -0,0 +1 @@
+#include "dimpleplus.h"
diff --git a/qmk/keyboards/lazydesigners/dimpleplus/dimpleplus.h b/qmk/keyboards/lazydesigners/dimpleplus/dimpleplus.h
new file mode 100644
index 00000000..7664b876
--- /dev/null
+++ b/qmk/keyboards/lazydesigners/dimpleplus/dimpleplus.h
@@ -0,0 +1,33 @@
+/*
+Copyright 2020 LAZYDESIGNERS
+
+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( \
+    K000,  K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \
+    K100,  K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \
+    K200,  K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \
+    K300,  K301, K302, K303, K304, K305, K306, K307, K308, K309, K310,       \
+    K400,        K402, K403, K404,        K406,      K407, K408, K409        \
+) { \
+    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011  }, \
+    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111  }, \
+    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211  }, \
+    { K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  KC_NO }, \
+    { K400,  KC_NO, K402,  K403,  K404,  KC_NO, K406,  K407,  K408,  K409,  KC_NO, KC_NO }  \
+}
diff --git a/qmk/keyboards/lazydesigners/dimpleplus/info.json b/qmk/keyboards/lazydesigners/dimpleplus/info.json
new file mode 100644
index 00000000..4ad13f37
--- /dev/null
+++ b/qmk/keyboards/lazydesigners/dimpleplus/info.json
@@ -0,0 +1,68 @@
+{
+    "keyboard_name": "Dimpleplus",
+    "url": "http://lazydesigners.cn",
+    "maintainer": "LAZYDESIGNERS",
+    "width": 12.5,
+    "height": 5.25,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"K000 (B3,F1)", "x":0, "y":0},
+                {"label":"K001 (B3,D5)", "x":1.5, "y":0},
+                {"label":"K002 (B3,F6)", "x":2.5, "y":0},
+                {"label":"K003 (B3,F7)", "x":3.5, "y":0},
+                {"label":"K004 (B3,C7)", "x":4.5, "y":0},
+                {"label":"K005 (B3,C6)", "x":5.5, "y":0},
+                {"label":"K006 (B3,B6)", "x":6.5, "y":0},
+                {"label":"K007 (B3,B5)", "x":7.5, "y":0},
+                {"label":"K008 (B3,B4)", "x":8.5, "y":0},
+                {"label":"K009 (B3,D7)", "x":9.5, "y":0},
+                {"label":"K010 (B3,D6)", "x":10.5, "y":0},
+                {"label":"K011 (B3,D4)", "x":11.5, "y":0},
+                {"label":"K100 (F0,F1)", "x":0, "y":1.25},
+                {"label":"K101 (F0,D5)", "x":1, "y":1.25},
+                {"label":"K102 (F0,F6)", "x":2, "y":1.25},
+                {"label":"K103 (F0,F7)", "x":3, "y":1.25},
+                {"label":"K104 (F0,C7)", "x":4, "y":1.25},
+                {"label":"K105 (F0,C6)", "x":5, "y":1.25},
+                {"label":"K106 (F0,B6)", "x":6, "y":1.25},
+                {"label":"K107 (F0,B5)", "x":7, "y":1.25},
+                {"label":"K108 (F0,B4)", "x":8, "y":1.25},
+                {"label":"K109 (F0,D7)", "x":9, "y":1.25},
+                {"label":"K110 (F0,D6)", "x":10, "y":1.25},
+                {"label":"K111 (F0,D4)", "x":11, "y":1.25, "w":1.5},
+                {"label":"K200 (E6,F1)", "x":0, "y":2.25, "w":1.25},
+                {"label":"K201 (E6,D5)", "x":1.25, "y":2.25},
+                {"label":"K202 (E6,F6)", "x":2.25, "y":2.25},
+                {"label":"K203 (E6,F7)", "x":3.25, "y":2.25},
+                {"label":"K204 (E6,C7)", "x":4.25, "y":2.25},
+                {"label":"K205 (E6,C6)", "x":5.25, "y":2.25},
+                {"label":"K206 (E6,B6)", "x":6.25, "y":2.25},
+                {"label":"K207 (E6,B5)", "x":7.25, "y":2.25},
+                {"label":"K208 (E6,B4)", "x":8.25, "y":2.25},
+                {"label":"K209 (E6,D7)", "x":9.25, "y":2.25},
+                {"label":"K210 (E6,D6)", "x":10.25, "y":2.25},
+                {"label":"K211 (E6,D4)", "x":11.25, "y":2.25, "w":1.25},
+                {"label":"K300 (F4,F1)", "x":0, "y":3.25, "w":1.75},
+                {"label":"K301 (F4,D5)", "x":1.75, "y":3.25},
+                {"label":"K302 (F4,F6)", "x":2.75, "y":3.25},
+                {"label":"K303 (F4,F7)", "x":3.75, "y":3.25},
+                {"label":"K304 (F4,C7)", "x":4.75, "y":3.25},
+                {"label":"K305 (F4,C6)", "x":5.75, "y":3.25},
+                {"label":"K306 (F4,B6)", "x":6.75, "y":3.25},
+                {"label":"K307 (F4,B5)", "x":7.75, "y":3.25},
+                {"label":"K308 (F4,B4)", "x":8.75, "y":3.25},
+                {"label":"K309 (F4,D7)", "x":9.75, "y":3.25},
+                {"label":"K310 (F4,D6)", "x":10.75, "y":3.25, "w":1.75},
+                {"label":"K400 (F5,F1)", "x":0.75, "y":4.25},
+                {"label":"K402 (F5,F6)", "x":1.75, "y":4.25},
+                {"label":"K403 (F5,F7)", "x":2.75, "y":4.25},
+                {"label":"K404 (F5,C7)", "x":3.75, "y":4.25, "w":2.25},
+                {"label":"K406 (F5,B6)", "x":6, "y":4.25, "w":2.75},
+                {"label":"K407 (F5,B5)", "x":8.75, "y":4.25},
+                {"label":"K408 (F5,B4)", "x":9.75, "y":4.25},
+                {"label":"K409 (F5,D7)", "x":10.75, "y":4.25}
+            ]
+        }
+    }
+}
diff --git a/qmk/keyboards/lazydesigners/dimpleplus/keymaps/default/keymap.c b/qmk/keyboards/lazydesigners/dimpleplus/keymaps/default/keymap.c
new file mode 100644
index 00000000..17b9aec4
--- /dev/null
+++ b/qmk/keyboards/lazydesigners/dimpleplus/keymaps/default/keymap.c
@@ -0,0 +1,43 @@
+/* Copyright 2020 LAZYDESIGNERS
+ *
+ * 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
+
+#define LT2_TAB LT(2, KC_TAB)
+#define LT1_SPC LT(1, KC_SPC)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        KC_ESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,
+        KC_GRV,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+        LT2_TAB,   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
+        KC_LSFT,   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_UP,   MO(2),
+        KC_LCTL,   KC_LALT, KC_LGUI, LT1_SPC,          KC_SPC,           KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT(
+        RESET,     KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  RESET,
+        KC_TILD,   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSLS,
+        KC_NO,     KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_LBRC, KC_RBRC, KC_MINS, KC_EQL,  KC_SCLN, KC_SLSH,
+        KC_NO,     KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_NO,   KC_NO,   KC_NO,   KC_DOT,  KC_NO,
+        RGB_TOG,   RGB_MOD, KC_NO,   KC_NO,            KC_NO,            KC_NO,   KC_NO,   KC_QUOT
+    ),
+    [2] = LAYOUT(
+        KC_NO,     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
+        KC_NO,     KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PIPE,
+        KC_NO,     KC_NO,   KC_NO,   KC_DEL,  KC_NO,   KC_NO,   KC_LCBR, KC_RCBR, KC_UNDS, KC_PLUS, KC_COLN, KC_QUES,
+        KC_NO,     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_LABK, KC_RABK, KC_NO,
+        KC_NO,     KC_NO,   KC_NO,   KC_NO,            KC_NO,            KC_NO,   KC_NO,   KC_DQUO
+    ),
+};
diff --git a/qmk/keyboards/lazydesigners/dimpleplus/keymaps/via/keymap.c b/qmk/keyboards/lazydesigners/dimpleplus/keymaps/via/keymap.c
new file mode 100644
index 00000000..e15949fd
--- /dev/null
+++ b/qmk/keyboards/lazydesigners/dimpleplus/keymaps/via/keymap.c
@@ -0,0 +1,48 @@
+/* Copyright 2020 LAZYDESIGNERS
+ *
+ * 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(
+                KC_ESC,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,
+                KC_GRV,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+                KC_TAB,    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
+                KC_LSFT,   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_UP,   MO(1),
+                KC_LCTL,   KC_LALT, KC_LGUI, KC_SPC,           KC_SPC,           KC_LEFT, KC_DOWN, KC_RGHT
+                ),
+	[1] = LAYOUT(
+                RESET,     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
+                KC_NO,     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
+                KC_NO,     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
+                KC_NO,     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   
+                KC_NO,     KC_NO,   KC_NO,   KC_NO,            KC_NO,            KC_NO,   KC_NO,   KC_NO
+                ),
+	[2] = LAYOUT(
+                KC_NO,     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
+                KC_NO,     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
+                KC_NO,     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
+                KC_NO,     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   
+                KC_NO,     KC_NO,   KC_NO,   KC_NO,            KC_NO,            KC_NO,   KC_NO,   KC_NO
+                ),
+	[3] = LAYOUT(
+                KC_NO,     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
+                KC_NO,     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
+                KC_NO,     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,
+                KC_NO,     KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   
+                KC_NO,     KC_NO,   KC_NO,   KC_NO,            KC_NO,            KC_NO,   KC_NO,   KC_NO
+                ),
+};
diff --git a/qmk/keyboards/lazydesigners/dimpleplus/keymaps/via/rules.mk b/qmk/keyboards/lazydesigners/dimpleplus/keymaps/via/rules.mk
new file mode 100644
index 00000000..36b7ba9c
--- /dev/null
+++ b/qmk/keyboards/lazydesigners/dimpleplus/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/qmk/keyboards/lazydesigners/dimpleplus/readme.md b/qmk/keyboards/lazydesigners/dimpleplus/readme.md
new file mode 100644
index 00000000..fc5881cd
--- /dev/null
+++ b/qmk/keyboards/lazydesigners/dimpleplus/readme.md
@@ -0,0 +1,19 @@
+# Dimpleplus
+
+![dimpleplus](https://i.loli.net/2020/08/15/GgfvXZ5dzDLqurh.jpg)
+
+* Keyboard Maintainer: [LAZYDESIGNERS](https://github.com/jackytrabbit)
+* Hardware Supported: Dimple Plus
+* Hardware Availability: Check [LAZYDESIGNERS's homepage.](http://lazydesigners.cn)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make lazydesigners/dimpleplus:default
+
+Flashing example for this keyboard:
+
+    make lazydesigners/dimpleplus:default:flash
+
+**Reset Key:** To enter the bootloader, either push the RESET button on the PCB or the RESET button on the FN layer.
+
+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).
diff --git a/qmk/keyboards/lazydesigners/dimpleplus/rules.mk b/qmk/keyboards/lazydesigners/dimpleplus/rules.mk
new file mode 100644
index 00000000..3fd7208d
--- /dev/null
+++ b/qmk/keyboards/lazydesigners/dimpleplus/rules.mk
@@ -0,0 +1,23 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+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
+# 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 = yes      # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth 
+AUDIO_ENABLE = no           # Audio output
+
diff --git a/qmk/keyboards/lazydesigners/the30/rules.mk b/qmk/keyboards/lazydesigners/the30/rules.mk
index 6c1e24fd..eea30f7e 100644
--- a/qmk/keyboards/lazydesigners/the30/rules.mk
+++ b/qmk/keyboards/lazydesigners/the30/rules.mk
@@ -29,7 +29,6 @@ MIDI_ENABLE = no            # MIDI support
 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
 
 # Support community keymaps
 LAYOUTS = ortho_3x10
diff --git a/qmk/keyboards/lets_split/keymaps/OLED_sample/keymap.c b/qmk/keyboards/lets_split/keymaps/OLED_sample/keymap.c
index 0cf3503e..a34d5a32 100644
--- a/qmk/keyboards/lets_split/keymaps/OLED_sample/keymap.c
+++ b/qmk/keyboards/lets_split/keymaps/OLED_sample/keymap.c
@@ -1,5 +1,5 @@
 #include QMK_KEYBOARD_H
-#include "LUFA/Drivers/Peripheral/TWI.h"
+#include <LUFA/Drivers/Peripheral/TWI.h>
 #ifdef SSD1306OLED
   #include "ssd1306.h"
 #endif
diff --git a/qmk/keyboards/lets_split/keymaps/via/rules.mk b/qmk/keyboards/lets_split/keymaps/via/rules.mk
index 48e7e7f2..92725994 100644
--- a/qmk/keyboards/lets_split/keymaps/via/rules.mk
+++ b/qmk/keyboards/lets_split/keymaps/via/rules.mk
@@ -1,4 +1,4 @@
 RGBLIGHT_ENABLE = yes 		# LED strips
 VIA_ENABLE = yes
 LTO_ENABLE = yes
-MOUSEKEY_ENABLE = no
+COMMAND_ENABLE = no
diff --git a/qmk/keyboards/lfkeyboards/TWIlib.c b/qmk/keyboards/lfkeyboards/TWIlib.c
index dc4fbf01..d50ce728 100644
--- a/qmk/keyboards/lfkeyboards/TWIlib.c
+++ b/qmk/keyboards/lfkeyboards/TWIlib.c
@@ -8,7 +8,7 @@
 #include <avr/io.h>
 #include <avr/interrupt.h>
 #include "TWIlib.h"
-#include "util/delay.h"
+#include <util/delay.h>
 #include "print.h"
 
 // Global transmit buffer
diff --git a/qmk/keyboards/lfkeyboards/lfk78/config.h b/qmk/keyboards/lfkeyboards/lfk78/config.h
index b96aca07..031b10cf 100644
--- a/qmk/keyboards/lfkeyboards/lfk78/config.h
+++ b/qmk/keyboards/lfkeyboards/lfk78/config.h
@@ -184,34 +184,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/lfkeyboards/lfk78/lfk78.c b/qmk/keyboards/lfkeyboards/lfk78/lfk78.c
index cf49a5cf..5b283f97 100644
--- a/qmk/keyboards/lfkeyboards/lfk78/lfk78.c
+++ b/qmk/keyboards/lfkeyboards/lfk78/lfk78.c
@@ -2,7 +2,7 @@
 
 #include <avr/timer_avr.h>
 #include <avr/wdt.h>
-#include <audio/audio.h>
+#include "audio.h"
 #include "issi.h"
 #include "TWIlib.h"
 #include "lighting.h"
diff --git a/qmk/keyboards/lfkeyboards/lfkpad/config.h b/qmk/keyboards/lfkeyboards/lfkpad/config.h
index b05ee0f0..05de35c0 100644
--- a/qmk/keyboards/lfkeyboards/lfkpad/config.h
+++ b/qmk/keyboards/lfkeyboards/lfkpad/config.h
@@ -201,34 +201,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/lfkeyboards/lfkpad/rules.mk b/qmk/keyboards/lfkeyboards/lfkpad/rules.mk
index aca77f56..0e723f2f 100644
--- a/qmk/keyboards/lfkeyboards/lfkpad/rules.mk
+++ b/qmk/keyboards/lfkeyboards/lfkpad/rules.mk
@@ -30,7 +30,6 @@ MIDI_ENABLE = no             # MIDI support
 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
 
 ISSI_ENABLE = yes            # If the I2C pullup resistors aren't installed this must be disabled
 WATCHDOG_ENABLE = no         # Resets keyboard if matrix_scan() isn't run every 250ms
diff --git a/qmk/keyboards/lfkeyboards/lighting.c b/qmk/keyboards/lfkeyboards/lighting.c
index 2a6eac92..dcc5c402 100644
--- a/qmk/keyboards/lfkeyboards/lighting.c
+++ b/qmk/keyboards/lfkeyboards/lighting.c
@@ -11,7 +11,7 @@
 #include "lighting.h"
 #include "debug.h"
 #include "rgblight.h"
-#include "audio/audio.h"
+#include "audio.h"
 
 
 extern rgblight_config_t rgblight_config; // Declared in rgblight.c
diff --git a/qmk/keyboards/lily58/keymaps/bcat/keymap.c b/qmk/keyboards/lily58/keymaps/bcat/keymap.c
index 69864cd0..549363d0 100644
--- a/qmk/keyboards/lily58/keymaps/bcat/keymap.c
+++ b/qmk/keyboards/lily58/keymaps/bcat/keymap.c
@@ -1,3 +1,19 @@
+/* Copyright 2020 Jonathan Rascher
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
 #include QMK_KEYBOARD_H
 
 #include "bcat.h"
@@ -24,7 +40,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,                         KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_BSPC,
         KC_ESC,   KC_A,     KC_S,     KC_D,     KC_F,     KC_G,                         KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,
         KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,     KC_WBAK,  KC_WFWD,  KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,
-                                      KC_LGUI,  KC_LCTL,  LY_LWR,   KC_SPC,   KC_ENT,   LY_RSE,   KC_RALT,  KC_APP
+                                      KC_LALT,  KC_LCTL,  LY_LWR,   KC_SPC,   KC_ENT,   LY_RSE,   KC_RALT,  KC_RGUI
     ),
 
     /* Lower layer: http://www.keyboard-layout-editor.com/#/gists/19ad0d3b5d745fbb2818db09740f5a11 */
diff --git a/qmk/keyboards/lily58/keymaps/bcat/readme.md b/qmk/keyboards/lily58/keymaps/bcat/readme.md
index 84c2fc33..de03526a 100644
--- a/qmk/keyboards/lily58/keymaps/bcat/readme.md
+++ b/qmk/keyboards/lily58/keymaps/bcat/readme.md
@@ -1,8 +1,8 @@
 # bcat's Lily58 layout
 
-This split ergo layout follows my preferred [Crkbd
-layout](https://github.com/qmk/qmk_firmware/tree/master/keyboards/crkbd/keymaps/bcat)
-with the following changes:
+This split ergo layout follows my preferred [split 3x6 + 3 thumb
+keys](https://github.com/qmk/qmk_firmware/tree/master/layouts/community/split_3x6_3/bcat)
+(Crkbd) layout with a few changes:
 
 * There's an optional number row at the top of the keyboard. I am quite used to
 using layers for numbers and symbols, so in practice this goes unused.
@@ -11,12 +11,15 @@ using layers for numbers and symbols, so in practice this goes unused.
 placed in the same positions as on the ErgoDox EZ. (There's no real reason for
 this; I just had to do _something_ with those keys.)
 
-* The extra thumb keys are used for dedicated Super/Menu keys, as well as
-browser back/forward navigation keys.
+* The extra thumb keys on the bottom row are used for a Left Alt key (for easier
+Alt+Tab, Alt+F4, etc.) and a dedicated Super key.
+
+* The harder-to-reach thumb keys below the controllers are bound to browser
+back/forward navigation keys.
 
 ## Default layer
 
-![Default layer layout](https://i.imgur.com/FNITWJ0.png)
+![Default layer layout](https://i.imgur.com/0stG2GT.png)
 
 ([KLE](http://www.keyboard-layout-editor.com/#/gists/e0eb3af65961e9fd612dcff3ddd88e4f))
 
diff --git a/qmk/keyboards/lily58/keymaps/via/config.h b/qmk/keyboards/lily58/keymaps/via/config.h
new file mode 100644
index 00000000..a3f0fb0a
--- /dev/null
+++ b/qmk/keyboards/lily58/keymaps/via/config.h
@@ -0,0 +1,42 @@
+/*
+This is the c configuration file for the keymap
+
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+Copyright 2015 Jack Humbert
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+//#define USE_MATRIX_I2C
+
+/* Select hand configuration */
+
+#define MASTER_LEFT
+// #define MASTER_RIGHT
+// #define EE_HANDS
+
+#define USE_SERIAL_PD2
+
+#define TAPPING_FORCE_HOLD
+#define TAPPING_TERM 100
+
+// Underglow
+/*
+#undef RGBLED_NUM
+#define RGBLED_NUM 14    // Number of LEDs
+#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_SLEEP
+*/
diff --git a/qmk/keyboards/lily58/keymaps/via/keymap.c b/qmk/keyboards/lily58/keymaps/via/keymap.c
new file mode 100644
index 00000000..bf46fb8e
--- /dev/null
+++ b/qmk/keyboards/lily58/keymaps/via/keymap.c
@@ -0,0 +1,229 @@
+ /* Copyright 2020 Naoki Katahira
+  *
+  * This program is free software: you can redistribute it and/or modify
+  * it under the terms of the GNU General Public License as published by
+  * the Free Software Foundation, either version 2 of the License, or
+  * (at your option) any later version.
+  *
+  * This program is distributed in the hope that it will be useful,
+  * but WITHOUT ANY WARRANTY; without even the implied warranty of
+  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  * GNU General Public License for more details.
+  *
+  * You should have received a copy of the GNU General Public License
+  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+  */
+
+#include QMK_KEYBOARD_H
+#include <stdio.h>
+
+//extern uint8_t is_master;
+
+enum layer_number {
+  _QWERTY = 0,
+  _LOWER,
+  _RAISE,
+  _ADJUST,
+};
+
+#define RAISE MO(_RAISE)
+#define LOWER MO(_LOWER)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/* QWERTY
+ * ,-----------------------------------------.                    ,-----------------------------------------.
+ * | ESC  |   1  |   2  |   3  |   4  |   5  |                    |   6  |   7  |   8  |   9  |   0  |  ~   |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * | Tab  |   Q  |   W  |   E  |   R  |   T  |                    |   Y  |   U  |   I  |   O  |   P  |  -   |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |LCTRL |   A  |   S  |   D  |   F  |   G  |-------.    ,-------|   H  |   J  |   K  |   L  |   ;  |  '   |
+ * |------+------+------+------+------+------|   [   |    |    ]  |------+------+------+------+------+------|
+ * |LShift|   Z  |   X  |   C  |   V  |   B  |-------|    |-------|   N  |   M  |   ,  |   .  |   /  |RShift|
+ * `-----------------------------------------/       /     \      \-----------------------------------------'
+ *                   |LOWER | LGUI | Alt  | /Space  /       \Enter \  |BackSP| RGUI |RAISE |
+ *                   |      |      |      |/       /         \      \ |      |      |      |
+ *                   `-------------------''-------'           '------''--------------------'
+ */
+
+ [_QWERTY] = LAYOUT(
+  KC_ESC,   KC_1,   KC_2,    KC_3,    KC_4,    KC_5,                     KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_GRV,
+  KC_TAB,   KC_Q,   KC_W,    KC_E,    KC_R,    KC_T,                     KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_MINS,
+  KC_LCTRL, KC_A,   KC_S,    KC_D,    KC_F,    KC_G,                     KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+  KC_LSFT,  KC_Z,   KC_X,    KC_C,    KC_V,    KC_B, KC_LBRC,  KC_RBRC,  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,  KC_RSFT,
+                      LOWER, KC_LGUI,  KC_LALT, KC_SPC,   KC_ENT,   KC_BSPC,  KC_RGUI, RAISE
+),
+/* LOWER
+ * ,-----------------------------------------.                    ,-----------------------------------------.
+ * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |      |   !  |   @  |   #  |   $  |   %  |                    |   ^  |   &  |   *  |   (  |   )  |      |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |      |   1  |   2  |   3  |   4  |   5  |-------.    ,-------|   6  |   7  |   8  |   9  |   0  |      |
+ * |------+------+------+------+------+------|   [   |    |    ]  |------+------+------+------+------+------|
+ * |      |      |      |      |      |      |-------|    |-------|   |  |   `  |   +  |   {  |   }  |      |
+ * `-----------------------------------------/       /     \      \-----------------------------------------'
+ *                   |LOWER | LGUI | Alt  | /Space  /       \Enter \  |BackSP| RGUI |RAISE |
+ *                   |      |      |      |/       /         \      \ |      |      |      |
+ *                   `-------------------''-------'           '------''--------------------'
+ */
+[_LOWER] = LAYOUT(
+  _______, _______, _______, _______, _______, _______,                   _______, _______, _______,_______, _______, _______,
+  _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                   KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______,
+  _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                      KC_6,    KC_7,    KC_8,    KC_9,    KC_0, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, KC_PIPE, KC_GRAVE, KC_PLUS, KC_LCBR, KC_RCBR, _______,
+                             _______, _______, _______, _______, _______,  _______, _______, _______
+),
+/* RAISE
+ * ,-----------------------------------------.                    ,-----------------------------------------.
+ * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |                    |  F7  |  F8  |  F9  | F10  | F11  | F12  |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |      |      |      |      |      |      |-------.    ,-------|      | Left | Down |  Up  |Right |      |
+ * |------+------+------+------+------+------|   [   |    |    ]  |------+------+------+------+------+------|
+ * |      |      |      |      |      |      |-------|    |-------|   +  |   =  |   [  |   ]  |   \  |      |
+ * `-----------------------------------------/       /     \      \-----------------------------------------'
+ *                   |LOWER | LGUI | Alt  | /Space  /       \Enter \  |BackSP| RGUI |RAISE |
+ *                   |      |      |      |/       /         \      \ |      |      |      |
+ *                   `-------------------''-------'           '------''--------------------'
+ */
+
+[_RAISE] = LAYOUT(
+  _______, _______, _______, _______, _______, _______,                     _______, _______, _______, _______, _______, _______,
+  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,                       KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
+  _______, _______, _______, _______, _______, _______,                     XXXXXXX, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, XXXXXXX,
+  _______, _______, _______, _______, _______, _______,   _______, _______, KC_PLUS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS, _______,
+                             _______, _______, _______,  _______, _______,  _______, _______, _______
+),
+
+/* ADJUST
+ * ,-----------------------------------------.                    ,-----------------------------------------.
+ * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |      |      |      |      |      |      |                    |      |      |      |      |      |      |
+ * |------+------+------+------+------+------|                    |------+------+------+------+------+------|
+ * |      |      |      |      |      |      |-------.    ,-------|      |      |      |      |      |      |
+ * |------+------+------+------+------+------|       |    |       |------+------+------+------+------+------|
+ * |      |      |      |      |      |      |-------|    |-------|      |      |      |      |      |      |
+ * `-----------------------------------------/       /     \      \-----------------------------------------'
+ *                   |LOWER | LGUI | Alt  | /Space  /       \Enter \  |BackSP| RGUI |RAISE |
+ *                   |      |      |      |/       /         \      \ |      |      |      |
+ *                   `----------------------------'           '------''--------------------'
+ */
+  [_ADJUST] = LAYOUT(
+  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+                             _______, _______, _______, _______, _______,  _______, _______, _______
+  )
+};
+
+#ifdef OLED_DRIVER_ENABLE
+
+oled_rotation_t oled_init_user(oled_rotation_t rotation) {
+  if (!is_keyboard_master())
+    return OLED_ROTATION_180;  // flips the display 180 degrees if offhand
+  return rotation;
+}
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+    state = update_tri_layer_state(state, _RAISE, _LOWER, _ADJUST);
+    return state;
+}
+
+static void render_logo(void) {
+    static const char PROGMEM logo[] = {
+        0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, 0x90, 0x91, 0x92, 0x93, 0x94,
+        0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF, 0xB0, 0xB1, 0xB2, 0xB3, 0xB4,
+        0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0x00
+    };
+
+    oled_write_P(logo, false);
+}
+char keylog_str[24] = {};
+char keylogs_str[21] = {};
+int keylogs_str_idx = 0;
+
+const char code_to_name[60] = {
+    ' ', ' ', ' ', ' ', 'a', 'b', 'c', 'd', 'e', 'f',
+    'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p',
+    'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
+    '1', '2', '3', '4', '5', '6', '7', '8', '9', '0',
+    'R', 'E', 'B', 'T', '_', '-', '=', '[', ']', '\\',
+    '#', ';', '\'', '`', ',', '.', '/', ' ', ' ', ' '};
+
+void set_keylog(uint16_t keycode, keyrecord_t *record) {
+  char name = ' ';
+  if (keycode < 60) {
+    name = code_to_name[keycode];
+  }
+
+  // update keylog
+  snprintf(keylog_str, sizeof(keylog_str), "%dx%d, k%2d : %c",
+           record->event.key.row, record->event.key.col,
+           keycode, name);
+
+  // update keylogs
+  if (keylogs_str_idx == sizeof(keylogs_str) - 1) {
+    keylogs_str_idx = 0;
+    for (int i = 0; i < sizeof(keylogs_str) - 1; i++) {
+      keylogs_str[i] = ' ';
+    }
+  }
+
+  keylogs_str[keylogs_str_idx] = name;
+  keylogs_str_idx++;
+}
+
+const char *read_keylog(void) {
+  return keylog_str;
+}
+
+const char *read_keylogs(void) {
+  return keylogs_str;
+}
+//new
+
+void oled_task_user(void) {
+  if (is_keyboard_master()) {
+    // Host Keyboard Layer Status
+    oled_write_P(PSTR("Layer: "), false);
+
+    switch (get_highest_layer(layer_state)) {
+    case _QWERTY:
+        oled_write_ln_P(PSTR("Default"), false);
+        break;
+    case _RAISE:
+        oled_write_ln_P(PSTR("Raise"), false);
+        break;
+    case _LOWER:
+        oled_write_ln_P(PSTR("Lower"), false);
+        break;
+    case _ADJUST:
+        oled_write_ln_P(PSTR("Adjust"), false);
+        break;
+    default:
+        oled_write_ln_P(PSTR("Undefined"), false);
+    }
+
+    oled_write_ln(read_keylog(), false);
+    oled_write_ln(read_keylogs(), false);
+
+  } else {
+      render_logo();
+  }
+}
+#endif // OLED_DRIVER_ENABLE
+
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  if (record->event.pressed) {
+#ifdef OLED_DRIVER_ENABLE
+    set_keylog(keycode, record);
+#endif
+    // set_timelog();
+  }
+  return true;
+}
diff --git a/qmk/keyboards/lily58/keymaps/via/rules.mk b/qmk/keyboards/lily58/keymaps/via/rules.mk
new file mode 100644
index 00000000..1df2dc4b
--- /dev/null
+++ b/qmk/keyboards/lily58/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+OLED_DRIVER_ENABLE = yes
diff --git a/qmk/keyboards/lucid/phantom_hs/config.h b/qmk/keyboards/lucid/phantom_hs/config.h
new file mode 100644
index 00000000..3e6fe458
--- /dev/null
+++ b/qmk/keyboards/lucid/phantom_hs/config.h
@@ -0,0 +1,105 @@
+/*
+Copyright 2020 <hello@lucidkb.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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID    0x7667 // Lucid
+#define PRODUCT_ID   0x0001 // Phantom
+#define DEVICE_VER   0x0001 // Version 1
+#define MANUFACTURER    Lucid
+#define PRODUCT         Phantom
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *         ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+*/
+
+// Checked with Eagle Schematic
+#define MATRIX_ROW_PINS { F4, F1, F7, F6, F5 }
+#define MATRIX_COL_PINS { F0, B1, B2, B3, B7, D0, D1, D2, D3, D5, D7, B4, B5, B6, C6 }
+#define UNUSED_PINS
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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 Indicator LED's */
+#define LED_CAPS_LOCK_PIN C7
+
+/* Define less important options */
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ * These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
diff --git a/qmk/keyboards/lucid/phantom_hs/info.json b/qmk/keyboards/lucid/phantom_hs/info.json
new file mode 100644
index 00000000..d190b252
--- /dev/null
+++ b/qmk/keyboards/lucid/phantom_hs/info.json
@@ -0,0 +1,84 @@
+{
+    "keyboard_name": "Phantom",
+    "url": "http://www.lucidkb.com",
+    "maintainer": "Lucid",
+    "width": 16,
+    "height": 5,
+    "layouts": {
+        "LAYOUT_65_ansi_blocker": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6, "y": 0},
+                {"x": 7, "y": 0},
+                {"x": 8, "y": 0},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0, "w": 2},
+                {"x": 15, "y": 0},
+
+                {"x": 0, "y": 1, "w": 1.5},
+                {"x": 1.5, "y": 1},
+                {"x": 2.5, "y": 1},
+                {"x": 3.5, "y": 1},
+                {"x": 4.5, "y": 1},
+                {"x": 5.5, "y": 1},
+                {"x": 6.5, "y": 1},
+                {"x": 7.5, "y": 1},
+                {"x": 8.5, "y": 1},
+                {"x": 9.5, "y": 1},
+                {"x": 10.5, "y": 1},
+                {"x": 11.5, "y": 1},
+                {"x": 12.5, "y": 1},
+                {"x": 13.5, "y": 1, "w": 1.5},
+                {"x": 15, "y": 1},
+
+                {"x": 0, "y": 2, "w": 1.75},
+                {"x": 1.75, "y": 2},
+                {"x": 2.75, "y": 2},
+                {"x": 3.75, "y": 2},
+                {"x": 4.75, "y": 2},
+                {"x": 5.75, "y": 2},
+                {"x": 6.75, "y": 2},
+                {"x": 7.75, "y": 2},
+                {"x": 8.75, "y": 2},
+                {"x": 9.75, "y": 2},
+                {"x": 10.75, "y": 2},
+                {"x": 11.75, "y": 2},
+                {"x": 12.75, "y": 2, "w": 2.25},
+                {"x": 15, "y": 2},
+
+                {"x": 0, "y": 3, "w": 2.25},
+                {"x": 2.25, "y": 3},
+                {"x": 3.25, "y": 3},
+                {"x": 4.25, "y": 3},
+                {"x": 5.25, "y": 3},
+                {"x": 6.25, "y": 3},
+                {"x": 7.25, "y": 3},
+                {"x": 8.25, "y": 3},
+                {"x": 9.25, "y": 3},
+                {"x": 10.25, "y": 3},
+                {"x": 11.25, "y": 3},
+                {"x": 12.25, "y": 3, "w": 1.75},
+                {"x": 14, "y": 3},
+                {"x": 15, "y": 3},
+
+                {"x": 0, "y": 4, "w": 1.25},
+                {"x": 1.25, "y": 4, "w": 1.25},
+                {"x": 2.5, "y": 4, "w": 1.25},
+                {"x": 3.75, "y": 4, "w": 6.25},
+                {"x": 10, "y": 4, "w": 1.25},
+                {"x": 11.25, "y": 4, "w": 1.25},
+                {"x": 13, "y": 4},
+                {"x": 14, "y": 4},
+                {"x": 15, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/qmk/keyboards/lucid/phantom_hs/keymaps/default/keymap.c b/qmk/keyboards/lucid/phantom_hs/keymaps/default/keymap.c
new file mode 100644
index 00000000..63229ed0
--- /dev/null
+++ b/qmk/keyboards/lucid/phantom_hs/keymaps/default/keymap.c
@@ -0,0 +1,39 @@
+/*
+Copyright 2020 <hello@lucidkb.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 QMK_KEYBOARD_H
+
+enum layers {
+    _LAYER0,
+    _LAYER1,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [_LAYER0] = LAYOUT_65_ansi_blocker(
+        KC_GESC, 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_DEL,
+        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_PGUP, 
+        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_PGDN, 
+        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_END, 
+        KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [_LAYER1] = LAYOUT_65_ansi_blocker(
+        KC_GESC, 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_BSPC, KC_DEL, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUSE, RESET, KC_PGUP,
+        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_PGDN, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_AUDIO_VOL_UP, KC_AUDIO_MUTE, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK
+    )
+};
diff --git a/qmk/keyboards/lucid/phantom_hs/keymaps/via/keymap.c b/qmk/keyboards/lucid/phantom_hs/keymaps/via/keymap.c
new file mode 100644
index 00000000..3366ff8b
--- /dev/null
+++ b/qmk/keyboards/lucid/phantom_hs/keymaps/via/keymap.c
@@ -0,0 +1,58 @@
+/*
+Copyright 2020 <hello@lucidkb.org>
+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
+
+enum layers {
+    _LAYER0,
+    _LAYER1,
+    _LAYER2,
+    _LAYER3,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [_LAYER0] = LAYOUT_65_ansi_blocker(
+        KC_GESC, 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_DEL,
+        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_PGUP, 
+        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_PGDN, 
+        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_END, 
+        KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [_LAYER1] = LAYOUT_65_ansi_blocker(
+        KC_GESC, 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_BSPC, KC_DEL, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUSE, RESET, KC_PGUP,
+        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_PGDN, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, NK_TOGG, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_AUDIO_VOL_UP, KC_AUDIO_MUTE, 
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MEDIA_PREV_TRACK, KC_AUDIO_VOL_DOWN, KC_MEDIA_NEXT_TRACK
+    ),
+
+    [_LAYER2] = LAYOUT_65_ansi_blocker(
+        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, 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
+    ),
+
+    [_LAYER3] = LAYOUT_65_ansi_blocker(
+        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, 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
+    ),
+
+};
diff --git a/qmk/keyboards/lucid/phantom_hs/keymaps/via/rules.mk b/qmk/keyboards/lucid/phantom_hs/keymaps/via/rules.mk
new file mode 100644
index 00000000..1e5b9980
--- /dev/null
+++ b/qmk/keyboards/lucid/phantom_hs/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/qmk/keyboards/lucid/phantom_hs/phantom_hs.c b/qmk/keyboards/lucid/phantom_hs/phantom_hs.c
new file mode 100644
index 00000000..4d10b67b
--- /dev/null
+++ b/qmk/keyboards/lucid/phantom_hs/phantom_hs.c
@@ -0,0 +1,14 @@
+/*
+Copyright 2020 <hello@lucidkb.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 "phantom_hs.h"
diff --git a/qmk/keyboards/lucid/phantom_hs/phantom_hs.h b/qmk/keyboards/lucid/phantom_hs/phantom_hs.h
new file mode 100644
index 00000000..6dc53cfa
--- /dev/null
+++ b/qmk/keyboards/lucid/phantom_hs/phantom_hs.h
@@ -0,0 +1,32 @@
+/*
+Copyright 2020 <hello@lucidkb.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"
+
+/* Phantom Keymap Definitions */
+#define LAYOUT_65_ansi_blocker( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,      K2E, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D, K3E, \
+    K40, K41, K42,           K45,                K49, K4A,      K4C, K4D, K4E \
+) { \
+    { K00, K01, K02, K03,   K04,     K05,   K06,   K07,   K08,   K09, K0A, K0B,   K0C,   K0D,   K0E }, \
+    { K10, K11, K12, K13,   K14,     K15,   K16,   K17,   K18,   K19, K1A, K1B,   K1C,   K1D,   K1E }, \
+    { K20, K21, K22, K23,   K24,     K25,   K26,   K27,   K28,   K29, K2A, K2B,   K2C,   KC_NO, K2E }, \
+    { K30, K31, K32, K33,   K34,     K35,   K36,   K37,   K38,   K39, K3A, K3B,   KC_NO, K3D,   K3E }, \
+    { K40, K41, K42, KC_NO, KC_NO,   K45,   KC_NO, KC_NO, KC_NO, K49, K4A, KC_NO, K4C,   K4D,   K4E }  \
+}
diff --git a/qmk/keyboards/lucid/phantom_hs/readme.md b/qmk/keyboards/lucid/phantom_hs/readme.md
new file mode 100644
index 00000000..0f25e139
--- /dev/null
+++ b/qmk/keyboards/lucid/phantom_hs/readme.md
@@ -0,0 +1,13 @@
+# Phantom Hotswap PCB by Lucid
+
+The following is the QMK Firmware for the Phantom Hotswap PCB for [LucidKB](http://www.lucidkb.cm).
+---
+
+* Keyboard Maintainer: Lucid
+* Hardware Supported: Phantom
+
+Make example for this keyboard (after setting up your build environment):
+
+    make lucid/phantom_hs: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).
diff --git a/qmk/keyboards/lucid/phantom_hs/rules.mk b/qmk/keyboards/lucid/phantom_hs/rules.mk
new file mode 100644
index 00000000..945e7be2
--- /dev/null
+++ b/qmk/keyboards/lucid/phantom_hs/rules.mk
@@ -0,0 +1,28 @@
+# MCU name
+MCU = atmega32u4
+
+# Processor frequency
+F_CPU = 8000000
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+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 = 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 = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+KEYBOARD_LOCK_ENABLE = yes
+
+LAYOUTS = 65_ansi_blocker
diff --git a/qmk/keyboards/manta60/rules.mk b/qmk/keyboards/manta60/rules.mk
index 559044bb..1e898f54 100644
--- a/qmk/keyboards/manta60/rules.mk
+++ b/qmk/keyboards/manta60/rules.mk
@@ -29,7 +29,6 @@ MIDI_ENABLE = no            # MIDI support
 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
 
 SPLIT_KEYBOARD = yes
 
diff --git a/qmk/keyboards/marksard/rhymestone/keymaps/switch_tester/rules.mk b/qmk/keyboards/marksard/rhymestone/keymaps/switch_tester/rules.mk
index 78824da3..f4ccdf54 100644
--- a/qmk/keyboards/marksard/rhymestone/keymaps/switch_tester/rules.mk
+++ b/qmk/keyboards/marksard/rhymestone/keymaps/switch_tester/rules.mk
@@ -4,4 +4,4 @@ TAP_DANCE_ENABLE = no
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 OLED_DRIVER_ENABLE = no
 LTO_ENABLE = yes
-RGB_MATRIX_ENABLE = WS2812
+RGB_MATRIX_ENABLE = yes
diff --git a/qmk/keyboards/marksard/rhymestone/rules.mk b/qmk/keyboards/marksard/rhymestone/rules.mk
index 1f58665e..adfaca21 100644
--- a/qmk/keyboards/marksard/rhymestone/rules.mk
+++ b/qmk/keyboards/marksard/rhymestone/rules.mk
@@ -21,6 +21,8 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 BLUETOOTH_ENABLE = no       # Enable Bluetooth
 AUDIO_ENABLE = no           # Audio output
 SPLIT_KEYBOARD = yes
+RGB_MATRIX_ENABLE = no
+RGB_MATRIX_DRIVER = WS2812
 
 DEFAULT_FOLDER = marksard/rhymestone/rev1
 
diff --git a/qmk/keyboards/massdrop/alt/alt.h b/qmk/keyboards/massdrop/alt/alt.h
index f1adcd67..03960954 100644
--- a/qmk/keyboards/massdrop/alt/alt.h
+++ b/qmk/keyboards/massdrop/alt/alt.h
@@ -5,7 +5,7 @@
 #include "matrix.h"
 
 #include "i2c_master.h"
-#include "led_matrix.h" //For led keycodes
+#include "md_rgb_matrix.h" //For led keycodes
 #include "usb/udi_cdc.h"
 #include "usb/usb2422.h"
 
diff --git a/qmk/keyboards/massdrop/alt/config_led.c b/qmk/keyboards/massdrop/alt/config_led.c
index 42d4d147..13611770 100644
--- a/qmk/keyboards/massdrop/alt/config_led.c
+++ b/qmk/keyboards/massdrop/alt/config_led.c
@@ -1,7 +1,7 @@
 #ifdef RGB_MATRIX_ENABLE
 #include "alt.h"
 
-#include "led_matrix.h"
+#include "md_rgb_matrix.h"
 #include "rgb_matrix.h"
 #include "config_led.h"
 
@@ -37,11 +37,11 @@ led_config_t g_led_config = { {
     { 224,  13 }, { 224,  25 }, { 224,  38 }, { 224,  50 }, { 222,  62 }, { 191,  64 }, { 179,  64 }, { 167,  64 }, { 153,  64 }, { 139,  64 }, { 125,  64 }, { 112,  64 }, {  98,  64 }, {  84,  64 }, {  70,  64 },
     {  56,  64 }, {  42,  64 }, {  28,  64 }, {   1,  62 }, {   0,  50 }, {   0,  38 }, {   0,  25 }, {   0,  13 }
 }, {
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-    4, 4, 4, 4, 4, 4, 4,
+    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1,
+    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+    9, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1,
+    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, 1,
+    1, 1, 1, 4, 1, 1, 1, 1, 1,
   // Underglow LEDs
     2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
     2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
@@ -52,7 +52,7 @@ led_config_t g_led_config = { {
 #ifdef USB_LED_INDICATOR_ENABLE
 void rgb_matrix_indicators_kb(void)
 {
-  led_matrix_indicators();
+  md_rgb_matrix_indicators();
 }
 #endif // USB_LED_INDICATOR_ENABLE
 
diff --git a/qmk/keyboards/massdrop/alt/keymaps/default/keymap.c b/qmk/keyboards/massdrop/alt/keymaps/default/keymap.c
index 0d3e7ccb..df8d4069 100644
--- a/qmk/keyboards/massdrop/alt/keymaps/default/keymap.c
+++ b/qmk/keyboards/massdrop/alt/keymaps/default/keymap.c
@@ -87,11 +87,11 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             if (record->event.pressed) {
               switch (rgb_matrix_get_flags()) {
                 case LED_FLAG_ALL: {
-                    rgb_matrix_set_flags(LED_FLAG_KEYLIGHT);
+                    rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR);
                     rgb_matrix_set_color_all(0, 0, 0);
                   }
                   break;
-                case LED_FLAG_KEYLIGHT: {
+                case (LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR): {
                     rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
                     rgb_matrix_set_color_all(0, 0, 0);
                   }
diff --git a/qmk/keyboards/massdrop/alt/keymaps/default_md/keymap.c b/qmk/keyboards/massdrop/alt/keymaps/default_md/keymap.c
index 9894caf4..810585a3 100644
--- a/qmk/keyboards/massdrop/alt/keymaps/default_md/keymap.c
+++ b/qmk/keyboards/massdrop/alt/keymaps/default_md/keymap.c
@@ -173,7 +173,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 led_instruction_t led_instructions[] = {
     //LEDs are normally inactive, no processing is performed on them
     //Flags are used in matching criteria for an LED to be active and indicate how to color it
-    //Flags can be found in tmk_core/protocol/arm_atsam/led_matrix.h (prefixed with LED_FLAG_)
+    //Flags can be found in tmk_core/protocol/arm_atsam/md_rgb_matrix.h (prefixed with LED_FLAG_)
     //LED IDs can be found in config_led.h in the keyboard's directory
     //Examples are below
 
diff --git a/qmk/keyboards/massdrop/alt/keymaps/pregame/config.h b/qmk/keyboards/massdrop/alt/keymaps/pregame/config.h
new file mode 100644
index 00000000..acd041ce
--- /dev/null
+++ b/qmk/keyboards/massdrop/alt/keymaps/pregame/config.h
@@ -0,0 +1,156 @@
+/* Copyright 2020 elijahblake81
+ *
+ * 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
+
+
+#define MODS_SHIFT  (get_mods() & MOD_MASK_SHIFT)
+#define MODS_CTRL   (get_mods() & MOD_MASK_CTRL)
+#define MODS_ALT    (get_mods() & MOD_MASK_ALT)
+
+// #define IS_COMMAND() (get_mods() == MOD_MASK_SHIFT)      // Key combination that allows the use of magic commands (useful for debugging)
+
+// #define NO_DEBUG                    			// Disable debugging
+// #define NO_PRINT                    			// Disable printing/debugging using hid_listen
+// #define NO_ACTION_LAYER             			// Disable layers
+// #define NO_ACTION_TAPPING           			// Disable tap dance and other tapping features
+// #define NO_ACTION_ONESHOT           			// Disable one-shot modifiers
+// #define NO_ACTION_MACRO             			// Disable old style macro handling: MACRO() & action_get_macro
+// #define TERMINAL_HELP
+// #define MOUSEKEY_INTERVAL 20
+// #define MOUSEKEY_DELAY 0
+// #define MOUSEKEY_TIME_TO_MAX 60
+// #define MOUSEKEY_MAX_SPEED 10
+// #define MOUSEKEY_WHEEL_DELAY 0
+#define FORCE_NKRO                  			// NKRO by default requires to be turned on, this forces it on during keyboard startup regardless of EEPROM setting. NKRO can still be turned off but will be turned on again if the keyboard reboots.
+// #define QMK_KEYS_PER_SCAN 4         			// Allows sending more than one key per scan. By default, only one key event gets sent via process_record() per scan. This has little impact on most typing, but if you're doing a lot of chords, or your scan rate is slow to begin with, you can have some delay in processing key events. Each press and release is a separate event. For a keyboard with 1ms or so scan times, even a very fast typist isn't going to produce the 500 keystrokes a second needed to actually get more than a few ms of delay from this. But if you're doing chording on something with 3-4ms scan times? You probably want this.
+// #define STRICT_LAYER_RELEASE        			// Force a key release to be evaluated using the current layer stack instead of remembering which layer it came from (used for advanced cases)
+// #define LOCKING_SUPPORT_ENABLE      			// Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap
+// #define LOCKING_RESYNC_ENABLE       			// Tries to keep switch state consistent with keyboard LED state
+// #define TAPPING_TERM 200            			// How long before a tap becomes a hold, if set above 500, a key tapped during the tapping term will turn it into a hold too
+// #define TAPPING_TERM_PER_KEY        			// Enabling to allow to tweak individual keys
+// #define RETRO_TAPPING               			// Tap anyway, even after TAPPING_TERM, if there was no other key interruption between press and release
+// #define TAPPING_TOGGLE 2            			// How many taps before triggering the toggle
+// #define PERMISSIVE_HOLD             			// Makes tap and hold keys trigger the hold if another key is pressed before releasing, even if it hasn't hit the TAPPING_TERM. See Permissive Hold for details
+// #define IGNORE_MOD_TAP_INTERRUPT    			// Makes it possible to do rolling combos (zx) with keys that convert to other keys on hold, by enforcing the TAPPING_TERM for both keys. See Mod tap interrupt for details
+// #define TAPPING_FORCE_HOLD          			// Makes it possible to use a dual role key as modifier shortly after having been tapped. See Hold after tap. Breaks any Tap Toggle functionality (TT or the One Shot Tap Toggle)
+// #define LEADER_TIMEOUT 300          			// How long before the leader key times out. If you're having issues finishing the sequence before it times out, you may need to increase the timeout setting. Or you may want to enable the LEADER_PER_KEY_TIMING option, which resets the timeout after each key is tapped.
+// #define LEADER_PER_KEY_TIMING       			// Sets the timer for leader key chords to run on each key press rather than overall
+// #define LEADER_KEY_STRICT_KEY_PROCESSING    	// Disables keycode filtering for Mod-Tap and Layer-Tap keycodes. Eg, if you enable this, you would need to specify MT(MOD_CTL, KC_A) if you want to use KC_A.
+// #define ONESHOT_TIMEOUT 3000         		// How long before oneshot times out
+// #define ONESHOT_TAP_TOGGLE 2        			// How many taps before oneshot toggle is triggered
+// #define COMBO_COUNT 2               			// Set this to the number of combos that you're using in the Combo feature.
+// #define COMBO_TERM 200              			// How long for the Combo keys to be detected. Defaults to TAPPING_TERM if not defined.
+// #define TAP_CODE_DELAY 100          			// Sets the delay between register_code and unregister_code, if you're having issues with it registering properly (common on VUSB boards). The value is in milliseconds.
+// #define TAP_HOLD_CAPS_DELAY 80      			// Sets the delay for Tap Hold keys (LT, MT) when using KC_CAPSLOCK keycode, as this has some special handling on MacOS.  The value is in milliseconds, and defaults to 80 ms if not defined. For macOS, you may want to set this to 200 or higher.
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#define RGB_MATRIX_KEYPRESSES         			// reacts to keypresses
+// #define RGB_MATRIX_KEYRELEASES        		// reacts to keyreleases (instead of keypresses)
+
+
+
+//Teal and Blue
+//#define RGB_MATRIX_STARTUP_HUE 127 			// Default boot color
+//#define RGB_MATRIX_STARTUP_SPD 47 			// Used to determine the color for the modifiers
+
+//Teal and Blue
+//#define RGB_MATRIX_STARTUP_HUE 120 			// Default boot color
+//#define RGB_MATRIX_STARTUP_SPD 50 			//Used to determine the color for the modifiers
+
+
+//QMK HSV is based on 255 value wheel rather than 360
+
+//Cyan and Yellow
+//#define RGB_MATRIX_STARTUP_HUE 127 			// Default boot color
+//#define RGB_MATRIX_STARTUP_SPD 177
+
+//Cyan and Green
+//#define RGB_MATRIX_STARTUP_HUE 127 			// Default boot color
+//#define RGB_MATRIX_STARTUP_SPD 215
+
+// #define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+
+#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_REACTIVE  	// Sets the default mode, if none has been set
+#define RGB_MATRIX_STARTUP_HUE 180  //purple  alphas with green background when pressed.
+// #define RGBLIGHT_HUE_STEP 12        						// Units to step when in/decreasing hue
+// #define RGBLIGHT_SAT_STEP 25        						// Units to step when in/decreasing saturation
+// #define RGBLIGHT_VAL_STEP 12        						// Units to step when in/decreasing value (brightness)
+// #define RGB_DISABLE_AFTER_TIMEOUT 0   					// number of ticks to wait until disabling effects
+// #define RGB_DISABLE_WHEN_USB_SUSPENDED false 			// turn off effects when suspended
+// #define RGB_MATRIX_LED_PROCESS_LIMIT (DRIVER_LED_TOTAL + 4) / 5 // limits the number of LEDs to process in an animation per task run (increases keyboard responsiveness)
+// #define RGB_MATRIX_LED_FLUSH_LIMIT 16 					// limits in milliseconds how frequently an animation will update the LEDs. 16 (16ms) is equivalent to limiting to 60fps (increases keyboard responsiveness)
+#define RGBLIGHT_ANIMATIONS             					// Run RGB animations
+// #define RGBLIGHT_ANIMATIONS             					// Enable all additional animation modes.
+#define RGBLIGHT_EFFECT_ALTERNATING     					// Enable alternating animation mode.
+#define RGBLIGHT_EFFECT_BREATHING       					// Enable breathing animation mode.
+// #define RGBLIGHT_EFFECT_CHRISTMAS       					// Enable christmas animation mode.
+// #define RGBLIGHT_EFFECT_KNIGHT          					// Enable knight animation mode.
+// #define RGBLIGHT_EFFECT_RAINBOW_MOOD    					// Enable rainbow mood animation mode.
+// #define RGBLIGHT_EFFECT_RAINBOW_SWIRL   					// Enable rainbow swirl animation mode.
+// #define RGBLIGHT_EFFECT_RGB_TEST        					// Enable RGB test animation mode.
+// #define RGBLIGHT_EFFECT_SNAKE           					// Enable snake animation mode.
+// #define RGBLIGHT_EFFECT_STATIC_GRADIENT 					// Enable static gradient mode.
+	
+// #define RGBLIGHT_EFFECT_BREATHE_CENTER              		// If defined, used to calculate the curve for the breathing animation. Valid values are 1.0 to 2.7
+// #define RGBLIGHT_EFFECT_BREATHE_MAX 255             		// The maximum brightness for the breathing mode. Valid values are 1 to 255
+// #define RGBLIGHT_EFFECT_CHRISTMAS_INTERVAL 1000     		// How long to wait between light changes for the "Christmas" animation, in milliseconds
+// #define RGBLIGHT_EFFECT_CHRISTMAS_STEP 2            		// The number of LEDs to group the red/green colors by for the "Christmas" animation
+// #define RGBLIGHT_EFFECT_KNIGHT_LED_NUM RGBLED_NUM   		// The number of LEDs to have the "Knight" animation travel
+// #define RGBLIGHT_EFFECT_KNIGHT_LENGTH 3             		// The number of LEDs to light up for the "Knight" animation
+// #define RGBLIGHT_EFFECT_KNIGHT_OFFSET 0             		// The number of LEDs to start the "Knight" animation from the start of the strip by
+// #define RGBLIGHT_RAINBOW_SWIRL_RANGE 255            		// Range adjustment for the rainbow swirl effect to get different swirls
+// #define RGBLIGHT_EFFECT_SNAKE_LENGTH 4              		// The number of LEDs to light up for the "Snake" animation
+
+// This list in in the correct mode order. Next mode is the following line, previous mode is previous line. Loops around.
+// #define DISABLE_RGB_MATRIX_SOLID_COLOR                   // Static single hue, no speed support
+// #define DISABLE_RGB_MATRIX_ALPHAS_MODS                   // Static dual hue, speed is hue for secondary hue
+// #define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN              // Static gradient top to bottom, speed controls how much gradient changes
+// #define DISABLE_RGB_MATRIX_BREATHING                     // Single hue brightness cycling animation
+// #define DISABLE_RGB_MATRIX_BAND_SAT                      // Single hue band fading saturation scrolling left to right
+// #define DISABLE_RGB_MATRIX_BAND_VAL                      // Single hue band fading brightness scrolling left to right
+// #define DISABLE_RGB_MATRIX_BAND_PINWHEEL_SAT             // Single hue 3 blade spinning pinwheel fades saturation
+// #define DISABLE_RGB_MATRIX_BAND_PINWHEEL_VAL             // Single hue 3 blade spinning pinwheel fades brightness
+// #define DISABLE_RGB_MATRIX_BAND_SPIRAL_SAT               // Single hue spinning spiral fades saturation
+// #define DISABLE_RGB_MATRIX_BAND_SPIRAL_VAL               // Single hue spinning spiral fades brightness
+// #define DISABLE_RGB_MATRIX_CYCLE_ALL                     // Full keyboard solid hue cycling through full gradient
+// #define DISABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT              // Full gradient scrolling left to right
+// #define DISABLE_RGB_MATRIX_CYCLE_UP_DOWN                 // Full gradient scrolling top to bottom
+// #define DISABLE_RGB_MATRIX_CYCLE_OUT_IN                  // Full gradient scrolling out to in
+// #define DISABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL             // Full dual gradients scrolling out to in
+// #define DISABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON        // Full gradent Chevron shapped scrolling left to right
+// #define DISABLE_RGB_MATRIX_CYCLE_PINWHEEL                // Full gradient spinning pinwheel around center of keyboard
+// #define DISABLE_RGB_MATRIX_CYCLE_SPIRAL                  // Full gradient spinning spiral around center of keyboard
+// #define DISABLE_RGB_MATRIX_DUAL_BEACON                   // Full gradient spinning around center of keyboard
+// #define DISABLE_RGB_MATRIX_RAINBOW_BEACON                // Full tighter gradient spinning around center of keyboard
+// #define DISABLE_RGB_MATRIX_RAINBOW_PINWHEELS             // Full dual gradients spinning two halfs of keyboard
+// #define DISABLE_RGB_MATRIX_RAINDROPS                     // Randomly changes a single key's hue
+// #define DISABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS           // Randomly changes a single key's hue and saturation
+// =================================================== Requires RGB_MATRIX_FRAMEBUFFER_EFFECTS =============================================================
+// #define DISABLE_RGB_MATRIX_TYPING_HEATMAP                // How hot is your WPM!
+#define DISABLE_RGB_MATRIX_DIGITAL_RAIN                  	// That famous computer simulation
+// =================================================== RGB_MATRIX_KEYPRESSES OR RGB_MATRIX_KEYRELEASES =====================================================
+// #define DISABLE_RGB_MATRIX_SOLID_REACTIVE                // Static single hue, pulses keys hit to shifted hue then fades to current hue
+// #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE         // Pulses keys hit to hue & value then fades value out
+// #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE           // Hue & value pulse near a single key hit then fades value out
+// #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE      // Hue & value pulse near multiple key hits then fades value out
+// #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS          // Hue & value pulse the same column and row of a single key hit then fades value out
+// #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS     // Hue & value pulse the same column and row of multiple key hits then fades value out
+// #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS          // Hue & value pulse away on the same column and row of a single key hit then fades value out
+// #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS     // Hue & value pulse away on the same column and row of multiple key hits then fades value out
+// #define DISABLE_RGB_MATRIX_SPLASH                        // Full gradient & value pulse away from a single key hit then fades value out
+// #define DISABLE_RGB_MATRIX_MULTISPLASH                   // Full gradient & value pulse away from multiple key hits then fades value out
+// #define DISABLE_RGB_MATRIX_SOLID_SPLASH                  // Hue & value pulse away from a single key hit then fades value out
+// #define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH             // Hue & value pulse away from multiple key hits then fades value out
diff --git a/qmk/keyboards/massdrop/alt/keymaps/pregame/keymap.c b/qmk/keyboards/massdrop/alt/keymaps/pregame/keymap.c
new file mode 100644
index 00000000..6c1d93b0
--- /dev/null
+++ b/qmk/keyboards/massdrop/alt/keymaps/pregame/keymap.c
@@ -0,0 +1,209 @@
+/* Copyright 2020 elijahblake81
+ *
+ * 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 "keymap.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    /*
+    [DEFAULT] = LAYOUT(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,     KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
+        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_HOME,
+        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_PGUP,
+        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_PGDN,
+        KC_LCTL, KC_LGUI, KC_LALT,                             KC_SPC,                             KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    */
+   [0] = LAYOUT_65_ansi_blocker(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,   KC_EQL,    KC_BSPC,   KC_DEL,
+        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_HOME,
+        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_PGUP,
+        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_PGDN,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),     KC_LEFT,  KC_DOWN, KC_RGHT
+        ),
+    [1] = LAYOUT_65_ansi_blocker(
+        KC_GRV,  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_F13,   KC_CALC,
+        RGB_M_P, RGB_SPD,  RGB_HUI, RGB_SPI, RGB_SAI, RGB_VAI, _______, U_T_AUTO, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, _______, KC_MYCM,
+        RGB_TOG, RGB_RMOD, RGB_HUD, RGB_MOD, RGB_SAD, RGB_VAD, _______, _______, _______, _______, _______, _______,          KC_MUTE,  KC_VOLU,
+        _______, _______,  _______, _______, _______, MD_BOOT, NK_TOGG, DBG_TOG, _______, _______, _______, _______,          KC_VOLU,  KC_VOLD,
+        _______, _______,  _______,                            KC_MPLY,                            _______, _______, KC_HOME, KC_VOLD,  KC_END
+    ),
+    /*
+    [X] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______, _______, _______, _______, TG_NKRO, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______
+    ),
+    [RGB] = LAYOUT(
+        ESC: 0,    1: 1,      2: 2,      3: 3,    4: 4,    5: 5,    6: 6,    7: 7,    8: 8,      9: 9,      0: 10,      MINS: 11,   EQL: 12,   BSPC: 13,  DEL: 14,
+        TAB: 15,   Q: 16,     W: 17,     E: 18,   R: 19,   T: 20,   Y: 21,   U: 22,   I: 23,     O: 24,     P: 25,      LBRC: 26,   RBRC: 27,  BSLS: 28,  HOME: 29,
+        CAPS: 30,  A: 31,     S: 32,     D: 33,   F: 34,   G: 35,   H: 36,   J: 37,   K: 38,     L: 39,     SCLN: 40,   QUOT: 41,              ENT: 42,   PGUP: 43,
+        LSFT: 44,  Z: 45,     X: 46,     C: 47,   V: 48,   B: 49,   N: 50,   M: 51,   COMM: 52,  DOT: 53,   SLSH: 54,   RSFT: 55,              UP: 56,    PGDN: 57,
+        LCTL: 58,  LGUI: 59,  LALT: 60,                    SPC: 61,                              RALT: 62,  FN: 63,                  LEFT: 64, DOWN: 65,  RGHT: 66
+        //UnderGlow
+        :67, :68, :69, :70, :71, :72, :73, :74, :75, :76, :77, :78, :79, :80, :81,
+        :82, :83, :84, :85,
+        :86, :87, :88, :89,
+        :90, :91, :92, :93, :94, :95, :96, :97, :98, :99, :100, :101, :102, :103, :104, :105,
+    ),
+    [MATRIX] = LAYOUT(
+        0,      1,      2,      3,      4,      5,      6,      7,      8,      9,      10,     11,         12,     13,     14,
+        15,     16,     17,     18,     19,     20,     21,     22,     23,     24,     25,     26,         27,     28,     29,
+        30,     31,     32,     33,     34,     35,     36,     37,     38,     39,     40,     41,         42,             43,
+        44,     45,     46,     47,     48,     49,     50,     51,     52,     53,     54,     55,                 56,     57,
+        58,     59,     60,                             61,                         62,     63,         64,     65,     66,
+        //UnderGlow
+        90,     91,     92,     93,     94,     95,     96,     97,     98,     99,     100,    101,    102,    103,        104,        105,
+        88,                                                                                                                             89,
+        86,                                                                                                                             87,
+        84,                                                                                                                             85,
+        67,     68,     69,     70,     71,     72,     73,     74,     75,     76,     77,     78,     79,     80,     81,     82,     83
+    ),
+    */
+};
+
+#ifdef _______
+#undef _______
+#define _______ {0, 0, 0}
+
+const uint8_t PROGMEM ledmap[][DRIVER_LED_TOTAL][3] = {
+    [0] = {
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, CHART,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, CHART,   CHART,   CHART,   _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          CHART,   _______,
+        _______, _______, _______,                            _______,                            _______, _______, CHART,   CHART,   CHART,
+        //UnderGlow
+        CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,
+        CHART,                                                                                                                        CHART,
+        CHART,                                                                                                                        CHART,
+        CHART,                                                                                                                        CHART,
+        CHART,                                                                                                                        CHART,
+        CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART
+        },
+    [1] = {
+        CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,    CHART,   CHART,   CHART,   CHART,     CHART,    BLUE,
+        GOLD,    PINK,    AZURE,   PINK,    TURQ,    TEAL,    _______, RED,     _______,  _______, GREEN,   BLUE,    GOLD,      _______,  BLUE,
+        TEAL,    MAGENT,  AZURE,   MAGENT,  TURQ,    TEAL,    _______, _______, _______,  _______, _______, _______,                GOLD, BLUE,
+        _______, _______, _______, _______, _______, RED,     RED,     RED,     _______,  _______, _______, _______,                GOLD, BLUE,
+        _______, _______, _______,                            GOLD,                                _______, _______,       PURPLE,  GOLD, PURPLE,
+        //UnderGlow
+        CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,
+        CHART,                                                                                                                        CHART,
+        CHART,                                                                                                                        CHART,
+        CHART,                                                                                                                        CHART,
+        CHART,                                                                                                                        CHART,
+        CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART,   CHART
+    },
+};
+
+#undef _______
+#define _______ KC_TRNS
+#endif
+
+// Runs just one time when the keyboard initializes.
+void matrix_init_user(void) {
+    // Enable or disable debugging
+    debug_enable=false;
+    debug_matrix=false;
+    debug_keyboard=false;
+    //rgb_enabled_flag = true;          // Initially, keyboard RGB is enabled. Change to false config.h initializes RGB disabled.
+};
+
+void keyboard_post_init_user(void) {
+    rgb_matrix_enable();
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    static uint32_t key_timer;
+
+    switch (keycode) {
+        case U_T_AUTO:
+            if (record->event.pressed && MODS_SHIFT && MODS_CTRL) {
+                TOGGLE_FLAG_AND_PRINT(usb_extra_manual, "USB extra port manual mode");
+            }
+            return false;
+        case U_T_AGCR:
+            if (record->event.pressed && MODS_SHIFT && MODS_CTRL) {
+                TOGGLE_FLAG_AND_PRINT(usb_gcr_auto, "USB GCR auto mode");
+            }
+            return false;
+        case MD_BOOT:
+            if (record->event.pressed) {
+                key_timer = timer_read32();
+            } else {
+                if (timer_elapsed32(key_timer) >= 500) {
+                    reset_keyboard();
+                }
+            }
+            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 | LED_FLAG_MODIFIER);
+                        rgb_matrix_set_color_all(0, 0, 0);
+                    }
+                    break;
+                    case LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER: {
+                        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;
+        }
+    }
+    return true;
+}
+void set_layer_color(int layer) {
+    for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
+        HSV hsv = {
+            .h = pgm_read_byte(&ledmap[layer][i][0]),
+            .s = pgm_read_byte(&ledmap[layer][i][1]),
+            .v = pgm_read_byte(&ledmap[layer][i][2]),
+        };
+        if (hsv.h || hsv.s || hsv.v) {
+            RGB rgb = hsv_to_rgb(hsv);
+            float f = (float)rgb_matrix_config.hsv.v / UINT8_MAX;
+            rgb_matrix_set_color(i, f * rgb.r, f * rgb.g, f * rgb.b);
+        } else if (layer == 1) {
+            // Only deactivate non-defined key LEDs at layers other than FN. Because at FN we have RGB adjustments and need to see them live.
+            // If the values are all false then it's a transparent key and deactivate LED at this layer
+            rgb_matrix_set_color(i, 0, 0, 0);
+        }
+    }
+}
+void rgb_matrix_indicators_user(void) {
+    if (g_suspend_state || disable_layer_color ||
+        rgb_matrix_get_flags() == LED_FLAG_NONE ||
+        rgb_matrix_get_flags() == LED_FLAG_UNDERGLOW) {
+            return;
+        }
+    set_layer_color(get_highest_layer(layer_state));
+}
diff --git a/qmk/keyboards/massdrop/alt/keymaps/pregame/keymap.h b/qmk/keyboards/massdrop/alt/keymaps/pregame/keymap.h
new file mode 100644
index 00000000..19808003
--- /dev/null
+++ b/qmk/keyboards/massdrop/alt/keymaps/pregame/keymap.h
@@ -0,0 +1,58 @@
+/* Copyright 2020 elijahblake81
+ *
+ * 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
+
+// HID has not yet been implemented for this keyboard
+// #include "raw_hid.h"
+
+#define MILLISECONDS_IN_SECOND 1000
+
+// These are just to make it neater to use builtin HSV values in the keymap
+#define RED {HSV_RED}
+#define CORAL {HSV_CORAL}
+#define ORANGE {HSV_ORANGE}
+#define GOLDEN {HSV_GOLDENROD}
+#define GOLD {HSV_GOLD}
+#define YELLOW {HSV_YELLOW}
+#define CHART {HSV_CHARTREUSE}
+#define GREEN {HSV_GREEN}
+#define SPRING {HSV_SPRINGGREEN}
+#define TURQ {HSV_TURQUOISE}
+#define TEAL {HSV_TEAL}
+#define CYAN {HSV_CYAN}
+#define AZURE {HSV_AZURE}
+#define BLUE {HSV_BLUE}
+#define PURPLE {HSV_PURPLE}
+#define MAGENT {HSV_MAGENTA}
+#define PINK {HSV_PINK}
+
+
+
+//========================================================== CONFIGURABLE DEFAULTS ==========================================================
+extern bool g_suspend_state;
+extern rgb_config_t rgb_matrix_config;
+bool disable_layer_color;
+
+enum alt_keycodes {
+    U_T_AUTO = SAFE_RANGE, // USB Extra Port Toggle Auto Detect / Always Active
+    U_T_AGCR,              // USB Toggle Automatic GCR control
+    DBG_TOG,               // DEBUG Toggle On / Off
+    DBG_MTRX,              // DEBUG Toggle Matrix Prints
+    DBG_KBD,               // DEBUG Toggle Keyboard Prints
+    DBG_MOU,               // DEBUG Toggle Mouse Prints
+    MD_BOOT,               // Restart into bootloader after hold timeout
+};
diff --git a/qmk/keyboards/massdrop/alt/keymaps/pregame/readme.md b/qmk/keyboards/massdrop/alt/keymaps/pregame/readme.md
new file mode 100644
index 00000000..e1872705
--- /dev/null
+++ b/qmk/keyboards/massdrop/alt/keymaps/pregame/readme.md
@@ -0,0 +1,35 @@
+# Massdrop Alt Pregame
+
+This keymap is here to show some love to the MD Alt. This is a stripped down version of the Drop Ctrl Endgame; hence the name Pregame.
+
+## IRL
+![In Real Life](https://i.imgur.com/Xp6Mb6P.jpg)
+
+
+
+## Layers
+
+### Typing Layer
+
+![Typing Layer](https://i.imgur.com/F7iU53K.png)
+
+### Function Layer
+
+![SHORTCUT_LAYER](https://i.imgur.com/Gub1xyC.png)
+
+## Features
+
+These are the features currently supported by this keymap:
+
+### RGB Can be customized by "NAME OF COLOR" in the Keymap.c file. 
+	1. Look at keymap for example.  My base layer the W,A,S,D and Arrow Keys are CHART short for CHARTREUSE (Close to NVIDIA GREEN). The values to pick from are located on keymap.h file.
+	2. I have applied static colors to the Function layer that let you know which keys are available to that layer only.  The not lit up keys are still accessible if set to Transparent Keycap!!! 
+
+## Credits
+
+This was all converted originally from the Drop Ctrl Endgame.  I took nblyumberg's version of code and converted it to fit into the alt.
+RGB timeout functionality was originally inspired by the code in this [gist](https://gist.github.com/algernon/9182469e21894192017f2bb5d478c7df).
+LED config code was mostly transferred from [matthewrobo keymap](https://github.com/qmk/qmk_firmware/tree/master/keyboards/massdrop/ctrl/keymaps/matthewrobo).
+
+
+**Rest of the information about RGB matrix, scan matrix, and whatever information I have used was made publicly available by many other awesome members of the community.**
diff --git a/qmk/keyboards/massdrop/alt/keymaps/pregame/rules.mk b/qmk/keyboards/massdrop/alt/keymaps/pregame/rules.mk
new file mode 100644
index 00000000..c6977c23
--- /dev/null
+++ b/qmk/keyboards/massdrop/alt/keymaps/pregame/rules.mk
@@ -0,0 +1,15 @@
+# RGBLIGHT_ENABLE = no			# Not for MD boards. This is here in case you forget.
+COMMAND_ENABLE = no			# Commands for debug and configuration
+BOOTMAGIC_ENABLE = no		# Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = no
+# AUTO_SHIFT_ENABLE = yes      	# Auto Shift
+NKRO_ENABLE = yes           	# USB Nkey Rollover
+DYNAMIC_MACRO_ENABLE = no		# Dynamic macro recording and play
+MOUSEKEY_ENABLE = no			# Enable mouse control keycodes. Increases firmware size.
+TAP_DANCE_ENABLE = no			# Enable tap dance keys
+CONSOLE_ENABLE = no			# Enable debugging console. Increases firmware size.
+TERMINAL_ENABLE = no
+EXTRAKEY_ENABLE = yes			# Audio control and System control
+# RAW_ENABLE = yes				# Raw HID has not yet been implemented for this keyboard
+# COMBO_ENABLE					# Key combo feature
+# LEADER_ENABLE					# Enable leader key chording
diff --git a/qmk/keyboards/massdrop/alt/keymaps/reywood/rgb_matrix_user.c b/qmk/keyboards/massdrop/alt/keymaps/reywood/rgb_matrix_user.c
index 36131e20..9ea8fbed 100644
--- a/qmk/keyboards/massdrop/alt/keymaps/reywood/rgb_matrix_user.c
+++ b/qmk/keyboards/massdrop/alt/keymaps/reywood/rgb_matrix_user.c
@@ -1,5 +1,5 @@
 #include "quantum.h"
-#include "led_matrix.h"
+#include "md_rgb_matrix.h"
 
 extern issi3733_led_t *led_cur;
 extern uint8_t led_per_run;
@@ -76,7 +76,7 @@ void rgb_matrix_init_user(void) {
   led_cur_index = 0;
 }
 
-void led_matrix_run(void) {
+void md_rgb_matrix_run(void) {
   uint8_t led_this_run = 0;
 
   if (led_cur == 0) { //Denotes start of new processing cycle in the case of chunked processing
diff --git a/qmk/keyboards/massdrop/alt/keymaps/reywood/rules.mk b/qmk/keyboards/massdrop/alt/keymaps/reywood/rules.mk
index 956d1c70..fd78df14 100644
--- a/qmk/keyboards/massdrop/alt/keymaps/reywood/rules.mk
+++ b/qmk/keyboards/massdrop/alt/keymaps/reywood/rules.mk
@@ -26,7 +26,6 @@ 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)
 VIRTSER_ENABLE = no         # USB Serial Driver
 RAW_ENABLE = no             # Raw device
 AUTO_SHIFT_ENABLE = no      # Auto Shift
diff --git a/qmk/keyboards/massdrop/alt/rules.mk b/qmk/keyboards/massdrop/alt/rules.mk
index ff482bb5..548288f5 100644
--- a/qmk/keyboards/massdrop/alt/rules.mk
+++ b/qmk/keyboards/massdrop/alt/rules.mk
@@ -27,12 +27,12 @@ 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
 VIRTSER_ENABLE = no         # USB Serial Driver
 RAW_ENABLE = no             # Raw device
 AUTO_SHIFT_ENABLE = no      # Auto Shift
 
 # Custom RGB matrix handling
-RGB_MATRIX_ENABLE = custom
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = custom
 
 LAYOUTS = 65_ansi_blocker
diff --git a/qmk/keyboards/massdrop/ctrl/config_led.c b/qmk/keyboards/massdrop/ctrl/config_led.c
index 448793cf..f711c6a4 100644
--- a/qmk/keyboards/massdrop/ctrl/config_led.c
+++ b/qmk/keyboards/massdrop/ctrl/config_led.c
@@ -1,7 +1,7 @@
 #ifdef RGB_MATRIX_ENABLE
 #include "ctrl.h"
 
-#include "led_matrix.h"
+#include "md_rgb_matrix.h"
 #include "rgb_matrix.h"
 #include "config_led.h"
 
@@ -46,7 +46,7 @@ led_config_t g_led_config = { {
 }, {
   // 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
     1, 4, 4, 4, 4, 1, 1, 1,
-    1, 4, 4, 4, 4, 1, 1, 1,
+    1, 4, 4, 4, 4, 1, 9, 1,
   // 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
     4, 4, 4, 4, 4, 4, 4, 4,
     4, 4, 4, 4, 4, 1, 1, 1,
@@ -56,7 +56,7 @@ led_config_t g_led_config = { {
     4, 4, 4, 4, 4, 4, 1, 1,
     1,
   // 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
-    1, 4, 4, 4, 4, 4, 4, 4,
+    9, 4, 4, 4, 4, 4, 4, 4,
     4, 4, 4, 4, 1,
   // 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
     1, 4, 4, 4, 4, 4, 4, 4,
@@ -75,7 +75,7 @@ led_config_t g_led_config = { {
 #ifdef USB_LED_INDICATOR_ENABLE
 void rgb_matrix_indicators_kb(void)
 {
-  led_matrix_indicators();
+  md_rgb_matrix_indicators();
 }
 #endif // USB_LED_INDICATOR_ENABLE
 
diff --git a/qmk/keyboards/massdrop/ctrl/ctrl.h b/qmk/keyboards/massdrop/ctrl/ctrl.h
index c83efca1..1650beb9 100644
--- a/qmk/keyboards/massdrop/ctrl/ctrl.h
+++ b/qmk/keyboards/massdrop/ctrl/ctrl.h
@@ -5,7 +5,7 @@
 #include "matrix.h"
 
 #include "i2c_master.h"
-#include "led_matrix.h" //For led keycodes
+#include "md_rgb_matrix.h" //For led keycodes
 #include "usb/udi_cdc.h"
 #include "usb/usb2422.h"
 
diff --git a/qmk/keyboards/massdrop/ctrl/keymaps/default/keymap.c b/qmk/keyboards/massdrop/ctrl/keymaps/default/keymap.c
index 51b7f393..48fec5ae 100644
--- a/qmk/keyboards/massdrop/ctrl/keymaps/default/keymap.c
+++ b/qmk/keyboards/massdrop/ctrl/keymaps/default/keymap.c
@@ -100,11 +100,11 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             if (record->event.pressed) {
               switch (rgb_matrix_get_flags()) {
                 case LED_FLAG_ALL: {
-                    rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER);
+                    rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR);
                     rgb_matrix_set_color_all(0, 0, 0);
                   }
                   break;
-                case LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER: {
+                case (LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR): {
                     rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
                     rgb_matrix_set_color_all(0, 0, 0);
                   }
diff --git a/qmk/keyboards/massdrop/ctrl/keymaps/default_md/keymap.c b/qmk/keyboards/massdrop/ctrl/keymaps/default_md/keymap.c
index 93289f8a..9ecebefa 100644
--- a/qmk/keyboards/massdrop/ctrl/keymaps/default_md/keymap.c
+++ b/qmk/keyboards/massdrop/ctrl/keymaps/default_md/keymap.c
@@ -186,7 +186,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 led_instruction_t led_instructions[] = {
     //LEDs are normally inactive, no processing is performed on them
     //Flags are used in matching criteria for an LED to be active and indicate how to color it
-    //Flags can be found in tmk_core/protocol/arm_atsam/led_matrix.h (prefixed with LED_FLAG_)
+    //Flags can be found in tmk_core/protocol/arm_atsam/md_rgb_matrix.h (prefixed with LED_FLAG_)
     //LED IDs can be found in config_led.h in the keyboard's directory
     //Examples are below
     
diff --git a/qmk/keyboards/massdrop/ctrl/keymaps/endgame/config_led.c b/qmk/keyboards/massdrop/ctrl/keymaps/endgame/config_led.c
index 448793cf..ec32b652 100644
--- a/qmk/keyboards/massdrop/ctrl/keymaps/endgame/config_led.c
+++ b/qmk/keyboards/massdrop/ctrl/keymaps/endgame/config_led.c
@@ -1,7 +1,7 @@
 #ifdef RGB_MATRIX_ENABLE
 #include "ctrl.h"
 
-#include "led_matrix.h"
+#include "md_rgb_matrix.h"
 #include "rgb_matrix.h"
 #include "config_led.h"
 
@@ -75,7 +75,7 @@ led_config_t g_led_config = { {
 #ifdef USB_LED_INDICATOR_ENABLE
 void rgb_matrix_indicators_kb(void)
 {
-  led_matrix_indicators();
+  md_rgb_matrix_indicators();
 }
 #endif // USB_LED_INDICATOR_ENABLE
 
diff --git a/qmk/keyboards/massdrop/ctrl/keymaps/matthewrobo/config_led.c b/qmk/keyboards/massdrop/ctrl/keymaps/matthewrobo/config_led.c
index a4ce649d..a1c1dec5 100644
--- a/qmk/keyboards/massdrop/ctrl/keymaps/matthewrobo/config_led.c
+++ b/qmk/keyboards/massdrop/ctrl/keymaps/matthewrobo/config_led.c
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifdef RGB_MATRIX_ENABLE
 #    include "ctrl.h"
 
-#    include "led_matrix.h"
+#    include "md_rgb_matrix.h"
 #    include "rgb_matrix.h"
 #    include "config_led.h"
 // clang-format off
@@ -91,7 +91,7 @@ led_config_t g_led_config = { {
 // clang-format on
 
 #    ifdef USB_LED_INDICATOR_ENABLE
-void rgb_matrix_indicators_kb(void) { led_matrix_indicators(); }
+void rgb_matrix_indicators_kb(void) { md_rgb_matrix_indicators(); }
 #    endif  // USB_LED_INDICATOR_ENABLE
 
-#endif
+#endif
\ No newline at end of file
diff --git a/qmk/keyboards/massdrop/ctrl/keymaps/r-pufky/config.h b/qmk/keyboards/massdrop/ctrl/keymaps/r-pufky/config.h
new file mode 100644
index 00000000..ddcd8163
--- /dev/null
+++ b/qmk/keyboards/massdrop/ctrl/keymaps/r-pufky/config.h
@@ -0,0 +1,26 @@
+/*
+Copyright 2015 Jun Wako <wakojun@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+#include "config_common.h"
+
+#define FORCE_NKRO
+
+#define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_SOLID_COLOR
+#define RGB_MATRIX_STARTUP_VAL 100
+#define HSV_BACKLIGHT_COLOR HSV_BLUE
diff --git a/qmk/keyboards/massdrop/ctrl/keymaps/r-pufky/keymap.c b/qmk/keyboards/massdrop/ctrl/keymaps/r-pufky/keymap.c
new file mode 100644
index 00000000..d523dba8
--- /dev/null
+++ b/qmk/keyboards/massdrop/ctrl/keymaps/r-pufky/keymap.c
@@ -0,0 +1,146 @@
+/* Copyright 2020 Robert Pufky <rpufky@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+#define MODS_SHIFT  (get_mods() & MOD_MASK_SHIFT)
+#define MODS_CTRL   (get_mods() & MOD_MASK_CTRL)
+#define MODS_ALT    (get_mods() & MOD_MASK_ALT)
+
+enum ctrl_keycodes {
+    U_T_AUTO = SAFE_RANGE, // USB Extra Port Toggle Auto Detect/Always Active
+    U_T_AGCR,              // USB Toggle Automatic GCR control
+    L_BRI = SAFE_RANGE,    // LED Brightness Increase
+    L_BRD,                 // LED Brightness Decrease
+    L_PTN,                 // LED Pattern Select Next
+    L_PTP,                 // LED Pattern Select Previous
+    L_PSI,                 // LED Pattern Speed Increase
+    L_PSD,                 // LED Pattern Speed Decrease
+    L_T_MD,                // LED Toggle Mode
+    L_T_ONF,               // LED Toggle On / Off //Broken
+    L_ON,                  // LED On              //Broken
+    L_OFF,                 // LED Off             //Broken
+    L_T_BR,                // LED Toggle Breath Effect
+    L_T_PTD,               // LED Toggle Scrolling Pattern Direction
+    DBG_TOG,               // DEBUG Toggle On / Off
+    DBG_MTRX,              // DEBUG Toggle Matrix Print
+    DBG_KBD,               // DEBUG Toggle Keyboard Prints
+    DBG_MOU,               // DEBUG Toggle Mouse Prints
+    MD_BOOT,               // Restart into bootloader after hold timeout
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        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_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_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_NLCK, KC_LGUI, KC_LALT,                   KC_SPC,                             KC_RALT, MO(1),   KC_F24,  KC_RCTL,            KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+    [1] = LAYOUT(
+        KC_EJCT, KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24,             KC_MUTE, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   KC_MPLY, KC_MSTP, KC_VOLU,
+        _______, RGB_SPD, RGB_VAI, RGB_SPI, RGB_HUI, RGB_SAI, _______, _______, _______, _______, _______, _______, _______, _______,   KC_MPRV, KC_MNXT, KC_VOLD,
+        KC_CAPS, RGB_RMOD,RGB_VAD, RGB_MOD, RGB_HUD, RGB_SAD, _______, _______, _______, _______, _______, _______, _______,
+        _______, RGB_TOG, _______, _______, _______, MD_BOOT, NK_TOGG, _______, _______, _______, _______, _______,                              KC_BRIU,
+        _______, _______, _______,                   _______,                            _______, _______, _______, _______,            KC_MRWD, KC_BRID, KC_MFFD
+    ),
+};
+
+// Init keyboard static color with underglow off.
+void matrix_init_user(void) {
+  rgblight_sethsv(HSV_BACKLIGHT_COLOR);
+  rgb_matrix_set_flags(LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR);
+};
+
+// Runs constantly in the background, in a loop.
+void matrix_scan_user(void) {
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    static uint32_t key_timer;
+
+    switch (keycode) {
+        case U_T_AUTO:
+            if (record->event.pressed && MODS_SHIFT && MODS_CTRL) {
+                TOGGLE_FLAG_AND_PRINT(usb_extra_manual, "USB extra port manual mode");
+            }
+            return false;
+        case U_T_AGCR:
+            if (record->event.pressed && MODS_SHIFT && MODS_CTRL) {
+                TOGGLE_FLAG_AND_PRINT(usb_gcr_auto, "USB GCR auto mode");
+            }
+            return false;
+        case DBG_TOG:
+            if (record->event.pressed) {
+                TOGGLE_FLAG_AND_PRINT(debug_enable, "Debug mode");
+            }
+            return false;
+        case DBG_MTRX:
+            if (record->event.pressed) {
+                TOGGLE_FLAG_AND_PRINT(debug_matrix, "Debug matrix");
+            }
+            return false;
+        case DBG_KBD:
+            if (record->event.pressed) {
+                TOGGLE_FLAG_AND_PRINT(debug_keyboard, "Debug keyboard");
+            }
+            return false;
+        case DBG_MOU:
+            if (record->event.pressed) {
+                TOGGLE_FLAG_AND_PRINT(debug_mouse, "Debug mouse");
+            }
+            return false;
+        case MD_BOOT:
+            if (record->event.pressed) {
+                key_timer = timer_read32();
+            } else {
+                if (timer_elapsed32(key_timer) >= 500) {
+                    reset_keyboard();
+                }
+            }
+            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 | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR);
+                    rgb_matrix_set_color_all(RGB_OFF);
+                  }
+                  break;
+                case (LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER | LED_FLAG_INDICATOR): {
+                    rgb_matrix_set_flags(LED_FLAG_UNDERGLOW);
+                    rgb_matrix_set_color_all(RGB_OFF);
+                  }
+                  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
+    }
+}
diff --git a/qmk/keyboards/massdrop/ctrl/keymaps/r-pufky/readme.md b/qmk/keyboards/massdrop/ctrl/keymaps/r-pufky/readme.md
new file mode 100644
index 00000000..51518925
--- /dev/null
+++ b/qmk/keyboards/massdrop/ctrl/keymaps/r-pufky/readme.md
@@ -0,0 +1,28 @@
+# Massdrop Ctrl r-pufky
+
+Gaming QOL improvments; enabling useful keys for left hand & in-game overlay usage.
+
+## Layers
+
+### Typing Layer
+
+![Typing Layer](https://i.imgur.com/qEBaupV.png)
+
+Layer optimized to enable useful keys for gaming without changing typing state, as well as specific
+in-game overlay keys.
+
+* Left Ctrl: Easier control key usage without always setting capslock.
+* Num Lock: Unique non visible character key for additional left-hand input options in game.
+* Fn: Enable layer 1, temporal.
+* F24: Unique non-visible F24 key; no windows function. Map to in-game overlays.
+ 
+### Function Layer
+
+![Function Layer](https://i.imgur.com/2qGNwVQ.png)
+
+* Purple: Media keys. Note CD Eject on Escape, and OSX Prev/Next on Arrows.
+* Blue: Keyboard adminstration. Toggle NKRO (N Key Rollover) and enable bootloader.
+* Orange: RGB Controls.
+* Capslock: Now requires the use of the function key.
+* F13-F24: Extended function keys.
+* Bright+/-: Monitor Brightness.
diff --git a/qmk/keyboards/massdrop/ctrl/keymaps/responsive_pattern/keymap.c b/qmk/keyboards/massdrop/ctrl/keymaps/responsive_pattern/keymap.c
index dbf90b50..d20dffef 100644
--- a/qmk/keyboards/massdrop/ctrl/keymaps/responsive_pattern/keymap.c
+++ b/qmk/keyboards/massdrop/ctrl/keymaps/responsive_pattern/keymap.c
@@ -659,7 +659,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 led_instruction_t led_instructions[] = {
     //LEDs are normally inactive, no processing is performed on them
     //Flags are used in matching criteria for an LED to be active and indicate how to color it
-    //Flags can be found in tmk_core/protocol/arm_atsam/led_matrix.h (prefixed with LED_FLAG_)
+    //Flags can be found in tmk_core/protocol/arm_atsam/md_rgb_matrix.h (prefixed with LED_FLAG_)
     //LED IDs can be found in config_led.h in the keyboard's directory
     //Examples are below
 
diff --git a/qmk/keyboards/massdrop/ctrl/rules.mk b/qmk/keyboards/massdrop/ctrl/rules.mk
index a382272b..1ebd461e 100644
--- a/qmk/keyboards/massdrop/ctrl/rules.mk
+++ b/qmk/keyboards/massdrop/ctrl/rules.mk
@@ -27,10 +27,10 @@ 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
 VIRTSER_ENABLE = no         # USB Serial Driver
 RAW_ENABLE = no             # Raw device
 AUTO_SHIFT_ENABLE = no      # Auto Shift
 
 # Custom RGB matrix handling
-RGB_MATRIX_ENABLE = custom
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = custom
diff --git a/qmk/keyboards/matrix/m20add/boards/m20add_bd/board.c b/qmk/keyboards/matrix/m20add/boards/m20add_bd/board.c
index 68cf23cd..95d9045a 100644
--- a/qmk/keyboards/matrix/m20add/boards/m20add_bd/board.c
+++ b/qmk/keyboards/matrix/m20add/boards/m20add_bd/board.c
@@ -19,8 +19,8 @@
  * generator plugin. Do not edit manually.
  */
 
-#include "hal.h"
-#include "stm32_gpio.h"
+#include <hal.h>
+#include <stm32_gpio.h>
 
 /*===========================================================================*/
 /* Driver local definitions.                                                 */
diff --git a/qmk/keyboards/matrix/m20add/bootloader_defs.h b/qmk/keyboards/matrix/m20add/bootloader_defs.h
index 20b8f73e..4da3d39a 100644
--- a/qmk/keyboards/matrix/m20add/bootloader_defs.h
+++ b/qmk/keyboards/matrix/m20add/bootloader_defs.h
@@ -1,7 +1,5 @@
 /* Address for jumping to bootloader on STM32 chips. */
 /* It is chip dependent, the correct number can be looked up here:
  * http://www.st.com/web/en/resource/technical/document/application_note/CD00167594.pdf
- * This also requires a patch to chibios:
- *  <tmk_dir>/tmk_core/tool/chibios/ch-bootloader-jump.patch
  */
 #define STM32_BOOTLOADER_ADDRESS 0x1FFF0000
diff --git a/qmk/keyboards/matrix/noah/boards/noah_bd/board.c b/qmk/keyboards/matrix/noah/boards/noah_bd/board.c
index 68cf23cd..95d9045a 100644
--- a/qmk/keyboards/matrix/noah/boards/noah_bd/board.c
+++ b/qmk/keyboards/matrix/noah/boards/noah_bd/board.c
@@ -19,8 +19,8 @@
  * generator plugin. Do not edit manually.
  */
 
-#include "hal.h"
-#include "stm32_gpio.h"
+#include <hal.h>
+#include <stm32_gpio.h>
 
 /*===========================================================================*/
 /* Driver local definitions.                                                 */
diff --git a/qmk/keyboards/matrix/noah/bootloader_defs.h b/qmk/keyboards/matrix/noah/bootloader_defs.h
index 20b8f73e..4da3d39a 100644
--- a/qmk/keyboards/matrix/noah/bootloader_defs.h
+++ b/qmk/keyboards/matrix/noah/bootloader_defs.h
@@ -1,7 +1,5 @@
 /* Address for jumping to bootloader on STM32 chips. */
 /* It is chip dependent, the correct number can be looked up here:
  * http://www.st.com/web/en/resource/technical/document/application_note/CD00167594.pdf
- * This also requires a patch to chibios:
- *  <tmk_dir>/tmk_core/tool/chibios/ch-bootloader-jump.patch
  */
 #define STM32_BOOTLOADER_ADDRESS 0x1FFF0000
diff --git a/qmk/keyboards/matrix/noah/matrix.c b/qmk/keyboards/matrix/noah/matrix.c
index 737f570c..21152043 100644
--- a/qmk/keyboards/matrix/noah/matrix.c
+++ b/qmk/keyboards/matrix/noah/matrix.c
@@ -5,11 +5,11 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <string.h>
-#include "hal.h"
+#include <hal.h>
 #include "quantum.h"
 #include "timer.h"
 #include "wait.h"
-#include "printf.h"
+#include "print.h"
 #include "matrix.h"
 
 /**
diff --git a/qmk/keyboards/matrix/noah/rules.mk b/qmk/keyboards/matrix/noah/rules.mk
index 19e432d2..aacd2882 100644
--- a/qmk/keyboards/matrix/noah/rules.mk
+++ b/qmk/keyboards/matrix/noah/rules.mk
@@ -22,6 +22,7 @@ NKRO_ENABLE = no            # USB Nkey Rollover
 NO_USB_STARTUP_CHECK = yes	# Disable initialization only when usb is plugged in
 
 RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = IS31FL3731
 
 RGBLIGHT_ENABLE = yes
 RGBLIGHT_CUSTOM_DRIVER = yes
diff --git a/qmk/keyboards/maxipad/rules.mk b/qmk/keyboards/maxipad/rules.mk
index 9d907bd2..41c018f8 100644
--- a/qmk/keyboards/maxipad/rules.mk
+++ b/qmk/keyboards/maxipad/rules.mk
@@ -17,6 +17,5 @@ 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
 
 DEFAULT_FOLDER = maxipad/promicro
diff --git a/qmk/keyboards/mc_76k/rules.mk b/qmk/keyboards/mc_76k/rules.mk
index 5f109c65..fb0f7cfd 100644
--- a/qmk/keyboards/mc_76k/rules.mk
+++ b/qmk/keyboards/mc_76k/rules.mk
@@ -29,4 +29,3 @@ MIDI_ENABLE = no            # MIDI support
 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
diff --git a/qmk/keyboards/mechkeys/mk60/config.h b/qmk/keyboards/mechkeys/mk60/config.h
index 9fccd8a8..205e8f7b 100644
--- a/qmk/keyboards/mechkeys/mk60/config.h
+++ b/qmk/keyboards/mechkeys/mk60/config.h
@@ -53,6 +53,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6
 
+#define LED_CAPS_LOCK_PIN B7
+#define LED_PIN_ON_STATE 0
+
 #define BACKLIGHT_PIN B6
 #define BACKLIGHT_BREATHING
 #define BACKLIGHT_LEVELS 6
@@ -212,34 +215,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/mechkeys/mk60/mk60.c b/qmk/keyboards/mechkeys/mk60/mk60.c
index 4c6a059f..7ec8bff2 100644
--- a/qmk/keyboards/mechkeys/mk60/mk60.c
+++ b/qmk/keyboards/mechkeys/mk60/mk60.c
@@ -14,37 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "mk60.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-	setPinOutput(B7);
-
-	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_CAPS_LOCK)){
-		writePinLow(B7);
-	}else {
-		writePinHigh(B7);
-	}
-
-	led_set_user(usb_led);
-}
diff --git a/qmk/keyboards/mechkeys/mk60/rules.mk b/qmk/keyboards/mechkeys/mk60/rules.mk
index e93b6146..9c7f42ef 100644
--- a/qmk/keyboards/mechkeys/mk60/rules.mk
+++ b/qmk/keyboards/mechkeys/mk60/rules.mk
@@ -30,4 +30,3 @@ 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
diff --git a/qmk/keyboards/mechlovin/adelais/adelais.h b/qmk/keyboards/mechlovin/adelais/adelais.h
index d28502da..5a5673ab 100644
--- a/qmk/keyboards/mechlovin/adelais/adelais.h
+++ b/qmk/keyboards/mechlovin/adelais/adelais.h
@@ -18,7 +18,7 @@
 
 #include "quantum.h"
 
-#define LAYOUT_all( \
+#define LAYOUT_alice_split_bs( \
     K1E, K00, K01, K02, K03, K04, K05, K06,         K07,K08,K09, K0A, K0B, K0C, K0D, K0E,\
     K2E, K10, K11, K12, K13, K14, K15,              K16,K17,K18, K19, K1A, K1B, K1C, K1D,\
     K3E, K20, K21, K22, K23, K24, K25,              K26,K27,K28, K29, K2A, K2B, K2D,\
@@ -31,3 +31,19 @@
     { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
     { K40,   KC_NO, K42,   KC_NO, K44,   KC_NO, K46,   KC_NO, K48,   KC_NO, K4A,   KC_NO, KC_NO, K4D,   K4E   }, \
 }
+
+#define LAYOUT_alice( \
+    K1E, K00, K01, K02, K03, K04, K05, K06,         K07,K08,K09, K0A, K0B, K0C, K0D, \
+    K2E, K10, K11, K12, K13, K14, K15,              K16,K17,K18, K19, K1A, K1B, K1C, K1D,\
+    K3E, K20, K21, K22, K23, K24, K25,              K26,K27,K28, K29, K2A, K2B, K2D,\
+         K30,      K32, K33, K34, K35, K36,         K37,K38,K39, K3A, K3B, K3D, K3C, K4D,\
+         K40,      K42,      K44,      K46,             K48,     K4A,               K4E \
+) { \
+    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   KC_NO }, \
+    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E   }, \
+    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   KC_NO, K2D,   K2E   }, \
+    { K30,   KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E   }, \
+    { K40,   KC_NO, K42,   KC_NO, K44,   KC_NO, K46,   KC_NO, K48,   KC_NO, K4A,   KC_NO, KC_NO, K4D,   K4E   }, \
+}
+
+#define LAYOUT_all LAYOUT_alice_split_bs
diff --git a/qmk/keyboards/mechlovin/adelais/config.h b/qmk/keyboards/mechlovin/adelais/config.h
index 9ec688ae..875eba51 100644
--- a/qmk/keyboards/mechlovin/adelais/config.h
+++ b/qmk/keyboards/mechlovin/adelais/config.h
@@ -28,19 +28,5 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROWS 5
 #define MATRIX_COLS 15
 
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { B1, A0, C13, A1, A2}
-#define MATRIX_COL_PINS { A10, A9, A8, B15, B14, B13, B12, B11, B10, B8, B4, B5, B3, C14, A15 }
-#define UNUSED_PINS
-
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
diff --git a/qmk/keyboards/mechlovin/adelais/info.json b/qmk/keyboards/mechlovin/adelais/info.json
index 4babd907..d65935a4 100644
--- a/qmk/keyboards/mechlovin/adelais/info.json
+++ b/qmk/keyboards/mechlovin/adelais/info.json
@@ -5,7 +5,7 @@
     "width": 18.5,
     "height": 5,
     "layouts": {
-        "LAYOUT_all": {
+        "LAYOUT_alice_split_bs": {
             "key_count": 66,
             "layout": [
                 {"label":"K1E", "x":0, "y":0},
@@ -75,6 +75,75 @@
                 {"label":"K4A", "x":12.5, "y":4, "w":1.25},
                 {"label":"K4E", "x":17, "y":4, "w":1.5}
             ]
+        },
+        "LAYOUT_alice": {
+            "layout": [
+                {"label":"K1E", "x":0, "y":0},
+                {"label":"K00", "x":1.5, "y":0},
+                {"label":"K01", "x":2.5, "y":0},
+                {"label":"K02", "x":3.5, "y":0},
+                {"label":"K03", "x":4.5, "y":0},
+                {"label":"K04", "x":5.5, "y":0},
+                {"label":"K05", "x":6.5, "y":0},
+                {"label":"K06", "x":7.5, "y":0},
+                {"label":"K07", "x":10.5, "y":0},
+                {"label":"K08", "x":11.5, "y":0},
+                {"label":"K09", "x":12.5, "y":0},
+                {"label":"K0A", "x":13.5, "y":0},
+                {"label":"K0B", "x":14.5, "y":0},
+                {"label":"K0C", "x":15.5, "y":0},
+                {"label":"K0D", "x":16.5, "y":0, "w":2},
+                {"label":"K2E", "x":0, "y":1},
+                {"label":"K10", "x":1.5, "y":1, "w":1.5},
+                {"label":"K11", "x":3, "y":1},
+                {"label":"K12", "x":4, "y":1},
+                {"label":"K13", "x":5, "y":1},
+                {"label":"K14", "x":6, "y":1},
+                {"label":"K15", "x":7, "y":1},
+                {"label":"K16", "x":10, "y":1},
+                {"label":"K17", "x":11, "y":1},
+                {"label":"K18", "x":12, "y":1},
+                {"label":"K19", "x":13, "y":1},
+                {"label":"K1A", "x":14, "y":1},
+                {"label":"K1B", "x":15, "y":1},
+                {"label":"K1C", "x":16, "y":1},
+                {"label":"K1D", "x":17, "y":1, "w":1.5},
+                {"label":"K3E", "x":0, "y":2},
+                {"label":"K20", "x":1.5, "y":2, "w":1.75},
+                {"label":"K21", "x":3.25, "y":2},
+                {"label":"K22", "x":4.25, "y":2},
+                {"label":"K23", "x":5.25, "y":2},
+                {"label":"K24", "x":6.25, "y":2},
+                {"label":"K25", "x":7.25, "y":2},
+                {"label":"K26", "x":10.25, "y":2},
+                {"label":"K27", "x":11.25, "y":2},
+                {"label":"K28", "x":12.25, "y":2},
+                {"label":"K29", "x":13.25, "y":2},
+                {"label":"K2A", "x":14.25, "y":2},
+                {"label":"K2B", "x":15.25, "y":2},
+                {"label":"K2D", "x":16.25, "y":2, "w":2.25},
+                {"label":"K30", "x":1.5, "y":3, "w":2.25},
+                {"label":"K32", "x":3.75, "y":3},
+                {"label":"K33", "x":4.75, "y":3},
+                {"label":"K34", "x":5.75, "y":3},
+                {"label":"K35", "x":6.75, "y":3},
+                {"label":"K36", "x":7.75, "y":3},
+                {"label":"K37", "x":9.75, "y":3},
+                {"label":"K38", "x":10.75, "y":3},
+                {"label":"K39", "x":11.75, "y":3},
+                {"label":"K3A", "x":12.75, "y":3},
+                {"label":"K3B", "x":13.75, "y":3},
+                {"label":"K4D", "x":14.75, "y":3},
+                {"label":"K3C", "x":15.75, "y":3, "w":1.75},
+                {"label":"K3D", "x":17.5, "y":3},
+                {"label":"K40", "x":1.5, "y":4, "w":1.5},
+                {"label":"K42", "x":4.5, "y":4, "w":1.25},
+                {"label":"K44", "x":5.75, "y":4, "w":2.25},
+                {"label":"K46", "x":8, "y":4, "w":1.25},
+                {"label":"K48", "x":9.75, "y":4, "w":2.75},
+                {"label":"K4A", "x":12.5, "y":4, "w":1.25},
+                {"label":"K4E", "x":17, "y":4, "w":1.5}
+            ]
         }
     }
     ,"meta": "https://noroadsleft.github.io/kbf_qmk_converter/"
diff --git a/qmk/keyboards/mechlovin/adelais/keymaps/brandonschlack/config.h b/qmk/keyboards/mechlovin/adelais/keymaps/brandonschlack/config.h
new file mode 100644
index 00000000..f277bcfa
--- /dev/null
+++ b/qmk/keyboards/mechlovin/adelais/keymaps/brandonschlack/config.h
@@ -0,0 +1,30 @@
+/* Copyright 2020 Brandon Schlack
+ *
+ * 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
+
+#define USE_LEDS_FOR_LAYERS
+#define STOPLIGHT_LED
+
+// LEDs
+#define TOP_LED    B2
+#define MIDDLE_LED C15
+#define BOTTOM_LED B9
+// #define LED_PIN_FLIP
+#ifdef LED_PIN_FLIP
+    #define LED_ON(flag) !flag
+#else
+    #define LED_ON(flag) flag
+#endif
diff --git a/qmk/keyboards/mechlovin/adelais/keymaps/brandonschlack/keymap.c b/qmk/keyboards/mechlovin/adelais/keymaps/brandonschlack/keymap.c
new file mode 100644
index 00000000..d3ab5ed1
--- /dev/null
+++ b/qmk/keyboards/mechlovin/adelais/keymaps/brandonschlack/keymap.c
@@ -0,0 +1,270 @@
+/* Copyright 2020 Brandon Schlack
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+#include "brandonschlack.h"
+
+/**
+ * Layer Names
+ *
+ * Layers mostly used for macro keys
+ */
+#define _REEDER      _M1
+#define _MAIL        _M2
+#define _REEDER_FN   _M1_FN1
+#define _MAIL_FN     _M2_FN1
+
+/**
+ * Keycodes & Macros
+ */
+#define TG_BASE   TO(_BASE)
+#define TG_REDR   TO(_REEDER)
+#define TG_MAIL   TO(_MAIL)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/* Base
+ * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐
+ * │Ply│ │Esc│! 1│@ 2│# 3│$ 4│% 5│^ 6│         │& 7│* 8│( 9│) 0│_ -│+ =│| \│~ `│
+ * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+ * │VlU│ │Tab  │ Q │ W │ E │ R │ T │         │ Y │ U │ I │ O │ P │{ [│} ]│ Bspc│
+ * ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐        └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │VlD│ │HyCaps│ A │ S │ D │ F │ G │         │ H │ J │ K │ L │: ;│" '│   Enter│
+ * └───┘ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+ *       │LShift  │ Z │ X │ C │ V │ B │     │ B │ N │ M │< ,│> .│? /│  Shft│Fn │
+ *       ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴─┐   ├───┴───┴──┬┴───┴┬──┴───┴────┬─┴───┤
+ *       │Opt  │     │Cmd  │Spc/Lwr│Ctrl│   │   Spc/Rai│  Cmd│           │  Opt│
+ *       └─────┘     └─────┴───────┴────┘   └──────────┴─────┘           └─────┘
+ */
+[_BASE] = LAYOUT_all( \
+    KC_MPLY, KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,  \
+    KC_VOLU, KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC, \
+    KC_VOLD, HY_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_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  LOWER,   KC_RSFT, KC_SLSH, \
+             KC_LOPT,          KC_LCMD,     SPC_LWR,      KC_LCTL,          SPC_RAI,          KC_RCMD,                   KC_ROPT \
+),
+/* Reeder
+ * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐
+ * │ H │ │   │   │   │   │   │   │   │         │   │   │   │   │   │   │   │   │
+ * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+ * │ K │ │     │   │   │   │   │   │         │   │   │   │   │   │   │   │     │
+ * ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐        └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │ J │ │      │   │   │   │   │   │         │   │   │   │   │   │   │        │
+ * └───┘ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+ *       │        │   │   │   │   │   │     │   │   │   │   │   │   │      │   │
+ *       ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴─┐   ├───┴───┴──┬┴───┴┬──┴───┴────┬─┴───┤
+ *       │     │     │     │       │    │   │          │     │           │     │
+ *       └─────┘     └─────┴───────┴────┘   └──────────┴─────┘           └─────┘
+ */
+[_REEDER] = LAYOUT_all( \
+    KC_H,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    KC_K,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    KC_J,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, \
+             _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+             _______,          _______,     _______,      _______,          _______,          _______,                   _______ \
+
+),
+/* Mail
+ * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐
+ * │Del│ │   │   │   │   │   │   │   │         │   │   │   │   │   │   │   │   │
+ * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+ * │It+│ │     │   │   │   │   │   │         │   │   │   │   │   │   │   │     │
+ * ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐        └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │It-│ │      │   │   │   │   │   │         │   │   │   │   │   │   │        │
+ * └───┘ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+ *       │        │   │   │   │   │   │     │   │   │   │   │   │   │      │   │
+ *       ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴─┐   ├───┴───┴──┬┴───┴┬──┴───┴────┬─┴───┤
+ *       │     │     │     │       │    │   │          │     │           │     │
+ *       └─────┘     └─────┴───────┴────┘   └──────────┴─────┘           └─────┘
+ */
+[_MAIL] = LAYOUT_all( \
+    G(KC_BSPC), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    KC_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, \
+             _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+             _______,          _______,     _______,      _______,          _______,          _______,                   _______ \
+
+),
+/* Lower
+ * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐
+ * │Mut│ │Mke│ F1│ F2│ F3│ F4│ F5│ F6│         │ F7│ F8│ F9│F10│F11│F12│LHP│SLP│
+ * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+ * │Nxt│ │RMod │RH+│RS+│RV+│Sp+│   │         │   │   │   │   │PgU│Hom│End│  Del│
+ * ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐        └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │Prv│ │RTgl  │RH-│RS-│RV-│Sp-│   │         │   │   │Prv│Nxt│PgD│ ↑ │   Play │
+ * └───┘ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+ *       │        │LYR│Thm│   │   │   │     │   │   │   │   │ ← │ ↓ │→ Shft│   │
+ *       ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴─┐   ├───┴───┴──┬┴───┴┬──┴───┴────┬─┴───┤
+ *       │     │     │     │       │    │   │          │     │           │     │
+ *       └─────┘     └─────┴───────┴────┘   └──────────┴─────┘           └─────┘
+ */
+[_LOWER] = LAYOUT_all( \
+    KC_MUTE, QM_MAKE, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  MC_LHPD, MC_SLPD, \
+    KC_MNXT, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, KC_PGUP, KC_HOME, KC_END,  KC_DELT, \
+    KC_MPRV, RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, KC_MPRV, KC_MNXT, KC_PGDN, KC_UP,            KC_MPLY, \
+             _______, RGB_LYR, RGB_THM, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, _______, RGT_SFT, KC_DOWN, \
+             _______,          _______,     _______,      _______,          _______,          _______,                   _______ \
+
+),
+/* Reeder Function
+ * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐
+ * │ L │ │   │   │   │   │   │   │   │         │   │   │   │   │   │   │   │   │
+ * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+ * │ P │ │     │   │   │   │   │   │         │   │   │   │   │   │   │   │     │
+ * ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐        └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │ N │ │      │   │   │   │   │   │         │   │   │   │   │   │   │        │
+ * └───┘ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+ *       │        │   │   │   │   │   │     │   │   │   │   │   │   │      │   │
+ *       ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴─┐   ├───┴───┴──┬┴───┴┬──┴───┴────┬─┴───┤
+ *       │     │     │     │       │    │   │          │     │           │     │
+ *       └─────┘     └─────┴───────┴────┘   └──────────┴─────┘           └─────┘
+ */
+[_REEDER_FN] = LAYOUT_all( \
+    KC_L,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    KC_P,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    KC_N,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, \
+             _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+             _______,          _______,     _______,      _______,          _______,          _______,                   _______ \
+
+),
+/* Mail
+ * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐
+ * │Del│ │   │   │   │   │   │   │   │         │   │   │   │   │   │   │   │   │
+ * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+ * │It+│ │     │   │   │   │   │   │         │   │   │   │   │   │   │   │     │
+ * ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐        └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │It-│ │      │   │   │   │   │   │         │   │   │   │   │   │   │        │
+ * └───┘ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+ *       │        │   │   │   │   │   │     │   │   │   │   │   │   │      │   │
+ *       ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴─┐   ├───┴───┴──┬┴───┴┬──┴───┴────┬─┴───┤
+ *       │     │     │     │       │    │   │          │     │           │     │
+ *       └─────┘     └─────┴───────┴────┘   └──────────┴─────┘           └─────┘
+ */
+[_MAIL_FN] = LAYOUT_all( \
+    KC_BSPC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    A(G(KC_LBRC)),   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    A(G(KC_RBRC)), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, \
+             _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+             _______,          _______,     _______,      _______,          _______,          _______,                   _______ \
+
+),
+/* Raise
+ * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐
+ * │   │ │   │   │   │   │   │   │   │         │   │   │   │   │   │   │   │   │
+ * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+ * │   │ │     │   │   │   │   │   │         │   │   │   │   │   │   │   │     │
+ * ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐        └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │   │ │      │   │   │   │   │   │         │   │   │   │   │   │   │        │
+ * └───┘ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+ *       │        │   │   │   │   │   │     │   │   │   │   │   │   │      │   │
+ *       ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴─┐   ├───┴───┴──┬┴───┴┬──┴───┴────┬─┴───┤
+ *       │     │     │     │       │    │   │          │     │           │     │
+ *       └─────┘     └─────┴───────┴────┘   └──────────┴─────┘           └─────┘
+ */
+[_RAISE] = LAYOUT_all( \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, \
+             _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+             _______,          _______,     _______,      _______,          _______,          _______,                   _______ \
+
+),
+/* Adjust
+ * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐
+ * │Bse│ │Mke│   │   │   │   │   │   │         │   │   │   │   │   │   │   │   │
+ * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+ * │Rdr│ │RMod │RH+│RS+│RV+│Sp+│   │         │   │   │   │   │   │   │   │     │
+ * ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐        └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │Mai│ │RTgl  │RH-│RS-│RV-│Sp-│   │         │   │   │   │   │   │   │        │
+ * └───┘ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+ *       │        │LYR│Thm│   │EEP│Rst│     │Rst│   │   │   │   │   │      │   │
+ *       ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴─┐   ├───┴───┴──┬┴───┴┬──┴───┴────┬─┴───┤
+ *       │     │     │     │       │    │   │          │     │           │     │
+ *       └─────┘     └─────┴───────┴────┘   └──────────┴─────┘           └─────┘
+ */
+[_ADJUST] = LAYOUT_all( \
+    TG_BASE, QM_MAKE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    TG_REDR, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    TG_MAIL, RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______,          _______, \
+             _______, RGB_LYR, RGB_THM, _______, EEP_RST, RESET,   RESET,   _______, _______, _______, _______, _______, _______, _______, \
+             _______,          _______,     _______,      _______,          _______,          _______,                   _______ \
+
+)
+/* Layout
+ * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐
+ * │   │ │   │   │   │   │   │   │   │         │   │   │   │   │   │   │   │   │
+ * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+ * │   │ │     │   │   │   │   │   │         │   │   │   │   │   │   │   │     │
+ * ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐        └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │   │ │      │   │   │   │   │   │         │   │   │   │   │   │   │        │
+ * └───┘ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+ *       │        │   │   │   │   │   │     │   │   │   │   │   │   │      │   │
+ *       ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴─┐   ├───┴───┴──┬┴───┴┬──┴───┴────┬─┴───┤
+ *       │     │     │     │       │    │   │          │     │           │     │
+ *       └─────┘     └─────┴───────┴────┘   └──────────┴─────┘           └─────┘
+ */
+/*
+[_BLANK] = LAYOUT( \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, \
+             _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+             _______,          _______,     _______,      _______,          _______,          _______,                   _______ \
+
+)
+*/
+};
+
+layer_state_t layer_state_set_keymap(layer_state_t state) {
+    state = update_tri_layer_state(state, _LOWER,  _RAISE, _ADJUST);
+    state = update_tri_layer_state(state, _REEDER, _LOWER, _REEDER_FN);
+    state = update_tri_layer_state(state, _MAIL,   _LOWER, _MAIL_FN);
+    return state;
+}
+
+#ifdef USE_LEDS_FOR_LAYERS
+bool led_update_keymap(led_t led_state) {
+    writePin(TOP_LED, LED_ON(IS_LAYER_ON(_REEDER) || IS_LAYER_ON(_MAIL))); // Use for Macro Layer
+    writePin(MIDDLE_LED, LED_ON(IS_LAYER_ON(_FN1))); // Use for Layer 2
+    writePin(BOTTOM_LED, LED_ON(led_state.caps_lock)); // Use for Caps Lock
+    return false; // Override default set by KB
+}
+#endif
+
+#ifdef ENCODER_ENABLE
+void encoder_update_user(uint8_t index, bool clockwise) {
+    if (index == 0) {
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    }
+    else if (index == 1) {
+        if (clockwise) {
+            tap_code(KC_LEFT);
+        } else {
+            tap_code(KC_RGHT);
+        }
+    }
+    else if (index == 2) {
+        if (clockwise) {
+            tap_code(KC_UP);
+        } else {
+            tap_code(KC_DOWN);
+        }
+    }
+}
+
+  #endif
diff --git a/qmk/keyboards/mechlovin/adelais/keymaps/brandonschlack/readme.md b/qmk/keyboards/mechlovin/adelais/keymaps/brandonschlack/readme.md
new file mode 100644
index 00000000..54d78d87
--- /dev/null
+++ b/qmk/keyboards/mechlovin/adelais/keymaps/brandonschlack/readme.md
@@ -0,0 +1 @@
+# The default keymap for adelais
diff --git a/qmk/keyboards/mechlovin/adelais/keymaps/via/keymap.c b/qmk/keyboards/mechlovin/adelais/keymaps/via/keymap.c
index d44a4e93..2ebd6a12 100644
--- a/qmk/keyboards/mechlovin/adelais/keymaps/via/keymap.c
+++ b/qmk/keyboards/mechlovin/adelais/keymaps/via/keymap.c
@@ -47,9 +47,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 void encoder_update_user(uint8_t index, bool clockwise) {
     if (index == 0) {
         if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
             tap_code(KC_VOLD);
+        } else {
+            tap_code(KC_VOLU);
         }
     }
     else if (index == 1) {
diff --git a/qmk/keyboards/mechlovin/adelais/rgb_led/rev1/config.h b/qmk/keyboards/mechlovin/adelais/rgb_led/rev1/config.h
index 9ebb399b..1ba7d27d 100644
--- a/qmk/keyboards/mechlovin/adelais/rgb_led/rev1/config.h
+++ b/qmk/keyboards/mechlovin/adelais/rgb_led/rev1/config.h
@@ -3,6 +3,11 @@
 #define PRODUCT_ID   0xAEC1
 #define PRODUCT      Adelais En Ciel
 
+#define MATRIX_ROW_PINS { B1, A0, C13, A1, A2}
+#define MATRIX_COL_PINS { A10, A9, A8, B15, B14, B13, B12, B11, B10, B8, B4, B5, B3, C14, A15 }
+#define UNUSED_PINS
+
+#define RGB_DI_PIN A7
 #define DRIVER_LED_TOTAL 91
 #define RGB_MATRIX_KEYPRESSES // reacts to keypresses
 #define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (instead of keypresses)
diff --git a/qmk/keyboards/mechlovin/adelais/rgb_led/rev1/rules.mk b/qmk/keyboards/mechlovin/adelais/rgb_led/rev1/rules.mk
index 20256e20..9be57067 100644
--- a/qmk/keyboards/mechlovin/adelais/rgb_led/rev1/rules.mk
+++ b/qmk/keyboards/mechlovin/adelais/rgb_led/rev1/rules.mk
@@ -1 +1,2 @@
-RGB_MATRIX_ENABLE = WS2812
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = WS2812
diff --git a/qmk/keyboards/mechlovin/adelais/rgb_led/rev2/config.h b/qmk/keyboards/mechlovin/adelais/rgb_led/rev2/config.h
index 534abc0f..38ffdd40 100644
--- a/qmk/keyboards/mechlovin/adelais/rgb_led/rev2/config.h
+++ b/qmk/keyboards/mechlovin/adelais/rgb_led/rev2/config.h
@@ -3,6 +3,10 @@
 #define PRODUCT_ID   0xAEC2
 #define PRODUCT      Adelais En Ciel Rev2  
 
+#define MATRIX_ROW_PINS { B1, A0, C13, A1, A2}
+#define MATRIX_COL_PINS { A10, A9, A8, B15, B14, B13, B12, B11, B10, B8, B4, B5, B3, C14, A7 }
+
+#define RGB_DI_PIN A15
 #define RGBLED_NUM      23
 #define RGBLIGHT_ANIMATIONS
 #define RGBLIGHT_HUE_STEP 8
@@ -18,7 +22,7 @@
 // 0b1110101 AD <-> SCL
 // 0b1110110 AD <-> SDA
 #define DRIVER_ADDR_1 0b1110100
-#define DRIVER_ADDR_2 0b1110101
+#define DRIVER_ADDR_2 0b1110110
 #define DRIVER_COUNT 2
 #define DRIVER_1_LED_TOTAL 32
 #define DRIVER_2_LED_TOTAL 36
@@ -32,4 +36,10 @@
 #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 255 // limits maximum brightness of LEDs to 200 out of 255. If not defined maximum brightness is set to 255
 #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_PINWHEEL // Sets the default mode, if none has been set
 
-#define RGB_MATRIX_DISABLE_KEYCODES
\ No newline at end of file
+#define RGB_MATRIX_DISABLE_KEYCODES
+
+#define ENCODERS_PAD_A { A4 }
+#define ENCODERS_PAD_B { A3 }
+#define ENCODER_RESOLUTION 4
+
+#define TAP_CODE_DELAY 10
\ No newline at end of file
diff --git a/qmk/keyboards/mechlovin/adelais/rgb_led/rev2/rev2.c b/qmk/keyboards/mechlovin/adelais/rgb_led/rev2/rev2.c
index ce0f24a0..5087174b 100644
--- a/qmk/keyboards/mechlovin/adelais/rgb_led/rev2/rev2.c
+++ b/qmk/keyboards/mechlovin/adelais/rgb_led/rev2/rev2.c
@@ -99,8 +99,8 @@ led_config_t g_led_config = { {
   { 1,           2,         3,          4,           5,           6,         7,          8,          9,          10,        11,           12,           13,          14,         16},
   {18,          19,        20,         21,          22,          23,        24,         25,         26,          27,        28,           29,           30,          31,          0},
   {33,          34,        35,         36,          37,          38,        39,         40,         41,          42,        43,           44,       NO_LED,          45,         17},
-  {46,        NO_LED,      47,         48,          49,          50,        51,         52,         53,          54,        55,           56,           58,          60,          32},
-  {61,        NO_LED,      62,     NO_LED,          63,      NO_LED,        64,     NO_LED,         65,      NO_LED,        66,       NO_LED,       NO_LED,          59,          67}
+  {46,        NO_LED,      47,         48,          49,          50,        51,         52,         53,          54,        55,           56,           59,          60,         32},
+  {61,        NO_LED,      62,     NO_LED,          63,      NO_LED,        64,     NO_LED,         65,      NO_LED,        66,       NO_LED,       NO_LED,          57,         67}
     },
     {
   //LED Index to Physical Positon
diff --git a/qmk/keyboards/mechlovin/adelais/rgb_led/rev2/rules.mk b/qmk/keyboards/mechlovin/adelais/rgb_led/rev2/rules.mk
index 014db586..b52c4f9d 100644
--- a/qmk/keyboards/mechlovin/adelais/rgb_led/rev2/rules.mk
+++ b/qmk/keyboards/mechlovin/adelais/rgb_led/rev2/rules.mk
@@ -1,2 +1,4 @@
-RGB_MATRIX_ENABLE = IS31FL3731
-RGBLIGHT_ENABLE = yes
\ No newline at end of file
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = IS31FL3731
+RGBLIGHT_ENABLE = yes
+ENCODER_ENABLE = yes
diff --git a/qmk/keyboards/mechlovin/adelais/rules.mk b/qmk/keyboards/mechlovin/adelais/rules.mk
index 75b9b6d2..0b6e62c6 100644
--- a/qmk/keyboards/mechlovin/adelais/rules.mk
+++ b/qmk/keyboards/mechlovin/adelais/rules.mk
@@ -18,6 +18,7 @@ MIDI_ENABLE = no            # MIDI support
 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
+
+LAYOUTS = alice alice_split_bs
 
 DEFAULT_FOLDER = mechlovin/adelais/standard_led/rev2
\ No newline at end of file
diff --git a/qmk/keyboards/mechlovin/adelais/standard_led/config.h b/qmk/keyboards/mechlovin/adelais/standard_led/config.h
index 6a008e2f..139026d0 100644
--- a/qmk/keyboards/mechlovin/adelais/standard_led/config.h
+++ b/qmk/keyboards/mechlovin/adelais/standard_led/config.h
@@ -3,6 +3,10 @@
 #define PRODUCT      Adelais
 #define DESCRIPTION  Team.Mechlovin Adelais
 
+#define MATRIX_ROW_PINS { B1, A0, C13, A1, A2}
+#define MATRIX_COL_PINS { A10, A9, A8, B15, B14, B13, B12, B11, B10, B8, B4, B5, B3, C14, A15 }
+#define UNUSED_PINS
+
 #define BACKLIGHT_PIN B0
 #define BACKLIGHT_BREATHING
 #define BACKLIGHT_PWM_DRIVER PWMD3
diff --git a/qmk/keyboards/mechlovin/adelais/standard_led/rev3/config.h b/qmk/keyboards/mechlovin/adelais/standard_led/rev3/config.h
index 60e28829..4d56fedf 100644
--- a/qmk/keyboards/mechlovin/adelais/standard_led/rev3/config.h
+++ b/qmk/keyboards/mechlovin/adelais/standard_led/rev3/config.h
@@ -6,3 +6,4 @@
 #define ENCODERS_PAD_B { A5, A3, B6 }
 #define ENCODER_RESOLUTION 4
 
+#define TAP_CODE_DELAY 10
\ No newline at end of file
diff --git a/qmk/keyboards/mechlovin/delphine/rgb_led/rules.mk b/qmk/keyboards/mechlovin/delphine/rgb_led/rules.mk
index 853f740c..204fb124 100644
--- a/qmk/keyboards/mechlovin/delphine/rgb_led/rules.mk
+++ b/qmk/keyboards/mechlovin/delphine/rgb_led/rules.mk
@@ -1,2 +1,3 @@
 RGBLIGHT_ENABLE = no               # Enable keyboard RGB underglow
-RGB_MATRIX_ENABLE = IS31FL3731     # Use RGB matrix
+RGB_MATRIX_ENABLE = yes            # Use RGB matrix
+RGB_MATRIX_DRIVER = IS31FL3731
diff --git a/qmk/keyboards/mechlovin/hannah60rgb/rev1/rules.mk b/qmk/keyboards/mechlovin/hannah60rgb/rev1/rules.mk
index 20256e20..9be57067 100644
--- a/qmk/keyboards/mechlovin/hannah60rgb/rev1/rules.mk
+++ b/qmk/keyboards/mechlovin/hannah60rgb/rev1/rules.mk
@@ -1 +1,2 @@
-RGB_MATRIX_ENABLE = WS2812
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = WS2812
diff --git a/qmk/keyboards/mechlovin/hannah60rgb/rev2/rules.mk b/qmk/keyboards/mechlovin/hannah60rgb/rev2/rules.mk
index 1114e695..fcd42ec5 100644
--- a/qmk/keyboards/mechlovin/hannah60rgb/rev2/rules.mk
+++ b/qmk/keyboards/mechlovin/hannah60rgb/rev2/rules.mk
@@ -1,2 +1,3 @@
 RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
-RGB_MATRIX_ENABLE = IS31FL3731
\ No newline at end of file
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = IS31FL3731
diff --git a/qmk/keyboards/mechlovin/hannah60rgb/rules.mk b/qmk/keyboards/mechlovin/hannah60rgb/rules.mk
index 7023e65c..eb9b1528 100644
--- a/qmk/keyboards/mechlovin/hannah60rgb/rules.mk
+++ b/qmk/keyboards/mechlovin/hannah60rgb/rules.mk
@@ -16,6 +16,7 @@ NKRO_ENABLE = yes            # USB Nkey Rollover
 BACKLIGHT_ENABLE = no        # Enable keyboard backlight functionality
 BLUETOOTH_ENABLE = no        # Enable Bluetooth with the Adafruit EZ-Key HID
 AUDIO_ENABLE = no            # Audio output on port C6
+
 # generated by KBFirmware JSON to QMK Parser
 # https://noroadsleft.github.io/kbf_qmk_converter/
 
diff --git a/qmk/keyboards/mechlovin/hannah65/mechlovin9/config.h b/qmk/keyboards/mechlovin/hannah65/mechlovin9/config.h
index df917e3d..68097bd6 100644
--- a/qmk/keyboards/mechlovin/hannah65/mechlovin9/config.h
+++ b/qmk/keyboards/mechlovin/hannah65/mechlovin9/config.h
@@ -1,5 +1,5 @@
 #pragma once
 
-#define PRODUCT_ID   0x6501
+#define PRODUCT_ID   0x6509
 #define DEVICE_VER   0x0001
 #define PRODUCTION   Mechlovin9
\ No newline at end of file
diff --git a/qmk/keyboards/mechlovin/hannah910/config.h b/qmk/keyboards/mechlovin/hannah910/config.h
index c6169359..ad1b7c2e 100644
--- a/qmk/keyboards/mechlovin/hannah910/config.h
+++ b/qmk/keyboards/mechlovin/hannah910/config.h
@@ -186,34 +186,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/mechlovin/hannah910/rev1/rules.mk b/qmk/keyboards/mechlovin/hannah910/rev1/rules.mk
index 5e17282e..f1a818c2 100644
--- a/qmk/keyboards/mechlovin/hannah910/rev1/rules.mk
+++ b/qmk/keyboards/mechlovin/hannah910/rev1/rules.mk
@@ -30,4 +30,3 @@ 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 
\ No newline at end of file
diff --git a/qmk/keyboards/mechlovin/infinityce/rules.mk b/qmk/keyboards/mechlovin/infinityce/rules.mk
index 199f3316..339e482d 100644
--- a/qmk/keyboards/mechlovin/infinityce/rules.mk
+++ b/qmk/keyboards/mechlovin/infinityce/rules.mk
@@ -29,4 +29,3 @@ MIDI_ENABLE = no            # MIDI support
 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
diff --git a/qmk/keyboards/mechlovin/pisces/rules.mk b/qmk/keyboards/mechlovin/pisces/rules.mk
index 9afc1864..d2bf8d3a 100644
--- a/qmk/keyboards/mechlovin/pisces/rules.mk
+++ b/qmk/keyboards/mechlovin/pisces/rules.mk
@@ -29,4 +29,3 @@ MIDI_ENABLE = no            # MIDI support
 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
diff --git a/qmk/keyboards/mechwild/bde/lefty/config.h b/qmk/keyboards/mechwild/bde/lefty/config.h
new file mode 100644
index 00000000..082295ef
--- /dev/null
+++ b/qmk/keyboards/mechwild/bde/lefty/config.h
@@ -0,0 +1,54 @@
+/* Copyright 2020 Kyle McCreery 
+ * 
+ * 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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x6D77 // mw = "MechWild"
+#define PRODUCT_ID      0x1701
+#define DEVICE_VER      0x0203
+#define MANUFACTURER    MechWild
+#define PRODUCT         BDE Lefty
+
+/* key matrix size */
+#define MATRIX_ROWS 3
+#define MATRIX_COLS 14
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { D1, D7, D3}
+#define MATRIX_COL_PINS { F7, B1, B6, B2, B3, F6, F5, F4, D0, D4, C6, E6, B5, B4}
+#define UNUSED_PINS
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION ROW2COL
+
+/* If RGBLIGHT_ENABLE is set to yes in the rules,  ensure the RGBLED_NUM is accurate for how many you have attached. */
+#define RGB_DI_PIN D2
+#define RGBLED_NUM 16 
+#define RGBLIGHT_ANIMATIONS
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
diff --git a/qmk/keyboards/mechwild/bde/lefty/info.json b/qmk/keyboards/mechwild/bde/lefty/info.json
new file mode 100644
index 00000000..1ada76e7
--- /dev/null
+++ b/qmk/keyboards/mechwild/bde/lefty/info.json
@@ -0,0 +1,16 @@
+{
+    "keyboard_name": "MechWild BDE Lefty",
+    "url": "mechwild.com",
+    "maintainer": "kylemccreery",
+    "width": 14,
+    "height": 3,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"7", "x":0, "y":0}, {"label":"8", "x":1, "y":0}, {"label":"9", "x":2, "y":0}, {"label":"0", "x":3, "y":0},            {"label":"Q", "x":4, "y":0}, {"label":"W", "x":5, "y":0}, {"label":"E", "x":6, "y":0}, {"label":"R", "x":7, "y":0}, {"label":"T", "x":8, "y":0},  {"label":"Y", "x":9, "y":0}, {"label":"U", "x":10, "y":0}, {"label":"I", "x":11, "y":0}, {"label":"O", "x":12, "y":0}, {"label":"P", "x":13, "y":0},
+                {"label":"4", "x":0, "y":1}, {"label":"5", "x":1, "y":1}, {"label":"6", "x":2, "y":1}, {"label":"Enter", "x":3, "y":1, "h":2}, {"label":"A", "x":4, "y":1}, {"label":"S", "x":5, "y":1}, {"label":"D", "x":6, "y":1}, {"label":"F", "x":7, "y":1}, {"label":"G", "x":8, "y":1},  {"label":"H", "x":9, "y":1}, {"label":"J", "x":10, "y":1}, {"label":"K", "x":11, "y":1}, {"label":"L", "x":12, "y":1}, {"label":"ESC", "x":13, "y":1},
+                {"label":"1", "x":0, "y":2}, {"label":"2", "x":1, "y":2}, {"label":"3", "x":2, "y":2},                                         {"label":"Z", "x":4, "y":2}, {"label":"X", "x":5, "y":2}, {"label":"C", "x":6, "y":2}, {"label":"V", "x":7, "y":2}, {"label":"BS", "x":8, "y":2}, {"label":"", "x":9, "y":2},  {"label":"B", "x":10, "y":2}, {"label":"N", "x":11, "y":2}, {"label":"M", "x":12, "y":2}, {"label":"ENT", "x":13, "y":2}
+            ]
+        }
+    }
+}
diff --git a/qmk/keyboards/mechwild/bde/lefty/keymaps/default/config.h b/qmk/keyboards/mechwild/bde/lefty/keymaps/default/config.h
new file mode 100644
index 00000000..80e8e2e0
--- /dev/null
+++ b/qmk/keyboards/mechwild/bde/lefty/keymaps/default/config.h
@@ -0,0 +1,23 @@
+/* Copyright 2020 Kyle McCreery 
+ * 
+ * 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/>. 
+ */
+
+
+/* Making it so you need to hold the modifier and other key for the time together, helps not accidentally hit activate the hold functions of bottom row*/
+#define IGNORE_MOD_TAP_INTERRUPT
+
+/* Setting tap term, helps not accidentally hit activate the hold functions of bottom row*/
+#define TAPPING_TERM 250
+
diff --git a/qmk/keyboards/mechwild/bde/lefty/keymaps/default/keymap.c b/qmk/keyboards/mechwild/bde/lefty/keymaps/default/keymap.c
new file mode 100644
index 00000000..3501a5e3
--- /dev/null
+++ b/qmk/keyboards/mechwild/bde/lefty/keymaps/default/keymap.c
@@ -0,0 +1,55 @@
+/* Copyright 2020 Kyle McCreery 
+ * 
+ * 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
+
+#define FN1_SPC     LT(1, KC_SPC)
+#define FN2_BSPC    LT(2, KC_BSPC)
+#define FN3_B       LT(3, KC_B)
+#define CTL_Z       CTL_T(KC_Z)
+#define ALT_X       ALT_T(KC_X)
+#define ALT_N       ALGR_T(KC_N)
+#define CTL_M       RCTL_T(KC_M)
+#define SFT_ENT     RSFT_T(KC_ENT)
+#define WIN_C		LGUI_T(KC_C)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [0] = LAYOUT(
+    KC_7,    KC_8,    KC_9,    KC_0,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,     KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,
+    KC_4,    KC_5,    KC_6,    SFT_ENT, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,     KC_H,    KC_J,    KC_K,    KC_L,    KC_ESC,
+    KC_1,    KC_2,    KC_3,     	    CTL_Z,   ALT_X,   WIN_C,   KC_V,    FN2_BSPC, FN1_SPC, FN3_B,   ALT_N,   CTL_M,   SFT_ENT
+  ),
+
+  [1] = LAYOUT(
+    KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______, _______, _______, RESET,   _______,  KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
+    KC_F4,   KC_F5,   KC_F6,   KC_TAB,  _______, _______, _______, _______, _______,  KC_COMM, KC_DOT,  KC_SLSH, KC_SCLN, KC_QUOT,
+    KC_F1,   KC_F2,   KC_F3,       	    _______, _______, KC_LGUI, _______, KC_DEL,	  _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+  ),
+	
+  [2] = LAYOUT(
+    _______, _______, _______, _______, _______, _______, _______, _______, _______,  KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______,  KC_LABK, KC_RABK, KC_QUES, KC_COLN, KC_DQUO,
+    KC_F11,  KC_F12,  _______,          _______, _______, _______, _______, _______,  KC_PSCR, KC_HOME, KC_PGDN, KC_PGUP, KC_END
+  ),
+
+  [3] = LAYOUT(
+    RGB_M_G,  RGB_M_T, _______,  RGB_M_P, RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD,  _______,  _______, _______, _______, _______, _______,
+    RGB_M_SN, RGB_M_K, RGB_M_X,  RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_RMOD, _______,  _______, _______, _______, _______, _______,
+    RGB_M_B,  RGB_M_R, RGB_M_SW,          _______, _______, _______, _______,  _______,  _______, _______, _______, _______, _______
+  )
+
+};
diff --git a/qmk/keyboards/mechwild/bde/lefty/keymaps/fancy/config.h b/qmk/keyboards/mechwild/bde/lefty/keymaps/fancy/config.h
new file mode 100644
index 00000000..8476c8cc
--- /dev/null
+++ b/qmk/keyboards/mechwild/bde/lefty/keymaps/fancy/config.h
@@ -0,0 +1,22 @@
+/* Copyright 2020 Kyle McCreery 
+ * 
+ * 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
+/* Making it so you need to hold the modifier and other key for the time together, helps not accidentally hit activate the hold functions of bottom row*/
+#define IGNORE_MOD_TAP_INTERRUPT
+
+/* Setting tap term, helps not accidentally hit activate the hold functions of bottom row*/
+#define TAPPING_TERM 250
diff --git a/qmk/keyboards/mechwild/bde/lefty/keymaps/fancy/keymap.c b/qmk/keyboards/mechwild/bde/lefty/keymaps/fancy/keymap.c
new file mode 100644
index 00000000..940575ce
--- /dev/null
+++ b/qmk/keyboards/mechwild/bde/lefty/keymaps/fancy/keymap.c
@@ -0,0 +1,121 @@
+/* Copyright 2020 Kyle McCreery 
+ * 
+ * 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
+
+
+#define FN1_SPC     LT(1, KC_SPC)
+#define FN2_BSPC    LT(2, KC_BSPC)
+#define FN3_B       LT(3, KC_B)
+#define CTL_Z       CTL_T(KC_Z)
+#define ALT_X       ALT_T(KC_X)
+#define ALT_N       ALGR_T(KC_N)
+#define CTL_M       RCTL_T(KC_M)
+#define SFT_ENT     RSFT_T(KC_ENT)
+#define WIN_C		LGUI_T(KC_C)
+
+typedef struct {
+    bool is_press_action;
+    uint8_t state;
+} tap;
+
+enum {
+    SINGLE_TAP = 1,
+    SINGLE_HOLD,
+    DOUBLE_TAP
+};
+
+// Tap dance enums
+enum {
+    left_enter,
+};
+
+uint8_t cur_dance(qk_tap_dance_state_t *state);
+void left_enter_finished(qk_tap_dance_state_t *state, void *user_data);
+void left_enter_reset(qk_tap_dance_state_t *state, void *user_data);
+
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [0] = LAYOUT(
+    KC_7,    KC_8,    KC_9,    KC_0,           KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,     KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,
+    KC_4,    KC_5,    KC_6,    TD(left_enter), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,     KC_H,    KC_J,    KC_K,    KC_L,    KC_ESC,
+    KC_1,    KC_2,    KC_3,     	           CTL_Z,   ALT_X,   WIN_C,   KC_V,    FN2_BSPC, FN1_SPC, FN3_B,   ALT_N,   CTL_M,   SFT_ENT
+  ),
+
+  [1] = LAYOUT(
+    KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______, _______, _______, RESET,   _______,  KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
+    KC_F4,   KC_F5,   KC_F6,   KC_TAB,  _______, _______, _______, _______, _______,  KC_COMM, KC_DOT,  KC_SLSH, KC_SCLN, KC_QUOT,
+    KC_F1,   KC_F2,   KC_F3,       	    _______, _______, KC_LGUI, _______, KC_DEL,	  _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+  ),
+	
+  [2] = LAYOUT(
+    _______, _______, _______, _______, _______, _______, _______, _______, _______,  KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______,  KC_LABK, KC_RABK, KC_QUES, KC_COLN, KC_DQUO,
+    KC_F11,  KC_F12,  _______,          _______, _______, _______, _______, _______,  KC_PSCR, KC_HOME, KC_PGDN, KC_PGUP, KC_END
+  ),
+
+[3] = LAYOUT(
+    RGB_M_G,  RGB_M_T, _______,  RGB_M_P, RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD,  _______,  _______, _______, _______, _______, _______,
+    RGB_M_SN, RGB_M_K, RGB_M_X,  RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_RMOD, _______,  _______, _______, _______, _______, _______,
+    RGB_M_B,  RGB_M_R, RGB_M_SW,          _______, _______, _______, _______,  _______,  _______, _______, _______, _______, _______
+  )
+  
+};
+
+
+uint8_t cur_dance(qk_tap_dance_state_t *state) {
+    if (state->count == 1) {
+        if (state->interrupted || !state->pressed) return SINGLE_TAP;
+        // Key has not been interrupted, but the key is still held. Means you want to send a 'HOLD'.
+        else return SINGLE_HOLD;
+	} else return DOUBLE_TAP;
+    //} else if (state->count >= 2) {
+	//	return DOUBLE_TAP;
+    //}else return 8; // Magic number. At some point this method will expand to work for more presses
+}
+
+static tap left_enter_tap_state = {
+    .is_press_action = true,
+    .state = 0
+};
+
+void left_enter_finished(qk_tap_dance_state_t *state, void *user_data) {
+    left_enter_tap_state.state = cur_dance(state);
+    switch (left_enter_tap_state.state) {
+        //case SINGLE_TAP: register_code(KC_ENT); break;
+        case SINGLE_HOLD: register_code(KC_LSFT); break;
+        case DOUBLE_TAP: register_code(KC_ENT); break;
+		}
+}
+
+void left_enter_reset(qk_tap_dance_state_t *state, void *user_data) {
+    switch (left_enter_tap_state.state) {
+        //case SINGLE_TAP: unregister_code(KC_ENT); break;
+        case SINGLE_HOLD: unregister_code(KC_LSFT); break;
+        case DOUBLE_TAP: unregister_code(KC_ENT); break;
+    }
+    left_enter_tap_state.state = 0;
+}
+
+qk_tap_dance_action_t tap_dance_actions[] = {
+    [left_enter] = ACTION_TAP_DANCE_FN_ADVANCED(NULL, left_enter_finished, left_enter_reset)
+};
+
+
+
diff --git a/qmk/keyboards/mechwild/bde/lefty/keymaps/fancy/rules.mk b/qmk/keyboards/mechwild/bde/lefty/keymaps/fancy/rules.mk
new file mode 100644
index 00000000..9a56408f
--- /dev/null
+++ b/qmk/keyboards/mechwild/bde/lefty/keymaps/fancy/rules.mk
@@ -0,0 +1,2 @@
+TAP_DANCE_ENABLE = yes
+
diff --git a/qmk/keyboards/mechwild/bde/lefty/keymaps/via/config.h b/qmk/keyboards/mechwild/bde/lefty/keymaps/via/config.h
new file mode 100644
index 00000000..8476c8cc
--- /dev/null
+++ b/qmk/keyboards/mechwild/bde/lefty/keymaps/via/config.h
@@ -0,0 +1,22 @@
+/* Copyright 2020 Kyle McCreery 
+ * 
+ * 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
+/* Making it so you need to hold the modifier and other key for the time together, helps not accidentally hit activate the hold functions of bottom row*/
+#define IGNORE_MOD_TAP_INTERRUPT
+
+/* Setting tap term, helps not accidentally hit activate the hold functions of bottom row*/
+#define TAPPING_TERM 250
diff --git a/qmk/keyboards/mechwild/bde/lefty/keymaps/via/keymap.c b/qmk/keyboards/mechwild/bde/lefty/keymaps/via/keymap.c
new file mode 100644
index 00000000..68ff3342
--- /dev/null
+++ b/qmk/keyboards/mechwild/bde/lefty/keymaps/via/keymap.c
@@ -0,0 +1,56 @@
+/* Copyright 2020 Kyle McCreery 
+ * 
+ * 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
+
+#define FN1_SPC     LT(1, KC_SPC)
+#define FN2_BSPC    LT(2, KC_BSPC)
+#define FN3_B       LT(3, KC_B)
+#define CTL_Z       CTL_T(KC_Z)
+#define ALT_X       ALT_T(KC_X)
+#define ALT_N       ALGR_T(KC_N)
+#define CTL_M       RCTL_T(KC_M)
+#define SFT_ENT     RSFT_T(KC_ENT)
+#define WIN_C		LGUI_T(KC_C)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [0] = LAYOUT(
+    KC_7,    KC_8,    KC_9,    KC_0,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,     KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,
+    KC_4,    KC_5,    KC_6,    SFT_ENT, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,     KC_H,    KC_J,    KC_K,    KC_L,    KC_ESC,
+    KC_1,    KC_2,    KC_3,     	    CTL_Z,   ALT_X,   WIN_C,   KC_V,    FN2_BSPC, FN1_SPC, FN3_B,   ALT_N,   CTL_M,   SFT_ENT
+  ),
+
+  [1] = LAYOUT(
+    KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______, _______, _______, RESET,   _______,  KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
+    KC_F4,   KC_F5,   KC_F6,   KC_TAB,  _______, _______, _______, _______, _______,  KC_COMM, KC_DOT,  KC_SLSH, KC_SCLN, KC_QUOT,
+    KC_F1,   KC_F2,   KC_F3,       	    _______, _______, KC_LGUI, _______, KC_DEL,	  _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+  ),
+	
+  [2] = LAYOUT(
+    _______, _______, _______, _______, _______, _______, _______, _______, _______,  KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______,  KC_LABK, KC_RABK, KC_QUES, KC_COLN, KC_DQUO,
+    KC_F11,  KC_F12,  _______,          _______, _______, _______, _______, _______,  KC_PSCR, KC_HOME, KC_PGDN, KC_PGUP, KC_END
+  ),
+
+  [3] = LAYOUT(
+    _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______,
+    _______, _______, _______,          _______, _______, _______, _______, _______,  _______, _______, _______, _______, _______
+  )
+
+};
diff --git a/qmk/keyboards/mechwild/bde/lefty/keymaps/via/rules.mk b/qmk/keyboards/mechwild/bde/lefty/keymaps/via/rules.mk
new file mode 100644
index 00000000..16d33cd8
--- /dev/null
+++ b/qmk/keyboards/mechwild/bde/lefty/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+
diff --git a/qmk/keyboards/mechwild/bde/lefty/lefty.c b/qmk/keyboards/mechwild/bde/lefty/lefty.c
new file mode 100644
index 00000000..77286f5a
--- /dev/null
+++ b/qmk/keyboards/mechwild/bde/lefty/lefty.c
@@ -0,0 +1,18 @@
+/* Copyright 2020 Kyle McCreery 
+ * 
+ * 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 "lefty.h"
diff --git a/qmk/keyboards/mechwild/bde/lefty/lefty.h b/qmk/keyboards/mechwild/bde/lefty/lefty.h
new file mode 100644
index 00000000..37b8771d
--- /dev/null
+++ b/qmk/keyboards/mechwild/bde/lefty/lefty.h
@@ -0,0 +1,30 @@
+/* Copyright 2020 Kyle McCreery 
+ * 
+ * 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( \
+	 K00,  K01,  K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K0A,  K0B,  K0C,  K0D ,   \
+	 K10,  K11,  K12,  K13,  K14,  K15,  K16,  K17,  K18,  K19,  K1A,  K1B,  K1C,  K1D ,   \
+	 K20,  K21,  K22,        K24,  K25,  K26,  K27,  K28,  K29,  K2A,  K2B,  K2C,  K2D     \
+) { \
+    {K00,  K01,  K02,  K03,   K04,  K05,  K06,  K07,  K08,  K09,  K0A,  K0B,  K0C,  K0D},   \
+    {K10,  K11,  K12,  K13,   K14,  K15,  K16,  K17,  K18,  K19,  K1A,  K1B,  K1C,  K1D},   \
+    {K20,  K21,  K22,  KC_NO, K24,  K25,  K26,  K27,  K28,  K29,  K2A,  K2B,  K2C,  K2D}    \
+}
diff --git a/qmk/keyboards/mechwild/bde/lefty/readme.md b/qmk/keyboards/mechwild/bde/lefty/readme.md
new file mode 100644
index 00000000..88e7be02
--- /dev/null
+++ b/qmk/keyboards/mechwild/bde/lefty/readme.md
@@ -0,0 +1,15 @@
+# BIG DILL EXTENDED
+
+![BIG DILL EXTENDED](https://i0.wp.com/mechwild.com/wp-content/uploads/2020/10/IMG_4458_web.jpg)
+
+A 41 key keyboard.
+
+* Keyboard Maintainer: [Kyle McCreery](https://github.com/kylemccreery)
+* Hardware Supported: BDE v2.3 Lefty
+* Hardware Availability: [BIG DILL EXTENDED on MechWild](https://mechwild.com/product/big-dill-extended-bde/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make mechwild/bde/lefty: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).
diff --git a/qmk/keyboards/mechwild/bde/lefty/rules.mk b/qmk/keyboards/mechwild/bde/lefty/rules.mk
new file mode 100644
index 00000000..f4aec9cf
--- /dev/null
+++ b/qmk/keyboards/mechwild/bde/lefty/rules.mk
@@ -0,0 +1,23 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+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
+# 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 = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+
diff --git a/qmk/keyboards/mechwild/bde/righty/config.h b/qmk/keyboards/mechwild/bde/righty/config.h
new file mode 100644
index 00000000..5f8537f9
--- /dev/null
+++ b/qmk/keyboards/mechwild/bde/righty/config.h
@@ -0,0 +1,55 @@
+/* Copyright 2020 Kyle McCreery 
+ * 
+ * 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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x6D77 // mw = "MechWild"
+#define PRODUCT_ID      0x1702
+#define DEVICE_VER      0x0203
+#define MANUFACTURER    MechWild
+#define PRODUCT         BDE Righty
+#define DESCRIPTION     41-key ortholinear 30% with numpad
+
+/* key matrix size */
+#define MATRIX_ROWS 3
+#define MATRIX_COLS 14
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { D1, D7, D3}
+#define MATRIX_COL_PINS { B4, B5, E6, C6, D4, D0, F4, F5, F6, B6, B3, B2, B1, F7}
+#define UNUSED_PINS
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION ROW2COL
+
+/* If RGBLIGHT_ENABLE is set to yes in the rules, ensure the RGBLED_NUM is accurate for how many you have attached. */
+#define RGB_DI_PIN D2
+#define RGBLED_NUM 16 
+#define RGBLIGHT_ANIMATIONS
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
diff --git a/qmk/keyboards/mechwild/bde/righty/info.json b/qmk/keyboards/mechwild/bde/righty/info.json
new file mode 100644
index 00000000..8f4c8794
--- /dev/null
+++ b/qmk/keyboards/mechwild/bde/righty/info.json
@@ -0,0 +1,16 @@
+{
+    "keyboard_name": "MechWild BDE Righty",
+    "url": "mechwild.com",
+    "maintainer": "kylemccreery",
+    "width": 14,
+    "height": 3,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"Q", "x":0, "y":0}, {"label":"W", "x":1, "y":0}, {"label":"E", "x":2, "y":0}, {"label":"R", "x":3, "y":0}, {"label":"T", "x":4, "y":0},  {"label":"Y", "x":5, "y":0}, {"label":"U", "x":6, "y":0}, {"label":"I", "x":7, "y":0}, {"label":"O", "x":8, "y":0}, {"label":"P", "x":9, "y":0},   {"label":"0", "x":10, "y":0},            {"label":"7", "x":11, "y":0}, {"label":"8", "x":12, "y":0}, {"label":"9", "x":13, "y":0},
+                {"label":"A", "x":0, "y":1}, {"label":"S", "x":1, "y":1}, {"label":"D", "x":2, "y":1}, {"label":"F", "x":3, "y":1}, {"label":"G", "x":4, "y":1},  {"label":"H", "x":5, "y":1}, {"label":"J", "x":6, "y":1}, {"label":"K", "x":7, "y":1}, {"label":"L", "x":8, "y":1}, {"label":"ESC", "x":9, "y":1}, {"label":"Enter", "x":10, "y":1, "h":2}, {"label":"4", "x":11, "y":1}, {"label":"5", "x":12, "y":1}, {"label":"6", "x":13, "y":1},
+                {"label":"Z", "x":0, "y":2}, {"label":"X", "x":1, "y":2}, {"label":"C", "x":2, "y":2}, {"label":"V", "x":3, "y":2}, {"label":"BS", "x":4, "y":2}, {"label":"", "x":5, "y":2},  {"label":"B", "x":6, "y":2}, {"label":"N", "x":7, "y":2}, {"label":"M", "x":8, "y":2}, {"label":"ENT", "x":9, "y":2},                                          {"label":"1", "x":11, "y":2}, {"label":"2", "x":12, "y":2}, {"label":"3", "x":13, "y":2}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/qmk/keyboards/mechwild/bde/righty/keymaps/default/config.h b/qmk/keyboards/mechwild/bde/righty/keymaps/default/config.h
new file mode 100644
index 00000000..80e8e2e0
--- /dev/null
+++ b/qmk/keyboards/mechwild/bde/righty/keymaps/default/config.h
@@ -0,0 +1,23 @@
+/* Copyright 2020 Kyle McCreery 
+ * 
+ * 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/>. 
+ */
+
+
+/* Making it so you need to hold the modifier and other key for the time together, helps not accidentally hit activate the hold functions of bottom row*/
+#define IGNORE_MOD_TAP_INTERRUPT
+
+/* Setting tap term, helps not accidentally hit activate the hold functions of bottom row*/
+#define TAPPING_TERM 250
+
diff --git a/qmk/keyboards/mechwild/bde/righty/keymaps/default/keymap.c b/qmk/keyboards/mechwild/bde/righty/keymaps/default/keymap.c
new file mode 100644
index 00000000..5310cea0
--- /dev/null
+++ b/qmk/keyboards/mechwild/bde/righty/keymaps/default/keymap.c
@@ -0,0 +1,55 @@
+/* Copyright 2020 Kyle McCreery 
+ * 
+ * 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
+
+#define FN1_SPC     LT(1, KC_SPC)
+#define FN2_BSPC    LT(2, KC_BSPC)
+#define FN3_B       LT(3, KC_B)
+#define CTL_Z       CTL_T(KC_Z)
+#define ALT_X       ALT_T(KC_X)
+#define ALT_N       ALGR_T(KC_N)
+#define CTL_M       RCTL_T(KC_M)
+#define WIN_C		LGUI_T(KC_C)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [0] = LAYOUT(
+    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,     KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_0,   KC_7,    KC_8,    KC_9,       
+    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,     KC_H,    KC_J,    KC_K,    KC_L,    KC_ESC,  KC_ENT, KC_4,    KC_5,    KC_6,  
+    CTL_Z,   ALT_X,   WIN_C,   KC_V,    FN2_BSPC, FN1_SPC, FN3_B,   ALT_N,   CTL_M,   KC_RSFT,         KC_1,    KC_2,    KC_3
+  ),
+
+  [1] = LAYOUT(
+    _______, _______, _______, RESET,   _______,  KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS, KC_F10, KC_F7,   KC_F8,   KC_F9,
+    _______, _______, _______, _______, _______,  KC_COMM, KC_DOT,  KC_SLSH, KC_SCLN, KC_QUOT, KC_TAB, KC_F4,   KC_F5,   KC_F6,
+    _______, _______, KC_LGUI, _______, KC_DEL,	  _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT,         KC_F1,   KC_F2,   KC_F3
+  ),
+	
+  [2] = LAYOUT(
+    _______, _______, _______, _______, _______,  KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______,  KC_LABK, KC_RABK, KC_QUES, KC_COLN, KC_DQUO, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______,  KC_PSCR, KC_HOME, KC_PGDN, KC_PGUP, KC_END,           KC_F11,  KC_F12,  _______
+  ),
+
+  [3] = LAYOUT(
+    RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD,  _______, _______, _______, _______, _______,  _______, RGB_M_P, RGB_M_G,  RGB_M_T, _______,
+    RGB_HUD, RGB_SAD, RGB_VAD, RGB_RMOD, _______, _______, _______, _______, _______,  _______, RGB_TOG, RGB_M_SN, RGB_M_K, RGB_M_X,
+    _______, _______, _______, _______,  _______, _______, _______, _______, _______,  _______,          RGB_M_B,  RGB_M_R, RGB_M_SW
+  )
+
+};
diff --git a/qmk/keyboards/mechwild/bde/righty/keymaps/via/config.h b/qmk/keyboards/mechwild/bde/righty/keymaps/via/config.h
new file mode 100644
index 00000000..80e8e2e0
--- /dev/null
+++ b/qmk/keyboards/mechwild/bde/righty/keymaps/via/config.h
@@ -0,0 +1,23 @@
+/* Copyright 2020 Kyle McCreery 
+ * 
+ * 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/>. 
+ */
+
+
+/* Making it so you need to hold the modifier and other key for the time together, helps not accidentally hit activate the hold functions of bottom row*/
+#define IGNORE_MOD_TAP_INTERRUPT
+
+/* Setting tap term, helps not accidentally hit activate the hold functions of bottom row*/
+#define TAPPING_TERM 250
+
diff --git a/qmk/keyboards/mechwild/bde/righty/keymaps/via/keymap.c b/qmk/keyboards/mechwild/bde/righty/keymaps/via/keymap.c
new file mode 100644
index 00000000..5310cea0
--- /dev/null
+++ b/qmk/keyboards/mechwild/bde/righty/keymaps/via/keymap.c
@@ -0,0 +1,55 @@
+/* Copyright 2020 Kyle McCreery 
+ * 
+ * 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
+
+#define FN1_SPC     LT(1, KC_SPC)
+#define FN2_BSPC    LT(2, KC_BSPC)
+#define FN3_B       LT(3, KC_B)
+#define CTL_Z       CTL_T(KC_Z)
+#define ALT_X       ALT_T(KC_X)
+#define ALT_N       ALGR_T(KC_N)
+#define CTL_M       RCTL_T(KC_M)
+#define WIN_C		LGUI_T(KC_C)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [0] = LAYOUT(
+    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,     KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_0,   KC_7,    KC_8,    KC_9,       
+    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,     KC_H,    KC_J,    KC_K,    KC_L,    KC_ESC,  KC_ENT, KC_4,    KC_5,    KC_6,  
+    CTL_Z,   ALT_X,   WIN_C,   KC_V,    FN2_BSPC, FN1_SPC, FN3_B,   ALT_N,   CTL_M,   KC_RSFT,         KC_1,    KC_2,    KC_3
+  ),
+
+  [1] = LAYOUT(
+    _______, _______, _______, RESET,   _______,  KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS, KC_F10, KC_F7,   KC_F8,   KC_F9,
+    _______, _______, _______, _______, _______,  KC_COMM, KC_DOT,  KC_SLSH, KC_SCLN, KC_QUOT, KC_TAB, KC_F4,   KC_F5,   KC_F6,
+    _______, _______, KC_LGUI, _______, KC_DEL,	  _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT,         KC_F1,   KC_F2,   KC_F3
+  ),
+	
+  [2] = LAYOUT(
+    _______, _______, _______, _______, _______,  KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______,  KC_LABK, KC_RABK, KC_QUES, KC_COLN, KC_DQUO, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______,  KC_PSCR, KC_HOME, KC_PGDN, KC_PGUP, KC_END,           KC_F11,  KC_F12,  _______
+  ),
+
+  [3] = LAYOUT(
+    RGB_HUI, RGB_SAI, RGB_VAI, RGB_MOD,  _______, _______, _______, _______, _______,  _______, RGB_M_P, RGB_M_G,  RGB_M_T, _______,
+    RGB_HUD, RGB_SAD, RGB_VAD, RGB_RMOD, _______, _______, _______, _______, _______,  _______, RGB_TOG, RGB_M_SN, RGB_M_K, RGB_M_X,
+    _______, _______, _______, _______,  _______, _______, _______, _______, _______,  _______,          RGB_M_B,  RGB_M_R, RGB_M_SW
+  )
+
+};
diff --git a/qmk/keyboards/mechwild/bde/righty/keymaps/via/rules.mk b/qmk/keyboards/mechwild/bde/righty/keymaps/via/rules.mk
new file mode 100644
index 00000000..16d33cd8
--- /dev/null
+++ b/qmk/keyboards/mechwild/bde/righty/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+
diff --git a/qmk/keyboards/mechwild/bde/righty/readme.md b/qmk/keyboards/mechwild/bde/righty/readme.md
new file mode 100644
index 00000000..619ea61f
--- /dev/null
+++ b/qmk/keyboards/mechwild/bde/righty/readme.md
@@ -0,0 +1,15 @@
+# BIG DILL EXTENDED
+
+![BIG DILL EXTENDED](https://i0.wp.com/mechwild.com/wp-content/uploads/2020/10/IMG_4458_web.jpg)
+
+A 41 key keyboard.
+
+* Keyboard Maintainer: [Kyle McCreery](https://github.com/kylemccreery)
+* Hardware Supported: BDE v2.3 Righty
+* Hardware Availability: [BIG DILL EXTENDED on MechWild](https://mechwild.com/product/big-dill-extended-bde/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make mechwild/bde/righty: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).
diff --git a/qmk/keyboards/mechwild/bde/righty/righty.c b/qmk/keyboards/mechwild/bde/righty/righty.c
new file mode 100644
index 00000000..d285e2e5
--- /dev/null
+++ b/qmk/keyboards/mechwild/bde/righty/righty.c
@@ -0,0 +1,18 @@
+/* Copyright 2020 Kyle McCreery 
+ * 
+ * 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 "righty.h"
diff --git a/qmk/keyboards/mechwild/bde/righty/righty.h b/qmk/keyboards/mechwild/bde/righty/righty.h
new file mode 100644
index 00000000..f1f29554
--- /dev/null
+++ b/qmk/keyboards/mechwild/bde/righty/righty.h
@@ -0,0 +1,30 @@
+/* Copyright 2020 Kyle McCreery 
+ * 
+ * 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( \
+	 K00,  K01,  K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K0A,   K0B,  K0C,  K0D ,   \
+	 K10,  K11,  K12,  K13,  K14,  K15,  K16,  K17,  K18,  K19,  K1A,   K1B,  K1C,  K1D ,   \
+	 K20,  K21,  K22,  K23,  K24,  K25,  K26,  K27,  K28,  K29,         K2B,  K2C,  K2D     \
+) { \
+    {K00,  K01,  K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K0A,   K0B,  K0C,  K0D},   \
+    {K10,  K11,  K12,  K13,  K14,  K15,  K16,  K17,  K18,  K19,  K1A,   K1B,  K1C,  K1D},   \
+    {K20,  K21,  K22,  K23,  K24,  K25,  K26,  K27,  K28,  K29,  KC_NO, K2B,  K2C,  K2D}    \
+}
diff --git a/qmk/keyboards/mechwild/bde/righty/rules.mk b/qmk/keyboards/mechwild/bde/righty/rules.mk
new file mode 100644
index 00000000..f4aec9cf
--- /dev/null
+++ b/qmk/keyboards/mechwild/bde/righty/rules.mk
@@ -0,0 +1,23 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+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
+# 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 = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+
diff --git a/qmk/keyboards/meira/TWIlib.c b/qmk/keyboards/meira/TWIlib.c
index 4091429b..8f5658fc 100644
--- a/qmk/keyboards/meira/TWIlib.c
+++ b/qmk/keyboards/meira/TWIlib.c
@@ -8,7 +8,7 @@
 #include <avr/io.h>
 #include <avr/interrupt.h>
 #include "TWIlib.h"
-#include "util/delay.h"
+#include <util/delay.h>
 #include "print.h"
 
 // Global transmit buffer
diff --git a/qmk/keyboards/meira/lighting.c b/qmk/keyboards/meira/lighting.c
index 37bb45ae..a02487f6 100644
--- a/qmk/keyboards/meira/lighting.c
+++ b/qmk/keyboards/meira/lighting.c
@@ -9,7 +9,7 @@
 #include "TWIlib.h"
 #include "lighting.h"
 #include "debug.h"
-#include "audio/audio.h"
+#include "audio.h"
 
 
 const uint8_t backlight_pwm_map[BACKLIGHT_LEVELS] = BACKLIGHT_PWM_MAP;
diff --git a/qmk/keyboards/meishi2/config.h b/qmk/keyboards/meishi2/config.h
index f681eb50..3aef9448 100644
--- a/qmk/keyboards/meishi2/config.h
+++ b/qmk/keyboards/meishi2/config.h
@@ -218,33 +218,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-//#define LCD_LINES           2     //< number of visible lines of the display
-//#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-//#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/meishi2/rules.mk b/qmk/keyboards/meishi2/rules.mk
index 1aa33793..77d0f1ec 100644
--- a/qmk/keyboards/meishi2/rules.mk
+++ b/qmk/keyboards/meishi2/rules.mk
@@ -30,4 +30,3 @@ 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
diff --git a/qmk/keyboards/melgeek/mj61/rev1/rules.mk b/qmk/keyboards/melgeek/mj61/rev1/rules.mk
index ba7f9eac..12c66f05 100644
--- a/qmk/keyboards/melgeek/mj61/rev1/rules.mk
+++ b/qmk/keyboards/melgeek/mj61/rev1/rules.mk
@@ -16,5 +16,6 @@ NKRO_ENABLE = yes              # USB Nkey Rollover
 BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
 BLUETOOTH_ENABLE = no          # Enable Bluetooth
-RGB_MATRIX_ENABLE = IS31FL3741 # Use RGB matrix
+RGB_MATRIX_ENABLE = yes        # Use RGB matrix
+RGB_MATRIX_DRIVER = IS31FL3741
 NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
diff --git a/qmk/keyboards/melgeek/mj63/rev1/rules.mk b/qmk/keyboards/melgeek/mj63/rev1/rules.mk
index 998f1275..d5fc76b8 100644
--- a/qmk/keyboards/melgeek/mj63/rev1/rules.mk
+++ b/qmk/keyboards/melgeek/mj63/rev1/rules.mk
@@ -16,7 +16,8 @@ NKRO_ENABLE = yes              # USB Nkey Rollover
 BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
 BLUETOOTH_ENABLE = no          # Enable Bluetooth
-RGB_MATRIX_ENABLE = IS31FL3741 # Use RGB matrix
+RGB_MATRIX_ENABLE = yes        # Use RGB matrix
+RGB_MATRIX_DRIVER = IS31FL3741
 NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
 
 LAYOUTS = 60_ansi_arrow
diff --git a/qmk/keyboards/melgeek/mj64/rev1/rules.mk b/qmk/keyboards/melgeek/mj64/rev1/rules.mk
index 6893fe2e..01b8aca4 100644
--- a/qmk/keyboards/melgeek/mj64/rev1/rules.mk
+++ b/qmk/keyboards/melgeek/mj64/rev1/rules.mk
@@ -16,7 +16,8 @@ NKRO_ENABLE = yes              # USB Nkey Rollover
 BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
 BLUETOOTH_ENABLE = no          # Enable Bluetooth
-RGB_MATRIX_ENABLE = IS31FL3741 # Use RGB matrix
+RGB_MATRIX_ENABLE = yes        # Use RGB matrix
+RGB_MATRIX_DRIVER = IS31FL3741
 NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
 
 LAYOUTS = 64_ansi
diff --git a/qmk/keyboards/melgeek/mj64/rev2/rules.mk b/qmk/keyboards/melgeek/mj64/rev2/rules.mk
index 6893fe2e..01b8aca4 100644
--- a/qmk/keyboards/melgeek/mj64/rev2/rules.mk
+++ b/qmk/keyboards/melgeek/mj64/rev2/rules.mk
@@ -16,7 +16,8 @@ NKRO_ENABLE = yes              # USB Nkey Rollover
 BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
 BLUETOOTH_ENABLE = no          # Enable Bluetooth
-RGB_MATRIX_ENABLE = IS31FL3741 # Use RGB matrix
+RGB_MATRIX_ENABLE = yes        # Use RGB matrix
+RGB_MATRIX_DRIVER = IS31FL3741
 NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
 
 LAYOUTS = 64_ansi
diff --git a/qmk/keyboards/melgeek/mojo75/rev1/rules.mk b/qmk/keyboards/melgeek/mojo75/rev1/rules.mk
index ba7f9eac..12c66f05 100644
--- a/qmk/keyboards/melgeek/mojo75/rev1/rules.mk
+++ b/qmk/keyboards/melgeek/mojo75/rev1/rules.mk
@@ -16,5 +16,6 @@ NKRO_ENABLE = yes              # USB Nkey Rollover
 BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
 BLUETOOTH_ENABLE = no          # Enable Bluetooth
-RGB_MATRIX_ENABLE = IS31FL3741 # Use RGB matrix
+RGB_MATRIX_ENABLE = yes        # Use RGB matrix
+RGB_MATRIX_DRIVER = IS31FL3741
 NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
diff --git a/qmk/keyboards/melgeek/z70ultra/rev1/rules.mk b/qmk/keyboards/melgeek/z70ultra/rev1/rules.mk
index cd262021..dce0366f 100644
--- a/qmk/keyboards/melgeek/z70ultra/rev1/rules.mk
+++ b/qmk/keyboards/melgeek/z70ultra/rev1/rules.mk
@@ -16,7 +16,8 @@ NKRO_ENABLE = yes              # USB Nkey Rollover
 BACKLIGHT_ENABLE = no          # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no           # Enable keyboard RGB underglow
 BLUETOOTH_ENABLE = no          # Enable Bluetooth
-RGB_MATRIX_ENABLE = IS31FL3741 # Use RGB matrix
+RGB_MATRIX_ENABLE = yes        # Use RGB matrix
+RGB_MATRIX_DRIVER = IS31FL3741
 NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
 
 LAYOUTS = 65_ansi_blocker
diff --git a/qmk/keyboards/melgeek/z70ultra/z70ultra.c b/qmk/keyboards/melgeek/z70ultra/z70ultra.c
index a98edd93..74072068 100644
--- a/qmk/keyboards/melgeek/z70ultra/z70ultra.c
+++ b/qmk/keyboards/melgeek/z70ultra/z70ultra.c
@@ -151,9 +151,6 @@ bool led_update_kb(led_t led_state) {
             IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[0], 0x00, 0x00, 0x00);
             IS31FL3741_set_pwm_buffer(&g_is31_indicator_leds[5], 0x00, 0x00, 0x00);
         }
-
-        // flush the indicator to the buffer
-        IS31FL3741_update_pwm_buffers(DRIVER_ADDR_1, DRIVER_ADDR_1);
     }
     return true;
 }
diff --git a/qmk/keyboards/melody96/config.h b/qmk/keyboards/melody96/config.h
index 2533bfa3..038d9746 100644
--- a/qmk/keyboards/melody96/config.h
+++ b/qmk/keyboards/melody96/config.h
@@ -22,6 +22,11 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION ROW2COL
 
+#define LED_NUM_LOCK_PIN C6
+#define LED_CAPS_LOCK_PIN C7
+#define LED_SCROLL_LOCK_PIN B5
+#define LED_PIN_ON_STATE 0
+
 /* number of backlight levels */
 #define BACKLIGHT_PIN B6
 #ifdef BACKLIGHT_PIN
diff --git a/qmk/keyboards/melody96/keymaps/zunger/keymap.c b/qmk/keyboards/melody96/keymaps/zunger/keymap.c
index bedb77a4..d396de68 100644
--- a/qmk/keyboards/melody96/keymaps/zunger/keymap.c
+++ b/qmk/keyboards/melody96/keymaps/zunger/keymap.c
@@ -55,58 +55,17 @@ enum layers_keymap {
 // TODO: It would also be nice to be able to put the actual code points in here, rather than
 // numbers.
 
+// Accent marks
+#define CMB_GRV H(0300)
+#define CMB_AGU H(0301)
+#define CMB_DIA H(0308)
+#define CMB_CIR H(0302)
+#define CMB_MAC H(0304)
+#define CMB_CED H(0327)
+#define CMB_TIL H(0303)
+
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* The diagram below shows five rows for each key: from top to bottom, the QWERTY layer, the
-   * GREEK layer, the SHIFTGREEK layer, the CADET layer, and the SHIFTCADET layer. (The single
-   * diagram is to make it easier to see what goes where with this many layers!)
-   *
-   * ,----------------------------------------------------------------------------
-   * | ` |F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|HOM|END|PGU|PGD|MUT|BRK|  QWERTY
-   * | ` | ¹ | ² | ³ | ⁴ | ⁵ | ⁶ | ⁷ | ⁸ | ⁹ | ⁰ | ⁻ | ⁺ | ⁽ | ⁾ |   |   |   |   |  GREEK
-   * | ` | ₁ | ₂ | ₃ | ₄ | ₅ | ₆ | ₇ | ₈ | ₉ | ₀ | ₋ | ₊ | ₍ | ₎ |   |   |   |   |  SHIFTGREEK
-   * | ¬ |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |  CADET
-   * | ∅ |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |  SHIFTCADET
-   * |---------------------------------------------------------------------------|
-   * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | + | BKSPC |LCK| / | * | - |
-   * | ` | ¡ |   | £ |   |   |   |   | ° |   |   | ∝ | ∼ | BKSPC |LCK| ⊘ | ⊙ | ⊖ |
-   * | ` | ¿ |   | € |   |   |   |   |   |   |   |   | ≁ | BKSPC |LCK|   | ⊗ |   |
-   * |   |  ̀ |  ́ |  ̂ |  ̃ |  ̈ |  ̄ |   |   |   |   |   | ± | BKSPC |LCK|   | × |   | [3]
-   * |   |   |   |   |   |   |   |   |   |   |   |   | ∓ | BKSPC |LCK|   |   |   |
-   * |---------------------------------------------------------------------------|
-   * | TAB  | Q | W | E | R | T | Y | U | I | O | P | [ | ] |  \ | 7 | 8 | 9 |   |
-   * |      | θ | ω | ε | ρ | τ | ψ | υ | ι | ο | π |   |   |    |   |   |   |   |
-   * |      | Θ | Ω | Ε | Ρ | Τ | Ψ | Υ | Ι | Ο | Π |   |   |    |   |   |   |   |
-   * |      | ∧ | ∨ | ∩ | ∪ | ⊂ | ⊃ | ∀ | ∞ | ∃ | ∂ | ∈ |   |    | * | * | * |   | [1]
-   * |      | ℚ |   |   | ℝ | ⊆ | ⊇ |   | ℵ | ∄ |   | ∉ |   |    | * | * | * |   |
-   * |-----------------------------------------------------------------------| + |
-   * | CTRL   | A | S | D | F | G | H | J | K | L | ; | ' |  RET | 4 | 5 | 6 | ⊕ |
-   * | CTRL   | α | σ | δ | φ | γ | η | ϑ | κ | λ | ⋯ | ⋅ |  RET |   |   |   |   |
-   * | CTRL   | Α | Σ | Δ | Φ | Γ | Η |   | Κ | Λ | … | ∴ |  RET |   |   |   |   |
-   * | CTRL   | ⟘ | ⊤ | ⊢ | ⊣ | ↑ | ↓ | ← | → | ↔ |   |   |  RET | * | * | * |   | [1]
-   * | CTRL   | Å |   | ∇ |   | ⇑ | ⇓ | ⇐ | ⇒ | ⇔ |   |   |  RET | * | * | * |   |
-   * |-----------------------------------------------------------------------|---|
-   * | SHIFT   | Z | X | C | V | B | N | M | , | . | / |SHFT | ↑ | 1 | 2 | 3 |   |
-   * | SHIFT   | ζ | ξ | χ | ς | β | ν | μ | ≪ | ≫ | ∫ |SHFT |   |   |   |   |   |
-   * | SHIFT   | Ζ | Ξ | Χ | ✔ | Β | Ν | Μ | ≲ | ≳ |   |SHFT |   |   |   |   |   |
-   * | SHIFT   |   |   | ≠ | ≈ | ≡ | ≤ | ≥ |   |   | ÷ |SHFT |   | * | * | * |   | [1]
-   * | SHIFT   | ℤ |   | ℂ | ≉ | ≢ | ℕ |   |   |   |   |SHFT |   | * | * | * |   |
-   * |-----------------------------------------------------------------------|ENT|
-   * | CTL | ALT| CMD|         SPACE         | α | β | γ | ← | ↓ | → | 0 | . |   | [2]
-   * | CTL | ALT| CMD|         SPACE         | α | β | γ |   |   |   |   |   |   |
-   * | CTL | ALT| CMD|         SPACE         | α | β | γ |   |   |   |   |   |   |
-   * | CTL | ALT| CMD|         SPACE         | α | β | γ |   |   |   |   |   |   |
-   * | CTL | ALT| CMD|         SPACE         | α | β | γ |   |   |   |   |   |   |
-   * `---------------------------------------------------------------------------'
-   *
-   * [1] CADET + numpad moves the mouse. SHIFT+CADET+NUMPAD moves it more quickly. CADET+5
-   * clicks the mouse, and SHIFT+CADET+FIVE right-clicks.
-   * [2] The Greek letters in this row are the three modifier keys (GREEK, CADET, FN),
-   * not the Unicode Greek letters.
-   * [3] The accent marks in this row are combining accent marks, which may be put after
-   * a character to combine it. In order, they are grave, acute, circumflex, tilde,
-   * diaresis (umlaut), and macron.
-  */
   // NB: Using GESC for escape in the QWERTY layer as a temporary hack because I messed up the
   // switch on the KC_GRV key; change back to KC_ESC once this is fixed.
 	[_QWERTY] = LAYOUT_hotswap(
@@ -115,10 +74,38 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     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_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_LCTL, KC_LALT, KC_LGUI,                            KC_SPC,                             KC_GREEK,KC_CADET,MO_FN,   KC_LEFT, KC_DOWN, KC_RGHT, KC_P0,   KC_PDOT, KC_PENT),
+    KC_LCTL, KC_LALT, KC_LGUI,                            KC_SPC,                             MO_FN,   KC_GREEK,KC_CADET,KC_LEFT, KC_DOWN, KC_RGHT, KC_P0,   KC_PDOT, KC_PENT),
+  /* The Greek layers. Shown here are the QWERTY layer (for visual reference) and the two Greek
+   * layers.
+   * ,----------------------------------------------------------------------------
+   * | ` |F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|HOM|END|PGU|PGD|MUT|BRK|  QWERTY
+   * | ` | ₁ | ₂ | ₃ | ₄ | ₅ | ₆ | ₇ | ₈ | ₉ | ₀ | ₋ | ₊ | ₍ | ₎ |   |   |   |   |  SHIFTGREEK
+   * | ` | ¹ | ² | ³ | ⁴ | ⁵ | ⁶ | ⁷ | ⁸ | ⁹ | ⁰ | ⁻ | ⁺ | ⁽ | ⁾ |   |   |   |   |  GREEK
+   * |---------------------------------------------------------------------------|
+   * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | + | BKSPC |LCK| / | * | - |
+   * | ` | ¿ |   | € |   |   |   |   |   |   |   |   | ≁ | BKSPC |LCK|   | ⊗ |   |
+   * |   |   |   |   |   |   |   |   |   |   |   | ∝ | ∼ | BKSPC |LCK| ⊘ | ⊙ | ⊖ |
+   * |---------------------------------------------------------------------------|
+   * | TAB  | Q | W | E | R | T | Y | U | I | O | P | [ | ] |  \ | 7 | 8 | 9 |   |
+   * |      | Θ | Ω | Ε | Ρ | Τ | Ψ | Υ | Ι | Ο | Π |   |   |    |   |   |   |   |
+   * |      | θ | ω | ε | ρ | τ | ψ | υ | ι | ο | π |   |   |    |   |   |   |   |
+   * |-----------------------------------------------------------------------| + |
+   * | CTRL   | A | S | D | F | G | H | J | K | L | ; | ' |  RET | 4 | 5 | 6 | ⊕ |
+   * | CTRL   | Α | Σ | Δ | Φ | Γ | Η |   | Κ | Λ | … | ∴ |  RET |   |   |   |   |
+   * | CTRL   | α | σ | δ | φ | γ | η | ϑ | κ | λ | ⋯ | ⋅ |  RET |   |   |   |   |
+   * |-----------------------------------------------------------------------|---|
+   * | SHIFT   | Z | X | C | V | B | N | M | , | . | / |SHFT | ↑ | 1 | 2 | 3 |   |
+   * | SHIFT   | Ζ | Ξ | Χ | ✔ | Β | Ν | Μ | ≲ | ≳ |   |SHFT |   |   |   |   |   |
+   * | SHIFT   | ζ | ξ | χ | ς | β | ν | μ | ≪ | ≫ | ∫ |SHFT |   |   |   |   |   |
+   * |-----------------------------------------------------------------------|ENT|
+   * | CTL | ALT| CMD|         SPACE         | α | β | γ | ← | ↓ | → | 0 | . |   |
+   * | CTL | ALT| CMD|         SPACE         | α | β | γ |   |   |   |   |   |   |
+   * | CTL | ALT| CMD|         SPACE         | α | β | γ |   |   |   |   |   |   |
+   * `---------------------------------------------------------------------------'
+   */
 	[_GREEK] = LAYOUT_hotswap(
     KC_GRV,  H(00b9), H(00b2), H(00b3), H(2074), H(2075), H(2076), H(2077), H(2078), H(2079), H(2070), H(207b), H(207a), H(207d), H(207e), XXXXXXX, XXXXXXX, XXXXXXX, _______,
-    KC_GRV,  H(00a1), _______, H(00a3), _______, _______, _______, _______, H(00b0), _______, _______, H(221d), H(223c),          _______, _______, H(2298), H(2299), H(2296),
+    KC_GRV,  _______, _______, _______, _______, _______, _______, _______, H(00b0), _______, _______, H(221d), H(223c),          _______, _______, H(2298), H(2299), H(2296),
     _______, H(03b8), H(03c9), H(03b5), H(03c1), H(03c4), H(03c8), H(03c5), H(03b9), H(03bf), H(03c0), KC_LBRC, KC_RBRC,          KC_BSLS, KC_P7,   KC_P8,   KC_P9,
     _______, H(03b1), H(03c3), H(03b4), H(03c6), H(03b3), H(03b7), H(03d1), H(03ba), H(03bb), H(22ef), H(22c5),                   _______, KC_P4,   KC_P5,   KC_P6,   H(2295),
     _______,          H(03b6), H(03be), H(03c7), H(03c2), H(03b2), H(03bd), H(03bc), H(226a), H(226b), H(222b), _______,          _______, KC_P1,   KC_P2,   KC_P3,
@@ -130,30 +117,58 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     _______, H(0391), H(03a3), H(0394), H(03a6), H(0393), H(0397), XXXXXXX, H(039a), H(039b), H(2026), H(2234),                   _______, KC_P4,   KC_P5,   KC_P6,   H(2295),
     _______,          H(0396), H(039e), H(03a7), H(2714), H(0392), H(039d), H(039c), H(2272), H(2273), XXXXXXX, _______,          _______, KC_P1,   KC_P2,   KC_P3,
     _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______, KC_P0,   KC_PDOT, KC_PENT),
-  // TODO: Add mouse keys to keypad.
+  /* The Cadet layers. Again, we show the QWERTY layer and the two cadet layers.
+   * ,----------------------------------------------------------------------------
+   * | ` |F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|HOM|END|PGU|PGD|MUT|BRK|  QWERTY
+   * | ∅ |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |  SHIFTCADET
+   * | ¬ |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |   |  CADET
+   * |---------------------------------------------------------------------------|
+   * | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | + | BKSPC |LCK| / | * | - |
+   * | ` | ¡ |   | £ |   |   |   |   | ° |   |   | * | ∓ | BKSPC |LCK|   |   |   |
+   * |   |   |   |   |   |   |   |   |   |   |   |   | ± | BKSPC |LCK|   | × |   |
+   * |---------------------------------------------------------------------------|
+   * | TAB  | Q | W | E | R | T | Y | U | I | O | P | [ | ] |  \ | 7 | 8 | 9 |   |
+   * |      | ℚ |   |   | ℝ | ⊆ | ⊇ |   | ℵ | ∄ |   | ∉ |   |    | * | * | * |   |
+   * |      | ∧ | ∨ | ∩ | ∪ | ⊂ | ⊃ | ∀ | ∞ | ∃ | ∂ | ∈ |   |    | * | * | * |   | [1]
+   * |-----------------------------------------------------------------------| + |
+   * | CTRL   | A | S | D | F | G | H | J | K | L | ; | ' |  RET | 4 | 5 | 6 | ⊕ |
+   * | CTRL   | Å |   | ∇ |   | ⇑ | ⇓ | ⇐ | ⇒ | ⇔ |   |   |  RET | * | * | * |   |
+   * | CTRL   | ⟘ | ⊤ | ⊢ | ⊣ | ↑ | ↓ | ← | → | ↔ |   |   |  RET | * | * | * |   | [1]
+   * |-----------------------------------------------------------------------|---|
+   * | SHIFT   | Z | X | C | V | B | N | M | , | . | / |SHFT | ↑ | 1 | 2 | 3 |   |
+   * | SHIFT   | ℤ | ℂ |   | ≉ | ≢ | ℕ |   |   |   |   |SHFT |   | * | * | * |   |
+   * | SHIFT   |   | ≠ |   | ≈ | ≡ | ≤ | ≥ |   |   | ÷ |SHFT |   | * | * | * |   | [1]
+   * |-----------------------------------------------------------------------|ENT|
+   * | CTL | ALT| CMD|         SPACE         | α | β | γ | ← | ↓ | → | 0 | . |   |
+   * | CTL | ALT| CMD|         SPACE         | α | β | γ |   |   |   |   |   |   |
+   * | CTL | ALT| CMD|         SPACE         | α | β | γ |   |   |   |   |   |   |
+   * `---------------------------------------------------------------------------'
+   * [1] CADET + numpad moves the mouse. SHIFT+CADET+NUMPAD moves it more quickly. CADET+5
+   * clicks the mouse, and SHIFT+CADET+FIVE right-clicks.
+   */
 	[_CADET] = LAYOUT_hotswap(
     H(00AC), KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
-    KC_GRV,  H(0300), H(0301), H(0302), H(0303), H(0308), H(0304), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, H(00b1),          _______, _______, XXXXXXX, H(00d7), XXXXXXX,
+    KC_GRV,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, H(00b1),          _______, _______, XXXXXXX, H(00d7), XXXXXXX,
     _______, H(2227), H(2228), H(2229), H(222a), H(2282), H(2283), H(2200), H(221e), H(2203), H(2202), H(2208), XXXXXXX,          XXXXXXX, KC_P7,   KC_P8,   KC_P9,
     _______, H(22a5), H(22a4), H(22a2), H(22a3), H(2191), H(2193), H(2190), H(2192), H(2194), XXXXXXX, XXXXXXX,                   _______, KC_P4,   KC_P5,   KC_P6,   XXXXXXX,
-    _______,          XXXXXXX, XXXXXXX, H(2260), H(2248), H(2261), H(2264), H(2265), XXXXXXX, XXXXXXX, H(00f7), _______,          _______, KC_P1,   KC_P2,   KC_P3,
+    _______,          XXXXXXX, H(2260), XXXXXXX, H(2248), H(2261), H(2264), H(2265), XXXXXXX, XXXXXXX, H(00f7), _______,          _______, KC_P1,   KC_P2,   KC_P3,
     _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______, KC_P0,   KC_PDOT, KC_PENT),
 	[_SHIFTCADET] = LAYOUT_hotswap(
     H(2205), KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______,
-    KC_GRV,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, H(2213),          _______, _______, XXXXXXX, XXXXXXX, XXXXXXX,
+    KC_GRV,  H(00a1), XXXXXXX, H(00a3), XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, H(2213),          _______, _______, XXXXXXX, XXXXXXX, XXXXXXX,
     _______, H(211a), XXXXXXX, XXXXXXX, H(211d), H(2286), H(2287), XXXXXXX, H(2135), H(2204), XXXXXXX, H(2209), XXXXXXX,          XXXXXXX, KC_P7,   KC_P8,   KC_P9,
     _______, H(212b), XXXXXXX, H(2207), XXXXXXX, H(21d1), H(21d3), H(21d0), H(21d2), H(21d4), XXXXXXX, XXXXXXX,                   _______, KC_P4,   KC_P5,   KC_P6,   XXXXXXX,
-    _______,          H(2124), XXXXXXX, H(2102), H(2249), H(2262), H(2115), XXXXXXX, XXXXXXX, XXXXXXX, H(00f7), _______,          _______, KC_P1,   KC_P2,   KC_P3,
+    _______,          H(2124), H(2102), XXXXXXX, H(2249), H(2262), H(2115), XXXXXXX, XXXXXXX, XXXXXXX, H(00f7), _______,          _______, KC_P1,   KC_P2,   KC_P3,
     _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______, KC_P0,   KC_PDOT, KC_PENT),
 
-  // Function layer is mostly for keyboard meta-control operations. Lots of this is just from the
-  // default layout; TODO make it nicer.
+  // Function layer is mostly for keyboard meta-control operations, but also contains the combining
+  // accent marks. These are deliberately placed to match where the analogous controls go on Mac OS.
 	[_FUNCTION] = LAYOUT_hotswap(
-    RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______,
-    _______, RGB_TOG, _______, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______,          _______, _______, _______, _______,
-    BL_TOGG, _______, _______, UC_M_OS, UC_M_LN, UC_M_WI, UC_M_BS, UC_M_WC, _______, _______, _______, _______,                   _______, _______, _______, _______, _______,
-    _______,          _______, _______, BL_DEC,  BL_TOGG, BL_INC,  _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______,
+    CMB_GRV, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, RESET,
+    CMB_GRV, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _______, _______,
+    _______, _______, _______, CMB_AGU, _______, _______, _______, CMB_DIA, CMB_CIR, CMB_MAC, _______, _______, _______,          _______, _______, _______, _______,
+    _______, _______, _______, UC_M_OS, UC_M_LN, UC_M_WI, UC_M_BS, UC_M_WC, _______, _______, _______, _______,                   _______, _______, _______, _______, _______,
+    _______,          _______, _______, CMB_CED, _______, _______, CMB_TIL, _______, _______, _______, _______, _______,          _______, _______, _______, _______,
     _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______, _______, _______, _______),
 };
 
diff --git a/qmk/keyboards/melody96/melody96.c b/qmk/keyboards/melody96/melody96.c
index 2fe274ee..44e81358 100644
--- a/qmk/keyboards/melody96/melody96.c
+++ b/qmk/keyboards/melody96/melody96.c
@@ -1,23 +1 @@
 #include "melody96.h"
-
-void led_set_kb(uint8_t usb_led) {
-	if (usb_led & (1 << USB_LED_NUM_LOCK)) {
-		DDRC |= (1 << 6); PORTC &= ~(1 << 6);
-	} else {
-		DDRC &= ~(1 << 6); PORTC &= ~(1 << 6);
-	}
-
-	if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
-		DDRC |= (1 << 7); PORTC &= ~(1 << 7);
-	} else {
-		DDRC &= ~(1 << 7); PORTC &= ~(1 << 7);
-	}
-
-	if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
-		DDRB |= (1 << 5); PORTB &= ~(1 << 5);
-	} else {
-		DDRB &= ~(1 << 5); PORTB &= ~(1 << 5);
-	}
-
-    led_set_user(usb_led);
-}
diff --git a/qmk/keyboards/meson/rules.mk b/qmk/keyboards/meson/rules.mk
index 2fe1d154..84ceecb4 100644
--- a/qmk/keyboards/meson/rules.mk
+++ b/qmk/keyboards/meson/rules.mk
@@ -31,4 +31,3 @@ 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
diff --git a/qmk/keyboards/miller/gm862/rules.mk b/qmk/keyboards/miller/gm862/rules.mk
index ed91876f..ed83bd9a 100644
--- a/qmk/keyboards/miller/gm862/rules.mk
+++ b/qmk/keyboards/miller/gm862/rules.mk
@@ -29,6 +29,6 @@ MIDI_ENABLE = no               # MIDI support
 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
-RGB_MATRIX_ENABLE = IS31FL3733 # Use RGB matrix
+RGB_MATRIX_ENABLE = yes        # Use RGB matrix
+RGB_MATRIX_DRIVER = IS31FL3733
 NO_USB_STARTUP_CHECK = no      # Disable initialization only when usb is plugged in
diff --git a/qmk/keyboards/miniaxe/config.h b/qmk/keyboards/miniaxe/config.h
index b0b9d4c4..b16e84e6 100644
--- a/qmk/keyboards/miniaxe/config.h
+++ b/qmk/keyboards/miniaxe/config.h
@@ -197,34 +197,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/miniaxe/rules.mk b/qmk/keyboards/miniaxe/rules.mk
index 7c5ef7d2..6d9ed783 100644
--- a/qmk/keyboards/miniaxe/rules.mk
+++ b/qmk/keyboards/miniaxe/rules.mk
@@ -30,7 +30,6 @@ 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
 
 DEBUG_ENABLE = no
 CUSTOM_MATRIX = no         # Use custom matrix code
diff --git a/qmk/keyboards/minidox/rules.mk b/qmk/keyboards/minidox/rules.mk
index 1446c514..e614f483 100644
--- a/qmk/keyboards/minidox/rules.mk
+++ b/qmk/keyboards/minidox/rules.mk
@@ -29,7 +29,6 @@ MIDI_ENABLE = no            # MIDI support
 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
 
 SPLIT_KEYBOARD = yes
 
diff --git a/qmk/keyboards/minim/config.h b/qmk/keyboards/minim/config.h
new file mode 100644
index 00000000..e13d2b79
--- /dev/null
+++ b/qmk/keyboards/minim/config.h
@@ -0,0 +1,63 @@
+/*
+Copyright 2020 Matthew Dias <matthewdias@me.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 "config_common.h"
+
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0xFEED
+#define PRODUCT_ID      0xAAAA
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Matthew Dias
+#define PRODUCT         minim
+
+/* key matrix size */
+#define MATRIX_ROWS 4
+#define MATRIX_COLS 14
+
+/* minim PCB default pin-out */
+#define MATRIX_ROW_PINS { D6, D7, B4, B5 }
+#define MATRIX_COL_PINS { F4, F5, F6, F1, F7, F0, B0, D1, B1, D2, B2, D3, D5, B3 }
+#define UNUSED_PINS
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
diff --git a/qmk/keyboards/minim/info.json b/qmk/keyboards/minim/info.json
new file mode 100644
index 00000000..a478ccfe
--- /dev/null
+++ b/qmk/keyboards/minim/info.json
@@ -0,0 +1,59 @@
+{
+    "keyboard_name": "minim",
+    "url": "https://github.com/matthewdias/minim",
+    "maintainer": "matthewdias",
+    "width": 14.5,
+    "height": 4,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                { "label": "Tab", "x": 0, "y": 0, "w": 1.25 },
+                { "label": "Q", "x": 1.25, "y": 0 },
+                { "label": "W", "x": 2.25, "y": 0 },
+                { "label": "E", "x": 3.25, "y": 0 },
+                { "label": "R", "x": 4.25, "y": 0 },
+                { "label": "T", "x": 5.25, "y": 0 },
+                { "label": "Y", "x": 6.25, "y": 0 },
+                { "label": "U", "x": 7.25, "y": 0 },
+                { "label": "I", "x": 8.25, "y": 0 },
+                { "label": "O", "x": 9.25, "y": 0 },
+                { "label": "P", "x": 10.25, "y": 0 },
+                { "label": "{", "x": 11.25, "y": 0 },
+                { "label": "}", "x": 12.25, "y": 0 },
+                { "label": "Back", "x": 13.25, "y": 0, "w": 1.25 },
+                { "label": "Ctrl", "x": 0, "y": 1, "w": 1.75 },
+                { "label": "A", "x": 1.75, "y": 1 },
+                { "label": "S", "x": 2.75, "y": 1 },
+                { "label": "D", "x": 3.75, "y": 1 },
+                { "label": "F", "x": 4.75, "y": 1 },
+                { "label": "G", "x": 5.75, "y": 1 },
+                { "label": "H", "x": 6.75, "y": 1 },
+                { "label": "J", "x": 7.75, "y": 1 },
+                { "label": "K", "x": 8.75, "y": 1 },
+                { "label": "L", "x": 9.75, "y": 1 },
+                { "label": ":", "x": 10.75, "y": 1 },
+                { "label": "\"", "x": 11.75, "y": 1 },
+                { "label": "Enter", "x": 12.75, "y": 1, "w": 1.75 },
+                { "label": "Shift", "x": 0, "y": 2, "w": 2.25 },
+                { "label": "Z", "x": 2.25, "y": 2 },
+                { "label": "X", "x": 3.25, "y": 2 },
+                { "label": "C", "x": 4.25, "y": 2 },
+                { "label": "V", "x": 5.25, "y": 2 },
+                { "label": "B", "x": 6.25, "y": 2 },
+                { "label": "N", "x": 7.25, "y": 2 },
+                { "label": "M", "x": 8.25, "y": 2 },
+                { "label": "<", "x": 9.25, "y": 2 },
+                { "label": ">", "x": 10.25, "y": 2 },
+                { "label": "?", "x": 11.25, "y": 2 },
+                { "label": "Shift", "x": 12.25, "y": 2, "w": 2.25 },
+                { "label": "Opt", "x": 1.5, "y": 3 },
+                { "label": "Cmd", "x": 2.5, "y": 3, "w": 1.25 },
+                { "label": "", "x": 3.75, "y": 3, "w": 2 },
+                { "label": "", "x": 5.75, "y": 3, "w": 3 },
+                { "label": "", "x": 8.75, "y": 3, "w": 2 },
+                { "label": "Cmd", "x": 10.75, "y": 3, "w": 1.25 },
+                { "label": "Opt", "x": 12, "y": 3 }
+            ]
+        }
+    }
+}
diff --git a/qmk/keyboards/minim/keymaps/default/keymap.json b/qmk/keyboards/minim/keymaps/default/keymap.json
new file mode 100644
index 00000000..bc7407e9
--- /dev/null
+++ b/qmk/keyboards/minim/keymaps/default/keymap.json
@@ -0,0 +1,24 @@
+{
+  "keyboard": "minim",
+  "keymap": "default",
+  "layout": "LAYOUT",
+  "layers": [
+    [
+      "KC_ESC",       "KC_Q", "KC_W", "KC_E", "KC_R", "KC_T", "KC_Y", "KC_U", "KC_I", "KC_O", "KC_P", "KC_LBRC", "KC_RBRC",       "KC_BSPC", 
+      "LCTL_T(KC_TAB)", "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_LALT", "KC_LGUI",   "MO(2)",             "KC_SPC",             "MO(1)",   "KC_RGUI", "KC_RALT"
+    ],
+    [
+      "KC_GRV",   "KC_MPRV", "KC_MPLY", "KC_MNXT", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_UP", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", 
+      "KC_TRNS",    "KC_VOLD", "KC_VOLU", "KC_MUTE", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_LEFT", "KC_DOWN", "KC_RGHT", "KC_TRNS", "KC_TRNS",      "KC_TRNS", 
+      "KC_TRNS",      "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",             "KC_TRNS", 
+                     "KC_TRNS", "KC_TRNS",   "KC_TRNS",             "KC_TRNS",             "KC_TRNS",   "KC_TRNS", "KC_RALT"
+    ],
+    [
+      "KC_TRNS",       "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_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_RALT"]
+    ]
+}
diff --git a/qmk/keyboards/minim/minim.c b/qmk/keyboards/minim/minim.c
new file mode 100644
index 00000000..aadb26fe
--- /dev/null
+++ b/qmk/keyboards/minim/minim.c
@@ -0,0 +1,18 @@
+/*
+Copyright 2020 Matthew Dias <matthewdias@me.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 "minim.h"
diff --git a/qmk/keyboards/minim/minim.h b/qmk/keyboards/minim/minim.h
new file mode 100644
index 00000000..7a732a8a
--- /dev/null
+++ b/qmk/keyboards/minim/minim.h
@@ -0,0 +1,33 @@
+/*
+Copyright 2020 Matthew Dias <matthewdias@me.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"
+
+#define LAYOUT( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
+    K10, K11, K12, K13, K14, K15, K16,      K18, K19, K1A, K1B, K1C, K1D, \
+    K20,      K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2D, \
+         K31, K32,      K34,           K37,      K39,      K3B, K3C       \
+) \
+{ \
+    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D   }, \
+    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   KC_NO, K18,   K19,   K1A,   K1B,   K1C,   K1D   }, \
+    { K20,   KC_NO, K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   KC_NO, K2D   }, \
+    { KC_NO, K31,   K32,   KC_NO, K34,   KC_NO, KC_NO, K37,   KC_NO, K39,   KC_NO, K3B,   K3C,   KC_NO }  \
+}
diff --git a/qmk/keyboards/minim/readme.md b/qmk/keyboards/minim/readme.md
new file mode 100644
index 00000000..95820c4d
--- /dev/null
+++ b/qmk/keyboards/minim/readme.md
@@ -0,0 +1,21 @@
+# minim
+
+![](https://raw.githubusercontent.com/matthewdias/minim/main/layout.png)
+
+A symmetrical 50% keyboard.
+
+* Keyboard Maintainer: matthewdias
+* Hardware Supported: minim PCB
+* Hardware Availability: [GitHub](https://github.com/matthewdias/minim)
+
+To reset the keyboard into bootloader mode, press the reset switch on the underside.
+
+Make example for this keyboard (after setting up your build environment):
+
+    make minim:default
+
+Flashing example for this keyboard ([using the command line](https://docs.qmk.fm/#/newbs_flashing?id=flash-your-keyboard-from-the-command-line)):
+
+    make minim:default:flash
+
+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).
diff --git a/qmk/keyboards/minim/rules.mk b/qmk/keyboards/minim/rules.mk
new file mode 100644
index 00000000..32981133
--- /dev/null
+++ b/qmk/keyboards/minim/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+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
+# 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 = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
diff --git a/qmk/keyboards/mint60/config.h b/qmk/keyboards/mint60/config.h
index 1b11092e..ccfec853 100644
--- a/qmk/keyboards/mint60/config.h
+++ b/qmk/keyboards/mint60/config.h
@@ -196,30 +196,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
diff --git a/qmk/keyboards/mint60/rules.mk b/qmk/keyboards/mint60/rules.mk
index bd9f3154..d5890941 100644
--- a/qmk/keyboards/mint60/rules.mk
+++ b/qmk/keyboards/mint60/rules.mk
@@ -30,6 +30,5 @@ 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
 
 SPLIT_KEYBOARD = yes
diff --git a/qmk/keyboards/montsinger/rebound/rev1/rules.mk b/qmk/keyboards/montsinger/rebound/rev1/rules.mk
index 9487213e..8846ef1d 100644
--- a/qmk/keyboards/montsinger/rebound/rev1/rules.mk
+++ b/qmk/keyboards/montsinger/rebound/rev1/rules.mk
@@ -26,7 +26,6 @@ MIDI_ENABLE = no            # MIDI support
 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
 
 LAYOUTS = ortho_4x12
 LAYOUTS_HAS_RGB = no
\ No newline at end of file
diff --git a/qmk/keyboards/montsinger/rebound/rev2/rules.mk b/qmk/keyboards/montsinger/rebound/rev2/rules.mk
index f5505e25..1e950486 100644
--- a/qmk/keyboards/montsinger/rebound/rev2/rules.mk
+++ b/qmk/keyboards/montsinger/rebound/rev2/rules.mk
@@ -26,7 +26,6 @@ MIDI_ENABLE = no            # MIDI support
 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
 ENCODER_ENABLE = yes
 
 LAYOUTS = ortho_4x12
diff --git a/qmk/keyboards/montsinger/rebound/rev3/rules.mk b/qmk/keyboards/montsinger/rebound/rev3/rules.mk
index 61e36fc4..07597092 100644
--- a/qmk/keyboards/montsinger/rebound/rev3/rules.mk
+++ b/qmk/keyboards/montsinger/rebound/rev3/rules.mk
@@ -26,7 +26,6 @@ MIDI_ENABLE = no            # MIDI support
 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
 ENCODER_ENABLE = yes
 
 LAYOUTS = ortho_4x12
diff --git a/qmk/keyboards/moon/config.h b/qmk/keyboards/moon/config.h
index a02cfdba..12a949a0 100644
--- a/qmk/keyboards/moon/config.h
+++ b/qmk/keyboards/moon/config.h
@@ -31,6 +31,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_ROWS 8
 #define MATRIX_COLS 11
 
+#define LED_CAPS_LOCK_PIN B5
+#define LED_SCROLL_LOCK_PIN B6
+
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
 
diff --git a/qmk/keyboards/moon/moon.c b/qmk/keyboards/moon/moon.c
index c218bf5e..95ce007e 100644
--- a/qmk/keyboards/moon/moon.c
+++ b/qmk/keyboards/moon/moon.c
@@ -14,56 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "moon.h"
-
-#define CAPS_PIN B5
-#define SCROLL_PIN B6
-
-// 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
-
-  setPinOutput(CAPS_PIN);
-  setPinOutput(SCROLL_PIN);
-
-  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_CAPS_LOCK)) {
-    writePinHigh(CAPS_PIN);
-  } else {
-    writePinLow(CAPS_PIN);
-  }
-
-  if (IS_LED_ON(usb_led, USB_LED_SCROLL_LOCK)) {
-    writePinHigh(SCROLL_PIN);
-  } else {
-    writePinLow(SCROLL_PIN);
-  }
-
-  led_set_user(usb_led);
-}
diff --git a/qmk/keyboards/moon/rules.mk b/qmk/keyboards/moon/rules.mk
index b0628b37..9b6b588c 100644
--- a/qmk/keyboards/moon/rules.mk
+++ b/qmk/keyboards/moon/rules.mk
@@ -30,7 +30,6 @@ 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
 
 # custom matrix setup
 CUSTOM_MATRIX = yes
diff --git a/qmk/keyboards/moonlander/matrix.c b/qmk/keyboards/moonlander/matrix.c
index 872643f6..f5c49b4d 100644
--- a/qmk/keyboards/moonlander/matrix.c
+++ b/qmk/keyboards/moonlander/matrix.c
@@ -21,10 +21,10 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include <string.h>
-#include "hal.h"
+#include <hal.h>
 #include "timer.h"
 #include "wait.h"
-#include "printf.h"
+#include "print.h"
 #include "matrix.h"
 #include "action.h"
 #include "keycode.h"
diff --git a/qmk/keyboards/moonlander/rules.mk b/qmk/keyboards/moonlander/rules.mk
index 63e91fab..12406107 100644
--- a/qmk/keyboards/moonlander/rules.mk
+++ b/qmk/keyboards/moonlander/rules.mk
@@ -20,7 +20,8 @@ AUDIO_ENABLE = yes          # Audio output
 CUSTOM_MATRIX = yes
 DEBOUNCE_TYPE = custom
 SWAP_HANDS_ENABLE = yes
-RGB_MATRIX_ENABLE = IS31FL3731
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = IS31FL3731
 #SERIAL_LINK_ENABLE = yes
 EEPROM_DRIVER = i2c
 
diff --git a/qmk/keyboards/mountainblocks/mb17/rules.mk b/qmk/keyboards/mountainblocks/mb17/rules.mk
index 0bdce956..2ec995cf 100644
--- a/qmk/keyboards/mountainblocks/mb17/rules.mk
+++ b/qmk/keyboards/mountainblocks/mb17/rules.mk
@@ -29,4 +29,3 @@ MIDI_ENABLE = no            # MIDI support
 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
diff --git a/qmk/keyboards/mschwingen/modelm/modelm.c b/qmk/keyboards/mschwingen/modelm/modelm.c
index 5756a951..c1180612 100644
--- a/qmk/keyboards/mschwingen/modelm/modelm.c
+++ b/qmk/keyboards/mschwingen/modelm/modelm.c
@@ -47,19 +47,19 @@ static cRGB led[RGBLED_NUM] = {{255, 255, 255}, {255, 255, 255}, {255, 255, 255}
 
 static const cRGB black = {.r = 0, .g = 0, .b = 0};
 
-static const cRGB green  = {.r = 0, .g = BRIGHT, .b = 0};
-static const cRGB lgreen = {.r = 0, .g = DIM, .b = 0};
+static const __attribute__((unused)) cRGB green  = {.r = 0, .g = BRIGHT, .b = 0};
+static const __attribute__((unused)) cRGB lgreen = {.r = 0, .g = DIM, .b = 0};
 
-static const cRGB red  = {.r = BRIGHT, .g = 0, .b = 0};
-static const cRGB lred = {.r = DIM, .g = 0, .b = 0};
+static const __attribute__((unused)) cRGB red  = {.r = BRIGHT, .g = 0, .b = 0};
+static const __attribute__((unused)) cRGB lred = {.r = DIM, .g = 0, .b = 0};
 
-static const cRGB blue  = {.r = 0, .g = 0, .b = BRIGHT};
-static const cRGB lblue = {.r = 0, .g = 0, .b = DIM};
+static const __attribute__((unused)) cRGB blue  = {.r = 0, .g = 0, .b = BRIGHT};
+static const __attribute__((unused)) cRGB lblue = {.r = 0, .g = 0, .b = DIM};
 
-static const cRGB turq  = {.r = 0, .g = BRIGHT, .b = BRIGHT};
-static const cRGB lturq = {.r = 0, .g = DIM, .b = DIM};
+static const __attribute__((unused)) cRGB turq  = {.r = 0, .g = BRIGHT, .b = BRIGHT};
+static const __attribute__((unused)) cRGB lturq = {.r = 0, .g = DIM, .b = DIM};
 
-static const cRGB white = {.r = BRIGHT, .g = BRIGHT, .b = BRIGHT};
+static const __attribute__((unused)) cRGB white = {.r = BRIGHT, .g = BRIGHT, .b = BRIGHT};
 
 static led_t   led_state;
 static uint8_t layer;
diff --git a/qmk/keyboards/mt64rgb/config.h b/qmk/keyboards/mt64rgb/config.h
new file mode 100644
index 00000000..8574d723
--- /dev/null
+++ b/qmk/keyboards/mt64rgb/config.h
@@ -0,0 +1,102 @@
+/* Copyright 2020 MT 
+  * 
+  * 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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x4D54  // "MT"
+#define PRODUCT_ID      0x0001
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    MT
+#define PRODUCT         MT64RGB
+
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 14
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+ */
+#define MATRIX_ROW_PINS { D7, D6, D5, D3, D2 }
+#define MATRIX_COL_PINS {B5, B6, C6, C7, F7, F6,F5, F4, F1, F0, B1, B2, B3, B7 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+#ifdef RGB_MATRIX_ENABLE
+#define RGB_MATRIX_KEYPRESSES
+#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+#define RGB_MATRIX_STARTUP_VAL RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 160
+#define RGB_MATRIX_LED_PROCESS_LIMIT 20
+#define RGB_MATRIX_LED_FLUSH_LIMIT 26
+#define DRIVER_ADDR_1 0b1010000
+#define DRIVER_ADDR_2 0b1010000
+
+#define DRIVER_COUNT 2
+#define DRIVER_1_LED_TOTAL 64
+#define DRIVER_LED_TOTAL DRIVER_1_LED_TOTAL
+	
+
+#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE	
+#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS	
+#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS	
+#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS	
+#define DISABLE_RGB_MATRIX_BAND_SAT
+#define DISABLE_RGB_MATRIX_BAND_VAL
+#define DISABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#define DISABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#define DISABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#define DISABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#define DISABLE_RGB_MATRIX_DIGITAL_RAIN
+#define DISABLE_RGB_MATRIX_TYPING_HEATMAP
+#define DISABLE_RGB_MATRIX_RAINBOW_BEACON
+#define DISABLE_RGB_MATRIX_ALPHAS_MODS
+#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#define DISABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
+
+#endif
+
+#define RGB_DI_PIN B0
+#ifdef RGB_DI_PIN
+#define RGBLIGHT_ANIMATIONS
+#define RGBLED_NUM 18
+#define RGBLIGHT_HUE_STEP 5
+#define RGBLIGHT_SAT_STEP 5
+#define RGBLIGHT_VAL_STEP 5
+#define RGBLIGHT_SLEEP
+#endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+/* VIA related config */
+#define VIA_EEPROM_LAYOUT_OPTIONS_SIZE 2
diff --git a/qmk/keyboards/mt64rgb/info.json b/qmk/keyboards/mt64rgb/info.json
new file mode 100644
index 00000000..21fc948d
--- /dev/null
+++ b/qmk/keyboards/mt64rgb/info.json
@@ -0,0 +1,12 @@
+{
+    "keyboard_name": "mt64rgb", 
+    "url": "", 
+    "maintainer": "qmk", 
+    "width": 15, 
+    "height": 5, 
+    "layouts": {
+        "LAYOUT_64_ansi": {
+            "layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"Backspace", "x":13, "y":0, "w":2}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Shift", "x":0, "y":3, "w":2}, {"label":"Z", "x":2, "y":3}, {"label":"X", "x":3, "y":3}, {"label":"C", "x":4, "y":3}, {"label":"V", "x":5, "y":3}, {"label":"B", "x":6, "y":3}, {"label":"N", "x":7, "y":3}, {"label":"M", "x":8, "y":3}, {"label":"<", "x":9, "y":3}, {"label":">", "x":10, "y":3}, {"label":"?", "x":11, "y":3}, {"label":"Shift", "x":12, "y":3}, {"x":13, "y":3}, {"x":14, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.25}, {"label":"Win", "x":1.25, "y":4, "w":1.25}, {"label":"Alt", "x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4}, {"x":13, "y":4}, {"x":14, "y":4}]
+        }
+    }
+}
diff --git a/qmk/keyboards/mt64rgb/keymaps/default/keymap.c b/qmk/keyboards/mt64rgb/keymaps/default/keymap.c
new file mode 100644
index 00000000..c7e027ba
--- /dev/null
+++ b/qmk/keyboards/mt64rgb/keymaps/default/keymap.c
@@ -0,0 +1,46 @@
+/* Copyright 2020 MT 
+  * 
+  * 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_64_ansi(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+        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_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_DEL,
+        KC_LCTL,  KC_LALT, KC_LWIN,                     KC_SPC,                          MO(1),  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+                        ),
+  [1] = LAYOUT_64_ansi(
+        _______,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,    KC_F6,    KC_F7,   KC_F8,   KC_F9  , KC_F10, KC_F11,    KC_F12,   _______,
+        _______, _______,_______,_______, _______,_______,  _______, _______,_______,_______, _______,_______,_______, _______,
+        RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, _______, _______,_______, _______,
+        _______,  RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, RGB_M_T, _______,_______,_______,_______,
+        _______,  _______,  _______, _______,    _______, _______,  _______, _______, _______
+                      )
+};
+
+void rgb_matrix_indicators_user(void) {
+    if (!g_suspend_state && layer_state_is(1)) {
+        rgb_matrix_set_color(77,0xFF, 0x80, 0x00);
+    }
+    if (host_keyboard_led_state().caps_lock) {
+          rgb_matrix_set_color(28, 0xFF, 0xFF, 0xFF);
+    }
+}
diff --git a/qmk/keyboards/mt64rgb/keymaps/default/readme.md b/qmk/keyboards/mt64rgb/keymaps/default/readme.md
new file mode 100644
index 00000000..5508f7df
--- /dev/null
+++ b/qmk/keyboards/mt64rgb/keymaps/default/readme.md
@@ -0,0 +1,3 @@
+# Default mt4rgb Layout
+
+This is the default layout that comes flashed on every mt64rgb. All key pins are shown in the file.
diff --git a/qmk/keyboards/mt64rgb/keymaps/via/keymap.c b/qmk/keyboards/mt64rgb/keymaps/via/keymap.c
new file mode 100644
index 00000000..a182e1a6
--- /dev/null
+++ b/qmk/keyboards/mt64rgb/keymaps/via/keymap.c
@@ -0,0 +1,54 @@
+ /* Copyright 2020 MT<704340378@qq.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 QMK_KEYBOARD_H
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	[0] =LAYOUT_64_ansi(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+        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_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_DEL,
+        KC_LCTL,    KC_LALT, KC_LWIN,              KC_SPC,                                          MO(1),                   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+                        ),
+	[1]   =LAYOUT_64_ansi(
+		KC_GRV,  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_DEL,
+		KC_TRNS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, RGB_SAI, RGB_SAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, RESET,
+		KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  BL_TOGG, BL_INC,  BL_STEP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,RGB_VAI, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, KC_TRNS, RGB_MOD, RGB_HUI, RGB_VAD, RGB_HUD),
+	[2] = LAYOUT_64_ansi(
+		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, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, 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),
+	[3] = LAYOUT_64_ansi(
+		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, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, 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 rgb_matrix_indicators_user(void) {
+    if (!g_suspend_state && layer_state_is(1)) {
+        rgb_matrix_set_color(77,0xFF, 0x80, 0x00);
+    }
+    if (host_keyboard_led_state().caps_lock) {
+          rgb_matrix_set_color(28, 0xFF, 0xFF, 0xFF);
+    }
+}
diff --git a/qmk/keyboards/mt64rgb/keymaps/via/rules.mk b/qmk/keyboards/mt64rgb/keymaps/via/rules.mk
new file mode 100644
index 00000000..ca9fed0e
--- /dev/null
+++ b/qmk/keyboards/mt64rgb/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+LTO_ENABLE = yes
+VIA_ENABLE = yes
diff --git a/qmk/keyboards/mt64rgb/mt64rgb.c b/qmk/keyboards/mt64rgb/mt64rgb.c
new file mode 100644
index 00000000..73f0e562
--- /dev/null
+++ b/qmk/keyboards/mt64rgb/mt64rgb.c
@@ -0,0 +1,116 @@
+ /* Copyright 2020 MT
+  * 
+  * 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 "mt64rgb.h"
+
+#ifdef RGB_MATRIX_ENABLE
+const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
+ /* Refer to IS31 manual for these locations
+ *   driver
+ *   |  R location
+ *   |  |      G location
+ *   |  |      |      B location
+ *   |  |      |      | */
+
+   {0, A_1,   B_1,   C_1},
+   {0, D_1,   E_1,   F_1},
+   {0, G_1,   H_1,   I_1},
+   {0, J_1,   K_1,   L_1},
+   {0, A_6,   B_6,   C_6},
+   {0, D_6,   E_6,   F_6},
+   {0, G_6,   H_6,   I_6},
+   {0, J_6,   K_6,   L_6},
+   {0, A_11,   B_11,   C_11},
+   {0, D_11,   E_11,   F_11},
+   {0, G_11,   H_11,   I_11},
+   {0, J_11,   K_11,   L_11},
+   {0, A_16,   B_16,   C_16},
+   {0, D_16,   E_16,   F_16},
+    	
+   {0, A_2,   B_2,   C_2},
+   {0, D_2,   E_2,   F_2},
+   {0, G_2,   H_2,   I_2},
+   {0, J_2,   K_2,   L_2},
+   {0, A_7,   B_7,   C_7},
+   {0, D_7,   E_7,   F_7},
+   {0, G_7,   H_7,   I_7},
+   {0, J_7,   K_7,   L_7},
+   {0, A_12,   B_12,   C_12},
+   {0, D_12,   E_12,   F_12},
+   {0, G_12,   H_12,   I_12},
+   {0, J_12,   K_12,   L_12},
+   {0, G_16,   H_16,   I_16},
+    {0, J_16,   K_16,   L_16},
+
+   {0, A_3,   B_3,   C_3},
+   {0, D_3,   E_3,   F_3},
+   {0, G_3,   H_3,   I_3},
+   {0, J_3,   K_3,   L_3},
+   {0, A_8,   B_8,   C_8},
+   {0, D_8,   E_8,   F_8},
+   {0, G_8,   H_8,   I_8},
+   {0, J_8,   K_8,   L_8},
+   {0, A_13,   B_13,   C_13},
+   {0, D_13,   E_13,   F_13},
+   {0, G_13,   H_13,   I_13},
+   {0, J_13,   K_13,   L_13},
+   {0, A_15,   B_15,   C_15},
+
+   {0, A_4,   B_4,   C_4},
+   {0, D_4,   E_4,   F_4},
+   {0, G_4,   H_4,   I_4},
+   {0, J_4,   K_4,   L_4},
+   {0, A_9,   B_9,   C_9},
+   {0, D_9,   E_9,   F_9},
+   {0, G_9,   H_9,   I_9},
+   {0, J_9,   K_9,   L_9},
+   {0, A_14,   B_14,   C_14},
+   {0, D_14,   E_14,   F_14},
+   {0, G_14,   H_14,   I_14},
+   {0, J_14,   K_14,   L_14},
+   {0, D_15,   E_15,   F_15},
+   {0, G_15,   H_15,   I_15},
+
+   {0, A_5,   B_5,   C_5},
+   {0, D_5,   E_5,   F_5},
+   {0, G_5,   H_5,   I_5},
+   {0, J_5,   K_5,   L_5},
+   {0, A_10,   B_10,   C_10},
+   {0, D_10,  E_10,  F_10},
+   {0, G_10,  H_10,  I_10},
+   {0, J_10,  K_10,  L_10},
+   {0, J_15,  K_15,  L_15}
+};
+
+led_config_t g_led_config = {{
+    {  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13 },
+    { 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27 },
+    { 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40},
+    { 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54 },
+    { 55, 56, 57, 58, 59, 60, 61, 62, 63}
+}, {
+    {   0,  0 }, {  16,  0 }, {  32,  0 }, {  48,  0 }, {  64,  0 }, { 80,  0 }, { 96,  0 }, { 112,  0 }, { 128,  0 }, { 144,  0 }, { 160,  0 }, { 176,  0 }, { 192,  0 }, { 216,  0 },
+    {   4, 16 }, {  18, 16 }, {  34, 16 }, {  50, 16 }, {  66, 16 }, { 82, 16 }, { 98, 16 }, { 114, 16 }, { 130, 16 }, { 146, 16 }, { 162, 16 }, { 178, 16 }, { 194,  16 }, { 220,  16 },
+    {   6, 32 }, {  20, 32 }, {  36, 32 }, {  52, 32 }, {  68, 32 }, { 84, 32 }, { 100, 32 }, { 116, 32 }, { 132, 32 }, { 148, 32 }, { 164, 32 }, { 180, 32 }, { 212,  32 },
+    {   9, 48 }, {  27, 48 }, {  43, 48 }, {  59, 48 }, {  75, 48 }, { 91, 48 }, { 107, 48 }, { 123, 48 }, { 139, 48 }, { 155, 48 }, { 171, 48 }, { 187, 48 }, { 203,  48 }, { 219,  48 },
+    {   2, 64 }, {  16, 64 }, {  32, 64 }, {  64, 64 },  { 114, 64 }, { 130, 64 }, { 146, 64 }, { 204, 64 }, { 224, 64 }
+}, {
+    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+    1, 1, 1,         4,              1, 1, 4, 4, 4,
+}};
+#endif
diff --git a/qmk/keyboards/mt64rgb/mt64rgb.h b/qmk/keyboards/mt64rgb/mt64rgb.h
new file mode 100644
index 00000000..dac98dfe
--- /dev/null
+++ b/qmk/keyboards/mt64rgb/mt64rgb.h
@@ -0,0 +1,33 @@
+ /* Copyright 2020 MT
+  * 
+  * 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_64_ansi( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, K0B, K0C, K0D, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C,      \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, \
+    k40, k41, k42,         k45,                             k48, k4A, k4B, k4C, k4D \
+) \
+{ \
+    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, K0B, K0C, K0D}, \
+    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D}, \
+    {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C,  KC_NO}, \
+    {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D}, \
+    {k40, k41, k42, KC_NO, KC_NO, k45, KC_NO, KC_NO,KC_NO, k48,  k4A, k4B, k4C, k4D} \
+}
diff --git a/qmk/keyboards/mt64rgb/readme.md b/qmk/keyboards/mt64rgb/readme.md
new file mode 100644
index 00000000..dcc94123
--- /dev/null
+++ b/qmk/keyboards/mt64rgb/readme.md
@@ -0,0 +1,16 @@
+# mt64rgb 
+
+![mt64rgb](https://i.imgur.com/kxGGUg9.jpg?1)
+
+A 60% keyboard PCB made by MT.
+It supports an ANSI-based 64-key layout, with hotswap sockets and per-key RGB backlight.
+
+* Keyboard Maintainer: [MT](https://github.com/704340378)
+* Hardware Supported: mt64rgb (atmega32u4)
+* Hardware Availability: [麦田外设](https://shop110310565.taobao.com)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make mt64rgb: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).
diff --git a/qmk/keyboards/mt64rgb/rules.mk b/qmk/keyboards/mt64rgb/rules.mk
new file mode 100644
index 00000000..08450b37
--- /dev/null
+++ b/qmk/keyboards/mt64rgb/rules.mk
@@ -0,0 +1,27 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite      # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no      # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # 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 = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+RGB_MATRIX_ENABLE = yes     # Use RGB matrix
+RGB_MATRIX_DRIVER = IS31FL3733
+
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+
+LAYOUTS = 64_ansi
diff --git a/qmk/keyboards/mt84/config.h b/qmk/keyboards/mt84/config.h
new file mode 100644
index 00000000..66460a9f
--- /dev/null
+++ b/qmk/keyboards/mt84/config.h
@@ -0,0 +1,107 @@
+ /* Copyright 2020  MT <704340378@qq.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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x4D54  // "MT"
+#define PRODUCT_ID      0x0002
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    MT
+#define PRODUCT         MT84
+
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 15
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+ */
+#define MATRIX_ROW_PINS { D7, D6, D5, D3, D2, D4 }
+#define MATRIX_COL_PINS {B5, B6, C6, C7, F7, F6,F5, F4, F1, F0, B1, B2, B3, B7, E6 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+#ifdef RGB_MATRIX_ENABLE
+	#define RGB_MATRIX_KEYPRESSES
+	#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+	#define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
+    #define RGB_MATRIX_STARTUP_MODE RGB_MATRIX_CYCLE_ALL
+	#define RGB_MATRIX_LED_PROCESS_LIMIT 20
+	#define RGB_MATRIX_LED_FLUSH_LIMIT 26
+	#define DRIVER_ADDR_1 0b1010000
+	#define DRIVER_ADDR_2 0b1011111
+
+	
+
+    #define DRIVER_COUNT 2
+	#define DRIVER_1_LED_TOTAL 44
+	#define DRIVER_2_LED_TOTAL 40
+	#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
+	
+    
+    #define DISABLE_RGB_MATRIX_ALPHAS_MODS
+	#define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+	#define DISABLE_RGB_MATRIX_BREATHING
+	#define DISABLE_RGB_MATRIX_BAND_SAT
+	#define DISABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+	#define DISABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+	#define DISABLE_RGB_MATRIX_RAINDROPS
+	#define DISABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+	#define DISABLE_RGB_MATRIX_TYPING_HEATMAP
+	#define DISABLE_RGB_MATRIX_DIGITAL_RAIN
+	#define DISABLE_RGB_MATRIX_SOLID_REACTIVE
+	#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+	#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+	#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+	#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+	#define DISABLE_RGB_MATRIX_SPLASH
+	#define DISABLE_RGB_MATRIX_SOLID_SPLASH
+	#define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH
+#endif
+
+#define RGB_DI_PIN B0
+#ifdef RGB_DI_PIN
+//    define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_BREATHING
+#    define RGBLED_NUM 18
+#    define RGBLIGHT_HUE_STEP 8
+#    define RGBLIGHT_SAT_STEP 8
+#    define RGBLIGHT_VAL_STEP 8
+#    define RGBLIGHT_SLEEP
+#endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
diff --git a/qmk/keyboards/mt84/info.json b/qmk/keyboards/mt84/info.json
new file mode 100644
index 00000000..f9486253
--- /dev/null
+++ b/qmk/keyboards/mt84/info.json
@@ -0,0 +1,12 @@
+{
+    "keyboard_name": "mt84", 
+    "url": "", 
+    "maintainer": "qmk", 
+    "width": 16, 
+    "height": 6, 
+    "layouts": {
+       "LAYOUT_75_ansi": {
+            "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"F1", "x":1, "y":0}, {"label":"F2", "x":2, "y":0}, {"label":"F3", "x":3, "y":0}, {"label":"F4", "x":4, "y":0}, {"label":"F5", "x":5, "y":0}, {"label":"F6", "x":6, "y":0}, {"label":"F7", "x":7, "y":0}, {"label":"F8", "x":8, "y":0}, {"label":"F9", "x":9, "y":0}, {"label":"F10", "x":10, "y":0}, {"label":"F11", "x":11, "y":0}, {"label":"F12", "x":12, "y":0}, {"label":"PrtSc", "x":13, "y":0}, {"label":"Pause", "x":14, "y":0}, {"label":"Delete", "x":15, "y":0}, {"label":"~", "x":0, "y":1}, {"label":"!", "x":1, "y":1}, {"label":"@", "x":2, "y":1}, {"label":"#", "x":3, "y":1}, {"label":"$", "x":4, "y":1}, {"label":"%", "x":5, "y":1}, {"label":"^", "x":6, "y":1}, {"label":"&", "x":7, "y":1}, {"label":"*", "x":8, "y":1}, {"label":"(", "x":9, "y":1}, {"label":")", "x":10, "y":1}, {"label":"_", "x":11, "y":1}, {"label":"+", "x":12, "y":1}, {"label":"Backspace", "x":13, "y":1, "w":2}, {"label":"Home", "x":15, "y":1}, {"label":"Tab", "x":0, "y":2, "w":1.5}, {"label":"Q", "x":1.5, "y":2}, {"label":"W", "x":2.5, "y":2}, {"label":"E", "x":3.5, "y":2}, {"label":"R", "x":4.5, "y":2}, {"label":"T", "x":5.5, "y":2}, {"label":"Y", "x":6.5, "y":2}, {"label":"U", "x":7.5, "y":2}, {"label":"I", "x":8.5, "y":2}, {"label":"O", "x":9.5, "y":2}, {"label":"P", "x":10.5, "y":2}, {"label":"{", "x":11.5, "y":2}, {"label":"}", "x":12.5, "y":2}, {"label":"|", "x":13.5, "y":2, "w":1.5}, {"label":"Page Up", "x":15, "y":2}, {"label":"Caps Lock", "x":0, "y":3, "w":1.75}, {"label":"A", "x":1.75, "y":3}, {"label":"S", "x":2.75, "y":3}, {"label":"D", "x":3.75, "y":3}, {"label":"F", "x":4.75, "y":3}, {"label":"G", "x":5.75, "y":3}, {"label":"H", "x":6.75, "y":3}, {"label":"J", "x":7.75, "y":3}, {"label":"K", "x":8.75, "y":3}, {"label":"L", "x":9.75, "y":3}, {"label":":", "x":10.75, "y":3}, {"label":"\"", "x":11.75, "y":3}, {"label":"Enter", "x":12.75, "y":3, "w":2.25}, {"label":"Page Down", "x":15, "y":3}, {"label":"Shift", "x":0, "y":4, "w":2.25}, {"label":"Z", "x":2.25, "y":4}, {"label":"X", "x":3.25, "y":4}, {"label":"C", "x":4.25, "y":4}, {"label":"V", "x":5.25, "y":4}, {"label":"B", "x":6.25, "y":4}, {"label":"N", "x":7.25, "y":4}, {"label":"M", "x":8.25, "y":4}, {"label":"<", "x":9.25, "y":4}, {"label":">", "x":10.25, "y":4}, {"label":"?", "x":11.25, "y":4}, {"label":"Shift", "x":12.25, "y":4, "w":1.75}, {"label":"\u2191", "x":14, "y":4}, {"label":"End", "x":15, "y":4}, {"label":"Ctrl", "x":0, "y":5, "w":1.25}, {"label":"Win", "x":1.25, "y":5, "w":1.25}, {"label":"Alt", "x":2.5, "y":5, "w":1.25}, {"x":3.75, "y":5, "w":6.25}, {"label":"Alt", "x":10, "y":5}, {"label":"Fn", "x":11, "y":5}, {"label":"Ctrl", "x":12, "y":5}, {"label":"\u2190", "x":13, "y":5}, {"label":"\u2193", "x":14, "y":5}, {"label":"\u2192", "x":15, "y":5}]
+        }
+    }
+}
diff --git a/qmk/keyboards/mt84/keymaps/default/keymap.c b/qmk/keyboards/mt84/keymaps/default/keymap.c
new file mode 100644
index 00000000..fc8481da
--- /dev/null
+++ b/qmk/keyboards/mt84/keymaps/default/keymap.c
@@ -0,0 +1,57 @@
+ /* Copyright 2020 mt<704340378@qq.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 QMK_KEYBOARD_H
+
+
+
+enum mt84_layers {
+    _DEFAULT,
+    _FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    [_DEFAULT] = LAYOUT_75_ansi(
+    	 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_PSCREEN, KC_PAUSE, KC_DELETE,
+        KC_GRAVE,  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_HOME,
+        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_PGUP,
+        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_PGDOWN,
+        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_END,
+        KC_LCTL,    KC_LALT, KC_LWIN,              KC_SPC,                                          MO(1),  KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+                        ),
+   [_FN]   = LAYOUT_75_ansi(
+      	 _______,  _______,  _______, _______,    _______, _______,  _______, _______, _______,  _______, _______,    _______, _______,  _______, _______,_______,
+      	 _______,  _______,  _______, _______,    _______, _______,  _______, _______, _______,  _______, _______,    _______, _______,  _______, _______,
+      	 _______,  _______,  _______, _______,    _______, _______,  _______, _______, _______,  _______, _______,    _______, _______,  _______, _______,
+        RGB_TOG, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, _______, _______,_______, _______,_______,
+        _______,  RGB_M_P, RGB_M_B, RGB_M_R, RGB_M_SW, RGB_M_SN, RGB_M_K, RGB_M_X, RGB_M_G, RGB_M_T, _______,_______,_______,_______,
+        _______,  _______,  _______,                        _______,                                                                     KC_TRNS, _______,  _______, _______, _______, _______
+                      )
+};
+
+void rgb_matrix_indicators_user(void) {
+	led_t led_state = host_keyboard_led_state();
+	  if (!g_suspend_state) {
+	    switch (get_highest_layer(layer_state)) {
+	      case _FN:
+	        rgb_matrix_set_color(77,0xFF, 0x80, 0x00);
+          break;
+      }
+    }
+    if (led_state.caps_lock) {
+          rgb_matrix_set_color(46, 0xFF, 0xFF, 0xFF);
+    }
+}
diff --git a/qmk/keyboards/mt84/keymaps/via/keymap.c b/qmk/keyboards/mt84/keymaps/via/keymap.c
new file mode 100644
index 00000000..3a92e9b9
--- /dev/null
+++ b/qmk/keyboards/mt84/keymaps/via/keymap.c
@@ -0,0 +1,48 @@
+ /* Copyright 2020 MaiKong<704340378@qq.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 QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	LAYOUT_75_ansi(
+    	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_PSCREEN, KC_PAUSE, KC_DELETE,
+        KC_GRAVE,  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_HOME,
+        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_PGUP,
+        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_PGDOWN,
+        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_END,
+        KC_LCTL,    KC_LALT, KC_LWIN,              KC_SPC,                                          MO(1),  KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+	LAYOUT_75_ansi(
+		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, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, 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_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, BL_DEC,  BL_TOGG, BL_INC,  BL_STEP, 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),
+	LAYOUT_75_ansi(
+		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, 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),
+	LAYOUT_75_ansi(
+		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, 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),
+};
diff --git a/qmk/keyboards/mt84/keymaps/via/rules.mk b/qmk/keyboards/mt84/keymaps/via/rules.mk
new file mode 100644
index 00000000..ca9fed0e
--- /dev/null
+++ b/qmk/keyboards/mt84/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+LTO_ENABLE = yes
+VIA_ENABLE = yes
diff --git a/qmk/keyboards/mt84/mt84.c b/qmk/keyboards/mt84/mt84.c
new file mode 100644
index 00000000..d9f509e1
--- /dev/null
+++ b/qmk/keyboards/mt84/mt84.c
@@ -0,0 +1,140 @@
+ /* Copyright 2020 MT<704340378@qq.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 "mt84.h"
+
+#ifdef RGB_MATRIX_ENABLE
+const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
+ /* Refer to IS31 manual for these locations
+ *   driver
+ *   |  R location
+ *   |  |      G location
+ *   |  |      |      B location
+ *   |  |      |      | */
+
+   {0, A_11,   B_11,   C_11},
+   {0, D_11,   E_11,   F_11},
+   {0, G_11,   H_11,   I_11},
+   {0, J_11,   K_11,   L_11},
+   {0, A_12,   B_12,   C_12},
+   {0, D_12,   E_12,   F_12},
+   {0, G_12,   H_12,   I_12},
+   {0, J_12,   K_12,   L_12},
+   {1, A_11,   B_11,   C_11},
+   {1, D_11,   E_11,   F_11},
+   {1, G_11,   H_11,   I_11},
+   {1, J_11,   K_11,   L_11},
+   {1, A_12,   B_12,   C_12},
+   {1, D_12,   E_12,   F_12},
+   {1, G_12,   H_12,   I_12},
+   {1, J_12,   K_12,   L_12},
+       
+   {0, A_1,   B_1,   C_1},
+   {0, D_1,   E_1,   F_1},
+   {0, G_1,   H_1,   I_1},
+   {0, J_1,   K_1,   L_1},
+   {0, A_6,   B_6,   C_6},
+   {0, D_6,   E_6,   F_6},
+   {0, G_6,   H_6,   I_6},
+   {0, J_6,   K_6,   L_6},
+   {1, A_1,   B_1,   C_1},
+   {1, D_1,   E_1,   F_1},
+   {1, G_1,   H_1,   I_1},
+   {1, J_1,   K_1,   L_1},
+   {1, A_6,   B_6,   C_6},
+   {1, D_6,   E_6,   F_6},
+   {1, G_6,   H_6,   I_6},
+
+   {0, A_2,   B_2,   C_2},
+   {0, D_2,   E_2,   F_2},
+   {0, G_2,   H_2,   I_2},
+   {0, J_2,   K_2,   L_2},
+   {0, A_7,   B_7,   C_7},
+   {0, D_7,   E_7,   F_7},
+   {0, G_7,   H_7,   I_7},
+   {0, J_7,   K_7,   L_7},
+   {1, A_2,   B_2,   C_2},
+   {1, D_2,   E_2,   F_2},
+   {1, G_2,   H_2,   I_2},
+   {1, J_2,   K_2,   L_2},
+   {1, A_7,   B_7,   C_7},
+   {1, D_7,   E_7,   F_7},
+   {1, G_7,   H_7,   I_7},
+       
+   {0, A_3,   B_3,   C_3},
+   {0, D_3,   E_3,   F_3},
+   {0, G_3,   H_3,   I_3},
+   {0, J_3,   K_3,   L_3},
+   {0, A_8,   B_8,   C_8},
+   {0, D_8,   E_8,   F_8},
+   {0, G_8,   H_8,   I_8},
+   {0, J_8,   K_8,   L_8},
+   {1, A_3,   B_3,   C_3},
+   {1, D_3,   E_3,   F_3},
+   {1, G_3,   H_3,   I_3},
+   {1, J_3,   K_3,   L_3},
+   {1, A_8,   B_8,   C_8},
+   {1, G_8,   H_8,   I_8},
+       
+   {0, A_4,   B_4,   C_4},
+   {0, D_4,   E_4,   F_4},
+   {0, G_4,   H_4,   I_4},
+   {0, J_4,   K_4,   L_4},
+   {0, A_9,   B_9,   C_9},
+   {0, D_9,   E_9,   F_9},
+   {0, G_9,   H_9,   I_9},
+   {0, J_9,   K_9,   L_9},
+   {1, A_4,   B_4,   C_4},
+   {1, D_4,   E_4,   F_4},
+   {1, G_4,   H_4,   I_4},
+   {1, J_4,   K_4,   L_4},
+   {1, A_9,   B_9,   C_9},
+   {1, G_9,   H_9,   I_9},
+
+   {0, A_5,   B_5,   C_5},
+   {0, D_5,   E_5,   F_5},
+   {0, G_5,   H_5,   I_5},
+   {0, D_10,  E_10,  F_10},
+   {1, D_5,   E_5,   F_5},
+   {1, G_5,   H_5,   I_5},
+   {1, J_5,   K_5,   L_5},
+   {1, A_10,  B_10,  C_10},
+   {1, D_10,  E_10,  F_10},
+   {1, G_10,   H_10,   I_10}
+};
+
+led_config_t g_led_config = {{
+    {  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14 },
+    { 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27,  28, 29 },
+    { 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44 },
+    { 45, 46, 47, 48, 49, 50, 51, 52, 53, 54,  55, 56, 57, 58 },
+    { 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73 },
+    {74, 75, 76, 77, 78, 79, 80, 81, 82, 83 }
+}, {
+    {   0,  0 }, {  15,  0 }, {  30,  0 }, {  45,  0 }, {  60,  0 }, { 75,  0 }, { 90,  0 }, { 105,  0 }, { 120,  0 }, { 135,  0 }, { 150,  0 }, { 165,  0 }, { 180,  0 }, { 195,  0 }, { 210,  0 }, { 224,  0 },
+    {   0,  13 }, {  15,  13 }, {  30,  13 }, {  45,  13 }, {  60,  13 }, { 75,  13 }, { 90,  13 }, { 105,  13 }, { 120,  13 }, { 135,  13 }, { 150,  13 }, { 165,  13 }, { 180,  13 }, { 205,  13 }, { 224,  13 },
+    {   3, 26 }, {  18, 26 }, {  33, 26 }, {  48, 26 }, {  63, 26 }, { 78, 26 }, { 93, 26 }, { 108, 26 }, { 123, 26 }, { 138, 26 }, { 153, 26 }, { 168, 26 }, { 183,  26 }, { 205,  26 },{ 224,  26 },
+    {   6, 39 }, {  20, 39 }, {  36, 39 }, {  52, 39 }, {  68, 39 }, { 84, 39 }, { 100, 39 }, { 116, 39 }, { 132, 39 }, { 148, 39 }, { 164, 39 }, { 180, 39 }, { 212,  39 }, { 224,  39 },
+    {   9, 52 }, {  27, 52 }, {  43, 52 }, {  59, 52 }, {  75, 52 }, { 91, 52 }, { 107, 52 }, { 123, 52 }, { 139, 52 }, { 155, 52 }, { 171, 52 }, { 187, 52 }, { 212,  52 }, { 224,  52 },
+{   2, 64 }, {  18, 64 }, {  33, 64 },                 {  93, 64 },                                                                              { 150, 64 }, { 165,  64 }, { 180, 64 }, { 195, 64 }, { 210, 64 }, { 224, 64 }
+}, {
+    1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 
+    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+    1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+    1, 1, 1,         4,              1, 1, 1, 4, 4, 4,
+}};
+#endif
diff --git a/qmk/keyboards/mt84/mt84.h b/qmk/keyboards/mt84/mt84.h
new file mode 100644
index 00000000..d3de007c
--- /dev/null
+++ b/qmk/keyboards/mt84/mt84.h
@@ -0,0 +1,35 @@
+   /* Copyright 2020 MaiKong<704340378@qq.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"
+
+#define LAYOUT_75_ansi( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k4E, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E,\
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E,\
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C,          k3E, \
+    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, \
+    k50, k51, k52,                k55,                         k59, k5A, k5B, k5C, k5D, k5E \
+) \
+{ \
+    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E}, \
+    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E}, \
+    {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E}, \
+    {k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, KC_NO, k3E}, \
+    {k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E}, \
+    {k50, k51, k52, KC_NO,KC_NO, k55, KC_NO,KC_NO,KC_NO, k59, k5A, k5B, k5C, k5D, k5E} \
+}
diff --git a/qmk/keyboards/mt84/readme.md b/qmk/keyboards/mt84/readme.md
new file mode 100644
index 00000000..17e1de2f
--- /dev/null
+++ b/qmk/keyboards/mt84/readme.md
@@ -0,0 +1,23 @@
+# Mt84rgb 
+
+![Mt84rgb](https://i.imgur.com/2fJg3DDl.png)
+
+A 84% keyboard PCB made by MT.
+It supports standard 84-key layout, with hotswap sockets and per-key RGB backlight.
+
+
+* Keyboard Maintainer: [MT](https://github.com/704340378)
+* Hardware Supported: mt84rgb (atmega32u4)
+* Hardware Availability: [麦田外设](https://shop110310565.taobao.com)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make mt84:default
+    
+Flashing example for this keyboard:
+
+    make mt84:default:flash
+
+To put the board into bootloader mode, either press the reset button on the bottom the PCB or hold Space+B while plugging it in.
+
+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).
diff --git a/qmk/keyboards/mt84/rules.mk b/qmk/keyboards/mt84/rules.mk
new file mode 100644
index 00000000..b27a7c34
--- /dev/null
+++ b/qmk/keyboards/mt84/rules.mk
@@ -0,0 +1,27 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = full     # 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
+# 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 = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGB_MATRIX_ENABLE = yes     # Use RGB Matrix
+RGB_MATRIX_DRIVER = IS31FL3737
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+
+LAYOUTS = 75_ansi
+
diff --git a/qmk/keyboards/mt980/config.h b/qmk/keyboards/mt980/config.h
index 6b8b9529..56927be7 100644
--- a/qmk/keyboards/mt980/config.h
+++ b/qmk/keyboards/mt980/config.h
@@ -22,6 +22,11 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION ROW2COL
 
+#define LED_NUM_LOCK_PIN C6
+#define LED_CAPS_LOCK_PIN C7
+#define LED_SCROLL_LOCK_PIN B5
+#define LED_PIN_ON_STATE 0
+
 /* number of backlight levels */
 #define BACKLIGHT_PIN B6
 #ifdef BACKLIGHT_PIN
diff --git a/qmk/keyboards/mt980/mt980.c b/qmk/keyboards/mt980/mt980.c
index 5461a3b2..69f7cc49 100644
--- a/qmk/keyboards/mt980/mt980.c
+++ b/qmk/keyboards/mt980/mt980.c
@@ -1,65 +1 @@
 #include "mt980.h"
-
-__attribute__ ((weak))
-void matrix_init_keymap(void) {}
-
-__attribute__ ((weak))
-void matrix_scan_keymap(void) {}
-
-__attribute__ ((weak))
-bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-__attribute__ ((weak))
-uint32_t layer_state_set_keymap (uint32_t state) {
-  return state;
-}
-__attribute__ ((weak))
-void led_set_keymap(uint8_t usb_led) {}
-
-void matrix_init_user(void) {
-  matrix_init_keymap();
-}
-
-void matrix_scan_user(void) {
-  matrix_scan_keymap();
-}
-
-void keyboard_pre_init_user(void) {
-  /* Set NUMLOCK indicator pin as output */
-  setPinOutput(C6);
-  /* Set CAPSLOCK indicator pin as output */
-  setPinOutput(C7);
-  /* Set SCROLLOCK indicator pin as output */
-  setPinOutput(B5);
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  return process_record_keymap(keycode, record);
-}
-
-void led_set_user(uint8_t usb_led) {
-
-  if (IS_LED_ON(usb_led, USB_LED_NUM_LOCK)) {
-    writePinLow(C6);
-  }
-  else {
-    writePinHigh(C6);
-  }
-
-  if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
-    writePinLow(C7);
-  }
-  else {
-    writePinHigh(C7);
-  }
-
-  if (IS_LED_ON(usb_led, USB_LED_SCROLL_LOCK)) {
-    writePinLow(B5);
-  }
-  else {
-    writePinHigh(B5);
-  }
-
-  led_set_keymap(usb_led);
-}
diff --git a/qmk/keyboards/murcielago/rev1/rules.mk b/qmk/keyboards/murcielago/rev1/rules.mk
index f8faea6c..b4c2699a 100644
--- a/qmk/keyboards/murcielago/rev1/rules.mk
+++ b/qmk/keyboards/murcielago/rev1/rules.mk
@@ -29,6 +29,5 @@ MIDI_ENABLE = no            # MIDI support
 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
 SPLIT_KEYBOARD = yes        # Enable split keyboard mode
 ENCODER_ENABLE = yes
\ No newline at end of file
diff --git a/qmk/keyboards/mxss/rgblight.c b/qmk/keyboards/mxss/rgblight.c
index 13094585..2e9352c5 100644
--- a/qmk/keyboards/mxss/rgblight.c
+++ b/qmk/keyboards/mxss/rgblight.c
@@ -20,7 +20,7 @@
 #    include <avr/interrupt.h>
 #endif
 #ifdef STM32_EEPROM_ENABLE
-#    include "hal.h"
+#    include <hal.h>
 #    include "eeprom.h"
 #    include "eeprom_stm32.h"
 #endif
@@ -31,7 +31,7 @@
 #include "color.h"
 #include "debug.h"
 #include "led_tables.h"
-#include "lib/lib8tion/lib8tion.h"
+#include <lib/lib8tion/lib8tion.h>
 #ifdef VELOCIKEY_ENABLE
 #    include "velocikey.h"
 #endif
diff --git a/qmk/keyboards/nack/config.h b/qmk/keyboards/nack/config.h
new file mode 100644
index 00000000..9f0880e3
--- /dev/null
+++ b/qmk/keyboards/nack/config.h
@@ -0,0 +1,59 @@
+/*
+Copyright 2020 pastapojken <pastapojken@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/ 
+
+#pragma once
+#include "config_common.h"
+
+#define VENDOR_ID 0xDA12
+#define PRODUCT_ID 0x6060
+#define DEVICE_VER 0x0001
+#define MANUFACTURER pastapojken
+#define PRODUCT nack keyboard
+
+#define MATRIX_ROWS 4
+#define MATRIX_COLS 13
+
+#define MATRIX_ROW_PINS { A0, A1, A2, A3 }	
+#define MATRIX_COL_PINS { A6, A7, A8, A9, A10, B0, B1, B2, B6, B7, C13, C14, C15 }
+
+#define DIODE_DIRECTION ROW2COL
+#define DEBOUNCE 5
+#define TAPPING_TOGGLE 2
+
+#ifdef RGB_MATRIX_ENABLE
+    #define WS2812_SPI SPID1
+    #define WS2812_SPI_MOSI_PAL_MODE 5
+    #define RGB_DI_PIN B5
+    #define RGBLED_NUM 52
+    #define DRIVER_LED_TOTAL RGBLED_NUM
+    #define RGB_MATRIX_MAXIMUM_BRIGHTNESS 128 // Max brightness of LEDs 
+    #define RGB_MATRIX_STARTUP_VAL 64
+    #define RGB_MATRIX_HUE_STEP 10
+    #define RGB_MATRIX_SAT_STEP 10
+    #define RGB_MATRIX_VAL_STEP 10
+#endif
+
+#ifdef AUDIO_ENABLE
+    #define STARTUP_SONG SONG(NO_SOUND)
+    #define AUDIO_PIN A4 // Pin of the left speaker 
+    #define AUDIO_PIN_ALT A5 // Pin of the right speaker
+    /* 
+     * Basically, change this section once pull request 6165 has been merged
+     * https://github.com/qmk/qmk_firmware/pull/6165
+     */
+#endif
+
diff --git a/qmk/keyboards/nack/info.json b/qmk/keyboards/nack/info.json
new file mode 100644
index 00000000..780017f6
--- /dev/null
+++ b/qmk/keyboards/nack/info.json
@@ -0,0 +1,12 @@
+{
+    "keyboard_name": "nack",
+    "url": "https://github.com/pastapojken/nack",
+    "maintainer": "pastapojken",
+    "width": 13,
+    "height": 4,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"\u00c5", "x":11, "y":0}, {"label":"\u00a8", "x":12, "y":0}, {"label":"Esc", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":"\u00d6", "x":10, "y":1}, {"label":"\u00c4", "x":11, "y":1}, {"label":"'", "x":12, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"", "x":10, "y":2}, {"label":"&uarr;", "x":11, "y":2}, {"label":"backsp", "x":12, "y":2}, {"label":"Ctrl", "x":0, "y":3}, {"label":"Super", "x":1, "y":3}, {"label":"Alt", "x":2, "y":3}, {"label":"Fn", "x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"label":"Fn", "x":6, "y":3}, {"label":"", "x":7, "y":3}, {"label":"Alt Gr", "x":8, "y":3}, {"label":"Enter", "x":9, "y":3}, {"label":"&larr;", "x":10, "y":3}, {"label":"&darr;", "x":11, "y":3}, {"label":"&rarr;", "x":12, "y":3}]
+        }
+    }
+}
diff --git a/qmk/keyboards/nack/keymaps/default/keymap.c b/qmk/keyboards/nack/keymaps/default/keymap.c
new file mode 100644
index 00000000..4c3e3dac
--- /dev/null
+++ b/qmk/keyboards/nack/keymaps/default/keymap.c
@@ -0,0 +1,65 @@
+/* Copyright 2020 pastapojken <pastapojken@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    BASE,
+    NUM,
+    FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [BASE] = LAYOUT(
+/*   __________________________________________________________________________________________________________________________________________________________________________
+    | \            \            \            \            \            \            \            \            \            \            \            \            \            \        */                                                                                                                                                                 
+//  | |----TAB-----|---Q--------|-----W------|-----E------|-----R------|----T-------|-----Y------|-----U------|----I-------|------O-----|----P-------|----Å-------|--( ¨^~ )---|  
+       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,
+//  | |----ESC-----|---A--------|---S--------|----D-------|-----F------|-----G------|-----H------|-----J------|-----K------|-----L------|-----Ö------|-----Ä------|--( '* )----|  
+       KC_ESC,      KC_A,        KC_S,        KC_D,        KC_F,        KC_G,        KC_H,        KC_J,        KC_K,        KC_L,        KC_SCLN,     KC_QUOT,     KC_NUHS,
+//  | |---SHIFT----|---Z--------|---X--------|----C-------|-----V------|-----B------|-----N------|------M-----|---( ,; )---|---( .: )---|---( -_ )---|----UP------|-BACKSPACE--|  
+       KC_LSFT,     KC_Z,        KC_X,        KC_C,        KC_V,        KC_B,        KC_N,        KC_M,        KC_COMM,     KC_DOT,      KC_SLSH,     KC_UP,       KC_BSPC,
+//  | |---CTRL-----|---ALT------|---META-----|----FN_1----|----------SPACE----------|----FN_2----|----AltGr---|--( <>| )---|---ENETER---|-LEFT-------|---DOWN-----|--RIGHT-----|  
+       KC_LCTL,     KC_LALT,     KC_LGUI,     TT(NUM),     KC_SPC,      KC_NO,       TT(FN),      KC_RALT,     KC_NUBS,     KC_ENT,     KC_LEFT,      KC_DOWN,     KC_RIGHT
+//   \|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|         
+    ),
+    [NUM] = LAYOUT(
+/*   __________________________________________________________________________________________________________________________________________________________________________
+    | \            \            \            \            \            \            \            \            \            \            \            \            \            \        */                                                                                                                                                                         
+//  | |---TAB------|---( 1! )---|--( 2"@ )---|--( 3#£ )---|---( 4¤$ )--|--( 5%€ )---|---( 6& )---|--( 7/{ )---|--( 8([ )---|--( 9)] )---|--( 0=} )---|---( +?\ )--|---( ´` )---|
+       _______,     KC_1,        KC_2,        KC_3,        KC_4,        KC_5,        KC_6,        KC_7,        KC_8,        KC_9,        KC_0,        KC_MINS,     KC_EQL,
+//  | |----ESC-----|-----F1-----|-----F2-----|----F3------|----F4------|----F5------|-----F6-----|-----F7------|----F8-----|-----F9-----|-----F10----|----F11-----|----F12-----|  
+       _______,     KC_F1,       KC_F2,       KC_F3,       KC_F4,       KC_F5,       KC_F6,       KC_F7,       KC_F8,       KC_F9,       KC_F10,      KC_F11,      KC_F12,
+//  | |---SHIFT----|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|  
+       _______,     KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,
+//  | |---CTRL-----|---ALT------|---META-----|---FN_1-----|------------|------------|----FN_2----|--AltGr-----|---( §½ )---|------------|------------|------------|------------|  
+       _______,     _______,     _______,     TT(FN),      KC_NO,       KC_NO,       TO(BASE),    _______,     KC_GRV,      KC_NO,       KC_NO,       KC_NO,       KC_NO
+//   \|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|         
+    ),
+    [FN] = LAYOUT(
+/*   __________________________________________________________________________________________________________________________________________________________________________
+    | \            \            \            \            \            \            \            \            \            \            \            \            \            \        */                                                                                                                                                           
+//  | |-RGB TOGGLE-|-CHANGE RGB-|-RGB HUE UP-|-RGB SAT UP-|------------|------------|------------|------------|------------|------------|------------|------------|-RESET KBD--|  
+       RGB_TOG,     RGB_MOD,     RGB_HUI,     RGB_SAI,     KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,
+//  | |------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|  
+       MU_TOG,      KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,
+//  | |------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|-RGB LIGHT +|------------|  
+       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       RGB_VAI,     KC_NO,
+//  | |------------|------------|------------|---FN_1-----|------------|------------|----FN_2----|------------|------------|------------|------------|-RGB LIGHT -|------------|  
+       KC_NO,       KC_NO,       KC_NO,       TT(NUM),     KC_NO,       KC_NO,       TO(BASE),    KC_NO,       KC_NO,       KC_NO,       KC_NO,       RGB_VAD,     KC_NO
+//   \|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|         
+    )
+};
diff --git a/qmk/keyboards/nack/keymaps/default/readme.md b/qmk/keyboards/nack/keymaps/default/readme.md
new file mode 100644
index 00000000..9cbf5c6e
--- /dev/null
+++ b/qmk/keyboards/nack/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for nack, simple and minimal.
diff --git a/qmk/keyboards/nack/keymaps/pastapojken/keymap.c b/qmk/keyboards/nack/keymaps/pastapojken/keymap.c
new file mode 100644
index 00000000..3bbcc4b3
--- /dev/null
+++ b/qmk/keyboards/nack/keymaps/pastapojken/keymap.c
@@ -0,0 +1,199 @@
+/* Copyright 2020 pastapojken <pastapojken@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+#include "keymap.h"
+
+#define ____ _______
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    BASE,
+    NUM,
+    FN
+};
+
+// Defines the keycodes used by our macros in process_record_user
+enum custom_keycodes {
+    CK_LSFT = SAFE_RANGE,   // Shift
+    CK_RALT,                // AltGr
+    CK_BSPC_DEL,            // Backspace or Del (if pressed with CK_LSFT or CK_RALT)
+    CK_UP_PGUP,             // Up or PgUp (if pressed with CK_LSFT or CK_RALT)
+    CK_DOWN_PGDOWN,         // Down or PgDown (if pressed with CK_LSFT or CK_RALT)
+    CK_LEFT_HOME,           // Left or Home (if pressed with CK_LSFT or CK_RALT)
+    CK_RIGHT_END,           // Right or End (if pressed with CK_LSFT or CK_RALT)
+    KK_RESET
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [BASE] = LAYOUT(
+/*   __________________________________________________________________________________________________________________________________________________________________________
+    | \            \            \            \            \            \            \            \            \            \            \            \            \            \        */                                                                                                                                                                 
+//  | |----TAB-----|---Q--------|-----W------|-----E------|-----R------|----T-------|-----Y------|-----U------|----I-------|------O-----|----P-------|----Å-------|--( ¨^~ )---|  
+       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,
+//  | |----ESC-----|---A--------|---S--------|----D-------|-----F------|-----G------|-----H------|-----J------|-----K------|-----L------|-----Ö------|-----Ä------|--( '* )----|  
+       KC_ESC,      KC_A,        KC_S,        KC_D,        KC_F,        KC_G,        KC_H,        KC_J,        KC_K,        KC_L,        KC_SCLN,     KC_QUOT,     KC_NUHS,
+//  | |---SHIFT----|---Z--------|---X--------|----C-------|-----V------|-----B------|-----N------|------M-----|---( ,; )---|---( .: )---|---( -_ )---|----UP------|-BACKSPACE--|  
+       CK_LSFT,     KC_Z,        KC_X,        KC_C,        KC_V,        KC_B,        KC_N,        KC_M,        KC_COMM,     KC_DOT,      KC_SLSH,     CK_UP_PGUP,  CK_BSPC_DEL,
+//  | |---CTRL-----|---ALT------|---META-----|----FN_1----|----------SPACE----------|----FN_2----|----AltGr---|--( <>| )---|---ENETER---|-LEFT-------|---DOWN-----|--RIGHT-----|  
+       KC_LCTL,     KC_LALT,     KC_LGUI,     TT(NUM),     KC_SPC,      KC_NO,       TT(FN),      CK_RALT,     KC_NUBS,     KC_ENT,     CK_LEFT_HOME,CK_DOWN_PGDOWN,CK_RIGHT_END
+//   \|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|         
+    ),
+    [NUM] = LAYOUT(
+/*   __________________________________________________________________________________________________________________________________________________________________________
+    | \            \            \            \            \            \            \            \            \            \            \            \            \            \        */                                                                                                                                                                         
+//  | |---TAB------|---( 1! )---|--( 2"@ )---|--( 3#£ )---|---( 4¤$ )--|--( 5%€ )---|---( 6& )---|--( 7/{ )---|--( 8([ )---|--( 9)] )---|--( 0=} )---|---( +?\ )--|---( ´` )---|
+       ____,        KC_1,        KC_2,        KC_3,        KC_4,        KC_5,        KC_6,        KC_7,        KC_8,        KC_9,        KC_0,        KC_MINS,     KC_EQL,
+//  | |----ESC-----|-----F1-----|-----F2-----|----F3------|----F4------|----F5------|-----F6-----|-----F7------|----F8-----|-----F9-----|-----F10----|----F11-----|----F12-----|  
+       ____,        KC_F1,       KC_F2,       KC_F3,       KC_F4,       KC_F5,       KC_F6,       KC_F7,       KC_F8,       KC_F9,       KC_F10,      KC_F11,      KC_F12,
+//  | |---SHIFT----|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|  
+       ____,        KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,
+//  | |---CTRL-----|---ALT------|---META-----|---FN_1-----|------------|------------|----FN_2----|--AltGr-----|---( §½ )---|------------|------------|------------|------------|  
+       ____,        ____,        ____,        TT(FN),       KC_NO,      KC_NO,       TO(BASE),    ____,        KC_GRV,      KC_NO,       KC_NO,       KC_NO,       KC_NO
+//   \|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|         
+    ),
+    [FN] = LAYOUT(
+/*   __________________________________________________________________________________________________________________________________________________________________________
+    | \            \            \            \            \            \            \            \            \            \            \            \            \            \        */                                                                                                                                                           
+//  | |-RGB TOGGLE-|-CHANGE RGB-|-RGB HUE UP-|-RGB SAT UP-|------------|------------|------------|------------|------------|------------|------------|------------|-RESET KBD--|  
+       RGB_TOG,     RGB_MOD,     RGB_HUI,     RGB_SAI,     KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KK_RESET,
+//  | |------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|  
+       MU_TOG,      KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,
+//  | |------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|------------|-RGB LIGHT +|------------|  
+       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       KC_NO,       RGB_VAI,     KC_NO,
+//  | |------------|------------|------------|---FN_1-----|------------|------------|----FN_2----|------------|------------|------------|------------|-RGB LIGHT -|------------|  
+       KC_NO,       KC_NO,       KC_NO,       TT(NUM),     KC_NO,       KC_NO,       TO(BASE),    KC_NO,       KC_NO,       KC_NO,       KC_NO,       RGB_VAD,     KC_NO
+//   \|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|____________|         
+    )
+};
+
+// Interrupt bools
+bool lshift = false, ralt = false;
+
+// Number of items that are saved in prev_kcs
+uint8_t prev_indx = 0;
+// Used to save the last 6 actual keycodes
+uint16_t prev_kcs[6] = {0, 0, 0, 0, 0, 0};
+
+/*
+Used to add a keycode to a prev_kcs to remember it.
+When full the last code gets discarded and replaced by
+the new one.
+*/
+void add_to_prev(uint16_t kc){
+  for (int i=0; i<prev_indx; i++){
+    if (kc == prev_kcs[i])
+      return;
+  }
+  if (prev_indx == 6){
+    for (int i=5; i>0; i--){
+      prev_kcs[i] = prev_kcs[i-1];
+    }
+    prev_kcs[0] = kc;
+  } else {
+    prev_kcs[prev_indx] = kc;
+    prev_indx++;
+  }
+}
+
+/*
+Unregisters all codes saved in prev_kcs and resets prev_indx.
+gets called on multiple occasions mainly when shift is released
+and when frankenkeycodes are pressed. Prevents output of
+wrong characters when really specific key combinations
+that would never occur during normal usage are pressed.
+*/
+void unreg_prev(void){
+  if (prev_indx == 0)
+    return;
+  for (int i=0; i<prev_indx; i++){
+    unregister_code(prev_kcs[i]);
+  }
+  prev_indx = 0;
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    static uint32_t key_timer;
+    switch (keycode) {
+        case CK_LSFT:
+          if(record->event.pressed) {
+            unregister_code(KC_LSFT);
+            register_code(KC_LSFT);
+            lshift = true;
+          } else {
+            unreg_prev();
+            unregister_code(KC_LSFT);
+            lshift = false;
+          }
+          return false;
+        case CK_RALT:
+          if(record->event.pressed) {
+            unregister_code(KC_RALT);
+            register_code(KC_RALT);
+            ralt = true;
+          } else {
+            unreg_prev();
+            unregister_code(KC_RALT);
+            ralt = false;
+          }
+          return false;
+        case CK_BSPC_DEL:
+            RALT_NO(KC_BSPC,KC_DEL);
+            break;
+        case CK_UP_PGUP:
+            RALT_NO(KC_UP,KC_PGUP);
+            break;
+        case CK_DOWN_PGDOWN:
+            RALT_NO(KC_DOWN,KC_PGDOWN);
+            break;
+        case CK_LEFT_HOME:
+            RALT_NO(KC_LEFT,KC_HOME);
+            break;
+        case CK_RIGHT_END:
+            RALT_NO(KC_RIGHT,KC_END);
+            break;
+        case KK_RESET: // Basically, turn off RGB before resetting
+                if (record->event.pressed) {
+                    key_timer = timer_read32();
+                    #ifdef RGB_MATRIX_ENABLE
+                    rgb_matrix_disable_noeeprom();
+                    #endif
+                } else {
+                    if (timer_elapsed32(key_timer) >= 20) {
+                        reset_keyboard();
+                    }
+                }
+                break;
+        default:
+          if(record->event.pressed) {
+            timer_timeout_keymap();
+            if (lshift)
+              register_code(KC_LSFT);
+            else
+              unregister_code(KC_LSFT);
+            
+            if (ralt)
+              register_code(KC_ALGR);
+            else
+              unregister_code(KC_ALGR);
+          }
+        break;
+    }
+    return true;
+}
+
+__attribute__((weak))
+void timer_timeout_keymap(void){
+}
diff --git a/qmk/keyboards/nack/keymaps/pastapojken/keymap.h b/qmk/keyboards/nack/keymaps/pastapojken/keymap.h
new file mode 100644
index 00000000..aaeed707
--- /dev/null
+++ b/qmk/keyboards/nack/keymaps/pastapojken/keymap.h
@@ -0,0 +1,122 @@
+/* Copyright 2020 pastapojken <pastapojken@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+#include "quantum.h"
+
+#define TAPPING_TOGGLE 2
+
+#ifdef AUDIO_ENABLE
+  #define STARTUP_SONG SONG(NO_SOUND)
+#endif
+
+void add_to_prev(uint16_t kc);
+void unreg_prev(void);
+void timer_timeout_keymap(void);
+bool process_record_user(uint16_t keycode, keyrecord_t *record);
+
+// Normal shift status
+#define SHIFT_NORM(kc1, kc2) \
+if (record->event.pressed) { \
+  timer_timeout_keymap(); \
+  if (lshift) { \
+    register_code(KC_LSFT); \
+    unregister_code(kc2); \
+    register_code(kc2); \
+    add_to_prev(kc2); \
+  } else { \
+    unregister_code(KC_LSFT); \
+    unregister_code(kc1); \
+    register_code(kc1); \
+  } \
+} else { \
+  unregister_code(kc1); \
+  unregister_code(kc2); \
+} \
+return false;
+
+// Always shifted
+#define SHIFT_ALL(kc1, kc2) \
+if (record->event.pressed) { \
+  timer_timeout_keymap(); \
+  register_code(KC_LSFT); \
+  if (lshift) { \
+    unregister_code(kc2); \
+    register_code(kc2); \
+    add_to_prev(kc2); \
+  } else { \
+    unregister_code(kc1); \
+    register_code(kc1); \
+    add_to_prev(kc1); \
+  } \
+} else { \
+  unregister_code(kc1); \
+  unregister_code(kc2); \
+  unreg_prev(); \
+  if (lshift) \
+    register_code(KC_LSFT); \
+  else \
+    unregister_code(KC_LSFT); \
+} \
+return false;
+
+// Never shifted
+#define SHIFT_NO(kc1, kc2) \
+if (record->event.pressed) { \
+  timer_timeout_keymap(); \
+  unregister_code(KC_LSFT); \
+  if (lshift) { \
+    unregister_code(kc2); \
+    register_code(kc2); \
+    add_to_prev(kc2); \
+  } else { \
+    unregister_code(kc1); \
+    register_code(kc1); \
+  } \
+} else { \
+  unregister_code(kc1); \
+  unregister_code(kc2); \
+  unreg_prev(); \
+  if (lshift) \
+    register_code(KC_LSFT); \
+  else \
+    unregister_code(KC_LSFT); \
+} \
+return false;
+
+//Never RALT
+#define RALT_NO(kc1, kc2) \
+if (record->event.pressed) { \
+  timer_timeout_keymap(); \
+  unregister_code(KC_RALT); \
+  if (ralt) { \
+    unregister_code(kc2); \
+    register_code(kc2); \
+    add_to_prev(kc2); \
+  } else { \
+    unregister_code(kc1); \
+    register_code(kc1); \
+  } \
+} else { \
+  unregister_code(kc1); \
+  unregister_code(kc2); \
+  unreg_prev(); \
+  if (ralt) \
+    register_code(KC_RALT); \
+  else \
+    unregister_code(KC_RALT); \
+} \
+return false;
diff --git a/qmk/keyboards/nack/keymaps/pastapojken/readme.md b/qmk/keyboards/nack/keymaps/pastapojken/readme.md
new file mode 100644
index 00000000..73e1e2ad
--- /dev/null
+++ b/qmk/keyboards/nack/keymaps/pastapojken/readme.md
@@ -0,0 +1 @@
+# pastapojken's keymap for nack
diff --git a/qmk/keyboards/nack/mcuconf.h b/qmk/keyboards/nack/mcuconf.h
new file mode 100644
index 00000000..0853242d
--- /dev/null
+++ b/qmk/keyboards/nack/mcuconf.h
@@ -0,0 +1,273 @@
+/*
+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#ifndef MCUCONF_H
+#define MCUCONF_H
+
+/*
+ * STM32F3xx drivers configuration.
+ * The following settings override the default settings present in
+ * the various device driver implementation headers.
+ * Note that the settings for each driver only have effect if the whole
+ * driver is enabled in halconf.h.
+ *
+ * IRQ priorities:
+ * 15...0       Lowest...Highest.
+ *
+ * DMA priorities:
+ * 0...3        Lowest...Highest.
+ */
+
+#define STM32F3xx_MCUCONF
+#define STM32F303_MCUCONF
+
+/*
+ * HAL driver system settings.
+ */
+#define STM32_NO_INIT                       FALSE
+#define STM32_PVD_ENABLE                    FALSE
+#define STM32_PLS                           STM32_PLS_LEV0
+#define STM32_HSI_ENABLED                   TRUE
+#define STM32_LSI_ENABLED                   TRUE
+#define STM32_HSE_ENABLED                   TRUE
+#define STM32_LSE_ENABLED                   FALSE
+#define STM32_SW                            STM32_SW_PLL
+#define STM32_PLLSRC                        STM32_PLLSRC_HSE
+#define STM32_PREDIV_VALUE                  1
+#define STM32_PLLMUL_VALUE                  9
+#define STM32_HPRE                          STM32_HPRE_DIV1
+#define STM32_PPRE1                         STM32_PPRE1_DIV2
+#define STM32_PPRE2                         STM32_PPRE2_DIV2
+#define STM32_MCOSEL                        STM32_MCOSEL_NOCLOCK
+#define STM32_ADC12PRES                     STM32_ADC12PRES_DIV1
+#define STM32_ADC34PRES                     STM32_ADC34PRES_DIV1
+#define STM32_USART1SW                      STM32_USART1SW_PCLK
+#define STM32_USART2SW                      STM32_USART2SW_PCLK
+#define STM32_USART3SW                      STM32_USART3SW_PCLK
+#define STM32_UART4SW                       STM32_UART4SW_PCLK
+#define STM32_UART5SW                       STM32_UART5SW_PCLK
+#define STM32_I2C1SW                        STM32_I2C1SW_SYSCLK
+#define STM32_I2C2SW                        STM32_I2C2SW_SYSCLK
+#define STM32_TIM1SW                        STM32_TIM1SW_PCLK2
+#define STM32_TIM8SW                        STM32_TIM8SW_PCLK2
+#define STM32_RTCSEL                        STM32_RTCSEL_LSI
+#define STM32_USB_CLOCK_REQUIRED            TRUE
+#define STM32_USBPRE                        STM32_USBPRE_DIV1P5
+
+/*
+ * IRQ system settings.
+ */
+#define STM32_IRQ_EXTI0_PRIORITY            6
+#define STM32_IRQ_EXTI1_PRIORITY            6
+#define STM32_IRQ_EXTI2_PRIORITY            6
+#define STM32_IRQ_EXTI3_PRIORITY            6
+#define STM32_IRQ_EXTI4_PRIORITY            6
+#define STM32_IRQ_EXTI5_9_PRIORITY          6
+#define STM32_IRQ_EXTI10_15_PRIORITY        6
+#define STM32_IRQ_EXTI16_PRIORITY           6
+#define STM32_IRQ_EXTI17_PRIORITY           15
+#define STM32_IRQ_EXTI18_PRIORITY           6
+#define STM32_IRQ_EXTI19_PRIORITY           15
+#define STM32_IRQ_EXTI20_PRIORITY           15
+#define STM32_IRQ_EXTI21_22_29_PRIORITY     6
+#define STM32_IRQ_EXTI30_32_PRIORITY        6
+#define STM32_IRQ_EXTI33_PRIORITY           6
+#define STM32_IRQ_TIM1_BRK_TIM15_PRIORITY   7
+#define STM32_IRQ_TIM1_UP_TIM16_PRIORITY    7
+#define STM32_IRQ_TIM1_TRGCO_TIM17_PRIORITY 7
+#define STM32_IRQ_TIM1_CC_PRIORITY          7
+
+/*
+ * ADC driver system settings.
+ */
+#define STM32_ADC_DUAL_MODE                 FALSE
+#define STM32_ADC_COMPACT_SAMPLES           FALSE
+#define STM32_ADC_USE_ADC1                  FALSE
+#define STM32_ADC_USE_ADC2                  FALSE
+#define STM32_ADC_USE_ADC3                  FALSE
+#define STM32_ADC_USE_ADC4                  FALSE
+#define STM32_ADC_ADC1_DMA_STREAM           STM32_DMA_STREAM_ID(1, 1)
+#define STM32_ADC_ADC2_DMA_STREAM           STM32_DMA_STREAM_ID(2, 1)
+#define STM32_ADC_ADC3_DMA_STREAM           STM32_DMA_STREAM_ID(2, 5)
+#define STM32_ADC_ADC4_DMA_STREAM           STM32_DMA_STREAM_ID(2, 2)
+#define STM32_ADC_ADC1_DMA_PRIORITY         2
+#define STM32_ADC_ADC2_DMA_PRIORITY         2
+#define STM32_ADC_ADC3_DMA_PRIORITY         2
+#define STM32_ADC_ADC4_DMA_PRIORITY         2
+#define STM32_ADC_ADC12_IRQ_PRIORITY        5
+#define STM32_ADC_ADC3_IRQ_PRIORITY         5
+#define STM32_ADC_ADC4_IRQ_PRIORITY         5
+#define STM32_ADC_ADC1_DMA_IRQ_PRIORITY     5
+#define STM32_ADC_ADC2_DMA_IRQ_PRIORITY     5
+#define STM32_ADC_ADC3_DMA_IRQ_PRIORITY     5
+#define STM32_ADC_ADC4_DMA_IRQ_PRIORITY     5
+#define STM32_ADC_ADC12_CLOCK_MODE          ADC_CCR_CKMODE_AHB_DIV1
+#define STM32_ADC_ADC34_CLOCK_MODE          ADC_CCR_CKMODE_AHB_DIV1
+
+/*
+ * CAN driver system settings.
+ */
+#define STM32_CAN_USE_CAN1                  FALSE
+#define STM32_CAN_CAN1_IRQ_PRIORITY         11
+
+/*
+ * DAC driver system settings.
+ */
+#define STM32_DAC_DUAL_MODE                 FALSE
+#define STM32_DAC_USE_DAC1_CH1              TRUE
+#define STM32_DAC_USE_DAC1_CH2              TRUE
+#define STM32_DAC_DAC1_CH1_IRQ_PRIORITY     10
+#define STM32_DAC_DAC1_CH2_IRQ_PRIORITY     10
+#define STM32_DAC_DAC1_CH1_DMA_PRIORITY     2
+#define STM32_DAC_DAC1_CH2_DMA_PRIORITY     2
+
+/*
+ * GPT driver system settings.
+ */
+#define STM32_GPT_USE_TIM1                  FALSE
+#define STM32_GPT_USE_TIM2                  FALSE
+#define STM32_GPT_USE_TIM3                  FALSE
+#define STM32_GPT_USE_TIM4                  FALSE
+#define STM32_GPT_USE_TIM6                  TRUE
+#define STM32_GPT_USE_TIM7                  TRUE
+#define STM32_GPT_USE_TIM8                  TRUE
+#define STM32_GPT_USE_TIM15                 TRUE
+#define STM32_GPT_USE_TIM16                 FALSE
+#define STM32_GPT_USE_TIM17                 FALSE
+#define STM32_GPT_TIM1_IRQ_PRIORITY         7
+#define STM32_GPT_TIM2_IRQ_PRIORITY         7
+#define STM32_GPT_TIM3_IRQ_PRIORITY         7
+#define STM32_GPT_TIM4_IRQ_PRIORITY         7
+#define STM32_GPT_TIM6_IRQ_PRIORITY         7
+#define STM32_GPT_TIM7_IRQ_PRIORITY         7
+#define STM32_GPT_TIM8_IRQ_PRIORITY         7
+
+/*
+ * I2C driver system settings.
+ */
+#define STM32_I2C_USE_I2C1                  TRUE
+#define STM32_I2C_USE_I2C2                  FALSE
+#define STM32_I2C_BUSY_TIMEOUT              50
+#define STM32_I2C_I2C1_IRQ_PRIORITY         10
+#define STM32_I2C_I2C2_IRQ_PRIORITY         10
+#define STM32_I2C_USE_DMA                   TRUE
+#define STM32_I2C_I2C1_DMA_PRIORITY         1
+#define STM32_I2C_I2C2_DMA_PRIORITY         1
+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")
+
+/*
+ * ICU driver system settings.
+ */
+#define STM32_ICU_USE_TIM1                  FALSE
+#define STM32_ICU_USE_TIM2                  FALSE
+#define STM32_ICU_USE_TIM3                  FALSE
+#define STM32_ICU_USE_TIM4                  FALSE
+#define STM32_ICU_USE_TIM8                  FALSE
+#define STM32_ICU_USE_TIM15                 FALSE
+#define STM32_ICU_TIM1_IRQ_PRIORITY         7
+#define STM32_ICU_TIM2_IRQ_PRIORITY         7
+#define STM32_ICU_TIM3_IRQ_PRIORITY         7
+#define STM32_ICU_TIM4_IRQ_PRIORITY         7
+#define STM32_ICU_TIM8_IRQ_PRIORITY         7
+
+/*
+ * PWM driver system settings.
+ */
+#define STM32_PWM_USE_ADVANCED              FALSE
+#define STM32_PWM_USE_TIM1                  FALSE
+#define STM32_PWM_USE_TIM2                  FALSE
+#define STM32_PWM_USE_TIM3                  TRUE
+#define STM32_PWM_USE_TIM4                  TRUE
+#define STM32_PWM_USE_TIM8                  FALSE
+#define STM32_PWM_USE_TIM15                 FALSE
+#define STM32_PWM_USE_TIM16                 FALSE
+#define STM32_PWM_USE_TIM17                 FALSE
+#define STM32_PWM_TIM1_IRQ_PRIORITY         7
+#define STM32_PWM_TIM2_IRQ_PRIORITY         7
+#define STM32_PWM_TIM3_IRQ_PRIORITY         7
+#define STM32_PWM_TIM4_IRQ_PRIORITY         7
+#define STM32_PWM_TIM8_IRQ_PRIORITY         7
+
+/*
+ * RTC driver system settings.
+ */
+#define STM32_RTC_PRESA_VALUE               32
+#define STM32_RTC_PRESS_VALUE               1024
+#define STM32_RTC_CR_INIT                   0
+#define STM32_RTC_TAMPCR_INIT               0
+
+/*
+ * SERIAL driver system settings.
+ */
+#define STM32_SERIAL_USE_USART1             FALSE
+#define STM32_SERIAL_USE_USART2             TRUE
+#define STM32_SERIAL_USE_USART3             FALSE
+#define STM32_SERIAL_USE_UART4              FALSE
+#define STM32_SERIAL_USE_UART5              FALSE
+#define STM32_SERIAL_USART1_PRIORITY        12
+#define STM32_SERIAL_USART2_PRIORITY        12
+#define STM32_SERIAL_USART3_PRIORITY        12
+#define STM32_SERIAL_UART4_PRIORITY         12
+#define STM32_SERIAL_UART5_PRIORITY         12
+
+/*
+ * SPI driver system settings.
+ */
+#define STM32_SPI_USE_SPI1                  TRUE
+#define STM32_SPI_USE_SPI2                  FALSE
+#define STM32_SPI_USE_SPI3                  FALSE
+#define STM32_SPI_SPI1_DMA_PRIORITY         1
+#define STM32_SPI_SPI2_DMA_PRIORITY         1
+#define STM32_SPI_SPI3_DMA_PRIORITY         1
+#define STM32_SPI_SPI1_IRQ_PRIORITY         10
+#define STM32_SPI_SPI2_IRQ_PRIORITY         10
+#define STM32_SPI_SPI3_IRQ_PRIORITY         10
+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")
+
+/*
+ * ST driver system settings.
+ */
+#define STM32_ST_IRQ_PRIORITY               8
+#define STM32_ST_USE_TIMER                  2
+
+/*
+ * UART driver system settings.
+ */
+#define STM32_UART_USE_USART1               FALSE
+#define STM32_UART_USE_USART2               FALSE
+#define STM32_UART_USE_USART3               FALSE
+#define STM32_UART_USART1_IRQ_PRIORITY      12
+#define STM32_UART_USART2_IRQ_PRIORITY      12
+#define STM32_UART_USART3_IRQ_PRIORITY      12
+#define STM32_UART_USART1_DMA_PRIORITY      0
+#define STM32_UART_USART2_DMA_PRIORITY      0
+#define STM32_UART_USART3_DMA_PRIORITY      0
+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")
+
+/*
+ * USB driver system settings.
+ */
+#define STM32_USB_USE_USB1                  TRUE
+#define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE
+#define STM32_USB_USB1_HP_IRQ_PRIORITY      13
+#define STM32_USB_USB1_LP_IRQ_PRIORITY      14
+
+/*
+ * WDG driver system settings.
+ */
+#define STM32_WDG_USE_IWDG                  FALSE
+
+#endif /* MCUCONF_H */
diff --git a/qmk/keyboards/nack/nack.c b/qmk/keyboards/nack/nack.c
new file mode 100644
index 00000000..185a96fd
--- /dev/null
+++ b/qmk/keyboards/nack/nack.c
@@ -0,0 +1,40 @@
+/* Copyright 2020 pastapojken <pastapojken@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+#ifdef RGB_MATRIX_ENABLE
+    led_config_t g_led_config = { {
+      // Key Matrix to LED Index
+      {   0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 },
+      {  13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25 },
+      {  26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38 },
+      {  39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51 }
+    }, {
+      // LED Index to Physical Position
+      { 0, 0 }, { 19,  0 }, { 38,  0 }, { 57,  0 }, { 76,  0 }, { 95, 0 }, { 114,  0 }, { 133,  0 }, { 152,  0 }, { 171,  0 }, { 190, 0 }, { 209,  0 }, { 223,  0 },
+      { 0, 21 }, { 19,  21 }, { 38,  21 }, { 57,  21 }, { 76,  21 }, { 95, 21 }, { 114,  21 }, { 133,  21 }, { 152,  21 }, { 171,  21 }, { 190, 21 }, { 209,  21 }, { 223,  21 },
+      { 0, 42 }, { 19,  42 }, { 38,  42 }, { 57,  42 }, { 76,  42 }, { 95, 42 }, { 114,  42 }, { 133,  42 }, { 152,  42 }, { 171,  42 }, { 190, 42 }, { 209,  42 }, { 223,  42 },
+      { 0, 63 }, { 19,  63 }, { 38,  63 }, { 57,  63 }, { 76,  63 }, { 95, 63 }, { 114,  63 }, { 133,  63 }, { 152,  63 }, { 171,  63 }, { 190, 63 }, { 209,  63 }, { 223,  63 }
+    }, {
+      // LED Index to Flag
+      4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+      4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+      4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+      4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4
+    } };
+#endif
+
diff --git a/qmk/keyboards/nack/nack.h b/qmk/keyboards/nack/nack.h
new file mode 100644
index 00000000..30e310a4
--- /dev/null
+++ b/qmk/keyboards/nack/nack.h
@@ -0,0 +1,31 @@
+/* Copyright 2020 pastapojken <pastapojken@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+#include "quantum.h"
+
+#define LAYOUT( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12,\
+    k13, k14, k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25,\
+    k26, k27, k28, k29, k30, k31, k32, k33, k34, k35, k36, k37, k38,\
+    k39, k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k50, k51\
+) \
+{ \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12 },\
+    { k13, k14, k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25 },\
+    { k26, k27, k28, k29, k30, k31, k32, k33, k34, k35, k36, k37, k38 },\
+    { k39, k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k50, k51 },\
+}
diff --git a/qmk/keyboards/nack/readme.md b/qmk/keyboards/nack/readme.md
new file mode 100644
index 00000000..6a1adeaf
--- /dev/null
+++ b/qmk/keyboards/nack/readme.md
@@ -0,0 +1,21 @@
+# nack
+
+
+A ISO-friendly ortholinear keyboard, 13x4 keys.  
+See [screenshots](https://imgur.com/a/PPO18Lc).
+
+* Keyboard Maintainer: [pastapojken](https://github.com/pastapojken)
+* Hardware Supported: nack PCB
+* Hardware Availability: [github repo](https://github.com/pastapojken/nack)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make nack:default
+
+Flashing example for this keyboard:
+
+    make nack:default:flash
+
+To reset the board into bootloader mode, press the reset button on top of the keyboard. It's the tiny button to the upper left of the board. If you are using the official case/plate you might need to use something thin to reach & press it.
+
+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).
diff --git a/qmk/keyboards/nack/rules.mk b/qmk/keyboards/nack/rules.mk
new file mode 100644
index 00000000..8b803b3a
--- /dev/null
+++ b/qmk/keyboards/nack/rules.mk
@@ -0,0 +1,24 @@
+# MCU name
+MCU = STM32F303
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = no        # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # 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 = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = yes          # Audio output
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = WS2812
+WS2812_DRIVER = spi
+AUDIO_DRIVER = dac_additive # How to drive the 2 speakers
+UNICODE_ENABLE = yes        # Unicode support
diff --git a/qmk/keyboards/naked48/keymaps/salicylic/rules.mk b/qmk/keyboards/naked48/keymaps/salicylic/rules.mk
index be8d10c9..370f3614 100644
--- a/qmk/keyboards/naked48/keymaps/salicylic/rules.mk
+++ b/qmk/keyboards/naked48/keymaps/salicylic/rules.mk
@@ -1,3 +1,3 @@
 RGBLIGHT_ENABLE = no
-RGB_MATRIX_ENABLE = WS2812
+RGB_MATRIX_ENABLE = yes
 
diff --git a/qmk/keyboards/naked48/rules.mk b/qmk/keyboards/naked48/rules.mk
index e4a63a7b..293d01ea 100644
--- a/qmk/keyboards/naked48/rules.mk
+++ b/qmk/keyboards/naked48/rules.mk
@@ -31,6 +31,8 @@ OLED_DRIVER_ENABLE = no
 # USE_I2C = yes
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
+RGB_MATRIX_ENABLE = no
+RGB_MATRIX_DRIVER = WS2812
 
 SPLIT_KEYBOARD = yes
 
diff --git a/qmk/keyboards/namecard2x4/rev1/config.h b/qmk/keyboards/namecard2x4/rev1/config.h
index 9286afa6..3e68cb8e 100644
--- a/qmk/keyboards/namecard2x4/rev1/config.h
+++ b/qmk/keyboards/namecard2x4/rev1/config.h
@@ -187,30 +187,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
diff --git a/qmk/keyboards/namecard2x4/rev2/config.h b/qmk/keyboards/namecard2x4/rev2/config.h
index f2cf053d..ee2c3157 100644
--- a/qmk/keyboards/namecard2x4/rev2/config.h
+++ b/qmk/keyboards/namecard2x4/rev2/config.h
@@ -187,30 +187,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
diff --git a/qmk/keyboards/namecard2x4/rules.mk b/qmk/keyboards/namecard2x4/rules.mk
index 8912698e..fc547673 100644
--- a/qmk/keyboards/namecard2x4/rules.mk
+++ b/qmk/keyboards/namecard2x4/rules.mk
@@ -29,7 +29,6 @@ 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
 
 #UNICODEMAP_ENABLE = yes # for emoji user
 #RGBLIGHT_ENABLE = yes # uncomment if you want addressable led strips
diff --git a/qmk/keyboards/navi10/rev0/rules.mk b/qmk/keyboards/navi10/rev0/rules.mk
index 79950e2a..5fc650a0 100644
--- a/qmk/keyboards/navi10/rev0/rules.mk
+++ b/qmk/keyboards/navi10/rev0/rules.mk
@@ -30,4 +30,3 @@ 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 
diff --git a/qmk/keyboards/navi10/rev2/rules.mk b/qmk/keyboards/navi10/rev2/rules.mk
index 79950e2a..5fc650a0 100644
--- a/qmk/keyboards/navi10/rev2/rules.mk
+++ b/qmk/keyboards/navi10/rev2/rules.mk
@@ -30,4 +30,3 @@ 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 
diff --git a/qmk/keyboards/navi10/rev3/rules.mk b/qmk/keyboards/navi10/rev3/rules.mk
index d5a072f1..bdc59cae 100644
--- a/qmk/keyboards/navi10/rev3/rules.mk
+++ b/qmk/keyboards/navi10/rev3/rules.mk
@@ -30,4 +30,3 @@ UNICODE_ENABLE = no         # Unicode
 BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 AUDIO_ENABLE = no           # Audio output
 FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches
-HD44780_ENABLE = no         # Enable support for HD44780 based LCDs 
diff --git a/qmk/keyboards/nebula12/bootloader_defs.h b/qmk/keyboards/nebula12/bootloader_defs.h
index 02c48c4e..dccd0fa5 100644
--- a/qmk/keyboards/nebula12/bootloader_defs.h
+++ b/qmk/keyboards/nebula12/bootloader_defs.h
@@ -1,7 +1,5 @@
 /* Address for jumping to bootloader on STM32 chips. */
 /* It is chip dependent, the correct number can be looked up here (page 175):
  * http://www.st.com/web/en/resource/technical/document/application_note/CD00167594.pdf
- * This also requires a patch to chibios:
- *  <tmk_dir>/tmk_core/tool/chibios/ch-bootloader-jump.patch
  */
 #define STM32_BOOTLOADER_ADDRESS 0x1FFFC800
diff --git a/qmk/keyboards/nebula12/config.h b/qmk/keyboards/nebula12/config.h
index 97f489fe..ab9f2134 100644
--- a/qmk/keyboards/nebula12/config.h
+++ b/qmk/keyboards/nebula12/config.h
@@ -19,6 +19,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "config_common.h"
 
+/* Ensure we jump to bootloader if the RESET keycode was pressed */
+#define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
+
+/* LSE clock */
+#define STM32_LSECLK 32768
+
 /* USB Device descriptor parameter */
 #define VENDOR_ID       0x8968
 #define PRODUCT_ID      0x5337
diff --git a/qmk/keyboards/nebula12/nebula12.c b/qmk/keyboards/nebula12/nebula12.c
index b23024ac..7491bee8 100644
--- a/qmk/keyboards/nebula12/nebula12.c
+++ b/qmk/keyboards/nebula12/nebula12.c
@@ -23,7 +23,3 @@ void board_init(void) {
   SYSCFG->CFGR1 |= SYSCFG_CFGR1_I2C1_DMA_RMP;
   SYSCFG->CFGR1 &= ~(SYSCFG_CFGR1_SPI2_DMA_RMP);
 }
-
-void keyboard_post_init_user(void) {
-rgblight_set_effect_range(0, 4);
-}
diff --git a/qmk/keyboards/nek_type_a/mcp23017.c b/qmk/keyboards/nek_type_a/mcp23017.c
index e2423168..1434fa56 100644
--- a/qmk/keyboards/nek_type_a/mcp23017.c
+++ b/qmk/keyboards/nek_type_a/mcp23017.c
@@ -15,8 +15,8 @@
  */
 #include <stdbool.h>
 #include "action.h"
-#include "lib/lufa/LUFA/Drivers/Peripheral/TWI.h"
-#include "lib/lufa/LUFA/Drivers/Peripheral/AVR8/TWI_AVR8.c"
+#include <LUFA/Drivers/Peripheral/TWI.h>
+#include <LUFA/Drivers/Peripheral/AVR8/TWI_AVR8.c>
 #include "mcp23017.h"
 #include "debug.h"
 #include "wait.h"
diff --git a/qmk/keyboards/nek_type_a/rules.mk b/qmk/keyboards/nek_type_a/rules.mk
index 8ee1054b..e46ea2b8 100644
--- a/qmk/keyboards/nek_type_a/rules.mk
+++ b/qmk/keyboards/nek_type_a/rules.mk
@@ -30,7 +30,6 @@ UNICODE_ENABLE = no         # Unicode
 BLUETOOTH_ENABLE = yes      # 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
 CUSTOM_MATRIX = yes
 DEBUG_ENABLE = yes
 BLUETOOTH = AdafruitBLE
diff --git a/qmk/keyboards/nemui/info.json b/qmk/keyboards/nemui/info.json
index 867b55f3..fb405069 100644
--- a/qmk/keyboards/nemui/info.json
+++ b/qmk/keyboards/nemui/info.json
@@ -62,7 +62,12 @@
     {
       "x": 13,
       "y": 0,
-      "w": 2
+      "w": 1
+    },
+    {
+      "x": 14,
+      "y": 0,
+      "w": 1
     },
     {
       "x": 0,
diff --git a/qmk/keyboards/nemui/keymaps/default/keymap.c b/qmk/keyboards/nemui/keymaps/default/keymap.c
index 400e7596..831ce5bb 100644
--- a/qmk/keyboards/nemui/keymaps/default/keymap.c
+++ b/qmk/keyboards/nemui/keymaps/default/keymap.c
@@ -17,13 +17,13 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT(
-        KC_ESC,  KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+        KC_ESC,  KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
         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_HOME,
         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_PGUP,
         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_PGDN,
         KC_LCTL, KC_LGUI, KC_LALT,                KC_SPC,                                  KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT),
         [1] = LAYOUT(
-        KC_GRAVE,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_DEL,
+        KC_GRAVE,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_DEL, 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, RESET, KC_END,
         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,
diff --git a/qmk/keyboards/nemui/keymaps/via/keymap.c b/qmk/keyboards/nemui/keymaps/via/keymap.c
index e703a177..1e524d18 100644
--- a/qmk/keyboards/nemui/keymaps/via/keymap.c
+++ b/qmk/keyboards/nemui/keymaps/via/keymap.c
@@ -17,25 +17,25 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [0] = LAYOUT(
-        KC_ESC,  KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
+        KC_ESC,  KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
         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_HOME,
         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_PGUP,
         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_PGDN,
         KC_LCTL, KC_LGUI, KC_LALT,                KC_SPC,                                  KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT),
         [1] = LAYOUT(
-        KC_GRAVE,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_DEL,
+        KC_GRAVE,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_DEL, 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, RESET, KC_END,
         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),
         [2] = LAYOUT(
-        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,   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),
         [3] = LAYOUT(
-        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,   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,
diff --git a/qmk/keyboards/nemui/nemui.h b/qmk/keyboards/nemui/nemui.h
index b48c6eab..87c9626e 100644
--- a/qmk/keyboards/nemui/nemui.h
+++ b/qmk/keyboards/nemui/nemui.h
@@ -20,13 +20,13 @@
 #define ___ KC_NO
 
 #define LAYOUT( \
-    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d,      \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
     k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \
     k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c,      k2e, \
     k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c,      k3e, \
     k40, k41, k42,           k45,                k49, k4a, k4b, k4c,      k4e  \
 ){ \
-    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, ___ },  \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e }, \
     { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e }, \
     { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, ___, k2e }, \
     { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, ___, k3e }, \
diff --git a/qmk/keyboards/nightingale_studios/hailey/chconf.h b/qmk/keyboards/nightingale_studios/hailey/chconf.h
new file mode 100644
index 00000000..6d2fa973
--- /dev/null
+++ b/qmk/keyboards/nightingale_studios/hailey/chconf.h
@@ -0,0 +1,19 @@
+/*
+Copyright 2020 zvecr<git@zvecr.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/>.
+*/
+
+#define CH_CFG_USE_TM FALSE
+#include_next "chconf.h"
\ No newline at end of file
diff --git a/qmk/keyboards/nightingale_studios/hailey/config.h b/qmk/keyboards/nightingale_studios/hailey/config.h
new file mode 100644
index 00000000..e3eb062c
--- /dev/null
+++ b/qmk/keyboards/nightingale_studios/hailey/config.h
@@ -0,0 +1,111 @@
+/*
+Copyright 2020 zvecr<git@zvecr.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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0xFEED
+#define PRODUCT_ID      0x4879
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Nightingale Studios
+#define PRODUCT         Hailey
+
+/* key matrix size - encoder is not part of matrix but wired to 2 pins so bodge a fake row/col*/
+#define MATRIX_ROWS 7
+#define MATRIX_COLS 17
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+ */
+#define MATRIX_ROW_PINS { A8, B15, B14, B13, B12, B6, A14 }
+#define MATRIX_COL_PINS { A4, A3, F1, F0, C15, C14, C13, B11, B10, B2, B1, B0, A7, A5, A6, B5, A15 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+#define ENCODERS_PAD_A { B3 }
+#define ENCODERS_PAD_B { B4 }
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+//#define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+/* Bootmagic Lite key configuration */
+//#define BOOTMAGIC_LITE_ROW 0
+//#define BOOTMAGIC_LITE_COLUMN 0
+
+#define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
diff --git a/qmk/keyboards/nightingale_studios/hailey/hailey.c b/qmk/keyboards/nightingale_studios/hailey/hailey.c
new file mode 100644
index 00000000..ec537397
--- /dev/null
+++ b/qmk/keyboards/nightingale_studios/hailey/hailey.c
@@ -0,0 +1,17 @@
+/*
+Copyright 2020 zvecr<git@zvecr.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 "hailey.h"
diff --git a/qmk/keyboards/nightingale_studios/hailey/hailey.h b/qmk/keyboards/nightingale_studios/hailey/hailey.h
new file mode 100644
index 00000000..ea33c80b
--- /dev/null
+++ b/qmk/keyboards/nightingale_studios/hailey/hailey.h
@@ -0,0 +1,64 @@
+/* Copyright 2020 zvecr<git@zvecr.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"
+#define ____ KC_NO
+
+/* This a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+
+#define LAYOUT_ansi( \
+    K000, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, E001, \
+    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K115, \
+    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K215, \
+    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K315, \
+    K400,       K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K414, \
+    K500, K501, K503,             K505,                   K509,       K511, K512, K514, K515 \
+) \
+{ \
+    { K000, ____, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, ____, ____}, \
+    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, ____, K115, ____}, \
+    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, ____, K215, ____}, \
+    { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, ____, ____, K315, ____}, \
+    { K400, ____, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, ____, K414, ____, ____}, \
+    { K500, K501, K503, ____, ____, K505, ____, ____, ____, K509, ____, K511, K512, ____, K514, K515, ____}, \
+    { ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, E001}, \
+}
+
+#define LAYOUT_all( \
+    K000, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, E001, \
+    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, \
+    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K215, \
+    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K315, \
+    K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K414, \
+    K500, K501, K503,             K505,                   K509,       K511, K512, K514, K515 \
+) \
+{ \
+    { K000, ____, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, ____, ____}, \
+    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, ____}, \
+    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, ____, K215, ____}, \
+    { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, ____, ____, K315, ____}, \
+    { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, ____, K414, ____, ____}, \
+    { K500, K501, K503, ____, ____, K505, ____, ____, ____, K509, ____, K511, K512, ____, K514, K515, ____}, \
+    { ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, E001}, \
+}
diff --git a/qmk/keyboards/nightingale_studios/hailey/halconf.h b/qmk/keyboards/nightingale_studios/hailey/halconf.h
new file mode 100644
index 00000000..8e3818ea
--- /dev/null
+++ b/qmk/keyboards/nightingale_studios/hailey/halconf.h
@@ -0,0 +1,26 @@
+/*
+Copyright 2020 zvecr<git@zvecr.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
+
+#define HAL_USE_I2C FALSE
+#define HAL_USE_PWM FALSE
+#define HAL_USE_SPI FALSE
+#define HAL_USE_GPT FALSE
+#define HAL_USE_PWM FALSE
+#define HAL_USE_DAC FALSE
+
+#include_next "halconf.h"
diff --git a/qmk/keyboards/nightingale_studios/hailey/info.json b/qmk/keyboards/nightingale_studios/hailey/info.json
new file mode 100644
index 00000000..007f20b3
--- /dev/null
+++ b/qmk/keyboards/nightingale_studios/hailey/info.json
@@ -0,0 +1,14 @@
+{
+    "keyboard_name": "Hailey", 
+    "maintainer": "zvecr", 
+    "width": 16.25, 
+    "height": 6.5, 
+    "layouts": {
+        "LAYOUT_ansi": {
+            "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,2", "x":1.25, "y":0}, {"label":"0,3", "x":2.25, "y":0}, {"label":"0,4", "x":3.25, "y":0}, {"label":"0,5", "x":4.25, "y":0}, {"label":"0,6", "x":5.5, "y":0}, {"label":"0,7", "x":6.5, "y":0}, {"label":"0,8", "x":7.5, "y":0}, {"label":"0,9", "x":8.5, "y":0}, {"label":"0,10", "x":9.75, "y":0}, {"label":"0,11", "x":10.75, "y":0}, {"label":"0,12", "x":11.75, "y":0}, {"label":"0,13", "x":12.75, "y":0}, {"label":"0,14", "x":14, "y":0}, {"label":"6,16", "x":15.25, "y":0}, {"label":"1,0", "x":0, "y":1.25}, {"label":"1,1", "x":1, "y":1.25}, {"label":"1,2", "x":2, "y":1.25}, {"label":"1,3", "x":3, "y":1.25}, {"label":"1,4", "x":4, "y":1.25}, {"label":"1,5", "x":5, "y":1.25}, {"label":"1,6", "x":6, "y":1.25}, {"label":"1,7", "x":7, "y":1.25}, {"label":"1,8", "x":8, "y":1.25}, {"label":"1,9", "x":9, "y":1.25}, {"label":"1,10", "x":10, "y":1.25}, {"label":"1,11", "x":11, "y":1.25}, {"label":"1,12", "x":12, "y":1.25}, {"label":"1,13", "x":13, "y":1.25, "w":2}, {"label":"1,15", "x":15.25, "y":1.25}, {"label":"2,0", "x":0, "y":2.25, "w":1.5}, {"label":"2,1", "x":1.5, "y":2.25}, {"label":"2,2", "x":2.5, "y":2.25}, {"label":"2,3", "x":3.5, "y":2.25}, {"label":"2,4", "x":4.5, "y":2.25}, {"label":"2,5", "x":5.5, "y":2.25}, {"label":"2,6", "x":6.5, "y":2.25}, {"label":"2,7", "x":7.5, "y":2.25}, {"label":"2,8", "x":8.5, "y":2.25}, {"label":"2,9", "x":9.5, "y":2.25}, {"label":"2,10", "x":10.5, "y":2.25}, {"label":"2,11", "x":11.5, "y":2.25}, {"label":"2,12", "x":12.5, "y":2.25}, {"label":"2,13", "x":13.5, "y":2.25, "w":1.5}, {"label":"2,15", "x":15.25, "y":2.25}, {"label":"3,0", "x":0, "y":3.25, "w":1.75}, {"label":"3,1", "x":1.75, "y":3.25}, {"label":"3,2", "x":2.75, "y":3.25}, {"label":"3,3", "x":3.75, "y":3.25}, {"label":"3,4", "x":4.75, "y":3.25}, {"label":"3,5", "x":5.75, "y":3.25}, {"label":"3,6", "x":6.75, "y":3.25}, {"label":"3,7", "x":7.75, "y":3.25}, {"label":"3,8", "x":8.75, "y":3.25}, {"label":"3,9", "x":9.75, "y":3.25}, {"label":"3,10", "x":10.75, "y":3.25}, {"label":"3,11", "x":11.75, "y":3.25}, {"label":"3,12", "x":12.75, "y":3.25, "w":2.25}, {"label":"3,15", "x":15.25, "y":3.25}, {"label":"4,0", "x":0, "y":4.25, "w":2.25}, {"label":"4,2", "x":2.25, "y":4.25}, {"label":"4,3", "x":3.25, "y":4.25}, {"label":"4,4", "x":4.25, "y":4.25}, {"label":"4,5", "x":5.25, "y":4.25}, {"label":"4,6", "x":6.25, "y":4.25}, {"label":"4,7", "x":7.25, "y":4.25}, {"label":"4,8", "x":8.25, "y":4.25}, {"label":"4,9", "x":9.25, "y":4.25}, {"label":"4,10", "x":10.25, "y":4.25}, {"label":"4,11", "x":11.25, "y":4.25}, {"label":"4,12", "x":12.25, "y":4.25, "w":1.75}, {"label":"4,14", "x":14.25, "y":4.5}, {"label":"5,0", "x":0, "y":5.25, "w":1.25}, {"label":"5,1", "x":1.25, "y":5.25, "w":1.25}, {"label":"5,2", "x":2.5, "y":5.25, "w":1.25}, {"label":"5,5", "x":3.75, "y":5.25, "w":6.25}, {"label":"5,9", "x":10, "y":5.25, "w":1.5}, {"label":"5,11", "x":11.5, "y":5.25, "w":1.5}, {"label":"5,12", "x":13.25, "y":5.5}, {"label":"5,14", "x":14.25, "y":5.5}, {"label":"5,15", "x":15.25, "y":5.5}]
+        },
+        "LAYOUT_all": {
+            "layout": [{"label":"0,0", "x":0, "y":0}, {"label":"0,2", "x":1.25, "y":0}, {"label":"0,3", "x":2.25, "y":0}, {"label":"0,4", "x":3.25, "y":0}, {"label":"0,5", "x":4.25, "y":0}, {"label":"0,6", "x":5.5, "y":0}, {"label":"0,7", "x":6.5, "y":0}, {"label":"0,8", "x":7.5, "y":0}, {"label":"0,9", "x":8.5, "y":0}, {"label":"0,10", "x":9.75, "y":0}, {"label":"0,11", "x":10.75, "y":0}, {"label":"0,12", "x":11.75, "y":0}, {"label":"0,13", "x":12.75, "y":0}, {"label":"0,14", "x":14, "y":0}, {"label":"6,16", "x":15.25, "y":0}, {"label":"1,0", "x":0, "y":1.25}, {"label":"1,1", "x":1, "y":1.25}, {"label":"1,2", "x":2, "y":1.25}, {"label":"1,3", "x":3, "y":1.25}, {"label":"1,4", "x":4, "y":1.25}, {"label":"1,5", "x":5, "y":1.25}, {"label":"1,6", "x":6, "y":1.25}, {"label":"1,7", "x":7, "y":1.25}, {"label":"1,8", "x":8, "y":1.25}, {"label":"1,9", "x":9, "y":1.25}, {"label":"1,10", "x":10, "y":1.25}, {"label":"1,11", "x":11, "y":1.25}, {"label":"1,12", "x":12, "y":1.25}, {"label":"1,13", "x":13, "y":1.25}, {"label":"1,14", "x":14, "y":1.25}, {"label":"1,15", "x":15.25, "y":1.25}, {"label":"2,0", "x":0, "y":2.25, "w":1.5}, {"label":"2,1", "x":1.5, "y":2.25}, {"label":"2,2", "x":2.5, "y":2.25}, {"label":"2,3", "x":3.5, "y":2.25}, {"label":"2,4", "x":4.5, "y":2.25}, {"label":"2,5", "x":5.5, "y":2.25}, {"label":"2,6", "x":6.5, "y":2.25}, {"label":"2,7", "x":7.5, "y":2.25}, {"label":"2,8", "x":8.5, "y":2.25}, {"label":"2,9", "x":9.5, "y":2.25}, {"label":"2,10", "x":10.5, "y":2.25}, {"label":"2,11", "x":11.5, "y":2.25}, {"label":"2,12", "x":12.5, "y":2.25}, {"label":"2,13", "x":13.5, "y":2.25, "w":1.5}, {"label":"2,15", "x":15.25, "y":2.25}, {"label":"3,0", "x":0, "y":3.25, "w":1.75}, {"label":"3,1", "x":1.75, "y":3.25}, {"label":"3,2", "x":2.75, "y":3.25}, {"label":"3,3", "x":3.75, "y":3.25}, {"label":"3,4", "x":4.75, "y":3.25}, {"label":"3,5", "x":5.75, "y":3.25}, {"label":"3,6", "x":6.75, "y":3.25}, {"label":"3,7", "x":7.75, "y":3.25}, {"label":"3,8", "x":8.75, "y":3.25}, {"label":"3,9", "x":9.75, "y":3.25}, {"label":"3,10", "x":10.75, "y":3.25}, {"label":"3,11", "x":11.75, "y":3.25}, {"label":"3,12", "x":12.75, "y":3.25, "w":2.25}, {"label":"3,15", "x":15.25, "y":3.25}, {"label":"4,0", "x":0, "y":4.25, "w":1.25}, {"label":"4,1", "x":1.25, "y":4.25}, {"label":"4,2", "x":2.25, "y":4.25}, {"label":"4,3", "x":3.25, "y":4.25}, {"label":"4,4", "x":4.25, "y":4.25}, {"label":"4,5", "x":5.25, "y":4.25}, {"label":"4,6", "x":6.25, "y":4.25}, {"label":"4,7", "x":7.25, "y":4.25}, {"label":"4,8", "x":8.25, "y":4.25}, {"label":"4,9", "x":9.25, "y":4.25}, {"label":"4,10", "x":10.25, "y":4.25}, {"label":"4,11", "x":11.25, "y":4.25}, {"label":"4,12", "x":12.25, "y":4.25, "w":1.75}, {"label":"4,14", "x":14.25, "y":4.5}, {"label":"5,0", "x":0, "y":5.25, "w":1.25}, {"label":"5,1", "x":1.25, "y":5.25, "w":1.25}, {"label":"5,2", "x":2.5, "y":5.25, "w":1.25}, {"label":"5,5", "x":3.75, "y":5.25, "w":6.25}, {"label":"5,9", "x":10, "y":5.25, "w":1.5}, {"label":"5,11", "x":11.5, "y":5.25, "w":1.5}, {"label":"5,12", "x":13.25, "y":5.5}, {"label":"5,14", "x":14.25, "y":5.5}, {"label":"5,15", "x":15.25, "y":5.5}]
+        }
+    }
+}
\ No newline at end of file
diff --git a/qmk/keyboards/nightingale_studios/hailey/keymaps/default/config.h b/qmk/keyboards/nightingale_studios/hailey/keymaps/default/config.h
new file mode 100644
index 00000000..cd88d1ab
--- /dev/null
+++ b/qmk/keyboards/nightingale_studios/hailey/keymaps/default/config.h
@@ -0,0 +1,20 @@
+/*
+Copyright 2020 zvecr<git@zvecr.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
+
+#define TAP_CODE_DELAY 10
+#define ENCODER_RESOLUTION 2
diff --git a/qmk/keyboards/nightingale_studios/hailey/keymaps/default/keymap.c b/qmk/keyboards/nightingale_studios/hailey/keymaps/default/keymap.c
new file mode 100644
index 00000000..062c51aa
--- /dev/null
+++ b/qmk/keyboards/nightingale_studios/hailey/keymaps/default/keymap.c
@@ -0,0 +1,46 @@
+/*
+Copyright 2020 zvecr<git@zvecr.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 QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [0] = LAYOUT_ansi(
+    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_F13,   KC_MPLY,
+    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_BSLS,  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_BSPC,            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,   MO(1),
+    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_LGUI,  KC_LALT,                      KC_SPC,                                 KC_RALT,  KC_RCTRL,                     KC_LEFT,  KC_DOWN,  KC_RGHT
+  ),
+
+  [1] = LAYOUT_ansi(
+    RESET,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                      _______,  _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
+    _______,  _______,  _______,                      _______,                                _______,  _______,                      _______,  _______,  _______
+  ),
+};
+
+void encoder_update_user(uint8_t index, bool clockwise) {
+  if (clockwise) {
+    tap_code(KC_VOLU);
+  } else {
+    tap_code(KC_VOLD);
+  }
+}
diff --git a/qmk/keyboards/nightingale_studios/hailey/keymaps/via/config.h b/qmk/keyboards/nightingale_studios/hailey/keymaps/via/config.h
new file mode 100644
index 00000000..cd88d1ab
--- /dev/null
+++ b/qmk/keyboards/nightingale_studios/hailey/keymaps/via/config.h
@@ -0,0 +1,20 @@
+/*
+Copyright 2020 zvecr<git@zvecr.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
+
+#define TAP_CODE_DELAY 10
+#define ENCODER_RESOLUTION 2
diff --git a/qmk/keyboards/nightingale_studios/hailey/keymaps/via/keymap.c b/qmk/keyboards/nightingale_studios/hailey/keymaps/via/keymap.c
new file mode 100644
index 00000000..0b7e0903
--- /dev/null
+++ b/qmk/keyboards/nightingale_studios/hailey/keymaps/via/keymap.c
@@ -0,0 +1,46 @@
+/*
+Copyright 2020 zvecr<git@zvecr.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 QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [0] = LAYOUT_all(
+    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_F13,   KC_MPLY,
+    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_BSLS,  KC_BSLS,  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_BSPC,            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,   MO(1),
+    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_UP,
+    KC_LCTL,  KC_LGUI,  KC_LALT,                      KC_SPC,                                 KC_RALT,  KC_RCTRL,                     KC_LEFT,  KC_DOWN,  KC_RGHT
+  ),
+
+  [1] = LAYOUT_all(
+    RESET,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                      _______,  _______,
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
+    _______,  _______,  _______,                      _______,                                _______,  _______,                      _______,  _______,  _______
+  ),
+};
+
+void encoder_update_user(uint8_t index, bool clockwise) {
+  if (clockwise) {
+    tap_code(KC_VOLU);
+  } else {
+    tap_code(KC_VOLD);
+  }
+}
diff --git a/qmk/keyboards/nightingale_studios/hailey/readme.md b/qmk/keyboards/nightingale_studios/hailey/readme.md
new file mode 100644
index 00000000..9d953a57
--- /dev/null
+++ b/qmk/keyboards/nightingale_studios/hailey/readme.md
@@ -0,0 +1,19 @@
+# Hailey
+
+![Hailey](https://i.imgur.com/DFZdE8E.jpg)
+
+A 75% ARM STM32F072 keyboard, with EC11K rotary encoder.
+
+* Keyboard Maintainer: [zvecr](https://github.com/zvecr)
+* Hardware Supported: Hailey PCB
+* Hardware Availability: Private Group-Buy
+
+Make example for this keyboard (after setting up your build environment):
+
+    make nightingale_studios/hailey:default
+
+Flashing example for this keyboard:
+
+    make nightingale_studios/hailey:default:flash
+
+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).
diff --git a/qmk/keyboards/nightingale_studios/hailey/rules.mk b/qmk/keyboards/nightingale_studios/hailey/rules.mk
new file mode 100644
index 00000000..5789036c
--- /dev/null
+++ b/qmk/keyboards/nightingale_studios/hailey/rules.mk
@@ -0,0 +1,20 @@
+# MCU name
+MCU = STM32F072
+
+# Build Options
+#   change yes to no to disable
+#
+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
+# 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
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = yes
diff --git a/qmk/keyboards/nightly_boards/alter/rev1/info.json b/qmk/keyboards/nightly_boards/alter/rev1/info.json
index abf155f1..4d4574f9 100644
--- a/qmk/keyboards/nightly_boards/alter/rev1/info.json
+++ b/qmk/keyboards/nightly_boards/alter/rev1/info.json
@@ -5,7 +5,7 @@
     "width": 20,
     "height": 5.25,
     "layouts": {
-        "LAYOUT": {
+        "LAYOUT_alice_split_bs": {
              "layout": [
 				{"x":0.5, "y":0}, 
 				{"x":2, "y":0}, 
diff --git a/qmk/keyboards/nightly_boards/alter/rev1/keymaps/default/keymap.c b/qmk/keyboards/nightly_boards/alter/rev1/keymaps/default/keymap.c
index cf2e561c..aff0c916 100644
--- a/qmk/keyboards/nightly_boards/alter/rev1/keymaps/default/keymap.c
+++ b/qmk/keyboards/nightly_boards/alter/rev1/keymaps/default/keymap.c
@@ -16,14 +16,14 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(
+    [0] = LAYOUT_alice_split_bs(
         KC_ESC,     KC_GESC, 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_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_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_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),            
                     KC_LCTL,          KC_LALT,          KC_SPC,  MO(1),	           KC_SPC,           KC_RGUI,                            KC_RCTL           
     ),
-    [1] = LAYOUT(
+    [1] = LAYOUT_alice_split_bs(
         RESET,      _______, 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_BRIU,    _______, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______  , _______, KC_DEL,          
         KC_BRID,    _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______, _______, _______, _______, _______,          _______,          
diff --git a/qmk/keyboards/nightly_boards/alter/rev1/rev1.h b/qmk/keyboards/nightly_boards/alter/rev1/rev1.h
index ee919c56..8fbbc71a 100644
--- a/qmk/keyboards/nightly_boards/alter/rev1/rev1.h
+++ b/qmk/keyboards/nightly_boards/alter/rev1/rev1.h
@@ -26,7 +26,7 @@
  * The second converts the arguments into a two-dimensional array which
  * represents the switch matrix.
  */
-#define LAYOUT( \
+#define LAYOUT_alice_split_bs( \
        K00,   K10, K01, K11, K02, K12, K03, K13,         K04, K14, K05, K15, K06, K16, K17, K07,     \
       K20,  K30,    K21,  K31, K22, K32, K23,          K24, K34, K25, K35,  K26, K36, K27, K37,      \
      K40,  K50,     K51,   K42, K52, K43, K53,          K44, K54, K45, K55,    K46, K56, K47,        \
@@ -44,3 +44,5 @@
     { KC_NO, KC_NO, K82,   K83,   K84,   KC_NO, KC_NO, K87   }, \
     { K90,   KC_NO, K92,   KC_NO, KC_NO, K95,   KC_NO, KC_NO }, \
 }
+
+#define LAYOUT LAYOUT_alice_split_bs
diff --git a/qmk/keyboards/nightly_boards/alter/rev1/rules.mk b/qmk/keyboards/nightly_boards/alter/rev1/rules.mk
index 5dbee69a..dafed5b0 100644
--- a/qmk/keyboards/nightly_boards/alter/rev1/rules.mk
+++ b/qmk/keyboards/nightly_boards/alter/rev1/rules.mk
@@ -28,4 +28,6 @@ RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
 MIDI_ENABLE = no            # MIDI support
 BLUETOOTH_ENABLE = no       # Enable Bluetooth
 AUDIO_ENABLE = no           # Audio output
-FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches
\ No newline at end of file
+FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches
+
+LAYOUTS = alice_split_bs
diff --git a/qmk/keyboards/nightmare/config.h b/qmk/keyboards/nightmare/config.h
index 29ab97c1..1bf32ca6 100644
--- a/qmk/keyboards/nightmare/config.h
+++ b/qmk/keyboards/nightmare/config.h
@@ -216,34 +216,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
-
 /* Bootmagic Lite key configuration */
 #define BOOTMAGIC_LITE_ROW 0
 #define BOOTMAGIC_LITE_COLUMN 1
diff --git a/qmk/keyboards/nightmare/keymaps/brandonschlack/keymap.c b/qmk/keyboards/nightmare/keymaps/brandonschlack/keymap.c
new file mode 100644
index 00000000..16da4184
--- /dev/null
+++ b/qmk/keyboards/nightmare/keymaps/brandonschlack/keymap.c
@@ -0,0 +1,195 @@
+/* Copyright 2019 Brandon Schlack
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+#include "brandonschlack.h"
+
+/**
+ * Layer Names
+ *
+ * Layers mostly used for macro keys
+ */
+#define _REEDER   _M1
+#define _NAV      _M2
+#define _MOUSE    _M3
+
+/**
+ * Keycodes & Macros
+ */
+#define TG_BASE   TO(_BASE)
+#define TG_REDR   TO(_REEDER)
+#define TG_NAV    TO(_NAV)
+#define TG_MOUS   TO(_MOUSE)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/**
+ * Base
+ * ┌───┬┬┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │Hom│││Esc│ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │{ [│} ]│Bck│
+ * ├───┼┼┼───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤
+ * │PgU│││Tab │ A │ S │ D │ F │ G │ H │ J │ K │ L │: ;│" '│ Enter│
+ * ├───┼┼┼────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──┬───┤
+ * │PgD│││Shift │ Z │ X │ C │ V │ B │ N │ M │< ,│> .│? /│Shft│ Fn│
+ * ├───┼┼┼┬┬┬┬┬─┴─┬─┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┼───┬┼┬┬┬┤
+ * │End││││││││Opt│Cmd │                           │ Cmd│Ctl││││││
+ * └───┴┴┴┴┴┴┴┴───┴────┴───────────────────────────┴────┴───┴┴┴┴┴┘
+ */
+[_BASE] = LAYOUT_default( \
+    KC_HOME,   KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC, \
+    KC_PGUP,   HY_TAB,  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_PGDN,            KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, PLY_FN1, \
+    KC_END,                      KC_LOPT, KC_LCMD,                            SPC_RAI,                            KC_RCMD, KC_RCTL  \
+),
+
+/**
+ * Reeder
+ * ┌───┬┬┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │ P │││   │   │   │   │   │   │   │   │   │   │   │   │   │   │
+ * ├───┼┼┼───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤
+ * │ K │││    │   │   │   │   │   │   │   │   │   │   │   │      │
+ * ├───┼┼┼────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──┬───┤
+ * │ J │││      │   │   │   │   │   │   │   │   │   │   │    │   │
+ * ├───┼┼┼┬┬┬┬┬─┴─┬─┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┼───┬┼┬┬┬┤
+ * │ N ││││││││   │    │                           │    │   ││││││
+ * └───┴┴┴┴┴┴┴┴───┴────┴───────────────────────────┴────┴───┴┴┴┴┴┘
+ */
+
+[_REEDER] = LAYOUT_default( \
+    _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, \
+    _______,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    _______,                     _______, _______,                            _______,                            _______, _______  \
+),
+
+/**
+ * Nav
+ * ┌───┬┬┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │ → │││   │   │   │   │   │   │   │   │   │   │   │   │   │   │
+ * ├───┼┼┼───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤
+ * │ ↑ │││    │   │   │   │   │   │   │   │   │   │   │   │      │
+ * ├───┼┼┼────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──┬───┤
+ * │ ↓ │││      │   │   │   │   │   │   │   │   │   │   │    │   │
+ * ├───┼┼┼┬┬┬┬┬─┴─┬─┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┼───┬┼┬┬┬┤
+ * │ ← ││││││││   │    │                           │    │   ││││││
+ * └───┴┴┴┴┴┴┴┴───┴────┴───────────────────────────┴────┴───┴┴┴┴┴┘
+ */
+[_NAV] = LAYOUT_default( \
+    _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, \
+    _______,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    _______,                     _______, _______,                            _______,                            _______, _______  \
+),
+
+/**
+ * Mouse
+ * ┌───┬┬┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │WhU│││   │   │   │   │   │   │   │   │   │   │   │   │   │   │
+ * ├───┼┼┼───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤
+ * │ ↑ │││    │   │   │   │   │   │   │   │   │   │   │   │      │
+ * ├───┼┼┼────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──┬───┤
+ * │ ↓ │││      │   │   │   │   │   │   │   │   │   │   │    │   │
+ * ├───┼┼┼┬┬┬┬┬─┴─┬─┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┼───┬┼┬┬┬┤
+ * │WhD││││││││   │    │                           │    │   ││││││
+ * └───┴┴┴┴┴┴┴┴───┴────┴───────────────────────────┴────┴───┴┴┴┴┴┘
+ */
+[_MOUSE] = LAYOUT_default( \
+    _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, \
+    _______,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    _______,                     _______, _______,                            _______,                            _______, _______  \
+),
+
+/**
+ * Lower
+ * ┌───┬┬┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │Nxt│││Del│BrD│BrU│Msn│LHP│   │   │   │   │   │   │ ↑ │Mut│SlD│
+ * ├───┼┼┼───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤
+ * │VlU│││    │   │   │NxW│PvT│Bck│Fwd│NxT│   │   │ ← │ → │ Play │
+ * ├───┼┼┼────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──┬───┤
+ * │VlD│││SftCap│   │   │   │1PX│1Ps│   │   │   │   │ ↓ │    │   │
+ * ├───┼┼┼┬┬┬┬┬─┴─┬─┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┼───┬┼┬┬┬┤
+ * │Prv││││││││   │    │                           │    │   ││││││
+ * └───┴┴┴┴┴┴┴┴───┴────┴───────────────────────────┴────┴───┴┴┴┴┴┘
+ */
+[_LOWER] = LAYOUT_default( \
+    KC_MNXT,   KC_DELT, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, _______, _______, _______, _______, _______, _______, KC_UP,   KC_MUTE, MC_SLPD, \
+    KC_VOLU,   _______, _______, _______, NXT_WIN, PRV_TAB, MC_BACK, MC_FWRD, NXT_TAB, _______, _______, KC_LEFT, KC_RGHT,          KC_MPLY, \
+    KC_VOLD,            SF_CAPS, _______, _______, _______, PX_AFLL, OP_AFLL, _______, _______, _______, _______, KC_DOWN, _______, _______, \
+    KC_MPRV,                     _______, _______,                            _______,                            _______, _______  \
+),
+
+/**
+ * Raise
+ * ┌───┬┬┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │Nxt│││~ `│! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│_ -│+ =│   │
+ * ├───┼┼┼───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤
+ * │VlU│││    │ F1│ F2│ F3│ F4│ F5│ F6│_ -│+ =│   │   │   │      │
+ * ├───┼┼┼────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──┬───┤
+ * │VlD│││      │ F7│ F8│ F9│F10│F11│F12│   │   │   │| \│    │   │
+ * ├───┼┼┼┬┬┬┬┬─┴─┬─┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┼───┬┼┬┬┬┤
+ * │Prv││││││││   │    │                           │    │   ││││││
+ * └───┴┴┴┴┴┴┴┴───┴────┴───────────────────────────┴────┴───┴┴┴┴┴┘
+ */
+[_RAISE] = LAYOUT_default( \
+    KC_MNXT,   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_VOLU,   _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  _______, _______, _______,          _______, \
+    KC_VOLD,            _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______, KC_BSLS, _______, _______, \
+    KC_MPRV,                     _______, _______,                            _______,                            _______, _______  \
+),
+
+/**
+ * Adjust
+ * ┌───┬┬┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │Bse│││Mke│   │   │EEP│RST│   │   │   │   │   │   │   │   │   │
+ * ├───┼┼┼───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤
+ * │Rdr│││    │   │   │   │   │   │   │   │   │   │   │   │      │
+ * ├───┼┼┼────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──┬───┤
+ * │Nav│││      │   │   │   │   │   │   │   │   │   │   │    │   │
+ * ├───┼┼┼┬┬┬┬┬─┴─┬─┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┼───┬┼┬┬┬┤
+ * │Mse││││││││   │    │                           │    │   ││││││
+ * └───┴┴┴┴┴┴┴┴───┴────┴───────────────────────────┴────┴───┴┴┴┴┴┘
+ */
+[_ADJUST] = LAYOUT_default( \
+    TG_BASE,   QM_MAKE, _______, _______, EEP_RST, RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    TG_REDR,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, \
+    TG_NAV,             _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    TG_MOUS,                     _______, _______,                            _______,                            _______, _______  \
+),
+
+/**
+ * Blank
+ * ┌───┬┬┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │   │││   │   │   │   │   │   │   │   │   │   │   │   │   │   │
+ * ├───┼┼┼───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤
+ * │   │││    │   │   │   │   │   │   │   │   │   │   │   │      │
+ * ├───┼┼┼────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴──┬───┤
+ * │   │││      │   │   │   │   │   │   │   │   │   │   │    │   │
+ * ├───┼┼┼┬┬┬┬┬─┴─┬─┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┼───┬┼┬┬┬┤
+ * │   ││││││││   │    │                           │    │   ││││││
+ * └───┴┴┴┴┴┴┴┴───┴────┴───────────────────────────┴────┴───┴┴┴┴┴┘
+ */
+/*
+[] = LAYOUT_default( \
+    _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    _______,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, \
+    _______,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    _______,                     _______, _______,                            _______,                            _______, _______  \
+),
+*/
+};
+
+layer_state_t layer_state_set_keymap(layer_state_t state) {
+    return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
+}
diff --git a/qmk/keyboards/nightmare/keymaps/brandonschlack/readme.md b/qmk/keyboards/nightmare/keymaps/brandonschlack/readme.md
new file mode 100644
index 00000000..94c77833
--- /dev/null
+++ b/qmk/keyboards/nightmare/keymaps/brandonschlack/readme.md
@@ -0,0 +1,20 @@
+# brandonschlack's Nightmare Keymap
+
+![Base, Raise, Lower](https://i.imgur.com/08759vK.png)
+
+## Features
+- Mod-Taps & Layer-Taps
+  - Spacebar is used as a Fn button when held to access missing numrow and F-keys on the **RAISE** layer.
+  - Holding `Tab` acts as `HYPER`, or `Shift+Control+Option+Command`. I use this set global shortcuts, such as `HYPER+w` for my **W**indow manager Moom.
+- **Lower** Layer
+  - `Lower+Esc` for `Delete`
+  - `Lower+LShift` for `Caps Lock`. Holding `Lower+LShift` still acts as `LShift`
+  - Arrow keys as `Lower+[`,`;`,`'`,`/` for `Up`,`Left`,`Right`,`Down`.
+  - Media keys as `Lower+Enter`,`Home`,`End` for `Play/Pause`,`Next Track`,`Prev Track`
+  - Volume controls as `Lower+]`,`Page Up`,`Page Down` for `Mute`,`Volume Up`,`Volume Down`
+- MacOS shortcuts on **Lower** Layer
+  - Display Brightness as `Lower+Q`,`W` for `Brightness Down`, `Brightness Up`
+  - Mission Control as `Lower+E`
+  - Launchpad as `Lower+R`
+  - Sleep Display as `Lower+Backspace`
+  - Browser 
diff --git a/qmk/keyboards/nightmare/rules.mk b/qmk/keyboards/nightmare/rules.mk
index 5fa842c8..dfc402a3 100644
--- a/qmk/keyboards/nightmare/rules.mk
+++ b/qmk/keyboards/nightmare/rules.mk
@@ -30,4 +30,3 @@ 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
diff --git a/qmk/keyboards/nk65/config.h b/qmk/keyboards/nk65/config.h
index 826e5418..f9845f67 100644
--- a/qmk/keyboards/nk65/config.h
+++ b/qmk/keyboards/nk65/config.h
@@ -144,3 +144,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 // VIA lighting is handled by the keyboard-level code
 #define VIA_CUSTOM_LIGHTING_ENABLE
+
+/* Custom EEPROM start addressing. This is to support
+ * both 128kb and 256kb versions of F303.
+ * Register 0x1FFFF7CC holds the size of the flash memory.
+ */
+#define EEPROM_START_ADDRESS
+#define FEE_MCU_FLASH_SIZE                              \
+({                                                      \
+    uint16_t (*flash_size) = (uint16_t*)FLASHSIZE_BASE;  \
+    *flash_size;                                        \
+})
diff --git a/qmk/keyboards/nk65/nk65.c b/qmk/keyboards/nk65/nk65.c
index 972373e1..fae30ac7 100644
--- a/qmk/keyboards/nk65/nk65.c
+++ b/qmk/keyboards/nk65/nk65.c
@@ -20,7 +20,7 @@
 #include "nk65.h"
 #include "drivers/issi/is31fl3733.h"
 
-/* Indicator LEDS are part of the LED driver 
+/* Indicator LEDS are part of the LED driver
  * Top LED is blue only. LED driver 2 RGB 7 Green channel
  * Middle LED is blue and red. LED driver 2 RGB 6 Red and Blue channel
  * Bottom LED is red only LED driver 2 RGB 6 Green channel.
@@ -48,7 +48,7 @@ __attribute__((weak)) layer_state_t layer_state_set_user(layer_state_t state) {
     if (state & (1UL << 2)) {
         G = 255;
     }
-    
+
     IS31FL3733_set_color( 6+64-1, R, G, B );
   return state;
 }
diff --git a/qmk/keyboards/nopunin10did/railroad/readme.md b/qmk/keyboards/nopunin10did/railroad/readme.md
new file mode 100644
index 00000000..aac088f1
--- /dev/null
+++ b/qmk/keyboards/nopunin10did/railroad/readme.md
@@ -0,0 +1,15 @@
+# The Railroad
+
+![The Railroad](https://i.imgur.com/B8OjXmyl.jpg)
+
+A long keyboard with ortholinear alphas and semi-standard modifier keys. For more information, join the [NoPunIn10Key Discord](https://discord.gg/sku2Y6w).
+
+* Keyboard Maintainer: [Alex Ronke](diplomacyvariants.wordpress.com), also known as NoPunIn10Did. 
+* Hardware Supported: The Railroad: 2020-07 Prototype
+* Hardware Availability: Currently by request only
+
+Make example for this keyboard (after setting up your build environment):
+
+    make nopunin10did/railroad/rev0: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).
diff --git a/qmk/keyboards/nopunin10did/railroad/rev0/config.h b/qmk/keyboards/nopunin10did/railroad/rev0/config.h
new file mode 100644
index 00000000..8c6b075b
--- /dev/null
+++ b/qmk/keyboards/nopunin10did/railroad/rev0/config.h
@@ -0,0 +1,47 @@
+/* Copyright 2020 W. Alex Ronke, a.k.a. NoPunIn10Did (w.alex.ronke@gmail.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x4E50  // "NP"
+#define PRODUCT_ID      0x9111
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    NoPunIn10Did
+#define PRODUCT         The Railroad
+
+/* key matrix size */
+#define MATRIX_ROWS 10
+#define MATRIX_COLS 11
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { D2, D3, D5, C6, C7, F6, F5, F4, F1, F0 }
+#define MATRIX_COL_PINS { B0, B1, B2, B3, B7, D4, D6, D7, B4, B5, B6 }
+#define UNUSED_PINS
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
diff --git a/qmk/keyboards/nopunin10did/railroad/rev0/info.json b/qmk/keyboards/nopunin10did/railroad/rev0/info.json
new file mode 100644
index 00000000..4305c09d
--- /dev/null
+++ b/qmk/keyboards/nopunin10did/railroad/rev0/info.json
@@ -0,0 +1,122 @@
+{
+    "keyboard_name": "The Railroad",
+    "url": "https://github.com/qmk/qmk_firmware/tree/master/keyboards/nopunin10did/railroad",
+    "maintainer": "NoPunIn10Did",
+    "manufacturer": "NoPunIn10Did",
+    "width": 23.5,
+    "height": 5.25,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"y":0, "x":0, "label":"Scroll"},   
+                {"y":0, "x":1, "label":"Pause"},    
+                {"y":0, "x":2, "label":"Esc"},      
+                {"y":0, "x":3, "label":"`"}, 
+                {"y":0, "x":4, "label":"1"},        
+                {"y":0, "x":5, "label":"2"},    
+                {"y":0, "x":6, "label":"3"},        
+                {"y":0, "x":7, "label":"4"},
+                {"y":0, "x":8, "label":"5"},        
+                {"y":0, "x":9, "label":"-"},
+                    
+                {"y":1, "x":0,   "label":"Print"},    
+                {"y":1, "x":1,   "label":"Backspace", "w":1.5}, 
+                {"y":1, "x":2.5, "label":"Tab", "w":1.5},
+                {"y":1, "x":4,   "label":"Q"},        
+                {"y":1, "x":5,   "label":"W"}, 
+                {"y":1, "x":6,   "label":"E"},        
+                {"y":1, "x":7,   "label":"R"}, 
+                {"y":1, "x":8,   "label":"T"},        
+                {"y":1, "x":9,   "label":"["},
+                
+                {"y":2, "x":0,    "label":"Caps", "w":1.25},
+                {"y":2, "x":1.75, "label":"Control", "w":2.25},
+                {"y":2, "x":4,    "label":"A"},        
+                {"y":2, "x":5,    "label":"S"}, 
+                {"y":2, "x":6,    "label":"D"},
+                {"y":2, "x":7,    "label":"F"}, 
+                {"y":2, "x":8,    "label":"G"},
+                {"y":2, "x":9,    "label":"PgUp"},
+                
+                {"y":3.25, "x":0, "label":"Cut"},
+                {"y":3, "x":1.25, "label":"Shift", "w":2.75},
+                {"y":3,    "x":4, "label":"Z"},        
+                {"y":3,    "x":5, "label":"X"}, 
+                {"y":3,    "x":6, "label":"C"},        
+                {"y":3,    "x":7, "label":"V"}, 
+                {"y":3,    "x":8, "label":"B"},        
+                {"y":3,    "x":9, "label":"PgDn"},
+                
+                {"y":4.25, "x":0,    "label":"Copy"},
+                {"y":4.25, "x":1,    "label":"Paste"},
+                {"y":4, "x":2.25,    "label":"Control", "w":1.5},
+                {"y":4, "x":3.75,    "label":"Super", "w":1.25},
+                {"y":4, "x":5,       "label":"Alt", "w":1.25},
+                {"y":4.25, "x":6.5,  "label":"UK \\|"},
+                {"y":4.25, "x":7.5,  "label":"Space", "w":1.75},
+                {"y":4.25, "x":9.25, "label":"Shift / Del", "w":2.75},
+                
+                {"y":0, "x":10.25, "label":"F1"}, 
+                {"y":0, "x":11.25, "label":"F5"},        
+                {"y":0, "x":12.25, "label":"F9"}, 
+                {"y":1, "x":10.25, "label":"F2"}, 
+                {"y":1, "x":11.25, "label":"F6"},        
+                {"y":1, "x":12.25, "label":"F10"},
+                {"y":2, "x":10.25, "label":"F3"}, 
+                {"y":2, "x":11.25, "label":"F7"},        
+                {"y":2, "x":12.25, "label":"F11"}, 
+                {"y":3, "x":10.25, "label":"F4"}, 
+                {"y":3, "x":11.25, "label":"F8"},        
+                {"y":3, "x":12.25, "label":"F12"},
+                
+                {"y":0, "x":13.5, "label":"="},
+                {"y":0, "x":14.5, "label":"6"},
+                {"y":0, "x":15.5, "label":"7"},
+                {"y":0, "x":16.5, "label":"8"},
+                {"y":0, "x":17.5, "label":"9"},
+                {"y":0, "x":18.5, "label":"0"},
+                {"y":0, "x":19.5, "label":"Backspace", "w":2},
+                {"y":0, "x":21.5, "label":"Ins"},
+                {"y":0, "x":22.5, "label":"Esc"},
+                
+                {"y":1, "x":13.5, "label":"]"},
+                {"y":1, "x":14.5, "label":"Y"},
+                {"y":1, "x":15.5, "label":"U"},
+                {"y":1, "x":16.5, "label":"I"},
+                {"y":1, "x":17.5, "label":"O"},
+                {"y":1, "x":18.5, "label":"P"},
+                {"y":1, "x":19.5, "label":"\\", "w":1.5},
+                {"y":1, "x":21,   "label":"Del"},
+                
+                {"y":2, "x":13.5, "label":"Home"},
+                {"y":2, "x":14.5, "label":"H"},
+                {"y":2, "x":15.5, "label":"J"},
+                {"y":2, "x":16.5, "label":"K"},
+                {"y":2, "x":17.5, "label":"L"},
+                {"y":2, "x":18.5, "label":";"},
+                {"y":2, "x":19.5, "label":"'"},
+                {"y":2, "x":20.5, "label":"Return", "w":1.75},
+                
+                {"y":1, "x":22.25, "label":"ISO Enter", "h":2, "w":1.25},
+                
+                {"y":3, "x":13.5,    "label":"End"},
+                {"y":3, "x":14.5,    "label":"N"},
+                {"y":3, "x":15.5,    "label":"M"},
+                {"y":3, "x":16.5,    "label":","},
+                {"y":3, "x":17.5,    "label":"."},
+                {"y":3, "x":18.5,    "label":"/"},
+                {"y":3, "x":19.5,    "label":"Shift", "w":1.75},
+                {"y":3.25, "x":21.5, "label":"Up"},
+                
+                {"y":4.25, "x":12,    "label":"LShftAlt / Calc", "w":2.25},
+                {"y":4.25, "x":14.25, "label":"Space", "w":1.75},
+                {"y":4.25, "x":16,    "label":"UK #~"},
+                {"y":4, "x":17.25,    "label":"AltGr / Home", "w":1.5},
+                {"y":4, "x":18.75,    "label":"Ctrl / End", "w":1.5},
+                {"y":4.25, "x":20.5,  "label":"Left"},
+                {"y":4.25, "x":21.5,  "label":"Down"},
+                {"y":4.25, "x":22.5,  "label":"Right"}
+            ]
+        }
+    }
+}
diff --git a/qmk/keyboards/nopunin10did/railroad/rev0/keymaps/default/keymap.c b/qmk/keyboards/nopunin10did/railroad/rev0/keymaps/default/keymap.c
new file mode 100644
index 00000000..8ffcc7f5
--- /dev/null
+++ b/qmk/keyboards/nopunin10did/railroad/rev0/keymaps/default/keymap.c
@@ -0,0 +1,45 @@
+/* Copyright 2020 W. Alex Ronke, a.k.a. NoPunIn10Did (w.alex.ronke@gmail.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+#define CUT     LCTL(KC_X)
+#define COPY    LCTL(KC_C)
+#define PASTE   LCTL(KC_V)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[0] = LAYOUT(
+/* Left Block */
+   KC_SLCK,KC_PAUS,KC_ESC ,KC_GRV ,KC_1   ,KC_2   ,KC_3   ,KC_4   ,KC_5   ,KC_MINS,  
+   KC_PSCR,KC_BSPC,        KC_TAB ,KC_Q   ,KC_W   ,KC_E   ,KC_R   ,KC_T   ,KC_LBRC,
+   KC_CAPS,                KC_LCTL,KC_A   ,KC_S   ,KC_D   ,KC_F   ,KC_G   ,KC_PGUP,
+   CUT    ,                KC_LSFT,KC_Z   ,KC_X   ,KC_C   ,KC_V   ,KC_B   ,KC_PGDN,
+   COPY   ,PASTE  ,        KC_LCTL,KC_LGUI,KC_LALT,KC_NUBS,KC_SPC ,KC_DEL ,
+/* Center Block */
+   KC_F1  ,KC_F5  ,KC_F9  ,
+   KC_F2  ,KC_F6  ,KC_F10 , 
+   KC_F3  ,KC_F7  ,KC_F11 , 
+   KC_F4  ,KC_F8  ,KC_F12 , 
+/* Right Block */
+   KC_EQL ,KC_6   ,KC_7   ,KC_8   ,KC_9   ,KC_0   ,KC_BSPC,        KC_INS ,KC_ESC , 
+   KC_RBRC,KC_Y   ,KC_U   ,KC_I   ,KC_O   ,KC_P   ,KC_BSLS,        KC_DEL ,/*ISO*/   
+   KC_HOME,KC_H   ,KC_J   ,KC_K   ,KC_L   ,KC_SCLN,KC_QUOT,        KC_ENT ,KC_ENT , 
+   KC_END ,KC_N   ,KC_M   ,KC_COMM,KC_DOT ,KC_SLSH,KC_RSFT,        KC_UP  ,
+           KC_CALC,KC_SPC ,KC_NUHS,KC_ALGR,KC_RCTL,        KC_LEFT,KC_DOWN,KC_RGHT 
+  )
+
+};
diff --git a/qmk/keyboards/nopunin10did/railroad/rev0/keymaps/nopunin10did/keymap.c b/qmk/keyboards/nopunin10did/railroad/rev0/keymaps/nopunin10did/keymap.c
new file mode 100644
index 00000000..466cd735
--- /dev/null
+++ b/qmk/keyboards/nopunin10did/railroad/rev0/keymaps/nopunin10did/keymap.c
@@ -0,0 +1,50 @@
+/* Copyright 2020 W. Alex Ronke, a.k.a. NoPunIn10Did (w.alex.ronke@gmail.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+ 
+#include QMK_KEYBOARD_H
+
+#define LSHFDEL LSFT_T(KC_DEL)
+#define LSACALC LSA_T(KC_CALC)
+#define RALTHOM RALT_T(KC_HOME)
+#define RCTLEND RCTL_T(KC_END)
+#define CUT     LCTL(KC_X)
+#define COPY    LCTL(KC_C)
+#define PASTE   LCTL(KC_V)
+#define CTLCAPS RCTL_T(KC_CAPS)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+[0] = LAYOUT(
+/* Left Block */
+   KC_ESC ,KC_PAUS,KC_ESC, KC_GRV, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,  
+   KC_SLCK,KC_BSPC,    KC_TAB,     KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_6,
+   CTLCAPS,      KC_LCTL,          KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_PGUP,
+   CUT,      KC_LSFT,              KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_PGDN,
+   COPY,   PASTE,    KC_LCTL,    KC_LGUI,  KC_LALT,    KC_GRV,   KC_SPC,     LSHFDEL,
+/* Center Block */
+   KC_F1,  KC_F5,  KC_F9,  
+   KC_F2,  KC_F6,  KC_F10,  
+   KC_F3,  KC_F7,  KC_F11,  
+   KC_F4,  KC_F8,  KC_F12,  
+/* Right Block */
+   KC_EQL, KC_7,   KC_8,   KC_9,   KC_0,   KC_MINS,KC_BSPC,         KC_INS, KC_PSCR,  
+   KC_EQL ,KC_Y,   KC_U,   KC_I,   KC_O,   KC_P,   KC_ENT ,     KC_DEL, /*   ISO */   
+   KC_LBRC,KC_H,   KC_J,   KC_K,   KC_L,   KC_SCLN,KC_QUOT,  KC_ENT,      KC_ENT,    
+   KC_RBRC,KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,KC_RSFT,          KC_UP,  
+ LSACALC,  KC_NUBS,    KC_NUHS,  RALTHOM,    RCTLEND,       KC_LEFT,KC_DOWN,KC_RGHT 
+  )
+
+};
diff --git a/qmk/keyboards/nopunin10did/railroad/rev0/readme.md b/qmk/keyboards/nopunin10did/railroad/rev0/readme.md
new file mode 100644
index 00000000..e3b8dc8b
--- /dev/null
+++ b/qmk/keyboards/nopunin10did/railroad/rev0/readme.md
@@ -0,0 +1,15 @@
+# The Railroad
+
+![The Railroad](https://i.imgur.com/B8OjXmyl.jpg)
+
+A long keyboard with ortholinear alphas and semi-standard modifier keys. For more information, join the [NoPunIn10Key Discord](https://discord.gg/sku2Y6w).
+
+* Keyboard Maintainer: [Alex Ronke](https://diplomacyvariants.wordpress.com/), also known as [NoPunIn10Did](https://github.com/nopunin10did). 
+* Hardware Supported: The Railroad: 2020-07 Prototype
+* Hardware Availability: Currently by request only
+
+Make example for this keyboard (after setting up your build environment):
+
+    make nopunin10did/railroad/rev0: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).
diff --git a/qmk/keyboards/nopunin10did/railroad/rev0/rev0.c b/qmk/keyboards/nopunin10did/railroad/rev0/rev0.c
new file mode 100644
index 00000000..f9a51af6
--- /dev/null
+++ b/qmk/keyboards/nopunin10did/railroad/rev0/rev0.c
@@ -0,0 +1,17 @@
+/* Copyright 2020 W. Alex Ronke, a.k.a. NoPunIn10Did (w.alex.ronke@gmail.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "rev0.h"
diff --git a/qmk/keyboards/nopunin10did/railroad/rev0/rev0.h b/qmk/keyboards/nopunin10did/railroad/rev0/rev0.h
new file mode 100644
index 00000000..ff7c3152
--- /dev/null
+++ b/qmk/keyboards/nopunin10did/railroad/rev0/rev0.h
@@ -0,0 +1,51 @@
+/* Copyright 2020 W. Alex Ronke, a.k.a. NoPunIn10Did (w.alex.ronke@gmail.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT( \
+\
+   K0000,  K0500,  K0100,  K0001,  K0101,  K0002,  K0102,  K0003,  K0103,  K0004,  \
+   K0200,  K0300,      K0201,      K0301,  K0202,  K0302,  K0203,  K0303,  K0204,  \
+   K0400,        K0401,            K0501,  K0402,  K0502,  K0403,  K0503,  K0404,  \
+   K0600,    K0601,                K0701,  K0602,  K0702,  K0603,  K0703,  K0604,  \
+   K0800,  K0900,    K0801,      K0901,    K0802,      K0902,  K0903,        K0904,\
+\
+   K0104,  K0005,  K0105,  \
+   K0304,  K0205,  K0305,  \
+   K0504,  K0405,  K0505,  \
+   K0704,  K0605,  K0705,  \
+\
+   K0006,  K0106,  K0007,  K0107,  K0008,  K0108,  K0009,          K0109,  K0010,  \
+   K0206,  K0306,  K0207,  K0307,  K0208,  K0308,  K0209,      K0309,  \
+   K0406,  K0506,  K0407,  K0507,  K0408,  K0508,  K0409,  K0509,        K0410,    \
+   K0606,  K0706,  K0607,  K0707,  K0608,  K0708,  K0609,          K0709,          \
+ K0905,  K0906,        K0907,    K0808,      K0908,        K0809,  K0909,  K0810   \
+) \
+{ \
+   { K0000, K0001, K0002, K0003, K0004, K0005, K0006, K0007, K0008, K0009, K0010 }, \
+   { K0100, K0101, K0102, K0103, K0104, K0105, K0106, K0107, K0108, K0109, KC_NO }, \
+   { K0200, K0201, K0202, K0203, K0204, K0205, K0206, K0207, K0208, K0209, KC_NO }, \
+   { K0300, K0301, K0302, K0303, K0304, K0305, K0306, K0307, K0308, K0309, KC_NO }, \
+   { K0400, K0401, K0402, K0403, K0404, K0405, K0406, K0407, K0408, K0409, K0410 }, \
+   { K0500, K0501, K0502, K0503, K0504, K0505, K0506, K0507, K0508, K0509, KC_NO }, \
+   { K0600, K0601, K0602, K0603, K0604, K0605, K0606, K0607, K0608, K0609, KC_NO }, \
+   { KC_NO, K0701, K0702, K0703, K0704, K0705, K0706, K0707, K0708, K0709, KC_NO }, \
+   { K0800, K0801, K0802, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K0808, K0809, K0810 }, \
+   { K0900, K0901, K0902, K0903, K0904, K0905, K0906, K0907, K0908, K0909, KC_NO }  \
+}
diff --git a/qmk/keyboards/nopunin10did/railroad/rev0/rules.mk b/qmk/keyboards/nopunin10did/railroad/rev0/rules.mk
new file mode 100644
index 00000000..a7facc53
--- /dev/null
+++ b/qmk/keyboards/nopunin10did/railroad/rev0/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # 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
+# 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 = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
diff --git a/qmk/keyboards/novelpad/config.h b/qmk/keyboards/novelpad/config.h
index a2d24d7f..3576ec4c 100644
--- a/qmk/keyboards/novelpad/config.h
+++ b/qmk/keyboards/novelpad/config.h
@@ -216,34 +216,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/noxary/220/config.h b/qmk/keyboards/noxary/220/config.h
index 75711380..5e371a4e 100644
--- a/qmk/keyboards/noxary/220/config.h
+++ b/qmk/keyboards/noxary/220/config.h
@@ -188,34 +188,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/noxary/220/keymaps/via/rules.mk b/qmk/keyboards/noxary/220/keymaps/via/rules.mk
index c2e96d23..09b3a0b6 100644
--- a/qmk/keyboards/noxary/220/keymaps/via/rules.mk
+++ b/qmk/keyboards/noxary/220/keymaps/via/rules.mk
@@ -1,5 +1,4 @@
 VIA_ENABLE = yes
-MOUSEKEY_ENABLE = no
 CONSOLE_ENABLE = no        # Console for debug
 COMMAND_ENABLE = no        # Commands for debug and configuration
 LTO_ENABLE = yes
diff --git a/qmk/keyboards/noxary/260/260.c b/qmk/keyboards/noxary/260/260.c
index 9f577a2a..a2f76a38 100644
--- a/qmk/keyboards/noxary/260/260.c
+++ b/qmk/keyboards/noxary/260/260.c
@@ -14,48 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "260.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
-  setPinOutput(B1);
-	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
-
-  led_set_user(usb_led);
-}
-
-*/
-
-void led_set_kb(uint8_t usb_led) {
-  if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
-    writePinLow(B1);
-  } else {
-    writePinHigh(B1);
-  }
-
-	led_set_user(usb_led);
-}
\ No newline at end of file
diff --git a/qmk/keyboards/noxary/260/config.h b/qmk/keyboards/noxary/260/config.h
index 379dbbf7..f3f0cbc3 100644
--- a/qmk/keyboards/noxary/260/config.h
+++ b/qmk/keyboards/noxary/260/config.h
@@ -48,6 +48,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
+#define LED_CAPS_LOCK_PIN B1
+#define LED_PIN_ON_STATE 0
+
 /*
  * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
  */
@@ -218,34 +221,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/noxary/260/rules.mk b/qmk/keyboards/noxary/260/rules.mk
index f17a6c17..093a7090 100644
--- a/qmk/keyboards/noxary/260/rules.mk
+++ b/qmk/keyboards/noxary/260/rules.mk
@@ -30,7 +30,6 @@ 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
 EXTRAFLAGS += -flto
 
 LAYOUTS = 60_ansi 60_iso 60_hhkb 60_tsangan_hhkb
diff --git a/qmk/keyboards/noxary/268/keymaps/via/rules.mk b/qmk/keyboards/noxary/268/keymaps/via/rules.mk
index c2e96d23..09b3a0b6 100644
--- a/qmk/keyboards/noxary/268/keymaps/via/rules.mk
+++ b/qmk/keyboards/noxary/268/keymaps/via/rules.mk
@@ -1,5 +1,4 @@
 VIA_ENABLE = yes
-MOUSEKEY_ENABLE = no
 CONSOLE_ENABLE = no        # Console for debug
 COMMAND_ENABLE = no        # Commands for debug and configuration
 LTO_ENABLE = yes
diff --git a/qmk/keyboards/noxary/268_2/config.h b/qmk/keyboards/noxary/268_2/config.h
index 1d668159..6adcc955 100644
--- a/qmk/keyboards/noxary/268_2/config.h
+++ b/qmk/keyboards/noxary/268_2/config.h
@@ -190,34 +190,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/noxary/268_2/keymaps/via/rules.mk b/qmk/keyboards/noxary/268_2/keymaps/via/rules.mk
index 1974f5d3..09b3a0b6 100644
--- a/qmk/keyboards/noxary/268_2/keymaps/via/rules.mk
+++ b/qmk/keyboards/noxary/268_2/keymaps/via/rules.mk
@@ -1,5 +1,4 @@
 VIA_ENABLE = yes
-MOUSEKEY_ENABLE = no
 CONSOLE_ENABLE = no        # Console for debug
 COMMAND_ENABLE = no        # Commands for debug and configuration
-LTO_ENABLE = yes
\ No newline at end of file
+LTO_ENABLE = yes
diff --git a/qmk/keyboards/noxary/268_2/rules.mk b/qmk/keyboards/noxary/268_2/rules.mk
index 168d3a2c..1533c297 100644
--- a/qmk/keyboards/noxary/268_2/rules.mk
+++ b/qmk/keyboards/noxary/268_2/rules.mk
@@ -30,6 +30,5 @@ 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
 
 LAYOUTS = 65_ansi_blocker
diff --git a/qmk/keyboards/noxary/280/config.h b/qmk/keyboards/noxary/280/config.h
index 0fe01217..a1bacd3d 100644
--- a/qmk/keyboards/noxary/280/config.h
+++ b/qmk/keyboards/noxary/280/config.h
@@ -189,34 +189,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/noxary/280/keymaps/via/rules.mk b/qmk/keyboards/noxary/280/keymaps/via/rules.mk
index c2e96d23..09b3a0b6 100644
--- a/qmk/keyboards/noxary/280/keymaps/via/rules.mk
+++ b/qmk/keyboards/noxary/280/keymaps/via/rules.mk
@@ -1,5 +1,4 @@
 VIA_ENABLE = yes
-MOUSEKEY_ENABLE = no
 CONSOLE_ENABLE = no        # Console for debug
 COMMAND_ENABLE = no        # Commands for debug and configuration
 LTO_ENABLE = yes
diff --git a/qmk/keyboards/noxary/280/rules.mk b/qmk/keyboards/noxary/280/rules.mk
index e75034e2..70902339 100644
--- a/qmk/keyboards/noxary/280/rules.mk
+++ b/qmk/keyboards/noxary/280/rules.mk
@@ -30,4 +30,3 @@ 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
diff --git a/qmk/keyboards/noxary/vulcan/config.h b/qmk/keyboards/noxary/vulcan/config.h
new file mode 100644
index 00000000..6281cb07
--- /dev/null
+++ b/qmk/keyboards/noxary/vulcan/config.h
@@ -0,0 +1,107 @@
+/*
+Copyright 2019 Ryota Goto
+
+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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0xA103
+#define PRODUCT_ID      0x0011
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Noxary
+#define PRODUCT         Vulcan
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 14
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+*/
+#define MATRIX_ROW_PINS { D1, D0, D2, F0, F1 }
+#define MATRIX_COL_PINS { F4, F5, F6, F7, C7, C6, B6, B5, B4, D7, D6, D4, D5, D3 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is userful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+// #define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+//#define NO_ACTION_MACRO
+//#define NO_ACTION_FUNCTION
+
+/* Bootmagic Lite key configuration */
+// #define BOOTMAGIC_LITE_ROW 0
+// #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/noxary/vulcan/info.json b/qmk/keyboards/noxary/vulcan/info.json
new file mode 100644
index 00000000..6e54519f
--- /dev/null
+++ b/qmk/keyboards/noxary/vulcan/info.json
@@ -0,0 +1,75 @@
+{
+    "keyboard_name": "vulcan", 
+    "url": "https://noxary.co/products/vulcan-pro-base", 
+    "maintainer": "ai03", 
+    "width": 15, 
+    "height": 5, 
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0}, 
+                {"label":"!", "x":1, "y":0}, 
+                {"label":"@", "x":2, "y":0}, 
+                {"label":"#", "x":3, "y":0}, 
+                {"label":"$", "x":4, "y":0}, 
+                {"label":"%", "x":5, "y":0}, 
+                {"label":"^", "x":6, "y":0}, 
+                {"label":"&", "x":7, "y":0}, 
+                {"label":"*", "x":8, "y":0}, 
+                {"label":"(", "x":9, "y":0}, 
+                {"label":")", "x":10, "y":0}, 
+                {"label":"_", "x":11, "y":0}, 
+                {"label":"+", "x":12, "y":0}, 
+                {"label":"Back Space", "x":13, "y":0}, 
+                {"label":"Delete", "x":14, "y":0}, 
+                {"label":"Tab", "x":0, "y":1, "w":1.5}, 
+                {"label":"Q", "x":1.5, "y":1}, 
+                {"label":"W", "x":2.5, "y":1}, 
+                {"label":"E", "x":3.5, "y":1}, 
+                {"label":"R", "x":4.5, "y":1}, 
+                {"label":"T", "x":5.5, "y":1}, 
+                {"label":"Y", "x":6.5, "y":1}, 
+                {"label":"U", "x":7.5, "y":1}, 
+                {"label":"I", "x":8.5, "y":1}, 
+                {"label":"O", "x":9.5, "y":1}, 
+                {"label":"P", "x":10.5, "y":1}, 
+                {"label":"{", "x":11.5, "y":1}, 
+                {"label":"}", "x":12.5, "y":1}, 
+                {"label":"|", "x":13.5, "y":1, "w":1.5}, 
+                {"label":"Caps Lock", "x":0, "y":2, "w":1.25}, 
+                {"label":"A", "x":1.75, "y":2}, 
+                {"label":"S", "x":2.75, "y":2}, 
+                {"label":"D", "x":3.75, "y":2}, 
+                {"label":"F", "x":4.75, "y":2}, 
+                {"label":"G", "x":5.75, "y":2}, 
+                {"label":"H", "x":6.75, "y":2}, 
+                {"label":"J", "x":7.75, "y":2}, 
+                {"label":"K", "x":8.75, "y":2}, 
+                {"label":"L", "x":9.75, "y":2}, 
+                {"label":":", "x":10.75, "y":2}, 
+                {"label":"\"", "x":11.75, "y":2}, 
+                {"label":"Enter", "x":12.75, "y":2, "w":2.25}, 
+                {"label":"Shift", "x":0, "y":3, "w":2.25}, 
+                {"label":"Z", "x":2.25, "y":3}, 
+                {"label":"X", "x":3.25, "y":3}, 
+                {"label":"C", "x":4.25, "y":3}, 
+                {"label":"V", "x":5.25, "y":3}, 
+                {"label":"B", "x":6.25, "y":3}, 
+                {"label":"N", "x":7.25, "y":3}, 
+                {"label":"M", "x":8.25, "y":3}, 
+                {"label":"<", "x":9.25, "y":3}, 
+                {"label":">", "x":10.25, "y":3}, 
+                {"label":"?", "x":11.25, "y":3}, 
+                {"label":"Shift", "x":12.25, "y":3, "w":1.75}, 
+                {"label":"Fn", "x":14, "y":3}, 
+                {"label":"Ctrl", "x":0, "y":4, "w":1.5}, 
+                {"label":"Win", "x":1.5, "y":4}, 
+                {"label":"Alt", "x":2.5, "y":4, "w":1.5}, 
+                {"x":4, "y":4, "w":7}, 
+                {"label":"Alt", "x":11, "y":4, "w":1.5}, 
+                {"label":"Win", "x":12.5, "y":4}, 
+                {"label":"Ctrl", "x":13.5, "y":4, "w":1.5}
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/qmk/keyboards/noxary/vulcan/keymaps/default/keymap.c b/qmk/keyboards/noxary/vulcan/keymaps/default/keymap.c
new file mode 100644
index 00000000..d80a451f
--- /dev/null
+++ b/qmk/keyboards/noxary/vulcan/keymaps/default/keymap.c
@@ -0,0 +1,45 @@
+/* Copyright 2019 Ryota Goto
+ *
+ * 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
+
+enum layer_names {
+    _BASE,
+    _FN
+};
+
+/*    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K212,
+ *    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,       K113,
+ *    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,             K213,
+ *    K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K312, K313,
+ *    K400, K401, K402,                         K410,                         K411, K412, K413 
+ */
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_BASE] = LAYOUT( /* Base */
+    KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL, 
+    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_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, MO(1), 
+    KC_LCTL, KC_LGUI, KC_LALT,                                     KC_SPC,                                      KC_RALT, KC_RGUI, KC_RCTL
+  ),
+  [_FN] = LAYOUT( /* Fn */
+    RESET,   KC_GRV,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, 
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, 
+    _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, 
+    _______, _______, _______,                                     _______,                                     _______, _______, _______ 
+  )
+};
diff --git a/qmk/keyboards/noxary/vulcan/keymaps/default/readme.md b/qmk/keyboards/noxary/vulcan/keymaps/default/readme.md
new file mode 100644
index 00000000..64ee9c8a
--- /dev/null
+++ b/qmk/keyboards/noxary/vulcan/keymaps/default/readme.md
@@ -0,0 +1,2 @@
+# The default keymap for Vulcan
+Nothing special
\ No newline at end of file
diff --git a/qmk/keyboards/noxary/vulcan/keymaps/via/keymap.c b/qmk/keyboards/noxary/vulcan/keymaps/via/keymap.c
new file mode 100644
index 00000000..155d9c8f
--- /dev/null
+++ b/qmk/keyboards/noxary/vulcan/keymaps/via/keymap.c
@@ -0,0 +1,63 @@
+/* Copyright 2019 Ryota Goto
+ *
+ * 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
+
+enum layer_names {
+    _BASE,
+    _FN,
+    _EXTRA_ONE,
+    _EXTRA_TWO
+};
+
+/*    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K212,
+ *    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,       K113,
+ *    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,             K213,
+ *    K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K312, K313,
+ *    K400, K401, K402,                         K410,                         K411, K412, K413 
+ */
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_BASE] = LAYOUT( /* Base */
+    KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL, 
+    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_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, MO(1), 
+    KC_LCTL, KC_LGUI, KC_LALT,                                     KC_SPC,                                      KC_RALT, KC_RGUI, KC_RCTL
+  ),
+  [_FN] = LAYOUT( /* Fn */
+    _______, KC_GRV,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, 
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, 
+    _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, 
+    _______, _______, _______,                                     _______,                                     _______, _______, _______ 
+  ),
+  [_EXTRA_ONE] = LAYOUT( /* Extra layer for via */
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, 
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, 
+    _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, 
+    _______, _______, _______,                                     _______,                                     _______, _______, _______ 
+  ),
+  [_EXTRA_TWO] = LAYOUT( /* Extra layer for via */
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, 
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, 
+    _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, 
+    _______, _______, _______,                                     _______,                                     _______, _______, _______ 
+  )
+};
+
+
diff --git a/qmk/keyboards/noxary/vulcan/keymaps/via/readme.md b/qmk/keyboards/noxary/vulcan/keymaps/via/readme.md
new file mode 100644
index 00000000..e4393e3f
--- /dev/null
+++ b/qmk/keyboards/noxary/vulcan/keymaps/via/readme.md
@@ -0,0 +1,2 @@
+# The via keymap for Vulcan
+For use with VIA configurator
\ No newline at end of file
diff --git a/qmk/keyboards/noxary/vulcan/keymaps/via/rules.mk b/qmk/keyboards/noxary/vulcan/keymaps/via/rules.mk
new file mode 100644
index 00000000..036bd6d1
--- /dev/null
+++ b/qmk/keyboards/noxary/vulcan/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/qmk/keyboards/noxary/vulcan/readme.md b/qmk/keyboards/noxary/vulcan/readme.md
new file mode 100644
index 00000000..7aacb4ec
--- /dev/null
+++ b/qmk/keyboards/noxary/vulcan/readme.md
@@ -0,0 +1,15 @@
+# Vulcan
+
+![Vulcan](https://i.imgur.com/ZwlJ0sxl.png)
+
+High-end 60% keyboard
+
+* Keyboard Maintainer: [ai03](https://github.com/ai03-2725)/Noxary Keyboards
+* Hardware Supported: The Vulcan PCB
+* Hardware Availability: [Noxary Webstore](https://noxary.co/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make noxary/vulcan: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).
diff --git a/qmk/keyboards/noxary/vulcan/rules.mk b/qmk/keyboards/noxary/vulcan/rules.mk
new file mode 100644
index 00000000..5f1b6954
--- /dev/null
+++ b/qmk/keyboards/noxary/vulcan/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+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 = 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 = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
diff --git a/qmk/keyboards/noxary/vulcan/vulcan.c b/qmk/keyboards/noxary/vulcan/vulcan.c
new file mode 100644
index 00000000..a36569ec
--- /dev/null
+++ b/qmk/keyboards/noxary/vulcan/vulcan.c
@@ -0,0 +1,17 @@
+/* Copyright 2019 Ryota Goto
+ *
+ * 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 "vulcan.h"
+
diff --git a/qmk/keyboards/noxary/vulcan/vulcan.h b/qmk/keyboards/noxary/vulcan/vulcan.h
new file mode 100644
index 00000000..97ac40ff
--- /dev/null
+++ b/qmk/keyboards/noxary/vulcan/vulcan.h
@@ -0,0 +1,41 @@
+/* Copyright 2019 Ryota Goto
+ *
+ * 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 first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT( \
+    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K212, \
+    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112,       K113, \
+    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211,             K213, \
+    K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K312, K313, \
+    K400, K401, K402,                         K410,                         K411, K412, K413  \
+) \
+{ \
+    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013 }, \
+    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113 }, \
+    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213 }, \
+    { K300,  KC_NO, K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313 }, \
+    { K400,  K401,  K402,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, K410,  K411,  K412,  K413 }  \
+}
diff --git a/qmk/keyboards/noxary/x268/config.h b/qmk/keyboards/noxary/x268/config.h
index c342da50..f6dae0b3 100644
--- a/qmk/keyboards/noxary/x268/config.h
+++ b/qmk/keyboards/noxary/x268/config.h
@@ -192,34 +192,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/noxary/x268/keymaps/via/rules.mk b/qmk/keyboards/noxary/x268/keymaps/via/rules.mk
index c2e96d23..09b3a0b6 100644
--- a/qmk/keyboards/noxary/x268/keymaps/via/rules.mk
+++ b/qmk/keyboards/noxary/x268/keymaps/via/rules.mk
@@ -1,5 +1,4 @@
 VIA_ENABLE = yes
-MOUSEKEY_ENABLE = no
 CONSOLE_ENABLE = no        # Console for debug
 COMMAND_ENABLE = no        # Commands for debug and configuration
 LTO_ENABLE = yes
diff --git a/qmk/keyboards/noxary/x268/rules.mk b/qmk/keyboards/noxary/x268/rules.mk
index c4b8c211..b7e5eb66 100644
--- a/qmk/keyboards/noxary/x268/rules.mk
+++ b/qmk/keyboards/noxary/x268/rules.mk
@@ -30,4 +30,3 @@ 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
diff --git a/qmk/keyboards/nullbitsco/nibble/info.json b/qmk/keyboards/nullbitsco/nibble/info.json
index bd97361e..fe4bf59f 100644
--- a/qmk/keyboards/nullbitsco/nibble/info.json
+++ b/qmk/keyboards/nullbitsco/nibble/info.json
@@ -6,1125 +6,232 @@
     "layouts": {
         "LAYOUT_all": {
             "layout": [
-                {
-                    "label": "Esc",
-                    "x": 1,
-                    "y": 0
-                },
-                {
-                    "label": "!",
-                    "x": 2,
-                    "y": 0
-                },
-                {
-                    "label": "@",
-                    "x": 3,
-                    "y": 0
-                },
-                {
-                    "label": "#",
-                    "x": 4,
-                    "y": 0
-                },
-                {
-                    "label": "$",
-                    "x": 5,
-                    "y": 0
-                },
-                {
-                    "label": "%",
-                    "x": 6,
-                    "y": 0
-                },
-                {
-                    "label": "^",
-                    "x": 7,
-                    "y": 0
-                },
-                {
-                    "label": "&",
-                    "x": 8,
-                    "y": 0
-                },
-                {
-                    "label": "*",
-                    "x": 9,
-                    "y": 0
-                },
-                {
-                    "label": "(",
-                    "x": 10,
-                    "y": 0
-                },
-                {
-                    "label": ")",
-                    "x": 11,
-                    "y": 0
-                },
-                {
-                    "label": "_",
-                    "x": 12,
-                    "y": 0
-                },
-                {
-                    "label": "+",
-                    "x": 13,
-                    "y": 0
-                },
-                {
-                    "label": "Backspace",
-                    "x": 14,
-                    "y": 0,
-                    "w": 2
-                },
-                {
-                    "label": "Home",
-                    "x": 16,
-                    "y": 0
-                },
-                {
-                    "x": 0,
-                    "y": 1
-                },
-                {
-                    "label": "Tab",
-                    "x": 1,
-                    "y": 1,
-                    "w": 1.5
-                },
-                {
-                    "label": "Q",
-                    "x": 2.5,
-                    "y": 1
-                },
-                {
-                    "label": "W",
-                    "x": 3.5,
-                    "y": 1
-                },
-                {
-                    "label": "E",
-                    "x": 4.5,
-                    "y": 1
-                },
-                {
-                    "label": "R",
-                    "x": 5.5,
-                    "y": 1
-                },
-                {
-                    "label": "T",
-                    "x": 6.5,
-                    "y": 1
-                },
-                {
-                    "label": "Y",
-                    "x": 7.5,
-                    "y": 1
-                },
-                {
-                    "label": "U",
-                    "x": 8.5,
-                    "y": 1
-                },
-                {
-                    "label": "I",
-                    "x": 9.5,
-                    "y": 1
-                },
-                {
-                    "label": "O",
-                    "x": 10.5,
-                    "y": 1
-                },
-                {
-                    "label": "P",
-                    "x": 11.5,
-                    "y": 1
-                },
-                {
-                    "label": "{",
-                    "x": 12.5,
-                    "y": 1
-                },
-                {
-                    "label": "}",
-                    "x": 13.5,
-                    "y": 1
-                },
-                {
-                    "label": "Enter",
-                    "x": 14.75,
-                    "y": 1,
-                    "w": 1.25,
-                    "h": 2
-                },
-                {
-                    "label": "Delete",
-                    "x": 16,
-                    "y": 1
-                },
-                {
-                    "x": 0,
-                    "y": 2
-                },
-                {
-                    "label": "Caps Lock",
-                    "x": 1,
-                    "y": 2,
-                    "w": 1.25
-                },
-                {
-                    "label": "A",
-                    "x": 2.75,
-                    "y": 2
-                },
-                {
-                    "label": "S",
-                    "x": 3.75,
-                    "y": 2
-                },
-                {
-                    "label": "D",
-                    "x": 4.75,
-                    "y": 2
-                },
-                {
-                    "label": "F",
-                    "x": 5.75,
-                    "y": 2
-                },
-                {
-                    "label": "G",
-                    "x": 6.75,
-                    "y": 2
-                },
-                {
-                    "label": "H",
-                    "x": 7.75,
-                    "y": 2
-                },
-                {
-                    "label": "J",
-                    "x": 8.75,
-                    "y": 2
-                },
-                {
-                    "label": "K",
-                    "x": 9.75,
-                    "y": 2
-                },
-                {
-                    "label": "L",
-                    "x": 10.75,
-                    "y": 2
-                },
-                {
-                    "label": ":",
-                    "x": 11.75,
-                    "y": 2
-                },
-                {
-                    "label": "\"",
-                    "x": 12.75,
-                    "y": 2
-                },
-                {
-                    "label": "~",
-                    "x": 13.75,
-                    "y": 2
-                },
-                {
-                    "label": "Page Up",
-                    "x": 16,
-                    "y": 2
-                },
-                {
-                    "x": 0,
-                    "y": 3
-                },
-                {
-                    "label": "Shift",
-                    "x": 1,
-                    "y": 3,
-                    "w": 1.25
-                },
-                {
-                    "label": "|",
-                    "x": 2.25,
-                    "y": 3
-                },
-                {
-                    "label": "Z",
-                    "x": 3.25,
-                    "y": 3
-                },
-                {
-                    "label": "X",
-                    "x": 4.25,
-                    "y": 3
-                },
-                {
-                    "label": "C",
-                    "x": 5.25,
-                    "y": 3
-                },
-                {
-                    "label": "V",
-                    "x": 6.25,
-                    "y": 3
-                },
-                {
-                    "label": "B",
-                    "x": 7.25,
-                    "y": 3
-                },
-                {
-                    "label": "N",
-                    "x": 8.25,
-                    "y": 3
-                },
-                {
-                    "label": "M",
-                    "x": 9.25,
-                    "y": 3
-                },
-                {
-                    "label": "<",
-                    "x": 10.25,
-                    "y": 3
-                },
-                {
-                    "label": ">",
-                    "x": 11.25,
-                    "y": 3
-                },
-                {
-                    "label": "?",
-                    "x": 12.25,
-                    "y": 3
-                },
-                {
-                    "label": "Shift",
-                    "x": 13.25,
-                    "y": 3,
-                    "w": 1.75
-                },
-                {
-                    "label": "\u2191",
-                    "x": 15,
-                    "y": 3
-                },
-                {
-                    "label": "Page Down",
-                    "x": 16,
-                    "y": 3
-                },
-                {
-                    "x": 0,
-                    "y": 4
-                },
-                {
-                    "label": "Ctrl",
-                    "x": 1,
-                    "y": 4,
-                    "w": 1.25
-                },
-                {
-                    "label": "Win",
-                    "x": 2.25,
-                    "y": 4,
-                    "w": 1.25
-                },
-                {
-                    "label": "Alt",
-                    "x": 3.5,
-                    "y": 4,
-                    "w": 1.25
-                },
-                {
-                    "label": "Space",
-                    "x": 4.75,
-                    "y": 4,
-                    "w": 6.25
-                },
-                {
-                    "label": "Alt",
-                    "x": 11,
-                    "y": 4
-                },
-                {
-                    "label": "Fn",
-                    "x": 12,
-                    "y": 4
-                },
-                {
-                    "label": "Ctrl",
-                    "x": 13,
-                    "y": 4
-                },
-                {
-                    "label": "\u2190",
-                    "x": 14,
-                    "y": 4
-                },
-                {
-                    "label": "\u2193",
-                    "x": 15,
-                    "y": 4
-                },
-                {
-                    "label": "\u2192",
-                    "x": 16,
-                    "y": 4
-                }
+                {"label":"Esc", "x":1, "y":0},
+                {"label":"!", "x":2, "y":0},
+                {"label":"@", "x":3, "y":0},
+                {"label":"#", "x":4, "y":0},
+                {"label":"$", "x":5, "y":0},
+                {"label":"%", "x":6, "y":0},
+                {"label":"^", "x":7, "y":0},
+                {"label":"&", "x":8, "y":0},
+                {"label":"*", "x":9, "y":0},
+                {"label":"(", "x":10, "y":0},
+                {"label":")", "x":11, "y":0},
+                {"label":"_", "x":12, "y":0},
+                {"label":"+", "x":13, "y":0},
+                {"label":"Backspace", "x":14, "y":0, "w":2},
+                {"label":"Home", "x":16, "y":0},
+                {"label":"ENC", "x":0, "y":1},
+                {"label":"Tab", "x":1, "y":1, "w":1.5},
+                {"label":"Q", "x":2.5, "y":1},
+                {"label":"W", "x":3.5, "y":1},
+                {"label":"E", "x":4.5, "y":1},
+                {"label":"R", "x":5.5, "y":1},
+                {"label":"T", "x":6.5, "y":1},
+                {"label":"Y", "x":7.5, "y":1},
+                {"label":"U", "x":8.5, "y":1},
+                {"label":"I", "x":9.5, "y":1},
+                {"label":"O", "x":10.5, "y":1},
+                {"label":"P", "x":11.5, "y":1},
+                {"label":"{", "x":12.5, "y":1},
+                {"label":"}", "x":13.5, "y":1},
+                {"label":"|", "x":14.5, "y":1, "w":1.5},
+                {"label":"Delete", "x":16, "y":1},
+                {"label":"M1", "x":0, "y":2},
+                {"label":"Caps Lock", "x":1, "y":2, "w":1.25},
+                {"label":"A", "x":2.75, "y":2},
+                {"label":"S", "x":3.75, "y":2},
+                {"label":"D", "x":4.75, "y":2},
+                {"label":"F", "x":5.75, "y":2},
+                {"label":"G", "x":6.75, "y":2},
+                {"label":"H", "x":7.75, "y":2},
+                {"label":"J", "x":8.75, "y":2},
+                {"label":"K", "x":9.75, "y":2},
+                {"label":"L", "x":10.75, "y":2},
+                {"label":":", "x":11.75, "y":2},
+                {"label":"\"", "x":12.75, "y":2},
+                {"label":"Enter", "x":13.75, "y":2, "w":2.25},
+                {"label":"PgUp", "x":16, "y":2},
+                {"label":"M2", "x":0, "y":3},
+                {"label":"Shift", "x":1, "y":3, "w":1.25},
+                {"label":"ISO \\", "x":2.25, "y":3},
+                {"label":"Z", "x":3.25, "y":3},
+                {"label":"X", "x":4.25, "y":3},
+                {"label":"C", "x":5.25, "y":3},
+                {"label":"V", "x":6.25, "y":3},
+                {"label":"B", "x":7.25, "y":3},
+                {"label":"N", "x":8.25, "y":3},
+                {"label":"M", "x":9.25, "y":3},
+                {"label":"<", "x":10.25, "y":3},
+                {"label":">", "x":11.25, "y":3},
+                {"label":"?", "x":12.25, "y":3},
+                {"label":"Shift", "x":13.25, "y":3, "w":1.75},
+                {"label":"\u2191", "x":15, "y":3},
+                {"label":"PgDn", "x":16, "y":3},
+                {"label":"M3", "x":0, "y":4},
+                {"label":"Ctrl", "x":1, "y":4, "w":1.25},
+                {"label":"Win", "x":2.25, "y":4, "w":1.25},
+                {"label":"Alt", "x":3.5, "y":4, "w":1.25},
+                {"label":"Space", "x":4.75, "y":4, "w":6.25},
+                {"label":"Fn", "x":11, "y":4},
+                {"label":"Alt", "x":12, "y":4},
+                {"label":"Ctrl", "x":13, "y":4},
+                {"label":"\u2190", "x":14, "y":4},
+                {"label":"\u2193", "x":15, "y":4},
+                {"label":"\u2192", "x":16, "y":4}
             ]
         },
         "LAYOUT_ansi": {
             "layout": [
-                {
-                    "label": "Esc",
-                    "x": 1,
-                    "y": 0
-                },
-                {
-                    "label": "!",
-                    "x": 2,
-                    "y": 0
-                },
-                {
-                    "label": "@",
-                    "x": 3,
-                    "y": 0
-                },
-                {
-                    "label": "#",
-                    "x": 4,
-                    "y": 0
-                },
-                {
-                    "label": "$",
-                    "x": 5,
-                    "y": 0
-                },
-                {
-                    "label": "%",
-                    "x": 6,
-                    "y": 0
-                },
-                {
-                    "label": "^",
-                    "x": 7,
-                    "y": 0
-                },
-                {
-                    "label": "&",
-                    "x": 8,
-                    "y": 0
-                },
-                {
-                    "label": "*",
-                    "x": 9,
-                    "y": 0
-                },
-                {
-                    "label": "(",
-                    "x": 10,
-                    "y": 0
-                },
-                {
-                    "label": ")",
-                    "x": 11,
-                    "y": 0
-                },
-                {
-                    "label": "_",
-                    "x": 12,
-                    "y": 0
-                },
-                {
-                    "label": "+",
-                    "x": 13,
-                    "y": 0
-                },
-                {
-                    "label": "Backspace",
-                    "x": 14,
-                    "y": 0,
-                    "w": 2
-                },
-                {
-                    "label": "~",
-                    "x": 16,
-                    "y": 0
-                },
-                {
-                    "x": 0,
-                    "y": 1
-                },
-                {
-                    "label": "Tab",
-                    "x": 1,
-                    "y": 1,
-                    "w": 1.5
-                },
-                {
-                    "label": "Q",
-                    "x": 2.5,
-                    "y": 1
-                },
-                {
-                    "label": "W",
-                    "x": 3.5,
-                    "y": 1
-                },
-                {
-                    "label": "E",
-                    "x": 4.5,
-                    "y": 1
-                },
-                {
-                    "label": "R",
-                    "x": 5.5,
-                    "y": 1
-                },
-                {
-                    "label": "T",
-                    "x": 6.5,
-                    "y": 1
-                },
-                {
-                    "label": "Y",
-                    "x": 7.5,
-                    "y": 1
-                },
-                {
-                    "label": "U",
-                    "x": 8.5,
-                    "y": 1
-                },
-                {
-                    "label": "I",
-                    "x": 9.5,
-                    "y": 1
-                },
-                {
-                    "label": "O",
-                    "x": 10.5,
-                    "y": 1
-                },
-                {
-                    "label": "P",
-                    "x": 11.5,
-                    "y": 1
-                },
-                {
-                    "label": "{",
-                    "x": 12.5,
-                    "y": 1
-                },
-                {
-                    "label": "}",
-                    "x": 13.5,
-                    "y": 1
-                },
-                {
-                    "label": "|",
-                    "x": 14.5,
-                    "y": 1,
-                    "w": 1.5
-                },
-                {
-                    "label": "Page Up",
-                    "x": 16,
-                    "y": 1
-                },
-                {
-                    "x": 0,
-                    "y": 2
-                },
-                {
-                    "label": "Caps Lock",
-                    "x": 1,
-                    "y": 2,
-                    "w": 1.25
-                },
-                {
-                    "label": "A",
-                    "x": 2.75,
-                    "y": 2
-                },
-                {
-                    "label": "S",
-                    "x": 3.75,
-                    "y": 2
-                },
-                {
-                    "label": "D",
-                    "x": 4.75,
-                    "y": 2
-                },
-                {
-                    "label": "F",
-                    "x": 5.75,
-                    "y": 2
-                },
-                {
-                    "label": "G",
-                    "x": 6.75,
-                    "y": 2
-                },
-                {
-                    "label": "H",
-                    "x": 7.75,
-                    "y": 2
-                },
-                {
-                    "label": "J",
-                    "x": 8.75,
-                    "y": 2
-                },
-                {
-                    "label": "K",
-                    "x": 9.75,
-                    "y": 2
-                },
-                {
-                    "label": "L",
-                    "x": 10.75,
-                    "y": 2
-                },
-                {
-                    "label": ":",
-                    "x": 11.75,
-                    "y": 2
-                },
-                {
-                    "label": "\"",
-                    "x": 12.75,
-                    "y": 2
-                },
-                {
-                    "label": "Enter",
-                    "x": 13.75,
-                    "y": 2,
-                    "w": 2.25
-                },
-                {
-                    "label": "Page Down",
-                    "x": 16,
-                    "y": 2
-                },
-                {
-                    "x": 0,
-                    "y": 3
-                },
-                {
-                    "label": "Shift",
-                    "x": 1,
-                    "y": 3,
-                    "w": 2.25
-                },
-                {
-                    "label": "Z",
-                    "x": 3.25,
-                    "y": 3
-                },
-                {
-                    "label": "X",
-                    "x": 4.25,
-                    "y": 3
-                },
-                {
-                    "label": "C",
-                    "x": 5.25,
-                    "y": 3
-                },
-                {
-                    "label": "V",
-                    "x": 6.25,
-                    "y": 3
-                },
-                {
-                    "label": "B",
-                    "x": 7.25,
-                    "y": 3
-                },
-                {
-                    "label": "N",
-                    "x": 8.25,
-                    "y": 3
-                },
-                {
-                    "label": "M",
-                    "x": 9.25,
-                    "y": 3
-                },
-                {
-                    "label": "<",
-                    "x": 10.25,
-                    "y": 3
-                },
-                {
-                    "label": ">",
-                    "x": 11.25,
-                    "y": 3
-                },
-                {
-                    "label": "?",
-                    "x": 12.25,
-                    "y": 3
-                },
-                {
-                    "label": "Shift",
-                    "x": 13.25,
-                    "y": 3,
-                    "w": 1.75
-                },
-                {
-                    "label": "\u2191",
-                    "x": 15,
-                    "y": 3
-                },
-                {
-                    "label": "End",
-                    "x": 16,
-                    "y": 3
-                },
-                {
-                    "x": 0,
-                    "y": 4
-                },
-                {
-                    "label": "Ctrl",
-                    "x": 1,
-                    "y": 4,
-                    "w": 1.25
-                },
-                {
-                    "label": "Win",
-                    "x": 2.25,
-                    "y": 4,
-                    "w": 1.25
-                },
-                {
-                    "label": "Alt",
-                    "x": 3.5,
-                    "y": 4,
-                    "w": 1.25
-                },
-                {
-                    "label": "Space",
-                    "x": 4.75,
-                    "y": 4,
-                    "w": 6.25
-                },
-                {
-                    "label": "Alt",
-                    "x": 11,
-                    "y": 4
-                },
-                {
-                    "label": "Fn",
-                    "x": 12,
-                    "y": 4
-                },
-                {
-                    "label": "Ctrl",
-                    "x": 13,
-                    "y": 4
-                },
-                {
-                    "label": "\u2190",
-                    "x": 14,
-                    "y": 4
-                },
-                {
-                    "label": "\u2193",
-                    "x": 15,
-                    "y": 4
-                },
-                {
-                    "label": "\u2192",
-                    "x": 16,
-                    "y": 4
-                }
+                {"label":"Esc", "x":1, "y":0},
+                {"label":"!", "x":2, "y":0},
+                {"label":"@", "x":3, "y":0},
+                {"label":"#", "x":4, "y":0},
+                {"label":"$", "x":5, "y":0},
+                {"label":"%", "x":6, "y":0},
+                {"label":"^", "x":7, "y":0},
+                {"label":"&", "x":8, "y":0},
+                {"label":"*", "x":9, "y":0},
+                {"label":"(", "x":10, "y":0},
+                {"label":")", "x":11, "y":0},
+                {"label":"_", "x":12, "y":0},
+                {"label":"+", "x":13, "y":0},
+                {"label":"Backspace", "x":14, "y":0, "w":2},
+                {"label":"~", "x":16, "y":0},
+                {"x":0, "y":1},
+                {"label":"Tab", "x":1, "y":1, "w":1.5},
+                {"label":"Q", "x":2.5, "y":1},
+                {"label":"W", "x":3.5, "y":1},
+                {"label":"E", "x":4.5, "y":1},
+                {"label":"R", "x":5.5, "y":1},
+                {"label":"T", "x":6.5, "y":1},
+                {"label":"Y", "x":7.5, "y":1},
+                {"label":"U", "x":8.5, "y":1},
+                {"label":"I", "x":9.5, "y":1},
+                {"label":"O", "x":10.5, "y":1},
+                {"label":"P", "x":11.5, "y":1},
+                {"label":"{", "x":12.5, "y":1},
+                {"label":"}", "x":13.5, "y":1},
+                {"label":"|", "x":14.5, "y":1, "w":1.5},
+                {"label":"Page Up", "x":16, "y":1},
+                {"x":0, "y":2},
+                {"label":"Caps Lock", "x":1, "y":2, "w":1.25},
+                {"label":"A", "x":2.75, "y":2},
+                {"label":"S", "x":3.75, "y":2},
+                {"label":"D", "x":4.75, "y":2},
+                {"label":"F", "x":5.75, "y":2},
+                {"label":"G", "x":6.75, "y":2},
+                {"label":"H", "x":7.75, "y":2},
+                {"label":"J", "x":8.75, "y":2},
+                {"label":"K", "x":9.75, "y":2},
+                {"label":"L", "x":10.75, "y":2},
+                {"label":":", "x":11.75, "y":2},
+                {"label":"\"", "x":12.75, "y":2},
+                {"label":"Enter", "x":13.75, "y":2, "w":2.25},
+                {"label":"Page Down", "x":16, "y":2},
+                {"x":0, "y":3},
+                {"label":"Shift", "x":1, "y":3, "w":2.25},
+                {"label":"Z", "x":3.25, "y":3},
+                {"label":"X", "x":4.25, "y":3},
+                {"label":"C", "x":5.25, "y":3},
+                {"label":"V", "x":6.25, "y":3},
+                {"label":"B", "x":7.25, "y":3},
+                {"label":"N", "x":8.25, "y":3},
+                {"label":"M", "x":9.25, "y":3},
+                {"label":"<", "x":10.25, "y":3},
+                {"label":">", "x":11.25, "y":3},
+                {"label":"?", "x":12.25, "y":3},
+                {"label":"Shift", "x":13.25, "y":3, "w":1.75},
+                {"label":"\u2191", "x":15, "y":3},
+                {"label":"End", "x":16, "y":3},
+                {"x":0, "y":4},
+                {"label":"Ctrl", "x":1, "y":4, "w":1.25},
+                {"label":"Win", "x":2.25, "y":4, "w":1.25},
+                {"label":"Alt", "x":3.5, "y":4, "w":1.25},
+                {"label":"Space", "x":4.75, "y":4, "w":6.25},
+                {"label":"Alt", "x":11, "y":4},
+                {"label":"Fn", "x":12, "y":4},
+                {"label":"Ctrl", "x":13, "y":4},
+                {"label":"\u2190", "x":14, "y":4},
+                {"label":"\u2193", "x":15, "y":4},
+                {"label":"\u2192", "x":16, "y":4}
             ]
         },
         "LAYOUT_iso": {
             "layout": [
-                {
-                    "label": "Esc",
-                    "x": 1,
-                    "y": 0
-                },
-                {
-                    "label": "!",
-                    "x": 2,
-                    "y": 0
-                },
-                {
-                    "label": "@",
-                    "x": 3,
-                    "y": 0
-                },
-                {
-                    "label": "#",
-                    "x": 4,
-                    "y": 0
-                },
-                {
-                    "label": "$",
-                    "x": 5,
-                    "y": 0
-                },
-                {
-                    "label": "%",
-                    "x": 6,
-                    "y": 0
-                },
-                {
-                    "label": "^",
-                    "x": 7,
-                    "y": 0
-                },
-                {
-                    "label": "&",
-                    "x": 8,
-                    "y": 0
-                },
-                {
-                    "label": "*",
-                    "x": 9,
-                    "y": 0
-                },
-                {
-                    "label": "(",
-                    "x": 10,
-                    "y": 0
-                },
-                {
-                    "label": ")",
-                    "x": 11,
-                    "y": 0
-                },
-                {
-                    "label": "_",
-                    "x": 12,
-                    "y": 0
-                },
-                {
-                    "label": "+",
-                    "x": 13,
-                    "y": 0
-                },
-                {
-                    "label": "Backspace",
-                    "x": 14,
-                    "y": 0,
-                    "w": 2
-                },
-                {
-                    "label": "Home",
-                    "x": 16,
-                    "y": 0
-                },
-                {
-                    "x": 0,
-                    "y": 1
-                },
-                {
-                    "label": "Tab",
-                    "x": 1,
-                    "y": 1,
-                    "w": 1.5
-                },
-                {
-                    "label": "Q",
-                    "x": 2.5,
-                    "y": 1
-                },
-                {
-                    "label": "W",
-                    "x": 3.5,
-                    "y": 1
-                },
-                {
-                    "label": "E",
-                    "x": 4.5,
-                    "y": 1
-                },
-                {
-                    "label": "R",
-                    "x": 5.5,
-                    "y": 1
-                },
-                {
-                    "label": "T",
-                    "x": 6.5,
-                    "y": 1
-                },
-                {
-                    "label": "Y",
-                    "x": 7.5,
-                    "y": 1
-                },
-                {
-                    "label": "U",
-                    "x": 8.5,
-                    "y": 1
-                },
-                {
-                    "label": "I",
-                    "x": 9.5,
-                    "y": 1
-                },
-                {
-                    "label": "O",
-                    "x": 10.5,
-                    "y": 1
-                },
-                {
-                    "label": "P",
-                    "x": 11.5,
-                    "y": 1
-                },
-                {
-                    "label": "{",
-                    "x": 12.5,
-                    "y": 1
-                },
-                {
-                    "label": "}",
-                    "x": 13.5,
-                    "y": 1
-                },
-                {
-                    "label": "Enter",
-                    "x": 14.75,
-                    "y": 1,
-                    "w": 1.25,
-                    "h": 2
-                },
-                {
-                    "label": "Delete",
-                    "x": 16,
-                    "y": 1
-                },
-                {
-                    "x": 0,
-                    "y": 2
-                },
-                {
-                    "label": "Caps Lock",
-                    "x": 1,
-                    "y": 2,
-                    "w": 1.25
-                },
-                {
-                    "label": "A",
-                    "x": 2.75,
-                    "y": 2
-                },
-                {
-                    "label": "S",
-                    "x": 3.75,
-                    "y": 2
-                },
-                {
-                    "label": "D",
-                    "x": 4.75,
-                    "y": 2
-                },
-                {
-                    "label": "F",
-                    "x": 5.75,
-                    "y": 2
-                },
-                {
-                    "label": "G",
-                    "x": 6.75,
-                    "y": 2
-                },
-                {
-                    "label": "H",
-                    "x": 7.75,
-                    "y": 2
-                },
-                {
-                    "label": "J",
-                    "x": 8.75,
-                    "y": 2
-                },
-                {
-                    "label": "K",
-                    "x": 9.75,
-                    "y": 2
-                },
-                {
-                    "label": "L",
-                    "x": 10.75,
-                    "y": 2
-                },
-                {
-                    "label": ":",
-                    "x": 11.75,
-                    "y": 2
-                },
-                {
-                    "label": "\"",
-                    "x": 12.75,
-                    "y": 2
-                },
-                {
-                    "label": "~",
-                    "x": 13.75,
-                    "y": 2
-                },
-                {
-                    "label": "Page Up",
-                    "x": 16,
-                    "y": 2
-                },
-                {
-                    "x": 0,
-                    "y": 3
-                },
-                {
-                    "label": "Shift",
-                    "x": 1,
-                    "y": 3,
-                    "w": 1.25
-                },
-                {
-                    "label": "|",
-                    "x": 2.25,
-                    "y": 3
-                },
-                {
-                    "label": "Z",
-                    "x": 3.25,
-                    "y": 3
-                },
-                {
-                    "label": "X",
-                    "x": 4.25,
-                    "y": 3
-                },
-                {
-                    "label": "C",
-                    "x": 5.25,
-                    "y": 3
-                },
-                {
-                    "label": "V",
-                    "x": 6.25,
-                    "y": 3
-                },
-                {
-                    "label": "B",
-                    "x": 7.25,
-                    "y": 3
-                },
-                {
-                    "label": "N",
-                    "x": 8.25,
-                    "y": 3
-                },
-                {
-                    "label": "M",
-                    "x": 9.25,
-                    "y": 3
-                },
-                {
-                    "label": "<",
-                    "x": 10.25,
-                    "y": 3
-                },
-                {
-                    "label": ">",
-                    "x": 11.25,
-                    "y": 3
-                },
-                {
-                    "label": "?",
-                    "x": 12.25,
-                    "y": 3
-                },
-                {
-                    "label": "Shift",
-                    "x": 13.25,
-                    "y": 3,
-                    "w": 1.75
-                },
-                {
-                    "label": "\u2191",
-                    "x": 15,
-                    "y": 3
-                },
-                {
-                    "label": "Page Down",
-                    "x": 16,
-                    "y": 3
-                },
-                {
-                    "x": 0,
-                    "y": 4
-                },
-                {
-                    "label": "Ctrl",
-                    "x": 1,
-                    "y": 4,
-                    "w": 1.25
-                },
-                {
-                    "label": "Win",
-                    "x": 2.25,
-                    "y": 4,
-                    "w": 1.25
-                },
-                {
-                    "label": "Alt",
-                    "x": 3.5,
-                    "y": 4,
-                    "w": 1.25
-                },
-                {
-                    "label": "Space",
-                    "x": 4.75,
-                    "y": 4,
-                    "w": 6.25
-                },
-                {
-                    "label": "Alt",
-                    "x": 11,
-                    "y": 4
-                },
-                {
-                    "label": "Fn",
-                    "x": 12,
-                    "y": 4
-                },
-                {
-                    "label": "Ctrl",
-                    "x": 13,
-                    "y": 4
-                },
-                {
-                    "label": "\u2190",
-                    "x": 14,
-                    "y": 4
-                },
-                {
-                    "label": "\u2193",
-                    "x": 15,
-                    "y": 4
-                },
-                {
-                    "label": "\u2192",
-                    "x": 16,
-                    "y": 4
-                }
+                {"label":"Esc", "x":1, "y":0},
+                {"label":"!", "x":2, "y":0},
+                {"label":"@", "x":3, "y":0},
+                {"label":"#", "x":4, "y":0},
+                {"label":"$", "x":5, "y":0},
+                {"label":"%", "x":6, "y":0},
+                {"label":"^", "x":7, "y":0},
+                {"label":"&", "x":8, "y":0},
+                {"label":"*", "x":9, "y":0},
+                {"label":"(", "x":10, "y":0},
+                {"label":")", "x":11, "y":0},
+                {"label":"_", "x":12, "y":0},
+                {"label":"+", "x":13, "y":0},
+                {"label":"Backspace", "x":14, "y":0, "w":2},
+                {"label":"Home", "x":16, "y":0},
+                {"x":0, "y":1},
+                {"label":"Tab", "x":1, "y":1, "w":1.5},
+                {"label":"Q", "x":2.5, "y":1},
+                {"label":"W", "x":3.5, "y":1},
+                {"label":"E", "x":4.5, "y":1},
+                {"label":"R", "x":5.5, "y":1},
+                {"label":"T", "x":6.5, "y":1},
+                {"label":"Y", "x":7.5, "y":1},
+                {"label":"U", "x":8.5, "y":1},
+                {"label":"I", "x":9.5, "y":1},
+                {"label":"O", "x":10.5, "y":1},
+                {"label":"P", "x":11.5, "y":1},
+                {"label":"{", "x":12.5, "y":1},
+                {"label":"}", "x":13.5, "y":1},
+                {"label":"Delete", "x":16, "y":1},
+                {"x":0, "y":2},
+                {"label":"Caps Lock", "x":1, "y":2, "w":1.25},
+                {"label":"A", "x":2.75, "y":2},
+                {"label":"S", "x":3.75, "y":2},
+                {"label":"D", "x":4.75, "y":2},
+                {"label":"F", "x":5.75, "y":2},
+                {"label":"G", "x":6.75, "y":2},
+                {"label":"H", "x":7.75, "y":2},
+                {"label":"J", "x":8.75, "y":2},
+                {"label":"K", "x":9.75, "y":2},
+                {"label":"L", "x":10.75, "y":2},
+                {"label":":", "x":11.75, "y":2},
+                {"label":"\"", "x":12.75, "y":2},
+                {"label":"~", "x":13.75, "y":2},
+                {"label":"Enter", "x":14.75, "y":1, "w":1.25, "h":2},
+                {"label":"Page Up", "x":16, "y":2},
+                {"x":0, "y":3},
+                {"label":"Shift", "x":1, "y":3, "w":1.25},
+                {"label":"|", "x":2.25, "y":3},
+                {"label":"Z", "x":3.25, "y":3},
+                {"label":"X", "x":4.25, "y":3},
+                {"label":"C", "x":5.25, "y":3},
+                {"label":"V", "x":6.25, "y":3},
+                {"label":"B", "x":7.25, "y":3},
+                {"label":"N", "x":8.25, "y":3},
+                {"label":"M", "x":9.25, "y":3},
+                {"label":"<", "x":10.25, "y":3},
+                {"label":">", "x":11.25, "y":3},
+                {"label":"?", "x":12.25, "y":3},
+                {"label":"Shift", "x":13.25, "y":3, "w":1.75},
+                {"label":"\u2191", "x":15, "y":3},
+                {"label":"Page Down", "x":16, "y":3},
+                {"x":0, "y":4},
+                {"label":"Ctrl", "x":1, "y":4, "w":1.25},
+                {"label":"Win", "x":2.25, "y":4, "w":1.25},
+                {"label":"Alt", "x":3.5, "y":4, "w":1.25},
+                {"label":"Space", "x":4.75, "y":4, "w":6.25},
+                {"label":"Alt", "x":11, "y":4},
+                {"label":"Fn", "x":12, "y":4},
+                {"label":"Ctrl", "x":13, "y":4},
+                {"label":"\u2190", "x":14, "y":4},
+                {"label":"\u2193", "x":15, "y":4},
+                {"label":"\u2192", "x":16, "y":4}
             ]
         }
     }
diff --git a/qmk/keyboards/nullbitsco/nibble/keymaps/oled/keymap.c b/qmk/keyboards/nullbitsco/nibble/keymaps/oled/keymap.c
new file mode 100644
index 00000000..0b6a9744
--- /dev/null
+++ b/qmk/keyboards/nullbitsco/nibble/keymaps/oled/keymap.c
@@ -0,0 +1,139 @@
+/* Copyright 2020 Jay Greco
+ *
+ * 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
+
+#define _MA 0
+#define _FN 1
+
+enum custom_keycodes {
+    KC_CUST = SAFE_RANGE,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_MA] = LAYOUT_ansi(
+                KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_TILD,
+        KC_F13, 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_F14, 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_PGUP,
+        KC_F15, 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_PGDN,
+        KC_F16, KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                    MO(_FN), KC_RALT, KC_RCTL, KC_LEFT,          KC_DOWN, KC_RGHT
+    ),
+    [_FN] = LAYOUT_ansi(
+                RESET,   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_HOME,  KC_INS,
+        RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
+        _______, _______, _______, _______,                   _______,                   _______, _______, _______, _______,          _______, _______
+    ),
+};
+
+#ifdef OLED_DRIVER_ENABLE
+oled_rotation_t oled_init_user(oled_rotation_t rotation) { return OLED_ROTATION_180; }
+
+static void render_logo(void) {
+    static const char PROGMEM nibble_logo[] = {
+        0x00, 0xfe, 0xff, 0xff, 0xff, 0xff, 0xfe, 0xf8, 0xf0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0xfe, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 0xfe, 0xff, 0xff, 
+        0xff, 0xfe, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 
+        0x1f, 0x1f, 0x1f, 0x3f, 0x3e, 0xfe, 0xfe, 0xfc, 0xf8, 0xf0, 0xc0, 0x00, 0x00, 0x00, 0x00, 0xfe, 
+        0xfe, 0xff, 0xff, 0xff, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x3f, 0x3e, 0xfe, 0xfe, 
+        0xfc, 0xf8, 0xf0, 0xc0, 0x00, 0x00, 0x00, 0xfc, 0xfe, 0xff, 0xff, 0xff, 0xfe, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0xfe, 0xff, 0xff, 0xff, 
+        0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1f, 0x1e, 0x0c, 0x00, 
+        0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x03, 0x0f, 0x1f, 0x7f, 0xff, 0xfe, 0xf8, 0xf0, 0xc0, 0x80, 
+        0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 
+        0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 
+        0xe0, 0xe0, 0xe0, 0xf0, 0xf0, 0xfc, 0xff, 0xff, 0xbf, 0x1f, 0x07, 0x00, 0x00, 0x00, 0x00, 0xff, 
+        0xff, 0xff, 0xff, 0xff, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xf0, 0xf0, 0xff, 0xff, 
+        0xff, 0xbf, 0x1f, 0x03, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 
+        0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xe0, 0xc0, 0xc0, 0x00, 0x00, 
+        0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x0f, 0x1f, 0x7f, 0xff, 
+        0xfe, 0xfc, 0xf0, 0xe0, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 
+        0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0x03, 0x03, 0x03, 0x03, 0x03, 
+        0x03, 0x03, 0x03, 0x03, 0x03, 0x07, 0x0f, 0xff, 0xff, 0xff, 0xfe, 0xfc, 0xe0, 0x00, 0x00, 0xff, 
+        0xff, 0xff, 0xff, 0xff, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x07, 0x0f, 
+        0xff, 0xff, 0xff, 0xfe, 0xf8, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0xff, 0xff, 
+        0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x01, 0x00, 0x00, 
+        0x00, 0x7f, 0xff, 0xff, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 
+        0x03, 0x07, 0x1f, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x7f, 0xff, 0xff, 
+        0xff, 0x7f, 0x00, 0x00, 0x00, 0x00, 0x3f, 0x7f, 0xff, 0xff, 0xff, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 
+        0xf8, 0xf8, 0xf8, 0xf8, 0x7c, 0x7c, 0x7e, 0x7f, 0x3f, 0x1f, 0x0f, 0x07, 0x00, 0x00, 0x00, 0x7f, 
+        0x7f, 0xff, 0xff, 0xff, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0x7c, 0x7c, 0x7e, 
+        0x3f, 0x3f, 0x1f, 0x0f, 0x07, 0x00, 0x00, 0x1f, 0x7f, 0x7f, 0xff, 0xff, 0xff, 0xf8, 0xf8, 0xf8, 
+        0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0x78, 0x30, 0x3f, 0x7f, 0xff, 0xff, 0xff, 
+        0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0xf8, 0x78, 0x30, 0x00
+    };
+    // Host Keyboard Layer Status
+    oled_write_raw_P(nibble_logo, sizeof(nibble_logo));
+}
+
+void oled_task_user(void) {
+    render_logo();
+}
+#endif
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  // Send keystrokes to host keyboard, if connected (see readme)
+    process_record_remote_kb(keycode, record);
+    switch(keycode) {
+        case KC_CUST: //custom macro
+            if (record->event.pressed) {
+            }
+        break;
+
+        case RM_1: //remote macro 1
+        if (record->event.pressed) {
+        }
+        break;
+
+        case RM_2: //remote macro 2
+        if (record->event.pressed) {
+        }
+        break;
+
+        case RM_3: //remote macro 3
+        if (record->event.pressed) {
+        }
+        break;
+
+        case RM_4: //remote macro 4
+        if (record->event.pressed) {
+        }
+        break;
+        
+    }
+    return true;
+}
+
+
+void encoder_update_kb(uint8_t index, bool clockwise) {
+    if (clockwise) {
+        tap_code(KC_VOLU);
+    } else {
+        tap_code(KC_VOLD);
+    }
+}
+
+void matrix_init_user(void) {
+    // Initialize remote keyboard, if connected (see readme)
+    matrix_init_remote_kb();
+}
+
+void matrix_scan_user(void) {
+    // Scan and parse keystrokes from remote keyboard, if connected (see readme)
+    matrix_scan_remote_kb();
+}
\ No newline at end of file
diff --git a/qmk/keyboards/nullbitsco/nibble/keymaps/oled/rules.mk b/qmk/keyboards/nullbitsco/nibble/keymaps/oled/rules.mk
new file mode 100644
index 00000000..48a51b22
--- /dev/null
+++ b/qmk/keyboards/nullbitsco/nibble/keymaps/oled/rules.mk
@@ -0,0 +1 @@
+OLED_DRIVER_ENABLE = yes
\ No newline at end of file
diff --git a/qmk/keyboards/nullbitsco/nibble/keymaps/via/keymap.c b/qmk/keyboards/nullbitsco/nibble/keymaps/via/keymap.c
index 1e1b0c03..f72ffc56 100644
--- a/qmk/keyboards/nullbitsco/nibble/keymaps/via/keymap.c
+++ b/qmk/keyboards/nullbitsco/nibble/keymaps/via/keymap.c
@@ -42,35 +42,35 @@ bool deafened = false;
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT_all(
-    KC_NUBS,   KC_GESC, 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_HOME,
-    KC_F13,    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_F14,    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_PGUP,
-    KC_F15,    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_PGDN,
-    KC_F16,    KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                  MO(_VIA1), KC_RALT, KC_RCTL, KC_LEFT,          KC_DOWN, KC_RGHT
+              KC_GESC, 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_HOME,
+    KC_F13,   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_F14,   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_PGUP,
+    KC_F15,   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_UP,   KC_PGDN,
+    KC_F16,   KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                  MO(_VIA1), KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
   ),
 
   [_VIA1] = LAYOUT_all(
-    _______,  RESET,   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_HOME,  KC_INS,
+              RESET,   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_HOME,  KC_INS,
     RGB_TOG,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-    _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-    _______,  _______, _______, _______,                   _______,                   _______, _______, _______, KC_MPRV,          KC_MPLY, KC_MNXT
+    _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______,  _______, _______, _______,                            _______,                   _______, _______, _______, KC_MPRV, KC_MPLY, KC_MNXT
   ),
 
   [_VIA2] = LAYOUT_all(
-    _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+              _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-    _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-    _______,  _______, _______, _______,                   _______,                   _______, _______, _______, _______,          _______, _______
+    _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______,  _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______, _______
   ),
 
   [_VIA3] = LAYOUT_all(
-    _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+              _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-    _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
-    _______,  _______, _______, _______,                   _______,                   _______, _______, _______, _______,          _______, _______
+    _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______,  _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______, _______
   ),
 
 };
diff --git a/qmk/keyboards/nullbitsco/nibble/nibble.h b/qmk/keyboards/nullbitsco/nibble/nibble.h
index 9744ae74..f6537b8b 100644
--- a/qmk/keyboards/nullbitsco/nibble/nibble.h
+++ b/qmk/keyboards/nullbitsco/nibble/nibble.h
@@ -21,11 +21,11 @@
 #include "remote_kb.h"
 
 #define LAYOUT_all( \
-    K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, \
-    K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, \
-    K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2F, K2G, \
-    K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,      K3F, K3G, \
-    K41, K42, K43, K44,           K47,           K4A, K4B, K4C, K4D,      K4F, K4G  \
+          K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, \
+    K11,  K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, \
+    K21,  K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2F, K2G, \
+    K31,  K32, K01, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3F, K3G, \
+    K41,  K42, K43, K44,                K47,           K4A, K4B, K4C, K4D, K4F, K4G  \
 ) { \
    {K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G}, \
    {K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G}, \
@@ -35,11 +35,11 @@
 }
 
 #define LAYOUT_ansi( \
-         K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, \
-    K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, \
-    K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2F, K2G, \
-    K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,      K3F, K3G, \
-    K41, K42, K43, K44,           K47,           K4A, K4B, K4C, K4D,      K4F, K4G  \
+          K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, \
+    K11,  K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, \
+    K21,  K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2F, K2G, \
+    K31,  K32,      K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3F, K3G, \
+    K41,  K42, K43, K44,                K47,           K4A, K4B, K4C, K4D, K4F, K4G  \
 ) { \
    {___, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G}, \
    {K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G}, \
@@ -49,11 +49,11 @@
 }
 
 #define LAYOUT_iso( \
-         K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, \
-    K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E,      K1G, \
-    K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K1F, K2F, K2G, \
-    K31, K32, K01, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3F, K3G, \
-    K41, K42, K43, K44,           K47,           K4A, K4B, K4C, K4D,      K4F, K4G  \
+          K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, \
+    K11,  K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E,      K1G, \
+    K21,  K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K1F, K2F, K2G, \
+    K31,  K32, K01, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3F, K3G, \
+    K41,  K42, K43, K44,                K47,           K4A, K4B, K4C, K4D, K4F, K4G  \
 ) { \
    {K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G}, \
    {K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G}, \
diff --git a/qmk/keyboards/oddball/adns.c b/qmk/keyboards/oddball/adns.c
index 35225f04..4582be1f 100644
--- a/qmk/keyboards/oddball/adns.c
+++ b/qmk/keyboards/oddball/adns.c
@@ -3,7 +3,7 @@
 #include "quantum.h"
 #include "pointing_device.h"
 #include "adns9800_srom_A4.h"
-#include "../../lib/lufa/LUFA/Drivers/Peripheral/SPI.h"
+#include <LUFA/Drivers/Peripheral/SPI.h>
 
 // registers
 #define REG_Product_ID                           0x00
diff --git a/qmk/keyboards/oddball/config.h b/qmk/keyboards/oddball/config.h
index 99d9f75d..7d69c223 100644
--- a/qmk/keyboards/oddball/config.h
+++ b/qmk/keyboards/oddball/config.h
@@ -221,34 +221,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/oddball/rules.mk b/qmk/keyboards/oddball/rules.mk
index af8c3d31..2499ba77 100644
--- a/qmk/keyboards/oddball/rules.mk
+++ b/qmk/keyboards/oddball/rules.mk
@@ -29,7 +29,6 @@ MIDI_ENABLE = no            # MIDI support
 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
 
 DEBOUNCE_TYPE = eager_pk
 SPLIT_KEYBOARD = yes
diff --git a/qmk/keyboards/ogre/ergo_single/rules.mk b/qmk/keyboards/ogre/ergo_single/rules.mk
index cd209a9c..edff748f 100644
--- a/qmk/keyboards/ogre/ergo_single/rules.mk
+++ b/qmk/keyboards/ogre/ergo_single/rules.mk
@@ -29,5 +29,4 @@ MIDI_ENABLE = no            # MIDI support
 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
 SPLIT_KEYBOARD = no
diff --git a/qmk/keyboards/ogre/ergo_split/rules.mk b/qmk/keyboards/ogre/ergo_split/rules.mk
index 06f53864..8614fadd 100644
--- a/qmk/keyboards/ogre/ergo_split/rules.mk
+++ b/qmk/keyboards/ogre/ergo_split/rules.mk
@@ -29,5 +29,4 @@ MIDI_ENABLE = no            # MIDI support
 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
 SPLIT_KEYBOARD = yes
diff --git a/qmk/keyboards/omnikeyish/config.h b/qmk/keyboards/omnikeyish/config.h
index d510c64c..1bce9052 100644
--- a/qmk/keyboards/omnikeyish/config.h
+++ b/qmk/keyboards/omnikeyish/config.h
@@ -24,9 +24,9 @@
 #endif 
 #define MATRIX_COL_PINS { F0, F1, F2, F3, F4, F5, F6, F7, C7, C6, C5, C4, C3, C2, C1, C0, B0, B1, B2, B3, B4, B5, B6 }
 
-#define NUMLOCKLEDPIN E0
-#define CAPSLOCKLEDPIN E1
-#define SCROLLLOCKLEDPIN B7
+#define LED_NUM_LOCK_PIN E0
+#define LED_CAPS_LOCK_PIN E1
+#define LED_SCROLL_LOCK_PIN B7
 
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION ROW2COL
diff --git a/qmk/keyboards/omnikeyish/dynamic_macro.c b/qmk/keyboards/omnikeyish/dynamic_macro.c
index c359b0bd..9dd03400 100644
--- a/qmk/keyboards/omnikeyish/dynamic_macro.c
+++ b/qmk/keyboards/omnikeyish/dynamic_macro.c
@@ -1,6 +1,8 @@
 #include QMK_KEYBOARD_H
 #include <string.h>
 
+dynamic_macro_t dynamic_macros[DYNAMIC_MACRO_COUNT];
+
 void dynamic_macro_init(void) {
   /* zero out macro blocks  */
   memset(&dynamic_macros, 0, DYNAMIC_MACRO_COUNT * sizeof(dynamic_macro_t));
diff --git a/qmk/keyboards/omnikeyish/dynamic_macro.h b/qmk/keyboards/omnikeyish/dynamic_macro.h
index 87665c44..68e129a9 100644
--- a/qmk/keyboards/omnikeyish/dynamic_macro.h
+++ b/qmk/keyboards/omnikeyish/dynamic_macro.h
@@ -71,8 +71,6 @@ typedef struct {
   uint16_t    checksum;
 } dynamic_macro_t;
 
-dynamic_macro_t dynamic_macros[DYNAMIC_MACRO_COUNT];
-
 void     dynamic_macro_init(void);
 void     dynamic_macro_led_blink(void);
 void     dynamic_macro_record_start(uint8_t macro_id);
diff --git a/qmk/keyboards/omnikeyish/omnikeyish.c b/qmk/keyboards/omnikeyish/omnikeyish.c
index d7b68d41..9b8ce7b9 100644
--- a/qmk/keyboards/omnikeyish/omnikeyish.c
+++ b/qmk/keyboards/omnikeyish/omnikeyish.c
@@ -1,11 +1,6 @@
 #include "omnikeyish.h"
 
 void keyboard_pre_init_user(void) {
-  /* Configure LED driving pins as output pins */
-  setPinOutput(NUMLOCKLEDPIN);
-  setPinOutput(CAPSLOCKLEDPIN);
-  setPinOutput(SCROLLLOCKLEDPIN);
-
   dynamic_macro_init();
 }
 
@@ -33,23 +28,3 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
 
   return true;
 }
-
-void led_set_user(uint8_t usb_led) {
-  if (IS_LED_ON(usb_led, USB_LED_NUM_LOCK)) {
-    writePinHigh(NUMLOCKLEDPIN);
-  } else {
-    writePinLow(NUMLOCKLEDPIN);
-  }
-
-  if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
-    writePinHigh(CAPSLOCKLEDPIN);
-  } else {
-    writePinLow(CAPSLOCKLEDPIN);
-  }
-
-  if (IS_LED_ON(usb_led, USB_LED_SCROLL_LOCK)) {
-    writePinHigh(SCROLLLOCKLEDPIN);
-  } else {
-    writePinLow(SCROLLLOCKLEDPIN);
-  }
-}
\ No newline at end of file
diff --git a/qmk/keyboards/opendeck/32/rev1/rules.mk b/qmk/keyboards/opendeck/32/rev1/rules.mk
index f4f4fa8a..9abea17f 100644
--- a/qmk/keyboards/opendeck/32/rev1/rules.mk
+++ b/qmk/keyboards/opendeck/32/rev1/rules.mk
@@ -23,6 +23,7 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 BLUETOOTH_ENABLE = no       # Enable Bluetooth
 AUDIO_ENABLE = no           # Audio output
-RGB_MATRIX_ENABLE = IS31FL3731
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = IS31FL3731
 
 LTO_ENABLE = yes
diff --git a/qmk/keyboards/ortho5by12/rules.mk b/qmk/keyboards/ortho5by12/rules.mk
index 465c5184..17ad792e 100644
--- a/qmk/keyboards/ortho5by12/rules.mk
+++ b/qmk/keyboards/ortho5by12/rules.mk
@@ -30,5 +30,4 @@ 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
 LAYOUTS_HAS_RGB = no
diff --git a/qmk/keyboards/otaku_split/rev0/config.h b/qmk/keyboards/otaku_split/rev0/config.h
index 5e1bfaac..8eee58d1 100644
--- a/qmk/keyboards/otaku_split/rev0/config.h
+++ b/qmk/keyboards/otaku_split/rev0/config.h
@@ -218,34 +218,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/otaku_split/rev0/rules.mk b/qmk/keyboards/otaku_split/rev0/rules.mk
index 15240c6d..cdc793b0 100644
--- a/qmk/keyboards/otaku_split/rev0/rules.mk
+++ b/qmk/keyboards/otaku_split/rev0/rules.mk
@@ -30,5 +30,4 @@ 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
 SPLIT_KEYBOARD=yes
diff --git a/qmk/keyboards/otaku_split/rev1/config.h b/qmk/keyboards/otaku_split/rev1/config.h
index e15ae40d..a015e2b1 100644
--- a/qmk/keyboards/otaku_split/rev1/config.h
+++ b/qmk/keyboards/otaku_split/rev1/config.h
@@ -222,34 +222,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/otaku_split/rev1/rules.mk b/qmk/keyboards/otaku_split/rev1/rules.mk
index 15240c6d..cdc793b0 100644
--- a/qmk/keyboards/otaku_split/rev1/rules.mk
+++ b/qmk/keyboards/otaku_split/rev1/rules.mk
@@ -30,5 +30,4 @@ 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
 SPLIT_KEYBOARD=yes
diff --git a/qmk/keyboards/pabile/p18/rules.mk b/qmk/keyboards/pabile/p18/rules.mk
index 4a84739d..9fcdfdb6 100644
--- a/qmk/keyboards/pabile/p18/rules.mk
+++ b/qmk/keyboards/pabile/p18/rules.mk
@@ -29,7 +29,6 @@ MIDI_ENABLE = no            # MIDI support
 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
 UNICODE_ENABLE = yes        # Unicode
 IOS_DEVICE_ENABLE = no      # connect to IOS Device
 ENCODER_ENABLE = yes
diff --git a/qmk/keyboards/pabile/p40/rules.mk b/qmk/keyboards/pabile/p40/rules.mk
index 2b5d9470..090983c4 100644
--- a/qmk/keyboards/pabile/p40/rules.mk
+++ b/qmk/keyboards/pabile/p40/rules.mk
@@ -29,7 +29,6 @@ MIDI_ENABLE = no            # MIDI controls
 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
 UNICODE_ENABLE = yes        # Unicode
 IOS_DEVICE_ENABLE = no      # connect to IOS Device
 
diff --git a/qmk/keyboards/palette1202/rules.mk b/qmk/keyboards/palette1202/rules.mk
index 57ea5030..0d79fc49 100644
--- a/qmk/keyboards/palette1202/rules.mk
+++ b/qmk/keyboards/palette1202/rules.mk
@@ -29,7 +29,6 @@ MIDI_ENABLE        = no     # MIDI support
 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
 ENCODER_ENABLE     = yes    # Enable support for rotary encoders
 OLED_DRIVER_ENABLE = yes    # Enable support for OLED display
 
diff --git a/qmk/keyboards/panc40/rules.mk b/qmk/keyboards/panc40/rules.mk
index e8087f50..d40c3e0e 100644
--- a/qmk/keyboards/panc40/rules.mk
+++ b/qmk/keyboards/panc40/rules.mk
@@ -29,4 +29,3 @@ MIDI_ENABLE = no            # MIDI support
 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
diff --git a/qmk/keyboards/pdxkbc/config.h b/qmk/keyboards/pdxkbc/config.h
index 336b1434..9c2e1e7d 100644
--- a/qmk/keyboards/pdxkbc/config.h
+++ b/qmk/keyboards/pdxkbc/config.h
@@ -218,34 +218,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/pdxkbc/rules.mk b/qmk/keyboards/pdxkbc/rules.mk
index 1aa33793..77d0f1ec 100644
--- a/qmk/keyboards/pdxkbc/rules.mk
+++ b/qmk/keyboards/pdxkbc/rules.mk
@@ -30,4 +30,3 @@ 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
diff --git a/qmk/keyboards/peiorisboards/ixora/config.h b/qmk/keyboards/peiorisboards/ixora/config.h
index 77ba89c2..4b52d18f 100644
--- a/qmk/keyboards/peiorisboards/ixora/config.h
+++ b/qmk/keyboards/peiorisboards/ixora/config.h
@@ -22,3 +22,7 @@
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 0
+
+#define LED_NUM_LOCK_PIN A9
+#define LED_CAPS_LOCK_PIN A10
+#define LED_SCROLL_LOCK_PIN A8
diff --git a/qmk/keyboards/peiorisboards/ixora/ixora.c b/qmk/keyboards/peiorisboards/ixora/ixora.c
index 7996db62..f2dcd864 100644
--- a/qmk/keyboards/peiorisboards/ixora/ixora.c
+++ b/qmk/keyboards/peiorisboards/ixora/ixora.c
@@ -1,43 +1 @@
 #include "ixora.h"
-
-void matrix_init_kb(void) {
-    // put your keyboard start-up code here
-    // runs once when the firmware starts up
-    setPinOutput(A8);
-    setPinOutput(A9);
-    setPinOutput(A10);
-    writePinLow(A8);
-    writePinLow(A9);
-    writePinLow(A10);
-
-    matrix_init_user();
-}
-
-void matrix_scan_kb(void) {
-
-    matrix_scan_user();
-}
-
-bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
-
-    return process_record_user(keycode, record);
-}
-
-void led_set_kb(uint8_t usb_led) {
-    if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
-        writePinHigh(A10);
-    } else {
-        writePinLow(A10);
-    }
-    if (IS_LED_ON(usb_led, USB_LED_NUM_LOCK)) {
-        writePinHigh(A9);
-    } else {
-        writePinLow(A9);
-    }
-    if (IS_LED_ON(usb_led, USB_LED_SCROLL_LOCK)) {
-        writePinHigh(A8);
-    } else {
-        writePinLow(A8);
-    }
-    led_set_user(usb_led);
-}
diff --git a/qmk/keyboards/percent/booster/rules.mk b/qmk/keyboards/percent/booster/rules.mk
index fb2ca00e..2aa43206 100644
--- a/qmk/keyboards/percent/booster/rules.mk
+++ b/qmk/keyboards/percent/booster/rules.mk
@@ -30,7 +30,6 @@ 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
 EXTRAFLAGS += -flto
 
 LAYOUTS = numpad_5x4
diff --git a/qmk/keyboards/percent/canoe/keymaps/via/rules.mk b/qmk/keyboards/percent/canoe/keymaps/via/rules.mk
index 1ebdc3e8..36b7ba9c 100644
--- a/qmk/keyboards/percent/canoe/keymaps/via/rules.mk
+++ b/qmk/keyboards/percent/canoe/keymaps/via/rules.mk
@@ -1,4 +1,2 @@
 VIA_ENABLE = yes
 LTO_ENABLE = yes
-
-EXTRAKEY_ENABLE = no
\ No newline at end of file
diff --git a/qmk/keyboards/percent/canoe_gen2/rules.mk b/qmk/keyboards/percent/canoe_gen2/rules.mk
index bde9a08f..6221fbca 100644
--- a/qmk/keyboards/percent/canoe_gen2/rules.mk
+++ b/qmk/keyboards/percent/canoe_gen2/rules.mk
@@ -20,7 +20,8 @@ BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 BLUETOOTH_ENABLE = no       # Enable Bluetooth
 AUDIO_ENABLE = no           # Audio output
-RGB_MATRIX_ENABLE = WS2812
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = WS2812
 
 LAYOUTS = 65_ansi_blocker_split_bs 65_iso_blocker_split_bs
 RGB_MATRIX_CUSTOM_KB = yes
diff --git a/qmk/keyboards/percent/skog_lite/keymaps/via/rules.mk b/qmk/keyboards/percent/skog_lite/keymaps/via/rules.mk
index 97010a99..36b7ba9c 100644
--- a/qmk/keyboards/percent/skog_lite/keymaps/via/rules.mk
+++ b/qmk/keyboards/percent/skog_lite/keymaps/via/rules.mk
@@ -1,5 +1,2 @@
 VIA_ENABLE = yes
 LTO_ENABLE = yes
-
-MOUSEKEY_ENABLE = no
-EXTRAKEY_ENABLE = no
diff --git a/qmk/keyboards/phantom/config.h b/qmk/keyboards/phantom/config.h
index 4ca731f2..a5d135a4 100644
--- a/qmk/keyboards/phantom/config.h
+++ b/qmk/keyboards/phantom/config.h
@@ -15,59 +15,86 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef CONFIG_H
-#define CONFIG_H
+#pragma once
 
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
-#define PRODUCT_ID      0x6060
-#define DEVICE_VER      0x0003
-#define MANUFACTURER    bpiphany
-#define PRODUCT         PHANTOM
-#define DESCRIPTION     QMK keyboard firmware for PHANTOM
+#define VENDOR_ID    0xFEED
+#define PRODUCT_ID   0x5B50
+#define DEVICE_VER   0x0003
+#define MANUFACTURER bpiphany
+#define PRODUCT      PHANTOM
 
 /* key matrix size */
 #define MATRIX_ROWS 6
 #define MATRIX_COLS 17
 
-// ROWS: Top to bottom, COLS: Left to right
-/* Row pin configuration
-*/
-#define MATRIX_ROW_PINS { B5, B4, B3, B2, B1, B0 }
-/* Column pin configuration
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
  */
+#define MATRIX_ROW_PINS { B5, B4, B3, B2, B1, B0 }
 #define MATRIX_COL_PINS { D5, C7, C6, D4, D0, E6, F0, F1, F4, F5, F6, F7, D7, D6, D1, D2, D3 }
 #define UNUSED_PINS
 
-/* COL2ROW or ROW2COL */
+/* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION ROW2COL
 
 // #define BACKLIGHT_PIN B7
-// #define BACKLIGHT_BREATHING
 // #define BACKLIGHT_LEVELS 3
+// #define BACKLIGHT_BREATHING
 
-/* Underlight configuration
- */
 #define RGB_DI_PIN E2
-#define RGBLIGHT_ANIMATIONS
-#define RGBLED_NUM 20     // Number of LEDs
-#define RGBLIGHT_HUE_STEP 10
-#define RGBLIGHT_SAT_STEP 17
-#define RGBLIGHT_VAL_STEP 17
+#ifdef RGB_DI_PIN
+#    define RGBLED_NUM 20
+#    define RGBLIGHT_HUE_STEP 10
+#    define RGBLIGHT_SAT_STEP 17
+#    define RGBLIGHT_VAL_STEP 17
+//#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+//#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+/*== all animations enable ==*/
+#    define RGBLIGHT_ANIMATIONS
+/*== or choose animations ==*/
+//#    define RGBLIGHT_EFFECT_BREATHING
+//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+//#    define RGBLIGHT_EFFECT_SNAKE
+//#    define RGBLIGHT_EFFECT_KNIGHT
+//#    define RGBLIGHT_EFFECT_CHRISTMAS
+//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+//#    define RGBLIGHT_EFFECT_RGB_TEST
+//#    define RGBLIGHT_EFFECT_ALTERNATING
+/*== customize breathing effect ==*/
+/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+//#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+/*==== use exp() and sin() ====*/
+//#    define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//#    define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+#endif
 
-/* define if matrix has ghost */
-//#define MATRIX_HAS_GHOST
-
-/* Set 0 if debouncing isn't needed */
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
 
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
 /* 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
 
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+//#define GRAVE_ESC_CTRL_OVERRIDE
+
 /*
  * Force NKRO
  *
@@ -89,54 +116,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 //#define FORCE_NKRO
 
-/*
- * Magic Key Options
- *
- * Magic keys are hotkey commands that allow control over firmware functions of
- * the keyboard. They are best used in combination with the HID Listen program,
- * found here: https://www.pjrc.com/teensy/hid_listen.html
- *
- * The options below allow the magic key functionality to be changed. This is
- * useful if your keyboard/keypad is missing keys and you want magic key support.
- *
- */
-
-/* control how magic key switches layers */
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS  true
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS  true
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false
-
-/* override magic key keymap */
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM
-//#define MAGIC_KEY_HELP1          H
-//#define MAGIC_KEY_HELP2          SLASH
-//#define MAGIC_KEY_DEBUG          D
-//#define MAGIC_KEY_DEBUG_MATRIX   X
-//#define MAGIC_KEY_DEBUG_KBD      K
-//#define MAGIC_KEY_DEBUG_MOUSE    M
-//#define MAGIC_KEY_VERSION        V
-//#define MAGIC_KEY_STATUS         S
-//#define MAGIC_KEY_CONSOLE        C
-//#define MAGIC_KEY_LAYER0_ALT1    ESC
-//#define MAGIC_KEY_LAYER0_ALT2    GRAVE
-//#define MAGIC_KEY_LAYER0         0
-//#define MAGIC_KEY_LAYER1         1
-//#define MAGIC_KEY_LAYER2         2
-//#define MAGIC_KEY_LAYER3         3
-//#define MAGIC_KEY_LAYER4         4
-//#define MAGIC_KEY_LAYER5         5
-//#define MAGIC_KEY_LAYER6         6
-//#define MAGIC_KEY_LAYER7         7
-//#define MAGIC_KEY_LAYER8         8
-//#define MAGIC_KEY_LAYER9         9
-//#define MAGIC_KEY_BOOTLOADER     PAUSE
-//#define MAGIC_KEY_LOCK           CAPS
-//#define MAGIC_KEY_EEPROM         E
-//#define MAGIC_KEY_NKRO           N
-//#define MAGIC_KEY_SLEEP_LED      Z
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
@@ -152,30 +131,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
 
-/*
- * MIDI options
- */
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
 
-/* Prevent use of disabled MIDI features in the keymap */
-//#define MIDI_ENABLE_STRICT 1
-
-/* enable basic MIDI features:
-   - MIDI notes can be sent when in Music mode is on
-*/
-//#define MIDI_BASIC
-
-/* enable advanced MIDI features:
-   - MIDI notes can be added to the keymap
-   - Octave shift and transpose
-   - Virtual sustain, portamento, and modulation wheel
-   - etc.
-*/
-//#define MIDI_ADVANCED
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 1
-
-#endif
+/* Bootmagic Lite key configuration */
+//#define BOOTMAGIC_LITE_ROW 0
+//#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/phantom/info.json b/qmk/keyboards/phantom/info.json
index 6a1e4f72..4cea5883 100644
--- a/qmk/keyboards/phantom/info.json
+++ b/qmk/keyboards/phantom/info.json
@@ -1,2798 +1,651 @@
 {
-  "keyboard_name": "Phantom",
-  "url": "https://deskthority.net/wiki/Phantom",
-  "maintainer": "qmk",
-  "width": 18.25,
-  "height": 6.5,
-  "layouts": {
-    "LAYOUT_tkl_ansi": {
-      "key_count": 87,
-      "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": "Backspace",
-          "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": "FN",
-          "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
+    "keyboard_name": "Phantom",
+    "url": "https://deskthority.net/wiki/Phantom",
+    "maintainer": "qmk",
+    "width": 18.25,
+    "height": 6.5,
+    "layouts": {
+        "LAYOUT_tkl_ansi": {
+            "layout": [
+                {"x": 0, "y": 0},
+
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+
+                {"x": 6.5, "y": 0},
+                {"x": 7.5, "y": 0},
+                {"x": 8.5, "y": 0},
+                {"x": 9.5, "y": 0},
+
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0},
+                {"x": 14, "y": 0},
+
+                {"x": 15.25, "y": 0},
+                {"x": 16.25, "y": 0},
+                {"x": 17.25, "y": 0},
+
+                {"x": 0, "y": 1.5},
+                {"x": 1, "y": 1.5},
+                {"x": 2, "y": 1.5},
+                {"x": 3, "y": 1.5},
+                {"x": 4, "y": 1.5},
+                {"x": 5, "y": 1.5},
+                {"x": 6, "y": 1.5},
+                {"x": 7, "y": 1.5},
+                {"x": 8, "y": 1.5},
+                {"x": 9, "y": 1.5},
+                {"x": 10, "y": 1.5},
+                {"x": 11, "y": 1.5},
+                {"x": 12, "y": 1.5},
+                {"x": 13, "y": 1.5, "w": 2},
+
+                {"x": 15.25, "y": 1.5},
+                {"x": 16.25, "y": 1.5},
+                {"x": 17.25, "y": 1.5},
+
+                {"x": 0, "y": 2.5, "w": 1.5},
+                {"x": 1.5, "y": 2.5},
+                {"x": 2.5, "y": 2.5},
+                {"x": 3.5, "y": 2.5},
+                {"x": 4.5, "y": 2.5},
+                {"x": 5.5, "y": 2.5},
+                {"x": 6.5, "y": 2.5},
+                {"x": 7.5, "y": 2.5},
+                {"x": 8.5, "y": 2.5},
+                {"x": 9.5, "y": 2.5},
+                {"x": 10.5, "y": 2.5},
+                {"x": 11.5, "y": 2.5},
+                {"x": 12.5, "y": 2.5},
+                {"x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"x": 15.25, "y": 2.5},
+                {"x": 16.25, "y": 2.5},
+                {"x": 17.25, "y": 2.5},
+
+                {"x": 0, "y": 3.5, "w": 1.75},
+                {"x": 1.75, "y": 3.5},
+                {"x": 2.75, "y": 3.5},
+                {"x": 3.75, "y": 3.5},
+                {"x": 4.75, "y": 3.5},
+                {"x": 5.75, "y": 3.5},
+                {"x": 6.75, "y": 3.5},
+                {"x": 7.75, "y": 3.5},
+                {"x": 8.75, "y": 3.5},
+                {"x": 9.75, "y": 3.5},
+                {"x": 10.75, "y": 3.5},
+                {"x": 11.75, "y": 3.5},
+                {"x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"x": 0, "y": 4.5, "w": 2.25},
+                {"x": 2.25, "y": 4.5},
+                {"x": 3.25, "y": 4.5},
+                {"x": 4.25, "y": 4.5},
+                {"x": 5.25, "y": 4.5},
+                {"x": 6.25, "y": 4.5},
+                {"x": 7.25, "y": 4.5},
+                {"x": 8.25, "y": 4.5},
+                {"x": 9.25, "y": 4.5},
+                {"x": 10.25, "y": 4.5},
+                {"x": 11.25, "y": 4.5},
+                {"x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"x": 16.25, "y": 4.5},
+
+                {"x": 0, "y": 5.5, "w": 1.25},
+                {"x": 1.25, "y": 5.5, "w": 1.25},
+                {"x": 2.5, "y": 5.5, "w": 1.25},
+                {"x": 3.75, "y": 5.5, "w": 6.25},
+                {"x": 10, "y": 5.5, "w": 1.25},
+                {"x": 11.25, "y": 5.5, "w": 1.25},
+                {"x": 12.5, "y": 5.5, "w": 1.25},
+                {"x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"x": 15.25, "y": 5.5},
+                {"x": 16.25, "y": 5.5},
+                {"x": 17.25, "y": 5.5}
+            ]
+        },
+        "LAYOUT_tkl_ansi_plus_five": {
+            "layout": [
+                {"x": 0, "y": 0},
+
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+
+                {"x": 6.5, "y": 0},
+                {"x": 7.5, "y": 0},
+                {"x": 8.5, "y": 0},
+                {"x": 9.5, "y": 0},
+
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0},
+                {"x": 14, "y": 0},
+
+                {"x": 15.25, "y": 0},
+                {"x": 16.25, "y": 0},
+                {"x": 17.25, "y": 0},
+
+                {"x": 0, "y": 1.5},
+                {"x": 1, "y": 1.5},
+                {"x": 2, "y": 1.5},
+                {"x": 3, "y": 1.5},
+                {"x": 4, "y": 1.5},
+                {"x": 5, "y": 1.5},
+                {"x": 6, "y": 1.5},
+                {"x": 7, "y": 1.5},
+                {"x": 8, "y": 1.5},
+                {"x": 9, "y": 1.5},
+                {"x": 10, "y": 1.5},
+                {"x": 11, "y": 1.5},
+                {"x": 12, "y": 1.5},
+                {"x": 13, "y": 1.5, "w": 2},
+
+                {"x": 15.25, "y": 1.5},
+                {"x": 16.25, "y": 1.5},
+                {"x": 17.25, "y": 1.5},
+
+                {"x": 0, "y": 2.5, "w": 1.5},
+                {"x": 1.5, "y": 2.5},
+                {"x": 2.5, "y": 2.5},
+                {"x": 3.5, "y": 2.5},
+                {"x": 4.5, "y": 2.5},
+                {"x": 5.5, "y": 2.5},
+                {"x": 6.5, "y": 2.5},
+                {"x": 7.5, "y": 2.5},
+                {"x": 8.5, "y": 2.5},
+                {"x": 9.5, "y": 2.5},
+                {"x": 10.5, "y": 2.5},
+                {"x": 11.5, "y": 2.5},
+                {"x": 12.5, "y": 2.5},
+                {"x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"x": 15.25, "y": 2.5},
+                {"x": 16.25, "y": 2.5},
+                {"x": 17.25, "y": 2.5},
+
+                {"x": 0, "y": 3.5, "w": 1.75},
+                {"x": 1.75, "y": 3.5},
+                {"x": 2.75, "y": 3.5},
+                {"x": 3.75, "y": 3.5},
+                {"x": 4.75, "y": 3.5},
+                {"x": 5.75, "y": 3.5},
+                {"x": 6.75, "y": 3.5},
+                {"x": 7.75, "y": 3.5},
+                {"x": 8.75, "y": 3.5},
+                {"x": 9.75, "y": 3.5},
+                {"x": 10.75, "y": 3.5},
+                {"x": 11.75, "y": 3.5},
+                {"x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"x": 15.25, "y": 3.5},
+                {"x": 16.25, "y": 3.5},
+                {"x": 17.25, "y": 3.5},
+
+                {"x": 0, "y": 4.5, "w": 2.25},
+                {"x": 2.25, "y": 4.5},
+                {"x": 3.25, "y": 4.5},
+                {"x": 4.25, "y": 4.5},
+                {"x": 5.25, "y": 4.5},
+                {"x": 6.25, "y": 4.5},
+                {"x": 7.25, "y": 4.5},
+                {"x": 8.25, "y": 4.5},
+                {"x": 9.25, "y": 4.5},
+                {"x": 10.25, "y": 4.5},
+                {"x": 11.25, "y": 4.5},
+                {"x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"x": 15.25, "y": 4.5},
+                {"x": 16.25, "y": 4.5},
+                {"x": 17.25, "y": 4.5},
+
+                {"x": 0, "y": 5.5, "w": 1.25},
+                {"x": 1.25, "y": 5.5, "w": 1.25},
+                {"x": 2.5, "y": 5.5, "w": 1.25},
+                {"x": 3.75, "y": 5.5, "w": 6.25},
+                {"x": 10, "y": 5.5, "w": 1.25},
+                {"x": 11.25, "y": 5.5, "w": 1.25},
+                {"x": 12.5, "y": 5.5, "w": 1.25},
+                {"x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"x": 15.25, "y": 5.5},
+                {"x": 16.25, "y": 5.5},
+                {"x": 17.25, "y": 5.5}
+            ]
+        },
+        "LAYOUT_tkl_ansi_wkl": {
+            "layout": [
+                {"x": 0, "y": 0},
+
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+
+                {"x": 6.5, "y": 0},
+                {"x": 7.5, "y": 0},
+                {"x": 8.5, "y": 0},
+                {"x": 9.5, "y": 0},
+
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0},
+                {"x": 14, "y": 0},
+
+                {"x": 15.25, "y": 0},
+                {"x": 16.25, "y": 0},
+                {"x": 17.25, "y": 0},
+
+                {"x": 0, "y": 1.5},
+                {"x": 1, "y": 1.5},
+                {"x": 2, "y": 1.5},
+                {"x": 3, "y": 1.5},
+                {"x": 4, "y": 1.5},
+                {"x": 5, "y": 1.5},
+                {"x": 6, "y": 1.5},
+                {"x": 7, "y": 1.5},
+                {"x": 8, "y": 1.5},
+                {"x": 9, "y": 1.5},
+                {"x": 10, "y": 1.5},
+                {"x": 11, "y": 1.5},
+                {"x": 12, "y": 1.5},
+                {"x": 13, "y": 1.5, "w": 2},
+
+                {"x": 15.25, "y": 1.5},
+                {"x": 16.25, "y": 1.5},
+                {"x": 17.25, "y": 1.5},
+
+                {"x": 0, "y": 2.5, "w": 1.5},
+                {"x": 1.5, "y": 2.5},
+                {"x": 2.5, "y": 2.5},
+                {"x": 3.5, "y": 2.5},
+                {"x": 4.5, "y": 2.5},
+                {"x": 5.5, "y": 2.5},
+                {"x": 6.5, "y": 2.5},
+                {"x": 7.5, "y": 2.5},
+                {"x": 8.5, "y": 2.5},
+                {"x": 9.5, "y": 2.5},
+                {"x": 10.5, "y": 2.5},
+                {"x": 11.5, "y": 2.5},
+                {"x": 12.5, "y": 2.5},
+                {"x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"x": 15.25, "y": 2.5},
+                {"x": 16.25, "y": 2.5},
+                {"x": 17.25, "y": 2.5},
+
+                {"x": 0, "y": 3.5, "w": 1.75},
+                {"x": 1.75, "y": 3.5},
+                {"x": 2.75, "y": 3.5},
+                {"x": 3.75, "y": 3.5},
+                {"x": 4.75, "y": 3.5},
+                {"x": 5.75, "y": 3.5},
+                {"x": 6.75, "y": 3.5},
+                {"x": 7.75, "y": 3.5},
+                {"x": 8.75, "y": 3.5},
+                {"x": 9.75, "y": 3.5},
+                {"x": 10.75, "y": 3.5},
+                {"x": 11.75, "y": 3.5},
+                {"x": 12.75, "y": 3.5, "w": 2.25},
+
+                {"x": 0, "y": 4.5, "w": 2.25},
+                {"x": 2.25, "y": 4.5},
+                {"x": 3.25, "y": 4.5},
+                {"x": 4.25, "y": 4.5},
+                {"x": 5.25, "y": 4.5},
+                {"x": 6.25, "y": 4.5},
+                {"x": 7.25, "y": 4.5},
+                {"x": 8.25, "y": 4.5},
+                {"x": 9.25, "y": 4.5},
+                {"x": 10.25, "y": 4.5},
+                {"x": 11.25, "y": 4.5},
+                {"x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"x": 16.25, "y": 4.5},
+
+                {"x": 0, "y": 5.5, "w": 1.5},
+                {"x": 1.5, "y": 5.5},
+                {"x": 2.5, "y": 5.5, "w": 1.5},
+                {"x": 4, "y": 5.5, "w": 7},
+                {"x": 11, "y": 5.5, "w": 1.5},
+                {"x": 12.5, "y": 5.5},
+                {"x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"x": 15.25, "y": 5.5},
+                {"x": 16.25, "y": 5.5},
+                {"x": 17.25, "y": 5.5}
+            ]
+        },
+        "LAYOUT_all": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6, "y": 0},
+                {"x": 7, "y": 0},
+                {"x": 8, "y": 0},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0},
+                {"x": 14, "y": 0},
+
+                {"x": 15.25, "y": 0},
+                {"x": 16.25, "y": 0},
+                {"x": 17.25, "y": 0},
+
+                {"x": 0, "y": 1.5},
+                {"x": 1, "y": 1.5},
+                {"x": 2, "y": 1.5},
+                {"x": 3, "y": 1.5},
+                {"x": 4, "y": 1.5},
+                {"x": 5, "y": 1.5},
+                {"x": 6, "y": 1.5},
+                {"x": 7, "y": 1.5},
+                {"x": 8, "y": 1.5},
+                {"x": 9, "y": 1.5},
+                {"x": 10, "y": 1.5},
+                {"x": 11, "y": 1.5},
+                {"x": 12, "y": 1.5},
+                {"x": 13, "y": 1.5},
+                {"x": 14, "y": 1.5},
+
+                {"x": 15.25, "y": 1.5},
+                {"x": 16.25, "y": 1.5},
+                {"x": 17.25, "y": 1.5},
+
+                {"x": 0, "y": 2.5, "w": 1.5},
+                {"x": 1.5, "y": 2.5},
+                {"x": 2.5, "y": 2.5},
+                {"x": 3.5, "y": 2.5},
+                {"x": 4.5, "y": 2.5},
+                {"x": 5.5, "y": 2.5},
+                {"x": 6.5, "y": 2.5},
+                {"x": 7.5, "y": 2.5},
+                {"x": 8.5, "y": 2.5},
+                {"x": 9.5, "y": 2.5},
+                {"x": 10.5, "y": 2.5},
+                {"x": 11.5, "y": 2.5},
+                {"x": 12.5, "y": 2.5},
+                {"x": 13.5, "y": 2.5, "w": 1.5},
+
+                {"x": 15.25, "y": 2.5},
+                {"x": 16.25, "y": 2.5},
+                {"x": 17.25, "y": 2.5},
+
+                {"x": 0, "y": 3.5, "w": 1.75},
+                {"x": 1.75, "y": 3.5},
+                {"x": 2.75, "y": 3.5},
+                {"x": 3.75, "y": 3.5},
+                {"x": 4.75, "y": 3.5},
+                {"x": 5.75, "y": 3.5},
+                {"x": 6.75, "y": 3.5},
+                {"x": 7.75, "y": 3.5},
+                {"x": 8.75, "y": 3.5},
+                {"x": 9.75, "y": 3.5},
+                {"x": 10.75, "y": 3.5},
+                {"x": 11.75, "y": 3.5},
+                {"x": 12.75, "y": 3.5},
+                {"x": 13.75, "y": 3.5, "w": 1.25},
+
+                {"x": 15.25, "y": 3.5},
+                {"x": 16.25, "y": 3.5},
+                {"x": 17.25, "y": 3.5},
+
+                {"x": 0, "y": 4.5, "w": 1.25},
+                {"x": 1.25, "y": 4.5},
+                {"x": 2.25, "y": 4.5},
+                {"x": 3.25, "y": 4.5},
+                {"x": 4.25, "y": 4.5},
+                {"x": 5.25, "y": 4.5},
+                {"x": 6.25, "y": 4.5},
+                {"x": 7.25, "y": 4.5},
+                {"x": 8.25, "y": 4.5},
+                {"x": 9.25, "y": 4.5},
+                {"x": 10.25, "y": 4.5},
+                {"x": 11.25, "y": 4.5},
+                {"x": 12.25, "y": 4.5, "w": 1.75},
+                {"x": 14, "y": 4.5},
+
+                {"x": 15.25, "y": 4.5},
+                {"x": 16.25, "y": 4.5},
+                {"x": 17.25, "y": 4.5},
+
+                {"x": 0, "y": 5.5, "w": 1.5},
+                {"x": 1.5, "y": 5.5},
+                {"x": 2.5, "y": 5.5, "w": 1.5},
+                {"x": 4, "y": 5.5, "w": 1.5},
+                {"x": 5.5, "y": 5.5, "w": 1.5},
+                {"x": 7, "y": 5.5},
+                {"x": 8, "y": 5.5, "w": 1.5},
+                {"x": 9.5, "y": 5.5, "w": 1.5},
+                {"x": 11, "y": 5.5, "w": 1.5},
+                {"x": 12.5, "y": 5.5},
+                {"x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"x": 15.25, "y": 5.5},
+                {"x": 16.25, "y": 5.5},
+                {"x": 17.25, "y": 5.5}
+            ]
+        },
+        "LAYOUT_tkl_iso_wkl": {
+            "layout": [
+                {"x": 0, "y": 0},
+
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+
+                {"x": 6.5, "y": 0},
+                {"x": 7.5, "y": 0},
+                {"x": 8.5, "y": 0},
+                {"x": 9.5, "y": 0},
+
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0},
+                {"x": 14, "y": 0},
+
+                {"x": 15.25, "y": 0},
+                {"x": 16.25, "y": 0},
+                {"x": 17.25, "y": 0},
+
+                {"x": 0, "y": 1.5},
+                {"x": 1, "y": 1.5},
+                {"x": 2, "y": 1.5},
+                {"x": 3, "y": 1.5},
+                {"x": 4, "y": 1.5},
+                {"x": 5, "y": 1.5},
+                {"x": 6, "y": 1.5},
+                {"x": 7, "y": 1.5},
+                {"x": 8, "y": 1.5},
+                {"x": 9, "y": 1.5},
+                {"x": 10, "y": 1.5},
+                {"x": 11, "y": 1.5},
+                {"x": 12, "y": 1.5},
+                {"x": 13, "y": 1.5, "w": 2},
+
+                {"x": 15.25, "y": 1.5},
+                {"x": 16.25, "y": 1.5},
+                {"x": 17.25, "y": 1.5},
+
+                {"x": 0, "y": 2.5, "w": 1.5},
+                {"x": 1.5, "y": 2.5},
+                {"x": 2.5, "y": 2.5},
+                {"x": 3.5, "y": 2.5},
+                {"x": 4.5, "y": 2.5},
+                {"x": 5.5, "y": 2.5},
+                {"x": 6.5, "y": 2.5},
+                {"x": 7.5, "y": 2.5},
+                {"x": 8.5, "y": 2.5},
+                {"x": 9.5, "y": 2.5},
+                {"x": 10.5, "y": 2.5},
+                {"x": 11.5, "y": 2.5},
+                {"x": 12.5, "y": 2.5},
+
+                {"x": 15.25, "y": 2.5},
+                {"x": 16.25, "y": 2.5},
+                {"x": 17.25, "y": 2.5},
+
+                {"x": 0, "y": 3.5, "w": 1.75},
+                {"x": 1.75, "y": 3.5},
+                {"x": 2.75, "y": 3.5},
+                {"x": 3.75, "y": 3.5},
+                {"x": 4.75, "y": 3.5},
+                {"x": 5.75, "y": 3.5},
+                {"x": 6.75, "y": 3.5},
+                {"x": 7.75, "y": 3.5},
+                {"x": 8.75, "y": 3.5},
+                {"x": 9.75, "y": 3.5},
+                {"x": 10.75, "y": 3.5},
+                {"x": 11.75, "y": 3.5},
+                {"x": 12.75, "y": 3.5},
+                {"x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"x": 0, "y": 4.5, "w": 1.25},
+                {"x": 1.25, "y": 4.5},
+                {"x": 2.25, "y": 4.5},
+                {"x": 3.25, "y": 4.5},
+                {"x": 4.25, "y": 4.5},
+                {"x": 5.25, "y": 4.5},
+                {"x": 6.25, "y": 4.5},
+                {"x": 7.25, "y": 4.5},
+                {"x": 8.25, "y": 4.5},
+                {"x": 9.25, "y": 4.5},
+                {"x": 10.25, "y": 4.5},
+                {"x": 11.25, "y": 4.5},
+                {"x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"x": 16.25, "y": 4.5},
+
+                {"x": 0, "y": 5.5, "w": 1.5},
+                {"x": 1.5, "y": 5.5},
+                {"x": 2.5, "y": 5.5, "w": 1.5},
+                {"x": 4, "y": 5.5, "w": 7},
+                {"x": 11, "y": 5.5, "w": 1.5},
+                {"x": 12.5, "y": 5.5},
+                {"x": 13.5, "y": 5.5, "w": 1.5},
+
+                {"x": 15.25, "y": 5.5},
+                {"x": 16.25, "y": 5.5},
+                {"x": 17.25, "y": 5.5}
+            ]
+        },
+        "LAYOUT_tkl_iso": {
+            "layout": [
+                {"x": 0, "y": 0},
+
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+
+                {"x": 6.5, "y": 0},
+                {"x": 7.5, "y": 0},
+                {"x": 8.5, "y": 0},
+                {"x": 9.5, "y": 0},
+
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0},
+                {"x": 14, "y": 0},
+
+                {"x": 15.25, "y": 0},
+                {"x": 16.25, "y": 0},
+                {"x": 17.25, "y": 0},
+
+                {"x": 0, "y": 1.5},
+                {"x": 1, "y": 1.5},
+                {"x": 2, "y": 1.5},
+                {"x": 3, "y": 1.5},
+                {"x": 4, "y": 1.5},
+                {"x": 5, "y": 1.5},
+                {"x": 6, "y": 1.5},
+                {"x": 7, "y": 1.5},
+                {"x": 8, "y": 1.5},
+                {"x": 9, "y": 1.5},
+                {"x": 10, "y": 1.5},
+                {"x": 11, "y": 1.5},
+                {"x": 12, "y": 1.5},
+                {"x": 13, "y": 1.5, "w": 2},
+
+                {"x": 15.25, "y": 1.5},
+                {"x": 16.25, "y": 1.5},
+                {"x": 17.25, "y": 1.5},
+
+                {"x": 0, "y": 2.5, "w": 1.5},
+                {"x": 1.5, "y": 2.5},
+                {"x": 2.5, "y": 2.5},
+                {"x": 3.5, "y": 2.5},
+                {"x": 4.5, "y": 2.5},
+                {"x": 5.5, "y": 2.5},
+                {"x": 6.5, "y": 2.5},
+                {"x": 7.5, "y": 2.5},
+                {"x": 8.5, "y": 2.5},
+                {"x": 9.5, "y": 2.5},
+                {"x": 10.5, "y": 2.5},
+                {"x": 11.5, "y": 2.5},
+                {"x": 12.5, "y": 2.5},
+
+                {"x": 15.25, "y": 2.5},
+                {"x": 16.25, "y": 2.5},
+                {"x": 17.25, "y": 2.5},
+
+                {"x": 0, "y": 3.5, "w": 1.75},
+                {"x": 1.75, "y": 3.5},
+                {"x": 2.75, "y": 3.5},
+                {"x": 3.75, "y": 3.5},
+                {"x": 4.75, "y": 3.5},
+                {"x": 5.75, "y": 3.5},
+                {"x": 6.75, "y": 3.5},
+                {"x": 7.75, "y": 3.5},
+                {"x": 8.75, "y": 3.5},
+                {"x": 9.75, "y": 3.5},
+                {"x": 10.75, "y": 3.5},
+                {"x": 11.75, "y": 3.5},
+                {"x": 12.75, "y": 3.5},
+                {"x": 13.75, "y": 2.5, "w": 1.25, "h": 2},
+
+                {"x": 0, "y": 4.5, "w": 1.25},
+                {"x": 1.25, "y": 4.5},
+                {"x": 2.25, "y": 4.5},
+                {"x": 3.25, "y": 4.5},
+                {"x": 4.25, "y": 4.5},
+                {"x": 5.25, "y": 4.5},
+                {"x": 6.25, "y": 4.5},
+                {"x": 7.25, "y": 4.5},
+                {"x": 8.25, "y": 4.5},
+                {"x": 9.25, "y": 4.5},
+                {"x": 10.25, "y": 4.5},
+                {"x": 11.25, "y": 4.5},
+                {"x": 12.25, "y": 4.5, "w": 2.75},
+
+                {"x": 16.25, "y": 4.5},
+
+                {"x": 0, "y": 5.5, "w": 1.25},
+                {"x": 1.25, "y": 5.5, "w": 1.25},
+                {"x": 2.5, "y": 5.5, "w": 1.25},
+                {"x": 3.75, "y": 5.5, "w": 6.25},
+                {"x": 10, "y": 5.5, "w": 1.25},
+                {"x": 11.25, "y": 5.5, "w": 1.25},
+                {"x": 12.5, "y": 5.5, "w": 1.25},
+                {"x": 13.75, "y": 5.5, "w": 1.25},
+
+                {"x": 15.25, "y": 5.5},
+                {"x": 16.25, "y": 5.5},
+                {"x": 17.25, "y": 5.5}
+            ]
         }
-      ]
-    },
-    "LAYOUT_tkl_ansi_plus_five": {
-      "key_count": 92,
-      "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": "Backspace",
-          "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
-        },
-	{
-	  "x": 15.25,
-	  "y": 3.5
-	},
-	{
-	  "x": 16.25,
-	  "y": 3.5
-	},
-	{
-	  "x": 17.25,
-	  "y": 3.5
-	},
-        {
-          "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
-        },
-	{
-	  "x": 15.25,
-	  "y": 4.5
-	},
-        {
-          "label": "\\u2191",
-          "x": 16.25,
-          "y": 4.5
-        },
-	{
-	  "x": 17.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": "FN",
-          "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": {
-      "key_count": 86,
-      "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": "Backspace",
-          "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": "Win",
-          "x": 1.5,
-          "y": 5.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": "Win",
-          "x": 12.5,
-          "y": 5.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
-        }
-      ]
-    },
-    "LAYOUT_7bit": {
-      "key_count": 101,
-      "layout": [
-        {
-          "label": "Esc",
-          "x": 0,
-          "y": 0
-        },
-        {
-          "x": 1,
-          "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
-        },
-        {
-          "x": 6,
-          "y": 0
-        },
-        {
-          "label": "F5",
-          "x": 7,
-          "y": 0
-        },
-        {
-          "label": "F6",
-          "x": 8,
-          "y": 0
-        },
-        {
-          "label": "F7",
-          "x": 9,
-          "y": 0
-        },
-        {
-          "label": "F8",
-          "x": 10,
-          "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
-        },
-        {
-          "x": 15.25,
-          "y": 3.5
-        },
-        {
-          "x": 16.25,
-          "y": 3.5
-        },
-        {
-          "x": 17.25,
-          "y": 3.5
-        },
-        {
-          "x": 0,
-          "y": 4.5
-        },
-        {
-          "label": "Shift",
-          "x": 1,
-          "y": 4.5,
-          "w": 1.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": 1.75
-        },
-        {
-          "x": 14,
-          "y": 4.5
-        },
-        {
-          "x": 15.25,
-          "y": 4.5
-        },
-        {
-          "label": "\\u2191",
-          "x": 16.25,
-          "y": 4.5
-        },
-        {
-          "x": 17.25,
-          "y": 4.5
-        },
-        {
-          "label": "Ctrl",
-          "x": 0,
-          "y": 5.5,
-          "w": 1.5
-        },
-        {
-          "label": "Win",
-          "x": 1.5,
-          "y": 5.5
-        },
-        {
-          "label": "Alt",
-          "x": 2.5,
-          "y": 5.5,
-          "w": 1.5
-        },
-        {
-          "x": 4,
-          "y": 5.5,
-          "w": 1.5
-        },
-        {
-          "x": 5.5,
-          "y": 5.5,
-          "w": 1.5
-        },
-        {
-          "x": 7,
-          "y": 5.5
-        },
-        {
-          "x": 8,
-          "y": 5.5,
-          "w": 1.5
-        },
-        {
-          "x": 9.5,
-          "y": 5.5,
-          "w": 1.5
-        },
-        {
-          "label": "Alt",
-          "x": 11,
-          "y": 5.5,
-          "w": 1.5
-        },
-        {
-          "label": "Win",
-          "x": 12.5,
-          "y": 5.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
-        }
-      ]
-    },
-    "LAYOUT_tkl_iso_wkl": {
-      "key_count": 87,
-      "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": "Backspace",
-          "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": "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": 2.5,
-          "w": 1.25,
-          "h": 2
-        },
-        {
-          "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": 2.75
-        },
-        {
-          "label": "\\u2191",
-          "x": 16.25,
-          "y": 4.5
-        },
-        {
-          "label": "Ctrl",
-          "x": 0,
-          "y": 5.5,
-          "w": 1.5
-        },
-        {
-          "label": "Win",
-          "x": 1.5,
-          "y": 5.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": "Win",
-          "x": 12.5,
-          "y": 5.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
-        }
-      ]
-    },
-    "LAYOUT_tkl_iso": {
-      "key_count": 88,
-      "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": "Backspace",
-          "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": "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": "~",
-          "x": 12.75,
-          "y": 3.5
-        },
-        {
-          "label": "Enter",
-          "x": 13.75,
-          "y": 2.5,
-          "w": 1.25,
-          "h": 2
-        },
-        {
-          "label": "Shift",
-          "x": 0,
-          "y": 4.5,
-          "w": 1.25
-        },
-        {
-          "label": "|",
-          "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": 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": "AltGr",
-          "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
-        }
-      ]
     }
-  }
 }
diff --git a/qmk/keyboards/phantom/keymaps/default/keymap.c b/qmk/keyboards/phantom/keymaps/default/keymap.c
index d7001f06..0871827b 100644
--- a/qmk/keyboards/phantom/keymaps/default/keymap.c
+++ b/qmk/keyboards/phantom/keymaps/default/keymap.c
@@ -13,46 +13,31 @@
  * 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
 
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-#define _BL 0
-#define _FL 1
+enum layer_names {
+    _BL,
+    _FL
+};
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BL] = LAYOUT_tkl_ansi(
-        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_BRK,  \
-        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_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, MO(_FL), KC_RCTL,      KC_LEFT, KC_DOWN, KC_RGHT  \
+        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_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, MO(_FL), KC_RCTL,      KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [_FL] = LAYOUT_tkl_ansi(
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, KC_MSTP, KC_MPLY, KC_MPRV, KC_MNXT,      KC_MUTE, KC_VOLD, KC_VOLU, \
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______, _______, _______, \
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______, _______, _______, \
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_MSEL,                                 \
-        _______,          _______, _______, KC_CALC, _______, _______, _______, _______, _______, _______, _______,          _______,               _______,          \
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______,      _______, _______, _______  \
-    ),
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, KC_MSTP, KC_MPLY, KC_MPRV, KC_MNXT,      KC_MUTE, KC_VOLD, KC_VOLU,
+
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_MSEL,
+        _______,          _______, _______, KC_CALC, _______, _______, _______, _______, _______, _______, _______,          _______,               _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______,      _______, _______, _______
+    )
 };
-
-void matrix_init_user(void) {
-
-}
-
-void matrix_scan_user(void) {
-
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    return true;
-}
-
-void led_set_user(uint8_t usb_led) {
-
-}
diff --git a/qmk/keyboards/phantom/keymaps/iso_uk/keymap.c b/qmk/keyboards/phantom/keymaps/iso_uk/keymap.c
index 43a7e55f..0230ccb7 100644
--- a/qmk/keyboards/phantom/keymaps/iso_uk/keymap.c
+++ b/qmk/keyboards/phantom/keymaps/iso_uk/keymap.c
@@ -13,62 +13,31 @@
  * 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
 
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-#define _BL 0
-#define _FL 1
+enum layer_names {
+    _BL,
+    _FL
+};
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BL] = LAYOUT_tkl_iso(
-        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_BRK,  \
-        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_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_RSFT,               KC_UP,            \
-        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, MO(_FL), KC_RCTL,      KC_LEFT, KC_DOWN, KC_RGHT  \
+        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_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_RSFT,               KC_UP,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, MO(_FL), KC_RCTL,      KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [_FL] = LAYOUT_tkl_iso(
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, KC_MSTP, KC_MPLY, KC_MPRV, KC_MNXT,      KC_MUTE, KC_VOLD, KC_VOLU, \
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______, _______, _______, \
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,               _______, _______, _______, \
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MSEL,                                 \
-        _______, _______, _______, _______, KC_CALC, _______, _______, _______, _______, _______, _______, _______,          _______,               _______,          \
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______,      _______, _______, _______  \
-    ),
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, KC_MSTP, KC_MPLY, KC_MPRV, KC_MNXT,      KC_MUTE, KC_VOLD, KC_VOLU,
+
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,      _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,               _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MSEL,
+        _______, _______, _______, _______, KC_CALC, _______, _______, _______, _______, _______, _______, _______,          _______,               _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______,      _______, _______, _______
+    )
 };
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-    // MACRODOWN only works in this function
-    switch(id) {
-        case 0:
-            if (record->event.pressed) {
-                register_code(KC_RSFT);
-            } else {
-                unregister_code(KC_RSFT);
-            }
-            break;
-    }
-    return MACRO_NONE;
-};
-
-
-void matrix_init_user(void) {
-
-}
-
-void matrix_scan_user(void) {
-
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    return true;
-}
-
-void led_set_user(uint8_t usb_led) {
-
-}
diff --git a/qmk/keyboards/phantom/keymaps/rgbmod/keymap.c b/qmk/keyboards/phantom/keymaps/rgbmod/keymap.c
index e3a67923..9be30fba 100644
--- a/qmk/keyboards/phantom/keymaps/rgbmod/keymap.c
+++ b/qmk/keyboards/phantom/keymaps/rgbmod/keymap.c
@@ -13,62 +13,31 @@
  * 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
 
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-#define _BL 0
-#define _FL 1
+enum layer_names {
+    _BL,
+    _FL
+};
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     [_BL] = LAYOUT_tkl_ansi(
-        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_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, MO(_FL), KC_RCTL,      KC_LEFT, KC_DOWN, KC_RGHT  \
+        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_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, MO(_FL), KC_RCTL,      KC_LEFT, KC_DOWN, KC_RGHT
     ),
     [_FL] = LAYOUT_tkl_ansi(
-        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,       _______, _______, _______, \
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,         _______, _______, _______, \
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,       _______, _______, _______, \
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP,            _______,                                  \
-        _______,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______,          _______,                _______,          \
-        _______, _______, _______,                            _______,                            _______, _______, _______, _______,       _______, _______, _______  \
-    ),
+        _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,       _______, _______, _______,
+
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,         _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,       _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP,            _______,
+        _______,          RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______,          _______,                _______,
+        _______, _______, _______,                            _______,                            _______, _______, _______, _______,       _______, _______, _______
+    )
 };
-
-const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
-{
-    // MACRODOWN only works in this function
-    switch(id) {
-        case 0:
-            if (record->event.pressed) {
-                register_code(KC_RSFT);
-            } else {
-                unregister_code(KC_RSFT);
-            }
-            break;
-    }
-    return MACRO_NONE;
-};
-
-
-void matrix_init_user(void) {
-
-}
-
-void matrix_scan_user(void) {
-
-}
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    return true;
-}
-
-void led_set_user(uint8_t usb_led) {
-
-}
diff --git a/qmk/keyboards/phantom/keymaps/rgbmod/rules.mk b/qmk/keyboards/phantom/keymaps/rgbmod/rules.mk
index e4865902..1e3cebb1 100644
--- a/qmk/keyboards/phantom/keymaps/rgbmod/rules.mk
+++ b/qmk/keyboards/phantom/keymaps/rgbmod/rules.mk
@@ -1,34 +1 @@
-# Copyright 2013 Jun Wako <wakojun@gmail.com>
-#
-# This program is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-
-# QMK Build Options
-#   change to "no" to disable the options, or define them in the Makefile in
-#   the appropriate keymap folder that will get included automatically
-#
-BOOTMAGIC_ENABLE = yes      # 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 = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI support
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = yes       # Enable WS2812 RGB underlight. Do not enable this with audio at the same time.
-SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
-
+RGBLIGHT_ENABLE = yes
diff --git a/qmk/keyboards/phantom/phantom.c b/qmk/keyboards/phantom/phantom.c
index 2bf1631b..1017de00 100644
--- a/qmk/keyboards/phantom/phantom.c
+++ b/qmk/keyboards/phantom/phantom.c
@@ -13,51 +13,25 @@
  * 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 "phantom.h"
 
-void matrix_init_kb(void) {
-    // put your keyboard start-up code here
-    // runs once when the firmware starts up
+void keyboard_pre_init_kb(void) {
     led_init_ports();
-    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);
+    keyboard_pre_init_user();
 }
 
 void led_init_ports(void) {
-    DDRB |= (1<<6) | (1<<7); // OUT
+    setPinOutput(B6);
+    setPinOutput(B7);
 }
 
-void led_set_kb(uint8_t usb_led) {
-    if (usb_led & (1<<USB_LED_CAPS_LOCK))
-    {
-        PORTB |= (1<<6); // HI
-    }
-    else
-    {
-        PORTB &= ~(1<<6); // LO
+bool led_update_kb(led_t led_state) {
+    if (led_update_user(led_state)) {
+        writePin(B6, led_state.caps_lock);
+        writePin(B7, led_state.scroll_lock);
     }
 
-    if (usb_led & (1<<USB_LED_SCROLL_LOCK))
-    {
-        PORTB |= (1<<7); // HI
-    }
-    else
-    {
-        PORTB &= ~(1<<7); // LO
-    }
-
-    led_set_user(usb_led);
+    return true;
 }
diff --git a/qmk/keyboards/phantom/phantom.h b/qmk/keyboards/phantom/phantom.h
index fa77634d..8e09e218 100644
--- a/qmk/keyboards/phantom/phantom.h
+++ b/qmk/keyboards/phantom/phantom.h
@@ -13,111 +13,111 @@
  * 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 PHANTOM_H
-#define PHANTOM_H
+
+#pragma once
 
 #include "quantum.h"
 
-// Keymap utilizing all the possible keys on the PCB.
-#define LAYOUT_7bit( \
-    K00, K53, K02, K03, K04, K05, K56, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, K0G, \
-    K01, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, K1G, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2E, K2F, K2G, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,      K3E, K3F, K3G, \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D,      K4E, K4F, K4G, \
-    K50, K51, K52, K54,      K55, K57, K58,           K5A, K5B, K5C, K5D,      K5E, K5F, K5G  \
-) { \
-/*          0      1      2      3      4      5      6      7      8      9      A      B      C      D      E      F      G    */  \
-/* 0 */   { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G   }, \
-/* 1 */   { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   K1C,   K1D,   K1E,   K1F,   K1G   }, \
-/* 2 */   { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,   K2E,   K2F,   K2G   }, \
-/* 3 */   { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,   K3E,   K3F,   K3G   }, \
-/* 4 */   { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   K4C,   K4D,   K4E,   K4F,   K4G   }, \
-/* 5 */   { K50,   K51,   K52,   K53,   K54,   K55,   K56,   K57,   K58,   KC_NO, K5A,   K5B,   K5C,   K5D,   K5E,   K5F,   K5G   }  \
-}
+#define XXX KC_NO
 
+// Keymap utilizing all the possible keys on the PCB.
+#define LAYOUT_all( \
+    k00, k53, k02, k03, k04, k05, k56, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G, \
+    k01, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D,      k2E, k2F, k2G, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D,      k3E, k3F, k3G, \
+    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D,      k4E, k4F, k4G, \
+    k50, k51, k52, k54,      k55, k57, k58,           k5A, k5B, k5C, k5D,      k5E, k5F, k5G \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1C, k1D, k1E, k1F, k1G }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, k3E, k3F, k3G }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, k4C, k4D, k4E, k4F, k4G }, \
+    { k50, k51, k52, k53, k54, k55, k56, k57, k58, XXX, k5A, k5B, k5C, k5D, k5E, k5F, k5G } \
+}
 
 // Keymap for a standard ANSI layout.
 #define LAYOUT_tkl_ansi( \
-    K00,      K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,      K0E, K0F, K0G, \
-    K01, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1D,      K1E, K1F, K1G, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2E, K2F, K2G, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                     \
-    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4D,           K4F,      \
-    K50, K51, K52,                K57,                K5A, K5B, K5C, K5D,      K5E, K5F, K5G  \
-) LAYOUT_7bit( \
-    K00,   KC_NO, K02,   K03,   K04,   K05,   KC_NO, K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G,   \
-    K01,   K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   KC_NO, K1D,   K1E,   K1F,   K1G,   \
-    K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,          K2E,   K2F,   K2G,   \
-    K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   KC_NO, K3D,          KC_NO, KC_NO, KC_NO, \
-    K40,   KC_NO, K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   KC_NO, K4D,          KC_NO, K4F,   KC_NO, \
-    K50,   K51,   K52,   KC_NO,        KC_NO, K57,   KC_NO,               K5A,   K5B,   K5C,   K5D,          K5E,   K5F,   K5G    \
-)
+    k00,      k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D,      k0E, k0F, k0G, \
+    k01, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1D,      k1E, k1F, k1G, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D,      k2E, k2F, k2G, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D, \
+    k40,      k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B,      k4D,           k4F, \
+    k50, k51, k52,                k57,                k5A, k5B, k5C, k5D,      k5E, k5F, k5G \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, XXX, k1D, k1E, k1F, k1G }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, XXX, XXX, XXX }, \
+    { k40, XXX, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, XXX, k4D, XXX, k4F, XXX }, \
+    { k50, k51, k52, XXX, XXX, XXX, XXX, k57, XXX, XXX, k5A, k5B, k5C, k5D, k5E, k5F, k5G } \
+}
 
 // Keymap for a standard ANSI layout plus the five extra keys
 // above the arrow block.
 #define LAYOUT_tkl_ansi_plus_five( \
-    K00,      K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,      K0E, K0F, K0G, \
-    K01, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1D,      K1E, K1F, K1G, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2E, K2F, K2G, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,      K3E, K3F, K3G, \
-    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4D,      K4E, K4F, K4G, \
-    K50, K51, K52,                K57,                K5A, K5B, K5C, K5D,      K5E, K5F, K5G  \
-) LAYOUT_7bit( \
-    K00,   KC_NO, K02,   K03,   K04,   K05,   KC_NO, K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G,   \
-    K01,   K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   KC_NO, K1D,   K1E,   K1F,   K1G,   \
-    K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,          K2E,   K2F,   K2G,   \
-    K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   KC_NO, K3D,          K3E,   K3F,   K3G,   \
-    K40,   KC_NO, K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   KC_NO, K4D,          K4E,   K4F,   K4G,   \
-    K50,   K51,   K52,   KC_NO,        KC_NO, K57,   KC_NO,               K5A,   K5B,   K5C,   K5D,          K5E,   K5F,   K5G    \
-)
+    k00,      k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D,      k0E, k0F, k0G, \
+    k01, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1D,      k1E, k1F, k1G, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D,      k2E, k2F, k2G, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D,      k3E, k3F, k3G, \
+    k40,      k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B,      k4D,      k4E, k4F, k4G, \
+    k50, k51, k52,                k57,                k5A, k5B, k5C, k5D,      k5E, k5F, k5G \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, XXX, k1D, k1E, k1F, k1G }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, k3E, k3F, k3G }, \
+    { k40, XXX, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, XXX, k4D, k4E, k4F, k4G }, \
+    { k50, k51, k52, XXX, XXX, XXX, XXX, k57, XXX, XXX, k5A, k5B, k5C, k5D, k5E, k5F, k5G } \
+}
 
 #define LAYOUT_tkl_ansi_wkl( \
-    K00,      K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,      K0E, K0F, K0G, \
-    K01, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1D,      K1E, K1F, K1G, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,      K2E, K2F, K2G, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B,      K3D,                     \
-    K40,      K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4D,           K4F,      \
-    K50, K51, K52,                K57,                     K5B, K5C, K5D,      K5E, K5F, K5G  \
-) LAYOUT_7bit( \
-    K00,   KC_NO, K02,   K03,   K04,   K05,   KC_NO, K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G,   \
-    K01,   K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   KC_NO, K1D,   K1E,   K1F,   K1G,   \
-    K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   K2D,          K2E,   K2F,   K2G,   \
-    K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   KC_NO, K3D,          KC_NO, KC_NO, KC_NO, \
-    K40,   KC_NO, K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   KC_NO, K4D,          KC_NO, K4F,   KC_NO, \
-    K50,   K51,   K52,   KC_NO,        KC_NO, K57,   KC_NO,               KC_NO, K5B,   K5C,   K5D,          K5E,   K5F,   K5G    \
-)
+    k00,      k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D,      k0E, k0F, k0G, \
+    k01, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1D,      k1E, k1F, k1G, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D,      k2E, k2F, k2G, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B,      k3D, \
+    k40,      k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B,      k4D,           k4F, \
+    k50, k51, k52,                k57,                     k5B, k5C, k5D,      k5E, k5F, k5G \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, XXX, k1D, k1E, k1F, k1G }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, k2D, k2E, k2F, k2G }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, XXX, k3D, XXX, XXX, XXX }, \
+    { k40, XXX, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, XXX, k4D, XXX, k4F, XXX }, \
+    { k50, k51, k52, XXX, XXX, XXX, XXX, k57, XXX, XXX, XXX, k5B, k5C, k5D, k5E, k5F, k5G } \
+}
 
 #define LAYOUT_tkl_iso( \
-    K00,      K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,      K0E, K0F, K0G, \
-    K01, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1D,      K1E, K1F, K1G, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,           K2E, K2F, K2G, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,                     \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4D,           K4F,      \
-    K50, K51, K52,                K57,                K5A, K5B, K5C, K5D,      K5E, K5F, K5G  \
-) LAYOUT_7bit( \
-    K00,   KC_NO, K02,   K03,   K04,   K05,   KC_NO, K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G,   \
-    K01,   K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   KC_NO, K1D,   K1E,   K1F,   K1G,   \
-    K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   KC_NO,        K2E,   K2F,   K2G,   \
-    K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,          KC_NO, KC_NO, KC_NO, \
-    K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   KC_NO, K4D,          KC_NO, K4F,   KC_NO, \
-    K50,   K51,   K52,   KC_NO,        KC_NO, K57,   KC_NO,               K5A,   K5B,   K5C,   K5D,          K5E,   K5F,   K5G    \
-)
+    k00,      k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D,      k0E, k0F, k0G, \
+    k01, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1D,      k1E, k1F, k1G, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C,           k2E, k2F, k2G, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, \
+    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B,      k4D,           k4F, \
+    k50, k51, k52,                k57,                k5A, k5B, k5C, k5D,      k5E, k5F, k5G \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, XXX, k1D, k1E, k1F, k1G }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, XXX, k2E, k2F, k2G }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, XXX, XXX, XXX }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, XXX, k4D, XXX, k4F, XXX }, \
+    { k50, k51, k52, XXX, XXX, XXX, XXX, k57, XXX, XXX, k5A, k5B, k5C, k5D, k5E, k5F, k5G } \
+}
 
 #define LAYOUT_tkl_iso_wkl( \
-    K00,      K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,      K0E, K0F, K0G, \
-    K01, K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1D,      K1E, K1F, K1G, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,           K2E, K2F, K2G, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,                     \
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,      K4D,           K4F,      \
-    K50, K51, K52,                K57,                     K5B, K5C, K5D,      K5E, K5F, K5G  \
-) LAYOUT_7bit( \
-    K00,   KC_NO, K02,   K03,   K04,   K05,   KC_NO, K06,   K07,   K08,   K09,   K0A,   K0B,   K0C,   K0D,   K0E,   K0F,   K0G,   \
-    K01,   K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18,   K19,   K1A,   K1B,   KC_NO, K1D,   K1E,   K1F,   K1G,   \
-    K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28,   K29,   K2A,   K2B,   K2C,   KC_NO,        K2E,   K2F,   K2G,   \
-    K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38,   K39,   K3A,   K3B,   K3C,   K3D,          KC_NO, KC_NO, KC_NO, \
-    K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48,   K49,   K4A,   K4B,   KC_NO, K4D,          KC_NO, K4F,   KC_NO, \
-    K50,   K51,   K52,   KC_NO,        KC_NO, K57,   KC_NO,               KC_NO, K5B,   K5C,   K5D,          K5E,   K5F,   K5G    \
-)
+    k00,      k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D,      k0E, k0F, k0G, \
+    k01, k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, k1D,      k1E, k1F, k1G, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C,           k2E, k2F, k2G, \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, \
+    k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B,      k4D,           k4F, \
+    k50, k51, k52,                k57,                     k5B, k5C, k5D,      k5E, k5F, k5G \
+) { \
+    { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0A, k0B, k0C, k0D, k0E, k0F, k0G }, \
+    { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1A, k1B, XXX, k1D, k1E, k1F, k1G }, \
+    { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2A, k2B, k2C, XXX, k2E, k2F, k2G }, \
+    { k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3A, k3B, k3C, k3D, XXX, XXX, XXX }, \
+    { k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4A, k4B, XXX, k4D, XXX, k4F, XXX }, \
+    { k50, k51, k52, XXX, XXX, XXX, XXX, k57, XXX, XXX, XXX, k5B, k5C, k5D, k5E, k5F, k5G } \
+}
 
-#endif
+#define LAYOUT_7bit LAYOUT_all
diff --git a/qmk/keyboards/phantom/readme.md b/qmk/keyboards/phantom/readme.md
index b2563095..857525d9 100644
--- a/qmk/keyboards/phantom/readme.md
+++ b/qmk/keyboards/phantom/readme.md
@@ -1,16 +1,19 @@
-Phantom
-=======
+# Phantom
 
 A community-developed keyboard PCB designed to fit inside the case of a Filco Majestouch.
 
 See the [Deskthority wiki](https://deskthority.net/wiki/Phantom) for more information.
 
-Keyboard Maintainer: QMK Community  
-Hardware Supported: Phantom PCB  
-Hardware Availability: https://mechanicalkeyboards.com/shop/index.php?l=product_detail&p=536
+* Keyboard Maintainer: QMK Community
+* Hardware Supported: Phantom PCB
+* Hardware Availability: https://mechanicalkeyboards.com/shop/index.php?l=product_detail&p=536
 
 Make example for this keyboard (after setting up your build environment):
 
     make phantom:default
 
-See [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) then the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information.
+Flashing example for this keyboard:
+
+    make phantom:default:flash
+
+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).
diff --git a/qmk/keyboards/phantom/rules.mk b/qmk/keyboards/phantom/rules.mk
index 79c64ac7..53d53e46 100644
--- a/qmk/keyboards/phantom/rules.mk
+++ b/qmk/keyboards/phantom/rules.mk
@@ -2,19 +2,12 @@
 MCU = atmega32u4
 
 # Bootloader selection
-#   Teensy       halfkay
-#   Pro Micro    caterina
-#   Atmel DFU    atmel-dfu
-#   LUFA DFU     lufa-dfu
-#   QMK DFU      qmk-dfu
-#   ATmega32A    bootloadHID
-#   ATmega328P   USBasp
 BOOTLOADER = halfkay
 
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full     # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
 CONSOLE_ENABLE = no         # Console for debug
@@ -24,11 +17,8 @@ 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 = yes           # USB Nkey Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. Do not enable this with audio at the same time.
-MIDI_ENABLE = no            # MIDI support
-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
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
 
 LAYOUTS = tkl_ansi tkl_iso
diff --git a/qmk/keyboards/phoenix/phoenix.c b/qmk/keyboards/phoenix/phoenix.c
index e79b35b1..a8e9a42a 100644
--- a/qmk/keyboards/phoenix/phoenix.c
+++ b/qmk/keyboards/phoenix/phoenix.c
@@ -1,4 +1,4 @@
-#include "hal.h"
+#include <hal.h>
 #include "usb_main.h"
 #include "phoenix.h"
 
diff --git a/qmk/keyboards/pinky/3/config.h b/qmk/keyboards/pinky/3/config.h
index 8a3f53a1..6bf0e8ea 100644
--- a/qmk/keyboards/pinky/3/config.h
+++ b/qmk/keyboards/pinky/3/config.h
@@ -208,34 +208,6 @@
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/pinky/4/config.h b/qmk/keyboards/pinky/4/config.h
index 4c44b0ab..f0868d02 100644
--- a/qmk/keyboards/pinky/4/config.h
+++ b/qmk/keyboards/pinky/4/config.h
@@ -208,34 +208,6 @@
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/pinky/rules.mk b/qmk/keyboards/pinky/rules.mk
index 2e315382..b743a754 100644
--- a/qmk/keyboards/pinky/rules.mk
+++ b/qmk/keyboards/pinky/rules.mk
@@ -30,7 +30,6 @@ 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
 
 SPLIT_KEYBOARD = yes
 
diff --git a/qmk/keyboards/pistachio_mp/config.h b/qmk/keyboards/pistachio_mp/config.h
new file mode 100644
index 00000000..f23530a1
--- /dev/null
+++ b/qmk/keyboards/pistachio_mp/config.h
@@ -0,0 +1,78 @@
+/*
+Copyright 2020 rate
+
+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.222
+
+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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID    0xFEED
+#define PRODUCT_ID   0xD0C3
+#define DEVICE_VER   0x0001
+#define MANUFACTURER rate
+#define PRODUCT      pistachio_mp
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 4
+
+#ifdef ENCODER_ENABLE
+#define ENCODERS_PAD_A {F4}
+#define ENCODERS_PAD_B {F5}
+#endif
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+ */
+#define MATRIX_ROW_PINS { B4, E6, D7, C6, D4 }
+#define MATRIX_COL_PINS { B3, B1, F7, F6 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION ROW2COL
+
+#define RGB_DI_PIN D2
+#define RGBLED_NUM 3
+#define RGBLIGHT_HUE_STEP 10
+#define RGBLIGHT_SAT_STEP 17
+#if defined(RGBLIGHT_ENABLE) && !defined(IOS_DEVICE_ENABLE)
+  #define USB_MAX_POWER_CONSUMPTION 400
+#else
+  #define USB_MAX_POWER_CONSUMPTION 100
+#endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+/* nKey Rollover */
+#define FORCE_NKRO
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
diff --git a/qmk/keyboards/pistachio_mp/info.json b/qmk/keyboards/pistachio_mp/info.json
new file mode 100644
index 00000000..cbbbd67b
--- /dev/null
+++ b/qmk/keyboards/pistachio_mp/info.json
@@ -0,0 +1,30 @@
+{
+    "keyboard_name": "pistachio_mp", 
+    "url": "", 
+    "maintainer": "rate", 
+    "width": 4, 
+    "height": 6.5, 
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+            {"label":"Encoder", "x":3, "y":0},
+            {"label":"Num Lock", "x":0, "y":1.5},
+            {"label":"/", "x":1, "y":1.5},
+            {"label":"*", "x":2, "y":1.5},
+            {"label":"-", "x":3, "y":1.5},
+            {"label":"7", "x":0, "y":2.5},
+            {"label":"8", "x":1, "y":2.5},
+            {"label":"9", "x":2, "y":2.5},
+            {"label":"+", "x":3, "y":2.5, "h":2},
+            {"label":"4", "x":0, "y":3.5},
+            {"label":"5", "x":1, "y":3.5},
+            {"label":"6", "x":2, "y":3.5},
+            {"label":"1", "x":0, "y":4.5},
+            {"label":"2", "x":1, "y":4.5},
+            {"label":"3", "x":2, "y":4.5},
+            {"label":"Enter", "x":3, "y":4.5, "h":2},
+            {"label":"0", "x":0, "y":5.5, "w":2},
+            {"label":".", "x":2, "y":5.5}]
+        }
+    }
+}
\ No newline at end of file
diff --git a/qmk/keyboards/pistachio_mp/keymaps/default/keymap.c b/qmk/keyboards/pistachio_mp/keymaps/default/keymap.c
new file mode 100644
index 00000000..a8e8cc73
--- /dev/null
+++ b/qmk/keyboards/pistachio_mp/keymaps/default/keymap.c
@@ -0,0 +1,55 @@
+/* Copyright 2020 rate
+ *
+ * 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 names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE = 0,
+    _FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [_BASE] = LAYOUT(
+                                           KC_MPLY,
+    LT(_FN, KC_NLCK),  KC_PSLS,  KC_PAST,  KC_PMNS,
+    KC_P7,             KC_P8,    KC_P9,
+    KC_P4,             KC_P5,    KC_P6,    KC_PPLS,
+    KC_P1,             KC_P2,    KC_P3,
+    KC_P0,                       KC_PDOT,  KC_PENT
+    ),
+    /* Fn */
+    [_FN] = LAYOUT(
+                                KC_NO,
+    KC_NO,   KC_NO,   KC_NO,    KC_NO,
+    RGB_HUI, RGB_SAI, RGB_VAI,
+    RGB_HUD, RGB_SAD, RGB_VAD,  RGB_TOG,
+    KC_NO,   KC_NO,   KC_NO,
+    KC_NO,            KC_NO,    KC_NO
+    )
+};
+#ifdef ENCODER_ENABLE
+void encoder_update_user(uint8_t index, bool clockwise) {
+    if (index == 0) {
+        // Volume control
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    }
+}
+#endif
diff --git a/qmk/keyboards/pistachio_mp/keymaps/default/readme.md b/qmk/keyboards/pistachio_mp/keymaps/default/readme.md
new file mode 100644
index 00000000..2bc50be9
--- /dev/null
+++ b/qmk/keyboards/pistachio_mp/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for pistachio_mp
diff --git a/qmk/keyboards/pistachio_mp/pistachio_mp.c b/qmk/keyboards/pistachio_mp/pistachio_mp.c
new file mode 100644
index 00000000..40e75fe1
--- /dev/null
+++ b/qmk/keyboards/pistachio_mp/pistachio_mp.c
@@ -0,0 +1,17 @@
+/* Copyright 2020 rate
+ *
+ * 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 "pistachio_mp.h"
diff --git a/qmk/keyboards/pistachio_mp/pistachio_mp.h b/qmk/keyboards/pistachio_mp/pistachio_mp.h
new file mode 100644
index 00000000..d7c5c9ba
--- /dev/null
+++ b/qmk/keyboards/pistachio_mp/pistachio_mp.h
@@ -0,0 +1,48 @@
+/* Copyright 2020 rate
+ *
+ * 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"
+
+/*
+ * ,------------------------
+ * |                   K07 |
+ * |------------------------
+ * | K00 | K01 | K02 | K03 |
+ * |------------------------
+ * | K04 | K05 | K06 |     |
+ * |------------------ K11 -
+ * | K08 | K09 | K10 |     |
+ * |------------------------
+ * | K12 | K13 | K14 |     |
+ * |------------------ K17 -
+ * |    K15    | K16 |     |
+ * |------------------------
+ */
+#define LAYOUT( \
+                   K07, \
+    K00, K01, K02, K03, \
+    K04, K05, K06,      \
+    K08, K09, K10, K11, \
+    K12, K13, K14,      \
+    K15,      K16, K17 ) { \
+    { K00,   K01,   K02,   K03 }, \
+    { K04,   K05,   K06,   K07 }, \
+    { K08,   K09,   K10,   K11 }, \
+    { K12,   K13,   K14,   KC_NO }, \
+    { K15,   KC_NO, K16,   K17 }, \
+}
diff --git a/qmk/keyboards/pistachio_mp/readme.md b/qmk/keyboards/pistachio_mp/readme.md
new file mode 100644
index 00000000..0e5b030a
--- /dev/null
+++ b/qmk/keyboards/pistachio_mp/readme.md
@@ -0,0 +1,21 @@
+# PistachioMacroPad
+
+![PistachioMacroPad](https://ratelog.net/wp-content/uploads/2020/11/s-PXL_20201114_134133741.jpg)
+
+This is a numeric keypad with a rotary encoder that uses a stainless steel plate.
+
+* Keyboard Maintainer: [rate](https://github.com/7-rate)
+* Hardware Supported: PistachioMacroPad PCB, Pro Micro, BMP MicroPro
+* Hardware Availability: [PCB & CaseData](https://github.com/7-rate/Pistachio_MacroPad.git), [Booth Shop](https://rates.booth.pm/items/2531312)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make pistachio_mp:default
+
+Flashing example for this keyboard:
+
+    make pistachio_mp:default:flash
+
+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).
+
+[Build guide](https://ratelog.net/pistachiomacropad-build-guide/)
\ No newline at end of file
diff --git a/qmk/keyboards/pistachio_mp/rules.mk b/qmk/keyboards/pistachio_mp/rules.mk
new file mode 100644
index 00000000..5c24e15f
--- /dev/null
+++ b/qmk/keyboards/pistachio_mp/rules.mk
@@ -0,0 +1,23 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+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
+# 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
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = yes
diff --git a/qmk/keyboards/planck/ez/ez.c b/qmk/keyboards/planck/ez/ez.c
index 5371c785..8c498a55 100644
--- a/qmk/keyboards/planck/ez/ez.c
+++ b/qmk/keyboards/planck/ez/ez.c
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "ez.h"
-#include "ch.h"
-#include "hal.h"
+#include <ch.h>
+#include <hal.h>
 
 keyboard_config_t keyboard_config;
 #ifdef RGB_MATRIX_ENABLE
diff --git a/qmk/keyboards/planck/ez/glow/rules.mk b/qmk/keyboards/planck/ez/glow/rules.mk
index 575a9c8f..aad92997 100644
--- a/qmk/keyboards/planck/ez/glow/rules.mk
+++ b/qmk/keyboards/planck/ez/glow/rules.mk
@@ -1 +1 @@
-RGB_MATRIX_ENABLE = IS31FL3737
+RGB_MATRIX_ENABLE = yes
diff --git a/qmk/keyboards/planck/ez/rules.mk b/qmk/keyboards/planck/ez/rules.mk
index cd8354b2..18eada38 100644
--- a/qmk/keyboards/planck/ez/rules.mk
+++ b/qmk/keyboards/planck/ez/rules.mk
@@ -26,6 +26,7 @@ SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
 
 # SERIAL_LINK_ENABLE = yes
 ENCODER_ENABLE = yes
+RGB_MATRIX_DRIVER = IS31FL3737
 
 LAYOUTS = ortho_4x12 planck_mit
 LAYOUTS_HAS_RGB = no
diff --git a/qmk/keyboards/planck/keymaps/bghull/keymap.c b/qmk/keyboards/planck/keymaps/bghull/keymap.c
new file mode 100644
index 00000000..3539ac7b
--- /dev/null
+++ b/qmk/keyboards/planck/keymaps/bghull/keymap.c
@@ -0,0 +1,101 @@
+/* Copyright 2015-2017 Jack Humbert
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+#include "keymap_steno.h"
+
+enum planck_layers {
+  _QWERTY,
+  _STENO,
+  _NUMPAD,
+  _FUNC
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/* Qwerty
+ * ,-----------------------------------------------------------------------------------.
+ * |  Tab |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Del  |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * |NUMPAD|   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  | ;  : | Enter|
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  | ,  < | .  > |  up  | /  ? |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |Es/Ctl|MACROS|STENO |  Alt | Bspc |    Space    | Ctrl | '  " |  lt  |  dn  |  rt  |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_QWERTY] = LAYOUT_planck_grid(
+    LGUI_T(KC_TAB),             KC_Q,      KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,     KC_O,    KC_P, KC_DEL,
+    MO(_NUMPAD),        KC_A,      KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,     KC_L, KC_SCLN, KC_ENT,
+    KC_LSFT,            KC_Z,      KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M, KC_COMM,   KC_DOT,   KC_UP, KC_SLSH,
+    LCTL_T(KC_ESC),MO(_FUNC),DF(_STENO), KC_LALT, KC_BSPC, KC_SPC ,_______ , KC_LCTL, KC_QUOT,  KC_LEFT, KC_DOWN, KC_RGHT
+),
+
+/* Plover layer (http://opensteno.org)
+ * ,-----------------------------------------------------------------------------------.
+ * |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |  FN  |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |QWERTY|   A  |   O  |             |   E  |   U  |  PWR | RES1 | RES2 |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_STENO] = LAYOUT_planck_grid(
+  STN_N1,  STN_N2,  STN_N3,     STN_N4,      STN_N5,  STN_N6,  STN_N7,  STN_N8,  STN_N9,  STN_NA,  STN_NB,  STN_NC ,
+  STN_FN,  STN_S1,  STN_TL,     STN_PL,      STN_HL,  STN_ST1, STN_ST3, STN_FR,  STN_PR,  STN_LR,  STN_TR,  STN_DR ,
+  XXXXXXX, STN_S2,  STN_KL,     STN_WL,      STN_RL,  STN_ST2, STN_ST4, STN_RR,  STN_BR,  STN_GR,  STN_SR,  STN_ZR ,
+  XXXXXXX, XXXXXXX, DF(_QWERTY),STN_A,STN_O, XXXXXXX, XXXXXXX, STN_E,   STN_U,   STN_PWR, STN_RE1, STN_RE2
+),
+
+/* 
+ * ,-----------------------------------------------------------------------------------.
+ * |      |RClick|  MsU |LClick|WheelU|   (  |  )   |   7  |   8  |   9  |   0  |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |  MsL |  MsD |  MsR |WheelD|  [{  |  ]}  |   4  |   5  |   6  |   +  |  -_  |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      | Mute | VolD | VolU |  `~  |   _  |  =   |   1  |   2  |   3  | PgUp | \  | |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |RESET |      |      |             |      |   .  | Home | PgDn | End  |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_NUMPAD] = LAYOUT_planck_grid(
+  _______, KC_BTN2, KC_MS_U, KC_BTN1,  KC_WH_U, KC_LPRN, KC_RPRN,    KC_7,     KC_8,    KC_9,    KC_0, _______,
+  _______, KC_MS_L, KC_MS_D, KC_MS_R,  KC_WH_D, KC_LBRC, KC_RBRC,    KC_4,     KC_5,    KC_6, KC_PPLS, KC_MINS,
+  _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_GRAVE, KC_UNDS,  KC_EQL,    KC_1,     KC_2,    KC_3, KC_PGUP, KC_BSLS,
+  _______, XXXXXXX,   RESET, _______,  _______, _______, _______, _______,  KC_PDOT, KC_HOME, KC_PGDN, KC_END
+),
+
+/* Dynamic macros + Winkey combos
+ * ,-----------------------------------------------------------------------------------.
+ * |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  | F10  | F11  | F12  |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |  W2  |      |      |      |      |      |      |      |      |      |      | RESET|
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |  W3  |      |      |      |      |      |      |      |      |      |      |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |  W4  |      |      |      |      |             |      |      |      |      |      |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_FUNC] = LAYOUT_planck_grid(
+     KC_F1  ,  KC_F2 ,  KC_F3 ,  KC_F4  , KC_F5  , KC_F6 ,  KC_F7 ,  KC_F8 ,  KC_F9 ,  KC_F10 , KC_F11 , KC_F12,
+  LGUI(KC_2), _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, RESET,
+  LGUI(KC_3), _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______, _______,
+  LGUI(KC_4), _______, DM_REC1, DM_PLY1, DM_RSTP, _______, _______, _______, _______,  _______, _______, _______
+),
+
+};
diff --git a/qmk/keyboards/planck/keymaps/bghull/rules.mk b/qmk/keyboards/planck/keymaps/bghull/rules.mk
new file mode 100644
index 00000000..9711c485
--- /dev/null
+++ b/qmk/keyboards/planck/keymaps/bghull/rules.mk
@@ -0,0 +1,5 @@
+SRC += muse.c
+AUTO_SHIFT_ENABLE = yes
+MOUSEKEY_ENABLE = yes
+STENO_ENABLE = yes
+AUDIO_ENABLE = no
\ No newline at end of file
diff --git a/qmk/keyboards/planck/light/rules.mk b/qmk/keyboards/planck/light/rules.mk
index e64f6e2f..fc6243c3 100644
--- a/qmk/keyboards/planck/light/rules.mk
+++ b/qmk/keyboards/planck/light/rules.mk
@@ -28,6 +28,7 @@ UNICODE_ENABLE = no         # Unicode
 BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
 RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = IS31FL3731
 API_SYSEX_ENABLE = no
 
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
diff --git a/qmk/keyboards/planck/readme.md b/qmk/keyboards/planck/readme.md
index 0d836563..748c2514 100644
--- a/qmk/keyboards/planck/readme.md
+++ b/qmk/keyboards/planck/readme.md
@@ -7,7 +7,7 @@ A compact 40% (12x4) ortholinear keyboard kit made and sold by OLKB and Massdrop
 
 Keyboard Maintainer: [Jack Humbert](https://github.com/jackhumbert)  
 Hardware Supported: Planck PCB rev1, rev2, rev3, rev4, rev5, rev6; Planck Light, Planck EZ  
-Hardware Availability: [OLKB.com](https://olkb.com), [Massdrop](https://www.massdrop.com/buy/planck-mechanical-keyboard?mode=guest_open)
+Hardware Availability: [OLKB.com](https://olkb.com), [Massdrop](https://www.massdrop.com/buy/planck-mechanical-keyboard?mode=guest_open), [Ergodox (Planck EZ)](https://ergodox-ez.com/pages/planck)
 
 Make example for this keyboard (after setting up your build environment):
 
diff --git a/qmk/keyboards/planck/rev6/rules.mk b/qmk/keyboards/planck/rev6/rules.mk
index 4f3790d2..02d6b895 100644
--- a/qmk/keyboards/planck/rev6/rules.mk
+++ b/qmk/keyboards/planck/rev6/rules.mk
@@ -24,7 +24,8 @@ API_SYSEX_ENABLE = no
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
 
-# RGB_MATRIX_ENABLE = WS2812
+RGB_MATRIX_ENABLE = no
+RGB_MATRIX_DRIVER = WS2812
 # SERIAL_LINK_ENABLE = yes
 ENCODER_ENABLE = yes
 DIP_SWITCH_ENABLE = yes
diff --git a/qmk/keyboards/playkbtw/ca66/ca66.c b/qmk/keyboards/playkbtw/ca66/ca66.c
index 43a648ec..91f4826f 100644
--- a/qmk/keyboards/playkbtw/ca66/ca66.c
+++ b/qmk/keyboards/playkbtw/ca66/ca66.c
@@ -1,12 +1 @@
 #include "ca66.h"
-
-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_CAPS_LOCK)) {
-    writePinHigh(D1);
-  } else {
-    writePinLow(D1);
-  }
-
-	led_set_user(usb_led);
-}
diff --git a/qmk/keyboards/playkbtw/ca66/config.h b/qmk/keyboards/playkbtw/ca66/config.h
index ff68cdac..4e2d0407 100644
--- a/qmk/keyboards/playkbtw/ca66/config.h
+++ b/qmk/keyboards/playkbtw/ca66/config.h
@@ -22,6 +22,8 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
+#define LED_CAPS_LOCK_PIN D1
+
 /* number of backlight levels */
 
 #define BACKLIGHT_PIN F0
diff --git a/qmk/keyboards/playkbtw/pk60/config.h b/qmk/keyboards/playkbtw/pk60/config.h
index 93e29951..f4709697 100644
--- a/qmk/keyboards/playkbtw/pk60/config.h
+++ b/qmk/keyboards/playkbtw/pk60/config.h
@@ -23,6 +23,9 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
+#define LED_CAPS_LOCK_PIN F4
+#define LED_PIN_ON_STATE 0
+
 /* number of backlight levels */
 #define BACKLIGHT_PIN B7
 #ifdef BACKLIGHT_PIN
diff --git a/qmk/keyboards/playkbtw/pk60/pk60.c b/qmk/keyboards/playkbtw/pk60/pk60.c
index a9da0ff2..909230de 100644
--- a/qmk/keyboards/playkbtw/pk60/pk60.c
+++ b/qmk/keyboards/playkbtw/pk60/pk60.c
@@ -1,35 +1 @@
 #include "pk60.h"
-#include "led.h"
-
-void matrix_init_kb (void) {
-
-  matrix_init_user();
-  led_init_ports();
-
-}
-
-void matrix_scan_kb(void) {
-
-  matrix_scan_user();
-
-};
-
-void led_init_ports(void) {
-  // Set capslock LED pin as pinout
-  DDRF |= (1 << 4);
-  PORTF |= (1 << 4);
-
-}
-
-void led_set_kb(uint8_t usb_led) {
-    
-  if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
-      // Turn capslock on
-      PORTF &= ~(1 << 4);
-  } else {
-      // Turn capslock off
-      PORTF |= (1 << 4);
-  }
-  led_set_user(usb_led);
-
-}
\ No newline at end of file
diff --git a/qmk/keyboards/plexus75/keymaps/via/keymap.c b/qmk/keyboards/plexus75/keymaps/via/keymap.c
new file mode 100644
index 00000000..91bdb75d
--- /dev/null
+++ b/qmk/keyboards/plexus75/keymaps/via/keymap.c
@@ -0,0 +1,101 @@
+/*
+ * 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 for task manager and such
+#define CALTDEL LCTL(LALT(KC_DEL))
+#define TSKMGR LCTL(LSFT(KC_ESC))
+
+// Layer shorthand
+enum layer_names {
+    _BASE,
+    _FN,
+    _FN1,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+    /* Base Layer
+     * .-----------------------------------------------------------------------------------------------------------------------------------------'
+     * |  ESC      | 1      | 2      | 3      | 4      | 5      | [      | ]      | `      | 6      | 7      | 8      | 9      | 0      | -      |
+     * |-----------+--------+--------+------- +--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+     * | TAB       | Q      | W      | E      | R      | T      | 7      | 8      | 9      | Y      | U      | I      | O      | P      | BCKSPC |
+     * |-----------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+     * | CTRL      | A      | S      | D      | F      | G      | 4      | 5      |  6     | H      | J      | K      | L      | ;      | '      |
+     * |-----------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+------- +--------+--------+--------|
+     * | LSHIFT    | Z      | X      | C      | V      | B      | 1      | 2      | 3      | N      | M      | ,      | .      | /      | ENTER  |
+     * |-----------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+     * |  PRNSCRN   |   LGUI   |    LALT    |  TT(_FN)  |    SPACE   |     O      |    SPACE    |   TT(_FN1)   |   RALT  |   RGUI   |    CAPS    |
+     * '-----------------------------------------------------------------------------------------------------------------------------------------'
+     */
+    [_BASE] = LAYOUT_2x2u(
+      KC_ESC,        KC_1,    KC_2,    KC_3,     KC_4,    KC_5,    KC_LBRC,   KC_RBRC,   KC_GRV,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS,
+      KC_TAB,        KC_Q,    KC_W,    KC_E,     KC_R,    KC_T,    KC_P7,     KC_P8,     KC_P9,     KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+      KC_LCTL,       KC_A,    KC_S,    KC_D,     KC_F,    KC_G,    KC_P4,     KC_P5,     KC_P6,     KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+      KC_LSFT,       KC_Z,    KC_X,    KC_C,     KC_V,    KC_B,    KC_P1,     KC_P2,     KC_P3,     KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
+      KC_PSCR,    KC_LGUI, KC_LALT, TT(_FN),   KC_SPC,   KC_P0,   KC_SPC,  TT(_FN1),   KC_RALT,  KC_RGUI, KC_CAPS
+    ),
+
+    /* Function Layer
+     * .-------------------------------------------------------------------------------------------------------------------------------------'
+     * | `      | F1     | F2     | F3     | F4     | F5     | F6     | F7     | F8     | F9     | F10    | F11    | F12    | F13   | DEL    |
+     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-------+--------|
+     * |        |        | MENU   |        |        |        |        |        |        |        |        |        | PRT SC |        |       |
+     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+----------------|
+     * |        |        |        |        |        |        |        |        |        |        |        |        |        | RESET   |      |
+     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+----------------|
+     * |        |        |        |        |        |        |        |        |        | MUTE   | VOL DN | VOL UP | \      |        |       |
+     * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+-----------------+--------+----------------|
+     * |             | RESET  | RESET  |        |        |        |        |        |        |        |        |        |                    |
+     * '-------------------------------------------------------------------------------------------------------------------------------------'
+     */
+    [_FN] = LAYOUT_2x2u(
+        KC_GRV,  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_F13, KC_DEL,
+        _______, _______, KC_APP,  _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,   _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_BSLS, _______, _______,
+        RESET, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______
+    ),
+
+    /* 2nd Function Layer
+     * .-------------------------------------------------------------------------------------------------------------------------------------'
+     * |        |        |RGB ON OFF|HUE INC|HUE DEC|SAT INC |SAT DEC |        |        |        |        |        |        |       |PRNSCRN |
+     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-------+--------|
+     * | `      | 1      | 2      | 3      | 4      | 5      |        |        |        | 6      | 7      | 8      | 9      |  0    |        |
+     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+----------------|
+     * |  ~     | !      |  @     |  #     |  $     |  %     |        |        |        |  ^     |  &     |  *     |  (     |  )    | BCKSPC |
+     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+----------------|
+     * |        |        |        |        |        |        |        |        |        | MUTE   | VOL DN | VOL UP | \      |       |        |
+     * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+-----------------+--------+----------------|
+     * |             | RESET  | RESET  |        |        |        |        |        |        |        |        |        |                    |
+     * '-------------------------------------------------------------------------------------------------------------------------------------'
+     */
+    [_FN1] = LAYOUT_2x2u(
+        _______, _______, RGB_TOG, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, _______, _______, _______, _______, _______, _______, _______, KC_PSCR,
+        KC_GRV,     KC_1,   KC_2,     KC_3,    KC_4,    KC_5, _______, _______, _______,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0, _______,
+        KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, _______, _______, _______, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_BSLS, _______, _______,
+        RESET, RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______
+    ),
+
+    [3] = LAYOUT_2x2u(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+    ),
+};
diff --git a/qmk/keyboards/plexus75/keymaps/via/rules.mk b/qmk/keyboards/plexus75/keymaps/via/rules.mk
new file mode 100644
index 00000000..1e5b9980
--- /dev/null
+++ b/qmk/keyboards/plexus75/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/qmk/keyboards/ploopyco/mouse/mouse.c b/qmk/keyboards/ploopyco/mouse/mouse.c
index fad4807c..788a0a1f 100644
--- a/qmk/keyboards/ploopyco/mouse/mouse.c
+++ b/qmk/keyboards/ploopyco/mouse/mouse.c
@@ -171,31 +171,14 @@ bool process_record_kb(uint16_t keycode, keyrecord_t* record) {
     if (IS_MOUSEKEY_BUTTON(keycode)) {
         report_mouse_t currentReport = pointing_device_get_report();
         if (record->event.pressed) {
-            if (keycode == KC_MS_BTN1)
-                currentReport.buttons |= MOUSE_BTN1;
-            else if (keycode == KC_MS_BTN2)
-                currentReport.buttons |= MOUSE_BTN2;
-            else if (keycode == KC_MS_BTN3)
-                currentReport.buttons |= MOUSE_BTN3;
-            else if (keycode == KC_MS_BTN4)
-                currentReport.buttons |= MOUSE_BTN4;
-            else if (keycode == KC_MS_BTN5)
-                currentReport.buttons |= MOUSE_BTN5;
+            currentReport.buttons |= 1 << (keycode - KC_MS_BTN1);
         } else {
-            if (keycode == KC_MS_BTN1)
-                currentReport.buttons &= ~MOUSE_BTN1;
-            else if (keycode == KC_MS_BTN2)
-                currentReport.buttons &= ~MOUSE_BTN2;
-            else if (keycode == KC_MS_BTN3)
-                currentReport.buttons &= ~MOUSE_BTN3;
-            else if (keycode == KC_MS_BTN4)
-                currentReport.buttons &= ~MOUSE_BTN4;
-            else if (keycode == KC_MS_BTN5)
-                currentReport.buttons &= ~MOUSE_BTN5;
+            currentReport.buttons &= ~(1 << (keycode - KC_MS_BTN1));
         }
         pointing_device_set_report(currentReport);
         pointing_device_send();
     }
+
 #endif
 
     return true;
diff --git a/qmk/keyboards/ploopyco/mouse/readme.md b/qmk/keyboards/ploopyco/mouse/readme.md
index a9b4b581..5532a199 100644
--- a/qmk/keyboards/ploopyco/mouse/readme.md
+++ b/qmk/keyboards/ploopyco/mouse/readme.md
@@ -2,9 +2,8 @@
 
 ![Ploopyco Mouse](https://www.ploopy.co/uploads/1/2/7/6/127652558/s905404500980887952_p10_i19_w1414.jpeg)
 
-It's a DIY, QMK Powered Trackball!!!!
+It's a DIY, QMK Powered Mouse!!!!
 
-Everything works. However the scroll wheel has some issues and acts very odd.
 
 * Keyboard Maintainer: [PloopyCo](https://github.com/ploopyco), [Drashna Jael're](https://github.com/drashna/), [Germ](https://github.com/germ/)
 * Hardware Supported: ATMega32u4 8MHz(3.3v)  
@@ -18,7 +17,7 @@ To jump to the bootloader, hold down "Button 4" (the "forward" button on the lef
 
 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).
 
-# Customzing your PloopyCo Trackball
+# Customzing your PloopyCo Mouse
 
 While the defaults are designed so that it can be plugged in and used right away, there are a number of things that you may want to change.  Such as adding DPI control, or to use the ball to scroll while holding a button.   To allow for this sort of control, there is a callback for both the scroll wheel and the mouse censor. 
 
@@ -51,27 +50,3 @@ To configure/set your own array, there are two defines to use, `PLOOPY_DPI_OPTIO
 The `PLOOPY_DPI_OPTIONS` array sets the values that you want to be able to cycle through, and the order they are in.  The "default" define lets the firmware know which of these options is the default and should be loaded by default. 
 
 The `DPI_CONFIG` macro will cycle through the values in the array, each time you hit it.  And it stores this value in persistent memory, so it will load it the next time the device powers up. 
-
-
-# Programming QMK-DFU onto the PloopyCo Mouse
-
-If you would rather have DFU on this board, you can use the QMK-DFU bootloader on the device.  To do so, you want to run: 
-
-    make ploopyco/trackball:default:production
-
-Once you have that, you'll need to [ISP Flash](https://docs.qmk.fm/#/isp_flashing_guide) the chip with the new bootloader hex file created (or the production hex), and set the fuses:
-
-
-| Fuse     | Setting          |
-|----------|------------------|
-| Low      | `0xDF`           |
-| High     | `0xD8` or `0x98` |
-| Extended | `0xCB`           |
-
-Original (Caterina) settings: 
-
-| Fuse     | Setting          |
-|----------|------------------|
-| Low      | `0xFF`           |
-| High     | `0xD8`           |
-| Extended | `0xFE`           |
diff --git a/qmk/keyboards/ploopyco/mouse/rules.mk b/qmk/keyboards/ploopyco/mouse/rules.mk
index db72641d..863f335c 100644
--- a/qmk/keyboards/ploopyco/mouse/rules.mk
+++ b/qmk/keyboards/ploopyco/mouse/rules.mk
@@ -5,7 +5,7 @@ MCU = atmega32u4
 F_CPU = 8000000
 
 # Bootloader selection
-BOOTLOADER = qmk-dfu
+BOOTLOADER = atmel-dfu
 
 # Build Options
 #   change yes to no to disable
diff --git a/qmk/keyboards/ploopyco/pmw3360.c b/qmk/keyboards/ploopyco/pmw3360.c
index 1bd03e8b..8007fece 100644
--- a/qmk/keyboards/ploopyco/pmw3360.c
+++ b/qmk/keyboards/ploopyco/pmw3360.c
@@ -213,7 +213,7 @@ report_pmw_t pmw_read_burst(void) {
     data.dx |= (data.mdx << 8);
     data.dx = data.dx * -1;
     data.dy |= (data.mdy << 8);
-    // data.dy = data.dy * -1;
+    data.dy = data.dy * -1;
 
     spi_stop();
 
diff --git a/qmk/keyboards/ploopyco/trackball/readme.md b/qmk/keyboards/ploopyco/trackball/readme.md
index a38fec21..714f6103 100644
--- a/qmk/keyboards/ploopyco/trackball/readme.md
+++ b/qmk/keyboards/ploopyco/trackball/readme.md
@@ -4,8 +4,6 @@
 
 It's a DIY, QMK Powered Trackball!!!!
 
-Everything works. However the scroll wheel has some issues and acts very odd.
-
 * Keyboard Maintainer: [PloopyCo](https://github.com/ploopyco), [Drashna Jael're](https://github.com/drashna/), [Germ](https://github.com/germ/)
 * Hardware Supported: ATMega32u4 8MHz(3.3v)  
 * Hardware Availability: [Store](https://ploopy.co), [GitHub](https://github.com/ploopyco)
@@ -60,26 +58,3 @@ To configure/set your own array, there are two defines to use, `PLOOPY_DPI_OPTIO
 The `PLOOPY_DPI_OPTIONS` array sets the values that you want to be able to cycle through, and the order they are in.  The "default" define lets the firmware know which of these options is the default and should be loaded by default. 
 
 The `DPI_CONFIG` macro will cycle through the values in the array, each time you hit it.  And it stores this value in persistent memory, so it will load it the next time the device powers up. 
-
-# Programming QMK-DFU onto the PloopyCo Trackball
-
-If you would rather have DFU on this board, you can use the QMK-DFU bootloader on the device.  To do so, you want to run: 
-
-    make ploopyco/trackball:default:production
-
-Once you have that, you'll need to [ISP Flash](https://docs.qmk.fm/#/isp_flashing_guide) the chip with the new bootloader hex file created (or the production hex), and set the fuses:
-
-
-| Fuse     | Setting          |
-|----------|------------------|
-| Low      | `0xDF`           |
-| High     | `0xD8` or `0x98` |
-| Extended | `0xCB`           |
-
-Original (Caterina) settings: 
-
-| Fuse     | Setting          |
-|----------|------------------|
-| Low      | `0xFF`           |
-| High     | `0xD8`           |
-| Extended | `0xFE`           |
diff --git a/qmk/keyboards/ploopyco/trackball/rev1/readme.md b/qmk/keyboards/ploopyco/trackball/rev1/readme.md
new file mode 100644
index 00000000..c0b02237
--- /dev/null
+++ b/qmk/keyboards/ploopyco/trackball/rev1/readme.md
@@ -0,0 +1,30 @@
+See the [main readme](../readme.md) for more details. 
+
+This is just the rev 1.001-1.004 trackball
+
+# Programming QMK-DFU onto the PloopyCo Trackball (Advanced)
+
+If you would rather have DFU on this board, you can use the QMK-DFU bootloader on the device.  To do so, you want to run: 
+
+    make ploopyco/trackball:default:production
+
+Once you have that, you'll need to [ISP Flash](https://docs.qmk.fm/#/isp_flashing_guide) the chip with the new "production" hex file created (or the production hex), and set the fuses:
+
+
+| Fuse     | Setting          |
+|----------|------------------|
+| Low      | `0xDF`           |
+| High     | `0xD8` or `0x98` |
+| Extended | `0xCB`           |
+
+Original (Caterina) settings: 
+
+| Fuse     | Setting          |
+|----------|------------------|
+| Low      | `0xFF`           |
+| High     | `0xD8`           |
+| Extended | `0xFE`           |
+
+If you're using QMK DFU, you'll also need to add `BOOTLOADER=qmk-dfu` to your keymap's rules.mk file, to ensure that the reboot/reset works correctly. Otherwise, it will jump right back into the firmware, like nothing happened.
+
+Additionally, once you've flashed the qmk-dfu bootloader onto your device, you will no longer be able to use the Arduino IDE to flash the board. You'll need to use the command line or QMK Toolbox to flash it. 
diff --git a/qmk/keyboards/ploopyco/trackball/rev1/rules.mk b/qmk/keyboards/ploopyco/trackball/rev1/rules.mk
index e69de29b..6ded83e7 100644
--- a/qmk/keyboards/ploopyco/trackball/rev1/rules.mk
+++ b/qmk/keyboards/ploopyco/trackball/rev1/rules.mk
@@ -0,0 +1,2 @@
+# Bootloader selection
+BOOTLOADER = caterina
diff --git a/qmk/keyboards/ploopyco/trackball/rev1_005/readme.md b/qmk/keyboards/ploopyco/trackball/rev1_005/readme.md
new file mode 100644
index 00000000..a923d165
--- /dev/null
+++ b/qmk/keyboards/ploopyco/trackball/rev1_005/readme.md
@@ -0,0 +1,3 @@
+See the [main readme](../readme.md) for more details. 
+
+This is just the rev 1.005+ trackball
diff --git a/qmk/keyboards/ploopyco/trackball/rev1_005/rules.mk b/qmk/keyboards/ploopyco/trackball/rev1_005/rules.mk
index e69de29b..bddd4e38 100644
--- a/qmk/keyboards/ploopyco/trackball/rev1_005/rules.mk
+++ b/qmk/keyboards/ploopyco/trackball/rev1_005/rules.mk
@@ -0,0 +1,2 @@
+# Bootloader selection
+BOOTLOADER = atmel-dfu
diff --git a/qmk/keyboards/ploopyco/trackball/rules.mk b/qmk/keyboards/ploopyco/trackball/rules.mk
index 9e252fbd..4ec870e6 100644
--- a/qmk/keyboards/ploopyco/trackball/rules.mk
+++ b/qmk/keyboards/ploopyco/trackball/rules.mk
@@ -4,9 +4,6 @@ MCU = atmega32u4
 # Processor frequency
 F_CPU = 8000000
 
-# Bootloader selection
-BOOTLOADER = caterina
-
 # Build Options
 #   change yes to no to disable
 #
diff --git a/qmk/keyboards/ploopyco/trackball/trackball.c b/qmk/keyboards/ploopyco/trackball/trackball.c
index 7b7b6802..94f28434 100644
--- a/qmk/keyboards/ploopyco/trackball/trackball.c
+++ b/qmk/keyboards/ploopyco/trackball/trackball.c
@@ -140,7 +140,7 @@ __attribute__((weak)) void process_mouse(report_mouse_t* mouse_report) {
         if (debug_mouse) dprintf("Cons] X: %d, Y: %d\n", data.dx, data.dy);
         // dprintf("Elapsed:%u, X: %f Y: %\n", i, pgm_read_byte(firmware_data+i));
 
-        process_mouse_user(mouse_report, data.dx, data.dy);
+        process_mouse_user(mouse_report, data.dx, -data.dy);
     }
 }
 
@@ -172,27 +172,9 @@ bool process_record_kb(uint16_t keycode, keyrecord_t* record) {
     if (IS_MOUSEKEY_BUTTON(keycode)) {
         report_mouse_t currentReport = pointing_device_get_report();
         if (record->event.pressed) {
-            if (keycode == KC_MS_BTN1)
-                currentReport.buttons |= MOUSE_BTN1;
-            else if (keycode == KC_MS_BTN2)
-                currentReport.buttons |= MOUSE_BTN2;
-            else if (keycode == KC_MS_BTN3)
-                currentReport.buttons |= MOUSE_BTN3;
-            else if (keycode == KC_MS_BTN4)
-                currentReport.buttons |= MOUSE_BTN4;
-            else if (keycode == KC_MS_BTN5)
-                currentReport.buttons |= MOUSE_BTN5;
+            currentReport.buttons |= 1 << (keycode - KC_MS_BTN1);
         } else {
-            if (keycode == KC_MS_BTN1)
-                currentReport.buttons &= ~MOUSE_BTN1;
-            else if (keycode == KC_MS_BTN2)
-                currentReport.buttons &= ~MOUSE_BTN2;
-            else if (keycode == KC_MS_BTN3)
-                currentReport.buttons &= ~MOUSE_BTN3;
-            else if (keycode == KC_MS_BTN4)
-                currentReport.buttons &= ~MOUSE_BTN4;
-            else if (keycode == KC_MS_BTN5)
-                currentReport.buttons &= ~MOUSE_BTN5;
+            currentReport.buttons &= ~(1 << (keycode - KC_MS_BTN1));
         }
         pointing_device_set_report(currentReport);
         pointing_device_send();
diff --git a/qmk/keyboards/plume/plume65/config.h b/qmk/keyboards/plume/plume65/config.h
index 2cd05e18..5035ee1e 100644
--- a/qmk/keyboards/plume/plume65/config.h
+++ b/qmk/keyboards/plume/plume65/config.h
@@ -1,4 +1,4 @@
-/* Copyright 2020 Dekkers
+/* Copyright 2020 Evy Dekkers
  *
  * 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
diff --git a/qmk/keyboards/plume/plume65/info.json b/qmk/keyboards/plume/plume65/info.json
index 941d911f..2f1a4f01 100644
--- a/qmk/keyboards/plume/plume65/info.json
+++ b/qmk/keyboards/plume/plume65/info.json
@@ -1,7 +1,7 @@
 {
     "keyboard_name": "Plume65", 
     "url": "", 
-    "maintainer": "maartenwut", 
+    "maintainer": "evyd13", 
     "width": 16, 
     "height": 5, 
     "layouts": {
diff --git a/qmk/keyboards/plume/plume65/keymaps/default/keymap.c b/qmk/keyboards/plume/plume65/keymaps/default/keymap.c
index 343c3b4f..241f7dda 100644
--- a/qmk/keyboards/plume/plume65/keymaps/default/keymap.c
+++ b/qmk/keyboards/plume/plume65/keymaps/default/keymap.c
@@ -1,4 +1,4 @@
-/* Copyright 2020 Dekkers
+/* Copyright 2020 Evy Dekkers
  *
  * 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
diff --git a/qmk/keyboards/plume/plume65/keymaps/via/keymap.c b/qmk/keyboards/plume/plume65/keymaps/via/keymap.c
index ed8e921c..023ce971 100644
--- a/qmk/keyboards/plume/plume65/keymaps/via/keymap.c
+++ b/qmk/keyboards/plume/plume65/keymaps/via/keymap.c
@@ -1,4 +1,4 @@
-/* Copyright 2020 Dekkers
+/* Copyright 2020 Evy Dekkers
  *
  * 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
diff --git a/qmk/keyboards/plume/plume65/plume65.c b/qmk/keyboards/plume/plume65/plume65.c
index d59f2289..991a989a 100644
--- a/qmk/keyboards/plume/plume65/plume65.c
+++ b/qmk/keyboards/plume/plume65/plume65.c
@@ -1,4 +1,4 @@
-/* Copyright 2020 Dekkers
+/* Copyright 2020 Evy Dekkers
  *
  * 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
diff --git a/qmk/keyboards/plume/plume65/plume65.h b/qmk/keyboards/plume/plume65/plume65.h
index fa169a8b..09f41d76 100644
--- a/qmk/keyboards/plume/plume65/plume65.h
+++ b/qmk/keyboards/plume/plume65/plume65.h
@@ -1,4 +1,4 @@
-/* Copyright 2020 Dekkers
+/* Copyright 2020 Evy Dekkers
  *
  * 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
diff --git a/qmk/keyboards/plume/plume65/readme.md b/qmk/keyboards/plume/plume65/readme.md
index 828477ea..b38d16f6 100644
--- a/qmk/keyboards/plume/plume65/readme.md
+++ b/qmk/keyboards/plume/plume65/readme.md
@@ -1,7 +1,7 @@
 # Plume65
 
 ## Support
-* Keyboard Maintainer: [maartenwut](https://github.com/maartenwut)
+* Keyboard Maintainer: [Evyd13](https://github.com/evyd13)
 * Hardware Supported: Plume65
 * Hardware Availability: N/A
 
diff --git a/qmk/keyboards/pos78/config.h b/qmk/keyboards/pos78/config.h
new file mode 100644
index 00000000..c307c6f5
--- /dev/null
+++ b/qmk/keyboards/pos78/config.h
@@ -0,0 +1,110 @@
+/*
+Copyright 2020 smssmssms
+
+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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID    0xFEED
+#define PRODUCT_ID   0x7878
+#define DEVICE_VER   0x0001
+#define MANUFACTURER smssmssms
+#define PRODUCT      POS78
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 13
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+ */
+#define MATRIX_ROW_PINS { F7, F6, F5, F4, F1, F0 }
+#define MATRIX_COL_PINS { C7, D6, B7 ,B6, B5, E6, C6, D0, D1, D3, D2,  B1, B2 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION ROW2COL
+
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+#define SOFT_SERIAL_PIN D0  // or D1, D2, D3, E6
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+//#define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+/* Bootmagic Lite key configuration */
+//#define BOOTMAGIC_LITE_ROW 0
+//#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/pos78/info.json b/qmk/keyboards/pos78/info.json
new file mode 100644
index 00000000..cbe894fd
--- /dev/null
+++ b/qmk/keyboards/pos78/info.json
@@ -0,0 +1,19 @@
+{
+    "keyboard_name": "pos78",
+    "url": "https://github.com/smssmssms/pos78.git",
+    "maintainer": "smssmssms",
+    "width": 13,
+    "height": 6,
+    "layouts": {
+        "LAYOUT_ortho_6x13": {
+            "layout": [
+				{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0},
+				{"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":3, "y":1}, {"x":4, "y":1}, {"x":5, "y":1}, {"x":6, "y":1}, {"x":7, "y":1}, {"x":8, "y":1}, {"x":9, "y":1}, {"x":10, "y":1}, {"x":11, "y":1}, {"x":12, "y":1},
+				{"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":8, "y":2}, {"x":9, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2},
+				{"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}, {"x":3, "y":3}, {"x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"x":7, "y":3}, {"x":8, "y":3}, {"x":9, "y":3}, {"x":10, "y":3}, {"x":11, "y":3}, {"x":12, "y":3},
+				{"x":0, "y":4}, {"x":1, "y":4}, {"x":2, "y":4}, {"x":3, "y":4}, {"x":4, "y":4}, {"x":5, "y":4}, {"x":6, "y":4}, {"x":7, "y":4}, {"x":8, "y":4}, {"x":9, "y":4}, {"x":10, "y":4}, {"x":11, "y":4}, {"x":12, "y":4},
+				{"x":0, "y":5}, {"x":1, "y":5}, {"x":2, "y":5}, {"x":3, "y":5}, {"x":4, "y":5}, {"x":5, "y":5}, {"x":6, "y":5}, {"x":7, "y":5}, {"x":8, "y":5}, {"x":9, "y":5}, {"x":10, "y":5}, {"x":11, "y":5}, {"x":12, "y":5}
+            ]
+        }
+    }
+}
diff --git a/qmk/keyboards/pos78/keymaps/default/keymap.c b/qmk/keyboards/pos78/keymaps/default/keymap.c
new file mode 100644
index 00000000..9d4b4300
--- /dev/null
+++ b/qmk/keyboards/pos78/keymaps/default/keymap.c
@@ -0,0 +1,45 @@
+/* Copyright 2020 smssmssms
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+#include "keymap_uk.h"
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _FN
+};
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [_BASE] = LAYOUT_ortho_6x13(
+        KC_ESC,     KC_F1,     KC_F2,     KC_F3,     KC_F4,     KC_F5,     KC_F6,     KC_F7,     KC_F8,     KC_F9,    KC_F10,   KC_BSPC, KC_DEL,
+        UK_GRV,     UK_1,      UK_2,      UK_3,      UK_4,      UK_5,      UK_6,      UK_7,      UK_8,      UK_9,     UK_0,     UK_MINS, UK_EQL,
+        KC_TAB,     KC_Q,      KC_W,      KC_E,      KC_R,      KC_T,      KC_Y,      KC_U,      KC_I,      KC_O,     KC_P,     UK_LBRC, UK_RBRC,
+        KC_CAPS,    KC_A,      KC_S,      KC_D,      KC_F,      KC_G,      KC_H,      KC_J,      KC_K,      KC_L,     UK_SCLN,  UK_QUOT, UK_HASH,
+        KC_LSFT,    KC_Z,      KC_X,      KC_C,      KC_V,      KC_B,      KC_N,      KC_M,      UK_COMM,   UK_DOT,   UK_SLSH,  UK_BSLS, KC_RSFT,
+        KC_LCTL,    KC_LGUI,   KC_LALT,   XXXXXXX,   KC_SPC,    TG(_FN),     KC_MUTE,   KC_ENT,    KC_ALGR,   KC_RGUI,  KC_MENU,  KC_HOME, KC_END
+    ),
+    
+    [_FN] = LAYOUT_ortho_6x13(
+        _______,    _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,  _______,  _______, _______,
+        KC_SLEP,    _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,  _______,  KC_F11,  KC_F12,
+        _______,    XXXXXXX,   KC_WAKE,   KC_MYCM,   XXXXXXX,   XXXXXXX,   KC_AGAIN,  KC_VOLU,   KC_INS,    KC_PWR,   KC_PSCR,  XXXXXXX, KC_PGUP,
+        _______,    XXXXXXX,   XXXXXXX,   XXXXXXX,   KC_FIND,   XXXXXXX,   KC_HELP,   KC_VOLD,   KC_CALC,   KC_BRIU,  XXXXXXX,  KC_UP,   KC_PGDN,
+        _______,    KC_UNDO,   KC_CUT,    KC_COPY,   KC_PASTE,  RESET,     XXXXXXX,   KC_MAIL,   UK_COMM,   KC_BRID,  KC_LEFT,  KC_DOWN, KC_RIGHT,
+        _______,    _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,  _______,  _______, _______
+    )
+};
diff --git a/qmk/keyboards/pos78/keymaps/default/readme.md b/qmk/keyboards/pos78/keymaps/default/readme.md
new file mode 100644
index 00000000..c313876f
--- /dev/null
+++ b/qmk/keyboards/pos78/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default (UK) keymap for pos78
diff --git a/qmk/keyboards/pos78/pos78.c b/qmk/keyboards/pos78/pos78.c
new file mode 100644
index 00000000..f2e98aba
--- /dev/null
+++ b/qmk/keyboards/pos78/pos78.c
@@ -0,0 +1,17 @@
+/* Copyright 2020 smssmssms
+ *
+ * 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 "pos78.h"
diff --git a/qmk/keyboards/pos78/pos78.h b/qmk/keyboards/pos78/pos78.h
new file mode 100644
index 00000000..2d5681ad
--- /dev/null
+++ b/qmk/keyboards/pos78/pos78.h
@@ -0,0 +1,43 @@
+/* Copyright 2020 smssmssms
+ *
+ * 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 is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT_ortho_6x13( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12, \
+    k13, k14, k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25, \
+    k26, k27, k28, k29, k30, k31, k32, k33, k34, k35, k36, k37, k38, \
+    k39, k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k50, k51, \
+    k52, k53, k54, k55, k56, k57, k58, k59, k60, k61, k62, k63, k64, \
+    k65, k66, k67, k68, k69, k70, k71, k72, k73, k74, k75, k76, k77  \
+) { \
+    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k10, k11, k12}, \
+    {k13, k14, k15, k16, k17, k18, k19, k20, k21, k22, k23, k24, k25}, \
+    {k26, k27, k28, k29, k30, k31, k32, k33, k34, k35, k36, k37, k38}, \
+    {k39, k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k50, k51}, \
+    {k52, k53, k54, k55, k56, k57, k58, k59, k60, k61, k62, k63, k64}, \
+    {k65, k66, k67, k68, k69, k70, k71, k72, k73, k74, k75, k76, k77}  \
+}
diff --git a/qmk/keyboards/pos78/readme.md b/qmk/keyboards/pos78/readme.md
new file mode 100644
index 00000000..3a85518a
--- /dev/null
+++ b/qmk/keyboards/pos78/readme.md
@@ -0,0 +1,17 @@
+# pos78
+
+![](https://i.imgur.com/ml5cPDS.png)
+
+* Keyboard Maintainer: [smssmssms](https://github.com/smssmssms)
+* Hardware Supported: ATMEGA 32U4 (Adafruit Itsy Bitsy 5v) 
+* Hardware Availability: 1980-90's version of the [Partner Tech Corp KB-78](https://www.partner.com.tw/wp-content/uploads/2019/09/KB-78-G-78-1-190911.pdf); a 78 key Point-Of-Sale ortholinear keyboard conversion
+  
+Make example for this keyboard (after setting up your build environment):
+
+    make pos78:default
+
+Flashing example for this keyboard:
+
+    make pos78:default:flash
+
+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).
diff --git a/qmk/keyboards/pos78/rules.mk b/qmk/keyboards/pos78/rules.mk
new file mode 100644
index 00000000..5c0d8f30
--- /dev/null
+++ b/qmk/keyboards/pos78/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+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
+# 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
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
diff --git a/qmk/keyboards/preonic/keymaps/bghull/keymap.c b/qmk/keyboards/preonic/keymaps/bghull/keymap.c
new file mode 100644
index 00000000..9a3ca0af
--- /dev/null
+++ b/qmk/keyboards/preonic/keymaps/bghull/keymap.c
@@ -0,0 +1,88 @@
+/* Copyright 2015-2017 Jack Humbert
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+#include "keymap_steno.h"
+
+enum preonic_layers {
+  _QWERTY,
+  _STENO,
+  _NUMPAD
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/* Qwerty
+ * ,-----------------------------------------------------------------------------------.
+ * |      |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | '  " |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Del  |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * |NUMPAD|   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |Enter |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |  Up  | /  ? |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |Es/Ctl| FUNC | STENO| Alt  |    Bspc     |    Space    | Ctrl | Left | Down | Right|
+ * `-----------------------------------------------------------------------------------'
+ */
+[_QWERTY] = LAYOUT_preonic_grid(
+  _______ ,      KC_1,    KC_2,       KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_QUOT,
+  KC_TAB ,       KC_Q,    KC_W,       KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_DEL,
+  MO(_NUMPAD),   KC_A,    KC_S,       KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
+  KC_LSFT ,      KC_Z,    KC_X,       KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_UP,   KC_SLSH,
+  LCTL_T(KC_ESC),KC_LGUI, DF(_STENO), KC_LALT, _______, KC_BSPC, _______, KC_SPC,  KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT
+),
+
+
+/* Steno
+ * ,-----------------------------------------------------------------------------------.
+ * |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |   #  |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * |  FN  |   S  |   T  |   P  |   H  |   *  |   *  |   F  |   P  |   L  |   T  |   D  |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * |      |   S  |   K  |   W  |   R  |   *  |   *  |   R  |   B  |   G  |   S  |   Z  |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |QWERTY|   A  |      O      |      E      |   U  |  PWR | RES1 | RES2 |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_STENO] = LAYOUT_preonic_grid(
+  _______, _______, _______, _______,  _______, _______, _______, _______,  _______, _______, _______, _______,
+  STN_N1,  STN_N2,  STN_N3,  STN_N4,  STN_N5,  STN_N6,  STN_N7,  STN_N8,  STN_N9,  STN_NA,  STN_NB,  STN_NC ,
+  STN_FN,  STN_S1,  STN_TL,  STN_PL,  STN_HL,  STN_ST1, STN_ST3, STN_FR,  STN_PR,  STN_LR,  STN_TR,  STN_DR ,
+  XXXXXXX, STN_S2,  STN_KL,  STN_WL,  STN_RL,  STN_ST2, STN_ST4, STN_RR,  STN_BR,  STN_GR,  STN_SR,  STN_ZR ,
+  XXXXXXX, XXXXXXX, DF(_QWERTY),STN_A,XXXXXXX, STN_O,   XXXXXXX, STN_E,   STN_U,   STN_PWR, STN_RE1, STN_RE2
+),
+
+/* 
+ * ,-----------------------------------------------------------------------------------.
+ * |      |RClick|  MsU |LClick|WheelU|   (  |  )   |   7  |   8  |   9  |   0  |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |  MsL |  MsD |  MsR |WheelD|  [{  |  ]}  |   4  |   5  |   6  |   +  |  -_  |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      | Mute | VolD | VolU |  `~  |   _  |  =   |   1  |   2  |   3  | PgUp | \  | |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      | RESET|      |      |             |      |   .  | Home | PgDn | End  |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_NUMPAD] = LAYOUT_preonic_grid(
+  _______, _______,_______, _______,  _______, _______, _______, _______,  _______, _______, _______, _______,
+  _______, KC_BTN2, KC_MS_U, KC_BTN1,  KC_WH_U, KC_LPRN, KC_RPRN,    KC_7,     KC_8,    KC_9,    KC_0, _______,
+  _______, KC_MS_L, KC_MS_D, KC_MS_R,  KC_WH_D, KC_LBRC, KC_RBRC,    KC_4,     KC_5,    KC_6, KC_PPLS, KC_MINS,
+  _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_GRAVE, KC_UNDS,  KC_EQL,    KC_1,     KC_2,    KC_3, KC_PGUP, KC_BSLS,
+  _______, XXXXXXX, RESET, _______,  _______, _______, _______, _______,  KC_PDOT, KC_HOME, KC_PGDN, KC_END
+)
+
+};
diff --git a/qmk/keyboards/preonic/keymaps/bghull/rules.mk b/qmk/keyboards/preonic/keymaps/bghull/rules.mk
new file mode 100644
index 00000000..9711c485
--- /dev/null
+++ b/qmk/keyboards/preonic/keymaps/bghull/rules.mk
@@ -0,0 +1,5 @@
+SRC += muse.c
+AUTO_SHIFT_ENABLE = yes
+MOUSEKEY_ENABLE = yes
+STENO_ENABLE = yes
+AUDIO_ENABLE = no
\ No newline at end of file
diff --git a/qmk/keyboards/preonic/keymaps/pcurt854/config.h b/qmk/keyboards/preonic/keymaps/pcurt854/config.h
new file mode 100644
index 00000000..8ac0b84d
--- /dev/null
+++ b/qmk/keyboards/preonic/keymaps/pcurt854/config.h
@@ -0,0 +1,74 @@
+/* Copyright 2020 Pete Curt
+ *
+ * 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
+
+#define TAPPING_TOGGLE 2
+
+
+#define LEADER_PER_KEY_TIMING
+#define LEADER_TIMEOUT 350
+
+
+#define RGBLIGHT_LAYERS
+
+#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
+
+#define RGBLIGHT_SLEEP
+// so rgb sleeps when the system goes to sleep
+
+
+
+
+#ifdef AUDIO_ENABLE
+    #define STARTUP_SONG SONG(CAMPANELLA)
+    // #define STARTUP_SONG SONG(FANTASIE_IMPROMPTU)
+    // #define STARTUP_SONG SONG(PREONIC_SOUND)
+    // #define STARTUP_SONG SONG(NO_SOUND)
+
+    // DEFAULT_LAYER_SONGS are used in set_single_persistent_default_layer in quantum/quantum.c
+    #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND), \
+                                  SONG(COLEMAK_SOUND), \
+                                  SONG(DVORAK_SOUND) \
+                                }
+#endif
+
+#define MUSIC_MASK (keycode != KC_NO)
+
+
+/*
+ * MIDI options
+ */
+
+/* Prevent use of disabled MIDI features in the keymap */
+//#define MIDI_ENABLE_STRICT 1
+
+/* enable basic MIDI features:
+   - MIDI notes can be sent when in Music mode is on
+*/
+
+#define MIDI_BASIC
+
+/* enable advanced MIDI features:
+   - MIDI notes can be added to the keymap
+   - Octave shift and transpose
+   - Virtual sustain, portamento, and modulation wheel
+   - etc.
+*/
+//#define MIDI_ADVANCED
+
+/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
+//#define MIDI_TONE_KEYCODE_OCTAVES 2
diff --git a/qmk/keyboards/preonic/keymaps/pcurt854/keymap.c b/qmk/keyboards/preonic/keymaps/pcurt854/keymap.c
new file mode 100644
index 00000000..4620f323
--- /dev/null
+++ b/qmk/keyboards/preonic/keymaps/pcurt854/keymap.c
@@ -0,0 +1,489 @@
+/* Copyright 2020 Pete Curt
+ * Based on code by Jack Humbert
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+#include "muse.h"
+
+enum preonic_layers {
+  _QWERTY,	// 0
+  _COLEMAK,	// 1
+  _DVORAK,	// 2
+  _NUMPAD,	// 3
+  _SYMBOL,	// 4
+  _BRACKET,	// 5
+  _ADJUST	// 6
+};
+
+enum preonic_keycodes {
+  QWERTY = SAFE_RANGE,
+  COLEMAK,
+  DVORAK,
+  BACKLIT,
+  ABKPAIR,
+  RBKPAIR,
+  SBKPAIR,
+  CBKPAIR
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/* Qwerty layer 0
+ * ,-----------------------------------------------------------------------------------.
+ * |      |      |      |      |      |      |      |      |      |      |      |   Del|
+ * | Esc  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
+ * | `~   |      |      |      |      |      |      |      |      |      |      |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |      |      |      |      |      |      |   Dnc|
+ * | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Lead |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * |      |      |      |    {}|      |      |      |    <>|      |      |      |      |
+ * | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
+ * | LCtl |      |      |      |      |      |      |      |      |      |      |      |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * |      |    []|    ()|    ap|      |      |      |      |      |      |      |      |
+ * |osl(5)|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |  Up  |osl(6)|
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | osm  | RCtl | Opt  | Cmd  |osl(4)| Entr | Spc  | tt(3)|   /  | Left | Down | Rght |
+ * | Lsft |      |      |      |      |      |      |      |      |      |      |      |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_QWERTY] = LAYOUT_preonic_grid(
+  KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
+  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LEAD,
+  LCTL_T(KC_ESC),
+           KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+  OSL(_BRACKET),
+           KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_UP,   OSL(_ADJUST),
+  OSM(MOD_LSFT),
+           KC_RCTL, KC_LOPT, KC_LCMD, OSL(_SYMBOL),
+                                               KC_ENT,  KC_SPC,  TT(_NUMPAD),
+                                                                          KC_SLSH, KC_LEFT, KC_DOWN, KC_RGHT
+),
+
+/* Colemak layer 1
+ * ,-----------------------------------------------------------------------------------.
+ * |      |      |      |      |      |      |      |      |      |      |      |   Del|
+ * | Esc  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
+ * | `~   |      |      |      |      |      |      |      |      |      |      |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |      |    <>|      |      |      |      |   Dnc|
+ * | Tab  |   Q  |   W  |   F  |   P  |   G  |   J  |   L  |   U  |   Y  |   ;  | Lead |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * |      |      |      |      |      |    {}|      |      |      |      |      |      |
+ * | Esc  |   A  |   R  |   S  |   T  |   D  |   H  |   N  |   E  |   I  |   O  |  "   |
+ * | LCtl |      |      |      |      |      |      |      |      |      |      |      |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * |      |    []|    ()|    ap|      |      |      |      |      |      |      |      |
+ * |osl(5)|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |  Up  |osl(6)|
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | osm  | RCtl | Opt  | Cmd  |osl(4)| Entr | Spc  | tt(3)|   /  | Left | Down | Rght |
+ * | Lsft |      |      |      |      |      |      |      |      |      |      |      |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_COLEMAK] = LAYOUT_preonic_grid(
+  KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
+  KC_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_LEAD,
+  LCTL_T(KC_ESC),
+           KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
+  OSL(_BRACKET),
+           KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_UP,   OSL(_ADJUST),
+  OSM(MOD_LSFT),
+           KC_RCTL, KC_LOPT, KC_LCMD, OSL(_SYMBOL),
+                                               KC_ENT,  KC_SPC,  TT(_NUMPAD),
+                                                                          KC_SLSH, KC_LEFT, KC_DOWN, KC_RGHT
+),
+
+/* Dvorak layer 2
+ * ,-----------------------------------------------------------------------------------.
+ * |      |      |      |      |      |      |      |      |      |      |      |   Del|
+ * | Esc  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
+ * | `~   |      |      |      |      |      |      |      |      |      |      |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |      |      |      |      |    ap|      |      |   Dnc|
+ * | Tab  |   "  |   ,  |   .  |   P  |   Y  |   F  |   G  |   C  |   R  |   L  | Lead |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * |      |      |      |      |      |      |    {}|      |      |      |      |      |
+ * | Esc  |   A  |   O  |   E  |   U  |   I  |   D  |   H  |   T  |   N  |   S  |  /   |
+ * | LCtl |      |      |      |      |      |      |      |      |      |      |      |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * |      |      |    <>|      |    ()|      |      |      |      |    []|      |      |
+ * |osl(5)|   Q  |   J  |   K  |   X  |   B  |   M  |   W  |   V  |   Z  |  Up  |osl(6)|
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | osm  | RCtl | Opt  | Cmd  |osl(4)| Entr | Spc  | tt(3)|   :  | Left | Down | Rght |
+ * | Lsft |      |      |      |      |      |      |      |      |      |      |      |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_DVORAK] = LAYOUT_preonic_grid(
+  KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
+  KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_LEAD,
+  LCTL_T(KC_ESC),
+           KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
+  OSL(_BRACKET),
+           KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_UP,   OSL(_ADJUST),
+  OSM(MOD_LSFT),
+           KC_RCTL, KC_LOPT, KC_LCMD, OSL(_SYMBOL),
+                                               KC_ENT,  KC_SPC,  TT(_NUMPAD),
+                                                                          KC_COLN, KC_LEFT, KC_DOWN, KC_RGHT
+),
+
+/* Numpad layer 3
+ * ,-----------------------------------------------------------------------------------.
+ * | ____ |   1  |   2  |   3  |   4  |   5  |  =+  |   7  |   8  |   9  |   ^  | ____ |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * | ____ |   6  |   7  |   8  |   9  |   0  |  -_  |   4  |   5  |   6  |   %  | ____ |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * | ____ |   1  |   2  |   3  |   4  |   5  |  *   |   1  |   2  |   3  | ____ | ____ |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * | ____ |   6  |   7  |   8  |   9  |   0  |  /   |   0  | ____ | ____ | PgUp | ____ |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | ____ | ____ | ____ | ____ | ____ | ____ | ____ | tg(3)| ____ | Home | PgDn | End  |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_NUMPAD] = LAYOUT_preonic_grid(
+  _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_EQL,  KC_7,    KC_8,    KC_9,    KC_CIRC, _______,
+  _______, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_4,    KC_5,    KC_6,    KC_PERC, _______,
+  _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_ASTR, KC_1,    KC_2,    KC_3,    _______, _______,
+  _______, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_SLSH, KC_0,    _______, _______, KC_PGUP, _______,
+  _______, _______, _______, _______, _______, _______, _______, TG(_NUMPAD),
+                                                                          _______, KC_HOME, KC_PGDN, KC_END
+),
+
+/* Symbol layer 4
+ * ,-----------------------------------------------------------------------------------.
+ * |      |  F1  |  F2  |  F3  |  F4  |  F5  |  F6  |  F7  |  F8  |  F9  |  F10 | ____ |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | ____ |      |      |   !  |   $  |   ~  |      |   _  |   |  |      |   %  | ____ |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * | ____ |   @  |   *  |   &  |      |   `  |   #  |   -  |      |   +  |      |      |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * |      |      |      |   ^  |      |   \  |      |   =  |      |      | PgUp |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | ____ | ____ | ____ | ____ | tg(4)| ____ | ____ |      |      | Home | PgDn | End  |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_SYMBOL] = LAYOUT_preonic_grid(
+  XXXXXXX, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  _______,
+  _______, XXXXXXX, XXXXXXX, KC_EXLM, KC_DLR,  KC_TILD, XXXXXXX, KC_UNDS, KC_PIPE, XXXXXXX, KC_PERC, _______,
+  _______, KC_AT,   KC_ASTR, KC_AMPR, XXXXXXX, KC_GRV,  KC_HASH, KC_MINS, XXXXXXX, KC_PLUS, XXXXXXX, XXXXXXX,
+  XXXXXXX, XXXXXXX, XXXXXXX, KC_CIRC, XXXXXXX, KC_BSLS, XXXXXXX, KC_EQL,  XXXXXXX, XXXXXXX, KC_PGUP, XXXXXXX,
+  _______, _______, _______, _______, TG(_SYMBOL), _______, _______, XXXXXXX, XXXXXXX, KC_HOME, KC_PGDN, KC_END
+),
+
+/* Bracket layer 5
+ * ,-----------------------------------------------------------------------------------.
+ * |      |plain |breath|      |      |      |      |    < | <|>  | >    |      | ____ |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * |      |snake |knight|      | rgb  | saT+ |      |    ( | (|)  | )    |      | ____ |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * |      |rainbw|gradnt|      |      | mod+ | Hue+ |    [ | [|]  | ]    |      |      |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * | tg(5)|swirl | Xmas | test |      | Brt+ |      |    { | {|}  | }    |      |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | ____ | ____ | ____ | ____ |      |      |      |      |      |      |      |      |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_BRACKET] = LAYOUT_preonic_grid(
+  XXXXXXX, RGB_M_P,  RGB_M_B, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_LABK, ABKPAIR, KC_RABK, XXXXXXX, _______,
+  XXXXXXX, RGB_M_SN, RGB_M_K, XXXXXXX, RGB_TOG, RGB_SAI, XXXXXXX, KC_LPRN, RBKPAIR, KC_RPRN, XXXXXXX, _______,
+  XXXXXXX, RGB_M_R,  RGB_M_G, XXXXXXX, XXXXXXX, RGB_MOD, RGB_HUI, KC_LBRC, SBKPAIR, KC_RBRC, XXXXXXX, XXXXXXX,
+  TG(_BRACKET),
+           RGB_M_SW, RGB_M_X, RGB_M_T, XXXXXXX, RGB_VAI, XXXXXXX, KC_LCBR, CBKPAIR, KC_RCBR, XXXXXXX, XXXXXXX,
+  _______, _______,  _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
+),
+
+/* Adjust layer 6
+ *
+ * The control sequences are highly personal.  Please change to adapt to your own system.
+ *
+ * ,-----------------------------------------------------------------------------------.
+ * |      | F11  | F12  | F13  | F14  | F15  | F16  | F17  | F18  | F19  | F20  |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |Qwerty|Colemk|Dvorak|      |      |      |      |      |      |Print |RESET |
+ * |      |      |      |      |      |      |      |      |      |      |screen|RESET |
+ * |------+------+------+------+------+-------------+------+------+------+------+------|
+ * |      |      |Sleep |show  |      |      |finder|mv win|      |Lock  |      |      |
+ * |      |      |      |Dsktp |      |      |Hddn  |clkw  |      |screen|      |      |
+ * |------+------+------+------+------+------|------+------+------+------+------+------|
+ * |      |      |      | Caps |Virus |      |      | Mute | vol+ |      | dsp+ | tg(6)|
+ * |      |      |      |      |scan  |      |      |      |      |      |      |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | ____ | ____ | ____ | ____ |      |      |      |      | vol- |      | dsp- |      |
+ * |      |      |      |      |      |      |      |      |      |      |      |      |
+ * `-----------------------------------------------------------------------------------'
+ */
+[_ADJUST] = LAYOUT_preonic_grid(
+  XXXXXXX, KC_F11,  KC_F12,  KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  XXXXXXX,
+  XXXXXXX, QWERTY,  COLEMAK, DVORAK,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, SCMD(KC_5), RESET,
+  XXXXXXX, XXXXXXX, C(LCMD(KC_PAUSE)),
+                             LCMD(KC_F4),
+                                      XXXXXXX, XXXXXXX, SCMD(KC_DOT),
+                                                                 LCA(KC_J), XXXXXXX, C(LCMD(KC_Q)), XXXXXXX, XXXXXXX,
+  XXXXXXX, XXXXXXX, XXXXXXX, KC_CAPS, SCMD(KC_V),
+                                               XXXXXXX, XXXXXXX, KC__MUTE, KC__VOLUP,   XXXXXXX, LCAG(KC_UP), TG(_ADJUST),
+  _______, _______, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,  KC__VOLDOWN, XXXXXXX, LCAG(KC_DOWN), XXXXXXX
+)
+
+
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  switch (keycode) {
+        case QWERTY:
+          if (record->event.pressed) {
+            set_single_persistent_default_layer(_QWERTY);
+          }
+          return false;
+          break;
+        case COLEMAK:
+          if (record->event.pressed) {
+            set_single_persistent_default_layer(_COLEMAK);
+          }
+          return false;
+          break;
+        case DVORAK:
+          if (record->event.pressed) {
+            set_single_persistent_default_layer(_DVORAK);
+          }
+          return false;
+          break;
+        case BACKLIT:
+          if (record->event.pressed) {
+            register_code(KC_RSFT);
+            #ifdef BACKLIGHT_ENABLE
+              backlight_step();
+            #endif
+            #ifdef __AVR__
+            writePinLow(E6);
+            #endif
+          } else {
+            unregister_code(KC_RSFT);
+            #ifdef __AVR__
+            writePinHigh(E6);
+            #endif
+          }
+          return false;
+          break;
+        case ABKPAIR:
+          if (record->event.pressed) {
+              SEND_STRING("<>"SS_TAP(X_LEFT));
+          }
+          break;
+        case RBKPAIR:
+          if (record->event.pressed) {
+              SEND_STRING("()"SS_TAP(X_LEFT));
+          }
+          break;
+        case SBKPAIR:
+          if (record->event.pressed) {
+              SEND_STRING("[]"SS_TAP(X_LEFT));
+          }
+          break;
+        case CBKPAIR:
+          if (record->event.pressed) {
+              SEND_STRING("{}"SS_TAP(X_LEFT));
+          }
+          break;
+      }
+    return true;
+};
+
+/*
+  Preonic LEDs visible from the top:
+    6 5 4 3
+    7 8 1 2
+
+  The two numbers: starting LED number, number of LEDs
+*/
+const rgblight_segment_t PROGMEM my_numpad_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {3, 3, HSV_ORANGE}
+);
+const rgblight_segment_t PROGMEM my_symbol_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {3, 3, HSV_MAGENTA}
+);
+const rgblight_segment_t PROGMEM my_bracket_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {3, 3, HSV_CYAN}
+);
+const rgblight_segment_t PROGMEM my_adjust_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {3, 3, HSV_GREEN}
+);
+const rgblight_segment_t PROGMEM my_capslock_layer[] = RGBLIGHT_LAYER_SEGMENTS(
+    {6, 2, HSV_PINK}
+);
+
+const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
+    my_numpad_layer,
+    my_symbol_layer,
+    my_bracket_layer,
+    my_adjust_layer,
+    my_capslock_layer
+);
+
+void keyboard_post_init_user(void) {
+    rgblight_layers = my_rgb_layers;
+}
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+    for (int i = 0; i <= _ADJUST - _NUMPAD; i++) {
+        rgblight_set_layer_state(i, false);
+    }
+    int highest_layer = get_highest_layer(state);
+    if (highest_layer >= _NUMPAD && highest_layer <= _ADJUST) {
+        rgblight_set_layer_state(highest_layer-_NUMPAD, true);
+    }
+
+    return state;
+}
+
+bool led_update_user(led_t led_state) {
+    rgblight_set_layer_state(_ADJUST - _NUMPAD + 1, led_state.caps_lock);
+
+    return true;
+}
+
+bool did_leader_succeed;
+#ifdef AUDIO_ENABLE
+//float leader_start_song[][2] = SONG(CHROMATIC_SOUND);
+float leader_start_song[][2] = SONG(NO_SOUND);
+float leader_succeed_song[][2] = SONG(STARTUP_SOUND);
+//float leader_fail_song[][2] = SONG(GOODBYE_SOUND);
+float leader_fail_song[][2] = SONG(NO_SOUND);
+#endif
+LEADER_EXTERNS();
+
+void matrix_scan_user(void) {
+  LEADER_DICTIONARY() {
+    did_leader_succeed = leading = false;
+
+    // tap dance
+    // sort by first key
+
+    SEQ_ONE_KEY(KC_C) {
+      SEND_STRING(SS_TAP(X_CAPS));
+      did_leader_succeed = true;
+    }
+
+    SEQ_ONE_KEY(KC_BSPC) {
+      SEND_STRING(SS_TAP(X_DEL));
+      did_leader_succeed = true;
+    }
+
+    SEQ_ONE_KEY(KC_D) {
+      SEND_STRING("{}"SS_TAP(X_LEFT));
+      did_leader_succeed = true;
+    }
+    SEQ_TWO_KEYS(KC_D, KC_B) {
+      SEND_STRING("Dear Brother");
+      did_leader_succeed = true;
+    }
+    SEQ_THREE_KEYS(KC_D, KC_B, KC_S) {
+      SEND_STRING("Dear Brothers and Sister");
+      did_leader_succeed = true;
+    }
+    SEQ_TWO_KEYS(KC_D, KC_D) {
+      SEND_STRING("{");
+      did_leader_succeed = true;
+    }
+    SEQ_THREE_KEYS(KC_D, KC_D, KC_D) {
+      SEND_STRING("}");
+      did_leader_succeed = true;
+    }
+    SEQ_TWO_KEYS(KC_D, KC_S) {
+      SEND_STRING("Dear Sister");
+      did_leader_succeed = true;
+    }
+
+    // Html Tags
+    SEQ_TWO_KEYS(KC_H, KC_T) {
+      SEND_STRING("<></>"SS_TAP(X_LEFT));
+      did_leader_succeed = true;
+    }
+
+    SEQ_TWO_KEYS(KC_I, KC_C) {
+      SEND_STRING("In Christ,");
+      did_leader_succeed = true;
+    }
+
+    SEQ_ONE_KEY(KC_J) {
+      SEND_STRING("<>"SS_TAP(X_LEFT));
+      did_leader_succeed = true;
+    }
+    SEQ_TWO_KEYS(KC_J, KC_J) {
+      SEND_STRING("<");
+      did_leader_succeed = true;
+    }
+    SEQ_THREE_KEYS(KC_J, KC_J, KC_J) {
+      SEND_STRING(">");
+      did_leader_succeed = true;
+    }
+
+    SEQ_TWO_KEYS(KC_T, KC_S) {
+      SEND_STRING("Thanks!");
+      did_leader_succeed = true;
+    }
+    SEQ_TWO_KEYS(KC_T, KC_Y) {
+      SEND_STRING("Thank you!");
+      did_leader_succeed = true;
+    }
+
+    SEQ_ONE_KEY(KC_X) {
+      SEND_STRING("()"SS_TAP(X_LEFT));
+      did_leader_succeed = true;
+    }
+    SEQ_TWO_KEYS(KC_X, KC_X) {
+      SEND_STRING("(");
+      did_leader_succeed = true;
+    }
+    SEQ_THREE_KEYS(KC_X, KC_X, KC_X) {
+      SEND_STRING(")");
+      did_leader_succeed = true;
+    }
+
+    SEQ_ONE_KEY(KC_Z) {
+      SEND_STRING("[]"SS_TAP(X_LEFT));
+      did_leader_succeed = true;
+    }
+    SEQ_TWO_KEYS(KC_Z, KC_Z) {
+      SEND_STRING("[");
+      did_leader_succeed = true;
+    }
+    SEQ_THREE_KEYS(KC_Z, KC_Z, KC_Z) {
+      SEND_STRING("]");
+      did_leader_succeed = true;
+    }
+
+    leader_end();
+  }
+}
+
+void leader_start(void) {
+#ifdef AUDIO_ENABLE
+    PLAY_SONG(leader_start_song);
+#endif
+}
+
+void leader_end(void) {
+  if (did_leader_succeed) {
+#ifdef AUDIO_ENABLE
+    PLAY_SONG(leader_succeed_song);
+#endif
+  } else {
+#ifdef AUDIO_ENABLE
+    PLAY_SONG(leader_fail_song);
+#endif
+  }
+}
+
diff --git a/qmk/keyboards/preonic/keymaps/pcurt854/readme.md b/qmk/keyboards/preonic/keymaps/pcurt854/readme.md
new file mode 100644
index 00000000..51b522f9
--- /dev/null
+++ b/qmk/keyboards/preonic/keymaps/pcurt854/readme.md
@@ -0,0 +1,71 @@
+# For programmers having trouble touch typing the top row
+
+### My problem and using preonic to solve it
+
+I am an okay letter typist, but often need to look and find special symbols, like $ and ^, on the top row.  Using layers, I assigned special symbols to keys corresponding to their names.
+
+When entering numbers, I like to use the numpad.  But the numpad on a full-sized keyboard is simply too far away.  Staggered keyboard makes it awkward to move the numpad in.  Preonic is ortholinear, and of the right size.  It's quite natural to move the numpad in.  Along the side of the numpad, I also included rows of 1-5 and 6-0.  Sometimes, it's simpler to enter numbers this way.
+
+For programmers, parentheses, brackets, and braces are important.  They are moved to under the fingers in an easy to remember layout as well.
+
+### Layer 0
+
+The middle section, from 1 to 0, plus three rows of letters, follows the traditional QWERTY layout.
+
+The left border, from top to bottom: Esc when tapped and ~ with Shift and ` with Command, Tab, Esc when tapped and Control when held, and One shot layer 5.
+
+The right border: Backspace, Tap dancing leader key, quotes, and One shot layer 6.
+
+Bottom row, left to right: One shot modifier Left shift, Control, Option, Command, One shot layer 4, Enter, Space, Layer 3 double tap to toggle, Slash (moved here to allow for a traditional cluster of arrows), Left, Down, and Right.
+
+### Layer 1
+
+Middle: Colemak
+
+Border: Same as QWERTY
+
+### Layer 2
+
+Middle: Dvorak
+
+Border: Same as QWERTY
+
+### Layer 3
+
+Numpad and common operators around it, with the left of board filled with rows of 1-5 and 6-0
+
+Home/End/Page Up/Down in place of arrow keys
+
+### Layer 4
+
+Special symbols using a character in their names:
+
+pLus (+), pIpe (|)
+
+anD (&), dollaR ($)
+
+At (@), Backslash (\\), Circumflex (^), Exclamation (!), Grave (`), Hash (#), Percent (%), Star (*), Tilde (~), Underscore (_)
+
+minus (\-) is put on J so it's under Underscore, easy to access, and matches the bump on J
+
+equal sign (=) is put on M, under J, because putting it on Q make accidential Command-Q likely
+
+Same Home/End/Page Up/Down cluster as that on Layer 3
+
+### Layer 5
+
+Brackets
+
+### Layer 6
+
+Reset, Caps lock. Base layer switches, RGB backlight controls, Volume controls, and other special functions
+
+### RGB backlight
+
+... is used to indicate the status of Cap locks and which of the higher layers is on.
+
+### Tap dancing
+
+With the Leader key, Tap dance the brackets: <> () [] {}, Cap lock, and some simple phrases.
+
+
diff --git a/qmk/keyboards/preonic/keymaps/pcurt854/rules.mk b/qmk/keyboards/preonic/keymaps/pcurt854/rules.mk
new file mode 100644
index 00000000..ee75c8b3
--- /dev/null
+++ b/qmk/keyboards/preonic/keymaps/pcurt854/rules.mk
@@ -0,0 +1,3 @@
+AUDIO_ENABLE = yes
+LEADER_ENABLE = yes
+RGBLIGHT_ENABLE = yes
diff --git a/qmk/keyboards/primekb/prime_e/keymaps/brandonschlack/config.h b/qmk/keyboards/primekb/prime_e/keymaps/brandonschlack/config.h
new file mode 100644
index 00000000..8a9aa040
--- /dev/null
+++ b/qmk/keyboards/primekb/prime_e/keymaps/brandonschlack/config.h
@@ -0,0 +1,30 @@
+/* Copyright 2020 Brandon Schlack
+ *
+ * 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
+
+#define USE_LEDS_FOR_LAYERS
+#define STOPLIGHT_LED
+
+#define TOP_LED    B1
+#define MIDDLE_LED B2
+#define BOTTOM_LED B3
+
+// #define LED_PIN_FLIP
+#ifdef LED_PIN_FLIP
+    #define LED_ON(flag) !flag
+#else
+    #define LED_ON(flag) flag
+#endif
diff --git a/qmk/keyboards/primekb/prime_e/keymaps/brandonschlack/keymap.c b/qmk/keyboards/primekb/prime_e/keymaps/brandonschlack/keymap.c
new file mode 100644
index 00000000..a92fcbfe
--- /dev/null
+++ b/qmk/keyboards/primekb/prime_e/keymaps/brandonschlack/keymap.c
@@ -0,0 +1,95 @@
+/* Copyright 2020 Brandon Schlack
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+#include "brandonschlack.h"
+
+// Tap Dance declarations
+enum {
+    TD_LR_BRC,
+    TD_SD_QUOT
+};
+
+// Tap Dance definitions
+qk_tap_dance_action_t tap_dance_actions[] = {
+    // Tap once for LBracket, twice for RBracket
+    [TD_LR_BRC] = ACTION_TAP_DANCE_DOUBLE(KC_LBRC, KC_RBRC),
+    // Tap once for Single Quote, twice for Double Quote
+    [TD_SD_QUOT] = ACTION_TAP_DANCE_DOUBLE(KC_QUOT, KC_DQT)
+};
+
+#define LWR_B      LT(_LOWER, KC_B)
+#define LWR_EQL    LT(_LOWER, KC_EQL)
+#define TD_BRC     TD(TD_LR_BRC)
+#define TD_QUOT    TD(TD_SD_QUOT)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASE] = LAYOUT( \
+        KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,            KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    TD_BRC,  KC_BSPC, \
+        HY_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,            KC_H,    KC_J,    KC_K,    KC_L,    TD_QUOT,          KC_ENT,  \
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    LWR_B,           KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, LOWER,   \
+        KC_LCTL, KC_LOPT,                   KC_LCMD, SPC_RAI,	      SPC_RAI,          KC_RCMD,                   KC_ROPT, KC_RCTL  \
+    ),
+
+    [_LOWER] = LAYOUT( \
+        KC_DELT, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, _______,         _______, _______, _______, KC_HOME, KC_UP,   KC_PGUP, MC_SLPD, \
+        _______, KC_MUTE, KC_VOLU, NXT_WIN, PRV_TAB, MC_BACK,         MC_FWRD, NXT_TAB, _______, KC_LEFT, KC_RGHT,          KC_MPLY, \
+        SF_CAPS, KC_MPRV, KC_VOLD, KC_MNXT, _______, PX_AFLL,         OP_AFLL, _______, _______, KC_END,  KC_DOWN, KC_PGDN, _______, \
+        _______, _______,                   _______, _______,         _______,          _______,                   _______, _______  \
+    ),
+
+    [_RAISE] = LAYOUT( \
+        KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_LBRC,         KC_RBRC, KC_7,    KC_8,    KC_9,    KC_0,    KC_RBRC, _______, \
+        _______, KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_MINS,         KC_PLUS, KC_4,    KC_5,    KC_6,    KC_SCLN,          _______, \
+        _______, KC_F9,   KC_F10,  KC_F11,  KC_F12,  LWR_EQL,         KC_EQL,  KC_1,    KC_2,    KC_3,    _______, KC_BSLS, _______, \
+        _______, _______,                   _______, _______,         _______,          _______,                   _______, _______  \
+    ),
+
+    [_ADJUST] = LAYOUT( \
+        QM_MAKE, _______, _______, EEP_RST, RESET,   _______,         _______, _______, _______, _______, _______, _______, _______, \
+        _______, _______, _______, _______, _______, _______,         _______, _______, _______, _______, _______,          _______, \
+        _______, _______, _______, _______, _______, _______,         _______, _______, _______, _______, _______, _______, _______, \
+        _______, _______,                   _______, _______,         _______,          _______,                   _______, _______  \
+    )
+
+/*
+    [BLANK] = LAYOUT( \
+        _______, _______, _______, _______, _______, _______,         _______, _______, _______, _______, _______, _______, _______, \
+        _______, _______, _______, _______, _______, _______,         _______, _______, _______, _______, _______,          _______, \
+        _______, _______, _______, _______, _______, _______,         _______, _______, _______, _______, _______, _______, _______, \
+        _______, _______,                   _______, _______,         _______,          _______,                   _______, _______  \
+    )
+ */
+};
+
+void keyboard_pre_init_user(void) {
+    setPinOutput(TOP_LED);
+    setPinOutput(MIDDLE_LED);
+    setPinOutput(BOTTOM_LED);
+}
+
+layer_state_t layer_state_set_keymap(layer_state_t state) {
+    state = update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
+    return state;
+}
+
+#ifdef USE_LEDS_FOR_LAYERS
+bool led_update_keymap(led_t led_state) {
+    writePin(TOP_LED, LED_ON(IS_LAYER_ON(_FN1))); // Use for Layer 1
+    writePin(MIDDLE_LED, LED_ON(IS_LAYER_ON(_FN2))); // Use for Layer 2
+    writePin(BOTTOM_LED, LED_ON(led_state.caps_lock)); // Use for Caps Lock
+    return false; // Override default set by KB
+}
+#endif
diff --git a/qmk/keyboards/primekb/prime_e/keymaps/brandonschlack/rules.mk b/qmk/keyboards/primekb/prime_e/keymaps/brandonschlack/rules.mk
new file mode 100644
index 00000000..c1dfab0c
--- /dev/null
+++ b/qmk/keyboards/primekb/prime_e/keymaps/brandonschlack/rules.mk
@@ -0,0 +1,2 @@
+BACKLIGHT_ENABLE = no
+TAP_DANCE_ENABLE = yes
diff --git a/qmk/keyboards/primekb/prime_e/keymaps/madhatter/keymap.c b/qmk/keyboards/primekb/prime_e/keymaps/madhatter/keymap.c
index 0a85aee1..099d6e03 100644
--- a/qmk/keyboards/primekb/prime_e/keymaps/madhatter/keymap.c
+++ b/qmk/keyboards/primekb/prime_e/keymaps/madhatter/keymap.c
@@ -30,44 +30,33 @@ static void togg_indicator(uint8_t *state, uint8_t pin);
 enum ilpse_layers {
     _QWERTY,
     _LOWER,
-    _RAISE,
-    _ADJUST
+    _RAISE
 };
 
-enum ilpse_keycodes {
-  QWERTY = SAFE_RANGE,
-  LOWER,
-  RAISE,
-  ADJUST
-};
+#define LOWER MO(_LOWER)
+#define RAISE MO(_RAISE)
+#define GUBS RGUI_T(KC_BSPC)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_QWERTY] = LAYOUT(
     KC_GESC, KC_Q,  KC_W,  KC_E,  KC_R,   KC_T,    KC_Y,  KC_U,  KC_I,  KC_O,    KC_P,    KC_MINS, KC_BSPC,
     KC_TAB,  KC_A,  KC_S,  KC_D,  KC_F,   KC_G,    KC_H,  KC_J,  KC_K,  KC_L,    KC_SCLN, KC_ENT,
     KC_LSPO, KC_Z,  KC_X,  KC_C,  KC_V,   KC_B,    KC_B,  KC_N,  KC_M,  KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC,
-    KC_LCTL, KC_LALT,          LOWER,  KC_LCMD,    KC_SPC,  RAISE,          KC_RGUI, KC_RCTL
+    KC_LCTL, KC_LALT,          LOWER,  GUBS,      KC_SPC,  RAISE,          KC_RGUI, KC_RCTL
   ),
 
   [_LOWER] = LAYOUT(
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,      KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_LBRC, KC_RBRC,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_SCLN, KC_QUOT,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSLS, KC_TRNS,
-    KC_TRNS, KC_TRNS,                     LOWER, KC_TRNS,   KC_TRNS,   RAISE,          KC_TRNS, KC_TRNS
+    KC_TRNS, KC_TRNS,                  KC_TRNS, KC_TRNS,   KC_TRNS,  KC_TRNS,          KC_TRNS, KC_TRNS
   ),
 
   [_RAISE] = LAYOUT(
     KC_TILD, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,     KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_TRNS,  KC_DEL,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_MINS, KC_EQL,  KC_LCBR, KC_RCBR, KC_PIPE, KC_ENT,
     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_UNDS, KC_PLUS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
-    KC_TRNS, KC_TRNS,                     LOWER, KC_TRNS,   KC_TRNS,   RAISE,          KC_TRNS, KC_TRNS
-  ),
-
-  [_ADJUST] = LAYOUT(
-      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_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,
-    AG_TOGG, 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
   )
 };
 
@@ -96,21 +85,9 @@ void matrix_scan_user(void) {
 
 //function for layer indicator LED
 layer_state_t layer_state_set_user(layer_state_t state) {
-    if (layer_state_cmp(state, 1)) {
-        writePinHigh(CAPS_LED_PIN);
-    } else {
-        writePinLow(CAPS_LED_PIN);
-    }
-    if (layer_state_cmp(state, 2)) {
-        writePinHigh(NUM_LED_PIN);
-    } else {
-        writePinLow(NUM_LED_PIN);
-    }
-    if (layer_state_cmp(state, 3)) {
-        writePinHigh(SCROLL_LED_PIN);
-    } else {
-        writePinLow(SCROLL_LED_PIN);
-    }
+    writePin(CAPS_LED_PIN, layer_state_cmp(state, 0));
+    writePin(NUM_LED_PIN, layer_state_cmp(state, 1));
+    writePin(SCROLL_LED_PIN, layer_state_cmp(state, 2));
     return state;
 }
 
@@ -129,32 +106,3 @@ void togg_indicator(uint8_t *state, uint8_t pin) {
         writePinLow(pin);
     }
 }
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QWERTY:
-      if (record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-      }
-      return false;
-    case LOWER:
-      if (record->event.pressed) {
-        layer_on(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_LOWER);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-    case RAISE:
-      if (record->event.pressed) {
-        layer_on(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      } else {
-        layer_off(_RAISE);
-        update_tri_layer(_LOWER, _RAISE, _ADJUST);
-      }
-      return false;
-  }
-  return true;
-}
diff --git a/qmk/keyboards/primekb/prime_e/keymaps/talljoe/config.h b/qmk/keyboards/primekb/prime_e/keymaps/talljoe/config.h
new file mode 100644
index 00000000..7ecea9c1
--- /dev/null
+++ b/qmk/keyboards/primekb/prime_e/keymaps/talljoe/config.h
@@ -0,0 +1,33 @@
+/* Copyright 2020 Joseph Wasson
+ *
+ * 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
+
+#define SPACE_COUNT 2
+
+#define TEMPLATE(                                                                   \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2D,      \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,           \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,                \
+    K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,           \
+    K40, K41, K42,      K44, K45, K46,      K48, K49,      K4B, K4C                 \
+)                                                                                   \
+LAYOUT( \
+	K10, K11, K12, K13, K14, K15,  		K16, K17, K18, K19, K1A, K1D, K2D, \
+	K20, K21, K22, K23, K24, K25,  		K26, K27, K28, K29, K2A,      K2C, \
+	K30, K32, K33, K34, K35, K36,  		K2B, K37, K38, K39, K3A, K3B, K3C, \
+	K40, K41,  			K42, K44,  		K46, K48, 				 K49, K3D \
+)
diff --git a/qmk/keyboards/primekb/prime_e/keymaps/talljoe/keymap.c b/qmk/keyboards/primekb/prime_e/keymaps/talljoe/keymap.c
new file mode 100644
index 00000000..7812add8
--- /dev/null
+++ b/qmk/keyboards/primekb/prime_e/keymaps/talljoe/keymap.c
@@ -0,0 +1 @@
+// This space intentionally left blank
diff --git a/qmk/keyboards/primekb/prime_l/rules.mk b/qmk/keyboards/primekb/prime_l/rules.mk
index 3030b50f..bd4e9b28 100644
--- a/qmk/keyboards/primekb/prime_l/rules.mk
+++ b/qmk/keyboards/primekb/prime_l/rules.mk
@@ -30,6 +30,5 @@ 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
 
 DEFAULT_FOLDER = primekb/prime_l/v1
\ No newline at end of file
diff --git a/qmk/keyboards/primekb/prime_m/rules.mk b/qmk/keyboards/primekb/prime_m/rules.mk
index 1a1eabc8..c0ece238 100644
--- a/qmk/keyboards/primekb/prime_m/rules.mk
+++ b/qmk/keyboards/primekb/prime_m/rules.mk
@@ -30,6 +30,5 @@ 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
 
 LAYOUTS = ortho_5x6 numpad_5x6
diff --git a/qmk/keyboards/primekb/prime_o/rules.mk b/qmk/keyboards/primekb/prime_o/rules.mk
index 8c2353de..2097c25d 100644
--- a/qmk/keyboards/primekb/prime_o/rules.mk
+++ b/qmk/keyboards/primekb/prime_o/rules.mk
@@ -30,4 +30,3 @@ 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
diff --git a/qmk/keyboards/program_yoink/config.h b/qmk/keyboards/program_yoink/config.h
new file mode 100644
index 00000000..d1fc28ef
--- /dev/null
+++ b/qmk/keyboards/program_yoink/config.h
@@ -0,0 +1,102 @@
+/*
+Copyright 2020 melonbred
+
+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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID 0xFEED
+#define PRODUCT_ID 0xF10B
+#define DEVICE_VER 0x0001
+#define MANUFACTURER melonbred
+#define PRODUCT program_yoink
+
+/* key matrix size */
+#define MATRIX_ROWS 4
+#define MATRIX_COLS 13
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+ */
+#define MATRIX_ROW_PINS { D2, D3, B1, B0 }
+#define MATRIX_COL_PINS { C4, C5, C6, C7, B7, B6, B5, B4, B3, B2, D6, C2, D5 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+/*Encoder Definition*/
+#define ENCODERS_PAD_A { D1 }
+#define ENCODERS_PAD_B { D0 }
+
+/*RGB*/
+#define RGB_DI_PIN D4
+ #ifdef RGB_DI_PIN
+   #define RGBLED_NUM 5
+   #define RGBLIGHT_HUE_STEP 8
+   #define RGBLIGHT_SAT_STEP 8
+   #define RGBLIGHT_VAL_STEP 8
+   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+ /*== all animations enable ==*/
+   //#define RGBLIGHT_ANIMATIONS
+ /*== or choose animations ==*/
+   //#define RGBLIGHT_EFFECT_BREATHING
+   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
+   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+   //#define RGBLIGHT_EFFECT_SNAKE
+   #define RGBLIGHT_EFFECT_KNIGHT
+   //#define RGBLIGHT_EFFECT_CHRISTMAS
+   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
+   //#define RGBLIGHT_EFFECT_RGB_TEST
+   //#define RGBLIGHT_EFFECT_ALTERNATING
+ /*== customize breathing effect ==*/
+   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+   //#define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+   /*==== use exp() and sin() ====*/
+   //#define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+   //#define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+ #endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
diff --git a/qmk/keyboards/program_yoink/info.json b/qmk/keyboards/program_yoink/info.json
new file mode 100644
index 00000000..ddce59b6
--- /dev/null
+++ b/qmk/keyboards/program_yoink/info.json
@@ -0,0 +1,107 @@
+{
+    "keyboard_name": "program_yoink",
+    "url": "",
+    "maintainer": "melonbred",
+    "width": 13.75,
+    "height": 4.25,
+    "layouts": {
+        "LAYOUT_default": {
+            "layout": [
+            	{"x":0, "y":0},
+            	{"x":1, "y":0},
+            	{"x":2, "y":0},
+            	{"x":3, "y":0},
+            	{"x":4, "y":0},
+            	{"x":5, "y":0},
+            	{"x":6, "y":0},
+            	{"x":7, "y":0},
+            	{"x":8, "y":0}, 
+            	{"x":9, "y":0}, 
+            	{"x":10, "y":0}, 
+            	{"x":11, "y":0}, 
+            	{"x":12.75, "y":0}, 
+            	{"x":0, "y":1, "w":1.25}, 
+            	{"x":1.25, "y":1}, 
+            	{"x":2.25, "y":1}, 
+            	{"x":3.25, "y":1}, 
+            	{"x":4.25, "y":1}, 
+            	{"x":5.25, "y":1}, 
+            	{"x":6.25, "y":1}, 
+            	{"x":7.25, "y":1}, 
+            	{"x":8.25, "y":1}, 
+            	{"x":9.25, "y":1}, 
+            	{"x":10.25, "y":1, "w":1.75}, 
+            	{"x":12.75, "y":1}, 
+            	{"x":0, "y":2, "w":1.75}, 
+            	{"x":1.75, "y":2}, 
+            	{"x":2.75, "y":2}, 
+            	{"x":3.75, "y":2}, 
+            	{"x":4.75, "y":2}, 
+            	{"x":5.75, "y":2}, 
+            	{"x":6.75, "y":2}, 
+            	{"x":7.75, "y":2}, 
+            	{"x":8.75, "y":2}, 
+            	{"x":9.75, "y":2, "w":1.25}, 
+            	{"x":12.75, "y":2}, 
+            	{"x":11.25, "y":2.25}, 
+            	{"x":0, "y":3, "w":1.25},
+            	{"x":1.25, "y":3, "w":1.25}, 
+            	{"x":2.5, "y":3, "w":6.25}, 
+            	{"x":8.75, "y":3, "w":1.25}, 
+            	{"x":10.25, "y":3.25}, 
+            	{"x":11.25, "y":3.25}, 
+            	{"x":12.25, "y":3.25}]
+        },
+        "LAYOUT_split_bar": {
+            "layout": [
+            	{"x":0, "y":0}, 
+            	{"x":1, "y":0}, 
+            	{"x":2, "y":0}, 
+            	{"x":3, "y":0}, 
+            	{"x":4, "y":0}, 
+            	{"x":5, "y":0}, 
+            	{"x":6, "y":0}, 
+            	{"x":7, "y":0}, 
+            	{"x":8, "y":0}, 
+            	{"x":9, "y":0}, 
+            	{"x":10, "y":0}, 
+            	{"x":11, "y":0}, 
+            	{"x":12.75, "y":0}, 
+            	{"x":0, "y":1, "w":1.25}, 
+            	{"x":1.25, "y":1}, 
+            	{"x":2.25, "y":1}, 
+            	{"x":3.25, "y":1}, 
+            	{"x":4.25, "y":1}, 
+            	{"x":5.25, "y":1}, 
+            	{"x":6.25, "y":1}, 
+            	{"x":7.25, "y":1}, 
+            	{"x":8.25, "y":1}, 
+            	{"x":9.25, "y":1}, 
+            	{"x":10.25, "y":1, "w":1.75}, 
+            	{"x":12.75, "y":1}, 
+            	{"x":0, "y":2, "w":1.75}, 
+            	{"x":1.75, "y":2}, 
+            	{"x":2.75, "y":2}, 
+            	{"x":3.75, "y":2}, 
+            	{"x":4.75, "y":2}, 
+            	{"x":5.75, "y":2}, 
+            	{"x":6.75, "y":2}, 
+            	{"x":7.75, "y":2}, 
+            	{"x":8.75, "y":2}, 
+            	{"x":9.75, "y":2, "w":1.25}, 
+            	{"x":12.75, "y":2}, 
+            	{"x":11.25, "y":2.25}, 
+            	{"x":0, "y":3}, 
+            	{"x":1, "y":3}, 
+            	{"x":2, "y":3}, 
+            	{"x":3, "y":3, "w":2.75}, 
+            	{"x":5.75, "y":3, "w":2.25}, 
+            	{"x":8, "y":3}, 
+            	{"x":9, "y":3}, 
+            	{"x":10.25, "y":3.25}, 
+            	{"x":11.25, "y":3.25}, 
+            	{"x":12.25, "y":3.25}]
+        }
+    }
+}
+ 
diff --git a/qmk/keyboards/program_yoink/keymaps/default/config.h b/qmk/keyboards/program_yoink/keymaps/default/config.h
new file mode 100644
index 00000000..c4b4470e
--- /dev/null
+++ b/qmk/keyboards/program_yoink/keymaps/default/config.h
@@ -0,0 +1,25 @@
+/* Copyright 2020 melonbred
+ *
+ * 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
+#define TAPPING_TERM 200
+
+#ifdef COMBO_ENABLE
+#    define COMBO_COUNT 10
+#    define COMBO_TERM 200
+#endif 
\ No newline at end of file
diff --git a/qmk/keyboards/program_yoink/keymaps/default/keymap.c b/qmk/keyboards/program_yoink/keymaps/default/keymap.c
new file mode 100644
index 00000000..1baeeb75
--- /dev/null
+++ b/qmk/keyboards/program_yoink/keymaps/default/keymap.c
@@ -0,0 +1,75 @@
+/* Copyright 2020 melonbred
+ *
+ * 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 names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _LAYER1,
+    _LAYER2
+};
+
+// Defines Combos for use in the keymap
+enum combo_events {
+  COMBO_SLSH,
+};
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASE] = LAYOUT_default(
+        KC_ESC,   KC_Q,   KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC, KC_MUTE,
+        KC_TAB,    KC_A, KC_S, KC_D, KC_F, KC_G,  KC_H, KC_J,    KC_K,    KC_L,    KC_ENT,     RGB_VAI,
+        KC_LSFT,    KC_Z,    KC_X, KC_C, KC_V, KC_B,  KC_N, KC_M,    KC_COMM, MT(MOD_RSFT, KC_DOT), KC_UP,  RGB_VAD,
+        KC_LCTL, MT(MOD_LALT, KC_CAPS),                  LT(_LAYER2, KC_SPC),               LT(_LAYER1, KC_DEL), KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+
+    [_LAYER1] = LAYOUT_default(
+        KC_MINS,  KC_1,    KC_2,   KC_3,      KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,  _______,
+        KC_EQL, _______, _______, _______,   _______, _______, _______, KC_LBRC, KC_RBRC, KC_SCLN, KC_QUOT,          _______,
+        _______, _______, _______,  _______, _______, _______, _______, _______, _______, _______, _______,          _______,
+        KC_LGUI, KC_LALT,                             _______,                   _______, _______, _______,          _______         
+    ), 
+
+    [_LAYER2] = LAYOUT_default(
+        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_6,    KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,
+        _______, _______, _______, _______, _______, _______, RGB_M_B, RGB_M_P, RGB_M_K, RGB_M_G, RGB_M_R,          RGB_HUI,
+        _______, _______, _______, _______, _______, RESET,   _______, _______, _______, _______, _______,          RGB_HUD,
+        _______, RGB_TOG,                            XXXXXXX,                   RESET, _______,  _______,          _______
+   ),
+};
+
+
+void encoder_update_user(uint8_t index, bool clockwise) {
+    if (index == 0) {
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    }
+}
+
+#ifdef COMBO_ENABLE
+const uint16_t PROGMEM combo_slsh[] = {MT(MOD_RSFT, KC_DOT), KC_COMM, COMBO_END};
+
+
+combo_t key_combos[COMBO_COUNT] = {
+  [COMBO_SLSH] = COMBO(combo_slsh,KC_SLSH),
+
+};
+#endif
+        
diff --git a/qmk/keyboards/program_yoink/keymaps/default/readme.md b/qmk/keyboards/program_yoink/keymaps/default/readme.md
new file mode 100644
index 00000000..4e0a314f
--- /dev/null
+++ b/qmk/keyboards/program_yoink/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for program_yoink
diff --git a/qmk/keyboards/program_yoink/keymaps/default/rules.mk b/qmk/keyboards/program_yoink/keymaps/default/rules.mk
new file mode 100644
index 00000000..ab1e4381
--- /dev/null
+++ b/qmk/keyboards/program_yoink/keymaps/default/rules.mk
@@ -0,0 +1 @@
+COMBO_ENABLE = yes
diff --git a/qmk/keyboards/program_yoink/keymaps/split_bar/config.h b/qmk/keyboards/program_yoink/keymaps/split_bar/config.h
new file mode 100644
index 00000000..842b3b80
--- /dev/null
+++ b/qmk/keyboards/program_yoink/keymaps/split_bar/config.h
@@ -0,0 +1,25 @@
+/* Copyright 2020 melonbred
+ *
+ * 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
+#define TAPPING_TERM 200
+
+#ifdef COMBO_ENABLE
+#    define COMBO_COUNT 10
+#    define COMBO_TERM 200
+#endif 
diff --git a/qmk/keyboards/program_yoink/keymaps/split_bar/keymap.c b/qmk/keyboards/program_yoink/keymaps/split_bar/keymap.c
new file mode 100644
index 00000000..f72c152f
--- /dev/null
+++ b/qmk/keyboards/program_yoink/keymaps/split_bar/keymap.c
@@ -0,0 +1,75 @@
+/* Copyright 2020 melonbred
+ *
+ * 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 names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _LAYER1,
+    _LAYER2
+};
+
+// Defines Combos for use in the keymap
+enum combo_events {
+  COMBO_SLSH,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASE] = LAYOUT_split_bar(
+        KC_ESC,        KC_Q,                   KC_W,    KC_E,                KC_R,   KC_T,   KC_Y,    KC_U,    KC_I,    KC_O,                 KC_P,    KC_BSPC, KC_MPLY,
+        CTL_T(KC_TAB), KC_A,                   KC_S,    KC_D,                KC_F,   KC_G,   KC_H,    KC_J,    KC_K,    KC_L,                 KC_ENT,           KC_PGUP,
+        KC_LSFT,       KC_Z,                   KC_X,    KC_C,                KC_V,   KC_B,   KC_N,    KC_M,    KC_COMM, MT(MOD_RSFT, KC_DOT), KC_UP,            KC_PGDN,
+        MO(_LAYER2),   KC_LGUI,                KC_LALT, LT(_LAYER1, KC_SPC),         KC_SPC,          KC_RALT, KC_RCTL, KC_LEFT,              KC_DOWN,          KC_RGHT
+    ),
+
+    [_LAYER1] = LAYOUT_split_bar(
+        KC_GRV,  KC_1,    KC_2,   KC_3,      KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL, _______,
+        KC_CAPS, KC_MINS, KC_EQL, KC_LBRC,   KC_RBRC, KC_BSLS, _______, _______, KC_SCLN, KC_QUOT, _______,         _______,
+        _______, _______, _______,  _______, _______, _______, _______,  _______, _______, _______, _______,         _______,
+        _______, KC_LGUI, _______,  _______,          _______,          _______, _______, _______, _______,         _______         
+    ), 
+
+    [_LAYER2] = LAYOUT_split_bar(
+        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_6,    KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RGB_M_K, RGB_M_G, RGB_M_R, RGB_M_SW,         RGB_HUI,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, RESET,   XXXXXXX, XXXXXXX, XXXXXXX, RGB_VAI, RGB_VAD,          RGB_HUD,
+        _______, RGB_TOG, XXXXXXX, XXXXXXX,          XXXXXXX,          XXXXXXX, XXXXXXX, KC_DEL,  KC_RALT,          KC_RCTL
+    ),
+};
+
+
+void encoder_update_user(uint8_t index, bool clockwise) {
+    if (index == 0) {
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    }
+} 
+
+#ifdef COMBO_ENABLE
+const uint16_t PROGMEM combo_slsh[] = {MT(MOD_RSFT, KC_DOT), KC_COMM, COMBO_END};
+
+
+combo_t key_combos[COMBO_COUNT] = {
+  [COMBO_SLSH] = COMBO(combo_slsh,KC_SLSH),
+
+};
+#endif
+        
+
+    
diff --git a/qmk/keyboards/program_yoink/keymaps/split_bar/readme.md b/qmk/keyboards/program_yoink/keymaps/split_bar/readme.md
new file mode 100644
index 00000000..4e0a314f
--- /dev/null
+++ b/qmk/keyboards/program_yoink/keymaps/split_bar/readme.md
@@ -0,0 +1 @@
+# The default keymap for program_yoink
diff --git a/qmk/keyboards/program_yoink/keymaps/split_bar/rules.mk b/qmk/keyboards/program_yoink/keymaps/split_bar/rules.mk
new file mode 100644
index 00000000..ab1e4381
--- /dev/null
+++ b/qmk/keyboards/program_yoink/keymaps/split_bar/rules.mk
@@ -0,0 +1 @@
+COMBO_ENABLE = yes
diff --git a/qmk/keyboards/program_yoink/program_yoink.c b/qmk/keyboards/program_yoink/program_yoink.c
new file mode 100644
index 00000000..e549c98e
--- /dev/null
+++ b/qmk/keyboards/program_yoink/program_yoink.c
@@ -0,0 +1,17 @@
+/* Copyright 2020 melonbred
+ *
+ * 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 "program_yoink.h"
diff --git a/qmk/keyboards/program_yoink/program_yoink.h b/qmk/keyboards/program_yoink/program_yoink.h
new file mode 100644
index 00000000..2b64fb30
--- /dev/null
+++ b/qmk/keyboards/program_yoink/program_yoink.h
@@ -0,0 +1,57 @@
+/* Copyright 2020 melonbred
+ *
+ * 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 is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define XXX KC_NO
+
+#define LAYOUT_default( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A,      K1C, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A,      K2C, \
+    K30, K31,           K34,                K38, K39, K3A,      K3C \
+) \
+{ \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, XXX, K1C }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, XXX, K2C }, \
+    { K30, K31, XXX, XXX, K34, XXX, XXX, XXX, K38, K39, K3A, XXX, K3C } \
+}
+
+#define LAYOUT_split_bar( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A,      K1C, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A,      K2C, \
+    K30, K31, K32, K33,      K35,      K37, K38, K39, K3A,      K3C \
+) \
+{ \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, XXX, K1C }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, XXX, K2C }, \
+    { K30, K31, K32, K33, XXX, K35, XXX, K37, K38, K39, K3A, XXX, K3C } \
+}
+
+
diff --git a/qmk/keyboards/program_yoink/readme.md b/qmk/keyboards/program_yoink/readme.md
new file mode 100644
index 00000000..6fa3bf4f
--- /dev/null
+++ b/qmk/keyboards/program_yoink/readme.md
@@ -0,0 +1,15 @@
+# program_yoink
+
+![program_yoink](https://i.imgur.com/2bBLKJrl.jpeg)
+
+Program Yoink is a 12u main cluster board accompanied by a macro column with optional encoder support and arrow keys.
+
+* Keyboard Maintainer: [melonbred](https://github.com/yourusername)
+* Hardware Supported: The PCBs, controllers supported
+* Hardware Availability: Links to where you can find this hardware
+
+Make example for this keyboard (after setting up your build environment):
+
+    make program_yoink: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).
diff --git a/qmk/keyboards/program_yoink/rules.mk b/qmk/keyboards/program_yoink/rules.mk
new file mode 100644
index 00000000..4384a0f0
--- /dev/null
+++ b/qmk/keyboards/program_yoink/rules.mk
@@ -0,0 +1,23 @@
+# MCU name
+MCU = atmega32u2
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+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
+# 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
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = yes		# Enable rotary encoder
diff --git a/qmk/keyboards/projectkb/alice/alice.h b/qmk/keyboards/projectkb/alice/alice.h
index 00bec92b..19052c43 100644
--- a/qmk/keyboards/projectkb/alice/alice.h
+++ b/qmk/keyboards/projectkb/alice/alice.h
@@ -3,9 +3,9 @@
 #include "quantum.h"
 
 #define KNO KC_NO
-#define LAYOUT_default LAYOUT_alice
+#define LAYOUT_default LAYOUT_alice_split_bs
 
-#define LAYOUT_alice( \
+#define LAYOUT_alice_split_bs( \
   K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E, K0F, \
   K10, K11, K12, K13, K14, K15, K16,      K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
   K20, K21, K22, K23, K24, K25, K26,      K28, K29, K2A, K2B, K2C, K2D,      K2F, \
@@ -18,3 +18,17 @@
   {  KNO, K31, K32, K33, K34, K35, K36, KNO, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F  }, \
   {  KNO, K41, KNO, K43, K44, KNO, K46, KNO, KNO, K49, KNO, K4B, KNO, KNO, KNO, K4F  }  \
 }
+
+#define LAYOUT_alice( \
+  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,      K0F, \
+  K10, K11, K12, K13, K14, K15, K16,      K18, K19, K1A, K1B, K1C, K1D, K1E, K1F, \
+  K20, K21, K22, K23, K24, K25, K26,      K28, K29, K2A, K2B, K2C, K2D,      K2F, \
+       K31, K32, K33, K34, K35, K36,      K38, K39, K3A, K3B, K3C, K3D, K3E, K3F,         \
+       K41,      K43, K44,      K46,           K49,      K4B,                K4F \
+) { \
+  {  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, KNO, K0F  }, \
+  {  K10, K11, K12, K13, K14, K15, K16, KNO, K18, K19, K1A, K1B, K1C, K1D, K1E, K1F  }, \
+  {  K20, K21, K22, K23, K24, K25, K26, KNO, K28, K29, K2A, K2B, K2C, K2D, KNO, K2F  }, \
+  {  KNO, K31, K32, K33, K34, K35, K36, KNO, K38, K39, K3A, K3B, K3C, K3D, K3E, K3F  }, \
+  {  KNO, K41, KNO, K43, K44, KNO, K46, KNO, KNO, K49, KNO, K4B, KNO, KNO, KNO, K4F  }  \
+}
diff --git a/qmk/keyboards/projectkb/alice/info.json b/qmk/keyboards/projectkb/alice/info.json
index 99311265..299612c1 100644
--- a/qmk/keyboards/projectkb/alice/info.json
+++ b/qmk/keyboards/projectkb/alice/info.json
@@ -5,7 +5,7 @@
     "width": 19.75,
     "height": 5.25,
     "layouts": {
-        "LAYOUT_alice": {
+        "LAYOUT_alice_split_bs": {
             "layout": [
                 {"label":"Esc", "x":0.5, "y":0},
                 {"label":"`", "x":1.75, "y":0.25},
@@ -70,6 +70,79 @@
                 {"label":"Shift", "x":17, "y":3.25, "w":1.75},
                 {"label":"Fn", "x":18.75, "y":3.25},
 
+                {"label":"Ctrl", "x":1.5, "y":4.25, "w":1.5},
+                {"label":"Alt", "x":5, "y":4.25, "w":1.5},
+                {"label":"Space", "x":6.5, "y":4.25, "w":2},
+                {"label":"Menu", "x":8.5, "y":4.25},
+                {"label":"Space", "x":10.25, "y":4.25, "w":2.75},
+                {"label":"Alt", "x":13, "y":4.25, "w":1.5},
+                {"label":"Ctrl", "x":18, "y":4.25, "w":1.5}
+            ]
+        },
+        "LAYOUT_alice": {
+            "layout": [
+                {"label":"Esc", "x":0.5, "y":0},
+                {"label":"`", "x":1.75, "y":0.25},
+                {"label":"1", "x":2.75, "y":0.25},
+                {"label":"2", "x":3.75, "y":0},
+                {"label":"3", "x":4.75, "y":0.25},
+                {"label":"4", "x":5.75, "y":0.25},
+                {"label":"5", "x":6.75, "y":0.25},
+                {"label":"6", "x":7.75, "y":0.25},
+                {"label":"7", "x":11, "y":0.25},
+                {"label":"8", "x":12, "y":0.25},
+                {"label":"9", "x":13, "y":0.25},
+                {"label":"0", "x":14, "y":0.25},
+                {"label":"-", "x":15, "y":0},
+                {"label":"=", "x":16, "y":0.25},
+                {"label":"Backspace", "x":17, "y":0.25, "w":2},
+
+                {"label":"PgUp", "x":0.25, "y":1},
+                {"label":"Tab", "x":1.5, "y":1.25, "w":1.5},
+                {"label":"Q", "x":3, "y":1.25},
+                {"label":"W", "x":4.25, "y":1.25},
+                {"label":"E", "x":5.25, "y":1.25},
+                {"label":"R", "x":6.25, "y":1.25},
+                {"label":"T", "x":7.25, "y":1.25},
+                {"label":"Y", "x":10.5, "y":1.25},
+                {"label":"U", "x":11.5, "y":1.25},
+                {"label":"I", "x":12.5, "y":1.25},
+                {"label":"O", "x":13.5, "y":1.25},
+                {"label":"P", "x":14.75, "y":1.25},
+                {"label":"{", "x":15.75, "y":1.25},
+                {"label":"}", "x":16.75, "y":1.25},
+                {"label":"|", "x":17.75, "y":1.25, "w":1.5},
+
+                {"label":"PgDn", "x":0, "y":2},
+                {"label":"Caps Lock", "x":1.5, "y":2.25, "w":1.75},
+                {"label":"A", "x":3.25, "y":2.25},
+                {"label":"S", "x":4.5, "y":2.25},
+                {"label":"D", "x":5.5, "y":2.25},
+                {"label":"F", "x":6.5, "y":2.25},
+                {"label":"G", "x":7.5, "y":2.25},
+                {"label":"H", "x":10.75, "y":2.25},
+                {"label":"J", "x":11.75, "y":2.25},
+                {"label":"K", "x":12.75, "y":2.25},
+                {"label":"L", "x":13.75, "y":2.25},
+                {"label":":", "x":15.25, "y":2.25},
+                {"label":"\"", "x":16.25, "y":2.25},
+                {"label":"Enter", "x":17.25, "y":2.25, "w":2.25},
+
+                {"label":"Shift", "x":1.5, "y":3.25, "w":2.25},
+                {"label":"Z", "x":3.75, "y":3.25},
+                {"label":"X", "x":5, "y":3.25},
+                {"label":"C", "x":6, "y":3.25},
+                {"label":"V", "x":7, "y":3.25},
+                {"label":"B", "x":8, "y":3.25},
+                {"label":"Fn", "x":10.25, "y":3.25},
+                {"label":"N", "x":11.25, "y":3.25},
+                {"label":"M", "x":12.25, "y":3.25},
+                {"label":"<", "x":13.25, "y":3.25},
+                {"label":">", "x":15, "y":3.25},
+                {"label":"?", "x":16, "y":3.25},
+                {"label":"Shift", "x":17, "y":3.25, "w":1.75},
+                {"label":"Fn", "x":18.75, "y":3.25},
+
                 {"label":"Ctrl", "x":1.5, "y":4.25, "w":1.5},
                 {"label":"Alt", "x":5, "y":4.25, "w":1.5},
                 {"label":"Space", "x":6.5, "y":4.25, "w":2},
diff --git a/qmk/keyboards/projectkb/alice/keymaps/default/keymap.c b/qmk/keyboards/projectkb/alice/keymaps/default/keymap.c
index 1566f128..a6d222b0 100644
--- a/qmk/keyboards/projectkb/alice/keymaps/default/keymap.c
+++ b/qmk/keyboards/projectkb/alice/keymaps/default/keymap.c
@@ -25,7 +25,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define _FN1 1
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT_alice(
+  [_BASE] = LAYOUT_alice_split_bs(
     KC_ESC,  KC_TILD, 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_DEL,  KC_BSPC,
     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_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,
@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
              KC_LCTL,          KC_LALT, KC_SPC,  MO(_FN1),                          KC_SPC,           KC_RALT,          KC_RCTL
   ),
 
-  [_FN1] = LAYOUT_alice(
+  [_FN1] = LAYOUT_alice_split_bs(
     RGB_TOG,  _______, 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_DEL,
     RGB_MOD,  _______,  _______, KC_UP,  _______, _______, _______,          RGB_SAI, RGB_HUI, RGB_VAI, _______, _______, _______, _______, _______,
     RGB_RMOD, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,          RGB_SAD, RGB_HUD, RGB_VAD, _______, _______, _______,          _______,
diff --git a/qmk/keyboards/projectkb/alice/keymaps/via/keymap.c b/qmk/keyboards/projectkb/alice/keymaps/via/keymap.c
index 57095e99..f2e14aaa 100644
--- a/qmk/keyboards/projectkb/alice/keymaps/via/keymap.c
+++ b/qmk/keyboards/projectkb/alice/keymaps/via/keymap.c
@@ -24,28 +24,28 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [0] = LAYOUT_alice(
+  [0] = LAYOUT_alice_split_bs(
     KC_ESC,  	KC_TILD, 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_DEL,  KC_BSPC,
     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_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_B,   KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_RGUI,
 				KC_LCTL,          KC_LALT, KC_SPC,  MO(1),                          KC_SPC,           KC_RALT,          KC_RCTL
   ),
-  [1] = LAYOUT_alice(
+  [1] = LAYOUT_alice_split_bs(
     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, 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
   ),
-  [2] = LAYOUT_alice(
+  [2] = LAYOUT_alice_split_bs(
     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, 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
   ),
-  [3] = LAYOUT_alice(
+  [3] = LAYOUT_alice_split_bs(
     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,
diff --git a/qmk/keyboards/projectkb/alice/rev1/rules.mk b/qmk/keyboards/projectkb/alice/rev1/rules.mk
index 258444db..aea9f17a 100644
--- a/qmk/keyboards/projectkb/alice/rev1/rules.mk
+++ b/qmk/keyboards/projectkb/alice/rev1/rules.mk
@@ -19,7 +19,6 @@ MIDI_ENABLE = no            # MIDI support
 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
 WS2812_DRIVER = spi
 
 
diff --git a/qmk/keyboards/projectkb/alice/rev2/rules.mk b/qmk/keyboards/projectkb/alice/rev2/rules.mk
index c3123014..aea9f17a 100644
--- a/qmk/keyboards/projectkb/alice/rev2/rules.mk
+++ b/qmk/keyboards/projectkb/alice/rev2/rules.mk
@@ -19,10 +19,8 @@ MIDI_ENABLE = no            # MIDI support
 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
 WS2812_DRIVER = spi
 
 
 # Enter lower-power sleep mode when on the ChibiOS idle thread
 OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
-LAYOUTS = alice
diff --git a/qmk/keyboards/projectkb/alice/rules.mk b/qmk/keyboards/projectkb/alice/rules.mk
index d6725769..39e431df 100644
--- a/qmk/keyboards/projectkb/alice/rules.mk
+++ b/qmk/keyboards/projectkb/alice/rules.mk
@@ -1 +1,2 @@
+LAYOUTS = alice alice_split_bs
 DEFAULT_FOLDER = projectkb/alice/rev1
diff --git a/qmk/keyboards/punk75/keymaps/dsanchezseco/keymap.c b/qmk/keyboards/punk75/keymaps/dsanchezseco/keymap.c
index 3c224b16..e3fb62f0 100644
--- a/qmk/keyboards/punk75/keymaps/dsanchezseco/keymap.c
+++ b/qmk/keyboards/punk75/keymaps/dsanchezseco/keymap.c
@@ -20,6 +20,7 @@
 // Defines names for use in layer keycodes and the keymap
 enum layer_names {
     _DVORAK,
+    _DVORAK_NUM,
     _QWERTY,
     _FN
 };
@@ -33,6 +34,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_END,   KC_MPLY, KC_PGDN, KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_SFTENT,
         KC_LCTL, KC_LGUI, KC_LALT, _______, MO(_FN), KC_SPC,  KC_SPC,   KC_MPRV, KC_BSPC, KC_BSPC, MO(_FN), _______, KC_RALT, KC_RGUI, KC_RCTL
     ),
+    [_DVORAK_NUM] = LAYOUT_ortho_5x15( /* DVORAK with center NUMPAD*/
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_GRV,   KC_BSLS, KC_EQL,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MUTE,
+        KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_P7,    KC_P8,   KC_P9, KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_SLSH,
+        ESC_CTL, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_P4,    KC_P5,   KC_P6, KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_MINS,
+        KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_P1,    KC_P2,   KC_P3, KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_SFTENT,
+        KC_LCTL, KC_LGUI, KC_LALT, _______, MO(_FN), KC_SPC,  KC_SPC,   KC_P0,   KC_BSPC, KC_BSPC, MO(_FN), _______, KC_RALT, KC_RGUI, KC_RCTL
+    ),
 
     [_QWERTY] = LAYOUT_ortho_5x15( /* QWERTY */
         KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_GRV,   KC_BSLS, KC_EQL,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MUTE,
@@ -43,11 +51,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     ),
 
     [_FN] = LAYOUT_ortho_5x15( /* FUNCTION */
-        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   DF(_QWERTY), _______, DF(_DVORAK), KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
+        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   DF(_QWERTY), DF(_DVORAK_NUM), DF(_DVORAK), KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_RIGHT, _______,
         _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, _______, _______, _______, _______,
         _______, _______, _______, KC_DOWN, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-        _______, _______, _______, _______, MO(_FN), _______, _______, _______, KC_DEL,  KC_DEL,  MO(_FN), _______, _______, _______, _______
+        _______, _______, _______, _______, MO(_FN), _______, _______, KC_NLCK, KC_DEL,  KC_DEL,  MO(_FN), _______, _______, _______, _______
     )
 
 };
diff --git a/qmk/keyboards/punk75/keymaps/via/keymap.c b/qmk/keyboards/punk75/keymaps/via/keymap.c
new file mode 100644
index 00000000..265814d1
--- /dev/null
+++ b/qmk/keyboards/punk75/keymaps/via/keymap.c
@@ -0,0 +1,90 @@
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/* QWERTY
+ * .--------------------------------------------------------------------------------------------------------------------------------------.
+ * | ESC    | 1      | 2      | 3      | 4      | 5      | -      | `      | =      | 6      | 7      | 8      | 9      | 0      | BACKSP |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
+ * | TAB    | Q      | W      | E      | R      | T      | [      | \      | ]      | Y      | U      | I      | O      | P      | '      |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
+ * | CAP LK | A      | S      | D      | F      | G      | HOME   | DEL    | PG UP  | H      | J      | K      | L      | ;      | ENTER  |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
+ * | LSHIFT | Z      | X      | C      | V      | B      | END    | UP     | PG DN  | N      | M      | ,      | .      | /      | RSHIFT |
+ * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+-----------------+--------+--------|
+ * | LCTRL  | LGUI   | LALT   | FN     | SPACE  | SPACE  | LEFT   | DOWN   | RIGHT  | SPACE  | SPACE  | FN     | RALT   | RGUI   | RCTRL  |
+ * '--------------------------------------------------------------------------------------------------------------------------------------'
+ */
+
+    [0] = LAYOUT_ortho_5x15( /* QWERTY */
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_MINS, KC_GRV,  KC_EQL,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_LBRC, KC_BSLS, KC_RBRC, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_QUOT,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_HOME, KC_DEL,  KC_PGUP, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_END,  KC_UP,   KC_PGDN, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
+        KC_LCTL, KC_LGUI, KC_LALT, MO(1), KC_SPC,  KC_SPC,  KC_LEFT, KC_DOWN, KC_RGHT, KC_SPC,  KC_SPC,  MO(1), KC_RALT, KC_RGUI, KC_RCTL
+    ),
+
+/* FUNCTION
+ * .--------------------------------------------------------------------------------------------------------------------------------------.
+ * | F1     | F2     | F3     | F4     | F5     | F6     | NUM LK | P/     | P*     | F7     | F8     | F9     | F10    | F11    | F12    |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * | SELECT | CALC   | MYCOMP | MAIL   | RGB HD | RGB HI | P7     | P8     | P9     | -      |        |        | PR SCR | SCR LK | PAUSE  |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * | PREV   | PLAY   | NEXT   | STOP   | RGB SD | RGB SI | P4     | P5     | P6     | +      |        | RESET  |        |        |        |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * | VOL-   | MUTE   | VOL+   | APP    | RGB VD | RGB VI | P1     | P2     | P3     | PENT   |        |        |        |        |        |
+ * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+ * |        |        | RGB TG | FN     | RGB RMD| RGB MD | P0     |        | P.     | PENT   | PENT   | FN     |        |        |        |
+ * '--------------------------------------------------------------------------------------------------------------------------------------'
+ */
+
+    [1] = LAYOUT_ortho_5x15( /* FUNCTION */
+        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_NLCK, KC_SLSH, KC_ASTR, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
+        KC_MSEL, KC_CALC, KC_MYCM, KC_MAIL, RGB_HUD, RGB_HUI, KC_P7,   KC_P8,   KC_P9,   KC_MINS, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP, RGB_SAD, RGB_SAI, KC_P4,   KC_P5,   KC_P6,   KC_PLUS, _______, RESET,   _______, _______, _______,
+        KC_VOLD, KC_MUTE, KC_VOLU, KC_APP,  RGB_VAD, RGB_VAI, KC_P1,   KC_P2,   KC_P3,   KC_PENT, _______, _______, _______, _______, _______,
+        _______, _______, RGB_TOG, MO(1), RGB_RMOD,RGB_MOD, KC_P0,   _______, KC_PDOT, KC_PENT, KC_PENT, MO(1), _______, _______, _______
+    ),
+
+    [2] = LAYOUT_ortho_5x15(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+    ),
+
+    [3] = LAYOUT_ortho_5x15(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+    ),
+};
+
+void led_keypress_update(pin_t led_pin, uint16_t keycode, keyrecord_t *record) {
+    // When a key is pressed turn on the LED, when released turn it off
+    writePin(led_pin, record->event.pressed);
+}
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    // Update LED state
+    led_keypress_update(LED, keycode, record);
+    return true;
+}
+
+void encoder_update_user(uint8_t index, bool clockwise) {
+    if (index == 0) { /* Encoder on the LEFT */
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    } else if (index == 1) { /* Encoder on the RIGHT */
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    }
+}
diff --git a/qmk/keyboards/punk75/keymaps/via/rules.mk b/qmk/keyboards/punk75/keymaps/via/rules.mk
new file mode 100644
index 00000000..1e5b9980
--- /dev/null
+++ b/qmk/keyboards/punk75/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/qmk/keyboards/quad_h/lb75/rules.mk b/qmk/keyboards/quad_h/lb75/rules.mk
index 37a5d441..f4f03c7d 100644
--- a/qmk/keyboards/quad_h/lb75/rules.mk
+++ b/qmk/keyboards/quad_h/lb75/rules.mk
@@ -29,5 +29,4 @@ MIDI_ENABLE = no            # MIDI support
 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
 
diff --git a/qmk/keyboards/quantrik/kyuu/config.h b/qmk/keyboards/quantrik/kyuu/config.h
index 69fa4191..a7ef5490 100644
--- a/qmk/keyboards/quantrik/kyuu/config.h
+++ b/qmk/keyboards/quantrik/kyuu/config.h
@@ -212,34 +212,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/quantrik/kyuu/rules.mk b/qmk/keyboards/quantrik/kyuu/rules.mk
index 62b1a397..fba77a1b 100644
--- a/qmk/keyboards/quantrik/kyuu/rules.mk
+++ b/qmk/keyboards/quantrik/kyuu/rules.mk
@@ -30,4 +30,3 @@ 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
diff --git a/qmk/keyboards/qvex/lynepad/config.h b/qmk/keyboards/qvex/lynepad/config.h
index 86b3910a..d1a5c2eb 100644
--- a/qmk/keyboards/qvex/lynepad/config.h
+++ b/qmk/keyboards/qvex/lynepad/config.h
@@ -25,7 +25,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    QVEX
 #define PRODUCT         Lynepad
-#define DESCRIPTION     Macro Keypad
 
 /* key matrix size */
 #define MATRIX_ROWS 3
diff --git a/qmk/keyboards/qvex/lynepad/info.json b/qmk/keyboards/qvex/lynepad/info.json
new file mode 100644
index 00000000..405614e9
--- /dev/null
+++ b/qmk/keyboards/qvex/lynepad/info.json
@@ -0,0 +1,12 @@
+{
+    "keyboard_name": "QVEX Lynepad",
+    "url": "https://www.tindie.com/products/qvex_tech/qvex-lynepad-macro-keypad/",
+    "maintainer": "KemoNine",
+    "width": 4,
+    "height": 3,
+    "layouts": {
+      "LAYOUT": {
+        "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}]
+      }
+    }
+  }
\ No newline at end of file
diff --git a/qmk/keyboards/qvex/lynepad/keymaps/default/keymap.c b/qmk/keyboards/qvex/lynepad/keymaps/default/keymap.c
index c7079d63..37e015e6 100644
--- a/qmk/keyboards/qvex/lynepad/keymaps/default/keymap.c
+++ b/qmk/keyboards/qvex/lynepad/keymaps/default/keymap.c
@@ -15,8 +15,6 @@
  */
 #include QMK_KEYBOARD_H
 
-#include <print.h>
-
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 /* Keymap (Base Layer) Default Layer
    * |----------------------------|
@@ -25,7 +23,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    * | 9 | 10 | 11 |              |
    * |----------------------------|
    */
-[0] = LAYOUT_Lynepad(
+[0] = LAYOUT(
   KC_MS_BTN4,   KC_MS_BTN2,   KC_MS_UP,    KC_MS_BTN1,
   KC_MS_BTN5,   KC_MS_LEFT,   KC_MS_DOWN,  KC_MS_RIGHT,
   KC_MS_ACCEL0, KC_MS_ACCEL1, KC_MS_ACCEL2
@@ -90,34 +88,30 @@ void matrix_scan_user(void) {
     }
     if (enc2Up != enc2UpPrev) {
         if (enc2Up < ENC_TILT_THRESHOLD) {
-            register_code16(RGB_VAI);
         }
         else {
-            unregister_code16(RGB_VAI);
+            rgblight_increase_val_noeeprom();
         }
     }
     if (enc2Down != enc2DownPrev) {
         if (enc2Down < ENC_TILT_THRESHOLD) {
-            register_code16(RGB_VAD);
         }
         else {
-            unregister_code16(RGB_VAD);
+            rgblight_decrease_val_noeeprom();
         }
     }
     if (enc2Left != enc2LeftPrev) {
         if (enc2Left < ENC_TILT_THRESHOLD) {
-            register_code16(RGB_TOG);
         }
         else {
-            unregister_code16(RGB_TOG);
+            rgblight_toggle_noeeprom();
         }
     }
     if (enc2Right != enc2RightPrev) {
         if (enc2Right < ENC_TILT_THRESHOLD) {
-            register_code16(RGB_MODE_FORWARD);
         }
         else {
-            unregister_code16(RGB_MODE_FORWARD);
+            rgblight_step_noeeprom();
         }
     }
 }
diff --git a/qmk/keyboards/qvex/lynepad/lynepad.c b/qmk/keyboards/qvex/lynepad/lynepad.c
index 9e3e1179..33620d9d 100644
--- a/qmk/keyboards/qvex/lynepad/lynepad.c
+++ b/qmk/keyboards/qvex/lynepad/lynepad.c
@@ -1,7 +1,18 @@
+/*
+Copyright 2020 KemoNine
+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 "lynepad.h"
 
-#include <print.h>
-
 void keyboard_pre_init_kb(void) {
     // Encoder pins
     setPinInput(PIN_TW_SW);
@@ -10,14 +21,9 @@ void keyboard_pre_init_kb(void) {
     setPinInput(PIN_RJ_DIR_C);
     setPinInput(PIN_RJ_DIR_B);
     setPinInput(PIN_RJ_DIR_D);
-}
 
-// void keyboard_post_init_user(void) {
-//   debug_enable=true;
-//   debug_matrix=true;
-//   debug_keyboard=true;
-//   debug_mouse=true;
-// }
+    keyboard_pre_init_user();
+}
 
 int16_t enc1Center = 1;
 int16_t enc1CenterPrev = 1;
diff --git a/qmk/keyboards/qvex/lynepad/lynepad.h b/qmk/keyboards/qvex/lynepad/lynepad.h
index 95b1178f..2a3015ce 100644
--- a/qmk/keyboards/qvex/lynepad/lynepad.h
+++ b/qmk/keyboards/qvex/lynepad/lynepad.h
@@ -25,13 +25,13 @@
  * The second converts the arguments into a two-dimensional array which
  * represents the switch matrix.
  */
-#define LAYOUT_Lynepad( \
-    K00, K01, K02, K03,           \
-    K10, K11, K12, K13,           \
-    K20, K21, K22                 \
+#define LAYOUT( \
+    k00, k01, k02, k03,           \
+    k10, k11, k12, k13,           \
+    k20, k21, k22                 \
 ) \
 { \
-    { K00,   K01,   K02,   K03   }, \
-    { K10,   K11,   K12,   K13   }, \
-    { K20,   K21,   K22,   KC_NO }  \
+    { k00,   k01,   k02,   k03   }, \
+    { k10,   k11,   k12,   k13   }, \
+    { k20,   k21,   k22,   KC_NO }  \
 }
diff --git a/qmk/keyboards/qvex/lynepad/matrix.c b/qmk/keyboards/qvex/lynepad/matrix.c
new file mode 100644
index 00000000..ad4ae3ba
--- /dev/null
+++ b/qmk/keyboards/qvex/lynepad/matrix.c
@@ -0,0 +1,27 @@
+/*
+Copyright 2020 KemoNine
+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 "quantum.h"
+
+void matrix_init_custom(void) {
+    // TODO: initialize hardware here
+}
+
+bool matrix_scan_custom(matrix_row_t current_matrix[]) {
+    bool matrix_has_changed = false;
+
+    // TODO: add matrix scanning routine here
+
+    return matrix_has_changed;
+}
diff --git a/qmk/keyboards/qvex/lynepad/readme.md b/qmk/keyboards/qvex/lynepad/readme.md
index 6657b319..68dd85a6 100644
--- a/qmk/keyboards/qvex/lynepad/readme.md
+++ b/qmk/keyboards/qvex/lynepad/readme.md
@@ -2,9 +2,9 @@
 
 Macro pad with 11 keys and 2 rotary encoders.
 
-Keyboard Maintainer: [KemoNine](https://git.kemonine.info/kemonine/keyboard)  
-Hardware Supported: QVEX Lynepad: macro keypad
-Hardware Availability: Tindie [Keyboard Kit](https://www.tindie.com/products/qvex_tech/qvex-lynepad-macro-keypad/)
+* Keyboard Maintainer: [KemoNine](https://git.kemonine.info/kemonine/keyboard)
+* Hardware Supported: QVEX Lynepad: macro keypad
+* Hardware Availability: Tindie [Keyboard Kit](https://www.tindie.com/products/qvex_tech/qvex-lynepad-macro-keypad/)
 
 Make example for this macro pad (after setting up your build environment):
 
diff --git a/qmk/keyboards/qvex/lynepad/rules.mk b/qmk/keyboards/qvex/lynepad/rules.mk
index 641c52e3..7b05cfb9 100644
--- a/qmk/keyboards/qvex/lynepad/rules.mk
+++ b/qmk/keyboards/qvex/lynepad/rules.mk
@@ -2,13 +2,6 @@
 MCU = atmega32u4
 
 # Bootloader selection
-#   Teensy       halfkay
-#   Pro Micro    caterina
-#   Atmel DFU    atmel-dfu
-#   LUFA DFU     lufa-dfu
-#   QMK DFU      qmk-dfu
-#   ATmega32A    bootloadHID
-#   ATmega328P   USBasp
 BOOTLOADER = caterina
 
 # Build Options
@@ -17,12 +10,12 @@ BOOTLOADER = caterina
 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
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # 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 = yes           # USB Nkey Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality on B7 by default
-RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 ENCODER_ENABLE = yes        # Enable the encoders
diff --git a/qmk/keyboards/qwertyydox/config.h b/qmk/keyboards/qwertyydox/config.h
index 34679521..900c0830 100644
--- a/qmk/keyboards/qwertyydox/config.h
+++ b/qmk/keyboards/qwertyydox/config.h
@@ -224,34 +224,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/rabbit/rabbit68/config.h b/qmk/keyboards/rabbit/rabbit68/config.h
index 5a91b379..0d67d067 100644
--- a/qmk/keyboards/rabbit/rabbit68/config.h
+++ b/qmk/keyboards/rabbit/rabbit68/config.h
@@ -212,34 +212,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/rabbit/rabbit68/rules.mk b/qmk/keyboards/rabbit/rabbit68/rules.mk
index b4d53d2e..d6d85874 100644
--- a/qmk/keyboards/rabbit/rabbit68/rules.mk
+++ b/qmk/keyboards/rabbit/rabbit68/rules.mk
@@ -30,4 +30,3 @@ 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
diff --git a/qmk/keyboards/rainkeeb/config.h b/qmk/keyboards/rainkeeb/config.h
new file mode 100644
index 00000000..36c3a5d5
--- /dev/null
+++ b/qmk/keyboards/rainkeeb/config.h
@@ -0,0 +1,51 @@
+/* Copyright 2020 Regan Palmer
+ *
+ * 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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x726B // rk - "rainkeebs"
+#define PRODUCT_ID      0x726B // rk - "rainkeeb"
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    rainkeebs
+#define PRODUCT         rainkeeb
+
+/* key matrix size */
+#define MATRIX_ROWS 8
+#define MATRIX_COLS 6
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { D3, D2, D4, C6, D7, E6, B4, B5 }
+#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 }
+#define UNUSED_PINS
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+/* encoder pads */
+#define ENCODERS_PAD_A { B2 }
+#define ENCODERS_PAD_B { B6 }
+#define ENCODER_RESOLUTION 4
diff --git a/qmk/keyboards/rainkeeb/info.json b/qmk/keyboards/rainkeeb/info.json
new file mode 100644
index 00000000..d329c831
--- /dev/null
+++ b/qmk/keyboards/rainkeeb/info.json
@@ -0,0 +1,54 @@
+{
+    "keyboard_name": "rainkeeb",
+    "url": "",
+    "maintainer": "rain",
+    "width": 12,
+    "height": 4,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label":"k00", "x":0, "y":0},
+                {"label":"k01", "x":1, "y":0},
+                {"label":"k02", "x":2, "y":0},
+                {"label":"k03", "x":3, "y":0},
+                {"label":"k04", "x":4, "y":0},
+                {"label":"k05", "x":7, "y":0},
+                {"label":"k06", "x":8, "y":0},
+                {"label":"k07", "x":9, "y":0},
+                {"label":"k08", "x":10, "y":0},
+                {"label":"k09", "x":11, "y":0},
+                {"label":"k10", "x":0, "y":1},
+                {"label":"k11", "x":1, "y":1},
+                {"label":"k12", "x":2, "y":1},
+                {"label":"k13", "x":3, "y":1},
+                {"label":"k14", "x":4, "y":1},
+                {"label":"k15", "x":5.5, "y":1},
+                {"label":"k16", "x":7, "y":1},
+                {"label":"k17", "x":8, "y":1},
+                {"label":"k18", "x":9, "y":1},
+                {"label":"k19", "x":10, "y":1},
+                {"label":"k1a", "x":11, "y":1},
+                {"label":"k20", "x":0, "y":2},
+                {"label":"k21", "x":1, "y":2},
+                {"label":"k22", "x":2, "y":2},
+                {"label":"k23", "x":3, "y":2},
+                {"label":"k24", "x":4, "y":2},
+                {"label":"k25", "x":5.5, "y":2},
+                {"label":"k26", "x":7, "y":2},
+                {"label":"k27", "x":8, "y":2},
+                {"label":"k28", "x":9, "y":2},
+                {"label":"k29", "x":10, "y":2},
+                {"label":"k2a", "x":11, "y":2},
+                {"label":"k30", "x":0, "y":3},
+                {"label":"k31", "x":1, "y":3},
+                {"label":"k32", "x":2, "y":3},
+                {"label":"k33", "x":3, "y":3, "w":2},
+                {"label":"k34", "x":5, "y":3, "w":2},
+                {"label":"k35", "x":7, "y":3, "w":2},
+                {"label":"k36", "x":9, "y":3},
+                {"label":"k37", "x":10, "y":3},
+                {"label":"k38", "x":11, "y":3}
+            ]
+        }
+    }
+}
diff --git a/qmk/keyboards/rainkeeb/keymaps/default/keymap.c b/qmk/keyboards/rainkeeb/keymaps/default/keymap.c
new file mode 100644
index 00000000..f68ab2ef
--- /dev/null
+++ b/qmk/keyboards/rainkeeb/keymaps/default/keymap.c
@@ -0,0 +1,115 @@
+/* Copyright 2020 Regan Palmer
+ *
+ * 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
+
+enum layers {
+  _BASE,
+  _RAISE,
+  _ADJUST,
+  _GAME,
+};
+
+#define RAISE MO(_RAISE)
+#define ADJUST MO(_ADJUST)
+#define GAME TG(_GAME)
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASE] = LAYOUT(
+        KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,             KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,
+        KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_MPLY, KC_H,    KC_J,    KC_K,    KC_L,    KC_ENT,
+        KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_PSCR, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_BSPC,
+        KC_LCTL, KC_LALT, KC_LGUI, KC_LSFT,          RAISE,            KC_SPC,  KC_RGUI, KC_RALT, KC_RCTL),
+
+    [_RAISE] = LAYOUT(
+        KC_1,    KC_2,    KC_3,    KC_4,    KC_5,             KC_6,    KC_7,    KC_8,    KC_9,    KC_0,
+        KC_ESC,  KC_GRV,  KC_BSLS, KC_UP,   KC_MINS, KC_TRNS, KC_LBRC, KC_RBRC, KC_SCLN, KC_QUOT, KC_TRNS,
+        KC_TAB,  KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, ADJUST,  KC_EQL,  KC_SLSH, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+    [_ADJUST] = LAYOUT(
+        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_F13,  KC_F14,  KC_F15,  GAME,   KC_HOME, KC_PGDN, KC_PGUP, KC_END,  KC_TRNS,
+        RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_DEL,  KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+    [_GAME] = LAYOUT(
+        KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,             KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,
+        KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    GAME, KC_H,    KC_J,    KC_K,    KC_L,    KC_ENT,
+        KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_PSCR, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_BSPC,
+        KC_LCTL, KC_LALT, KC_LGUI, KC_LSFT,          KC_NO,            KC_SPC,  KC_RGUI, KC_RALT, KC_RCTL)
+};
+
+void encoder_update_user(uint8_t index, bool clockwise) {
+	switch (get_highest_layer(layer_state)) {
+        case _BASE:
+             if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+            break;
+        case _RAISE:
+            if (clockwise) {
+            tap_code(KC_MS_WH_DOWN);
+        } else {
+            tap_code(KC_MS_WH_UP);
+        }
+            break;
+		case _ADJUST:
+			if (clockwise) {
+            tap_code(KC_MS_WH_RIGHT);
+        } else {
+            tap_code(KC_MS_WH_LEFT);
+        }
+			break;
+        case _GAME:
+             if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+            break;
+    }
+}
+
+char wpm[10];
+
+void oled_task_user(void) {
+    sprintf(wpm, "WPM: %03d", get_current_wpm());
+
+    // Host Keyboard Layer Status
+    oled_write_P(PSTR("       rainkeeb \n"), false);
+    oled_write_P(PSTR(" Layer: "), false);
+
+    switch (get_highest_layer(layer_state)) {
+        case _BASE:
+            oled_write_P(PSTR("Default\n"), false);
+            break;
+        case _RAISE:
+            oled_write_P(PSTR("Raise\n"), false);
+            break;
+        case _ADJUST:
+            oled_write_P(PSTR("Adjust\n"), false);
+            break;
+        case _GAME:
+            oled_write_P(PSTR("Game\n"), false);
+            break;
+        default:
+            // Or use the write_ln shortcut over adding '\n' to the end of your string
+            oled_write_ln_P(PSTR("Undefined"), false);
+    }
+    oled_write_P(PSTR(" "), false);
+    oled_write(wpm, false);
+}
diff --git a/qmk/keyboards/rainkeeb/keymaps/via/keymap.c b/qmk/keyboards/rainkeeb/keymaps/via/keymap.c
new file mode 100644
index 00000000..f68ab2ef
--- /dev/null
+++ b/qmk/keyboards/rainkeeb/keymaps/via/keymap.c
@@ -0,0 +1,115 @@
+/* Copyright 2020 Regan Palmer
+ *
+ * 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
+
+enum layers {
+  _BASE,
+  _RAISE,
+  _ADJUST,
+  _GAME,
+};
+
+#define RAISE MO(_RAISE)
+#define ADJUST MO(_ADJUST)
+#define GAME TG(_GAME)
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASE] = LAYOUT(
+        KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,             KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,
+        KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_MPLY, KC_H,    KC_J,    KC_K,    KC_L,    KC_ENT,
+        KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_PSCR, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_BSPC,
+        KC_LCTL, KC_LALT, KC_LGUI, KC_LSFT,          RAISE,            KC_SPC,  KC_RGUI, KC_RALT, KC_RCTL),
+
+    [_RAISE] = LAYOUT(
+        KC_1,    KC_2,    KC_3,    KC_4,    KC_5,             KC_6,    KC_7,    KC_8,    KC_9,    KC_0,
+        KC_ESC,  KC_GRV,  KC_BSLS, KC_UP,   KC_MINS, KC_TRNS, KC_LBRC, KC_RBRC, KC_SCLN, KC_QUOT, KC_TRNS,
+        KC_TAB,  KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, ADJUST,  KC_EQL,  KC_SLSH, KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+    [_ADJUST] = LAYOUT(
+        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_F13,  KC_F14,  KC_F15,  GAME,   KC_HOME, KC_PGDN, KC_PGUP, KC_END,  KC_TRNS,
+        RESET, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_DEL,  KC_TRNS, KC_TRNS, KC_TRNS,
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+    [_GAME] = LAYOUT(
+        KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,             KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,
+        KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    GAME, KC_H,    KC_J,    KC_K,    KC_L,    KC_ENT,
+        KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_PSCR, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_BSPC,
+        KC_LCTL, KC_LALT, KC_LGUI, KC_LSFT,          KC_NO,            KC_SPC,  KC_RGUI, KC_RALT, KC_RCTL)
+};
+
+void encoder_update_user(uint8_t index, bool clockwise) {
+	switch (get_highest_layer(layer_state)) {
+        case _BASE:
+             if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+            break;
+        case _RAISE:
+            if (clockwise) {
+            tap_code(KC_MS_WH_DOWN);
+        } else {
+            tap_code(KC_MS_WH_UP);
+        }
+            break;
+		case _ADJUST:
+			if (clockwise) {
+            tap_code(KC_MS_WH_RIGHT);
+        } else {
+            tap_code(KC_MS_WH_LEFT);
+        }
+			break;
+        case _GAME:
+             if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+            break;
+    }
+}
+
+char wpm[10];
+
+void oled_task_user(void) {
+    sprintf(wpm, "WPM: %03d", get_current_wpm());
+
+    // Host Keyboard Layer Status
+    oled_write_P(PSTR("       rainkeeb \n"), false);
+    oled_write_P(PSTR(" Layer: "), false);
+
+    switch (get_highest_layer(layer_state)) {
+        case _BASE:
+            oled_write_P(PSTR("Default\n"), false);
+            break;
+        case _RAISE:
+            oled_write_P(PSTR("Raise\n"), false);
+            break;
+        case _ADJUST:
+            oled_write_P(PSTR("Adjust\n"), false);
+            break;
+        case _GAME:
+            oled_write_P(PSTR("Game\n"), false);
+            break;
+        default:
+            // Or use the write_ln shortcut over adding '\n' to the end of your string
+            oled_write_ln_P(PSTR("Undefined"), false);
+    }
+    oled_write_P(PSTR(" "), false);
+    oled_write(wpm, false);
+}
diff --git a/qmk/keyboards/rainkeeb/keymaps/via/rules.mk b/qmk/keyboards/rainkeeb/keymaps/via/rules.mk
new file mode 100644
index 00000000..036bd6d1
--- /dev/null
+++ b/qmk/keyboards/rainkeeb/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
\ No newline at end of file
diff --git a/qmk/keyboards/rainkeeb/rainkeeb.c b/qmk/keyboards/rainkeeb/rainkeeb.c
new file mode 100644
index 00000000..b13ecb24
--- /dev/null
+++ b/qmk/keyboards/rainkeeb/rainkeeb.c
@@ -0,0 +1,16 @@
+/* Copyright 2020 Regan Palmer
+ *
+ * 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 "rainkeeb.h"
\ No newline at end of file
diff --git a/qmk/keyboards/rainkeeb/rainkeeb.h b/qmk/keyboards/rainkeeb/rainkeeb.h
new file mode 100644
index 00000000..f0179f08
--- /dev/null
+++ b/qmk/keyboards/rainkeeb/rainkeeb.h
@@ -0,0 +1,34 @@
+/* Copyright 2020 Regan Palmer
+ *
+ * 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( \
+    K00, K10, K01, K11, K02,      K13, K03, K14, K04, K15, \
+    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, \
+    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, \
+    K60, K70, K61, K72,      K62,      K73, K64, K74, K65  \
+) { \
+    { K00,   K01,   K02,   K03,   K04,   KC_NO }, \
+    { K10,   K11,   KC_NO, K13,   K14,   K15 }, \
+    { K20,   K21,   K22,   K23,   K24,   K25 }, \
+    { K30,   K31,   K32,   K33,   K34,   KC_NO }, \
+    { K40,   K41,   K42,   K43,   K44,   K45 }, \
+    { K50,   K51,   K52,   K53,   K54,   KC_NO }, \
+    { K60,   K61,   K62,   KC_NO, K64,   K65 }, \
+    { K70,   KC_NO, K72,   K73,   K74,   KC_NO }  \
+}
diff --git a/qmk/keyboards/rainkeeb/readme.md b/qmk/keyboards/rainkeeb/readme.md
new file mode 100644
index 00000000..f2c759eb
--- /dev/null
+++ b/qmk/keyboards/rainkeeb/readme.md
@@ -0,0 +1,24 @@
+# rainkeeb
+
+![rainkeeb](https://i.imgur.com/GpVBRMw.jpg)
+
+My first custom mech design. 4x10(ish), pro micro based, unibody, split, ortho (any more adjectives?), with OLED and (optional) rotary encoder.
+
+![Default layout](https://i.imgur.com/rCOwsoy.png)
+This is the default layout, at least the base layer. By default the OLED displays "rainkeeb" at the top in case you forget what you're typing on, a layer indicator below that (Default, Raised, Alt), and a WPM counter below that. Encoder toggles Play/Pause on click on the Default and Raised layers, and is supposed to RESET into flash-mode on the Alt layer but that's not working for some reason. Clockwise turn increases volume, scrolls down, and scrolls right on the Default, Raise, and Alt layers respectively. Counterclockwise does the opposite of the clockwise turns, you get the picture.
+
+* Keyboard Maintainer: [rain](https://github.com/rainsff)
+* Hardware Supported: rainkeeb PCB v1
+* Hardware Availability: GB soon
+
+Make example for this keyboard (after setting up your build environment):
+
+    make rainkeeb:default
+
+To put reset into bootloader mode just push the reset button from the left side of the board using a pair of tweezers or similar object.
+
+Install example for this keyboard:
+
+    make rainkeeb:default:flash
+
+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).
diff --git a/qmk/keyboards/rainkeeb/rules.mk b/qmk/keyboards/rainkeeb/rules.mk
new file mode 100644
index 00000000..aa9aab9b
--- /dev/null
+++ b/qmk/keyboards/rainkeeb/rules.mk
@@ -0,0 +1,28 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   comment out to disable the options.
+#
+BOOTMAGIC_ENABLE = yes	# 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 = no
+
+# OLED enable
+OLED_DRIVER_ENABLE = yes
+
+# Encoder enable
+ENCODER_ENABLE = yes
+
+# WPM counter enable
+WPM_ENABLE = yes
diff --git a/qmk/keyboards/ramonimbao/aelith/info.json b/qmk/keyboards/ramonimbao/aelith/info.json
index e001c1d4..47e11dcc 100644
--- a/qmk/keyboards/ramonimbao/aelith/info.json
+++ b/qmk/keyboards/ramonimbao/aelith/info.json
@@ -81,6 +81,86 @@
                 {"x":6, "y":4, "w":2.25},
                 {"x":8.25, "y":4},
 
+                {"x":10.25, "y":4, "w":2.75},
+                {"x":13, "y":4, "w":1.5},
+                {"x":17.5, "y":4, "w":1.5}
+            ]
+        },
+        "LAYOUT_alice": {
+            "layout": [
+                {"x":0.5, "y":0},
+
+                {"x":1.75, "y":0},
+                {"x":2.75, "y":0},
+                {"x":3.75, "y":0},
+                {"x":4.75, "y":0},
+                {"x":5.75, "y":0},
+                {"x":6.75, "y":0},
+                {"x":7.75, "y":0},
+
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
+                {"x":15, "y":0},
+                {"x":16, "y":0},
+                {"x":17, "y":0, "w":2},
+
+                {"x":0.25, "y":1},
+                {"x":1.75, "y":1, "w":1.5},
+                {"x":3.25, "y":1},
+                {"x":4.25, "y":1},
+                {"x":5.25, "y":1},
+                {"x":6.25, "y":1},
+                {"x":7.25, "y":1},
+
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1},
+                {"x":14.5, "y":1},
+                {"x":15.5, "y":1},
+                {"x":16.5, "y":1},
+                {"x":17.5, "y":1, "w":1.5},
+
+                {"x":0, "y":2},
+
+                {"x":1.75, "y":2, "w":1.75},
+                {"x":3.5, "y":2},
+                {"x":4.5, "y":2},
+                {"x":5.5, "y":2},
+                {"x":6.5, "y":2},
+                {"x":7.5, "y":2},
+
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2},
+                {"x":13.75, "y":2},
+                {"x":14.75, "y":2},
+                {"x":15.75, "y":2},
+                {"x":16.75, "y":2, "w":2.25},
+
+                {"x":1.75, "y":3, "w":2.25},
+                {"x":4, "y":3},
+                {"x":5, "y":3},
+                {"x":6, "y":3},
+                {"x":7, "y":3},
+                {"x":8, "y":3},
+
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3},
+                {"x":13.25, "y":3},
+                {"x":14.25, "y":3},
+                {"x":15.25, "y":3},
+                {"x":16.25, "y":3, "w":1.75},
+                {"x":18, "y":3},
+
+                {"x":1.75, "y":4, "w":1.5},
+                {"x":4.5, "y":4, "w":1.5},
+                {"x":6, "y":4, "w":2.25},
+                {"x":8.25, "y":4},
+
                 {"x":10.25, "y":4, "w":2.75},
                 {"x":13, "y":4, "w":1.5},
                 {"x":17.5, "y":4, "w":1.5}
diff --git a/qmk/keyboards/ramonimbao/aelith/rules.mk b/qmk/keyboards/ramonimbao/aelith/rules.mk
index 5e4cc3d6..53042630 100644
--- a/qmk/keyboards/ramonimbao/aelith/rules.mk
+++ b/qmk/keyboards/ramonimbao/aelith/rules.mk
@@ -24,4 +24,4 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 BLUETOOTH_ENABLE = no       # Enable Bluetooth
 AUDIO_ENABLE = no           # Audio output
 
-LAYOUTS = alice
+LAYOUTS = alice alice_split_bs
diff --git a/qmk/keyboards/ramonimbao/herringbone/keymaps/via/rules.mk b/qmk/keyboards/ramonimbao/herringbone/keymaps/via/rules.mk
index 930e3552..1e5b9980 100644
--- a/qmk/keyboards/ramonimbao/herringbone/keymaps/via/rules.mk
+++ b/qmk/keyboards/ramonimbao/herringbone/keymaps/via/rules.mk
@@ -1,3 +1 @@
 VIA_ENABLE = yes
-MOUSEKEY_ENABLE = no
-EXTRAKEY_ENABLE = no
diff --git a/qmk/keyboards/rart/rart45/config.h b/qmk/keyboards/rart/rart45/config.h
new file mode 100644
index 00000000..d4d7e744
--- /dev/null
+++ b/qmk/keyboards/rart/rart45/config.h
@@ -0,0 +1,47 @@
+/* Copyright 2020 Alabahuy
+ * 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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x414C
+#define PRODUCT_ID      0x0045
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Alabahuy
+#define PRODUCT         Rart45
+
+/* key matrix size */
+#define MATRIX_ROWS 9
+#define MATRIX_COLS 6
+
+#define MATRIX_ROW_PINS { D1, C3, C1, B1, D0, C2, C0, D7, B0 }
+#define MATRIX_COL_PINS { D6, D4, B2, B5, B4, B3 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+#define LED_CAPS_LOCK_PIN D5
+#define LED_PIN_ON_STATE 0
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
diff --git a/qmk/keyboards/rart/rart45/info.json b/qmk/keyboards/rart/rart45/info.json
new file mode 100644
index 00000000..d3fc5aa7
--- /dev/null
+++ b/qmk/keyboards/rart/rart45/info.json
@@ -0,0 +1,70 @@
+{
+  "keyboard_name": "Rartlice",
+  "url": "",
+  "maintainer": "Alabahuy",
+  "width": 13,
+  "height": 5,
+  "layouts": {
+    "LAYOUT_all": {
+      "layout": [
+        { "x": 0, "y": 0 },
+        { "x": 1, "y": 0 },
+        { "x": 2, "y": 0 },
+        { "x": 3, "y": 0 },
+        { "x": 4, "y": 0 },
+        { "x": 5, "y": 0 },
+        { "x": 7, "y": 0 },
+        { "x": 8, "y": 0 },
+        { "x": 9, "y": 0 },
+        { "x": 10, "y": 0 },
+        { "x": 11, "y": 0 },
+        { "x": 12, "y": 0 },
+
+        {"x": 0, "y": 1 },
+        {"x": 1, "y": 1 },
+        {"x": 2, "y": 1 },
+        {"x": 3, "y": 1 },
+        {"x": 4, "y": 1 },
+        {"x": 5, "y": 1 },
+        {"x": 7, "y": 1 },
+        {"x": 8, "y": 1 },
+        {"x": 9, "y": 1 },
+        {"x": 10, "y": 1 },
+        {"x": 11, "y": 1 },
+        {"x": 12, "y": 1 },
+
+        {"x": 0, "y": 2 },
+        {"x": 1, "y": 2 },
+        {"x": 2, "y": 2 },
+        {"x": 3, "y": 2 },
+        {"x": 4, "y": 2 },
+        {"x": 5, "y": 2 },
+        {"x": 7, "y": 2 },
+        {"x": 8, "y": 2 },
+        {"x": 9, "y": 2 },
+        {"x": 10, "y": 2 },
+        {"x": 11, "y": 2 },
+        {"x": 12, "y": 2 },
+
+        {"x": 0, "y": 3 },
+        {"x": 1, "y": 3 },
+        {"x": 2, "y": 3 },
+        {"x": 3, "y": 3 },
+        {"x": 4, "y": 3 },
+        {"x": 5, "y": 3 },
+        {"x": 7, "y": 3 },
+        {"x": 8, "y": 3 },
+        {"x": 9, "y": 3 },
+        {"x": 10, "y": 3 },
+        {"x": 11, "y": 3 },
+        {"x": 12, "y": 3 },
+
+        {"x": 2.875, "y": 4, "w":1.25},
+        {"x": 4.125, "y": 4, "w":1.25 },
+        {"x": 5.375, "y": 4, "w":2.25 },
+        {"x": 7.625, "y": 4, "w":1.25 },
+        {"x": 8.875, "y": 4, "w":1.25 }
+      ]
+    }
+  }
+}
diff --git a/qmk/keyboards/rart/rart45/keymaps/default/keymap.c b/qmk/keyboards/rart/rart45/keymaps/default/keymap.c
new file mode 100644
index 00000000..c1aae582
--- /dev/null
+++ b/qmk/keyboards/rart/rart45/keymaps/default/keymap.c
@@ -0,0 +1,43 @@
+/* Copyright 2020 Alabahuy
+ * 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_all(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,    
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+        KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_BSLS,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
+                                   KC_LCTL, MO(1),       KC_SPC,       MO(2),   KC_LALT
+  ),
+
+  [1] = LAYOUT_all(
+        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_LCTL, _______,     KC_SPC,       _______, KC_LALT        
+  ),
+
+  [2] = LAYOUT_all(
+        RESET,   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+                                   KC_LCTL, _______,     KC_SPC,       _______, KC_LALT   
+  )
+
+};
diff --git a/qmk/keyboards/rart/rart45/keymaps/via/keymap.c b/qmk/keyboards/rart/rart45/keymaps/via/keymap.c
new file mode 100644
index 00000000..2147bb67
--- /dev/null
+++ b/qmk/keyboards/rart/rart45/keymaps/via/keymap.c
@@ -0,0 +1,50 @@
+/* Copyright 2020 Alabahuy
+ * 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_all(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,    
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+        KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_BSLS,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
+                                   KC_LCTL, MO(1),       KC_SPC,       MO(2),   KC_LALT
+  ),
+
+  [1] = LAYOUT_all(
+        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_LCTL, _______,     KC_SPC,       _______, KC_LALT        
+  ),
+
+  [2] = LAYOUT_all(
+        RESET,   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+                                   KC_LCTL, _______,     KC_SPC,       _______, KC_LALT   
+  ),  
+
+  [3] = LAYOUT_all(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+                                   _______, _______,     _______,      _______, _______   
+  ) 
+};
diff --git a/qmk/keyboards/rart/rart45/keymaps/via/rules.mk b/qmk/keyboards/rart/rart45/keymaps/via/rules.mk
new file mode 100644
index 00000000..1e5b9980
--- /dev/null
+++ b/qmk/keyboards/rart/rart45/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/qmk/keyboards/rart/rart45/rart45.c b/qmk/keyboards/rart/rart45/rart45.c
new file mode 100644
index 00000000..480b05a8
--- /dev/null
+++ b/qmk/keyboards/rart/rart45/rart45.c
@@ -0,0 +1,15 @@
+/* Copyright 2020 Alabahuy
+ * 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 "rart45.h"
diff --git a/qmk/keyboards/rart/rart45/rart45.h b/qmk/keyboards/rart/rart45/rart45.h
new file mode 100644
index 00000000..99ac9acd
--- /dev/null
+++ b/qmk/keyboards/rart/rart45/rart45.h
@@ -0,0 +1,44 @@
+/* Copyright 2020 Alabahuy
+ * 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 first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT_all( \
+    K00, K40, K01, K41, K02, K42,   K03, K43, K04, K44, K05, K45, \
+    K10, K50, K11, K51, K12, K52,   K13, K53, K14, K54, K15, K55, \
+    K20, K60, K21, K61, K22, K62,   K23, K63, K24, K64, K25, K65, \
+    K30, K70, K31, K71, K32, K72,   K33, K73, K34, K74, K35, K75, \
+                   K80, K81,     K82,    K83, K84 \
+) \
+{ \
+    { K00, K01, K02, K03, K04, K05   }, \
+    { K10, K11, K12, K13, K14, K15   }, \
+    { K20, K21, K22, K23, K24, K25   }, \
+    { K30, K31, K32, K33, K34, K35   }, \
+    { K40, K41, K42, K43, K44, K45   }, \
+    { K50, K51, K52, K53, K54, K55   }, \
+    { K60, K61, K62, K63, K64, K65   }, \
+    { K70, K71, K72, K73, K74, K75   }, \
+    { K80, K81, K82, K83, K84, KC_NO }, \
+}
diff --git a/qmk/keyboards/rart/rart45/readme.md b/qmk/keyboards/rart/rart45/readme.md
new file mode 100644
index 00000000..9b9821e5
--- /dev/null
+++ b/qmk/keyboards/rart/rart45/readme.md
@@ -0,0 +1,23 @@
+# Rart45
+
+![TOP](https://user-images.githubusercontent.com/30220306/100749285-0fdd8500-3417-11eb-9b06-11a04f9de264.png)
+
+A 40% Ergo Layout Mechanical Keyboard with Atmega328p inspired by the Reviung41 by gtips and the Plaid by hsgw, based on [IMKG](https://www.facebook.com/groups/indomechanicalkeyboard/) (Indonesia Mechanical Keyboard Group).
+
+* Keyboard Maintainer: [Alabahuy](https://github.com/alabahuy)
+* Hardware Supported: RART45 PCB, Mini USB, ATMEGA328p with vusb
+* Hardware Availability: Private GB 
+
+Make example for this keyboard (after setting up your build environment):
+
+    make rart/rart45:default
+
+Flashing example for this keyboard:
+
+    make rart/rart45:default:flash
+
+## Bootloader
+use usbasploader in hgsw repository.
+https://github.com/hsgw/USBaspLoader/tree/plaid
+
+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).
diff --git a/qmk/keyboards/rart/rart45/rules.mk b/qmk/keyboards/rart/rart45/rules.mk
new file mode 100644
index 00000000..e9a5cac2
--- /dev/null
+++ b/qmk/keyboards/rart/rart45/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega328p
+
+# Bootloader selection
+BOOTLOADER = USBasp
+
+# Build Options
+#   change yes to no to disable
+#
+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
+# 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
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
diff --git a/qmk/keyboards/rart/rart4x4/config.h b/qmk/keyboards/rart/rart4x4/config.h
new file mode 100644
index 00000000..0d79e314
--- /dev/null
+++ b/qmk/keyboards/rart/rart4x4/config.h
@@ -0,0 +1,62 @@
+/*
+Copyright 2020 Alabahuy
+
+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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x414C 
+#define PRODUCT_ID      0x0004
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Alabahuy
+#define PRODUCT         RART4X4
+
+/* key matrix size */
+#define MATRIX_ROWS 4
+#define MATRIX_COLS 4
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { F4, B6, B3, B1 }
+#define MATRIX_COL_PINS { F7, B2, B5, B4 }
+#define UNUSED_PINS
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+#define ENCODERS_PAD_A { F6, D7 }
+#define ENCODERS_PAD_B { F5, E6 }
+
+#define RGB_DI_PIN D3
+#ifdef RGB_DI_PIN
+#define RGBLIGHT_ANIMATIONS
+#define RGBLED_NUM 5
+#define RGBLIGHT_HUE_STEP 8
+#define RGBLIGHT_SAT_STEP 8
+#define RGBLIGHT_VAL_STEP 8
+#define RGBLIGHT_LIMIT_VAL 240
+#define RGBLIGHT_SLEEP
+#endif
diff --git a/qmk/keyboards/rart/rart4x4/info.json b/qmk/keyboards/rart/rart4x4/info.json
new file mode 100644
index 00000000..a115f3a6
--- /dev/null
+++ b/qmk/keyboards/rart/rart4x4/info.json
@@ -0,0 +1,32 @@
+{
+  "keyboard_name": "RART4X4",
+  "url": "",
+  "maintainer": "Alabahuy",
+  "width": 4,
+  "height": 4,
+  "layouts": {
+      "LAYOUT_ortho_4x4": {
+            "layout": [
+                {"label": "Numlock", "x": 0, "y": 0},
+                {"label": "/", "x": 1, "y": 0},
+                {"label": "*", "x": 2, "y": 0},
+                {"label": "-", "x": 3, "y": 0},
+                
+                {"label": "7", "x": 0, "y": 1},
+                {"label": "8", "x": 1, "y": 1},
+                {"label": "9", "x": 2, "y": 1},
+                {"label": "=", "x": 3, "y": 1},
+                
+                {"label": "4", "x": 0, "y": 2},
+                {"label": "5", "x": 1, "y": 2},
+                {"label": "6", "x": 2, "y": 2},
+                {"label": "+", "x": 3, "y": 2},
+                
+                {"label": "1", "x": 0, "y": 3},
+                {"label": "2", "x": 1, "y": 3},
+                {"label": "3", "x": 2, "y": 3},
+                {"label": "Esc", "x": 3, "y": 3},
+            ]
+      }
+  }
+}
diff --git a/qmk/keyboards/rart/rart4x4/keymaps/default/keymap.c b/qmk/keyboards/rart/rart4x4/keymaps/default/keymap.c
new file mode 100644
index 00000000..36680e35
--- /dev/null
+++ b/qmk/keyboards/rart/rart4x4/keymaps/default/keymap.c
@@ -0,0 +1,51 @@
+/*
+Copyright 2020 Alabahuy
+
+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_ortho_4x4(
+        KC_NLCK, KC_PSLS, KC_PAST, MO(1),
+        KC_P7,   KC_P8,   KC_P9,   KC_PEQL,
+        KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
+        KC_P1,   KC_P2,   KC_P3,   KC_PENT
+    ),
+ 
+    [1] = LAYOUT_ortho_4x4(
+        KC_TRNS, RGB_HUI, RGB_HUD,  KC_TRNS, 
+        RGB_SAI, RGB_SAD, KC_MNXT,  KC_MPRV, 
+        RGB_VAI, RGB_VAD, KC_MSTP,  KC_MPLY, 
+        KC_COPY, KC_PSTE, KC_MYCM,  RGB_TOG
+    )
+};
+
+void encoder_update_user(uint8_t index, bool clockwise) {
+    if (index == 0) { /* First encoder */
+        if (clockwise) {
+            tap_code(KC_VOLD);
+        } else {
+            tap_code(KC_VOLU);
+        }
+    } else if (index == 1) { /* Second encoder */
+        if (clockwise) {
+            tap_code(KC_WH_D);
+        } else {
+            tap_code(KC_WH_U);
+        }
+    }
+}
diff --git a/qmk/keyboards/rart/rart4x4/keymaps/via/keymap.c b/qmk/keyboards/rart/rart4x4/keymaps/via/keymap.c
new file mode 100644
index 00000000..9407b5f3
--- /dev/null
+++ b/qmk/keyboards/rart/rart4x4/keymaps/via/keymap.c
@@ -0,0 +1,61 @@
+/*
+Copyright 2020 Alabahuy
+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_ortho_4x4(
+    KC_NLCK, KC_PSLS, KC_PAST, MO(1),
+    KC_P7,   KC_P8,   KC_P9,   KC_PEQL,
+    KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
+    KC_P1,   KC_P2,   KC_P3,   KC_PMNS
+    ),
+ 
+  [1] = LAYOUT_ortho_4x4(
+    KC_TRNS, RGB_HUI, RGB_HUD,  RESET, 
+    RGB_SAI, RGB_SAD, KC_MNXT,  KC_MPRV, 
+    RGB_VAI, RGB_VAD, KC_MSTP,  KC_MPLY, 
+    KC_COPY, KC_PSTE, KC_MYCM,  RGB_TOG
+    ),
+    
+  [2] = LAYOUT_ortho_4x4(
+    _______, _______, _______, _______,
+    _______, _______, _______, _______,
+    _______, _______, _______, _______,
+    _______, _______, _______, _______
+    ),
+    
+  [3] = LAYOUT_ortho_4x4(
+    _______, _______, _______, _______,
+    _______, _______, _______, _______,
+    _______, _______, _______, _______,
+    _______, _______, _______, _______
+    )
+};
+
+void encoder_update_user(uint8_t index, bool clockwise) {
+    if (index == 0) { /* First encoder */
+        if (clockwise) {
+            tap_code(KC_WH_U);
+        } else {
+            tap_code(KC_WH_D);
+        }
+    } else if (index == 1) { /* Second encoder */
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    }
+}
diff --git a/qmk/keyboards/rart/rart4x4/keymaps/via/rules.mk b/qmk/keyboards/rart/rart4x4/keymaps/via/rules.mk
new file mode 100644
index 00000000..1e5b9980
--- /dev/null
+++ b/qmk/keyboards/rart/rart4x4/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/qmk/keyboards/rart/rart4x4/rart4x4.c b/qmk/keyboards/rart/rart4x4/rart4x4.c
new file mode 100644
index 00000000..0d5e2dba
--- /dev/null
+++ b/qmk/keyboards/rart/rart4x4/rart4x4.c
@@ -0,0 +1,15 @@
+/* Copyright 2020 Alabahuy
+ * 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 "rart4x4.h"
diff --git a/qmk/keyboards/rart/rart4x4/rart4x4.h b/qmk/keyboards/rart/rart4x4/rart4x4.h
new file mode 100644
index 00000000..8160420a
--- /dev/null
+++ b/qmk/keyboards/rart/rart4x4/rart4x4.h
@@ -0,0 +1,37 @@
+/*
+Copyright 2020 Alabahuy
+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 first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#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 }, \
+}
diff --git a/qmk/keyboards/rart/rart4x4/readme.md b/qmk/keyboards/rart/rart4x4/readme.md
new file mode 100644
index 00000000..4908f266
--- /dev/null
+++ b/qmk/keyboards/rart/rart4x4/readme.md
@@ -0,0 +1,14 @@
+# [RART4X4](https://github.com/alabahuy/RART/blob/master/RART4X4/readme.md)
+
+![rartpad](https://user-images.githubusercontent.com/30220306/100748142-8aa5a080-3415-11eb-9b22-77f38d4dd891.png)
+4x4 Macropad pcb with double encoder, based on IMKG (Indonesia Mechanical Keyboard Group)
+
+* Keyboard Maintainer: [Alabahuy](https://github.com/alabahuy)
+* Hardware Supported: RART4X4 PCB, Promicro, Mini USB, Encoders
+* Hardware Availability: Private GB
+
+Make example for this keyboard (after setting up your build environment):
+
+    make rart/rart4x4: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).
diff --git a/qmk/keyboards/rart/rart4x4/rules.mk b/qmk/keyboards/rart/rart4x4/rules.mk
new file mode 100644
index 00000000..773b5860
--- /dev/null
+++ b/qmk/keyboards/rart/rart4x4/rules.mk
@@ -0,0 +1,25 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+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
+# 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 = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = yes
+
+LAYOUTS = ortho_4x4
diff --git a/qmk/keyboards/redscarf_i/rules.mk b/qmk/keyboards/redscarf_i/rules.mk
index 2724fe6d..ef09cd18 100644
--- a/qmk/keyboards/redscarf_i/rules.mk
+++ b/qmk/keyboards/redscarf_i/rules.mk
@@ -27,7 +27,6 @@ MIDI_ENABLE       = no      # MIDI support
 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
 UNICODE_ENABLE    = no      # Unicode
 
 LAYOUTS = ortho_5x4 ortho_6x4 numpad_5x4 numpad_6x4
diff --git a/qmk/keyboards/redscarf_iiplus/verb/config.h b/qmk/keyboards/redscarf_iiplus/verb/config.h
index 3fecdcac..de867bb0 100644
--- a/qmk/keyboards/redscarf_iiplus/verb/config.h
+++ b/qmk/keyboards/redscarf_iiplus/verb/config.h
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 Maarten Dekkers <maartenwut@gmail.com>
+Copyright 2019 Evy Dekkers
 
 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
@@ -49,10 +49,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
-/*
- * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
- */
-//#define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6
+#define LED_NUM_LOCK_PIN E6
+#define LED_CAPS_LOCK_PIN C7
+#define LED_PIN_ON_STATE 0
 
 #define BACKLIGHT_PIN B7
 //   #define BACKLIGHT_BREATHING
@@ -219,34 +218,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/redscarf_iiplus/verb/keymaps/default/keymap.c b/qmk/keyboards/redscarf_iiplus/verb/keymaps/default/keymap.c
index eea39a33..4f05b0c2 100644
--- a/qmk/keyboards/redscarf_iiplus/verb/keymaps/default/keymap.c
+++ b/qmk/keyboards/redscarf_iiplus/verb/keymaps/default/keymap.c
@@ -1,4 +1,4 @@
-/* Copyright 2019 Maarten Dekkers <maartenwut@gmail.com>
+/* Copyright 2019 Evy Dekkers
  *
  * 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
diff --git a/qmk/keyboards/redscarf_iiplus/verb/readme.md b/qmk/keyboards/redscarf_iiplus/verb/readme.md
index 05ec00a2..b77fabf1 100644
--- a/qmk/keyboards/redscarf_iiplus/verb/readme.md
+++ b/qmk/keyboards/redscarf_iiplus/verb/readme.md
@@ -2,7 +2,7 @@
 
 A 65% keyboard with two function columns on the left.
 
-Keyboard Maintainer: [Maartenwut](https://github.com/Maartenwut)  
+Keyboard Maintainer: [Evyd13](https://github.com/evyd13)  
 Hardware Supported: Ver.B (RS78), Ver.C (RS68)  
 Hardware Availability: [Drop](https://drop.com/buy/red-scarf-ii-ver-b-custom-mechanical-keyboard-kit)
 
diff --git a/qmk/keyboards/redscarf_iiplus/verb/rules.mk b/qmk/keyboards/redscarf_iiplus/verb/rules.mk
index 395010b6..404807e8 100644
--- a/qmk/keyboards/redscarf_iiplus/verb/rules.mk
+++ b/qmk/keyboards/redscarf_iiplus/verb/rules.mk
@@ -30,7 +30,6 @@ 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
 
 CUSTOM_MATRIX = yes
 SRC += matrix.c
diff --git a/qmk/keyboards/redscarf_iiplus/verb/verb.c b/qmk/keyboards/redscarf_iiplus/verb/verb.c
index 62ea1859..9313b2a7 100644
--- a/qmk/keyboards/redscarf_iiplus/verb/verb.c
+++ b/qmk/keyboards/redscarf_iiplus/verb/verb.c
@@ -1,4 +1,4 @@
-/* Copyright 2019 Maarten Dekkers <maartenwut@gmail.com>
+/* Copyright 2019 Evy Dekkers
  *
  * 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
@@ -14,38 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "verb.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();
-    led_init_ports();
-}
-
-void led_init_ports(void) {
-	setPinOutput(C7);
-	setPinOutput(E6);
-}
-
-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_CAPS_LOCK)) {
-        writePinLow(C7);
-    } else {
-        writePinHigh(C7);
-    }
-
-    if (IS_LED_ON(usb_led, USB_LED_NUM_LOCK)) {
-        writePinLow(E6);
-    } else {
-        writePinHigh(E6);
-    }
-
-    led_set_user(usb_led);
-}
diff --git a/qmk/keyboards/redscarf_iiplus/verb/verb.h b/qmk/keyboards/redscarf_iiplus/verb/verb.h
index d86a6c4c..e444abad 100644
--- a/qmk/keyboards/redscarf_iiplus/verb/verb.h
+++ b/qmk/keyboards/redscarf_iiplus/verb/verb.h
@@ -1,4 +1,4 @@
-/* Copyright 2019 Maarten Dekkers <maartenwut@gmail.com>
+/* Copyright 2019 Evy Dekkers
  *
  * 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
diff --git a/qmk/keyboards/redscarf_iiplus/verc/config.h b/qmk/keyboards/redscarf_iiplus/verc/config.h
index 3fecdcac..de867bb0 100644
--- a/qmk/keyboards/redscarf_iiplus/verc/config.h
+++ b/qmk/keyboards/redscarf_iiplus/verc/config.h
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 Maarten Dekkers <maartenwut@gmail.com>
+Copyright 2019 Evy Dekkers
 
 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
@@ -49,10 +49,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
-/*
- * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
- */
-//#define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6
+#define LED_NUM_LOCK_PIN E6
+#define LED_CAPS_LOCK_PIN C7
+#define LED_PIN_ON_STATE 0
 
 #define BACKLIGHT_PIN B7
 //   #define BACKLIGHT_BREATHING
@@ -219,34 +218,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/redscarf_iiplus/verc/keymaps/default/keymap.c b/qmk/keyboards/redscarf_iiplus/verc/keymaps/default/keymap.c
index aad19132..f382b477 100644
--- a/qmk/keyboards/redscarf_iiplus/verc/keymaps/default/keymap.c
+++ b/qmk/keyboards/redscarf_iiplus/verc/keymaps/default/keymap.c
@@ -1,4 +1,4 @@
-/* Copyright 2019 Maarten Dekkers <maartenwut@gmail.com>
+/* Copyright 2019 Evy Dekkers
  *
  * 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
diff --git a/qmk/keyboards/redscarf_iiplus/verc/rules.mk b/qmk/keyboards/redscarf_iiplus/verc/rules.mk
index 0157596c..34aad423 100644
--- a/qmk/keyboards/redscarf_iiplus/verc/rules.mk
+++ b/qmk/keyboards/redscarf_iiplus/verc/rules.mk
@@ -30,7 +30,6 @@ 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
 
 CUSTOM_MATRIX = yes
 SRC += matrix.c
diff --git a/qmk/keyboards/redscarf_iiplus/verc/verc.c b/qmk/keyboards/redscarf_iiplus/verc/verc.c
index 9dfc2606..09edb5f1 100644
--- a/qmk/keyboards/redscarf_iiplus/verc/verc.c
+++ b/qmk/keyboards/redscarf_iiplus/verc/verc.c
@@ -1,4 +1,4 @@
-/* Copyright 2019 Maarten Dekkers <maartenwut@gmail.com>
+/* Copyright 2019 Evy Dekkers
  *
  * 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
@@ -14,38 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "verc.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();
-    led_init_ports();
-}
-
-void led_init_ports(void) {
-	setPinOutput(C7);
-	setPinOutput(E6);
-}
-
-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_CAPS_LOCK)) {
-        writePinLow(C7);
-    } else {
-        writePinHigh(C7);
-    }
-
-    if (IS_LED_ON(usb_led, USB_LED_NUM_LOCK)) {
-        writePinLow(E6);
-    } else {
-        writePinHigh(E6);
-    }
-
-    led_set_user(usb_led);
-}
diff --git a/qmk/keyboards/redscarf_iiplus/verc/verc.h b/qmk/keyboards/redscarf_iiplus/verc/verc.h
index 6da76134..c548bbe8 100644
--- a/qmk/keyboards/redscarf_iiplus/verc/verc.h
+++ b/qmk/keyboards/redscarf_iiplus/verc/verc.h
@@ -1,4 +1,4 @@
-/* Copyright 2019 Maarten Dekkers <maartenwut@gmail.com>
+/* Copyright 2019 Evy Dekkers
  *
  * 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
diff --git a/qmk/keyboards/redscarf_iiplus/verd/config.h b/qmk/keyboards/redscarf_iiplus/verd/config.h
index 5c19f2ab..3381a803 100644
--- a/qmk/keyboards/redscarf_iiplus/verd/config.h
+++ b/qmk/keyboards/redscarf_iiplus/verd/config.h
@@ -218,34 +218,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/redscarf_iiplus/verd/rules.mk b/qmk/keyboards/redscarf_iiplus/verd/rules.mk
index 89b1a598..730951b7 100644
--- a/qmk/keyboards/redscarf_iiplus/verd/rules.mk
+++ b/qmk/keyboards/redscarf_iiplus/verd/rules.mk
@@ -30,7 +30,6 @@ 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
 
 CUSTOM_MATRIX = yes
 SRC += matrix.c
diff --git a/qmk/keyboards/retro_75/config.h b/qmk/keyboards/retro_75/config.h
index a6b8ec67..3b6c78d1 100644
--- a/qmk/keyboards/retro_75/config.h
+++ b/qmk/keyboards/retro_75/config.h
@@ -216,34 +216,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/retro_75/rules.mk b/qmk/keyboards/retro_75/rules.mk
index d3ead7f6..89af053d 100644
--- a/qmk/keyboards/retro_75/rules.mk
+++ b/qmk/keyboards/retro_75/rules.mk
@@ -19,4 +19,3 @@ MIDI_ENABLE = no            # MIDI support
 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
diff --git a/qmk/keyboards/reversestudio/decadepad/keymaps/via/rules.mk b/qmk/keyboards/reversestudio/decadepad/keymaps/via/rules.mk
index bee21da5..1e5b9980 100644
--- a/qmk/keyboards/reversestudio/decadepad/keymaps/via/rules.mk
+++ b/qmk/keyboards/reversestudio/decadepad/keymaps/via/rules.mk
@@ -1,2 +1 @@
 VIA_ENABLE = yes
-MOUSEKEY_ENABLE = no
\ No newline at end of file
diff --git a/qmk/keyboards/reversestudio/decadepad/rules.mk b/qmk/keyboards/reversestudio/decadepad/rules.mk
index 7730f09c..35ec60f5 100644
--- a/qmk/keyboards/reversestudio/decadepad/rules.mk
+++ b/qmk/keyboards/reversestudio/decadepad/rules.mk
@@ -29,7 +29,6 @@ MIDI_ENABLE = no            # MIDI support
 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
 UNICODE_ENABLE = yes        # Unicode
 
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
diff --git a/qmk/keyboards/reviung34/config.h b/qmk/keyboards/reviung34/config.h
index 5cd46cab..6a2ca9e8 100644
--- a/qmk/keyboards/reviung34/config.h
+++ b/qmk/keyboards/reviung34/config.h
@@ -218,34 +218,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/reviung34/keymaps/default/keymap.c b/qmk/keyboards/reviung34/keymaps/default/keymap.c
index fe373f53..66939d24 100644
--- a/qmk/keyboards/reviung34/keymaps/default/keymap.c
+++ b/qmk/keyboards/reviung34/keymaps/default/keymap.c
@@ -16,48 +16,51 @@
 #include QMK_KEYBOARD_H
 
 enum layer_names {
-    _BASE,
-    _LOWER,
-    _RAISE,
-    _ADJUST
+  _BASE,
+  _LOWER,
+  _RAISE,
+  _ADJUST
 };
 
 #define LOWER  MO(_LOWER)
 #define RAISE  MO(_RAISE)
 
-#define CT_TB LCTL_T(KC_TAB)
 #define CT_Q  LCTL_T(KC_Q)
+#define CT_CM RCTL_T(KC_COMM)
 #define SF_Z  LSFT_T(KC_Z)
 #define SF_SS RSFT_T(KC_SLSH)
 #define AL_X  LALT_T(KC_X)
+#define AL_DT RALT_T(KC_DOT)
+#define RA_SP LT(RAISE, KC_SPC)
+
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT_reviung34(
-    CT_Q,     KC_W,     KC_E,     KC_R,     KC_T,               KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,
-    KC_A,     KC_S,     KC_D,     KC_F,     KC_G,               KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,
-    SF_Z,     AL_X,     KC_C,     KC_V,     KC_B,               KC_N,     KC_M,     KC_COMM,  KC_DOT,   SF_SS,
-                        CT_TB,    LOWER,    RAISE,              KC_SPC
+    CT_Q,    KC_W,    KC_E,    KC_R,    KC_T,          KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,
+    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,          KC_H,    KC_J,    KC_K,    KC_L,    KC_ENT,
+    SF_Z,    AL_X,    KC_C,    KC_V,    KC_B,          KC_N,    KC_M,    CT_CM,   AL_DT,   SF_SS,
+                      KC_TAB,  KC_BSPC, LOWER,              RA_SP
+  ),
+
+  [_LOWER] = LAYOUT_reviung34(
+    KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,       KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,
+    KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,       KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_SCLN,
+    KC_LSFT, KC_ESC,  KC_LGUI, KC_LALT, KC_QUOT,       KC_HOME, KC_END,  KC_PGUP, KC_PGDN, KC_BSPC,
+                      _______, _______, _______,            _______
   ),
   
-  [_LOWER] = LAYOUT_reviung34(
-    KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,   KC_PERC,            KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_LPRN,  KC_RPRN,
-    KC_UNDS,  KC_PLUS,  KC_LCBR,  KC_RCBR,  KC_PIPE,            KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  KC_QUOT,
-    KC_LSFT,  KC_ESC,   KC_LGUI,  KC_LALT,  KC_CAPS,            KC_HOME,  KC_END,   KC_PGUP,  KC_PGDN,  KC_DEL,
-                        _______,  _______,  _______,            KC_BSPC
-  ),
-	
-	[_RAISE] = LAYOUT_reviung34(
-    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_LBRC,  KC_RBRC,  KC_BSLS,            XXXXXXX,  XXXXXXX,  KC_GRV,   KC_TILD,  KC_DQUO,
-    KC_LSFT,  KC_ESC,   KC_RGUI,  KC_LALT,  KC_CAPS,            KC_TAB,   KC_RALT,  KC_RCTL,  KC_RSFT,  KC_BSPC,
-                        _______,  _______,  _______,            KC_ENT
+  [_RAISE] = LAYOUT_reviung34(
+    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_LBRC, KC_RBRC, KC_BSLS,       XXXXXXX, XXXXXXX, KC_GRV,  KC_TILD, KC_COLN,
+    KC_LSFT, KC_ESC,  KC_RGUI, KC_LALT, KC_DQUO,       KC_TAB,  XXXXXXX, KC_RCTL, KC_RALT, KC_DEL,
+                      _______, _______, _______,            _______
   ),
   
   [_ADJUST] = LAYOUT_reviung34(
-    KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,              XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
-    KC_F7,    KC_F7,    KC_F8,    KC_F9,    KC_F10,             XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
-    KC_F11,   KC_F12,   XXXXXXX,  XXXXXXX,  KC_PSCR,            RESET,    XXXXXXX,  XXXXXXX,  XXXXXXX,  XXXXXXX,
-                        _______,  _______,  _______,            XXXXXXX
+    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PSCR,
+    KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+    KC_F11,  KC_F12,  KC_CAPS, XXXXXXX, XXXXXXX,       RESET,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+                      _______, _______, _______,            _______
   ),
 };
 
diff --git a/qmk/keyboards/reviung34/keymaps/default_2uL/keymap.c b/qmk/keyboards/reviung34/keymaps/default_2uL/keymap.c
new file mode 100644
index 00000000..767c0ff4
--- /dev/null
+++ b/qmk/keyboards/reviung34/keymaps/default_2uL/keymap.c
@@ -0,0 +1,69 @@
+/* Copyright 2019 gtips
+ *
+ * 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
+
+enum layer_names {
+  _BASE,
+  _LOWER,
+  _RAISE,
+  _ADJUST
+};
+
+#define LOWER  MO(_LOWER)
+#define RAISE  MO(_RAISE)
+
+#define CT_Q  LCTL_T(KC_Q)
+#define CT_CM RCTL_T(KC_COMM)
+#define SF_Z  LSFT_T(KC_Z)
+#define SF_SS RSFT_T(KC_SLSH)
+#define AL_X  LALT_T(KC_X)
+#define AL_DT RALT_T(KC_DOT)
+#define RA_SP LT(RAISE, KC_SPC)
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_BASE] = LAYOUT_reviung34_2uL(
+    CT_Q,    KC_W,    KC_E,    KC_R,    KC_T,          KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,
+    KC_A,    KC_S,    KC_D,    KC_F,    KC_G,          KC_H,    KC_J,    KC_K,    KC_L,    KC_ENT,
+    SF_Z,    AL_X,    KC_C,    KC_V,    KC_B,          KC_N,    KC_M,    CT_CM,   AL_DT,   SF_SS,
+                      KC_TAB,       LOWER,                  RA_SP
+  ),
+
+  [_LOWER] = LAYOUT_reviung34_2uL(
+    KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,       KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN,
+    KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,       KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_SCLN,
+    KC_LSFT, KC_ESC,  KC_LGUI, KC_LALT, KC_QUOT,       KC_HOME, KC_END,  KC_PGUP, KC_PGDN, KC_BSPC,
+                      _______,      _______,                _______
+  ),
+  
+  [_RAISE] = LAYOUT_reviung34_2uL(
+    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_LBRC, KC_RBRC, KC_BSLS,       XXXXXXX, XXXXXXX, KC_GRV,  KC_TILD, KC_COLN,
+    KC_LSFT, KC_ESC,  KC_RGUI, KC_LALT, KC_DQUO,       KC_TAB,  XXXXXXX, KC_RCTL, KC_RALT, KC_DEL,
+                      _______,      _______,                _______
+  ),
+  
+  [_ADJUST] = LAYOUT_reviung34_2uL(
+    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PSCR,
+    KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+    KC_F11,  KC_F12,  KC_CAPS, XXXXXXX, XXXXXXX,       RESET,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+                      _______,      _______,                _______
+  ),
+};
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
+}
diff --git a/qmk/keyboards/reviung34/keymaps/default_2uL/readme.md b/qmk/keyboards/reviung34/keymaps/default_2uL/readme.md
new file mode 100644
index 00000000..2e4619fa
--- /dev/null
+++ b/qmk/keyboards/reviung34/keymaps/default_2uL/readme.md
@@ -0,0 +1 @@
+# The default keymap for reviung34
diff --git a/qmk/keyboards/reviung34/keymaps/default_jp/keymap.c b/qmk/keyboards/reviung34/keymaps/default_jp/keymap.c
new file mode 100644
index 00000000..c37d8766
--- /dev/null
+++ b/qmk/keyboards/reviung34/keymaps/default_jp/keymap.c
@@ -0,0 +1,70 @@
+/* Copyright 2019 gtips
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+#include "keymap_jp.h"
+
+enum layer_names {
+  _BASE,
+  _LOWER,
+  _RAISE,
+  _ADJUST
+};
+
+#define LOWER  MO(_LOWER)
+#define RAISE  MO(_RAISE)
+
+#define CT_Q  LCTL_T(JP_Q)
+#define CT_CM RCTL_T(JP_COMM)
+#define SF_Z  LSFT_T(JP_Z)
+#define SF_SS RSFT_T(JP_SLSH)
+#define AL_X  LALT_T(JP_X)
+#define AL_DT RALT_T(JP_DOT)
+#define RA_SP LT(RAISE, KC_SPC)
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_BASE] = LAYOUT_reviung34(
+    CT_Q,    JP_W,    JP_E,    JP_R,    JP_T,          JP_Y,    JP_U,    JP_I,    JP_O,    JP_P,
+    JP_A,    JP_S,    JP_D,    JP_F,    JP_G,          JP_H,    JP_J,    JP_K,    JP_L,    KC_ENT,
+    SF_Z,    AL_X,    JP_C,    JP_V,    JP_B,          JP_N,    JP_M,    CT_CM,   AL_DT,   SF_SS,
+                      KC_TAB,  KC_BSPC, LOWER,              RA_SP
+  ),
+
+  [_LOWER] = LAYOUT_reviung34(
+    JP_EXLM, JP_AT,   JP_HASH, JP_DLR,  JP_PERC,       JP_CIRC, JP_AMPR, JP_ASTR, JP_LPRN, JP_RPRN,
+    JP_UNDS, JP_PLUS, JP_LCBR, JP_RCBR, JP_PIPE,       KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, JP_SCLN,
+    KC_LSFT, KC_ESC,  KC_LGUI, KC_LALT, JP_QUOT,       KC_HOME, KC_END,  KC_PGUP, KC_PGDN, KC_BSPC,
+                      _______, _______, _______,            _______
+  ),
+  
+  [_RAISE] = LAYOUT_reviung34(
+    JP_1,    JP_2,    JP_3,    JP_4,    JP_5,          JP_6,    JP_7,    JP_8,    JP_9,    JP_0,
+    JP_MINS, JP_EQL,  JP_LBRC, JP_RBRC, JP_YEN,        KC_RO,   XXXXXXX, JP_GRV,  JP_TILD, JP_COLN,
+    KC_LSFT, KC_ESC,  KC_RGUI, KC_LALT, JP_DQUO,       KC_TAB,  XXXXXXX, KC_RCTL, KC_RALT, KC_DEL,
+                      _______, _______, _______,            _______
+  ),
+  
+  [_ADJUST] = LAYOUT_reviung34(
+    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,         XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_PSCR,
+    KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+    KC_F11,  KC_F12,  KC_CAPS, XXXXXXX, XXXXXXX,       RESET,   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+                      _______, _______, _______,            _______
+  ),
+};
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
+}
diff --git a/qmk/keyboards/reviung34/keymaps/default_jp/readme.md b/qmk/keyboards/reviung34/keymaps/default_jp/readme.md
new file mode 100644
index 00000000..2e4619fa
--- /dev/null
+++ b/qmk/keyboards/reviung34/keymaps/default_jp/readme.md
@@ -0,0 +1 @@
+# The default keymap for reviung34
diff --git a/qmk/keyboards/reviung34/reviung34.h b/qmk/keyboards/reviung34/reviung34.h
index ccf9762f..8385e5c8 100644
--- a/qmk/keyboards/reviung34/reviung34.h
+++ b/qmk/keyboards/reviung34/reviung34.h
@@ -29,11 +29,24 @@
     K00, K01, K02, K03, K04,     K05, K06, K07, K08, K35, \
     K10, K11, K12, K13, K14,     K15, K16, K17, K18, K36, \
     K20, K21, K22, K23, K24,     K25, K26, K27, K28, K37, \
-              K32, K33, K34,     K38 \
+              K32, K33, K34,        K38 \
 ) \
 { \
-    { K00,   K01,   K02, K03, K04, K05, K06, K07, K08 }, \
-    { K10,   K11,   K12, K13, K14, K15, K16, K17, K18 }, \
-    { K20,   K21,   K22, K23, K24, K25, K26, K27, K28 }, \
-    { KC_NO, KC_NO, K32, K33, K34, K35, K36, K37, K38 } \
+    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08 }, \
+    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18 }, \
+    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28 }, \
+    { KC_NO, KC_NO, K32,   K33,   K34,   K35,   K36,   K37,   K38 } \
+}
+
+#define LAYOUT_reviung34_2uL( \
+    K00, K01, K02, K03, K04,     K05, K06, K07, K08, K35, \
+    K10, K11, K12, K13, K14,     K15, K16, K17, K18, K36, \
+    K20, K21, K22, K23, K24,     K25, K26, K27, K28, K37, \
+              K32,    K34,          K38 \
+) \
+{ \
+    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08 }, \
+    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18 }, \
+    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28 }, \
+    { KC_NO, KC_NO, K32,   KC_NO, K34,   K35,   K36,   K37,   K38 } \
 }
diff --git a/qmk/keyboards/reviung34/rules.mk b/qmk/keyboards/reviung34/rules.mk
index 036fb0c3..1487925b 100644
--- a/qmk/keyboards/reviung34/rules.mk
+++ b/qmk/keyboards/reviung34/rules.mk
@@ -30,4 +30,3 @@ 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
diff --git a/qmk/keyboards/reviung39/config.h b/qmk/keyboards/reviung39/config.h
index 9a8600b6..d1eb8644 100644
--- a/qmk/keyboards/reviung39/config.h
+++ b/qmk/keyboards/reviung39/config.h
@@ -218,34 +218,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/reviung39/rules.mk b/qmk/keyboards/reviung39/rules.mk
index 036fb0c3..1487925b 100644
--- a/qmk/keyboards/reviung39/rules.mk
+++ b/qmk/keyboards/reviung39/rules.mk
@@ -30,4 +30,3 @@ 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
diff --git a/qmk/keyboards/reviung41/config.h b/qmk/keyboards/reviung41/config.h
index 26ecc142..acac4f0d 100644
--- a/qmk/keyboards/reviung41/config.h
+++ b/qmk/keyboards/reviung41/config.h
@@ -218,34 +218,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/reviung41/rules.mk b/qmk/keyboards/reviung41/rules.mk
index 983d574a..edee7940 100644
--- a/qmk/keyboards/reviung41/rules.mk
+++ b/qmk/keyboards/reviung41/rules.mk
@@ -30,4 +30,3 @@ 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
diff --git a/qmk/keyboards/rgbkb/pan/config.h b/qmk/keyboards/rgbkb/pan/config.h
new file mode 100644
index 00000000..a1a2aae9
--- /dev/null
+++ b/qmk/keyboards/rgbkb/pan/config.h
@@ -0,0 +1,43 @@
+/*Copyright 2020 RGBKB
+
+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 "config_common.h"
+
+#define VENDOR_ID       0x5247  // "RG" - RGBKB
+#define PRODUCT_ID      0x8C9C  // Pan
+#define DEVICE_VER      0x0002
+#define MANUFACTURER    RGBKB
+#define PRODUCT         Pan
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 13
+
+#define ENCODER_RESOLUTION 4
+#define RGBLED_NUM 64
+#define RGBLIGHT_ANIMATIONS
+#define DRIVER_LED_TOTAL RGBLED_NUM
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+#define RGBLIGHT_LIMIT_VAL 120
+#define USB_MAX_POWER_CONSUMPTION 500
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
diff --git a/qmk/keyboards/rgbkb/pan/keymaps/default/keymap.c b/qmk/keyboards/rgbkb/pan/keymaps/default/keymap.c
new file mode 100644
index 00000000..c041c0b5
--- /dev/null
+++ b/qmk/keyboards/rgbkb/pan/keymaps/default/keymap.c
@@ -0,0 +1,117 @@
+ /* Copyright 2020 RGBKB
+  * 
+  * 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/>. 
+  */ 
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+#include QMK_KEYBOARD_H
+
+enum layer_number {
+    _QWERTY,
+    _COLEMAK,
+    _FN,
+    _ADJ
+};
+
+#define FN_ESC   LT(_FN, KC_ESC)
+#define FN_CAPS  LT(_FN, KC_CAPS)
+#define QWERTY   DF(_QWERTY)
+#define COLEMAK  DF(_COLEMAK)
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_QWERTY] = LAYOUT_all(
+        KC_NO,                                                                                                      KC_NO,
+        GRAVE_ESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,   KC_6,   KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC, KC_DEL,
+        KC_TAB,    KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,   KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_BSLS,
+        FN_CAPS,   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,   KC_H,   KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
+        KC_LSFT,   KC_BSLS, KC_Z,    KC_X,    KC_C,    KC_V,   KC_B,   KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC,
+        KC_LCTL,   KC_LGUI, KC_LALT, RGB_TOG, MO(_ADJ),KC_SPC, KC_SPC, MO(_FN), KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT
+    ),
+
+    [_COLEMAK] = LAYOUT_all(
+        KC_NO,                                                                                                      KC_NO,
+        GRAVE_ESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,   KC_6,   KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC, KC_DEL,
+        KC_TAB,    KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,   KC_J,   KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSLS,
+        FN_CAPS,   KC_A,    KC_R,    KC_S,    KC_T,    KC_D,   KC_H,   KC_N,    KC_E,    KC_I,    KC_O,    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_RSPC, KC_ENT,
+        KC_LCTL,   KC_LGUI, KC_LALT, RGB_TOG, MO(_ADJ),KC_SPC, KC_SPC, MO(_FN), KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT
+    ),
+
+    [_FN] = LAYOUT_all(
+        KC_NO,                                                                                                      KC_NO,
+        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_PGDN, KC_UP,   KC_PGUP, _______, _______, _______, KC_PGDN, KC_UP,   KC_PGUP, KC_PSCR, KC_HOME,
+        _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_INS,  KC_END,
+        _______, _______, _______, _______, _______, _______, _______, KC_LBRC, _______, KC_RBRC, _______, _______, _______,
+        _______, _______, _______, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______
+    ),
+
+    [_ADJ] = LAYOUT_all(
+        KC_NO,                                                                                                      KC_NO,
+        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,
+        _______, RGB_SAD, RGB_VAI, RGB_SAI, RESET,   _______, _______, KC_P7,   KC_P8,   KC_P9,   _______, _______,
+        _______, RGB_HUD, RGB_VAD, RGB_HUI, _______, _______, _______, KC_P4,   KC_P5,   KC_P6,   _______, _______,
+        _______, RGB_SPD, _______, RGB_SPI, _______, _______, _______, KC_P1,   KC_P2,   KC_P3,   _______, _______, _______,
+        _______, _______, _______, RGB_MOD, _______, _______, _______, KC_P0,   KC_PDOT, KC_NLCK, _QWERTY, _COLEMAK
+    )
+};
+
+#ifdef OLED_DRIVER_ENABLE
+void oled_task_user(void) {
+    // Host Keyboard Layer Status
+    oled_write_P(PSTR("RGBKB Pan\n"), false);
+    oled_write_P(PSTR("Layer: "), false);
+    uint8_t layer = layer_state ? biton(layer_state) : biton32(default_layer_state);
+    switch (layer) {
+        case _QWERTY:
+            oled_write_P(PSTR("Default\n"), false);
+            break;
+        case _COLEMAK:
+            oled_write_P(PSTR("Colemak\n"), false);
+            break;
+        case _FN:
+            oled_write_P(PSTR("Function\n"), false);
+            break;
+        case _ADJ:
+            oled_write_P(PSTR("Adjust\n"), false);
+            break;
+        default:
+            oled_write_P(PSTR("Undefined\n"), false);
+            // Or use the write_ln shortcut over adding '\n' to the end of your string
+            //oled_write_ln_P(PSTR("Undefined"), false);
+    }
+    led_t led_state = host_keyboard_led_state();
+    oled_write_P(led_state.num_lock ? PSTR("Numlock On\n") : PSTR("           \n"), false);
+    oled_write_P(led_state.caps_lock ? PSTR("Capslock On \n") : PSTR("           \n"), false);
+}
+#endif
+
+void encoder_update_user(uint8_t index, bool clockwise) {
+  if (index == 0) {         // First encoder - right
+    if (clockwise) {
+      tap_code(KC_VOLU);
+    } else {
+      tap_code(KC_VOLD);
+    }
+  } else if (index == 1) {  // Second encoder - left
+    if (clockwise) {
+      tap_code(KC_VOLU);
+    } else {
+      tap_code(KC_VOLD);
+    }
+  }
+}
diff --git a/qmk/keyboards/rgbkb/pan/keymaps/default/rules.mk b/qmk/keyboards/rgbkb/pan/keymaps/default/rules.mk
new file mode 100644
index 00000000..9ad29c64
--- /dev/null
+++ b/qmk/keyboards/rgbkb/pan/keymaps/default/rules.mk
@@ -0,0 +1,6 @@
+# RGB layout selection
+RGB_ENCODERS          = yes    # For RGB encoders, solder on both WS2811 chips
+STAGGERED_LAYOUT      = no     # If you soldered R1-A12 and R4-A12, enable this.
+
+# Do not edit past here
+include keyboards/$(KEYBOARD)/post_rules.mk
diff --git a/qmk/keyboards/rgbkb/pan/pan.c b/qmk/keyboards/rgbkb/pan/pan.c
new file mode 100644
index 00000000..bc438f2d
--- /dev/null
+++ b/qmk/keyboards/rgbkb/pan/pan.c
@@ -0,0 +1,88 @@
+ /* Copyright 2020 RGBKB
+  * 
+  * 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 "pan.h"
+#include "quantum.h"
+#include "rgb_matrix_types.h"
+
+
+#if defined RGB_MATRIX_ENABLE
+    led_config_t g_led_config = { {
+       { 2,  3,  4,  5,  6,  7,  8,  9,  10, 11, 12, 13, 14 },
+       { 0, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15 },
+       { 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 1 },
+       { 52, 51, 50, 49, 48, 47, 46, 45, 44, 43, 42, 41, 40 },
+       { 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, NO_LED  }
+    }, {
+#ifdef STAGGERED_RGB_ENCODERS
+        {0, -19},{228, -19},
+        {0, 0}, {14, 0}, {33, 0}, {52, 0}, {71, 0}, {90, 0}, {109, 0}, {128, 0}, {147, 0}, {166, 0}, {185, 0}, {204, 0}, {223, 0},
+        {209, 19}, {190, 19}, {171, 19}, {152, 19}, {133, 19}, {114, 19}, {95, 19}, {76, 19}, {57, 19}, {38, 19}, {19, 19}, {0, 19},
+        {0, 38}, {19, 38}, {38, 38}, {57, 38}, {76, 38}, {95, 38}, {114, 38}, {133, 38}, {152, 38}, {171, 38}, {190, 38}, {209, 38},
+        {223, 57}, {204, 57}, {185, 57}, {171, 57}, {147, 57}, {128, 57}, {109, 57}, {90, 57}, {71, 57}, {52, 57}, {33, 57}, {14, 57}, {0, 57},
+        {0, 76}, {19, 76}, {38, 76}, {57, 76}, {76, 76}, {95, 76}, {114, 76}, {133, 76}, {152, 76}, {171, 76}, {190, 76}, {209, 76},
+#elif defined RGB_ENCODERS
+        {0, -19},{228, -19},
+        {0, 0}, {19, 0}, {38, 0}, {57, 0}, {76, 0}, {95, 0}, {114, 0}, {133, 0}, {152, 0}, {171, 0}, {190, 0}, {209, 0},
+        {209, 19}, {190, 19}, {171, 19}, {152, 19}, {133, 19}, {114, 19}, {95, 19}, {76, 19}, {57, 19}, {38, 19}, {19, 19}, {0, 19},
+        {0, 38}, {19, 38}, {38, 38}, {57, 38}, {76, 38}, {95, 38}, {114, 38}, {133, 38}, {152, 38}, {171, 38}, {190, 38}, {209, 38},
+        {209, 57}, {190, 57}, {171, 57}, {152, 57}, {133, 57}, {114, 57}, {95, 57}, {76, 57}, {57, 57}, {38, 57}, {19, 57}, {0, 57},
+        {0, 76}, {19, 76}, {38, 76}, {57, 76}, {76, 76}, {95, 76}, {114, 76}, {133, 76}, {152, 76}, {171, 76}, {190, 76}, {209, 76},
+        {0, 95},{19, 95}, //not used
+#elif defined STAGGERED_LAYOUT
+        {0, 0}, {19, 0}, {38, 0}, {57, 0}, {76, 0}, {95, 0}, {114, 0}, {133, 0}, {152, 0}, {171, 0}, {190, 0}, {209, 0}, {0, 0},
+        {209, 19}, {190, 19}, {171, 19}, {152, 19}, {133, 19}, {114, 19}, {95, 19}, {76, 19}, {57, 19}, {38, 19}, {19, 19}, {0, 19},
+        {0, 38}, {19, 38}, {38, 38}, {57, 38}, {76, 38}, {95, 38}, {114, 38}, {133, 38}, {152, 38}, {171, 38}, {190, 38}, {209, 38},
+        {209, 57}, {190, 57}, {171, 57}, {152, 57}, {133, 57}, {114, 57}, {95, 57}, {76, 57}, {57, 57}, {38, 57}, {19, 57}, {0, 57}, {0, 0},
+        {0, 76}, {19, 76}, {38, 76}, {57, 76}, {76, 76}, {95, 76}, {114, 76}, {133, 76}, {152, 76}, {171, 76}, {190, 76}, {209, 76},
+        {0, 95},{19, 95},//not used
+#else
+        {0, 0}, {19, 0}, {38, 0}, {57, 0}, {76, 0}, {95, 0}, {114, 0}, {133, 0}, {152, 0}, {171, 0}, {190, 0}, {209, 0},
+        {209, 19}, {190, 19}, {171, 19}, {152, 19}, {133, 19}, {114, 19}, {95, 19}, {76, 19}, {57, 19}, {38, 19}, {19, 19}, {0, 19},
+        {0, 38}, {19, 38}, {38, 38}, {57, 38}, {76, 38}, {95, 38}, {114, 38}, {133, 38}, {152, 38}, {171, 38}, {190, 38}, {209, 38},
+        {209, 57}, {190, 57}, {171, 57}, {152, 57}, {133, 57}, {114, 57}, {95, 57}, {76, 57}, {57, 57}, {38, 57}, {19, 57}, {0, 57},
+        {0, 76}, {19, 76}, {38, 76}, {57, 76}, {76, 76}, {95, 76}, {114, 76}, {133, 76}, {152, 76}, {171, 76}, {190, 76}, {209, 76},
+        {0, 0},{0, 0}, {0, 0},{0, 0},//not used
+#endif
+    }, {
+#ifdef STAGGERED_RGB_ENCODERS
+        1,                               1,
+        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
+#elif defined RGB_ENCODERS
+        1,                               1,
+        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
+#elif defined STAGGERED_LAYOUT
+        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
+#else
+        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+        1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
+        1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1
+#endif
+    } };
+#endif
diff --git a/qmk/keyboards/rgbkb/pan/pan.h b/qmk/keyboards/rgbkb/pan/pan.h
new file mode 100644
index 00000000..c1b9f77f
--- /dev/null
+++ b/qmk/keyboards/rgbkb/pan/pan.h
@@ -0,0 +1,37 @@
+/* Copyright 2020 RGBKB
+ *
+ * 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
+
+#define _x_ KC_NO
+
+#include "quantum.h"
+
+#define LAYOUT_all( \
+         E01,                                                          E02, \
+/*       0    1    2    3    4    5    6    7    8    9    10   11     12 */\
+/* 0 */  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K10, K11,   K12, \
+/* 1 */  K13, K14, K15, K16, K17, K18, K19, K20, K21, K22, K23, K24,        \
+/* 2 */  K26, K27, K28, K29, K30, K31, K32, K33, K34, K35, K36, K37,        \
+/* 3 */  K38, K39, K40, K41, K42, K43, K44, K45, K46, K47, K48, K49,   K50, \
+/* 4 */  K51, K52, K53, K54, K55, K56, K57, K58, K59, K60, K61, K62         \
+  ) { \
+/* 0 */{ K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K10, K11,   K12   }, \
+/* 1 */{ K13, K14, K15, K16, K17, K18, K19, K20, K21, K22, K23, K24,   KC_NO }, \
+/* 2 */{ K26, K27, K28, K29, K30, K31, K32, K33, K34, K35, K36, K37,   KC_NO }, \
+/* 3 */{ K38, K39, K40, K41, K42, K43, K44, K45, K46, K47, K48, K49,   K50   }, \
+/* 4 */{ K51, K52, K53, K54, K55, K56, K57, K58, K59, K60, K61, KC_NO, K62   }  \
+  }
diff --git a/qmk/keyboards/rgbkb/pan/post_rules.mk b/qmk/keyboards/rgbkb/pan/post_rules.mk
new file mode 100644
index 00000000..7947d1d9
--- /dev/null
+++ b/qmk/keyboards/rgbkb/pan/post_rules.mk
@@ -0,0 +1,22 @@
+# As long as the users rules.mk has include $(KEYBOARD)/post_rules.mk this will be run after to properly setup any keyboard features and defines
+ifeq ($(strip $(RGB_MATRIX_KEYPRESSES)), yes)
+    OPT_DEFS += -DRGB_MATRIX_KEYPRESSES
+endif
+
+ifeq ($(strip $(RGB_MATRIX_FRAMEBUFFER)), yes)
+    OPT_DEFS += -DRGB_MATRIX_FRAMEBUFFER_EFFECTS
+endif
+
+ifeq ($(strip $(STAGGERED_LAYOUT)), yes)
+    OPT_DEFS += -DSTAGGERED_LAYOUT
+endif
+
+ifeq ($(strip $(RGB_ENCODERS)), yes)
+    OPT_DEFS += -DRGB_ENCODERS
+endif
+
+ifeq ($(strip $(RGB_ENCODERS)), yes)
+    ifeq ($(strip $(STAGGERED_LAYOUT)), yes)
+        OPT_DEFS += -DSTAGGERED_RGB_ENCODERS=$(strip $(STAGGERED_RGB_ENCODERS))
+    endif
+endif
diff --git a/qmk/keyboards/rgbkb/pan/readme.md b/qmk/keyboards/rgbkb/pan/readme.md
new file mode 100644
index 00000000..f7041605
--- /dev/null
+++ b/qmk/keyboards/rgbkb/pan/readme.md
@@ -0,0 +1,19 @@
+# Pan
+
+![pan](https://i.imgur.com/Q6pqCFFl.jpg)
+
+Ortho or Staggered DIY kit with RGB
+
+* Keyboard Maintainer: [RGBKB](https://github.com/RGBKB)
+* Hardware Supported: Pan, atmega32a or Proton-C
+* Hardware Availability: [rgbkb.net](https://www.rgbkb.net/), [GitHub](https://github.com/RGBKB/Keyboard-files/tree/master/Pan)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make rgbkb/pan/rev1/32a:default
+
+If you are using the Proton-C:
+
+    make rgbkb/pan/rev1/proton_c: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).
diff --git a/qmk/keyboards/rgbkb/pan/rev1/32a/config.h b/qmk/keyboards/rgbkb/pan/rev1/32a/config.h
new file mode 100644
index 00000000..ed5d3457
--- /dev/null
+++ b/qmk/keyboards/rgbkb/pan/rev1/32a/config.h
@@ -0,0 +1,24 @@
+/*Copyright 2020 RGBKB
+
+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 "config_common.h"
+#define MATRIX_ROW_PINS { D7, D1, D5, D6, C2 }
+#define MATRIX_COL_PINS { C3, C4, C5, C6, C7, A7, A6, A5, A4, A3, A2, A1, A0 }
+#define ENCODERS_PAD_A { B0, D0 }
+#define ENCODERS_PAD_B { B1, B2}
+#define RGB_DI_PIN B3
diff --git a/qmk/keyboards/rgbkb/pan/rev1/32a/post_rules.mk b/qmk/keyboards/rgbkb/pan/rev1/32a/post_rules.mk
new file mode 100644
index 00000000..7947d1d9
--- /dev/null
+++ b/qmk/keyboards/rgbkb/pan/rev1/32a/post_rules.mk
@@ -0,0 +1,22 @@
+# As long as the users rules.mk has include $(KEYBOARD)/post_rules.mk this will be run after to properly setup any keyboard features and defines
+ifeq ($(strip $(RGB_MATRIX_KEYPRESSES)), yes)
+    OPT_DEFS += -DRGB_MATRIX_KEYPRESSES
+endif
+
+ifeq ($(strip $(RGB_MATRIX_FRAMEBUFFER)), yes)
+    OPT_DEFS += -DRGB_MATRIX_FRAMEBUFFER_EFFECTS
+endif
+
+ifeq ($(strip $(STAGGERED_LAYOUT)), yes)
+    OPT_DEFS += -DSTAGGERED_LAYOUT
+endif
+
+ifeq ($(strip $(RGB_ENCODERS)), yes)
+    OPT_DEFS += -DRGB_ENCODERS
+endif
+
+ifeq ($(strip $(RGB_ENCODERS)), yes)
+    ifeq ($(strip $(STAGGERED_LAYOUT)), yes)
+        OPT_DEFS += -DSTAGGERED_RGB_ENCODERS=$(strip $(STAGGERED_RGB_ENCODERS))
+    endif
+endif
diff --git a/qmk/keyboards/rgbkb/pan/rev1/32a/rules.mk b/qmk/keyboards/rgbkb/pan/rev1/32a/rules.mk
new file mode 100644
index 00000000..321ecc5c
--- /dev/null
+++ b/qmk/keyboards/rgbkb/pan/rev1/32a/rules.mk
@@ -0,0 +1,8 @@
+# MCU name
+MCU = atmega32a
+
+# Processor frequency
+F_CPU = 16000000
+
+# Bootloader selection
+BOOTLOADER = USBasp
diff --git a/qmk/keyboards/rgbkb/pan/rev1/proton_c/config.h b/qmk/keyboards/rgbkb/pan/rev1/proton_c/config.h
new file mode 100644
index 00000000..7a909a9a
--- /dev/null
+++ b/qmk/keyboards/rgbkb/pan/rev1/proton_c/config.h
@@ -0,0 +1,24 @@
+/*Copyright 2020 RGBKB
+
+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 "config_common.h"
+#define MATRIX_ROW_PINS { A15, B10, A14, A13, A7 }
+#define MATRIX_COL_PINS { A8, A6, B0, B1, B2, B4, B5, A1, A2, B3, B9, A10, A9 }
+#define ENCODERS_PAD_A { B14, B11 }
+#define ENCODERS_PAD_B { B15, B12 }
+#define RGB_DI_PIN A3
diff --git a/qmk/keyboards/rgbkb/pan/rev1/proton_c/post_rules.mk b/qmk/keyboards/rgbkb/pan/rev1/proton_c/post_rules.mk
new file mode 100644
index 00000000..7947d1d9
--- /dev/null
+++ b/qmk/keyboards/rgbkb/pan/rev1/proton_c/post_rules.mk
@@ -0,0 +1,22 @@
+# As long as the users rules.mk has include $(KEYBOARD)/post_rules.mk this will be run after to properly setup any keyboard features and defines
+ifeq ($(strip $(RGB_MATRIX_KEYPRESSES)), yes)
+    OPT_DEFS += -DRGB_MATRIX_KEYPRESSES
+endif
+
+ifeq ($(strip $(RGB_MATRIX_FRAMEBUFFER)), yes)
+    OPT_DEFS += -DRGB_MATRIX_FRAMEBUFFER_EFFECTS
+endif
+
+ifeq ($(strip $(STAGGERED_LAYOUT)), yes)
+    OPT_DEFS += -DSTAGGERED_LAYOUT
+endif
+
+ifeq ($(strip $(RGB_ENCODERS)), yes)
+    OPT_DEFS += -DRGB_ENCODERS
+endif
+
+ifeq ($(strip $(RGB_ENCODERS)), yes)
+    ifeq ($(strip $(STAGGERED_LAYOUT)), yes)
+        OPT_DEFS += -DSTAGGERED_RGB_ENCODERS=$(strip $(STAGGERED_RGB_ENCODERS))
+    endif
+endif
diff --git a/qmk/keyboards/rgbkb/pan/rev1/proton_c/rules.mk b/qmk/keyboards/rgbkb/pan/rev1/proton_c/rules.mk
new file mode 100644
index 00000000..b17a3d03
--- /dev/null
+++ b/qmk/keyboards/rgbkb/pan/rev1/proton_c/rules.mk
@@ -0,0 +1,2 @@
+# MCU name
+MCU = STM32F303
diff --git a/qmk/keyboards/rgbkb/pan/rev1/rules.mk b/qmk/keyboards/rgbkb/pan/rev1/rules.mk
new file mode 100644
index 00000000..4d3c0f66
--- /dev/null
+++ b/qmk/keyboards/rgbkb/pan/rev1/rules.mk
@@ -0,0 +1,2 @@
+# The default configuration is a atmega32a
+DEFAULT_FOLDER = rgbkb/pan/rev1/32a
diff --git a/qmk/keyboards/rgbkb/pan/rules.mk b/qmk/keyboards/rgbkb/pan/rules.mk
new file mode 100644
index 00000000..fa3ce946
--- /dev/null
+++ b/qmk/keyboards/rgbkb/pan/rules.mk
@@ -0,0 +1,26 @@
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # 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
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = WS2812
+WS2812_DRIVER = bitbang
+ENCODER_ENABLE = yes
+OLED_DRIVER_ENABLE = yes
+
+# RGB layout selection
+RGB_ENCODERS = yes # For RGB encoders, solder on both WS2811 chips
+STAGGERED_LAYOUT = no # If you soldered R1-A12 and R4-A12, enable this.
+
+# Default to revision 1
+DEFAULT_FOLDER = rgbkb/pan/rev1
diff --git a/qmk/keyboards/rgbkb/sol/keymaps/kageurufu/rules.mk b/qmk/keyboards/rgbkb/sol/keymaps/kageurufu/rules.mk
index f60fa5d4..88469075 100644
--- a/qmk/keyboards/rgbkb/sol/keymaps/kageurufu/rules.mk
+++ b/qmk/keyboards/rgbkb/sol/keymaps/kageurufu/rules.mk
@@ -8,7 +8,7 @@ COMMAND_ENABLE          = yes       # Commands for debug and configuration
 RGBLIGHT_ENABLE         = no        # Enable global lighting effects. Do not enable with RGB Matrix
 RGBLIGHT_ANIMATIONS     = no        # LED animations
 LED_MIRRORED            = no        # Mirror LEDs across halves (enable DIP 1 on slave, and DIP 2 and 3 on master)
-RGB_MATRIX_ENABLE       = WS2812    # Enable per-key coordinate based RGB effects. Do not enable with RGBlight
+RGB_MATRIX_ENABLE       = yes       # Enable per-key coordinate based RGB effects. Do not enable with RGBlight
 
 # Userspace implements their own LTO
 LTO_ENABLE = no
diff --git a/qmk/keyboards/rgbkb/sol/keymaps/xulkal/rules.mk b/qmk/keyboards/rgbkb/sol/keymaps/xulkal/rules.mk
index da524e3d..c386b39d 100644
--- a/qmk/keyboards/rgbkb/sol/keymaps/xulkal/rules.mk
+++ b/qmk/keyboards/rgbkb/sol/keymaps/xulkal/rules.mk
@@ -4,7 +4,7 @@
 RGBLIGHT_ENABLE         = no        # Enable global lighting effects. Do not enable with RGB Matrix
 RGBLIGHT_ANIMATIONS     = no        # LED animations
 LED_MIRRORED            = no        # Mirror LEDs across halves (enable DIP 1 on slave, and DIP 2 and 3 on master)
-RGB_MATRIX_ENABLE       = WS2812    # Enable per-key coordinate based RGB effects. Do not enable with RGBlight
+RGB_MATRIX_ENABLE       = yes       # Enable per-key coordinate based RGB effects. Do not enable with RGBlight
 FULLHAND_ENABLE         = no        # Enables the additional 24 Full Hand LEDs
 SF_ENABLE               = no        # Enables the additional 38 Starfighter LEDs
 
diff --git a/qmk/keyboards/rgbkb/sol/rev1/rules.mk b/qmk/keyboards/rgbkb/sol/rev1/rules.mk
index 7be64231..235e8525 100644
--- a/qmk/keyboards/rgbkb/sol/rev1/rules.mk
+++ b/qmk/keyboards/rgbkb/sol/rev1/rules.mk
@@ -17,6 +17,7 @@ RGBLIGHT_ANIMATIONS     = yes       # LED animations
 LED_MIRRORED            = yes       # Mirror LEDs across halves (enable DIP 1 on slave, and DIP 2 and 3 on master)
 
 RGB_MATRIX_ENABLE       = no        # Enable per-key coordinate based RGB effects. Do not enable with RGBlight
+RGB_MATRIX_DRIVER       = WS2812
 RGB_MATRIX_KEYPRESSES   = no        # Enable reactive per-key effects.
 RGB_MATRIX_FRAMEBUFFER_EFFECTS = no # Enable frame buffer effects like the typing heatmap.
 
diff --git a/qmk/keyboards/rgbkb/sol/rev2/rules.mk b/qmk/keyboards/rgbkb/sol/rev2/rules.mk
index 201a7b47..29e21101 100644
--- a/qmk/keyboards/rgbkb/sol/rev2/rules.mk
+++ b/qmk/keyboards/rgbkb/sol/rev2/rules.mk
@@ -16,7 +16,8 @@ RGBLIGHT_ENABLE         = no        # Enable global lighting effects. Do not ena
 RGBLIGHT_ANIMATIONS     = no        # LED animations
 LED_MIRRORED            = no        # Mirror LEDs across halves (enable DIP 1 on slave, and DIP 2 and 3 on master)
 
-RGB_MATRIX_ENABLE       = WS2812    # Enable per-key coordinate based RGB effects. Do not enable with RGBlight
+RGB_MATRIX_ENABLE = yes             # Enable per-key coordinate based RGB effects. Do not enable with RGBlight
+RGB_MATRIX_DRIVER = WS2812
 RGB_MATRIX_KEYPRESSES   = no        # Enable reactive per-key effects.
 RGB_MATRIX_FRAMEBUFFER_EFFECTS = no # Enable frame buffer effects like the typing heatmap.
 
diff --git a/qmk/keyboards/rgbkb/zygomorph/rules.mk b/qmk/keyboards/rgbkb/zygomorph/rules.mk
index 83706cdf..1b27af2e 100644
--- a/qmk/keyboards/rgbkb/zygomorph/rules.mk
+++ b/qmk/keyboards/rgbkb/zygomorph/rules.mk
@@ -30,7 +30,7 @@ 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
+RGB_MATRIX_DRIVER = WS2812
 
 SPLIT_KEYBOARD = yes
 LAYOUTS = ortho_4x12 ortho_5x12
diff --git a/qmk/keyboards/rocketboard_16/chconf.h b/qmk/keyboards/rocketboard_16/chconf.h
new file mode 100644
index 00000000..f5e47164
--- /dev/null
+++ b/qmk/keyboards/rocketboard_16/chconf.h
@@ -0,0 +1,714 @@
+/*
+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+/**
+ * @file    rt/templates/chconf.h
+ * @brief   Configuration file template.
+ * @details A copy of this file must be placed in each project directory, it
+ *          contains the application specific kernel settings.
+ *
+ * @addtogroup config
+ * @details Kernel related settings and hooks.
+ * @{
+ */
+
+#ifndef CHCONF_H
+#define CHCONF_H
+
+#define _CHIBIOS_RT_CONF_
+#define _CHIBIOS_RT_CONF_VER_6_0_
+
+/*===========================================================================*/
+/**
+ * @name System timers settings
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   System time counter resolution.
+ * @note    Allowed values are 16 or 32 bits.
+ */
+#if !defined(CH_CFG_ST_RESOLUTION)
+#define CH_CFG_ST_RESOLUTION                32
+#endif
+
+/**
+ * @brief   System tick frequency.
+ * @details Frequency of the system timer that drives the system ticks. This
+ *          setting also defines the system tick time unit.
+ */
+#if !defined(CH_CFG_ST_FREQUENCY)
+#define CH_CFG_ST_FREQUENCY                 100000
+#endif
+
+/**
+ * @brief   Time intervals data size.
+ * @note    Allowed values are 16, 32 or 64 bits.
+ */
+#if !defined(CH_CFG_INTERVALS_SIZE)
+#define CH_CFG_INTERVALS_SIZE               32
+#endif
+
+/**
+ * @brief   Time types data size.
+ * @note    Allowed values are 16 or 32 bits.
+ */
+#if !defined(CH_CFG_TIME_TYPES_SIZE)
+#define CH_CFG_TIME_TYPES_SIZE              32
+#endif
+
+/**
+ * @brief   Time delta constant for the tick-less mode.
+ * @note    If this value is zero then the system uses the classic
+ *          periodic tick. This value represents the minimum number
+ *          of ticks that is safe to specify in a timeout directive.
+ *          The value one is not valid, timeouts are rounded up to
+ *          this value.
+ */
+#if !defined(CH_CFG_ST_TIMEDELTA)
+#define CH_CFG_ST_TIMEDELTA                 0
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Kernel parameters and options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   Round robin interval.
+ * @details This constant is the number of system ticks allowed for the
+ *          threads before preemption occurs. Setting this value to zero
+ *          disables the preemption for threads with equal priority and the
+ *          round robin becomes cooperative. Note that higher priority
+ *          threads can still preempt, the kernel is always preemptive.
+ * @note    Disabling the round robin preemption makes the kernel more compact
+ *          and generally faster.
+ * @note    The round robin preemption is not supported in tickless mode and
+ *          must be set to zero in that case.
+ */
+#if !defined(CH_CFG_TIME_QUANTUM)
+#define CH_CFG_TIME_QUANTUM                 0
+#endif
+
+/**
+ * @brief   Managed RAM size.
+ * @details Size of the RAM area to be managed by the OS. If set to zero
+ *          then the whole available RAM is used. The core memory is made
+ *          available to the heap allocator and/or can be used directly through
+ *          the simplified core memory allocator.
+ *
+ * @note    In order to let the OS manage the whole RAM the linker script must
+ *          provide the @p __heap_base__ and @p __heap_end__ symbols.
+ * @note    Requires @p CH_CFG_USE_MEMCORE.
+ */
+#if !defined(CH_CFG_MEMCORE_SIZE)
+#define CH_CFG_MEMCORE_SIZE                 0
+#endif
+
+/**
+ * @brief   Idle thread automatic spawn suppression.
+ * @details When this option is activated the function @p chSysInit()
+ *          does not spawn the idle thread. The application @p main()
+ *          function becomes the idle thread and must implement an
+ *          infinite loop.
+ */
+#if !defined(CH_CFG_NO_IDLE_THREAD)
+#define CH_CFG_NO_IDLE_THREAD               FALSE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Performance options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   OS optimization.
+ * @details If enabled then time efficient rather than space efficient code
+ *          is used when two possible implementations exist.
+ *
+ * @note    This is not related to the compiler optimization options.
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_OPTIMIZE_SPEED)
+#define CH_CFG_OPTIMIZE_SPEED               TRUE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Subsystem options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   Time Measurement APIs.
+ * @details If enabled then the time measurement APIs are included in
+ *          the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_TM)
+#define CH_CFG_USE_TM                       FALSE
+#endif
+
+/**
+ * @brief   Threads registry APIs.
+ * @details If enabled then the registry APIs are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_REGISTRY)
+#define CH_CFG_USE_REGISTRY                 TRUE
+#endif
+
+/**
+ * @brief   Threads synchronization APIs.
+ * @details If enabled then the @p chThdWait() function is included in
+ *          the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_WAITEXIT)
+#define CH_CFG_USE_WAITEXIT                 TRUE
+#endif
+
+/**
+ * @brief   Semaphores APIs.
+ * @details If enabled then the Semaphores APIs are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_SEMAPHORES)
+#define CH_CFG_USE_SEMAPHORES               TRUE
+#endif
+
+/**
+ * @brief   Semaphores queuing mode.
+ * @details If enabled then the threads are enqueued on semaphores by
+ *          priority rather than in FIFO order.
+ *
+ * @note    The default is @p FALSE. Enable this if you have special
+ *          requirements.
+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.
+ */
+#if !defined(CH_CFG_USE_SEMAPHORES_PRIORITY)
+#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE
+#endif
+
+/**
+ * @brief   Mutexes APIs.
+ * @details If enabled then the mutexes APIs are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_MUTEXES)
+#define CH_CFG_USE_MUTEXES                  TRUE
+#endif
+
+/**
+ * @brief   Enables recursive behavior on mutexes.
+ * @note    Recursive mutexes are heavier and have an increased
+ *          memory footprint.
+ *
+ * @note    The default is @p FALSE.
+ * @note    Requires @p CH_CFG_USE_MUTEXES.
+ */
+#if !defined(CH_CFG_USE_MUTEXES_RECURSIVE)
+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE
+#endif
+
+/**
+ * @brief   Conditional Variables APIs.
+ * @details If enabled then the conditional variables APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_MUTEXES.
+ */
+#if !defined(CH_CFG_USE_CONDVARS)
+#define CH_CFG_USE_CONDVARS                 TRUE
+#endif
+
+/**
+ * @brief   Conditional Variables APIs with timeout.
+ * @details If enabled then the conditional variables APIs with timeout
+ *          specification are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_CONDVARS.
+ */
+#if !defined(CH_CFG_USE_CONDVARS_TIMEOUT)
+#define CH_CFG_USE_CONDVARS_TIMEOUT         FALSE
+#endif
+
+/**
+ * @brief   Events Flags APIs.
+ * @details If enabled then the event flags APIs are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_EVENTS)
+#define CH_CFG_USE_EVENTS                   TRUE
+#endif
+
+/**
+ * @brief   Events Flags APIs with timeout.
+ * @details If enabled then the events APIs with timeout specification
+ *          are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_EVENTS.
+ */
+#if !defined(CH_CFG_USE_EVENTS_TIMEOUT)
+#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE
+#endif
+
+/**
+ * @brief   Synchronous Messages APIs.
+ * @details If enabled then the synchronous messages APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_MESSAGES)
+#define CH_CFG_USE_MESSAGES                 TRUE
+#endif
+
+/**
+ * @brief   Synchronous Messages queuing mode.
+ * @details If enabled then messages are served by priority rather than in
+ *          FIFO order.
+ *
+ * @note    The default is @p FALSE. Enable this if you have special
+ *          requirements.
+ * @note    Requires @p CH_CFG_USE_MESSAGES.
+ */
+#if !defined(CH_CFG_USE_MESSAGES_PRIORITY)
+#define CH_CFG_USE_MESSAGES_PRIORITY        FALSE
+#endif
+
+/**
+ * @brief   Mailboxes APIs.
+ * @details If enabled then the asynchronous messages (mailboxes) APIs are
+ *          included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.
+ */
+#if !defined(CH_CFG_USE_MAILBOXES)
+#define CH_CFG_USE_MAILBOXES                TRUE
+#endif
+
+/**
+ * @brief   Core Memory Manager APIs.
+ * @details If enabled then the core memory manager APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_MEMCORE)
+#define CH_CFG_USE_MEMCORE                  TRUE
+#endif
+
+/**
+ * @brief   Heap Allocator APIs.
+ * @details If enabled then the memory heap allocator APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_MEMCORE and either @p CH_CFG_USE_MUTEXES or
+ *          @p CH_CFG_USE_SEMAPHORES.
+ * @note    Mutexes are recommended.
+ */
+#if !defined(CH_CFG_USE_HEAP)
+#define CH_CFG_USE_HEAP                     TRUE
+#endif
+
+/**
+ * @brief   Memory Pools Allocator APIs.
+ * @details If enabled then the memory pools allocator APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_MEMPOOLS)
+#define CH_CFG_USE_MEMPOOLS                 FALSE
+#endif
+
+/**
+ * @brief   Objects FIFOs APIs.
+ * @details If enabled then the objects FIFOs APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_OBJ_FIFOS)
+#define CH_CFG_USE_OBJ_FIFOS                FALSE
+#endif
+
+/**
+ * @brief   Pipes APIs.
+ * @details If enabled then the pipes APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_PIPES)
+#define CH_CFG_USE_PIPES                    FALSE
+#endif
+
+/**
+ * @brief   Dynamic Threads APIs.
+ * @details If enabled then the dynamic threads creation APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_WAITEXIT.
+ * @note    Requires @p CH_CFG_USE_HEAP and/or @p CH_CFG_USE_MEMPOOLS.
+ */
+#if !defined(CH_CFG_USE_DYNAMIC)
+#define CH_CFG_USE_DYNAMIC                  FALSE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Objects factory options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   Objects Factory APIs.
+ * @details If enabled then the objects factory APIs are included in the
+ *          kernel.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_CFG_USE_FACTORY)
+#define CH_CFG_USE_FACTORY                  FALSE
+#endif
+
+/**
+ * @brief   Maximum length for object names.
+ * @details If the specified length is zero then the name is stored by
+ *          pointer but this could have unintended side effects.
+ */
+#if !defined(CH_CFG_FACTORY_MAX_NAMES_LENGTH)
+#define CH_CFG_FACTORY_MAX_NAMES_LENGTH     8
+#endif
+
+/**
+ * @brief   Enables the registry of generic objects.
+ */
+#if !defined(CH_CFG_FACTORY_OBJECTS_REGISTRY)
+#define CH_CFG_FACTORY_OBJECTS_REGISTRY     FALSE
+#endif
+
+/**
+ * @brief   Enables factory for generic buffers.
+ */
+#if !defined(CH_CFG_FACTORY_GENERIC_BUFFERS)
+#define CH_CFG_FACTORY_GENERIC_BUFFERS      FALSE
+#endif
+
+/**
+ * @brief   Enables factory for semaphores.
+ */
+#if !defined(CH_CFG_FACTORY_SEMAPHORES)
+#define CH_CFG_FACTORY_SEMAPHORES           FALSE
+#endif
+
+/**
+ * @brief   Enables factory for mailboxes.
+ */
+#if !defined(CH_CFG_FACTORY_MAILBOXES)
+#define CH_CFG_FACTORY_MAILBOXES            FALSE
+#endif
+
+/**
+ * @brief   Enables factory for objects FIFOs.
+ */
+#if !defined(CH_CFG_FACTORY_OBJ_FIFOS)
+#define CH_CFG_FACTORY_OBJ_FIFOS            FALSE
+#endif
+
+/**
+ * @brief   Enables factory for Pipes.
+ */
+#if !defined(CH_CFG_FACTORY_PIPES) || defined(__DOXYGEN__)
+#define CH_CFG_FACTORY_PIPES                FALSE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Debug options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   Debug option, kernel statistics.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_STATISTICS)
+#define CH_DBG_STATISTICS                   FALSE
+#endif
+
+/**
+ * @brief   Debug option, system state check.
+ * @details If enabled the correct call protocol for system APIs is checked
+ *          at runtime.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_SYSTEM_STATE_CHECK)
+#define CH_DBG_SYSTEM_STATE_CHECK           FALSE
+#endif
+
+/**
+ * @brief   Debug option, parameters checks.
+ * @details If enabled then the checks on the API functions input
+ *          parameters are activated.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_ENABLE_CHECKS)
+#define CH_DBG_ENABLE_CHECKS                FALSE
+#endif
+
+/**
+ * @brief   Debug option, consistency checks.
+ * @details If enabled then all the assertions in the kernel code are
+ *          activated. This includes consistency checks inside the kernel,
+ *          runtime anomalies and port-defined checks.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_ENABLE_ASSERTS)
+#define CH_DBG_ENABLE_ASSERTS               FALSE
+#endif
+
+/**
+ * @brief   Debug option, trace buffer.
+ * @details If enabled then the trace buffer is activated.
+ *
+ * @note    The default is @p CH_DBG_TRACE_MASK_DISABLED.
+ */
+#if !defined(CH_DBG_TRACE_MASK)
+#define CH_DBG_TRACE_MASK                   CH_DBG_TRACE_MASK_DISABLED
+#endif
+
+/**
+ * @brief   Trace buffer entries.
+ * @note    The trace buffer is only allocated if @p CH_DBG_TRACE_MASK is
+ *          different from @p CH_DBG_TRACE_MASK_DISABLED.
+ */
+#if !defined(CH_DBG_TRACE_BUFFER_SIZE)
+#define CH_DBG_TRACE_BUFFER_SIZE            128
+#endif
+
+/**
+ * @brief   Debug option, stack checks.
+ * @details If enabled then a runtime stack check is performed.
+ *
+ * @note    The default is @p FALSE.
+ * @note    The stack check is performed in a architecture/port dependent way.
+ *          It may not be implemented or some ports.
+ * @note    The default failure mode is to halt the system with the global
+ *          @p panic_msg variable set to @p NULL.
+ */
+#if !defined(CH_DBG_ENABLE_STACK_CHECK)
+#define CH_DBG_ENABLE_STACK_CHECK           FALSE
+#endif
+
+/**
+ * @brief   Debug option, stacks initialization.
+ * @details If enabled then the threads working area is filled with a byte
+ *          value when a thread is created. This can be useful for the
+ *          runtime measurement of the used stack.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_FILL_THREADS)
+#define CH_DBG_FILL_THREADS                 FALSE
+#endif
+
+/**
+ * @brief   Debug option, threads profiling.
+ * @details If enabled then a field is added to the @p thread_t structure that
+ *          counts the system ticks occurred while executing the thread.
+ *
+ * @note    The default is @p FALSE.
+ * @note    This debug option is not currently compatible with the
+ *          tickless mode.
+ */
+#if !defined(CH_DBG_THREADS_PROFILING)
+#define CH_DBG_THREADS_PROFILING            FALSE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Kernel hooks
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   System structure extension.
+ * @details User fields added to the end of the @p ch_system_t structure.
+ */
+#define CH_CFG_SYSTEM_EXTRA_FIELDS                                          \
+  /* Add threads custom fields here.*/
+
+/**
+ * @brief   System initialization hook.
+ * @details User initialization code added to the @p chSysInit() function
+ *          just before interrupts are enabled globally.
+ */
+#define CH_CFG_SYSTEM_INIT_HOOK() {                                         \
+  /* Add threads initialization code here.*/                                \
+}
+
+/**
+ * @brief   Threads descriptor structure extension.
+ * @details User fields added to the end of the @p thread_t structure.
+ */
+#define CH_CFG_THREAD_EXTRA_FIELDS                                          \
+  /* Add threads custom fields here.*/
+
+/**
+ * @brief   Threads initialization hook.
+ * @details User initialization code added to the @p _thread_init() function.
+ *
+ * @note    It is invoked from within @p _thread_init() and implicitly from all
+ *          the threads creation APIs.
+ */
+#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \
+  /* Add threads initialization code here.*/                                \
+}
+
+/**
+ * @brief   Threads finalization hook.
+ * @details User finalization code added to the @p chThdExit() API.
+ */
+#define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \
+  /* Add threads finalization code here.*/                                  \
+}
+
+/**
+ * @brief   Context switch hook.
+ * @details This hook is invoked just before switching between threads.
+ */
+#define CH_CFG_CONTEXT_SWITCH_HOOK(ntp, otp) {                              \
+  /* Context switch code here.*/                                            \
+}
+
+/**
+ * @brief   ISR enter hook.
+ */
+#define CH_CFG_IRQ_PROLOGUE_HOOK() {                                        \
+  /* IRQ prologue code here.*/                                              \
+}
+
+/**
+ * @brief   ISR exit hook.
+ */
+#define CH_CFG_IRQ_EPILOGUE_HOOK() {                                        \
+  /* IRQ epilogue code here.*/                                              \
+}
+
+/**
+ * @brief   Idle thread enter hook.
+ * @note    This hook is invoked within a critical zone, no OS functions
+ *          should be invoked from here.
+ * @note    This macro can be used to activate a power saving mode.
+ */
+#define CH_CFG_IDLE_ENTER_HOOK() {                                          \
+  /* Idle-enter code here.*/                                                \
+}
+
+/**
+ * @brief   Idle thread leave hook.
+ * @note    This hook is invoked within a critical zone, no OS functions
+ *          should be invoked from here.
+ * @note    This macro can be used to deactivate a power saving mode.
+ */
+#define CH_CFG_IDLE_LEAVE_HOOK() {                                          \
+  /* Idle-leave code here.*/                                                \
+}
+
+/**
+ * @brief   Idle Loop hook.
+ * @details This hook is continuously invoked by the idle thread loop.
+ */
+#define CH_CFG_IDLE_LOOP_HOOK() {                                           \
+  /* Idle loop code here.*/                                                 \
+}
+
+/**
+ * @brief   System tick event hook.
+ * @details This hook is invoked in the system tick handler immediately
+ *          after processing the virtual timers queue.
+ */
+#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \
+  /* System tick event code here.*/                                         \
+}
+
+/**
+ * @brief   System halt hook.
+ * @details This hook is invoked in case to a system halting error before
+ *          the system is halted.
+ */
+#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \
+  /* System halt code here.*/                                               \
+}
+
+/**
+ * @brief   Trace hook.
+ * @details This hook is invoked each time a new record is written in the
+ *          trace buffer.
+ */
+#define CH_CFG_TRACE_HOOK(tep) {                                            \
+  /* Trace code here.*/                                                     \
+}
+
+/** @} */
+
+/*===========================================================================*/
+/* Port-specific settings (override port settings defaulted in chcore.h).    */
+/*===========================================================================*/
+
+#endif  /* CHCONF_H */
+
+/** @} */
diff --git a/qmk/keyboards/rocketboard_16/config.h b/qmk/keyboards/rocketboard_16/config.h
new file mode 100644
index 00000000..a82514e0
--- /dev/null
+++ b/qmk/keyboards/rocketboard_16/config.h
@@ -0,0 +1,83 @@
+/*
+Copyright 2020 Seth Bonner <fl3tching101@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0xB034
+#define PRODUCT_ID      0xFF16
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Rocketboard
+#define PRODUCT         Rocketboard-16
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 4
+
+#define MATRIX_ROW_PINS { A9, B13, B14, B15, B3 }
+#define MATRIX_COL_PINS { B8, B9, B10, B11 }
+#define DIODE_DIRECTION COL2ROW
+
+/* Bootmagic key - row 4, col 1 */
+#define BOOTMAGIC_LITE_ROW 4
+#define BOOTMAGIC_LITE_COLUMN 1
+
+/* define if matrix has ghost */
+//#define MATRIX_HAS_GHOST
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE    5
+
+#define RGBLIGHT_ANIMATIONS
+#define RGB_DI_PIN A4
+#define RGBLED_NUM 16
+#define RGBLIGHT_LIMIT_VAL 128
+#define RGBLIGHT_VAL_STEP 8
+#define RGBLIGHT_SLEEP
+
+// OLED stuff
+#define OLED_DISPLAY_128X64
+
+// Allows for rotary encoder volume control
+#define TAP_CODE_DELAY 20
+
+/* Encoder stuff */
+#define ENCODERS_PAD_A \
+    { A0, A2 }
+#define ENCODERS_PAD_B \
+    { A1, A3 }
+
+#define LOCKING_SUPPORT_ENABLE
+#define LOCKING_RESYNC_ENABLE
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+//#define NO_ACTION_MACRO
+//#define NO_ACTION_FUNCTION
diff --git a/qmk/keyboards/rocketboard_16/halconf.h b/qmk/keyboards/rocketboard_16/halconf.h
new file mode 100644
index 00000000..7347a425
--- /dev/null
+++ b/qmk/keyboards/rocketboard_16/halconf.h
@@ -0,0 +1,525 @@
+/*
+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+/**
+ * @file    templates/halconf.h
+ * @brief   HAL configuration header.
+ * @details HAL configuration file, this file allows to enable or disable the
+ *          various device drivers from your application. You may also use
+ *          this file in order to override the device drivers default settings.
+ *
+ * @addtogroup HAL_CONF
+ * @{
+ */
+
+#ifndef HALCONF_H
+#define HALCONF_H
+
+#define _CHIBIOS_HAL_CONF_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
+
+#include "mcuconf.h"
+
+/**
+ * @brief   Enables the PAL subsystem.
+ */
+#if !defined(HAL_USE_PAL) || defined(__DOXYGEN__)
+#define HAL_USE_PAL                         TRUE
+#endif
+
+/**
+ * @brief   Enables the ADC subsystem.
+ */
+#if !defined(HAL_USE_ADC) || defined(__DOXYGEN__)
+#define HAL_USE_ADC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the CAN subsystem.
+ */
+#if !defined(HAL_USE_CAN) || defined(__DOXYGEN__)
+#define HAL_USE_CAN                         FALSE
+#endif
+
+/**
+ * @brief   Enables the cryptographic subsystem.
+ */
+#if !defined(HAL_USE_CRY) || defined(__DOXYGEN__)
+#define HAL_USE_CRY                         FALSE
+#endif
+
+/**
+ * @brief   Enables the DAC subsystem.
+ */
+#if !defined(HAL_USE_DAC) || defined(__DOXYGEN__)
+#define HAL_USE_DAC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the GPT subsystem.
+ */
+#if !defined(HAL_USE_GPT) || defined(__DOXYGEN__)
+#define HAL_USE_GPT                         FALSE
+#endif
+
+/**
+ * @brief   Enables the I2C subsystem.
+ */
+#if !defined(HAL_USE_I2C) || defined(__DOXYGEN__)
+#define HAL_USE_I2C                         TRUE
+#endif
+
+/**
+ * @brief   Enables the I2S subsystem.
+ */
+#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)
+#define HAL_USE_I2S                         FALSE
+#endif
+
+/**
+ * @brief   Enables the ICU subsystem.
+ */
+#if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)
+#define HAL_USE_ICU                         FALSE
+#endif
+
+/**
+ * @brief   Enables the MAC subsystem.
+ */
+#if !defined(HAL_USE_MAC) || defined(__DOXYGEN__)
+#define HAL_USE_MAC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the MMC_SPI subsystem.
+ */
+#if !defined(HAL_USE_MMC_SPI) || defined(__DOXYGEN__)
+#define HAL_USE_MMC_SPI                     FALSE
+#endif
+
+/**
+ * @brief   Enables the PWM subsystem.
+ */
+#if !defined(HAL_USE_PWM) || defined(__DOXYGEN__)
+#define HAL_USE_PWM                         TRUE
+#endif
+
+/**
+ * @brief   Enables the RTC subsystem.
+ */
+#if !defined(HAL_USE_RTC) || defined(__DOXYGEN__)
+#define HAL_USE_RTC                         TRUE
+#endif
+
+/**
+ * @brief   Enables the SDC subsystem.
+ */
+#if !defined(HAL_USE_SDC) || defined(__DOXYGEN__)
+#define HAL_USE_SDC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the SERIAL subsystem.
+ */
+#if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__)
+#define HAL_USE_SERIAL                      FALSE
+#endif
+
+/**
+ * @brief   Enables the SERIAL over USB subsystem.
+ */
+#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)
+#define HAL_USE_SERIAL_USB                  FALSE
+#endif
+
+/**
+ * @brief   Enables the SIO subsystem.
+ */
+#if !defined(HAL_USE_SIO) || defined(__DOXYGEN__)
+#define HAL_USE_SIO                         FALSE
+#endif
+
+/**
+ * @brief   Enables the SPI subsystem.
+ */
+#if !defined(HAL_USE_SPI) || defined(__DOXYGEN__)
+#define HAL_USE_SPI                         TRUE
+#endif
+
+/**
+ * @brief   Enables the TRNG subsystem.
+ */
+#if !defined(HAL_USE_TRNG) || defined(__DOXYGEN__)
+#define HAL_USE_TRNG                        FALSE
+#endif
+
+/**
+ * @brief   Enables the UART subsystem.
+ */
+#if !defined(HAL_USE_UART) || defined(__DOXYGEN__)
+#define HAL_USE_UART                        FALSE
+#endif
+
+/**
+ * @brief   Enables the USB subsystem.
+ */
+#if !defined(HAL_USE_USB) || defined(__DOXYGEN__)
+#define HAL_USE_USB                         TRUE
+#endif
+
+/**
+ * @brief   Enables the WDG subsystem.
+ */
+#if !defined(HAL_USE_WDG) || defined(__DOXYGEN__)
+#define HAL_USE_WDG                         FALSE
+#endif
+
+/**
+ * @brief   Enables the WSPI subsystem.
+ */
+#if !defined(HAL_USE_WSPI) || defined(__DOXYGEN__)
+#define HAL_USE_WSPI                        FALSE
+#endif
+
+/*===========================================================================*/
+/* PAL driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(PAL_USE_CALLBACKS) || defined(__DOXYGEN__)
+#define PAL_USE_CALLBACKS                   FALSE
+#endif
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(PAL_USE_WAIT) || defined(__DOXYGEN__)
+#define PAL_USE_WAIT                        FALSE
+#endif
+
+/*===========================================================================*/
+/* ADC driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(ADC_USE_WAIT) || defined(__DOXYGEN__)
+#define ADC_USE_WAIT                        TRUE
+#endif
+
+/**
+ * @brief   Enables the @p adcAcquireBus() and @p adcReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(ADC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define ADC_USE_MUTUAL_EXCLUSION            TRUE
+#endif
+
+/*===========================================================================*/
+/* CAN driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Sleep mode related APIs inclusion switch.
+ */
+#if !defined(CAN_USE_SLEEP_MODE) || defined(__DOXYGEN__)
+#define CAN_USE_SLEEP_MODE                  TRUE
+#endif
+
+/**
+ * @brief   Enforces the driver to use direct callbacks rather than OSAL events.
+ */
+#if !defined(CAN_ENFORCE_USE_CALLBACKS) || defined(__DOXYGEN__)
+#define CAN_ENFORCE_USE_CALLBACKS           FALSE
+#endif
+
+/*===========================================================================*/
+/* CRY driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables the SW fall-back of the cryptographic driver.
+ * @details When enabled, this option, activates a fall-back software
+ *          implementation for algorithms not supported by the underlying
+ *          hardware.
+ * @note    Fall-back implementations may not be present for all algorithms.
+ */
+#if !defined(HAL_CRY_USE_FALLBACK) || defined(__DOXYGEN__)
+#define HAL_CRY_USE_FALLBACK                FALSE
+#endif
+
+/**
+ * @brief   Makes the driver forcibly use the fall-back implementations.
+ */
+#if !defined(HAL_CRY_ENFORCE_FALLBACK) || defined(__DOXYGEN__)
+#define HAL_CRY_ENFORCE_FALLBACK            FALSE
+#endif
+
+/*===========================================================================*/
+/* DAC driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(DAC_USE_WAIT) || defined(__DOXYGEN__)
+#define DAC_USE_WAIT                        TRUE
+#endif
+
+/**
+ * @brief   Enables the @p dacAcquireBus() and @p dacReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(DAC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define DAC_USE_MUTUAL_EXCLUSION            TRUE
+#endif
+
+/*===========================================================================*/
+/* I2C driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables the mutual exclusion APIs on the I2C bus.
+ */
+#if !defined(I2C_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define I2C_USE_MUTUAL_EXCLUSION            TRUE
+#endif
+
+/*===========================================================================*/
+/* MAC driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables the zero-copy API.
+ */
+#if !defined(MAC_USE_ZERO_COPY) || defined(__DOXYGEN__)
+#define MAC_USE_ZERO_COPY                   FALSE
+#endif
+
+/**
+ * @brief   Enables an event sources for incoming packets.
+ */
+#if !defined(MAC_USE_EVENTS) || defined(__DOXYGEN__)
+#define MAC_USE_EVENTS                      TRUE
+#endif
+
+/*===========================================================================*/
+/* MMC_SPI driver related settings.                                          */
+/*===========================================================================*/
+
+/**
+ * @brief   Delays insertions.
+ * @details If enabled this options inserts delays into the MMC waiting
+ *          routines releasing some extra CPU time for the threads with
+ *          lower priority, this may slow down the driver a bit however.
+ *          This option is recommended also if the SPI driver does not
+ *          use a DMA channel and heavily loads the CPU.
+ */
+#if !defined(MMC_NICE_WAITING) || defined(__DOXYGEN__)
+#define MMC_NICE_WAITING                    TRUE
+#endif
+
+/*===========================================================================*/
+/* SDC driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Number of initialization attempts before rejecting the card.
+ * @note    Attempts are performed at 10mS intervals.
+ */
+#if !defined(SDC_INIT_RETRY) || defined(__DOXYGEN__)
+#define SDC_INIT_RETRY                      100
+#endif
+
+/**
+ * @brief   Include support for MMC cards.
+ * @note    MMC support is not yet implemented so this option must be kept
+ *          at @p FALSE.
+ */
+#if !defined(SDC_MMC_SUPPORT) || defined(__DOXYGEN__)
+#define SDC_MMC_SUPPORT                     FALSE
+#endif
+
+/**
+ * @brief   Delays insertions.
+ * @details If enabled this options inserts delays into the MMC waiting
+ *          routines releasing some extra CPU time for the threads with
+ *          lower priority, this may slow down the driver a bit however.
+ */
+#if !defined(SDC_NICE_WAITING) || defined(__DOXYGEN__)
+#define SDC_NICE_WAITING                    TRUE
+#endif
+
+/**
+ * @brief   OCR initialization constant for V20 cards.
+ */
+#if !defined(SDC_INIT_OCR_V20) || defined(__DOXYGEN__)
+#define SDC_INIT_OCR_V20                    0x50FF8000U
+#endif
+
+/**
+ * @brief   OCR initialization constant for non-V20 cards.
+ */
+#if !defined(SDC_INIT_OCR) || defined(__DOXYGEN__)
+#define SDC_INIT_OCR                        0x80100000U
+#endif
+
+/*===========================================================================*/
+/* SERIAL driver related settings.                                           */
+/*===========================================================================*/
+
+/**
+ * @brief   Default bit rate.
+ * @details Configuration parameter, this is the baud rate selected for the
+ *          default configuration.
+ */
+#if !defined(SERIAL_DEFAULT_BITRATE) || defined(__DOXYGEN__)
+#define SERIAL_DEFAULT_BITRATE              38400
+#endif
+
+/**
+ * @brief   Serial buffers size.
+ * @details Configuration parameter, you can change the depth of the queue
+ *          buffers depending on the requirements of your application.
+ * @note    The default is 16 bytes for both the transmission and receive
+ *          buffers.
+ */
+#if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__)
+#define SERIAL_BUFFERS_SIZE                 16
+#endif
+
+/*===========================================================================*/
+/* SERIAL_USB driver related setting.                                        */
+/*===========================================================================*/
+
+/**
+ * @brief   Serial over USB buffers size.
+ * @details Configuration parameter, the buffer size must be a multiple of
+ *          the USB data endpoint maximum packet size.
+ * @note    The default is 256 bytes for both the transmission and receive
+ *          buffers.
+ */
+#if !defined(SERIAL_USB_BUFFERS_SIZE) || defined(__DOXYGEN__)
+#define SERIAL_USB_BUFFERS_SIZE             1
+#endif
+
+/**
+ * @brief   Serial over USB number of buffers.
+ * @note    The default is 2 buffers.
+ */
+#if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
+#define SERIAL_USB_BUFFERS_NUMBER           2
+#endif
+
+/*===========================================================================*/
+/* SPI driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(SPI_USE_WAIT) || defined(__DOXYGEN__)
+#define SPI_USE_WAIT                        TRUE
+#endif
+
+/**
+ * @brief   Enables circular transfers APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(SPI_USE_CIRCULAR) || defined(__DOXYGEN__)
+#define SPI_USE_CIRCULAR                    FALSE
+#endif
+
+
+/**
+ * @brief   Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(SPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define SPI_USE_MUTUAL_EXCLUSION            TRUE
+#endif
+
+/**
+ * @brief   Handling method for SPI CS line.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(SPI_SELECT_MODE) || defined(__DOXYGEN__)
+#define SPI_SELECT_MODE                     SPI_SELECT_MODE_PAD
+#endif
+
+/*===========================================================================*/
+/* UART driver related settings.                                             */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(UART_USE_WAIT) || defined(__DOXYGEN__)
+#define UART_USE_WAIT                       FALSE
+#endif
+
+/**
+ * @brief   Enables the @p uartAcquireBus() and @p uartReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(UART_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define UART_USE_MUTUAL_EXCLUSION           FALSE
+#endif
+
+/*===========================================================================*/
+/* USB driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(USB_USE_WAIT) || defined(__DOXYGEN__)
+#define USB_USE_WAIT                        TRUE
+#endif
+
+/*===========================================================================*/
+/* WSPI driver related settings.                                             */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(WSPI_USE_WAIT) || defined(__DOXYGEN__)
+#define WSPI_USE_WAIT                       TRUE
+#endif
+
+/**
+ * @brief   Enables the @p wspiAcquireBus() and @p wspiReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(WSPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define WSPI_USE_MUTUAL_EXCLUSION           TRUE
+#endif
+
+#endif /* HALCONF_H */
+
+/** @} */
diff --git a/qmk/keyboards/rocketboard_16/info.json b/qmk/keyboards/rocketboard_16/info.json
new file mode 100644
index 00000000..3530a4b7
--- /dev/null
+++ b/qmk/keyboards/rocketboard_16/info.json
@@ -0,0 +1,35 @@
+{
+    "keyboard_name": "Rocketboard-16",
+    "url": "",
+    "maintainer": "fl3tching101",
+    "width": 4,
+    "height": 5,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"x": 0, "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},
+
+                {"x": 0, "y": 4},
+                {"x": 1, "y": 4},
+                {"x": 2, "y": 4},
+                {"x": 3, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/qmk/keyboards/rocketboard_16/keymaps/default/keymap.c b/qmk/keyboards/rocketboard_16/keymaps/default/keymap.c
new file mode 100644
index 00000000..b014e503
--- /dev/null
+++ b/qmk/keyboards/rocketboard_16/keymaps/default/keymap.c
@@ -0,0 +1,89 @@
+/*
+Copyright 2020 Seth Bonner <fl3tching101@gmail.com>
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+#define _BASE 0
+
+// Use the following format to create custom key codes to make macros out of and such
+/*
+enum custom_keycodes {
+ FOO = SAFE_RANGE,
+};
+*/
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [_BASE] = LAYOUT_default(
+   RGB_MODE_FORWARD,                KC_NUMLOCK,
+   KC_KP_7, KC_KP_8, KC_KP_9,       KC_DELETE,
+   KC_KP_4, KC_KP_5, KC_KP_6,       KC_END,
+   KC_KP_1, KC_KP_2, KC_KP_3,       KC_AUDIO_VOL_UP,
+   KC_KP_0, RGB_TOG, KC_AUDIO_MUTE, KC_AUDIO_VOL_DOWN
+ )
+};
+
+void encoder_update_user(uint8_t index, bool clockwise){
+  if(index == 0) { // first encoder
+    if(clockwise){
+      tap_code(KC_AUDIO_VOL_UP);
+    }else{
+      tap_code(KC_AUDIO_VOL_DOWN);
+    }
+  }else if(index == 1){ // second encoder
+    if(clockwise){
+      rgblight_increase_val();
+    }else{
+      rgblight_decrease_val();
+    }
+  }
+}
+
+#ifdef OLED_DRIVER_ENABLE
+
+static void render_logo(void) {
+    static const char PROGMEM qmk_logo[] = {
+        0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, 0x90, 0x91, 0x92, 0x93, 0x94,
+        0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF, 0xB0, 0xB1, 0xB2, 0xB3, 0xB4,
+        0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0x00
+    };
+
+    oled_write(qmk_logo, false);
+}
+
+oled_rotation_t oled_init_user(oled_rotation_t rotation) { return OLED_ROTATION_180; }
+
+void oled_task_user(void) {
+    uint8_t light_level = rgblight_get_val();
+    light_level = (uint8_t)(100.0 * ((float)light_level/(float)RGBLIGHT_LIMIT_VAL)); // Convert to %
+    char c_light_level[3];
+    itoa(light_level, c_light_level, 10);
+
+    render_logo(); // Render the QMK logo
+    oled_write_ln(PSTR(""), false); // Add a newline
+    // Host Keyboard LED Status
+    led_t led_state = host_keyboard_led_state();
+    oled_write(led_state.num_lock ? PSTR("   |NUM|") : PSTR("   |   |"), false);
+    oled_write(led_state.caps_lock ? PSTR("|CAP|") : PSTR("|   |"), false);
+    oled_write(led_state.scroll_lock ? PSTR("|SCR|   ") : PSTR("|   |   "), false);
+
+    oled_write_ln(PSTR(""), false); // Add a newline
+    oled_write(PSTR("    BKLT: "), false);
+    oled_write(c_light_level, false);
+    oled_write_ln(PSTR("%    "), false);
+}
+#endif
diff --git a/qmk/keyboards/rocketboard_16/keymaps/via/keymap.c b/qmk/keyboards/rocketboard_16/keymaps/via/keymap.c
new file mode 100644
index 00000000..b014e503
--- /dev/null
+++ b/qmk/keyboards/rocketboard_16/keymaps/via/keymap.c
@@ -0,0 +1,89 @@
+/*
+Copyright 2020 Seth Bonner <fl3tching101@gmail.com>
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+#include QMK_KEYBOARD_H
+
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+#define _BASE 0
+
+// Use the following format to create custom key codes to make macros out of and such
+/*
+enum custom_keycodes {
+ FOO = SAFE_RANGE,
+};
+*/
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [_BASE] = LAYOUT_default(
+   RGB_MODE_FORWARD,                KC_NUMLOCK,
+   KC_KP_7, KC_KP_8, KC_KP_9,       KC_DELETE,
+   KC_KP_4, KC_KP_5, KC_KP_6,       KC_END,
+   KC_KP_1, KC_KP_2, KC_KP_3,       KC_AUDIO_VOL_UP,
+   KC_KP_0, RGB_TOG, KC_AUDIO_MUTE, KC_AUDIO_VOL_DOWN
+ )
+};
+
+void encoder_update_user(uint8_t index, bool clockwise){
+  if(index == 0) { // first encoder
+    if(clockwise){
+      tap_code(KC_AUDIO_VOL_UP);
+    }else{
+      tap_code(KC_AUDIO_VOL_DOWN);
+    }
+  }else if(index == 1){ // second encoder
+    if(clockwise){
+      rgblight_increase_val();
+    }else{
+      rgblight_decrease_val();
+    }
+  }
+}
+
+#ifdef OLED_DRIVER_ENABLE
+
+static void render_logo(void) {
+    static const char PROGMEM qmk_logo[] = {
+        0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89, 0x8A, 0x8B, 0x8C, 0x8D, 0x8E, 0x8F, 0x90, 0x91, 0x92, 0x93, 0x94,
+        0xA0, 0xA1, 0xA2, 0xA3, 0xA4, 0xA5, 0xA6, 0xA7, 0xA8, 0xA9, 0xAA, 0xAB, 0xAC, 0xAD, 0xAE, 0xAF, 0xB0, 0xB1, 0xB2, 0xB3, 0xB4,
+        0xC0, 0xC1, 0xC2, 0xC3, 0xC4, 0xC5, 0xC6, 0xC7, 0xC8, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xCF, 0xD0, 0xD1, 0xD2, 0xD3, 0xD4, 0x00
+    };
+
+    oled_write(qmk_logo, false);
+}
+
+oled_rotation_t oled_init_user(oled_rotation_t rotation) { return OLED_ROTATION_180; }
+
+void oled_task_user(void) {
+    uint8_t light_level = rgblight_get_val();
+    light_level = (uint8_t)(100.0 * ((float)light_level/(float)RGBLIGHT_LIMIT_VAL)); // Convert to %
+    char c_light_level[3];
+    itoa(light_level, c_light_level, 10);
+
+    render_logo(); // Render the QMK logo
+    oled_write_ln(PSTR(""), false); // Add a newline
+    // Host Keyboard LED Status
+    led_t led_state = host_keyboard_led_state();
+    oled_write(led_state.num_lock ? PSTR("   |NUM|") : PSTR("   |   |"), false);
+    oled_write(led_state.caps_lock ? PSTR("|CAP|") : PSTR("|   |"), false);
+    oled_write(led_state.scroll_lock ? PSTR("|SCR|   ") : PSTR("|   |   "), false);
+
+    oled_write_ln(PSTR(""), false); // Add a newline
+    oled_write(PSTR("    BKLT: "), false);
+    oled_write(c_light_level, false);
+    oled_write_ln(PSTR("%    "), false);
+}
+#endif
diff --git a/qmk/keyboards/rocketboard_16/keymaps/via/rules.mk b/qmk/keyboards/rocketboard_16/keymaps/via/rules.mk
new file mode 100644
index 00000000..45fa6895
--- /dev/null
+++ b/qmk/keyboards/rocketboard_16/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes 
diff --git a/qmk/keyboards/rocketboard_16/mcuconf.h b/qmk/keyboards/rocketboard_16/mcuconf.h
new file mode 100644
index 00000000..999f3451
--- /dev/null
+++ b/qmk/keyboards/rocketboard_16/mcuconf.h
@@ -0,0 +1,209 @@
+/*
+    ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
+#define STM32F103_MCUCONF
+
+/*
+ * STM32F103 drivers configuration.
+ * The following settings override the default settings present in
+ * the various device driver implementation headers.
+ * Note that the settings for each driver only have effect if the whole
+ * driver is enabled in halconf.h.
+ *
+ * IRQ priorities:
+ * 15...0       Lowest...Highest.
+ *
+ * DMA priorities:
+ * 0...3        Lowest...Highest.
+ */
+
+/*
+ * HAL driver system settings.
+ */
+#define STM32_NO_INIT                       FALSE
+#define STM32_HSI_ENABLED                   TRUE
+#define STM32_LSI_ENABLED                   TRUE
+#define STM32_HSE_ENABLED                   TRUE
+#define STM32_LSE_ENABLED                   TRUE
+#define STM32_SW                            STM32_SW_PLL
+#define STM32_PLLSRC                        STM32_PLLSRC_HSE
+#define STM32_PLLXTPRE                      STM32_PLLXTPRE_DIV1
+#define STM32_PLLMUL_VALUE                  9
+#define STM32_HPRE                          STM32_HPRE_DIV1
+#define STM32_PPRE1                         STM32_PPRE1_DIV2
+#define STM32_PPRE2                         STM32_PPRE2_DIV2
+#define STM32_ADCPRE                        STM32_ADCPRE_DIV4
+#define STM32_USB_CLOCK_REQUIRED            TRUE
+#define STM32_USBPRE                        STM32_USBPRE_DIV1P5
+#define STM32_MCOSEL                        STM32_MCOSEL_NOCLOCK
+#define STM32_RTCSEL                        STM32_RTCSEL_HSEDIV
+#define STM32_PVD_ENABLE                    FALSE
+#define STM32_PLS                           STM32_PLS_LEV0
+
+/*
+ * ADC driver system settings.
+ */
+#define STM32_ADC_USE_ADC1                  FALSE
+#define STM32_ADC_ADC1_DMA_PRIORITY         2
+#define STM32_ADC_ADC1_IRQ_PRIORITY         6
+
+/*
+ * CAN driver system settings.
+ */
+#define STM32_CAN_USE_CAN1                  FALSE
+#define STM32_CAN_CAN1_IRQ_PRIORITY         11
+
+/*
+ * EXT driver system settings.
+ */
+#define STM32_EXT_EXTI0_IRQ_PRIORITY        6
+#define STM32_EXT_EXTI1_IRQ_PRIORITY        6
+#define STM32_EXT_EXTI2_IRQ_PRIORITY        6
+#define STM32_EXT_EXTI3_IRQ_PRIORITY        6
+#define STM32_EXT_EXTI4_IRQ_PRIORITY        6
+#define STM32_EXT_EXTI5_9_IRQ_PRIORITY      6
+#define STM32_EXT_EXTI10_15_IRQ_PRIORITY    6
+#define STM32_EXT_EXTI16_IRQ_PRIORITY       6
+#define STM32_EXT_EXTI17_IRQ_PRIORITY       6
+#define STM32_EXT_EXTI18_IRQ_PRIORITY       6
+#define STM32_EXT_EXTI19_IRQ_PRIORITY       6
+
+/*
+ * GPT driver system settings.
+ */
+#define STM32_GPT_USE_TIM1                  FALSE
+#define STM32_GPT_USE_TIM2                  FALSE
+#define STM32_GPT_USE_TIM3                  FALSE
+#define STM32_GPT_USE_TIM4                  FALSE
+#define STM32_GPT_USE_TIM5                  FALSE
+#define STM32_GPT_USE_TIM8                  FALSE
+#define STM32_GPT_TIM1_IRQ_PRIORITY         7
+#define STM32_GPT_TIM2_IRQ_PRIORITY         7
+#define STM32_GPT_TIM3_IRQ_PRIORITY         7
+#define STM32_GPT_TIM4_IRQ_PRIORITY         7
+#define STM32_GPT_TIM5_IRQ_PRIORITY         7
+#define STM32_GPT_TIM8_IRQ_PRIORITY         7
+
+/*
+ * I2C driver system settings.
+ */
+#define STM32_I2C_USE_I2C1                  TRUE
+#define STM32_I2C_USE_I2C2                  FALSE
+#define STM32_I2C_BUSY_TIMEOUT              50
+#define STM32_I2C_I2C1_IRQ_PRIORITY         5
+#define STM32_I2C_I2C2_IRQ_PRIORITY         5
+#define STM32_I2C_I2C1_DMA_PRIORITY         3
+#define STM32_I2C_I2C2_DMA_PRIORITY         3
+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")
+
+/*
+ * ICU driver system settings.
+ */
+#define STM32_ICU_USE_TIM1                  FALSE
+#define STM32_ICU_USE_TIM2                  FALSE
+#define STM32_ICU_USE_TIM3                  FALSE
+#define STM32_ICU_USE_TIM4                  FALSE
+#define STM32_ICU_USE_TIM5                  FALSE
+#define STM32_ICU_USE_TIM8                  FALSE
+#define STM32_ICU_TIM1_IRQ_PRIORITY         7
+#define STM32_ICU_TIM2_IRQ_PRIORITY         7
+#define STM32_ICU_TIM3_IRQ_PRIORITY         7
+#define STM32_ICU_TIM4_IRQ_PRIORITY         7
+#define STM32_ICU_TIM5_IRQ_PRIORITY         7
+#define STM32_ICU_TIM8_IRQ_PRIORITY         7
+
+/*
+ * PWM driver system settings.
+ */
+#define STM32_PWM_USE_ADVANCED              FALSE
+#define STM32_PWM_USE_TIM1                  FALSE
+#define STM32_PWM_USE_TIM2                  TRUE
+#define STM32_PWM_USE_TIM3                  FALSE
+#define STM32_PWM_USE_TIM4                  FALSE
+#define STM32_PWM_USE_TIM5                  FALSE
+#define STM32_PWM_USE_TIM8                  FALSE
+#define STM32_PWM_TIM1_IRQ_PRIORITY         7
+#define STM32_PWM_TIM2_IRQ_PRIORITY         7
+#define STM32_PWM_TIM3_IRQ_PRIORITY         7
+#define STM32_PWM_TIM4_IRQ_PRIORITY         7
+#define STM32_PWM_TIM5_IRQ_PRIORITY         7
+#define STM32_PWM_TIM8_IRQ_PRIORITY         7
+
+/*
+ * RTC driver system settings.
+ */
+#define STM32_RTC_IRQ_PRIORITY              15
+
+/*
+ * SERIAL driver system settings.
+ */
+#define STM32_SERIAL_USE_USART1             FALSE
+#define STM32_SERIAL_USE_USART2             FALSE
+#define STM32_SERIAL_USE_USART3             FALSE
+#define STM32_SERIAL_USE_UART4              FALSE
+#define STM32_SERIAL_USE_UART5              FALSE
+#define STM32_SERIAL_USART1_PRIORITY        12
+#define STM32_SERIAL_USART2_PRIORITY        12
+#define STM32_SERIAL_USART3_PRIORITY        12
+#define STM32_SERIAL_UART4_PRIORITY         12
+#define STM32_SERIAL_UART5_PRIORITY         12
+
+/*
+ * SPI driver system settings.
+ */
+#define STM32_SPI_USE_SPI1                  TRUE
+#define STM32_SPI_USE_SPI2                  FALSE
+#define STM32_SPI_USE_SPI3                  FALSE
+#define STM32_SPI_SPI1_DMA_PRIORITY         1
+#define STM32_SPI_SPI2_DMA_PRIORITY         1
+#define STM32_SPI_SPI3_DMA_PRIORITY         1
+#define STM32_SPI_SPI1_IRQ_PRIORITY         10
+#define STM32_SPI_SPI2_IRQ_PRIORITY         10
+#define STM32_SPI_SPI3_IRQ_PRIORITY         10
+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")
+
+/*
+ * ST driver system settings.
+ */
+#define STM32_ST_IRQ_PRIORITY               8
+#define STM32_ST_USE_TIMER                  2
+
+/*
+ * UART driver system settings.
+ */
+#define STM32_UART_USE_USART1               FALSE
+#define STM32_UART_USE_USART2               FALSE
+#define STM32_UART_USE_USART3               FALSE
+#define STM32_UART_USART1_IRQ_PRIORITY      12
+#define STM32_UART_USART2_IRQ_PRIORITY      12
+#define STM32_UART_USART3_IRQ_PRIORITY      12
+#define STM32_UART_USART1_DMA_PRIORITY      0
+#define STM32_UART_USART2_DMA_PRIORITY      0
+#define STM32_UART_USART3_DMA_PRIORITY      0
+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")
+
+/*
+ * USB driver system settings.
+ */
+#define STM32_USB_USE_USB1                  TRUE
+#define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE
+#define STM32_USB_USB1_HP_IRQ_PRIORITY      13
+#define STM32_USB_USB1_LP_IRQ_PRIORITY      14
+
+#endif /* _MCUCONF_H_ */
diff --git a/qmk/keyboards/rocketboard_16/readme.md b/qmk/keyboards/rocketboard_16/readme.md
new file mode 100644
index 00000000..878c2b5c
--- /dev/null
+++ b/qmk/keyboards/rocketboard_16/readme.md
@@ -0,0 +1,13 @@
+# Rocketboard 16
+
+A STM32F103 based macropad/numpad with RGB individual key underglow, dual rotary encoders, and a 128x64 OLED display. [More info on qmk.fm](http://qmk.fm/)
+
+* Keyboard Maintainer: [fl3tching101](https://github.com/fl3tching101)
+* Hardware Supported: Rocketboard 16 PCB rev1.1
+* Hardware Availability: Group buy on r/mechmarket
+
+Make example for this keyboard (after setting up your build environment):
+
+    make rocketboard_16: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).
diff --git a/qmk/keyboards/rocketboard_16/rocketboard_16.c b/qmk/keyboards/rocketboard_16/rocketboard_16.c
new file mode 100644
index 00000000..a2710083
--- /dev/null
+++ b/qmk/keyboards/rocketboard_16/rocketboard_16.c
@@ -0,0 +1 @@
+#include "rocketboard_16.h"
diff --git a/qmk/keyboards/rocketboard_16/rocketboard_16.h b/qmk/keyboards/rocketboard_16/rocketboard_16.h
new file mode 100644
index 00000000..87965906
--- /dev/null
+++ b/qmk/keyboards/rocketboard_16/rocketboard_16.h
@@ -0,0 +1,19 @@
+#pragma once
+
+#include "quantum.h"
+
+#define KNO KC_NO
+
+#define LAYOUT_default( \
+  K00,           K01, \
+  K02, K03, K04, K05, \
+  K06, K07, K08, K09, \
+  K0A, K0B, K0C, K0D, \
+  K0E, K0F, K10, K11  \
+) { \
+  {  K00,  KC_NO, KC_NO, K01  }, \
+  {  K02,  K03,   K04,   K05  }, \
+  {  K06,  K07,   K08,   K09  }, \
+  {  K0A,  K0B,   K0C,   K0D  }, \
+  {  K0E,  K0F,   K10,   K11  }  \
+}
diff --git a/qmk/keyboards/rocketboard_16/rules.mk b/qmk/keyboards/rocketboard_16/rules.mk
new file mode 100644
index 00000000..eedbc33d
--- /dev/null
+++ b/qmk/keyboards/rocketboard_16/rules.mk
@@ -0,0 +1,27 @@
+# MCU name
+MCU = STM32F103
+
+# Bootloader selection
+BOOTLOADER = stm32duino
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = yes        # Console for debug
+COMMAND_ENABLE = yes        # Commands for debug and configuration
+# 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 = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB backlit keys
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+OLED_DRIVER_ENABLE = yes
+ENCODER_ENABLE = yes
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/qmk/keyboards/rpiguy9907/southpaw66/config.h b/qmk/keyboards/rpiguy9907/southpaw66/config.h
new file mode 100644
index 00000000..242b4a7c
--- /dev/null
+++ b/qmk/keyboards/rpiguy9907/southpaw66/config.h
@@ -0,0 +1,53 @@
+ /* Copyright 2020 gooberpsycho
+  *
+  * 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 "config_common.h"
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0xFEED
+#define PRODUCT_ID      0x6077
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    rpiguy9907
+#define PRODUCT         Southpaw66
+
+#define TAPPING_TERM 400
+
+/* key matrix size */
+#define MATRIX_ROWS 7
+#define MATRIX_COLS 10
+
+// ROWS: Top to bottom, COLS: Left to right
+
+#define MATRIX_ROW_PINS { D7, C6, D4, D0, D1, D2, D3 }
+#define MATRIX_COL_PINS { E6, B4, B5, F4, F5, F6, F7, B1, B3, B2 }
+#define UNUSED_PINS
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+/* Bootmagic Lite key configuration */
+#define BOOTMAGIC_LITE_ROW 1
+#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/rpiguy9907/southpaw66/info.json b/qmk/keyboards/rpiguy9907/southpaw66/info.json
new file mode 100644
index 00000000..80d78a5d
--- /dev/null
+++ b/qmk/keyboards/rpiguy9907/southpaw66/info.json
@@ -0,0 +1,78 @@
+{
+    "keyboard_name": "Southpaw66",
+    "url": "",
+    "maintainer": "qmk",
+    "width": 15,
+    "height": 5,
+    "layouts": {
+        "LAYOUT": {
+
+            "layout": [
+                {"label":"Insert", "x":0, "y":0},
+                {"label":"Esc", "x":1.5, "y":0},
+                {"label":"1", "x":2.5, "y":0},
+                {"label":"2", "x":3.5, "y":0},
+                {"label":"3", "x":4.5, "y":0},
+                {"label":"4", "x":5.5, "y":0},
+                {"label":"5", "x":6.5, "y":0},
+                {"label":"6", "x":7.5, "y":0},
+                {"label":"7", "x":8.5, "y":0},
+                {"label":"8", "x":9.5, "y":0},
+                {"label":"9", "x":10.5, "y":0},
+                {"label":"0", "x":11.5, "y":0},
+                {"label":"-", "x":12.5, "y":0},
+                {"label":"=", "x":13.5, "y":0},
+                {"label":"Backspace", "x":14.5, "y":0, "w":2},
+                {"label":"Delete", "x":0, "y":1},
+                {"label":"Tab", "x":1.5, "y":1, "w":1.5},
+                {"label":"Q", "x":3, "y":1},
+                {"label":"W", "x":4, "y":1},
+                {"label":"E", "x":5, "y":1},
+                {"label":"R", "x":6, "y":1},
+                {"label":"T", "x":7, "y":1},
+                {"label":"Y", "x":8, "y":1},
+                {"label":"U", "x":9, "y":1},
+                {"label":"I", "x":10, "y":1},
+                {"label":"O", "x":11, "y":1},
+                {"label":"P", "x":12, "y":1},
+                {"label":"[", "x":13, "y":1},
+                {"label":"]", "x":14, "y":1},
+                {"label":"|", "x":15, "y":1, "w":1.5},
+                {"label":"Caps Lock", "x":1.5, "y":2, "w":1.75},
+                {"label":"A", "x":3.25, "y":2},
+                {"label":"S", "x":4.25, "y":2},
+                {"label":"D", "x":5.25, "y":2},
+                {"label":"F", "x":6.25, "y":2},
+                {"label":"G", "x":7.25, "y":2},
+                {"label":"H", "x":8.25, "y":2},
+                {"label":"J", "x":9.25, "y":2},
+                {"label":"K", "x":10.25, "y":2},
+                {"label":"L", "x":11.25, "y":2},
+                {"label":":", "x":12.25, "y":2},
+                {"label":"\"", "x":13.25, "y":2},
+                {"label":"Enter", "x":14.25, "y":2, "w":2.25},
+                {"label":"Up", "x":1, "y":3},
+                {"label":"Shift", "x":2, "y":3, "w":1.75},
+                {"label":"Z", "x":3.75, "y":3},
+                {"label":"X", "x":4.75, "y":3},
+                {"label":"C", "x":5.75, "y":3},
+                {"label":"V", "x":6.75, "y":3},
+                {"label":"B", "x":7.75, "y":3},
+                {"label":"N", "x":8.75, "y":3},
+                {"label":"M", "x":9.75, "y":3},
+                {"label":",", "x":10.75, "y":3},
+                {"label":".", "x":11.75, "y":3},
+                {"label":"/", "x":12.75, "y":3},
+                {"label":"Shift", "x":13.75, "y":3, "w":2.75},
+                {"label":"Left", "x":0, "y":4},
+                {"label":"Down", "x":1, "y":4},
+                {"label":"Right", "x":2, "y":4},
+                {"label":"Ctrl", "x":3, "y":4, "w":1.5},
+                {"label":"Alt", "x":4.5, "y":4},
+                {"label":"Space", "x":5.5, "y":4, "w":7},
+                {"label":"Win", "x":12.5, "y":4},
+                {"label":"Alt", "x":13.5, "y":4, "w":1.5},
+                {"label":"Ctrl", "x":15, "y":4, "w":1.5}]
+        }
+    }
+}
diff --git a/qmk/keyboards/rpiguy9907/southpaw66/keymaps/default/keymap.c b/qmk/keyboards/rpiguy9907/southpaw66/keymaps/default/keymap.c
new file mode 100644
index 00000000..712a34c9
--- /dev/null
+++ b/qmk/keyboards/rpiguy9907/southpaw66/keymaps/default/keymap.c
@@ -0,0 +1,34 @@
+ /* Copyright 2020 gooberpsycho
+  *
+  * 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(
+        KC_DEL, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
+        KC_END, 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_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_UP, 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_LEFT, KC_DOWN, KC_RGHT, KC_LCTL, KC_LGUI, KC_SPC, KC_RALT, MO(1), KC_RCTL
+        ),
+    [1] = LAYOUT(
+        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_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_VOLU, 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_VOLD, KC_MNXT,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+        ),
+};
diff --git a/qmk/keyboards/rpiguy9907/southpaw66/keymaps/via/keymap.c b/qmk/keyboards/rpiguy9907/southpaw66/keymaps/via/keymap.c
new file mode 100644
index 00000000..87eccd22
--- /dev/null
+++ b/qmk/keyboards/rpiguy9907/southpaw66/keymaps/via/keymap.c
@@ -0,0 +1,48 @@
+ /* Copyright 2020 gooberpsycho
+  *
+  * 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(
+        KC_DEL, KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC,
+        KC_END, 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_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_UP, 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_LEFT, KC_DOWN, KC_RGHT, KC_LCTL, KC_LGUI, KC_SPC, MO(1), KC_RALT, KC_RCTL
+        ),
+    [1] = LAYOUT(
+        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_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_VOLU, 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_VOLD, KC_MNXT, KC_TRNS, KC_TRNS, KC_MPLY, KC_TRNS, KC_TRNS, KC_TRNS
+        ),
+    [2] = LAYOUT(
+        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, 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
+        ),
+    [3] = LAYOUT(
+        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, 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
+        )
+};
diff --git a/qmk/keyboards/rpiguy9907/southpaw66/keymaps/via/rules.mk b/qmk/keyboards/rpiguy9907/southpaw66/keymaps/via/rules.mk
new file mode 100644
index 00000000..1e5b9980
--- /dev/null
+++ b/qmk/keyboards/rpiguy9907/southpaw66/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/qmk/keyboards/rpiguy9907/southpaw66/readme.md b/qmk/keyboards/rpiguy9907/southpaw66/readme.md
new file mode 100644
index 00000000..c7a289b7
--- /dev/null
+++ b/qmk/keyboards/rpiguy9907/southpaw66/readme.md
@@ -0,0 +1,24 @@
+# Southpaw66
+
+![](https://i.imgur.com/Mzmhsedl.jpg)
+
+### Pro Micro Pinout
+| rows            | 0   | 1   | 2   | 3   | 4   | 5   | 6   |
+| --------------- | --- | --- | --- | --- | --- | --- | --- |
+| Pro Micro pin   | D3  | D2  | D1  | D0  | D4  | C6  | D7  |
+
+| columns         | 0   | 1   | 2   | 3   | 4   | 5   | 6   | 7   | 8   | 9   |
+| --------------- | --- | --- | --- | --- | --- | --- | --- | --- | --- | --- |
+| Pro Micro pin   | E6  | B4  | B5  | F4  | F5  | F6  | F7  | B1  | B3  | B2  |
+
+
+Make example for this keyboard (after setting up your build environment):
+
+    make rpiguy9907/southpaw66:default
+
+**Reset Key:** Hold down the key located at `k10`, commonly programmed as Escape while plugging in the keyboard.
+
+* Keyboard Maintainer: [gooberpsycho](https://github.com/gooberpsycho)
+* Hardware Availability: [Casefile](https://github.com/rpiguy9907/Keyboards/tree/master/Southpaw66)
+
+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).
diff --git a/qmk/keyboards/rpiguy9907/southpaw66/rules.mk b/qmk/keyboards/rpiguy9907/southpaw66/rules.mk
new file mode 100644
index 00000000..9ea17f06
--- /dev/null
+++ b/qmk/keyboards/rpiguy9907/southpaw66/rules.mk
@@ -0,0 +1,23 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = yes        # Console for debug
+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 = yes           # USB Nkey Rollover
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+LTO_ENABLE = yes
diff --git a/qmk/keyboards/rpiguy9907/southpaw66/southpaw66.c b/qmk/keyboards/rpiguy9907/southpaw66/southpaw66.c
new file mode 100644
index 00000000..ef61984b
--- /dev/null
+++ b/qmk/keyboards/rpiguy9907/southpaw66/southpaw66.c
@@ -0,0 +1,17 @@
+ /* Copyright 2020  gooberpsycho
+  *
+  * 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 "southpaw66.h"
diff --git a/qmk/keyboards/rpiguy9907/southpaw66/southpaw66.h b/qmk/keyboards/rpiguy9907/southpaw66/southpaw66.h
new file mode 100644
index 00000000..11f1fc7e
--- /dev/null
+++ b/qmk/keyboards/rpiguy9907/southpaw66/southpaw66.h
@@ -0,0 +1,37 @@
+ /* Copyright 2020 gooberpsycho
+  *
+  * 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"
+
+// The first section contains all of the arguments
+// The second converts the arguments into a two-dimensional array
+#define LAYOUT( \
+  k00, k10, k20, k30, k40, k50, k60, k01, k11, k21, k31, k41, k51, k61, k02,    \
+  k12, k22, k32, k42, k52, k62, k03, k13, k23, k33, k43, k53, k63, k04, k14,    \
+  k24, k34, k44, k54, k64, k05, k15, k25, k35, k45, k55, k65, k06,              \
+  k16, k26, k36, k46, k56, k66, k07, k17, k27, k37, k47, k57, k67,              \
+  k08, k18, k28, k38, k48, k58, k68, k09, k19                                   \
+) \
+{ \
+  {k00,   k01,   k02,   k03,   k04,   k05,   k06,   k07,   k08,   k09}, \
+  {k10,   k11,   k12,   k13,   k14,   k15,   k16,   k17,   k18,   k19}, \
+  {k20,   k21,   k22,   k23,   k24,   k25,   k26,   k27,   k28,   KC_NO}, \
+  {k30,   k31,   k32,   k33,   k34,   k35,   k36,   k37,   k38,   KC_NO}, \
+  {k40,   k41,   k42,   k43,   k44,   k45,   k46,   k47,   k48,   KC_NO}, \
+  {k50,   k51,   k52,   k53,   k54,   k55,   k56,   k57,   k58,   KC_NO}, \
+  {k60,   k61,   k62,   k63,   k64,   k65,   k66,   k67,   k68,   KC_NO} \
+}
diff --git a/qmk/keyboards/runner3680/rules.mk b/qmk/keyboards/runner3680/rules.mk
index 2bf7ea0c..1b7499c0 100644
--- a/qmk/keyboards/runner3680/rules.mk
+++ b/qmk/keyboards/runner3680/rules.mk
@@ -30,7 +30,6 @@ 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
 
 SPLIT_KEYBOARD = yes       # Enables split keyboard support
 
diff --git a/qmk/keyboards/ryloo_studio/m0110/config.h b/qmk/keyboards/ryloo_studio/m0110/config.h
new file mode 100644
index 00000000..754c164b
--- /dev/null
+++ b/qmk/keyboards/ryloo_studio/m0110/config.h
@@ -0,0 +1,64 @@
+/*
+Copyright 2020 newtonapple
+
+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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID 0x614D
+#define PRODUCT_ID 0x1000
+#define DEVICE_VER 0x0001
+#define MANUFACTURER Ryloo studio
+#define PRODUCT M0110
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { D0, D1, D2, D3, D5 }
+#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, F7, B5, B4, D7, D6, B3, B2 }
+#define UNUSED_PINS
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* number of backlight levels */
+#define BACKLIGHT_PIN B7
+#ifdef BACKLIGHT_PIN
+#    define BACKLIGHT_LEVELS 5
+#endif
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+#define RGB_DI_PIN E2
+#ifdef RGB_DI_PIN
+#    define RGBLIGHT_ANIMATIONS
+#    define RGBLED_NUM 18
+#    define RGBLIGHT_HUE_STEP 8
+#    define RGBLIGHT_SAT_STEP 8
+#    define RGBLIGHT_VAL_STEP 8
+#    define RGBLIGHT_LIMIT_VAL 123
+#endif
diff --git a/qmk/keyboards/ryloo_studio/m0110/info.json b/qmk/keyboards/ryloo_studio/m0110/info.json
new file mode 100644
index 00000000..5ae15b5c
--- /dev/null
+++ b/qmk/keyboards/ryloo_studio/m0110/info.json
@@ -0,0 +1,222 @@
+{
+    "keyboard_name": "M0110",
+    "url": "https://drop.com/buy/ryloo-studio-hello-m0110-mechanical-keyboard-kit",
+    "maintainer": "qmk",
+    "width": 15,
+    "height": 5,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6, "y": 0},
+                {"x": 7, "y": 0},
+                {"x": 8, "y": 0},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0},
+                {"x": 14, "y": 0},
+
+                {"x": 0, "y": 1, "w": 1.5},
+                {"x": 1.5, "y": 1},
+                {"x": 2.5, "y": 1},
+                {"x": 3.5, "y": 1},
+                {"x": 4.5, "y": 1},
+                {"x": 5.5, "y": 1},
+                {"x": 6.5, "y": 1},
+                {"x": 7.5, "y": 1},
+                {"x": 8.5, "y": 1},
+                {"x": 9.5, "y": 1},
+                {"x": 10.5, "y": 1},
+                {"x": 11.5, "y": 1},
+                {"x": 12.5, "y": 1},
+                {"x": 13.5, "y": 1, "w": 1.5},
+
+                {"x": 0, "y": 2, "w": 1.75},
+                {"x": 1.75, "y": 2},
+                {"x": 2.75, "y": 2},
+                {"x": 3.75, "y": 2},
+                {"x": 4.75, "y": 2},
+                {"x": 5.75, "y": 2},
+                {"x": 6.75, "y": 2},
+                {"x": 7.75, "y": 2},
+                {"x": 8.75, "y": 2},
+                {"x": 9.75, "y": 2},
+                {"x": 10.75, "y": 2},
+                {"x": 11.75, "y": 2},
+                {"x": 12.75, "y": 2},
+                {"x": 13.75, "y": 2, "w": 1.25},
+
+                {"x": 0, "y": 3, "w": 1.25},
+                {"x": 1.25, "y": 3},
+                {"x": 2.25, "y": 3},
+                {"x": 3.25, "y": 3},
+                {"x": 4.25, "y": 3},
+                {"x": 5.25, "y": 3},
+                {"x": 6.25, "y": 3},
+                {"x": 7.25, "y": 3},
+                {"x": 8.25, "y": 3},
+                {"x": 9.25, "y": 3},
+                {"x": 10.25, "y": 3},
+                {"x": 11.25, "y": 3},
+                {"x": 12.25, "y": 3, "w": 1.75},
+                {"x": 14, "y": 3},
+
+                {"x": 0, "y": 4, "w": 1.25},
+                {"x": 1.25, "y": 4, "w": 1.25},
+                {"x": 2.5, "y": 4, "w": 1.25},
+                {"x": 3.75, "y": 4, "w": 2.25},
+                {"x": 6, "y": 4, "w": 1.25},
+                {"x": 7.25, "y": 4, "w": 2.75},
+                {"x": 10, "y": 4},
+                {"x": 11, "y": 4},
+                {"x": 12, "y": 4},
+                {"x": 13, "y": 4},
+                {"x": 14, "y": 4}
+            ]
+        },
+        "LAYOUT_60_ansi": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6, "y": 0},
+                {"x": 7, "y": 0},
+                {"x": 8, "y": 0},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0, "w": 2},
+
+                {"x": 0, "y": 1, "w": 1.5},
+                {"x": 1.5, "y": 1},
+                {"x": 2.5, "y": 1},
+                {"x": 3.5, "y": 1},
+                {"x": 4.5, "y": 1},
+                {"x": 5.5, "y": 1},
+                {"x": 6.5, "y": 1},
+                {"x": 7.5, "y": 1},
+                {"x": 8.5, "y": 1},
+                {"x": 9.5, "y": 1},
+                {"x": 10.5, "y": 1},
+                {"x": 11.5, "y": 1},
+                {"x": 12.5, "y": 1},
+                {"x": 13.5, "y": 1, "w": 1.5},
+
+                {"x": 0, "y": 2, "w": 1.75},
+                {"x": 1.75, "y": 2},
+                {"x": 2.75, "y": 2},
+                {"x": 3.75, "y": 2},
+                {"x": 4.75, "y": 2},
+                {"x": 5.75, "y": 2},
+                {"x": 6.75, "y": 2},
+                {"x": 7.75, "y": 2},
+                {"x": 8.75, "y": 2},
+                {"x": 9.75, "y": 2},
+                {"x": 10.75, "y": 2},
+                {"x": 11.75, "y": 2},
+                {"x": 12.75, "y": 2, "w": 2.25},
+
+                {"x": 0, "y": 3, "w": 2.25},
+                {"x": 2.25, "y": 3},
+                {"x": 3.25, "y": 3},
+                {"x": 4.25, "y": 3},
+                {"x": 5.25, "y": 3},
+                {"x": 6.25, "y": 3},
+                {"x": 7.25, "y": 3},
+                {"x": 8.25, "y": 3},
+                {"x": 9.25, "y": 3},
+                {"x": 10.25, "y": 3},
+                {"x": 11.25, "y": 3},
+                {"x": 12.25, "y": 3, "w": 2.75},
+
+                {"x": 0, "y": 4, "w": 1.25},
+                {"x": 1.25, "y": 4, "w": 1.25},
+                {"x": 2.5, "y": 4, "w": 1.25},
+                {"x": 3.75, "y": 4, "w": 6.25},
+                {"x": 10, "y": 4, "w": 1.25},
+                {"x": 11.25, "y": 4, "w": 1.25},
+                {"x": 12.5, "y": 4, "w": 1.25},
+                {"x": 13.75, "y": 4, "w": 1.25}
+            ]
+        },
+        "LAYOUT_60_hhkb": {
+            "layout": [
+                {"x": 0, "y": 0},
+                {"x": 1, "y": 0},
+                {"x": 2, "y": 0},
+                {"x": 3, "y": 0},
+                {"x": 4, "y": 0},
+                {"x": 5, "y": 0},
+                {"x": 6, "y": 0},
+                {"x": 7, "y": 0},
+                {"x": 8, "y": 0},
+                {"x": 9, "y": 0},
+                {"x": 10, "y": 0},
+                {"x": 11, "y": 0},
+                {"x": 12, "y": 0},
+                {"x": 13, "y": 0},
+                {"x": 14, "y": 0},
+
+                {"x": 0, "y": 1, "w": 1.5},
+                {"x": 1.5, "y": 1},
+                {"x": 2.5, "y": 1},
+                {"x": 3.5, "y": 1},
+                {"x": 4.5, "y": 1},
+                {"x": 5.5, "y": 1},
+                {"x": 6.5, "y": 1},
+                {"x": 7.5, "y": 1},
+                {"x": 8.5, "y": 1},
+                {"x": 9.5, "y": 1},
+                {"x": 10.5, "y": 1},
+                {"x": 11.5, "y": 1},
+                {"x": 12.5, "y": 1},
+                {"x": 13.5, "y": 1, "w": 1.5},
+
+                {"x": 0, "y": 2, "w": 1.75},
+                {"x": 1.75, "y": 2},
+                {"x": 2.75, "y": 2},
+                {"x": 3.75, "y": 2},
+                {"x": 4.75, "y": 2},
+                {"x": 5.75, "y": 2},
+                {"x": 6.75, "y": 2},
+                {"x": 7.75, "y": 2},
+                {"x": 8.75, "y": 2},
+                {"x": 9.75, "y": 2},
+                {"x": 10.75, "y": 2},
+                {"x": 11.75, "y": 2},
+                {"x": 12.75, "y": 2, "w": 2.25},
+
+                {"x": 0, "y": 3, "w": 2.25},
+                {"x": 2.25, "y": 3},
+                {"x": 3.25, "y": 3},
+                {"x": 4.25, "y": 3},
+                {"x": 5.25, "y": 3},
+                {"x": 6.25, "y": 3},
+                {"x": 7.25, "y": 3},
+                {"x": 8.25, "y": 3},
+                {"x": 9.25, "y": 3},
+                {"x": 10.25, "y": 3},
+                {"x": 11.25, "y": 3},
+                {"x": 12.25, "y": 3, "w": 1.75},
+                {"x": 14, "y": 3},
+
+                {"x": 1.5, "y": 4},
+                {"x": 2.5, "y": 4, "w": 1.5},
+                {"x": 4, "y": 4, "w": 7},
+                {"x": 11, "y": 4, "w": 1.5},
+                {"x": 12.5, "y": 4}
+            ]
+        }
+    }
+}
diff --git a/qmk/keyboards/ryloo_studio/m0110/keymaps/default/keymap.c b/qmk/keyboards/ryloo_studio/m0110/keymaps/default/keymap.c
new file mode 100644
index 00000000..98b739b5
--- /dev/null
+++ b/qmk/keyboards/ryloo_studio/m0110/keymaps/default/keymap.c
@@ -0,0 +1,41 @@
+/*
+Copyright 2020 newtonapple
+
+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
+
+enum keyboard_layers {
+  _BASE,
+  _FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASE] = LAYOUT(
+        KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  XXXXXXX, KC_BSPC,
+        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_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, XXXXXXX, KC_ENT,
+        KC_LSFT, XXXXXXX, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, XXXXXXX,
+        KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,  KC_SPC,  KC_SPC,           KC_RALT, KC_RGUI, XXXXXXX, MO(_FN), KC_RCTL
+    ),
+
+    [_FN] = LAYOUT(
+        KC_GRV,  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_DEL,
+        RGB_TOG, _______, KC_UP,   _______, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, RESET,
+        BL_TOGG, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        BL_BRTG, _______, BL_DEC,  BL_INC,  BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______,                   _______, _______, _______,          _______, _______, _______, _______, _______
+    )
+};
diff --git a/qmk/keyboards/ryloo_studio/m0110/m0110.c b/qmk/keyboards/ryloo_studio/m0110/m0110.c
new file mode 100644
index 00000000..c7bae90e
--- /dev/null
+++ b/qmk/keyboards/ryloo_studio/m0110/m0110.c
@@ -0,0 +1,18 @@
+/*
+Copyright 2020 newtonapple
+
+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 "m0110.h"
diff --git a/qmk/keyboards/ryloo_studio/m0110/m0110.h b/qmk/keyboards/ryloo_studio/m0110/m0110.h
new file mode 100644
index 00000000..bb9df7ce
--- /dev/null
+++ b/qmk/keyboards/ryloo_studio/m0110/m0110.h
@@ -0,0 +1,103 @@
+/*
+Copyright 2020 newtonapple
+
+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"
+
+
+/* Standard arrangement / LAYOUT
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+ * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d   │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2c │2d  │
+ * ├────┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+ * │30  │31 │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d    │3e │
+ * ├────┼───┴┬──┴─┬─┴───┴──┬┴───┼───┴───┴──┬┴──┬┴──┬┴──┬───┼───┤
+ * │40  │41  │42  │43      │47  │48        │49 │4a │4b │4c │4d │
+ * └────┴────┴────┴────────┴────┴──────────┴───┴───┴───┴───┴───┘
+*/
+#define LAYOUT( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,      \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2c, k2d,      \
+    k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3d, k3e, \
+    k40, k41, k42, k43,                k47, k48, k49, k4a, k4b, k4c, k4d       \
+) { \
+    { k00,  k01,  k02,  k03,  k04,   k05,   k06,   k07,  k08,  k09,  k0a,  k0b,  k0c,   k0d,  k0e   }, \
+    { k10,  k11,  k12,  k13,  k14,   k15,   k16,   k17,  k18,  k19,  k1a,  k1b,  k1c,   k1d,  KC_NO }, \
+    { k20,  k21,  k22,  k23,  k24,   k25,   k26,   k27,  k28,  k29,  k2a,  k2b,  k2c,   k2d,  KC_NO }, \
+    { k30,  k31,  k32,  k33,  k34,   k35,   k36,   k37,  k38,  k39,  k3a,  k3b,  KC_NO, k3d,  k3e   }, \
+    { k40,  k41,  k42,  k43,  KC_NO, KC_NO, KC_NO, k47,  k48,  k49,  k4a,  k4b,  k4c,   k4d,  KC_NO }  \
+}
+
+/* LAYOUT_60_ansi
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0e     │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
+ * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d   │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2d      │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
+ * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d        │
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
+ * │40  │41  │42  │46                      │49  │4a  │4c  │4d  │
+ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+*/
+#define LAYOUT_60_ansi( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c,      k0e, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,      \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,      k2d,      \
+    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3d,      \
+    k40, k41, k42,                k46,           k49, k4a,           k4c, k4d  \
+) { \
+    { k00,  k01,   k02,  k03,   k04,   k05,   k06,  k07,   k08,   k09,  k0a,  k0b,   k0c,   KC_NO, k0e   }, \
+    { k10,  k11,   k12,  k13,   k14,   k15,   k16,   k17,  k18,   k19,  k1a,  k1b,   k1c,   k1d,   KC_NO }, \
+    { k20,  k21,   k22,  k23,   k24,   k25,   k26,   k27,  k28,   k29,  k2a,  k2b,   KC_NO, k2d,   KC_NO }, \
+    { k30,  KC_NO, k32,  k33,   k34,   k35,   k36,   k37,  k38,   k39,  k3a,  k3b,   KC_NO, k3d,   KC_NO }, \
+    { k40,  k41,   k42,  KC_NO, KC_NO, KC_NO, k46,  KC_NO, KC_NO, k49,  k4a,  KC_NO, k4c,   k4d,   KC_NO }  \
+}
+
+/* LAYOUT_60_hhkb
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+ * │10   │11 │12 │13 │14 │15 │16 │17 │18 │19 │1a │1b │1c │1d   │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │20    │21 │22 │23 │24 │25 │26 │27 │28 │29 │2a │2b │2d      │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+ * │30      │32 │33 │34 │35 │36 │37 │38 │39 │3a │3b │3d    │3e │
+ * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤
+ * │▓▓▓▓▓│41 │42   │47 (7u)                    │4a   │4c │▓▓▓▓▓│
+ * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+*/
+#define LAYOUT_60_hhkb( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d,      \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,      k2d,      \
+    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b,      k3d, k3e, \
+         k41, k42,                     k47,           k4a,      k4c            \
+) { \
+    { k00,   k01,   k02,  k03,   k04,   k05,   k06,   k07,  k08,   k09,   k0a,  k0b,   k0c,   k0d,   k0e   }, \
+    { k10,   k11,   k12,  k13,   k14,   k15,   k16,   k17,  k18,   k19,   k1a,  k1b,   k1c,   k1d,   KC_NO }, \
+    { k20,   k21,   k22,  k23,   k24,   k25,   k26,   k27,  k28,   k29,   k2a,  k2b,   KC_NO, k2d,   KC_NO }, \
+    { k30,   KC_NO, k32,  k33,   k34,   k35,   k36,   k37,  k38,   k39,   k3a,  k3b,   KC_NO, k3d,   k3e   }, \
+    { KC_NO, k41,   k42,  KC_NO, KC_NO, KC_NO, KC_NO, k47,  KC_NO, KC_NO, k4a,  KC_NO, k4c,   KC_NO, KC_NO }  \
+}
diff --git a/qmk/keyboards/ryloo_studio/m0110/readme.md b/qmk/keyboards/ryloo_studio/m0110/readme.md
new file mode 100644
index 00000000..78a59f0e
--- /dev/null
+++ b/qmk/keyboards/ryloo_studio/m0110/readme.md
@@ -0,0 +1,24 @@
+# RYLOO STUDIO "HELLO" M0110
+
+![RYLOO STUDIO "HELLO" M0110](https://i.imgur.com/CpKGhRl.jpeg)
+
+* Keyboard Maintainer: [G14D](https://github.com/HumphreyKwok), [newtonapple](https://github.com/newtonapple)
+* Hardware Supported: M0110 PCB
+* Hardware Availability: [M0110](https://drop.com/buy/ryloo-studio-hello-m0110-mechanical-keyboard-kit)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make ryloo_studio/m0110:default
+
+Flashing example for this keyboard:
+
+    make ryloo_studio/m0110:default:flash
+
+Putting the Keyboard in Bootloader Mode:
+
+The shipped PCB did not come with a reset button.  To put the PCB in bootloader mode: locate the 2 `RESET` pins in the back of the PCB and short them with a conductive wire or tweezer.
+
+![Ryloo Studio M0110 PCB RESET pins location](https://i.imgur.com/QJWmpqF.jpeg)
+
+
+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).
diff --git a/qmk/keyboards/ryloo_studio/m0110/rules.mk b/qmk/keyboards/ryloo_studio/m0110/rules.mk
new file mode 100644
index 00000000..ec85ce10
--- /dev/null
+++ b/qmk/keyboards/ryloo_studio/m0110/rules.mk
@@ -0,0 +1,24 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+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
+# 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 = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+
+LAYOUTS = 60_ansi 60_hhkb
diff --git a/qmk/keyboards/scatter42/config.h b/qmk/keyboards/scatter42/config.h
new file mode 100644
index 00000000..3bca175c
--- /dev/null
+++ b/qmk/keyboards/scatter42/config.h
@@ -0,0 +1,147 @@
+/*
+Copyright 2020 bbrfkr
+
+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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID    0xFEED
+#define PRODUCT_ID   0x3B47
+#define DEVICE_VER   0x0001
+#define MANUFACTURER bbrfkr
+#define PRODUCT      scatter42
+
+/* key matrix size */
+#define MATRIX_ROWS 8
+#define MATRIX_COLS 6
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+ */
+#define MATRIX_ROW_PINS { D4, C6, D7, E6 }
+#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+#define SOFT_SERIAL_PIN D2  // or D1, D2, D3, E6
+#define USE_SERIAL
+
+//#define BACKLIGHT_PIN B7
+//#define BACKLIGHT_LEVELS 3
+//#define BACKLIGHT_BREATHING
+
+//#define RGB_DI_PIN E2
+//#ifdef RGB_DI_PIN
+//#    define RGBLED_NUM 16
+//#    define RGBLIGHT_HUE_STEP 8
+//#    define RGBLIGHT_SAT_STEP 8
+//#    define RGBLIGHT_VAL_STEP 8
+//#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+//#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+/*== all animations enable ==*/
+//#    define RGBLIGHT_ANIMATIONS
+/*== or choose animations ==*/
+//#    define RGBLIGHT_EFFECT_BREATHING
+//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+//#    define RGBLIGHT_EFFECT_SNAKE
+//#    define RGBLIGHT_EFFECT_KNIGHT
+//#    define RGBLIGHT_EFFECT_CHRISTMAS
+//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+//#    define RGBLIGHT_EFFECT_RGB_TEST
+//#    define RGBLIGHT_EFFECT_ALTERNATING
+/*== customize breathing effect ==*/
+/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+//#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+/*==== use exp() and sin() ====*/
+//#    define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//#    define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+//#endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+//#define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+/* Bootmagic Lite key configuration */
+//#define BOOTMAGIC_LITE_ROW 0
+//#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/scatter42/info.json b/qmk/keyboards/scatter42/info.json
new file mode 100644
index 00000000..a682eb61
--- /dev/null
+++ b/qmk/keyboards/scatter42/info.json
@@ -0,0 +1,223 @@
+{
+    "keyboard_name": "scatter42",
+    "url": "https://github.com/bbrfkr/keyboards/tree/master/scatter42",
+    "maintainer": "bbrfkr",
+    "width": 14,
+    "height": 5.125,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {
+                    "label": "Q",
+                    "x": 0,
+                    "y": 0.5
+                },
+                {
+                    "label": "W",
+                    "x": 1,
+                    "y": 0.25
+                },
+                {
+                    "label": "E",
+                    "x": 2,
+                    "y": 0
+                },
+                {
+                    "label": "R",
+                    "x": 3,
+                    "y": 0.25
+                },
+                {
+                    "label": "T",
+                    "x": 4,
+                    "y": 0.5
+                },
+                {
+                    "label": "Y",
+                    "x": 9,
+                    "y": 0.5
+                },
+                {
+                    "label": "U",
+                    "x": 10,
+                    "y": 0.25
+                },
+                {
+                    "label": "I",
+                    "x": 11,
+                    "y": 0
+                },
+                {
+                    "label": "O",
+                    "x": 12,
+                    "y": 0.25
+                },
+                {
+                    "label": "P",
+                    "x": 13,
+                    "y": 0.5
+                },
+                {
+                    "label": "A",
+                    "x": 0,
+                    "y": 1.5
+                },
+                {
+                    "label": "S",
+                    "x": 1,
+                    "y": 1.25
+                },
+                {
+                    "label": "D",
+                    "x": 2,
+                    "y": 1
+                },
+                {
+                    "label": "F",
+                    "x": 3,
+                    "y": 1.25
+                },
+                {
+                    "label": "G",
+                    "x": 4,
+                    "y": 1.5
+                },
+                {
+                    "label": "H",
+                    "x": 9,
+                    "y": 1.5
+                },
+                {
+                    "label": "J",
+                    "x": 10,
+                    "y": 1.25
+                },
+                {
+                    "label": "K",
+                    "x": 11,
+                    "y": 1
+                },
+                {
+                    "label": "L",
+                    "x": 12,
+                    "y": 1.25
+                },
+                {
+                    "label": ";",
+                    "x": 13,
+                    "y": 1.5
+                },
+                {
+                    "label": "Z",
+                    "x": 0,
+                    "y": 2.5
+                },
+                {
+                    "label": "X",
+                    "x": 1,
+                    "y": 2.25
+                },
+                {
+                    "label": "C",
+                    "x": 2,
+                    "y": 2
+                },
+                {
+                    "label": "V",
+                    "x": 3,
+                    "y": 2.25
+                },
+                {
+                    "label": "B",
+                    "x": 4,
+                    "y": 2.5
+                },
+                {
+                    "label": "N",
+                    "x": 9,
+                    "y": 2.5
+                },
+                {
+                    "label": "M",
+                    "x": 10,
+                    "y": 2.25
+                },
+                {
+                    "label": ",",
+                    "x": 11,
+                    "y": 2
+                },
+                {
+                    "label": ".",
+                    "x": 12,
+                    "y": 2.25
+                },
+                {
+                    "label": "/",
+                    "x": 13,
+                    "y": 2.5
+                },
+                {
+                    "label": "Ctrl",
+                    "x": 0,
+                    "y": 3.5
+                },
+                {
+                    "label": "Shift",
+                    "x": 1,
+                    "y": 3.25
+                },
+                {
+                    "label": "Tab",
+                    "x": 2,
+                    "y": 3
+                },
+                {
+                    "label": "Super",
+                    "x": 3.5,
+                    "y": 3.625
+                },
+                {
+                    "label": "Lower",
+                    "x": 4.5,
+                    "y": 3.875
+                },
+                {
+                    "label": "Space",
+                    "x": 5.5,
+                    "y": 4.125
+                },
+                {
+                    "label": "Enter",
+                    "x": 7.45,
+                    "y": 4.125
+                },
+                {
+                    "label": "Raise",
+                    "x": 8.45,
+                    "y": 3.875
+                },
+                {
+                    "label": "Alt",
+                    "x": 9.45,
+                    "y": 3.625
+                },
+                {
+                    "label": "Back",
+                    "x": 11,
+                    "y": 3
+                },
+                {
+                    "label": "Shift",
+                    "x": 12,
+                    "y": 3.25
+                },
+                {
+                    "label": "Ctrl",
+                    "x": 13,
+                    "y": 3.5
+                }
+            ]
+        }
+    }
+}
diff --git a/qmk/keyboards/scatter42/keymaps/default/keymap.c b/qmk/keyboards/scatter42/keymaps/default/keymap.c
new file mode 100644
index 00000000..53e0d1e5
--- /dev/null
+++ b/qmk/keyboards/scatter42/keymaps/default/keymap.c
@@ -0,0 +1,31 @@
+/* Copyright 2020 bbrfkr
+ *
+ * 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 names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _LOWER,
+    _RAISE,
+    _FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+        [0] = LAYOUT(KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_LCTL, KC_LSFT, KC_TAB, KC_LGUI, MO(1), KC_SPC, KC_ENT, MO(2), KC_RALT, KC_BSPC, KC_RSFT, KC_RCTL),
+        [1] = LAYOUT(KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_F11, KC_HOME, KC_PGDN, KC_PGUP, KC_END, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_F12, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_LCTL, KC_LSFT, KC_ESC, KC_LGUI, KC_TRNS, KC_SPC, KC_ENT, MO(3), KC_RALT, KC_DEL, KC_RSFT, KC_PSCR),
+        [2] = LAYOUT(KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_NO, KC_NO, KC_NO, KC_BSLS, KC_GRV, KC_MINS, KC_EQL, KC_QUOT, KC_LCBR, KC_RCBR, KC_NO, KC_NO, KC_NO, KC_PIPE, KC_TILD, KC_UNDS, KC_PLUS, KC_DQUO, KC_LBRC, KC_RBRC, KC_LCTL, KC_LSFT, KC_ESC, KC_LGUI, MO(3), KC_SPC, KC_ENT, KC_TRNS, KC_RALT, KC_DEL, KC_RSFT, KC_RCTL),
+        [3] = LAYOUT(KC_VOLU, RESET, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_BRIU, KC_VOLD, RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, KC_NO, KC_NO, KC_NO, KC_NO, KC_BRID, KC_MUTE, RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO)
+};
diff --git a/qmk/keyboards/scatter42/keymaps/default/readme.md b/qmk/keyboards/scatter42/keymaps/default/readme.md
new file mode 100644
index 00000000..0471f5e0
--- /dev/null
+++ b/qmk/keyboards/scatter42/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for scatter42
diff --git a/qmk/keyboards/scatter42/readme.md b/qmk/keyboards/scatter42/readme.md
new file mode 100644
index 00000000..06a59928
--- /dev/null
+++ b/qmk/keyboards/scatter42/readme.md
@@ -0,0 +1,19 @@
+# scatter42
+
+[![scatter42](https://i.imgur.com/2MGMcip.jpg)](https://imgur.com/2MGMcip)
+
+A split keyboard with 39 (4rows and 5columns) keys and 3 keys for thumbs.
+
+* Keyboard Maintainer: [bbrfkr](https://github.com/bbrfkr) [@bbrfkr](https://twitter.com/bbrfkr)
+* Hardware Supported: scatter42 PCB, Pro Micro
+* Hardware Availability: https://bbrfkr.booth.pm/
+
+Make example for this keyboard (after setting up your build environment):
+
+    make scatter42:default
+
+Flashing example for this keyboard:
+
+    make scatter42:default:flash
+
+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).
diff --git a/qmk/keyboards/scatter42/rules.mk b/qmk/keyboards/scatter42/rules.mk
new file mode 100644
index 00000000..29f4021b
--- /dev/null
+++ b/qmk/keyboards/scatter42/rules.mk
@@ -0,0 +1,23 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+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
+# 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
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+SPLIT_KEYBOARD = yes
\ No newline at end of file
diff --git a/qmk/keyboards/scatter42/scatter42.c b/qmk/keyboards/scatter42/scatter42.c
new file mode 100644
index 00000000..4126382d
--- /dev/null
+++ b/qmk/keyboards/scatter42/scatter42.c
@@ -0,0 +1,17 @@
+/* Copyright 2020 bbrfkr
+ *
+ * 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 "scatter42.h"
diff --git a/qmk/keyboards/scatter42/scatter42.h b/qmk/keyboards/scatter42/scatter42.h
new file mode 100644
index 00000000..2aae6a5e
--- /dev/null
+++ b/qmk/keyboards/scatter42/scatter42.h
@@ -0,0 +1,44 @@
+/* Copyright 2020 bbrfkr
+ *
+ * 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 is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT( \
+  L00, L01, L02, L03, L04,           R00, R01, R02, R03, R04, \
+  L10, L11, L12, L13, L14,           R10, R11, R12, R13, R14, \
+  L20, L21, L22, L23, L24,           R20, R21, R22, R23, R24, \
+  L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35 \
+  ) \
+  { \
+    { L00, L01, L02, L03, L04, KC_NO }, \
+    { L10, L11, L12, L13, L14, KC_NO }, \
+    { L20, L21, L22, L23, L24, KC_NO }, \
+    { L30, L31, L32, L33, L34, L35 }, \
+    { R04, R03, R02, R01, R00, KC_NO }, \
+    { R14, R13, R12, R11, R10, KC_NO }, \
+    { R24, R23, R22, R21, R20, KC_NO }, \
+    { R35, R34, R33, R32, R31, R30 } \
+  }
diff --git a/qmk/keyboards/sck/m0116b/config.h b/qmk/keyboards/sck/m0116b/config.h
index 03fa9f25..8563f7fc 100644
--- a/qmk/keyboards/sck/m0116b/config.h
+++ b/qmk/keyboards/sck/m0116b/config.h
@@ -216,34 +216,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
-
 /* Bootmagic Lite key configuration */
  #define BOOTMAGIC_LITE_ROW 0
  #define BOOTMAGIC_LITE_COLUMN 6
diff --git a/qmk/keyboards/sck/m0116b/rules.mk b/qmk/keyboards/sck/m0116b/rules.mk
index 562bad5d..c97360b5 100644
--- a/qmk/keyboards/sck/m0116b/rules.mk
+++ b/qmk/keyboards/sck/m0116b/rules.mk
@@ -30,4 +30,3 @@ 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
diff --git a/qmk/keyboards/sck/neiso/rules.mk b/qmk/keyboards/sck/neiso/rules.mk
index 990edc9d..a480f1f8 100644
--- a/qmk/keyboards/sck/neiso/rules.mk
+++ b/qmk/keyboards/sck/neiso/rules.mk
@@ -30,4 +30,3 @@ UNICODE_ENABLE = no         # Unicode
 BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 AUDIO_ENABLE = no           # Audio output
 FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches
-HD44780_ENABLE = no 		# Enable support for HD44780 based LCDs
diff --git a/qmk/keyboards/sck/osa/config.h b/qmk/keyboards/sck/osa/config.h
index 67101344..83dec82d 100644
--- a/qmk/keyboards/sck/osa/config.h
+++ b/qmk/keyboards/sck/osa/config.h
@@ -91,6 +91,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* define if matrix has ghost (lacks anti-ghosting diodes) */
 //#define MATRIX_HAS_GHOST
 
+#define LED_NUM_LOCK_PIN C7
+#define LED_CAPS_LOCK_PIN C6
+#define LED_SCROLL_LOCK_PIN B6
+
 /* number of backlight levels */
 
 /* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
@@ -218,34 +222,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
-
 /* Bootmagic Lite key configuration */
 //#define BOOTMAGIC_LITE_ROW 0
 //#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/sck/osa/info.json b/qmk/keyboards/sck/osa/info.json
index 64ed057e..3736ebee 100644
--- a/qmk/keyboards/sck/osa/info.json
+++ b/qmk/keyboards/sck/osa/info.json
@@ -13,11 +13,11 @@
             "key_count": 65,
             "layout": [{"label":"Delete", "x":0, "y":0}, {"label":"Esc", "x":1.25, "y":0}, {"label":"!", "x":2.25, "y":0}, {"label":"@", "x":3.25, "y":0}, {"label":"#", "x":4.25, "y":0}, {"label":"$", "x":5.25, "y":0}, {"label":"%", "x":6.25, "y":0}, {"label":"^", "x":7.25, "y":0}, {"label":"&", "x":10.25, "y":0}, {"label":"*", "x":11.25, "y":0}, {"label":"(", "x":12.25, "y":0}, {"label":")", "x":13.25, "y":0}, {"label":"_", "x":14.25, "y":0}, {"label":"+", "x":15.25, "y":0}, {"label":"~", "x":16.25, "y":0}, {"label":"|", "x":17.25, "y":0}, {"label":"Page Up", "x":0, "y":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":9.75, "y":1}, {"label":"U", "x":10.75, "y":1}, {"label":"I", "x":11.75, "y":1}, {"label":"O", "x":12.75, "y":1}, {"label":"P", "x":13.75, "y":1}, {"label":"{", "x":14.75, "y":1}, {"label":"}", "x":15.75, "y":1}, {"label":"Backspace", "x":16.75, "y":1, "w":1.5}, {"label":"Page Down", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":10, "y":2}, {"label":"J", "x":11, "y":2}, {"label":"K", "x":12, "y":2}, {"label":"L", "x":13, "y":2}, {"label":":", "x":14, "y":2}, {"label":"\"", "x":15, "y":2}, {"label":"Enter", "x":16, "y":2, "w":2.25}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":9.5, "y":3}, {"label":"N", "x":10.5, "y":3}, {"label":"M", "x":11.5, "y":3}, {"label":"<", "x":12.5, "y":3}, {"label":">", "x":13.5, "y":3}, {"label":"?", "x":14.5, "y":3}, {"label":"Shift", "x":15.5, "y":3, "w":2.75}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.5}, {"label":"Win", "x":4.25, "y":4, "w":1.5}, {"x":5.75, "y":4, "w":2.25}, {"label":"Fn", "x":8, "y":4}, {"x":9.5, "y":4, "w":2.75}, {"label":"Alt", "x":12.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":16.75, "y":4, "w":1.5}]
         },
-        "LAYOUT_split_right_shift": {
+        "LAYOUT_alice": {
             "key_count": 65,
             "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"~", "x":1.25, "y":0}, {"label":"!", "x":2.25, "y":0}, {"label":"@", "x":3.25, "y":0}, {"label":"#", "x":4.25, "y":0}, {"label":"$", "x":5.25, "y":0}, {"label":"%", "x":6.25, "y":0}, {"label":"^", "x":7.25, "y":0}, {"label":"&", "x":10.25, "y":0}, {"label":"*", "x":11.25, "y":0}, {"label":"(", "x":12.25, "y":0}, {"label":")", "x":13.25, "y":0}, {"label":"_", "x":14.25, "y":0}, {"label":"+", "x":15.25, "y":0}, {"label":"Backspace", "x":16.25, "y":0, "w":2}, {"label":"Page Up", "x":0, "y":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":9.75, "y":1}, {"label":"U", "x":10.75, "y":1}, {"label":"I", "x":11.75, "y":1}, {"label":"O", "x":12.75, "y":1}, {"label":"P", "x":13.75, "y":1}, {"label":"{", "x":14.75, "y":1}, {"label":"}", "x":15.75, "y":1}, {"label":"|", "x":16.75, "y":1, "w":1.5}, {"label":"Page Down", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":10, "y":2}, {"label":"J", "x":11, "y":2}, {"label":"K", "x":12, "y":2}, {"label":"L", "x":13, "y":2}, {"label":":", "x":14, "y":2}, {"label":"\"", "x":15, "y":2}, {"label":"Enter", "x":16, "y":2, "w":2.25}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":9.5, "y":3}, {"label":"N", "x":10.5, "y":3}, {"label":"M", "x":11.5, "y":3}, {"label":"<", "x":12.5, "y":3}, {"label":">", "x":13.5, "y":3}, {"label":"?", "x":14.5, "y":3}, {"label":"Shift", "x":15.5, "y":3, "w":1.75}, {"label":"Fn", "x":17.25, "y":3}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.5}, {"label":"Win", "x":4.25, "y":4, "w":1.5}, {"x":5.75, "y":4, "w":2.25}, {"label":"Fn", "x":8, "y":4}, {"x":9.5, "y":4, "w":2.75}, {"label":"Alt", "x":12.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":16.75, "y":4, "w":1.5}]
         },
-        "LAYOUT_all": {
+        "LAYOUT_alice_split_bs": {
             "key_count": 66,
             "layout": [{"label":"Delete", "x":0, "y":0}, {"label":"Esc", "x":1.25, "y":0}, {"label":"!", "x":2.25, "y":0}, {"label":"@", "x":3.25, "y":0}, {"label":"#", "x":4.25, "y":0}, {"label":"$", "x":5.25, "y":0}, {"label":"%", "x":6.25, "y":0}, {"label":"^", "x":7.25, "y":0}, {"label":"&", "x":10.25, "y":0}, {"label":"*", "x":11.25, "y":0}, {"label":"(", "x":12.25, "y":0}, {"label":")", "x":13.25, "y":0}, {"label":"_", "x":14.25, "y":0}, {"label":"+", "x":15.25, "y":0}, {"label":"~", "x":16.25, "y":0}, {"label":"|", "x":17.25, "y":0}, {"label":"Page Up", "x":0, "y":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":9.75, "y":1}, {"label":"U", "x":10.75, "y":1}, {"label":"I", "x":11.75, "y":1}, {"label":"O", "x":12.75, "y":1}, {"label":"P", "x":13.75, "y":1}, {"label":"{", "x":14.75, "y":1}, {"label":"}", "x":15.75, "y":1}, {"label":"Backspace", "x":16.75, "y":1, "w":1.5}, {"label":"Page Down", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":10, "y":2}, {"label":"J", "x":11, "y":2}, {"label":"K", "x":12, "y":2}, {"label":"L", "x":13, "y":2}, {"label":":", "x":14, "y":2}, {"label":"\"", "x":15, "y":2}, {"label":"Enter", "x":16, "y":2, "w":2.25}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":9.5, "y":3}, {"label":"N", "x":10.5, "y":3}, {"label":"M", "x":11.5, "y":3}, {"label":"<", "x":12.5, "y":3}, {"label":">", "x":13.5, "y":3}, {"label":"?", "x":14.5, "y":3}, {"label":"Shift", "x":15.5, "y":3, "w":1.75}, {"label":"Fn", "x":17.25, "y":3}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.5}, {"label":"Win", "x":4.25, "y":4, "w":1.5}, {"x":5.75, "y":4, "w":2.25}, {"label":"Fn", "x":8, "y":4}, {"x":9.5, "y":4, "w":2.75}, {"label":"Alt", "x":12.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":16.75, "y":4, "w":1.5}]
         }
diff --git a/qmk/keyboards/sck/osa/keymaps/all/keymap.c b/qmk/keyboards/sck/osa/keymaps/all/keymap.c
index 378f8ed5..01bd9da2 100644
--- a/qmk/keyboards/sck/osa/keymaps/all/keymap.c
+++ b/qmk/keyboards/sck/osa/keymaps/all/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    *       |CAPS|    | Alt | Space | Fn |     | Space | Alt |               | Ctrl|
    *       `----------------------------------------------------------------------'
    */
-[0] = LAYOUT_all( /* OSA Base */
+[0] = LAYOUT_alice_split_bs( /* OSA Base */
 	KC_DEL,   KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,   KC_5,   KC_6,              KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,  KC_BSLS,
 	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_BSPC,
 	KC_PGDN,  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,
@@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    *       |CAPS|    | Alt | Space | Fn |     | Space | Alt |               | Ctrl|
    *       `----------------------------------------------------------------------'
    */
-[1] = LAYOUT_all( /* OSA Layer 1 */
+[1] = LAYOUT_alice_split_bs( /* OSA Layer 1 */
 	KC_SLCK,   KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,   KC_5,   KC_6,              KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,  KC_BSLS,
 	KC_NLCK,  KC_TAB,  KC_Q,    KC_UP,   KC_E,    KC_R,   KC_T,    					 KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
 	KC_CLCK,  KC_LCTL, KC_LEFT, KC_DOWN, KC_RGHT, KC_F,   KC_G,    					 KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_SCLN, KC_QUOT,          KC_ENT,
diff --git a/qmk/keyboards/sck/osa/keymaps/splitrs/keymap.c b/qmk/keyboards/sck/osa/keymaps/splitrs/keymap.c
index a59b6633..3c643006 100644
--- a/qmk/keyboards/sck/osa/keymaps/splitrs/keymap.c
+++ b/qmk/keyboards/sck/osa/keymaps/splitrs/keymap.c
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    *       |CAPS|    | Alt | Space | Fn |     | Space | Alt |               | Ctrl|
    *       `----------------------------------------------------------------------'
    */
-[0] = LAYOUT_split_right_shift( /* OSA Base */
+[0] = LAYOUT_alice( /* OSA Base */
 	KC_DEL,   KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,   KC_5,   KC_6,              KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,           KC_BSPC,
 	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_PGDN,  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,
@@ -56,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    *       |CAPS|    | Alt | Space | Fn |     | Space | Alt |               | Ctrl|
    *       `----------------------------------------------------------------------'
    */
-[1] = LAYOUT_split_right_shift( /* OSA Layer 1 */
+[1] = LAYOUT_alice( /* OSA Layer 1 */
 	KC_DEL,   KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,   KC_5,   KC_6,              KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,           KC_BSPC,
 	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_PGDN,  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,
diff --git a/qmk/keyboards/sck/osa/keymaps/via/keymap.c b/qmk/keyboards/sck/osa/keymaps/via/keymap.c
index 2c1af073..79368024 100644
--- a/qmk/keyboards/sck/osa/keymaps/via/keymap.c
+++ b/qmk/keyboards/sck/osa/keymaps/via/keymap.c
@@ -16,14 +16,14 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-[0] = LAYOUT_all(
+[0] = LAYOUT_alice_split_bs(
   KC_DEL,  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,             KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC,
   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_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_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_RSFT,
            KC_LCTL,          KC_LALT,          KC_SPC,  MO(1),                     KC_SPC,                    KC_RALT,                            KC_RCTL
   ),
-[1] = LAYOUT_all(
+[1] = LAYOUT_alice_split_bs(
   KC_TRNS, KC_TRNS, 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_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,
@@ -31,7 +31,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
            KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS,                   KC_TRNS,                   KC_TRNS,                            KC_TRNS
   ),
 
-[2] = LAYOUT_all(
+[2] = LAYOUT_alice_split_bs(
   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,
@@ -39,7 +39,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
            KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS,                   KC_TRNS,                   KC_TRNS,                            KC_TRNS
   ),
 
-[3] = LAYOUT_all(
+[3] = LAYOUT_alice_split_bs(
   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,
diff --git a/qmk/keyboards/sck/osa/keymaps/via/rules.mk b/qmk/keyboards/sck/osa/keymaps/via/rules.mk
index bee21da5..e9977d2f 100644
--- a/qmk/keyboards/sck/osa/keymaps/via/rules.mk
+++ b/qmk/keyboards/sck/osa/keymaps/via/rules.mk
@@ -1,2 +1,3 @@
 VIA_ENABLE = yes
-MOUSEKEY_ENABLE = no
\ No newline at end of file
+
+CONSOLE_ENABLE = no
diff --git a/qmk/keyboards/sck/osa/osa.c b/qmk/keyboards/sck/osa/osa.c
index 138a2889..7f144035 100644
--- a/qmk/keyboards/sck/osa/osa.c
+++ b/qmk/keyboards/sck/osa/osa.c
@@ -14,60 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "osa.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) {
-  // 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 matrix_init_board(void){
-    setPinOutput(C7);
-    setPinOutput(C6);
-    setPinOutput(B6);
-}
-
-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)) {
-        writePinHigh(C7);
-    } else {
-        writePinLow(C7);
-    }
-    if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
-        writePinHigh(C6);
-    } else {
-        writePinLow(C6);
-    }
-    if (IS_LED_ON(usb_led, USB_LED_SCROLL_LOCK)) {
-        writePinHigh(B6);
-    } else {
-        writePinLow(B6);
-    }
-  led_set_user(usb_led);
-}
-
diff --git a/qmk/keyboards/sck/osa/osa.h b/qmk/keyboards/sck/osa/osa.h
index 46cb3cd8..d6ac51c7 100644
--- a/qmk/keyboards/sck/osa/osa.h
+++ b/qmk/keyboards/sck/osa/osa.h
@@ -77,7 +77,7 @@
     { KC_NO, K81,   K82,   K83,   K84,   K85,   K86,   K87    }, \
     { K90,   KC_NO, KC_NO, K93,   KC_NO, K95,   KC_NO, KC_NO  }  \
 }
-#define LAYOUT_split_right_shift( \
+#define LAYOUT_alice( \
   K10, K00, K01, K02, K03, K04, K05, K06,   K56, K55, K54, K53, K52, K51,      K57, \
   K20, K11, K12, K13, K14, K15, K16,        K66, K65, K64, K63, K62, K61, K60, K67, \
   K30, K21, K22, K23, K24, K25, K26,        K76, K75, K74, K73, K72, K71,      K77, \
@@ -96,7 +96,7 @@
     { K80,   K81,   K82,   K83,   K84,   K85,   K86,   K87    }, \
     { K90,   KC_NO, KC_NO, K93,   KC_NO, K95,   KC_NO, KC_NO  }  \
 }
-#define LAYOUT_all( \
+#define LAYOUT_alice_split_bs( \
   K10, K00, K01, K02, K03, K04, K05, K06,   K56, K55, K54, K53, K52, K51, K50, K57, \
   K20, K11, K12, K13, K14, K15, K16,        K66, K65, K64, K63, K62, K61, K60, K67, \
   K30, K21, K22, K23, K24, K25, K26,        K76, K75, K74, K73, K72, K71,      K77, \
@@ -115,3 +115,6 @@
     { K80,   K81,   K82,   K83,   K84,   K85,   K86,   K87    }, \
     { K90,   KC_NO, KC_NO, K93,   KC_NO, K95,   KC_NO, KC_NO  }  \
 }
+
+#define LAYOUT_split_right_shift LAYOUT_alice
+#define LAYOUT_all LAYOUT_alice_split_bs
diff --git a/qmk/keyboards/sck/osa/rules.mk b/qmk/keyboards/sck/osa/rules.mk
index c9213044..0faf76e7 100644
--- a/qmk/keyboards/sck/osa/rules.mk
+++ b/qmk/keyboards/sck/osa/rules.mk
@@ -30,4 +30,5 @@ 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
+
+LAYOUTS = alice alice_split_bs
diff --git a/qmk/keyboards/scythe/config.h b/qmk/keyboards/scythe/config.h
index c4d12bb0..4c6b07a3 100644
--- a/qmk/keyboards/scythe/config.h
+++ b/qmk/keyboards/scythe/config.h
@@ -191,34 +191,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/scythe/rules.mk b/qmk/keyboards/scythe/rules.mk
index d268951e..c327fc3a 100644
--- a/qmk/keyboards/scythe/rules.mk
+++ b/qmk/keyboards/scythe/rules.mk
@@ -30,7 +30,6 @@ 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
 
 SPLIT_KEYBOARD = yes        # Use shared split_common
 RGBLIGHT_SPLIT = yes
diff --git a/qmk/keyboards/sentraq/number_pad/rules.mk b/qmk/keyboards/sentraq/number_pad/rules.mk
index 7c87642a..8d93d390 100644
--- a/qmk/keyboards/sentraq/number_pad/rules.mk
+++ b/qmk/keyboards/sentraq/number_pad/rules.mk
@@ -30,4 +30,3 @@ 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
diff --git a/qmk/keyboards/sentraq/s65_plus/config.h b/qmk/keyboards/sentraq/s65_plus/config.h
index 51aacfc1..f1f3512c 100644
--- a/qmk/keyboards/sentraq/s65_plus/config.h
+++ b/qmk/keyboards/sentraq/s65_plus/config.h
@@ -20,6 +20,9 @@
 #define MATRIX_COL_PINS { F6, F5, F4, F1, F0, E6, B0, B1, D5, B2, B3, D0, D1, D2, D4, D6, D7, F7 }
 #define UNUSED_PINS
 
+#define LED_CAPS_LOCK_PIN B7
+#define LED_PIN_ON_STATE 0
+
 /* number of backlight levels */
 #define BACKLIGHT_PIN B7
 #define BACKLIGHT_LEVELS 3
diff --git a/qmk/keyboards/sentraq/s65_plus/s65_plus.c b/qmk/keyboards/sentraq/s65_plus/s65_plus.c
index 3eaaa371..7b20ee06 100644
--- a/qmk/keyboards/sentraq/s65_plus/s65_plus.c
+++ b/qmk/keyboards/sentraq/s65_plus/s65_plus.c
@@ -1,24 +1 @@
 #include "s65_plus.h"
-#include "led.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();
-};
-
-void led_set_kb(uint8_t usb_led) {
-  if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
-    // Turn capslock on
-    PORTB &= ~(1<<7);
-  } else {
-    // Turn capslock off
-    PORTB |= (1<<7);
-  }
-}
diff --git a/qmk/keyboards/setta21/keymaps/salicylic/rules.mk b/qmk/keyboards/setta21/keymaps/salicylic/rules.mk
index 6e59dde1..2d191929 100644
--- a/qmk/keyboards/setta21/keymaps/salicylic/rules.mk
+++ b/qmk/keyboards/setta21/keymaps/salicylic/rules.mk
@@ -1,3 +1,3 @@
 RGBLIGHT_ENABLE = no
-RGB_MATRIX_ENABLE = WS2812
+RGB_MATRIX_ENABLE = yes
 OLED_DRIVER_ENABLE = yes
diff --git a/qmk/keyboards/setta21/rules.mk b/qmk/keyboards/setta21/rules.mk
index 8eae05c6..b99696bc 100644
--- a/qmk/keyboards/setta21/rules.mk
+++ b/qmk/keyboards/setta21/rules.mk
@@ -31,6 +31,8 @@ OLED_DRIVER_ENABLE = no
 USE_I2C = no
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
+RGB_MATRIX_ENABLE = no
+RGB_MATRIX_DRIVER = WS2812
 
 DEFAULT_FOLDER = setta21/rev1
 
diff --git a/qmk/keyboards/shambles/rules.mk b/qmk/keyboards/shambles/rules.mk
index d029ee52..46138baf 100644
--- a/qmk/keyboards/shambles/rules.mk
+++ b/qmk/keyboards/shambles/rules.mk
@@ -29,4 +29,3 @@ MIDI_ENABLE = no            # MIDI support
 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
diff --git a/qmk/keyboards/shiro/config.h b/qmk/keyboards/shiro/config.h
index d97be0cd..f7d2a76e 100644
--- a/qmk/keyboards/shiro/config.h
+++ b/qmk/keyboards/shiro/config.h
@@ -218,34 +218,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/shiro/rules.mk b/qmk/keyboards/shiro/rules.mk
index fa186489..7854599d 100644
--- a/qmk/keyboards/shiro/rules.mk
+++ b/qmk/keyboards/shiro/rules.mk
@@ -30,4 +30,3 @@ 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
diff --git a/qmk/keyboards/sidderskb/majbritt/rules.mk b/qmk/keyboards/sidderskb/majbritt/rules.mk
index 40534842..b842278b 100644
--- a/qmk/keyboards/sidderskb/majbritt/rules.mk
+++ b/qmk/keyboards/sidderskb/majbritt/rules.mk
@@ -29,4 +29,3 @@ MIDI_ENABLE = no            # MIDI support
 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
diff --git a/qmk/keyboards/silverbullet44/config.h b/qmk/keyboards/silverbullet44/config.h
index a7402a00..3f9243fd 100644
--- a/qmk/keyboards/silverbullet44/config.h
+++ b/qmk/keyboards/silverbullet44/config.h
@@ -261,34 +261,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/silverbullet44/rules.mk b/qmk/keyboards/silverbullet44/rules.mk
index 39c5a045..d6a09479 100644
--- a/qmk/keyboards/silverbullet44/rules.mk
+++ b/qmk/keyboards/silverbullet44/rules.mk
@@ -25,12 +25,12 @@ SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 NKRO_ENABLE = no            # USB Nkey Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality on B7 by default
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-#RGB_MATRIX_ENABLE = WS2812
+RGB_MATRIX_ENABLE = no
+RGB_MATRIX_DRIVER = WS2812
 MIDI_ENABLE = no            # MIDI support
 UNICODE_ENABLE = no         # Unicode
 BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 AUDIO_ENABLE = yes          # Audio output on port B6
 FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches
-HD44780_ENABLE = no         # Enable support for HD44780 based LCDs
 SPLIT_KEYBOARD = yes
 LTO_ENABLE = yes
diff --git a/qmk/keyboards/singa/keymaps/via/rules.mk b/qmk/keyboards/singa/keymaps/via/rules.mk
index a823f59c..8c8ed55d 100644
--- a/qmk/keyboards/singa/keymaps/via/rules.mk
+++ b/qmk/keyboards/singa/keymaps/via/rules.mk
@@ -1,8 +1,6 @@
 VIA_ENABLE = yes
 LTO_ENABLE = yes
 
-MOUSEKEY_ENABLE = no
-EXTRAKEY_ENABLE = no
 COMMAND_ENABLE = no
 CONSOLE_ENABLE = no
 
diff --git a/qmk/keyboards/slz40/config.h b/qmk/keyboards/slz40/config.h
new file mode 100644
index 00000000..cc868e4c
--- /dev/null
+++ b/qmk/keyboards/slz40/config.h
@@ -0,0 +1,146 @@
+/*
+Copyright 2020 SithLord
+
+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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID    0xFEED
+#define PRODUCT_ID   0x0000
+#define DEVICE_VER   0x0001
+#define MANUFACTURER SithLord
+#define PRODUCT      slz40
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 12
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+ */
+#define MATRIX_ROW_PINS { B4, B5, B3, B2, B6 }
+#define MATRIX_COL_PINS { F4, D2, F5, D1, F6, D0, F7, D4, B1, C6, E6, D7 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+#define SOFT_SERIAL_PIN D0  // or D1, D2, D3, E6
+
+//#define BACKLIGHT_PIN B7
+//#define BACKLIGHT_LEVELS 3
+//#define BACKLIGHT_BREATHING
+
+//#define RGB_DI_PIN E2
+//#ifdef RGB_DI_PIN
+//#    define RGBLED_NUM 16
+//#    define RGBLIGHT_HUE_STEP 8
+//#    define RGBLIGHT_SAT_STEP 8
+//#    define RGBLIGHT_VAL_STEP 8
+//#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+//#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+/*== all animations enable ==*/
+//#    define RGBLIGHT_ANIMATIONS
+/*== or choose animations ==*/
+//#    define RGBLIGHT_EFFECT_BREATHING
+//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+//#    define RGBLIGHT_EFFECT_SNAKE
+//#    define RGBLIGHT_EFFECT_KNIGHT
+//#    define RGBLIGHT_EFFECT_CHRISTMAS
+//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+//#    define RGBLIGHT_EFFECT_RGB_TEST
+//#    define RGBLIGHT_EFFECT_ALTERNATING
+/*== customize breathing effect ==*/
+/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+//#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+/*==== use exp() and sin() ====*/
+//#    define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//#    define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+//#endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+//#define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+/* Bootmagic Lite key configuration */
+//#define BOOTMAGIC_LITE_ROW 0
+//#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/slz40/info.json b/qmk/keyboards/slz40/info.json
new file mode 100644
index 00000000..2723453c
--- /dev/null
+++ b/qmk/keyboards/slz40/info.json
@@ -0,0 +1,76 @@
+{
+    "keyboard_name": "slz40",
+    "url": "https://github.com/sithlord121/slz40",
+    "maintainer": "SithLord",
+    "width": 13,
+    "height": 5,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label": "1", "x": 0.5, "y": 0},
+                {"label": "2", "x": 1.5, "y": 0},
+                {"label": "3", "x": 2.5, "y": 0},
+                {"label": "4", "x": 3.5, "y": 0},
+                {"label": "5", "x": 4.5, "y": 0},
+                {"label": "6", "x": 5.5, "y": 0},
+                {"label": "7", "x": 6.5, "y": 0},
+                {"label": "8", "x": 7.5, "y": 0},
+                {"label": "9", "x": 8.5, "y": 0},
+                {"label": "0", "x": 9.5, "y": 0},
+                {"label": "-", "x": 10.5, "y": 0},
+
+                {"label": "esc", "x": 0, "y": 1},
+                {"label": "q", "x": 1, "y": 1},
+                {"label": "w", "x": 2, "y": 1},
+                {"label": "e", "x": 3, "y": 1},
+                {"label": "r", "x": 4, "y": 1},
+                {"label": "t", "x": 5, "y": 1},
+                {"label": "y", "x": 6, "y": 1},
+                {"label": "u", "x": 7, "y": 1},
+                {"label": "i", "x": 8, "y": 1},
+                {"label": "o", "x": 9, "y": 1},
+                {"label": "p", "x": 10, "y": 1},
+                {"label": "/", "x": 11, "y": 1},
+                {"label": "bs", "x": 12, "y": 1},
+                
+                {"label": "tab", "x": 0, "y": 2, "w": 1.25},
+                {"label": "a", "x": 1.25, "y": 2},
+                {"label": "s", "x": 2.25, "y": 2},
+                {"label": "d", "x": 3.25, "y": 2}, 
+                {"label": "f", "x": 4.25, "y": 2},
+                {"label": "g", "x": 5.25, "y": 2},
+                {"label": "h", "x": 6.25, "y": 2},
+                {"label": "j", "x": 7.25, "y": 2},
+                {"label": "k", "x": 8.25, "y": 2}, 
+                {"label": "l", "x": 9.25, "y": 2},
+                {"label": ";", "x": 10.25, "y": 2},
+                {"label": "enter", "x": 11.25, "y": 2, "w": 1.75},
+                
+                {"label": "lshift", "x": 0, "y": 3, "w": 1.75},
+                {"label": "z", "x": 1.75, "y": 3}, 
+                {"label": "x", "x": 2.75, "y": 3},
+                {"label": "c", "x": 3.75, "y": 3},
+                {"label": "v", "x": 4.75, "y": 3}, 
+                {"label": "b", "x": 5.75, "y": 3},
+                {"label": "n", "x": 6.75, "y": 3},
+                {"label": "m", "x": 7.75, "y": 3}, 
+                {"label": ",", "x": 8.75, "y": 3},
+                {"label": ".", "x": 9.75, "y": 3},
+                {"label": "up", "x": 10.75, "y": 3}, 
+                {"label": "rshift", "x": 11.75, "y": 3, "w": 1.25},
+                
+                {"label": "ctrl", "x": 0, "y": 4, "w": 1.25},
+                {"label": "qui", "x": 1.25, "y": 4, "w": 1.25},
+                {"label": "alt", "x": 2.50, "y": 4, "w": 1.25},
+                {"label": "del", "x": 3.75, "y": 4, "w": 1.25},
+                {"label": "enter", "x": 5, "y": 4, "w": 1.75},
+                {"label": "space", "x": 6.75, "y": 4, "w": 1.75},
+                {"label": "'", "x": 8.50, "y": 4, "w": 1.5},
+                {"label": "left", "x": 10, "y": 4},
+                {"label": "down", "x": 11, "y": 4},
+                {"label": "right", "x": 12, "y": 4}
+                
+            ]
+        }
+    }
+}
diff --git a/qmk/keyboards/slz40/keymaps/default/keymap.c b/qmk/keyboards/slz40/keymaps/default/keymap.c
new file mode 100644
index 00000000..9212d792
--- /dev/null
+++ b/qmk/keyboards/slz40/keymaps/default/keymap.c
@@ -0,0 +1,48 @@
+/* Copyright 2020 SithLord
+ *
+ * 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 names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _FN,
+	_FN2
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Base */
+    [_BASE] = LAYOUT(
+        KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,
+		KC_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_SLSH, KC_BSPC,
+		LT(_FN, KC_TAB),  KC_A,  KC_S,  KC_D,  KC_F,  KC_G,  KC_H,  KC_J,  KC_K,  KC_L,  KC_SCLN,  LT(_FN,KC_ENT),
+		KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_UP, KC_RSPC, 
+		KC_LCTL, KC_LGUI, KC_LALT,  LT(_FN2, KC_DEL), LT(_FN2, KC_ENTER),   KC_SPACE,   KC_QUOT,  KC_LEFT, KC_DOWN, KC_RIGHT
+    ),
+    [_FN] = LAYOUT(
+		KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11,
+		KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,  KC_SLSH, KC_BSPC,
+		KC_TRNS,  KC_F1,  KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_PIPE,  KC_MINS,  KC_EQL,  KC_NO,  KC_BSLS,  KC_TRNS,
+		KC_LSFT,   KC_F6,  KC_F7,  KC_F8,  KC_F9, KC_F10,  KC_LBRC, KC_RBRC, KC_COMM, KC_DOT, KC_PGUP, KC_RSFT, 
+		KC_LCTL, KC_LGUI, KC_LALT,  KC_TRNS, KC_TRNS,   KC_SPACE,   KC_QUOT,  KC_HOME, KC_PGDN, KC_END
+    ),
+    [_FN2] = LAYOUT(
+		KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, RESET,
+		KC_ESC, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PIPE, KC_BSPC,
+		KC_TAB,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_NO,  KC_BSLS,  KC_UNDS,  KC_PLUS,  KC_NO,  KC_NO,  KC_ENT,
+		KC_LSFT,   KC_NO,  KC_NO,  KC_NO,  KC_NO, KC_NO,  KC_LCBR, KC_RCBR, KC_COMM, KC_DOT, KC_VOLU, KC_RSFT, 
+		KC_LCTL, KC_LGUI, KC_LALT,  KC_TRNS, KC_TRNS,   KC_SPACE,   KC_QUOT,  KC_HOME, KC_VOLD, KC_END
+    )
+};
diff --git a/qmk/keyboards/slz40/keymaps/default/readme.md b/qmk/keyboards/slz40/keymaps/default/readme.md
new file mode 100644
index 00000000..e9b38ab4
--- /dev/null
+++ b/qmk/keyboards/slz40/keymaps/default/readme.md
@@ -0,0 +1 @@
+# The default keymap for slz40
diff --git a/qmk/keyboards/slz40/readme.md b/qmk/keyboards/slz40/readme.md
new file mode 100644
index 00000000..d710f597
--- /dev/null
+++ b/qmk/keyboards/slz40/readme.md
@@ -0,0 +1,19 @@
+# slz40
+
+![SLZ40](https://imgur.com/kgXfEBR.jpg)
+
+PCB and keymap files for the SLZ40, a 40s style keyboard with numbers for Zhuyin input.
+
+* Keyboard Maintainer: [SithLord](https://github.com/sithlord121/slz40)
+* Hardware Supported: ProMicro or similar controller is required.
+* Hardware Availability: PCB files can be found at https://github.com/sithlord121/slz40
+
+Make example for this keyboard (after setting up your build environment):
+
+    make slz40:default
+
+Flashing example for this keyboard:
+
+    make slz40:default:flash
+
+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).
diff --git a/qmk/keyboards/slz40/rules.mk b/qmk/keyboards/slz40/rules.mk
new file mode 100644
index 00000000..5c0d8f30
--- /dev/null
+++ b/qmk/keyboards/slz40/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+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
+# 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
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
diff --git a/qmk/keyboards/slz40/slz40.c b/qmk/keyboards/slz40/slz40.c
new file mode 100644
index 00000000..261b0bd8
--- /dev/null
+++ b/qmk/keyboards/slz40/slz40.c
@@ -0,0 +1,17 @@
+/* Copyright 2020 SithLord
+ *
+ * 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 "slz40.h"
diff --git a/qmk/keyboards/slz40/slz40.h b/qmk/keyboards/slz40/slz40.h
new file mode 100644
index 00000000..88e7178c
--- /dev/null
+++ b/qmk/keyboards/slz40/slz40.h
@@ -0,0 +1,41 @@
+/* Copyright 2020 SithLord
+ *
+ * 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 is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a,	\
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k0b, 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,	\
+	k40, k41, k42, k43, k44,      k46,      k48, k49, k4a, k4b \
+) { \
+    { 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 },  \
+	{ k40, k41, k42, k43,  k44, KC_NO, k46, KC_NO, k48, k49, k4a, k4b }  \
+}
diff --git a/qmk/keyboards/snampad/config.h b/qmk/keyboards/snampad/config.h
index 86dd3ce2..87f7feab 100644
--- a/qmk/keyboards/snampad/config.h
+++ b/qmk/keyboards/snampad/config.h
@@ -212,34 +212,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/snampad/rules.mk b/qmk/keyboards/snampad/rules.mk
index 91b492ba..8425f62b 100644
--- a/qmk/keyboards/snampad/rules.mk
+++ b/qmk/keyboards/snampad/rules.mk
@@ -30,6 +30,5 @@ 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
 
 LAYOUTS = numpad_6x4
diff --git a/qmk/keyboards/sneakbox/aliceclone/aliceclone.h b/qmk/keyboards/sneakbox/aliceclone/aliceclone.h
index 67ae7ce7..49d227fd 100644
--- a/qmk/keyboards/sneakbox/aliceclone/aliceclone.h
+++ b/qmk/keyboards/sneakbox/aliceclone/aliceclone.h
@@ -19,7 +19,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "quantum.h"
 
-#define LAYOUT_all( \
+#define LAYOUT_all LAYOUT_alice_split_bs
+
+#define LAYOUT_alice_split_bs( \
 	K020,   K000, K001, K002, K003, K004, K005, K006,       K010, K011, K012, K013, K014, K015, K016, K017, \
 	K040,   K021,       K022, K023, K024, K025, K026,       K030, K031, K032, K033, K034, K035, K036, K037, \
 	K060,   K041,       K042, K043, K044, K045, K046,       K050, K051, K052, K053, K054, K055,       K056, \
@@ -37,3 +39,22 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 	{ KC_NO, K081,  KC_NO, K083,  KC_NO, K085,  K086,  KC_NO }, \
 	{ KC_NO, K091,  KC_NO, K093,  KC_NO, KC_NO, KC_NO, K097 }  \
 }
+
+#define LAYOUT_alice( \
+    K020,   K000, K001, K002, K003, K004, K005, K006,       K010, K011, K012, K013, K014, K015,       K016, \
+    K040,   K021,       K022, K023, K024, K025, K026,       K030, K031, K032, K033, K034, K035, K036, K037, \
+    K060,   K041,       K042, K043, K044, K045, K046,       K050, K051, K052, K053, K054, K055,       K056, \
+            K061,       K062, K063, K064, K065, K066,       K070, K071, K072, K073, K074, K075, K076, K077, \
+            K081,                   K083, K085, K086,       K091, K093,                               K097  \
+) { \
+    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  KC_NO }, \
+    { K010,  K011,  K012,  K013,  K014,  K015,  K016,  KC_NO }, \
+    { K020,  K021,  K022,  K023,  K024,  K025,  K026,  KC_NO }, \
+    { K030,  K031,  K032,  K033,  K034,  K035,  K036,  K037 }, \
+    { K040,  K041,  K042,  K043,  K044,  K045,  K046,  KC_NO }, \
+    { K050,  K051,  K052,  K053,  K054,  K055,  K056,  KC_NO }, \
+    { K060,  K061,  K062,  K063,  K064,  K065,  K066,  KC_NO }, \
+    { K070,  K071,  K072,  K073,  K074,  K075,  K076,  K077 }, \
+    { KC_NO, K081,  KC_NO, K083,  KC_NO, K085,  K086,  KC_NO }, \
+    { KC_NO, K091,  KC_NO, K093,  KC_NO, KC_NO, KC_NO, K097 }  \
+}
diff --git a/qmk/keyboards/sneakbox/aliceclone/info.json b/qmk/keyboards/sneakbox/aliceclone/info.json
index 332404b5..cacef99b 100644
--- a/qmk/keyboards/sneakbox/aliceclone/info.json
+++ b/qmk/keyboards/sneakbox/aliceclone/info.json
@@ -5,7 +5,7 @@
   "width": 18.25,
   "height": 5,
   "layouts": {
-      "LAYOUT_all": {
+      "LAYOUT_alice_split_bs": {
           "layout": [
               {"x":0, "y":0}, {"x":1.25, "y":0}, {"x":2.25, "y":0}, {"x":3.25, "y":0}, {"x":4.25, "y":0}, {"x":5.25, "y":0}, {"x":6.25, "y":0}, {"x":7.25, "y":0}, {"x":10.25, "y":0}, {"x":11.25, "y":0}, {"x":12.25, "y":0}, {"x":13.25, "y":0}, {"x":14.25, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0},
               {"x":0, "y":1}, {"x":1.25, "y":1, "w":1.5}, {"x":2.75, "y":1}, {"x":3.75, "y":1}, {"x":4.75, "y":1}, {"x":5.75, "y":1}, {"x":6.75, "y":1}, {"x":9.75, "y":1}, {"x":10.75, "y":1}, {"x":11.75, "y":1}, {"x":12.75, "y":1}, {"x":13.75, "y":1}, {"x":14.75, "y":1}, {"x":15.75, "y":1}, {"x":16.75, "y":1, "w":1.5},
@@ -13,6 +13,15 @@
               {"x":1.25, "y":3, "w":2.25}, {"x":3.5, "y":3}, {"x":4.5, "y":3}, {"x":5.5, "y":3}, {"x":6.5, "y":3}, {"x":7.5, "y":3}, {"x":9.5, "y":3}, {"x":10.5, "y":3}, {"x":11.5, "y":3}, {"x":12.5, "y":3}, {"x":13.5, "y":3}, {"x":14.5, "y":3}, {"x":15.5, "y":3, "w":1.75}, {"x":17.25, "y":3},
               {"x":1.25, "y":4, "w":1.5}, {"x":4, "y":4, "w":1.5}, {"x":5.5, "y":4, "w":2.25}, {"x":7.75, "y":4}, {"x":9.75, "y":4, "w":2.75}, {"x":12.5, "y":4, "w":1.5}, {"x":16.75, "y":4, "w":1.5}
 			]
+      },
+      "LAYOUT_alice": {
+          "layout": [
+              {"x":0, "y":0}, {"x":1.25, "y":0}, {"x":2.25, "y":0}, {"x":3.25, "y":0}, {"x":4.25, "y":0}, {"x":5.25, "y":0}, {"x":6.25, "y":0}, {"x":7.25, "y":0}, {"x":10.25, "y":0}, {"x":11.25, "y":0}, {"x":12.25, "y":0}, {"x":13.25, "y":0}, {"x":14.25, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0, "w":2},
+              {"x":0, "y":1}, {"x":1.25, "y":1, "w":1.5}, {"x":2.75, "y":1}, {"x":3.75, "y":1}, {"x":4.75, "y":1}, {"x":5.75, "y":1}, {"x":6.75, "y":1}, {"x":9.75, "y":1}, {"x":10.75, "y":1}, {"x":11.75, "y":1}, {"x":12.75, "y":1}, {"x":13.75, "y":1}, {"x":14.75, "y":1}, {"x":15.75, "y":1}, {"x":16.75, "y":1, "w":1.5},
+              {"x":0, "y":2}, {"x":1.25, "y":2, "w":1.75}, {"x":3, "y":2}, {"x":4, "y":2}, {"x":5, "y":2}, {"x":6, "y":2}, {"x":7, "y":2}, {"x":10, "y":2}, {"x":11, "y":2}, {"x":12, "y":2}, {"x":13, "y":2}, {"x":14, "y":2}, {"x":15, "y":2}, {"x":16, "y":2, "w":2.25},
+              {"x":1.25, "y":3, "w":2.25}, {"x":3.5, "y":3}, {"x":4.5, "y":3}, {"x":5.5, "y":3}, {"x":6.5, "y":3}, {"x":7.5, "y":3}, {"x":9.5, "y":3}, {"x":10.5, "y":3}, {"x":11.5, "y":3}, {"x":12.5, "y":3}, {"x":13.5, "y":3}, {"x":14.5, "y":3}, {"x":15.5, "y":3, "w":1.75}, {"x":17.25, "y":3},
+              {"x":1.25, "y":4, "w":1.5}, {"x":4, "y":4, "w":1.5}, {"x":5.5, "y":4, "w":2.25}, {"x":7.75, "y":4}, {"x":9.75, "y":4, "w":2.75}, {"x":12.5, "y":4, "w":1.5}, {"x":16.75, "y":4, "w":1.5}
+            ]
       }
   }
 }
diff --git a/qmk/keyboards/sneakbox/aliceclone/keymaps/default/keymap.c b/qmk/keyboards/sneakbox/aliceclone/keymaps/default/keymap.c
index 39eb44bc..0dee1fb0 100644
--- a/qmk/keyboards/sneakbox/aliceclone/keymaps/default/keymap.c
+++ b/qmk/keyboards/sneakbox/aliceclone/keymaps/default/keymap.c
@@ -24,13 +24,13 @@ enum layer_names {
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [_BASE] = LAYOUT_all(
+    [_BASE] = LAYOUT_alice_split_bs(
         KC_ESC,    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_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_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_B,    KC_N,    KC_M,    KC_COMM,    KC_DOT,    KC_SLSH,    KC_RSFT,    KC_LGUI, 
                    KC_LCTL,                     KC_LALT, KC_SPC, LT(_FN, KC_SPC),                KC_SPC, KC_RALT,                                              KC_RCTL),
-    [_FN] = LAYOUT_all(
+    [_FN] = LAYOUT_alice_split_bs(
         KC_TRNS,   KC_TRNS,   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_TRNS,    KC_TRNS, 
         KC_TRNS,   KC_TRNS,   KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS,                       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS, 
         RESET,     KC_TRNS,   KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS,                       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS, 
diff --git a/qmk/keyboards/sneakbox/aliceclone/keymaps/via/keymap.c b/qmk/keyboards/sneakbox/aliceclone/keymaps/via/keymap.c
index 333b8a21..a8f44e60 100644
--- a/qmk/keyboards/sneakbox/aliceclone/keymaps/via/keymap.c
+++ b/qmk/keyboards/sneakbox/aliceclone/keymaps/via/keymap.c
@@ -27,25 +27,25 @@ enum layer_names {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-    [_BASE] = LAYOUT_all(
+    [_BASE] = LAYOUT_alice_split_bs(
         KC_ESC,    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_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_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_B,    KC_N,    KC_M,    KC_COMM,    KC_DOT,    KC_SLSH,    KC_RSFT,    KC_LGUI, 
                    KC_LCTL,                     KC_LALT, KC_SPC, LT(_FN, KC_SPC),                KC_SPC, KC_RALT,                                              KC_RCTL),
-    [_FN] = LAYOUT_all(
+    [_FN] = LAYOUT_alice_split_bs(
         KC_TRNS,   KC_TRNS,   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_TRNS,    KC_TRNS, 
         KC_TRNS,   KC_TRNS,   KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS,                       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS, 
         RESET,     KC_TRNS,   KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS,                       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS, 
                    KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,                       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,    KC_TRNS, 
                    KC_TRNS,                     KC_TRNS, KC_TRNS, KC_TRNS,                       KC_TRNS, KC_TRNS,                                             KC_TRNS),
-    [_L3] = LAYOUT_all(
+    [_L3] = LAYOUT_alice_split_bs(
         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, 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),
-    [_L4] = LAYOUT_all(
+    [_L4] = LAYOUT_alice_split_bs(
         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, 
diff --git a/qmk/keyboards/sneakbox/aliceclone/rules.mk b/qmk/keyboards/sneakbox/aliceclone/rules.mk
index fb12719c..24bce999 100644
--- a/qmk/keyboards/sneakbox/aliceclone/rules.mk
+++ b/qmk/keyboards/sneakbox/aliceclone/rules.mk
@@ -21,3 +21,5 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 BLUETOOTH_ENABLE = no       # Enable Bluetooth
 AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes
+
+LAYOUTS = alice alice_split_bs
diff --git a/qmk/keyboards/spaceman/2_milk/keymaps/encg/config.h b/qmk/keyboards/spaceman/2_milk/keymaps/encg/config.h
new file mode 100644
index 00000000..4d7e1bb5
--- /dev/null
+++ b/qmk/keyboards/spaceman/2_milk/keymaps/encg/config.h
@@ -0,0 +1,20 @@
+/* Copyright 2020 encg
+ *
+ * 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
+
+#define UNICODE_SELECTED_MODES UC_MAC, UC_WINC
+#define UNICODE_CYCLE_PERSIST true
diff --git a/qmk/keyboards/spaceman/2_milk/keymaps/encg/keymap.c b/qmk/keyboards/spaceman/2_milk/keymaps/encg/keymap.c
new file mode 100644
index 00000000..d74f8828
--- /dev/null
+++ b/qmk/keyboards/spaceman/2_milk/keymaps/encg/keymap.c
@@ -0,0 +1,196 @@
+/* Copyright 2020 encg
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+#include <stdio.h> 
+#include <stdlib.h> 
+#include <time.h>
+
+enum my_keycodes {
+    SPIN = SAFE_RANGE,
+    RULES,
+};
+
+enum unicode_names {
+    COW,
+    BTTR,
+    CHIKN,
+    FISH,
+    SEED,
+    RENV,
+    MBAG,
+    FACE,
+    WING,
+    SIGN,
+    WAVE
+};
+
+const uint32_t PROGMEM unicode_map[] = {
+    [COW]   = 0x1F404,  // 🐄
+    [BTTR]  = 0x1F9C8,  // 🧈
+    [CHIKN] = 0x1F414,  // 🐔
+    [FISH]  = 0x1F3A3,  // 🎣
+    [SEED]  = 0x1F331,  // 🌱
+    [RENV]  = 0x1F9E7,  // 🧧
+    [MBAG]  = 0x1F4B0,  // 💰
+    [FACE]  = 0x1F911,  // 🤑
+    [WING]  = 0x1F4B8,  // 💸
+    [SIGN]  = 0x1F4B2,  // 💲
+    [WAVE]  = 0x1F44B,  // 👋
+};
+
+/* Emojis stored in an array in order to be randomly accessed */
+const char* emoji[5] = {"🐄", "🧈", "🐔", "🎣", "🌱"};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case SPIN:
+            if (record->event.pressed) {
+                /* Seed RNG used by rand() with timer_read() https://beta.docs.qmk.fm/developing-qmk/qmk-reference/ref_functions#software-timers */
+                srand(timer_read());
+                int rng1 = rand() % 5; 
+                send_unicode_string(emoji[rng1]);
+                wait_ms(200);    
+                int rng2 = rand() % 5;
+                send_unicode_string(emoji[rng2]);
+                wait_ms(200);
+                int rng3 = rand() % 5;
+                send_unicode_string(emoji[rng3]);
+                wait_ms(200);
+                    if (rng1 == rng2 && rng1 == rng3) {
+                        if (rng1 == 0) {
+                            wait_ms(200);
+                            SEND_STRING("   ");
+                            send_unicode_string("🧧🧧🧧");
+                            wait_ms(200);
+                            SEND_STRING("\n");
+                          } else if (rng1 == 1) {
+                            wait_ms(200);
+                            SEND_STRING("   ");
+                            send_unicode_string("💰💰💰");
+                            wait_ms(200);
+                            SEND_STRING("\n");
+                          } else if (rng1 == 2) {
+                            wait_ms(200);
+                            SEND_STRING("   ");
+                            send_unicode_string("🤑🤑🤑");
+                            wait_ms(200);
+                            SEND_STRING("\n");
+                          } else if (rng1 == 3) {
+                            wait_ms(200);
+                            SEND_STRING("   ");
+                            send_unicode_string("💲💲💲");
+                            wait_ms(200);
+                            SEND_STRING("\n");
+                          } else if (rng1 == 4) {
+                            wait_ms(200);
+                            SEND_STRING("   ");
+                            send_unicode_string("📈📈📈");
+                            wait_ms(200);
+                            SEND_STRING("\n");
+                        }
+                    } else {
+                          SEND_STRING("   ");
+                          send_unicode_string("👋💸");
+                          SEND_STRING("\n");
+                    }
+      }
+            return false;
+            break;
+        case RULES:
+            if (record->event.pressed) {
+                send_unicode_string("🐄");
+                wait_ms(200);
+                send_unicode_string("🐄");
+                wait_ms(200);
+                send_unicode_string("🐄");
+                wait_ms(200);
+                SEND_STRING("   ");
+                send_unicode_string("🧧");
+                wait_ms(200);
+                send_unicode_string("🧧");
+                wait_ms(200);
+                send_unicode_string("🧧");
+                SEND_STRING("\n");
+                wait_ms(100);
+                send_unicode_string("🧈");
+                wait_ms(200);
+                send_unicode_string("🧈");
+                wait_ms(200);
+                send_unicode_string("🧈");
+                wait_ms(200);
+                SEND_STRING("   ");
+                send_unicode_string("💰");
+                wait_ms(200);
+                send_unicode_string("💰");
+                wait_ms(200);
+                send_unicode_string("💰");
+                SEND_STRING("\n");
+                wait_ms(100);
+                send_unicode_string("🐔");
+                wait_ms(200);
+                send_unicode_string("🐔");
+                wait_ms(200);
+                send_unicode_string("🐔");
+                wait_ms(200);
+                SEND_STRING("   ");
+                send_unicode_string("🤑");
+                wait_ms(200);
+                send_unicode_string("🤑");
+                wait_ms(200);
+                send_unicode_string("🤑");
+                SEND_STRING("\n");
+                wait_ms(100);
+                send_unicode_string("🎣");
+                wait_ms(200);
+                send_unicode_string("🎣");
+                wait_ms(200);
+                send_unicode_string("🎣");
+                wait_ms(200);
+                SEND_STRING("   ");
+                send_unicode_string("💲");
+                wait_ms(200);
+                send_unicode_string("💲");
+                wait_ms(200);
+                send_unicode_string("💲");
+                SEND_STRING("\n");
+                wait_ms(100);
+                send_unicode_string("🌱");
+                wait_ms(200);
+                send_unicode_string("🌱");
+                wait_ms(200);
+                send_unicode_string("🌱");
+                wait_ms(200);
+                SEND_STRING("   ");
+                send_unicode_string("📈");
+                wait_ms(200);
+                send_unicode_string("📈");
+                wait_ms(200);
+                send_unicode_string("📈");
+                SEND_STRING("\n\n");
+            }
+            return false;
+            break;    
+            }
+    return false;
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [0] = LAYOUT(
+        SPIN, /* bottom button */
+        RULES /* top button */
+    )
+};
diff --git a/qmk/keyboards/spaceman/2_milk/keymaps/encg/readme.md b/qmk/keyboards/spaceman/2_milk/keymaps/encg/readme.md
new file mode 100644
index 00000000..f1f9cd6c
--- /dev/null
+++ b/qmk/keyboards/spaceman/2_milk/keymaps/encg/readme.md
@@ -0,0 +1,26 @@
+# encg's Keymap
+
+## What is this?
+
+A simple slot machine emulator for the [2% Milk Keyboard](https://github.com/Spaceman/SpaceboardsHardware/tree/master/Keyboards/2%25%20Milk). This idea is based on the [implementation by /u/ln8r on /r/mechanicalkeyboards](https://www.reddit.com/r/MechanicalKeyboards/comments/hcw21b/2_milk_slot_machine/).
+
+## How does it work?
+
+The top button outputs all possible winning emoji combinations followed by a corresponding "score." Emojis are output one-by-one with a short delay to simulate the "slots" feel.
+
+![IMG](https://i.imgur.com/rUc3IOn.gif)
+
+The bottom button outputs 3 random emojis one by one. The random function takes `timer_read()` as its seed value [(referenced here)](https://beta.docs.qmk.fm/developing-qmk/qmk-reference/ref_functions#software-timers).
+
+![IMG](https://i.imgur.com/4EREsIq.png)
+
+## Unicode Setup
+
+This keymap's default unicode input mode is `UC_WINC` which requires [WinCompose](https://github.com/samhocevar/wincompose). For other OSes, see [QMK documentation on unicode input modes](https://docs.qmk.fm/#/feature_unicode?id=input-modes).
+
+## Ideas for the future
+
+- [ ] Factor in emoji hierarchy into RNG algorithm
+- [ ] Random/Wildcard emoji
+- [ ] Keep a count for winng combinations
+- [ ] Implement tap dance for easily switching unicode input types
diff --git a/qmk/keyboards/spaceman/2_milk/keymaps/encg/rules.mk b/qmk/keyboards/spaceman/2_milk/keymaps/encg/rules.mk
new file mode 100644
index 00000000..502b2def
--- /dev/null
+++ b/qmk/keyboards/spaceman/2_milk/keymaps/encg/rules.mk
@@ -0,0 +1 @@
+UNICODEMAP_ENABLE = yes
diff --git a/qmk/keyboards/spacetime/config.h b/qmk/keyboards/spacetime/config.h
index 26eb8dd2..75053ab1 100644
--- a/qmk/keyboards/spacetime/config.h
+++ b/qmk/keyboards/spacetime/config.h
@@ -212,34 +212,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/spacetime/rules.mk b/qmk/keyboards/spacetime/rules.mk
index 7dd77619..e2158fb1 100644
--- a/qmk/keyboards/spacetime/rules.mk
+++ b/qmk/keyboards/spacetime/rules.mk
@@ -30,7 +30,6 @@ 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
 OLED_DRIVER_ENABLE = no
 
 # Enable generic behavior for split boards
diff --git a/qmk/keyboards/splitreus62/rules.mk b/qmk/keyboards/splitreus62/rules.mk
index ad3095be..1549a10c 100644
--- a/qmk/keyboards/splitreus62/rules.mk
+++ b/qmk/keyboards/splitreus62/rules.mk
@@ -29,7 +29,6 @@ MIDI_ENABLE = no            # MIDI controls
 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
 UNICODE_ENABLE = no         # Unicode
 
 SPLIT_KEYBOARD = yes
diff --git a/qmk/keyboards/standaside/config.h b/qmk/keyboards/standaside/config.h
index 92c6b28b..d00d8dd0 100644
--- a/qmk/keyboards/standaside/config.h
+++ b/qmk/keyboards/standaside/config.h
@@ -174,30 +174,3 @@
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
diff --git a/qmk/keyboards/standaside/rules.mk b/qmk/keyboards/standaside/rules.mk
index 29608172..59ce4d7e 100644
--- a/qmk/keyboards/standaside/rules.mk
+++ b/qmk/keyboards/standaside/rules.mk
@@ -29,5 +29,4 @@ 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
 RGBLIGHT_ENABLE = yes       # Enable RGB underlighting support
diff --git a/qmk/keyboards/staryu/rules.mk b/qmk/keyboards/staryu/rules.mk
index c9703880..6032c5de 100644
--- a/qmk/keyboards/staryu/rules.mk
+++ b/qmk/keyboards/staryu/rules.mk
@@ -30,4 +30,3 @@ 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
diff --git a/qmk/keyboards/suihankey/alpha/config.h b/qmk/keyboards/suihankey/alpha/config.h
index f7f4aee1..37dca925 100644
--- a/qmk/keyboards/suihankey/alpha/config.h
+++ b/qmk/keyboards/suihankey/alpha/config.h
@@ -213,34 +213,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/suihankey/rev1/config.h b/qmk/keyboards/suihankey/rev1/config.h
index 4e145512..1bf8e930 100644
--- a/qmk/keyboards/suihankey/rev1/config.h
+++ b/qmk/keyboards/suihankey/rev1/config.h
@@ -213,34 +213,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/suihankey/rules.mk b/qmk/keyboards/suihankey/rules.mk
index e3b91d3d..593ff2d3 100644
--- a/qmk/keyboards/suihankey/rules.mk
+++ b/qmk/keyboards/suihankey/rules.mk
@@ -30,7 +30,6 @@ 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
 OLED_DRIVER_ENABLE = yes
 SPLIT_KEYBOARD = no
 
diff --git a/qmk/keyboards/suihankey/split/alpha/config.h b/qmk/keyboards/suihankey/split/alpha/config.h
index ed3d971b..1028fbdf 100644
--- a/qmk/keyboards/suihankey/split/alpha/config.h
+++ b/qmk/keyboards/suihankey/split/alpha/config.h
@@ -213,34 +213,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/suihankey/split/rev1/config.h b/qmk/keyboards/suihankey/split/rev1/config.h
index 04ed0ba5..6c28ec3e 100644
--- a/qmk/keyboards/suihankey/split/rev1/config.h
+++ b/qmk/keyboards/suihankey/split/rev1/config.h
@@ -213,34 +213,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/switchplate/southpaw_65/config.h b/qmk/keyboards/switchplate/southpaw_65/config.h
index 58df7657..5bb42442 100644
--- a/qmk/keyboards/switchplate/southpaw_65/config.h
+++ b/qmk/keyboards/switchplate/southpaw_65/config.h
@@ -206,34 +206,6 @@
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/switchplate/southpaw_65/rules.mk b/qmk/keyboards/switchplate/southpaw_65/rules.mk
index 3ede910c..e9818c59 100644
--- a/qmk/keyboards/switchplate/southpaw_65/rules.mk
+++ b/qmk/keyboards/switchplate/southpaw_65/rules.mk
@@ -30,7 +30,6 @@ 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
 LTO_ENABLE = yes
 
 # custom matrix setup
diff --git a/qmk/keyboards/switchplate/southpaw_fullsize/rules.mk b/qmk/keyboards/switchplate/southpaw_fullsize/rules.mk
index 46d62bf5..021099d6 100644
--- a/qmk/keyboards/switchplate/southpaw_fullsize/rules.mk
+++ b/qmk/keyboards/switchplate/southpaw_fullsize/rules.mk
@@ -29,4 +29,3 @@ MIDI_ENABLE = no            # MIDI support
 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
diff --git a/qmk/keyboards/tada68/config.h b/qmk/keyboards/tada68/config.h
index 41618e9d..8c36a78b 100644
--- a/qmk/keyboards/tada68/config.h
+++ b/qmk/keyboards/tada68/config.h
@@ -51,6 +51,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Locking resynchronize hack */
 #define LOCKING_RESYNC_ENABLE
 
+#define LED_CAPS_LOCK_PIN B2
+#define LED_PIN_ON_STATE 0
+
 /* Backlight configuration */
 #define BACKLIGHT_PIN B6
 #define BACKLIGHT_BREATHING
diff --git a/qmk/keyboards/tada68/keymaps/rupa/config.h b/qmk/keyboards/tada68/keymaps/rupa/config.h
index ddbf0ab6..e1a6eb1a 100644
--- a/qmk/keyboards/tada68/keymaps/rupa/config.h
+++ b/qmk/keyboards/tada68/keymaps/rupa/config.h
@@ -1,10 +1,3 @@
 #pragma once
 
 #define GRAVE_ESC_ALT_OVERRIDE
-
-/* disable features */
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
diff --git a/qmk/keyboards/tada68/keymaps/rupa/keymap.c b/qmk/keyboards/tada68/keymaps/rupa/keymap.c
index 3a8a5505..ce95673a 100644
--- a/qmk/keyboards/tada68/keymaps/rupa/keymap.c
+++ b/qmk/keyboards/tada68/keymaps/rupa/keymap.c
@@ -1,45 +1,38 @@
 #include "rupa.h"
 
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Keymap _QWERTY: (Base Layer) Default Layer
-     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
-     * │Esc│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│~ `│
-     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
-     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │  \  │Del│
-     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
-     * │  Fn  │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │  Enter │PgU│
-     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
-     * │ Shift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Shift│ ↑ │PgD│
-     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
-     * │Ctrl│Alt │Gui │        Space           │Fn │Alt│Ctl│ ← │ ↓ │ → │
-     * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
-     */
-    [_QWERTY] = LAYOUT_65_ansi(
-        KC_GESC, 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_GRV,
-        KC_TAB,  KC_Q,    KC_W,    KC_E,  KC_R,  KC_T,  KC_Y,    KC_U,  KC_I,  KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
-        RAISE,   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_PGUP,
-        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_PGDN,
-        KC_LCTL, KC_LALT, KC_LGUI,                      KC_SPC,                RAISE,   KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
-    ),
+#define LAYOUT_65_ansi_wrapper(...) LAYOUT_65_ansi(__VA_ARGS__)
 
-    /* Keymap _RAISE: Function Layer
-     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
-     * │LOD│F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│  Del  │Hme│
-     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
-     * │     │VSN│U_s│U_f│U_m│   │   │uni│   │ ॐ │   │♩ ♪│♫ ♬│★  ☆ │Ins│
-     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
-     * │      │   │   │   │   │   │   │   │   │   │   │   │    ✓   │End│
-     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
-     * │ RShift │ ⸮ │Rup│Brt│Bls│Blt│   │Mut│V- │V+ │‽ ☭│   McL│M↑ │McR│
-     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
-     * │RCtl│RAlt│RGui│                        │   │   │CAP│M← │M↓ │M→ │
-     * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
-     */
-    [_RAISE] = LAYOUT_65_ansi(
-        LOD,     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_DEL,       KC_HOME,
-        _______, VRSN,    U_SCRPT, U_FRACT, U_MONOS, _______, _______, UC_MOD,  _______, X(OM),   _______, XP(M4,M8),    XP(M8B,M16), XP(STB, STW), KC_INS,
-        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   X(CHEK),      KC_END,
-        OS_RSFT,          X(IRNY), RUPA,    BL_BRTG, BL_STEP, BL_TOGG, _______, KC_MUTE, KC_VOLD, KC_VOLU, XP(IBNG,HAS), KC_BTN1,     KC_MS_U,      KC_BTN2,
-        OS_RCTL, OS_RALT, OS_RGUI,                            _______,                   _______, _______, KC_CAPS,      KC_MS_L,     KC_MS_D,      KC_MS_R
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_QWERTY] = LAYOUT_65_ansi_wrapper(
+        ____65_QWERTY______________ROW1,
+        ____65_QWERTY______________ROW2,
+        ____65_QWERTY______________ROW3,
+        ____65_QWERTY______________ROW4,
+        ____65_QWERTY______________ROW5
+    ),
+    [_RAISE] = LAYOUT_65_ansi_wrapper(
+        ____65_RAISE_______________ROW1,
+        ____65_RAISE_______________ROW2,
+        ____65_RAISE_______________ROW3,
+        ____65_RAISE_______________ROW4,
+        ____65_RAISE_______________ROW5
+    ),
+    [_LOWER] = LAYOUT_65_ansi_wrapper(
+        ____65_LOWER_______________ROW1,
+        ____65_LOWER_______________ROW2,
+        ____65_LOWER_______________ROW3,
+        ____65_LOWER_______________ROW4,
+        ____65_LOWER_______________ROW5
+    ),
+    [_ADJUST] = LAYOUT_65_ansi_wrapper(
+        ____65_ADJUST______________ROW1,
+        ____65_ADJUST___________BL_ROW2,
+        ____65_ADJUST______________ROW3,
+        ____65_ADJUST______________ROW4,
+        ____65_ADJUST______________ROW5
     ),
 };
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+    return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
+}
diff --git a/qmk/keyboards/tada68/keymaps/rupa/readme.md b/qmk/keyboards/tada68/keymaps/rupa/readme.md
index 77629131..eea966fd 100644
--- a/qmk/keyboards/tada68/keymaps/rupa/readme.md
+++ b/qmk/keyboards/tada68/keymaps/rupa/readme.md
@@ -2,9 +2,7 @@
 
 i've swapped the lufa-ms bootloader for caterina
 
-most everything is in my userspace dir
-
-console mode is on, and there's barely any room left!
+most everything is in my [userspace](../../../../users/rupa/)
 
 * win/alt -> alt/cmd
 * alt/fn -> fn/alt
@@ -16,6 +14,6 @@ fn layer:
   * rotate mute/vol
   * backlight -> breathing, step, toggle
   * swap home and ins
-  * unicode chars sprinkled around
-  * script mode!
+  * unicode chars and strings sprinkled around
+  * script modes!
   * (one-shot) right versions of shift/ctl/alt/gui (not working quite right yet)
diff --git a/qmk/keyboards/tada68/keymaps/rupa/rules.mk b/qmk/keyboards/tada68/keymaps/rupa/rules.mk
index df6f5674..1777fc10 100644
--- a/qmk/keyboards/tada68/keymaps/rupa/rules.mk
+++ b/qmk/keyboards/tada68/keymaps/rupa/rules.mk
@@ -1,4 +1,3 @@
 BOOTLOADER = caterina
 
-UNICODEMAP_ENABLE = yes
 CONSOLE_ENABLE = yes
diff --git a/qmk/keyboards/tada68/rules.mk b/qmk/keyboards/tada68/rules.mk
index 18b4cdf7..f0c66680 100644
--- a/qmk/keyboards/tada68/rules.mk
+++ b/qmk/keyboards/tada68/rules.mk
@@ -29,7 +29,6 @@ MIDI_ENABLE = no            # MIDI support
 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
 UNICODE_ENABLE = no         # Unicode
 
 LAYOUTS = 65_ansi 65_iso
diff --git a/qmk/keyboards/tada68/tada68.c b/qmk/keyboards/tada68/tada68.c
index e4fab981..34534de7 100644
--- a/qmk/keyboards/tada68/tada68.c
+++ b/qmk/keyboards/tada68/tada68.c
@@ -1,31 +1 @@
 #include "tada68.h"
-#include "led.h"
-
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-	matrix_init_user();
-	led_init_ports();
-};
-
-void matrix_scan_kb(void) {
-	// put your looping keyboard code here
-	// runs every cycle (a lot)
-	matrix_scan_user();
-};
-
-void led_init_ports(void) {
-    // * Set our LED pins as output
-    DDRB |= (1<<2);
-}
-
-void led_set_kb(uint8_t usb_led) {
-	if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
-        // Turn capslock on
-        PORTB &= ~(1<<2);
-    } else {
-        // Turn capslock off
-        PORTB |= (1<<2);
-    }
-	led_set_user(usb_led);
-}
diff --git a/qmk/keyboards/taleguers/taleguers75/config.h b/qmk/keyboards/taleguers/taleguers75/config.h
new file mode 100644
index 00000000..32fc1e99
--- /dev/null
+++ b/qmk/keyboards/taleguers/taleguers75/config.h
@@ -0,0 +1,68 @@
+/* Copyright 2020 Borja Lopez Jimenez
+ *
+ * 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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x8476
+#define PRODUCT_ID      0x0075
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Taleguers
+#define PRODUCT         Taleguers75
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 14
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { B0, F6, F5, F4, F1, F0 }
+#define MATRIX_COL_PINS { B3, B2, B1, E6, B7, C7, C6, D4, D6, D7, B4, D0, D1, F7 }
+#define UNUSED_PINS
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+#define ENCODERS_PAD_A { B6 }
+#define ENCODERS_PAD_B { B5 }
+
+/* number of backlight levels */
+
+#ifdef BACKLIGHT_PIN
+#define BACKLIGHT_LEVELS 3
+#endif
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+
+#define RGB_DI_PIN D3
+#ifdef RGB_DI_PIN
+#define RGBLIGHT_ANIMATIONS
+#define RGBLED_NUM 6
+#define RGBLIGHT_LED_MAP { 5, 4, 3, 2, 1, 0 }
+#define RGBLIGHT_HUE_STEP 8
+#define RGBLIGHT_SAT_STEP 8
+#define RGBLIGHT_VAL_STEP 8
+#define RGBLIGHT_SLEEP
+#endif
diff --git a/qmk/keyboards/taleguers/taleguers75/info.json b/qmk/keyboards/taleguers/taleguers75/info.json
new file mode 100644
index 00000000..634a96b6
--- /dev/null
+++ b/qmk/keyboards/taleguers/taleguers75/info.json
@@ -0,0 +1,427 @@
+{
+    "keyboard_name": "Taleguers75",
+    "url": "",
+    "maintainer": "borlopjim",
+    "width": 16.5,
+    "height": 6.5,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [{
+                    "label": "Esc",
+                    "x": 0,
+                    "y": 0
+                },
+                {
+                    "label": "F1",
+                    "x": 1.5,
+                    "y": 0
+                },
+                {
+                    "label": "F2",
+                    "x": 2.5,
+                    "y": 0
+                },
+                {
+                    "label": "F3",
+                    "x": 3.5,
+                    "y": 0
+                },
+                {
+                    "label": "F4",
+                    "x": 4.5,
+                    "y": 0
+                },
+                {
+                    "label": "F5",
+                    "x": 5.75,
+                    "y": 0
+                },
+                {
+                    "label": "F6",
+                    "x": 6.75,
+                    "y": 0
+                },
+                {
+                    "label": "F7",
+                    "x": 7.75,
+                    "y": 0
+                },
+                {
+                    "label": "F8",
+                    "x": 8.75,
+                    "y": 0
+                },
+                {
+                    "label": "F9",
+                    "x": 10,
+                    "y": 0
+                },
+                {
+                    "label": "F10",
+                    "x": 11,
+                    "y": 0
+                },
+                {
+                    "label": "F11",
+                    "x": 12,
+                    "y": 0
+                },
+                {
+                    "label": "F12",
+                    "x": 13,
+                    "y": 0
+                },
+                {
+                    "label": "Del",
+                    "x": 15.5,
+                    "y": 2.25
+                },
+                {
+                    "label": "~",
+                    "x": 0,
+                    "y": 1.25
+                },
+                {
+                    "label": "!",
+                    "x": 1,
+                    "y": 1.25
+                },
+                {
+                    "label": "@",
+                    "x": 2,
+                    "y": 1.25
+                },
+                {
+                    "label": "#",
+                    "x": 3,
+                    "y": 1.25
+                },
+                {
+                    "label": "$",
+                    "x": 4,
+                    "y": 1.25
+                },
+                {
+                    "label": "%",
+                    "x": 5,
+                    "y": 1.25
+                },
+                {
+                    "label": "^",
+                    "x": 6,
+                    "y": 1.25
+                },
+                {
+                    "label": "*",
+                    "x": 7,
+                    "y": 1.25
+                },
+                {
+                    "label": "*",
+                    "x": 8,
+                    "y": 1.25
+                },
+                {
+                    "label": "(",
+                    "x": 9,
+                    "y": 1.25
+                },
+                {
+                    "label": ")",
+                    "x": 10,
+                    "y": 1.25
+                },
+                {
+                    "label": "_",
+                    "x": 11,
+                    "y": 1.25
+                },
+                {
+                    "label": "+",
+                    "x": 12,
+                    "y": 1.25
+                },
+                {
+                    "label": "Backspace",
+                    "x": 13,
+                    "y": 1.25,
+                    "w": 2
+                },
+                {
+                    "label": "Tab",
+                    "x": 0,
+                    "y": 2.25,
+                    "w": 1.5
+                },
+                {
+                    "label": "Q",
+                    "x": 1.5,
+                    "y": 2.25
+                },
+                {
+                    "label": "W",
+                    "x": 2.5,
+                    "y": 2.25
+                },
+                {
+                    "label": "E",
+                    "x": 3.5,
+                    "y": 2.25
+                },
+                {
+                    "label": "R",
+                    "x": 4.5,
+                    "y": 2.25
+                },
+                {
+                    "label": "T",
+                    "x": 5.5,
+                    "y": 2.25
+                },
+                {
+                    "label": "Y",
+                    "x": 6.5,
+                    "y": 2.25
+                },
+                {
+                    "label": "U",
+                    "x": 7.5,
+                    "y": 2.25
+                },
+                {
+                    "label": "I",
+                    "x": 8.5,
+                    "y": 2.25
+                },
+                {
+                    "label": "O",
+                    "x": 9.5,
+                    "y": 2.25
+                },
+                {
+                    "label": "P",
+                    "x": 10.5,
+                    "y": 2.25
+                },
+                {
+                    "label": "{",
+                    "x": 11.5,
+                    "y": 2.25
+                },
+                {
+                    "label": "}",
+                    "x": 12.5,
+                    "y": 2.25
+                },
+                {
+                    "label": "|",
+                    "x": 13.5,
+                    "y": 2.25,
+                    "w": 1.5
+                },
+                {
+                    "label": "Caps Lock",
+                    "x": 0,
+                    "y": 3.25,
+                    "w": 1.75
+                },
+                {
+                    "label": "A",
+                    "x": 1.75,
+                    "y": 3.25
+                },
+                {
+                    "label": "S",
+                    "x": 2.75,
+                    "y": 3.25
+                },
+                {
+                    "label": "D",
+                    "x": 3.75,
+                    "y": 3.25
+                },
+                {
+                    "label": "F",
+                    "x": 4.75,
+                    "y": 3.25
+                },
+                {
+                    "label": "G",
+                    "x": 5.75,
+                    "y": 3.25
+                },
+                {
+                    "label": "H",
+                    "x": 6.75,
+                    "y": 3.25
+                },
+                {
+                    "label": "J",
+                    "x": 7.75,
+                    "y": 3.25
+                },
+                {
+                    "label": "K",
+                    "x": 8.75,
+                    "y": 3.25
+                },
+                {
+                    "label": "L",
+                    "x": 9.75,
+                    "y": 3.25
+                },
+                {
+                    "label": ":",
+                    "x": 10.75,
+                    "y": 3.25
+                },
+                {
+                    "label": "\"",
+                    "x": 11.75,
+                    "y": 3.25
+                },
+                {
+                    "label": "Enter",
+                    "x": 12.75,
+                    "y": 3.25,
+                    "w": 2.25
+                },
+                {
+                    "label": "Pg Up",
+                    "x": 15.5,
+                    "y": 3.25
+                },
+                {
+                    "label": "Shift",
+                    "x": 0,
+                    "y": 4.25,
+                    "w": 1.25
+                },
+                {
+                    "label": "Prnt Scr",
+                    "x": 1.25,
+                    "y": 4.25
+                },
+                {
+                    "label": "Z",
+                    "x": 2.25,
+                    "y": 4.25
+                },
+                {
+                    "label": "X",
+                    "x": 3.25,
+                    "y": 4.25
+                },
+                {
+                    "label": "C",
+                    "x": 4.25,
+                    "y": 4.25
+                },
+                {
+                    "label": "V",
+                    "x": 5.25,
+                    "y": 4.25
+                },
+                {
+                    "label": "B",
+                    "x": 6.25,
+                    "y": 4.25
+                },
+                {
+                    "label": "N",
+                    "x": 7.25,
+                    "y": 4.25
+                },
+                {
+                    "label": "M",
+                    "x": 8.25,
+                    "y": 4.25
+                },
+                {
+                    "label": "<",
+                    "x": 9.25,
+                    "y": 4.25
+                },
+                {
+                    "label": ">",
+                    "x": 10.25,
+                    "y": 4.25
+                },
+                {
+                    "label": "?",
+                    "x": 11.25,
+                    "y": 4.25
+                },
+                {
+                    "label": "Shift",
+                    "x": 12.25,
+                    "y": 4.25,
+                    "w": 1.75
+                },
+                {
+                    "label": "Pg Down",
+                    "x": 15.5,
+                    "y": 4.25
+                },
+                {
+                    "label": "Ctrl",
+                    "x": 0,
+                    "y": 5.25,
+                    "w": 1.25
+                },
+                {
+                    "label": "Super",
+                    "x": 1.25,
+                    "y": 5.25,
+                    "w": 1.25
+                },
+                {
+                    "label": "Alt",
+                    "x": 2.5,
+                    "y": 5.25,
+                    "w": 1.25
+                },
+                {
+                    "x": 3.75,
+                    "y": 5.25,
+                    "w": 6.25
+                },
+                {
+                    "label": "Alt Gr",
+                    "x": 10,
+                    "y": 5.25
+                },
+                {
+                    "label": "Fn",
+                    "x": 11,
+                    "y": 5.25
+                },
+                {
+                    "label": "Ctrl",
+                    "x": 12,
+                    "y": 5.25
+                },
+                {
+                    "label": "\u2190",
+                    "x": 13.25,
+                    "y": 5.5
+                },
+                {
+                    "label": "\u2191",
+                    "x": 14.25,
+                    "y": 4.5
+                },
+                {
+                    "label": "\u2193",
+                    "x": 14.25,
+                    "y": 5.5
+                },
+                {
+                    "label": "\u2192",
+                    "x": 15.25,
+                    "y": 5.5
+                }
+            ]
+        }
+    }
+}
\ No newline at end of file
diff --git a/qmk/keyboards/taleguers/taleguers75/keymaps/default/keymap.c b/qmk/keyboards/taleguers/taleguers75/keymaps/default/keymap.c
new file mode 100644
index 00000000..24dc65aa
--- /dev/null
+++ b/qmk/keyboards/taleguers/taleguers75/keymaps/default/keymap.c
@@ -0,0 +1,37 @@
+/* Copyright 2020 Borja Lopez Jimenez
+ *
+ * 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(
+		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_DEL, 
+		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_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_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_PGUP, 
+		KC_LSFT, KC_PSCR, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_PGDN, 
+		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT),
+
+	[1] = LAYOUT(
+		KC_TRNS, RGB_MODE_FORWARD, RGB_MODE_REVERSE, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, 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_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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+};
diff --git a/qmk/keyboards/taleguers/taleguers75/keymaps/via/keymap.c b/qmk/keyboards/taleguers/taleguers75/keymaps/via/keymap.c
new file mode 100644
index 00000000..bc251057
--- /dev/null
+++ b/qmk/keyboards/taleguers/taleguers75/keymaps/via/keymap.c
@@ -0,0 +1,53 @@
+/* Copyright 2020 Borja Lopez Jimenez
+ *
+ * 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(
+		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_DEL, 
+		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_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_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_PGUP, 
+		KC_LSFT, KC_PSCR, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_PGDN, 
+		KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_UP, KC_DOWN, KC_RGHT),
+
+	[1] = LAYOUT(
+		KC_TRNS, RGB_MODE_FORWARD, RGB_MODE_REVERSE, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, 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_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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+	[2] = LAYOUT(
+		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, 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),
+
+	[3] = LAYOUT(
+		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, 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)
+
+};
diff --git a/qmk/keyboards/taleguers/taleguers75/keymaps/via/rules.mk b/qmk/keyboards/taleguers/taleguers75/keymaps/via/rules.mk
new file mode 100644
index 00000000..43061db1
--- /dev/null
+++ b/qmk/keyboards/taleguers/taleguers75/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
\ No newline at end of file
diff --git a/qmk/keyboards/taleguers/taleguers75/readme.md b/qmk/keyboards/taleguers/taleguers75/readme.md
new file mode 100644
index 00000000..c3018dc2
--- /dev/null
+++ b/qmk/keyboards/taleguers/taleguers75/readme.md
@@ -0,0 +1,14 @@
+# Taleguers75
+
+![Taleguers75](https://i.imgur.com/v59FU8M.png)
+
+A 75% with rotatory encoder.
+
+* Keyboard Maintainer: [Borlopjim](https://github.com/borlopjim)
+* Hardware Supported: Taleguers75 PCB
+
+Make example for this keyboard (after setting up your build environment):
+
+    make taleguers/taleguers75: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).
\ No newline at end of file
diff --git a/qmk/keyboards/taleguers/taleguers75/rules.mk b/qmk/keyboards/taleguers/taleguers75/rules.mk
new file mode 100644
index 00000000..928f9ba5
--- /dev/null
+++ b/qmk/keyboards/taleguers/taleguers75/rules.mk
@@ -0,0 +1,23 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+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
+# 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 = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = yes
diff --git a/qmk/keyboards/taleguers/taleguers75/taleguers75.c b/qmk/keyboards/taleguers/taleguers75/taleguers75.c
new file mode 100644
index 00000000..684d54a3
--- /dev/null
+++ b/qmk/keyboards/taleguers/taleguers75/taleguers75.c
@@ -0,0 +1,26 @@
+/* Copyright 2020 Borja Lopez Jimenez
+ *
+ * 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 "taleguers75.h"
+
+
+__attribute__ ((weak)) void encoder_update_user(uint8_t index, bool clockwise) {
+	if (!clockwise) {
+		tap_code(KC_AUDIO_VOL_DOWN);
+	} else {
+		tap_code(KC_AUDIO_VOL_UP);
+	}
+}
diff --git a/qmk/keyboards/taleguers/taleguers75/taleguers75.h b/qmk/keyboards/taleguers/taleguers75/taleguers75.h
new file mode 100644
index 00000000..ccf1300c
--- /dev/null
+++ b/qmk/keyboards/taleguers/taleguers75/taleguers75.h
@@ -0,0 +1,35 @@
+/* Copyright 2020 Borja Lopez Jimenez
+ *
+ * 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( \
+	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, \
+	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, \
+	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, \
+	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, \
+	K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, \
+	K500, K501, K502,       K504,       K506, K507, K508,       K510, K511, K512, K513  \
+) { \
+	{ K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013 }, \
+	{ K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113 }, \
+	{ K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213 }, \
+	{ K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313 }, \
+	{ K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  K412,  K413 }, \
+	{ K500,  K501,  K502,  KC_NO, K504,  KC_NO, K506,  K507,  K508,  KC_NO, K510,  K511,  K512,  K513 }  \
+}
diff --git a/qmk/keyboards/technika/chconf.h b/qmk/keyboards/technika/chconf.h
new file mode 100644
index 00000000..4640ff53
--- /dev/null
+++ b/qmk/keyboards/technika/chconf.h
@@ -0,0 +1,714 @@
+/*
+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+/**
+ * @file    rt/templates/chconf.h
+ * @brief   Configuration file template.
+ * @details A copy of this file must be placed in each project directory, it
+ *          contains the application specific kernel settings.
+ *
+ * @addtogroup config
+ * @details Kernel related settings and hooks.
+ * @{
+ */
+
+#ifndef CHCONF_H
+#define CHCONF_H
+
+#define _CHIBIOS_RT_CONF_
+#define _CHIBIOS_RT_CONF_VER_6_0_
+
+/*===========================================================================*/
+/**
+ * @name System timers settings
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   System time counter resolution.
+ * @note    Allowed values are 16 or 32 bits.
+ */
+#if !defined(CH_CFG_ST_RESOLUTION)
+#define CH_CFG_ST_RESOLUTION                32
+#endif
+
+/**
+ * @brief   System tick frequency.
+ * @details Frequency of the system timer that drives the system ticks. This
+ *          setting also defines the system tick time unit.
+ */
+#if !defined(CH_CFG_ST_FREQUENCY)
+#define CH_CFG_ST_FREQUENCY                 10000
+#endif
+
+/**
+ * @brief   Time intervals data size.
+ * @note    Allowed values are 16, 32 or 64 bits.
+ */
+#if !defined(CH_CFG_INTERVALS_SIZE)
+#define CH_CFG_INTERVALS_SIZE               32
+#endif
+
+/**
+ * @brief   Time types data size.
+ * @note    Allowed values are 16 or 32 bits.
+ */
+#if !defined(CH_CFG_TIME_TYPES_SIZE)
+#define CH_CFG_TIME_TYPES_SIZE              32
+#endif
+
+/**
+ * @brief   Time delta constant for the tick-less mode.
+ * @note    If this value is zero then the system uses the classic
+ *          periodic tick. This value represents the minimum number
+ *          of ticks that is safe to specify in a timeout directive.
+ *          The value one is not valid, timeouts are rounded up to
+ *          this value.
+ */
+#if !defined(CH_CFG_ST_TIMEDELTA)
+#define CH_CFG_ST_TIMEDELTA                 2
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Kernel parameters and options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   Round robin interval.
+ * @details This constant is the number of system ticks allowed for the
+ *          threads before preemption occurs. Setting this value to zero
+ *          disables the preemption for threads with equal priority and the
+ *          round robin becomes cooperative. Note that higher priority
+ *          threads can still preempt, the kernel is always preemptive.
+ * @note    Disabling the round robin preemption makes the kernel more compact
+ *          and generally faster.
+ * @note    The round robin preemption is not supported in tickless mode and
+ *          must be set to zero in that case.
+ */
+#if !defined(CH_CFG_TIME_QUANTUM)
+#define CH_CFG_TIME_QUANTUM                 0
+#endif
+
+/**
+ * @brief   Managed RAM size.
+ * @details Size of the RAM area to be managed by the OS. If set to zero
+ *          then the whole available RAM is used. The core memory is made
+ *          available to the heap allocator and/or can be used directly through
+ *          the simplified core memory allocator.
+ *
+ * @note    In order to let the OS manage the whole RAM the linker script must
+ *          provide the @p __heap_base__ and @p __heap_end__ symbols.
+ * @note    Requires @p CH_CFG_USE_MEMCORE.
+ */
+#if !defined(CH_CFG_MEMCORE_SIZE)
+#define CH_CFG_MEMCORE_SIZE                 0
+#endif
+
+/**
+ * @brief   Idle thread automatic spawn suppression.
+ * @details When this option is activated the function @p chSysInit()
+ *          does not spawn the idle thread. The application @p main()
+ *          function becomes the idle thread and must implement an
+ *          infinite loop.
+ */
+#if !defined(CH_CFG_NO_IDLE_THREAD)
+#define CH_CFG_NO_IDLE_THREAD               FALSE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Performance options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   OS optimization.
+ * @details If enabled then time efficient rather than space efficient code
+ *          is used when two possible implementations exist.
+ *
+ * @note    This is not related to the compiler optimization options.
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_OPTIMIZE_SPEED)
+#define CH_CFG_OPTIMIZE_SPEED               FALSE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Subsystem options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   Time Measurement APIs.
+ * @details If enabled then the time measurement APIs are included in
+ *          the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_TM)
+#define CH_CFG_USE_TM                       FALSE
+#endif
+
+/**
+ * @brief   Threads registry APIs.
+ * @details If enabled then the registry APIs are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_REGISTRY)
+#define CH_CFG_USE_REGISTRY                 TRUE
+#endif
+
+/**
+ * @brief   Threads synchronization APIs.
+ * @details If enabled then the @p chThdWait() function is included in
+ *          the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_WAITEXIT)
+#define CH_CFG_USE_WAITEXIT                 TRUE
+#endif
+
+/**
+ * @brief   Semaphores APIs.
+ * @details If enabled then the Semaphores APIs are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_SEMAPHORES)
+#define CH_CFG_USE_SEMAPHORES               TRUE
+#endif
+
+/**
+ * @brief   Semaphores queuing mode.
+ * @details If enabled then the threads are enqueued on semaphores by
+ *          priority rather than in FIFO order.
+ *
+ * @note    The default is @p FALSE. Enable this if you have special
+ *          requirements.
+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.
+ */
+#if !defined(CH_CFG_USE_SEMAPHORES_PRIORITY)
+#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE
+#endif
+
+/**
+ * @brief   Mutexes APIs.
+ * @details If enabled then the mutexes APIs are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_MUTEXES)
+#define CH_CFG_USE_MUTEXES                  TRUE
+#endif
+
+/**
+ * @brief   Enables recursive behavior on mutexes.
+ * @note    Recursive mutexes are heavier and have an increased
+ *          memory footprint.
+ *
+ * @note    The default is @p FALSE.
+ * @note    Requires @p CH_CFG_USE_MUTEXES.
+ */
+#if !defined(CH_CFG_USE_MUTEXES_RECURSIVE)
+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE
+#endif
+
+/**
+ * @brief   Conditional Variables APIs.
+ * @details If enabled then the conditional variables APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_MUTEXES.
+ */
+#if !defined(CH_CFG_USE_CONDVARS)
+#define CH_CFG_USE_CONDVARS                 TRUE
+#endif
+
+/**
+ * @brief   Conditional Variables APIs with timeout.
+ * @details If enabled then the conditional variables APIs with timeout
+ *          specification are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_CONDVARS.
+ */
+#if !defined(CH_CFG_USE_CONDVARS_TIMEOUT)
+#define CH_CFG_USE_CONDVARS_TIMEOUT         FALSE
+#endif
+
+/**
+ * @brief   Events Flags APIs.
+ * @details If enabled then the event flags APIs are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_EVENTS)
+#define CH_CFG_USE_EVENTS                   TRUE
+#endif
+
+/**
+ * @brief   Events Flags APIs with timeout.
+ * @details If enabled then the events APIs with timeout specification
+ *          are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_EVENTS.
+ */
+#if !defined(CH_CFG_USE_EVENTS_TIMEOUT)
+#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE
+#endif
+
+/**
+ * @brief   Synchronous Messages APIs.
+ * @details If enabled then the synchronous messages APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_MESSAGES)
+#define CH_CFG_USE_MESSAGES                 TRUE
+#endif
+
+/**
+ * @brief   Synchronous Messages queuing mode.
+ * @details If enabled then messages are served by priority rather than in
+ *          FIFO order.
+ *
+ * @note    The default is @p FALSE. Enable this if you have special
+ *          requirements.
+ * @note    Requires @p CH_CFG_USE_MESSAGES.
+ */
+#if !defined(CH_CFG_USE_MESSAGES_PRIORITY)
+#define CH_CFG_USE_MESSAGES_PRIORITY        FALSE
+#endif
+
+/**
+ * @brief   Mailboxes APIs.
+ * @details If enabled then the asynchronous messages (mailboxes) APIs are
+ *          included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.
+ */
+#if !defined(CH_CFG_USE_MAILBOXES)
+#define CH_CFG_USE_MAILBOXES                TRUE
+#endif
+
+/**
+ * @brief   Core Memory Manager APIs.
+ * @details If enabled then the core memory manager APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_MEMCORE)
+#define CH_CFG_USE_MEMCORE                  FALSE
+#endif
+
+/**
+ * @brief   Heap Allocator APIs.
+ * @details If enabled then the memory heap allocator APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_MEMCORE and either @p CH_CFG_USE_MUTEXES or
+ *          @p CH_CFG_USE_SEMAPHORES.
+ * @note    Mutexes are recommended.
+ */
+#if !defined(CH_CFG_USE_HEAP)
+#define CH_CFG_USE_HEAP                     FALSE
+#endif
+
+/**
+ * @brief   Memory Pools Allocator APIs.
+ * @details If enabled then the memory pools allocator APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_MEMPOOLS)
+#define CH_CFG_USE_MEMPOOLS                 FALSE
+#endif
+
+/**
+ * @brief   Objects FIFOs APIs.
+ * @details If enabled then the objects FIFOs APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_OBJ_FIFOS)
+#define CH_CFG_USE_OBJ_FIFOS                FALSE
+#endif
+
+/**
+ * @brief   Pipes APIs.
+ * @details If enabled then the pipes APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_PIPES)
+#define CH_CFG_USE_PIPES                    FALSE
+#endif
+
+/**
+ * @brief   Dynamic Threads APIs.
+ * @details If enabled then the dynamic threads creation APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_WAITEXIT.
+ * @note    Requires @p CH_CFG_USE_HEAP and/or @p CH_CFG_USE_MEMPOOLS.
+ */
+#if !defined(CH_CFG_USE_DYNAMIC)
+#define CH_CFG_USE_DYNAMIC                  FALSE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Objects factory options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   Objects Factory APIs.
+ * @details If enabled then the objects factory APIs are included in the
+ *          kernel.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_CFG_USE_FACTORY)
+#define CH_CFG_USE_FACTORY                  FALSE
+#endif
+
+/**
+ * @brief   Maximum length for object names.
+ * @details If the specified length is zero then the name is stored by
+ *          pointer but this could have unintended side effects.
+ */
+#if !defined(CH_CFG_FACTORY_MAX_NAMES_LENGTH)
+#define CH_CFG_FACTORY_MAX_NAMES_LENGTH     8
+#endif
+
+/**
+ * @brief   Enables the registry of generic objects.
+ */
+#if !defined(CH_CFG_FACTORY_OBJECTS_REGISTRY)
+#define CH_CFG_FACTORY_OBJECTS_REGISTRY     FALSE
+#endif
+
+/**
+ * @brief   Enables factory for generic buffers.
+ */
+#if !defined(CH_CFG_FACTORY_GENERIC_BUFFERS)
+#define CH_CFG_FACTORY_GENERIC_BUFFERS      FALSE
+#endif
+
+/**
+ * @brief   Enables factory for semaphores.
+ */
+#if !defined(CH_CFG_FACTORY_SEMAPHORES)
+#define CH_CFG_FACTORY_SEMAPHORES           FALSE
+#endif
+
+/**
+ * @brief   Enables factory for mailboxes.
+ */
+#if !defined(CH_CFG_FACTORY_MAILBOXES)
+#define CH_CFG_FACTORY_MAILBOXES            FALSE
+#endif
+
+/**
+ * @brief   Enables factory for objects FIFOs.
+ */
+#if !defined(CH_CFG_FACTORY_OBJ_FIFOS)
+#define CH_CFG_FACTORY_OBJ_FIFOS            FALSE
+#endif
+
+/**
+ * @brief   Enables factory for Pipes.
+ */
+#if !defined(CH_CFG_FACTORY_PIPES) || defined(__DOXYGEN__)
+#define CH_CFG_FACTORY_PIPES                FALSE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Debug options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   Debug option, kernel statistics.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_STATISTICS)
+#define CH_DBG_STATISTICS                   FALSE
+#endif
+
+/**
+ * @brief   Debug option, system state check.
+ * @details If enabled the correct call protocol for system APIs is checked
+ *          at runtime.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_SYSTEM_STATE_CHECK)
+#define CH_DBG_SYSTEM_STATE_CHECK           FALSE
+#endif
+
+/**
+ * @brief   Debug option, parameters checks.
+ * @details If enabled then the checks on the API functions input
+ *          parameters are activated.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_ENABLE_CHECKS)
+#define CH_DBG_ENABLE_CHECKS                FALSE
+#endif
+
+/**
+ * @brief   Debug option, consistency checks.
+ * @details If enabled then all the assertions in the kernel code are
+ *          activated. This includes consistency checks inside the kernel,
+ *          runtime anomalies and port-defined checks.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_ENABLE_ASSERTS)
+#define CH_DBG_ENABLE_ASSERTS               FALSE
+#endif
+
+/**
+ * @brief   Debug option, trace buffer.
+ * @details If enabled then the trace buffer is activated.
+ *
+ * @note    The default is @p CH_DBG_TRACE_MASK_DISABLED.
+ */
+#if !defined(CH_DBG_TRACE_MASK)
+#define CH_DBG_TRACE_MASK                   CH_DBG_TRACE_MASK_DISABLED
+#endif
+
+/**
+ * @brief   Trace buffer entries.
+ * @note    The trace buffer is only allocated if @p CH_DBG_TRACE_MASK is
+ *          different from @p CH_DBG_TRACE_MASK_DISABLED.
+ */
+#if !defined(CH_DBG_TRACE_BUFFER_SIZE)
+#define CH_DBG_TRACE_BUFFER_SIZE            128
+#endif
+
+/**
+ * @brief   Debug option, stack checks.
+ * @details If enabled then a runtime stack check is performed.
+ *
+ * @note    The default is @p FALSE.
+ * @note    The stack check is performed in a architecture/port dependent way.
+ *          It may not be implemented or some ports.
+ * @note    The default failure mode is to halt the system with the global
+ *          @p panic_msg variable set to @p NULL.
+ */
+#if !defined(CH_DBG_ENABLE_STACK_CHECK)
+#define CH_DBG_ENABLE_STACK_CHECK           FALSE
+#endif
+
+/**
+ * @brief   Debug option, stacks initialization.
+ * @details If enabled then the threads working area is filled with a byte
+ *          value when a thread is created. This can be useful for the
+ *          runtime measurement of the used stack.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_FILL_THREADS)
+#define CH_DBG_FILL_THREADS                 FALSE
+#endif
+
+/**
+ * @brief   Debug option, threads profiling.
+ * @details If enabled then a field is added to the @p thread_t structure that
+ *          counts the system ticks occurred while executing the thread.
+ *
+ * @note    The default is @p FALSE.
+ * @note    This debug option is not currently compatible with the
+ *          tickless mode.
+ */
+#if !defined(CH_DBG_THREADS_PROFILING)
+#define CH_DBG_THREADS_PROFILING            FALSE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Kernel hooks
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   System structure extension.
+ * @details User fields added to the end of the @p ch_system_t structure.
+ */
+#define CH_CFG_SYSTEM_EXTRA_FIELDS                                          \
+  /* Add threads custom fields here.*/
+
+/**
+ * @brief   System initialization hook.
+ * @details User initialization code added to the @p chSysInit() function
+ *          just before interrupts are enabled globally.
+ */
+#define CH_CFG_SYSTEM_INIT_HOOK() {                                         \
+  /* Add threads initialization code here.*/                                \
+}
+
+/**
+ * @brief   Threads descriptor structure extension.
+ * @details User fields added to the end of the @p thread_t structure.
+ */
+#define CH_CFG_THREAD_EXTRA_FIELDS                                          \
+  /* Add threads custom fields here.*/
+
+/**
+ * @brief   Threads initialization hook.
+ * @details User initialization code added to the @p _thread_init() function.
+ *
+ * @note    It is invoked from within @p _thread_init() and implicitly from all
+ *          the threads creation APIs.
+ */
+#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \
+  /* Add threads initialization code here.*/                                \
+}
+
+/**
+ * @brief   Threads finalization hook.
+ * @details User finalization code added to the @p chThdExit() API.
+ */
+#define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \
+  /* Add threads finalization code here.*/                                  \
+}
+
+/**
+ * @brief   Context switch hook.
+ * @details This hook is invoked just before switching between threads.
+ */
+#define CH_CFG_CONTEXT_SWITCH_HOOK(ntp, otp) {                              \
+  /* Context switch code here.*/                                            \
+}
+
+/**
+ * @brief   ISR enter hook.
+ */
+#define CH_CFG_IRQ_PROLOGUE_HOOK() {                                        \
+  /* IRQ prologue code here.*/                                              \
+}
+
+/**
+ * @brief   ISR exit hook.
+ */
+#define CH_CFG_IRQ_EPILOGUE_HOOK() {                                        \
+  /* IRQ epilogue code here.*/                                              \
+}
+
+/**
+ * @brief   Idle thread enter hook.
+ * @note    This hook is invoked within a critical zone, no OS functions
+ *          should be invoked from here.
+ * @note    This macro can be used to activate a power saving mode.
+ */
+#define CH_CFG_IDLE_ENTER_HOOK() {                                          \
+  /* Idle-enter code here.*/                                                \
+}
+
+/**
+ * @brief   Idle thread leave hook.
+ * @note    This hook is invoked within a critical zone, no OS functions
+ *          should be invoked from here.
+ * @note    This macro can be used to deactivate a power saving mode.
+ */
+#define CH_CFG_IDLE_LEAVE_HOOK() {                                          \
+  /* Idle-leave code here.*/                                                \
+}
+
+/**
+ * @brief   Idle Loop hook.
+ * @details This hook is continuously invoked by the idle thread loop.
+ */
+#define CH_CFG_IDLE_LOOP_HOOK() {                                           \
+  /* Idle loop code here.*/                                                 \
+}
+
+/**
+ * @brief   System tick event hook.
+ * @details This hook is invoked in the system tick handler immediately
+ *          after processing the virtual timers queue.
+ */
+#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \
+  /* System tick event code here.*/                                         \
+}
+
+/**
+ * @brief   System halt hook.
+ * @details This hook is invoked in case to a system halting error before
+ *          the system is halted.
+ */
+#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \
+  /* System halt code here.*/                                               \
+}
+
+/**
+ * @brief   Trace hook.
+ * @details This hook is invoked each time a new record is written in the
+ *          trace buffer.
+ */
+#define CH_CFG_TRACE_HOOK(tep) {                                            \
+  /* Trace code here.*/                                                     \
+}
+
+/** @} */
+
+/*===========================================================================*/
+/* Port-specific settings (override port settings defaulted in chcore.h).    */
+/*===========================================================================*/
+
+#endif  /* CHCONF_H */
+
+/** @} */
diff --git a/qmk/keyboards/technika/config.h b/qmk/keyboards/technika/config.h
new file mode 100644
index 00000000..f7ca1384
--- /dev/null
+++ b/qmk/keyboards/technika/config.h
@@ -0,0 +1,72 @@
+/*
+Copyright 2015 Álvaro "Gondolindrim" Volpato  <gondolindrim@acheronproject.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
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x8484 // TT for TealTechnik
+#define PRODUCT_ID      0x6049 // 60i
+#define DEVICE_VER      0x0001 // Revision pre-Alpha
+#define MANUFACTURER    TealTechnik
+#define PRODUCT         Technika
+
+/* key matrix size */
+#define MATRIX_ROWS 4
+#define MATRIX_COLS 14
+
+#define MATRIX_COL_PINS { A10, A9 , A8 , B14, B12, B2 , B1 , B0 , A7 , A6 , A3 , B9 , B8 , B7}
+#define MATRIX_ROW_PINS { B11, B10, A5 , A4 }
+#define DIODE_DIRECTION COL2ROW
+
+/* define if matrix has ghost */
+//#define MATRIX_HAS_GHOST
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE    5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+#define RGB_DI_PIN B15
+#define RGBLED_NUM 16
+#define RGBLIGT_LIMIT_VAL 200
+#define RGBLIGHT_SLEEP
+#define RGBLIGHT_ANIMATIONS
+
+#define LED_NUM_LOCK_PIN A15
+#define LED_CAPS_LOCK_PIN B3
+#define LED_SCROLL_LOCK_PIN B4
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+//#define NO_ACTION_MACRO
+//#define NO_ACTION_FUNCTION
diff --git a/qmk/keyboards/technika/halconf.h b/qmk/keyboards/technika/halconf.h
new file mode 100644
index 00000000..df71dd64
--- /dev/null
+++ b/qmk/keyboards/technika/halconf.h
@@ -0,0 +1,525 @@
+/*
+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+/**
+ * @file    templates/halconf.h
+ * @brief   HAL configuration header.
+ * @details HAL configuration file, this file allows to enable or disable the
+ *          various device drivers from your application. You may also use
+ *          this file in order to override the device drivers default settings.
+ *
+ * @addtogroup HAL_CONF
+ * @{
+ */
+
+#ifndef HALCONF_H
+#define HALCONF_H
+
+#define _CHIBIOS_HAL_CONF_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
+
+#include "mcuconf.h"
+
+/**
+ * @brief   Enables the PAL subsystem.
+ */
+#if !defined(HAL_USE_PAL) || defined(__DOXYGEN__)
+#define HAL_USE_PAL                         TRUE
+#endif
+
+/**
+ * @brief   Enables the ADC subsystem.
+ */
+#if !defined(HAL_USE_ADC) || defined(__DOXYGEN__)
+#define HAL_USE_ADC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the CAN subsystem.
+ */
+#if !defined(HAL_USE_CAN) || defined(__DOXYGEN__)
+#define HAL_USE_CAN                         FALSE
+#endif
+
+/**
+ * @brief   Enables the cryptographic subsystem.
+ */
+#if !defined(HAL_USE_CRY) || defined(__DOXYGEN__)
+#define HAL_USE_CRY                         FALSE
+#endif
+
+/**
+ * @brief   Enables the DAC subsystem.
+ */
+#if !defined(HAL_USE_DAC) || defined(__DOXYGEN__)
+#define HAL_USE_DAC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the GPT subsystem.
+ */
+#if !defined(HAL_USE_GPT) || defined(__DOXYGEN__)
+#define HAL_USE_GPT                         FALSE
+#endif
+
+/**
+ * @brief   Enables the I2C subsystem.
+ */
+#if !defined(HAL_USE_I2C) || defined(__DOXYGEN__)
+#define HAL_USE_I2C                         FALSE
+#endif
+
+/**
+ * @brief   Enables the I2S subsystem.
+ */
+#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)
+#define HAL_USE_I2S                         FALSE
+#endif
+
+/**
+ * @brief   Enables the ICU subsystem.
+ */
+#if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)
+#define HAL_USE_ICU                         FALSE
+#endif
+
+/**
+ * @brief   Enables the MAC subsystem.
+ */
+#if !defined(HAL_USE_MAC) || defined(__DOXYGEN__)
+#define HAL_USE_MAC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the MMC_SPI subsystem.
+ */
+#if !defined(HAL_USE_MMC_SPI) || defined(__DOXYGEN__)
+#define HAL_USE_MMC_SPI                     FALSE
+#endif
+
+/**
+ * @brief   Enables the PWM subsystem.
+ */
+#if !defined(HAL_USE_PWM) || defined(__DOXYGEN__)
+#define HAL_USE_PWM                         FALSE
+#endif
+
+/**
+ * @brief   Enables the RTC subsystem.
+ */
+#if !defined(HAL_USE_RTC) || defined(__DOXYGEN__)
+#define HAL_USE_RTC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the SDC subsystem.
+ */
+#if !defined(HAL_USE_SDC) || defined(__DOXYGEN__)
+#define HAL_USE_SDC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the SERIAL subsystem.
+ */
+#if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__)
+#define HAL_USE_SERIAL                      FALSE
+#endif
+
+/**
+ * @brief   Enables the SERIAL over USB subsystem.
+ */
+#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)
+#define HAL_USE_SERIAL_USB                  FALSE
+#endif
+
+/**
+ * @brief   Enables the SIO subsystem.
+ */
+#if !defined(HAL_USE_SIO) || defined(__DOXYGEN__)
+#define HAL_USE_SIO                         FALSE
+#endif
+
+/**
+ * @brief   Enables the SPI subsystem.
+ */
+#if !defined(HAL_USE_SPI) || defined(__DOXYGEN__)
+#define HAL_USE_SPI                         TRUE
+#endif
+
+/**
+ * @brief   Enables the TRNG subsystem.
+ */
+#if !defined(HAL_USE_TRNG) || defined(__DOXYGEN__)
+#define HAL_USE_TRNG                        FALSE
+#endif
+
+/**
+ * @brief   Enables the UART subsystem.
+ */
+#if !defined(HAL_USE_UART) || defined(__DOXYGEN__)
+#define HAL_USE_UART                        FALSE
+#endif
+
+/**
+ * @brief   Enables the USB subsystem.
+ */
+#if !defined(HAL_USE_USB) || defined(__DOXYGEN__)
+#define HAL_USE_USB                         TRUE
+#endif
+
+/**
+ * @brief   Enables the WDG subsystem.
+ */
+#if !defined(HAL_USE_WDG) || defined(__DOXYGEN__)
+#define HAL_USE_WDG                         FALSE
+#endif
+
+/**
+ * @brief   Enables the WSPI subsystem.
+ */
+#if !defined(HAL_USE_WSPI) || defined(__DOXYGEN__)
+#define HAL_USE_WSPI                        FALSE
+#endif
+
+/*===========================================================================*/
+/* PAL driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(PAL_USE_CALLBACKS) || defined(__DOXYGEN__)
+#define PAL_USE_CALLBACKS                   FALSE
+#endif
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(PAL_USE_WAIT) || defined(__DOXYGEN__)
+#define PAL_USE_WAIT                        FALSE
+#endif
+
+/*===========================================================================*/
+/* ADC driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(ADC_USE_WAIT) || defined(__DOXYGEN__)
+#define ADC_USE_WAIT                        TRUE
+#endif
+
+/**
+ * @brief   Enables the @p adcAcquireBus() and @p adcReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(ADC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define ADC_USE_MUTUAL_EXCLUSION            TRUE
+#endif
+
+/*===========================================================================*/
+/* CAN driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Sleep mode related APIs inclusion switch.
+ */
+#if !defined(CAN_USE_SLEEP_MODE) || defined(__DOXYGEN__)
+#define CAN_USE_SLEEP_MODE                  TRUE
+#endif
+
+/**
+ * @brief   Enforces the driver to use direct callbacks rather than OSAL events.
+ */
+#if !defined(CAN_ENFORCE_USE_CALLBACKS) || defined(__DOXYGEN__)
+#define CAN_ENFORCE_USE_CALLBACKS           FALSE
+#endif
+
+/*===========================================================================*/
+/* CRY driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables the SW fall-back of the cryptographic driver.
+ * @details When enabled, this option, activates a fall-back software
+ *          implementation for algorithms not supported by the underlying
+ *          hardware.
+ * @note    Fall-back implementations may not be present for all algorithms.
+ */
+#if !defined(HAL_CRY_USE_FALLBACK) || defined(__DOXYGEN__)
+#define HAL_CRY_USE_FALLBACK                FALSE
+#endif
+
+/**
+ * @brief   Makes the driver forcibly use the fall-back implementations.
+ */
+#if !defined(HAL_CRY_ENFORCE_FALLBACK) || defined(__DOXYGEN__)
+#define HAL_CRY_ENFORCE_FALLBACK            FALSE
+#endif
+
+/*===========================================================================*/
+/* DAC driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(DAC_USE_WAIT) || defined(__DOXYGEN__)
+#define DAC_USE_WAIT                        TRUE
+#endif
+
+/**
+ * @brief   Enables the @p dacAcquireBus() and @p dacReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(DAC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define DAC_USE_MUTUAL_EXCLUSION            TRUE
+#endif
+
+/*===========================================================================*/
+/* I2C driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables the mutual exclusion APIs on the I2C bus.
+ */
+#if !defined(I2C_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define I2C_USE_MUTUAL_EXCLUSION            TRUE
+#endif
+
+/*===========================================================================*/
+/* MAC driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables the zero-copy API.
+ */
+#if !defined(MAC_USE_ZERO_COPY) || defined(__DOXYGEN__)
+#define MAC_USE_ZERO_COPY                   FALSE
+#endif
+
+/**
+ * @brief   Enables an event sources for incoming packets.
+ */
+#if !defined(MAC_USE_EVENTS) || defined(__DOXYGEN__)
+#define MAC_USE_EVENTS                      TRUE
+#endif
+
+/*===========================================================================*/
+/* MMC_SPI driver related settings.                                          */
+/*===========================================================================*/
+
+/**
+ * @brief   Delays insertions.
+ * @details If enabled this options inserts delays into the MMC waiting
+ *          routines releasing some extra CPU time for the threads with
+ *          lower priority, this may slow down the driver a bit however.
+ *          This option is recommended also if the SPI driver does not
+ *          use a DMA channel and heavily loads the CPU.
+ */
+#if !defined(MMC_NICE_WAITING) || defined(__DOXYGEN__)
+#define MMC_NICE_WAITING                    TRUE
+#endif
+
+/*===========================================================================*/
+/* SDC driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Number of initialization attempts before rejecting the card.
+ * @note    Attempts are performed at 10mS intervals.
+ */
+#if !defined(SDC_INIT_RETRY) || defined(__DOXYGEN__)
+#define SDC_INIT_RETRY                      100
+#endif
+
+/**
+ * @brief   Include support for MMC cards.
+ * @note    MMC support is not yet implemented so this option must be kept
+ *          at @p FALSE.
+ */
+#if !defined(SDC_MMC_SUPPORT) || defined(__DOXYGEN__)
+#define SDC_MMC_SUPPORT                     FALSE
+#endif
+
+/**
+ * @brief   Delays insertions.
+ * @details If enabled this options inserts delays into the MMC waiting
+ *          routines releasing some extra CPU time for the threads with
+ *          lower priority, this may slow down the driver a bit however.
+ */
+#if !defined(SDC_NICE_WAITING) || defined(__DOXYGEN__)
+#define SDC_NICE_WAITING                    TRUE
+#endif
+
+/**
+ * @brief   OCR initialization constant for V20 cards.
+ */
+#if !defined(SDC_INIT_OCR_V20) || defined(__DOXYGEN__)
+#define SDC_INIT_OCR_V20                    0x50FF8000U
+#endif
+
+/**
+ * @brief   OCR initialization constant for non-V20 cards.
+ */
+#if !defined(SDC_INIT_OCR) || defined(__DOXYGEN__)
+#define SDC_INIT_OCR                        0x80100000U
+#endif
+
+/*===========================================================================*/
+/* SERIAL driver related settings.                                           */
+/*===========================================================================*/
+
+/**
+ * @brief   Default bit rate.
+ * @details Configuration parameter, this is the baud rate selected for the
+ *          default configuration.
+ */
+#if !defined(SERIAL_DEFAULT_BITRATE) || defined(__DOXYGEN__)
+#define SERIAL_DEFAULT_BITRATE              38400
+#endif
+
+/**
+ * @brief   Serial buffers size.
+ * @details Configuration parameter, you can change the depth of the queue
+ *          buffers depending on the requirements of your application.
+ * @note    The default is 16 bytes for both the transmission and receive
+ *          buffers.
+ */
+#if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__)
+#define SERIAL_BUFFERS_SIZE                 16
+#endif
+
+/*===========================================================================*/
+/* SERIAL_USB driver related setting.                                        */
+/*===========================================================================*/
+
+/**
+ * @brief   Serial over USB buffers size.
+ * @details Configuration parameter, the buffer size must be a multiple of
+ *          the USB data endpoint maximum packet size.
+ * @note    The default is 256 bytes for both the transmission and receive
+ *          buffers.
+ */
+#if !defined(SERIAL_USB_BUFFERS_SIZE) || defined(__DOXYGEN__)
+#define SERIAL_USB_BUFFERS_SIZE             1
+#endif
+
+/**
+ * @brief   Serial over USB number of buffers.
+ * @note    The default is 2 buffers.
+ */
+#if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
+#define SERIAL_USB_BUFFERS_NUMBER           2
+#endif
+
+/*===========================================================================*/
+/* SPI driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(SPI_USE_WAIT) || defined(__DOXYGEN__)
+#define SPI_USE_WAIT                        TRUE
+#endif
+
+/**
+ * @brief   Enables circular transfers APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(SPI_USE_CIRCULAR) || defined(__DOXYGEN__)
+#define SPI_USE_CIRCULAR                    FALSE
+#endif
+
+
+/**
+ * @brief   Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(SPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define SPI_USE_MUTUAL_EXCLUSION            TRUE
+#endif
+
+/**
+ * @brief   Handling method for SPI CS line.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(SPI_SELECT_MODE) || defined(__DOXYGEN__)
+#define SPI_SELECT_MODE                     SPI_SELECT_MODE_PAD
+#endif
+
+/*===========================================================================*/
+/* UART driver related settings.                                             */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(UART_USE_WAIT) || defined(__DOXYGEN__)
+#define UART_USE_WAIT                       FALSE
+#endif
+
+/**
+ * @brief   Enables the @p uartAcquireBus() and @p uartReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(UART_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define UART_USE_MUTUAL_EXCLUSION           FALSE
+#endif
+
+/*===========================================================================*/
+/* USB driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(USB_USE_WAIT) || defined(__DOXYGEN__)
+#define USB_USE_WAIT                        TRUE
+#endif
+
+/*===========================================================================*/
+/* WSPI driver related settings.                                             */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(WSPI_USE_WAIT) || defined(__DOXYGEN__)
+#define WSPI_USE_WAIT                       TRUE
+#endif
+
+/**
+ * @brief   Enables the @p wspiAcquireBus() and @p wspiReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(WSPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define WSPI_USE_MUTUAL_EXCLUSION           TRUE
+#endif
+
+#endif /* HALCONF_H */
+
+/** @} */
diff --git a/qmk/keyboards/technika/keymaps/default/keymap.c b/qmk/keyboards/technika/keymaps/default/keymap.c
new file mode 100644
index 00000000..b95b1548
--- /dev/null
+++ b/qmk/keyboards/technika/keymaps/default/keymap.c
@@ -0,0 +1,31 @@
+/*
+Copyright 2012,2013 Jun Wako <wakojun@gmail.com>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+   [0] = LAYOUT(
+        KC_GESC, KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_P7  , KC_P8  , KC_P9  ,
+        KC_TAB , KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_ENT , KC_P4  , KC_P5  , KC_P6  ,
+        KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_N   , KC_M   , KC_COMM, KC_RSFT, MO(1)  , KC_P3  , KC_P2  , KC_P1  ,
+        KC_LCTL, KC_LGUI, KC_LALT,          KC_SPC , KC_SPC , KC_SPC , KC_RALT, KC_RGUI, KC_RCTL, KC_BSPC, KC_P0  , KC_P0  , KC_PDOT ),
+   [1] = LAYOUT(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ , 
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ , 
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ , 
+        _______, _______, _______         , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ )
+};
diff --git a/qmk/keyboards/technika/mcuconf.h b/qmk/keyboards/technika/mcuconf.h
new file mode 100644
index 00000000..5df5e5cc
--- /dev/null
+++ b/qmk/keyboards/technika/mcuconf.h
@@ -0,0 +1,176 @@
+/*
+    ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
+/*
+ * STM32F0xx drivers configuration.
+ * The following settings override the default settings present in
+ * the various device driver implementation headers.
+ * Note that the settings for each driver only have effect if the whole
+ * driver is enabled in halconf.h.
+ *
+ * IRQ priorities:
+ * 3...0       Lowest...Highest.
+ *
+ * DMA priorities:
+ * 0...3        Lowest...Highest.
+ */
+
+#define STM32F0xx_MCUCONF
+// #define STM32F070xB
+
+/*
+ * HAL driver system settings.
+ */
+#define STM32_NO_INIT                       FALSE
+#define STM32_PVD_ENABLE                    FALSE
+#define STM32_PLS                           STM32_PLS_LEV0
+#define STM32_HSI_ENABLED                   TRUE
+#define STM32_HSI14_ENABLED                 TRUE
+#define STM32_HSI48_ENABLED                 FALSE
+#define STM32_LSI_ENABLED                   TRUE
+#define STM32_HSE_ENABLED                   FALSE
+#define STM32_LSE_ENABLED                   FALSE
+#define STM32_SW                            STM32_SW_PLL
+#define STM32_PLLSRC                        STM32_PLLSRC_HSI_DIV2
+#define STM32_PREDIV_VALUE                  1
+#define STM32_PLLMUL_VALUE                  12
+#define STM32_HPRE                          STM32_HPRE_DIV1
+#define STM32_PPRE                          STM32_PPRE_DIV1
+#define STM32_ADCSW                         STM32_ADCSW_HSI14
+#define STM32_ADCPRE                        STM32_ADCPRE_DIV4
+#define STM32_MCOSEL                        STM32_MCOSEL_NOCLOCK
+#define STM32_ADCPRE                        STM32_ADCPRE_DIV4
+#define STM32_ADCSW                         STM32_ADCSW_HSI14
+#define STM32_USBSW                         STM32_USBSW_HSI48
+#define STM32_CECSW                         STM32_CECSW_HSI
+#define STM32_I2C1SW                        STM32_I2C1SW_HSI
+#define STM32_USART1SW                      STM32_USART1SW_PCLK
+#define STM32_RTCSEL                        STM32_RTCSEL_LSI
+
+/*
+ * ADC driver system settings.
+ */
+#define STM32_ADC_USE_ADC1                  FALSE
+#define STM32_ADC_ADC1_DMA_PRIORITY         2
+#define STM32_ADC_IRQ_PRIORITY              2
+#define STM32_ADC_ADC1_DMA_IRQ_PRIORITY     2
+
+/*
+ * EXT driver system settings.
+ */
+#define STM32_EXT_EXTI0_1_IRQ_PRIORITY      3
+#define STM32_EXT_EXTI2_3_IRQ_PRIORITY      3
+#define STM32_EXT_EXTI4_15_IRQ_PRIORITY     3
+#define STM32_EXT_EXTI16_IRQ_PRIORITY       3
+#define STM32_EXT_EXTI17_IRQ_PRIORITY       3
+
+/*
+ * GPT driver system settings.
+ */
+#define STM32_GPT_USE_TIM1                  FALSE
+#define STM32_GPT_USE_TIM2                  FALSE
+#define STM32_GPT_USE_TIM3                  FALSE
+#define STM32_GPT_USE_TIM14                 FALSE
+#define STM32_GPT_TIM1_IRQ_PRIORITY         2
+#define STM32_GPT_TIM2_IRQ_PRIORITY         2
+#define STM32_GPT_TIM3_IRQ_PRIORITY         2
+#define STM32_GPT_TIM14_IRQ_PRIORITY        2
+
+/*
+ * I2C driver system settings.
+ */
+#define STM32_I2C_USE_I2C1                  FALSE
+#define STM32_I2C_USE_I2C2                  FALSE
+#define STM32_I2C_BUSY_TIMEOUT              50
+#define STM32_I2C_I2C1_IRQ_PRIORITY         3
+#define STM32_I2C_I2C2_IRQ_PRIORITY         3
+#define STM32_I2C_USE_DMA                   FALSE
+#define STM32_I2C_I2C1_DMA_PRIORITY         1
+#define STM32_I2C_I2C2_DMA_PRIORITY         1
+#define STM32_I2C_I2C1_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 7)
+#define STM32_I2C_I2C1_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 6)
+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")
+
+/*
+ * ICU driver system settings.
+ */
+#define STM32_ICU_USE_TIM1                  FALSE
+#define STM32_ICU_USE_TIM2                  FALSE
+#define STM32_ICU_USE_TIM3                  FALSE
+#define STM32_ICU_TIM1_IRQ_PRIORITY         3
+#define STM32_ICU_TIM2_IRQ_PRIORITY         3
+#define STM32_ICU_TIM3_IRQ_PRIORITY         3
+
+/*
+ * PWM driver system settings.
+ */
+#define STM32_PWM_USE_ADVANCED              FALSE
+#define STM32_PWM_USE_TIM1                  FALSE
+#define STM32_PWM_USE_TIM2                  FALSE
+#define STM32_PWM_USE_TIM3                  TRUE
+#define STM32_PWM_TIM1_IRQ_PRIORITY         3
+#define STM32_PWM_TIM2_IRQ_PRIORITY         3
+#define STM32_PWM_TIM3_IRQ_PRIORITY         3
+
+/*
+ * SERIAL driver system settings.
+ */
+#define STM32_SERIAL_USE_USART1             FALSE
+#define STM32_SERIAL_USE_USART2             FALSE
+#define STM32_SERIAL_USART1_PRIORITY        3
+#define STM32_SERIAL_USART2_PRIORITY        3
+
+/*
+ * SPI driver system settings.
+ */
+#define STM32_SPI_USE_SPI1                  FALSE
+#define STM32_SPI_USE_SPI2                  TRUE
+#define STM32_SPI_SPI1_DMA_PRIORITY         1
+#define STM32_SPI_SPI2_DMA_PRIORITY         1
+#define STM32_SPI_SPI1_IRQ_PRIORITY         2
+#define STM32_SPI_SPI2_IRQ_PRIORITY         2
+#define STM32_SPI_SPI2_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 4)
+#define STM32_SPI_SPI2_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 5)
+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")
+
+/*
+ * ST driver system settings.
+ */
+#define STM32_ST_IRQ_PRIORITY               2
+#define STM32_ST_USE_TIMER                  2
+
+/*
+ * UART driver system settings.
+ */
+#define STM32_UART_USE_USART1               FALSE
+#define STM32_UART_USE_USART2               FALSE
+#define STM32_UART_USART1_IRQ_PRIORITY      3
+#define STM32_UART_USART2_IRQ_PRIORITY      3
+#define STM32_UART_USART1_DMA_PRIORITY      0
+#define STM32_UART_USART2_DMA_PRIORITY      0
+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")
+
+/*
+ * USB driver system settings.
+ */
+#define STM32_USB_USE_USB1                  TRUE
+#define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE
+#define STM32_USB_USB1_LP_IRQ_PRIORITY      3
+
+#endif /* _MCUCONF_H_ */
diff --git a/qmk/keyboards/technika/readme.md b/qmk/keyboards/technika/readme.md
new file mode 100644
index 00000000..4122b732
--- /dev/null
+++ b/qmk/keyboards/technika/readme.md
@@ -0,0 +1,19 @@
+# Technika QMK firmware
+
+## Introduction
+
+This is the QMK firmware repository for the Technika PCB designed by Gondolindrim and sold by Teal Technik, LLC.
+
+## Introduction
+
+This is the QMK firmware repository for the Technika PCB, a 45% PCB designed by [Gondolindrim](https://github.com/Gondolindrim) and sold by [Teal Technik, LLC.](https://tealtechnik.com/).
+
+As of november 2020, the PCB has not yet been sold but will be added soon.
+
+## How to compile
+
+After setting up your build environment, you can compile the CK60i default keymap by using:
+
+    make technika: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).
diff --git a/qmk/keyboards/technika/rules.mk b/qmk/keyboards/technika/rules.mk
new file mode 100644
index 00000000..683d7f14
--- /dev/null
+++ b/qmk/keyboards/technika/rules.mk
@@ -0,0 +1,23 @@
+# MCU name
+MCU = STM32F072
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = yes      # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = yes        # Console for debug
+COMMAND_ENABLE = yes        # Commands for debug and configuration
+# 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 = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality 
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = no
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/qmk/keyboards/technika/technika.c b/qmk/keyboards/technika/technika.c
new file mode 100644
index 00000000..35a8666c
--- /dev/null
+++ b/qmk/keyboards/technika/technika.c
@@ -0,0 +1,26 @@
+/*
+Copyright 2020 Álvaro "Gondolindrim" Volpato  <gondolindrim@acheronproject.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 "technika.h"
+
+void keyboard_pre_init_kb(void) {
+    setPinOutput(A15);
+    setPinOutput(B3);
+    setPinOutput(B4);
+
+    keyboard_pre_init_user();
+}
diff --git a/qmk/keyboards/technika/technika.h b/qmk/keyboards/technika/technika.h
new file mode 100644
index 00000000..9bae8981
--- /dev/null
+++ b/qmk/keyboards/technika/technika.h
@@ -0,0 +1,34 @@
+/*
+Copyright 2015 Álvaro "Gondolindrim" Volpato  <gondolindrim@acheronproject.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
+
+#define ___ KC_NO
+
+#include "quantum.h"
+
+#define LAYOUT( \
+	K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, \
+	K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
+	K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, \
+	K30, K31, K32, K33,      K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D \
+) { \
+    {  K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D}, \
+    {  K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D}, \
+    {  K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D}, \
+    {  K30, K31, K32, K33, ___, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D}  \
+}
diff --git a/qmk/keyboards/terrazzo/rules.mk b/qmk/keyboards/terrazzo/rules.mk
index f6ea149e..7a08fb76 100644
--- a/qmk/keyboards/terrazzo/rules.mk
+++ b/qmk/keyboards/terrazzo/rules.mk
@@ -26,7 +26,8 @@ NKRO_ENABLE = yes      # USB Nkey Rollover - if this doesn't work, see here: htt
 AUDIO_ENABLE = no
 RGBLIGHT_ENABLE = no
 BACKLIGHT_ENABLE = no  # Enable keyboard backlight functionality
-LED_MATRIX_ENABLE = IS31FL3731
+LED_MATRIX_ENABLE = yes
+LED_MATRIX_DRIVER = IS31FL3731
 ENCODER_ENABLE = yes
 WPM_ENABLE = yes
 
diff --git a/qmk/keyboards/terrazzo/terrazzo.c b/qmk/keyboards/terrazzo/terrazzo.c
index 2fe94f86..e8a4e03f 100644
--- a/qmk/keyboards/terrazzo/terrazzo.c
+++ b/qmk/keyboards/terrazzo/terrazzo.c
@@ -19,7 +19,7 @@
 #ifdef LED_MATRIX_ENABLE
     #include "is31fl3731-simple.h"
     #include <math.h>
-    #include <print.h>
+    #include "print.h"
     #include "quantum.h"
 
 const is31_led g_is31_leds[LED_DRIVER_LED_COUNT] = {
diff --git a/qmk/keyboards/tg4x/config.h b/qmk/keyboards/tg4x/config.h
index c00cf282..3fcef6d2 100644
--- a/qmk/keyboards/tg4x/config.h
+++ b/qmk/keyboards/tg4x/config.h
@@ -218,34 +218,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/tg4x/rules.mk b/qmk/keyboards/tg4x/rules.mk
index 4a86998c..866fc58f 100644
--- a/qmk/keyboards/tg4x/rules.mk
+++ b/qmk/keyboards/tg4x/rules.mk
@@ -29,6 +29,5 @@ MIDI_ENABLE = no            # MIDI support
 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
 
 LTO_ENABLE = yes
diff --git a/qmk/keyboards/tgr/910/keymaps/via/rules.mk b/qmk/keyboards/tgr/910/keymaps/via/rules.mk
index 9e1952e2..36b7ba9c 100644
--- a/qmk/keyboards/tgr/910/keymaps/via/rules.mk
+++ b/qmk/keyboards/tgr/910/keymaps/via/rules.mk
@@ -1,4 +1,2 @@
 VIA_ENABLE = yes
 LTO_ENABLE = yes
-
-EXTRAKEY_ENABLE = no  
diff --git a/qmk/keyboards/tgr/910ce/keymaps/via/rules.mk b/qmk/keyboards/tgr/910ce/keymaps/via/rules.mk
index 71c94085..36b7ba9c 100644
--- a/qmk/keyboards/tgr/910ce/keymaps/via/rules.mk
+++ b/qmk/keyboards/tgr/910ce/keymaps/via/rules.mk
@@ -1,4 +1,2 @@
 VIA_ENABLE = yes
 LTO_ENABLE = yes
-
-EXTRAKEY_ENABLE = no       # Audio control and System control
\ No newline at end of file
diff --git a/qmk/keyboards/tgr/alice/alice.h b/qmk/keyboards/tgr/alice/alice.h
index 1486612f..8525fd85 100644
--- a/qmk/keyboards/tgr/alice/alice.h
+++ b/qmk/keyboards/tgr/alice/alice.h
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "quantum.h"
 
-/* LAYOUT
+/* Layout
  * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐
  * │50 │ │00 │01 │02 │03 │04 │05 │06 │         │07 │08 │09 │0A │0B │0C │0D │0E │
  * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
@@ -32,7 +32,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *       │40   │     │41   │42     │43  │   │46        │47   │           │48   │
  *       └─────┘     └─────┴───────┴────┘   └──────────┴─────┘           └─────┘
  */
-#define LAYOUT( \
+#define LAYOUT_alice_split_bs( \
   K50,   K00, K01, K02, K03, K04, K05, K06,      K07, K08, K09, K0A, K0B, K0C, K0D, K0E, \
   K51,   K10, K11, K12, K13, K14, K15,      K16, K17, K18, K19, K1A, K1B, K1C, K1D,      \
   K52,   K20, K21, K22, K23, K24, K25,      K26, K27, K28, K29, K2A, K2B,      K2C,      \
@@ -48,3 +48,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
   { K50  , K51  , K52  , KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }  \
 }
 
+#define LAYOUT LAYOUT_alice_split_bs
diff --git a/qmk/keyboards/tgr/alice/info.json b/qmk/keyboards/tgr/alice/info.json
index b2620933..13377293 100644
--- a/qmk/keyboards/tgr/alice/info.json
+++ b/qmk/keyboards/tgr/alice/info.json
@@ -5,7 +5,7 @@
   "width": 17.75,
   "height": 5,
   "layouts": {
-    "LAYOUT": {
+    "LAYOUT_alice_split_bs": {
       "key_count": 66,
       "layout": [
         {"label":"K63", "x":0, "y":0},
diff --git a/qmk/keyboards/tgr/alice/keymaps/default/keymap.c b/qmk/keyboards/tgr/alice/keymaps/default/keymap.c
index 29fff661..4d4a3ecc 100644
--- a/qmk/keyboards/tgr/alice/keymaps/default/keymap.c
+++ b/qmk/keyboards/tgr/alice/keymaps/default/keymap.c
@@ -18,14 +18,14 @@ 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(
+    [0] = LAYOUT_alice_split_bs(
         KC_ESC,     KC_GESC, 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_GRV,  KC_BSLS, \
         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_BSPC,          \
         KC_PGDN,    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_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),            \
                     KC_LGUI,          KC_LALT,          KC_SPC,  KC_LGUI,          KC_SPC,           KC_RALT,                            KC_RCTL           \
     ),
-    [1] = LAYOUT(
+    [1] = LAYOUT_alice_split_bs(
         _______,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
         _______,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP  , _______, _______,          \
         _______,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_RGHT,          _______,          \
diff --git a/qmk/keyboards/tgr/alice/rules.mk b/qmk/keyboards/tgr/alice/rules.mk
index 20f0222c..39af20ef 100644
--- a/qmk/keyboards/tgr/alice/rules.mk
+++ b/qmk/keyboards/tgr/alice/rules.mk
@@ -20,3 +20,5 @@ COMMAND_ENABLE = yes
 BACKLIGHT_ENABLE = yes
 RGBLIGHT_ENABLE = yes
 WS2812_DRIVER = i2c
+
+LAYOUTS = alice_split_bs
diff --git a/qmk/keyboards/tgr/jane/keymaps/via/rules.mk b/qmk/keyboards/tgr/jane/keymaps/via/rules.mk
index 97010a99..36b7ba9c 100644
--- a/qmk/keyboards/tgr/jane/keymaps/via/rules.mk
+++ b/qmk/keyboards/tgr/jane/keymaps/via/rules.mk
@@ -1,5 +1,2 @@
 VIA_ENABLE = yes
 LTO_ENABLE = yes
-
-MOUSEKEY_ENABLE = no
-EXTRAKEY_ENABLE = no
diff --git a/qmk/keyboards/tgr/tris/keymaps/via/rules.mk b/qmk/keyboards/tgr/tris/keymaps/via/rules.mk
index 7d47e6b7..36b7ba9c 100644
--- a/qmk/keyboards/tgr/tris/keymaps/via/rules.mk
+++ b/qmk/keyboards/tgr/tris/keymaps/via/rules.mk
@@ -1,4 +1,2 @@
 VIA_ENABLE = yes
 LTO_ENABLE = yes
-
-EXTRAKEY_ENABLE = no
diff --git a/qmk/keyboards/the_royal/liminal/keymaps/brandonschlack/keymap.c b/qmk/keyboards/the_royal/liminal/keymaps/brandonschlack/keymap.c
new file mode 100644
index 00000000..4180e946
--- /dev/null
+++ b/qmk/keyboards/the_royal/liminal/keymaps/brandonschlack/keymap.c
@@ -0,0 +1,115 @@
+/* Copyright 2020 Brandon Schlack
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+#include "brandonschlack.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/* Base
+ * ┌───┬─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐
+ * │Hom│Tab  │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │{ [│ BsPc│
+ * ├───┼─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │PgU│HyEsc │ A │ S │ D │ F │ G │ H │ J │ K │ L │" '│   Enter│
+ * ├───┼──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬──────┤
+ * │PgD│Shift   │ Z │ X │ C │ V │ B │ N │ M │< ,│> .│? /│ ↑Shft│
+ * ├───┼────┬───┼───┴┬──┴───┴───┴───┴───┴───┴───┴┬──┴─┬─┴─┬────┤
+ * │End│Ctrl│Opt│Cmd │        Space-Raise        │←Cmd│↓Lw│→Opt│
+ * └───┴────┴───┴────┴───────────────────────────┴────┴───┴────┘
+ */
+[_BASE] = LAYOUT_base_kit_all( \
+    KC_HOME, 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_BSPC, \
+    KC_PGUP, HY_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_QUOT, XXXXXXX, KC_ENT,  \
+    KC_PGDN, KC_LSFT, XXXXXXX, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, UP_RSFT, \
+    KC_END,  KC_LCTL, KC_LOPT, KC_LCMD,              XXXXXXX,         SPC_RAI,                XXXXXXX, LFT_CMD, DWN_LWR, RGT_OPT  \
+),
+
+/* Lower
+ * ┌───┬─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐
+ * │Nxt│Del  │BrD│BrU│Msn│LHP│   │   │   │   │   │ ↑ │Mut│ SlpD│
+ * ├───┼─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │VlU│HyCaps│   │   │NxW│PvT│Bck│Fwd│NxT│   │ ← │ → │    Play│
+ * ├───┼──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬──────┤
+ * │VlD│        │   │   │   │1PX│1Ps│   │   │   │ ↓ │   │      │
+ * ├───┼────┬───┼───┴┬──┴───┴───┴───┴───┴───┴───┴┬──┴─┬─┴─┬────┤
+ * │Prv│    │   │    │                           │    │   │    │
+ * └───┴────┴───┴────┴───────────────────────────┴────┴───┴────┘
+ */
+[_LOWER] = LAYOUT_base_kit_all( \
+    KC_MNXT, KC_DELT, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, _______, _______, _______, _______, _______, KC_UP,   KC_MUTE, MC_SLPD, \
+    KC_VOLU, HY_CAPS, _______, _______, NXT_WIN, PRV_TAB, MC_BACK, MC_FWRD, NXT_TAB, _______, KC_LEFT, KC_RGHT, XXXXXXX, KC_MPLY, \
+    KC_VOLD, _______, XXXXXXX, _______, _______, _______, PX_AFLL, OP_AFLL, _______, _______, _______, KC_DOWN, _______, _______, \
+    KC_MPRV, _______, _______, _______,              XXXXXXX,         _______,                XXXXXXX, _______, _______, _______  \
+),
+
+/* Raise
+ * ┌───┬─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐
+ * │Nxt│~ `  │! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│} ]│     │
+ * ├───┼─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │VlU│      │ F1│ F2│ F3│ F4│ F5│ F6│_ -│+ =│   │: ;│        │
+ * ├───┼──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬──────┤
+ * │VlD│        │ F7│ F8│ F9│F10│F11│F12│   │{ [│} ]│| \│ ⇞Shft│
+ * ├───┼────┬───┼───┴┬──┴───┴───┴───┴───┴───┴───┴┬──┴─┬─┴─┬────┤
+ * │Prv│    │   │    │                           │↖︎Cmd│⇟Fn│↘︎Opt│
+ * └───┴────┴───┴────┴───────────────────────────┴────┴───┴────┘
+ */
+[_RAISE] = LAYOUT_base_kit_all( \
+    KC_MNXT, KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_RBRC, _______, \
+    KC_VOLU, _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  _______, KC_SCLN, XXXXXXX, _______, \
+    KC_VOLD, _______, XXXXXXX, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_LBRC, KC_RBRC, KC_BSLS, PGU_SFT, \
+    KC_MPRV, _______, _______, _______,              XXXXXXX,         _______,                XXXXXXX, HOM_CMD, PGD_LWR, END_OPT  \
+),
+
+/* Adjust
+ * ┌───┬─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐
+ * │   │Make │   │   │EEP│RST│   │   │   │   │   │   │   │     │
+ * ├───┼─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │   │      │   │   │   │   │   │   │   │   │   │   │        │
+ * ├───┼──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬──────┤
+ * │   │        │   │   │   │   │   │   │   │   │   │   │      │
+ * ├───┼────┬───┼───┴┬──┴───┴───┴───┴───┴───┴───┴┬──┴─┬─┴─┬────┤
+ * │   │    │   │    │                           │    │   │    │
+ * └───┴────┴───┴────┴───────────────────────────┴────┴───┴────┘
+ */
+[_ADJUST] = LAYOUT_base_kit_all( \
+    _______, QM_MAKE, _______, _______, EEP_RST, RESET,   _______, _______, _______, _______, _______, _______, _______, _______, \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, _______, \
+    _______, _______, XXXXXXX, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    _______, _______, _______, _______,              XXXXXXX,         _______,                XXXXXXX, _______, _______, _______  \
+),
+
+/* Blank layer
+ * ┌───┬─────┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬─────┐
+ * │   │     │   │   │   │   │   │   │   │   │   │   │   │     │
+ * ├───┼─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │   │      │   │   │   │   │   │   │   │   │   │   │        │
+ * ├───┼──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬──────┤
+ * │   │        │   │   │   │   │   │   │   │   │   │   │      │
+ * ├───┼────┬───┼───┴┬──┴───┴───┴───┴───┴───┴───┴┬──┴─┬─┴─┬────┤
+ * │   │    │   │    │                           │    │   │    │
+ * └───┴────┴───┴────┴───────────────────────────┴────┴───┴────┘
+ */
+/*
+[_BLANK] = LAYOUT_base_kit_all( \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, XXXXXXX, _______, \
+    _______, _______, XXXXXXX, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    _______, _______, _______, _______,              XXXXXXX,         _______,                XXXXXXX, _______, _______, _______  \
+),
+*/
+};
+
+layer_state_t layer_state_set_keymap(layer_state_t state) {
+    return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
+}
diff --git a/qmk/keyboards/the_royal/liminal/rules.mk b/qmk/keyboards/the_royal/liminal/rules.mk
index 4d210280..0f05ebc3 100644
--- a/qmk/keyboards/the_royal/liminal/rules.mk
+++ b/qmk/keyboards/the_royal/liminal/rules.mk
@@ -29,4 +29,3 @@ MIDI_ENABLE = no            # MIDI support
 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
diff --git a/qmk/keyboards/thedogkeyboard/config.h b/qmk/keyboards/thedogkeyboard/config.h
index 1a67a3f1..ec167698 100644
--- a/qmk/keyboards/thedogkeyboard/config.h
+++ b/qmk/keyboards/thedogkeyboard/config.h
@@ -213,34 +213,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/thedogkeyboard/rules.mk b/qmk/keyboards/thedogkeyboard/rules.mk
index 31e3aa83..70420fd3 100644
--- a/qmk/keyboards/thedogkeyboard/rules.mk
+++ b/qmk/keyboards/thedogkeyboard/rules.mk
@@ -29,7 +29,6 @@ MIDI_ENABLE = no            # MIDI support
 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
 CUSTOM_MATRIX = yes
 
 SRC += matrix.c
diff --git a/qmk/keyboards/thevankeyboards/bananasplit/keymaps/talljoe/config.h b/qmk/keyboards/thevankeyboards/bananasplit/keymaps/talljoe/config.h
index fc9bd3d6..40b3fd3e 100644
--- a/qmk/keyboards/thevankeyboards/bananasplit/keymaps/talljoe/config.h
+++ b/qmk/keyboards/thevankeyboards/bananasplit/keymaps/talljoe/config.h
@@ -1,7 +1,20 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
+/* Copyright 2020 Joseph Wasson
+ *
+ * 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_CONFIG_H
+#pragma once
 
 #define SPACE_COUNT 3
 
@@ -18,5 +31,3 @@
     { K30, KC_NO,    K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D },  \
     { K40, K41, K42, KC_NO, K44, K45, K46, KC_NO, K48, K49, KC_NO, K4B, K4C, KC_NO }\
 }
-
-#endif
diff --git a/qmk/keyboards/thevankeyboards/minivan/keymaps/dcompact/keymap.c b/qmk/keyboards/thevankeyboards/minivan/keymaps/dcompact/keymap.c
new file mode 100644
index 00000000..188dd338
--- /dev/null
+++ b/qmk/keyboards/thevankeyboards/minivan/keymaps/dcompact/keymap.c
@@ -0,0 +1,87 @@
+/* Copyright 2020 Dan Herrera
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+#include "keymap_steno.h"
+
+// Custom Keycodes and Combinations Used
+#define DEL_SHF SFT_T(KC_DEL)
+#define SPC_ALT LALT_T(KC_SPC)
+#define QUAKE LCTL(KC_GRV)
+
+#define WKSP_L LALT(LCTL(KC_LEFT))
+#define WKSP_D LALT(LCTL(KC_DOWN))
+#define WKSP_U LALT(LCTL(KC_UP))
+#define WKSP_R LALT(LCTL(KC_RGHT))
+
+#define AM_CYC A(S(KC_SPC))
+#define AM_SHR A(S(KC_COMM))
+#define AM_GRW A(S(KC_DOT))
+#define AM_REL A(S(KC_Z))
+#define AM_LFT A(S(KC_H))
+#define AM_RGH A(S(KC_L))
+#define AM_CW A(S(KC_K))
+#define AM_CCW A(S(KC_J))
+#define AM_TLL A(S(KC_1))
+#define AM_TLW A(S(KC_2))
+#define AM_BSP A(S(KC_3))
+#define AM_FUL A(S(KC_4))
+
+
+
+enum layers {
+  _BASE,
+  _LOWER,
+  _RAISE,
+  _ADJUST
+};
+
+#define LOWER MO(_LOWER)
+#define RAISE MO(_RAISE)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+[_BASE] = LAYOUT(
+    KC_TAB, KC_QUOT, KC_COMM,  KC_DOT,    KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L, KC_SLSH,
+    KC_ESC,    KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S, KC_MINS,
+   DEL_SHF, KC_SCLN,    KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z, KC_BSPC,
+   KC_LCTL, KC_LGUI,   LOWER,                   KC_LSFT, SPC_ALT,                     RAISE, KC_RGUI, KC_ENT
+),
+
+[_LOWER] = LAYOUT(
+   XXXXXXX,  AM_CYC,  AM_SHR,  AM_GRW,  AM_REL, XXXXXXX, XXXXXXX, KC_HOME, KC_PGDN, KC_PGUP,  KC_END, XXXXXXX,
+   XXXXXXX,  AM_LFT,  AM_CCW,   AM_CW,  AM_RGH, XXXXXXX, XXXXXXX, KC_LEFT, KC_DOWN,   KC_UP, KC_RGHT, XXXXXXX,
+   XXXXXXX,  AM_TLL,  AM_TLW,  AM_BSP,  AM_FUL, XXXXXXX, XXXXXXX,  WKSP_L,  WKSP_D,  WKSP_U,  WKSP_R, XXXXXXX,
+   _______, XXXXXXX, _______,                   _______, XXXXXXX,                   _______, _______, XXXXXXX
+),
+
+[_RAISE] = LAYOUT(
+     QUAKE,  KC_GRV, KC_TILD, KC_BSLS, KC_PIPE, KC_LPRN, KC_RPRN,    KC_7,    KC_8,    KC_9, KC_SLSH,  KC_EQL,
+   XXXXXXX, KC_EXLM,   KC_AT, KC_HASH,  KC_DLR, KC_LCBR, KC_RCBR,    KC_4,    KC_5,    KC_6, KC_ASTR, KC_PLUS,
+   XXXXXXX, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LBRC, KC_RBRC,    KC_1,    KC_2,    KC_3, KC_MINS, KC_BSPC,
+   _______, XXXXXXX, _______,                   KC_LABK, KC_RABK,                   _______,    KC_0, XXXXXXX
+),
+
+[_ADJUST] = LAYOUT(
+     RESET, KC_SLEP, KC_MPRV, KC_MPLY, KC_MNXT, XXXXXXX, XXXXXXX,   KC_F9,  KC_F10,  KC_F11,  KC_F12, XXXXXXX,
+   XXXXXXX, KC_WAKE, KC_MUTE, KC_VOLD, KC_VOLU, XXXXXXX, XXXXXXX,   KC_F5,   KC_F6,   KC_F7,   KC_F8, XXXXXXX,
+   XXXXXXX,  KC_PWR, KC_MRWD, KC_MPLY, KC_MFFD, XXXXXXX, XXXXXXX,   KC_F1,   KC_F2,   KC_F3,   KC_F4, XXXXXXX,
+   _______, _______, _______,                   XXXXXXX, XXXXXXX,                   _______, _______, XXXXXXX
+),
+};
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
+}
diff --git a/qmk/keyboards/thevankeyboards/minivan/keymaps/dcompact/readme.md b/qmk/keyboards/thevankeyboards/minivan/keymaps/dcompact/readme.md
new file mode 100644
index 00000000..f3f3d8ca
--- /dev/null
+++ b/qmk/keyboards/thevankeyboards/minivan/keymaps/dcompact/readme.md
@@ -0,0 +1,45 @@
+# DCompact Layout
+
+**Dvorak, Layered, Mouse-Enabled, Compact -- now with Game Mode~**
+
+_See [the layout source](keymap.c) for the actual layout_
+
+## Goals
+
+The following are the goals kept in mind when designing the DCompact
+layout:
+
+- Provide minimal travel distance when typing English or coding
+- Consistent muscle memory translation from standard QWERTY
+- Stateless typing experience
+- OS-agnostic features, macros, and key placement
+- Minimize dependence on mouse usage
+
+These are generally all met or balanced within reason. This layout is
+not intended at all to be a familiar layout for much of anyone (except
+maybe those who already type in Dvorak) -- this is meant to amplify the
+best parts of having limited, ortholinear keys with layering.
+
+## As Reference Material
+
+If you're reading this hoping to find reference material to implement
+your own layout, then please feel free to copy over this layout and
+make edits where you see fit. I removed a lot of the features I felt
+extraneous to my usage and simplified style where I felt needed. This
+would hopefully mean that my code should feel like a good base to
+develop from for those new to QMK.
+
+_Remember that settings defined in the layout directory override and
+merge with those in the keyboard folder_
+
+## Relevant Links
+
+- [Online Dvorak Layout Trainer](https://learn.dvorak.nl/)
+- [Dvorak Wikipedia Page](https://en.wikipedia.org/wiki/Dvorak_Simplified_Keyboard)
+- [QMK Docs](https://docs.qmk.fm/#/)
+- [QMK KeyCode Reference](https://docs.qmk.fm/#/keycodes)
+
+## Contact
+
+Maintainer: [Dan](https://github.com/loksonarius)
+
diff --git a/qmk/keyboards/thevankeyboards/minivan/keymaps/dcompact/rules.mk b/qmk/keyboards/thevankeyboards/minivan/keymaps/dcompact/rules.mk
new file mode 100644
index 00000000..ac4c1453
--- /dev/null
+++ b/qmk/keyboards/thevankeyboards/minivan/keymaps/dcompact/rules.mk
@@ -0,0 +1,10 @@
+# https://docs.qmk.fm/#/config_options?id=feature-options
+# Features Specifically Wanted
+EXTRAKEY_ENABLE = yes
+STENO_ENABLE = yes
+NKRO_ENABLE = yes
+
+# Features taking up space
+MOUSEKEY_ENABLE = no
+MIDI_ENABLE = no
+CONSOLE_ENABLE = no
diff --git a/qmk/keyboards/thevankeyboards/minivan/keymaps/talljoe-minivan/config.h b/qmk/keyboards/thevankeyboards/minivan/keymaps/talljoe-minivan/config.h
index 26d5e207..89980614 100644
--- a/qmk/keyboards/thevankeyboards/minivan/keymaps/talljoe-minivan/config.h
+++ b/qmk/keyboards/thevankeyboards/minivan/keymaps/talljoe-minivan/config.h
@@ -1,7 +1,21 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
+/* Copyright 2020 Joseph Wasson
+ *
+ * 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_CONFIG_H
 
 #define SPACE_COUNT 2
 
@@ -15,7 +29,7 @@
     K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1D, \
     K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, \
     K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K0D, \
-    K41, K49, K42,      K44, K45,      K3C, K0B, K00, K3D       \
+    K41, K49, K42,      K44, K46,      K3C, K0B, K00, K3D       \
 )
 
 #define TEMPLATE_ALT(                                                              \
@@ -28,7 +42,7 @@
     K00, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1D, \
     K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2C, \
     K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, \
-    K41, K49, K42,      K44, K45,      K48, K49, K4B, K4C       \
+    K41, K49, K42,      K44, K46,      K48, K49, K4B, K4C       \
 )
 
 #define TEMPLATE_ADJUST(                                                            \
@@ -41,7 +55,7 @@
     K00, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K2D, \
     K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2C, \
     K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, \
-    K40, K41, K42,      K44, K45,      K48, K0B, K0C, K4C       \
+    K40, K41, K42,      K44, K46,      K48, K0B, K0C, K4C       \
 )
 
 #define TEMPLATE_RESET LAYOUT_arrow( \
@@ -49,5 +63,3 @@
     KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \
     KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, \
     KC_NO, KC_NO, KC_NO,      KC_NO, KC_NO,      KC_NO, KC_NO, KC_NO, RESET)
-
-#endif
diff --git a/qmk/keyboards/thevankeyboards/minivan/keymaps/via/rules.mk b/qmk/keyboards/thevankeyboards/minivan/keymaps/via/rules.mk
index f2e549c7..36b7ba9c 100644
--- a/qmk/keyboards/thevankeyboards/minivan/keymaps/via/rules.mk
+++ b/qmk/keyboards/thevankeyboards/minivan/keymaps/via/rules.mk
@@ -1,10 +1,2 @@
 VIA_ENABLE = yes
 LTO_ENABLE = yes
-# These features are not (yet) supported by VIA
-LEADER_ENABLE = no
-FAUXCLICKY_ENABLE = no
-MIDI_ENABLE = no
-BLUETOOTH_ENABLE = no
-KEY_LOCK_ENABLE = no
-TERMINAL_ENABLE = no
-MOUSEKEY_ENABLE = no
diff --git a/qmk/keyboards/tkc/m0lly/config.h b/qmk/keyboards/tkc/m0lly/config.h
index 29bd8411..77480995 100644
--- a/qmk/keyboards/tkc/m0lly/config.h
+++ b/qmk/keyboards/tkc/m0lly/config.h
@@ -43,6 +43,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
+#define LED_NUM_LOCK_PIN D2
+#define LED_CAPS_LOCK_PIN D3
+#define LED_SCROLL_LOCK_PIN D4
+
 #define BACKLIGHT_PIN B6
 #define BACKLIGHT_BREATHING
 #define BACKLIGHT_LEVELS 3
diff --git a/qmk/keyboards/tkc/m0lly/m0lly.c b/qmk/keyboards/tkc/m0lly/m0lly.c
index e47f9531..e04407a3 100644
--- a/qmk/keyboards/tkc/m0lly/m0lly.c
+++ b/qmk/keyboards/tkc/m0lly/m0lly.c
@@ -14,63 +14,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "m0lly.h"
-#include "led.h"
 
 void keyboard_pre_init_kb(void) {
-  setPinInputHigh(D0);
-  setPinInputHigh(D1);
+    setPinInputHigh(D0);
+    setPinInputHigh(D1);
 
-  keyboard_pre_init_user();
+    setPinOutput(B7);
+    writePinHigh(B7);
+
+    keyboard_pre_init_user();
 }
-
-void matrix_init_kb(void) {
-    // put your keyboard start-up code here
-    // runs once when the firmware starts up
-    led_init_ports();
-    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_init_ports(void) {
-	DDRD |= (1<<2) | (1<<3) | (1<<4); // OUT
-	DDRB |= (1<<7); // OUT
-	PORTB |= (1<<7);
-}
-
-void led_set_kb(uint8_t usb_led) {
-//    led_set_user(usb_led);
-	if (usb_led & (1<<USB_LED_NUM_LOCK)) {
-        // Turn numlock on
-		PORTD |= (1<<2);
-    } else {
-        // Turn numlock off
-	    PORTD &= ~(1<<2);
-    }
-	if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
-        // Turn capslock on
-		PORTD |= (1<<3);
-    } else {
-        // Turn capslock off
-		PORTD &= ~(1<<3);
-    }
-	if (usb_led & (1<<USB_LED_SCROLL_LOCK)) {
-        // Turn scrolllock on
-	    PORTD |= (1<<4);
-    } else {
-        // Turn scrolllock off
-		PORTD &= ~(1<<4);
-    }
-}
\ No newline at end of file
diff --git a/qmk/keyboards/tkc/osav2/info.json b/qmk/keyboards/tkc/osav2/info.json
index adbc6ee1..5a615521 100644
--- a/qmk/keyboards/tkc/osav2/info.json
+++ b/qmk/keyboards/tkc/osav2/info.json
@@ -11,10 +11,10 @@
         "LAYOUT_split_backspace": {
             "layout": [{"label":"Delete", "x":0, "y":0}, {"label":"Esc", "x":1.25, "y":0}, {"label":"!", "x":2.25, "y":0}, {"label":"@", "x":3.25, "y":0}, {"label":"#", "x":4.25, "y":0}, {"label":"$", "x":5.25, "y":0}, {"label":"%", "x":6.25, "y":0}, {"label":"^", "x":7.25, "y":0}, {"label":"&", "x":10.25, "y":0}, {"label":"*", "x":11.25, "y":0}, {"label":"(", "x":12.25, "y":0}, {"label":")", "x":13.25, "y":0}, {"label":"_", "x":14.25, "y":0}, {"label":"+", "x":15.25, "y":0}, {"label":"~", "x":16.25, "y":0}, {"label":"|", "x":17.25, "y":0}, {"label":"Page Up", "x":0, "y":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":9.75, "y":1}, {"label":"U", "x":10.75, "y":1}, {"label":"I", "x":11.75, "y":1}, {"label":"O", "x":12.75, "y":1}, {"label":"P", "x":13.75, "y":1}, {"label":"{", "x":14.75, "y":1}, {"label":"}", "x":15.75, "y":1}, {"label":"Backspace", "x":16.75, "y":1, "w":1.5}, {"label":"Page Down", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":10, "y":2}, {"label":"J", "x":11, "y":2}, {"label":"K", "x":12, "y":2}, {"label":"L", "x":13, "y":2}, {"label":":", "x":14, "y":2}, {"label":"\"", "x":15, "y":2}, {"label":"Enter", "x":16, "y":2, "w":2.25}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":9.5, "y":3}, {"label":"N", "x":10.5, "y":3}, {"label":"M", "x":11.5, "y":3}, {"label":"<", "x":12.5, "y":3}, {"label":">", "x":13.5, "y":3}, {"label":"?", "x":14.5, "y":3}, {"label":"Shift", "x":15.5, "y":3, "w":2.75}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.5}, {"label":"Win", "x":4.25, "y":4, "w":1.5}, {"x":5.75, "y":4, "w":2.25}, {"label":"Fn", "x":8, "y":4}, {"x":9.5, "y":4, "w":2.75}, {"label":"Alt", "x":12.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":16.75, "y":4, "w":1.5}]
         },
-        "LAYOUT_split_right_shift": {
+        "LAYOUT_alice": {
             "layout": [{"label":"Esc", "x":0, "y":0}, {"label":"~", "x":1.25, "y":0}, {"label":"!", "x":2.25, "y":0}, {"label":"@", "x":3.25, "y":0}, {"label":"#", "x":4.25, "y":0}, {"label":"$", "x":5.25, "y":0}, {"label":"%", "x":6.25, "y":0}, {"label":"^", "x":7.25, "y":0}, {"label":"&", "x":10.25, "y":0}, {"label":"*", "x":11.25, "y":0}, {"label":"(", "x":12.25, "y":0}, {"label":")", "x":13.25, "y":0}, {"label":"_", "x":14.25, "y":0}, {"label":"+", "x":15.25, "y":0}, {"label":"Backspace", "x":16.25, "y":0, "w":2}, {"label":"Page Up", "x":0, "y":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":9.75, "y":1}, {"label":"U", "x":10.75, "y":1}, {"label":"I", "x":11.75, "y":1}, {"label":"O", "x":12.75, "y":1}, {"label":"P", "x":13.75, "y":1}, {"label":"{", "x":14.75, "y":1}, {"label":"}", "x":15.75, "y":1}, {"label":"|", "x":16.75, "y":1, "w":1.5}, {"label":"Page Down", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":10, "y":2}, {"label":"J", "x":11, "y":2}, {"label":"K", "x":12, "y":2}, {"label":"L", "x":13, "y":2}, {"label":":", "x":14, "y":2}, {"label":"\"", "x":15, "y":2}, {"label":"Enter", "x":16, "y":2, "w":2.25}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":9.5, "y":3}, {"label":"N", "x":10.5, "y":3}, {"label":"M", "x":11.5, "y":3}, {"label":"<", "x":12.5, "y":3}, {"label":">", "x":13.5, "y":3}, {"label":"?", "x":14.5, "y":3}, {"label":"Shift", "x":15.5, "y":3, "w":1.75}, {"label":"Fn", "x":17.25, "y":3}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.5}, {"label":"Win", "x":4.25, "y":4, "w":1.5}, {"x":5.75, "y":4, "w":2.25}, {"label":"Fn", "x":8, "y":4}, {"x":9.5, "y":4, "w":2.75}, {"label":"Alt", "x":12.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":16.75, "y":4, "w":1.5}]
         },
-        "LAYOUT_all": {
+        "LAYOUT_alice_split_bs": {
             "layout": [{"label":"Delete", "x":0, "y":0}, {"label":"Esc", "x":1.25, "y":0}, {"label":"!", "x":2.25, "y":0}, {"label":"@", "x":3.25, "y":0}, {"label":"#", "x":4.25, "y":0}, {"label":"$", "x":5.25, "y":0}, {"label":"%", "x":6.25, "y":0}, {"label":"^", "x":7.25, "y":0}, {"label":"&", "x":10.25, "y":0}, {"label":"*", "x":11.25, "y":0}, {"label":"(", "x":12.25, "y":0}, {"label":")", "x":13.25, "y":0}, {"label":"_", "x":14.25, "y":0}, {"label":"+", "x":15.25, "y":0}, {"label":"~", "x":16.25, "y":0}, {"label":"|", "x":17.25, "y":0}, {"label":"Page Up", "x":0, "y":1}, {"label":"Tab", "x":1.25, "y":1, "w":1.5}, {"label":"Q", "x":2.75, "y":1}, {"label":"W", "x":3.75, "y":1}, {"label":"E", "x":4.75, "y":1}, {"label":"R", "x":5.75, "y":1}, {"label":"T", "x":6.75, "y":1}, {"label":"Y", "x":9.75, "y":1}, {"label":"U", "x":10.75, "y":1}, {"label":"I", "x":11.75, "y":1}, {"label":"O", "x":12.75, "y":1}, {"label":"P", "x":13.75, "y":1}, {"label":"{", "x":14.75, "y":1}, {"label":"}", "x":15.75, "y":1}, {"label":"Backspace", "x":16.75, "y":1, "w":1.5}, {"label":"Page Down", "x":0, "y":2}, {"label":"Caps Lock", "x":1.25, "y":2, "w":1.75}, {"label":"A", "x":3, "y":2}, {"label":"S", "x":4, "y":2}, {"label":"D", "x":5, "y":2}, {"label":"F", "x":6, "y":2}, {"label":"G", "x":7, "y":2}, {"label":"H", "x":10, "y":2}, {"label":"J", "x":11, "y":2}, {"label":"K", "x":12, "y":2}, {"label":"L", "x":13, "y":2}, {"label":":", "x":14, "y":2}, {"label":"\"", "x":15, "y":2}, {"label":"Enter", "x":16, "y":2, "w":2.25}, {"label":"Shift", "x":1.25, "y":3, "w":2.25}, {"label":"Z", "x":3.5, "y":3}, {"label":"X", "x":4.5, "y":3}, {"label":"C", "x":5.5, "y":3}, {"label":"V", "x":6.5, "y":3}, {"label":"B", "x":7.5, "y":3}, {"label":"B", "x":9.5, "y":3}, {"label":"N", "x":10.5, "y":3}, {"label":"M", "x":11.5, "y":3}, {"label":"<", "x":12.5, "y":3}, {"label":">", "x":13.5, "y":3}, {"label":"?", "x":14.5, "y":3}, {"label":"Shift", "x":15.5, "y":3, "w":1.75}, {"label":"Fn", "x":17.25, "y":3}, {"label":"Ctrl", "x":1.25, "y":4, "w":1.5}, {"label":"Win", "x":4.25, "y":4, "w":1.5}, {"x":5.75, "y":4, "w":2.25}, {"label":"Fn", "x":8, "y":4}, {"x":9.5, "y":4, "w":2.75}, {"label":"Alt", "x":12.25, "y":4, "w":1.5}, {"label":"Ctrl", "x":16.75, "y":4, "w":1.5}]
         }
     }
diff --git a/qmk/keyboards/tkc/osav2/keymaps/brandonschlack/config.h b/qmk/keyboards/tkc/osav2/keymaps/brandonschlack/config.h
new file mode 100644
index 00000000..e74d93c3
--- /dev/null
+++ b/qmk/keyboards/tkc/osav2/keymaps/brandonschlack/config.h
@@ -0,0 +1,30 @@
+/* Copyright 2020 Brandon Schlack
+ *
+ * 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
+
+#define USE_LEDS_FOR_LAYERS
+#define STOPLIGHT_LED
+
+#define TOP_LED    C7
+#define MIDDLE_LED C6
+#define BOTTOM_LED B6
+
+// #define LED_PIN_FLIP
+#ifdef LED_PIN_FLIP
+    #define LED_ON(flag) !flag
+#else
+    #define LED_ON(flag) flag
+#endif
diff --git a/qmk/keyboards/tkc/osav2/keymaps/brandonschlack/keymap.c b/qmk/keyboards/tkc/osav2/keymaps/brandonschlack/keymap.c
new file mode 100644
index 00000000..5e3debd8
--- /dev/null
+++ b/qmk/keyboards/tkc/osav2/keymaps/brandonschlack/keymap.c
@@ -0,0 +1,243 @@
+/* Copyright 2020 Brandon Schlack
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+#include "brandonschlack.h"
+
+/**
+ * Layer Names
+ *
+ * Layers mostly used for macro keys
+ */
+#define _REEDER      _M1
+#define _MAIL        _M2
+#define _REEDER_FN   _M1_FN1
+#define _MAIL_FN     _M2_FN1
+
+/**
+ * Keycodes & Macros
+ */
+#define TG_BASE   TO(_BASE)
+#define TG_REDR   TO(_REEDER)
+#define TG_MAIL   TO(_MAIL)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/* Base
+ * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐
+ * │Ply│ │Esc│! 1│@ 2│# 3│$ 4│% 5│^ 6│         │& 7│* 8│( 9│) 0│_ -│+ =│| \│~ `│
+ * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+ * │VlU│ │Tab  │ Q │ W │ E │ R │ T │         │ Y │ U │ I │ O │ P │{ [│} ]│ Bspc│
+ * ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐        └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │VlD│ │HyCaps│ A │ S │ D │ F │ G │         │ H │ J │ K │ L │: ;│" '│   Enter│
+ * └───┘ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+ *       │LShift  │ Z │ X │ C │ V │ B │     │ B │ N │ M │< ,│> .│? /│  Shft│Fn │
+ *       ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴─┐   ├───┴───┴──┬┴───┴┬──┴───┴────┬─┴───┤
+ *       │Opt  │     │Cmd  │Spc/Lwr│Ctrl│   │   Spc/Rai│  Cmd│           │  Opt│
+ *       └─────┘     └─────┴───────┴────┘   └──────────┴─────┘           └─────┘
+ */
+[_BASE] = LAYOUT_all( \
+    KC_MPLY, KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,  \
+    KC_VOLU, KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC, \
+    KC_VOLD, HY_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_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, LOWER,   \
+             KC_LOPT,          KC_LCMD,     SPC_LWR,      KC_LCTL,          SPC_RAI,          KC_RCMD,                   KC_ROPT \
+),
+/* Reeder
+ * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐
+ * │ H │ │   │   │   │   │   │   │   │         │   │   │   │   │   │   │   │   │
+ * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+ * │ K │ │     │   │   │   │   │   │         │   │   │   │   │   │   │   │     │
+ * ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐        └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │ J │ │      │   │   │   │   │   │         │   │   │   │   │   │   │        │
+ * └───┘ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+ *       │        │   │   │   │   │   │     │   │   │   │   │   │   │      │   │
+ *       ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴─┐   ├───┴───┴──┬┴───┴┬──┴───┴────┬─┴───┤
+ *       │     │     │     │       │    │   │          │     │           │     │
+ *       └─────┘     └─────┴───────┴────┘   └──────────┴─────┘           └─────┘
+ */
+[_REEDER] = LAYOUT_all( \
+    KC_H,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    KC_K,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    KC_J,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, \
+             _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+             _______,          _______,     _______,      _______,          _______,          _______,                   _______ \
+
+),
+/* Mail
+ * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐
+ * │Del│ │   │   │   │   │   │   │   │         │   │   │   │   │   │   │   │   │
+ * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+ * │It+│ │     │   │   │   │   │   │         │   │   │   │   │   │   │   │     │
+ * ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐        └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │It-│ │      │   │   │   │   │   │         │   │   │   │   │   │   │        │
+ * └───┘ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+ *       │        │   │   │   │   │   │     │   │   │   │   │   │   │      │   │
+ *       ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴─┐   ├───┴───┴──┬┴───┴┬──┴───┴────┬─┴───┤
+ *       │     │     │     │       │    │   │          │     │           │     │
+ *       └─────┘     └─────┴───────┴────┘   └──────────┴─────┘           └─────┘
+ */
+[_MAIL] = LAYOUT_all( \
+    G(KC_BSPC), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    KC_DOWN, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, \
+             _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+             _______,          _______,     _______,      _______,          _______,          _______,                   _______ \
+
+),
+/* Lower
+ * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐
+ * │Mut│ │Mke│ F1│ F2│ F3│ F4│ F5│ F6│         │ F7│ F8│ F9│F10│F11│F12│LHP│SLP│
+ * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+ * │Nxt│ │RMod │RH+│RS+│RV+│Sp+│   │         │   │   │   │   │PgU│Hom│End│  Del│
+ * ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐        └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │Prv│ │RTgl  │RH-│RS-│RV-│Sp-│   │         │   │   │Prv│Nxt│PgD│ ↑ │   Play │
+ * └───┘ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+ *       │        │LYR│Thm│   │   │   │     │   │   │   │   │ ← │ ↓ │→ Shft│   │
+ *       ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴─┐   ├───┴───┴──┬┴───┴┬──┴───┴────┬─┴───┤
+ *       │     │     │     │       │    │   │          │     │           │     │
+ *       └─────┘     └─────┴───────┴────┘   └──────────┴─────┘           └─────┘
+ */
+[_LOWER] = LAYOUT_all( \
+    KC_MUTE, QM_MAKE, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  MC_LHPD, MC_SLPD, \
+    KC_MNXT, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, KC_PGUP, KC_HOME, KC_END,  KC_DELT, \
+    KC_MPRV, RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, KC_MPRV, KC_MNXT, KC_PGDN, KC_UP,            KC_MPLY, \
+             _______, RGB_LYR, RGB_THM, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, RGT_SFT, _______, \
+             _______,          _______,     _______,      _______,          _______,          _______,                   _______ \
+
+),
+/* Reeder Function
+ * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐
+ * │ L │ │   │   │   │   │   │   │   │         │   │   │   │   │   │   │   │   │
+ * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+ * │ P │ │     │   │   │   │   │   │         │   │   │   │   │   │   │   │     │
+ * ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐        └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │ N │ │      │   │   │   │   │   │         │   │   │   │   │   │   │        │
+ * └───┘ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+ *       │        │   │   │   │   │   │     │   │   │   │   │   │   │      │   │
+ *       ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴─┐   ├───┴───┴──┬┴───┴┬──┴───┴────┬─┴───┤
+ *       │     │     │     │       │    │   │          │     │           │     │
+ *       └─────┘     └─────┴───────┴────┘   └──────────┴─────┘           └─────┘
+ */
+[_REEDER_FN] = LAYOUT_all( \
+    KC_L,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    KC_P,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    KC_N,    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, \
+             _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+             _______,          _______,     _______,      _______,          _______,          _______,                   _______ \
+
+),
+/* Mail
+ * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐
+ * │Del│ │   │   │   │   │   │   │   │         │   │   │   │   │   │   │   │   │
+ * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+ * │It+│ │     │   │   │   │   │   │         │   │   │   │   │   │   │   │     │
+ * ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐        └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │It-│ │      │   │   │   │   │   │         │   │   │   │   │   │   │        │
+ * └───┘ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+ *       │        │   │   │   │   │   │     │   │   │   │   │   │   │      │   │
+ *       ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴─┐   ├───┴───┴──┬┴───┴┬──┴───┴────┬─┴───┤
+ *       │     │     │     │       │    │   │          │     │           │     │
+ *       └─────┘     └─────┴───────┴────┘   └──────────┴─────┘           └─────┘
+ */
+[_MAIL_FN] = LAYOUT_all( \
+    KC_BSPC, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    A(G(KC_LBRC)),   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    A(G(KC_RBRC)), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, \
+             _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+             _______,          _______,     _______,      _______,          _______,          _______,                   _______ \
+
+),
+/* Raise
+ * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐
+ * │   │ │   │   │   │   │   │   │   │         │   │   │   │   │   │   │   │   │
+ * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+ * │   │ │     │   │   │   │   │   │         │   │   │   │   │   │   │   │     │
+ * ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐        └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │   │ │      │   │   │   │   │   │         │   │   │   │   │   │   │        │
+ * └───┘ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+ *       │        │   │   │   │   │   │     │   │   │   │   │   │   │      │   │
+ *       ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴─┐   ├───┴───┴──┬┴───┴┬──┴───┴────┬─┴───┤
+ *       │     │     │     │       │    │   │          │     │           │     │
+ *       └─────┘     └─────┴───────┴────┘   └──────────┴─────┘           └─────┘
+ */
+[_RAISE] = LAYOUT_all( \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, \
+             _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+             _______,          _______,     _______,      _______,          _______,          _______,                   _______ \
+
+),
+/* Adjust
+ * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐
+ * │Bse│ │Mke│   │   │   │   │   │   │         │   │   │   │   │   │   │   │   │
+ * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+ * │Rdr│ │RMod │RH+│RS+│RV+│Sp+│   │         │   │   │   │   │   │   │   │     │
+ * ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐        └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │Mai│ │RTgl  │RH-│RS-│RV-│Sp-│   │         │   │   │   │   │   │   │        │
+ * └───┘ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+ *       │        │LYR│Thm│   │EEP│Rst│     │Rst│   │   │   │   │   │      │   │
+ *       ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴─┐   ├───┴───┴──┬┴───┴┬──┴───┴────┬─┴───┤
+ *       │     │     │     │       │    │   │          │     │           │     │
+ *       └─────┘     └─────┴───────┴────┘   └──────────┴─────┘           └─────┘
+ */
+[_ADJUST] = LAYOUT_all( \
+    TG_BASE, QM_MAKE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    TG_REDR, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    TG_MAIL, RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______,          _______, \
+             _______, RGB_LYR, RGB_THM, _______, EEP_RST, RESET,   RESET,   _______, _______, _______, _______, _______, _______, _______, \
+             _______,          _______,     _______,      _______,          _______,          _______,                   _______ \
+
+)
+/* Layout
+ * ┌───┐ ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐
+ * │   │ │   │   │   │   │   │   │   │         │   │   │   │   │   │   │   │   │
+ * ├───┤ ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+ * │   │ │     │   │   │   │   │   │         │   │   │   │   │   │   │   │     │
+ * ├───┤ ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐        └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │   │ │      │   │   │   │   │   │         │   │   │   │   │   │   │        │
+ * └───┘ ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┐     ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+ *       │        │   │   │   │   │   │     │   │   │   │   │   │   │      │   │
+ *       ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴─┐   ├───┴───┴──┬┴───┴┬──┴───┴────┬─┴───┤
+ *       │     │     │     │       │    │   │          │     │           │     │
+ *       └─────┘     └─────┴───────┴────┘   └──────────┴─────┘           └─────┘
+ */
+/*
+[_BLANK] = LAYOUT( \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, \
+             _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+             _______,          _______,     _______,      _______,          _______,          _______,                   _______ \
+
+)
+*/
+};
+
+layer_state_t layer_state_set_keymap(layer_state_t state) {
+    state = update_tri_layer_state(state, _LOWER,  _RAISE, _ADJUST);
+    state = update_tri_layer_state(state, _REEDER, _LOWER, _REEDER_FN);
+    state = update_tri_layer_state(state, _MAIL,   _LOWER, _MAIL_FN);
+    return state;
+}
+
+#ifdef USE_LEDS_FOR_LAYERS
+bool led_update_keymap(led_t led_state) {
+    writePin(TOP_LED, LED_ON(IS_LAYER_ON(_REEDER) || IS_LAYER_ON(_MAIL))); // Use for Macro Layer
+    writePin(MIDDLE_LED, LED_ON(IS_LAYER_ON(_FN1))); // Use for Layer 2
+    writePin(BOTTOM_LED, LED_ON(led_state.caps_lock)); // Use for Caps Lock
+    return false; // Override default set by KB
+}
+#endif
diff --git a/qmk/keyboards/tkc/osav2/keymaps/brandonschlack/rules.mk b/qmk/keyboards/tkc/osav2/keymaps/brandonschlack/rules.mk
new file mode 100644
index 00000000..9c896e0d
--- /dev/null
+++ b/qmk/keyboards/tkc/osav2/keymaps/brandonschlack/rules.mk
@@ -0,0 +1,9 @@
+# Build Options
+#   comment out to disable the options.
+#
+BACKLIGHT_ENABLE = no
+MOUSEKEY_ENABLE = yes	# Mouse keys
+CONSOLE_ENABLE = no 	# Console for debug
+COMMAND_ENABLE = no     # Commands for debug and configuration
+VELOCIKEY_ENABLE = no
+
diff --git a/qmk/keyboards/tkc/osav2/osav2.h b/qmk/keyboards/tkc/osav2/osav2.h
index 46cb3cd8..d6ac51c7 100644
--- a/qmk/keyboards/tkc/osav2/osav2.h
+++ b/qmk/keyboards/tkc/osav2/osav2.h
@@ -77,7 +77,7 @@
     { KC_NO, K81,   K82,   K83,   K84,   K85,   K86,   K87    }, \
     { K90,   KC_NO, KC_NO, K93,   KC_NO, K95,   KC_NO, KC_NO  }  \
 }
-#define LAYOUT_split_right_shift( \
+#define LAYOUT_alice( \
   K10, K00, K01, K02, K03, K04, K05, K06,   K56, K55, K54, K53, K52, K51,      K57, \
   K20, K11, K12, K13, K14, K15, K16,        K66, K65, K64, K63, K62, K61, K60, K67, \
   K30, K21, K22, K23, K24, K25, K26,        K76, K75, K74, K73, K72, K71,      K77, \
@@ -96,7 +96,7 @@
     { K80,   K81,   K82,   K83,   K84,   K85,   K86,   K87    }, \
     { K90,   KC_NO, KC_NO, K93,   KC_NO, K95,   KC_NO, KC_NO  }  \
 }
-#define LAYOUT_all( \
+#define LAYOUT_alice_split_bs( \
   K10, K00, K01, K02, K03, K04, K05, K06,   K56, K55, K54, K53, K52, K51, K50, K57, \
   K20, K11, K12, K13, K14, K15, K16,        K66, K65, K64, K63, K62, K61, K60, K67, \
   K30, K21, K22, K23, K24, K25, K26,        K76, K75, K74, K73, K72, K71,      K77, \
@@ -115,3 +115,6 @@
     { K80,   K81,   K82,   K83,   K84,   K85,   K86,   K87    }, \
     { K90,   KC_NO, KC_NO, K93,   KC_NO, K95,   KC_NO, KC_NO  }  \
 }
+
+#define LAYOUT_split_right_shift LAYOUT_alice
+#define LAYOUT_all LAYOUT_alice_split_bs
diff --git a/qmk/keyboards/tkc/osav2/rules.mk b/qmk/keyboards/tkc/osav2/rules.mk
index a11aa7ae..6a6f28d4 100644
--- a/qmk/keyboards/tkc/osav2/rules.mk
+++ b/qmk/keyboards/tkc/osav2/rules.mk
@@ -31,3 +31,5 @@ BLUETOOTH_ENABLE = no       # Enable Bluetooth
 AUDIO_ENABLE = no           # Audio output
 FAUXCLICKY_ENABLE = no      # Use buzzer to emulate clicky switches
 LTO_ENABLE = yes            # Reduces compile size
+
+LAYOUTS = alice alice_split_bs
diff --git a/qmk/keyboards/tkc/tkc1800/config.h b/qmk/keyboards/tkc/tkc1800/config.h
index 9c35699c..f54583c2 100644
--- a/qmk/keyboards/tkc/tkc1800/config.h
+++ b/qmk/keyboards/tkc/tkc1800/config.h
@@ -43,6 +43,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
+#define LED_NUM_LOCK_PIN D2
+#define LED_CAPS_LOCK_PIN D3
+#define LED_SCROLL_LOCK_PIN D4
+
 #define BACKLIGHT_PIN B6
 #define BACKLIGHT_BREATHING
 #define BACKLIGHT_LEVELS 3
diff --git a/qmk/keyboards/tkc/tkc1800/tkc1800.c b/qmk/keyboards/tkc/tkc1800/tkc1800.c
index 4232c97d..08e4e0bb 100644
--- a/qmk/keyboards/tkc/tkc1800/tkc1800.c
+++ b/qmk/keyboards/tkc/tkc1800/tkc1800.c
@@ -14,63 +14,13 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "tkc1800.h"
-#include "led.h"
 
 void keyboard_pre_init_kb(void) {
-  setPinInputHigh(D0);
-  setPinInputHigh(D1);
+    setPinInputHigh(D0);
+    setPinInputHigh(D1);
 
-  keyboard_pre_init_user();
+    setPinOutput(B7);
+    writePinHigh(B7);
+
+    keyboard_pre_init_user();
 }
-
-void matrix_init_kb(void) {
-    // put your keyboard start-up code here
-    // runs once when the firmware starts up
-    led_init_ports();
-    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_init_ports(void) {
-	DDRD |= (1<<2) | (1<<3) | (1<<4); // OUT
-	DDRB |= (1<<7); // OUT
-	PORTB |= (1<<7);
-}
-
-void led_set_kb(uint8_t usb_led) {
-//    led_set_user(usb_led);
-	if (usb_led & (1<<USB_LED_NUM_LOCK)) {
-        // Turn numlock on
-		PORTD |= (1<<2);
-    } else {
-        // Turn numlock off
-	    PORTD &= ~(1<<2);
-    }
-	if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
-        // Turn capslock on
-		PORTD |= (1<<3);
-    } else {
-        // Turn capslock off
-		PORTD &= ~(1<<3);
-    }
-	if (usb_led & (1<<USB_LED_SCROLL_LOCK)) {
-        // Turn scrolllock on
-	    PORTD |= (1<<4);
-    } else {
-        // Turn scrolllock off
-		PORTD &= ~(1<<4);
-    }
-}
\ No newline at end of file
diff --git a/qmk/keyboards/tkc/tkl_ab87/config.h b/qmk/keyboards/tkc/tkl_ab87/config.h
new file mode 100644
index 00000000..71bf94ca
--- /dev/null
+++ b/qmk/keyboards/tkc/tkl_ab87/config.h
@@ -0,0 +1,151 @@
+/*
+Copyright 2020 Terry Mathews
+
+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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x544B //TK
+#define PRODUCT_ID      0x0007
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    TKC
+#define PRODUCT         TKL A/B87
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 16
+
+#define DYNAMIC_KEYMAP_LAYER_COUNT 2 //Reduced layer count due to memory space considerations
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+*/
+#define MATRIX_ROW_PINS { B1, F5, F7, B0, B2, B3 }
+#define MATRIX_COL_PINS { D0, D1, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6, C7, E6, F6, F4 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+//#define SOFT_SERIAL_PIN D0 // or D1, D2, D3, E6
+#define BACKLIGHT_PIN B7
+#ifdef BACKLIGHT_PIN
+#define BACKLIGHT_BREATHING
+#define BACKLIGHT_LEVELS 3
+#endif
+#define RGB_DI_PIN E2
+#ifdef RGB_DI_PIN
+  #define RGBLED_NUM 22
+  #define RGBLIGHT_HUE_STEP 8
+  #define RGBLIGHT_SAT_STEP 8
+  #define RGBLIGHT_VAL_STEP 8
+  #define RGBLIGHT_LIMIT_VAL 200 /* The maximum brightness level */
+  #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+/*== all animations enable ==*/
+  #define RGBLIGHT_ANIMATIONS
+// /*== or choose animations ==*/
+//   #define RGBLIGHT_EFFECT_BREATHING
+//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
+//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+//   #define RGBLIGHT_EFFECT_SNAKE
+//   #define RGBLIGHT_EFFECT_KNIGHT
+//   #define RGBLIGHT_EFFECT_CHRISTMAS
+//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
+//   #define RGBLIGHT_EFFECT_RGB_TEST
+//   #define RGBLIGHT_EFFECT_ALTERNATING
+// /*== customize breathing effect ==*/
+//   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+//   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+//   /*==== use exp() and sin() ====*/
+//   #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//   #define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+#endif
+
+#define LED_SCROLL_LOCK_PIN F0
+#define LED_CAPS_LOCK_PIN F1
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* number of backlight levels */
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is userful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+// #define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+//#define NO_ACTION_MACRO
+//#define NO_ACTION_FUNCTION
+
+/* Bootmagic Lite key configuration */
+// #define BOOTMAGIC_LITE_ROW 0
+// #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/tkc/tkl_ab87/info.json b/qmk/keyboards/tkc/tkl_ab87/info.json
new file mode 100644
index 00000000..478c064f
--- /dev/null
+++ b/qmk/keyboards/tkc/tkl_ab87/info.json
@@ -0,0 +1,103 @@
+{
+    "keyboard_name": "TKC TKL A/B87", 
+    "url": "", 
+    "maintainer": "TerryMathews", 
+    "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}, 
+				{"label":"Del", "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}, 
+				{"label":"Nuhs", "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}, 
+				{"label":"Nubs", "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}, 
+				{"label":"Del", "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}]
+        }
+    }
+}
\ No newline at end of file
diff --git a/qmk/keyboards/tkc/tkl_ab87/keymaps/default/keymap.c b/qmk/keyboards/tkc/tkl_ab87/keymaps/default/keymap.c
new file mode 100644
index 00000000..0213499e
--- /dev/null
+++ b/qmk/keyboards/tkc/tkl_ab87/keymaps/default/keymap.c
@@ -0,0 +1,28 @@
+/* Copyright 2020 Terry Mathews
+ *
+ * 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_all( /* 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_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_DEL, 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_RSFT, KC_DEL,                    KC_UP,
+	KC_LCTL, KC_LGUI, KC_LALT,                           KC_SPC,                                       KC_RALT, KC_RGUI, KC_APP,  KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
+  ),
+};
diff --git a/qmk/keyboards/tkc/tkl_ab87/keymaps/via/keymap.c b/qmk/keyboards/tkc/tkl_ab87/keymaps/via/keymap.c
new file mode 100644
index 00000000..f3b011f0
--- /dev/null
+++ b/qmk/keyboards/tkc/tkl_ab87/keymaps/via/keymap.c
@@ -0,0 +1,44 @@
+/* Copyright 2020 Terry Mathews
+ *
+ * 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
+
+//Layers
+
+enum {
+  BASE = 0,
+  FUNCTION,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [BASE] = LAYOUT_all( /* 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_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_DEL, 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_RSFT, KC_DEL,                    KC_UP,
+	KC_LCTL, KC_LGUI, KC_LALT,                           KC_SPC,                                       KC_RALT, KC_RGUI, KC_APP,  KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT
+  ),
+  [FUNCTION] = LAYOUT_all( /* Function */
+    
+	_______,           _______,   _______,   _______,   _______,        _______,   _______,   _______,   _______,       _______,   _______,  _______,  _______,           _______, _______, _______,
+	_______,  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______, _______,  _______, _______,           _______,  _______, _______,
+	_______,  _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______, _______,          _______,          _______,  _______,  _______,
+	_______, _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______, _______, _______,          _______,
+	_______, _______, _______,    _______,    _______,    _______,    _______,    _______,    _______,    _______, _______,  _______,          _______, _______,                    _______,
+	_______, _______, _______,                           _______,                                       _______, _______, _______,  _______,          _______, _______, _______
+  ),
+};
diff --git a/qmk/keyboards/tkc/tkl_ab87/keymaps/via/rules.mk b/qmk/keyboards/tkc/tkl_ab87/keymaps/via/rules.mk
new file mode 100644
index 00000000..1e5b9980
--- /dev/null
+++ b/qmk/keyboards/tkc/tkl_ab87/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/qmk/keyboards/tkc/tkl_ab87/readme.md b/qmk/keyboards/tkc/tkl_ab87/readme.md
new file mode 100644
index 00000000..e91380ca
--- /dev/null
+++ b/qmk/keyboards/tkc/tkl_ab87/readme.md
@@ -0,0 +1,27 @@
+# TKC TKL A/B87
+
+![Photo](https://i.imgur.com/BRHfEbHl.jpg)
+
+A fairly typical TKL
+
+* Keyboard Maintainer: [TerryMathews](https://github.com/TerryMathews)
+* Hardware Supported: TKC TKL A/B87 PCB
+* Hardware Availability: TBA
+
+	
+Reset board in one of two ways:
+
+	1) Short reset header to right of up arrow key
+![Photo](https://i.imgur.com/S01CTTGl.jpg)
+	
+	2) Hold down Esc key while plugging in USB-C
+
+Make example for this keyboard (after setting up your build environment):
+
+    make tkc/tkl_ab87:default
+
+Flashing example for this keyboard:
+
+    make tkc/tkl_ab87:default:flash
+
+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).
diff --git a/qmk/keyboards/tkc/tkl_ab87/rules.mk b/qmk/keyboards/tkc/tkl_ab87/rules.mk
new file mode 100644
index 00000000..1d60cf3c
--- /dev/null
+++ b/qmk/keyboards/tkc/tkl_ab87/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+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 = 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 = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
diff --git a/qmk/keyboards/tkc/tkl_ab87/tkl_ab87.c b/qmk/keyboards/tkc/tkl_ab87/tkl_ab87.c
new file mode 100644
index 00000000..5d1b2d98
--- /dev/null
+++ b/qmk/keyboards/tkc/tkl_ab87/tkl_ab87.c
@@ -0,0 +1,16 @@
+/* Copyright 2020 Terry Mathews
+ *
+ * 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 "tkl_ab87.h"
diff --git a/qmk/keyboards/tkc/tkl_ab87/tkl_ab87.h b/qmk/keyboards/tkc/tkl_ab87/tkl_ab87.h
new file mode 100644
index 00000000..3d831bb7
--- /dev/null
+++ b/qmk/keyboards/tkc/tkl_ab87/tkl_ab87.h
@@ -0,0 +1,42 @@
+/* Copyright 2020 Terry Mathews
+ *
+ * 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 first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT_all( \
+    K00,  K01, K02, K03, K04,    K05, K06, K07, K08,    K09, K0A, K0B, K0C,     K0E, K0F, K56,  \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K0D, K1D,  K1E, K1F, K55,  \
+    K20,   K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,     K2E, K2F, K54,  \
+    K30,    K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,   K3D,                  \
+    K40,  K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B,   K4C,   K4D,       K4F,       \
+    K50,  K51,  K52,              K57,                K5A,  K5B,  K5C,  K5D,    K5E, K5F, K53   \
+) { \
+    { K00,   K01,   K02,   K03,   K04,   K05,   K06,   K07,   K08, K09, K0A, K0B, K0C, K0D, K0E, K0F   }, \
+    { K10,   K11,   K12,   K13,   K14,   K15,   K16,   K17,   K18, K19, K1A, K1B, K1C, K1D, K1E, K1F   }, \
+    { K20,   K21,   K22,   K23,   K24,   K25,   K26,   K27,   K28, K29, K2A, K2B, K2C, K2D, K2E, K2F   }, \
+    { K30,   K31,   K32,   K33,   K34,   K35,   K36,   K37,   K38, K39, K3A, K3B, K3C, K3D,KC_NO,KC_NO }, \
+    { K40,   K41,   K42,   K43,   K44,   K45,   K46,   K47,   K48, K49, K4A, K4B, K4C, K4D,KC_NO,K4F   }, \
+    { K50,   K51,   K52,   K53,   K54,   K55,   K56,  K57, KC_NO,KC_NO,K5A, K5B, K5C, K5D, K5E, K5F   }, \
+}
diff --git a/qmk/keyboards/tmo50/keymaps/talljoe/config.h b/qmk/keyboards/tmo50/keymaps/talljoe/config.h
new file mode 100644
index 00000000..53d59338
--- /dev/null
+++ b/qmk/keyboards/tmo50/keymaps/talljoe/config.h
@@ -0,0 +1,33 @@
+/* Copyright 2020 Joseph Wasson
+ *
+ * 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
+
+#define SPACE_COUNT 2
+
+#define TEMPLATE_TKL(\
+  KESC,       KF01, KF02, KF03, KF04, KF05, KF06, KF07, KF08, KF09, KF10, KF11, KF12,   KSCL, KPRS, KADJ, \
+  KGRV, K_1 , K_2 , K_3 , K_4 , K_5 , K_6 , K_7 , K_8 , K_9 , K_0 , KMIN, KEQL, KBLS,   KINS, KHOM, KPUP, \
+  KTAB, K_Q , K_W , K_E , K_R , K_T , K_Y , K_U , K_I , K_O , K_P , KLBR, KRBR, KBSP,   KDEL, KEND, LPDN, \
+  KCAP, K_A , K_S , K_D , K_F , K_G , K_H , K_J , K_K , K_L , KSMI, KQUO,       KENT,                     \
+  KLSH, K_Z , K_X , K_C , K_V , K_B , K_N , K_M , KCMA, KDOT, KSLS,             KRSH,         K_UP,       \
+  KLCT, KLOS, KLAL,             KSP2, KSP3, KSP1,             KRAL, KROS, KRCT, KPTT,   K_LT, K_DN, K_RT  \
+) LAYOUT_all( \
+	KF01, KTAB, K_Q , K_W , K_E , K_R , K_T , K_Y , K_U , K_I , K_O , K_P , KLBR, KRBR, KBSP, \
+	KF02, KCAP, K_A , K_S , K_D , K_F , K_G , K_H , K_J , K_K , K_L , KSMI, KQUO,       KENT, \
+	KF03, KLSH, K_Z , K_X , K_C , K_V , K_B , K_N , K_M , KCMA, KDOT, KSLS,       KRSH, KADJ, \
+	KF04,             KLOS, KLAL,       KSP2,             KSP1,       KRAL, KESC              \
+)
diff --git a/qmk/keyboards/tmo50/keymaps/talljoe/keymap.c b/qmk/keyboards/tmo50/keymaps/talljoe/keymap.c
new file mode 100644
index 00000000..fa652399
--- /dev/null
+++ b/qmk/keyboards/tmo50/keymaps/talljoe/keymap.c
@@ -0,0 +1,44 @@
+#include "quantum.h"
+#include "talljoe.h"
+
+bool process_indicator_led_user(uint32_t state){
+  return false;
+}
+
+#define LED_MASK (_BV(PB0) | _BV(PB1) | _BV(PB2) | _BV(PB3))
+#define WHITE (_BV(PB0))
+#define YELLOW (_BV(PB1))
+#define MAGENTA (_BV(PB2))
+#define RED (_BV(PB3))
+
+void matrix_scan_keymap(void) {
+  uint32_t lights = WHITE;
+
+  switch(get_highest_layer(layer_state))
+  {
+    case _NAV:
+      lights |= YELLOW;
+      break;
+    case _NUM:
+      lights |= MAGENTA;
+      break;
+    case _ADJUST:
+      lights |= RED;
+      break;
+    default: {
+      uint8_t default_layer = get_highest_layer(default_layer_state);
+      lights = 0; // no white LED by default.
+      if(default_layer & 1)
+        lights |= YELLOW;
+      if(default_layer & 2)
+        lights |= MAGENTA;
+      if(default_layer & 4)
+        lights |= RED;
+    }
+  }
+
+  uint32_t port = PORTB;
+  port |= LED_MASK;
+  port &= ~lights;
+  PORTB = port;
+}
diff --git a/qmk/keyboards/tmo50/rules.mk b/qmk/keyboards/tmo50/rules.mk
index 954dd224..aae95314 100644
--- a/qmk/keyboards/tmo50/rules.mk
+++ b/qmk/keyboards/tmo50/rules.mk
@@ -30,4 +30,3 @@ 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
diff --git a/qmk/keyboards/toad/config.h b/qmk/keyboards/toad/config.h
index 5f3eb43c..016bd541 100644
--- a/qmk/keyboards/toad/config.h
+++ b/qmk/keyboards/toad/config.h
@@ -23,6 +23,10 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
+#define LED_CAPS_LOCK_PIN B6
+#define LED_SCROLL_LOCK_PIN B5
+#define LED_PIN_ON_STATE 0
+
 /* number of backlight levels */
 
 #ifdef BACKLIGHT_PIN
diff --git a/qmk/keyboards/toad/toad.c b/qmk/keyboards/toad/toad.c
index bc4db033..a5877950 100644
--- a/qmk/keyboards/toad/toad.c
+++ b/qmk/keyboards/toad/toad.c
@@ -1,18 +1 @@
 #include "toad.h"
-
-void led_set_user(uint8_t usb_led) {
-
-	//LED1
-	if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
-		DDRB |= (1 << 6); PORTB &= ~(1 << 6);
-	} else {
-		DDRB &= ~(1 << 6); PORTB &= ~(1 << 6);
-	}
-
-	//LED2
-	if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
-		DDRB |= (1 << 5); PORTB &= ~(1 << 5);
-	} else {
-		DDRB &= ~(1 << 5); PORTB &= ~(1 << 5);
-	}
-}
diff --git a/qmk/keyboards/torn/keymaps/kinesish/config.h b/qmk/keyboards/torn/keymaps/kinesish/config.h
new file mode 100644
index 00000000..734512e6
--- /dev/null
+++ b/qmk/keyboards/torn/keymaps/kinesish/config.h
@@ -0,0 +1,21 @@
+/* Copyright 2020 Alexander Dergachev (alexander.dergachev@gmail.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#define TAPPING_TERM 200
+#define IGNORE_MOD_TAP_INTERRUPT_PER_KEY
+#define PERMISSIVE_HOLD_PER_KEY
diff --git a/qmk/keyboards/torn/keymaps/kinesish/keymap.c b/qmk/keyboards/torn/keymaps/kinesish/keymap.c
new file mode 100644
index 00000000..fcac4698
--- /dev/null
+++ b/qmk/keyboards/torn/keymaps/kinesish/keymap.c
@@ -0,0 +1,165 @@
+/* Copyright 2020 Alexander Dergachev (alexander.dergachev@gmail.com)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+enum torn_layers { _QWERTY, _LOWER, _RAISE, _ADJUST };
+
+#define G_DEL LGUI_T(KC_DEL)
+#define G_ENT RGUI_T(KC_ENT)
+
+#define C_BSPC LCTL_T(KC_BSPC)
+#define C_SPC RCTL_T(KC_SPC)
+
+#define S_EQL LSFT_T(KC_EQL)
+#define S_MINS RSFT_T(KC_MINS)
+
+#define R_TAB LT(_RAISE, KC_TAB)
+#define R_BSLS LT(_RAISE, KC_BSLS)
+
+#define L_GRV LT(_LOWER, KC_GRV)
+#define L_QUOT LT(_LOWER, KC_QUOT)
+
+// clang-format off
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/* Qwerty
+ * ,-----------------------------------------.    ,-----------------------------------------.
+ * | Tab  |   Q  |   W  |   E  |   R  |   T  |    |   Y  |   U  |   I  |   O  |   P  |  \   |
+ * | Raise|      |      |      |      |      |    |      |      |      |      |      | Raise|
+ * |------+------+------+------+------+------|    |------+------+------+------+------+------|
+ * | `    |   A  |   S  |   D  |   F  |   G  |    |   H  |   J  |   K  |   L  |   ;  |  '   |
+ * | Lower|      |      |      |      |      |    |      |      |      |      |      | Lower|
+ * |------+------+------+------+------+------|    |------+------+------+------+------+------|
+ * |  =+  |   Z  |   X  |   C  |   V  |   B  |    |   N  |   M  |   ,  |   .  |   /  |  -_  |
+ * | Shift|      |      |      |      |      |    |      |      |      |      |      | Shift|
+ * |------+------+------+------+------+------|    |------+------+------+------+------+------|
+ *               | ____ | Alt  | Bksp | Del  |    |Enter |Space | Alt  | ____ |
+ *               |      |      | Ctrl | Gui  |    | Gui  | Ctrl |      |      |
+ *               `---------------------------'    `---------------------------'
+ */
+[_QWERTY] = LAYOUT_split_3x6_4(
+    R_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    R_BSLS,
+    L_GRV,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,      KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, L_QUOT,
+    S_EQL,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,      KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, S_MINS ,
+                     _______, KC_LALT, C_BSPC,  G_DEL,     G_ENT,   C_SPC,   KC_RALT, _______
+),
+
+/* Lower
+ * ,-----------------------------------------.    ,-----------------------------------------.
+ * |  Esc |   !  |   @  |   #  |   $  |   %  |    |   ^  |   &  |   *  |   (  |   )  |      |
+ * |------+------+------+------+------+------|    |------+------+------+------+------+------|
+ * |      |   1  |   2  |   3  |   4  |   5  |    |   6  |   7  |   8  |   9  |   0  |      |
+ * |------+------+------+------+------+------|    |------+------+------+------+------+------|
+ * |      |      |      |      |      |      |    |      |      |      |   [  |   ]  |      |
+ * |------+------+------+------+------+------|    |------+------+------+------+------+------|
+ *               | ____ | Alt  | Bksp | Del  |    |Enter |Space | Alt  | ____ |
+ *               |      |      | Ctrl | Gui  |    | Gui  | Ctrl |      |      |
+ *               `---------------------------'    `---------------------------'
+ */
+[_LOWER] = LAYOUT_split_3x6_4(
+    KC_ESC,   KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,   KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_TRNS,
+    KC_TRNS,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,      KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_TRNS,
+    KC_TRNS,  _______, _______, _______, _______, _______,   _______, _______, _______, KC_LBRC, KC_RBRC, KC_TRNS,
+                       KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+),
+
+/* Raise
+ * ,-----------------------------------------.    ,-----------------------------------------.
+ * |      |  F1  |  F2  |  F3  |  F4  |  F5  |    | S+H  | S+A+L|  UP  | S+A+R| S+E  |      |
+ * |------+------+------+------+------+------|    |------+------+------+------+------+------|
+ * |      |  F6  |  F7  |  F8  |  F9  |  F10 |    | Home | Left | Down | Right| End  | PgUp |
+ * |------+------+------+------+------+------|    |------+------+------+------+------+------|
+ * |      |  F11 |  F12 |      |      |      |    | A+L  | S+L  | S+D  | S+R  | A+R  | PgDn |
+ * |------+------+------+------+------+------|    |------+------+------+------+------+------|
+ *               | ____ | Alt  | Bksp | Del  |    |Enter |Space | Alt  | ____ |
+ *               |      |      | Ctrl | Gui  |    | Gui  | Ctrl |      |      |
+ *               `---------------------------'    `---------------------------'
+ */
+[_RAISE] = LAYOUT_split_3x6_4(
+    KC_TRNS, KC_F1,  KC_F2,   KC_F3,   KC_F4,   KC_F5,     S(KC_HOME), S(A(KC_LEFT)), KC_UP,      S(A(KC_RGHT)), S(KC_END),  KC_TRNS,
+    KC_TRNS, KC_F6,  KC_F7,   KC_F8,   KC_F9,   KC_F10,    KC_HOME,    KC_LEFT,       KC_DOWN,    KC_RGHT,       KC_END,     KC_PGUP,
+    KC_TRNS, KC_F11, KC_F12,  _______, _______, _______,   A(KC_LEFT), S(KC_LEFT),    S(KC_DOWN), S(KC_RGHT),    A(KC_RGHT), KC_PGDN ,
+                     KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+),
+
+/* Adjust
+ * ,-----------------------------------------.    ,-----------------------------------------.
+ * |      |      |      |      |      |      |    |      |      |      |      |      |      |
+ * |------+------+------+------+------+------|    |------+------+------+------+------+------|
+ * |      |      |      |      |      |      |    |      |      |      |      |      |      |
+ * |------+------+------+------+------+------|    |------+------+------+------+------+------|
+ * |      |      |      |      |      |      |    |      |      |      |      |      |      |
+ * |------+------+------+------+------+------|    |------+------+------+------+------+------|
+ *               | ____ | Alt  | Bksp | Del  |    |Enter |Space | Alt  | ____ |
+ *               |      |      | Ctrl | Gui  |    | Gui  | Ctrl |      |      |
+ *               `---------------------------'    `---------------------------'
+ */
+[_ADJUST] = LAYOUT_split_3x6_4(
+    _______, _______, _______, _______, _______, _______,   _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______,   _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______,   _______, _______, _______, _______, _______, _______,
+                      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
+)
+
+};
+
+const uint16_t PROGMEM encoder_keymaps[][2][2] = {
+    [_QWERTY] =  { { C(S(KC_TAB)), C(KC_TAB) },     { G(A(KC_LEFT)), G(A(KC_RIGHT)) } },
+    [_LOWER]  =  { { C(KC_LEFT),   C(KC_RGHT) },    { KC__VOLDOWN,   KC__VOLUP } },
+    [_RAISE]  =  { { G(KC_LEFT),   G(KC_RGHT) },    { G(KC_TAB),     G(S(KC_TAB)) } },
+    [_ADJUST] =  { { KC_TRNS,      KC_TRNS },       { KC_TRNS,       KC_TRNS } },
+};
+// clang-format on
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+    torn_set_led(0, IS_LAYER_ON_STATE(state, _RAISE));
+    torn_set_led(1, IS_LAYER_ON_STATE(state, _LOWER));
+    torn_set_led(2, IS_LAYER_ON_STATE(state, _ADJUST));
+    return state;
+}
+
+/*
+ * Enable `IGNORE_MOD_TAP_INTERRUPT` for all modifiers except `Shift`.
+ * For more info see `IGNORE_MOD_TAP_INTERRUPT_PER_KEY` in `docs/tap_hold.md`.
+ */
+
+bool get_ignore_mod_tap_interrupt(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case S_EQL:
+            return false;
+        case S_MINS:
+            return false;
+        default:
+            return true;
+    }
+}
+
+/*
+ * Enable `PERMISSIVE_HOLD` for `Shift` modifers.
+ * For more info see `PERMISSIVE_HOLD_PER_KEY` in `docs/tap_hold.md`.
+ */
+
+bool get_permissive_hold(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case S_EQL:
+            return true;
+        case S_MINS:
+            return true;
+        default:
+            return false;
+    }
+}
diff --git a/qmk/keyboards/torn/keymaps/kinesish/readme.md b/qmk/keyboards/torn/keymaps/kinesish/readme.md
new file mode 100644
index 00000000..481602e5
--- /dev/null
+++ b/qmk/keyboards/torn/keymaps/kinesish/readme.md
@@ -0,0 +1,6 @@
+# A Custom Keymap for [Torn](https://github.com/rtitmuss/torn)
+
+## Keymap
+This keymap was inspired by default layout of Kinesis Advantage.
+
+The main idea behind this keymap is that you have all modifiers as well as layer keys duplicated on both halves.
diff --git a/qmk/keyboards/torn/keymaps/kinesish/rules.mk b/qmk/keyboards/torn/keymaps/kinesish/rules.mk
new file mode 100644
index 00000000..36b7ba9c
--- /dev/null
+++ b/qmk/keyboards/torn/keymaps/kinesish/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/qmk/keyboards/tr60w/rules.mk b/qmk/keyboards/tr60w/rules.mk
index 4b68e6c7..07a540c3 100644
--- a/qmk/keyboards/tr60w/rules.mk
+++ b/qmk/keyboards/tr60w/rules.mk
@@ -29,4 +29,3 @@ MIDI_ENABLE = no            # MIDI support
 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
diff --git a/qmk/keyboards/treadstone48/rev1/config.h b/qmk/keyboards/treadstone48/rev1/config.h
index 3ea28583..cde24322 100644
--- a/qmk/keyboards/treadstone48/rev1/config.h
+++ b/qmk/keyboards/treadstone48/rev1/config.h
@@ -224,34 +224,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/treadstone48/rev2/config.h b/qmk/keyboards/treadstone48/rev2/config.h
index fb5011a0..fddf6809 100644
--- a/qmk/keyboards/treadstone48/rev2/config.h
+++ b/qmk/keyboards/treadstone48/rev2/config.h
@@ -217,34 +217,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/treadstone48/rules.mk b/qmk/keyboards/treadstone48/rules.mk
index df284153..39af991a 100644
--- a/qmk/keyboards/treadstone48/rules.mk
+++ b/qmk/keyboards/treadstone48/rules.mk
@@ -27,7 +27,6 @@ MIDI_ENABLE = no            # MIDI support
 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
 SPLIT_KEYBOARD = yes
 
 MOUSEKEY_ENABLE = yes       # Mouse keys
diff --git a/qmk/keyboards/treasure/type9/config.h b/qmk/keyboards/treasure/type9/config.h
index 220b7f78..177422f0 100644
--- a/qmk/keyboards/treasure/type9/config.h
+++ b/qmk/keyboards/treasure/type9/config.h
@@ -189,30 +189,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
diff --git a/qmk/keyboards/treasure/type9/rules.mk b/qmk/keyboards/treasure/type9/rules.mk
index d4b1f6f9..a45ccd94 100644
--- a/qmk/keyboards/treasure/type9/rules.mk
+++ b/qmk/keyboards/treasure/type9/rules.mk
@@ -30,4 +30,3 @@ 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
diff --git a/qmk/keyboards/ua62/config.h b/qmk/keyboards/ua62/config.h
index a6590d36..120e3e77 100644
--- a/qmk/keyboards/ua62/config.h
+++ b/qmk/keyboards/ua62/config.h
@@ -217,34 +217,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/ua62/rules.mk b/qmk/keyboards/ua62/rules.mk
index eaca3310..7c5512b6 100644
--- a/qmk/keyboards/ua62/rules.mk
+++ b/qmk/keyboards/ua62/rules.mk
@@ -29,4 +29,3 @@ MIDI_ENABLE = no            # MIDI support
 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
diff --git a/qmk/keyboards/underscore33/rev1/keymaps/default/config.h b/qmk/keyboards/underscore33/rev1/keymaps/default/config.h
index 5708a439..82cbcc42 100644
--- a/qmk/keyboards/underscore33/rev1/keymaps/default/config.h
+++ b/qmk/keyboards/underscore33/rev1/keymaps/default/config.h
@@ -1,3 +1,18 @@
+/* Copyright 2020 tominabox1
+ *
+ * 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
 
 /* Combos */
diff --git a/qmk/keyboards/underscore33/rev1/keymaps/default/keymap.c b/qmk/keyboards/underscore33/rev1/keymaps/default/keymap.c
index 148e840f..beaa8d92 100644
--- a/qmk/keyboards/underscore33/rev1/keymaps/default/keymap.c
+++ b/qmk/keyboards/underscore33/rev1/keymaps/default/keymap.c
@@ -21,10 +21,6 @@ enum layers{
   _NAV
 };
 
-enum custom_keycodes{
-  RGBRST = SAFE_RANGE,
-};
-
 #define KC_NUM_SPC LT(_NUM_SYM, KC_SPC)
 #define KC_NAV_ENT LT(_NAV, KC_ENT)
 #define KC_GA LGUI_T(KC_A)
@@ -60,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_NAV] = LAYOUT_33_split_space(
-      RESET,   RGBRST,  AG_NORM,  AG_SWAP,  DEBUG,   KC_GRV,  KC_PGDN,    KC_UP,  KC_PGUP,  KC_SCLN,
+      RESET,    KC_NO,    KC_NO,    KC_NO,  KC_NO,   KC_GRV,  KC_PGDN,    KC_UP,  KC_PGUP,  KC_SCLN,
     RGB_TOG,  RGB_HUI,  RGB_SAI,  RGB_VAI,  KC_NO,  KC_HOME,  KC_LEFT,  KC_DOWN,  KC_RGHT,   KC_END,
     RGB_MOD,  RGB_HUD,  RGB_SAD,  RGB_VAD,  KC_NO,  KC_MINS,    KC_RO,  KC_COMM,   KC_DOT,  KC_BSLS,
                    KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS,   KC_TRNS
diff --git a/qmk/keyboards/underscore33/rev1/keymaps/default_big_space/config.h b/qmk/keyboards/underscore33/rev1/keymaps/default_big_space/config.h
new file mode 100644
index 00000000..82cbcc42
--- /dev/null
+++ b/qmk/keyboards/underscore33/rev1/keymaps/default_big_space/config.h
@@ -0,0 +1,20 @@
+/* Copyright 2020 tominabox1
+ *
+ * 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
+
+/* Combos */
+#define COMBO_COUNT 5
+#define COMBO_TERM 50
diff --git a/qmk/keyboards/underscore33/rev1/keymaps/default_big_space/keymap.c b/qmk/keyboards/underscore33/rev1/keymaps/default_big_space/keymap.c
new file mode 100644
index 00000000..09547fa0
--- /dev/null
+++ b/qmk/keyboards/underscore33/rev1/keymaps/default_big_space/keymap.c
@@ -0,0 +1,82 @@
+/* Copyright 2020 tominabox1
+ *
+ * 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
+
+enum layers{
+  _BASE,
+  _NUM_SYM,
+  _NAV
+};
+
+#define KC_NUM_SPC LT(_NUM_SYM, KC_SPC)
+#define KC_NAV_ENT LT(_NAV, KC_ENT)
+#define KC_GA LGUI_T(KC_A)
+#define KC_AS LALT_T(KC_S)
+#define KC_CD LCTL_T(KC_D)
+#define KC_SF LSFT_T(KC_F)
+#define KC_SJ RSFT_T(KC_J)
+#define KC_CK RCTL_T(KC_K)
+#define KC_AL RALT_T(KC_L)
+#define KC_GSCLN RGUI_T(KC_SCLN)
+
+enum combo_events {
+  COMBO_BSPC,
+  COMBO_NUMBAK,
+  COMBO_TAB,
+  COMBO_ESC,
+  COMBO_DEL,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_BASE] = LAYOUT_33_big_space(
+    KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,    KC_I,   KC_O,     KC_P,
+   KC_GA,  KC_AS,  KC_CD,  KC_SF,   KC_G,   KC_H,  KC_SJ,   KC_CK,  KC_AL, KC_GSCLN,
+    KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M, KC_COMM, KC_DOT,  KC_SLSH,
+                        KC_LCTL, KC_NUM_SPC, KC_NAV_ENT
+  ),
+
+  [_NUM_SYM] = LAYOUT_33_big_space(
+       KC_1,     KC_2,     KC_3,     KC_4,      KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,
+    KC_EXLM,    KC_AT,  KC_HASH,   KC_DLR,   KC_PERC,  KC_CIRC,  KC_AMPR,  KC_ASTR, KC_EQUAL,  KC_MINS,
+    KC_BSLS,  KC_LCBR,  KC_LBRC,  KC_LPRN,   KC_UNDS,  KC_RPRN,  KC_RBRC,  KC_RCBR,   KC_DOT,   KC_GRV,
+                        KC_TRNS, KC_TRNS,   KC_TRNS
+  ),
+
+  [_NAV] = LAYOUT_33_big_space(
+      RESET,    KC_NO,    KC_NO,    KC_NO,  KC_NO,   KC_GRV,  KC_PGDN,    KC_UP,  KC_PGUP,  KC_SCLN,
+    RGB_TOG,  RGB_HUI,  RGB_SAI,  RGB_VAI,  KC_NO,  KC_HOME,  KC_LEFT,  KC_DOWN,  KC_RGHT,   KC_END,
+    RGB_MOD,  RGB_HUD,  RGB_SAD,  RGB_VAD,  KC_NO,  KC_MINS,    KC_RO,  KC_COMM,   KC_DOT,  KC_BSLS,
+                        KC_TRNS,   KC_TRNS,   KC_TRNS
+  ),
+};
+
+
+#ifdef COMBO_ENABLE
+const uint16_t PROGMEM combo_bspc[] = {KC_O, KC_P, COMBO_END};
+const uint16_t PROGMEM combo_numbak[] = {KC_0, KC_9, COMBO_END};
+const uint16_t PROGMEM combo_tab[] = {KC_Q, KC_W, COMBO_END};
+const uint16_t PROGMEM combo_esc[] = {KC_E, KC_W, COMBO_END};
+const uint16_t PROGMEM combo_del[] = {KC_MINS, KC_EQL, COMBO_END};
+
+combo_t key_combos[COMBO_COUNT] = {
+  [COMBO_BSPC] = COMBO(combo_bspc,KC_BSPC),
+  [COMBO_NUMBAK] = COMBO(combo_numbak,KC_BSPC),
+  [COMBO_TAB] = COMBO(combo_tab,KC_TAB),
+  [COMBO_ESC] = COMBO(combo_esc,KC_ESC),
+  [COMBO_DEL] = COMBO(combo_del,KC_DEL),
+
+};
+#endif
diff --git a/qmk/keyboards/underscore33/rev1/keymaps/default_big_space/readme.md b/qmk/keyboards/underscore33/rev1/keymaps/default_big_space/readme.md
new file mode 100644
index 00000000..3f22df7c
--- /dev/null
+++ b/qmk/keyboards/underscore33/rev1/keymaps/default_big_space/readme.md
@@ -0,0 +1,3 @@
+# Default _33 Rev1 Layout (with big spacebar)
+
+This is the recommended default layout. 
diff --git a/qmk/keyboards/underscore33/rev1/keymaps/default_big_space/rules.mk b/qmk/keyboards/underscore33/rev1/keymaps/default_big_space/rules.mk
new file mode 100644
index 00000000..ab1e4381
--- /dev/null
+++ b/qmk/keyboards/underscore33/rev1/keymaps/default_big_space/rules.mk
@@ -0,0 +1 @@
+COMBO_ENABLE = yes
diff --git a/qmk/keyboards/underscore33/rev2/keymaps/default/config.h b/qmk/keyboards/underscore33/rev2/keymaps/default/config.h
index 5708a439..82cbcc42 100644
--- a/qmk/keyboards/underscore33/rev2/keymaps/default/config.h
+++ b/qmk/keyboards/underscore33/rev2/keymaps/default/config.h
@@ -1,3 +1,18 @@
+/* Copyright 2020 tominabox1
+ *
+ * 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
 
 /* Combos */
diff --git a/qmk/keyboards/underscore33/rev2/keymaps/default/keymap.c b/qmk/keyboards/underscore33/rev2/keymaps/default/keymap.c
index 32a6f486..ebacea41 100644
--- a/qmk/keyboards/underscore33/rev2/keymaps/default/keymap.c
+++ b/qmk/keyboards/underscore33/rev2/keymaps/default/keymap.c
@@ -21,10 +21,6 @@ enum layers{
   _NAV
 };
 
-enum custom_keycodes{
-  RGBRST = SAFE_RANGE,
-};
-
 #define KC_NUM_SPC LT(_NUM_SYM, KC_SPC)
 #define KC_NAV_ENT LT(_NAV, KC_ENT)
 #define KC_GA LGUI_T(KC_A)
@@ -60,7 +56,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_NAV] = LAYOUT_33_split_space(
-      RESET,   RGBRST,  AG_NORM,  AG_SWAP,  DEBUG,   KC_GRV,  KC_PGDN,    KC_UP,  KC_PGUP,  KC_SCLN,
+    RESET,    KC_NO,    KC_NO,    KC_NO,  KC_NO,   KC_GRV,  KC_PGDN,    KC_UP,  KC_PGUP,  KC_SCLN,
     RGB_TOG,  RGB_HUI,  RGB_SAI,  RGB_VAI,  KC_NO,  KC_HOME,  KC_LEFT,  KC_DOWN,  KC_RGHT,   KC_END,
     RGB_MOD,  RGB_HUD,  RGB_SAD,  RGB_VAD,  KC_NO,  KC_MINS,    KC_RO,  KC_COMM,   KC_DOT,  KC_BSLS,
                    KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS,   KC_TRNS,   KC_TRNS
diff --git a/qmk/keyboards/underscore33/rev2/keymaps/default_big_space/config.h b/qmk/keyboards/underscore33/rev2/keymaps/default_big_space/config.h
new file mode 100644
index 00000000..82cbcc42
--- /dev/null
+++ b/qmk/keyboards/underscore33/rev2/keymaps/default_big_space/config.h
@@ -0,0 +1,20 @@
+/* Copyright 2020 tominabox1
+ *
+ * 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
+
+/* Combos */
+#define COMBO_COUNT 5
+#define COMBO_TERM 50
diff --git a/qmk/keyboards/underscore33/rev2/keymaps/default_big_space/keymap.c b/qmk/keyboards/underscore33/rev2/keymaps/default_big_space/keymap.c
new file mode 100644
index 00000000..09547fa0
--- /dev/null
+++ b/qmk/keyboards/underscore33/rev2/keymaps/default_big_space/keymap.c
@@ -0,0 +1,82 @@
+/* Copyright 2020 tominabox1
+ *
+ * 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
+
+enum layers{
+  _BASE,
+  _NUM_SYM,
+  _NAV
+};
+
+#define KC_NUM_SPC LT(_NUM_SYM, KC_SPC)
+#define KC_NAV_ENT LT(_NAV, KC_ENT)
+#define KC_GA LGUI_T(KC_A)
+#define KC_AS LALT_T(KC_S)
+#define KC_CD LCTL_T(KC_D)
+#define KC_SF LSFT_T(KC_F)
+#define KC_SJ RSFT_T(KC_J)
+#define KC_CK RCTL_T(KC_K)
+#define KC_AL RALT_T(KC_L)
+#define KC_GSCLN RGUI_T(KC_SCLN)
+
+enum combo_events {
+  COMBO_BSPC,
+  COMBO_NUMBAK,
+  COMBO_TAB,
+  COMBO_ESC,
+  COMBO_DEL,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_BASE] = LAYOUT_33_big_space(
+    KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,    KC_I,   KC_O,     KC_P,
+   KC_GA,  KC_AS,  KC_CD,  KC_SF,   KC_G,   KC_H,  KC_SJ,   KC_CK,  KC_AL, KC_GSCLN,
+    KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M, KC_COMM, KC_DOT,  KC_SLSH,
+                        KC_LCTL, KC_NUM_SPC, KC_NAV_ENT
+  ),
+
+  [_NUM_SYM] = LAYOUT_33_big_space(
+       KC_1,     KC_2,     KC_3,     KC_4,      KC_5,     KC_6,     KC_7,     KC_8,     KC_9,     KC_0,
+    KC_EXLM,    KC_AT,  KC_HASH,   KC_DLR,   KC_PERC,  KC_CIRC,  KC_AMPR,  KC_ASTR, KC_EQUAL,  KC_MINS,
+    KC_BSLS,  KC_LCBR,  KC_LBRC,  KC_LPRN,   KC_UNDS,  KC_RPRN,  KC_RBRC,  KC_RCBR,   KC_DOT,   KC_GRV,
+                        KC_TRNS, KC_TRNS,   KC_TRNS
+  ),
+
+  [_NAV] = LAYOUT_33_big_space(
+      RESET,    KC_NO,    KC_NO,    KC_NO,  KC_NO,   KC_GRV,  KC_PGDN,    KC_UP,  KC_PGUP,  KC_SCLN,
+    RGB_TOG,  RGB_HUI,  RGB_SAI,  RGB_VAI,  KC_NO,  KC_HOME,  KC_LEFT,  KC_DOWN,  KC_RGHT,   KC_END,
+    RGB_MOD,  RGB_HUD,  RGB_SAD,  RGB_VAD,  KC_NO,  KC_MINS,    KC_RO,  KC_COMM,   KC_DOT,  KC_BSLS,
+                        KC_TRNS,   KC_TRNS,   KC_TRNS
+  ),
+};
+
+
+#ifdef COMBO_ENABLE
+const uint16_t PROGMEM combo_bspc[] = {KC_O, KC_P, COMBO_END};
+const uint16_t PROGMEM combo_numbak[] = {KC_0, KC_9, COMBO_END};
+const uint16_t PROGMEM combo_tab[] = {KC_Q, KC_W, COMBO_END};
+const uint16_t PROGMEM combo_esc[] = {KC_E, KC_W, COMBO_END};
+const uint16_t PROGMEM combo_del[] = {KC_MINS, KC_EQL, COMBO_END};
+
+combo_t key_combos[COMBO_COUNT] = {
+  [COMBO_BSPC] = COMBO(combo_bspc,KC_BSPC),
+  [COMBO_NUMBAK] = COMBO(combo_numbak,KC_BSPC),
+  [COMBO_TAB] = COMBO(combo_tab,KC_TAB),
+  [COMBO_ESC] = COMBO(combo_esc,KC_ESC),
+  [COMBO_DEL] = COMBO(combo_del,KC_DEL),
+
+};
+#endif
diff --git a/qmk/keyboards/underscore33/rev2/keymaps/default_big_space/readme.md b/qmk/keyboards/underscore33/rev2/keymaps/default_big_space/readme.md
new file mode 100644
index 00000000..f11d18ec
--- /dev/null
+++ b/qmk/keyboards/underscore33/rev2/keymaps/default_big_space/readme.md
@@ -0,0 +1,3 @@
+# Default _33 Rev2 Layout (with big spacebar)
+
+This is the recommended default layout. 
diff --git a/qmk/keyboards/underscore33/rev2/keymaps/default_big_space/rules.mk b/qmk/keyboards/underscore33/rev2/keymaps/default_big_space/rules.mk
new file mode 100644
index 00000000..ab1e4381
--- /dev/null
+++ b/qmk/keyboards/underscore33/rev2/keymaps/default_big_space/rules.mk
@@ -0,0 +1 @@
+COMBO_ENABLE = yes
diff --git a/qmk/keyboards/ungodly/launch_pad/config.h b/qmk/keyboards/ungodly/launch_pad/config.h
new file mode 100644
index 00000000..c4da0976
--- /dev/null
+++ b/qmk/keyboards/ungodly/launch_pad/config.h
@@ -0,0 +1,72 @@
+/* Copyright 2020 Ungodly Design <hello@ungodly.design>
+ *
+ * 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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x5544 // "UD" = Ungodly Design
+#define PRODUCT_ID      0x4C50 // "LP" = Launch Pad
+#define DEVICE_VER      0x9999
+#define MANUFACTURER    Ungodly Design
+#define PRODUCT         Launch Pad
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 4
+
+/* Keyboard Matrix Assignments */
+#define MATRIX_ROW_PINS { D4, D6, D7, B4, B5 }
+#define MATRIX_COL_PINS { B0, B1, B2, B3 }
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Rotary Encoder Assignment */
+#define ENCODERS_PAD_A { C6 }
+#define ENCODERS_PAD_B { B6 }
+#define ENCODER_RESOLUTION 2
+
+/* Midi Slider */
+#define SLIDER_PIN F6
+
+/* RGB Matrix configuration */
+#ifdef RGB_MATRIX_ENABLE
+#    define RGB_MATRIX_KEYPRESSES
+#endif
+
+#define RGB_DI_PIN F7
+#ifdef RGB_DI_PIN
+#    define RGBLED_NUM 22
+#    define RGBLIGHT_HUE_STEP 8
+#    define RGBLIGHT_SAT_STEP 8
+#    define RGBLIGHT_VAL_STEP 8
+#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+#    define RGBLIGHT_SLEEP         /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+/*== all animations enable ==*/
+#    define RGBLIGHT_ANIMATIONS
+// RGB Matrix
+#    ifdef RGB_MATRIX_ENABLE
+#        define DRIVER_LED_TOTAL RGBLED_NUM
+#    endif
+#endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+#define LOCKING_RESYNC_ENABLE
+
+#define MIDI_ADVANCED
diff --git a/qmk/keyboards/ungodly/launch_pad/keymaps/default/keymap.c b/qmk/keyboards/ungodly/launch_pad/keymaps/default/keymap.c
new file mode 100644
index 00000000..4ddec6c4
--- /dev/null
+++ b/qmk/keyboards/ungodly/launch_pad/keymaps/default/keymap.c
@@ -0,0 +1,257 @@
+/* Copyright 2020 Ungodly Design <hello@ungodly.design>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+#include "analog.h"
+#include "qmk_midi.h"
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+enum layers {
+_BL = 0,
+_NV,
+_FN
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/* Keymap _BL: (Base Layer) Default Numpad Layer
+ * ,-------------------.
+ * | NV | /  | *  |BK/FN|
+ * |----|----|----|-----|
+ * | 7  | 8  | 9  |  -  |
+ * |----|----|----|-----|
+ * | 4  | 5  | 6  |  +  |
+ * |----|----|----|-----|
+ * | 1  | 2  | 3  |     |
+ * |----|----|----| En  |
+ * |    0    | .  |     |
+ * `--------------------'
+ */
+ [_BL] = LAYOUT_ortho_5x4(
+   TG(_NV),  KC_PSLS,  KC_PAST,   LT(_FN, KC_BSPC),
+   KC_7,    KC_8,    KC_9,     KC_PMNS,
+   KC_4,    KC_5,    KC_6,     KC_PPLS,
+   KC_1,    KC_2,    KC_3,     KC_PENT,
+   KC_0,    KC_0,  KC_DOT,   KC_PENT
+ ),
+
+/* Keymap _NV: Navigation layer
+ * ,-------------------.
+ * |INS |HOME|PGUP|    |
+ * |----|----|----|----|
+ * |DEL |END |PGDN|    |
+ * |----|----|----|----|
+ * |    | UP |    |    |
+ * |----|----|----|----|
+ * |LEFT|DOWN|RIGH|    |
+ * |----|----|----|    |
+ * |         |    |    |
+ * `-------------------'
+ */
+  [_NV] = LAYOUT_ortho_5x4(
+    KC_INS,   KC_HOME,  KC_PGUP,   TG(_NV),
+    KC_DEL,   KC_END,   KC_PGDN,   XXXXXXX,
+    XXXXXXX,  KC_UP,    XXXXXXX,   XXXXXXX,
+    KC_LEFT,  KC_DOWN,  KC_RGHT,   XXXXXXX,
+    XXXXXXX,  XXXXXXX,  XXXXXXX,   XXXXXXX
+  ),
+
+/* Keymap _FN: RGB Function Layer
+ * ,-------------------.
+ * |RMOD|RGBP|RTOG| FN |
+ * |----|----|----|----|
+ * |HUD |HUI |    |    |
+ * |----|----|----|----|
+ * |SAD |SAI |    |    |
+ * |----|----|----|----|
+ * |VAD |VAS |    |    |
+ * |----|----|----|    |
+ * |RST |    |    |    |
+ * `-------------------'
+ */
+  [_FN] = LAYOUT_ortho_5x4(
+    RGB_MOD,  RGB_M_P,  RGB_TOG,   _______,
+    RGB_HUD,  RGB_HUI,  XXXXXXX,   XXXXXXX,
+    RGB_SAD,  RGB_SAI,  XXXXXXX,   XXXXXXX,
+    RGB_VAD,  RGB_VAI,  XXXXXXX,   XXXXXXX,
+    RESET,    XXXXXXX,  XXXXXXX,   XXXXXXX
+  ),
+};
+
+void encoder_update_user(uint8_t index, bool clockwise) {
+  if (clockwise) {
+      tap_code(KC_VOLU);
+  } else {
+      tap_code(KC_VOLD);
+  }
+}
+
+uint8_t divisor = 0;
+
+void slider(void) {
+    if (divisor++) { // only run the slider function 1/256 times it's called
+        return;
+    }
+
+    midi_send_cc(&midi_device, 2, 0x3E, 0x7F - (analogReadPin(SLIDER_PIN) >> 3));
+}
+
+void matrix_scan_user(void) {
+    slider();
+}
+
+// 0.91" OLED, 128x32 resolution
+#ifdef OLED_DRIVER_ENABLE
+
+oled_rotation_t oled_init_user(oled_rotation_t rotation) {
+    return OLED_ROTATION_180;  // flips the display 270 degrees
+}
+
+#define ANIM_SIZE 636 // number of bytes in array, minimize for adequate firmware size, max is 1024
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+
+    static const char PROGMEM gui_layers[][ANIM_SIZE] = {
+      {
+        // Home Screen
+        // 'layer_bl', 128x32px
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80,
+        0x80, 0x80, 0xc0, 0x40, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x20, 0x50, 0x50, 0x90,
+        0x10, 0x10, 0x20, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x80, 0x80,
+        0x80, 0x40, 0x40, 0x40, 0x40, 0x20, 0x10, 0x10, 0xf0, 0x10, 0x10, 0x08, 0x08, 0x08, 0x04, 0x04,
+        0x04, 0xfc, 0xfc, 0xfc, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0xfc, 0x7c, 0x7e, 0x7e, 0x7f,
+        0x81, 0x81, 0x81, 0x81, 0xff, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0xff,
+        0xff, 0xe7, 0xe7, 0xe7, 0xe7, 0xe7, 0xe7, 0xe7, 0xe7, 0x01, 0x01, 0x01, 0xf9, 0x01, 0xf9, 0x01,
+        0xf9, 0x01, 0xf9, 0x01, 0x01, 0x01, 0xe7, 0xe7, 0xe7, 0xe7, 0xe7, 0xe7, 0xe7, 0xe7, 0xe7, 0xe6,
+        0xe6, 0xe6, 0xe6, 0xe6, 0xff, 0x8c, 0x52, 0x52, 0x52, 0xde, 0x84, 0x08, 0x84, 0x08, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x04, 0x04,
+        0x05, 0x05, 0x02, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x01, 0x01, 0x01, 0x01, 0x02, 0x04, 0x04, 0x07, 0x04, 0x04, 0x08, 0x08, 0x08, 0x10, 0x10,
+        0x10, 0x1f, 0x1f, 0x1f, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x10, 0x1f, 0x10, 0x20, 0x20, 0x40,
+        0x7f, 0x7f, 0x7f, 0x7f, 0x7f, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x40, 0x7f,
+        0x7f, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x40, 0x40, 0x40, 0x4a, 0x44, 0x4a, 0x40,
+        0x4f, 0x40, 0x4f, 0x40, 0x40, 0x40, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x5c, 0x9c,
+        0x9c, 0x9c, 0x9c, 0x1c, 0xff, 0x31, 0x4a, 0x4a, 0x4a, 0x7b, 0x10, 0x21, 0x10, 0x21, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+      },
+      {
+        // Navigation Screen
+        // 'layer_nav', 128x32px
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x20, 0x20, 0x40,
+        0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x20, 0x50, 0x50, 0x90,
+        0x10, 0x10, 0x20, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xe0, 0x10, 0xc8, 0x28, 0x28, 0x28, 0xc8, 0x10,
+        0xb0, 0x10, 0x20, 0x20, 0x20, 0x40, 0x40, 0x40, 0x80, 0x80, 0x80, 0x40, 0x40, 0x40, 0x20, 0x20,
+        0x20, 0x10, 0x10, 0x10, 0x08, 0x08, 0x08, 0x04, 0x04, 0x04, 0x02, 0x02, 0x02, 0xa1, 0x09, 0xe1,
+        0xf3, 0x29, 0x05, 0x85, 0xe5, 0xe5, 0xc5, 0x89, 0x92, 0xe4, 0x08, 0xf0, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x88, 0x88, 0x44,
+        0x44, 0x22, 0xe2, 0x11, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x04, 0x04,
+        0x05, 0x05, 0x02, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x04, 0x09, 0x0b, 0x0b, 0x0b, 0x09, 0x04,
+        0x06, 0x04, 0x02, 0x02, 0x02, 0x01, 0x01, 0x01, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x02, 0x02,
+        0x02, 0x04, 0x04, 0x04, 0x08, 0x08, 0x08, 0x10, 0x10, 0x10, 0x20, 0x20, 0x20, 0x42, 0x48, 0x43,
+        0x66, 0x4e, 0x53, 0x51, 0x51, 0x53, 0x53, 0x49, 0x24, 0x13, 0x08, 0x07, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x10, 0x91,
+        0x91, 0x52, 0x53, 0x34, 0x34, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x03, 0x02,
+        0x02, 0x02, 0x02, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+      },
+      {
+        // RGB Screen
+        // 'layer_rgb', 128x32px
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80, 0x9c, 0x80, 0x80,
+        0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x80,
+        0x80, 0x40, 0x40, 0x40, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xd0, 0x20, 0x50, 0x50, 0x90,
+        0x10, 0x10, 0x20, 0xc0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x80, 0x80, 0x80, 0x00, 0x00, 0xe0, 0x19, 0x04, 0x62, 0x11, 0x09, 0x04, 0x04, 0x00, 0x00, 0x00,
+        0x00, 0x01, 0x01, 0x02, 0x04, 0x19, 0x10, 0x10, 0xf0, 0x00, 0x00, 0xf0, 0x00, 0xf0, 0xe0, 0xc0,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc7, 0x24, 0x04,
+        0x07, 0xe4, 0x24, 0x24, 0xc7, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x04, 0x04, 0x04,
+        0x05, 0x05, 0x02, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x88, 0x30, 0x40, 0x40, 0x80, 0x80, 0x00, 0x00, 0x00, 0x00,
+        0x80, 0x80, 0x40, 0x60, 0x30, 0x98, 0x08, 0x08, 0x0f, 0x00, 0x00, 0x0f, 0x00, 0x0f, 0x07, 0x03,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc1, 0x22, 0x24,
+        0x24, 0xc4, 0x44, 0x22, 0x21, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x02, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x1d, 0x01, 0x01,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+        0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0x02, 0x02,
+        0x02, 0x03, 0x02, 0x02, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+      }
+    };
+
+    switch (get_highest_layer(state)) {
+    case _BL:
+      oled_write_raw_P(gui_layers[0], sizeof(gui_layers[0]) );
+      break;
+    case _NV:
+      oled_write_raw_P(gui_layers[1], sizeof(gui_layers[1]) );
+      break;
+    case _FN:
+      oled_write_raw_P(gui_layers[2], sizeof(gui_layers[2]) );
+      break;
+    default:
+      // Or use the write_ln shortcut over adding '\n' to the end of your string
+      oled_write_ln_P(PSTR(" UND"), false);
+      break;
+    }
+  return state;
+}
+
+#endif
diff --git a/qmk/keyboards/ungodly/launch_pad/launch_pad.c b/qmk/keyboards/ungodly/launch_pad/launch_pad.c
new file mode 100644
index 00000000..fde6ed20
--- /dev/null
+++ b/qmk/keyboards/ungodly/launch_pad/launch_pad.c
@@ -0,0 +1,61 @@
+/* Copyright 2020 Ungodly Design <hello@ungodly.design>
+ *
+ * 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 "launch_pad.h"
+
+#ifdef RGB_MATRIX_ENABLE
+led_config_t g_led_config = { {
+    // Key Matrix to LED Index
+    { 14, 15, 16, 17 },
+    { 13, 12, 11, 10 },
+    { 6, 7, 8, 9 },
+    { 5, 4, 3, 2 },
+    {NO_LED, 0, 1, NO_LED }
+}, {  // LED Index to Physical Position
+     { 37, 60 }, { 148, 60 },                            // row 5
+    { 222, 54 }, { 148, 45 },  { 74, 45 },   { 0, 45 },  // row 4
+      { 0, 30 },  { 74, 30 }, { 148, 30 }, { 222, 30 },  // row 3
+    { 222, 15 }, { 148, 15 },  { 74, 15 },   { 0, 15 },  // row 2
+       { 0, 0 },   { 74, 0 },  { 148, 0 },  { 222, 0 },  // row 1
+     { 185, 7 },   { 37, 7 },                            // top underglow
+     { 37, 52 }, { 185, 52 },                            // bottom underglow
+}, {
+    // LED Index to Flag
+    4, 4,       // row 5
+    4, 4, 4, 4, // row 4
+    4, 4, 4, 4, // row 3
+    4, 4, 4, 4, // row 2
+    4, 4, 4, 4, // row 1
+    2, 2,
+    2, 2
+} };
+#endif
+
+void eeconfig_init_kb(void) {
+#ifdef RGBLIGHT_ENABLE
+    rgblight_enable();             // Enable RGB by default
+    rgblight_sethsv(0, 255, 255);  // Set default HSV - red hue, full saturation, full brightness
+#    ifdef RGBLIGHT_ANIMATIONS
+    rgblight_mode(RGBLIGHT_MODE_RAINBOW_SWIRL + 2);  // set to RGB_RAINBOW_SWIRL by default
+#    endif
+#endif
+
+#ifdef RGB_MATRIX_ENABLE
+    rgb_matrix_enable();  // Enable RGB by default
+#endif
+
+    eeconfig_update_kb(0);
+    eeconfig_init_user();
+}
diff --git a/qmk/keyboards/ungodly/launch_pad/launch_pad.h b/qmk/keyboards/ungodly/launch_pad/launch_pad.h
new file mode 100644
index 00000000..7a7815f3
--- /dev/null
+++ b/qmk/keyboards/ungodly/launch_pad/launch_pad.h
@@ -0,0 +1,70 @@
+/* Copyright 2020 Ungodly Design <hello@ungodly.design>
+ *
+ * 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 first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+
+/* 4x5 numpad matrix layout
+   * ,-------------------.
+   * | 00 | 01 | 02 | 03 |
+   * |----|----|----|----|
+   * | 10 | 11 | 12 | 13 |
+   * |----|----|----|----|
+   * | 20 | 21 | 22 | 23 |
+   * |----|----|----|----|
+   * | 30 | 31 | 32 | 33 |
+   * |----|----|----|----|
+   * | 40 | 41 | 42 | 43 |
+   * `-------------------'
+ */
+
+ /* Numpad matrix layout
+    * ,-------------------.
+    * | 00 | 01 | 02 | 03 |
+    * |----|----|----|----|
+    * | 10 | 11 | 12 | 13 |
+    * |----|----|----|----|
+    * | 20 | 21 | 22 | 23 |
+    * |----|----|----|----|
+    * | 30 | 31 | 32 |    |
+    * |----|----|----| 33 |
+    * |   41    | 42 |    |
+    * `-------------------'
+  */
+
+#define LAYOUT_ortho_5x4( \
+	k00, k01, k02, k03,  \
+	k10, k11, k12, k13,  \
+	k20, k21, k22, k23,  \
+	k30, k31, k32, k33,  \
+	k40, k41, k42, k43   \
+) \
+{ \
+	{k00, k01, k02, k03}, \
+	{k10, k11, k12, k13}, \
+	{k20, k21, k22, k23}, \
+	{k30, k31, k32, k33}, \
+	{k40, k41, k42, k43}  \
+}
diff --git a/qmk/keyboards/ungodly/launch_pad/readme.md b/qmk/keyboards/ungodly/launch_pad/readme.md
new file mode 100644
index 00000000..89e4b641
--- /dev/null
+++ b/qmk/keyboards/ungodly/launch_pad/readme.md
@@ -0,0 +1,37 @@
+# Launch Pad
+The guidance computer inside the [Launch Pad](https://ungodly.design/products/launch-pad) by Ungodly Design.
+
+**Features:**
+* Onboard atmega32u4 controller, 5V @ 16MHz
+* Kaihl hotswap sockets
+* USB-C connector
+* 18 in-switch RGB LEDs
+* 4 underglow RGB LEDs
+* 100 Ω potentiometer slider
+* (optional) M2 pcb mounting holes
+* (optional) pcb-mount stablizer footprints
+* (optional) pin breakout:
+  * F5, F4, F1, F0, VBUS, GND
+
+PCB Front             |  PCB Back
+:-------------------------:|:-------------------------:
+![Numpad](https://i.imgur.com/f47ZFZZl.png)  |  ![5x4](https://i.imgur.com/wZH76Ppl.png)
+
+Numpad Layout             |  5x4 Layout
+:-------------------------:|:-------------------------:
+![Numpad](https://i.imgur.com/4XvqCBHl.jpg)  |  ![5x4](https://i.imgur.com/mwtGnPSl.jpg)
+
+
+|Reset Bootloader|   |
+|---|---|
+|Use tweezers to short the two bottom pins of the J-Link pinout.|![Numpad](https://i.imgur.com/ArSIcK0.pngl)|
+
+* Keyboard Maintainer: [Luis Godinez](https://github.com/luis-Godinez)
+* Hardware Supported: Launch Pad PCB
+* Hardware Availability: [Ungodly.Design](https://ungodly.design/products/launch-pad-pcb)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make ungodly/launch_pad: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).
diff --git a/qmk/keyboards/ungodly/launch_pad/rules.mk b/qmk/keyboards/ungodly/launch_pad/rules.mk
new file mode 100644
index 00000000..298ee450
--- /dev/null
+++ b/qmk/keyboards/ungodly/launch_pad/rules.mk
@@ -0,0 +1,33 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # 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 = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+MIDI_ENABLE = yes
+OLED_DRIVER_ENABLE = yes
+ENCODER_ENABLE = yes
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = WS2812
+SPACE_CADET_ENABLE = no
+MAGIC_ENABLE = no
+GRAVE_ESC_ENABLE = no
+LTO_ENABLE = yes
+
+SRC += analog.c
diff --git a/qmk/keyboards/ungodly/nines/config.h b/qmk/keyboards/ungodly/nines/config.h
new file mode 100644
index 00000000..a2f874bd
--- /dev/null
+++ b/qmk/keyboards/ungodly/nines/config.h
@@ -0,0 +1,51 @@
+/* Copyright 2020 Ungodly Design <hello@ungodly.design>
+ *
+ * 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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x5544 // "UD" = Ungodly Design
+#define PRODUCT_ID      0x544E // "TN" = The Nines
+#define DEVICE_VER      0x9999
+#define MANUFACTURER    Ungodly Design
+#define PRODUCT         The Nines
+
+/* key matrix size */
+#define MATRIX_ROWS 3
+#define MATRIX_COLS 3
+
+/* Keyboard Matrix Assignments */
+#define DIRECT_PINS { \
+    { F4, F5, F6 }, \
+    { F7, B1, B3 }, \
+    { B2, B6, B5 }  \
+}
+#define UNUSED_PINS
+
+/* Rotary Encoder Assignments */
+#define ENCODERS_PAD_A { C6, E6 }
+#define ENCODERS_PAD_B { D7, B4 }
+
+#define ENCODER_RESOLUTION 2
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
diff --git a/qmk/keyboards/ungodly/nines/info.json b/qmk/keyboards/ungodly/nines/info.json
new file mode 100644
index 00000000..4a3c5424
--- /dev/null
+++ b/qmk/keyboards/ungodly/nines/info.json
@@ -0,0 +1,22 @@
+{
+  "keyboard_name": "The Nines",
+  "url": "https://www.qlavier.com/",
+  "maintainer": "Ungodly Design",
+  "width": 3,
+  "height": 3,
+  "layouts": {
+    "LAYOUT_ortho_3x3": {
+      "layout": [
+        {"x":0, "y":0},
+        {"x":1, "y":0},
+        {"x":2, "y":0},
+        {"x":0, "y":1},
+        {"x":1, "y":1},
+        {"x":2, "y":1},
+        {"x":0, "y":2},
+        {"x":1, "y":2},
+        {"x":2, "y":2}
+      ]
+    }
+  }
+}
diff --git a/qmk/keyboards/ungodly/nines/keymaps/default/keymap.c b/qmk/keyboards/ungodly/nines/keymaps/default/keymap.c
new file mode 100644
index 00000000..2100f4b8
--- /dev/null
+++ b/qmk/keyboards/ungodly/nines/keymaps/default/keymap.c
@@ -0,0 +1,32 @@
+/* Copyright 2020 Ungodly Design <hello@ungodly.design>
+ *
+ * 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_ortho_3x3(
+    KC_MPLY, KC_HOME, KC_MUTE,
+    MO(1),   KC_UP,   KC_END,
+    KC_LEFT, KC_DOWN, KC_RGHT
+),
+
+[1] = LAYOUT_ortho_3x3(
+    RESET,   _______, KC_STOP,
+    _______, KC_HOME, _______,
+    KC_MPRV, KC_END , KC_MNXT
+)
+
+};
diff --git a/qmk/keyboards/ungodly/nines/keymaps/via/keymap.c b/qmk/keyboards/ungodly/nines/keymaps/via/keymap.c
new file mode 100644
index 00000000..e0567ff0
--- /dev/null
+++ b/qmk/keyboards/ungodly/nines/keymaps/via/keymap.c
@@ -0,0 +1,44 @@
+/* Copyright 2020 Ungodly Design <hello@ungodly.design>
+ *
+ * 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_ortho_3x3(
+    KC_MPLY, KC_HOME, KC_MUTE,
+    MO(1),   KC_UP,   KC_END,
+    KC_LEFT, KC_DOWN, KC_RGHT
+),
+
+[1] = LAYOUT_ortho_3x3(
+    RESET,   _______, KC_STOP,
+    _______, KC_HOME, _______,
+    KC_MPRV, KC_END , KC_MNXT
+),
+
+[2] = LAYOUT_ortho_3x3(
+    _______, _______, _______,
+    _______, _______, _______,
+    _______, _______, _______
+),
+
+[3] = LAYOUT_ortho_3x3(
+    _______, _______, _______,
+    _______, _______, _______,
+    _______, _______, _______
+)
+
+};
diff --git a/qmk/keyboards/ungodly/nines/keymaps/via/rules.mk b/qmk/keyboards/ungodly/nines/keymaps/via/rules.mk
new file mode 100644
index 00000000..1e5b9980
--- /dev/null
+++ b/qmk/keyboards/ungodly/nines/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/qmk/keyboards/ungodly/nines/nines.c b/qmk/keyboards/ungodly/nines/nines.c
new file mode 100644
index 00000000..3b29b268
--- /dev/null
+++ b/qmk/keyboards/ungodly/nines/nines.c
@@ -0,0 +1,32 @@
+/* Copyright 2020 Ungodly Design <hello@ungodly.design>
+ *
+ * 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 "nines.h"
+
+__attribute__((weak)) void encoder_update_user(uint8_t index, bool clockwise) {
+    if (index == 0) { /* Left encoder */
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    } else if (index == 1) { /* Right encoder */
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    }
+}
diff --git a/qmk/keyboards/ungodly/nines/nines.h b/qmk/keyboards/ungodly/nines/nines.h
new file mode 100644
index 00000000..f67615ec
--- /dev/null
+++ b/qmk/keyboards/ungodly/nines/nines.h
@@ -0,0 +1,37 @@
+/* Copyright 2020 Ungodly Design <hello@ungodly.design>
+ *
+ * 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 first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT_ortho_3x3( \
+    k00, k01, k02, \
+    k10, k11, k12, \
+    k20, k21, k22  \
+) \
+{ \
+    { k00, k01, k02 }, \
+    { k10, k11, k12 }, \
+    { k20, k21, k22 }  \
+}
diff --git a/qmk/keyboards/ungodly/nines/readme.md b/qmk/keyboards/ungodly/nines/readme.md
new file mode 100644
index 00000000..21b2628b
--- /dev/null
+++ b/qmk/keyboards/ungodly/nines/readme.md
@@ -0,0 +1,20 @@
+# Nines
+
+A 9 key (3x3) macropad with rotary encoder support.
+Made by Ungodly Design for Qlavier.
+
+![Nines](https://i.imgur.com/zNnmPV9.jpg)
+
+|Reset Bootloader|   |
+|---|---|
+|Use tweezers to short the two pins to the left of the pro-micro.|![Nines](https://i.imgur.com/ifTZ6Xw.pngl)|
+
+* Keyboard Maintainer: [Luis Godinez](https://github.com/luis-Godinez)
+* Hardware Supported: The Nines PCB
+* Hardware Availability: [Qlavier](https://www.qlavier.com/shop/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make ungodly/nines: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).
diff --git a/qmk/keyboards/ungodly/nines/rules.mk b/qmk/keyboards/ungodly/nines/rules.mk
new file mode 100644
index 00000000..c8cbaf06
--- /dev/null
+++ b/qmk/keyboards/ungodly/nines/rules.mk
@@ -0,0 +1,23 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+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
+# 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 = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = yes        # Rotary encoder support
diff --git a/qmk/keyboards/unikorn/keymaps/via/rules.mk b/qmk/keyboards/unikorn/keymaps/via/rules.mk
index 7b439d08..58ecfdf5 100644
--- a/qmk/keyboards/unikorn/keymaps/via/rules.mk
+++ b/qmk/keyboards/unikorn/keymaps/via/rules.mk
@@ -1,7 +1,4 @@
 VIA_ENABLE = yes
 LTO_ENABLE = yes
 
-MOUSEKEY_ENABLE = no
-EXTRAKEY_ENABLE = no
 RGBLIGHT_ENABLE = yes
-
diff --git a/qmk/keyboards/uno/config.h b/qmk/keyboards/uno/config.h
new file mode 100644
index 00000000..1cae17f5
--- /dev/null
+++ b/qmk/keyboards/uno/config.h
@@ -0,0 +1,69 @@
+/* Copyright 2020 Snipeye
+ *
+ * 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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0xFEED
+#define PRODUCT_ID      0xACC8
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Broekhuijsen
+#define PRODUCT         Uno
+
+/* key matrix size */
+#define MATRIX_ROWS 1
+#define MATRIX_COLS 1
+
+/* Uno default pinout */
+#define DIRECT_PINS { \
+    { B6 } \
+}
+#define UNUSED_PINS
+
+#define RGB_DI_PIN F6
+#ifdef RGB_DI_PIN
+#define RGBLED_NUM 1
+//   #define RGBLIGHT_HUE_STEP 32
+//   #define RGBLIGHT_SAT_STEP 32
+//   #define RGBLIGHT_VAL_STEP 32
+//   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+//   #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+// /*== all animations enable ==*/
+#define RGBLIGHT_ANIMATIONS
+// /*== or choose animations ==*/
+//   #define RGBLIGHT_EFFECT_BREATHING
+//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
+//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+//   #define RGBLIGHT_EFFECT_SNAKE
+//   #define RGBLIGHT_EFFECT_KNIGHT
+//   #define RGBLIGHT_EFFECT_CHRISTMAS
+//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
+//   #define RGBLIGHT_EFFECT_RGB_TEST
+//   #define RGBLIGHT_EFFECT_ALTERNATING
+// /*== customize breathing effect ==*/
+//   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+//   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+//   /*==== use exp() and sin() ====*/
+//   #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//   #define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+#endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
diff --git a/qmk/keyboards/uno/info.json b/qmk/keyboards/uno/info.json
new file mode 100644
index 00000000..3460c25d
--- /dev/null
+++ b/qmk/keyboards/uno/info.json
@@ -0,0 +1,13 @@
+{
+    "keyboard_name": "Uno",
+    "keyboard_folder": "uno",
+    "url": "https://www.reddit.com/r/mechmarket/comments/gyijm7/gb_uno/",
+    "maintainer": "Snipeye",
+    "width": 1,
+    "height": 1,
+    "layouts": {
+      "LAYOUT": {
+        "layout": [ {"x": 0, "y": 0 }]
+      }
+    }
+  }
diff --git a/qmk/keyboards/uno/keymaps/default/keymap.c b/qmk/keyboards/uno/keymaps/default/keymap.c
new file mode 100644
index 00000000..bb19ea7d
--- /dev/null
+++ b/qmk/keyboards/uno/keymaps/default/keymap.c
@@ -0,0 +1,102 @@
+/* Copyright 2020 Snipeye
+ *
+ * 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
+
+enum uno_keycode
+{
+  UNO = SAFE_RANGE
+};
+
+static uint16_t pressTimer = 0xFFFF;
+#define CUSTOM_LONGPRESS 150
+#define CUSTOM_LONGERPRESS 750
+#define CUSTOM_STRING "I can put a whole buncha text in here and type it all with a single keypress."
+#define RESET_LENGTH 3000
+const uint8_t PROGMEM RGBLED_RAINBOW_MOOD_INTERVALS[] = { 10, 25, 50 };
+
+char stringToSend[2] = "a";
+char maxLetter = 'z';
+
+uint8_t presetCounter = 0;
+
+#define COUNTER X_A
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+      [0] = LAYOUT(
+            UNO
+          )
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+	switch (keycode) {
+		case UNO:
+            if (record->event.pressed) {
+                pressTimer = timer_read();
+            } else {
+                uint16_t timeElapsed = timer_elapsed(pressTimer);
+                switch (presetCounter) {
+                    case 0:
+                        SEND_STRING(SS_LCMD("n"));
+                    break;
+                    case 1:
+                        SEND_STRING("Hello!");
+                    break;
+                    case 2:
+                        SEND_STRING(SS_TAP(X_ENTER)SS_TAP(X_ENTER)"I am uno!");
+                    break;
+                    case 3:
+                        SEND_STRING(SS_TAP(X_ENTER)SS_TAP(X_ENTER)"I can do all sorts of useless things!");
+                    break;
+                    case 4:
+                        SEND_STRING(SS_TAP(X_ENTER)SS_TAP(X_ENTER)"And I have a built-in RGB LED!"SS_TAP(X_ENTER)SS_TAP(X_ENTER)SS_TAP(X_ENTER));
+                        rgblight_sethsv_noeeprom(255, 255, 255);
+                        rgblight_mode_noeeprom(RGBLIGHT_MODE_RAINBOW_MOOD);
+                    break;
+                    default:
+                        if (timeElapsed < CUSTOM_LONGPRESS) {
+                            // Normal press.  We're going to send the current letter and increment the counter.
+                            SEND_STRING(SS_TAP(X_BSPACE));
+                            send_string(stringToSend);
+                            stringToSend[0]++;
+                            if (stringToSend[0] > maxLetter) {
+                                stringToSend[0] = 'a';
+                            }
+                        } else if (timeElapsed < CUSTOM_LONGERPRESS) {
+                            // Long press, confirm the current letter, reset counter
+                            stringToSend[0] = 'a';
+                            send_string(stringToSend);
+                        } else if (timeElapsed < RESET_LENGTH) {
+                            // Longer press, display macro.
+                            SEND_STRING(CUSTOM_STRING);
+                        } else {
+                            reset_keyboard();
+                        }
+                        presetCounter--;
+                    break;
+                }
+                presetCounter++;
+            }
+        break;
+    }
+    return false;
+}
+
+void keyboard_post_init_user(void) {
+    rgblight_enable_noeeprom();
+    rgblight_sethsv_noeeprom(0, 0, 0);
+    rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
+}
diff --git a/qmk/keyboards/uno/keymaps/default/readme.md b/qmk/keyboards/uno/keymaps/default/readme.md
new file mode 100644
index 00000000..53b762f8
--- /dev/null
+++ b/qmk/keyboards/uno/keymaps/default/readme.md
@@ -0,0 +1,4 @@
+# The default keymap for uno
+![Keymap](https://i.imgur.com/lCPZZpO.png)
+
+The 'Macro' key does a few things: If you open up textedit (was made for a mac), it sends "Command+n" for the first press to make a new document.  It then types a few different messages, activates the RGB LED, and finally ends in a "scroll through the alphabet with a long press to confirm a certain character" keyboard mode.
diff --git a/qmk/keyboards/uno/readme.md b/qmk/keyboards/uno/readme.md
new file mode 100644
index 00000000..ce4cccd1
--- /dev/null
+++ b/qmk/keyboards/uno/readme.md
@@ -0,0 +1,19 @@
+# uno
+
+ ![uno](https://i.imgur.com/OqPyWbbl.jpg)
+
+A 1-key, in-USB "board" for the lulz
+
+ * Keyboard Maintainer: [Snipeye](https://github.com/Snipeye)
+ * Hardware Supported: uno pcb
+ * Hardware Availability: [GB](https://www.reddit.com/r/mechmarket/comments/gyijm7/gb_uno/)
+
+ Make example for this keyboard (after setting up your build environment):
+
+     make uno:default
+
+ Flashing example for this keyboard:
+
+     make uno:default:flash
+
+ 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).
diff --git a/qmk/keyboards/uno/rules.mk b/qmk/keyboards/uno/rules.mk
new file mode 100644
index 00000000..d23e9551
--- /dev/null
+++ b/qmk/keyboards/uno/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+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
+# 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
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
diff --git a/qmk/keyboards/uno/uno.c b/qmk/keyboards/uno/uno.c
new file mode 100644
index 00000000..5ffb2886
--- /dev/null
+++ b/qmk/keyboards/uno/uno.c
@@ -0,0 +1,17 @@
+/* Copyright 2020 Snipeye
+ *
+ * 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 "uno.h"
diff --git a/qmk/keyboards/uno/uno.h b/qmk/keyboards/uno/uno.h
new file mode 100644
index 00000000..91d48d2a
--- /dev/null
+++ b/qmk/keyboards/uno/uno.h
@@ -0,0 +1,24 @@
+/* Copyright 2020 Snipeye
+ *
+ * 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( \
+  K00  \
+) { \
+  { K00 } \
+}
diff --git a/qmk/keyboards/uranuma/config.h b/qmk/keyboards/uranuma/config.h
index e4a62d88..f2f8d0e5 100644
--- a/qmk/keyboards/uranuma/config.h
+++ b/qmk/keyboards/uranuma/config.h
@@ -203,34 +203,6 @@
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/uranuma/rules.mk b/qmk/keyboards/uranuma/rules.mk
index d30114df..9f06db70 100644
--- a/qmk/keyboards/uranuma/rules.mk
+++ b/qmk/keyboards/uranuma/rules.mk
@@ -30,7 +30,6 @@ 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
 
 #COMBO_ENABLE = yes
 #SRC +=  .nicola.c \
diff --git a/qmk/keyboards/vagrant_10/config.h b/qmk/keyboards/vagrant_10/config.h
new file mode 100644
index 00000000..2771df78
--- /dev/null
+++ b/qmk/keyboards/vagrant_10/config.h
@@ -0,0 +1,55 @@
+
+/**
+MIT License
+
+Copyright (c) 2020 Shanduur & QMK Firmware
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+
+#pragma once
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x534C
+#define PRODUCT_ID      0x5E99
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Shanduur
+#define PRODUCT         Vagrant 10
+
+/* key matrix size */
+#define MATRIX_ROWS 4
+#define MATRIX_COLS 3
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { F7, B1, B3, B2 }
+#define MATRIX_COL_PINS { F4, F6, F5 }
+#define UNUSED_PINS
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
diff --git a/qmk/keyboards/vagrant_10/info.json b/qmk/keyboards/vagrant_10/info.json
new file mode 100644
index 00000000..badf84a7
--- /dev/null
+++ b/qmk/keyboards/vagrant_10/info.json
@@ -0,0 +1,12 @@
+{
+  "keyboard_name": "Vagrant-10", 
+  "url": "https://github.com/Sho-Keebs/Vagrant-10", 
+  "maintainer": "Shanduur", 
+  "width": 3, 
+  "height": 4, 
+  "layouts": {
+    "LAYOUT": {
+      "layout": [{"x":1, "y":0, "w":2}, {"x":0, "y":1}, {"x":1, "y":1}, {"x":2, "y":1}, {"x":0, "y":2}, {"x":1, "y":2}, {"x":2, "y":2}, {"x":0, "y":3}, {"x":1, "y":3}, {"x":2, "y":3}]
+    }
+  }
+}
diff --git a/qmk/keyboards/vagrant_10/keymaps/default/keymap.c b/qmk/keyboards/vagrant_10/keymaps/default/keymap.c
new file mode 100644
index 00000000..4864ce6e
--- /dev/null
+++ b/qmk/keyboards/vagrant_10/keymaps/default/keymap.c
@@ -0,0 +1,59 @@
+/**
+MIT License
+
+Copyright (c) 2020 Shanduur & QMK Firmware
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+
+#include QMK_KEYBOARD_H
+
+// Defines names for use in layer keycodes and the keymap
+enum layer_names {
+    HOME,
+    MODS,
+    MODS2,
+    OTHER
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+	[HOME] = LAYOUT(
+                          KC_P0,
+        KC_P7,   KC_P8,   KC_P9,
+        KC_P4,   KC_P5,   KC_P6,
+        LT(1, KC_P1), LT(2, KC_P2), LT(3, KC_P3)),
+
+	[MODS] = LAYOUT(
+                          KC_MUTE,
+        KC_MPLY, KC_NO,   KC_VOLU,
+        KC_MPRV, KC_MNXT, KC_VOLD,
+        KC_TRNS, KC_NO,   KC_NO),
+
+	[MODS2] = LAYOUT(
+                          KC_F13,
+        KC_F14,  KC_F15,  KC_F16,
+        KC_F19,  KC_F18,  KC_F17,
+        KC_NO,   KC_TRNS, KC_NO),
+
+	[OTHER] = LAYOUT(
+                          RESET,
+        KC_NO,   KC_NO,   KC_NO,
+        KC_NO,   KC_NO,   KC_NO,
+        KC_NO,   KC_NO,   KC_TRNS),
+};
diff --git a/qmk/keyboards/vagrant_10/readme.md b/qmk/keyboards/vagrant_10/readme.md
new file mode 100644
index 00000000..5972dfec
--- /dev/null
+++ b/qmk/keyboards/vagrant_10/readme.md
@@ -0,0 +1,19 @@
+# Vagrant 10
+
+![Vagrant 10](https://raw.githubusercontent.com/Sho-Keebs/Vagrant-10/master/doc/vag.jpg)
+
+This is (yet another) simple and small macropad.
+
+* Keyboard Maintainer: [Shanduur](https://github.com/Shanduur)
+* Hardware Supported: Vagrant-10 PCB, Arduino Pro Micro
+* Hardware Availability: Groupbuys, Pro Micro can be found on [Aliexpress](https://www.aliexpress.com/wholesale?SearchText=arduino+pro+micro)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make vagrant_10:default
+
+Flashing example for this keyboard:
+
+    make vagrant_10:default:flash
+
+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).
diff --git a/qmk/keyboards/vagrant_10/rules.mk b/qmk/keyboards/vagrant_10/rules.mk
new file mode 100644
index 00000000..e4ffb10d
--- /dev/null
+++ b/qmk/keyboards/vagrant_10/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+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
+# 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 = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
diff --git a/qmk/keyboards/vagrant_10/vagrant_10.c b/qmk/keyboards/vagrant_10/vagrant_10.c
new file mode 100644
index 00000000..6c577b92
--- /dev/null
+++ b/qmk/keyboards/vagrant_10/vagrant_10.c
@@ -0,0 +1,25 @@
+/**
+MIT License
+
+Copyright (c) 2020 Shanduur & QMK Firmware
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+
+#include "vagrant_10.h"
diff --git a/qmk/keyboards/vagrant_10/vagrant_10.h b/qmk/keyboards/vagrant_10/vagrant_10.h
new file mode 100644
index 00000000..1cd4d1b7
--- /dev/null
+++ b/qmk/keyboards/vagrant_10/vagrant_10.h
@@ -0,0 +1,39 @@
+/**
+MIT License
+
+Copyright (c) 2020 Shanduur & QMK Firmware
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
+*/
+
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT( \
+                K002, \
+    K100, K101, K102, \
+    K200, K201, K202, \
+    K300, K301, K302  \
+) { \
+    { KC_NO, KC_NO, K002 }, \
+    { K100,  K101,  K102 }, \
+    { K200,  K201,  K202 }, \
+    { K300,  K301,  K302 }  \
+}
diff --git a/qmk/keyboards/viktus/styrka/chconf.h b/qmk/keyboards/viktus/styrka/chconf.h
new file mode 100644
index 00000000..03f63da3
--- /dev/null
+++ b/qmk/keyboards/viktus/styrka/chconf.h
@@ -0,0 +1,714 @@
+/*
+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+/**
+ * @file    rt/templates/chconf.h
+ * @brief   Configuration file template.
+ * @details A copy of this file must be placed in each project directory, it
+ *          contains the application specific kernel settings.
+ *
+ * @addtogroup config
+ * @details Kernel related settings and hooks.
+ * @{
+ */
+
+#ifndef CHCONF_H
+#define CHCONF_H
+
+#define _CHIBIOS_RT_CONF_
+#define _CHIBIOS_RT_CONF_VER_6_0_
+
+/*===========================================================================*/
+/**
+ * @name System timers settings
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   System time counter resolution.
+ * @note    Allowed values are 16 or 32 bits.
+ */
+#if !defined(CH_CFG_ST_RESOLUTION)
+#define CH_CFG_ST_RESOLUTION                32
+#endif
+
+/**
+ * @brief   System tick frequency.
+ * @details Frequency of the system timer that drives the system ticks. This
+ *          setting also defines the system tick time unit.
+ */
+#if !defined(CH_CFG_ST_FREQUENCY)
+#define CH_CFG_ST_FREQUENCY                 10000
+#endif
+
+/**
+ * @brief   Time intervals data size.
+ * @note    Allowed values are 16, 32 or 64 bits.
+ */
+#if !defined(CH_CFG_INTERVALS_SIZE)
+#define CH_CFG_INTERVALS_SIZE               32
+#endif
+
+/**
+ * @brief   Time types data size.
+ * @note    Allowed values are 16 or 32 bits.
+ */
+#if !defined(CH_CFG_TIME_TYPES_SIZE)
+#define CH_CFG_TIME_TYPES_SIZE              32
+#endif
+
+/**
+ * @brief   Time delta constant for the tick-less mode.
+ * @note    If this value is zero then the system uses the classic
+ *          periodic tick. This value represents the minimum number
+ *          of ticks that is safe to specify in a timeout directive.
+ *          The value one is not valid, timeouts are rounded up to
+ *          this value.
+ */
+#if !defined(CH_CFG_ST_TIMEDELTA)
+#define CH_CFG_ST_TIMEDELTA                 2
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Kernel parameters and options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   Round robin interval.
+ * @details This constant is the number of system ticks allowed for the
+ *          threads before preemption occurs. Setting this value to zero
+ *          disables the preemption for threads with equal priority and the
+ *          round robin becomes cooperative. Note that higher priority
+ *          threads can still preempt, the kernel is always preemptive.
+ * @note    Disabling the round robin preemption makes the kernel more compact
+ *          and generally faster.
+ * @note    The round robin preemption is not supported in tickless mode and
+ *          must be set to zero in that case.
+ */
+#if !defined(CH_CFG_TIME_QUANTUM)
+#define CH_CFG_TIME_QUANTUM                 0
+#endif
+
+/**
+ * @brief   Managed RAM size.
+ * @details Size of the RAM area to be managed by the OS. If set to zero
+ *          then the whole available RAM is used. The core memory is made
+ *          available to the heap allocator and/or can be used directly through
+ *          the simplified core memory allocator.
+ *
+ * @note    In order to let the OS manage the whole RAM the linker script must
+ *          provide the @p __heap_base__ and @p __heap_end__ symbols.
+ * @note    Requires @p CH_CFG_USE_MEMCORE.
+ */
+#if !defined(CH_CFG_MEMCORE_SIZE)
+#define CH_CFG_MEMCORE_SIZE                 0
+#endif
+
+/**
+ * @brief   Idle thread automatic spawn suppression.
+ * @details When this option is activated the function @p chSysInit()
+ *          does not spawn the idle thread. The application @p main()
+ *          function becomes the idle thread and must implement an
+ *          infinite loop.
+ */
+#if !defined(CH_CFG_NO_IDLE_THREAD)
+#define CH_CFG_NO_IDLE_THREAD               FALSE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Performance options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   OS optimization.
+ * @details If enabled then time efficient rather than space efficient code
+ *          is used when two possible implementations exist.
+ *
+ * @note    This is not related to the compiler optimization options.
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_OPTIMIZE_SPEED)
+#define CH_CFG_OPTIMIZE_SPEED               FALSE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Subsystem options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   Time Measurement APIs.
+ * @details If enabled then the time measurement APIs are included in
+ *          the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_TM)
+#define CH_CFG_USE_TM                       FALSE
+#endif
+
+/**
+ * @brief   Threads registry APIs.
+ * @details If enabled then the registry APIs are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_REGISTRY)
+#define CH_CFG_USE_REGISTRY                 TRUE
+#endif
+
+/**
+ * @brief   Threads synchronization APIs.
+ * @details If enabled then the @p chThdWait() function is included in
+ *          the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_WAITEXIT)
+#define CH_CFG_USE_WAITEXIT                 TRUE
+#endif
+
+/**
+ * @brief   Semaphores APIs.
+ * @details If enabled then the Semaphores APIs are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_SEMAPHORES)
+#define CH_CFG_USE_SEMAPHORES               TRUE
+#endif
+
+/**
+ * @brief   Semaphores queuing mode.
+ * @details If enabled then the threads are enqueued on semaphores by
+ *          priority rather than in FIFO order.
+ *
+ * @note    The default is @p FALSE. Enable this if you have special
+ *          requirements.
+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.
+ */
+#if !defined(CH_CFG_USE_SEMAPHORES_PRIORITY)
+#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE
+#endif
+
+/**
+ * @brief   Mutexes APIs.
+ * @details If enabled then the mutexes APIs are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_MUTEXES)
+#define CH_CFG_USE_MUTEXES                  TRUE
+#endif
+
+/**
+ * @brief   Enables recursive behavior on mutexes.
+ * @note    Recursive mutexes are heavier and have an increased
+ *          memory footprint.
+ *
+ * @note    The default is @p FALSE.
+ * @note    Requires @p CH_CFG_USE_MUTEXES.
+ */
+#if !defined(CH_CFG_USE_MUTEXES_RECURSIVE)
+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE
+#endif
+
+/**
+ * @brief   Conditional Variables APIs.
+ * @details If enabled then the conditional variables APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_MUTEXES.
+ */
+#if !defined(CH_CFG_USE_CONDVARS)
+#define CH_CFG_USE_CONDVARS                 TRUE
+#endif
+
+/**
+ * @brief   Conditional Variables APIs with timeout.
+ * @details If enabled then the conditional variables APIs with timeout
+ *          specification are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_CONDVARS.
+ */
+#if !defined(CH_CFG_USE_CONDVARS_TIMEOUT)
+#define CH_CFG_USE_CONDVARS_TIMEOUT         FALSE
+#endif
+
+/**
+ * @brief   Events Flags APIs.
+ * @details If enabled then the event flags APIs are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_EVENTS)
+#define CH_CFG_USE_EVENTS                   TRUE
+#endif
+
+/**
+ * @brief   Events Flags APIs with timeout.
+ * @details If enabled then the events APIs with timeout specification
+ *          are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_EVENTS.
+ */
+#if !defined(CH_CFG_USE_EVENTS_TIMEOUT)
+#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE
+#endif
+
+/**
+ * @brief   Synchronous Messages APIs.
+ * @details If enabled then the synchronous messages APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_MESSAGES)
+#define CH_CFG_USE_MESSAGES                 TRUE
+#endif
+
+/**
+ * @brief   Synchronous Messages queuing mode.
+ * @details If enabled then messages are served by priority rather than in
+ *          FIFO order.
+ *
+ * @note    The default is @p FALSE. Enable this if you have special
+ *          requirements.
+ * @note    Requires @p CH_CFG_USE_MESSAGES.
+ */
+#if !defined(CH_CFG_USE_MESSAGES_PRIORITY)
+#define CH_CFG_USE_MESSAGES_PRIORITY        FALSE
+#endif
+
+/**
+ * @brief   Mailboxes APIs.
+ * @details If enabled then the asynchronous messages (mailboxes) APIs are
+ *          included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.
+ */
+#if !defined(CH_CFG_USE_MAILBOXES)
+#define CH_CFG_USE_MAILBOXES                TRUE
+#endif
+
+/**
+ * @brief   Core Memory Manager APIs.
+ * @details If enabled then the core memory manager APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_MEMCORE)
+#define CH_CFG_USE_MEMCORE                  TRUE
+#endif
+
+/**
+ * @brief   Heap Allocator APIs.
+ * @details If enabled then the memory heap allocator APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_MEMCORE and either @p CH_CFG_USE_MUTEXES or
+ *          @p CH_CFG_USE_SEMAPHORES.
+ * @note    Mutexes are recommended.
+ */
+#if !defined(CH_CFG_USE_HEAP)
+#define CH_CFG_USE_HEAP                     FALSE
+#endif
+
+/**
+ * @brief   Memory Pools Allocator APIs.
+ * @details If enabled then the memory pools allocator APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_MEMPOOLS)
+#define CH_CFG_USE_MEMPOOLS                 FALSE
+#endif
+
+/**
+ * @brief   Objects FIFOs APIs.
+ * @details If enabled then the objects FIFOs APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_OBJ_FIFOS)
+#define CH_CFG_USE_OBJ_FIFOS                FALSE
+#endif
+
+/**
+ * @brief   Pipes APIs.
+ * @details If enabled then the pipes APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_PIPES)
+#define CH_CFG_USE_PIPES                    FALSE
+#endif
+
+/**
+ * @brief   Dynamic Threads APIs.
+ * @details If enabled then the dynamic threads creation APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_WAITEXIT.
+ * @note    Requires @p CH_CFG_USE_HEAP and/or @p CH_CFG_USE_MEMPOOLS.
+ */
+#if !defined(CH_CFG_USE_DYNAMIC)
+#define CH_CFG_USE_DYNAMIC                  FALSE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Objects factory options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   Objects Factory APIs.
+ * @details If enabled then the objects factory APIs are included in the
+ *          kernel.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_CFG_USE_FACTORY)
+#define CH_CFG_USE_FACTORY                  FALSE
+#endif
+
+/**
+ * @brief   Maximum length for object names.
+ * @details If the specified length is zero then the name is stored by
+ *          pointer but this could have unintended side effects.
+ */
+#if !defined(CH_CFG_FACTORY_MAX_NAMES_LENGTH)
+#define CH_CFG_FACTORY_MAX_NAMES_LENGTH     8
+#endif
+
+/**
+ * @brief   Enables the registry of generic objects.
+ */
+#if !defined(CH_CFG_FACTORY_OBJECTS_REGISTRY)
+#define CH_CFG_FACTORY_OBJECTS_REGISTRY     FALSE
+#endif
+
+/**
+ * @brief   Enables factory for generic buffers.
+ */
+#if !defined(CH_CFG_FACTORY_GENERIC_BUFFERS)
+#define CH_CFG_FACTORY_GENERIC_BUFFERS      FALSE
+#endif
+
+/**
+ * @brief   Enables factory for semaphores.
+ */
+#if !defined(CH_CFG_FACTORY_SEMAPHORES)
+#define CH_CFG_FACTORY_SEMAPHORES           FALSE
+#endif
+
+/**
+ * @brief   Enables factory for mailboxes.
+ */
+#if !defined(CH_CFG_FACTORY_MAILBOXES)
+#define CH_CFG_FACTORY_MAILBOXES            FALSE
+#endif
+
+/**
+ * @brief   Enables factory for objects FIFOs.
+ */
+#if !defined(CH_CFG_FACTORY_OBJ_FIFOS)
+#define CH_CFG_FACTORY_OBJ_FIFOS            FALSE
+#endif
+
+/**
+ * @brief   Enables factory for Pipes.
+ */
+#if !defined(CH_CFG_FACTORY_PIPES) || defined(__DOXYGEN__)
+#define CH_CFG_FACTORY_PIPES                FALSE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Debug options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   Debug option, kernel statistics.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_STATISTICS)
+#define CH_DBG_STATISTICS                   FALSE
+#endif
+
+/**
+ * @brief   Debug option, system state check.
+ * @details If enabled the correct call protocol for system APIs is checked
+ *          at runtime.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_SYSTEM_STATE_CHECK)
+#define CH_DBG_SYSTEM_STATE_CHECK           FALSE
+#endif
+
+/**
+ * @brief   Debug option, parameters checks.
+ * @details If enabled then the checks on the API functions input
+ *          parameters are activated.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_ENABLE_CHECKS)
+#define CH_DBG_ENABLE_CHECKS                FALSE
+#endif
+
+/**
+ * @brief   Debug option, consistency checks.
+ * @details If enabled then all the assertions in the kernel code are
+ *          activated. This includes consistency checks inside the kernel,
+ *          runtime anomalies and port-defined checks.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_ENABLE_ASSERTS)
+#define CH_DBG_ENABLE_ASSERTS               FALSE
+#endif
+
+/**
+ * @brief   Debug option, trace buffer.
+ * @details If enabled then the trace buffer is activated.
+ *
+ * @note    The default is @p CH_DBG_TRACE_MASK_DISABLED.
+ */
+#if !defined(CH_DBG_TRACE_MASK)
+#define CH_DBG_TRACE_MASK                   CH_DBG_TRACE_MASK_DISABLED
+#endif
+
+/**
+ * @brief   Trace buffer entries.
+ * @note    The trace buffer is only allocated if @p CH_DBG_TRACE_MASK is
+ *          different from @p CH_DBG_TRACE_MASK_DISABLED.
+ */
+#if !defined(CH_DBG_TRACE_BUFFER_SIZE)
+#define CH_DBG_TRACE_BUFFER_SIZE            128
+#endif
+
+/**
+ * @brief   Debug option, stack checks.
+ * @details If enabled then a runtime stack check is performed.
+ *
+ * @note    The default is @p FALSE.
+ * @note    The stack check is performed in a architecture/port dependent way.
+ *          It may not be implemented or some ports.
+ * @note    The default failure mode is to halt the system with the global
+ *          @p panic_msg variable set to @p NULL.
+ */
+#if !defined(CH_DBG_ENABLE_STACK_CHECK)
+#define CH_DBG_ENABLE_STACK_CHECK           FALSE
+#endif
+
+/**
+ * @brief   Debug option, stacks initialization.
+ * @details If enabled then the threads working area is filled with a byte
+ *          value when a thread is created. This can be useful for the
+ *          runtime measurement of the used stack.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_FILL_THREADS)
+#define CH_DBG_FILL_THREADS                 FALSE
+#endif
+
+/**
+ * @brief   Debug option, threads profiling.
+ * @details If enabled then a field is added to the @p thread_t structure that
+ *          counts the system ticks occurred while executing the thread.
+ *
+ * @note    The default is @p FALSE.
+ * @note    This debug option is not currently compatible with the
+ *          tickless mode.
+ */
+#if !defined(CH_DBG_THREADS_PROFILING)
+#define CH_DBG_THREADS_PROFILING            FALSE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Kernel hooks
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   System structure extension.
+ * @details User fields added to the end of the @p ch_system_t structure.
+ */
+#define CH_CFG_SYSTEM_EXTRA_FIELDS                                          \
+  /* Add threads custom fields here.*/
+
+/**
+ * @brief   System initialization hook.
+ * @details User initialization code added to the @p chSysInit() function
+ *          just before interrupts are enabled globally.
+ */
+#define CH_CFG_SYSTEM_INIT_HOOK() {                                         \
+  /* Add threads initialization code here.*/                                \
+}
+
+/**
+ * @brief   Threads descriptor structure extension.
+ * @details User fields added to the end of the @p thread_t structure.
+ */
+#define CH_CFG_THREAD_EXTRA_FIELDS                                          \
+  /* Add threads custom fields here.*/
+
+/**
+ * @brief   Threads initialization hook.
+ * @details User initialization code added to the @p _thread_init() function.
+ *
+ * @note    It is invoked from within @p _thread_init() and implicitly from all
+ *          the threads creation APIs.
+ */
+#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \
+  /* Add threads initialization code here.*/                                \
+}
+
+/**
+ * @brief   Threads finalization hook.
+ * @details User finalization code added to the @p chThdExit() API.
+ */
+#define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \
+  /* Add threads finalization code here.*/                                  \
+}
+
+/**
+ * @brief   Context switch hook.
+ * @details This hook is invoked just before switching between threads.
+ */
+#define CH_CFG_CONTEXT_SWITCH_HOOK(ntp, otp) {                              \
+  /* Context switch code here.*/                                            \
+}
+
+/**
+ * @brief   ISR enter hook.
+ */
+#define CH_CFG_IRQ_PROLOGUE_HOOK() {                                        \
+  /* IRQ prologue code here.*/                                              \
+}
+
+/**
+ * @brief   ISR exit hook.
+ */
+#define CH_CFG_IRQ_EPILOGUE_HOOK() {                                        \
+  /* IRQ epilogue code here.*/                                              \
+}
+
+/**
+ * @brief   Idle thread enter hook.
+ * @note    This hook is invoked within a critical zone, no OS functions
+ *          should be invoked from here.
+ * @note    This macro can be used to activate a power saving mode.
+ */
+#define CH_CFG_IDLE_ENTER_HOOK() {                                          \
+  /* Idle-enter code here.*/                                                \
+}
+
+/**
+ * @brief   Idle thread leave hook.
+ * @note    This hook is invoked within a critical zone, no OS functions
+ *          should be invoked from here.
+ * @note    This macro can be used to deactivate a power saving mode.
+ */
+#define CH_CFG_IDLE_LEAVE_HOOK() {                                          \
+  /* Idle-leave code here.*/                                                \
+}
+
+/**
+ * @brief   Idle Loop hook.
+ * @details This hook is continuously invoked by the idle thread loop.
+ */
+#define CH_CFG_IDLE_LOOP_HOOK() {                                           \
+  /* Idle loop code here.*/                                                 \
+}
+
+/**
+ * @brief   System tick event hook.
+ * @details This hook is invoked in the system tick handler immediately
+ *          after processing the virtual timers queue.
+ */
+#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \
+  /* System tick event code here.*/                                         \
+}
+
+/**
+ * @brief   System halt hook.
+ * @details This hook is invoked in case to a system halting error before
+ *          the system is halted.
+ */
+#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \
+  /* System halt code here.*/                                               \
+}
+
+/**
+ * @brief   Trace hook.
+ * @details This hook is invoked each time a new record is written in the
+ *          trace buffer.
+ */
+#define CH_CFG_TRACE_HOOK(tep) {                                            \
+  /* Trace code here.*/                                                     \
+}
+
+/** @} */
+
+/*===========================================================================*/
+/* Port-specific settings (override port settings defaulted in chcore.h).    */
+/*===========================================================================*/
+
+#endif  /* CHCONF_H */
+
+/** @} */
diff --git a/qmk/keyboards/viktus/styrka/config.h b/qmk/keyboards/viktus/styrka/config.h
new file mode 100644
index 00000000..9fe66a8b
--- /dev/null
+++ b/qmk/keyboards/viktus/styrka/config.h
@@ -0,0 +1,109 @@
+/*
+Copyright 2020 jrfhoutx
+
+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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x5644 // "VD" = Viktus Design LLC
+#define PRODUCT_ID      0x0001
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Viktus Design LLC
+#define PRODUCT         Styrka
+
+/* key matrix size */
+#define MATRIX_ROWS 10
+#define MATRIX_COLS 9
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+*/
+#define MATRIX_ROW_PINS {B11, B10, B2, B1, B0, A7, A6, A5, B13, B12}
+#define MATRIX_COL_PINS {A0, A1, A2, A3, A4, B14, B15, A8, A9}
+//{C13, C14, C15, A0,A2,A3,A4,A5,A6, A1,B12,B1}
+/* Unused pins, in the default layout, are:
+EncA (B6) because it is not used in the default PCB
+All Extra pins (A8, B15, B14, B13, B3, B5, B8, B9) , for the same reason;
+B0, which is unconnected on the PCB
+*/
+//#define UNUSED_PINS { B0, B6, B13, B14, B15, B8, B9, B5, B3 }
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is userful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+// #define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+//#define NO_ACTION_MACRO
+//#define NO_ACTION_FUNCTION
diff --git a/qmk/keyboards/viktus/styrka/halconf.h b/qmk/keyboards/viktus/styrka/halconf.h
new file mode 100644
index 00000000..16f32117
--- /dev/null
+++ b/qmk/keyboards/viktus/styrka/halconf.h
@@ -0,0 +1,525 @@
+/*
+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+/**
+ * @file    templates/halconf.h
+ * @brief   HAL configuration header.
+ * @details HAL configuration file, this file allows to enable or disable the
+ *          various device drivers from your application. You may also use
+ *          this file in order to override the device drivers default settings.
+ *
+ * @addtogroup HAL_CONF
+ * @{
+ */
+
+#ifndef HALCONF_H
+#define HALCONF_H
+
+#define _CHIBIOS_HAL_CONF_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
+
+#include "mcuconf.h"
+
+/**
+ * @brief   Enables the PAL subsystem.
+ */
+#if !defined(HAL_USE_PAL) || defined(__DOXYGEN__)
+#define HAL_USE_PAL                         TRUE
+#endif
+
+/**
+ * @brief   Enables the ADC subsystem.
+ */
+#if !defined(HAL_USE_ADC) || defined(__DOXYGEN__)
+#define HAL_USE_ADC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the CAN subsystem.
+ */
+#if !defined(HAL_USE_CAN) || defined(__DOXYGEN__)
+#define HAL_USE_CAN                         FALSE
+#endif
+
+/**
+ * @brief   Enables the cryptographic subsystem.
+ */
+#if !defined(HAL_USE_CRY) || defined(__DOXYGEN__)
+#define HAL_USE_CRY                         FALSE
+#endif
+
+/**
+ * @brief   Enables the DAC subsystem.
+ */
+#if !defined(HAL_USE_DAC) || defined(__DOXYGEN__)
+#define HAL_USE_DAC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the GPT subsystem.
+ */
+#if !defined(HAL_USE_GPT) || defined(__DOXYGEN__)
+#define HAL_USE_GPT                         FALSE
+#endif
+
+/**
+ * @brief   Enables the I2C subsystem.
+ */
+#if !defined(HAL_USE_I2C) || defined(__DOXYGEN__)
+#define HAL_USE_I2C                         FALSE
+#endif
+
+/**
+ * @brief   Enables the I2S subsystem.
+ */
+#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)
+#define HAL_USE_I2S                         FALSE
+#endif
+
+/**
+ * @brief   Enables the ICU subsystem.
+ */
+#if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)
+#define HAL_USE_ICU                         FALSE
+#endif
+
+/**
+ * @brief   Enables the MAC subsystem.
+ */
+#if !defined(HAL_USE_MAC) || defined(__DOXYGEN__)
+#define HAL_USE_MAC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the MMC_SPI subsystem.
+ */
+#if !defined(HAL_USE_MMC_SPI) || defined(__DOXYGEN__)
+#define HAL_USE_MMC_SPI                     FALSE
+#endif
+
+/**
+ * @brief   Enables the PWM subsystem.
+ */
+#if !defined(HAL_USE_PWM) || defined(__DOXYGEN__)
+#define HAL_USE_PWM                         FALSE
+#endif
+
+/**
+ * @brief   Enables the RTC subsystem.
+ */
+#if !defined(HAL_USE_RTC) || defined(__DOXYGEN__)
+#define HAL_USE_RTC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the SDC subsystem.
+ */
+#if !defined(HAL_USE_SDC) || defined(__DOXYGEN__)
+#define HAL_USE_SDC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the SERIAL subsystem.
+ */
+#if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__)
+#define HAL_USE_SERIAL                      FALSE
+#endif
+
+/**
+ * @brief   Enables the SERIAL over USB subsystem.
+ */
+#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)
+#define HAL_USE_SERIAL_USB                  FALSE
+#endif
+
+/**
+ * @brief   Enables the SIO subsystem.
+ */
+#if !defined(HAL_USE_SIO) || defined(__DOXYGEN__)
+#define HAL_USE_SIO                         FALSE
+#endif
+
+/**
+ * @brief   Enables the SPI subsystem.
+ */
+#if !defined(HAL_USE_SPI) || defined(__DOXYGEN__)
+#define HAL_USE_SPI                         FALSE
+#endif
+
+/**
+ * @brief   Enables the TRNG subsystem.
+ */
+#if !defined(HAL_USE_TRNG) || defined(__DOXYGEN__)
+#define HAL_USE_TRNG                        FALSE
+#endif
+
+/**
+ * @brief   Enables the UART subsystem.
+ */
+#if !defined(HAL_USE_UART) || defined(__DOXYGEN__)
+#define HAL_USE_UART                        FALSE
+#endif
+
+/**
+ * @brief   Enables the USB subsystem.
+ */
+#if !defined(HAL_USE_USB) || defined(__DOXYGEN__)
+#define HAL_USE_USB                         TRUE
+#endif
+
+/**
+ * @brief   Enables the WDG subsystem.
+ */
+#if !defined(HAL_USE_WDG) || defined(__DOXYGEN__)
+#define HAL_USE_WDG                         FALSE
+#endif
+
+/**
+ * @brief   Enables the WSPI subsystem.
+ */
+#if !defined(HAL_USE_WSPI) || defined(__DOXYGEN__)
+#define HAL_USE_WSPI                        FALSE
+#endif
+
+/*===========================================================================*/
+/* PAL driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(PAL_USE_CALLBACKS) || defined(__DOXYGEN__)
+#define PAL_USE_CALLBACKS                   FALSE
+#endif
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(PAL_USE_WAIT) || defined(__DOXYGEN__)
+#define PAL_USE_WAIT                        FALSE
+#endif
+
+/*===========================================================================*/
+/* ADC driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(ADC_USE_WAIT) || defined(__DOXYGEN__)
+#define ADC_USE_WAIT                        TRUE
+#endif
+
+/**
+ * @brief   Enables the @p adcAcquireBus() and @p adcReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(ADC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define ADC_USE_MUTUAL_EXCLUSION            TRUE
+#endif
+
+/*===========================================================================*/
+/* CAN driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Sleep mode related APIs inclusion switch.
+ */
+#if !defined(CAN_USE_SLEEP_MODE) || defined(__DOXYGEN__)
+#define CAN_USE_SLEEP_MODE                  TRUE
+#endif
+
+/**
+ * @brief   Enforces the driver to use direct callbacks rather than OSAL events.
+ */
+#if !defined(CAN_ENFORCE_USE_CALLBACKS) || defined(__DOXYGEN__)
+#define CAN_ENFORCE_USE_CALLBACKS           FALSE
+#endif
+
+/*===========================================================================*/
+/* CRY driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables the SW fall-back of the cryptographic driver.
+ * @details When enabled, this option, activates a fall-back software
+ *          implementation for algorithms not supported by the underlying
+ *          hardware.
+ * @note    Fall-back implementations may not be present for all algorithms.
+ */
+#if !defined(HAL_CRY_USE_FALLBACK) || defined(__DOXYGEN__)
+#define HAL_CRY_USE_FALLBACK                FALSE
+#endif
+
+/**
+ * @brief   Makes the driver forcibly use the fall-back implementations.
+ */
+#if !defined(HAL_CRY_ENFORCE_FALLBACK) || defined(__DOXYGEN__)
+#define HAL_CRY_ENFORCE_FALLBACK            FALSE
+#endif
+
+/*===========================================================================*/
+/* DAC driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(DAC_USE_WAIT) || defined(__DOXYGEN__)
+#define DAC_USE_WAIT                        TRUE
+#endif
+
+/**
+ * @brief   Enables the @p dacAcquireBus() and @p dacReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(DAC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define DAC_USE_MUTUAL_EXCLUSION            TRUE
+#endif
+
+/*===========================================================================*/
+/* I2C driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables the mutual exclusion APIs on the I2C bus.
+ */
+#if !defined(I2C_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define I2C_USE_MUTUAL_EXCLUSION            TRUE
+#endif
+
+/*===========================================================================*/
+/* MAC driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables the zero-copy API.
+ */
+#if !defined(MAC_USE_ZERO_COPY) || defined(__DOXYGEN__)
+#define MAC_USE_ZERO_COPY                   FALSE
+#endif
+
+/**
+ * @brief   Enables an event sources for incoming packets.
+ */
+#if !defined(MAC_USE_EVENTS) || defined(__DOXYGEN__)
+#define MAC_USE_EVENTS                      TRUE
+#endif
+
+/*===========================================================================*/
+/* MMC_SPI driver related settings.                                          */
+/*===========================================================================*/
+
+/**
+ * @brief   Delays insertions.
+ * @details If enabled this options inserts delays into the MMC waiting
+ *          routines releasing some extra CPU time for the threads with
+ *          lower priority, this may slow down the driver a bit however.
+ *          This option is recommended also if the SPI driver does not
+ *          use a DMA channel and heavily loads the CPU.
+ */
+#if !defined(MMC_NICE_WAITING) || defined(__DOXYGEN__)
+#define MMC_NICE_WAITING                    TRUE
+#endif
+
+/*===========================================================================*/
+/* SDC driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Number of initialization attempts before rejecting the card.
+ * @note    Attempts are performed at 10mS intervals.
+ */
+#if !defined(SDC_INIT_RETRY) || defined(__DOXYGEN__)
+#define SDC_INIT_RETRY                      100
+#endif
+
+/**
+ * @brief   Include support for MMC cards.
+ * @note    MMC support is not yet implemented so this option must be kept
+ *          at @p FALSE.
+ */
+#if !defined(SDC_MMC_SUPPORT) || defined(__DOXYGEN__)
+#define SDC_MMC_SUPPORT                     FALSE
+#endif
+
+/**
+ * @brief   Delays insertions.
+ * @details If enabled this options inserts delays into the MMC waiting
+ *          routines releasing some extra CPU time for the threads with
+ *          lower priority, this may slow down the driver a bit however.
+ */
+#if !defined(SDC_NICE_WAITING) || defined(__DOXYGEN__)
+#define SDC_NICE_WAITING                    TRUE
+#endif
+
+/**
+ * @brief   OCR initialization constant for V20 cards.
+ */
+#if !defined(SDC_INIT_OCR_V20) || defined(__DOXYGEN__)
+#define SDC_INIT_OCR_V20                    0x50FF8000U
+#endif
+
+/**
+ * @brief   OCR initialization constant for non-V20 cards.
+ */
+#if !defined(SDC_INIT_OCR) || defined(__DOXYGEN__)
+#define SDC_INIT_OCR                        0x80100000U
+#endif
+
+/*===========================================================================*/
+/* SERIAL driver related settings.                                           */
+/*===========================================================================*/
+
+/**
+ * @brief   Default bit rate.
+ * @details Configuration parameter, this is the baud rate selected for the
+ *          default configuration.
+ */
+#if !defined(SERIAL_DEFAULT_BITRATE) || defined(__DOXYGEN__)
+#define SERIAL_DEFAULT_BITRATE              38400
+#endif
+
+/**
+ * @brief   Serial buffers size.
+ * @details Configuration parameter, you can change the depth of the queue
+ *          buffers depending on the requirements of your application.
+ * @note    The default is 16 bytes for both the transmission and receive
+ *          buffers.
+ */
+#if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__)
+#define SERIAL_BUFFERS_SIZE                 16
+#endif
+
+/*===========================================================================*/
+/* SERIAL_USB driver related setting.                                        */
+/*===========================================================================*/
+
+/**
+ * @brief   Serial over USB buffers size.
+ * @details Configuration parameter, the buffer size must be a multiple of
+ *          the USB data endpoint maximum packet size.
+ * @note    The default is 256 bytes for both the transmission and receive
+ *          buffers.
+ */
+#if !defined(SERIAL_USB_BUFFERS_SIZE) || defined(__DOXYGEN__)
+#define SERIAL_USB_BUFFERS_SIZE             1
+#endif
+
+/**
+ * @brief   Serial over USB number of buffers.
+ * @note    The default is 2 buffers.
+ */
+#if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
+#define SERIAL_USB_BUFFERS_NUMBER           2
+#endif
+
+/*===========================================================================*/
+/* SPI driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(SPI_USE_WAIT) || defined(__DOXYGEN__)
+#define SPI_USE_WAIT                        TRUE
+#endif
+
+/**
+ * @brief   Enables circular transfers APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(SPI_USE_CIRCULAR) || defined(__DOXYGEN__)
+#define SPI_USE_CIRCULAR                    FALSE
+#endif
+
+
+/**
+ * @brief   Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(SPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define SPI_USE_MUTUAL_EXCLUSION            TRUE
+#endif
+
+/**
+ * @brief   Handling method for SPI CS line.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(SPI_SELECT_MODE) || defined(__DOXYGEN__)
+#define SPI_SELECT_MODE                     SPI_SELECT_MODE_PAD
+#endif
+
+/*===========================================================================*/
+/* UART driver related settings.                                             */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(UART_USE_WAIT) || defined(__DOXYGEN__)
+#define UART_USE_WAIT                       FALSE
+#endif
+
+/**
+ * @brief   Enables the @p uartAcquireBus() and @p uartReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(UART_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define UART_USE_MUTUAL_EXCLUSION           FALSE
+#endif
+
+/*===========================================================================*/
+/* USB driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(USB_USE_WAIT) || defined(__DOXYGEN__)
+#define USB_USE_WAIT                        TRUE
+#endif
+
+/*===========================================================================*/
+/* WSPI driver related settings.                                             */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(WSPI_USE_WAIT) || defined(__DOXYGEN__)
+#define WSPI_USE_WAIT                       TRUE
+#endif
+
+/**
+ * @brief   Enables the @p wspiAcquireBus() and @p wspiReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(WSPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define WSPI_USE_MUTUAL_EXCLUSION           TRUE
+#endif
+
+#endif /* HALCONF_H */
+
+/** @} */
diff --git a/qmk/keyboards/viktus/styrka/info.json b/qmk/keyboards/viktus/styrka/info.json
new file mode 100644
index 00000000..972a42e8
--- /dev/null
+++ b/qmk/keyboards/viktus/styrka/info.json
@@ -0,0 +1,19 @@
+{
+  "keyboard_name": "Styrka",
+  "keyboard_folder": "viktus/styrka",
+  "url": "https",
+  "maintainer": "jrfhoutx",
+  "width": 18.25,
+  "height": 5,
+  "layouts": {
+    "LAYOUT_default": {
+      "layout": [{"label":"F1", "x":0, "y":0}, {"label":"MO(1)", "x":1, "y":0}, {"label":"~", "x":2.25, "y":0}, {"label":"!", "x":3.25, "y":0}, {"label":"@", "x":4.25, "y":0}, {"label":"#", "x":5.25, "y":0}, {"label":"$", "x":6.25, "y":0}, {"label":"%", "x":7.25, "y":0}, {"label":"^", "x":8.25, "y":0}, {"label":"&", "x":9.25, "y":0}, {"label":"*", "x":10.25, "y":0}, {"label":"(", "x":11.25, "y":0}, {"label":")", "x":12.25, "y":0}, {"label":"_", "x":13.25, "y":0}, {"label":"+", "x":14.25, "y":0}, {"label":"Backspace", "x":15.25, "y":0, "w":2}, {"label":"Insert", "x":17.25, "y":0}, {"label":"F3", "x":0, "y":1}, {"label":"F4", "x":1, "y":1}, {"label":"Tab", "x":2.25, "y":1, "w":1.5}, {"label":"Q", "x":3.75, "y":1}, {"label":"W", "x":4.75, "y":1}, {"label":"E", "x":5.75, "y":1}, {"label":"R", "x":6.75, "y":1}, {"label":"T", "x":7.75, "y":1}, {"label":"Y", "x":8.75, "y":1}, {"label":"U", "x":9.75, "y":1}, {"label":"I", "x":10.75, "y":1}, {"label":"O", "x":11.75, "y":1}, {"label":"P", "x":12.75, "y":1}, {"label":"{", "x":13.75, "y":1}, {"label":"}", "x":14.75, "y":1}, {"label":"|", "x":15.75, "y":1, "w":1.5}, {"label":"Delete", "x":17.25, "y":1}, {"label":"F5", "x":0, "y":2}, {"label":"F6", "x":1, "y":2}, {"label":"Caps Lock", "x":2.25, "y":2, "w":1.75}, {"label":"A", "x":4, "y":2}, {"label":"S", "x":5, "y":2}, {"label":"D", "x":6, "y":2}, {"label":"F", "x":7, "y":2}, {"label":"G", "x":8, "y":2}, {"label":"H", "x":9, "y":2}, {"label":"J", "x":10, "y":2}, {"label":"K", "x":11, "y":2}, {"label":"L", "x":12, "y":2}, {"label":":", "x":13, "y":2}, {"label":"\"", "x":14, "y":2}, {"label":"Enter", "x":15, "y":2, "w":2.25}, {"label":"PgUp", "x":17.25, "y":2}, {"label":"F7", "x":0, "y":3}, {"label":"F8", "x":1, "y":3}, {"label":"Shift", "x":2.25, "y":3, "w":2.25}, {"label":"Z", "x":4.5, "y":3}, {"label":"X", "x":5.5, "y":3}, {"label":"C", "x":6.5, "y":3}, {"label":"V", "x":7.5, "y":3}, {"label":"B", "x":8.5, "y":3}, {"label":"N", "x":9.5, "y":3}, {"label":"M", "x":10.5, "y":3}, {"label":"<", "x":11.5, "y":3}, {"label":">", "x":12.5, "y":3}, {"label":"?", "x":13.5, "y":3}, {"label":"Shift", "x":14.5, "y":3, "w":1.75}, {"label":"\u2191", "x":16.25, "y":3}, {"label":"PgDn", "x":17.25, "y":3}, {"label":"F9", "x":0, "y":4}, {"label":"F10", "x":1, "y":4}, {"label":"Ctrl", "x":2.25, "y":4, "w":1.25}, {"label":"Win", "x":3.5, "y":4, "w":1.25}, {"label":"Alt", "x":4.75, "y":4, "w":1.25}, {"x":6, "y":4, "w":6.25}, {"label":"Alt", "x":12.25, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.5, "y":4, "w":1.25}, {"label":"\u2190", "x":15.25, "y":4}, {"label":"\u2193", "x":16.25, "y":4}, {"label":"\u2192", "x":17.25, "y":4}]
+    },
+    "LAYOUT_split_bs": {
+      "layout": [{"label":"F1", "x":0, "y":0}, {"label":"MO(1)", "x":1, "y":0}, {"label":"~", "x":2.25, "y":0}, {"label":"!", "x":3.25, "y":0}, {"label":"@", "x":4.25, "y":0}, {"label":"#", "x":5.25, "y":0}, {"label":"$", "x":6.25, "y":0}, {"label":"%", "x":7.25, "y":0}, {"label":"^", "x":8.25, "y":0}, {"label":"&", "x":9.25, "y":0}, {"label":"*", "x":10.25, "y":0}, {"label":"(", "x":11.25, "y":0}, {"label":")", "x":12.25, "y":0}, {"label":"_", "x":13.25, "y":0}, {"label":"+", "x":14.25, "y":0}, {"label":"|", "x":15.25, "y":0}, {"label":"Delete", "x":16.25, "y":0}, {"label":"Insert", "x":17.25, "y":0}, {"label":"F3", "x":0, "y":1}, {"label":"F4", "x":1, "y":1}, {"label":"Tab", "x":2.25, "y":1, "w":1.5}, {"label":"Q", "x":3.75, "y":1}, {"label":"W", "x":4.75, "y":1}, {"label":"E", "x":5.75, "y":1}, {"label":"R", "x":6.75, "y":1}, {"label":"T", "x":7.75, "y":1}, {"label":"Y", "x":8.75, "y":1}, {"label":"U", "x":9.75, "y":1}, {"label":"I", "x":10.75, "y":1}, {"label":"O", "x":11.75, "y":1}, {"label":"P", "x":12.75, "y":1}, {"label":"{", "x":13.75, "y":1}, {"label":"}", "x":14.75, "y":1}, {"label":"Backspace", "x":15.75, "y":1, "w":1.5}, {"label":"PgUp", "x":17.25, "y":1}, {"label":"F5", "x":0, "y":2}, {"label":"F6", "x":1, "y":2}, {"label":"Caps Lock", "x":2.25, "y":2, "w":1.75}, {"label":"A", "x":4, "y":2}, {"label":"S", "x":5, "y":2}, {"label":"D", "x":6, "y":2}, {"label":"F", "x":7, "y":2}, {"label":"G", "x":8, "y":2}, {"label":"H", "x":9, "y":2}, {"label":"J", "x":10, "y":2}, {"label":"K", "x":11, "y":2}, {"label":"L", "x":12, "y":2}, {"label":":", "x":13, "y":2}, {"label":"\"", "x":14, "y":2}, {"label":"Enter", "x":15, "y":2, "w":2.25}, {"label":"PgDn", "x":17.25, "y":2}, {"label":"F7", "x":0, "y":3}, {"label":"F8", "x":1, "y":3}, {"label":"Shift", "x":2.25, "y":3, "w":2.25}, {"label":"Z", "x":4.5, "y":3}, {"label":"X", "x":5.5, "y":3}, {"label":"C", "x":6.5, "y":3}, {"label":"V", "x":7.5, "y":3}, {"label":"B", "x":8.5, "y":3}, {"label":"N", "x":9.5, "y":3}, {"label":"M", "x":10.5, "y":3}, {"label":"<", "x":11.5, "y":3}, {"label":">", "x":12.5, "y":3}, {"label":"?", "x":13.5, "y":3}, {"label":"Shift", "x":14.5, "y":3, "w":1.75}, {"label":"\u2191", "x":16.25, "y":3}, {"label":"End", "x":17.25, "y":3}, {"label":"F9", "x":0, "y":4}, {"label":"F10", "x":1, "y":4}, {"label":"Ctrl", "x":2.25, "y":4, "w":1.25}, {"label":"Win", "x":3.5, "y":4, "w":1.25}, {"label":"Alt", "x":4.75, "y":4, "w":1.25}, {"x":6, "y":4, "w":6.25}, {"label":"Alt", "x":12.25, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.5, "y":4, "w":1.25}, {"label":"\u2190", "x":15.25, "y":4}, {"label":"\u2193", "x":16.25, "y":4}, {"label":"\u2192", "x":17.25, "y":4}]
+    },
+    "LAYOUT_all": {
+      "layout": [{"label":"F1", "x":0, "y":0}, {"label":"MO(1)", "x":1, "y":0}, {"label":"~", "x":2.25, "y":0}, {"label":"!", "x":3.25, "y":0}, {"label":"@", "x":4.25, "y":0}, {"label":"#", "x":5.25, "y":0}, {"label":"$", "x":6.25, "y":0}, {"label":"%", "x":7.25, "y":0}, {"label":"^", "x":8.25, "y":0}, {"label":"&", "x":9.25, "y":0}, {"label":"*", "x":10.25, "y":0}, {"label":"(", "x":11.25, "y":0}, {"label":")", "x":12.25, "y":0}, {"label":"_", "x":13.25, "y":0}, {"label":"+", "x":14.25, "y":0}, {"x":15.25, "y":0}, {"label":"Back", "x":16.25, "y":0}, {"label":"Insert", "x":17.25, "y":0}, {"label":"F3", "x":0, "y":1}, {"label":"F4", "x":1, "y":1}, {"label":"Tab", "x":2.25, "y":1, "w":1.5}, {"label":"Q", "x":3.75, "y":1}, {"label":"W", "x":4.75, "y":1}, {"label":"E", "x":5.75, "y":1}, {"label":"R", "x":6.75, "y":1}, {"label":"T", "x":7.75, "y":1}, {"label":"Y", "x":8.75, "y":1}, {"label":"U", "x":9.75, "y":1}, {"label":"I", "x":10.75, "y":1}, {"label":"O", "x":11.75, "y":1}, {"label":"P", "x":12.75, "y":1}, {"label":"{", "x":13.75, "y":1}, {"label":"}", "x":14.75, "y":1}, {"label":"|", "x":15.75, "y":1, "w":1.5}, {"label":"Delete", "x":17.25, "y":1}, {"label":"F5", "x":0, "y":2}, {"label":"F6", "x":1, "y":2}, {"label":"Caps Lock", "x":2.25, "y":2, "w":1.75}, {"label":"A", "x":4, "y":2}, {"label":"S", "x":5, "y":2}, {"label":"D", "x":6, "y":2}, {"label":"F", "x":7, "y":2}, {"label":"G", "x":8, "y":2}, {"label":"H", "x":9, "y":2}, {"label":"J", "x":10, "y":2}, {"label":"K", "x":11, "y":2}, {"label":"L", "x":12, "y":2}, {"label":":", "x":13, "y":2}, {"label":"\"", "x":14, "y":2}, {"x":15, "y":2}, {"label":"Enter", "x":16, "y":2, "w":1.25}, {"label":"PgUp", "x":17.25, "y":2}, {"label":"F7", "x":0, "y":3}, {"label":"F8", "x":1, "y":3}, {"label":"Shift", "x":2.25, "y":3, "w":1.25}, {"x":3.5, "y":3}, {"label":"Z", "x":4.5, "y":3}, {"label":"X", "x":5.5, "y":3}, {"label":"C", "x":6.5, "y":3}, {"label":"V", "x":7.5, "y":3}, {"label":"B", "x":8.5, "y":3}, {"label":"N", "x":9.5, "y":3}, {"label":"M", "x":10.5, "y":3}, {"label":"<", "x":11.5, "y":3}, {"label":">", "x":12.5, "y":3}, {"label":"?", "x":13.5, "y":3}, {"label":"Shift", "x":14.5, "y":3, "w":1.75}, {"label":"\u2191", "x":16.25, "y":3}, {"label":"PgDn", "x":17.25, "y":3}, {"label":"F9", "x":0, "y":4}, {"label":"F10", "x":1, "y":4}, {"label":"Ctrl", "x":2.25, "y":4, "w":1.25}, {"label":"Win", "x":3.5, "y":4, "w":1.25}, {"label":"Alt", "x":4.75, "y":4, "w":1.25}, {"x":6, "y":4, "w":6.25}, {"label":"Alt", "x":12.25, "y":4, "w":1.25}, {"label":"Ctrl", "x":13.5, "y":4, "w":1.25}, {"label":"\u2190", "x":15.25, "y":4}, {"label":"\u2193", "x":16.25, "y":4}, {"label":"\u2192", "x":17.25, "y":4}]
+    }
+}
+}
diff --git a/qmk/keyboards/viktus/styrka/keymaps/all/keymap.c b/qmk/keyboards/viktus/styrka/keymaps/all/keymap.c
new file mode 100644
index 00000000..01c8362e
--- /dev/null
+++ b/qmk/keyboards/viktus/styrka/keymaps/all/keymap.c
@@ -0,0 +1,48 @@
+/* Copyright 2020 jrfhoutx
+ *
+ * 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] = {
+ /* Keymap BASE: (Base Layer) Default Split Backspace Layer
+   * .---------.,---------------------------------------------------------------------.
+   * | F1 | F2 ||Esc | 1 |  2|  3|  4|  5|  6| 7|  8|  9|  0|  -|  =|  ~ |  \  |  Ins |
+   * |----|----||---------------------------------------------------------------------|
+   * | F3 | F4 ||Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P| [ | ] |  BkSpc |  Del |
+   * |----|----||---------------------------------------------------------------------|
+   * | F5 | F6 ||CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|  Return  |  PgUp|
+   * |----|----||---------------------------------------------------------------------|
+   * | F7 | F8 ||Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /| Shift | Up  |  PgDn|
+   * |----|----||---------------------------------------------------------------------|
+   * | F9 | F10||LCtrl| Alt | Space | Fn | Space | Alt |         |  L    |  Dn |   R  |
+   * `---------'`---------------------------------------------------------------------'
+   */
+[0] = LAYOUT_all( /* Styrka Base */
+	KC_F1,   KC_F2,   KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,  KC_BSLS, KC_INS,
+    KC_F3,   KC_F4,   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSPC, KC_DEL,
+    KC_F5,   KC_F6,   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_TRNS,          KC_ENT,  KC_PGUP,
+    KC_F7,   KC_F8,   KC_LSFT, KC_TRNS, 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_PGDN,
+    KC_F9,   KC_F10,  KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),            KC_LEFT, KC_DOWN, KC_RGHT
+  ),
+
+[1] = LAYOUT_all( /* Styrka Base */
+	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_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, 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
+  ),
+};
diff --git a/qmk/keyboards/viktus/styrka/keymaps/all/readme.md b/qmk/keyboards/viktus/styrka/keymaps/all/readme.md
new file mode 100644
index 00000000..09b07840
--- /dev/null
+++ b/qmk/keyboards/viktus/styrka/keymaps/all/readme.md
@@ -0,0 +1 @@
+#  A keymap for the Viktus Styrka that covers all supported layout options
diff --git a/qmk/keyboards/viktus/styrka/keymaps/default/keymap.c b/qmk/keyboards/viktus/styrka/keymaps/default/keymap.c
new file mode 100644
index 00000000..ac4950b2
--- /dev/null
+++ b/qmk/keyboards/viktus/styrka/keymaps/default/keymap.c
@@ -0,0 +1,48 @@
+/* Copyright 2020 jrfhoutx
+ *
+ * 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] = {
+ /* Keymap BASE: (Base Layer) Default Layer
+   * .---------.,---------------------------------------------------------------------.
+   * | F1 | F2 ||Esc | 1 |  2|  3|  4|  5|  6| 7|  8|  9|  0|  -|  =|     BkSpc | Ins |
+   * |----|----||---------------------------------------------------------------------|
+   * | F3 | F4 ||Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P| [ | ] |    \   |  Del |
+   * |----|----||---------------------------------------------------------------------|
+   * | F5 | F6 ||CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|  Return  |  PgUp|
+   * |----|----||---------------------------------------------------------------------|
+   * | F7 | F8 ||Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /| Shift | Up  |  PgDn|
+   * |----|----||---------------------------------------------------------------------|
+   * | F9 | F10|| LCtrl | GUI | Alt |     Space      | Alt | MO(1) |  L  |  Dn |   R  |
+   * `---------'`---------------------------------------------------------------------'
+   */
+[0] = LAYOUT_default( /* Styrka Base */
+	KC_F1,   KC_F2,   KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,           KC_BSPC, KC_INS,
+    KC_F3,   KC_F4,   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_F5,   KC_F6,   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_PGUP,
+    KC_F7,   KC_F8,   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_PGDN,
+    KC_F9,   KC_F10,  KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),            KC_LEFT, KC_DOWN, KC_RGHT
+  ),
+
+[1] = LAYOUT_default( /* Styrka Base */
+	RESET,   KC_F2,   KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,           KC_BSLS, KC_INS,
+    KC_F3,   KC_F4,   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSPC, KC_DEL,
+    KC_F5,   KC_F6,   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_PGUP,
+    KC_F7,   KC_F8,   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_PGDN,
+    KC_F9,   KC_F10,  KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_TRNS,          KC_LEFT, KC_DOWN, KC_RGHT
+  ),
+};
diff --git a/qmk/keyboards/viktus/styrka/keymaps/default/readme.md b/qmk/keyboards/viktus/styrka/keymaps/default/readme.md
new file mode 100644
index 00000000..656be826
--- /dev/null
+++ b/qmk/keyboards/viktus/styrka/keymaps/default/readme.md
@@ -0,0 +1 @@
+#  The default keymap for the Viktus Styrka
diff --git a/qmk/keyboards/viktus/styrka/keymaps/split_bs/keymap.c b/qmk/keyboards/viktus/styrka/keymaps/split_bs/keymap.c
new file mode 100644
index 00000000..435bcf0a
--- /dev/null
+++ b/qmk/keyboards/viktus/styrka/keymaps/split_bs/keymap.c
@@ -0,0 +1,48 @@
+/* Copyright 2020 jrfhoutx
+ *
+ * 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] = {
+ /* Keymap BASE: (Base Layer) Default Split Backspace Layer
+   * .---------.,---------------------------------------------------------------------.
+   * | F1 | F2 ||Esc | 1 |  2|  3|  4|  5|  6| 7|  8|  9|  0|  -|  =|  ~ |  \  |  Ins |
+   * |----|----||---------------------------------------------------------------------|
+   * | F3 | F4 ||Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P| [ | ] |  BkSpc |  Del |
+   * |----|----||---------------------------------------------------------------------|
+   * | F5 | F6 ||CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|  Return  |  PgUp|
+   * |----|----||---------------------------------------------------------------------|
+   * | F7 | F8 ||Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /| Shift | Up  |  PgDn|
+   * |----|----||---------------------------------------------------------------------|
+   * | F9 | F10||LCtrl| Alt | Space | Fn | Space | Alt |         |  L    |  Dn |   R  |
+   * `---------'`---------------------------------------------------------------------'
+   */
+[0] = LAYOUT_split_bs( /* Styrka Base */
+	KC_F1,   KC_F2,   KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,  KC_BSLS, KC_INS,
+    KC_F3,   KC_F4,   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSPC, KC_DEL,
+    KC_F5,   KC_F6,   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_PGUP,
+    KC_F7,   KC_F8,   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_PGDN,
+    KC_F9,   KC_F10,  KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),            KC_LEFT, KC_DOWN, KC_RGHT
+  ),
+
+[1] = LAYOUT_split_bs( /* Styrka Base */
+	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_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, 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
+  ),
+};
diff --git a/qmk/keyboards/viktus/styrka/keymaps/split_bs/readme.md b/qmk/keyboards/viktus/styrka/keymaps/split_bs/readme.md
new file mode 100644
index 00000000..1e2a856e
--- /dev/null
+++ b/qmk/keyboards/viktus/styrka/keymaps/split_bs/readme.md
@@ -0,0 +1 @@
+#  The Split Backspace keymap for the Viktus Styrka
diff --git a/qmk/keyboards/viktus/styrka/keymaps/via/keymap.c b/qmk/keyboards/viktus/styrka/keymaps/via/keymap.c
new file mode 100644
index 00000000..6ec931a9
--- /dev/null
+++ b/qmk/keyboards/viktus/styrka/keymaps/via/keymap.c
@@ -0,0 +1,64 @@
+/* Copyright 2020 jrfhoutx
+ *
+ * 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] = {
+ /* Keymap BASE: (Base Layer) Default Layer
+   * .---------.,---------------------------------------------------------------------.
+   * | F1 | F2 ||Esc | 1 |  2|  3|  4|  5|  6| 7|  8|  9|  0|  -|  =| ~ | BkSpc | Ins |
+   * |----|----||---------------------------------------------------------------------|
+   * | F3 | F4 ||Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P| [ | ] |    \   |  Del |
+   * |----|----||---------------------------------------------------------------------|
+   * | F5 | F6 ||CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|  Return  |  PgUp|
+   * |----|----||---------------------------------------------------------------------|
+   * | F7 | F8 ||Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /| Shift | Up  |  PgDn|
+   * |----|----||---------------------------------------------------------------------|
+   * | F9 | F10||LCtrl| Alt | Space | Fn | Space | Alt |         |  L    |  Dn |   R  |
+   * `---------'`---------------------------------------------------------------------'
+   */
+[0] = LAYOUT_all( /* Styrka Base */
+	KC_F1,   KC_F2,   KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,  KC_BSLS, KC_INS,
+    KC_F3,   KC_F4,   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC,          KC_BSPC, KC_DEL,
+    KC_F5,   KC_F6,   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_TRNS,          KC_ENT,  KC_PGUP,
+    KC_F7,   KC_F8,   KC_LSFT, KC_TRNS, 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_PGDN,
+    KC_F9,   KC_F10,  KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),            KC_LEFT, KC_DOWN, KC_RGHT
+  ),
+
+[1] = LAYOUT_all( /* Styrka Base */
+	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_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, 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
+  ),
+
+[2] = LAYOUT_all( /* Styrka Base */
+	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,          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
+  ),
+
+[3] = LAYOUT_all( /* Styrka Base */
+	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,          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
+  ),
+};
diff --git a/qmk/keyboards/viktus/styrka/keymaps/via/readme.md b/qmk/keyboards/viktus/styrka/keymaps/via/readme.md
new file mode 100644
index 00000000..7c6ea6ce
--- /dev/null
+++ b/qmk/keyboards/viktus/styrka/keymaps/via/readme.md
@@ -0,0 +1 @@
+#  The VIA keymap for the Viktus Styrka
diff --git a/qmk/keyboards/viktus/styrka/keymaps/via/rules.mk b/qmk/keyboards/viktus/styrka/keymaps/via/rules.mk
new file mode 100644
index 00000000..1e5b9980
--- /dev/null
+++ b/qmk/keyboards/viktus/styrka/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/qmk/keyboards/viktus/styrka/mcuconf.h b/qmk/keyboards/viktus/styrka/mcuconf.h
new file mode 100644
index 00000000..faca3def
--- /dev/null
+++ b/qmk/keyboards/viktus/styrka/mcuconf.h
@@ -0,0 +1,171 @@
+/*
+    ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
+/*
+ * STM32F0xx drivers configuration.
+ * The following settings override the default settings present in
+ * the various device driver implementation headers.
+ * Note that the settings for each driver only have effect if the whole
+ * driver is enabled in halconf.h.
+ *
+ * IRQ priorities:
+ * 3...0       Lowest...Highest.
+ *
+ * DMA priorities:
+ * 0...3        Lowest...Highest.
+ */
+
+#define STM32F0xx_MCUCONF
+
+/*
+ * HAL driver system settings.
+ */
+#define STM32_NO_INIT                       FALSE
+#define STM32_PVD_ENABLE                    FALSE
+#define STM32_PLS                           STM32_PLS_LEV0
+#define STM32_HSI_ENABLED                   TRUE
+#define STM32_HSI14_ENABLED                 TRUE
+#define STM32_HSI48_ENABLED                 FALSE
+#define STM32_LSI_ENABLED                   TRUE
+#define STM32_HSE_ENABLED                   FALSE
+#define STM32_LSE_ENABLED                   FALSE
+#define STM32_SW                            STM32_SW_PLL
+#define STM32_PLLSRC                        STM32_PLLSRC_HSI_DIV2
+#define STM32_PREDIV_VALUE                  1
+#define STM32_PLLMUL_VALUE                  12
+#define STM32_HPRE                          STM32_HPRE_DIV1
+#define STM32_PPRE                          STM32_PPRE_DIV1
+#define STM32_ADCSW                         STM32_ADCSW_HSI14
+#define STM32_ADCPRE                        STM32_ADCPRE_DIV4
+#define STM32_MCOSEL                        STM32_MCOSEL_NOCLOCK
+#define STM32_ADCPRE                        STM32_ADCPRE_DIV4
+#define STM32_ADCSW                         STM32_ADCSW_HSI14
+#define STM32_USBSW                         STM32_USBSW_HSI48
+#define STM32_CECSW                         STM32_CECSW_HSI
+#define STM32_I2C1SW                        STM32_I2C1SW_HSI
+#define STM32_USART1SW                      STM32_USART1SW_PCLK
+#define STM32_RTCSEL                        STM32_RTCSEL_LSI
+
+/*
+ * ADC driver system settings.
+ */
+#define STM32_ADC_USE_ADC1                  FALSE
+#define STM32_ADC_ADC1_DMA_PRIORITY         2
+#define STM32_ADC_IRQ_PRIORITY              2
+#define STM32_ADC_ADC1_DMA_IRQ_PRIORITY     2
+
+/*
+ * EXT driver system settings.
+ */
+#define STM32_EXT_EXTI0_1_IRQ_PRIORITY      3
+#define STM32_EXT_EXTI2_3_IRQ_PRIORITY      3
+#define STM32_EXT_EXTI4_15_IRQ_PRIORITY     3
+#define STM32_EXT_EXTI16_IRQ_PRIORITY       3
+#define STM32_EXT_EXTI17_IRQ_PRIORITY       3
+
+/*
+ * GPT driver system settings.
+ */
+#define STM32_GPT_USE_TIM1                  FALSE
+#define STM32_GPT_USE_TIM2                  FALSE
+#define STM32_GPT_USE_TIM3                  FALSE
+#define STM32_GPT_USE_TIM14                 FALSE
+#define STM32_GPT_TIM1_IRQ_PRIORITY         2
+#define STM32_GPT_TIM2_IRQ_PRIORITY         2
+#define STM32_GPT_TIM3_IRQ_PRIORITY         2
+#define STM32_GPT_TIM14_IRQ_PRIORITY        2
+
+/*
+ * I2C driver system settings.
+ */
+#define STM32_I2C_USE_I2C1                  FALSE
+#define STM32_I2C_USE_I2C2                  FALSE
+#define STM32_I2C_BUSY_TIMEOUT              50
+#define STM32_I2C_I2C1_IRQ_PRIORITY         3
+#define STM32_I2C_I2C2_IRQ_PRIORITY         3
+#define STM32_I2C_USE_DMA                   TRUE
+#define STM32_I2C_I2C1_DMA_PRIORITY         1
+#define STM32_I2C_I2C2_DMA_PRIORITY         1
+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")
+
+/*
+ * ICU driver system settings.
+ */
+#define STM32_ICU_USE_TIM1                  FALSE
+#define STM32_ICU_USE_TIM2                  FALSE
+#define STM32_ICU_USE_TIM3                  FALSE
+#define STM32_ICU_TIM1_IRQ_PRIORITY         3
+#define STM32_ICU_TIM2_IRQ_PRIORITY         3
+#define STM32_ICU_TIM3_IRQ_PRIORITY         3
+
+/*
+ * PWM driver system settings.
+ */
+#define STM32_PWM_USE_ADVANCED              FALSE
+#define STM32_PWM_USE_TIM1                  FALSE
+#define STM32_PWM_USE_TIM2                  FALSE
+#define STM32_PWM_USE_TIM3                  FALSE
+#define STM32_PWM_TIM1_IRQ_PRIORITY         3
+#define STM32_PWM_TIM2_IRQ_PRIORITY         3
+#define STM32_PWM_TIM3_IRQ_PRIORITY         3
+
+/*
+ * SERIAL driver system settings.
+ */
+#define STM32_SERIAL_USE_USART1             FALSE
+#define STM32_SERIAL_USE_USART2             FALSE
+#define STM32_SERIAL_USART1_PRIORITY        3
+#define STM32_SERIAL_USART2_PRIORITY        3
+
+/*
+ * SPI driver system settings.
+ */
+#define STM32_SPI_USE_SPI1                  FALSE
+#define STM32_SPI_USE_SPI2                  FALSE
+#define STM32_SPI_SPI1_DMA_PRIORITY         1
+#define STM32_SPI_SPI2_DMA_PRIORITY         1
+#define STM32_SPI_SPI1_IRQ_PRIORITY         2
+#define STM32_SPI_SPI2_IRQ_PRIORITY         2
+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")
+
+/*
+ * ST driver system settings.
+ */
+#define STM32_ST_IRQ_PRIORITY               2
+#define STM32_ST_USE_TIMER                  2
+
+/*
+ * UART driver system settings.
+ */
+#define STM32_UART_USE_USART1               FALSE
+#define STM32_UART_USE_USART2               FALSE
+#define STM32_UART_USART1_IRQ_PRIORITY      3
+#define STM32_UART_USART2_IRQ_PRIORITY      3
+#define STM32_UART_USART1_DMA_PRIORITY      0
+#define STM32_UART_USART2_DMA_PRIORITY      0
+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")
+
+/*
+ * USB driver system settings.
+ */
+#define STM32_USB_USE_USB1                  TRUE
+#define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE
+#define STM32_USB_USB1_LP_IRQ_PRIORITY      3
+
+#endif /* _MCUCONF_H_ */
diff --git a/qmk/keyboards/viktus/styrka/readme.md b/qmk/keyboards/viktus/styrka/readme.md
new file mode 100644
index 00000000..3d211e8c
--- /dev/null
+++ b/qmk/keyboards/viktus/styrka/readme.md
@@ -0,0 +1,23 @@
+# Viktus Styrka
+
+![Styrka](https://i.imgur.com/)
+
+The Viktus Styrka is a 65% + left macro block created in a collaboration of OneCreativeMind and BlindAssassin111 (Viktus owner). All design done by BlindAssassin111. The board supports ANSI and ISO modifiers as well as split backspace and stepped/non-stepped caps lock.
+
+The PCB is an arm powered board utilizing the STM32F072CBT6 mcu. The PCB is designed to work with the universal daughterboard and a 4in (~100mm) 4 pin JST SR cable with reversed pinout (pin 1 of both connectors is the same wire etc.).
+
+On the PCB is a single button for a reset for flashing. As well, there is a [Segger J-Link 6-pin Needle Adapter](https://www.segger.com/products/debug-probes/j-link/accessories/adapters/6-pin-needle-adapter/) footprint for reflashing the mcu as a backup in case of a bootloader issue.
+
+* Keyboard Maintainer: [jrfhoutx](https://github.com/jrfhoutx), blindassassin111
+* Hardware Supported: Styrka
+* Hardware Availability: <https://www.Viktus.Design>
+
+Make example for this keyboard (after setting up your build environment):
+
+    make viktus/styrka:default
+
+Flashing example for this keyboard:
+
+    make viktus/styrka:default:flash
+
+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).
diff --git a/qmk/keyboards/viktus/styrka/rules.mk b/qmk/keyboards/viktus/styrka/rules.mk
new file mode 100644
index 00000000..ce2a3f75
--- /dev/null
+++ b/qmk/keyboards/viktus/styrka/rules.mk
@@ -0,0 +1,19 @@
+# MCU name
+MCU = STM32F072
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # 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 = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
diff --git a/qmk/keyboards/viktus/styrka/styrka.c b/qmk/keyboards/viktus/styrka/styrka.c
new file mode 100644
index 00000000..4bf6fef9
--- /dev/null
+++ b/qmk/keyboards/viktus/styrka/styrka.c
@@ -0,0 +1,16 @@
+/* Copyright 2020 jrfhoutx
+ *
+ * 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 "styrka.h"
diff --git a/qmk/keyboards/viktus/styrka/styrka.h b/qmk/keyboards/viktus/styrka/styrka.h
new file mode 100644
index 00000000..81d1a76f
--- /dev/null
+++ b/qmk/keyboards/viktus/styrka/styrka.h
@@ -0,0 +1,90 @@
+/* Copyright 2020 jrfhoutx
+ *
+ * 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 ___ KC_NO
+
+/* This a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ *
+ *
+ * Use LAYOUT_all for ISO and Tsangan builds
+ *
+ */
+
+#define LAYOUT_default( \
+    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07,      K08, K18, \
+    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K27,      K28, K38, \
+    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K56,           K48, K58, \
+    K60, K70, K61,      K62, K72, K63, K73, K64, K74, K65, K75, K66, K76, K67,      K68, K78, \
+    K80, K90, K81, K91, K82,                K84,                K86, K96, K87,      K88, K98  \
+) \
+{ \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08 }, \
+    { K10, K11, K12, K13, K14, K15, K16, ___, K18 }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \
+    { K30, K31, K32, K33, K34, K35, K36, ___, K38 }, \
+    { K40, K41, K42, K43, K44, K45, K46, ___, K48 }, \
+    { K50, K51, K52, K53, K54, K55, K56, ___, K58 }, \
+    { K60, K61, K62, K63, K64, K65, K66, K67, K68 }, \
+    { K70, ___, K72, K73, K74, K75, K76, ___, K78 }, \
+    { K80, K81, K82, ___, K84, ___, K86, K87, K88 }, \
+    { K90, K91, ___, ___, ___, ___, K96, ___, K98 }  \
+}
+#define LAYOUT_split_bs( \
+    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07, K17, K08, K18, \
+    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K27,      K28, K38, \
+    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K56,           K48, K58, \
+    K60, K70, K61,      K62, K72, K63, K73, K64, K74, K65, K75, K66, K76, K67,      K68, K78, \
+    K80, K90, K81, K91, K82,                K84,                K86, K96,      K87, K88, K98  \
+) \
+{ \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08 }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18 }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \
+    { K30, K31, K32, K33, K34, K35, K36, ___, K38 }, \
+    { K40, K41, K42, K43, K44, K45, K46, ___, K48 }, \
+    { K50, K51, K52, K53, K54, K55, K56, ___, K58 }, \
+    { K60, K61, K62, K63, K64, K65, K66, K67, K68 }, \
+    { K70, ___, K72, K73, K74, K75, K76, ___, K78 }, \
+    { K80, K81, K82, ___, K84, ___, K86, K87, K88 }, \
+    { K90, K91, ___, ___, ___, ___, K96, ___, K98 }  \
+}
+#define LAYOUT_all( \
+    K00, K10, K01, K11, K02, K12, K03, K13, K04, K14, K05, K15, K06, K16, K07, K17, K08, K18, \
+    K20, K30, K21, K31, K22, K32, K23, K33, K24, K34, K25, K35, K26, K36, K27,      K28, K38, \
+    K40, K50, K41, K51, K42, K52, K43, K53, K44, K54, K45, K55, K46, K56, K47,      K48, K58, \
+    K60, K70, K61, K71, K62, K72, K63, K73, K64, K74, K65, K75, K66, K76, K67,      K68, K78, \
+    K80, K90, K81, K91, K82,                K84,                K86, K96,      K87, K88, K98  \
+) \
+{ \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08 }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18 }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28 }, \
+    { K30, K31, K32, K33, K34, K35, K36, ___, K38 }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47, K48 }, \
+    { K50, K51, K52, K53, K54, K55, K56, ___, K58 }, \
+    { K60, K61, K62, K63, K64, K65, K66, K67, K68 }, \
+    { K70, K71, K72, K73, K74, K75, K76, ___, K78 }, \
+    { K80, K81, K82, ___, K84, ___, K86, K87, K88 }, \
+    { K90, K91, ___, ___, ___, ___, K96, ___, K98 }  \
+}
diff --git a/qmk/keyboards/wallaby/config.h b/qmk/keyboards/wallaby/config.h
index 11fa674a..28ac9f3f 100644
--- a/qmk/keyboards/wallaby/config.h
+++ b/qmk/keyboards/wallaby/config.h
@@ -218,34 +218,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/wallaby/rules.mk b/qmk/keyboards/wallaby/rules.mk
index 1f9b6d4d..1cec2845 100644
--- a/qmk/keyboards/wallaby/rules.mk
+++ b/qmk/keyboards/wallaby/rules.mk
@@ -29,6 +29,5 @@ MIDI_ENABLE = no            # MIDI support
 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
 
 LAYOUTS = tkl_ansi
diff --git a/qmk/keyboards/walletburner/neuron/keymaps/brandonschlack/keymap.c b/qmk/keyboards/walletburner/neuron/keymaps/brandonschlack/keymap.c
new file mode 100644
index 00000000..1193fa32
--- /dev/null
+++ b/qmk/keyboards/walletburner/neuron/keymaps/brandonschlack/keymap.c
@@ -0,0 +1,132 @@
+/* Copyright 2020 Brandon Schlack
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+#include "brandonschlack.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/* Base Layer
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │Esc│ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │Bsp│
+ * ├───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤
+ * │HyTb│ A │ S │ D │ F │ G │ H │ J │ K │ L │ Enter│
+ * ├────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬────┤
+ * │Shift │ Z │ X │ C │ V │ B │ N │ M │< ,│> .│?/Lw│
+ * ├┬┬┬┬──┴─┬─┴──┬┴───┴───┴───┴───┴───┴───┼───┴┬┬┬┬┤
+ * │││││Opt │Cmd │         SpcRse         │Ctrl│││││
+ * └┴┴┴┴────┴────┴────────────────────────┴────┴┴┴┴┘
+ */
+[_BASE] = LAYOUT( \
+    KC_ESC,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC, \
+    HY_TAB,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,             KC_ENT,  \
+    KC_LSFT,          KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  SLH_LWR, \
+             KC_LOPT, KC_LCMD,          XXXXXXX, SPC_RAI, XXXXXXX,                   XXXXXXX, KC_LCTL           \
+),
+/* Lower
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │Del│BrD│BrU│Msn│LHP│   │   │   │Hom│ ↑ │PgU│SlD│
+ * ├───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤
+ * │    │Mut│VlU│NxW│PvT│Bck│Fwd│NxT│ ← │ → │  Ply │
+ * ├────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬────┤
+ * │SfCaps│Prv│VlD│Nxt│1PX│1Ps│   │End│ ↓ │PgD│    │
+ * ├┬┬┬┬──┴─┬─┴──┬┴───┴───┴───┴───┴───┴───┼───┴┬┬┬┬┤
+ * │││││    │    │                        │    │││││
+ * └┴┴┴┴────┴────┴────────────────────────┴────┴┴┴┴┘
+ */
+[_LOWER] = LAYOUT( \
+    KC_DELT, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, _______, _______, _______, KC_HOME, KC_UP,   KC_PGUP, MC_SLPD, \
+    _______, KC_MUTE, KC_VOLU, NXT_WIN, PRV_TAB, MC_BACK, MC_FWRD, NXT_TAB, KC_LEFT, KC_RGHT,          KC_MPLY, \
+    SF_CAPS,          KC_MPRV, KC_VOLD, KC_MNXT, PX_AFLL, OP_AFLL, _______, KC_END,  KC_DOWN, KC_PGDN, _______, \
+             _______, _______,          XXXXXXX, _______, XXXXXXX,                   XXXXXXX, _______           \
+),
+/* Raise
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │~ `│! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│   │
+ * ├───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤
+ * │    │ F1│ F2│ F3│ F4│ F5│ F6│_ -│+ =│: ;│   " '│
+ * ├────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬────┤
+ * │      │ F7│ F8│ F9│F10│F11│F12│   │{ [│} ]│|\Lw│
+ * ├┬┬┬┬──┴─┬─┴──┬┴───┴───┴───┴───┴───┴───┼───┴┬┬┬┬┤
+ * │││││    │    │                        │    │││││
+ * └┴┴┴┴────┴────┴────────────────────────┴────┴┴┴┴┘
+ */
+/*
+[_RAISE] = LAYOUT( \
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______, \
+    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_SCLN,          KC_QUOT, \
+    _______,          KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, KC_LBRC, KC_RBRC, BSL_LWR, \
+             _______, _______,          XXXXXXX, _______, XXXXXXX,                   XXXXXXX, _______           \
+), */
+/* Raise
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │~ `│ F1│ F2│ F3│ F4│{ [│} ]│& 7│* 8│( 9│) 0│   │
+ * ├───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤
+ * │    │ F5│ F6│ F7│ F8│_ -│ + │$ 4│% 5│^ 6│   " '│
+ * ├────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬────┤
+ * │      │ F9│F10│F11│F12│+ =│! 1│@ 2│# 3│: ;│|\Lw│
+ * ├┬┬┬┬──┴─┬─┴──┬┴───┴───┴───┴───┴───┴───┼───┴┬┬┬┬┤
+ * │││││    │    │                        │    │││││
+ * └┴┴┴┴────┴────┴────────────────────────┴────┴┴┴┴┘
+ */
+[_RAISE] = LAYOUT( \
+    KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_LBRC, KC_RBRC, KC_7,    KC_8,    KC_9,    KC_0,    _______, \
+    _______, KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_MINS, KC_PLUS, KC_4,    KC_5,    KC_6,             KC_QUOT, \
+    _______,          KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_EQL,  KC_1,    KC_2,    KC_3,    KC_SCLN, BSL_LWR, \
+             _______, _______,          XXXXXXX, _______, XXXXXXX,                   XXXXXXX, _______           \
+),
+/* Adjust/Macro
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │Mke│   │   │EEP│RST│   │   │   │   │   │   │   │
+ * ├───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤
+ * │    │   │   │   │   │   │   │   │   │   │      │
+ * ├────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬────┤
+ * │      │   │   │   │   │   │   │   │   │   │    │
+ * ├┬┬┬┬──┴─┬─┴──┬┴───┴───┴───┴───┴───┴───┼───┴┬┬┬┬┤
+ * │││││    │    │                        │    │││││
+ * └┴┴┴┴────┴────┴────────────────────────┴────┴┴┴┴┘
+ */
+
+[_ADJUST] = LAYOUT( \
+    QM_MAKE, _______, _______, EEP_RST, RESET,   _______, _______, _______, _______, _______, _______, _______, \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, \
+    _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+             _______, _______,          XXXXXXX, _______, XXXXXXX,                   XXXXXXX, _______           \
+)
+/* Blank Layer
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │   │   │   │   │   │   │   │   │   │   │   │   │
+ * ├───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴───┤
+ * │    │   │   │   │   │   │   │   │   │   │      │
+ * ├────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬────┤
+ * │      │   │   │   │   │   │   │   │   │   │    │
+ * ├┬┬┬┬──┴─┬─┴──┬┴───┴───┴───┴───┴───┴───┼───┴┬┬┬┬┤
+ * │││││    │    │                        │    │││││
+ * └┴┴┴┴────┴────┴────────────────────────┴────┴┴┴┴┘
+ */
+/*
+[BLANK] = LAYOUT( \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, \
+    _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+             _______, _______,          XXXXXXX, _______, XXXXXXX,                   XXXXXXX, _______           \
+)
+*/
+
+};
+
+layer_state_t layer_state_set_keymap(layer_state_t state) {
+    return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
+}
+
diff --git a/qmk/keyboards/westfoxtrot/aanzee/aanzee.c b/qmk/keyboards/westfoxtrot/aanzee/aanzee.c
index 17efdbe8..bc90dcf2 100644
--- a/qmk/keyboards/westfoxtrot/aanzee/aanzee.c
+++ b/qmk/keyboards/westfoxtrot/aanzee/aanzee.c
@@ -1,55 +1,17 @@
 /* Copyright 2019 westfoxtrot
-
 *
-
 * 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 "aanzee.h"
-
-void keyboard_pre_init_kb(void) {
-
-    // Call the keyboard pre init code.
-    // Set our LED pins as output
-    setPinOutput(B2);
-
-    keyboard_pre_init_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-
-    if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
-
-        // Turn capslock on
-        writePinLow(B2);
-    } else {
-
-        // Turn capslock off
-        writePinHigh(B2);
-    }
-
-    led_set_user(usb_led);
-}
diff --git a/qmk/keyboards/westfoxtrot/aanzee/config.h b/qmk/keyboards/westfoxtrot/aanzee/config.h
index 69fc6138..73db816f 100644
--- a/qmk/keyboards/westfoxtrot/aanzee/config.h
+++ b/qmk/keyboards/westfoxtrot/aanzee/config.h
@@ -40,6 +40,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
+#define LED_CAPS_LOCK_PIN B2
+#define LED_PIN_ON_STATE 0
+
 #define BACKLIGHT_PIN B7
 #define BACKLIGHT_BREATHING
 #define BACKLIGHT_LEVELS 5
diff --git a/qmk/keyboards/westfoxtrot/cyclops/config.h b/qmk/keyboards/westfoxtrot/cyclops/config.h
index 3af60703..0a28a4a4 100644
--- a/qmk/keyboards/westfoxtrot/cyclops/config.h
+++ b/qmk/keyboards/westfoxtrot/cyclops/config.h
@@ -176,32 +176,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/westfoxtrot/cyclops/rules.mk b/qmk/keyboards/westfoxtrot/cyclops/rules.mk
index 03b28cbe..6f062970 100644
--- a/qmk/keyboards/westfoxtrot/cyclops/rules.mk
+++ b/qmk/keyboards/westfoxtrot/cyclops/rules.mk
@@ -30,4 +30,3 @@ 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
diff --git a/qmk/keyboards/westfoxtrot/cypher/rev1/rules.mk b/qmk/keyboards/westfoxtrot/cypher/rev1/rules.mk
index ccf5ec1e..4b0dc19a 100644
--- a/qmk/keyboards/westfoxtrot/cypher/rev1/rules.mk
+++ b/qmk/keyboards/westfoxtrot/cypher/rev1/rules.mk
@@ -30,4 +30,3 @@ 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
diff --git a/qmk/keyboards/westfoxtrot/cypher/rev5/rules.mk b/qmk/keyboards/westfoxtrot/cypher/rev5/rules.mk
index a41c12af..813f51cd 100644
--- a/qmk/keyboards/westfoxtrot/cypher/rev5/rules.mk
+++ b/qmk/keyboards/westfoxtrot/cypher/rev5/rules.mk
@@ -30,4 +30,3 @@ 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
diff --git a/qmk/keyboards/wheatfield/blocked65/config.h b/qmk/keyboards/wheatfield/blocked65/config.h
index fb277881..486e01bf 100644
--- a/qmk/keyboards/wheatfield/blocked65/config.h
+++ b/qmk/keyboards/wheatfield/blocked65/config.h
@@ -1,5 +1,5 @@
 /*
-Copyright 2019 Maarten Dekkers <maartenwut@gmail.com>
+Copyright 2019 Evy Dekkers
 
 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
diff --git a/qmk/keyboards/wheatfield/blocked65/rules.mk b/qmk/keyboards/wheatfield/blocked65/rules.mk
index b572f2e4..b3671d9e 100644
--- a/qmk/keyboards/wheatfield/blocked65/rules.mk
+++ b/qmk/keyboards/wheatfield/blocked65/rules.mk
@@ -29,7 +29,6 @@ MIDI_ENABLE = no            # MIDI controls
 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
 UNICODE_ENABLE = no         # Unicode
 
 LAYOUTS = 65_ansi_blocker
diff --git a/qmk/keyboards/wilba_tech/wt60_d/keymaps/madhatter/keymap.c b/qmk/keyboards/wilba_tech/wt60_d/keymaps/madhatter/keymap.c
index a46c9777..b97474f2 100644
--- a/qmk/keyboards/wilba_tech/wt60_d/keymaps/madhatter/keymap.c
+++ b/qmk/keyboards/wilba_tech/wt60_d/keymaps/madhatter/keymap.c
@@ -12,18 +12,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 // Default layer
 [_QWERTY] = LAYOUT_all(
-	KC_GESC, KC_1,    KC_2,   KC_3,  KC_4,  KC_5,  KC_6,  KC_7,  KC_8,  KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_DEL,
-	KC_TAB,  KC_Q,    KC_W,   KC_E,  KC_R,  KC_T,  KC_Y,  KC_U,  KC_I,  KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
-	KC_GRV,  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_NO,   KC_Z,   KC_X,  KC_C,  KC_V,  KC_B,  KC_N,  KC_M,  KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, FNMS,
-	KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                         KC_SPC,  KC_RGUI, FNMS,    KC_RCTL),
+	KC_GESC, KC_1,    KC_2,   KC_3,  KC_4, KC_5, KC_6,  KC_7, KC_8, KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_DEL,
+	KC_TAB,  KC_Q,    KC_W,   KC_E,  KC_R, KC_T, KC_Y,  KC_U, KC_I, KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
+	KC_GRV,  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_NO,   KC_Z,   KC_X,  KC_C, KC_V, KC_B,  KC_N, KC_M, KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, FNMS,
+	KC_LCTL, KC_LALT, KC_LCMD,                   KC_SPC,                     KC_SPC,  FNMS,    KC_RALT, KC_RCTL),
 
 // Fn1 Layer
 [_FNMS] = LAYOUT_all(
 	KC_GRV,  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_BSLS,  KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, RESET,
-	AG_TOGG, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_HOME, KC_PGUP, KC_TRNS,
-	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_END,  KC_PGDN, KC_TRNS, KC_TRNS,
+	KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS,  KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, RESET,
+	AG_TOGG, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_RGHT, KC_TRNS,
+	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_DOWN, KC_TRNS, KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
 
 };
diff --git a/qmk/keyboards/wilba_tech/wt60_g/config.h b/qmk/keyboards/wilba_tech/wt60_g/config.h
new file mode 100644
index 00000000..ca3242ca
--- /dev/null
+++ b/qmk/keyboards/wilba_tech/wt60_g/config.h
@@ -0,0 +1,55 @@
+/* Copyright 2020 Jason Williams (Wilba)
+ *
+ * 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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x6582 // wilba.tech
+#define PRODUCT_ID      0x0021 // PCB #33
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    wilba.tech
+#define PRODUCT         wilba.tech WT60-G
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 14
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+*/
+#define MATRIX_ROW_PINS { F0, F1, F4, F6, F7 }
+#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6 } // D4, B7, B0
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
diff --git a/qmk/keyboards/wilba_tech/wt60_g/info.json b/qmk/keyboards/wilba_tech/wt60_g/info.json
new file mode 100644
index 00000000..2b1570d9
--- /dev/null
+++ b/qmk/keyboards/wilba_tech/wt60_g/info.json
@@ -0,0 +1,12 @@
+{
+    "keyboard_name": "wilba.tech WT60-G", 
+    "url": "https://wilba.tech", 
+    "maintainer": "Wilba", 
+    "width": 15, 
+    "height": 5, 
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":12.5, "y":4, "w":1.25}, {"x":13.75, "y":4, "w":1.25}]
+        }
+    }
+}
\ No newline at end of file
diff --git a/qmk/keyboards/wilba_tech/wt60_g/keymaps/default/keymap.c b/qmk/keyboards/wilba_tech/wt60_g/keymaps/default/keymap.c
new file mode 100644
index 00000000..82d17200
--- /dev/null
+++ b/qmk/keyboards/wilba_tech/wt60_g/keymaps/default/keymap.c
@@ -0,0 +1,52 @@
+/* Copyright 2020 Jason Williams (Wilba)
+ *
+ * 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/>.
+ */
+// Default layout for WT60-G
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	// Default layer
+	[0] = LAYOUT_all(
+		KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_DEL,
+		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_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_NO,   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
+		KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RALT, KC_RGUI, KC_RCTL),
+
+	// Fn1 Layer
+	[1] = LAYOUT_all(
+		KC_GRV,  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_DEL,  KC_TRNS,
+		KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+
+	// Fn2 Layer
+	[2] = LAYOUT_all(
+		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, 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),
+		
+	// Fn3 Layer
+	[3] = LAYOUT_all(
+		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, 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),
+};
\ No newline at end of file
diff --git a/qmk/keyboards/wilba_tech/wt60_g/keymaps/via/keymap.c b/qmk/keyboards/wilba_tech/wt60_g/keymaps/via/keymap.c
new file mode 100644
index 00000000..1f9d213f
--- /dev/null
+++ b/qmk/keyboards/wilba_tech/wt60_g/keymaps/via/keymap.c
@@ -0,0 +1 @@
+#include "../default/keymap.c"
\ No newline at end of file
diff --git a/qmk/keyboards/wilba_tech/wt60_g/keymaps/via/rules.mk b/qmk/keyboards/wilba_tech/wt60_g/keymaps/via/rules.mk
new file mode 100644
index 00000000..1e5b9980
--- /dev/null
+++ b/qmk/keyboards/wilba_tech/wt60_g/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/qmk/keyboards/wilba_tech/wt60_g/readme.md b/qmk/keyboards/wilba_tech/wt60_g/readme.md
new file mode 100644
index 00000000..4af59876
--- /dev/null
+++ b/qmk/keyboards/wilba_tech/wt60_g/readme.md
@@ -0,0 +1,17 @@
+# wilba.tech WT60-G
+
+WT60-G is a keyboard PCB supporting 60% layout and daughterboard USB-C. [More info at wilba.tech](https://wilba.tech/)
+
+* Keyboard Maintainer: [Wilba6582](https://github.com/Wilba6582)
+* Hardware Supported: wilba.tech WT60-G
+* Hardware Availability: [wilba.tech](https://wilba.tech/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make wilba_tech/wt60_g:default
+
+Flashing example for this keyboard:
+
+    make wilba_tech/wt60_g:default:flash
+
+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).
diff --git a/qmk/keyboards/wilba_tech/wt60_g/rules.mk b/qmk/keyboards/wilba_tech/wt60_g/rules.mk
new file mode 100644
index 00000000..04e644cb
--- /dev/null
+++ b/qmk/keyboards/wilba_tech/wt60_g/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # 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 = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
\ No newline at end of file
diff --git a/qmk/keyboards/wilba_tech/wt60_g/wt60_g.c b/qmk/keyboards/wilba_tech/wt60_g/wt60_g.c
new file mode 100644
index 00000000..1c1eed88
--- /dev/null
+++ b/qmk/keyboards/wilba_tech/wt60_g/wt60_g.c
@@ -0,0 +1,17 @@
+/* Copyright 2020 Jason Williams (Wilba)
+ *
+ * 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 "wt60_g.h"
diff --git a/qmk/keyboards/wilba_tech/wt60_g/wt60_g.h b/qmk/keyboards/wilba_tech/wt60_g/wt60_g.h
new file mode 100644
index 00000000..94fcb696
--- /dev/null
+++ b/qmk/keyboards/wilba_tech/wt60_g/wt60_g.h
@@ -0,0 +1,36 @@
+/* Copyright 2020 Jason Williams (Wilba)
+ *
+ * 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 ____ KC_NO
+
+#define LAYOUT_all( \
+    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K213, \
+    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,       \
+    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,             \
+    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313,       \
+    K400, K401, K402,                   K406,                   K410, K411, K412, K413        \
+) { \
+    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013 }, \
+    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113 }, \
+    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213 }, \
+    { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313 }, \
+    { K400, K401, K402, ____, ____, ____, K406, ____, ____, ____, K410, K411, K412, K413 }  \
+}
+
diff --git a/qmk/keyboards/wilba_tech/wt60_h1/config.h b/qmk/keyboards/wilba_tech/wt60_h1/config.h
new file mode 100644
index 00000000..005ad42c
--- /dev/null
+++ b/qmk/keyboards/wilba_tech/wt60_h1/config.h
@@ -0,0 +1,55 @@
+/* Copyright 2020 Jason Williams (Wilba)
+ *
+ * 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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x6582 // wilba.tech
+#define PRODUCT_ID      0x0024 // PCB #36
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    wilba.tech
+#define PRODUCT         wilba.tech WT60-H1
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 14
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+*/
+#define MATRIX_ROW_PINS { F0, F1, F4, F6, F7 }
+#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6 } // D4, B7, B0
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
diff --git a/qmk/keyboards/wilba_tech/wt60_h1/info.json b/qmk/keyboards/wilba_tech/wt60_h1/info.json
new file mode 100644
index 00000000..d179d9e1
--- /dev/null
+++ b/qmk/keyboards/wilba_tech/wt60_h1/info.json
@@ -0,0 +1,12 @@
+{
+    "keyboard_name": "wilba.tech WT60-H1", 
+    "url": "https://wilba.tech", 
+    "maintainer": "Wilba", 
+    "width": 15, 
+    "height": 5, 
+    "layouts": {
+        "LAYOUT_60_tsangan_hhkb": {
+            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":0, "y":4, "w":1.5}, {"x":1.5, "y":4}, {"x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"x":11, "y":4, "w":1.5}, {"x":12.5, "y":4}, {"x":13.5, "y":4, "w":1.5}]
+        }
+    }
+}
diff --git a/qmk/keyboards/wilba_tech/wt60_h1/keymaps/default/keymap.c b/qmk/keyboards/wilba_tech/wt60_h1/keymaps/default/keymap.c
new file mode 100644
index 00000000..e701e417
--- /dev/null
+++ b/qmk/keyboards/wilba_tech/wt60_h1/keymaps/default/keymap.c
@@ -0,0 +1,52 @@
+/* Copyright 2020 Jason Williams (Wilba)
+ *
+ * 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/>.
+ */
+// Default layout for WT60-H1
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	// Default layer
+	[0] = LAYOUT_60_tsangan_hhkb(
+		KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_DEL,
+		KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,
+		KC_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_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),
+		MO(1),   KC_LGUI, KC_LALT,                            KC_SPC,                                      KC_RALT, KC_RGUI, KC_RCTL),
+
+	// Fn1 Layer
+	[1] = LAYOUT_60_tsangan_hhkb(
+		KC_GRV,  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_DEL,
+		KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP,   KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END,  KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                            KC_TRNS, KC_TRNS, KC_TRNS),
+
+	// Fn2 Layer
+	[2] = LAYOUT_60_tsangan_hhkb(
+		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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS),
+
+	// Fn3 Layer
+	[3] = LAYOUT_60_tsangan_hhkb(
+		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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS,                            KC_TRNS,                                     KC_TRNS, KC_TRNS, KC_TRNS),
+};
diff --git a/qmk/keyboards/wilba_tech/wt60_h1/keymaps/via/keymap.c b/qmk/keyboards/wilba_tech/wt60_h1/keymaps/via/keymap.c
new file mode 100644
index 00000000..1f9d213f
--- /dev/null
+++ b/qmk/keyboards/wilba_tech/wt60_h1/keymaps/via/keymap.c
@@ -0,0 +1 @@
+#include "../default/keymap.c"
\ No newline at end of file
diff --git a/qmk/keyboards/wilba_tech/wt60_h1/keymaps/via/rules.mk b/qmk/keyboards/wilba_tech/wt60_h1/keymaps/via/rules.mk
new file mode 100644
index 00000000..1e5b9980
--- /dev/null
+++ b/qmk/keyboards/wilba_tech/wt60_h1/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/qmk/keyboards/wilba_tech/wt60_h1/readme.md b/qmk/keyboards/wilba_tech/wt60_h1/readme.md
new file mode 100644
index 00000000..6c6c65c6
--- /dev/null
+++ b/qmk/keyboards/wilba_tech/wt60_h1/readme.md
@@ -0,0 +1,17 @@
+# wilba.tech WT60-H1
+
+WT60-H1 is a keyboard PCB supporting 60% layout and daughterboard USB-C. [More info at wilba.tech](https://wilba.tech/)
+
+* Keyboard Maintainer: [Wilba6582](https://github.com/Wilba6582)
+* Hardware Supported: wilba.tech WT60-H1
+* Hardware Availability: [wilba.tech](https://wilba.tech/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make wilba_tech/wt60_h1:default
+
+Flashing example for this keyboard:
+
+    make wilba_tech/wt60_h1:default:flash
+
+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).
diff --git a/qmk/keyboards/wilba_tech/wt60_h1/rules.mk b/qmk/keyboards/wilba_tech/wt60_h1/rules.mk
new file mode 100644
index 00000000..7e56f6e1
--- /dev/null
+++ b/qmk/keyboards/wilba_tech/wt60_h1/rules.mk
@@ -0,0 +1,24 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # 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 = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+
+LAYOUTS = 60_tsangan_hhkb
diff --git a/qmk/keyboards/wilba_tech/wt60_h1/wt60_h1.c b/qmk/keyboards/wilba_tech/wt60_h1/wt60_h1.c
new file mode 100644
index 00000000..5370394e
--- /dev/null
+++ b/qmk/keyboards/wilba_tech/wt60_h1/wt60_h1.c
@@ -0,0 +1,17 @@
+/* Copyright 2020 Jason Williams (Wilba)
+ *
+ * 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 "wt60_h1.h"
diff --git a/qmk/keyboards/wilba_tech/wt60_h1/wt60_h1.h b/qmk/keyboards/wilba_tech/wt60_h1/wt60_h1.h
new file mode 100644
index 00000000..89b90e7a
--- /dev/null
+++ b/qmk/keyboards/wilba_tech/wt60_h1/wt60_h1.h
@@ -0,0 +1,36 @@
+/* Copyright 2020 Jason Williams (Wilba)
+ *
+ * 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 ____ KC_NO
+
+// This is equivalent to LAYOUT_all
+#define LAYOUT_60_tsangan_hhkb( \
+    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K213, \
+    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,       \
+    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,             \
+    K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313,       \
+    K400, K401, K402,                   K406,                         K411, K412, K413        \
+) { \
+    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013 }, \
+    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113 }, \
+    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213 }, \
+    { K300, ____, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313 }, \
+    { K400, K401, K402, ____, ____, ____, K406, ____, ____, ____, ____, K411, K412, K413 }  \
+}
diff --git a/qmk/keyboards/wilba_tech/wt65_g/config.h b/qmk/keyboards/wilba_tech/wt65_g/config.h
new file mode 100644
index 00000000..8529d899
--- /dev/null
+++ b/qmk/keyboards/wilba_tech/wt65_g/config.h
@@ -0,0 +1,55 @@
+/* Copyright 2020 Jason Williams (Wilba)
+ *
+ * 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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x6582 // wilba.tech
+#define PRODUCT_ID      0x0022 // PCB #34
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    wilba.tech
+#define PRODUCT         wilba.tech WT65-G
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+*/
+#define MATRIX_ROW_PINS { F0, F1, F4, F6, F7 }
+#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4 } // B7, B0
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
diff --git a/qmk/keyboards/wilba_tech/wt65_g/info.json b/qmk/keyboards/wilba_tech/wt65_g/info.json
new file mode 100644
index 00000000..c88ac4da
--- /dev/null
+++ b/qmk/keyboards/wilba_tech/wt65_g/info.json
@@ -0,0 +1,12 @@
+{
+    "keyboard_name": "wilba.tech WT65-G", 
+    "url": "https://wilba.tech", 
+    "maintainer": "Wilba", 
+    "width": 16, 
+    "height": 5, 
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":1.25}, {"x":1.25, "y":3}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25}, {"x":2.5, "y":4, "w":1.25}, {"x":3.75, "y":4, "w":6.25}, {"x":10, "y":4, "w":1.25}, {"x":11.25, "y":4, "w":1.25}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}]
+        }
+    }
+}
\ No newline at end of file
diff --git a/qmk/keyboards/wilba_tech/wt65_g/keymaps/default/keymap.c b/qmk/keyboards/wilba_tech/wt65_g/keymaps/default/keymap.c
new file mode 100644
index 00000000..9670dd4c
--- /dev/null
+++ b/qmk/keyboards/wilba_tech/wt65_g/keymaps/default/keymap.c
@@ -0,0 +1,52 @@
+/* Copyright 2020 Jason Williams (Wilba)
+ *
+ * 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/>.
+ */
+// Default layout for WT65-G
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	// Default layer
+	[0] = LAYOUT_all(
+		KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_BSPC, KC_HOME,
+		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_PGUP,
+		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_PGDN,
+		KC_LSFT, KC_NO,   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_END,
+		KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, MO(1),            KC_LEFT, KC_DOWN, KC_RGHT),
+
+	// Fn1 Layer
+	[1] = LAYOUT_all(
+		KC_GRV,  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_DEL,  KC_DEL,  KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+		KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, 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),
+
+	// Fn2 Layer
+	[2] = LAYOUT_all(
+		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, 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),
+
+	// Fn3 Layer
+	[3] = LAYOUT_all(
+		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, 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),
+};
\ No newline at end of file
diff --git a/qmk/keyboards/wilba_tech/wt65_g/keymaps/via/keymap.c b/qmk/keyboards/wilba_tech/wt65_g/keymaps/via/keymap.c
new file mode 100644
index 00000000..1f9d213f
--- /dev/null
+++ b/qmk/keyboards/wilba_tech/wt65_g/keymaps/via/keymap.c
@@ -0,0 +1 @@
+#include "../default/keymap.c"
\ No newline at end of file
diff --git a/qmk/keyboards/wilba_tech/wt65_g/keymaps/via/rules.mk b/qmk/keyboards/wilba_tech/wt65_g/keymaps/via/rules.mk
new file mode 100644
index 00000000..1e5b9980
--- /dev/null
+++ b/qmk/keyboards/wilba_tech/wt65_g/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/qmk/keyboards/wilba_tech/wt65_g/readme.md b/qmk/keyboards/wilba_tech/wt65_g/readme.md
new file mode 100644
index 00000000..09c8c56e
--- /dev/null
+++ b/qmk/keyboards/wilba_tech/wt65_g/readme.md
@@ -0,0 +1,17 @@
+# wilba.tech WT65-G
+
+WT65-G is a keyboard PCB supporting 65% layout and daughterboard USB-C. [More info at wilba.tech](https://wilba.tech/)
+
+* Keyboard Maintainer: [Wilba6582](https://github.com/Wilba6582)
+* Hardware Supported: wilba.tech WT65-G
+* Hardware Availability: [wilba.tech](https://wilba.tech/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make wilba_tech/wt65_g:default
+
+Flashing example for this keyboard:
+
+    make wilba_tech/wt65_g:default:flash
+
+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).
diff --git a/qmk/keyboards/wilba_tech/wt65_g/rules.mk b/qmk/keyboards/wilba_tech/wt65_g/rules.mk
new file mode 100644
index 00000000..04e644cb
--- /dev/null
+++ b/qmk/keyboards/wilba_tech/wt65_g/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # 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 = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
\ No newline at end of file
diff --git a/qmk/keyboards/wilba_tech/wt65_g/wt65_g.c b/qmk/keyboards/wilba_tech/wt65_g/wt65_g.c
new file mode 100644
index 00000000..54e823cb
--- /dev/null
+++ b/qmk/keyboards/wilba_tech/wt65_g/wt65_g.c
@@ -0,0 +1,17 @@
+/* Copyright 2020 Jason Williams (Wilba)
+ *
+ * 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 "wt65_g.h"
diff --git a/qmk/keyboards/wilba_tech/wt65_g/wt65_g.h b/qmk/keyboards/wilba_tech/wt65_g/wt65_g.h
new file mode 100644
index 00000000..bd738123
--- /dev/null
+++ b/qmk/keyboards/wilba_tech/wt65_g/wt65_g.h
@@ -0,0 +1,36 @@
+/* Copyright 2020 Jason Williams (Wilba)
+ *
+ * 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 ____ KC_NO
+
+#define LAYOUT_all( \
+    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K213, K014, \
+    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,       K114, \
+    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,             K214, \
+    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312,       K313, K314, \
+    K400, K401, K402,                   K406,                   K410, K411,       K412, K413, K414  \
+) { \
+    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
+    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
+    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 }, \
+	{ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314 }, \
+    { K400, K401, K402, ____, ____, ____, K406, ____, ____, ____, K410, K411, K412, K413, K414 }  \
+}
+
diff --git a/qmk/keyboards/wilba_tech/wt65_h1/config.h b/qmk/keyboards/wilba_tech/wt65_h1/config.h
new file mode 100644
index 00000000..d7626af3
--- /dev/null
+++ b/qmk/keyboards/wilba_tech/wt65_h1/config.h
@@ -0,0 +1,55 @@
+/* Copyright 2020 Jason Williams (Wilba)
+ *
+ * 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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x6582 // wilba.tech
+#define PRODUCT_ID      0x0025 // PCB #37
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    wilba.tech
+#define PRODUCT         wilba.tech WT65-H1
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+*/
+#define MATRIX_ROW_PINS { F0, F1, F4, F6, F7 }
+#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4 } // B7, B0
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
diff --git a/qmk/keyboards/wilba_tech/wt65_h1/info.json b/qmk/keyboards/wilba_tech/wt65_h1/info.json
new file mode 100644
index 00000000..813848d3
--- /dev/null
+++ b/qmk/keyboards/wilba_tech/wt65_h1/info.json
@@ -0,0 +1,12 @@
+{
+    "keyboard_name": "wilba.tech WT65-H1", 
+    "url": "https://wilba.tech", 
+    "maintainer": "Wilba", 
+    "width": 16, 
+    "height": 5, 
+    "layouts": {
+        "LAYOUT_65_ansi_blocker_tsangan": {
+            "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0, "w":2}, {"x":15, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":15, "y":1}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":15, "y":2}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":15, "y":3}, {"x":0, "y":4, "w":1.5}, {"x":1.5, "y":4}, {"x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"x":11, "y":4, "w":1.5}, {"x":13, "y":4}, {"x":14, "y":4}, {"x":15, "y":4}]
+        }
+    }
+}
diff --git a/qmk/keyboards/wilba_tech/wt65_h1/keymaps/default/keymap.c b/qmk/keyboards/wilba_tech/wt65_h1/keymaps/default/keymap.c
new file mode 100644
index 00000000..b24e61a9
--- /dev/null
+++ b/qmk/keyboards/wilba_tech/wt65_h1/keymaps/default/keymap.c
@@ -0,0 +1,52 @@
+/* Copyright 2020 Jason Williams (Wilba)
+ *
+ * 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/>.
+ */
+// Default layout for WT65-H1
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	// Default layer
+	[0] = LAYOUT_65_ansi_blocker_tsangan(
+		KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,          KC_HOME,
+		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_PGUP,
+		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_PGDN,
+		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_END,
+		KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                                      MO(1),            KC_LEFT, KC_DOWN, KC_RGHT),
+
+	// Fn1 Layer
+	[1] = LAYOUT_65_ansi_blocker_tsangan(
+		KC_GRV,  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_DEL,           KC_TRNS,
+		KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+		KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, 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),
+
+	// Fn2 Layer
+	[2] = LAYOUT_65_ansi_blocker_tsangan(
+		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, 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),
+
+	// Fn3 Layer
+	[3] = LAYOUT_65_ansi_blocker_tsangan(
+		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, 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),
+};
diff --git a/qmk/keyboards/wilba_tech/wt65_h1/keymaps/via/keymap.c b/qmk/keyboards/wilba_tech/wt65_h1/keymaps/via/keymap.c
new file mode 100644
index 00000000..1f9d213f
--- /dev/null
+++ b/qmk/keyboards/wilba_tech/wt65_h1/keymaps/via/keymap.c
@@ -0,0 +1 @@
+#include "../default/keymap.c"
\ No newline at end of file
diff --git a/qmk/keyboards/wilba_tech/wt65_h1/keymaps/via/rules.mk b/qmk/keyboards/wilba_tech/wt65_h1/keymaps/via/rules.mk
new file mode 100644
index 00000000..1e5b9980
--- /dev/null
+++ b/qmk/keyboards/wilba_tech/wt65_h1/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/qmk/keyboards/wilba_tech/wt65_h1/readme.md b/qmk/keyboards/wilba_tech/wt65_h1/readme.md
new file mode 100644
index 00000000..9ace4dbf
--- /dev/null
+++ b/qmk/keyboards/wilba_tech/wt65_h1/readme.md
@@ -0,0 +1,17 @@
+# wilba.tech WT65-H1
+
+WT65-H1 is a keyboard PCB supporting 65% layout and daughterboard USB-C. [More info at wilba.tech](https://wilba.tech/)
+
+* Keyboard Maintainer: [Wilba6582](https://github.com/Wilba6582)
+* Hardware Supported: wilba.tech WT65-H1
+* Hardware Availability: [wilba.tech](https://wilba.tech/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make wilba_tech/wt65_h1:default
+
+Flashing example for this keyboard:
+
+    make wilba_tech/wt65_h1:default:flash
+
+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).
diff --git a/qmk/keyboards/wilba_tech/wt65_h1/rules.mk b/qmk/keyboards/wilba_tech/wt65_h1/rules.mk
new file mode 100644
index 00000000..7dcc056a
--- /dev/null
+++ b/qmk/keyboards/wilba_tech/wt65_h1/rules.mk
@@ -0,0 +1,24 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # 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 = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+
+LAYOUTS = 65_ansi_blocker_tsangan
diff --git a/qmk/keyboards/wilba_tech/wt65_h1/wt65_h1.c b/qmk/keyboards/wilba_tech/wt65_h1/wt65_h1.c
new file mode 100644
index 00000000..e8e5466a
--- /dev/null
+++ b/qmk/keyboards/wilba_tech/wt65_h1/wt65_h1.c
@@ -0,0 +1,17 @@
+/* Copyright 2020 Jason Williams (Wilba)
+ *
+ * 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 "wt65_h1.h"
diff --git a/qmk/keyboards/wilba_tech/wt65_h1/wt65_h1.h b/qmk/keyboards/wilba_tech/wt65_h1/wt65_h1.h
new file mode 100644
index 00000000..4935bf6d
--- /dev/null
+++ b/qmk/keyboards/wilba_tech/wt65_h1/wt65_h1.h
@@ -0,0 +1,36 @@
+/* Copyright 2020 Jason Williams (Wilba)
+ *
+ * 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 ____ KC_NO
+
+// This is equivalent to LAYOUT_all
+#define LAYOUT_65_ansi_blocker_tsangan( \
+    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013,       K014, \
+    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,       K114, \
+    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,             K214, \
+    K300,       K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312,       K313, K314, \
+    K400, K401, K402,                   K406,                         K411,       K412, K413, K414  \
+) { \
+    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
+    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
+    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, ____, K214 }, \
+	{ K300, ____, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314 }, \
+    { K400, K401, K402, ____, ____, ____, K406, ____, ____, ____, ____, K411, K412, K413, K414 }  \
+}
diff --git a/qmk/keyboards/wilba_tech/wt80_g/config.h b/qmk/keyboards/wilba_tech/wt80_g/config.h
new file mode 100644
index 00000000..4c636c20
--- /dev/null
+++ b/qmk/keyboards/wilba_tech/wt80_g/config.h
@@ -0,0 +1,55 @@
+/* Copyright 2020 Jason Williams (Wilba)
+ *
+ * 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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x6582 // wilba.tech
+#define PRODUCT_ID      0x0023 // PCB #35
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    wilba.tech
+#define PRODUCT         wilba.tech WT80-G
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 17
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+*/
+#define MATRIX_ROW_PINS { F1, F0, E6, F4, F6, F7 }
+#define MATRIX_COL_PINS { F5, D5, B1, B2, B3, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4, B7, B0 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL*/
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
diff --git a/qmk/keyboards/wilba_tech/wt80_g/info.json b/qmk/keyboards/wilba_tech/wt80_g/info.json
new file mode 100644
index 00000000..1d407c24
--- /dev/null
+++ b/qmk/keyboards/wilba_tech/wt80_g/info.json
@@ -0,0 +1,12 @@
+{
+    "keyboard_name": "wilba.tech WT80-G", 
+    "url": "https://wilba.tech", 
+    "maintainer": "Wilba", 
+    "width": 18.25, 
+    "height": 6.25, 
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [{"x":0, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6.5, "y":0}, {"x":7.5, "y":0}, {"x":8.5, "y":0}, {"x":9.5, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":15.25, "y":0}, {"x":16.25, "y":0}, {"x":17.25, "y":0}, {"x":0, "y":1.25}, {"x":1, "y":1.25}, {"x":2, "y":1.25}, {"x":3, "y":1.25}, {"x":4, "y":1.25}, {"x":5, "y":1.25}, {"x":6, "y":1.25}, {"x":7, "y":1.25}, {"x":8, "y":1.25}, {"x":9, "y":1.25}, {"x":10, "y":1.25}, {"x":11, "y":1.25}, {"x":12, "y":1.25}, {"x":13, "y":1.25}, {"x":14, "y":1.25}, {"x":15.25, "y":1.25}, {"x":16.25, "y":1.25}, {"x":17.25, "y":1.25}, {"x":0, "y":2.25, "w":1.5}, {"x":1.5, "y":2.25}, {"x":2.5, "y":2.25}, {"x":3.5, "y":2.25}, {"x":4.5, "y":2.25}, {"x":5.5, "y":2.25}, {"x":6.5, "y":2.25}, {"x":7.5, "y":2.25}, {"x":8.5, "y":2.25}, {"x":9.5, "y":2.25}, {"x":10.5, "y":2.25}, {"x":11.5, "y":2.25}, {"x":12.5, "y":2.25}, {"x":13.5, "y":2.25, "w":1.5}, {"x":15.25, "y":2.25}, {"x":16.25, "y":2.25}, {"x":17.25, "y":2.25}, {"x":0, "y":3.25, "w":1.75}, {"x":1.75, "y":3.25}, {"x":2.75, "y":3.25}, {"x":3.75, "y":3.25}, {"x":4.75, "y":3.25}, {"x":5.75, "y":3.25}, {"x":6.75, "y":3.25}, {"x":7.75, "y":3.25}, {"x":8.75, "y":3.25}, {"x":9.75, "y":3.25}, {"x":10.75, "y":3.25}, {"x":11.75, "y":3.25}, {"x":12.75, "y":3.25, "w":2.25}, {"x":0, "y":4.25, "w":1.25}, {"x":1.25, "y":4.25}, {"x":2.25, "y":4.25}, {"x":3.25, "y":4.25}, {"x":4.25, "y":4.25}, {"x":5.25, "y":4.25}, {"x":6.25, "y":4.25}, {"x":7.25, "y":4.25}, {"x":8.25, "y":4.25}, {"x":9.25, "y":4.25}, {"x":10.25, "y":4.25}, {"x":11.25, "y":4.25}, {"x":12.25, "y":4.25, "w":1.75}, {"x":14, "y":4.25}, {"x":16.25, "y":4.25}, {"x":0, "y":5.25, "w":1.25}, {"x":1.25, "y":5.25, "w":1.25}, {"x":2.5, "y":5.25, "w":1.25}, {"x":3.75, "y":5.25, "w":6.25}, {"x":10, "y":5.25, "w":1.25}, {"x":11.25, "y":5.25, "w":1.25}, {"x":12.5, "y":5.25, "w":1.25}, {"x":13.75, "y":5.25, "w":1.25}, {"x":15.25, "y":5.25}, {"x":16.25, "y":5.25}, {"x":17.25, "y":5.25}]
+        }
+    }
+}
\ No newline at end of file
diff --git a/qmk/keyboards/wilba_tech/wt80_g/keymaps/default/keymap.c b/qmk/keyboards/wilba_tech/wt80_g/keymaps/default/keymap.c
new file mode 100644
index 00000000..08fa11b3
--- /dev/null
+++ b/qmk/keyboards/wilba_tech/wt80_g/keymaps/default/keymap.c
@@ -0,0 +1,54 @@
+/* Copyright 2020 Jason Williams (Wilba)
+ *
+ * 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/>.
+ */
+// Default layout for WT80-G
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+	  [0] = LAYOUT_all(
+	    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_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_NO,   KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_RSFT,                   KC_UP,
+	    KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                                      KC_RALT, KC_RGUI, KC_APP,  KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT),
+
+	  [1] = LAYOUT_all(
+	    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, 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),
+
+	  [2] = LAYOUT_all(
+		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, 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),
+
+	  [3] = LAYOUT_all(
+		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, 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),
+
+};
+
diff --git a/qmk/keyboards/wilba_tech/wt80_g/keymaps/via/keymap.c b/qmk/keyboards/wilba_tech/wt80_g/keymaps/via/keymap.c
new file mode 100644
index 00000000..1f9d213f
--- /dev/null
+++ b/qmk/keyboards/wilba_tech/wt80_g/keymaps/via/keymap.c
@@ -0,0 +1 @@
+#include "../default/keymap.c"
\ No newline at end of file
diff --git a/qmk/keyboards/wilba_tech/wt80_g/keymaps/via/rules.mk b/qmk/keyboards/wilba_tech/wt80_g/keymaps/via/rules.mk
new file mode 100644
index 00000000..1e5b9980
--- /dev/null
+++ b/qmk/keyboards/wilba_tech/wt80_g/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/qmk/keyboards/wilba_tech/wt80_g/readme.md b/qmk/keyboards/wilba_tech/wt80_g/readme.md
new file mode 100644
index 00000000..b016b7ac
--- /dev/null
+++ b/qmk/keyboards/wilba_tech/wt80_g/readme.md
@@ -0,0 +1,17 @@
+# wilba.tech WT80-G
+
+WT80-G is a keyboard PCB supporting TKL layout and daughterboard USB-C. [More info at wilba.tech](https://wilba.tech/)
+
+* Keyboard Maintainer: [Wilba6582](https://github.com/Wilba6582)
+* Hardware Supported: wilba.tech WT80-G
+* Hardware Availability: [wilba.tech](https://wilba.tech/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make wilba_tech/wt80_g:default
+
+Flashing example for this keyboard:
+
+    make wilba_tech/wt80_g:default:flash
+
+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).
diff --git a/qmk/keyboards/wilba_tech/wt80_g/rules.mk b/qmk/keyboards/wilba_tech/wt80_g/rules.mk
new file mode 100644
index 00000000..04e644cb
--- /dev/null
+++ b/qmk/keyboards/wilba_tech/wt80_g/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # 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 = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
\ No newline at end of file
diff --git a/qmk/keyboards/wilba_tech/wt80_g/wt80_g.c b/qmk/keyboards/wilba_tech/wt80_g/wt80_g.c
new file mode 100644
index 00000000..821cffc7
--- /dev/null
+++ b/qmk/keyboards/wilba_tech/wt80_g/wt80_g.c
@@ -0,0 +1,17 @@
+/* Copyright 2020 Jason Williams (Wilba)
+ *
+ * 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 "wt80_g.h"
diff --git a/qmk/keyboards/wilba_tech/wt80_g/wt80_g.h b/qmk/keyboards/wilba_tech/wt80_g/wt80_g.h
new file mode 100644
index 00000000..df0bfe57
--- /dev/null
+++ b/qmk/keyboards/wilba_tech/wt80_g/wt80_g.h
@@ -0,0 +1,37 @@
+/* Copyright 2020 Jason Williams (Wilba)
+ *
+ * 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 ____ KC_NO
+
+#define LAYOUT_all( \
+    K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012,             K014, K015, K016, \
+    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K313, K114, K115, K116, \
+    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,       K214, K215, K216, \
+    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312,                               \
+    K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413,             K415,       \
+    K500, K501, K502,                   K506,                   K510, K511, K512, K513,       K514, K515, K516  \
+) { \
+    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, ____, K014, K015, K016 }, \
+    { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116 }, \
+    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216 }, \
+    { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, ____, ____, ____ }, \
+	{ K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, ____, K415, ____ }, \
+    { K500, K501, K502, ____, ____, ____, K506, ____, ____, ____, K510, K511, K512, K513, K514, K515, K516 }  \
+}
diff --git a/qmk/keyboards/wilba_tech/wt_rgb_backlight.c b/qmk/keyboards/wilba_tech/wt_rgb_backlight.c
index cd3fdd20..306f8186 100644
--- a/qmk/keyboards/wilba_tech/wt_rgb_backlight.c
+++ b/qmk/keyboards/wilba_tech/wt_rgb_backlight.c
@@ -25,6 +25,7 @@
     defined(RGB_BACKLIGHT_HS60) || \
     defined(RGB_BACKLIGHT_NK65) || \
     defined(RGB_BACKLIGHT_NK87) || \
+    defined(RGB_BACKLIGHT_KW_MEGA) || \
     defined(RGB_BACKLIGHT_NEBULA12) || \
     defined(RGB_BACKLIGHT_NEBULA68) || \
     defined(RGB_BACKLIGHT_U80_A) || \
@@ -50,12 +51,12 @@
 #include "wt_rgb_backlight_api.h"
 #include "wt_rgb_backlight_keycodes.h"
 
-#if !defined(RGB_BACKLIGHT_HS60) && !defined(RGB_BACKLIGHT_NK65) && !defined(RGB_BACKLIGHT_NK87) && !defined(RGB_BACKLIGHT_NEBULA68) && !defined(RGB_BACKLIGHT_NEBULA12)
+#if !defined(RGB_BACKLIGHT_HS60) && !defined(RGB_BACKLIGHT_NK65) && !defined(RGB_BACKLIGHT_NK87) && !defined(RGB_BACKLIGHT_NEBULA68) && !defined(RGB_BACKLIGHT_NEBULA12) && !defined (RGB_BACKLIGHT_KW_MEGA)
 #include <avr/interrupt.h>
 #include "drivers/avr/i2c_master.h"
 #else
-#include "ch.h"
-#include "hal.h"
+#include <ch.h>
+#include <hal.h>
 #include "drivers/chibios/i2c_master.h"
 #endif
 
@@ -81,7 +82,7 @@ LED_TYPE g_ws2812_leds[WS2812_LED_TOTAL];
 #elif defined(RGB_BACKLIGHT_HS60)
 #include "drivers/issi/is31fl3733.h"
 #define BACKLIGHT_LED_COUNT 64
-#elif defined(RGB_BACKLIGHT_NK65) || defined(RGB_BACKLIGHT_NEBULA68)
+#elif defined(RGB_BACKLIGHT_NK65) || defined(RGB_BACKLIGHT_NEBULA68) || defined(RGB_BACKLIGHT_KW_MEGA)
 #include "drivers/issi/is31fl3733.h"
 #define BACKLIGHT_LED_COUNT 69
 #elif defined(RGB_BACKLIGHT_NK87)
@@ -227,7 +228,7 @@ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
     {0, K_16,  J_16,  L_16}, //LA64
 };
 
-#elif defined(RGB_BACKLIGHT_NK65) || defined(RGB_BACKLIGHT_NEBULA68) || defined(RGB_BACKLIGHT_NK87)
+#elif defined(RGB_BACKLIGHT_NK65) || defined(RGB_BACKLIGHT_NEBULA68) || defined(RGB_BACKLIGHT_NK87) || defined(RGB_BACKLIGHT_KW_MEGA)
 
 // This is a 7-bit address, that gets left-shifted and bit 0
 // set to 0 for write, 1 for read (as per I2C protocol)
@@ -1001,7 +1002,7 @@ const Point g_map_led_to_point_polar[BACKLIGHT_LED_COUNT] PROGMEM = {
     {255,255},// LA61 does not exit, dummy
     {209,255}, {215,255}, {220,255}
 };
-#elif defined(RGB_BACKLIGHT_NK65)
+#elif defined(RGB_BACKLIGHT_NK65) || defined(RGB_BACKLIGHT_KW_MEGA)
 const Point g_map_led_to_point[BACKLIGHT_LED_COUNT] PROGMEM = {
     // LA1..LA60
     {0,0}, {4,16}, {6,32}, {10,48}, {16,0}, {24,16}, {28,32}, {36,48}, {32,0}, {40,16}, {44,32}, {52,48},
@@ -1197,7 +1198,8 @@ void map_led_to_point( uint8_t index, Point *point )
     point->x = pgm_read_byte(addr);
     point->y = pgm_read_byte(addr+1);
 
-#if defined(RGB_BACKLIGHT_M6_B) || defined(RGB_BACKLIGHT_M10_C) || defined(RGB_BACKLIGHT_HS60) || defined(RGB_BACKLIGHT_NK65) || defined(RGB_BACKLIGHT_NK87) || defined(RGB_BACKLIGHT_NEBULA68) || defined(RGB_BACKLIGHT_NEBULA12)
+#if defined(RGB_BACKLIGHT_M6_B) || defined(RGB_BACKLIGHT_M10_C) || defined(RGB_BACKLIGHT_HS60) || defined(RGB_BACKLIGHT_NK65) || \
+    defined(RGB_BACKLIGHT_NK87) || defined(RGB_BACKLIGHT_NEBULA68) || defined(RGB_BACKLIGHT_NEBULA12) || defined(RGB_BACKLIGHT_KW_MEGA)
     return;
 #endif
 
@@ -1400,7 +1402,7 @@ const uint8_t g_map_row_column_to_led[MATRIX_ROWS][MATRIX_COLS] PROGMEM = {
     {  4-1, 48-1,  8-1, 12-1, 16-1, 20-1, 24-1, 28-1, 32-1, 36-1, 40-1, 44-1,  255, 52-1 },
     { 57-1, 58-1, 59-1,  255,  255,  255, 60-1,  255,  255,  255, 62-1, 63-1, 64-1, 56-1 }
 };
-#elif defined(RGB_BACKLIGHT_NK65) || defined(RGB_BACKLIGHT_NEBULA68)
+#elif defined(RGB_BACKLIGHT_NK65) || defined(RGB_BACKLIGHT_NEBULA68) || defined(RGB_BACKLIGHT_KW_MEGA)
 //
 // LA1,  LA5,  LA9,  LA13, LA17, LA21, LA25, LA29, LA33, LA37, LA41, LA45, LA49, LA53, LB1,
 // LA2,  LA6,  LA10, LA14, LA18, LA22, LA26, LA30, LA34, LA38, LA42, LA46, LA50,  ---, LB2,
@@ -1504,7 +1506,7 @@ void backlight_update_pwm_buffers(void)
 #elif defined(RGB_BACKLIGHT_HS60)
     IS31FL3733_update_pwm_buffers( ISSI_ADDR_1, 0 );
     IS31FL3733_update_led_control_registers( ISSI_ADDR_1, 0 );
-#elif defined(RGB_BACKLIGHT_NK65) || defined(RGB_BACKLIGHT_NEBULA68) || defined(RGB_BACKLIGHT_NK87)
+#elif defined(RGB_BACKLIGHT_NK65) || defined(RGB_BACKLIGHT_NEBULA68) || defined(RGB_BACKLIGHT_NK87) || defined(RGB_BACKLIGHT_KW_MEGA)
     IS31FL3733_update_pwm_buffers( ISSI_ADDR_1, 0 );
     IS31FL3733_update_pwm_buffers( ISSI_ADDR_2, 1 );
     IS31FL3733_update_led_control_registers( ISSI_ADDR_1, 0 );
@@ -1542,7 +1544,7 @@ void backlight_set_color( int index, uint8_t red, uint8_t green, uint8_t blue )
 {
 #if defined(RGB_BACKLIGHT_M6_B)
     IS31FL3218_set_color( index, red, green, blue );
-#elif defined(RGB_BACKLIGHT_HS60) || defined(RGB_BACKLIGHT_NK65) || defined(RGB_BACKLIGHT_NEBULA68)
+#elif defined(RGB_BACKLIGHT_HS60) || defined(RGB_BACKLIGHT_NK65) || defined(RGB_BACKLIGHT_NEBULA68) || defined(RGB_BACKLIGHT_KW_MEGA)
     IS31FL3733_set_color( index, red, green, blue );
 #elif defined(RGB_BACKLIGHT_NK87)
     // This is done to avoid indicator LEDs being set
@@ -1567,7 +1569,7 @@ void backlight_set_color_all( uint8_t red, uint8_t green, uint8_t blue )
 {
 #if defined(RGB_BACKLIGHT_M6_B)
     IS31FL3218_set_color_all( red, green, blue );
-#elif defined(RGB_BACKLIGHT_HS60) || defined(RGB_BACKLIGHT_NK65) || defined(RGB_BACKLIGHT_NEBULA68)
+#elif defined(RGB_BACKLIGHT_HS60) || defined(RGB_BACKLIGHT_NK65) || defined(RGB_BACKLIGHT_NEBULA68) || defined(RGB_BACKLIGHT_KW_MEGA)
     // This is done to avoid indicator LEDs being set
     for (int i = 0; i < BACKLIGHT_LED_COUNT; i++) {
         IS31FL3733_set_color(i, red, green, blue);
@@ -1601,7 +1603,7 @@ void backlight_set_key_hit(uint8_t row, uint8_t column)
     g_any_key_hit = 0;
 }
 
-#if !defined(RGB_BACKLIGHT_HS60) && !defined(RGB_BACKLIGHT_NK65) && !defined(RGB_BACKLIGHT_NEBULA68) && !defined(RGB_BACKLIGHT_NEBULA12) && !defined(RGB_BACKLIGHT_NK87)
+#if !defined(RGB_BACKLIGHT_HS60) && !defined(RGB_BACKLIGHT_NK65) && !defined(RGB_BACKLIGHT_NEBULA68) && !defined(RGB_BACKLIGHT_NEBULA12) && !defined(RGB_BACKLIGHT_NK87) && !defined(RGB_BACKLIGHT_KW_MEGA)
 // This is (F_CPU/1024) / 20 Hz
 // = 15625 Hz / 20 Hz
 // = 781
@@ -1681,7 +1683,7 @@ void backlight_timer_disable(void)
 {
     gptStopTimer(&GPTD4);
 }
-#endif //!defined(RGB_BACKLIGHT_HS60) && !defined(RGB_BACKLIGHT_NK65) && !defined(RGB_BACKLIGHT_NEBULA68) && !defined(RGB_BACKLIGHT_NEBULA12) && !defined(RGB_BACKLIGHT_NK87)
+#endif //!defined(RGB_BACKLIGHT_HS60) && !defined(RGB_BACKLIGHT_NK65) && !defined(RGB_BACKLIGHT_NEBULA68) && !defined(RGB_BACKLIGHT_NEBULA12) && !defined(RGB_BACKLIGHT_NK87) && !defined(RGB_BACKLIGHT_KW_MEGA)
 
 void backlight_set_suspend_state(bool state)
 {
@@ -1927,7 +1929,7 @@ void backlight_effect_cycle_all(void)
     for ( int i=0; i<BACKLIGHT_LED_COUNT; i++ )
     {
         uint16_t offset2 = g_key_hit[i]<<2;
-#if !defined(RGB_BACKLIGHT_HS60) && !defined(RGB_BACKLIGHT_NK65) && !defined(RGB_BACKLIGHT_DAWN60) && !defined(RGB_BACKLIGHT_NEBULA68) && !defined(RGB_BACKLIGHT_NEBULA12) && !defined(RGB_BACKLIGHT_NK87)
+#if !defined(RGB_BACKLIGHT_HS60) && !defined(RGB_BACKLIGHT_NK65) && !defined(RGB_BACKLIGHT_DAWN60) && !defined(RGB_BACKLIGHT_NEBULA68) && !defined(RGB_BACKLIGHT_NEBULA12) && !defined(RGB_BACKLIGHT_NK87) && !defined(RGB_BACKLIGHT_KW_MEGA)
         // stabilizer LEDs use spacebar hits
         if ( i == 36+6 || i == 54+13 || // LC6, LD13
                 ( g_config.use_7u_spacebar && i == 54+14 ) ) // LD14
@@ -1952,7 +1954,7 @@ void backlight_effect_cycle_left_right(void)
     for ( int i=0; i<BACKLIGHT_LED_COUNT; i++ )
     {
         uint16_t offset2 = g_key_hit[i]<<2;
-#if !defined(RGB_BACKLIGHT_HS60) && !defined(RGB_BACKLIGHT_NK65) && !defined(RGB_BACKLIGHT_DAWN60) && !defined(RGB_BACKLIGHT_NEBULA68) && !defined(RGB_BACKLIGHT_NEBULA12) && !defined(RGB_BACKLIGHT_NK87)
+#if !defined(RGB_BACKLIGHT_HS60) && !defined(RGB_BACKLIGHT_NK65) && !defined(RGB_BACKLIGHT_DAWN60) && !defined(RGB_BACKLIGHT_NEBULA68) && !defined(RGB_BACKLIGHT_NEBULA12) && !defined(RGB_BACKLIGHT_NK87) && !defined(RGB_BACKLIGHT_KW_MEGA)
         // stabilizer LEDs use spacebar hits
         if ( i == 36+6 || i == 54+13 || // LC6, LD13
                 ( g_config.use_7u_spacebar && i == 54+14 ) ) // LD14
@@ -1979,7 +1981,7 @@ void backlight_effect_cycle_up_down(void)
     for ( int i=0; i<BACKLIGHT_LED_COUNT; i++ )
     {
         uint16_t offset2 = g_key_hit[i]<<2;
-#if !defined(RGB_BACKLIGHT_HS60) && !defined(RGB_BACKLIGHT_NK65) && !defined(RGB_BACKLIGHT_DAWN60) && !defined(RGB_BACKLIGHT_NEBULA68) && !defined(RGB_BACKLIGHT_NEBULA12) && !defined(RGB_BACKLIGHT_NK87)
+#if !defined(RGB_BACKLIGHT_HS60) && !defined(RGB_BACKLIGHT_NK65) && !defined(RGB_BACKLIGHT_DAWN60) && !defined(RGB_BACKLIGHT_NEBULA68) && !defined(RGB_BACKLIGHT_NEBULA12) && !defined(RGB_BACKLIGHT_NK87) && !defined(RGB_BACKLIGHT_KW_MEGA)
         // stabilizer LEDs use spacebar hits
         if ( i == 36+6 || i == 54+13 || // LC6, LD13
                 ( g_config.use_7u_spacebar && i == 54+14 ) ) // LD14
@@ -2160,7 +2162,7 @@ void backlight_effect_indicators(void)
     }
 }
 
-#if !defined(RGB_BACKLIGHT_HS60) && !defined(RGB_BACKLIGHT_NK65) && !defined(RGB_BACKLIGHT_NEBULA68) && !defined(RGB_BACKLIGHT_NEBULA12) && !defined(RGB_BACKLIGHT_NK87)
+#if !defined(RGB_BACKLIGHT_HS60) && !defined(RGB_BACKLIGHT_NK65) && !defined(RGB_BACKLIGHT_NEBULA68) && !defined(RGB_BACKLIGHT_NEBULA12) && !defined(RGB_BACKLIGHT_NK87) && !defined(RGB_BACKLIGHT_KW_MEGA)
 ISR(TIMER3_COMPA_vect)
 #else //STM32 interrupt
 static void gpt_backlight_timer_task(GPTDriver *gptp)
@@ -2701,6 +2703,20 @@ void backlight_init_drivers(void)
     // This actually updates the LED drivers
     IS31FL3733_update_led_control_registers( ISSI_ADDR_1, 0 );
     IS31FL3733_update_led_control_registers( ISSI_ADDR_2, 1 );
+#elif defined(RGB_BACKLIGHT_KW_MEGA)
+    IS31FL3733_init( ISSI_ADDR_1, 0 );
+    IS31FL3733_init( ISSI_ADDR_2, 0 );
+
+    for ( int index = 0; index < DRIVER_LED_TOTAL; index++ )
+    {
+        bool enabled = !( ( index == 61-1 )   || //LA61
+                          ( index > 6+64-1 ) ); //LB7-LB64
+        // This only caches it for later
+        IS31FL3733_set_led_control_register( index, enabled, enabled, enabled );
+    }
+    // This actually updates the LED drivers
+    IS31FL3733_update_led_control_registers( ISSI_ADDR_1, 0 );
+    IS31FL3733_update_led_control_registers( ISSI_ADDR_2, 1 );
 #else
     // Init the #1 driver
     IS31FL3731_init( ISSI_ADDR_1 );
diff --git a/qmk/keyboards/winkeyless/bface/keymaps/via/rules.mk b/qmk/keyboards/winkeyless/bface/keymaps/via/rules.mk
index 97010a99..36b7ba9c 100644
--- a/qmk/keyboards/winkeyless/bface/keymaps/via/rules.mk
+++ b/qmk/keyboards/winkeyless/bface/keymaps/via/rules.mk
@@ -1,5 +1,2 @@
 VIA_ENABLE = yes
 LTO_ENABLE = yes
-
-MOUSEKEY_ENABLE = no
-EXTRAKEY_ENABLE = no
diff --git a/qmk/keyboards/winkeyless/bmini/keymaps/via/rules.mk b/qmk/keyboards/winkeyless/bmini/keymaps/via/rules.mk
index 97010a99..36b7ba9c 100644
--- a/qmk/keyboards/winkeyless/bmini/keymaps/via/rules.mk
+++ b/qmk/keyboards/winkeyless/bmini/keymaps/via/rules.mk
@@ -1,5 +1,2 @@
 VIA_ENABLE = yes
 LTO_ENABLE = yes
-
-MOUSEKEY_ENABLE = no
-EXTRAKEY_ENABLE = no
diff --git a/qmk/keyboards/winkeyless/bminiex/keymaps/via/rules.mk b/qmk/keyboards/winkeyless/bminiex/keymaps/via/rules.mk
index 97010a99..36b7ba9c 100644
--- a/qmk/keyboards/winkeyless/bminiex/keymaps/via/rules.mk
+++ b/qmk/keyboards/winkeyless/bminiex/keymaps/via/rules.mk
@@ -1,5 +1,2 @@
 VIA_ENABLE = yes
 LTO_ENABLE = yes
-
-MOUSEKEY_ENABLE = no
-EXTRAKEY_ENABLE = no
diff --git a/qmk/keyboards/wsk/alpha9/alpha9.c b/qmk/keyboards/wsk/alpha9/alpha9.c
new file mode 100644
index 00000000..0d9f32c4
--- /dev/null
+++ b/qmk/keyboards/wsk/alpha9/alpha9.c
@@ -0,0 +1,17 @@
+/* Copyright 2020 Worldspawn <mcmancuso@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "alpha9.h"
diff --git a/qmk/keyboards/wsk/alpha9/alpha9.h b/qmk/keyboards/wsk/alpha9/alpha9.h
new file mode 100644
index 00000000..ce43bdf0
--- /dev/null
+++ b/qmk/keyboards/wsk/alpha9/alpha9.h
@@ -0,0 +1,30 @@
+/* Copyright 2020 Worldspawn <mcmancuso@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT( \
+        K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0a, K0b, K0c,\
+        K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1a, K1b, K1c,\
+        K20, K21, K22, K23, K24, K25, K26,      K28,      K2a, K2b, K2c \
+) { \
+        { K00, K01, K02, K03, K04, K05, K06, K07,   K08, K09,   K0a, K0b, K0c }, \
+        { K10, K11, K12, K13, K14, K15, K16, K17,   K18, K19,   K1a, K1b, K1c }, \
+        { K20, K21, K22, K23, K24, K25, K26, KC_NO, K28, KC_NO, K2a, K2b, K2c }  \
+}
+
diff --git a/qmk/keyboards/wsk/alpha9/config.h b/qmk/keyboards/wsk/alpha9/config.h
new file mode 100644
index 00000000..0b09ba92
--- /dev/null
+++ b/qmk/keyboards/wsk/alpha9/config.h
@@ -0,0 +1,59 @@
+/* Copyright 2020 Worldspawn <mcmancuso@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x5753  // "WS" - Worldspawn00
+#define PRODUCT_ID      0x692A
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Worldspawn00
+#define PRODUCT         Alpha9
+
+/* key matrix size */
+#define MATRIX_ROWS 3
+#define MATRIX_COLS 13
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { D4, B4, B5 }
+#define MATRIX_COL_PINS { D7, E6, C6, B6, B2, B3, B1, F7, F6, F5, D1, D0, D2 }
+#define UNUSED_PINS
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+#define LED_CAPS_LOCK_PIN D3
+#define LED_PIN_ON_STATE 0
+
+#define RGB_DI_PIN F4
+#ifdef RGB_DI_PIN
+#    define RGBLIGHT_ANIMATIONS
+#    define RGBLED_NUM 5
+#    define RGBLIGHT_HUE_STEP 8
+#    define RGBLIGHT_SAT_STEP 8
+#    define RGBLIGHT_VAL_STEP 8
+#endif
diff --git a/qmk/keyboards/wsk/alpha9/info.json b/qmk/keyboards/wsk/alpha9/info.json
new file mode 100644
index 00000000..1ffa6638
--- /dev/null
+++ b/qmk/keyboards/wsk/alpha9/info.json
@@ -0,0 +1,12 @@
+{
+  "keyboard_name": "Alpha9",
+  "url": "",
+  "maintainer": "Worldspawn00",
+  "width": 13,
+  "height": 3,
+  "layouts": {
+    "LAYOUT": {
+            "layout": [{"label":"7", "x":0, "y":0}, {"label":"8", "x":1, "y":0}, {"label":"9", "x":2, "y":0}, {"label":"Q", "x":3.5, "y":0}, {"label":"W", "x":4.5, "y":0}, {"label":"E", "x":5.5, "y":0}, {"label":"R", "x":6.5, "y":0}, {"label":"T", "x":7.5, "y":0}, {"label":"Y", "x":8.5, "y":0}, {"label":"U", "x":9.5, "y":0}, {"label":"I", "x":10.5, "y":0}, {"label":"O", "x":11.5, "y":0}, {"label":"P", "x":12.5, "y":0}, {"label":"4", "x":0, "y":1}, {"label":"5", "x":1, "y":1}, {"label":"6", "x":2, "y":1}, {"label":"A", "x":3.5, "y":1}, {"label":"S", "x":4.5, "y":1}, {"label":"D", "x":5.5, "y":1}, {"label":"F", "x":6.5, "y":1}, {"label":"G", "x":7.5, "y":1}, {"label":"H", "x":8.5, "y":1}, {"label":"J", "x":9.5, "y":1}, {"label":"K", "x":10.5, "y":1}, {"label":"L", "x":11.5, "y":1}, {"label":"Enter", "x":12.5, "y":1}, {"label":"1", "x":0, "y":2}, {"label":"2", "x":1, "y":2}, {"label":"3", "x":2, "y":2}, {"label":"Z", "x":4, "y":2}, {"label":"X", "x":5, "y":2}, {"label":"C", "x":6, "y":2}, {"label":"V", "x":7, "y":2}, {"x":8, "y":2, "w":2}, {"label":"B", "x":10, "y":2}, {"label":"N", "x":11, "y":2}, {"label":"M", "x":12, "y":2}]
+        }
+    }
+}
diff --git a/qmk/keyboards/wsk/alpha9/keymaps/default/keymap.c b/qmk/keyboards/wsk/alpha9/keymaps/default/keymap.c
new file mode 100644
index 00000000..ba0da415
--- /dev/null
+++ b/qmk/keyboards/wsk/alpha9/keymaps/default/keymap.c
@@ -0,0 +1,50 @@
+/* Copyright 2020 Worldspawn <mcmancuso@gmail.com>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+enum alpha9_layers {
+    _HOME,
+    _FN,
+    _FNCHAR,
+    _FKEYS,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_HOME] = LAYOUT(
+        KC_P7,   KC_P8,   KC_P9,   KC_Q,         KC_W,         KC_E,          KC_R,    KC_T,     KC_Y, KC_U,     KC_I,         KC_O,         KC_P,
+        KC_P4,   KC_P5,   KC_P6,   KC_A,         KC_S,         KC_D,          KC_F,    KC_G,     KC_H, KC_J,     KC_K,         KC_L,         KC_ENT,
+        KC_P1,   KC_P2,   KC_P3,   LCTL_T(KC_Z), LALT_T(KC_X), LT(_FN, KC_C), LT(_FNCHAR, KC_V), LSFT_T(KC_SPC), RGUI_T(KC_B), RALT_T(KC_N), RCTL_T(KC_M)
+    ),
+
+    [_FN] = LAYOUT(
+        KC_INS,  KC_HOME, KC_PGUP, KC_ESC,  KC_MUTE, KC_VOLD, KC_VOLU,    KC_MPLY,        KC_HOME, KC_PGDN, KC_PGUP, KC_END,  KC_NO,
+        KC_DEL,  KC_UP,   KC_PGDN, KC_TAB,  KC_NO,   KC_NO,   KC_NO,      KC_NO,          KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_BSPC,
+        KC_LEFT, KC_DOWN, KC_RGHT, KC_LCTL, KC_LALT, KC_TRNS, MO(_FKEYS), LSFT_T(KC_SPC),          KC_RGUI,          KC_RALT, KC_RCTL
+    ),
+
+    [_FNCHAR] = LAYOUT(
+        KC_NLCK, KC_NO,   KC_NO,   KC_1,    KC_2,    KC_3,       KC_4,   KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,
+        KC_NO,   KC_NO,   KC_NO,   KC_GRV,  KC_NO,   KC_MINS,    KC_EQL, KC_BSLS, KC_LBRC, KC_RBRC, KC_SCLN, KC_QUOT, KC_BSPC,
+        KC_NO,   KC_NO,   KC_NO,   KC_LCTL, KC_LALT, MO(_FKEYS), KC_TRNS,         LSFT_T(KC_SPC),   KC_COMM, KC_DOT,  KC_SLSH
+    ),
+
+    [_FKEYS] = LAYOUT(
+        KC_NO,   KC_NO,   KC_NO,    KC_F1,    KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,
+        KC_NO,   KC_NO,   KC_NO,    KC_F11,   KC_F12,  KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_DEL,
+        KC_NO,   KC_NO,   KC_NO,    KC_LCTL,  KC_LALT, KC_TRNS, KC_TRNS,          LSFT_T(KC_SPC),   KC_RGUI, KC_RALT, KC_RCTL
+    ),
+};
diff --git a/qmk/keyboards/wsk/alpha9/readme.md b/qmk/keyboards/wsk/alpha9/readme.md
new file mode 100644
index 00000000..e737a51a
--- /dev/null
+++ b/qmk/keyboards/wsk/alpha9/readme.md
@@ -0,0 +1,19 @@
+# Alpha9
+
+![Alpha9](https://i.imgur.com/mLWff9a.png)
+
+A reversible 37 position keyboard based on the Alpha 28-key, a semi-ortho keyboard designed by PyroL!
+
+* Keyboard Maintainer: [Worldspawn00](https://www.github.com/Worldspawn00)
+* Hardware Supported: Alpha9 PCB, Pro Micro/EliteC and clones
+* Hardware Availability: https://www.etsy.com/shop/WorldspawnsKeebs
+
+Make example for this keyboard (after setting up your build environment):
+
+    make wsk/alpha9:default
+
+Flashing example for this keyboard:
+
+    make wsk/alpha9:default:flash
+
+See [build environment setup](https://docs.qmk.fm/install-build-tools) then the [make instructions](https://docs.qmk.fm/faq/build-compile-qmk) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/qmk/keyboards/wsk/alpha9/rules.mk b/qmk/keyboards/wsk/alpha9/rules.mk
new file mode 100644
index 00000000..676a400f
--- /dev/null
+++ b/qmk/keyboards/wsk/alpha9/rules.mk
@@ -0,0 +1,22 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = full     # 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
+# 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 = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
diff --git a/qmk/keyboards/wsk/gothic50/rules.mk b/qmk/keyboards/wsk/gothic50/rules.mk
index ea21d62b..ee4f3b1a 100644
--- a/qmk/keyboards/wsk/gothic50/rules.mk
+++ b/qmk/keyboards/wsk/gothic50/rules.mk
@@ -30,4 +30,3 @@ 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
diff --git a/qmk/keyboards/wsk/gothic70/config.h b/qmk/keyboards/wsk/gothic70/config.h
index 98e70e61..bef22e82 100644
--- a/qmk/keyboards/wsk/gothic70/config.h
+++ b/qmk/keyboards/wsk/gothic70/config.h
@@ -3,7 +3,7 @@
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0xFEED
+#define VENDOR_ID       0x5753  // "WS"
 #define PRODUCT_ID      0x63CC
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    Worldspawn00
diff --git a/qmk/keyboards/wsk/gothic70/keymaps/via/keymap.c b/qmk/keyboards/wsk/gothic70/keymaps/via/keymap.c
new file mode 100644
index 00000000..f386f0b3
--- /dev/null
+++ b/qmk/keyboards/wsk/gothic70/keymaps/via/keymap.c
@@ -0,0 +1,76 @@
+/*
+Copyright 2020 worldspawn00
+
+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 names for use in layer keycodes and the keymap
+enum layer_names {
+    _BASE,
+    _FN,
+    _MEDIA };
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_BASE] = LAYOUT(
+    KC_ESC,   KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,           KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_GRV,  KC_BSPC,    KC_PSCR,
+    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_INS,
+    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_DEL,
+    KC_LSFT,  KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,       MO(_MEDIA),  KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,            KC_UP,
+    KC_LCTL, KC_LGUI,  KC_LALT,          KC_SPC,  MO(_FN),                        KC_BSPC,           KC_RALT,      KC_RCTL,       KC_LEFT, KC_DOWN, KC_RGHT
+  ),
+
+  [_FN] = LAYOUT(
+    KC_GRV,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,           KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______,    KC_PAUS,
+    _______, _______, _______, _______, RESET,   _______,                  _______, _______, _______, _______, _______, _______, _______, _______,    _______,
+    _______, RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, _______,                  _______, _______, _______, _______, _______, _______, _______,             _______,
+    _______, RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, _______,        _______,  _______, _______, _______, _______, _______, _______,           KC_PGUP,
+    _______, _______, _______,          _______, _______,                         _______,           _______,      _______,       KC_HOME, KC_PGDN, KC_END
+  ),
+
+  [_MEDIA] = LAYOUT(
+    _______, _______, _______, _______, _______, _______, _______,         _______, _______, _______, _______, _______, _______, _______, _______,    RESET,
+    _______, _______, _______, _______, _______, _______,                  _______, _______, _______, _______, _______, _______, _______, _______,    _______,
+    _______, _______, _______, _______, _______, _______,                  _______, _______, _______, _______, _______, _______, KC_MPLY,             _______,
+    _______, _______, _______, _______, _______, _______,        _______,  _______, _______, _______, _______, _______, _______,           KC_VOLU,
+    _______, _______, _______,          _______, _______,                         _______,           _______,      _______,       KC_MPRV, KC_VOLD, KC_MNXT
+  ),
+
+  [3] = LAYOUT(
+    _______, _______, _______, _______, _______, _______, _______,         _______, _______, _______, _______, _______, _______, _______, _______,    _______,
+    _______, _______, _______, _______, _______, _______,                  _______, _______, _______, _______, _______, _______, _______, _______,    _______,
+    _______, _______, _______, _______, _______, _______,                  _______, _______, _______, _______, _______, _______, _______,             _______,
+    _______, _______, _______, _______, _______, _______,        _______,  _______, _______, _______, _______, _______, _______,           _______,
+    _______, _______, _______,          _______, _______,                         _______,           _______,      _______,       _______, _______, _______
+  )
+};
+
+void matrix_init_user(void) {
+  // set CapsLock LED to output and off (active high)
+  setPinOutput(F5);
+  // set NumLock LED to output and off (active high)
+  setPinOutput(F6);
+  // set ScrollLock LED to output and off (active high)
+  setPinOutput(F7);
+}
+
+// write to above indicators in a binary fashion based on current layer
+layer_state_t layer_state_set_user(layer_state_t state)
+{
+    writePin(F5, (state & 0x1));
+    writePin(F6, (state & 0x2));
+    writePin(F7, (state & 0x4));
+    return state;
+}
diff --git a/qmk/keyboards/wsk/gothic70/keymaps/via/rules.mk b/qmk/keyboards/wsk/gothic70/keymaps/via/rules.mk
new file mode 100644
index 00000000..0638fd5d
--- /dev/null
+++ b/qmk/keyboards/wsk/gothic70/keymaps/via/rules.mk
@@ -0,0 +1,3 @@
+VIA_ENABLE = yes
+CONSOLE_ENABLE = no
+COMMAND_ENABLE = no
\ No newline at end of file
diff --git a/qmk/keyboards/wsk/gothic70/rules.mk b/qmk/keyboards/wsk/gothic70/rules.mk
index ea21d62b..ee4f3b1a 100644
--- a/qmk/keyboards/wsk/gothic70/rules.mk
+++ b/qmk/keyboards/wsk/gothic70/rules.mk
@@ -30,4 +30,3 @@ 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
diff --git a/qmk/keyboards/wsk/tkl30/rules.mk b/qmk/keyboards/wsk/tkl30/rules.mk
index ad1dd345..49bc458d 100644
--- a/qmk/keyboards/wsk/tkl30/rules.mk
+++ b/qmk/keyboards/wsk/tkl30/rules.mk
@@ -29,4 +29,3 @@ MIDI_ENABLE = no            # MIDI support
 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
diff --git a/qmk/keyboards/xbows/nature/config.h b/qmk/keyboards/xbows/nature/config.h
new file mode 100644
index 00000000..84b8a2af
--- /dev/null
+++ b/qmk/keyboards/xbows/nature/config.h
@@ -0,0 +1,64 @@
+/* Copyright 2020 Shulin Huang <mumu@x-bows.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 "config_common.h"
+
+#define VENDOR_ID    0xFEED
+#define PRODUCT_ID   0x1226
+#define DEVICE_VER   0x0001
+#define MANUFACTURER X-BOWS
+#define PRODUCT      NATURE
+
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 15
+#define MATRIX_ROW_PINS { F7, F6, F5, F4, F1, F0 }
+#define MATRIX_COL_PINS { B0, B1, B2, B3, B7, D2, D3, D5, D4, D6, D7, B4, B5, B6, C6 }
+#define DIODE_DIRECTION COL2ROW
+
+#ifdef RGB_MATRIX_ENABLE
+#    define RGB_MATRIX_LED_PROCESS_LIMIT 18
+#    define RGB_MATRIX_LED_FLUSH_LIMIT 16
+#    define DEBOUNCE 3
+#    define RGB_DISABLE_AFTER_TIMEOUT 0          // number of ticks to wait until disabling effects
+#    define RGB_DISABLE_WHEN_USB_SUSPENDED true  // turn off effects when suspended
+#    define RGB_MATRIX_KEYPRESSES
+#    define RGB_MATRIX_MAXIMUM_BRIGHTNESS 200
+#    define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#    define DISABLE_RGB_MATRIX_BAND_SAT
+#    define DISABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#    define DISABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#    define DISABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#    define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#    define DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#    define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#    define DISABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#    define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#    define DISABLE_RGB_MATRIX_SPLASH
+#    define DISABLE_RGB_MATRIX_MULTISPLASH
+#    define DISABLE_RGB_MATRIX_SOLID_SPLASH
+#    define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH
+#    define DISABLE_RGB_MATRIX_DIGITAL_RAIN
+
+#    define DRIVER_ADDR_1 0b1110100
+#    define DRIVER_ADDR_2 0b1110110
+#    define DRIVER_ADDR_3 0b1110101
+#    define DRIVER_COUNT 3
+#    define DRIVER_1_LED_TOTAL 36
+#    define DRIVER_2_LED_TOTAL 36
+#    define DRIVER_3_LED_TOTAL 15
+#    define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL + DRIVER_3_LED_TOTAL)
+#endif
diff --git a/qmk/keyboards/xbows/nature/info.json b/qmk/keyboards/xbows/nature/info.json
new file mode 100644
index 00000000..a9d4c4c7
--- /dev/null
+++ b/qmk/keyboards/xbows/nature/info.json
@@ -0,0 +1,105 @@
+{
+    "keyboard_name": "NATURE",
+    "url": "",
+    "maintainer": "xbows-qmk",
+    "width": 18,
+    "height": 6.5,
+    "layouts": {
+        "LAYOUT": {
+            "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":"Delete", "x":14, "y":0, "w":2},
+                {"label":"Print Screen", "x":16, "y":0, "w":2},
+
+                {"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":9, "y":1.5},
+                {"label":"&", "x":10, "y":1.5},
+                {"label":"*", "x":11, "y":1.5},
+                {"label":"(", "x":12, "y":1.5},
+                {"label":")", "x":13, "y":1.5},
+                {"label":"_", "x":14, "y":1.5},
+                {"label":"+", "x":15, "y":1.5},
+                {"label":"Backspace", "x":16, "y":1.5, "w":2},
+
+                {"label":"Tab", "x":0, "y":2.5},
+                {"label":"Q", "x":1, "y":2.5},
+                {"label":"W", "x":2, "y":2.5},
+                {"label":"E", "x":3, "y":2.5},
+                {"label":"R", "x":4, "y":2.5},
+                {"label":"T", "x":5, "y":2.5},
+                {"label":"Y", "x":9, "y":2.5},
+                {"label":"U", "x":10, "y":2.5},
+                {"label":"I", "x":11, "y":2.5},
+                {"label":"O", "x":12, "y":2.5},
+                {"label":"P", "x":13, "y":2.5},
+                {"label":"{", "x":14, "y":2.5},
+                {"label":"}", "x":15, "y":2.5},
+                {"label":"|", "x":16, "y":2.5},
+                {"label":"Page Up", "x":17, "y":2.5},
+
+                {"label":"Caps Lock", "x":0, "y":3.5},
+                {"label":"A", "x":1, "y":3.5},
+                {"label":"S", "x":2, "y":3.5},
+                {"label":"D", "x":3, "y":3.5},
+                {"label":"F", "x":4, "y":3.5},
+                {"label":"G", "x":5, "y":3.5},
+                {"label":"Backspace", "x":6, "y":3.5, "w":3},
+                {"label":"H", "x":9, "y":3.5},
+                {"label":"J", "x":10, "y":3.5},
+                {"label":"K", "x":11, "y":3.5},
+                {"label":"L", "x":12, "y":3.5},
+                {"label":":", "x":13, "y":3.5},
+                {"label":"\"", "x":14, "y":3.5},
+                {"label":"Enter", "x":15, "y":3.5, "w":2},
+                {"label":"Page Down", "x":17, "y":3.5},
+
+                {"label":"Shift", "x":0, "y":4.5},
+                {"label":"Z", "x":1, "y":4.5},
+                {"label":"X", "x":2, "y":4.5},
+                {"label":"C", "x":3, "y":4.5},
+                {"label":"V", "x":4, "y":4.5},
+                {"label":"B", "x":5, "y":4.5},
+                {"label":"Enter", "x":6, "y":4.5, "w":3},
+                {"label":"N", "x":9, "y":4.5},
+                {"label":"M", "x":10, "y":4.5},
+                {"label":"<", "x":11, "y":4.5},
+                {"label":">", "x":12, "y":4.5},
+                {"label":"?", "x":13, "y":4.5},
+                {"label":"Shift", "x":14, "y":4.5},
+                {"label":"Up", "x":16, "y":4.5},
+
+                {"label":"Ctrl", "x":0, "y":5.5},
+                {"label":"Win", "x":1, "y":5.5},
+                {"label":"Alt", "x":2, "y":5.5, "w":2},
+                {"label":"Space", "x":4, "y":5.5, "w":2},
+                {"label":"Ctrl", "x":6, "y":5.5, "w":1.5},
+                {"label":"Shift", "x":7.5, "y":5.5, "w":1.5},
+                {"label":"Space", "x":9, "y":5.5, "w":2},
+                {"label":"Alt", "x":11, "y":5.5, "w":2},
+                {"label":"Fn", "x":13, "y":5.5},
+                {"label":"Ctrl", "x":14, "y":5.5},
+                {"label":"Left", "x":15, "y":5.5},
+                {"label":"Down", "x":16, "y":5.5},
+                {"label":"Right", "x":17, "y":5.5}
+
+            ]
+        }
+    }
+}
diff --git a/qmk/keyboards/xbows/nature/keymaps/default/keymap.c b/qmk/keyboards/xbows/nature/keymaps/default/keymap.c
new file mode 100644
index 00000000..b707311f
--- /dev/null
+++ b/qmk/keyboards/xbows/nature/keymaps/default/keymap.c
@@ -0,0 +1,49 @@
+/* Copyright 2020 Shulin Huang <mumu@x-bows.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 QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  /* Keymap VANILLA: (Base Layer) Default Layer
+   *
+   * |---------------------------------------------------------------------------------------------------------------------------------|
+   * | Esc |  F1  |  F2  |  F3  |  F4  |      F5  |  F6  |  F7  |  F8  |      F9  |  F10 |  F11 |  F12 |   Delete   |    Prtsc    |
+   * |---------------------------------------------------------------------------------------------------------------------------------|
+   * |  ~  |     1   |   2   |   3   |   4   |    5      |       6    |    7    |    8   |   9  |   0  |   -  |  =  |  Backspace  |
+   * |---------------------------------------------------------------------------------------------------------------------------------|
+   * | Tab |   Q    |    W   |   E  |   R  |   T  |            |    Y   |    U   |    I  |   O  |   P  |   [  |  ]  |   \  | PgUp |
+   * |---------------------------------------------------------------------------------------------------------------------------------|
+   * | Ctl |   A   |   S   |   D  |   F  |   G  |      Bksp      |    H  |    J   |   K  |   L  |   ;  |  '"  |    Enter   | PgDn |
+   * |---------------------------------------------------------------------------------------------------------------------------------|
+   * |Shift|   Z  |   X  |   C  |   V  |   B  |       Enter       |    N  |    M   |  ,  |   .  |  /?  | Shift|      |  Up |
+   * |---------------------------------------------------------------------------------------------------------------------------------|
+   * |Ctrl | GUI |     Alter   |    Space   |   Ctrl   |   Shift   |     Space     |    Alter   |  FN  | Ctrl | Lft  |  Dn |  Rig |
+   * |---------------------------------------------------------------------------------------------------------------------------------|
+   */
+  [0] = LAYOUT(
+		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_DEL,  KC_PSCR,
+		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_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_PGUP,
+		KC_CAPS, KC_A,    KC_S,  KC_D,   KC_F,   KC_G,    KC_BSPC, KC_H,  KC_J,   KC_K,    KC_L,   KC_SCLN, KC_QUOT, KC_ENT,  KC_PGDN,
+		KC_LSFT, KC_Z,    KC_X,  KC_C,   KC_V,   KC_B,    KC_ENT,  KC_N,  KC_M,   KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP,
+		KC_LCTL, KC_LGUI, KC_LALT,       KC_SPC, KC_LCTL, KC_LSFT, KC_SPC,        KC_RALT, MO(1),  KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT),
+  [1] = LAYOUT(
+    RESET,     NK_TOGG, RGB_TOG, RGB_MOD,  RGB_HUI,  RGB_SAI,   RGB_SAD,  RGB_VAI,  RGB_VAD,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_TRNS,   EEP_RST,
+    AG_TOGG,   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_NLCK,
+    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_HOME,
+    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_END,
+    KC_TRNS,   UC_M_WI, UC_M_MA, UC_M_LN,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,   KC_TRNS,   KC_VOLU,
+    KC_TRNS,   GUI_OFF, GUI_ON,            KC_TRNS,  KC_TRNS,   KC_TRNS,  KC_TRNS,            KC_TRNS,   KC_TRNS,  KC_TRNS,   RGB_SPD,   KC_VOLD,   RGB_SPI)
+};
diff --git a/qmk/keyboards/xbows/nature/nature.c b/qmk/keyboards/xbows/nature/nature.c
new file mode 100644
index 00000000..64b1c0dd
--- /dev/null
+++ b/qmk/keyboards/xbows/nature/nature.c
@@ -0,0 +1,155 @@
+/* Copyright 2020 Shulin Huang <mumu@x-bows.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 "nature.h"
+ #ifdef RGB_MATRIX_ENABLE
+ const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
+
+ 	{0, C3_3,  C2_3, C1_3},   // L01
+ 	{0, C3_4,  C2_4, C1_4},   // L02
+ 	{0, C3_5,  C2_5, C1_5},   // L03
+ 	{0, C3_6,  C2_6, C1_6},   // L04
+ 	{0, C3_7,  C2_7, C1_7},   // L05
+ 	{0, C3_8,  C2_8, C1_8},   // L06
+ 	{1, C3_3,  C2_3, C1_3},   // L07
+ 	{1, C3_4,  C2_4, C1_4},   // L08
+ 	{1, C3_5,  C2_5, C1_5},   // L09
+ 	{1, C3_6,  C2_6, C1_6},   // L10
+ 	{1, C3_7,  C2_7, C1_7},   // L11
+ 	{1, C3_8,  C2_8, C1_8},   // L12
+ 	{2, C3_3,  C2_3, C1_3},   // L13
+ 	{2, C3_4,  C2_4, C1_4},   // L14
+ 	{2, C3_5,  C2_5, C1_5},   // L15
+
+ 	{0, C4_1,  C5_1, C6_1},   // L16
+ 	{0, C4_2,  C5_2, C6_2},   // L17
+ 	{0, C4_3,  C5_3, C6_3},   // L18
+ 	{0, C4_6,  C5_6, C6_6},   // L19
+ 	{0, C4_7,  C5_7, C6_7},   // L20
+ 	{0, C4_8,  C5_8, C6_8},   // L21
+ 	{1, C4_1,  C5_1, C6_1},   // L87
+ 	{1, C4_2,  C5_2, C6_2},   // L22
+ 	{1, C4_3,  C5_3, C6_3},   // L23
+ 	{1, C4_6,  C5_6, C6_6},   // L24
+ 	{1, C4_7,  C5_7, C6_7},   // L25
+ 	{1, C4_8,  C5_8, C6_8},   // L26
+ 	{2, C4_1,  C5_1, C6_1},   // L27
+ 	{2, C4_2,  C5_2, C6_2},   // L28
+ 	{2, C4_3,  C5_3, C6_3},   // L29
+
+ 	{0, C7_1,  C8_1, C9_1},   // L30
+ 	{0, C7_2,  C8_2, C9_2},   // L31
+ 	{0, C7_3,  C8_3, C9_3},   // L32
+ 	{0, C7_4,  C8_4, C9_4},   // L33
+ 	{0, C7_5,  C8_5, C9_5},   // L34
+ 	{0, C7_6,  C8_6, C9_6},   // L35
+ 	{2, C4_8,  C5_8, C6_8},   // L44
+ 	{1, C7_1,  C8_1, C9_1},   // L36
+ 	{1, C7_2,  C8_2, C9_2},   // L37
+ 	{1, C7_3,  C8_3, C9_3},   // L38
+ 	{1, C7_4,  C8_4, C9_4},   // L39
+ 	{1, C7_5,  C8_5, C9_5},   // L40
+ 	{1, C7_6,  C8_6, C9_6},   // L41
+ 	{2, C4_6,  C5_6, C6_6},   // L42
+ 	{2, C4_7,  C5_7, C6_7},   // L43
+
+
+ 	{0, C3_11,  C2_11, C1_11},   // L45
+ 	{0, C3_12,  C2_12, C1_12},   // L46
+ 	{0, C3_13,  C2_13, C1_13},   // L47
+ 	{0, C3_14,  C2_14, C1_14},   // L48
+ 	{0, C3_15,  C2_15, C1_15},   // L49
+ 	{0, C3_16,  C2_16, C1_16},   // L50
+ 	{1, C7_9,   C8_9,  C9_9},    // L51
+ 	{1, C3_11,  C2_11, C1_11},   // L52
+ 	{1, C3_12,  C2_12, C1_12},   // L53
+ 	{1, C3_13,  C2_13, C1_13},   // L54
+ 	{1, C3_14,  C2_14, C1_14},   // L55
+ 	{1, C3_15,  C2_15, C1_15},   // L56
+ 	{1, C3_16,  C2_16, C1_16},   // L57
+ 	{2, C7_4,   C8_4,  C9_4},    // L58
+ 	{2, C7_5,   C8_5,  C9_5},    // L59
+
+ 	{0, C4_9,  C5_9, C6_9},      // L60
+ 	{0, C4_10,  C5_10, C6_10},   // L61
+ 	{0, C4_11,  C5_11, C6_11},   // L62
+ 	{0, C4_14,  C5_14, C6_14},   // L63
+ 	{0, C4_15,  C5_15, C6_15},   // L64
+ 	{0, C4_16,  C5_16, C6_16},   // L65
+ 	{1, C7_10,  C8_10, C9_10},   // L66
+ 	{1, C4_9,  C5_9, C6_9},      // L67
+ 	{1, C4_10,  C5_10, C6_10},   // L68
+ 	{1, C4_11,  C5_11, C6_11},   // L69
+ 	{1, C4_14,  C5_14, C6_14},   // L70
+ 	{1, C4_15,  C5_15, C6_15},   // L71
+ 	{1, C4_16,  C5_16, C6_16},   // L72
+ 	{2, C7_6,   C8_6,  C9_6},    // L73
+
+ 	{0, C7_9,   C8_9, C9_9},     // L74
+ 	{0, C7_10,  C8_10, C9_10},   // L75
+ 	{0, C7_11,  C8_11, C9_11},   // L76
+ 	{0, C7_12,  C8_12, C9_12},   // L77
+ 	{0, C7_13,  C8_13, C9_13},   // L78
+ 	{0, C7_14,  C8_14, C9_14},   // L79
+ 	{1, C7_11,  C8_11, C9_11},   // L80
+ 	{1, C7_12,  C8_12, C9_12},   // L81
+ 	{1, C7_13,  C8_13, C9_13},   // L82
+ 	{1, C7_14,  C8_14, C9_14},   // L83
+ 	{2, C3_6,  C2_6, C1_6},      // L84
+ 	{2, C3_7,  C2_7, C1_7},      // L85
+ 	{2, C3_8,  C2_8, C1_8},      // L86
+ };
+
+ led_config_t g_led_config = { {
+     {  0,      1,      2,      3,      4,      5,      6,      7,      8,      9,      10,     11,     12,     13,     14     },
+     {  15,     16,     17,     18,     19,     20,     21,     22,     23,     24,     25,     26,     27,     28,     29     },
+     {  30,     31,     32,     33,     34,     35,     36,     37,     38,     39,     40,     41,     42,     43,     44     },
+     {  45,     46,     47,     48,     49,     50,     51,     52,     53,     54,     55,     56,     57,     58,     59     },
+     {  60,     61,     62,     63,     64,     65,     66,     67,     68,     69,     70,     71,     72,     73,     NO_LED },
+     {  74,     75,     76,     NO_LED, 77,     78,     79,     80,     NO_LED, 81,     82,     83,     84,     85,     86     }
+ }, {
+ 		{0,0},  {16,0},  {30,0},  {43,0},  {56,0},  {72,0},  {85,0},   {99,0},   {112,0},  {128,0},  {141,0},  {154,0},  {167,0},  {190,0},  {216,0},
+ 		{0,13}, {16,13}, {32,12}, {49,14}, {66,16}, {82,20}, {92,26},  {102,20}, {118,16}, {134,14}, {150,12}, {167,13}, {184,13}, {197,13}, {216,13},
+ 		{0,26}, {15,26}, {31,23}, {47,24}, {63,28}, {78,30}, {224,26}, {105,30}, {120,28}, {136,24}, {152,23}, {168,26}, {184,26}, {197,26}, {210,26},
+ 		{0,37}, {15,37}, {30,33}, {45,35}, {60,37}, {75,40}, {92,43},  {108,40}, {124,37}, {138,35}, {153,33}, {168,37}, {184,37}, {203,37}, {224,37},
+ 		{0,48}, {14,48}, {29,44}, {43,46}, {57,48}, {72,50}, {92,53},  {112,50}, {126,48}, {141,46}, {155,44}, {169,48}, {184,48}, {210,48},
+ 		{0,58}, {14,58}, {34,58}, {61,61}, {83,64}, {100,64},{122,61}, {149,58}, {170,58}, {184,58}, {197,58}, {210,58}, {224,58}
+ }, {
+     4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+     4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+     4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+     4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+     4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
+     4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4
+ } };
+
+#endif
+
+
+void suspend_power_down_kb(void) {
+    rgb_matrix_set_suspend_state(true);
+    suspend_power_down_user();
+}
+
+void suspend_wakeup_init_kb(void) {
+    rgb_matrix_set_suspend_state(false);
+    suspend_wakeup_init_user();
+}
+
+ __attribute__ ((weak)) void rgb_matrix_indicators_user(void) {
+    if (host_keyboard_led_state().caps_lock) {
+        rgb_matrix_set_color(45, 0xFF, 0x00, 0x00);
+    }
+}
diff --git a/qmk/keyboards/xbows/nature/nature.h b/qmk/keyboards/xbows/nature/nature.h
new file mode 100644
index 00000000..02e1af52
--- /dev/null
+++ b/qmk/keyboards/xbows/nature/nature.h
@@ -0,0 +1,33 @@
+/* Copyright 2020 Shulin Huang <mumu@x-bows.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"
+#define LAYOUT( \
+	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014,  \
+	K100, K101, K102, K103, K104, K105,       K107, K108, K109, K110, K111, K112, K113, K114,  \
+	K200, K201, K202, K203, K204, K205, K207, K208, K209, K210, K211, K212, K213, K214, K206,  \
+	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314,  \
+	K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413,        \
+	K500, K501, K502,       K504, K505, K506, K507,       K509, K510, K511, K512, K513, K514   \
+) \
+	{ \
+    { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
+    { K100, K101, K102, K103, K104, K105, KC_NO,K107, K108, K109, K110, K111, K112, K113, K114 }, \
+    { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 }, \
+    { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314 }, \
+    { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, KC_NO}, \
+    { K500, K501, K502, KC_NO,K504, K505, K506, K507, KC_NO,K509, K510, K511, K512, K513, K514 }  \
+}
diff --git a/qmk/keyboards/xbows/nature/readme.md b/qmk/keyboards/xbows/nature/readme.md
new file mode 100644
index 00000000..18db496d
--- /dev/null
+++ b/qmk/keyboards/xbows/nature/readme.md
@@ -0,0 +1,27 @@
+# NATURE
+![NATURE](https://cdn.shopify.com/s/files/1/0014/7623/1237/files/xbows_1_720x_99574cc7-a547-4c1d-b847-482ec282f45b_540x.png)
+
+Nature, A 86 Keys Ergonomic Mechanical Keyboard with RGB backlight.
+
+If you spend your work days in front of a computer, you have likely felt some discomfort after a long day of typing. While spending less time on our computers would be the ideal remedy for this problem, that is not a realistic solution for most people. X-Bows was designed to limit the stress on your hands and wrists while also providing a productive and stylish typing experience.
+
+
+X-Bows was designed with three criteria in mind:
+* Enhancing the comfort and ergonomics of the keyboard
+* Limiting the learning curve for our new layout
+* Creating an attractive design
+
+
+* Keyboard Maintainer: X-BOWS
+* Hardware Supported: X-BOWS Nature
+* Hardware Availability: [X-BOWS](https://x-bows.com/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make xbows/nature:default
+
+Flashing example for this keyboard:
+
+    make xbows/nature:default:flash
+
+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).
diff --git a/qmk/keyboards/xbows/nature/rules.mk b/qmk/keyboards/xbows/nature/rules.mk
new file mode 100644
index 00000000..7eaceaa6
--- /dev/null
+++ b/qmk/keyboards/xbows/nature/rules.mk
@@ -0,0 +1,24 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+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
+# 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 = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = IS31FL3731
diff --git a/qmk/keyboards/xbows/woody/rules.mk b/qmk/keyboards/xbows/woody/rules.mk
index 147acc58..a1a6e78d 100644
--- a/qmk/keyboards/xbows/woody/rules.mk
+++ b/qmk/keyboards/xbows/woody/rules.mk
@@ -12,5 +12,6 @@ COMMAND_ENABLE = no                # Commands for debug and configuration
 #SLEEP_LED_ENABLE = yes            # Breathing sleep LED during USB suspend
 NKRO_ENABLE = yes                 # USB Nkey Rollover
 AUDIO_ENABLE = no
-RGB_MATRIX_ENABLE = yes     # Use RGB matrix
+RGB_MATRIX_ENABLE = yes            # Use RGB matrix
+RGB_MATRIX_DRIVER = IS31FL3731
 NO_USB_STARTUP_CHECK = no          # Disable initialization only when usb is plugged in
diff --git a/qmk/keyboards/xd002/rules.mk b/qmk/keyboards/xd002/rules.mk
index 1142142b..ed51953c 100644
--- a/qmk/keyboards/xd002/rules.mk
+++ b/qmk/keyboards/xd002/rules.mk
@@ -25,7 +25,6 @@ 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
 
 # Save as much space as we can...
 LTO_ENABLE = yes
diff --git a/qmk/keyboards/xd68/info.json b/qmk/keyboards/xd68/info.json
index 01b5bb20..a2ee19d7 100644
--- a/qmk/keyboards/xd68/info.json
+++ b/qmk/keyboards/xd68/info.json
@@ -78,6 +78,79 @@
                 {"label":"Right", "x":15, "y":4}
             ]
         },
+        "LAYOUT_65_ansi_split_bs": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"1", "x":1, "y":0},
+                {"label":"2", "x":2, "y":0},
+                {"label":"3", "x":3, "y":0},
+                {"label":"4", "x":4, "y":0},
+                {"label":"5", "x":5, "y":0},
+                {"label":"6", "x":6, "y":0},
+                {"label":"7", "x":7, "y":0},
+                {"label":"8", "x":8, "y":0},
+                {"label":"9", "x":9, "y":0},
+                {"label":"0", "x":10, "y":0},
+                {"label":"-", "x":11, "y":0},
+                {"label":"=", "x":12, "y":0},
+                {"label":"Grave.", "x":13, "y":0},
+                {"label":"Backspace", "x":14, "y":0},
+                {"label":"Home", "x":15, "y":0},
+                {"label":"Tab", "x":0, "y":1, "w":1.5},
+                {"label":"Q", "x":1.5, "y":1},
+                {"label":"W", "x":2.5, "y":1},
+                {"label":"E", "x":3.5, "y":1},
+                {"label":"R", "x":4.5, "y":1},
+                {"label":"T", "x":5.5, "y":1},
+                {"label":"Y", "x":6.5, "y":1},
+                {"label":"U", "x":7.5, "y":1},
+                {"label":"I", "x":8.5, "y":1},
+                {"label":"O", "x":9.5, "y":1},
+                {"label":"P", "x":10.5, "y":1},
+                {"label":"[", "x":11.5, "y":1},
+                {"label":"]", "x":12.5, "y":1},
+                {"label":"\\", "x":13.5, "y":1, "w":1.5},
+                {"label":"Page Up", "x":15, "y":1},
+                {"label":"Caps Lock", "x":0, "y":2, "w":1.75},
+                {"label":"A", "x":1.75, "y":2},
+                {"label":"S", "x":2.75, "y":2},
+                {"label":"D", "x":3.75, "y":2},
+                {"label":"F", "x":4.75, "y":2},
+                {"label":"G", "x":5.75, "y":2},
+                {"label":"H", "x":6.75, "y":2},
+                {"label":"J", "x":7.75, "y":2},
+                {"label":"K", "x":8.75, "y":2},
+                {"label":"L", "x":9.75, "y":2},
+                {"label":";", "x":10.75, "y":2},
+                {"label":"'", "x":11.75, "y":2},
+                {"label":"Enter", "x":12.75, "y":2, "w":2.25},
+                {"label":"Page Down", "x":15, "y":2},
+                {"label":"Shift", "x":0, "y":3, "w":2.25},
+                {"label":"Z", "x":2.25, "y":3},
+                {"label":"X", "x":3.25, "y":3},
+                {"label":"C", "x":4.25, "y":3},
+                {"label":"V", "x":5.25, "y":3},
+                {"label":"B", "x":6.25, "y":3},
+                {"label":"N", "x":7.25, "y":3},
+                {"label":"M", "x":8.25, "y":3},
+                {"label":",", "x":9.25, "y":3},
+                {"label":".", "x":10.25, "y":3},
+                {"label":"/", "x":11.25, "y":3},
+                {"label":"Shift", "x":12.25, "y":3, "w":1.75},
+                {"label":"Up", "x":14, "y":3},
+                {"label":"End", "x":15, "y":3},
+                {"label":"Ctrl", "x":0, "y":4, "w":1.25},
+                {"label":"GUI", "x":1.25, "y":4, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":4, "w":1.25},
+                {"label":"Space", "x":3.75, "y":4, "w":6.25},
+                {"label":"Menu", "x":10, "y":4},
+                {"label":"Ctrl", "x":11, "y":4},
+                {"label":"Fn", "x":12, "y":4},
+                {"label":"Left", "x":13, "y":4},
+                {"label":"Down", "x":14, "y":4},
+                {"label":"Right", "x":15, "y":4}
+            ]
+        },
         "LAYOUT_65_iso": {
             "key_count": 69,
             "layout": [
diff --git a/qmk/keyboards/xd68/rules.mk b/qmk/keyboards/xd68/rules.mk
index 8d52ba32..acab5aae 100644
--- a/qmk/keyboards/xd68/rules.mk
+++ b/qmk/keyboards/xd68/rules.mk
@@ -29,7 +29,6 @@ MIDI_ENABLE = no            # MIDI support
 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
 UNICODE_ENABLE = no         # Unicode
 
-LAYOUTS = 65_ansi 65_iso
+LAYOUTS = 65_ansi 65_ansi_split_bs 65_iso
diff --git a/qmk/keyboards/xd68/xd68.h b/qmk/keyboards/xd68/xd68.h
index f4347928..c4cd20db 100644
--- a/qmk/keyboards/xd68/xd68.h
+++ b/qmk/keyboards/xd68/xd68.h
@@ -69,6 +69,37 @@
     {k40, k41, k42, XXX, XXX, k45, XXX, XXX, k4b, XXX, k48, k4a, k4c, k4d, k4e}  \
 }
 
+/* XD68 ANSI layout with split backspace
+   * ,----------------------------------------------------------------.
+   * | 00 |01| 02| 03| 04| 05| 06| 07| 08| 09| 0a| 0b| 0c| 0d| 49| 0e |
+   * |----------------------------------------------------------------|
+   * | 10  | 11| 12| 13| 14| 15| 16| 17| 18| 19| 1a| 1b| 1c|  1d | 1e |
+   * |----------------------------------------------------------------|
+   * | 20    | 21| 22| 23| 24| 25| 26| 27| 28| 29| 2a| 2b| 2d    | 2e |
+   * |----------------------------------------------------------------|
+   * | 30     | 32| 33| 34| 35| 36| 37| 38| 39| 3a| 3b|    3c| 3d| 3e |
+   * |----------------------------------------------------------------|
+   * | 40 | 41 | 42 |        45             | 48| 4a|  4b| 4c| 4d| 4e |
+   * `----------------------------------------------------------------'
+ */
+// The first section contains all of the arguments
+// The second converts the arguments into a two-dimensional array
+
+#define LAYOUT_65_ansi_split_bs( \
+    k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k49, k0e, \
+    k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e, \
+    k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b,      k2d, k2e, \
+    k30,      k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e, \
+    k40, k41, k42,            k45,               k48, k4a, k4b, k4c, k4d, k4e  \
+) \
+{ \
+    {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e}, \
+    {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k1e}, \
+    {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, k2e}, \
+    {k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, k3e}, \
+    {k40, k41, k42, XXX, XXX, k45, XXX, XXX, k4b, k49, k48, k4a, k4c, k4d, k4e}  \
+}
+
 /* XD68 ISO layout
    * ,----------------------------------------------------------------.
    * | 00 |01| 02| 03| 04| 05| 06| 07| 08| 09| 0a| 0b| 0c| 0d    | 0e |
diff --git a/qmk/keyboards/xd75/config.h b/qmk/keyboards/xd75/config.h
index 57ca4001..2958a49e 100644
--- a/qmk/keyboards/xd75/config.h
+++ b/qmk/keyboards/xd75/config.h
@@ -20,12 +20,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "config_common.h"
 
 /* USB Device descriptor parameter */
-#define VENDOR_ID       0x7844   // "XD"
-#define PRODUCT_ID      0x7575
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    xiudi
-#define PRODUCT         XD75
-#define DESCRIPTION     XD75Re 15x5 ortholinear keyboard
+#define VENDOR_ID    0x7844  // "XD"
+#define PRODUCT_ID   0x7575
+#define DEVICE_VER   0x0001
+#define MANUFACTURER xiudi
+#define PRODUCT      XD75
 
 /* key matrix size */
 #define MATRIX_ROWS 5
@@ -45,12 +44,41 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B7, B5, B4, D7, D6, B3, B0 }
 #define UNUSED_PINS
 
-/* COL2ROW, ROW2COL*/
+/* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
 #define BACKLIGHT_PIN F5
 #define BACKLIGHT_LEVELS 6
 #define BACKLIGHT_ON_STATE 0
+//#define BACKLIGHT_BREATHING
+
+#define RGB_DI_PIN F6
+#ifdef RGB_DI_PIN
+#    define RGBLED_NUM 6
+#    define RGBLIGHT_HUE_STEP 12
+#    define RGBLIGHT_SAT_STEP 25
+#    define RGBLIGHT_VAL_STEP 12
+//#    define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+//#    define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+/*== all animations enable ==*/
+#    define RGBLIGHT_ANIMATIONS
+/*== or choose animations ==*/
+//#    define RGBLIGHT_EFFECT_BREATHING
+//#    define RGBLIGHT_EFFECT_RAINBOW_MOOD
+//#    define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+//#    define RGBLIGHT_EFFECT_SNAKE
+//#    define RGBLIGHT_EFFECT_KNIGHT
+//#    define RGBLIGHT_EFFECT_CHRISTMAS
+//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+//#    define RGBLIGHT_EFFECT_RGB_TEST
+//#    define RGBLIGHT_EFFECT_ALTERNATING
+/*== customize breathing effect ==*/
+/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+//#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+/*==== use exp() and sin() ====*/
+//#    define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//#    define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+#endif
 
 /* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
 #define DEBOUNCE 5
@@ -58,13 +86,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* define if matrix has ghost (lacks anti-ghosting diodes) */
 //#define MATRIX_HAS_GHOST
 
-/* number of backlight levels */
-
 /* 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
 
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+//#define GRAVE_ESC_CTRL_OVERRIDE
+
 /*
  * Force NKRO
  *
@@ -86,54 +117,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 //#define FORCE_NKRO
 
-/*
- * Magic Key Options
- *
- * Magic keys are hotkey commands that allow control over firmware functions of
- * the keyboard. They are best used in combination with the HID Listen program,
- * found here: https://www.pjrc.com/teensy/hid_listen.html
- *
- * The options below allow the magic key functionality to be changed. This is
- * useful if your keyboard/keypad is missing keys and you want magic key support.
- *
- */
-
-/* control how magic key switches layers */
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS  true
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS  true
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM false
-
-/* override magic key keymap */
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_FKEYS
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_NKEYS
-//#define MAGIC_KEY_SWITCH_LAYER_WITH_CUSTOM
-//#define MAGIC_KEY_HELP1          H
-//#define MAGIC_KEY_HELP2          SLASH
-//#define MAGIC_KEY_DEBUG          D
-//#define MAGIC_KEY_DEBUG_MATRIX   X
-//#define MAGIC_KEY_DEBUG_KBD      K
-//#define MAGIC_KEY_DEBUG_MOUSE    M
-//#define MAGIC_KEY_VERSION        V
-//#define MAGIC_KEY_STATUS         S
-//#define MAGIC_KEY_CONSOLE        C
-//#define MAGIC_KEY_LAYER0_ALT1    ESC
-//#define MAGIC_KEY_LAYER0_ALT2    GRAVE
-//#define MAGIC_KEY_LAYER0         0
-//#define MAGIC_KEY_LAYER1         1
-//#define MAGIC_KEY_LAYER2         2
-//#define MAGIC_KEY_LAYER3         3
-//#define MAGIC_KEY_LAYER4         4
-//#define MAGIC_KEY_LAYER5         5
-//#define MAGIC_KEY_LAYER6         6
-//#define MAGIC_KEY_LAYER7         7
-//#define MAGIC_KEY_LAYER8         8
-//#define MAGIC_KEY_LAYER9         9
-//#define MAGIC_KEY_BOOTLOADER     PAUSE
-//#define MAGIC_KEY_LOCK           CAPS
-//#define MAGIC_KEY_EEPROM         E
-//#define MAGIC_KEY_NKRO           N
-//#define MAGIC_KEY_SLEEP_LED      Z
-
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.
@@ -149,36 +132,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //#define NO_ACTION_LAYER
 //#define NO_ACTION_TAPPING
 //#define NO_ACTION_ONESHOT
+
+/* disable these deprecated features by default */
 //#define NO_ACTION_MACRO
 //#define NO_ACTION_FUNCTION
 
-// ws2812 options
-#define RGB_DI_PIN F6 // pin the DI on the ws2812 is hooked-up to
-#define RGBLIGHT_ANIMATIONS // run RGB animations
-#define RGBLED_NUM 6 // number of LEDs
-#define RGBLIGHT_HUE_STEP 12 // units to step when in/decreasing hue
-#define RGBLIGHT_SAT_STEP 25 // units to step when in/decresing saturation
-#define RGBLIGHT_VAL_STEP 12 // units to step when in/decreasing value (brightness)
-
-/*
- * MIDI options
- */
-
-/* Prevent use of disabled MIDI features in the keymap */
-//#define MIDI_ENABLE_STRICT 1
-
-/* enable basic MIDI features:
-   - MIDI notes can be sent when in Music mode is on
-*/
-//#define MIDI_BASIC
-
-/* enable advanced MIDI features:
-   - MIDI notes can be added to the keymap
-   - Octave shift and transpose
-   - Virtual sustain, portamento, and modulation wheel
-   - etc.
-*/
-//#define MIDI_ADVANCED
-
-/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
-//#define MIDI_TONE_KEYCODE_OCTAVES 1
+/* Bootmagic Lite key configuration */
+//#define BOOTMAGIC_LITE_ROW 0
+//#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/xd75/keymaps/adi/keymap.c b/qmk/keyboards/xd75/keymaps/adi/keymap.c
index 4f9e414c..aa45d598 100644
--- a/qmk/keyboards/xd75/keymaps/adi/keymap.c
+++ b/qmk/keyboards/xd75/keymaps/adi/keymap.c
@@ -40,68 +40,68 @@
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
- [_QW] = { /* QWERTY */
-  { KC_GRAVE,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_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_INSERT  },
-  { KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    LT(_MOUSE, KC_SCLN), LT(_MEDIA, KC_QUOT), LT(_ENTFN, KC_ENT),  LT(_ENTFN, KC_ENT), KC_PGUP  },
-  { 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_RSFT, KC_UP,   KC_PGDN  },
-  { KC_LCTL, MO(_FN), KC_LALT, KC_LGUI, MO(_LW), KC_SPC,  KC_SPC,  MO(_RS), LT(_ENTFN, KC_ENT), KC_RGUI, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT  },
- },
+ [_QW] = LAYOUT_ortho_5x15( /* QWERTY */
+  KC_GRAVE,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_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_INSERT,
+  KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    LT(_MOUSE, KC_SCLN), LT(_MEDIA, KC_QUOT), LT(_ENTFN, KC_ENT),  LT(_ENTFN, KC_ENT), KC_PGUP,
+  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_RSFT, KC_UP,   KC_PGDN,
+  KC_LCTL, MO(_FN), KC_LALT, KC_LGUI, MO(_LW), KC_SPC,  KC_SPC,  MO(_RS), LT(_ENTFN, KC_ENT), KC_RGUI, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+ ),
 
 /* LOWERED
  */
  
- [_LW] = { /* LOWERED */
-  { _______, 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_DEL, KC_DEL  },
-  { _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, _______, _______, KC_INS   },
-  { _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, ___T___, ___T___, _______  },
-  { _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______, _______, ___T___, ___T___, KC_PGUP, _______  },
-  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END  },
- },
+ [_LW] = LAYOUT_ortho_5x15( /* LOWERED */
+  _______, 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_DEL, KC_DEL,
+  _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, _______, _______, KC_INS,
+  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, ___T___, ___T___, _______,
+  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______, _______, ___T___, ___T___, KC_PGUP, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END
+ ),
 
 /* RAISED
  */
  
- [_RS] = { /* RAISED */
-  { _______, 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_DEL, KC_DEL  },
-  { _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______, _______, _______, KC_INS   },
-  { _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS, ___T___, ___T___, _______  },
-  { _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______, _______, ___T___, ___T___, KC_PGUP, _______  },
-  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END  },
- },
+ [_RS] = LAYOUT_ortho_5x15( /* RAISED */
+  _______, 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_DEL, KC_DEL,
+  _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______, _______, _______, KC_INS,
+  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS, ___T___, ___T___, _______,
+  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______, _______, ___T___, ___T___, KC_PGUP, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_PGDN, KC_END
+ ),
  
 /* FUNCTION
  */
  
- [_FN] = { /* FUNCTION */
-  { RESET, 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_DEL, KC_DEL  },
-  { KC_SLCK, KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24,  KC_PAUS, KC_PSCR  },
-  { KC_CAPS, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, _______, _______, _______, _______, _______  },
-  { RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, BL_TOGG, BL_INC,  BL_DEC,   ___T___, ___T___, KC_PGUP, KC_WH_D  },
-  { _______  , _______, AG_SWAP, AG_NORM, _______, KC_BTN1, KC_BTN1, _______, AG_NORM, AG_SWAP, _______, _______, KC_HOME, KC_PGDN, KC_END  },
- },
+ [_FN] = LAYOUT_ortho_5x15( /* FUNCTION */
+  RESET, 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_DEL, KC_DEL,
+  KC_SLCK, KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24,  KC_PAUS, KC_PSCR,
+  KC_CAPS, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, _______, _______, _______, _______, _______,
+  RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, BL_TOGG, BL_INC,  BL_DEC,   ___T___, ___T___, KC_PGUP, KC_WH_D,
+  _______  , _______, AG_SWAP, AG_NORM, _______, KC_BTN1, KC_BTN1, _______, AG_NORM, AG_SWAP, _______, _______, KC_HOME, KC_PGDN, KC_END
+ ),
 
- [_ENTFN] = { /* Enter FN */
-  { _______, _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,  _______,  _______,  _______, _______  },
-  { _______, M(M_PTAB), M(M_NTAB), M(M_PSPC), M(M_NSPC),  _______,  _______,  _______,  _______,  M(M_ZOUT), M(M_ZOIN),  _______,  _______,  _______, _______  },
-  { _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, _______, _______, _______, _______, _______  },
-  { _______, M(M_BACK),  M(M_FWRD), _______, _______, _______, _______, _______, _______, _______,  _______,   _______, _______, _______, _______  },
-  { _______  , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  },
- },
- [_MEDIA] = { /* Media */
-  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  },
-  { _______, KC_SLCK, KC_PAUS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  },
-  { _______, KC_VOLU, _______, _______, _______, _______, _______, KC_MRWD, KC_MPLY, KC_MFFD, _______, _______, _______, _______, _______  },
-  { _______, KC_VOLD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  },
-  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  },
- },
- [_MOUSE] = { /* Mouse */
-  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  },
-  { _______, _______, _______, _______, _______, _______, _______, KC_BTN1, KC_BTN2, _______, _______, _______, _______, _______, _______  },
-  { _______, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, _______, _______, _______, _______, _______  },
-  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  },
-  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  },
- },
+ [_ENTFN] = LAYOUT_ortho_5x15( /* Enter FN */
+  _______, _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,  _______,  _______,  _______, _______,
+  _______, M(M_PTAB), M(M_NTAB), M(M_PSPC), M(M_NSPC),  _______,  _______,  _______,  _______,  M(M_ZOUT), M(M_ZOIN),  _______,  _______,  _______, _______,
+  _______, _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, _______, _______, _______, _______, _______,
+  _______, M(M_BACK),  M(M_FWRD), _______, _______, _______, _______, _______, _______, _______,  _______,   _______, _______, _______, _______,
+  _______  , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ ),
+ [_MEDIA] = LAYOUT_ortho_5x15( /* Media */
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, KC_SLCK, KC_PAUS, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, KC_VOLU, _______, _______, _______, _______, _______, KC_MRWD, KC_MPLY, KC_MFFD, _______, _______, _______, _______, _______,
+  _______, KC_VOLD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ ),
+ [_MOUSE] = LAYOUT_ortho_5x15( /* Mouse */
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, KC_BTN1, KC_BTN2, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ )
 };
 
 const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
diff --git a/qmk/keyboards/xd75/keymaps/arpinfidel/keymap.c b/qmk/keyboards/xd75/keymaps/arpinfidel/keymap.c
index d8890db5..d6681e78 100644
--- a/qmk/keyboards/xd75/keymaps/arpinfidel/keymap.c
+++ b/qmk/keyboards/xd75/keymaps/arpinfidel/keymap.c
@@ -41,13 +41,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * '--------------------------------------------------------------------------------------------------------------------------------------'
  */
 
- [_QW] = { /* QWERTY */
-  { KC_ESC , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_MINS, KC_GRV , KC_EQL , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_BSPC  },
-  { KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_LBRC, KC_RBRC, KC_BSLS, KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_QUOT  },
-  { KC_CAPS, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_UP  , KC_DEL , KC_DOWN, KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_ENT   },
-  { KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_HOME, KC_PGUP, KC_END , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT  },
-  { KC_LCTL, TT(_FN), KC_LGUI, KC_LALT, KC_SPC , KC_SPC , TT(_FN), KC_PGDN, TT(_FN), KC_BSPC, KC_BSPC, KC_RALT, KC_RGUI, TT(_FN), KC_RCTL  },
- },
+ [_QW] = LAYOUT_ortho_5x15( /* QWERTY */
+  KC_ESC , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_MINS, KC_GRV , KC_EQL , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_BSPC,
+  KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_LBRC, KC_RBRC, KC_BSLS, KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_QUOT,
+  KC_CAPS, KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_UP  , KC_DEL , KC_DOWN, KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_ENT,
+  KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_HOME, KC_PGUP, KC_END , KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,
+  KC_LCTL, TT(_FN), KC_LGUI, KC_LALT, KC_SPC , KC_SPC , TT(_FN), KC_PGDN, TT(_FN), KC_BSPC, KC_BSPC, KC_RALT, KC_RGUI, TT(_FN), KC_RCTL
+ ),
 
 /* FUNCTION
  * .--------------------------------------------------------------------------------------------------------------------------------------.
@@ -63,13 +63,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * '--------------------------------------------------------------------------------------------------------------------------------------'
  */
  
- [_FN] = { /* FUNCTION */
-  { KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   RGB_HUD, _______, RGB_HUI, KC_F7,   KC_F8,   KC_F9,   KC_F10  , KC_F11 , KC_F12   },
-  { KC_WH_U, _______, KC_BTN2, KC_MS_U, KC_BTN1, KC_BTN3, RGB_SAD, _______, RGB_SAI, KC_LBRC, KC_RBRC, KC_UP  , _______ , KC_EQL , KC_BSLS  },
-  { KC_WH_D, _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, RGB_VAD, _______, RGB_VAI, KC_MINS, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______  },
-  { _______, _______, _______, _______, _______, _______, RGB_RMOD,A_BL_TG, RGB_MOD, _______, _______, _______, _______ , _______, _______  },
-  { _______, TT(_FN), RGB_TOG, _______, KC_WH_L, KC_WH_R, TT(_FN), RESET  , TT(_FN), KC_BTN1, KC_BTN2, _______, _______ , TT(_FN), _______  },
- }
+ [_FN] = LAYOUT_ortho_5x15( /* FUNCTION */
+  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   RGB_HUD, _______, RGB_HUI, KC_F7,   KC_F8,   KC_F9,   KC_F10  , KC_F11 , KC_F12,
+  KC_WH_U, _______, KC_BTN2, KC_MS_U, KC_BTN1, KC_BTN3, RGB_SAD, _______, RGB_SAI, KC_LBRC, KC_RBRC, KC_UP  , _______ , KC_EQL , KC_BSLS,
+  KC_WH_D, _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, RGB_VAD, _______, RGB_VAI, KC_MINS, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______,
+  _______, _______, _______, _______, _______, _______, RGB_RMOD,A_BL_TG, RGB_MOD, _______, _______, _______, _______ , _______, _______,
+  _______, TT(_FN), RGB_TOG, _______, KC_WH_L, KC_WH_R, TT(_FN), RESET  , TT(_FN), KC_BTN1, KC_BTN2, _______, _______ , TT(_FN), _______
+ )
 };
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
diff --git a/qmk/keyboards/xd75/keymaps/atomic_style/keymap.c b/qmk/keyboards/xd75/keymaps/atomic_style/keymap.c
index bdbbc4af..9bd1e58a 100644
--- a/qmk/keyboards/xd75/keymaps/atomic_style/keymap.c
+++ b/qmk/keyboards/xd75/keymaps/atomic_style/keymap.c
@@ -42,13 +42,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * '--------------------------------------------------------------------------------------------------------------------------------------'
  */
 	
- [_QW] = { /* QWERTY */
-  { 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_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_ESC,  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_ENT,  KC_PGUP  },
-  { 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_RSFT, KC_UP,   KC_PGDN  },
-  { M(0),    KC_LCTL, KC_LALT, KC_LGUI, MO(_RS), KC_SPC,  KC_SPC,  MO(_LW), KC_RGUI, KC_RALT, KC_RCTL, MO(_FN), KC_LEFT, KC_DOWN, KC_RGHT  },
- },
+ [_QW] = LAYOUT_ortho_5x15( /* QWERTY */
+  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_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_ESC,  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_ENT,  KC_PGUP,
+  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_RSFT, KC_UP,   KC_PGDN,
+  M(0),    KC_LCTL, KC_LALT, KC_LGUI, MO(_RS), KC_SPC,  KC_SPC,  MO(_LW), KC_RGUI, KC_RALT, KC_RCTL, MO(_FN), KC_LEFT, KC_DOWN, KC_RGHT
+ ),
 
 /* COLEMAK - MIT ENHANCED / GRID COMPATIBLE
  * .---------------------------------------------------------------------------------------------------------------------- 2u ------------.
@@ -64,13 +64,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * '--------------------------------------------------------------------------------------------------------------------------------------'
  */
 	
- [_CM] = { /* COLEMAK */
-  { 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_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL   },
-  { KC_ESC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT, KC_ENT,  KC_ENT,  KC_PGUP  },
-  { KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_RSFT, KC_UP,   KC_PGDN  },
-  { M(0),    KC_LCTL, KC_LALT, KC_LGUI, MO(_RS), KC_SPC,  KC_SPC,  MO(_LW), KC_RGUI, KC_RALT, KC_RCTL, MO(_FN), KC_LEFT, KC_DOWN, KC_RGHT  },
- },
+ [_CM] = LAYOUT_ortho_5x15( /* COLEMAK */
+  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_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
+  KC_ESC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT, KC_ENT,  KC_ENT,  KC_PGUP,
+  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_RSFT, KC_UP,   KC_PGDN,
+  M(0),    KC_LCTL, KC_LALT, KC_LGUI, MO(_RS), KC_SPC,  KC_SPC,  MO(_LW), KC_RGUI, KC_RALT, KC_RCTL, MO(_FN), KC_LEFT, KC_DOWN, KC_RGHT
+ ),
 	
 /* DVORAK - MIT ENHANCED / GRID COMPATIBLE
  * .---------------------------------------------------------------------------------------------------------------------- 2u ------------.
@@ -86,13 +86,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * '--------------------------------------------------------------------------------------------------------------------------------------'
  */
 
- [_DV] = { /* DVORAK */
-  { 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_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL   },
-  { KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH, KC_ENT,  KC_ENT,  KC_PGUP  },
-  { KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_RSFT, KC_RSFT, KC_UP,   KC_PGDN  },
-  { M(0),    KC_LCTL, KC_LALT, KC_LGUI, MO(_RS), KC_SPC,  KC_SPC,  MO(_LW), KC_RGUI, KC_RALT, KC_RCTL, MO(_FN), KC_LEFT, KC_DOWN, KC_RGHT  },
- },
+ [_DV] = LAYOUT_ortho_5x15( /* DVORAK */
+  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_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
+  KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH, KC_ENT,  KC_ENT,  KC_PGUP,
+  KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_RSFT, KC_RSFT, KC_UP,   KC_PGDN,
+  M(0),    KC_LCTL, KC_LALT, KC_LGUI, MO(_RS), KC_SPC,  KC_SPC,  MO(_LW), KC_RGUI, KC_RALT, KC_RCTL, MO(_FN), KC_LEFT, KC_DOWN, KC_RGHT
+ ),
 
 /* LOWERED
  * .---------------------------------------------------------------------------------------------------------------------- 2u ------------.
@@ -108,13 +108,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * '--------------------------------------------------------------------------------------------------------------------------------------'
  */
  
- [_LW] = { /* LOWERED */
-  { _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  ___T___, ___T___  },
-  { _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, _______, _______, KC_INS   },
-  { _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, ___T___, ___T___, _______  },
-  { _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______, _______, ___T___, ___T___, _______, _______  },
-  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  },
- },
+ [_LW] = LAYOUT_ortho_5x15( /* LOWERED */
+  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  ___T___, ___T___,
+  _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, _______, _______, KC_INS,
+  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, ___T___, ___T___, _______,
+  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______, _______, ___T___, ___T___, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ ),
 
 /* RAISED
  * .---------------------------------------------------------------------------------------------------------------------- 2u ------------.
@@ -130,13 +130,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * '--------------------------------------------------------------------------------------------------------------------------------------'
  */
  
- [_RS] = { /* RAISED */
-  { _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  ___T___, ___T___  },
-  { _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______, _______, _______, KC_INS   },
-  { _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS, ___T___, ___T___, _______  },
-  { _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______, _______, ___T___, ___T___, _______, _______  },
-  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  },
- },
+ [_RS] = LAYOUT_ortho_5x15( /* RAISED */
+  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  ___T___, ___T___,
+  _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______, _______, _______, KC_INS,
+  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS, ___T___, ___T___, _______,
+  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______, _______, ___T___, ___T___, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ ),
  
 /* FUNCTION
  * .---------------------------------------------------------------------------------------------------------------------- 2u ------------.
@@ -152,13 +152,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * '--------------------------------------------------------------------------------------------------------------------------------------'
  */
  
- [_FN] = { /* FUNCTION */
-  { KC_NLCK, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  ___T___, ___T___  },
-  { KC_SLCK, KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24,  KC_PAUS, KC_PSCR  },
-  { KC_CAPS, KC_BTN5, KC_BTN4, KC_BTN3, KC_BTN2, KC_ACL0, KC_ACL2, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, _______, ___T___, ___T___, KC_WH_U  },
-  { RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, BL_TOGG, BL_INC,  BL_DEC,   ___T___, ___T___, KC_MS_U, KC_WH_D  },
-  { RESET  , _______, DF(_QW), DF(_CM), DF(_DV), KC_BTN1, KC_BTN1, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R  },
- },
+ [_FN] = LAYOUT_ortho_5x15( /* FUNCTION */
+  KC_NLCK, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  ___T___, ___T___,
+  KC_SLCK, KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24,  KC_PAUS, KC_PSCR,
+  KC_CAPS, KC_BTN5, KC_BTN4, KC_BTN3, KC_BTN2, KC_ACL0, KC_ACL2, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, _______, ___T___, ___T___, KC_WH_U,
+  RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, BL_TOGG, BL_INC,  BL_DEC,   ___T___, ___T___, KC_MS_U, KC_WH_D,
+  RESET  , _______, DF(_QW), DF(_CM), DF(_DV), KC_BTN1, KC_BTN1, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R
+ )
 };
 
 const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
diff --git a/qmk/keyboards/xd75/keymaps/boy_314/keymap.c b/qmk/keyboards/xd75/keymaps/boy_314/keymap.c
index e51a2654..01c3a362 100644
--- a/qmk/keyboards/xd75/keymaps/boy_314/keymap.c
+++ b/qmk/keyboards/xd75/keymaps/boy_314/keymap.c
@@ -27,13 +27,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * '--------------------------------------------------------------------------------------------------------------------------------------'
  */
 
- [_DV] = { /* DVORAK */
-  { KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_MINS, KC_GRV,  KC_EQL,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC  },
-  { KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_LBRC, KC_UP,   KC_RBRC, KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_SLSH  },
-  { LCTL_T(KC_CAPS), KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_LEFT, KC_DOWN, KC_RGHT, KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_ENT   },
-  { KC_LSPO, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_PGDN,  KC_UP,  KC_PGUP, KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_RSPC  },
-  { KC_LCTL, KC_DEL,  KC_LALT, KC_LGUI, MO(_FN1),KC_SPC,  KC_LEFT, KC_DOWN, KC_RGHT, KC_SPC,  MO(_FN2),KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT },
- },
+ [_DV] = LAYOUT_ortho_5x15( /* DVORAK */
+  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_MINS, KC_GRV,  KC_EQL,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
+  KC_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_LBRC, KC_UP,   KC_RBRC, KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_SLSH,
+  LCTL_T(KC_CAPS), KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_LEFT, KC_DOWN, KC_RGHT, KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_ENT,
+  KC_LSPO, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_PGDN,  KC_UP,  KC_PGUP, KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_RSPC,
+  KC_LCTL, KC_DEL,  KC_LALT, KC_LGUI, MO(_FN1),KC_SPC,  KC_LEFT, KC_DOWN, KC_RGHT, KC_SPC,  MO(_FN2),KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT
+ ),
 
 /* QWERTY
  * .--------------------------------------------------------------------------------------------------------------------------------------.
@@ -49,13 +49,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * '--------------------------------------------------------------------------------------------------------------------------------------'
  */
  
- [_QW] = { /* QWERTY */
-  { KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_MINS, KC_GRV,  KC_EQL,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC  },
-  { KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_LBRC, KC_BSLS, KC_RBRC, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_ENT   },
-  { KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_HOME, KC_DEL,  KC_PGUP, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT  },
-  { KC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_END,  KC_UP,   KC_PGDN, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC  },
-  { KC_LCTL, KC_DEL,  KC_LALT, KC_LGUI, MO(_FN1),KC_SPC,  KC_LEFT, KC_DOWN, KC_RGHT, KC_SPC,  MO(_FN2),KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT },
- },
+ [_QW] = LAYOUT_ortho_5x15( /* QWERTY */
+  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_MINS, KC_GRV,  KC_EQL,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
+  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_LBRC, KC_BSLS, KC_RBRC, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_ENT,
+  KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_HOME, KC_DEL,  KC_PGUP, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+  KC_LSPO, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_END,  KC_UP,   KC_PGDN, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSPC,
+  KC_LCTL, KC_DEL,  KC_LALT, KC_LGUI, MO(_FN1),KC_SPC,  KC_LEFT, KC_DOWN, KC_RGHT, KC_SPC,  MO(_FN2),KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT
+ ),
  
 /* NUMPAD
  * .--------------------------------------------------------------------------------------------------------------------------------------.
@@ -71,13 +71,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * '--------------------------------------------------------------------------------------------------------------------------------------'
  */  
 
-  [_NP] = { /* NUMPAD */
-  { _______, _______, _______, _______, _______, _______, KC_SLSH, KC_ASTR, KC_MINS, _______, _______, _______, _______, _______, _______  },
-  { _______, _______, _______, _______, _______, _______,    KC_7,    KC_8,    KC_9, _______, _______, _______, _______, _______, _______  },
-  { _______, _______, _______, _______, _______, _______,    KC_4,    KC_5,    KC_6, _______, _______, _______, _______, _______, _______  },
-  { _______, _______, _______, _______, _______, _______,    KC_1,    KC_2,    KC_3, _______, _______, _______, _______, _______, _______  },
-  { _______, _______, _______, _______, _______, _______,    KC_0, KC_PLUS,  KC_DOT, _______, _______, _______, _______, _______, _______  },
- },
+  [_NP] = LAYOUT_ortho_5x15( /* NUMPAD */
+  _______, _______, _______, _______, _______, _______, KC_SLSH, KC_ASTR, KC_MINS, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______,    KC_7,    KC_8,    KC_9, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______,    KC_4,    KC_5,    KC_6, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______,    KC_1,    KC_2,    KC_3, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______,    KC_0, KC_PLUS,  KC_DOT, _______, _______, _______, _______, _______, _______
+ ),
 
 /* FUNCTION1
  * .--------------------------------------------------------------------------------------------------------------------------------------.
@@ -93,13 +93,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * '--------------------------------------------------------------------------------------------------------------------------------------'
  */
  
- [_FN1] = { /* FUNCTION1 */
-  { KC_GRV , KC_EXLM,   KC_AT, KC_HASH,  KC_DLR, KC_PERC, _______, _______, _______, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC  },
-  { KC_TILD, KC_EXLM,   KC_AT, KC_HASH,  KC_DLR, KC_PERC,   RESET, RGB_HUD, RGB_HUI, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL   },
-  { KC_DEL,    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6, RGB_SAD, RGB_SAI, TO(_DV), KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE  },
-  { _______,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, RGB_VAD, RGB_VAI, TO(_QW), _______, _______, KC_HOME,  KC_END, _______  },
-  { _______, _______, _______, _______, _______, _______, _______,RGB_RMOD, RGB_MOD, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY  },
- },
+ [_FN1] = LAYOUT_ortho_5x15( /* FUNCTION1 */
+  KC_GRV , KC_EXLM,   KC_AT, KC_HASH,  KC_DLR, KC_PERC, _______, _______, _______, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
+  KC_TILD, KC_EXLM,   KC_AT, KC_HASH,  KC_DLR, KC_PERC,   RESET, RGB_HUD, RGB_HUI, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL,
+  KC_DEL,    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6, RGB_SAD, RGB_SAI, TO(_DV), KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
+  _______,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, RGB_VAD, RGB_VAI, TO(_QW), _______, _______, KC_HOME,  KC_END, _______,
+  _______, _______, _______, _______, _______, _______, _______,RGB_RMOD, RGB_MOD, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+ ),
 
 
 /* FUNCTION2
@@ -116,13 +116,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * '--------------------------------------------------------------------------------------------------------------------------------------'
  */    
  
- [_FN2] = { /* FUNCTION2 */
-  {  KC_GRV,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5, _______, _______, _______, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC  },
-  {  KC_GRV, _______, _______,   KC_UP, _______, _______,   RESET, RGB_HUD, RGB_HUI, TG(_NP), _______, _______, _______, _______, KC_DEL   },
-  {  KC_DEL, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, RGB_SAD, RGB_SAI, TG(_DV), KC_MINS,  KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS  },
-  { _______, _______, _______, _______, _______, _______, _______, RGB_VAD, RGB_VAI, TG(_QW), _______, _______, KC_PGDN, KC_PGUP, _______  },
-  { _______, _______, _______, _______, _______, _______, _______,RGB_RMOD, RGB_MOD, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY  },
- }
+ [_FN2] = LAYOUT_ortho_5x15( /* FUNCTION2 */
+  KC_GRV,    KC_1,    KC_2,    KC_3,    KC_4,    KC_5, _______, _______, _______, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
+  KC_GRV, _______, _______,   KC_UP, _______, _______,   RESET, RGB_HUD, RGB_HUI, TG(_NP), _______, _______, _______, _______, KC_DEL,
+  KC_DEL, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, RGB_SAD, RGB_SAI, TG(_DV), KC_MINS,  KC_EQL, KC_LBRC, KC_RBRC, KC_BSLS,
+  _______, _______, _______, _______, _______, _______, _______, RGB_VAD, RGB_VAI, TG(_QW), _______, _______, KC_PGDN, KC_PGUP, _______,
+  _______, _______, _______, _______, _______, _______, _______,RGB_RMOD, RGB_MOD, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+ )
 };
 
 
diff --git a/qmk/keyboards/xd75/keymaps/bramver/keymap.c b/qmk/keyboards/xd75/keymaps/bramver/keymap.c
index 0d609152..7cbb0bae 100644
--- a/qmk/keyboards/xd75/keymaps/bramver/keymap.c
+++ b/qmk/keyboards/xd75/keymaps/bramver/keymap.c
@@ -50,45 +50,45 @@ const uint32_t PROGMEM unicode_map[] = {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-  [_BASE] = {
-    { KC_GESC , KC_1  , KC_2    , KC_3    , KC_4    , KC_5    , KC_MPRV , KC_MPLY , KC_MNXT , KC_6    , KC_7    , KC_8    , KC_9    , KC_0    , KC_BSPC },
-    { KC_TAB  , KC_Q  , KC_W    , KC_E    , KC_R    , KC_T    , KC_MINS , KC_EQL  , KC_BSLS , KC_Y    , KC_U    , KC_I    , KC_O    , KC_P    , KC_ENT  },
-    { MO(3)   , KC_A  , KC_S    , KC_D    , KC_F    , KC_G    , KC_LBRC , KC_MUTE , KC_RBRC , KC_H    , KC_J    , KC_K    , KC_L    , KC_SCLN , KC_QUOT },
-    { KC_LSFT , KC_Z  , KC_X    , KC_C    , KC_V    , KC_B    , KC_HOME , KC_SLEP , KC_END  , KC_N    , KC_M    , KC_COMM , KC_DOT  , KC_SLSH , KC_RSFT },
-    { KC_LCTL , MO(4) , KC_LALT , KC_LGUI , KC_SPC  , KC_SPC  , MO(1)   , KC_DEL  , MO(2)   , KC_SPC  , KC_LEFT , KC_DOWN , KC_UP   , KC_RGHT , KC_RGUI },
-  },
+  [_BASE] = LAYOUT_ortho_5x15(
+    KC_GESC , KC_1  , KC_2    , KC_3    , KC_4    , KC_5    , KC_MPRV , KC_MPLY , KC_MNXT , KC_6    , KC_7    , KC_8    , KC_9    , KC_0    , KC_BSPC,
+    KC_TAB  , KC_Q  , KC_W    , KC_E    , KC_R    , KC_T    , KC_MINS , KC_EQL  , KC_BSLS , KC_Y    , KC_U    , KC_I    , KC_O    , KC_P    , KC_ENT ,
+    MO(3)   , KC_A  , KC_S    , KC_D    , KC_F    , KC_G    , KC_LBRC , KC_MUTE , KC_RBRC , KC_H    , KC_J    , KC_K    , KC_L    , KC_SCLN , KC_QUOT,
+    KC_LSFT , KC_Z  , KC_X    , KC_C    , KC_V    , KC_B    , KC_HOME , KC_SLEP , KC_END  , KC_N    , KC_M    , KC_COMM , KC_DOT  , KC_SLSH , KC_RSFT,
+    KC_LCTL , MO(4) , KC_LALT , KC_LGUI , KC_SPC  , KC_SPC  , MO(1)   , KC_DEL  , MO(2)   , KC_SPC  , KC_LEFT , KC_DOWN , KC_UP   , KC_RGHT , KC_RGUI,
+  ),
 
-  [_LOWER] = {
-    { _______ , _______ , _______ , _______ , _______ , _______ , BL_TOGG , BL_DEC  , BL_INC  , _______ , _______ , _______ , _______ , _______ , _______ },
-    { _______ , KC_WH_L , KC_BTN1 , KC_MS_U , KC_BTN2 , KC_WH_U , BL_STEP , RGB_TOG , RGB_MOD , _______ , _______ , _______ , _______ , _______ , _______ },
-    { _______ , KC_WH_R , KC_MS_L , KC_MS_D , KC_MS_R , KC_WH_D , RGB_HUI , RGB_HUD , RGB_SAI , _______ , KC_LEFT , KC_DOWN , KC_UP   , KC_RGHT , _______ },
-    { _______ , _______ , _______ , _______ , _______ , _______ , RGB_SAD , RGB_VAI , RGB_VAD , _______ , _______ , _______ , _______ , _______ , _______ },
-    { _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ },
-  },
+  [_LOWER] = LAYOUT_ortho_5x15(
+    _______ , _______ , _______ , _______ , _______ , _______ , BL_TOGG , BL_DEC  , BL_INC  , _______ , _______ , _______ , _______ , _______ , _______,
+    _______ , KC_WH_L , KC_BTN1 , KC_MS_U , KC_BTN2 , KC_WH_U , BL_STEP , RGB_TOG , RGB_MOD , _______ , _______ , _______ , _______ , _______ , _______,
+    _______ , KC_WH_R , KC_MS_L , KC_MS_D , KC_MS_R , KC_WH_D , RGB_HUI , RGB_HUD , RGB_SAI , _______ , KC_LEFT , KC_DOWN , KC_UP   , KC_RGHT , _______,
+    _______ , _______ , _______ , _______ , _______ , _______ , RGB_SAD , RGB_VAI , RGB_VAD , _______ , _______ , _______ , _______ , _______ , _______,
+    _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______,
+  ),
 
-  [_LINVERT] = {
-    { _______ , _______ , _______ , _______ , _______ , _______ , BL_TOGG , BL_DEC  , BL_INC  , _______ , _______ , _______ , _______ , _______ , _______ },
-    { _______ , _______ , _______ , _______ , _______ , _______ , BL_STEP , RGB_TOG , RGB_MOD , KC_WH_U , KC_BTN1 , KC_MS_U , KC_BTN2 , KC_WH_L , _______ },
-    { _______ , KC_LEFT , KC_DOWN , KC_UP   , KC_RGHT , _______ , RGB_SAI , RGB_HUI , RGB_HUD , KC_WH_D , KC_MS_L , KC_MS_D , KC_MS_R , KC_WH_R , _______ },
-    { _______ , _______ , _______ , _______ , _______ , _______ , RGB_SAD , RGB_VAI , RGB_VAD , _______ , _______ , _______ , _______ , _______ , _______ },
-    { _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ },
-  },
+  [_LINVERT] = LAYOUT_ortho_5x15(
+    _______ , _______ , _______ , _______ , _______ , _______ , BL_TOGG , BL_DEC  , BL_INC  , _______ , _______ , _______ , _______ , _______ , _______,
+    _______ , _______ , _______ , _______ , _______ , _______ , BL_STEP , RGB_TOG , RGB_MOD , KC_WH_U , KC_BTN1 , KC_MS_U , KC_BTN2 , KC_WH_L , _______,
+    _______ , KC_LEFT , KC_DOWN , KC_UP   , KC_RGHT , _______ , RGB_SAI , RGB_HUI , RGB_HUD , KC_WH_D , KC_MS_L , KC_MS_D , KC_MS_R , KC_WH_R , _______,
+    _______ , _______ , _______ , _______ , _______ , _______ , RGB_SAD , RGB_VAI , RGB_VAD , _______ , _______ , _______ , _______ , _______ , _______,
+    _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______
+  ),
 
-  [_RAISE] = {
-    { 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_7    , KC_8    , KC_9    , _______ , _______ , _______ , _______ , _______ , KC_MUTE , KC_VOLD , KC_VOLU , _______ , _______ },
-    { _______ , _______ , KC_4    , KC_5    , KC_6    , _______ , _______ , _______ , _______ , _______ , KC_MPRV , KC_MPLY , KC_MNXT , _______ , _______ },
-    { _______ , _______ , KC_1    , KC_2    , KC_3    , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ },
-    { _______ , _______ , _______ , KC_0    , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ },
-  },
+  [_RAISE] = LAYOUT_ortho_5x15(
+    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_7    , KC_8    , KC_9    , _______ , _______ , _______ , _______ , _______ , KC_MUTE , KC_VOLD , KC_VOLU , _______ , _______,
+    _______ , _______ , KC_4    , KC_5    , KC_6    , _______ , _______ , _______ , _______ , _______ , KC_MPRV , KC_MPLY , KC_MNXT , _______ , _______,
+    _______ , _______ , KC_1    , KC_2    , KC_3    , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______,
+    _______ , _______ , _______ , KC_0    , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______
+  ),
 
-  [_EMOJIFY] = {
-    { TO(0)   , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , RESET   },
-    { _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ },
-    { _______ , X(CELE) , X(PRAY) , X(NAIL) , X(OK)   , X(THNK) , _______ , _______ , _______ , X(UNAM) , X(HEYE) , X(COOL) , X(EYES) , X(SMIR) , _______ },
-    { _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ },
-    { _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ },
-  },
+  [_EMOJIFY] = LAYOUT_ortho_5x15(
+    TO(0)   , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , RESET  ,
+    _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______,
+    _______ , X(CELE) , X(PRAY) , X(NAIL) , X(OK)   , X(THNK) , _______ , _______ , _______ , X(UNAM) , X(HEYE) , X(COOL) , X(EYES) , X(SMIR) , _______,
+    _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______,
+    _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______ , _______
+  )
 
 };
 
@@ -98,12 +98,12 @@ void matrix_init_user(void) {
 }
 
 /* Template for future layers
- [_LAYER_NAME] = {
-  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
-  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
-  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
-  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
-  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______},
- }
+ [_LAYER_NAME] = LAYOUT_ortho_5x15(
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ )
 };
 */
diff --git a/qmk/keyboards/xd75/keymaps/c4software_bepo/keymap.c b/qmk/keyboards/xd75/keymaps/c4software_bepo/keymap.c
index 2c70f287..0eb202dd 100644
--- a/qmk/keyboards/xd75/keymaps/c4software_bepo/keymap.c
+++ b/qmk/keyboards/xd75/keymaps/c4software_bepo/keymap.c
@@ -36,13 +36,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * '--------------------------------------------------------------------------------------------------------------------------------------'
  */
 
- [_BP] = { /* BepoDev */
-  { KC_ESC,  BP_DQOT,    BP_LGIL,    BP_RGIL, BP_LPRN, BP_RPRN,    BP_PERCENT, KC_VOLD, KC_VOLU, BP_AT,   BP_PLUS, BP_MINUS, BP_SLASH, BP_ASTR, BP_EQUAL },
-  { KC_TAB,  BP_B,       BP_E_ACUTE, BP_P,    BP_O,    BP_DOLLAR,  BP_E_GRAVE, KC_DEL,  BP_DCRC, BP_V,    BP_D,    BP_L,     BP_J,     BP_Z,    BP_CCED  },
-  { KC_RALT, BP_A,       BP_U,       BP_I,    BP_E,    BP_COMMA,   KC_BSPC,    KC_ENT,  BP_C,    BP_T,    BP_S,    BP_R,     BP_N,     BP_M,    BP_W     },
-  { KC_LSFT, BP_A_GRAVE, BP_Y,       BP_X,    BP_DOT,  BP_K,       KC_BSPC,    KC_ENT,  BP_APOS, BP_Q,    BP_G,    BP_H,     BP_F,     KC_UP,   KC_RSFT  },
-  { KC_LALT, KC_LCTL,    MO(_FN),    KC_LGUI, KC_SPC,  KC_SPC,     KC_RALT,    KC_RALT, KC_SPC,  KC_SPC,  KC_RGUI, MO(_FN),  KC_LEFT,  KC_DOWN, KC_RGHT  },
- },
+ [_BP] = LAYOUT_ortho_5x15( /* BepoDev */
+  KC_ESC,  BP_DQOT,    BP_LGIL,    BP_RGIL, BP_LPRN, BP_RPRN,    BP_PERCENT, KC_VOLD, KC_VOLU, BP_AT,   BP_PLUS, BP_MINUS, BP_SLASH, BP_ASTR, BP_EQUAL,
+  KC_TAB,  BP_B,       BP_E_ACUTE, BP_P,    BP_O,    BP_DOLLAR,  BP_E_GRAVE, KC_DEL,  BP_DCRC, BP_V,    BP_D,    BP_L,     BP_J,     BP_Z,    BP_CCED,
+  KC_RALT, BP_A,       BP_U,       BP_I,    BP_E,    BP_COMMA,   KC_BSPC,    KC_ENT,  BP_C,    BP_T,    BP_S,    BP_R,     BP_N,     BP_M,    BP_W,
+  KC_LSFT, BP_A_GRAVE, BP_Y,       BP_X,    BP_DOT,  BP_K,       KC_BSPC,    KC_ENT,  BP_APOS, BP_Q,    BP_G,    BP_H,     BP_F,     KC_UP,   KC_RSFT,
+  KC_LALT, KC_LCTL,    MO(_FN),    KC_LGUI, KC_SPC,  KC_SPC,     KC_RALT,    KC_RALT, KC_SPC,  KC_SPC,  KC_RGUI, MO(_FN),  KC_LEFT,  KC_DOWN, KC_RGHT
+ ),
 
 /* FUNCTION
  * .--------------------------------------------------------------------------------------------------------------------------------------.
@@ -58,13 +58,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * '--------------------------------------------------------------------------------------------------------------------------------------'
  */
 
- [_FN] = { /* FUNCTION */
-  { KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_SLSH, KC_ASTR, KC_F9,   KC_F10,  KC_F11,  KC_F12  },
-  { KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_P7,   KC_P8,   KC_P9,   KC_MINS, RGB_TOG, RGB_MOD, RGB_HUI },
-  { KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP, KC_TRNS, KC_TRNS, KC_TRNS, KC_P4,   KC_P5,   KC_P6,   KC_PLUS, RGB_SAI, RGB_SAD, RGB_VAI },
-  { KC_TRNS, KC_VOLD, KC_MUTE, KC_VOLU, KC_APP,  KC_TRNS, KC_TRNS, KC_TRNS, KC_P1,   KC_P2,   KC_P3,   KC_ENT,  RGB_VAD, KC_HOME, RGB_HUD },
-  { RESET,   KC_TRNS, MO(_FN), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_KP_0, KC_KP_0, KC_PDOT, MO(_FN), KC_TRNS, KC_END,  KC_TRNS },
- }
+ [_FN] = LAYOUT_ortho_5x15( /* FUNCTION */
+  KC_TRNS, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_SLSH, KC_ASTR, KC_F9,   KC_F10,  KC_F11,  KC_F12,
+  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_P7,   KC_P8,   KC_P9,   KC_MINS, RGB_TOG, RGB_MOD, RGB_HUI,
+  KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP, KC_TRNS, KC_TRNS, KC_TRNS, KC_P4,   KC_P5,   KC_P6,   KC_PLUS, RGB_SAI, RGB_SAD, RGB_VAI,
+  KC_TRNS, KC_VOLD, KC_MUTE, KC_VOLU, KC_APP,  KC_TRNS, KC_TRNS, KC_TRNS, KC_P1,   KC_P2,   KC_P3,   KC_ENT,  RGB_VAD, KC_HOME, RGB_HUD,
+  RESET,   KC_TRNS, MO(_FN), KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_KP_0, KC_KP_0, KC_PDOT, MO(_FN), KC_TRNS, KC_END,  KC_TRNS
+ )
 };
 
 const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
diff --git a/qmk/keyboards/xd75/keymaps/daniel/keymap.c b/qmk/keyboards/xd75/keymaps/daniel/keymap.c
index 2804a6cd..e9f2740b 100644
--- a/qmk/keyboards/xd75/keymaps/daniel/keymap.c
+++ b/qmk/keyboards/xd75/keymaps/daniel/keymap.c
@@ -5,25 +5,25 @@
 #define _NM 2
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [_QW] = {
-  { KC_ESC , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_GRV , KC_BSPC },
-  { 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  },
-  { MO(_NV), KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT, KC_ENT , MO(_NM), KC_PGUP },
-  { 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_PGDN },
-  { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC , KC_SPC , KC_SPC , KC_SPC , KC_SPC , KC_SPC , KC_RALT, KC_RGUI, KC_APP , KC_LEFT, KC_DOWN, KC_RGHT },
- },
- [_NV] = {
-  { 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_DEL , KC_BSPC, _______, KC_HOME, KC_UP  , KC_END , KC_INS , _______, _______, _______, _______ },
-  { _______, _______, _______, KC_LSFT, KC_LCTL, KC_ENT , _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_DEL , _______, _______, _______, _______ },
-  { _______, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN, _______, _______, _______, _______, _______, _______ },
-  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
- },
- [_NM] = {
-  { _______, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
-  { _______, RGB_HUD, RGB_HUI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
-  { _______, RGB_SAD, RGB_SAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
-  { _______, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
-  { RESET  , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
- }
+ [_QW] = LAYOUT_ortho_5x15(
+  KC_ESC , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_MINS, KC_EQL , KC_GRV , KC_BSPC,
+  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,
+  MO(_NV), KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT, KC_ENT , MO(_NM), KC_PGUP,
+  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_PGDN,
+  KC_LCTL, KC_LGUI, KC_LALT, KC_SPC , KC_SPC , KC_SPC , KC_SPC , KC_SPC , KC_SPC , KC_RALT, KC_RGUI, KC_APP , KC_LEFT, KC_DOWN, KC_RGHT
+ ),
+ [_NV] = LAYOUT_ortho_5x15(
+  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_DEL , KC_BSPC, _______, KC_HOME, KC_UP  , KC_END , KC_INS , _______, _______, _______, _______,
+  _______, _______, _______, KC_LSFT, KC_LCTL, KC_ENT , _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_DEL , _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ ),
+ [_NM] = LAYOUT_ortho_5x15(
+  _______, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, RGB_HUD, RGB_HUI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, RGB_SAD, RGB_SAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  RESET  , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ )
 };
diff --git a/qmk/keyboards/xd75/keymaps/default/keymap.c b/qmk/keyboards/xd75/keymaps/default/keymap.c
index 0e5c7dba..68441d17 100644
--- a/qmk/keyboards/xd75/keymaps/default/keymap.c
+++ b/qmk/keyboards/xd75/keymaps/default/keymap.c
@@ -13,95 +13,54 @@
  * 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
 
-// Layer shorthand
-#define _QW 0
-#define _FN 1
-
-// Defines the keycodes used by our macros in process_record_user
-enum custom_keycodes {
-  QMKBEST = SAFE_RANGE,
-  QMKURL
+enum layer_names {
+    _QW,
+    _FN
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* QWERTY
+     * .--------------------------------------------------------------------------------------------------------------------------------------.
+     * | ESC    | 1      | 2      | 3      | 4      | 5      | -      | `      | =      | 6      | 7      | 8      | 9      | 0      | BACKSP |
+     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
+     * | TAB    | Q      | W      | E      | R      | T      | [      | \      | ]      | Y      | U      | I      | O      | P      | '      |
+     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
+     * | CAP LK | A      | S      | D      | F      | G      | HOME   | DEL    | PG UP  | H      | J      | K      | L      | ;      | ENTER  |
+     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
+     * | LSHIFT | Z      | X      | C      | V      | B      | END    | UP     | PG DN  | N      | M      | ,      | .      | /      | RSHIFT |
+     * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+-----------------+--------+--------|
+     * | LCTRL  | LGUI   | LALT   | FN     | SPACE  | SPACE  | LEFT   | DOWN   | RIGHT  | SPACE  | SPACE  | FN     | RALT   | RGUI   | RCTRL  |
+     * '--------------------------------------------------------------------------------------------------------------------------------------'
+     */
+    [_QW] = LAYOUT_ortho_5x15( /* QWERTY */
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_MINS, KC_GRV,  KC_EQL,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_LBRC, KC_BSLS, KC_RBRC, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_QUOT,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_HOME, KC_DEL,  KC_PGUP, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_END,  KC_UP,   KC_PGDN, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
+        KC_LCTL, KC_LGUI, KC_LALT, MO(_FN), KC_SPC,  KC_SPC,  KC_LEFT, KC_DOWN, KC_RGHT, KC_SPC,  KC_SPC,  MO(_FN), KC_RALT, KC_RGUI, KC_RCTL
+    ),
 
-/* QWERTY
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * | ESC    | 1      | 2      | 3      | 4      | 5      | -      | `      | =      | 6      | 7      | 8      | 9      | 0      | BACKSP |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
- * | TAB    | Q      | W      | E      | R      | T      | [      | \      | ]      | Y      | U      | I      | O      | P      | '      |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
- * | CAP LK | A      | S      | D      | F      | G      | HOME   | DEL    | PG UP  | H      | J      | K      | L      | ;      | ENTER  |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
- * | LSHIFT | Z      | X      | C      | V      | B      | END    | UP     | PG DN  | N      | M      | ,      | .      | /      | RSHIFT |
- * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+-----------------+--------+--------|
- * | LCTRL  | LGUI   | LALT   | FN     | SPACE  | SPACE  | LEFT   | DOWN   | RIGHT  | SPACE  | SPACE  | FN     | RALT   | RGUI   | RCTRL  |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
-
-  [_QW] = LAYOUT_ortho_5x15( /* QWERTY */
-    KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_MINS, KC_GRV,  KC_EQL,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_LBRC, KC_BSLS, KC_RBRC, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_QUOT,
-    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_HOME, KC_DEL,  KC_PGUP, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
-    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_END,  KC_UP,   KC_PGDN, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-    KC_LCTL, KC_LGUI, KC_LALT, MO(_FN), KC_SPC,  KC_SPC,  KC_LEFT, KC_DOWN, KC_RGHT, KC_SPC,  KC_SPC,  MO(_FN), KC_RALT, KC_RGUI, KC_RCTL
-  ),
-
-/* FUNCTION
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * | F1     | F2     | F3     | F4     | F5     | F6     | NUM LK | P/     | P*     | F7     | F8     | F9     | F10    | F11    | F12    |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | SELECT | CALC   | MYCOMP | MAIL   | RGB HD | RGB HI | P7     | P8     | P9     | -      |        |        | PR SCR | SCR LK | PAUSE  |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | PREV   | PLAY   | NEXT   | STOP   | RGB SD | RGB SI | P4     | P5     | P6     | +      |        | RESET  |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | VOL-   | MUTE   | VOL+   | APP    | RGB VD | RGB VI | P1     | P2     | P3     | PENT   |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        | RGB TG | FN     | RGB RMD| RGB MD | P0     |        | P.     | PENT   | PENT   | FN     |        |        |        |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
-
-  [_FN] = LAYOUT_ortho_5x15( /* FUNCTION */
-    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_NLCK, KC_SLSH, KC_ASTR, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-    KC_MSEL, KC_CALC, KC_MYCM, KC_MAIL, RGB_HUD, RGB_HUI, KC_P7,   KC_P8,   KC_P9,   KC_MINS, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS,
-    KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP, RGB_SAD, RGB_SAI, KC_P4,   KC_P5,   KC_P6,   KC_PLUS, _______, RESET,   _______, _______, _______,
-    KC_VOLD, KC_MUTE, KC_VOLU, KC_APP,  RGB_VAD, RGB_VAI, KC_P1,   KC_P2,   KC_P3,   KC_PENT, _______, _______, _______, _______, _______,
-    _______, _______, RGB_TOG, MO(_FN), RGB_RMOD,RGB_MOD, KC_P0,   _______, KC_PDOT, KC_PENT, KC_PENT, MO(_FN), _______, _______, _______
-  )
+    /* FUNCTION
+     * .--------------------------------------------------------------------------------------------------------------------------------------.
+     * | F1     | F2     | F3     | F4     | F5     | F6     | NUM LK | P/     | P*     | F7     | F8     | F9     | F10    | F11    | F12    |
+     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+     * | SELECT | CALC   | MYCOMP | MAIL   | RGB HD | RGB HI | P7     | P8     | P9     | -      |        |        | PR SCR | SCR LK | PAUSE  |
+     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+     * | PREV   | PLAY   | NEXT   | STOP   | RGB SD | RGB SI | P4     | P5     | P6     | +      |        | RESET  |        |        |        |
+     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+     * | VOL-   | MUTE   | VOL+   | APP    | RGB VD | RGB VI | P1     | P2     | P3     | PENT   |        |        |        |        |        |
+     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+     * |        |        | RGB TG | FN     | RGB RMD| RGB MD | P0     |        | P.     | PENT   | PENT   | FN     |        |        |        |
+     * '--------------------------------------------------------------------------------------------------------------------------------------'
+     */
+    [_FN] = LAYOUT_ortho_5x15( /* FUNCTION */
+        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_NLCK, KC_SLSH, KC_ASTR, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
+        KC_MSEL, KC_CALC, KC_MYCM, KC_MAIL, RGB_HUD, RGB_HUI, KC_P7,   KC_P8,   KC_P9,   KC_MINS, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP, RGB_SAD, RGB_SAI, KC_P4,   KC_P5,   KC_P6,   KC_PLUS, _______, RESET,   _______, _______, _______,
+        KC_VOLD, KC_MUTE, KC_VOLU, KC_APP,  RGB_VAD, RGB_VAI, KC_P1,   KC_P2,   KC_P3,   KC_PENT, _______, _______, _______, _______, _______,
+        _______, _______, RGB_TOG, MO(_FN), RGB_RMOD,RGB_MOD, KC_P0,   _______, KC_PDOT, KC_PENT, KC_PENT, MO(_FN), _______, _______, _______
+    )
 };
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case QMKBEST:
-      if (record->event.pressed) {
-        // when keycode QMKBEST is pressed
-        SEND_STRING("QMK is the best thing ever!");
-      } else {
-        // when keycode QMKBEST is released
-      }
-      break;
-    case QMKURL:
-      if (record->event.pressed) {
-        // when keycode QMKURL is pressed
-        SEND_STRING("https://qmk.fm/" SS_TAP(X_ENTER));
-      } else {
-        // when keycode QMKURL is released
-      }
-      break;
-  }
-  return true;
-}
-
-void matrix_init_user(void) {
-
-}
-
-void matrix_scan_user(void) {
-
-}
-
-void led_set_user(uint8_t usb_led) {
-
-}
diff --git a/qmk/keyboards/xd75/keymaps/developper_bepo/keymap.c b/qmk/keyboards/xd75/keymaps/developper_bepo/keymap.c
index b23639a0..7fedb7fb 100644
--- a/qmk/keyboards/xd75/keymaps/developper_bepo/keymap.c
+++ b/qmk/keyboards/xd75/keymaps/developper_bepo/keymap.c
@@ -37,13 +37,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * '--------------------------------------------------------------------------------------------------------------------------------------'
  */
 
- [_BP] = { /* BepoDev */
-  { BP_DOLLAR, BP_DQOT,  BP_LCBR,    BP_RCBR, BP_LPRN, BP_RPRN,        KC_VOLD, KC_MUTE, KC_VOLU,   BP_PLUS,         BP_MINUS,BP_SLASH,BP_ASTR,  BP_EQL,  BP_PERC },
-  { KC_TAB,    BP_B,     BP_E_ACUTE, BP_P,    BP_O,    BP_E_GRAVE,     KC_KP_7, KC_KP_8, KC_KP_9,   BP_DCRC,         BP_V,    BP_D,    BP_L,     BP_J,    BP_Z    },
-  { KC_ESC,    BP_A,     BP_U,       BP_I,    BP_E,    BP_COMMA,       KC_HOME, KC_KP_5, KC_END,    BP_C,            BP_T,    BP_S,    BP_R,     BP_N,    BP_M    },
-  { KC_LSFT,   BP_W,     BP_Y,       BP_X,    BP_DOT,  BP_K,           KC_PGUP, KC_END,  KC_PGDOWN, BP_APOS,         BP_Q,    BP_G,    BP_H,     BP_F,    KC_RSFT },
-  { KC_LCTL,   KC_LGUI, KC_RALT,     KC_LGUI, BP_UNDS, LT(_FN,KC_ENT), KC_DEL,  KC_KP_0, KC_BSPC,   LT(_FN,KC_SPC),  BP_UNDS, KC_RALT, KC_RALT,  KC_RGUI, KC_LCTL },
- },
+ [_BP] = LAYOUT_ortho_5x15( /* BepoDev */
+  BP_DOLLAR, BP_DQOT,  BP_LCBR,    BP_RCBR, BP_LPRN, BP_RPRN,        KC_VOLD, KC_MUTE, KC_VOLU,   BP_PLUS,         BP_MINUS,BP_SLASH,BP_ASTR,  BP_EQL,  BP_PERC,
+  KC_TAB,    BP_B,     BP_E_ACUTE, BP_P,    BP_O,    BP_E_GRAVE,     KC_KP_7, KC_KP_8, KC_KP_9,   BP_DCRC,         BP_V,    BP_D,    BP_L,     BP_J,    BP_Z,
+  KC_ESC,    BP_A,     BP_U,       BP_I,    BP_E,    BP_COMMA,       KC_HOME, KC_KP_5, KC_END,    BP_C,            BP_T,    BP_S,    BP_R,     BP_N,    BP_M,
+  KC_LSFT,   BP_W,     BP_Y,       BP_X,    BP_DOT,  BP_K,           KC_PGUP, KC_END,  KC_PGDOWN, BP_APOS,         BP_Q,    BP_G,    BP_H,     BP_F,    KC_RSFT,
+  KC_LCTL,   KC_LGUI, KC_RALT,     KC_LGUI, BP_UNDS, LT(_FN,KC_ENT), KC_DEL,  KC_KP_0, KC_BSPC,   LT(_FN,KC_SPC),  BP_UNDS, KC_RALT, KC_RALT,  KC_RGUI, KC_LCTL
+ ),
 
 
 /* FUNCTION
@@ -61,12 +61,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  */
 
 
- [_FN] = { /* FUNCTION */
-  { KC_F1,   KC_F2,      KC_F3,      KC_F4,      KC_F5,      KC_F6,          KC_MPRV, KC_MPLY, KC_MNXT, KC_F7,          KC_F8,      KC_F9,       KC_F10,      KC_F11,     KC_F12    },
-  { _______, S(BP_DQOT), S(BP_LGIL), S(BP_RGIL), S(BP_LPRN), S(BP_RPRN),     _______, _______, _______, S(BP_AT),       S(BP_PLUS), S(BP_MINUS), S(BP_SLASH), S(BP_ASTR), S(BP_EQL) },
-  { _______, RALT(BP_B), BP_BSLS,    BP_LBRC,    BP_RBRC,    RALT(BP_P),     _______, _______, _______, _______,        KC_LEFT,    KC_DOWN,     KC_UP  ,     KC_RGHT,    _______   },
-  { _______, BP_BSLS,    _______,    _______,    _______,    _______,        _______, _______, _______, _______,        BP_LESS,    BP_GRTR,     BP_AT  ,     _______,    _______   },
-  { _______, _______,    _______,    _______,    _______,    LT(_FN,KC_ENT), _______, _______, _______, LT(_FN,KC_SPC), _______,    _______,     _______,     _______,    RESET     },
- }
+ [_FN] = LAYOUT_ortho_5x15( /* FUNCTION */
+  KC_F1,   KC_F2,      KC_F3,      KC_F4,      KC_F5,      KC_F6,          KC_MPRV, KC_MPLY, KC_MNXT, KC_F7,          KC_F8,      KC_F9,       KC_F10,      KC_F11,     KC_F12,
+  _______, S(BP_DQOT), S(BP_LGIL), S(BP_RGIL), S(BP_LPRN), S(BP_RPRN),     _______, _______, _______, S(BP_AT),       S(BP_PLUS), S(BP_MINUS), S(BP_SLASH), S(BP_ASTR), S(BP_EQL),
+  _______, RALT(BP_B), BP_BSLS,    BP_LBRC,    BP_RBRC,    RALT(BP_P),     _______, _______, _______, _______,        KC_LEFT,    KC_DOWN,     KC_UP  ,     KC_RGHT,    _______,
+  _______, BP_BSLS,    _______,    _______,    _______,    _______,        _______, _______, _______, _______,        BP_LESS,    BP_GRTR,     BP_AT  ,     _______,    _______,
+  _______, _______,    _______,    _______,    _______,    LT(_FN,KC_ENT), _______, _______, _______, LT(_FN,KC_SPC), _______,    _______,     _______,     _______,    RESET
+ )
 
 };
diff --git a/qmk/keyboards/xd75/keymaps/dyn_macro_tap_dance/keymap.c b/qmk/keyboards/xd75/keymaps/dyn_macro_tap_dance/keymap.c
index cf4bfb4d..220c85dd 100644
--- a/qmk/keyboards/xd75/keymaps/dyn_macro_tap_dance/keymap.c
+++ b/qmk/keyboards/xd75/keymaps/dyn_macro_tap_dance/keymap.c
@@ -83,13 +83,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * '--------------------------------------------------------------------------------------------------------------------------------------'
  */
 
- [_QW] = { /* QWERTY */
-  { KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_MINS, KC_GRV,  KC_EQL,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC  },
-  { KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_LBRC, KC_BSLS, KC_RBRC, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_QUOT  },
-  { KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_HOME, KC_DEL,  KC_PGUP, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT   },
-  { KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_END,  KC_UP,   KC_PGDN, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT  },
-  { KC_LCTL, KC_LGUI, KC_LALT, MO(_FN), KC_SPC,  KC_SPC,  KC_LEFT, KC_DOWN, KC_RGHT, MCROTOG, KC_SPC,  MO(_FN), KC_RALT, KC_RGUI, KC_RCTL  },
- },
+ [_QW] = LAYOUT_ortho_5x15( /* QWERTY */
+  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_MINS, KC_GRV,  KC_EQL,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
+  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_LBRC, KC_BSLS, KC_RBRC, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_QUOT,
+  KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_HOME, KC_DEL,  KC_PGUP, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
+  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_END,  KC_UP,   KC_PGDN, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
+  KC_LCTL, KC_LGUI, KC_LALT, MO(_FN), KC_SPC,  KC_SPC,  KC_LEFT, KC_DOWN, KC_RGHT, MCROTOG, KC_SPC,  MO(_FN), KC_RALT, KC_RGUI, KC_RCTL
+ ),
 
 /* FUNCTION
  * .--------------------------------------------------------------------------------------------------------------------------------------.
@@ -105,13 +105,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * '--------------------------------------------------------------------------------------------------------------------------------------'
  */
  
- [_FN] = { /* FUNCTION */
-  { KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_NLCK, KC_SLSH, KC_ASTR, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12   },
-  { KC_MSEL, KC_CALC, KC_MYCM, KC_MAIL, RGB_HUD, RGB_HUI, KC_P7,   KC_P8,   KC_P9,   KC_MINS, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS  },
-  { KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP, RGB_SAD, RGB_SAI, KC_P4,   KC_P5,   KC_P6,   KC_PLUS, _______, RESET,   _______, _______, _______  },
-  { KC_VOLD, KC_MUTE, KC_VOLU, KC_APP,  RGB_VAD, RGB_VAI, KC_P1,   KC_P2,   KC_P3,   KC_PENT, _______, _______, _______, _______, _______  },
-  { _______, _______, RGB_TOG, MO(_FN), RGB_RMOD,RGB_MOD, KC_P0,   _______, KC_PDOT, KC_PENT, KC_PENT, MO(_FN), _______, _______, _______  },
- }
+ [_FN] = LAYOUT_ortho_5x15( /* FUNCTION */
+  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_NLCK, KC_SLSH, KC_ASTR, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
+  KC_MSEL, KC_CALC, KC_MYCM, KC_MAIL, RGB_HUD, RGB_HUI, KC_P7,   KC_P8,   KC_P9,   KC_MINS, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS,
+  KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP, RGB_SAD, RGB_SAI, KC_P4,   KC_P5,   KC_P6,   KC_PLUS, _______, RESET,   _______, _______, _______,
+  KC_VOLD, KC_MUTE, KC_VOLU, KC_APP,  RGB_VAD, RGB_VAI, KC_P1,   KC_P2,   KC_P3,   KC_PENT, _______, _______, _______, _______, _______,
+  _______, _______, RGB_TOG, MO(_FN), RGB_RMOD,RGB_MOD, KC_P0,   _______, KC_PDOT, KC_PENT, KC_PENT, MO(_FN), _______, _______, _______
+ )
 };
 
 const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
diff --git a/qmk/keyboards/xd75/keymaps/emilyh/keymap.c b/qmk/keyboards/xd75/keymaps/emilyh/keymap.c
index bea9863d..3197b6bd 100644
--- a/qmk/keyboards/xd75/keymaps/emilyh/keymap.c
+++ b/qmk/keyboards/xd75/keymaps/emilyh/keymap.c
@@ -43,13 +43,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * '--------------------------------------------------------------------------------------------------------------------------------------'
  */
 	
- [_QW] = { /* QWERTY */
-  { KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_EQL,  KC_PSLS, KC_PAST, KC_PPLS  },
-  { KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC, KC_P7,   KC_P8,   KC_P9   },
-  { 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_P4,   KC_P5,   KC_P6  },
-  { KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_UP,   KC_ENT,  KC_P1,   KC_P2,   KC_P3  },
-  { KC_LCTL, M(0),    KC_LGUI, KC_LALT, MO(_LW), KC_SPC,  KC_SPC,  MO(_RS), KC_SLSH, KC_LEFT, KC_DOWN, KC_RIGHT,KC_P0,   KC_PDOT, KC_PENT  },
- },
+ [_QW] = LAYOUT_ortho_5x15( /* QWERTY */
+  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_EQL,  KC_PSLS, KC_PAST, KC_PPLS,
+  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC, KC_P7,   KC_P8,   KC_P9,
+  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_P4,   KC_P5,   KC_P6,
+  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_UP,   KC_ENT,  KC_P1,   KC_P2,   KC_P3,
+  KC_LCTL, M(0),    KC_LGUI, KC_LALT, MO(_LW), KC_SPC,  KC_SPC,  MO(_RS), KC_SLSH, KC_LEFT, KC_DOWN, KC_RIGHT,KC_P0,   KC_PDOT, KC_PENT
+ ),
 
 /* COLEMAK - MIT ENHANCED / GRID COMPATIBLE
  * .---------------------------------------------------------------------------------------------------------------------- 2u ------------.
@@ -65,13 +65,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * '--------------------------------------------------------------------------------------------------------------------------------------'
  */
 	
- [_CM] = { /* COLEMAK */
-  { 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_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL   },
-  { KC_ESC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT, KC_ENT,  KC_ENT,  KC_PGUP  },
-  { KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_RSFT, KC_UP,   KC_PGDN  },
-  { M(0),    KC_LCTL, KC_LALT, KC_LGUI, MO(_RS), KC_SPC,  KC_SPC,  MO(_LW), KC_RGUI, KC_RALT, KC_RCTL, MO(_FN), KC_LEFT, KC_DOWN, KC_RGHT  },
- },
+ [_CM] = LAYOUT_ortho_5x15( /* COLEMAK */
+  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_TAB,  KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
+  KC_ESC,  KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT, KC_ENT,  KC_ENT,  KC_PGUP,
+  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_RSFT, KC_UP,   KC_PGDN,
+  M(0),    KC_LCTL, KC_LALT, KC_LGUI, MO(_RS), KC_SPC,  KC_SPC,  MO(_LW), KC_RGUI, KC_RALT, KC_RCTL, MO(_FN), KC_LEFT, KC_DOWN, KC_RGHT
+ ),
 	
 /* DVORAK - MIT ENHANCED / GRID COMPATIBLE
  * .---------------------------------------------------------------------------------------------------------------------- 2u ------------.
@@ -87,13 +87,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * '--------------------------------------------------------------------------------------------------------------------------------------'
  */
 
- [_DV] = { /* DVORAK */
-  { 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_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL   },
-  { KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH, KC_ENT,  KC_ENT,  KC_PGUP  },
-  { KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_RSFT, KC_RSFT, KC_UP,   KC_PGDN  },
-  { M(0),    KC_LCTL, KC_LALT, KC_LGUI, MO(_RS), KC_SPC,  KC_SPC,  MO(_LW), KC_RGUI, KC_RALT, KC_RCTL, MO(_FN), KC_LEFT, KC_DOWN, KC_RGHT  },
- },
+ [_DV] = LAYOUT_ortho_5x15( /* DVORAK */
+  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_TAB,  KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_LBRC, KC_RBRC, KC_BSLS, KC_DEL,
+  KC_ESC,  KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH, KC_ENT,  KC_ENT,  KC_PGUP,
+  KC_LSFT, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    KC_RSFT, KC_RSFT, KC_UP,   KC_PGDN,
+  M(0),    KC_LCTL, KC_LALT, KC_LGUI, MO(_RS), KC_SPC,  KC_SPC,  MO(_LW), KC_RGUI, KC_RALT, KC_RCTL, MO(_FN), KC_LEFT, KC_DOWN, KC_RGHT
+ ),
 
 /* LOWERED
  * .---------------------------------------------------------------------------------------------------------------------- 2u ------------.
@@ -109,13 +109,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * '--------------------------------------------------------------------------------------------------------------------------------------'
  */
  
- [_LW] = { /* LOWERED */
-  { _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  ___T___, ___T___  },
-  { _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, _______, _______, KC_INS   },
-  { RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, ___T___, ___T___, _______  },
-  { _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______, _______, ___T___, ___T___, _______, _______  },
-  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  },
- },
+ [_LW] = LAYOUT_ortho_5x15( /* LOWERED */
+  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  ___T___, ___T___,
+  _______, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, _______, _______, KC_INS,
+  RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, ___T___, ___T___, _______,
+  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______, _______, ___T___, ___T___, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ ),
 
 /* RAISED
  * .---------------------------------------------------------------------------------------------------------------------- 2u ------------.
@@ -131,13 +131,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * '--------------------------------------------------------------------------------------------------------------------------------------'
  */
  
- [_RS] = { /* RAISED */
-  { _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  ___T___, ___T___  },
-  { _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______, _______, _______, KC_INS   },
-  { _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS, ___T___, ___T___, _______  },
-  { _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______, _______, ___T___, ___T___, _______, _______  },
-  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  },
- },
+ [_RS] = LAYOUT_ortho_5x15( /* RAISED */
+  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  ___T___, ___T___,
+  _______, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    _______, _______, _______, KC_INS,
+  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS, ___T___, ___T___, _______,
+  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______, _______, _______, ___T___, ___T___, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ ),
  
 /* FUNCTION
  * .---------------------------------------------------------------------------------------------------------------------- 2u ------------.
@@ -153,13 +153,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * '--------------------------------------------------------------------------------------------------------------------------------------'
  */
  
- [_FN] = { /* FUNCTION */
-  { KC_NLCK, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  ___T___, ___T___  },
-  { KC_SLCK, KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24,  KC_PAUS, KC_PSCR  },
-  { KC_CAPS, KC_BTN5, KC_BTN4, KC_BTN3, KC_BTN2, KC_ACL0, KC_ACL2, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, _______, ___T___, ___T___, KC_WH_U  },
-  { RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, BL_TOGG, BL_INC,  BL_DEC,   ___T___, ___T___, KC_MS_U, KC_WH_D  },
-  { RESET  , _______, DF(_QW), DF(_CM), DF(_DV), KC_BTN1, KC_BTN1, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R  },
- },
+ [_FN] = LAYOUT_ortho_5x15( /* FUNCTION */
+  KC_NLCK, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  ___T___, ___T___,
+  KC_SLCK, KC_F13,  KC_F14,  KC_F15,  KC_F16,  KC_F17,  KC_F18,  KC_F19,  KC_F20,  KC_F21,  KC_F22,  KC_F23,  KC_F24,  KC_PAUS, KC_PSCR,
+  KC_CAPS, KC_BTN5, KC_BTN4, KC_BTN3, KC_BTN2, KC_ACL0, KC_ACL2, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY, _______, ___T___, ___T___, KC_WH_U,
+  RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, BL_TOGG, BL_INC,  BL_DEC,   ___T___, ___T___, KC_MS_U, KC_WH_D,
+  RESET  , _______, DF(_QW), DF(_CM), DF(_DV), KC_BTN1, KC_BTN1, _______, _______, _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R
+ )
 };
 
 const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
diff --git a/qmk/keyboards/xd75/keymaps/fabian/keymap.c b/qmk/keyboards/xd75/keymaps/fabian/keymap.c
index 7c515626..0d59e4ce 100644
--- a/qmk/keyboards/xd75/keymaps/fabian/keymap.c
+++ b/qmk/keyboards/xd75/keymaps/fabian/keymap.c
@@ -64,13 +64,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * | Ctrl | Meh  | Alt  | GUI  |Lower |Space |      |      |      | Tab  |Raise | GUI  |AltGr | Umlt | Ctrl |
  * `--------------------------------------------------------------------------------------------------------'
  */
-[_QWERTY] = {
-  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
-  { HPR_TAB, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    _______, _______, _______, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC },
-  { CTL_ESC, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    _______, _______, _______, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT },
-  { SFT_BSP, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    _______, _______, _______, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SFT_ENT },
-  { KC_LCTL, MEH_GRV, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  _______, _______, _______, HPR_TAB, RAISE,   KC_RGUI, KC_RALT, UMLAUT,  KC_RCTL }
-},
+[_QWERTY] = LAYOUT_ortho_5x15(
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  HPR_TAB, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    _______, _______, _______, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+  CTL_ESC, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    _______, _______, _______, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+  SFT_BSP, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    _______, _______, _______, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SFT_ENT,
+  KC_LCTL, MEH_GRV, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  _______, _______, _______, HPR_TAB, RAISE,   KC_RGUI, KC_RALT, UMLAUT,  KC_RCTL
+),
 
 /* Colemak
  * ,--------------------------------------------------------------------------------------------------------.
@@ -85,13 +85,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * | Ctrl | Meh  | Alt  | GUI  |Lower |Space |      |      |      | Tab  |Raise | GUI  |AltGr | Umlt | Ctrl |
  * `--------------------------------------------------------------------------------------------------------'
  */
-[_COLEMAK] = {
-  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
-  { HPR_TAB, KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    _______, _______, _______, KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC },
-  { CTL_ESC, KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    _______, _______, _______, KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT },
-  { SFT_BSP, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    _______, _______, _______, KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SFT_ENT },
-  { KC_LCTL, MEH_GRV, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  _______, _______, _______, HPR_TAB, RAISE,   KC_RGUI, KC_RALT, UMLAUT,  KC_RCTL }
-},
+[_COLEMAK] = LAYOUT_ortho_5x15(
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  HPR_TAB, KC_Q,    KC_W,    KC_F,    KC_P,    KC_G,    _______, _______, _______, KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
+  CTL_ESC, KC_A,    KC_R,    KC_S,    KC_T,    KC_D,    _______, _______, _______, KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
+  SFT_BSP, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    _______, _______, _______, KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SFT_ENT,
+  KC_LCTL, MEH_GRV, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  _______, _______, _______, HPR_TAB, RAISE,   KC_RGUI, KC_RALT, UMLAUT,  KC_RCTL
+),
 
 /* Dvorak
  * ,--------------------------------------------------------------------------------------------------------.
@@ -106,13 +106,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * | Ctrl | Meh  | Alt  | GUI  |Lower |Space |      |      |      | Tab  |Raise | GUI  |AltGr | Umlt | Ctrl |
  * `--------------------------------------------------------------------------------------------------------'
  */
-[_DVORAK] = {
-  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
-  { HPR_TAB, KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    _______, _______, _______, KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC },
-  { CTL_ESC, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    _______, _______, _______, KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH },
-  { SFT_BSP, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    _______, _______, _______, KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    SFT_ENT },
-  { KC_LCTL, MEH_GRV, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  _______, _______, _______, HPR_TAB, RAISE,   KC_RGUI, KC_RALT, UMLAUT,  KC_RCTL }
-},
+[_DVORAK] = LAYOUT_ortho_5x15(
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  HPR_TAB, KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    _______, _______, _______, KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    KC_BSPC,
+  CTL_ESC, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    _______, _______, _______, KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
+  SFT_BSP, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    _______, _______, _______, KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    SFT_ENT,
+  KC_LCTL, MEH_GRV, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  _______, _______, _______, HPR_TAB, RAISE,   KC_RGUI, KC_RALT, UMLAUT,  KC_RCTL
+),
 
 /* Lower
  * ,--------------------------------------------------------------------------------------------------------.
@@ -127,13 +127,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |      |      |      |      |      |      |      |      |      |      |      | Next | Vol- | Vol+ | Play |
  * `--------------------------------------------------------------------------------------------------------'
   */
-[_LOWER] = {
-  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
-  { KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, _______, _______, _______, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC },
-  { KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   _______, _______, _______, KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE },
-  { _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  _______, _______, _______, KC_F12,  KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_BTN1 },
-  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY }
-},
+[_LOWER] = LAYOUT_ortho_5x15(
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, _______, _______, _______, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
+  KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   _______, _______, _______, KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
+  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  _______, _______, _______, KC_F12,  KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_BTN1,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+),
 
 /* Raise
  * ,--------------------------------------------------------------------------------------------------------.
@@ -148,13 +148,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |      |      |      |      |      |      |      |      |      |      |      | Next | Vol- | Vol+ | Play |
  * `--------------------------------------------------------------------------------------------------------'
  */
-[_RAISE] = {
-  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
-  { KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    _______, _______, _______, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC },
-  { KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   _______, _______, _______, KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS },
-  { _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  _______, _______, _______, KC_F12,  KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_BTN2 },
-  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY }
-},
+[_RAISE] = LAYOUT_ortho_5x15(
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    _______, _______, _______, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
+  KC_DEL,  KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   _______, _______, _______, KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
+  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  _______, _______, _______, KC_F12,  KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, KC_BTN2,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_MNXT, KC_VOLD, KC_VOLU, KC_MPLY
+),
 
 /* Plover layer (http://opensteno.org)
  * ,--------------------------------------------------------------------------------------------------------.
@@ -170,13 +170,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `--------------------------------------------------------------------------------------------------------'
  */
 
-[_PLOVER] = {
-  { XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX },
-  { KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    XXXXXXX, XXXXXXX, XXXXXXX, KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1    },
-  { XXXXXXX, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    XXXXXXX, XXXXXXX, XXXXXXX, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC },
-  { XXXXXXX, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    XXXXXXX, XXXXXXX, XXXXXXX, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT },
-  { EXT_PLV, XXXXXXX, XXXXXXX, KC_C,    KC_V,    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_N,    KC_M,    XXXXXXX, XXXXXXX, XXXXXXX }
-},
+[_PLOVER] = LAYOUT_ortho_5x15(
+  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+  KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    XXXXXXX, XXXXXXX, XXXXXXX, KC_1,    KC_1,    KC_1,    KC_1,    KC_1,    KC_1,
+  XXXXXXX, KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    XXXXXXX, XXXXXXX, XXXXXXX, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC,
+  XXXXXXX, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    XXXXXXX, XXXXXXX, XXXXXXX, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+  EXT_PLV, XXXXXXX, XXXXXXX, KC_C,    KC_V,    XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_N,    KC_M,    XXXXXXX, XXXXXXX, XXXXXXX
+),
 
 /* Adjust (Lower + Raise)
  * ,--------------------------------------------------------------------------------------------------------.
@@ -192,13 +192,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `--------------------------------------------------------------------------------------------------------'
  */
 
-[_ADJUST] = {
-  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
-  { _______, RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,   KC_DEL  },
-  { _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, _______, _______, _______, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______ },
-  { _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   _______, _______, _______, MI_OFF,  _______, _______, _______, _______, _______ },
-  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ }
-}
+[_ADJUST] = LAYOUT_ortho_5x15(
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,   KC_DEL,
+  _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, _______, _______, _______, AG_SWAP, QWERTY,  COLEMAK, DVORAK,  PLOVER,  _______,
+  _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   _______, _______, _______, MI_OFF,  _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+)
 };
 
 #ifdef AUDIO_ENABLE
diff --git a/qmk/keyboards/xd75/keymaps/french/keymap.c b/qmk/keyboards/xd75/keymaps/french/keymap.c
index 547a67b6..f8de0763 100644
--- a/qmk/keyboards/xd75/keymaps/french/keymap.c
+++ b/qmk/keyboards/xd75/keymaps/french/keymap.c
@@ -23,13 +23,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * '--------------------------------------------------------------------------------------------------------------------------------------'
  */
 
- [_AZ] = { /* AZERTY */
-  { FR_ESC,  	FR_AMP, 	FR_EACU, 	FR_QUOT, 	FR_APOS,  	FR_LPAR, 	FR_MINS, 	FR_EGRV,  	FR_UNDS,  	FR_CCED,  	FR_AGRV,  	FR_RPAR,  	FR_EQUA,  	FR_INST,  	FR_BSPC },
-  { FR_TAB,  	FR_A,   	FR_Z,    	FR_E,    	FR_R,     	FR_T,    	FR_Y,    	FR_U,     	FR_I,     	FR_O,		FR_P,     	FR_HAT,   	FR_DLR,   	FR_ENTR,  	FR_PGUP },
-  { FR_CAPL, 	FR_Q,   	FR_S,    	FR_D,    	FR_F,     	FR_G,    	FR_H,    	FR_J,     	FR_K,     	FR_L,     	FR_M,     	FR_UGRV,  	FR_AST,   	FR_ENTR,  	FR_PGDN },
-  { FR_LSFT, 	FR_W,    	FR_X,    	FR_C,    	FR_V,     	FR_B,    	FR_N,    	FR_COMM,  	FR_SCLN,  	FR_COLN,  	FR_EXCL,  	FR_LESS,      	FR_RSFT,  	FR_UP,    	FR_DEL  },
-  { FR_LCTR, 	FR_LCMD, 	FR_LALT, 	MO(_FN),	FR_SPAC,  	FR_SPAC, 	FR_SPAC, 	FR_SPAC,  	FR_ALGR,  	FR_MENU,  	FR_HOME,  	FR_END,   	FR_LEFT,  	FR_DOWN,  	FR_RIGT },
- },
+ [_AZ] = LAYOUT_ortho_5x15( /* AZERTY */
+  FR_ESC,  	FR_AMP, 	FR_EACU, 	FR_QUOT, 	FR_APOS,  	FR_LPAR, 	FR_MINS, 	FR_EGRV,  	FR_UNDS,  	FR_CCED,  	FR_AGRV,  	FR_RPAR,  	FR_EQUA,  	FR_INST,  	FR_BSPC,
+  FR_TAB,  	FR_A,   	FR_Z,    	FR_E,    	FR_R,     	FR_T,    	FR_Y,    	FR_U,     	FR_I,     	FR_O,		FR_P,     	FR_HAT,   	FR_DLR,   	FR_ENTR,  	FR_PGUP,
+  FR_CAPL, 	FR_Q,   	FR_S,    	FR_D,    	FR_F,     	FR_G,    	FR_H,    	FR_J,     	FR_K,     	FR_L,     	FR_M,     	FR_UGRV,  	FR_AST,   	FR_ENTR,  	FR_PGDN,
+  FR_LSFT, 	FR_W,    	FR_X,    	FR_C,    	FR_V,     	FR_B,    	FR_N,    	FR_COMM,  	FR_SCLN,  	FR_COLN,  	FR_EXCL,  	FR_LESS,      	FR_RSFT,  	FR_UP,    	FR_DEL,
+  FR_LCTR, 	FR_LCMD, 	FR_LALT, 	MO(_FN),	FR_SPAC,  	FR_SPAC, 	FR_SPAC, 	FR_SPAC,  	FR_ALGR,  	FR_MENU,  	FR_HOME,  	FR_END,   	FR_LEFT,  	FR_DOWN,  	FR_RIGT
+ ),
 
 
 /* FUNCTION
@@ -46,11 +46,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * '--------------------------------------------------------------------------------------------------------------------------------------'
  */
  
- [_FN] = { /* FUNCTION */
-  { FR_EMPT,	FR_F1,		FR_F2,		FR_F3,		FR_F4,		FR_F5,		FR_F6,  	FR_F7,		FR_F8,    	FR_F9,		FR_F10, 	FR_F11,  	FR_F12,   	FR_PSCR,	BL_TOGG },
-  { FR_EMPT,	FR_MPRV,	FR_MPLY,	FR_MNXT,	FR_EMPT,	FR_EMPT,	FR_EMPT,	FR_EMPT,	FR_NUML,  	FR_7,     	FR_8,   	FR_9,    	FR_MULT,  	FR_EMPT,	BL_INC	},
-  { FR_EMPT,	FR_MVDN,	FR_MUTE,	FR_MVUP,	FR_EMPT,	FR_EMPT,	FR_EMPT,	FR_EMPT,	FR_EMPT,  	FR_4,     	FR_5,   	FR_6,    	FR_MOIN,  	FR_EMPT,	BL_DEC	},
-  { FR_EMPT,	FR_EMPT,	FR_EMPT,	FR_EMPT,	FR_EMPT,	FR_EMPT,	FR_EMPT,	FR_EMPT,  	FR_EMPT,  	FR_1,     	FR_2,   	FR_3,    	FR_PLUS,  	FR_EMPT,	BL_ON 	},
-  { RESET,	FR_EMPT,	FR_EMPT,	FR_TRANS,	FR_EMPT,	FR_EMPT,	FR_EMPT,	FR_EMPT,  	FR_EMPT,  	FR_EMPT,  	FR_0,   	FR_DOT,  	FR_ENTK,  	FR_EMPT,	BL_STEP	},
- },
+ [_FN] = LAYOUT_ortho_5x15( /* FUNCTION */
+  FR_EMPT,	FR_F1,		FR_F2,		FR_F3,		FR_F4,		FR_F5,		FR_F6,  	FR_F7,		FR_F8,    	FR_F9,		FR_F10, 	FR_F11,  	FR_F12,   	FR_PSCR,	BL_TOGG,
+  FR_EMPT,	FR_MPRV,	FR_MPLY,	FR_MNXT,	FR_EMPT,	FR_EMPT,	FR_EMPT,	FR_EMPT,	FR_NUML,  	FR_7,     	FR_8,   	FR_9,    	FR_MULT,  	FR_EMPT,	BL_INC,
+  FR_EMPT,	FR_MVDN,	FR_MUTE,	FR_MVUP,	FR_EMPT,	FR_EMPT,	FR_EMPT,	FR_EMPT,	FR_EMPT,  	FR_4,     	FR_5,   	FR_6,    	FR_MOIN,  	FR_EMPT,	BL_DEC,
+  FR_EMPT,	FR_EMPT,	FR_EMPT,	FR_EMPT,	FR_EMPT,	FR_EMPT,	FR_EMPT,	FR_EMPT,  	FR_EMPT,  	FR_1,     	FR_2,   	FR_3,    	FR_PLUS,  	FR_EMPT,	BL_ON,
+  RESET,	FR_EMPT,	FR_EMPT,	FR_TRANS,	FR_EMPT,	FR_EMPT,	FR_EMPT,	FR_EMPT,  	FR_EMPT,  	FR_EMPT,  	FR_0,   	FR_DOT,  	FR_ENTK,  	FR_EMPT,	BL_STEP
+ )
 };
diff --git a/qmk/keyboards/xd75/keymaps/germanized/keymap.c b/qmk/keyboards/xd75/keymaps/germanized/keymap.c
index bba1172e..77346d18 100644
--- a/qmk/keyboards/xd75/keymaps/germanized/keymap.c
+++ b/qmk/keyboards/xd75/keymaps/germanized/keymap.c
@@ -53,13 +53,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * °-----------------------------------------------------------------------------------------------------------------------°
  */
  
-	[_QWZ] = {
-	{ TD(TD_ESC_RUPT), KC_1,    KC_2,          KC_3,   KC_4,   KC_5,    KC_6,  KC_7,  KC_8,                  KC_9,    KC_0,    DE_SS,   DE_ACUT,               KC_BSPC, KC_ESC  }, 
-	{ KC_TAB,          KC_Q,    KC_W,          KC_E,   KC_R,   KC_T,    DE_Z,  KC_U,  KC_I,                  KC_O,    KC_P,    DE_UE,   DE_PLUS,               KC_NO,   KC_PGUP }, 
-	{ TD(TD_TAB),      KC_A,    KC_S,          KC_D,   KC_F,   KC_G,    KC_H,  KC_J,  KC_K,                  KC_L,    DE_OE,   DE_AE,   DE_HASH,               KC_ENT,  KC_PGDN }, 
-    { KC_LSFT,         DE_Y,    KC_X,          KC_C,   KC_V,   KC_B,    KC_N,  KC_M,  KC_COMM,               KC_DOT,  DE_MINS, DE_CIRC, MT(MOD_RSFT, KC_HOME), KC_UP,   KC_END  }, 
-    { KC_LCTL,         KC_LALT, LT(1, KC_ENT), KC_SPC, KC_NO,  KC_BSPC, KC_NO, TT(1), MT(MOD_RALT, KC_PAUS), KC_RGUI, DE_LESS, KC_DEL,  KC_LEFT,               KC_DOWN, KC_RGHT },
-    },
+	[_QWZ] = LAYOUT_ortho_5x15(
+	TD(TD_ESC_RUPT), KC_1,    KC_2,          KC_3,   KC_4,   KC_5,    KC_6,  KC_7,  KC_8,                  KC_9,    KC_0,    DE_SS,   DE_ACUT,               KC_BSPC, KC_ESC,
+	KC_TAB,          KC_Q,    KC_W,          KC_E,   KC_R,   KC_T,    DE_Z,  KC_U,  KC_I,                  KC_O,    KC_P,    DE_UE,   DE_PLUS,               KC_NO,   KC_PGUP,
+	TD(TD_TAB),      KC_A,    KC_S,          KC_D,   KC_F,   KC_G,    KC_H,  KC_J,  KC_K,                  KC_L,    DE_OE,   DE_AE,   DE_HASH,               KC_ENT,  KC_PGDN,
+    KC_LSFT,         DE_Y,    KC_X,          KC_C,   KC_V,   KC_B,    KC_N,  KC_M,  KC_COMM,               KC_DOT,  DE_MINS, DE_CIRC, MT(MOD_RSFT, KC_HOME), KC_UP,   KC_END,
+    KC_LCTL,         KC_LALT, LT(1, KC_ENT), KC_SPC, KC_NO,  KC_BSPC, KC_NO, TT(1), MT(MOD_RALT, KC_PAUS), KC_RGUI, DE_LESS, KC_DEL,  KC_LEFT,               KC_DOWN, KC_RGHT
+    ),
 	
 	/* FNC
  * .-----------------------------------------------------------------------------------------------------------------------.
@@ -74,13 +74,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * | TO(0) | _____ | _____ | _____ | _____ | _____ | _____ | _____ | _____ | _____ | _____ | _____ | Prev  | VolDn | Next  |
  * °-----------------------------------------------------------------------------------------------------------------------°
 */	
-	[_FNC] = {
-	{ RESET,   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_TRNS, KC_TRNS }, 
-	{ KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP,   KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS }, 
-	{ KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_MPLY, KC_TRNS }, 
-	{ KC_CAPS, KC_TRNS, KC_TRNS, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_MUTE }, 
-	{ TO(0),   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_VOLD, KC_MNXT },
-	}, 
+	[_FNC] = LAYOUT_ortho_5x15(
+	RESET,   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_TRNS, KC_TRNS,
+	KC_TRNS, KC_TRNS, KC_TRNS, RGB_VAI, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_UP,   KC_PSCR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+	KC_TRNS, KC_TRNS, KC_TRNS, RGB_TOG, RGB_MOD, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_MPLY, KC_TRNS,
+	KC_CAPS, KC_TRNS, KC_TRNS, RGB_VAD, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, KC_MUTE,
+	TO(0),   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_VOLD, KC_MNXT
+	)
 	
 };
 
diff --git a/qmk/keyboards/xd75/keymaps/jarred/keymap.c b/qmk/keyboards/xd75/keymaps/jarred/keymap.c
index f8517871..a8751650 100644
--- a/qmk/keyboards/xd75/keymaps/jarred/keymap.c
+++ b/qmk/keyboards/xd75/keymaps/jarred/keymap.c
@@ -6,32 +6,32 @@
 #define _NM 3
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [_QW] = {
-  { KC_ESC , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_MUTE, KC_VOLD, KC_VOLU, KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_BSPC },
-  { KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_INS , KC_HOME, KC_PGUP, KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_BSPC },
-  { MO(_NV), KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_DEL , KC_END , KC_PGDN, KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT },
-  { KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , _______, KC_UP  , _______, KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT },
-  { KC_LCTL, KC_LGUI, MO(_NM), KC_LALT, MO(_LW), KC_SPC , KC_LEFT, KC_DOWN, KC_RGHT, KC_ENT , MO(_LW), KC_RALT, KC_RGUI, KC_APP , KC_RCTL },
- },
- [_LW] = {
-  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
-  { KC_ESC , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , _______, _______, _______, KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , _______ },
-  { _______, KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , _______, _______, _______, KC_F11 , KC_MINS, KC_EQL , KC_LBRC, KC_RBRC, KC_BSLS },
-  { _______, KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , _______, _______, _______, KC_F12 , KC_GRV , _______, _______, _______, _______ },
-  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
- },
- [_NV] = {
-  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
-  { _______, _______, _______, _______, KC_DEL , KC_BSPC, _______, _______, _______, _______, KC_HOME, KC_UP  , KC_END , KC_INS , _______ },
-  { _______, _______, _______, KC_LSFT, KC_LCTL, KC_ENT , _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_DEL , _______ },
-  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN, _______, _______, _______ },
-  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
- },
- [_NM] = {
-  { _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______ },
-  { _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_HUI, _______, _______, _______, _______, _______, _______, _______ },
-  { _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_SAI, _______, _______, _______, _______, _______, _______, _______ },
-  { _______, _______, _______, _______, _______, _______, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, _______ },
-  { RESET  , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
- }
+ [_QW] = LAYOUT_ortho_5x15(
+  KC_ESC , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , KC_MUTE, KC_VOLD, KC_VOLU, KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , KC_BSPC,
+  KC_TAB , KC_Q   , KC_W   , KC_E   , KC_R   , KC_T   , KC_INS , KC_HOME, KC_PGUP, KC_Y   , KC_U   , KC_I   , KC_O   , KC_P   , KC_BSPC,
+  MO(_NV), KC_A   , KC_S   , KC_D   , KC_F   , KC_G   , KC_DEL , KC_END , KC_PGDN, KC_H   , KC_J   , KC_K   , KC_L   , KC_SCLN, KC_QUOT,
+  KC_LSFT, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , _______, KC_UP  , _______, KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT,
+  KC_LCTL, KC_LGUI, MO(_NM), KC_LALT, MO(_LW), KC_SPC , KC_LEFT, KC_DOWN, KC_RGHT, KC_ENT , MO(_LW), KC_RALT, KC_RGUI, KC_APP , KC_RCTL
+ ),
+ [_LW] = LAYOUT_ortho_5x15(
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  KC_ESC , KC_1   , KC_2   , KC_3   , KC_4   , KC_5   , _______, _______, _______, KC_6   , KC_7   , KC_8   , KC_9   , KC_0   , _______,
+  _______, KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , _______, _______, _______, KC_F11 , KC_MINS, KC_EQL , KC_LBRC, KC_RBRC, KC_BSLS,
+  _______, KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , _______, _______, _______, KC_F12 , KC_GRV , _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ ),
+ [_NV] = LAYOUT_ortho_5x15(
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, KC_DEL , KC_BSPC, _______, _______, _______, _______, KC_HOME, KC_UP  , KC_END , KC_INS , _______,
+  _______, _______, _______, KC_LSFT, KC_LCTL, KC_ENT , _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_DEL , _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, KC_PGDN, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ ),
+ [_NM] = LAYOUT_ortho_5x15(
+  _______, _______, _______, _______, _______, _______, RGB_TOG, RGB_MOD, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, RGB_HUD, RGB_HUI, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, RGB_SAD, RGB_SAI, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, _______,
+  RESET  , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ )
 };
diff --git a/qmk/keyboards/xd75/keymaps/kim-kim-xd73/keymap.c b/qmk/keyboards/xd75/keymaps/kim-kim-xd73/keymap.c
index 61e5c73a..edbcfe97 100644
--- a/qmk/keyboards/xd75/keymaps/kim-kim-xd73/keymap.c
+++ b/qmk/keyboards/xd75/keymaps/kim-kim-xd73/keymap.c
@@ -40,13 +40,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * '--------------------------------------------------------------------------------------------------------------------------------------'
  */
 	
- [_QW] = { /* SPLIT QWERTY */
-  { KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_PSLS, KC_PAST, KC_PMNS, KC_6,   KC_7,    KC_8,    KC_9,    KC_0,    KC_GRV  },
-  { KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_P7,   KC_P8,   KC_P9,   KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC  },
-  { KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_P4,   KC_P5,   KC_P6,   KC_H,   KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT   },
-  { KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_P1,   KC_P2,   KC_P3,   KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT },
-  { _______, KC_LALT, MO(_RS), KC_LGUI, KC_SPC,  KC_SPC,  KC_PPLS, KC_P0,   KC_PDOT, KC_SPC, KC_SPC,  KC_RGUI, MO(_LW), KC_RALT, _______  },
- },
+ [_QW] = LAYOUT_ortho_5x15( /* SPLIT QWERTY */
+  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_PSLS, KC_PAST, KC_PMNS, KC_6,   KC_7,    KC_8,    KC_9,    KC_0,    KC_GRV,
+  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_P7,   KC_P8,   KC_P9,   KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+  KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_P4,   KC_P5,   KC_P6,   KC_H,   KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_P1,   KC_P2,   KC_P3,   KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
+  _______, KC_LALT, MO(_RS), KC_LGUI, KC_SPC,  KC_SPC,  KC_PPLS, KC_P0,   KC_PDOT, KC_SPC, KC_SPC,  KC_RGUI, MO(_LW), KC_RALT, _______
+ ),
 
 /* LOWERED
  * .--------------------------------------------------------------------------------------------------------------------------------------.
@@ -62,13 +62,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * '--------------------------------------------------------------------------------------------------------------------------------------'
  */
  
- [_LW] = { /* LOWERED */
-  { _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F11,  _______, _______, _______, _______, _______, _______, _______, _______  },
-  { _______, KC_MPRV, KC_MNXT, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  },
-  { _______, KC_MPLY, KC_MSTP, KC_VOLD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  },
-  { _______, _______, _______, KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  },
-  { _______, MO(_RT), MO(_RT), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  },
- },
+ [_LW] = LAYOUT_ortho_5x15( /* LOWERED */
+  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F11,  _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, KC_MPRV, KC_MNXT, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, KC_MPLY, KC_MSTP, KC_VOLD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, MO(_RT), MO(_RT), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ ),
 
 /* RAISED
  * .--------------------------------------------------------------------------------------------------------------------------------------.
@@ -84,13 +84,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * '--------------------------------------------------------------------------------------------------------------------------------------'
  */
  
- [_RS] = { /* RAISED */
-  { _______, _______, _______, _______, _______, _______, _______, _______, KC_F12,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_DEL  },
-  { _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, KC_LBRC, KC_RBRC, KC_MINS, KC_EQL,  KC_BSLS },
-  { _______, _______, _______, _______, _______, _______, _______, _______, BL_INC, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______  },
-  { _______, _______, _______, _______, _______, _______, _______, _______, BL_DEC, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END,  _______ },
-  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(_RT), MO(_RT), _______ },
- },
+ [_RS] = LAYOUT_ortho_5x15( /* RAISED */
+  _______, _______, _______, _______, _______, _______, _______, _______, KC_F12,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_DEL,
+  _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, KC_LBRC, KC_RBRC, KC_MINS, KC_EQL,  KC_BSLS,
+  _______, _______, _______, _______, _______, _______, _______, _______, BL_INC, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, BL_DEC, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END,  _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(_RT), MO(_RT), _______
+ ),
 
 /* RESET
  * .--------------------------------------------------------------------------------------------------------------------------------------.
@@ -106,13 +106,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * '--------------------------------------------------------------------------------------------------------------------------------------'
  */
  
- [_RT] = { /* RESET */
-  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
-  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
-  { _______, _______, _______, _______, _______, _______, _______, RESET,   _______, _______, _______, _______, _______, _______, _______  },
-  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
-  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
- }
+ [_RT] = LAYOUT_ortho_5x15( /* RESET */
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, RESET,   _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ )
 
 };
 
diff --git a/qmk/keyboards/xd75/keymaps/kim-kim/keymap.c b/qmk/keyboards/xd75/keymaps/kim-kim/keymap.c
index f46c0b65..0557074d 100644
--- a/qmk/keyboards/xd75/keymaps/kim-kim/keymap.c
+++ b/qmk/keyboards/xd75/keymaps/kim-kim/keymap.c
@@ -40,13 +40,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * '--------------------------------------------------------------------------------------------------------------------------------------'
  */
 	
- [_QW] = { /* SPLIT QWERTY */
-  { KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_PSLS, KC_PAST, KC_PMNS, KC_6,   KC_7,    KC_8,    KC_9,    KC_0,    KC_GRV  },
-  { KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_P7,   KC_P8,   KC_P9,   KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC  },
-  { KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_P4,   KC_P5,   KC_P6,   KC_H,   KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT   },
-  { KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_P1,   KC_P2,   KC_P3,   KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT },
-  { KC_LALT, MO(_RS), MO(_RS), KC_LGUI, KC_SPC,  KC_SPC,  KC_PPLS, KC_P0,   KC_PDOT, KC_SPC, KC_SPC,  KC_RGUI, MO(_LW), MO(_LW), KC_RALT  },
- },
+ [_QW] = LAYOUT_ortho_5x15( /* SPLIT QWERTY */
+  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_PSLS, KC_PAST, KC_PMNS, KC_6,   KC_7,    KC_8,    KC_9,    KC_0,    KC_GRV,
+  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_P7,   KC_P8,   KC_P9,   KC_Y,   KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+  KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_P4,   KC_P5,   KC_P6,   KC_H,   KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+  KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_P1,   KC_P2,   KC_P3,   KC_N,   KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
+  KC_LALT, MO(_RS), MO(_RS), KC_LGUI, KC_SPC,  KC_SPC,  KC_PPLS, KC_P0,   KC_PDOT, KC_SPC, KC_SPC,  KC_RGUI, MO(_LW), MO(_LW), KC_RALT
+ ),
 
 /* LOWERED
  * .--------------------------------------------------------------------------------------------------------------------------------------.
@@ -62,13 +62,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * '--------------------------------------------------------------------------------------------------------------------------------------'
  */
  
- [_LW] = { /* LOWERED */
-  { _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F11,  _______, _______, _______, _______, _______, _______, _______, _______  },
-  { _______, KC_MPRV, KC_MNXT, KC_VOLU, _______, _______, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______  },
-  { _______, KC_MPLY, KC_MSTP, KC_VOLD, _______, _______, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______  },
-  { _______, _______, _______, KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  },
-  { _______, MO(_RT), MO(_RT), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  },
- },
+ [_LW] = LAYOUT_ortho_5x15( /* LOWERED */
+  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F11,  _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, KC_MPRV, KC_MNXT, KC_VOLU, _______, _______, RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, KC_MPLY, KC_MSTP, KC_VOLD, _______, _______, RGB_MOD, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, MO(_RT), MO(_RT), _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ ),
 
 /* RAISED
  * .--------------------------------------------------------------------------------------------------------------------------------------.
@@ -84,13 +84,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * '--------------------------------------------------------------------------------------------------------------------------------------'
  */
  
- [_RS] = { /* RAISED */
-  { _______, _______, _______, _______, _______, _______, _______, _______, KC_F12,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_DEL  },
-  { _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, KC_LBRC, KC_RBRC, KC_MINS, KC_EQL,  KC_BSLS },
-  { _______, _______, _______, _______, _______, _______, _______, _______, BL_INC, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______  },
-  { _______, _______, _______, _______, _______, _______, _______, _______, BL_DEC, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END,  _______ },
-  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(_RT), MO(_RT), _______ },
- },
+ [_RS] = LAYOUT_ortho_5x15( /* RAISED */
+  _______, _______, _______, _______, _______, _______, _______, _______, KC_F12,  KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_DEL,
+  _______, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, _______, KC_LBRC, KC_RBRC, KC_MINS, KC_EQL,  KC_BSLS
+  _______, _______, _______, _______, _______, _______, _______, _______, BL_INC, _______, KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, BL_DEC, _______, KC_HOME, KC_PGDN, KC_PGUP, KC_END,  _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MO(_RT), MO(_RT), _______
+ ),
 
 /* RESET
  * .--------------------------------------------------------------------------------------------------------------------------------------.
@@ -106,13 +106,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * '--------------------------------------------------------------------------------------------------------------------------------------'
  */
  
- [_RT] = { /* RESET */
-  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
-  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
-  { _______, _______, _______, _______, _______, _______, _______, RESET,   _______, _______, _______, _______, _______, _______, _______  },
-  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
-  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ },
- }
+ [_RT] = LAYOUT_ortho_5x15( /* RESET */
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, RESET,   _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ )
 
 };
 
diff --git a/qmk/keyboards/xd75/keymaps/kloki/keymap.c b/qmk/keyboards/xd75/keymaps/kloki/keymap.c
index b9bb2c66..d9a67e8b 100644
--- a/qmk/keyboards/xd75/keymaps/kloki/keymap.c
+++ b/qmk/keyboards/xd75/keymaps/kloki/keymap.c
@@ -26,43 +26,43 @@
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 
- [_WO] = { /* WORKMAN */
-  { KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,   KC_5,   MO(_FUN),TG(_NUM),TG(_QW),KC_6,    KC_7,   KC_8,    KC_9,    KC_0,    KC_BSPC },
-  { KC_TAB,  KC_Q,    KC_D,    KC_R,    KC_W,   KC_B,   KC_GRV,  KC_LGUI, KC_QUOT, KC_J,   KC_F,   KC_U,    KC_P,    KC_SCLN, KC_BSLS },
-  { CTL_T(KC_ESC),KC_A,KC_S,   KC_H,    KC_T,   KC_G,   KC_EQL,  KC_UP,   KC_MINS, KC_Y,   KC_N,   KC_E,    KC_O,    KC_I,    KC_ENT  },
-  { KC_LSFT, KC_Z,    KC_X,    KC_M,    KC_C,   KC_V,   KC_LEFT, KC_DOWN, KC_RGHT, KC_K,   KC_L,   KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT },
-  { KC_MEH,KC_LGUI,KC_LALT,KC_LEFT,KC_RGHT,LT(_SYM,KC_SPC),LGUI_T(KC_ENT),KC_SPC,LT(_SYM,KC_TAB),KC_BSPC,KC_DOWN,KC_UP,KC_LBRC,KC_RBRC,MO(_SYM)},
- },
+ [_WO] = LAYOUT_ortho_5x15( /* WORKMAN */
+  KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,   KC_5,   MO(_FUN),TG(_NUM),TG(_QW),KC_6,    KC_7,   KC_8,    KC_9,    KC_0,    KC_BSPC,
+  KC_TAB,  KC_Q,    KC_D,    KC_R,    KC_W,   KC_B,   KC_GRV,  KC_LGUI, KC_QUOT, KC_J,   KC_F,   KC_U,    KC_P,    KC_SCLN, KC_BSLS,
+  CTL_T(KC_ESC),KC_A,KC_S,   KC_H,    KC_T,   KC_G,   KC_EQL,  KC_UP,   KC_MINS, KC_Y,   KC_N,   KC_E,    KC_O,    KC_I,    KC_ENT,
+  KC_LSFT, KC_Z,    KC_X,    KC_M,    KC_C,   KC_V,   KC_LEFT, KC_DOWN, KC_RGHT, KC_K,   KC_L,   KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
+  KC_MEH,KC_LGUI,KC_LALT,KC_LEFT,KC_RGHT,LT(_SYM,KC_SPC),LGUI_T(KC_ENT),KC_SPC,LT(_SYM,KC_TAB),KC_BSPC,KC_DOWN,KC_UP,KC_LBRC,KC_RBRC,MO(_SYM)
+ ),
 
- [_QW] = { /* QWERTY */
-  { _______,  KC_1,    KC_2,    KC_3,    KC_4,   KC_5,   _______, _______, _______, KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    _______ },
-  { _______,  KC_Q,    KC_W,    KC_E,    KC_R,   KC_T,   _______, _______, _______, KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    _______ },
-  { _______,  KC_A,    KC_S,    KC_D,    KC_F,   KC_G,   _______, _______, _______, KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN, _______ },
-  { _______,  KC_Z,    KC_X,    KC_C,    KC_V,   KC_B,   _______, _______, _______, KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH, _______ },
-  { _______,  _______, _______, _______, _______,_______,_______, _______, _______, _______,_______,_______, _______, _______, _______ },
- },//
+ [_QW] = LAYOUT_ortho_5x15( /* QWERTY */
+  _______,  KC_1,    KC_2,    KC_3,    KC_4,   KC_5,   _______, _______, _______, KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    _______,
+  _______,  KC_Q,    KC_W,    KC_E,    KC_R,   KC_T,   _______, _______, _______, KC_Y,   KC_U,   KC_I,    KC_O,    KC_P,    _______,
+  _______,  KC_A,    KC_S,    KC_D,    KC_F,   KC_G,   _______, _______, _______, KC_H,   KC_J,   KC_K,    KC_L,    KC_SCLN, _______,
+  _______,  KC_Z,    KC_X,    KC_C,    KC_V,   KC_B,   _______, _______, _______, KC_N,   KC_M,   KC_COMM, KC_DOT,  KC_SLSH, _______,
+  _______,  _______, _______, _______, _______,_______,_______, _______, _______, _______,_______,_______, _______, _______, _______
+ ),//
 
- [_NUM] = { /* NUM */
-  { _______,  _______, _______, _______, _______,_______,_______, _______, _______, _______,_______,_______, _______, _______, _______ },
-  { _______,  _______, _______, _______, _______,_______,KC_7,    KC_8,    KC_9, _______,_______,_______, _______, _______, _______ },
-  { _______,  _______, _______, _______, _______,_______,KC_4,    KC_5,    KC_6, _______,_______,_______, _______, _______, _______ },
-  { _______,  _______, _______, _______, _______,_______,KC_1,    KC_2,    KC_3, _______,_______,_______, _______, _______, _______ },
-  { _______,  _______, _______, _______, _______,_______,_______, KC_0, _______, _______,_______,_______, _______, _______, _______ },
- },
- [_SYM] = { /* SYM */
-  { _______,  KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  _______, _______, _______, KC_F6,  KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_DEL, },
-  { _______,  KC_EXLM, KC_AT,   KC_LCBR, KC_RCBR,KC_ASTR,_______, KC_F11,  KC_F12,  KC_LABK,KC_HOME,KC_UP,   KC_PGUP, KC_ASTR, _______ },
-  { _______,  KC_HASH, KC_DLR,  KC_LPRN, KC_RPRN,KC_GRV, _______, _______, _______, KC_RABK,KC_LEFT,KC_DOWN, KC_RIGHT,KC_PLUS, _______ },
-  { _______,  KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC,KC_TILD,_______, _______, _______, KC_AMPR,KC_END, KC_DOWN, KC_PGDN, KC_BSLS, _______ },
-  { _______,  _______, _______, _______, _______,_______,_______, _______, _______, _______,_______,_______, _______, _______, _______ },
- },
- [_FUN] = { /* FUN */
-  { _______,  RGB_RMOD,RGB_MOD, RGB_TOG, _______,_______,_______, _______, _______, _______,_______,_______, _______, _______, RESET   },
-  { _______,  RGB_HUD, RGB_HUI, RGB_MODE_PLAIN, _______,_______,_______, _______, _______, _______,_______,_______, _______, _______, _______ },
-  { _______,  RGB_SAD, RGB_SAI, _______, _______,_______,_______, _______, _______, _______,_______,_______, _______, _______, _______ },
-  { _______,  RGB_VAD, RGB_VAI, _______, _______,_______,_______, _______, _______, _______,_______,_______, _______, _______, _______ },
-  { _______,  _______, _______, _______, _______,_______,_______, _______, _______, _______,_______,_______, _______, _______, _______ },
- }
+ [_NUM] = LAYOUT_ortho_5x15( /* NUM */
+  _______,  _______, _______, _______, _______,_______,_______, _______, _______, _______,_______,_______, _______, _______, _______,
+  _______,  _______, _______, _______, _______,_______,KC_7,    KC_8,    KC_9, _______,_______,_______, _______, _______, _______,
+  _______,  _______, _______, _______, _______,_______,KC_4,    KC_5,    KC_6, _______,_______,_______, _______, _______, _______,
+  _______,  _______, _______, _______, _______,_______,KC_1,    KC_2,    KC_3, _______,_______,_______, _______, _______, _______,
+  _______,  _______, _______, _______, _______,_______,_______, KC_0, _______, _______,_______,_______, _______, _______, _______
+ ),
+ [_SYM] = LAYOUT_ortho_5x15( /* SYM */
+  _______,  KC_F1,   KC_F2,   KC_F3,   KC_F4,  KC_F5,  _______, _______, _______, KC_F6,  KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_DEL,
+  _______,  KC_EXLM, KC_AT,   KC_LCBR, KC_RCBR,KC_ASTR,_______, KC_F11,  KC_F12,  KC_LABK,KC_HOME,KC_UP,   KC_PGUP, KC_ASTR, _______,
+  _______,  KC_HASH, KC_DLR,  KC_LPRN, KC_RPRN,KC_GRV, _______, _______, _______, KC_RABK,KC_LEFT,KC_DOWN, KC_RIGHT,KC_PLUS, _______,
+  _______,  KC_PERC, KC_CIRC, KC_LBRC, KC_RBRC,KC_TILD,_______, _______, _______, KC_AMPR,KC_END, KC_DOWN, KC_PGDN, KC_BSLS, _______,
+  _______,  _______, _______, _______, _______,_______,_______, _______, _______, _______,_______,_______, _______, _______, _______
+ ),
+ [_FUN] = LAYOUT_ortho_5x15( /* FUN */
+  _______,  RGB_RMOD,RGB_MOD, RGB_TOG, _______,_______,_______, _______, _______, _______,_______,_______, _______, _______, RESET,
+  _______,  RGB_HUD, RGB_HUI, RGB_MODE_PLAIN, _______,_______,_______, _______, _______, _______,_______,_______, _______, _______, _______,
+  _______,  RGB_SAD, RGB_SAI, _______, _______,_______,_______, _______, _______, _______,_______,_______, _______, _______, _______,
+  _______,  RGB_VAD, RGB_VAI, _______, _______,_______,_______, _______, _______, _______,_______,_______, _______, _______, _______,
+  _______,  _______, _______, _______, _______,_______,_______, _______, _______, _______,_______,_______, _______, _______, _______
+ )
 };
 
 const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
diff --git a/qmk/keyboards/xd75/keymaps/markus/keymap.c b/qmk/keyboards/xd75/keymaps/markus/keymap.c
index 9b8ab52f..ab818318 100644
--- a/qmk/keyboards/xd75/keymaps/markus/keymap.c
+++ b/qmk/keyboards/xd75/keymaps/markus/keymap.c
@@ -59,13 +59,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * | Caps   | Fn3    | LGUI   | LAlt   | Fn2    | Fn1    | Tab    | Del    | Enter  | Space  | Bksp   | LAlt   | LGUI   | Fn3    | Ins    |
  * '--------------------------------------------------------------------------------------------------------------------------------------'
  */
-[_QWZ] = {
-{ DE_1,     DE_2,     DE_3,     DE_4,     DE_5,     DE_6,     KC_MUTE,  KC_VOLD,  KC_VOLU,  DE_7,     DE_8,     DE_9,     DE_0,     DE_SS,    DE_UE    },
-{ KC_ESC,   DE_Q,     DE_W,     DE_E,     DE_R,     DE_T,     KC_HOME,  KC_MPLY,  KC_END,   DE_Z,     DE_U,     DE_I,     DE_O,     DE_P,     DE_AE    },
-{ KC_LSFT,  DE_A,     DE_S,     DE_D,     DE_F,     DE_G,     KC_PGUP,  KC_UP,    KC_PGDN,  DE_H,     DE_J,     DE_K,     DE_L,     DE_OE,    KC_RSFT  },
-{ KC_LCTL,  DE_Y,     DE_X,     DE_C,     DE_V,     DE_B,     KC_LEFT,  KC_DOWN,  KC_RIGHT, DE_N,     DE_M,     DE_COMM,  DE_DOT,   DE_MINS,  KC_RCTL  },
-{ KC_CAPS,  MO(_FN3), KC_LGUI,  KC_LALT,  MO(_FN2), MO(_FN1), KC_TAB,   KC_DEL,   KC_ENT,   KC_SPC,   KC_BSPC,  KC_LALT,  KC_LGUI,  MO(_FN3), KC_INS   },
-},
+[_QWZ] = LAYOUT_ortho_5x15(
+DE_1,     DE_2,     DE_3,     DE_4,     DE_5,     DE_6,     KC_MUTE,  KC_VOLD,  KC_VOLU,  DE_7,     DE_8,     DE_9,     DE_0,     DE_SS,    DE_UE,
+KC_ESC,   DE_Q,     DE_W,     DE_E,     DE_R,     DE_T,     KC_HOME,  KC_MPLY,  KC_END,   DE_Z,     DE_U,     DE_I,     DE_O,     DE_P,     DE_AE,
+KC_LSFT,  DE_A,     DE_S,     DE_D,     DE_F,     DE_G,     KC_PGUP,  KC_UP,    KC_PGDN,  DE_H,     DE_J,     DE_K,     DE_L,     DE_OE,    KC_RSFT,
+KC_LCTL,  DE_Y,     DE_X,     DE_C,     DE_V,     DE_B,     KC_LEFT,  KC_DOWN,  KC_RIGHT, DE_N,     DE_M,     DE_COMM,  DE_DOT,   DE_MINS,  KC_RCTL,
+KC_CAPS,  MO(_FN3), KC_LGUI,  KC_LALT,  MO(_FN2), MO(_FN1), KC_TAB,   KC_DEL,   KC_ENT,   KC_SPC,   KC_BSPC,  KC_LALT,  KC_LGUI,  MO(_FN3), KC_INS
+),
 
 /* QWERTY
  * .--------------------------------------------------------------------------------------------------------------------------------------.
@@ -80,13 +80,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
  * '--------------------------------------------------------------------------------------------------------------------------------------'
  */
-[_QWY] = {
-{ DE_1,     DE_2,     DE_3,     DE_4,     DE_5,     DE_6,     KC_MUTE,  KC_VOLD,  KC_VOLU,  DE_7,     DE_8,     DE_9,     DE_0,     DE_SS,    DE_UE    },
-{ KC_ESC,   DE_Q,     DE_W,     DE_E,     DE_R,     DE_T,     KC_HOME,  KC_MPLY,  KC_END,   DE_Y,     DE_U,     DE_I,     DE_O,     DE_P,     DE_AE    },
-{ KC_LSFT,  DE_A,     DE_S,     DE_D,     DE_F,     DE_G,     KC_PGUP,  KC_UP,    KC_PGDN,  DE_H,     DE_J,     DE_K,     DE_L,     DE_OE,    KC_RSFT  },
-{ KC_LCTL,  DE_Z,     DE_X,     DE_C,     DE_V,     DE_B,     KC_LEFT,  KC_DOWN,  KC_RIGHT, DE_N,     DE_M,     DE_COMM,  DE_DOT,   DE_MINS,  KC_RCTL  },
-{ KC_CAPS,  MO(_FN3), KC_LGUI,  KC_LALT,  MO(_FN2), MO(_FN1), KC_TAB,   KC_DEL,   KC_ENT,   KC_SPC,   KC_BSPC,  KC_LALT,  KC_LGUI,  MO(_FN3), KC_INS   },
-},
+[_QWY] = LAYOUT_ortho_5x15(
+DE_1,     DE_2,     DE_3,     DE_4,     DE_5,     DE_6,     KC_MUTE,  KC_VOLD,  KC_VOLU,  DE_7,     DE_8,     DE_9,     DE_0,     DE_SS,    DE_UE,
+KC_ESC,   DE_Q,     DE_W,     DE_E,     DE_R,     DE_T,     KC_HOME,  KC_MPLY,  KC_END,   DE_Y,     DE_U,     DE_I,     DE_O,     DE_P,     DE_AE,
+KC_LSFT,  DE_A,     DE_S,     DE_D,     DE_F,     DE_G,     KC_PGUP,  KC_UP,    KC_PGDN,  DE_H,     DE_J,     DE_K,     DE_L,     DE_OE,    KC_RSFT,
+KC_LCTL,  DE_Z,     DE_X,     DE_C,     DE_V,     DE_B,     KC_LEFT,  KC_DOWN,  KC_RIGHT, DE_N,     DE_M,     DE_COMM,  DE_DOT,   DE_MINS,  KC_RCTL,
+KC_CAPS,  MO(_FN3), KC_LGUI,  KC_LALT,  MO(_FN2), MO(_FN1), KC_TAB,   KC_DEL,   KC_ENT,   KC_SPC,   KC_BSPC,  KC_LALT,  KC_LGUI,  MO(_FN3), KC_INS
+),
 
 /* GAMING
  * .--------------------------------------------------------------------------------------------------------------------------------------.
@@ -101,13 +101,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * | Fn2    |        |        |        | Space  |        |        |        |        |        |        |        |        |        |        |
  * '--------------------------------------------------------------------------------------------------------------------------------------'
  */
-[_GAM] = {
-{ DE_1,     DE_2,     DE_3,     DE_4,     DE_5,     DE_6,     KC_MUTE,  KC_VOLD,  KC_VOLU,  DE_7,     DE_8,     DE_9,     DE_0,     DE_SS,    DE_UE    },
-{ KC_ESC,   DE_Q,     DE_W,     DE_E,     DE_R,     DE_T,     KC_HOME,  KC_MPLY,  KC_END,   DE_Y,     DE_U,     DE_I,     DE_O,     DE_P,     DE_AE    },
-{ KC_LSFT,  DE_A,     DE_S,     DE_D,     DE_F,     DE_G,     KC_PGUP,  KC_UP,    KC_PGDN,  DE_H,     DE_J,     DE_K,     DE_L,     DE_OE,    KC_RSFT  },
-{ KC_LCTL,  DE_Z,     DE_X,     DE_C,     DE_V,     DE_B,     KC_LEFT,  KC_DOWN,  KC_RIGHT, DE_N,     DE_M,     DE_COMM,  DE_DOT,   DE_MINS,  KC_RCTL  },
-{ MO(_FN2), MO(_FN3), KC_LGUI,  KC_LALT,  KC_SPC,   MO(_FN1), KC_TAB,   KC_DEL,   KC_ENT,   KC_SPC,   KC_BSPC,  KC_LALT,  KC_LGUI,  MO(_FN3), KC_INS   },
-},
+[_GAM] = LAYOUT_ortho_5x15(
+DE_1,     DE_2,     DE_3,     DE_4,     DE_5,     DE_6,     KC_MUTE,  KC_VOLD,  KC_VOLU,  DE_7,     DE_8,     DE_9,     DE_0,     DE_SS,    DE_UE,
+KC_ESC,   DE_Q,     DE_W,     DE_E,     DE_R,     DE_T,     KC_HOME,  KC_MPLY,  KC_END,   DE_Y,     DE_U,     DE_I,     DE_O,     DE_P,     DE_AE,
+KC_LSFT,  DE_A,     DE_S,     DE_D,     DE_F,     DE_G,     KC_PGUP,  KC_UP,    KC_PGDN,  DE_H,     DE_J,     DE_K,     DE_L,     DE_OE,    KC_RSFT,
+KC_LCTL,  DE_Z,     DE_X,     DE_C,     DE_V,     DE_B,     KC_LEFT,  KC_DOWN,  KC_RIGHT, DE_N,     DE_M,     DE_COMM,  DE_DOT,   DE_MINS,  KC_RCTL,
+MO(_FN2), MO(_FN3), KC_LGUI,  KC_LALT,  KC_SPC,   MO(_FN1), KC_TAB,   KC_DEL,   KC_ENT,   KC_SPC,   KC_BSPC,  KC_LALT,  KC_LGUI,  MO(_FN3), KC_INS
+),
 
 /* FN1
  * .--------------------------------------------------------------------------------------------------------------------------------------.
@@ -122,13 +122,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |        |        |        |        |        |        |        |        |        |        |        |        |        |        |        |
  * '--------------------------------------------------------------------------------------------------------------------------------------'
  */
-[_FN1] = {
-{ KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12   },
-{ ________, DE_AT,    DE_TILD,  DE_EURO,  DE_ACUT,  DE_GRV,   ________, ___xx___, ________, DE_BSLS,  DE_LCBR,  DE_RCBR,  DE_PLUS,  DE_ASTR,  ___xx___ },
-{ ________, DE_DQOT,  DE_QUOT,  UC(L'‚'), UC(L'‘'), UC(L'’'), ________, ________, ________, DE_PIPE,  DE_LBRC,  DE_RBRC,  DE_EXLM,  DE_QST,   ________ },
-{ ________, DE_RING,  DE_CIRC,  UC(L'„'), UC(L'“'), UC(L'”'), ________, ________, ________, DE_HASH,  DE_LESS,  DE_MORE,  UC(L'…'), UC(L'–'), ________ },
-{ ___xx___, ________, ________, ________, ________, ________, ________, ________, ________, ________, ________, ________, ________, ________, ________ },
-},
+[_FN1] = LAYOUT_ortho_5x15(
+KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,    KC_F6,    KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,
+________, DE_AT,    DE_TILD,  DE_EURO,  DE_ACUT,  DE_GRV,   ________, ___xx___, ________, DE_BSLS,  DE_LCBR,  DE_RCBR,  DE_PLUS,  DE_ASTR,  ___xx___,
+________, DE_DQOT,  DE_QUOT,  UC(L'‚'), UC(L'‘'), UC(L'’'), ________, ________, ________, DE_PIPE,  DE_LBRC,  DE_RBRC,  DE_EXLM,  DE_QST,   ________,
+________, DE_RING,  DE_CIRC,  UC(L'„'), UC(L'“'), UC(L'”'), ________, ________, ________, DE_HASH,  DE_LESS,  DE_MORE,  UC(L'…'), UC(L'–'), ________,
+___xx___, ________, ________, ________, ________, ________, ________, ________, ________, ________, ________, ________, ________, ________, ________
+),
 
 /* FN2
  * .--------------------------------------------------------------------------------------------------------------------------------------.
@@ -143,13 +143,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * | Fn2    |        |        |        |        | PEnter | P0     | . :    | P,     | BTN1   | BTN2   | BTN3   |        |        |        |
  * '--------------------------------------------------------------------------------------------------------------------------------------'
  */
-[_FN2] = {
-{ ___xx___, ___xx___, ___xx___, ___xx___, DE_PERC,  DE_LPRN,  DE_RPRN,  KC_PSLS,  KC_PAST,  KC_PMNS,  KC_PSCR,  KC_LSCR,  KC_PAUS,  UC(L'ẞ'), UC(L'−') },
-{ ________, ___xx___, KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_BSPC,  KC_P7,    KC_P8,    KC_P9,    KC_PPLS,  KC_WH_U,  KC_MS_U,  KC_WH_D,  UC(L'×'), UC(L'÷') },
-{ ________, KC_APP,   KC_ACL2,  KC_ACL1,  KC_ACL0,  KC_SPC,   KC_P4,    KC_P5,    KC_P6,    KC_WH_L,  KC_MS_L,  KC_MS_D,  KC_MS_R,  KC_WH_R,  ________ },
-{ ________, ___xx___, KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_TAB,   KC_P1,    KC_P2,    KC_P3,    KC_PENT,  KC_BTN1,  KC_BTN2,  KC_BTN3,  UC(L'—'), ________ },
-{ MO(_FN2), ________, ________, ________, ________, KC_PENT,  KC_P0,    DE_DOT,   KC_PDOT,  KC_BTN1,  KC_BTN2,  KC_BTN3,  ________, ________, ________ },
-},
+[_FN2] = LAYOUT_ortho_5x15(
+___xx___, ___xx___, ___xx___, ___xx___, DE_PERC,  DE_LPRN,  DE_RPRN,  KC_PSLS,  KC_PAST,  KC_PMNS,  KC_PSCR,  KC_LSCR,  KC_PAUS,  UC(L'ẞ'), UC(L'−'),
+________, ___xx___, KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_BSPC,  KC_P7,    KC_P8,    KC_P9,    KC_PPLS,  KC_WH_U,  KC_MS_U,  KC_WH_D,  UC(L'×'), UC(L'÷'),
+________, KC_APP,   KC_ACL2,  KC_ACL1,  KC_ACL0,  KC_SPC,   KC_P4,    KC_P5,    KC_P6,    KC_WH_L,  KC_MS_L,  KC_MS_D,  KC_MS_R,  KC_WH_R,  ________,
+________, ___xx___, KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_TAB,   KC_P1,    KC_P2,    KC_P3,    KC_PENT,  KC_BTN1,  KC_BTN2,  KC_BTN3,  UC(L'—'), ________,
+MO(_FN2), ________, ________, ________, ________, KC_PENT,  KC_P0,    DE_DOT,   KC_PDOT,  KC_BTN1,  KC_BTN2,  KC_BTN3,  ________, ________, ________
+),
 
 /* FN3
  * .--------------------------------------------------------------------------------------------------------------------------------------.
@@ -164,13 +164,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * |        |        |        |        |        |        |        | Reset  |        |        |        |        |        |        |        |
  * '--------------------------------------------------------------------------------------------------------------------------------------'
  */
-[_FN3] = {
-{ KC_F13,   KC_F14,   KC_F15,   KC_F16,   KC_F17,   KC_F18,   UNI_LNX,  UNI_WIN,  UNI_MAC,  KC_F19,   KC_F20,   KC_F21,   KC_F22,   KC_F23,   KC_F24   },
-{ ________, QWERTZ,   QWERTY,   GAMING,   ___xx___, ___xx___, RGB_TOG,  RGB_M_P,  RGB_MOD,  ___xx___, KC_PGUP,  KC_UP,    KC_PGDN,  ___xx___, ___xx___ },
-{ ________, ___xx___, ___xx___, UC(L'›'), UC(L'‹'), ___xx___, RGB_HUI,  RGB_SAI,  RGB_VAI,  KC_HOME,  KC_LEFT,  KC_DOWN,  KC_RIGHT, KC_END,   ________ },
-{ ________, ___xx___, ___xx___, UC(L'»'), UC(L'«'), ___xx___, RGB_HUD,  RGB_SAD,  RGB_VAD,  UC(L' '), UC(L' '), UC(L' '), UC(L' '), UC(L'‑'), ________ },
-{ ___xx___, ________, ________, ________, ________, ________, ________, RESET,    ________, ________, ________, ________, ________, ________, ________ },
-},
+[_FN3] = LAYOUT_ortho_5x15(
+KC_F13,   KC_F14,   KC_F15,   KC_F16,   KC_F17,   KC_F18,   UNI_LNX,  UNI_WIN,  UNI_MAC,  KC_F19,   KC_F20,   KC_F21,   KC_F22,   KC_F23,   KC_F24,
+________, QWERTZ,   QWERTY,   GAMING,   ___xx___, ___xx___, RGB_TOG,  RGB_M_P,  RGB_MOD,  ___xx___, KC_PGUP,  KC_UP,    KC_PGDN,  ___xx___, ___xx___,
+________, ___xx___, ___xx___, UC(L'›'), UC(L'‹'), ___xx___, RGB_HUI,  RGB_SAI,  RGB_VAI,  KC_HOME,  KC_LEFT,  KC_DOWN,  KC_RIGHT, KC_END,   ________,
+________, ___xx___, ___xx___, UC(L'»'), UC(L'«'), ___xx___, RGB_HUD,  RGB_SAD,  RGB_VAD,  UC(L' '), UC(L' '), UC(L' '), UC(L' '), UC(L'‑'), ________,
+___xx___, ________, ________, ________, ________, ________, ________, RESET,    ________, ________, ________, ________, ________, ________, ________
+)
 
 };
 
diff --git a/qmk/keyboards/xd75/keymaps/msiu/keymap.c b/qmk/keyboards/xd75/keymaps/msiu/keymap.c
index c4cc456a..d1a4154e 100644
--- a/qmk/keyboards/xd75/keymaps/msiu/keymap.c
+++ b/qmk/keyboards/xd75/keymaps/msiu/keymap.c
@@ -43,23 +43,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * '--------------------------------------------------------------------------------------------------------------------------------------'
  */
 
- [_QW] = { /* QWERTY */
-  { KC_GRV,          KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_PLUS, KC_MINS, KC_ASTR, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC  },
-  { KC_TAB,          KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_7,    KC_8,    KC_9   , KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_DEL   },
-  { LCTL_T(KC_ESC),  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_4,    KC_5,    KC_6   , KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT  },
-  { KC_LSFT,         KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_1,    KC_2,    KC_3   , KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT   },
-  { KC_LCTL,         KC_HYPR, KC_LALT, KC_LGUI, MO(_LW), MO(_FN), KC_0,    _______, KC_DOT , KC_SPC,  MO(_RS), KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT  },
- },
+ [_QW] = LAYOUT_ortho_5x15( /* QWERTY */
+  KC_GRV,          KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_PLUS, KC_MINS, KC_ASTR, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
+  KC_TAB,          KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_7,    KC_8,    KC_9   , KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_DEL,
+  LCTL_T(KC_ESC),  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_4,    KC_5,    KC_6   , KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+  KC_LSFT,         KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_1,    KC_2,    KC_3   , KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
+  KC_LCTL,         KC_HYPR, KC_LALT, KC_LGUI, MO(_LW), MO(_FN), KC_0,    _______, KC_DOT , KC_SPC,  MO(_RS), KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+ ),
 
  /* Dvorak */
 
-  [_DV] = { /* Dvorak */
-   { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  },
-   { _______, KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    _______, _______, _______, KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    _______  },
-   { _______, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    _______, _______, _______, KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH  },
-   { _______, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    _______, _______, _______, KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    _______  },
-   { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  },
-  },
+  [_DV] = LAYOUT_ortho_5x15( /* Dvorak */
+   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+   _______, KC_QUOT, KC_COMM, KC_DOT,  KC_P,    KC_Y,    _______, _______, _______, KC_F,    KC_G,    KC_C,    KC_R,    KC_L,    _______,
+   _______, KC_A,    KC_O,    KC_E,    KC_U,    KC_I,    _______, _______, _______, KC_D,    KC_H,    KC_T,    KC_N,    KC_S,    KC_SLSH,
+   _______, KC_SCLN, KC_Q,    KC_J,    KC_K,    KC_X,    _______, _______, _______, KC_B,    KC_M,    KC_W,    KC_V,    KC_Z,    _______,
+   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+  ),
 
 
 /* LOWERED
@@ -76,13 +76,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * '--------------------------------------------------------------------------------------------------------------------------------------'
  */
 
- [_LW] = { /* LOWERED */
-  { _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   _______, _______, _______, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_DEL   },
-  { KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, _______, KC_VOLU, _______, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL    },
-  { _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_MPRV, KC_MPLY, KC_MNXT, KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE   },
-  { _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  _______, KC_VOLD, _______, KC_F12,  KC_PGDN, KC_PGUP, KC_HOME, KC_END , KC_MUTE   },
-  { _______, _______, _______, _______, _______, _______, _______, KC_MUTE, _______, KC_MPLY, _______, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT   },
- },
+ [_LW] = LAYOUT_ortho_5x15( /* LOWERED */
+  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   _______, _______, _______, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_DEL,
+  KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, _______, KC_VOLU, _______, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DEL,
+  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_MPRV, KC_MPLY, KC_MNXT, KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE,
+  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  _______, KC_VOLD, _______, KC_F12,  KC_PGDN, KC_PGUP, KC_HOME, KC_END , KC_MUTE,
+  _______, _______, _______, _______, _______, _______, _______, KC_MUTE, _______, KC_MPLY, _______, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT
+ ),
 
 /* RAISED
  * .--------------------------------------------------------------------------------------------------------------------------------------.
@@ -98,23 +98,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * '--------------------------------------------------------------------------------------------------------------------------------------'
  */
 
- [_RS] = { /* RAISED */
-  { _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   _______, _______, _______, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_DEL    },
-  { KC_GRV , KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    _______, KC_VOLU, _______, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL    },
-  { _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_MPRV, KC_MPLY, KC_MNXT, KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS   },
-  { _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  _______, KC_VOLD, _______, KC_F12,  KC_PGDN, KC_PGUP, KC_HOME, KC_END , KC_MUTE   },
-  { _______, _______, _______, _______, _______, _______, _______, KC_MUTE, _______, KC_MPLY, _______, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT   },
- },
+ [_RS] = LAYOUT_ortho_5x15( /* RAISED */
+  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   _______, _______, _______, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_DEL,
+  KC_GRV , KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    _______, KC_VOLU, _______, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DEL,
+  _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_MPRV, KC_MPLY, KC_MNXT, KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS,
+  _______, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  _______, KC_VOLD, _______, KC_F12,  KC_PGDN, KC_PGUP, KC_HOME, KC_END , KC_MUTE,
+  _______, _______, _______, _______, _______, _______, _______, KC_MUTE, _______, KC_MPLY, _______, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT
+ ),
 
 /* FUNCTION */
 
- [_FN] = { /* FUNCTION */
-  { RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, BL_TOGG, BL_INC,  BL_DEC,  _______, _______, _______, _______  },
-  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP  , _______, KC_PSCR, _______  },
-  { _______, _______, _______, TO(_DV), TO(_QW), _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______  },
-  { _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  },
-  { RESET  , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  },
- },
+ [_FN] = LAYOUT_ortho_5x15( /* FUNCTION */
+  RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, BL_TOGG, BL_INC,  BL_DEC,  _______, _______, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP  , _______, KC_PSCR, _______,
+  _______, _______, _______, TO(_DV), TO(_QW), _______, _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,
+  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+  RESET  , _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+ )
 };
 
 
diff --git a/qmk/keyboards/xd75/keymaps/mtdjr/keymap.c b/qmk/keyboards/xd75/keymaps/mtdjr/keymap.c
index e56d918f..98e21cf3 100644
--- a/qmk/keyboards/xd75/keymaps/mtdjr/keymap.c
+++ b/qmk/keyboards/xd75/keymaps/mtdjr/keymap.c
@@ -2,54 +2,36 @@
 #include "mtdjr.h"
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_QWERTY] = LAYOUT_ortho_5x15(
+        KC_EXC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_PGUP, KC_MPNT, KC_PGDN, KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_INS,  KC_HOME, KC_DEL,  KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_QUOT,
+        KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_EQL,  KC_ELCK, KC_MINS, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_LBRC, KC_BSLS, KC_RBRC, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ELCK,
+        KC_LOWR, KC_LCTL, KC_LALT, KC_LGUI, XXXXXXX, KC_SPC,  KC_LOWR, KC_RASE, XXXXXXX, KC_SPC,  KC_APP,  KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+    ),
 
- [_QWERTY] = LAYOUT_kc(
-//  .--------------------------------------------------------------------------.
-      EXC, 1  , 2  , 3  , 4  , 5  ,PGUP,MPNT,PGDN, 6  , 7  , 8  , 9  , 0  ,BSPC,
-//  |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----|
-      TAB, Q  , W  ,  E , R  , T  , INS,HOME, DEL, Y  , U  , I  , O  , P  ,QUOT,
-//  |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----|
-     LCTL, A  , S  ,  D , F  , G  , EQL,ELCK,MINS, H  , J  , K  , L  ,SCLN, ENT,
-//  |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----|
-     LSFT, Z  , X  ,  C , V  , B  ,LBRC,BSLS,RBRC, N  , M  ,COMM, DOT,SLSH,ELCK,
-//  |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----|
-     LOWR,LCTL,LALT,LGUI,xxxx, SPC,LOWR,RASE,xxxx, SPC, APP,LEFT,DOWN,  UP,RGHT
-//  '----+----+----+----+----+----+----+----+----+----+----+----+----+----+----'
-),
+    [_LOWER] = LAYOUT_ortho_5x15(
+        XXXXXXX, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   XXXXXXX, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,
+        XXXXXXX, KC_ROOT, KC_PPLY, KC_PSEF, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_CALC, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MUTE,
+        _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, KC_MPLY, XXXXXXX, KC_MNXT, KC_VOLD, KC_VOLU, KC_MNXT
+    ),
 
- [_LOWER] = LAYOUT_kc(
-//  .--------------------------------------------------------------------------.
-     xxxx, F1 , F2 , F3 , F4 , F5 , F6 ,xxxx, F7 , F8 , F9 , F10, F11, F12, DEL,
-//  |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----|
-     xxxx,ROOT,PPLY,PSEF,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,
-//  |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----|
-     xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,CALC,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,
-//  |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----|
-     xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,MUTE,
-//  |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----|
-         ,xxxx,xxxx,xxxx,xxxx,xxxx,    ,    ,xxxx,MPLY,xxxx,MNXT,VOLD,VOLU,MNXT
-//  '----+----+----+----+----+----+----+----+----+----+----+----+----+----+----'
-),
-
-[_RAISE] = LAYOUT_kc(
-//  .--------------------------------------------------------------------------.
-     xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,
-//  |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----|
-     xxxx,xxxx,xxxx,xxxx, RST,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,xxxx,
-//  |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----|
-     CAPS,xxxx,xxxx,xxxx,xxxx,xxxx, BLI,xxxx, BLD,xxxx,xxxx,xxxx,XLCK,xxxx,xxxx,
-//  |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----|
-      RGB,RHUI,RHUD,RSAI,RSAD,RVAI,RVAD,xxxx,xxxx,xxxx,xxxx,xxxx,BTN1,MS_U,BTN2,
-//  |----+----+----+----+----+----+----+----+----+----+----+----+----+----+----|
-         ,xxxx,xxxx,xxxx,xxxx,xxxx,    ,    ,xxxx,xxxx,xxxx,xxxx,MS_L,MS_D,MS_R
-//  '----+----+----+----+----+----+----+----+----+----+----+----+----+----+----'
-)
+    [_RAISE] = LAYOUT_ortho_5x15(
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_RST,  XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
+        KC_CAPS, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_BLI,  XXXXXXX, KC_BLD,  XXXXXXX, XXXXXXX, XXXXXXX, KC_XLCK, XXXXXXX, XXXXXXX,
+        KC_RGB,  KC_RHUI, KC_RHUD, KC_RSAI, KC_RSAD, KC_RVAI, KC_RVAD, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_BTN1, KC_MS_U, KC_BTN2,
+        _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, _______, _______, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, KC_MS_L, KC_MS_D, KC_MS_R
+    )
 };
 
-void led_set_user(uint8_t usb_led) {
-    if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
+bool led_update_user(led_t led_state) {
+    if (led_state.caps_lock) {
         capslock_led_on();
     } else {
         capslock_led_off();
     }
+    return false;
 }
diff --git a/qmk/keyboards/xd75/keymaps/tdl-jturner/keymap.c b/qmk/keyboards/xd75/keymaps/tdl-jturner/keymap.c
index 593e54f1..0c51289b 100644
--- a/qmk/keyboards/xd75/keymaps/tdl-jturner/keymap.c
+++ b/qmk/keyboards/xd75/keymaps/tdl-jturner/keymap.c
@@ -65,99 +65,99 @@ qk_tap_dance_action_t tap_dance_actions[] = {
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
  //QWERY - Base Layer
- [_QWERTY] = {
-         {KC_GRV ,  KC_1  ,  KC_2  ,  KC_3  ,  KC_4  ,  KC_5  ,________  ,________,________,  KC_6  ,  KC_7  ,  KC_8  ,  KC_9  ,  KC_0  ,KC_MINUS},
-         {KC_TAB ,  KC_Q  ,  KC_W  ,  KC_E  ,  KC_R  ,  KC_T  ,________  ,________,________,  KC_Y  ,  KC_U  ,  KC_I  ,  KC_O  ,  KC_P  ,KC_BSDEL}, //Custom shift Codes. Backspace ^ Delete
-{LT(_LYMD,KC_ESC),  KC_A  ,  KC_S  ,  KC_D  ,  KC_F  ,  KC_G  ,________  ,________,________,  KC_H  ,  KC_J  ,  KC_K  ,  KC_L  ,KC_SCLN ,KC_QUOT },
-         {KC_LSPO,  KC_Z  ,  KC_X  ,  KC_C  ,  KC_V  ,  KC_B  ,________  ,________,________,  KC_N  ,  KC_M  ,KC_CPIPE,KC_DOTQ ,KC_FBSLH,KC_RSPC }, // Custom Shift Codes. ,^| .^?  /^|
-      { KC_MEH ,KC_LCTL ,KC_LGUI ,KC_LALT ,MO(_LYNUM), KC_SPC ,________  ,________,________, KC_ENT ,MO(_LYNAV),TD(TD_CBR) ,TD(TD_BRC),TD(TD_ABK),TD(TD_LOCK_SLEEP)}
+ [_QWERTY] = LAYOUT_ortho_5x15(
+         KC_GRV ,  KC_1  ,  KC_2  ,  KC_3  ,  KC_4  ,  KC_5  ,________  ,________,________,  KC_6  ,  KC_7  ,  KC_8  ,  KC_9  ,  KC_0  ,KC_MINUS,
+         KC_TAB ,  KC_Q  ,  KC_W  ,  KC_E  ,  KC_R  ,  KC_T  ,________  ,________,________,  KC_Y  ,  KC_U  ,  KC_I  ,  KC_O  ,  KC_P  ,KC_BSDEL, //Custom shift Codes. Backspace ^ Delete
+LT(_LYMD,KC_ESC),  KC_A  ,  KC_S  ,  KC_D  ,  KC_F  ,  KC_G  ,________  ,________,________,  KC_H  ,  KC_J  ,  KC_K  ,  KC_L  ,KC_SCLN ,KC_QUOT,
+         KC_LSPO,  KC_Z  ,  KC_X  ,  KC_C  ,  KC_V  ,  KC_B  ,________  ,________,________,  KC_N  ,  KC_M  ,KC_CPIPE,KC_DOTQ ,KC_FBSLH,KC_RSPC, // Custom Shift Codes. ,^| .^?  /^|
+      KC_MEH ,KC_LCTL ,KC_LGUI ,KC_LALT ,MO(_LYNUM), KC_SPC ,________  ,________,________, KC_ENT ,MO(_LYNAV),TD(TD_CBR) ,TD(TD_BRC),TD(TD_ABK),TD(TD_LOCK_SLEEP)
 
- },
+ ),
 
  //_COLEMAK - Colemak Layout - Identical to qwerty layer except for the layout changes
- [_COLEMAK] = {
-         {KC_GRV ,  KC_1  ,  KC_2  ,  KC_3  ,  KC_4  ,  KC_5  ,________  ,________,________,  KC_6  ,  KC_7  ,  KC_8  ,  KC_9  ,  KC_0  ,KC_MINUS},
-         {KC_TAB ,  KC_Q  ,  KC_W  ,  KC_F  ,  KC_P  ,  KC_G  ,________  ,________,________,  KC_J  ,  KC_L  ,  KC_U  ,  KC_Y  ,KC_SCLN ,KC_BSDEL}, //Custom shift Codes. Backspace ^ Delete
-{LT(_LYMD,KC_ESC),  KC_A  ,  KC_R  ,  KC_S  ,  KC_T  ,  KC_D  ,________  ,________,________,  KC_H  ,  KC_N  ,  KC_E  ,  KC_I  ,  KC_O  ,KC_QUOT },
-         {KC_LSPO,  KC_Z  ,  KC_X  ,  KC_C  ,  KC_V  ,  KC_B  ,________  ,________,________,  KC_K  ,  KC_M  ,KC_CPIPE,KC_DOTQ ,KC_FBSLH,KC_RSPC }, // Custom Shift Codes. ,^| .^?  /^|
-     {  KC_MEH ,KC_LCTL ,KC_LGUI ,KC_LALT ,MO(_LYNUM), KC_SPC ,________  ,________,________, KC_ENT ,MO(_LYNAV),TD(TD_CBR) ,TD(TD_BRC),TD(TD_ABK),TD(TD_LOCK_SLEEP)}
+ [_COLEMAK] = LAYOUT_ortho_5x15(
+         KC_GRV ,  KC_1  ,  KC_2  ,  KC_3  ,  KC_4  ,  KC_5  ,________  ,________,________,  KC_6  ,  KC_7  ,  KC_8  ,  KC_9  ,  KC_0  ,KC_MINUS,
+         KC_TAB ,  KC_Q  ,  KC_W  ,  KC_F  ,  KC_P  ,  KC_G  ,________  ,________,________,  KC_J  ,  KC_L  ,  KC_U  ,  KC_Y  ,KC_SCLN ,KC_BSDEL, //Custom shift Codes. Backspace ^ Delete
+LT(_LYMD,KC_ESC),  KC_A  ,  KC_R  ,  KC_S  ,  KC_T  ,  KC_D  ,________  ,________,________,  KC_H  ,  KC_N  ,  KC_E  ,  KC_I  ,  KC_O  ,KC_QUOT,
+         KC_LSPO,  KC_Z  ,  KC_X  ,  KC_C  ,  KC_V  ,  KC_B  ,________  ,________,________,  KC_K  ,  KC_M  ,KC_CPIPE,KC_DOTQ ,KC_FBSLH,KC_RSPC, // Custom Shift Codes. ,^| .^?  /^|
+     KC_MEH ,KC_LCTL ,KC_LGUI ,KC_LALT ,MO(_LYNUM), KC_SPC ,________  ,________,________, KC_ENT ,MO(_LYNAV),TD(TD_CBR) ,TD(TD_BRC),TD(TD_ABK),TD(TD_LOCK_SLEEP)
 
- },
+ ),
 
  // Decision Layer
  [_LYMD] =
-    {
-       {________,________  ,________  ,________  ,________,________,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___},
-       {________,MO(_LYFK) ,MO(_LYMED),________  ,________,________,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,________},
-       {________,MO(_LYNUM),MO(_LYNAV),________  ,________,________,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___},
-       {________,MO(_LYMOS),MO(_LYSYS),MO(_LYLT) ,________,________,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___},
-       {________,________  ,________  ,________  ,________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,___XX___}
-     },
+    LAYOUT_ortho_5x15(
+       ________,________  ,________  ,________  ,________,________,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,
+       ________,MO(_LYFK) ,MO(_LYMED),________  ,________,________,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,________,
+       ________,MO(_LYNUM),MO(_LYNAV),________  ,________,________,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,
+       ________,MO(_LYMOS),MO(_LYSYS),MO(_LYLT) ,________,________,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,
+       ________,________  ,________  ,________  ,________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,___XX___
+     ),
 
  //F Keys
  [_LYFK] =
-    {
-      {________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___},
-      {KC_LYDEF,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,KC_F7   ,KC_F8   ,KC_F9   ,KC_F12  ,________},
-      {________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,KC_F4   ,KC_F5   ,KC_F6   ,KC_F11  ,___XX___},
-      {________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,KC_F1   ,KC_F2   ,KC_F3   ,KC_F10  ,___XX___},
-      {________,________,________,________,________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,___XX___}
-    },
+    LAYOUT_ortho_5x15(
+      ________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,
+      KC_LYDEF,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,KC_F7   ,KC_F8   ,KC_F9   ,KC_F12  ,________,
+      ________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,KC_F4   ,KC_F5   ,KC_F6   ,KC_F11  ,___XX___,
+      ________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,KC_F1   ,KC_F2   ,KC_F3   ,KC_F10  ,___XX___,
+      ________,________,________,________,________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,___XX___
+    ),
 //Media Keys
 [_LYMED] =
-   {
-     {________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___},
-     {KC_LYDEF,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,___XX___,KC_VOLU ,___XX___,___XX___,________},
-     {________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,KC_MPRV ,KC_MUTE ,KC_MNXT ,___XX___,___XX___},
-     {________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,___XX___,KC_VOLD ,___XX___,KC_MSTP ,___XX___},
-     {________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,KC_MPLY ,___XX___,___XX___,___XX___,___XX___}
-   },
+   LAYOUT_ortho_5x15(
+     ________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,
+     KC_LYDEF,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,___XX___,KC_VOLU ,___XX___,___XX___,________,
+     ________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,KC_MPRV ,KC_MUTE ,KC_MNXT ,___XX___,___XX___,
+     ________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,___XX___,KC_VOLD ,___XX___,KC_MSTP ,___XX___,
+     ________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,KC_MPLY ,___XX___,___XX___,___XX___,___XX___
+   ),
 //Num Keys
 [_LYNUM] =
-  {
-    {________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,KC_PEQL ,KC_PSLS ,KC_PAST ,KC_PMNS ,___XX___},
-    {KC_LYDEF,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,KC_7    ,KC_8    ,KC_9    ,KC_MINUS,________},
-    {________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,KC_4    ,KC_5    ,KC_6    ,KC_PPLS ,KC_PSLS },
-    {________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,KC_1    ,KC_2    ,KC_3    ,KC_PENT ,KC_PAST },
-    {________,________,________,________,________,________,________,________,________,________,KC_0    ,KC_0    ,KC_PDOT ,KC_PEQL ,___XX___}
-  },
+  LAYOUT_ortho_5x15(
+    ________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,KC_PEQL ,KC_PSLS ,KC_PAST ,KC_PMNS ,___XX___,
+    KC_LYDEF,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,KC_7    ,KC_8    ,KC_9    ,KC_MINUS,________,
+    ________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,KC_4    ,KC_5    ,KC_6    ,KC_PPLS ,KC_PSLS,
+    ________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,KC_1    ,KC_2    ,KC_3    ,KC_PENT ,KC_PAST,
+    ________,________,________,________,________,________,________,________,________,________,KC_0    ,KC_0    ,KC_PDOT ,KC_PEQL ,___XX___
+  ),
 //Navigation Keys
 [_LYNAV] =
- {
-   {________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___},
-   {KC_LYDEF,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,KC_HOME ,KC_UP   ,KC_PGUP ,KC_PSCR ,________},
-   {________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,KC_LEFT ,KC_F5   ,KC_RIGHT,KC_SLCK ,___XX___},
-   {________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,KC_END  ,KC_DOWN ,KC_PGDN ,KC_PAUS ,___XX___},
-   {________,________,________,________,________,________,________,________,________,________,________,KC_INS  ,KC_DEL  ,___XX___,___XX___}
- },
+ LAYOUT_ortho_5x15(
+   ________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,
+   KC_LYDEF,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,KC_HOME ,KC_UP   ,KC_PGUP ,KC_PSCR ,________,
+   ________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,KC_LEFT ,KC_F5   ,KC_RIGHT,KC_SLCK ,___XX___,
+   ________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,KC_END  ,KC_DOWN ,KC_PGDN ,KC_PAUS ,___XX___,
+   ________,________,________,________,________,________,________,________,________,________,________,KC_INS  ,KC_DEL  ,___XX___,___XX___
+ ),
  //Mouse Keys
  [_LYMOS] =
-  {
-    {________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___},
-    {KC_LYDEF,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,___XX___,KC_MS_U ,KC_WH_U ,KC_ACL2 ,________},
-    {________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,KC_MS_L ,KC_ACL0 ,KC_MS_R ,KC_ACL1 ,___XX___},
-    {________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,___XX___,KC_MS_D ,KC_WH_D ,KC_BTN2 ,___XX___},
-    {________,________,________,________,________,________,________,________,________,________,KC_BTN1 ,KC_BTN3 ,KC_BTN4 ,___XX___,___XX___}
-  },
+  LAYOUT_ortho_5x15(
+    ________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,
+    KC_LYDEF,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,___XX___,KC_MS_U ,KC_WH_U ,KC_ACL2 ,________,
+    _______,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,KC_MS_L ,KC_ACL0 ,KC_MS_R ,KC_ACL1 ,___XX___,
+    ________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,___XX___,KC_MS_D ,KC_WH_D ,KC_BTN2 ,___XX___,
+    ________,________,________,________,________,________,________,________,________,________,KC_BTN1 ,KC_BTN3 ,KC_BTN4 ,___XX___,___XX___
+  ),
   //Systen Keys
   [_LYSYS] =
-   {
-     {________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___},
-     {KC_LYDEF,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,________},
-     {________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,___XX___,QWERTY  ,COLEMAK ,___XX___,RESET   },
-     {________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___},
-     {________,________,________,________,________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,___XX___}
-   },
+   LAYOUT_ortho_5x15(
+     ________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,
+     KC_LYDEF,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,________,
+     ________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,___XX___,QWERTY  ,COLEMAK ,___XX___,RESET,
+     ________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,
+     ________,________,________,________,________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,___XX___
+   ),
 
 // Light Control
 [_LYLT] =
-  {
-     {________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___},
-     {KC_LYDEF,________,________,________,________,________,___XX___,___XX___,___XX___,RGB_HUD ,RGB_HUI ,RGB_SAD ,RGB_SAI ,RGB_VAD ,RGB_VAI },
-     {________,________,________,________,________,________,___XX___,___XX___,___XX___,RGB_TOG ,RGB_RMOD,RGB_MOD ,___XX___,___XX___,___XX___},
-     {________,________,________,________,________,________,___XX___,___XX___,___XX___,BL_TOGG ,BL_DEC  ,BL_INC  ,BL_BRTG ,___XX___,___XX___},
-     {________,________,________,________,________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,___XX___}
-  }
+  LAYOUT_ortho_5x15(
+     ________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,___XX___,
+     KC_LYDEF,________,________,________,________,________,___XX___,___XX___,___XX___,RGB_HUD ,RGB_HUI ,RGB_SAD ,RGB_SAI ,RGB_VAD ,RGB_VAI,
+     ________,________,________,________,________,________,___XX___,___XX___,___XX___,RGB_TOG ,RGB_RMOD,RGB_MOD ,___XX___,___XX___,___XX___,
+     ________,________,________,________,________,________,___XX___,___XX___,___XX___,BL_TOGG ,BL_DEC  ,BL_INC  ,BL_BRTG ,___XX___,___XX___,
+     ________,________,________,________,________,________,________,________,________,________,___XX___,___XX___,___XX___,___XX___,___XX___
+  )
 };
 
 //Define layer colors
diff --git a/qmk/keyboards/xd75/keymaps/via/keymap.c b/qmk/keyboards/xd75/keymaps/via/keymap.c
index 32cf102d..a8682226 100644
--- a/qmk/keyboards/xd75/keymaps/via/keymap.c
+++ b/qmk/keyboards/xd75/keymaps/via/keymap.c
@@ -13,67 +13,65 @@
  * 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] = {
+    /* QWERTY
+     * .--------------------------------------------------------------------------------------------------------------------------------------.
+     * | ESC    | 1      | 2      | 3      | 4      | 5      | -      | `      | =      | 6      | 7      | 8      | 9      | 0      | BACKSP |
+     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
+     * | TAB    | Q      | W      | E      | R      | T      | [      | \      | ]      | Y      | U      | I      | O      | P      | '      |
+     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
+     * | CAP LK | A      | S      | D      | F      | G      | HOME   | DEL    | PG UP  | H      | J      | K      | L      | ;      | ENTER  |
+     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
+     * | LSHIFT | Z      | X      | C      | V      | B      | END    | UP     | PG DN  | N      | M      | ,      | .      | /      | RSHIFT |
+     * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+-----------------+--------+--------|
+     * | LCTRL  | LGUI   | LALT   | FN     | SPACE  | SPACE  | LEFT   | DOWN   | RIGHT  | SPACE  | SPACE  | FN     | RALT   | RGUI   | RCTRL  |
+     * '--------------------------------------------------------------------------------------------------------------------------------------'
+     */
+    [0] = LAYOUT_ortho_5x15(
+        KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_MINS, KC_GRV,  KC_EQL,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
+        KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_LBRC, KC_BSLS, KC_RBRC, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_QUOT,
+        KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_HOME, KC_DEL,  KC_PGUP, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
+        KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_END,  KC_UP,   KC_PGDN, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
+        KC_LCTL, KC_LGUI, KC_LALT, MO(1),   KC_SPC,  KC_SPC,  KC_LEFT, KC_DOWN, KC_RGHT, KC_SPC,  KC_SPC,  MO(1),   KC_RALT, KC_RGUI, KC_RCTL
+    ),
 
-/* QWERTY
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * | ESC    | 1      | 2      | 3      | 4      | 5      | -      | `      | =      | 6      | 7      | 8      | 9      | 0      | BACKSP |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------|
- * | TAB    | Q      | W      | E      | R      | T      | [      | \      | ]      | Y      | U      | I      | O      | P      | '      |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+-----------------+--------|
- * | CAP LK | A      | S      | D      | F      | G      | HOME   | DEL    | PG UP  | H      | J      | K      | L      | ;      | ENTER  |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------------------------+--------|
- * | LSHIFT | Z      | X      | C      | V      | B      | END    | UP     | PG DN  | N      | M      | ,      | .      | /      | RSHIFT |
- * |--------+--------+--------+--------+--------+-----------------+--------+--------+--------+--------+-----------------+--------+--------|
- * | LCTRL  | LGUI   | LALT   | FN     | SPACE  | SPACE  | LEFT   | DOWN   | RIGHT  | SPACE  | SPACE  | FN     | RALT   | RGUI   | RCTRL  |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
+    /* FUNCTION
+     * .--------------------------------------------------------------------------------------------------------------------------------------.
+     * | F1     | F2     | F3     | F4     | F5     | F6     | NUM LK | P/     | P*     | F7     | F8     | F9     | F10    | F11    | F12    |
+     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+     * | SELECT | CALC   | MYCOMP | MAIL   | RGB HD | RGB HI | P7     | P8     | P9     | -      |        |        | PR SCR | SCR LK | PAUSE  |
+     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+     * | PREV   | PLAY   | NEXT   | STOP   | RGB SD | RGB SI | P4     | P5     | P6     | +      |        | RESET  |        |        |        |
+     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+     * | VOL-   | MUTE   | VOL+   | APP    | RGB VD | RGB VI | P1     | P2     | P3     | PENT   |        |        |        |        |        |
+     * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
+     * |        |        | RGB TG | FN     | RGB RMD| RGB MD | P0     |        | P.     | PENT   | PENT   | FN     |        |        |        |
+     * '--------------------------------------------------------------------------------------------------------------------------------------'
+     */
+    [1] = LAYOUT_ortho_5x15(
+        KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_NLCK, KC_SLSH, KC_ASTR, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
+        KC_MSEL, KC_CALC, KC_MYCM, KC_MAIL, RGB_HUD, RGB_HUI, KC_P7,   KC_P8,   KC_P9,   KC_MINS, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS,
+        KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP, RGB_SAD, RGB_SAI, KC_P4,   KC_P5,   KC_P6,   KC_PLUS, _______, RESET,   _______, _______, _______,
+        KC_VOLD, KC_MUTE, KC_VOLU, KC_APP,  RGB_VAD, RGB_VAI, KC_P1,   KC_P2,   KC_P3,   KC_PENT, _______, _______, _______, _______, _______,
+        _______, _______, RGB_TOG, _______, RGB_RMOD,RGB_MOD, KC_P0,   _______, KC_PDOT, KC_PENT, KC_PENT, _______, _______, _______, _______
+    ),
 
-  [0] = LAYOUT_ortho_5x15( /* QWERTY */
-    KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_MINS, KC_GRV,  KC_EQL,  KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_LBRC, KC_BSLS, KC_RBRC, KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_QUOT,
-    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_HOME, KC_DEL,  KC_PGUP, KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_ENT,
-    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_END,  KC_UP,   KC_PGDN, KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
-    KC_LCTL, KC_LGUI, KC_LALT, MO(1),   KC_SPC,  KC_SPC,  KC_LEFT, KC_DOWN, KC_RGHT, KC_SPC,  KC_SPC,  MO(1),   KC_RALT, KC_RGUI, KC_RCTL
-  ),
+    [2] = LAYOUT_ortho_5x15(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+    ),
 
-/* FUNCTION
- * .--------------------------------------------------------------------------------------------------------------------------------------.
- * | F1     | F2     | F3     | F4     | F5     | F6     | NUM LK | P/     | P*     | F7     | F8     | F9     | F10    | F11    | F12    |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | SELECT | CALC   | MYCOMP | MAIL   | RGB HD | RGB HI | P7     | P8     | P9     | -      |        |        | PR SCR | SCR LK | PAUSE  |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | PREV   | PLAY   | NEXT   | STOP   | RGB SD | RGB SI | P4     | P5     | P6     | +      |        | RESET  |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * | VOL-   | MUTE   | VOL+   | APP    | RGB VD | RGB VI | P1     | P2     | P3     | PENT   |        |        |        |        |        |
- * |--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------|
- * |        |        | RGB TG | FN     | RGB RMD| RGB MD | P0     |        | P.     | PENT   | PENT   | FN     |        |        |        |
- * '--------------------------------------------------------------------------------------------------------------------------------------'
- */
-
-  [1] = LAYOUT_ortho_5x15( /* FUNCTION */
-    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_NLCK, KC_SLSH, KC_ASTR, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
-    KC_MSEL, KC_CALC, KC_MYCM, KC_MAIL, RGB_HUD, RGB_HUI, KC_P7,   KC_P8,   KC_P9,   KC_MINS, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS,
-    KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP, RGB_SAD, RGB_SAI, KC_P4,   KC_P5,   KC_P6,   KC_PLUS, _______, RESET,   _______, _______, _______,
-    KC_VOLD, KC_MUTE, KC_VOLU, KC_APP,  RGB_VAD, RGB_VAI, KC_P1,   KC_P2,   KC_P3,   KC_PENT, _______, _______, _______, _______, _______,
-    _______, _______, RGB_TOG, _______, RGB_RMOD,RGB_MOD, KC_P0,   _______, KC_PDOT, KC_PENT, KC_PENT, _______, _______, _______, _______
-  ),
-
-  [2] = LAYOUT_ortho_5x15(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-  ),
-
-  [3] = LAYOUT_ortho_5x15(
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
-  ),
+    [3] = LAYOUT_ortho_5x15(
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______
+    )
 };
diff --git a/qmk/keyboards/xd75/readme.md b/qmk/keyboards/xd75/readme.md
index fc5b8972..65da5cc0 100644
--- a/qmk/keyboards/xd75/readme.md
+++ b/qmk/keyboards/xd75/readme.md
@@ -2,26 +2,27 @@
 
 ![XD75](https://cdn.shopify.com/s/files/1/2711/4238/products/HTB1MzOISXXXXXXgXpXXq6xXFXXXO_1024x1024.jpg)
 
-The XD75Re is a 15x5 full-grid ortholinear keyboard manufactured by XIUDI. This port of the QMK firmware is my first shot at using QMK, so if you see any features done wrong (or just plain missing), feel free to fix them and put in a pull request!
+The XD75 is a 15x5 full-grid ortholinear keyboard manufactured by XIUDI. Available in two different versions: XD75Re with hot swap switch sockets and XD75Am with Alps+MX Stem support that needs soldering.
 
-Keyboard Maintainer: [The QMK Community](https://github.com/qmk)  
-Hardware Supported: XD75Re  
-Hardware Availability: [KPrepublic](https://kprepublic.com/products/xd75re-xd75am-xd75-xiudi-60-custom-keyboard-pcb), [AliExpress](https://www.aliexpress.com/item/xd75re-Custom-Mechanical-Keyboard-75-keys-TKG-TOOLS-Underglow-RGB-PCB-GH60-60-programmed-gh60-kle/32818745981.html)
+This port of the QMK firmware is my first shot at using QMK, so if you see any features done wrong (or just plain missing), feel free to fix them and put in a pull request!
+
+* Keyboard Maintainer: [The QMK Community](https://github.com/qmk)
+* Hardware Supported: XD75Re, XD75Am
+* Hardware Availability: [KPrepublic](https://kprepublic.com/products/xd75re-xd75am-xd75-xiudi-60-custom-keyboard-pcb), [AliExpress](https://www.aliexpress.com/item/xd75re-Custom-Mechanical-Keyboard-75-keys-TKG-TOOLS-Underglow-RGB-PCB-GH60-60-programmed-gh60-kle/32818745981.html)
 
 Make example for this keyboard (after setting up your build environment):
 
     make xd75:default
 
-Flashing example:
+Flashing example for this keyboard:
 
-    make xd75:default:dfu
+    make xd75:default:flash
 
 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).
 
+## LED Control
 
-## LED control
-
-There are 3 individual LEDs that can be turned on and off, plus the keycap LEDs (which are all wired into the same pin).  The functions are named according to how they're labeled on the PCB.
+There are 3 individual LEDs that can be turned on and off. The functions are named according to how they're labeled on the PCB.
 
 TODO: it would be nice to have PWM support on these LEDs for fade-in/fade-out effects.
 
@@ -29,13 +30,9 @@ TODO: it would be nice to have PWM support on these LEDs for fade-in/fade-out ef
 capslock_led_on();
 gp100_led_on();
 gp103_led_on();
-keycaps_led_on();
 
-
-// led_set_user example - you could also turn these on/off in response
-// to events in process_record_user or matrix_scan_user
-void led_set_user(uint8_t usb_led) {
-    if (usb_led & (1<<USB_LED_CAPS_LOCK)) {
+bool led_update_user(led_t led_state) {
+    if (led_state.caps_lock) {
         capslock_led_on();
     } else {
         capslock_led_off();
@@ -43,10 +40,11 @@ void led_set_user(uint8_t usb_led) {
 
     if (some_custom_state) {
       gp100_led_on();
-    }
-    else {
+    } else {
       gp100_led_off();
     }
+
+    return false;
 }
 ```
 
@@ -55,6 +53,5 @@ For the curious:
 ```
 CAPSLOCK_LED    B2
 GP103_LED       F4
-KEYCAPS_LED     F5
 GP100_LED       F7
 ```
diff --git a/qmk/keyboards/xd75/rules.mk b/qmk/keyboards/xd75/rules.mk
index e822f37e..97d0f379 100644
--- a/qmk/keyboards/xd75/rules.mk
+++ b/qmk/keyboards/xd75/rules.mk
@@ -2,31 +2,23 @@
 MCU = atmega32u4
 
 # Bootloader selection
-#   Teensy       halfkay
-#   Pro Micro    caterina
-#   Atmel DFU    atmel-dfu
-#   LUFA DFU     lufa-dfu
-#   QMK DFU      qmk-dfu
-#   ATmega32A    bootloadHID
-#   ATmega328P   USBasp
 BOOTLOADER = atmel-dfu
 
-# QMK Build Options
-#   change to "no" to disable the options, or define them in the Makefile in 
-#   the appropriate keymap folder that will get included automatically
+# Build Options
+#   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = yes       # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = full     # 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 = yes        # Commands for debug and configuration
-NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-MIDI_ENABLE = no            # MIDI support
-AUDIO_ENABLE = no           # Audio output on port C6
-UNICODE_ENABLE = no         # Unicode
-BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
-RGBLIGHT_ENABLE = yes        # Enable WS2812 RGB underlight. 
+# 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
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
 
 LAYOUTS = ortho_5x15
diff --git a/qmk/keyboards/xd75/xd75.c b/qmk/keyboards/xd75/xd75.c
index dd0ec8a4..b0166435 100644
--- a/qmk/keyboards/xd75/xd75.c
+++ b/qmk/keyboards/xd75/xd75.c
@@ -13,93 +13,56 @@
  * 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 "xd75.h"
 
-#define XD75_CAPSLOCK_LED 2  // B2
-#define XD75_GP103_LED 4  // F4
-#define XD75_KEYCAPS_LED 5  // F5
-#define XD75_GP100_LED 7  // F7
+#define XD75_CAPSLOCK_LED B2
+#define XD75_GP103_LED F4
+#define XD75_GP100_LED F7
 
 void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
+    capslock_led_init();
+    gp100_led_init();
+    gp103_led_init();
 
-	capslock_led_init();
-	gp100_led_init();
-	gp103_led_init();
-	keycaps_led_init();
-
-	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
-
-	led_set_user(usb_led);
+    matrix_init_user();
 }
 
 void capslock_led_init(void) {
-	DDRB |= (1 << XD75_CAPSLOCK_LED);
-	capslock_led_off();
+    setPinOutput(XD75_CAPSLOCK_LED);
+    capslock_led_off();
 }
 
 void capslock_led_off(void) {
-	PORTB |= (1 << XD75_CAPSLOCK_LED);
+    writePinHigh(XD75_CAPSLOCK_LED);
 }
 
 void capslock_led_on(void) {
-	PORTB &= ~(1 << XD75_CAPSLOCK_LED);
+    writePinLow(XD75_CAPSLOCK_LED);
 }
 
 void gp100_led_init(void) {
-	DDRF |= (1 << XD75_GP100_LED);
-	gp100_led_off();
+    setPinOutput(XD75_GP100_LED);
+    gp100_led_off();
 }
 
 void gp100_led_off(void) {
-	PORTF |= (1 << XD75_GP100_LED);
+    writePinHigh(XD75_GP100_LED);
 }
 
 void gp100_led_on(void) {
-	PORTF &= ~(1 << XD75_GP100_LED);
+    writePinLow(XD75_GP100_LED);
 }
 
 void gp103_led_init(void) {
-	DDRF |= (1 << XD75_GP103_LED);
-	gp103_led_off();
+    setPinOutput(XD75_GP103_LED);
+    gp103_led_off();
 }
 
 void gp103_led_off(void) {
-	PORTF &= ~(1 << XD75_GP103_LED);
+    writePinLow(XD75_GP103_LED);
 }
 
 void gp103_led_on(void) {
-	PORTF |= (1 << XD75_GP103_LED);
-}
-
-void keycaps_led_init(void) {
-	DDRF |= (1 << XD75_KEYCAPS_LED);
-	keycaps_led_off();
-}
-
-void keycaps_led_off(void) {
-	PORTF |= (1 << XD75_KEYCAPS_LED);
-}
-
-void keycaps_led_on(void) {
-	PORTF &= ~(1 << XD75_KEYCAPS_LED);
+    writePinHigh(XD75_GP103_LED);
 }
diff --git a/qmk/keyboards/xd75/xd75.h b/qmk/keyboards/xd75/xd75.h
index c27930a8..33f2ec92 100644
--- a/qmk/keyboards/xd75/xd75.h
+++ b/qmk/keyboards/xd75/xd75.h
@@ -13,44 +13,11 @@
  * 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( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E,\
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E,\
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E,\
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E,\
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
-    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E }  \
-}
-
-#define LAYOUT_kc( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E,\
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E,\
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E,\
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E,\
-    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E \
-) { \
-    { 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_##K0C, KC_##K0D, KC_##K0E }, \
-    { 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_##K1C, KC_##K1D, KC_##K1E }, \
-    { 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_##K2C, KC_##K2D, KC_##K2E }, \
-    { KC_##K30, KC_##K31, KC_##K32, KC_##K33, KC_##K34, KC_##K35, KC_##K36, KC_##K37, KC_##K38, KC_##K39, KC_##K3A, KC_##K3B, KC_##K3C, KC_##K3D, KC_##K3E }, \
-    { KC_##K40, KC_##K41, KC_##K42, KC_##K43, KC_##K44, KC_##K45, KC_##K46, KC_##K47, KC_##K48, KC_##K49, KC_##K4A, KC_##K4B, KC_##K4C, KC_##K4D, KC_##K4E }  \
-}
-
-#define LAYOUT_ortho_5x15 LAYOUT
-
 void capslock_led_init(void);
 void capslock_led_off(void);
 void capslock_led_on(void);
@@ -63,6 +30,26 @@ void gp103_led_init(void);
 void gp103_led_off(void);
 void gp103_led_on(void);
 
-void keycaps_led_init(void);
-void keycaps_led_off(void);
-void keycaps_led_on(void);
+/* This is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT_ortho_5x15( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E,\
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E,\
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E,\
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E,\
+    K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K0E }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, K1E }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D, K2E }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D, K3E }, \
+    { K40, K41, K42, K43, K44, K45, K46, K47, K48, K49, K4A, K4B, K4C, K4D, K4E }  \
+}
+
+#define LAYOUT LAYOUT_ortho_5x15
diff --git a/qmk/keyboards/xd84/config.h b/qmk/keyboards/xd84/config.h
index 2a77db68..9a823669 100644
--- a/qmk/keyboards/xd84/config.h
+++ b/qmk/keyboards/xd84/config.h
@@ -47,6 +47,9 @@
 /* COL2ROW, ROW2COL */
 //#define DIODE_DIRECTION COL2ROW
 
+#define LED_CAPS_LOCK_PIN B6
+#define LED_PIN_ON_STATE 0
+
 #define BACKLIGHT_PIN B5
 #define BACKLIGHT_LEVELS 10
 // #define BACKLIGHT_BREATHING
@@ -206,34 +209,6 @@
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/xd84/rules.mk b/qmk/keyboards/xd84/rules.mk
index 59003862..b857c29a 100644
--- a/qmk/keyboards/xd84/rules.mk
+++ b/qmk/keyboards/xd84/rules.mk
@@ -30,7 +30,6 @@ 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
 LTO_ENABLE = yes
 
 # custom matrix setup
diff --git a/qmk/keyboards/xd84/xd84.c b/qmk/keyboards/xd84/xd84.c
index eaf53142..dec4ef95 100644
--- a/qmk/keyboards/xd84/xd84.c
+++ b/qmk/keyboards/xd84/xd84.c
@@ -14,19 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "xd84.h"
-
-void keyboard_pre_init_kb(void) {
-  setPinOutput(B6);
-
-  keyboard_pre_init_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-  if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
-    writePinLow(B6);
-  } else {
-    writePinHigh(B6);
-  }
-
-  led_set_user(usb_led);
-}
diff --git a/qmk/keyboards/xd84pro/config.h b/qmk/keyboards/xd84pro/config.h
new file mode 100644
index 00000000..01f410ea
--- /dev/null
+++ b/qmk/keyboards/xd84pro/config.h
@@ -0,0 +1,78 @@
+/* Copyright 2020
+ *
+ * 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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x7844 // "xD"
+#define PRODUCT_ID      0x8450 // 84 "P"
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    KPrepublic
+#define PRODUCT         XD84 Pro
+
+/* key matrix size */
+#define MATRIX_ROWS 6
+#define MATRIX_COLS 15
+
+#define MATRIX_ROW_PINS { F4, D0, D1, D2, D3, D5 }
+#define MATRIX_COL_PINS { F0, F1, E6, C7, C6, B6, D4, B1, B7, B5, B4, D7, D6, B3, F7 }
+#define UNUSED_PINS { B0, E2 }
+
+#define DIODE_DIRECTION COL2ROW
+
+#define LED_CAPS_LOCK_PIN B2
+#define LED_PIN_ON_STATE 0
+
+#define RGB_DI_PIN F6
+#ifdef RGB_DI_PIN
+    #define RGBLED_NUM 12
+//   #define RGBLIGHT_HUE_STEP 8
+//   #define RGBLIGHT_SAT_STEP 8
+//   #define RGBLIGHT_VAL_STEP 8
+//   #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+    #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+// /*== all animations enable ==*/
+    #define RGBLIGHT_ANIMATIONS
+// /*== or choose animations ==*/
+//   #define RGBLIGHT_EFFECT_BREATHING
+//   #define RGBLIGHT_EFFECT_RAINBOW_MOOD
+//   #define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+//   #define RGBLIGHT_EFFECT_SNAKE
+//   #define RGBLIGHT_EFFECT_KNIGHT
+//   #define RGBLIGHT_EFFECT_CHRISTMAS
+//   #define RGBLIGHT_EFFECT_STATIC_GRADIENT
+//   #define RGBLIGHT_EFFECT_RGB_TEST
+//   #define RGBLIGHT_EFFECT_ALTERNATING
+#endif
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* number of backlight levels */
+#define BACKLIGHT_PIN F5
+#define BACKLIGHT_LEVELS 10
+#define BACKLIGHT_ON_STATE 0
+// #define BACKLIGHT_BREATHING
+
+/* 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 NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
diff --git a/qmk/keyboards/xd84pro/dev.md b/qmk/keyboards/xd84pro/dev.md
new file mode 100644
index 00000000..6e7f4449
--- /dev/null
+++ b/qmk/keyboards/xd84pro/dev.md
@@ -0,0 +1,28 @@
+# XD84 Pro
+
+Development docs covering the following:
+- ATmega32u4
+- RGB
+- Backlight
+- Light Through Cat
+
+### Bootloader
+Default bootloader is `atmel-dfu`.
+Reboot to bootloader via bridging 2 contacts points in the icsp header.
+Flash using regular dfu methods.
+
+# RGB
+- PIN F6
+- Number of RGB LED: 12
+
+# Backlight
+- PIN F5
+
+# Light Through Cat
+- PIN F5
+
+# Caps Lock LED/Indicator
+- PIN B2
+
+## Return to stock firmware
+The original TMK firmware is available at [xd.tkg.io](https://xd.tkg.io).
diff --git a/qmk/keyboards/xd84pro/info.json b/qmk/keyboards/xd84pro/info.json
new file mode 100644
index 00000000..807f7318
--- /dev/null
+++ b/qmk/keyboards/xd84pro/info.json
@@ -0,0 +1,277 @@
+{
+    "keyboard_name": "XD84 Pro",
+    "url": "",
+    "maintainer": "qmk",
+    "width": 16,
+    "height": 6,
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":1, "y":0},
+                {"label":"F2", "x":2, "y":0},
+                {"label":"F3", "x":3, "y":0},
+                {"label":"F4", "x":4, "y":0},
+                {"label":"F5", "x":5, "y":0},
+                {"label":"F6", "x":6, "y":0},
+                {"label":"F7", "x":7, "y":0},
+                {"label":"F8", "x":8, "y":0},
+                {"label":"F9", "x":9, "y":0},
+                {"label":"F10", "x":10, "y":0},
+                {"label":"F11", "x":11, "y":0},
+                {"label":"F12", "x":12, "y":0},
+                {"label":"PrtSc", "x":13, "y":0},
+                {"label":"Pause", "x":14, "y":0},
+                {"label":"Delete", "x":15, "y":0},
+                {"label":"~", "x":0, "y":1},
+                {"label":"1", "x":1, "y":1},
+                {"label":"2", "x":2, "y":1},
+                {"label":"3", "x":3, "y":1},
+                {"label":"4", "x":4, "y":1},
+                {"label":"5", "x":5, "y":1},
+                {"label":"6", "x":6, "y":1},
+                {"label":"7", "x":7, "y":1},
+                {"label":"8", "x":8, "y":1},
+                {"label":"9", "x":9, "y":1},
+                {"label":"0", "x":10, "y":1},
+                {"label":"_", "x":11, "y":1},
+                {"label":"+", "x":12, "y":1},
+                {"label":"Backspace", "x":13, "y":1},
+                {"label":"Backspace", "x":14, "y":1},
+                {"label":"Home", "x":15, "y":1},
+                {"label":"Tab", "x":0, "y":2, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2},
+                {"label":"W", "x":2.5, "y":2},
+                {"label":"E", "x":3.5, "y":2},
+                {"label":"R", "x":4.5, "y":2},
+                {"label":"T", "x":5.5, "y":2},
+                {"label":"Y", "x":6.5, "y":2},
+                {"label":"U", "x":7.5, "y":2},
+                {"label":"I", "x":8.5, "y":2},
+                {"label":"O", "x":9.5, "y":2},
+                {"label":"P", "x":10.5, "y":2},
+                {"label":"{", "x":11.5, "y":2},
+                {"label":"}", "x":12.5, "y":2},
+                {"label":"|", "x":13.5, "y":2, "w":1.5},
+                {"label":"Page Up", "x":15, "y":2},
+                {"label":"Caps Lock", "x":0, "y":3, "w":1.75},
+                {"label":"A", "x":1.75, "y":3},
+                {"label":"S", "x":2.75, "y":3},
+                {"label":"D", "x":3.75, "y":3},
+                {"label":"F", "x":4.75, "y":3},
+                {"label":"G", "x":5.75, "y":3},
+                {"label":"H", "x":6.75, "y":3},
+                {"label":"J", "x":7.75, "y":3},
+                {"label":"K", "x":8.75, "y":3},
+                {"label":"L", "x":9.75, "y":3},
+                {"label":":", "x":10.75, "y":3},
+                {"label":"\"", "x":11.75, "y":3},
+                {"label":"\\", "x":12.75, "y":3},
+                {"label":"Enter", "x":13.75, "y":3, "w":1.25},
+                {"label":"Page Down", "x":15, "y":3},
+                {"label":"Shift", "x":0, "y":4, "w":1.25},
+                {"label":"Shift", "x":1.25, "y":4},
+                {"label":"Z", "x":2.25, "y":4},
+                {"label":"X", "x":3.25, "y":4},
+                {"label":"C", "x":4.25, "y":4},
+                {"label":"V", "x":5.25, "y":4},
+                {"label":"B", "x":6.25, "y":4},
+                {"label":"N", "x":7.25, "y":4},
+                {"label":"M", "x":8.25, "y":4},
+                {"label":"<", "x":9.25, "y":4},
+                {"label":">", "x":10.25, "y":4},
+                {"label":"?", "x":11.25, "y":4},
+                {"label":"Shift", "x":12.25, "y":4, "w":1.75},
+                {"label":"Up", "x":14, "y":4},
+                {"label":"End", "x":15, "y":4},
+                {"label":"Ctrl", "x":0, "y":5, "w":1.25},
+                {"label":"Win", "x":1.25, "y":5, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":5, "w":1.25},
+                {"label":"Space", "x":3.75, "y":5, "w":6.25},
+                {"label":"Alt", "x":10, "y":5},
+                {"label":"Fn", "x":11, "y":5},
+                {"label":"Ctrl", "x":12, "y":5},
+                {"label":"Left", "x":13, "y":5},
+                {"label":"Down", "x":14, "y":5},
+                {"label":"Right", "x":15, "y":5}
+            ]
+        },
+        "LAYOUT_75_ansi": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":1, "y":0},
+                {"label":"F2", "x":2, "y":0},
+                {"label":"F3", "x":3, "y":0},
+                {"label":"F4", "x":4, "y":0},
+                {"label":"F5", "x":5, "y":0},
+                {"label":"F6", "x":6, "y":0},
+                {"label":"F7", "x":7, "y":0},
+                {"label":"F8", "x":8, "y":0},
+                {"label":"F9", "x":9, "y":0},
+                {"label":"F10", "x":10, "y":0},
+                {"label":"F11", "x":11, "y":0},
+                {"label":"F12", "x":12, "y":0},
+                {"label":"PrtSc", "x":13, "y":0},
+                {"label":"Pause", "x":14, "y":0},
+                {"label":"Delete", "x":15, "y":0},
+                {"label":"~", "x":0, "y":1},
+                {"label":"1", "x":1, "y":1},
+                {"label":"2", "x":2, "y":1},
+                {"label":"3", "x":3, "y":1},
+                {"label":"4", "x":4, "y":1},
+                {"label":"5", "x":5, "y":1},
+                {"label":"6", "x":6, "y":1},
+                {"label":"7", "x":7, "y":1},
+                {"label":"8", "x":8, "y":1},
+                {"label":"9", "x":9, "y":1},
+                {"label":"0", "x":10, "y":1},
+                {"label":"_", "x":11, "y":1},
+                {"label":"+", "x":12, "y":1},
+                {"label":"Backspace", "x":13, "y":1, "w":2},
+                {"label":"Home", "x":15, "y":1},
+                {"label":"Tab", "x":0, "y":2, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2},
+                {"label":"W", "x":2.5, "y":2},
+                {"label":"E", "x":3.5, "y":2},
+                {"label":"R", "x":4.5, "y":2},
+                {"label":"T", "x":5.5, "y":2},
+                {"label":"Y", "x":6.5, "y":2},
+                {"label":"U", "x":7.5, "y":2},
+                {"label":"I", "x":8.5, "y":2},
+                {"label":"O", "x":9.5, "y":2},
+                {"label":"P", "x":10.5, "y":2},
+                {"label":"{", "x":11.5, "y":2},
+                {"label":"}", "x":12.5, "y":2},
+                {"label":"|", "x":13.5, "y":2, "w":1.5},
+                {"label":"Page Up", "x":15, "y":2},
+                {"label":"Caps Lock", "x":0, "y":3, "w":1.75},
+                {"label":"A", "x":1.75, "y":3},
+                {"label":"S", "x":2.75, "y":3},
+                {"label":"D", "x":3.75, "y":3},
+                {"label":"F", "x":4.75, "y":3},
+                {"label":"G", "x":5.75, "y":3},
+                {"label":"H", "x":6.75, "y":3},
+                {"label":"J", "x":7.75, "y":3},
+                {"label":"K", "x":8.75, "y":3},
+                {"label":"L", "x":9.75, "y":3},
+                {"label":":", "x":10.75, "y":3},
+                {"label":"\"", "x":11.75, "y":3},
+                {"label":"Enter", "x":12.75, "y":3, "w":2.25},
+                {"label":"Page Down", "x":15, "y":3},
+                {"label":"Shift", "x":0, "y":4, "w":2.25},
+                {"label":"Z", "x":2.25, "y":4},
+                {"label":"X", "x":3.25, "y":4},
+                {"label":"C", "x":4.25, "y":4},
+                {"label":"V", "x":5.25, "y":4},
+                {"label":"B", "x":6.25, "y":4},
+                {"label":"N", "x":7.25, "y":4},
+                {"label":"M", "x":8.25, "y":4},
+                {"label":"<", "x":9.25, "y":4},
+                {"label":">", "x":10.25, "y":4},
+                {"label":"?", "x":11.25, "y":4},
+                {"label":"Shift", "x":12.25, "y":4, "w":1.75},
+                {"label":"Up", "x":14, "y":4},
+                {"label":"End", "x":15, "y":4},
+                {"label":"Ctrl", "x":0, "y":5, "w":1.25},
+                {"label":"Win", "x":1.25, "y":5, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":5, "w":1.25},
+                {"label":"Space", "x":3.75, "y":5, "w":6.25},
+                {"label":"Alt", "x":10, "y":5},
+                {"label":"Fn", "x":11, "y":5},
+                {"label":"Ctrl", "x":12, "y":5},
+                {"label":"Left", "x":13, "y":5},
+                {"label":"Down", "x":14, "y":5},
+                {"label":"Right", "x":15, "y":5}
+            ]
+        },
+        "LAYOUT_75_iso": {
+            "layout": [
+                {"label":"Esc", "x":0, "y":0},
+                {"label":"F1", "x":1, "y":0},
+                {"label":"F2", "x":2, "y":0},
+                {"label":"F3", "x":3, "y":0},
+                {"label":"F4", "x":4, "y":0},
+                {"label":"F5", "x":5, "y":0},
+                {"label":"F6", "x":6, "y":0},
+                {"label":"F7", "x":7, "y":0},
+                {"label":"F8", "x":8, "y":0},
+                {"label":"F9", "x":9, "y":0},
+                {"label":"F10", "x":10, "y":0},
+                {"label":"F11", "x":11, "y":0},
+                {"label":"F12", "x":12, "y":0},
+                {"label":"PrtSc", "x":13, "y":0},
+                {"label":"Pause", "x":14, "y":0},
+                {"label":"Delete", "x":15, "y":0},
+                {"label":"~", "x":0, "y":1},
+                {"label":"1", "x":1, "y":1},
+                {"label":"2", "x":2, "y":1},
+                {"label":"3", "x":3, "y":1},
+                {"label":"4", "x":4, "y":1},
+                {"label":"5", "x":5, "y":1},
+                {"label":"6", "x":6, "y":1},
+                {"label":"7", "x":7, "y":1},
+                {"label":"8", "x":8, "y":1},
+                {"label":"9", "x":9, "y":1},
+                {"label":"0", "x":10, "y":1},
+                {"label":"_", "x":11, "y":1},
+                {"label":"+", "x":12, "y":1},
+                {"label":"Backspace", "x":13, "y":1, "w":2},
+                {"label":"Home", "x":15, "y":1},
+                {"label":"Tab", "x":0, "y":2, "w":1.5},
+                {"label":"Q", "x":1.5, "y":2},
+                {"label":"W", "x":2.5, "y":2},
+                {"label":"E", "x":3.5, "y":2},
+                {"label":"R", "x":4.5, "y":2},
+                {"label":"T", "x":5.5, "y":2},
+                {"label":"Y", "x":6.5, "y":2},
+                {"label":"U", "x":7.5, "y":2},
+                {"label":"I", "x":8.5, "y":2},
+                {"label":"O", "x":9.5, "y":2},
+                {"label":"P", "x":10.5, "y":2},
+                {"label":"{", "x":11.5, "y":2},
+                {"label":"}", "x":12.5, "y":2},
+                {"label":"Page Up", "x":15, "y":2},
+                {"label":"Caps Lock", "x":0, "y":3, "w":1.75},
+                {"label":"A", "x":1.75, "y":3},
+                {"label":"S", "x":2.75, "y":3},
+                {"label":"D", "x":3.75, "y":3},
+                {"label":"F", "x":4.75, "y":3},
+                {"label":"G", "x":5.75, "y":3},
+                {"label":"H", "x":6.75, "y":3},
+                {"label":"J", "x":7.75, "y":3},
+                {"label":"K", "x":8.75, "y":3},
+                {"label":"L", "x":9.75, "y":3},
+                {"label":":", "x":10.75, "y":3},
+                {"label":"@", "x":11.75, "y":3},
+                {"label":"~", "x":12.75, "y":3},
+                {"label":"Enter", "x":13.75, "y":2, "w":1.25, "h":2},
+                {"label":"Page Down", "x":15, "y":3},
+                {"label":"Shift", "x":0, "y":4, "w":1.25},
+                {"label":"|", "x":1.25, "y":4},
+                {"label":"Z", "x":2.25, "y":4},
+                {"label":"X", "x":3.25, "y":4},
+                {"label":"C", "x":4.25, "y":4},
+                {"label":"V", "x":5.25, "y":4},
+                {"label":"B", "x":6.25, "y":4},
+                {"label":"N", "x":7.25, "y":4},
+                {"label":"M", "x":8.25, "y":4},
+                {"label":"<", "x":9.25, "y":4},
+                {"label":">", "x":10.25, "y":4},
+                {"label":"?", "x":11.25, "y":4},
+                {"label":"Shift", "x":12.25, "y":4, "w":1.75},
+                {"label":"Up", "x":14, "y":4},
+                {"label":"End", "x":15, "y":4},
+                {"label":"Ctrl", "x":0, "y":5, "w":1.25},
+                {"label":"Win", "x":1.25, "y":5, "w":1.25},
+                {"label":"Alt", "x":2.5, "y":5, "w":1.25},
+                {"label":"Space", "x":3.75, "y":5, "w":6.25},
+                {"label":"Alt", "x":10, "y":5},
+                {"label":"Fn", "x":11, "y":5},
+                {"label":"Ctrl", "x":12, "y":5},
+                {"label":"Left", "x":13, "y":5},
+                {"label":"Down", "x":14, "y":5},
+                {"label":"Right", "x":15, "y":5}
+            ]
+        }
+    }
+}
diff --git a/qmk/keyboards/xd84pro/keymaps/default/keymap.c b/qmk/keyboards/xd84pro/keymaps/default/keymap.c
new file mode 100644
index 00000000..5229b746
--- /dev/null
+++ b/qmk/keyboards/xd84pro/keymaps/default/keymap.c
@@ -0,0 +1,52 @@
+/* Copyright 2020 katawajojo
+  *
+  * 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_75_ansi(
+/* ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐ */
+    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_SLCK,  KC_PAUS,  KC_DEL,
+/* ├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┴─────────┼─────────┤ */
+	  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_HOME,
+/* ├─────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬──────────────┼─────────┤ */
+	  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_PGUP,
+/* ├──────────────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──────────────├─────────┤ */
+	  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_PGDN,
+/* ├─────────────────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───────────┬─────────┼─────────┤ */
+	  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_END,
+/* ├───────────┬─────────┴─┬───────┴───┬─────┴─────────┴─────────┴─────────┴─────────┴─────────┴───────┬─┴───────┬─┴───────┬─┴───────┬─────────┼─────────┼─────────┤ */
+	  KC_LCTL,    KC_LGUI,    KC_LALT,    KC_SPC,                                                         KC_RALT,  MO(1),  KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT
+/* └───────────┴───────────┴───────────┴───────────────────────────────────────────────────────────────┴─────────┴─────────┴─────────┴─────────┴─────────┴─────────┘ */
+  ),
+
+  [1] = LAYOUT_75_ansi(
+/* ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐ */
+    _______,  BL_TOGG,  BL_STEP,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  RESET,
+/* ├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┴─────────┼─────────┤ */
+	  _______,  RGB_TOG,  RGB_MOD,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
+/* ├─────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬──────────────┼─────────┤ */
+	  _______, 	     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,       _______,
+/* ├──────────────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──────────────├─────────┤ */
+	  _______,          _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,              _______,
+/* ├─────────────────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───────────┬─────────┼─────────┤ */
+	  _______,              _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,          _______,  _______,
+/* ├───────────┬─────────┴─┬───────┴───┬─────┴─────────┴─────────┴─────────┴─────────┴─────────┴───────┬─┴───────┬─┴───────┬─┴───────┬─────────┼─────────┼─────────┤ */
+	  _______,    _______,    _______,    _______,                                                        _______,  _______,  _______,  _______,  _______,  _______
+/* └───────────┴───────────┴───────────┴───────────────────────────────────────────────────────────────┴─────────┴─────────┴─────────┴─────────┴─────────┴─────────┘ */
+  )
+};
\ No newline at end of file
diff --git a/qmk/keyboards/xd84pro/keymaps/default_iso/keymap.c b/qmk/keyboards/xd84pro/keymaps/default_iso/keymap.c
new file mode 100644
index 00000000..c27c1696
--- /dev/null
+++ b/qmk/keyboards/xd84pro/keymaps/default_iso/keymap.c
@@ -0,0 +1,54 @@
+/* Copyright 2020 katawajojo
+  *
+  * 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
+
+#define L1_RGUI LM(1, MOD_RGUI)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [0] = LAYOUT_75_iso(
+/* ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐ */
+    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_PAUS,  KC_DEL,
+/* ├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┴─────────┼─────────┤ */
+	  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_HOME,
+/* ├─────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬──────────────┼─────────┤ */
+	  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_PGUP,
+/* ├──────────────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬           ├─────────┤ */
+	  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_PGDN,
+/* ├───────────┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴─────────┴─┬─────────┼─────────┤ */
+	  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_UP,    KC_END,
+/* ├───────────┼─────────┴─┬───────┴───┬─────┴─────────┴─────────┴─────────┴─────────┴─────────┴───────┬─┴───────┬─┴───────┬─┴───────┬─────────┼─────────┼─────────┤ */
+	  KC_LCTL,    KC_LGUI,    KC_LALT,    KC_SPC,                                                         KC_RALT,  L1_RGUI,  KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT
+/* └───────────┴───────────┴───────────┴───────────────────────────────────────────────────────────────┴─────────┴─────────┴─────────┴─────────┴─────────┴─────────┘ */
+  ),
+
+  [1] = LAYOUT_75_iso(
+/* ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐ */
+    _______,  BL_TOGG,  BL_STEP,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  RESET,
+/* ├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┴─────────┼─────────┤ */
+	  _______,  RGB_TOG,  RGB_MOD,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,            _______,
+/* ├─────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬──────────────┼─────────┤ */
+	  _______, 	     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,                 _______,
+/* ├──────────────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬           ├─────────┤ */
+	  _______,          _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,
+/* ├───────────┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴─────────┴─┬─────────┼─────────┤ */
+	  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,          _______,  _______,
+/* ├───────────┼─────────┴─┬───────┴───┬─────┴─────────┴─────────┴─────────┴─────────┴─────────┴───────┬─┴───────┬─┴───────┬─┴───────┬─────────┼─────────┼─────────┤ */
+	  _______,    _______,    _______,    _______,                                                        _______,  _______,  _______,  _______,  _______,  _______
+/* └───────────┴───────────┴───────────┴───────────────────────────────────────────────────────────────┴─────────┴─────────┴─────────┴─────────┴─────────┴─────────┘ */
+  )
+};
diff --git a/qmk/keyboards/xd84pro/keymaps/via/keymap.c b/qmk/keyboards/xd84pro/keymaps/via/keymap.c
new file mode 100644
index 00000000..214fff6f
--- /dev/null
+++ b/qmk/keyboards/xd84pro/keymaps/via/keymap.c
@@ -0,0 +1,84 @@
+/* Copyright 2020 katawajojo
+  *
+  * 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_all(
+/* ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐ */
+    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_SLCK,  KC_PAUS,  KC_DEL,
+/* ├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┴─────────┼─────────┤ */
+      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_HOME,
+/* ├─────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬──────────────┼─────────┤ */
+      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_PGUP,
+/* ├──────────────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴────┬─────────├─────────┤ */
+      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_BSLS,   KC_ENT,   KC_PGDN,
+/* ├─────────────────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───────────┼─────────┼─────────┤ */
+      KC_LSFT, 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_END,
+/* ├───────────┬─────────┴─┬───────┴───┬─────┴─────────┴─────────┴─────────┴─────────┴─────────┴───────┬─┴───────┬─┴───────┬─┴───────┬─────────┼─────────┼─────────┤ */
+      KC_LCTL,    KC_LGUI,    KC_LALT,    KC_SPC,                                                         KC_RALT,    MO(1),  KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT
+/* └───────────┴───────────┴───────────┴───────────────────────────────────────────────────────────────┴─────────┴─────────┴─────────┴─────────┴─────────┴─────────┘ */
+  ),
+
+  [1] = LAYOUT_all(
+/* ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐ */
+    _______,  BL_TOGG,  BL_STEP,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  RESET,
+/* ├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┴─────────┼─────────┤ */
+      _______,  RGB_TOG,  RGB_MOD,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,   _______,
+/* ├─────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬──────────────┼─────────┤ */
+      _______, 	     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,       _______,
+/* ├──────────────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──────────────├─────────┤ */
+      _______,          _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,
+/* ├─────────────────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───────────┬─────────┼─────────┤ */
+      _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,          _______,  _______,
+/* ├───────────┬─────────┴─┬───────┴───┬─────┴─────────┴─────────┴─────────┴─────────┴─────────┴───────┬─┴───────┬─┴───────┬─┴───────┬─────────┼─────────┼─────────┤ */
+      _______,    _______,    _______,    _______,                                                        _______,  _______,  _______,  _______,  _______,  _______
+/* └───────────┴───────────┴───────────┴───────────────────────────────────────────────────────────────┴─────────┴─────────┴─────────┴─────────┴─────────┴─────────┘ */
+  ),
+
+  [2] = LAYOUT_all(
+/* ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐ */
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+/* ├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┴─────────┼─────────┤ */
+      _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,  _______,
+/* ├─────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬──────────────┼─────────┤ */
+      _______, 	     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,       _______,
+/* ├──────────────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──────────────├─────────┤ */
+      _______,          _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,    _______,
+/* ├─────────────────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───────────┬─────────┼─────────┤ */
+      _______,  _______,    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,          _______,  _______,
+/* ├───────────┬─────────┴─┬───────┴───┬─────┴─────────┴─────────┴─────────┴─────────┴─────────┴───────┬─┴───────┬─┴───────┬─┴───────┬─────────┼─────────┼─────────┤ */
+      _______,    _______,    _______,    _______,                                                        _______,  _______,  _______,  _______,  _______,  _______
+/* └───────────┴───────────┴───────────┴───────────────────────────────────────────────────────────────┴─────────┴─────────┴─────────┴─────────┴─────────┴─────────┘ */
+  ),
+
+  [3] = LAYOUT_all(
+/* ┌─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┬─────────┐ */
+    _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,
+/* ├─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┼─────────┴─────────┼─────────┤ */
+      _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______, _______,   _______,
+/* ├─────────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬────┴────┬──────────────┼─────────┤ */
+      _______, 	     _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,       _______,
+/* ├──────────────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──┬──────┴──────────────├─────────┤ */
+      _______,          _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,   _______,
+/* ├─────────────────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───┬─────┴───────────┬─────────┼─────────┤ */
+      _______,   _______,   _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,  _______,          _______,  _______,
+/* ├───────────┬─────────┴─┬───────┴───┬─────┴─────────┴─────────┴─────────┴─────────┴─────────┴───────┬─┴───────┬─┴───────┬─┴───────┬─────────┼─────────┼─────────┤ */
+      _______,    _______,    _______,    _______,                                                        _______,  _______,  _______,  _______,  _______,  _______
+/* └───────────┴───────────┴───────────┴───────────────────────────────────────────────────────────────┴─────────┴─────────┴─────────┴─────────┴─────────┴─────────┘ */
+  ),
+};
diff --git a/qmk/keyboards/xd84pro/keymaps/via/readme.md b/qmk/keyboards/xd84pro/keymaps/via/readme.md
new file mode 100644
index 00000000..27cb965e
--- /dev/null
+++ b/qmk/keyboards/xd84pro/keymaps/via/readme.md
@@ -0,0 +1 @@
+# The VIA default layout
diff --git a/qmk/keyboards/xd84pro/keymaps/via/rules.mk b/qmk/keyboards/xd84pro/keymaps/via/rules.mk
new file mode 100644
index 00000000..43061db1
--- /dev/null
+++ b/qmk/keyboards/xd84pro/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
\ No newline at end of file
diff --git a/qmk/keyboards/xd84pro/readme.md b/qmk/keyboards/xd84pro/readme.md
new file mode 100644
index 00000000..76e83c6c
--- /dev/null
+++ b/qmk/keyboards/xd84pro/readme.md
@@ -0,0 +1,24 @@
+# XD84 Pro
+
+![XD84 Pro](https://cdn.shopify.com/s/files/1/2711/4238/products/Hf5d4a9571a524cb78870def7403f5acc5.jpg?v=1574416288)
+
+Keyboard with 84 Keys, RGB LED Underglow, and USB-C Connection
+- Designed by Xiudi
+- Up to 87 keys
+  - iso and ansi support
+
+The silkscreen printing on the PCB refers to this as the "XD84 v2.0".
+
+* Keyboard Maintainer: QMK Community
+* Hardware Supported: XD84 Pro
+* Hardware Availability: [KPrepublic](https://kprepublic.com/products/xd84pro-xd84-pro-custom-mechanical-keyboard-kit-75-supports-tkg-tools-support-underglow-rgb-pcb-programmed-gh84-kle-type-c)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make xd84pro:default
+
+Flashing example for this keyboard:
+
+    make xd84pro:default:flash
+
+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).
diff --git a/qmk/keyboards/xd84pro/rules.mk b/qmk/keyboards/xd84pro/rules.mk
new file mode 100644
index 00000000..1c94b3a7
--- /dev/null
+++ b/qmk/keyboards/xd84pro/rules.mk
@@ -0,0 +1,24 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # 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 = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+
+LAYOUTS = 75_ansi 75_iso
diff --git a/qmk/keyboards/xd84pro/xd84pro.c b/qmk/keyboards/xd84pro/xd84pro.c
new file mode 100644
index 00000000..0eb52fda
--- /dev/null
+++ b/qmk/keyboards/xd84pro/xd84pro.c
@@ -0,0 +1,16 @@
+/* Copyright 2020
+ *
+ * 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 "xd84pro.h"
diff --git a/qmk/keyboards/xd84pro/xd84pro.h b/qmk/keyboards/xd84pro/xd84pro.h
new file mode 100644
index 00000000..eda75eac
--- /dev/null
+++ b/qmk/keyboards/xd84pro/xd84pro.h
@@ -0,0 +1,75 @@
+/* Copyright 2020
+ *
+ * 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 ____ KC_NO
+
+/* This a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT_all( \
+    K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, \
+    K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216, \
+    K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314,       K316, \
+    K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K414,       K416, \
+    K501, K502, K503, K504, K505, K506, K507, K508, K509, K510, K511, K512, K513,       K515, K516, \
+    K601, K602, K603,                       K607,               K611, K612, K613, K614, K615, K616  \
+) { \
+    { K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K116 }, \
+    { K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K216 }, \
+    { K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K316 }, \
+    { K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K414, K416 }, \
+    { K501, K502, K503, K504, K505, K506, K507, K508, K509, K510, K511, K512, K513, K515, K516 }, \
+    { K601, K602, K603, ____, ____, K607, K115, ____, K613, K215, K611, K612, K614, K615, K616 }  \
+}
+
+#define LAYOUT_75_ansi( \
+    K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, \
+    K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214,       K216, \
+    K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314,       K316, \
+    K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412,       K414,       K416, \
+    K501,       K503, K504, K505, K506, K507, K508, K509, K510, K511, K512, K513,       K515, K516, \
+    K601, K602, K603,                       K607,               K611, K612, K613, K614, K615, K616  \
+) { \
+    { K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K116 }, \
+    { K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K216 }, \
+    { K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K316 }, \
+    { K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, ____, K414, K416 }, \
+    { K501, ____, K503, K504, K505, K506, K507, K508, K509, K510, K511, K512, K513, K515, K516 }, \
+    { K601, K602, K603, ____, ____, K607, K115, ____, K613, ____, K611, K612, K614, K615, K616 }  \
+}
+
+#define LAYOUT_75_iso( \
+    K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, \
+    K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214,       K216, \
+    K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313,             K316, \
+    K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412,       K414, K415, K416, \
+    K501, K502, K503, K504, K505, K506, K507, K508, K509, K510, K511, K512, K513,       K515, K516, \
+    K601, K602, K603,                       K607,               K611, K612, K613, K614, K615, K616  \
+) { \
+    { K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K116 }, \
+    { K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K216 }, \
+    { K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, ____, K316 }, \
+    { K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K414, K415, K416 }, \
+    { K501, K502, K503, K504, K505, K506, K507, K508, K509, K510, K511, K512, K513, K515, K516 }, \
+    { K601, K602, K603, ____, ____, K607, K115, ____, K613, ____, K611, K612, K614, K615, K616 }  \
+}
diff --git a/qmk/keyboards/xd87/config.h b/qmk/keyboards/xd87/config.h
index 1caaa558..8bfa8606 100644
--- a/qmk/keyboards/xd87/config.h
+++ b/qmk/keyboards/xd87/config.h
@@ -192,30 +192,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
diff --git a/qmk/keyboards/xd87/rules.mk b/qmk/keyboards/xd87/rules.mk
index 5797e535..8927a07a 100644
--- a/qmk/keyboards/xd87/rules.mk
+++ b/qmk/keyboards/xd87/rules.mk
@@ -30,7 +30,6 @@ 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
 
 # Supported layouts
 LAYOUTS = tkl_ansi tkl_iso
diff --git a/qmk/keyboards/xd96/config.h b/qmk/keyboards/xd96/config.h
index 799b835d..cb1c4e26 100644
--- a/qmk/keyboards/xd96/config.h
+++ b/qmk/keyboards/xd96/config.h
@@ -47,6 +47,10 @@
 /* COL2ROW, ROW2COL */
 //#define DIODE_DIRECTION COL2ROW
 
+#define LED_NUM_LOCK_PIN C6
+#define LED_CAPS_LOCK_PIN B6
+#define LED_PIN_ON_STATE 0
+
 #define BACKLIGHT_PIN B5
 #define BACKLIGHT_LEVELS 10
 // #define BACKLIGHT_BREATHING
@@ -207,34 +211,6 @@
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/xd96/info.json b/qmk/keyboards/xd96/info.json
index 2d678414..22de0660 100644
--- a/qmk/keyboards/xd96/info.json
+++ b/qmk/keyboards/xd96/info.json
@@ -232,6 +232,120 @@
         {"label":".", "x":17, "y":5},
         {"label":"Enter", "x":18, "y":4, "h":2}
       ]
+    },
+    "LAYOUT_all": {
+      "layout": [
+        {"label":"Esc", "x":0, "y":0},
+        {"label":"F1", "x":1, "y":0},
+        {"label":"F2", "x":2, "y":0},
+        {"label":"F3", "x":3, "y":0},
+        {"label":"F4", "x":4, "y":0},
+        {"label":"F5", "x":5, "y":0},
+        {"label":"F6", "x":6, "y":0},
+        {"label":"F7", "x":7, "y":0},
+        {"label":"F8", "x":8, "y":0},
+        {"label":"F9", "x":9, "y":0},
+        {"label":"F10", "x":10, "y":0},
+        {"label":"F11", "x":11, "y":0},
+        {"label":"F12", "x":12, "y":0},
+        {"label":"Insert", "x":13, "y":0},
+        {"label":"Delete", "x":14, "y":0},
+        {"label":"Home", "x":15, "y":0},
+        {"label":"End", "x":16, "y":0},
+        {"label":"PgUp", "x":17, "y":0},
+        {"label":"PgDn", "x":18, "y":0},
+
+        {"label":"~", "x":0, "y":1},
+        {"label":"!", "x":1, "y":1},
+        {"label":"@", "x":2, "y":1},
+        {"label":"#", "x":3, "y":1},
+        {"label":"$", "x":4, "y":1},
+        {"label":"%", "x":5, "y":1},
+        {"label":"^", "x":6, "y":1},
+        {"label":"&", "x":7, "y":1},
+        {"label":"*", "x":8, "y":1},
+        {"label":"(", "x":9, "y":1},
+        {"label":")", "x":10, "y":1},
+        {"label":"_", "x":11, "y":1},
+        {"label":"+", "x":12, "y":1},
+        {"label":"Backspace", "x":13, "y":1},
+        {"label":"Backspace", "x":14, "y":1},
+        {"label":"Num Lock", "x":15, "y":1},
+        {"label":"/", "x":16, "y":1},
+        {"label":"*", "x":17, "y":1},
+        {"label":"-", "x":18, "y":1},
+
+        {"label":"Tab", "x":0, "y":2, "w":1.5},
+        {"label":"Q", "x":1.5, "y":2},
+        {"label":"W", "x":2.5, "y":2},
+        {"label":"E", "x":3.5, "y":2},
+        {"label":"R", "x":4.5, "y":2},
+        {"label":"T", "x":5.5, "y":2},
+        {"label":"Y", "x":6.5, "y":2},
+        {"label":"U", "x":7.5, "y":2},
+        {"label":"I", "x":8.5, "y":2},
+        {"label":"O", "x":9.5, "y":2},
+        {"label":"P", "x":10.5, "y":2},
+        {"label":"{", "x":11.5, "y":2},
+        {"label":"}", "x":12.5, "y":2},
+        {"label":"|", "x":13.5, "y":2, "w":1.5},
+        {"label":"7", "x":15, "y":2},
+        {"label":"8", "x":16, "y":2},
+        {"label":"9", "x":17, "y":2},
+        {"label":"+", "x":18, "y":2},
+
+
+        {"label":"Caps Lock", "x":0, "y":3, "w":1.75},
+        {"label":"A", "x":1.75, "y":3},
+        {"label":"S", "x":2.75, "y":3},
+        {"label":"D", "x":3.75, "y":3},
+        {"label":"F", "x":4.75, "y":3},
+        {"label":"G", "x":5.75, "y":3},
+        {"label":"H", "x":6.75, "y":3},
+        {"label":"J", "x":7.75, "y":3},
+        {"label":"K", "x":8.75, "y":3},
+        {"label":"L", "x":9.75, "y":3},
+        {"label":":", "x":10.75, "y":3},
+        {"label":"\"", "x":11.75, "y":3},
+        {"label":"Enter", "x":12.75, "y":3},
+        {"label":"Enter", "x":13.75, "y":3, "w":1.25},
+        {"label":"4", "x":15, "y":3},
+        {"label":"5", "x":16, "y":3},
+        {"label":"6", "x":17, "y":3},
+        {"label":"+", "x":18, "y":3},
+
+        {"label":"Shift", "x":0, "y":4, "w":1.25},
+        {"label":"Shift", "x":1.25, "y":4},
+        {"label":"Z", "x":2.25, "y":4},
+        {"label":"X", "x":3.25, "y":4},
+        {"label":"C", "x":4.25, "y":4},
+        {"label":"V", "x":5.25, "y":4},
+        {"label":"B", "x":6.25, "y":4},
+        {"label":"N", "x":7.25, "y":4},
+        {"label":"M", "x":8.25, "y":4},
+        {"label":"<", "x":9.25, "y":4},
+        {"label":">", "x":10.25, "y":4},
+        {"label":"?", "x":11.25, "y":4},
+        {"label":"Shift", "x":12.25, "y":4, "w":1.75},
+        {"label":"\u2191", "x":14, "y":4},
+        {"label":"1", "x":15, "y":4},
+        {"label":"2", "x":16, "y":4},
+        {"label":"3", "x":17, "y":4},
+        {"label":"Enter", "x":18, "y":4},
+
+        {"label":"Ctrl", "x":0, "y":5, "w":1.25},
+        {"label":"Win", "x":1.25, "y":5, "w":1.25},
+        {"label":"Alt", "x":2.5, "y":5, "w":1.25},
+        {"x":3.75, "y":5, "w":6.25},
+        {"label":"Alt", "x":10, "y":5, "w":1.5},
+        {"label":"Ctrl", "x":11.5, "y":5, "w":1.5},
+        {"label":"\u2190", "x":13, "y":5},
+        {"label":"\u2193", "x":14, "y":5},
+        {"label":"\u2192", "x":15, "y":5},
+        {"label":"0", "x":16, "y":5},
+        {"label":".", "x":17, "y":5},
+        {"label":"Enter", "x":18, "y":5}
+      ]
     }
   }
 }
diff --git a/qmk/keyboards/xd96/keymaps/uuupah/keymap.c b/qmk/keyboards/xd96/keymaps/uuupah/keymap.c
new file mode 100644
index 00000000..a3a3da91
--- /dev/null
+++ b/qmk/keyboards/xd96/keymaps/uuupah/keymap.c
@@ -0,0 +1,71 @@
+/* Copyright 2020 Jonathan Souter 
+ * 
+ * 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
+
+#define LT_ENT2 LT(2,KC_ENT)
+
+#ifdef RGBLIGHT_ENABLE
+void matrix_init_user() {
+  rgblight_disable();
+}
+#endif
+
+enum custom_keycodes {
+  ZEROZER,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [0] = LAYOUT_all(
+    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_CALC, KC_PSCR, KC_HOME, KC_END,  KC_PGUP, KC_PGDN,
+	  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_BSLS, KC_DEL,  KC_NLCK, _______, KC_PMNS, KC_PSLS,
+	  KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC,          KC_P7,   KC_P8,   KC_P9,   KC_PAST,
+	  KC_LCTL, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, _______, LT_ENT2,          KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
+	  KC_LSFT, KC_BSLS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(1),            KC_P1,   KC_P2,   KC_P3,   KC_EQL,
+	  KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_APP,  KC_RCTL,          KC_P0,   ZEROZER, KC_PDOT, KC_PENT
+  ),
+
+  [1] = LAYOUT_all(
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RGB_TOG, RESET,   _______, _______, _______, _______,
+	  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+	  _______, KC_MPLY, KC_VOLU, _______, _______, _______, _______, _______, _______, _______, _______, KC_UP,   KC_PSCR, _______,          _______, _______, _______, _______,
+	  _______, KC_MPRV, KC_MNXT, _______, _______, _______, _______, _______, _______, _______, KC_LEFT, KC_RGHT, _______, _______,          _______, _______, _______, _______,
+	  _______, _______, KC_VOLD, _______, _______, _______, _______, _______, _______, _______, _______, KC_DOWN, _______, _______,          _______, _______, _______, _______,
+	  _______, _______, _______,                            _______,                            _______, _______, _______, _______,          _______, _______, _______, _______
+  ),
+  
+  [2] = LAYOUT_all(
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+	  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+	  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGUP, _______, _______,          _______, _______, _______, _______,
+	  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_HOME, KC_END,  _______, _______,          _______, _______, _______, _______,
+	  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_PGDN, _______, _______,          _______, _______, _______, _______,
+	  _______, _______, _______,                            _______,                            _______, _______, _______, _______,          _______, _______, _______, _______
+  ),
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+  switch (keycode) {
+    case ZEROZER:
+      if (record->event.pressed) {
+        SEND_STRING("00");
+      } else {
+      }
+      break;
+  }
+  return true;
+}
diff --git a/qmk/keyboards/xd96/rules.mk b/qmk/keyboards/xd96/rules.mk
index 3ede910c..9d2cd1d1 100644
--- a/qmk/keyboards/xd96/rules.mk
+++ b/qmk/keyboards/xd96/rules.mk
@@ -23,14 +23,13 @@ COMMAND_ENABLE = no         # Commands for debug and configuration
 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 = yes      # Enable keyboard backlight functionality on B7 by default
+BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
 RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
 MIDI_ENABLE = no            # MIDI support
 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
 LTO_ENABLE = yes
 
 # custom matrix setup
diff --git a/qmk/keyboards/xd96/xd96.c b/qmk/keyboards/xd96/xd96.c
index e2af9f10..2c67ee3d 100644
--- a/qmk/keyboards/xd96/xd96.c
+++ b/qmk/keyboards/xd96/xd96.c
@@ -14,29 +14,3 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "xd96.h"
-
-#define CAPS_PIN B6
-#define NUMLOCK_PIN C6
-
-void keyboard_pre_init_kb(void) {
-  setPinOutput(CAPS_PIN);
-  setPinOutput(NUMLOCK_PIN);
-
-  keyboard_pre_init_user();
-}
-
-void led_set_kb(uint8_t usb_led) {
-  if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
-    writePinLow(CAPS_PIN);
-  } else {
-    writePinHigh(CAPS_PIN);
-  }
-  
-  if (IS_LED_ON(usb_led, USB_LED_NUM_LOCK)) {
-    writePinLow(NUMLOCK_PIN);
-  } else {
-    writePinHigh(NUMLOCK_PIN);
-  }
-
-  led_set_user(usb_led);
-}
diff --git a/qmk/keyboards/xd96/xd96.h b/qmk/keyboards/xd96/xd96.h
index 04c2cc46..bb855da5 100644
--- a/qmk/keyboards/xd96/xd96.h
+++ b/qmk/keyboards/xd96/xd96.h
@@ -57,3 +57,19 @@
     { K501, K502, K503, K504, K505, K506, K507, K508, K509, K510, K511, K512, K513, K515, K516, K517, K518, K619 }, \
     { K601, K602, K603, ____, ____, K607, K115, ____, K612, ____, K611, K612, K614, K615, K616, K617, K618, ____ }  \
 }
+
+#define LAYOUT_all( \
+    K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116, K117, K118, K119, \
+    K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K215, K216, K217, K218, K219, \
+    K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314,       K316, K317, K318, K319, \
+    K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412,       K414, K415, K416, K417, K418, K419, \
+    K501, K502, K503, K504, K505, K506, K507, K508, K509, K510, K511, K512, K513,       K515, K516, K517, K518, K519, \
+    K601, K602, K603,                       K607,               K611, K612,       K614, K615, K616, K617, K618, K619  \
+) { \
+    { K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K116, K117, K118, K119 }, \
+    { K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214, K216, K217, K218, K219 }, \
+    { K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, K316, K317, K318, K319 }, \
+    { K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K414, K415, K416, K417, K418, K419 }, \
+    { K501, K502, K503, K504, K505, K506, K507, K508, K509, K510, K511, K512, K513, K515, K516, K517, K518, K519 }, \
+    { K601, K602, K603, K215, ____, K607, K115, ____, K612, K215, K611, ____, K614, K615, K616, K617, K618, K619 }  \
+}
diff --git a/qmk/keyboards/xelus/dawn60/config.h b/qmk/keyboards/xelus/dawn60/config.h
index 59eb828f..ebd231ca 100644
--- a/qmk/keyboards/xelus/dawn60/config.h
+++ b/qmk/keyboards/xelus/dawn60/config.h
@@ -1,4 +1,4 @@
-/* Copyright 2017 Jason Williams (Wilba)
+/* Copyright 2020 Harrison Chan (Xelus)
  *
  * 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
@@ -13,133 +13,5 @@
  * 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 "config_common.h"
-
-// USB Device descriptor parameter
-#define VENDOR_ID       0x5845 // XE
-#define PRODUCT_ID      0x0060 // Dawn60
-#define DEVICE_VER      0x0001
-#define MANUFACTURER    Xelus
-#define PRODUCT         Dawn60
-#define DESCRIPTION     Dawn60
-
-// key matrix size
-#define MATRIX_ROWS 5
-#define MATRIX_COLS 14
-
-//no underglow - prototype
-//#define MATRIX_ROW_PINS { B1, B3, B7, F6, F7 }
-//#define MATRIX_COL_PINS { B0, D5, B2, F5, D2, D3, D4, D6, D7, B4, B5, B6, C6, C7 }
-//#define UNUSED_PINS
-
-//underglow
-#define MATRIX_ROW_PINS { B1, B3, F1, F6, F7 }
-#define MATRIX_COL_PINS { B0, D5, B2, F5, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4 }
-#define UNUSED_PINS
-
-// IS31FL3731 driver
-#define DRIVER_COUNT 2
-#define DRIVER_LED_TOTAL 64
-
-// COL2ROW or ROW2COL
-#define DIODE_DIRECTION COL2ROW
-
-// Set 0 if debouncing isn't needed
-#define DEBOUNCE 5
-
-// Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap
-#define LOCKING_SUPPORT_ENABLE
-// Locking resynchronize hack
-#define LOCKING_RESYNC_ENABLE
-
-/*
- * Feature disable options
- *  These options are also useful to firmware size reduction.
- */
-
-// disable debug print
-//#define NO_DEBUG
-
-// disable print
-//#define NO_PRINT
-
-// disable action features
-//#define NO_ACTION_LAYER
-//#define NO_ACTION_TAPPING
-//#define NO_ACTION_ONESHOT
-//#define NO_ACTION_MACRO
-//#define NO_ACTION_FUNCTION
-
-#define RGB_BACKLIGHT_ENABLED 1
-
-// This conditionally compiles the backlight code for Dawn60 specifics
-#define RGB_BACKLIGHT_DAWN60
-
-//RGB Underglow defines
-#define RGB_DI_PIN F0
-#define WS2812_LED_TOTAL 20
-
-#define RGB_UNDERGLOW_ALPHA_TOP_START 0
-#define RGB_UNDERGLOW_ALPHA_TOP_END   6   
-#define RGB_UNDERGLOW_ALPHA_BOT_START 12
-#define RGB_UNDERGLOW_ALPHA_BOT_END   15
-
-// enable/disable LEDs based on layout
-// switch between split backspace (1) or normal backspace(0)
-#define RGB_BACKLIGHT_USE_SPLIT_BACKSPACE 1
-// switch between Tsangan (1) or Arrows Bottom Row (0)
-#define RGB_BACKLIGHT_USE_7U_SPACEBAR 0
-// switch between standard split rshift (0) or arrows r shift (1)
-// .------------------.           .-------------------.
-// | ? |  Shift  | Fn |    vs     |  Shift  | Up | Fn |
-// `------------------'           `-------------------'
-#define RGB_BACKLIGHT_USE_SPLIT_RIGHT_SHIFT 1
-
-//not used
-#define RGB_BACKLIGHT_USE_ISO_ENTER 0
-#define RGB_BACKLIGHT_USE_SPLIT_LEFT_SHIFT 0
-#define RGB_BACKLIGHT_DISABLE_HHKB_BLOCKER_LEDS 0
-
-// disable backlight when USB suspended (PC sleep/hibernate/shutdown)
-#define RGB_BACKLIGHT_DISABLE_WHEN_USB_SUSPENDED 0
-
-// disable backlight after timeout in minutes, 0 = no timeout
-#define RGB_BACKLIGHT_DISABLE_AFTER_TIMEOUT 0
-
-// the default brightness
-#define RGB_BACKLIGHT_BRIGHTNESS 255
-
-// the default effect (RGB test)
-#define RGB_BACKLIGHT_EFFECT 255
-
-// the default effect speed (0-3)
-#define RGB_BACKLIGHT_EFFECT_SPEED 0
-
-// the default color1 and color2
-#define RGB_BACKLIGHT_COLOR_1 { .h = 0, .s = 255 }
-#define RGB_BACKLIGHT_COLOR_2 { .h = 127, .s = 255 }
-
-// These define which keys in the matrix are alphas/mods
-// Used for backlight effects so colors are different for
-// alphas vs. mods
-// Each value is for a row, bit 0 is column 0
-// Alpha=0 Mod=1
-#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_0 0b0000000000000001
-#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_1 0b0010000000000001
-#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_2 0b0011000000000001
-#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_3 0b0011000000000001
-#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_4 0b0011111000011111
-
-#define RGB_BACKLIGHT_CAPS_LOCK_INDICATOR { .color = { .h = 0, .s = 0 }, .index = 255 }
-#define RGB_BACKLIGHT_LAYER_1_INDICATOR { .color = { .h = 0, .s = 0 }, .index = 255 }
-#define RGB_BACKLIGHT_LAYER_2_INDICATOR { .color = { .h = 0, .s = 0 }, .index = 255 }
-#define RGB_BACKLIGHT_LAYER_3_INDICATOR { .color = { .h = 0, .s = 0 }, .index = 255 }
-
-// Backlight config starts after VIA's EEPROM usage,
-// dynamic keymaps start after this.
-#define VIA_EEPROM_CUSTOM_CONFIG_SIZE 31
-
-// VIA lighting is handled by the keyboard-level code
-#define VIA_CUSTOM_LIGHTING_ENABLE
diff --git a/qmk/keyboards/xelus/dawn60/dawn60.c b/qmk/keyboards/xelus/dawn60/dawn60.c
index bce6eea9..3e009b3b 100644
--- a/qmk/keyboards/xelus/dawn60/dawn60.c
+++ b/qmk/keyboards/xelus/dawn60/dawn60.c
@@ -1,18 +1 @@
-/* Copyright 2017 Jason Williams (Wilba)
- *
- * 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 RGB_BACKLIGHT_DAWN60
-#error RGB_BACKLIGHT_DAWN60 not defined, you done goofed somehao, brah
-#endif
+#include "dawn60.h"
diff --git a/qmk/keyboards/xelus/dawn60/dawn60.h b/qmk/keyboards/xelus/dawn60/dawn60.h
index fe63de10..e663e3bb 100644
--- a/qmk/keyboards/xelus/dawn60/dawn60.h
+++ b/qmk/keyboards/xelus/dawn60/dawn60.h
@@ -1,4 +1,4 @@
-/* Copyright 2017 Jason Williams (Wilba)
+/* Copyright 2020 Harrison Chan (Xelus)
  *
  * 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
@@ -16,21 +16,7 @@
 #pragma once
 
 #include "quantum.h"
-#include "keyboards/wilba_tech/wt_rgb_backlight_keycodes.h"
-#include "via.h"
 
-#define XXX KC_NO
-
-#define LAYOUT_60_all( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2D, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2C, \
-    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39,      K3B, K3C, K3D, \
-    K40, K41, K42,           K45,                K49, K4A, K4B, K4C, K4D  \
-) { \
-    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
-    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
-    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
-    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, XXX, K3B, K3C, K3D }, \
-    { K40, K41, K42, XXX, XXX, K45, XXX, XXX, XXX, K49, K4A, K4B, K4C, K4D }  \
-}
+#if defined(KEYBOARD_xelus_dawn60_rev1)
+    #include "rev1.h"
+#endif
diff --git a/qmk/keyboards/xelus/dawn60/readme.md b/qmk/keyboards/xelus/dawn60/readme.md
index 3409bac1..8e013819 100644
--- a/qmk/keyboards/xelus/dawn60/readme.md
+++ b/qmk/keyboards/xelus/dawn60/readme.md
@@ -8,6 +8,6 @@ An in-switch RGB LED keyboard with RGB underglow.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make xelus/dawn60:default
+    make xelus/dawn60/rev1: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).
\ No newline at end of file
diff --git a/qmk/keyboards/xelus/dawn60/rev1/config.h b/qmk/keyboards/xelus/dawn60/rev1/config.h
new file mode 100644
index 00000000..375bea94
--- /dev/null
+++ b/qmk/keyboards/xelus/dawn60/rev1/config.h
@@ -0,0 +1,143 @@
+/* Copyright 2020 Harrison Chan (Xelus)
+ *
+ * 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 "config_common.h"
+
+// USB Device descriptor parameter
+#define VENDOR_ID       0x5845 // XE
+#define PRODUCT_ID      0x0060 // Dawn60
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Xelus
+#define PRODUCT         Dawn60
+// key matrix size
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 14
+
+//no underglow - prototype
+//#define MATRIX_ROW_PINS { B1, B3, B7, F6, F7 }
+//#define MATRIX_COL_PINS { B0, D5, B2, F5, D2, D3, D4, D6, D7, B4, B5, B6, C6, C7 }
+//#define UNUSED_PINS
+
+//underglow
+#define MATRIX_ROW_PINS { B1, B3, F1, F6, F7 }
+#define MATRIX_COL_PINS { B0, D5, B2, F5, D3, D2, C7, C6, B6, B5, B4, D7, D6, D4 }
+#define UNUSED_PINS
+
+// IS31FL3731 driver
+#define DRIVER_COUNT 2
+#define DRIVER_LED_TOTAL 64
+
+// COL2ROW or ROW2COL
+#define DIODE_DIRECTION COL2ROW
+
+// Set 0 if debouncing isn't needed
+#define DEBOUNCE 5
+
+// Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap
+#define LOCKING_SUPPORT_ENABLE
+// Locking resynchronize hack
+#define LOCKING_RESYNC_ENABLE
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+// disable debug print
+//#define NO_DEBUG
+
+// disable print
+//#define NO_PRINT
+
+// disable action features
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+//#define NO_ACTION_MACRO
+//#define NO_ACTION_FUNCTION
+
+#define RGB_BACKLIGHT_ENABLED 1
+
+// This conditionally compiles the backlight code for Dawn60 specifics
+#define RGB_BACKLIGHT_DAWN60
+
+//RGB Underglow defines
+#define RGB_DI_PIN F0
+#define WS2812_LED_TOTAL 20
+
+#define RGB_UNDERGLOW_ALPHA_TOP_START 0
+#define RGB_UNDERGLOW_ALPHA_TOP_END   6   
+#define RGB_UNDERGLOW_ALPHA_BOT_START 12
+#define RGB_UNDERGLOW_ALPHA_BOT_END   15
+
+// enable/disable LEDs based on layout
+// switch between split backspace (1) or normal backspace(0)
+#define RGB_BACKLIGHT_USE_SPLIT_BACKSPACE 1
+// switch between Tsangan (1) or Arrows Bottom Row (0)
+#define RGB_BACKLIGHT_USE_7U_SPACEBAR 0
+// switch between standard split rshift (0) or arrows r shift (1)
+// .------------------.           .-------------------.
+// | ? |  Shift  | Fn |    vs     |  Shift  | Up | Fn |
+// `------------------'           `-------------------'
+#define RGB_BACKLIGHT_USE_SPLIT_RIGHT_SHIFT 1
+
+//not used
+#define RGB_BACKLIGHT_USE_ISO_ENTER 0
+#define RGB_BACKLIGHT_USE_SPLIT_LEFT_SHIFT 0
+#define RGB_BACKLIGHT_DISABLE_HHKB_BLOCKER_LEDS 0
+
+// disable backlight when USB suspended (PC sleep/hibernate/shutdown)
+#define RGB_BACKLIGHT_DISABLE_WHEN_USB_SUSPENDED 0
+
+// disable backlight after timeout in minutes, 0 = no timeout
+#define RGB_BACKLIGHT_DISABLE_AFTER_TIMEOUT 0
+
+// the default brightness
+#define RGB_BACKLIGHT_BRIGHTNESS 255
+
+// the default effect (RGB test)
+#define RGB_BACKLIGHT_EFFECT 255
+
+// the default effect speed (0-3)
+#define RGB_BACKLIGHT_EFFECT_SPEED 0
+
+// the default color1 and color2
+#define RGB_BACKLIGHT_COLOR_1 { .h = 0, .s = 255 }
+#define RGB_BACKLIGHT_COLOR_2 { .h = 127, .s = 255 }
+
+// These define which keys in the matrix are alphas/mods
+// Used for backlight effects so colors are different for
+// alphas vs. mods
+// Each value is for a row, bit 0 is column 0
+// Alpha=0 Mod=1
+#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_0 0b0000000000000001
+#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_1 0b0010000000000001
+#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_2 0b0011000000000001
+#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_3 0b0011000000000001
+#define RGB_BACKLIGHT_ALPHAS_MODS_ROW_4 0b0011111000011111
+
+#define RGB_BACKLIGHT_CAPS_LOCK_INDICATOR { .color = { .h = 0, .s = 0 }, .index = 255 }
+#define RGB_BACKLIGHT_LAYER_1_INDICATOR { .color = { .h = 0, .s = 0 }, .index = 255 }
+#define RGB_BACKLIGHT_LAYER_2_INDICATOR { .color = { .h = 0, .s = 0 }, .index = 255 }
+#define RGB_BACKLIGHT_LAYER_3_INDICATOR { .color = { .h = 0, .s = 0 }, .index = 255 }
+
+// Backlight config starts after VIA's EEPROM usage,
+// dynamic keymaps start after this.
+#define VIA_EEPROM_CUSTOM_CONFIG_SIZE 31
+
+// VIA lighting is handled by the keyboard-level code
+#define VIA_CUSTOM_LIGHTING_ENABLE
diff --git a/qmk/keyboards/xelus/dawn60/rev1/rev1.c b/qmk/keyboards/xelus/dawn60/rev1/rev1.c
new file mode 100644
index 00000000..2d0b465b
--- /dev/null
+++ b/qmk/keyboards/xelus/dawn60/rev1/rev1.c
@@ -0,0 +1,18 @@
+/* Copyright 2020 Harrison Chan (Xelus)
+ *
+ * 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 RGB_BACKLIGHT_DAWN60
+#error RGB_BACKLIGHT_DAWN60 not defined, you done goofed somehao, brah
+#endif
diff --git a/qmk/keyboards/xelus/dawn60/rev1/rev1.h b/qmk/keyboards/xelus/dawn60/rev1/rev1.h
new file mode 100644
index 00000000..53d40e54
--- /dev/null
+++ b/qmk/keyboards/xelus/dawn60/rev1/rev1.h
@@ -0,0 +1,36 @@
+/* Copyright 2020 Harrison Chan (Xelus)
+ *
+ * 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"
+#include "keyboards/wilba_tech/wt_rgb_backlight_keycodes.h"
+#include "via.h"
+
+#define XXX KC_NO
+
+#define LAYOUT_60_all( \
+    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D, K2D, \
+    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D, \
+    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B,      K2C, \
+    K30, K31, K32, K33, K34, K35, K36, K37, K38, K39,      K3B, K3C, K3D, \
+    K40, K41, K42,           K45,                K49, K4A, K4B, K4C, K4D  \
+) { \
+    { K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D }, \
+    { K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D }, \
+    { K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D }, \
+    { K30, K31, K32, K33, K34, K35, K36, K37, K38, K39, XXX, K3B, K3C, K3D }, \
+    { K40, K41, K42, XXX, XXX, K45, XXX, XXX, XXX, K49, K4A, K4B, K4C, K4D }  \
+}
diff --git a/qmk/keyboards/xelus/dawn60/rev1/rules.mk b/qmk/keyboards/xelus/dawn60/rev1/rules.mk
new file mode 100644
index 00000000..3ac5f997
--- /dev/null
+++ b/qmk/keyboards/xelus/dawn60/rev1/rules.mk
@@ -0,0 +1,49 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+#   Teensy       halfkay
+#   Pro Micro    caterina
+#   Atmel DFU    atmel-dfu
+#   LUFA DFU     lufa-dfu
+#   QMK DFU      qmk-dfu
+#   ATmega32A    bootloadHID
+#   ATmega328P   USBasp
+BOOTLOADER = atmel-dfu
+
+# Do not put the microcontroller into power saving mode
+# when we get USB suspend event. We want it to keep updating
+# backlight effects.
+OPT_DEFS += -DNO_SUSPEND_POWER_DOWN
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # 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 = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality on B7 by default
+MIDI_ENABLE = no            # MIDI support
+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
+RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight. - We have custom RGB underglow
+
+CIE1931_CURVE = yes
+
+
+# project specific files
+SRC +=	keyboards/wilba_tech/wt_main.c \
+		keyboards/wilba_tech/wt_rgb_backlight.c \
+		quantum/color.c \
+		drivers/issi/is31fl3731.c \
+		ws2812.c
+
+QUANTUM_LIB_SRC += i2c_master.c 
diff --git a/qmk/keyboards/xelus/trinityxttkl/trinityxttkl.c b/qmk/keyboards/xelus/trinityxttkl/trinityxttkl.c
index fbf38010..c548a10c 100644
--- a/qmk/keyboards/xelus/trinityxttkl/trinityxttkl.c
+++ b/qmk/keyboards/xelus/trinityxttkl/trinityxttkl.c
@@ -1 +1,4 @@
 #include "trinityxttkl.h"
+
+// Tested and verified working on Trinity XT TKL
+void matrix_io_delay(void) { __asm__ volatile("nop\nnop\nnop\n"); }
diff --git a/qmk/keyboards/xelus/valor/rev1/config.h b/qmk/keyboards/xelus/valor/rev1/config.h
new file mode 100644
index 00000000..a45ecbc0
--- /dev/null
+++ b/qmk/keyboards/xelus/valor/rev1/config.h
@@ -0,0 +1,53 @@
+/* Copyright 2020 Harrison Chan (Xelus)
+ *
+ * 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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x5845 // "XE"
+#define PRODUCT_ID      0x5652 // Valor "VR"
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Xelus
+#define PRODUCT         Xelus Valor
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { B1, B2, C7, C6, B6 }
+#define MATRIX_COL_PINS { E6, F0, F1, F4, F5, F6, F7, B5, B4, D7, D6, D4, D5, D3, D2 }
+#define UNUSED_PINS
+
+/* RGB Underglow */
+#define RGB_DI_PIN B0
+#define RGBLED_NUM 28
+#define RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_LIMIT_VAL 200
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
diff --git a/qmk/keyboards/xelus/valor/rev1/info.json b/qmk/keyboards/xelus/valor/rev1/info.json
new file mode 100644
index 00000000..35d8e275
--- /dev/null
+++ b/qmk/keyboards/xelus/valor/rev1/info.json
@@ -0,0 +1,83 @@
+{
+    "keyboard_name": "Xelus Valor rev1",
+    "url": "",
+    "maintainer": "Xelus22",
+    "width": 17.75,
+    "height": 5,
+    "layouts": {
+        "LAYOUT_alice_split_bs": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1.25, "y":0},
+                {"x":2.25, "y":0},
+                {"x":3.25, "y":0},
+                {"x":4.25, "y":0},
+                {"x":5.25, "y":0},
+                {"x":6.25, "y":0},
+                {"x":7.25, "y":0},
+                {"x":10.25, "y":0},
+                {"x":11.25, "y":0},
+                {"x":12.25, "y":0},
+                {"x":13.25, "y":0},
+                {"x":14.25, "y":0},
+                {"x":15.25, "y":0},
+                {"x":16.25, "y":0},
+                {"x":17.25, "y":0},
+
+                {"x":0, "y":1},
+                {"x":1.25, "y":1, "w":1.5},
+                {"x":2.75, "y":1},
+                {"x":3.75, "y":1},
+                {"x":4.75, "y":1},
+                {"x":5.75, "y":1},
+                {"x":6.75, "y":1},
+                {"x":9.75, "y":1},
+                {"x":10.75, "y":1},
+                {"x":11.75, "y":1},
+                {"x":12.75, "y":1},
+                {"x":13.75, "y":1},
+                {"x":14.75, "y":1},
+                {"x":15.75, "y":1},
+                {"x":16.75, "y":1, "w":1.5},
+
+                {"x":0, "y":2},
+                {"x":1.25, "y":2, "w":1.75},
+                {"x":3, "y":2},
+                {"x":4, "y":2},
+                {"x":5, "y":2},
+                {"x":6, "y":2},
+                {"x":7, "y":2},
+                {"x":10, "y":2},
+                {"x":11, "y":2},
+                {"x":12, "y":2},
+                {"x":13, "y":2},
+                {"x":14, "y":2},
+                {"x":15, "y":2},
+                {"x":16, "y":2, "w":2.25},
+
+                {"x":1.25, "y":3, "w":2.25},
+                {"x":3.5, "y":3},
+                {"x":4.5, "y":3},
+                {"x":5.5, "y":3},
+                {"x":6.5, "y":3},
+                {"x":7.5, "y":3},
+                {"x":9.5, "y":3},
+                {"x":10.5, "y":3},
+                {"x":11.5, "y":3},
+                {"x":12.5, "y":3},
+                {"x":13.5, "y":3},
+                {"x":14.5, "y":3},
+                {"x":15.5, "y":3, "w":1.75},
+                {"x":17.25, "y":3},
+
+                {"x":1.25, "y":4, "w":1.5},
+                {"x":4.25, "y":4, "w":1.5},
+                {"x":5.75, "y":4, "w":2},
+                {"x":7.75, "y":4, "w":1.25},
+                {"x":9.5, "y":4, "w":2.75},
+                {"x":12.25, "y":4, "w":1.5},
+                {"x":16.75, "y":4, "w":1.5}
+            ]
+        }
+    }
+}
diff --git a/qmk/keyboards/xelus/valor/rev1/keymaps/default/keymap.c b/qmk/keyboards/xelus/valor/rev1/keymaps/default/keymap.c
new file mode 100644
index 00000000..3cf8111e
--- /dev/null
+++ b/qmk/keyboards/xelus/valor/rev1/keymaps/default/keymap.c
@@ -0,0 +1,34 @@
+/* Copyright 2020 Harrison Chan (Xelus)
+ *
+ * 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_all(
+    KC_ESC,  KC_TILD, 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_DEL,  KC_BSPC,
+    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_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_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_RGUI,
+             KC_LCTL,          KC_LALT,          KC_SPC,  MO(1),            KC_SPC,           KC_RALT,                   KC_RCTL
+  ),
+
+  [1] = LAYOUT_all(
+    RGB_TOG, KC_TRNS, 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_TRNS, KC_TRNS,
+    RGB_MOD, 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,
+    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_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
+  )
+};
diff --git a/qmk/keyboards/xelus/valor/rev1/keymaps/default/readme.md b/qmk/keyboards/xelus/valor/rev1/keymaps/default/readme.md
new file mode 100644
index 00000000..d596c606
--- /dev/null
+++ b/qmk/keyboards/xelus/valor/rev1/keymaps/default/readme.md
@@ -0,0 +1,2 @@
+# The Default Valor Layout
+
diff --git a/qmk/keyboards/xelus/valor/rev1/keymaps/via/keymap.c b/qmk/keyboards/xelus/valor/rev1/keymaps/via/keymap.c
new file mode 100644
index 00000000..b3395f1d
--- /dev/null
+++ b/qmk/keyboards/xelus/valor/rev1/keymaps/via/keymap.c
@@ -0,0 +1,50 @@
+/* Copyright 2020 Harrison Chan (Xelus)
+ *
+ * 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_all(
+    KC_ESC,  KC_TILD, 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_DEL,  KC_BSPC,
+    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_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_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_RGUI,
+             KC_LCTL,          KC_LALT,          KC_SPC,  MO(1),            KC_SPC,           KC_RALT,                   KC_RCTL
+  ),
+
+  [1] = LAYOUT_all(
+    RGB_TOG, KC_TRNS, 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_TRNS, KC_TRNS,
+    RGB_MOD, 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,
+    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_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
+  ),
+
+  [2] = LAYOUT_all(
+    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, 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
+  ),
+
+  [3] = LAYOUT_all(
+    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, 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
+  )
+};
diff --git a/qmk/keyboards/xelus/valor/rev1/keymaps/via/readme.md b/qmk/keyboards/xelus/valor/rev1/keymaps/via/readme.md
new file mode 100644
index 00000000..1efb713b
--- /dev/null
+++ b/qmk/keyboards/xelus/valor/rev1/keymaps/via/readme.md
@@ -0,0 +1,2 @@
+# The VIA Valor Layout
+
diff --git a/qmk/keyboards/xelus/valor/rev1/keymaps/via/rules.mk b/qmk/keyboards/xelus/valor/rev1/keymaps/via/rules.mk
new file mode 100644
index 00000000..1e5b9980
--- /dev/null
+++ b/qmk/keyboards/xelus/valor/rev1/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/qmk/keyboards/xelus/valor/rev1/readme.md b/qmk/keyboards/xelus/valor/rev1/readme.md
new file mode 100644
index 00000000..decd1fe2
--- /dev/null
+++ b/qmk/keyboards/xelus/valor/rev1/readme.md
@@ -0,0 +1,13 @@
+# Valor
+
+An Alice replacement keyboard PCB.
+
+* Keyboard Maintainer: [Xelus22](https://github.com/Xelus22)
+* Hardware Supported: Valor
+* Hardware Availability: Custom keyboard group buys
+
+Make example for this keyboard (after setting up your build environment):
+
+    make xelus/valor/rev1: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).
diff --git a/qmk/keyboards/xelus/valor/rev1/rev1.c b/qmk/keyboards/xelus/valor/rev1/rev1.c
new file mode 100644
index 00000000..614899aa
--- /dev/null
+++ b/qmk/keyboards/xelus/valor/rev1/rev1.c
@@ -0,0 +1,19 @@
+/* Copyright 2020 Harrison Chan (Xelus)
+ *
+ * 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/>.
+ */
+
+// Nothing to see here, move along... ;-)
+
+#include "rev1.h"
\ No newline at end of file
diff --git a/qmk/keyboards/xelus/valor/rev1/rev1.h b/qmk/keyboards/xelus/valor/rev1/rev1.h
new file mode 100644
index 00000000..3e05ae5e
--- /dev/null
+++ b/qmk/keyboards/xelus/valor/rev1/rev1.h
@@ -0,0 +1,37 @@
+/* Copyright 2020 Harrison Chan (Xelus)
+ *
+ * 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 ____ KC_NO
+
+#define LAYOUT_alice_split_bs( \
+  K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K214, \
+  K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114,       \
+  K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,             \
+        K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314,       \
+        K401,       K403,       K405, K406,       K408,       K410,             K413              \
+) { \
+  { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014 }, \
+  { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114 }, \
+  { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K214 }, \
+  { ____, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314 }, \
+  { ____, K401, ____, K403, ____, K405, K406, ____, K408, ____, K410, ____, ____, K413, ____ }  \
+}
+
+#define LAYOUT_all LAYOUT_alice_split_bs
diff --git a/qmk/keyboards/xelus/valor/rev1/rules.mk b/qmk/keyboards/xelus/valor/rev1/rules.mk
new file mode 100644
index 00000000..2840d97f
--- /dev/null
+++ b/qmk/keyboards/xelus/valor/rev1/rules.mk
@@ -0,0 +1,25 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = yes        # Console for debug
+COMMAND_ENABLE = yes        # Commands for debug and configuration
+# 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 = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+LTO_ENABLE = yes
+
+LAYOUTS = alice_split_bs
diff --git a/qmk/keyboards/xelus/valor_frl_tkl/chconf.h b/qmk/keyboards/xelus/valor_frl_tkl/chconf.h
new file mode 100644
index 00000000..03f63da3
--- /dev/null
+++ b/qmk/keyboards/xelus/valor_frl_tkl/chconf.h
@@ -0,0 +1,714 @@
+/*
+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+/**
+ * @file    rt/templates/chconf.h
+ * @brief   Configuration file template.
+ * @details A copy of this file must be placed in each project directory, it
+ *          contains the application specific kernel settings.
+ *
+ * @addtogroup config
+ * @details Kernel related settings and hooks.
+ * @{
+ */
+
+#ifndef CHCONF_H
+#define CHCONF_H
+
+#define _CHIBIOS_RT_CONF_
+#define _CHIBIOS_RT_CONF_VER_6_0_
+
+/*===========================================================================*/
+/**
+ * @name System timers settings
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   System time counter resolution.
+ * @note    Allowed values are 16 or 32 bits.
+ */
+#if !defined(CH_CFG_ST_RESOLUTION)
+#define CH_CFG_ST_RESOLUTION                32
+#endif
+
+/**
+ * @brief   System tick frequency.
+ * @details Frequency of the system timer that drives the system ticks. This
+ *          setting also defines the system tick time unit.
+ */
+#if !defined(CH_CFG_ST_FREQUENCY)
+#define CH_CFG_ST_FREQUENCY                 10000
+#endif
+
+/**
+ * @brief   Time intervals data size.
+ * @note    Allowed values are 16, 32 or 64 bits.
+ */
+#if !defined(CH_CFG_INTERVALS_SIZE)
+#define CH_CFG_INTERVALS_SIZE               32
+#endif
+
+/**
+ * @brief   Time types data size.
+ * @note    Allowed values are 16 or 32 bits.
+ */
+#if !defined(CH_CFG_TIME_TYPES_SIZE)
+#define CH_CFG_TIME_TYPES_SIZE              32
+#endif
+
+/**
+ * @brief   Time delta constant for the tick-less mode.
+ * @note    If this value is zero then the system uses the classic
+ *          periodic tick. This value represents the minimum number
+ *          of ticks that is safe to specify in a timeout directive.
+ *          The value one is not valid, timeouts are rounded up to
+ *          this value.
+ */
+#if !defined(CH_CFG_ST_TIMEDELTA)
+#define CH_CFG_ST_TIMEDELTA                 2
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Kernel parameters and options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   Round robin interval.
+ * @details This constant is the number of system ticks allowed for the
+ *          threads before preemption occurs. Setting this value to zero
+ *          disables the preemption for threads with equal priority and the
+ *          round robin becomes cooperative. Note that higher priority
+ *          threads can still preempt, the kernel is always preemptive.
+ * @note    Disabling the round robin preemption makes the kernel more compact
+ *          and generally faster.
+ * @note    The round robin preemption is not supported in tickless mode and
+ *          must be set to zero in that case.
+ */
+#if !defined(CH_CFG_TIME_QUANTUM)
+#define CH_CFG_TIME_QUANTUM                 0
+#endif
+
+/**
+ * @brief   Managed RAM size.
+ * @details Size of the RAM area to be managed by the OS. If set to zero
+ *          then the whole available RAM is used. The core memory is made
+ *          available to the heap allocator and/or can be used directly through
+ *          the simplified core memory allocator.
+ *
+ * @note    In order to let the OS manage the whole RAM the linker script must
+ *          provide the @p __heap_base__ and @p __heap_end__ symbols.
+ * @note    Requires @p CH_CFG_USE_MEMCORE.
+ */
+#if !defined(CH_CFG_MEMCORE_SIZE)
+#define CH_CFG_MEMCORE_SIZE                 0
+#endif
+
+/**
+ * @brief   Idle thread automatic spawn suppression.
+ * @details When this option is activated the function @p chSysInit()
+ *          does not spawn the idle thread. The application @p main()
+ *          function becomes the idle thread and must implement an
+ *          infinite loop.
+ */
+#if !defined(CH_CFG_NO_IDLE_THREAD)
+#define CH_CFG_NO_IDLE_THREAD               FALSE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Performance options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   OS optimization.
+ * @details If enabled then time efficient rather than space efficient code
+ *          is used when two possible implementations exist.
+ *
+ * @note    This is not related to the compiler optimization options.
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_OPTIMIZE_SPEED)
+#define CH_CFG_OPTIMIZE_SPEED               FALSE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Subsystem options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   Time Measurement APIs.
+ * @details If enabled then the time measurement APIs are included in
+ *          the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_TM)
+#define CH_CFG_USE_TM                       FALSE
+#endif
+
+/**
+ * @brief   Threads registry APIs.
+ * @details If enabled then the registry APIs are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_REGISTRY)
+#define CH_CFG_USE_REGISTRY                 TRUE
+#endif
+
+/**
+ * @brief   Threads synchronization APIs.
+ * @details If enabled then the @p chThdWait() function is included in
+ *          the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_WAITEXIT)
+#define CH_CFG_USE_WAITEXIT                 TRUE
+#endif
+
+/**
+ * @brief   Semaphores APIs.
+ * @details If enabled then the Semaphores APIs are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_SEMAPHORES)
+#define CH_CFG_USE_SEMAPHORES               TRUE
+#endif
+
+/**
+ * @brief   Semaphores queuing mode.
+ * @details If enabled then the threads are enqueued on semaphores by
+ *          priority rather than in FIFO order.
+ *
+ * @note    The default is @p FALSE. Enable this if you have special
+ *          requirements.
+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.
+ */
+#if !defined(CH_CFG_USE_SEMAPHORES_PRIORITY)
+#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE
+#endif
+
+/**
+ * @brief   Mutexes APIs.
+ * @details If enabled then the mutexes APIs are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_MUTEXES)
+#define CH_CFG_USE_MUTEXES                  TRUE
+#endif
+
+/**
+ * @brief   Enables recursive behavior on mutexes.
+ * @note    Recursive mutexes are heavier and have an increased
+ *          memory footprint.
+ *
+ * @note    The default is @p FALSE.
+ * @note    Requires @p CH_CFG_USE_MUTEXES.
+ */
+#if !defined(CH_CFG_USE_MUTEXES_RECURSIVE)
+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE
+#endif
+
+/**
+ * @brief   Conditional Variables APIs.
+ * @details If enabled then the conditional variables APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_MUTEXES.
+ */
+#if !defined(CH_CFG_USE_CONDVARS)
+#define CH_CFG_USE_CONDVARS                 TRUE
+#endif
+
+/**
+ * @brief   Conditional Variables APIs with timeout.
+ * @details If enabled then the conditional variables APIs with timeout
+ *          specification are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_CONDVARS.
+ */
+#if !defined(CH_CFG_USE_CONDVARS_TIMEOUT)
+#define CH_CFG_USE_CONDVARS_TIMEOUT         FALSE
+#endif
+
+/**
+ * @brief   Events Flags APIs.
+ * @details If enabled then the event flags APIs are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_EVENTS)
+#define CH_CFG_USE_EVENTS                   TRUE
+#endif
+
+/**
+ * @brief   Events Flags APIs with timeout.
+ * @details If enabled then the events APIs with timeout specification
+ *          are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_EVENTS.
+ */
+#if !defined(CH_CFG_USE_EVENTS_TIMEOUT)
+#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE
+#endif
+
+/**
+ * @brief   Synchronous Messages APIs.
+ * @details If enabled then the synchronous messages APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_MESSAGES)
+#define CH_CFG_USE_MESSAGES                 TRUE
+#endif
+
+/**
+ * @brief   Synchronous Messages queuing mode.
+ * @details If enabled then messages are served by priority rather than in
+ *          FIFO order.
+ *
+ * @note    The default is @p FALSE. Enable this if you have special
+ *          requirements.
+ * @note    Requires @p CH_CFG_USE_MESSAGES.
+ */
+#if !defined(CH_CFG_USE_MESSAGES_PRIORITY)
+#define CH_CFG_USE_MESSAGES_PRIORITY        FALSE
+#endif
+
+/**
+ * @brief   Mailboxes APIs.
+ * @details If enabled then the asynchronous messages (mailboxes) APIs are
+ *          included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.
+ */
+#if !defined(CH_CFG_USE_MAILBOXES)
+#define CH_CFG_USE_MAILBOXES                TRUE
+#endif
+
+/**
+ * @brief   Core Memory Manager APIs.
+ * @details If enabled then the core memory manager APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_MEMCORE)
+#define CH_CFG_USE_MEMCORE                  TRUE
+#endif
+
+/**
+ * @brief   Heap Allocator APIs.
+ * @details If enabled then the memory heap allocator APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_MEMCORE and either @p CH_CFG_USE_MUTEXES or
+ *          @p CH_CFG_USE_SEMAPHORES.
+ * @note    Mutexes are recommended.
+ */
+#if !defined(CH_CFG_USE_HEAP)
+#define CH_CFG_USE_HEAP                     FALSE
+#endif
+
+/**
+ * @brief   Memory Pools Allocator APIs.
+ * @details If enabled then the memory pools allocator APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_MEMPOOLS)
+#define CH_CFG_USE_MEMPOOLS                 FALSE
+#endif
+
+/**
+ * @brief   Objects FIFOs APIs.
+ * @details If enabled then the objects FIFOs APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_OBJ_FIFOS)
+#define CH_CFG_USE_OBJ_FIFOS                FALSE
+#endif
+
+/**
+ * @brief   Pipes APIs.
+ * @details If enabled then the pipes APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_PIPES)
+#define CH_CFG_USE_PIPES                    FALSE
+#endif
+
+/**
+ * @brief   Dynamic Threads APIs.
+ * @details If enabled then the dynamic threads creation APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_WAITEXIT.
+ * @note    Requires @p CH_CFG_USE_HEAP and/or @p CH_CFG_USE_MEMPOOLS.
+ */
+#if !defined(CH_CFG_USE_DYNAMIC)
+#define CH_CFG_USE_DYNAMIC                  FALSE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Objects factory options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   Objects Factory APIs.
+ * @details If enabled then the objects factory APIs are included in the
+ *          kernel.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_CFG_USE_FACTORY)
+#define CH_CFG_USE_FACTORY                  FALSE
+#endif
+
+/**
+ * @brief   Maximum length for object names.
+ * @details If the specified length is zero then the name is stored by
+ *          pointer but this could have unintended side effects.
+ */
+#if !defined(CH_CFG_FACTORY_MAX_NAMES_LENGTH)
+#define CH_CFG_FACTORY_MAX_NAMES_LENGTH     8
+#endif
+
+/**
+ * @brief   Enables the registry of generic objects.
+ */
+#if !defined(CH_CFG_FACTORY_OBJECTS_REGISTRY)
+#define CH_CFG_FACTORY_OBJECTS_REGISTRY     FALSE
+#endif
+
+/**
+ * @brief   Enables factory for generic buffers.
+ */
+#if !defined(CH_CFG_FACTORY_GENERIC_BUFFERS)
+#define CH_CFG_FACTORY_GENERIC_BUFFERS      FALSE
+#endif
+
+/**
+ * @brief   Enables factory for semaphores.
+ */
+#if !defined(CH_CFG_FACTORY_SEMAPHORES)
+#define CH_CFG_FACTORY_SEMAPHORES           FALSE
+#endif
+
+/**
+ * @brief   Enables factory for mailboxes.
+ */
+#if !defined(CH_CFG_FACTORY_MAILBOXES)
+#define CH_CFG_FACTORY_MAILBOXES            FALSE
+#endif
+
+/**
+ * @brief   Enables factory for objects FIFOs.
+ */
+#if !defined(CH_CFG_FACTORY_OBJ_FIFOS)
+#define CH_CFG_FACTORY_OBJ_FIFOS            FALSE
+#endif
+
+/**
+ * @brief   Enables factory for Pipes.
+ */
+#if !defined(CH_CFG_FACTORY_PIPES) || defined(__DOXYGEN__)
+#define CH_CFG_FACTORY_PIPES                FALSE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Debug options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   Debug option, kernel statistics.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_STATISTICS)
+#define CH_DBG_STATISTICS                   FALSE
+#endif
+
+/**
+ * @brief   Debug option, system state check.
+ * @details If enabled the correct call protocol for system APIs is checked
+ *          at runtime.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_SYSTEM_STATE_CHECK)
+#define CH_DBG_SYSTEM_STATE_CHECK           FALSE
+#endif
+
+/**
+ * @brief   Debug option, parameters checks.
+ * @details If enabled then the checks on the API functions input
+ *          parameters are activated.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_ENABLE_CHECKS)
+#define CH_DBG_ENABLE_CHECKS                FALSE
+#endif
+
+/**
+ * @brief   Debug option, consistency checks.
+ * @details If enabled then all the assertions in the kernel code are
+ *          activated. This includes consistency checks inside the kernel,
+ *          runtime anomalies and port-defined checks.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_ENABLE_ASSERTS)
+#define CH_DBG_ENABLE_ASSERTS               FALSE
+#endif
+
+/**
+ * @brief   Debug option, trace buffer.
+ * @details If enabled then the trace buffer is activated.
+ *
+ * @note    The default is @p CH_DBG_TRACE_MASK_DISABLED.
+ */
+#if !defined(CH_DBG_TRACE_MASK)
+#define CH_DBG_TRACE_MASK                   CH_DBG_TRACE_MASK_DISABLED
+#endif
+
+/**
+ * @brief   Trace buffer entries.
+ * @note    The trace buffer is only allocated if @p CH_DBG_TRACE_MASK is
+ *          different from @p CH_DBG_TRACE_MASK_DISABLED.
+ */
+#if !defined(CH_DBG_TRACE_BUFFER_SIZE)
+#define CH_DBG_TRACE_BUFFER_SIZE            128
+#endif
+
+/**
+ * @brief   Debug option, stack checks.
+ * @details If enabled then a runtime stack check is performed.
+ *
+ * @note    The default is @p FALSE.
+ * @note    The stack check is performed in a architecture/port dependent way.
+ *          It may not be implemented or some ports.
+ * @note    The default failure mode is to halt the system with the global
+ *          @p panic_msg variable set to @p NULL.
+ */
+#if !defined(CH_DBG_ENABLE_STACK_CHECK)
+#define CH_DBG_ENABLE_STACK_CHECK           FALSE
+#endif
+
+/**
+ * @brief   Debug option, stacks initialization.
+ * @details If enabled then the threads working area is filled with a byte
+ *          value when a thread is created. This can be useful for the
+ *          runtime measurement of the used stack.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_FILL_THREADS)
+#define CH_DBG_FILL_THREADS                 FALSE
+#endif
+
+/**
+ * @brief   Debug option, threads profiling.
+ * @details If enabled then a field is added to the @p thread_t structure that
+ *          counts the system ticks occurred while executing the thread.
+ *
+ * @note    The default is @p FALSE.
+ * @note    This debug option is not currently compatible with the
+ *          tickless mode.
+ */
+#if !defined(CH_DBG_THREADS_PROFILING)
+#define CH_DBG_THREADS_PROFILING            FALSE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Kernel hooks
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   System structure extension.
+ * @details User fields added to the end of the @p ch_system_t structure.
+ */
+#define CH_CFG_SYSTEM_EXTRA_FIELDS                                          \
+  /* Add threads custom fields here.*/
+
+/**
+ * @brief   System initialization hook.
+ * @details User initialization code added to the @p chSysInit() function
+ *          just before interrupts are enabled globally.
+ */
+#define CH_CFG_SYSTEM_INIT_HOOK() {                                         \
+  /* Add threads initialization code here.*/                                \
+}
+
+/**
+ * @brief   Threads descriptor structure extension.
+ * @details User fields added to the end of the @p thread_t structure.
+ */
+#define CH_CFG_THREAD_EXTRA_FIELDS                                          \
+  /* Add threads custom fields here.*/
+
+/**
+ * @brief   Threads initialization hook.
+ * @details User initialization code added to the @p _thread_init() function.
+ *
+ * @note    It is invoked from within @p _thread_init() and implicitly from all
+ *          the threads creation APIs.
+ */
+#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \
+  /* Add threads initialization code here.*/                                \
+}
+
+/**
+ * @brief   Threads finalization hook.
+ * @details User finalization code added to the @p chThdExit() API.
+ */
+#define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \
+  /* Add threads finalization code here.*/                                  \
+}
+
+/**
+ * @brief   Context switch hook.
+ * @details This hook is invoked just before switching between threads.
+ */
+#define CH_CFG_CONTEXT_SWITCH_HOOK(ntp, otp) {                              \
+  /* Context switch code here.*/                                            \
+}
+
+/**
+ * @brief   ISR enter hook.
+ */
+#define CH_CFG_IRQ_PROLOGUE_HOOK() {                                        \
+  /* IRQ prologue code here.*/                                              \
+}
+
+/**
+ * @brief   ISR exit hook.
+ */
+#define CH_CFG_IRQ_EPILOGUE_HOOK() {                                        \
+  /* IRQ epilogue code here.*/                                              \
+}
+
+/**
+ * @brief   Idle thread enter hook.
+ * @note    This hook is invoked within a critical zone, no OS functions
+ *          should be invoked from here.
+ * @note    This macro can be used to activate a power saving mode.
+ */
+#define CH_CFG_IDLE_ENTER_HOOK() {                                          \
+  /* Idle-enter code here.*/                                                \
+}
+
+/**
+ * @brief   Idle thread leave hook.
+ * @note    This hook is invoked within a critical zone, no OS functions
+ *          should be invoked from here.
+ * @note    This macro can be used to deactivate a power saving mode.
+ */
+#define CH_CFG_IDLE_LEAVE_HOOK() {                                          \
+  /* Idle-leave code here.*/                                                \
+}
+
+/**
+ * @brief   Idle Loop hook.
+ * @details This hook is continuously invoked by the idle thread loop.
+ */
+#define CH_CFG_IDLE_LOOP_HOOK() {                                           \
+  /* Idle loop code here.*/                                                 \
+}
+
+/**
+ * @brief   System tick event hook.
+ * @details This hook is invoked in the system tick handler immediately
+ *          after processing the virtual timers queue.
+ */
+#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \
+  /* System tick event code here.*/                                         \
+}
+
+/**
+ * @brief   System halt hook.
+ * @details This hook is invoked in case to a system halting error before
+ *          the system is halted.
+ */
+#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \
+  /* System halt code here.*/                                               \
+}
+
+/**
+ * @brief   Trace hook.
+ * @details This hook is invoked each time a new record is written in the
+ *          trace buffer.
+ */
+#define CH_CFG_TRACE_HOOK(tep) {                                            \
+  /* Trace code here.*/                                                     \
+}
+
+/** @} */
+
+/*===========================================================================*/
+/* Port-specific settings (override port settings defaulted in chcore.h).    */
+/*===========================================================================*/
+
+#endif  /* CHCONF_H */
+
+/** @} */
diff --git a/qmk/keyboards/xelus/valor_frl_tkl/config.h b/qmk/keyboards/xelus/valor_frl_tkl/config.h
new file mode 100644
index 00000000..ff2ea6dd
--- /dev/null
+++ b/qmk/keyboards/xelus/valor_frl_tkl/config.h
@@ -0,0 +1,69 @@
+/* Copyright 2020 Harrison Chan (Xelus)
+ *
+ * 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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0x5845 // "XE"
+#define PRODUCT_ID      0x4654 // "FT"
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Xelus
+#define PRODUCT         Xelus Valor FRL TKL
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 17
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { A15, A14, A1, B3, B4 }
+#define MATRIX_COL_PINS { A9, A8, B15, B14, B13, B12, A0, B11, B10, B2, B1, B0, A7, A6, A5, A4, A3 }
+#define UNUSED_PINS
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+// I2C OLED defines
+#define I2C1_SCL 8
+#define I2C1_SDA 9
+
+#define I2C1_SCL_PAL_MODE 1
+#define I2C1_SDA_PAL_MODE 1
+
+#define I2C1_TIMINGR_PRESC 	0U
+#define I2C1_TIMINGR_SCLDEL 3U
+#define I2C1_TIMINGR_SDADEL 1U
+#define I2C1_TIMINGR_SCLH 	3U
+#define I2C1_TIMINGR_SCLL   9U
+
+// I2C EEPROM
+// 24LC64
+#define EEPROM_I2C_24LC64
+
+// Dynamic EEPROM
+// Something sensible or else VIA may crash
+// Users may enable more if they wish
+#define DYNAMIC_KEYMAP_EEPROM_MAX_ADDR  4095
diff --git a/qmk/keyboards/xelus/valor_frl_tkl/halconf.h b/qmk/keyboards/xelus/valor_frl_tkl/halconf.h
new file mode 100644
index 00000000..de0f29ce
--- /dev/null
+++ b/qmk/keyboards/xelus/valor_frl_tkl/halconf.h
@@ -0,0 +1,525 @@
+/*
+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+/**
+ * @file    templates/halconf.h
+ * @brief   HAL configuration header.
+ * @details HAL configuration file, this file allows to enable or disable the
+ *          various device drivers from your application. You may also use
+ *          this file in order to override the device drivers default settings.
+ *
+ * @addtogroup HAL_CONF
+ * @{
+ */
+
+#ifndef HALCONF_H
+#define HALCONF_H
+
+#define _CHIBIOS_HAL_CONF_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
+
+#include "mcuconf.h"
+
+/**
+ * @brief   Enables the PAL subsystem.
+ */
+#if !defined(HAL_USE_PAL) || defined(__DOXYGEN__)
+#define HAL_USE_PAL                         TRUE
+#endif
+
+/**
+ * @brief   Enables the ADC subsystem.
+ */
+#if !defined(HAL_USE_ADC) || defined(__DOXYGEN__)
+#define HAL_USE_ADC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the CAN subsystem.
+ */
+#if !defined(HAL_USE_CAN) || defined(__DOXYGEN__)
+#define HAL_USE_CAN                         FALSE
+#endif
+
+/**
+ * @brief   Enables the cryptographic subsystem.
+ */
+#if !defined(HAL_USE_CRY) || defined(__DOXYGEN__)
+#define HAL_USE_CRY                         FALSE
+#endif
+
+/**
+ * @brief   Enables the DAC subsystem.
+ */
+#if !defined(HAL_USE_DAC) || defined(__DOXYGEN__)
+#define HAL_USE_DAC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the GPT subsystem.
+ */
+#if !defined(HAL_USE_GPT) || defined(__DOXYGEN__)
+#define HAL_USE_GPT                         FALSE
+#endif
+
+/**
+ * @brief   Enables the I2C subsystem.
+ */
+#if !defined(HAL_USE_I2C) || defined(__DOXYGEN__)
+#define HAL_USE_I2C                         TRUE
+#endif
+
+/**
+ * @brief   Enables the I2S subsystem.
+ */
+#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)
+#define HAL_USE_I2S                         FALSE
+#endif
+
+/**
+ * @brief   Enables the ICU subsystem.
+ */
+#if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)
+#define HAL_USE_ICU                         FALSE
+#endif
+
+/**
+ * @brief   Enables the MAC subsystem.
+ */
+#if !defined(HAL_USE_MAC) || defined(__DOXYGEN__)
+#define HAL_USE_MAC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the MMC_SPI subsystem.
+ */
+#if !defined(HAL_USE_MMC_SPI) || defined(__DOXYGEN__)
+#define HAL_USE_MMC_SPI                     FALSE
+#endif
+
+/**
+ * @brief   Enables the PWM subsystem.
+ */
+#if !defined(HAL_USE_PWM) || defined(__DOXYGEN__)
+#define HAL_USE_PWM                         FALSE
+#endif
+
+/**
+ * @brief   Enables the RTC subsystem.
+ */
+#if !defined(HAL_USE_RTC) || defined(__DOXYGEN__)
+#define HAL_USE_RTC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the SDC subsystem.
+ */
+#if !defined(HAL_USE_SDC) || defined(__DOXYGEN__)
+#define HAL_USE_SDC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the SERIAL subsystem.
+ */
+#if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__)
+#define HAL_USE_SERIAL                      FALSE
+#endif
+
+/**
+ * @brief   Enables the SERIAL over USB subsystem.
+ */
+#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)
+#define HAL_USE_SERIAL_USB                  FALSE
+#endif
+
+/**
+ * @brief   Enables the SIO subsystem.
+ */
+#if !defined(HAL_USE_SIO) || defined(__DOXYGEN__)
+#define HAL_USE_SIO                         FALSE
+#endif
+
+/**
+ * @brief   Enables the SPI subsystem.
+ */
+#if !defined(HAL_USE_SPI) || defined(__DOXYGEN__)
+#define HAL_USE_SPI                         FALSE
+#endif
+
+/**
+ * @brief   Enables the TRNG subsystem.
+ */
+#if !defined(HAL_USE_TRNG) || defined(__DOXYGEN__)
+#define HAL_USE_TRNG                        FALSE
+#endif
+
+/**
+ * @brief   Enables the UART subsystem.
+ */
+#if !defined(HAL_USE_UART) || defined(__DOXYGEN__)
+#define HAL_USE_UART                        FALSE
+#endif
+
+/**
+ * @brief   Enables the USB subsystem.
+ */
+#if !defined(HAL_USE_USB) || defined(__DOXYGEN__)
+#define HAL_USE_USB                         TRUE
+#endif
+
+/**
+ * @brief   Enables the WDG subsystem.
+ */
+#if !defined(HAL_USE_WDG) || defined(__DOXYGEN__)
+#define HAL_USE_WDG                         FALSE
+#endif
+
+/**
+ * @brief   Enables the WSPI subsystem.
+ */
+#if !defined(HAL_USE_WSPI) || defined(__DOXYGEN__)
+#define HAL_USE_WSPI                        FALSE
+#endif
+
+/*===========================================================================*/
+/* PAL driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(PAL_USE_CALLBACKS) || defined(__DOXYGEN__)
+#define PAL_USE_CALLBACKS                   FALSE
+#endif
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(PAL_USE_WAIT) || defined(__DOXYGEN__)
+#define PAL_USE_WAIT                        FALSE
+#endif
+
+/*===========================================================================*/
+/* ADC driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(ADC_USE_WAIT) || defined(__DOXYGEN__)
+#define ADC_USE_WAIT                        TRUE
+#endif
+
+/**
+ * @brief   Enables the @p adcAcquireBus() and @p adcReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(ADC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define ADC_USE_MUTUAL_EXCLUSION            TRUE
+#endif
+
+/*===========================================================================*/
+/* CAN driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Sleep mode related APIs inclusion switch.
+ */
+#if !defined(CAN_USE_SLEEP_MODE) || defined(__DOXYGEN__)
+#define CAN_USE_SLEEP_MODE                  TRUE
+#endif
+
+/**
+ * @brief   Enforces the driver to use direct callbacks rather than OSAL events.
+ */
+#if !defined(CAN_ENFORCE_USE_CALLBACKS) || defined(__DOXYGEN__)
+#define CAN_ENFORCE_USE_CALLBACKS           FALSE
+#endif
+
+/*===========================================================================*/
+/* CRY driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables the SW fall-back of the cryptographic driver.
+ * @details When enabled, this option, activates a fall-back software
+ *          implementation for algorithms not supported by the underlying
+ *          hardware.
+ * @note    Fall-back implementations may not be present for all algorithms.
+ */
+#if !defined(HAL_CRY_USE_FALLBACK) || defined(__DOXYGEN__)
+#define HAL_CRY_USE_FALLBACK                FALSE
+#endif
+
+/**
+ * @brief   Makes the driver forcibly use the fall-back implementations.
+ */
+#if !defined(HAL_CRY_ENFORCE_FALLBACK) || defined(__DOXYGEN__)
+#define HAL_CRY_ENFORCE_FALLBACK            FALSE
+#endif
+
+/*===========================================================================*/
+/* DAC driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(DAC_USE_WAIT) || defined(__DOXYGEN__)
+#define DAC_USE_WAIT                        TRUE
+#endif
+
+/**
+ * @brief   Enables the @p dacAcquireBus() and @p dacReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(DAC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define DAC_USE_MUTUAL_EXCLUSION            TRUE
+#endif
+
+/*===========================================================================*/
+/* I2C driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables the mutual exclusion APIs on the I2C bus.
+ */
+#if !defined(I2C_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define I2C_USE_MUTUAL_EXCLUSION            TRUE
+#endif
+
+/*===========================================================================*/
+/* MAC driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables the zero-copy API.
+ */
+#if !defined(MAC_USE_ZERO_COPY) || defined(__DOXYGEN__)
+#define MAC_USE_ZERO_COPY                   FALSE
+#endif
+
+/**
+ * @brief   Enables an event sources for incoming packets.
+ */
+#if !defined(MAC_USE_EVENTS) || defined(__DOXYGEN__)
+#define MAC_USE_EVENTS                      TRUE
+#endif
+
+/*===========================================================================*/
+/* MMC_SPI driver related settings.                                          */
+/*===========================================================================*/
+
+/**
+ * @brief   Delays insertions.
+ * @details If enabled this options inserts delays into the MMC waiting
+ *          routines releasing some extra CPU time for the threads with
+ *          lower priority, this may slow down the driver a bit however.
+ *          This option is recommended also if the SPI driver does not
+ *          use a DMA channel and heavily loads the CPU.
+ */
+#if !defined(MMC_NICE_WAITING) || defined(__DOXYGEN__)
+#define MMC_NICE_WAITING                    TRUE
+#endif
+
+/*===========================================================================*/
+/* SDC driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Number of initialization attempts before rejecting the card.
+ * @note    Attempts are performed at 10mS intervals.
+ */
+#if !defined(SDC_INIT_RETRY) || defined(__DOXYGEN__)
+#define SDC_INIT_RETRY                      100
+#endif
+
+/**
+ * @brief   Include support for MMC cards.
+ * @note    MMC support is not yet implemented so this option must be kept
+ *          at @p FALSE.
+ */
+#if !defined(SDC_MMC_SUPPORT) || defined(__DOXYGEN__)
+#define SDC_MMC_SUPPORT                     FALSE
+#endif
+
+/**
+ * @brief   Delays insertions.
+ * @details If enabled this options inserts delays into the MMC waiting
+ *          routines releasing some extra CPU time for the threads with
+ *          lower priority, this may slow down the driver a bit however.
+ */
+#if !defined(SDC_NICE_WAITING) || defined(__DOXYGEN__)
+#define SDC_NICE_WAITING                    TRUE
+#endif
+
+/**
+ * @brief   OCR initialization constant for V20 cards.
+ */
+#if !defined(SDC_INIT_OCR_V20) || defined(__DOXYGEN__)
+#define SDC_INIT_OCR_V20                    0x50FF8000U
+#endif
+
+/**
+ * @brief   OCR initialization constant for non-V20 cards.
+ */
+#if !defined(SDC_INIT_OCR) || defined(__DOXYGEN__)
+#define SDC_INIT_OCR                        0x80100000U
+#endif
+
+/*===========================================================================*/
+/* SERIAL driver related settings.                                           */
+/*===========================================================================*/
+
+/**
+ * @brief   Default bit rate.
+ * @details Configuration parameter, this is the baud rate selected for the
+ *          default configuration.
+ */
+#if !defined(SERIAL_DEFAULT_BITRATE) || defined(__DOXYGEN__)
+#define SERIAL_DEFAULT_BITRATE              38400
+#endif
+
+/**
+ * @brief   Serial buffers size.
+ * @details Configuration parameter, you can change the depth of the queue
+ *          buffers depending on the requirements of your application.
+ * @note    The default is 16 bytes for both the transmission and receive
+ *          buffers.
+ */
+#if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__)
+#define SERIAL_BUFFERS_SIZE                 16
+#endif
+
+/*===========================================================================*/
+/* SERIAL_USB driver related setting.                                        */
+/*===========================================================================*/
+
+/**
+ * @brief   Serial over USB buffers size.
+ * @details Configuration parameter, the buffer size must be a multiple of
+ *          the USB data endpoint maximum packet size.
+ * @note    The default is 256 bytes for both the transmission and receive
+ *          buffers.
+ */
+#if !defined(SERIAL_USB_BUFFERS_SIZE) || defined(__DOXYGEN__)
+#define SERIAL_USB_BUFFERS_SIZE             1
+#endif
+
+/**
+ * @brief   Serial over USB number of buffers.
+ * @note    The default is 2 buffers.
+ */
+#if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
+#define SERIAL_USB_BUFFERS_NUMBER           2
+#endif
+
+/*===========================================================================*/
+/* SPI driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(SPI_USE_WAIT) || defined(__DOXYGEN__)
+#define SPI_USE_WAIT                        TRUE
+#endif
+
+/**
+ * @brief   Enables circular transfers APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(SPI_USE_CIRCULAR) || defined(__DOXYGEN__)
+#define SPI_USE_CIRCULAR                    FALSE
+#endif
+
+
+/**
+ * @brief   Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(SPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define SPI_USE_MUTUAL_EXCLUSION            TRUE
+#endif
+
+/**
+ * @brief   Handling method for SPI CS line.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(SPI_SELECT_MODE) || defined(__DOXYGEN__)
+#define SPI_SELECT_MODE                     SPI_SELECT_MODE_PAD
+#endif
+
+/*===========================================================================*/
+/* UART driver related settings.                                             */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(UART_USE_WAIT) || defined(__DOXYGEN__)
+#define UART_USE_WAIT                       FALSE
+#endif
+
+/**
+ * @brief   Enables the @p uartAcquireBus() and @p uartReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(UART_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define UART_USE_MUTUAL_EXCLUSION           FALSE
+#endif
+
+/*===========================================================================*/
+/* USB driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(USB_USE_WAIT) || defined(__DOXYGEN__)
+#define USB_USE_WAIT                        TRUE
+#endif
+
+/*===========================================================================*/
+/* WSPI driver related settings.                                             */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(WSPI_USE_WAIT) || defined(__DOXYGEN__)
+#define WSPI_USE_WAIT                       TRUE
+#endif
+
+/**
+ * @brief   Enables the @p wspiAcquireBus() and @p wspiReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(WSPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define WSPI_USE_MUTUAL_EXCLUSION           TRUE
+#endif
+
+#endif /* HALCONF_H */
+
+/** @} */
diff --git a/qmk/keyboards/xelus/valor_frl_tkl/keymaps/default/config.h b/qmk/keyboards/xelus/valor_frl_tkl/keymaps/default/config.h
new file mode 100644
index 00000000..604c00df
--- /dev/null
+++ b/qmk/keyboards/xelus/valor_frl_tkl/keymaps/default/config.h
@@ -0,0 +1,19 @@
+/* Copyright 2020 Harrison Chan (Xelus)
+ *
+ * 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
+
+#define USB_POLLING_INTERVAL_MS 1
+#define QMK_KEYS_PER_SCAN 4
diff --git a/qmk/keyboards/xelus/valor_frl_tkl/keymaps/default/keymap.c b/qmk/keyboards/xelus/valor_frl_tkl/keymaps/default/keymap.c
new file mode 100644
index 00000000..24c15719
--- /dev/null
+++ b/qmk/keyboards/xelus/valor_frl_tkl/keymaps/default/keymap.c
@@ -0,0 +1,34 @@
+/* Copyright 2020 Harrison Chan (Xelus)
+ *
+ * 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_all(
+    KC_TILD, 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_DEL,  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_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_RGUI,                    KC_UP,
+    KC_LCTL,          KC_LALT,          KC_SPC,  MO(1),            KC_SPC,           KC_RALT,                   KC_RCTL,                    KC_LEFT, KC_DOWN, KC_RGHT
+  ),
+
+  [1] = LAYOUT_all(
+    KC_TRNS, 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_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,
+    KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,                   KC_TRNS,                    KC_TRNS, KC_TRNS, KC_TRNS
+  )
+};
diff --git a/qmk/keyboards/xelus/valor_frl_tkl/keymaps/default/readme.md b/qmk/keyboards/xelus/valor_frl_tkl/keymaps/default/readme.md
new file mode 100644
index 00000000..3f9d6dff
--- /dev/null
+++ b/qmk/keyboards/xelus/valor_frl_tkl/keymaps/default/readme.md
@@ -0,0 +1,2 @@
+# The Default Valor FRL TKL Layout
+
diff --git a/qmk/keyboards/xelus/valor_frl_tkl/keymaps/via/config.h b/qmk/keyboards/xelus/valor_frl_tkl/keymaps/via/config.h
new file mode 100644
index 00000000..604c00df
--- /dev/null
+++ b/qmk/keyboards/xelus/valor_frl_tkl/keymaps/via/config.h
@@ -0,0 +1,19 @@
+/* Copyright 2020 Harrison Chan (Xelus)
+ *
+ * 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
+
+#define USB_POLLING_INTERVAL_MS 1
+#define QMK_KEYS_PER_SCAN 4
diff --git a/qmk/keyboards/xelus/valor_frl_tkl/keymaps/via/keymap.c b/qmk/keyboards/xelus/valor_frl_tkl/keymaps/via/keymap.c
new file mode 100644
index 00000000..24d26272
--- /dev/null
+++ b/qmk/keyboards/xelus/valor_frl_tkl/keymaps/via/keymap.c
@@ -0,0 +1,50 @@
+/* Copyright 2020 Harrison Chan (Xelus)
+ *
+ * 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_all(
+    KC_TILD, 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_DEL,  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_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_RGUI,                    KC_UP,
+    KC_LCTL,          KC_LALT,          KC_SPC,  MO(1),            KC_SPC,           KC_RALT,                   KC_RCTL,                    KC_LEFT, KC_DOWN, KC_RGHT
+  ),
+
+  [1] = LAYOUT_all(
+    KC_TRNS, 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_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,
+    KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS,          KC_TRNS,          KC_TRNS,                   KC_TRNS,                    KC_TRNS, KC_TRNS, KC_TRNS
+  ),
+
+  [2] = LAYOUT_all(
+    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, 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
+  ),
+
+  [3] = LAYOUT_all(
+    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, 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
+  )
+};
diff --git a/qmk/keyboards/xelus/valor_frl_tkl/keymaps/via/readme.md b/qmk/keyboards/xelus/valor_frl_tkl/keymaps/via/readme.md
new file mode 100644
index 00000000..c1f633ac
--- /dev/null
+++ b/qmk/keyboards/xelus/valor_frl_tkl/keymaps/via/readme.md
@@ -0,0 +1,2 @@
+# The VIA Valor FRL TKL Layout
+
diff --git a/qmk/keyboards/xelus/valor_frl_tkl/keymaps/via/rules.mk b/qmk/keyboards/xelus/valor_frl_tkl/keymaps/via/rules.mk
new file mode 100644
index 00000000..1e5b9980
--- /dev/null
+++ b/qmk/keyboards/xelus/valor_frl_tkl/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/qmk/keyboards/xelus/valor_frl_tkl/mcuconf.h b/qmk/keyboards/xelus/valor_frl_tkl/mcuconf.h
new file mode 100644
index 00000000..8d706de2
--- /dev/null
+++ b/qmk/keyboards/xelus/valor_frl_tkl/mcuconf.h
@@ -0,0 +1,176 @@
+/*
+    ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
+/*
+ * STM32F0xx drivers configuration.
+ * The following settings override the default settings present in
+ * the various device driver implementation headers.
+ * Note that the settings for each driver only have effect if the whole
+ * driver is enabled in halconf.h.
+ *
+ * IRQ priorities:
+ * 3...0       Lowest...Highest.
+ *
+ * DMA priorities:
+ * 0...3        Lowest...Highest.
+ */
+
+#define STM32F0xx_MCUCONF
+// #define STM32F070xB
+
+/*
+ * HAL driver system settings.
+ */
+#define STM32_NO_INIT                       FALSE
+#define STM32_PVD_ENABLE                    FALSE
+#define STM32_PLS                           STM32_PLS_LEV0
+#define STM32_HSI_ENABLED                   TRUE
+#define STM32_HSI14_ENABLED                 TRUE
+#define STM32_HSI48_ENABLED                 FALSE
+#define STM32_LSI_ENABLED                   TRUE
+#define STM32_HSE_ENABLED                   FALSE
+#define STM32_LSE_ENABLED                   FALSE
+#define STM32_SW                            STM32_SW_PLL
+#define STM32_PLLSRC                        STM32_PLLSRC_HSI_DIV2
+#define STM32_PREDIV_VALUE                  1
+#define STM32_PLLMUL_VALUE                  12
+#define STM32_HPRE                          STM32_HPRE_DIV1
+#define STM32_PPRE                          STM32_PPRE_DIV1
+#define STM32_ADCSW                         STM32_ADCSW_HSI14
+#define STM32_ADCPRE                        STM32_ADCPRE_DIV4
+#define STM32_MCOSEL                        STM32_MCOSEL_NOCLOCK
+#define STM32_ADCPRE                        STM32_ADCPRE_DIV4
+#define STM32_ADCSW                         STM32_ADCSW_HSI14
+#define STM32_USBSW                         STM32_USBSW_HSI48
+#define STM32_CECSW                         STM32_CECSW_HSI
+#define STM32_I2C1SW                        STM32_I2C1SW_HSI
+#define STM32_USART1SW                      STM32_USART1SW_PCLK
+#define STM32_RTCSEL                        STM32_RTCSEL_LSI
+
+/*
+ * ADC driver system settings.
+ */
+#define STM32_ADC_USE_ADC1                  FALSE
+#define STM32_ADC_ADC1_DMA_PRIORITY         2
+#define STM32_ADC_IRQ_PRIORITY              2
+#define STM32_ADC_ADC1_DMA_IRQ_PRIORITY     2
+
+/*
+ * EXT driver system settings.
+ */
+#define STM32_EXT_EXTI0_1_IRQ_PRIORITY      3
+#define STM32_EXT_EXTI2_3_IRQ_PRIORITY      3
+#define STM32_EXT_EXTI4_15_IRQ_PRIORITY     3
+#define STM32_EXT_EXTI16_IRQ_PRIORITY       3
+#define STM32_EXT_EXTI17_IRQ_PRIORITY       3
+
+/*
+ * GPT driver system settings.
+ */
+#define STM32_GPT_USE_TIM1                  FALSE
+#define STM32_GPT_USE_TIM2                  FALSE
+#define STM32_GPT_USE_TIM3                  FALSE
+#define STM32_GPT_USE_TIM14                 FALSE
+#define STM32_GPT_TIM1_IRQ_PRIORITY         2
+#define STM32_GPT_TIM2_IRQ_PRIORITY         2
+#define STM32_GPT_TIM3_IRQ_PRIORITY         2
+#define STM32_GPT_TIM14_IRQ_PRIORITY        2
+
+/*
+ * I2C driver system settings.
+ */
+#define STM32_I2C_USE_I2C1                  TRUE
+#define STM32_I2C_USE_I2C2                  FALSE
+#define STM32_I2C_BUSY_TIMEOUT              50
+#define STM32_I2C_I2C1_IRQ_PRIORITY         3
+#define STM32_I2C_I2C2_IRQ_PRIORITY         3
+#define STM32_I2C_USE_DMA                   TRUE
+#define STM32_I2C_I2C1_DMA_PRIORITY         1
+#define STM32_I2C_I2C2_DMA_PRIORITY         1
+#define STM32_I2C_I2C1_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 7)
+#define STM32_I2C_I2C1_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 6)
+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")
+
+/*
+ * ICU driver system settings.
+ */
+#define STM32_ICU_USE_TIM1                  FALSE
+#define STM32_ICU_USE_TIM2                  FALSE
+#define STM32_ICU_USE_TIM3                  FALSE
+#define STM32_ICU_TIM1_IRQ_PRIORITY         3
+#define STM32_ICU_TIM2_IRQ_PRIORITY         3
+#define STM32_ICU_TIM3_IRQ_PRIORITY         3
+
+/*
+ * PWM driver system settings.
+ */
+#define STM32_PWM_USE_ADVANCED              FALSE
+#define STM32_PWM_USE_TIM1                  FALSE
+#define STM32_PWM_USE_TIM2                  FALSE
+#define STM32_PWM_USE_TIM3                  FALSE
+#define STM32_PWM_TIM1_IRQ_PRIORITY         3
+#define STM32_PWM_TIM2_IRQ_PRIORITY         3
+#define STM32_PWM_TIM3_IRQ_PRIORITY         3
+
+/*
+ * SERIAL driver system settings.
+ */
+#define STM32_SERIAL_USE_USART1             FALSE
+#define STM32_SERIAL_USE_USART2             FALSE
+#define STM32_SERIAL_USART1_PRIORITY        3
+#define STM32_SERIAL_USART2_PRIORITY        3
+
+/*
+ * SPI driver system settings.
+ */
+#define STM32_SPI_USE_SPI1                  FALSE
+#define STM32_SPI_USE_SPI2                  FALSE
+#define STM32_SPI_SPI1_DMA_PRIORITY         1
+#define STM32_SPI_SPI2_DMA_PRIORITY         1
+#define STM32_SPI_SPI1_IRQ_PRIORITY         2
+#define STM32_SPI_SPI2_IRQ_PRIORITY         2
+#define STM32_SPI_SPI2_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 4)
+#define STM32_SPI_SPI2_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 5)
+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")
+
+/*
+ * ST driver system settings.
+ */
+#define STM32_ST_IRQ_PRIORITY               2
+#define STM32_ST_USE_TIMER                  2
+
+/*
+ * UART driver system settings.
+ */
+#define STM32_UART_USE_USART1               FALSE
+#define STM32_UART_USE_USART2               FALSE
+#define STM32_UART_USART1_IRQ_PRIORITY      3
+#define STM32_UART_USART2_IRQ_PRIORITY      3
+#define STM32_UART_USART1_DMA_PRIORITY      0
+#define STM32_UART_USART2_DMA_PRIORITY      0
+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")
+
+/*
+ * USB driver system settings.
+ */
+#define STM32_USB_USE_USB1                  TRUE
+#define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE
+#define STM32_USB_USB1_LP_IRQ_PRIORITY      3
+
+#endif /* _MCUCONF_H_ */
diff --git a/qmk/keyboards/xelus/valor_frl_tkl/readme.md b/qmk/keyboards/xelus/valor_frl_tkl/readme.md
new file mode 100644
index 00000000..da85ebbd
--- /dev/null
+++ b/qmk/keyboards/xelus/valor_frl_tkl/readme.md
@@ -0,0 +1,13 @@
+# Valor FRL TKL
+
+An Alice-esque FRL TKL keyboard PCB.
+
+* Keyboard Maintainer: [Xelus22](https://github.com/Xelus22)
+* Hardware Supported: Valor FRL TKL
+* Hardware Availability: Custom keyboard group buys
+
+Make example for this keyboard (after setting up your build environment):
+
+    make xelus/valor_frl_tkl: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).
diff --git a/qmk/keyboards/xelus/valor_frl_tkl/rules.mk b/qmk/keyboards/xelus/valor_frl_tkl/rules.mk
new file mode 100644
index 00000000..7165dd54
--- /dev/null
+++ b/qmk/keyboards/xelus/valor_frl_tkl/rules.mk
@@ -0,0 +1,24 @@
+# MCU name
+MCU = STM32F072
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = yes       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = yes        # Console for debug
+COMMAND_ENABLE = yes        # Commands for debug and configuration
+# 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 = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+
+EEPROM_DRIVER = i2c
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
diff --git a/qmk/keyboards/xelus/valor_frl_tkl/valor_frl_tkl.c b/qmk/keyboards/xelus/valor_frl_tkl/valor_frl_tkl.c
new file mode 100644
index 00000000..08e08068
--- /dev/null
+++ b/qmk/keyboards/xelus/valor_frl_tkl/valor_frl_tkl.c
@@ -0,0 +1,24 @@
+/* Copyright 2020 Harrison Chan (Xelus)
+ *
+ * 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/>.
+ */
+
+// Nothing to see here, move along... ;-)
+
+#include "valor_frl_tkl.h"
+
+void board_init(void) {
+  SYSCFG->CFGR1 |= SYSCFG_CFGR1_I2C1_DMA_RMP;
+  SYSCFG->CFGR1 &= ~(SYSCFG_CFGR1_SPI2_DMA_RMP);
+}
diff --git a/qmk/keyboards/xelus/valor_frl_tkl/valor_frl_tkl.h b/qmk/keyboards/xelus/valor_frl_tkl/valor_frl_tkl.h
new file mode 100644
index 00000000..757f64ad
--- /dev/null
+++ b/qmk/keyboards/xelus/valor_frl_tkl/valor_frl_tkl.h
@@ -0,0 +1,35 @@
+/* Copyright 2020 Harrison Chan (Xelus)
+ *
+ * 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 ____ KC_NO
+
+#define LAYOUT_all( \
+  K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K213,   K014, K015, K016, \
+  K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113,         K114, K115, K116, \
+  K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,                                 \
+  K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313,               K315,       \
+  K400,       K402,       K404, K405,       K407,       K409,             K412,               K414, K415, K416  \
+) { \
+  { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, K015, K016 }, \
+  { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, K115, K116 }, \
+  { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, ____, ____, ____ }, \
+  { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, ____, K315, ____ }, \
+  { K400, ____, K402, ____, K404, K405, ____, K407, ____, K409, ____, ____, K412, ____, K414, K415, K416 }  \
+}
diff --git a/qmk/keyboards/xmmx/config.h b/qmk/keyboards/xmmx/config.h
index bee047bf..5f9c305d 100644
--- a/qmk/keyboards/xmmx/config.h
+++ b/qmk/keyboards/xmmx/config.h
@@ -23,6 +23,10 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
+#define LED_CAPS_LOCK_PIN B6
+#define LED_SCROLL_LOCK_PIN B5
+#define LED_PIN_ON_STATE 0
+
 /* number of backlight levels */
 
 #ifdef BACKLIGHT_PIN
diff --git a/qmk/keyboards/xmmx/xmmx.c b/qmk/keyboards/xmmx/xmmx.c
index 4d410e90..399ae4eb 100644
--- a/qmk/keyboards/xmmx/xmmx.c
+++ b/qmk/keyboards/xmmx/xmmx.c
@@ -1,18 +1 @@
 #include "xmmx.h"
-
-void led_set_user(uint8_t usb_led) {
-
-	//LED1
-	if (usb_led & (1 << USB_LED_CAPS_LOCK)) {
-		DDRB |= (1 << 6); PORTB &= ~(1 << 6);
-	} else {
-		DDRB &= ~(1 << 6); PORTB &= ~(1 << 6);
-	}
-
-	//LED2
-	if (usb_led & (1 << USB_LED_SCROLL_LOCK)) {
-		DDRB |= (1 << 5); PORTB &= ~(1 << 5);
-	} else {
-		DDRB &= ~(1 << 5); PORTB &= ~(1 << 5);
-	}
-}
diff --git a/qmk/keyboards/yatara/drink_me/rules.mk b/qmk/keyboards/yatara/drink_me/rules.mk
index f0edf97b..990a9079 100644
--- a/qmk/keyboards/yatara/drink_me/rules.mk
+++ b/qmk/keyboards/yatara/drink_me/rules.mk
@@ -29,4 +29,3 @@ MIDI_ENABLE = no            # MIDI support
 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
diff --git a/qmk/keyboards/yd60mq/rules.mk b/qmk/keyboards/yd60mq/rules.mk
index 615e4865..7a5062a7 100644
--- a/qmk/keyboards/yd60mq/rules.mk
+++ b/qmk/keyboards/yd60mq/rules.mk
@@ -29,7 +29,6 @@ MIDI_ENABLE = no            # MIDI support
 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
 
 LAYOUTS = 60_ansi 60_ansi_split_bs_rshift 60_ansi_tsangan 60_hhkb 60_iso 60_iso_split_bs_rshift 60_iso_tsangan
 
diff --git a/qmk/keyboards/yd68/config.h b/qmk/keyboards/yd68/config.h
index 17461c5d..5bd1ba5b 100644
--- a/qmk/keyboards/yd68/config.h
+++ b/qmk/keyboards/yd68/config.h
@@ -48,6 +48,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL*/
 #define DIODE_DIRECTION COL2ROW
 
+#define LED_CAPS_LOCK_PIN D4
+#define LED_PIN_ON_STATE 0
+
 // #define BACKLIGHT_PIN B7
 // #define BACKLIGHT_BREATHING
 // #define BACKLIGHT_LEVELS 3
@@ -189,30 +192,3 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
diff --git a/qmk/keyboards/yd68/rules.mk b/qmk/keyboards/yd68/rules.mk
index 48283f11..e6f094ed 100644
--- a/qmk/keyboards/yd68/rules.mk
+++ b/qmk/keyboards/yd68/rules.mk
@@ -30,4 +30,3 @@ 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
diff --git a/qmk/keyboards/yd68/yd68.c b/qmk/keyboards/yd68/yd68.c
index f34661dd..22f75f7f 100644
--- a/qmk/keyboards/yd68/yd68.c
+++ b/qmk/keyboards/yd68/yd68.c
@@ -15,59 +15,22 @@
  */
 #include "yd68.h"
 
-void matrix_init_kb(void) {
-	// put your keyboard start-up code here
-	// runs once when the firmware starts up
-	
-	//Capslock LED Output Low
-	DDRD |= (1<<4);
-    PORTD &= ~(1<<4);
-	
+void keyboard_pre_init_kb(void) {
 	//Backlight LEDs Output Low
-	DDRD |= (1<<6);
-    PORTD &= ~(1<<6);
+	setPinOutput(D6);
+	writePinLow(D6);
 	
 	//RGB power output low
-	DDRE |= (1<<2);
-    PORTE &= ~(1<<2);
+	setPinOutput(E2);
+	writePinLow(E2);
 	
 	//Bluetooth power output high
-	DDRB |= (1<<2);
-    PORTB |= (1<<2);
+	setPinOutput(B2);
+	writePinLow(B2);
 	
 	//RGB data output low
-	DDRB |= (1<<3);
-	PORTB &= ~(1<<3);
+	setPinOutput(B3);
+	writePinLow(B3);
 	
-	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 (usb_led & (1<<USB_LED_CAPS_LOCK)) {
-        // output low
-        DDRD |= (1<<4);
-        PORTD &= ~(1<<4);
-    } else {
-        // output high
-        DDRD |= (1<<4);
-        PORTD |= (1<<4);
-    }
-
-	led_set_user(usb_led);
+	keyboard_pre_init_user();
 }
diff --git a/qmk/keyboards/ymd75/rev3/rev3.h b/qmk/keyboards/ymd75/rev3/rev3.h
index d25579ea..d2477977 100644
--- a/qmk/keyboards/ymd75/rev3/rev3.h
+++ b/qmk/keyboards/ymd75/rev3/rev3.h
@@ -21,8 +21,8 @@
 #define LAYOUT( \
     K50, K51, K52, K53, K54, K55, K56, K57, K58, KB8, KB7, KB5, KB4, KB3, KB6, KB2,   \
     K40, K41, K42, K43, K44, K45, K46, K47, K48, KA8, KA7, KA5, KA4, KA6,      KA2,   \
-    K30,   K31, K32, K33, K34, K35, K36, K37, K38, K98, K97, K95, K94,  K84,   K96,   \
-    K20,    K21, K22, K23, K24, K25, K26, K27, K28, K88, K87, K85, K93,        K86,   \
+    K30,   K31, K32, K33, K34, K35, K36, K37, K38, K98, K97, K95, K94,  K93,   K96,   \
+    K20,    K21, K22, K23, K24, K25, K26, K27, K28, K88, K87, K85, K84,        K86,   \
     K10,       K12, K13, K14, K15, K16, K17, K18, K78, K77, K75, K74,     K73, K76,   \
     K00,  K01,  K02,              K06,                K08, K07, K05, K04, K03, K66    \
 ) { \
diff --git a/qmk/keyboards/ymdk/bface/config.h b/qmk/keyboards/ymdk/bface/config.h
index e6006aeb..3d9605b7 100644
--- a/qmk/keyboards/ymdk/bface/config.h
+++ b/qmk/keyboards/ymdk/bface/config.h
@@ -17,8 +17,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-#define VENDOR_ID       0x20A0
-#define PRODUCT_ID      0x422D
+#define VENDOR_ID       0x594D // "YM"
+#define PRODUCT_ID      0x4266 // "Bf"
 #define DEVICE_VER      0x0200
 #define MANUFACTURER    YMDK
 #define PRODUCT         B.face
diff --git a/qmk/keyboards/ymdk/bface/keymaps/via/keymap.c b/qmk/keyboards/ymdk/bface/keymaps/via/keymap.c
new file mode 100644
index 00000000..27280b7d
--- /dev/null
+++ b/qmk/keyboards/ymdk/bface/keymaps/via/keymap.c
@@ -0,0 +1,53 @@
+/*
+Copyright 2019 Ethan Durrant (emdarcher)
+
+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] = {
+    //Base Layer
+    [0] = LAYOUT_all(
+        KC_GESC,   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_NO, KC_BSPC,
+        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_CAPS,     KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,KC_SCLN,KC_QUOT, KC_NO, KC_ENT,
+        KC_LSFT, KC_NO,   KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,KC_COMM, KC_DOT,KC_SLSH, KC_NO,        KC_RSFT, KC_NO,
+        KC_LCTL,   KC_LGUI,KC_LALT, KC_NO,                KC_SPC,                  KC_NO,    KC_RALT,MO(1),KC_NO,KC_MENU,KC_RCTL
+    ),
+    //Layer 1
+    [1] = LAYOUT_all(
+        KC_GRV,   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_NO,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_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_NO,KC_TRNS,
+        KC_TRNS,KC_NO,KC_TRNS,KC_TRNS, KC_TRNS,KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_NO,        KC_TRNS, KC_NO,
+        KC_TRNS,KC_TRNS,KC_TRNS, KC_NO,               KC_TRNS,               KC_NO,         KC_TRNS,KC_TRNS,KC_NO,KC_TRNS,KC_TRNS
+    ),
+    //Layer 2
+    [2] = LAYOUT_all(
+        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_NO,KC_TRNS,
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_NO,KC_TRNS,
+        KC_TRNS,KC_NO,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_NO,       KC_TRNS, KC_NO,
+        KC_TRNS,KC_TRNS,KC_TRNS, KC_NO,               KC_TRNS,                 KC_NO,       KC_TRNS,KC_TRNS,KC_NO,KC_TRNS,KC_TRNS
+    ), 
+    //Layer 3
+    [3] = LAYOUT_all(
+        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_NO,KC_TRNS,
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,
+        KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_NO,KC_TRNS,
+        KC_TRNS,KC_NO,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_NO,       KC_TRNS, KC_NO,
+        KC_TRNS,KC_TRNS,KC_TRNS, KC_NO,               KC_TRNS,                 KC_NO,       KC_TRNS,KC_TRNS,KC_NO,KC_TRNS,KC_TRNS
+    ), 
+};
diff --git a/qmk/keyboards/ymdk/bface/keymaps/via/rules.mk b/qmk/keyboards/ymdk/bface/keymaps/via/rules.mk
new file mode 100644
index 00000000..36b7ba9c
--- /dev/null
+++ b/qmk/keyboards/ymdk/bface/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
+VIA_ENABLE = yes
+LTO_ENABLE = yes
diff --git a/qmk/keyboards/ymdk/ymd09/rules.mk b/qmk/keyboards/ymdk/ymd09/rules.mk
index be181136..519c2309 100644
--- a/qmk/keyboards/ymdk/ymd09/rules.mk
+++ b/qmk/keyboards/ymdk/ymd09/rules.mk
@@ -29,5 +29,4 @@ MIDI_ENABLE = no            # MIDI support
 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
 LTO_ENABLE = yes            # reduce firmware size
diff --git a/qmk/keyboards/ymdk_np21/ymdk_np21.h b/qmk/keyboards/ymdk_np21/ymdk_np21.h
index bdc37231..7434cf01 100644
--- a/qmk/keyboards/ymdk_np21/ymdk_np21.h
+++ b/qmk/keyboards/ymdk_np21/ymdk_np21.h
@@ -50,15 +50,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LAYOUT_numpad_6x4( \
     k00,  k10,  k20,  k30, \
     k01,  k11,  k21,  k31, \
-    k02,  k12,  k22,\
-    k03,  k13,  k23,  k33, \
+    k02,  k12,  k22, \
+    k03,  k13,  k23,  k32, \
     k04,  k14,  k24, \
-    k05,        k25,  k35 \
+    k05,        k25,  k34 \
 ) { \
     { k00, k01, k02, k03, k04, k05 }, \
     { k10, k11, k12, k13, k14, XXX }, \
     { k20, k21, k22, k23, k24, k25 }, \
-    { k30, k31, XXX, k33, XXX, k35 } \
+    { k30, k31, k32, XXX, k34, XXX } \
 }
 
 #define LAYOUT LAYOUT_ortho_4x6
diff --git a/qmk/keyboards/yncognito/batpad/rules.mk b/qmk/keyboards/yncognito/batpad/rules.mk
index 71cf8ef3..7f5fd080 100644
--- a/qmk/keyboards/yncognito/batpad/rules.mk
+++ b/qmk/keyboards/yncognito/batpad/rules.mk
@@ -24,7 +24,8 @@ 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 = yes             # USB Nkey Rollover
 BACKLIGHT_ENABLE = no        # Enable keyboard backlight functionality
-RGB_MATRIX_ENABLE = WS2812       
+RGB_MATRIX_ENABLE = yes
+RGB_MATRIX_DRIVER = WS2812
 MIDI_ENABLE = no             # MIDI support
 UNICODE_ENABLE = no          # Unicode
 BLUETOOTH_ENABLE = no        # Enable Bluetooth with the Adafruit EZ-Key HID
diff --git a/qmk/keyboards/yoichiro/lunakey_mini/config.h b/qmk/keyboards/yoichiro/lunakey_mini/config.h
new file mode 100644
index 00000000..86290cd4
--- /dev/null
+++ b/qmk/keyboards/yoichiro/lunakey_mini/config.h
@@ -0,0 +1,153 @@
+/*
+Copyright 2020 Yoichiro Tanaka
+
+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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID    0x5954  // "YT" - Yoichiro Tanaka
+#define PRODUCT_ID   0x0001
+#define DEVICE_VER   0x0001
+#define MANUFACTURER yoichiro
+#define PRODUCT      Lunakey Mini
+
+/* key matrix size */
+#define MATRIX_ROWS 8
+#define MATRIX_COLS 6
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+ */
+#define MATRIX_ROW_PINS { D4, D7, E6, B4 }
+#define MATRIX_COL_PINS { F4, F5, F6, F7, B1, B3 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/*
+ * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
+ */
+#define SOFT_SERIAL_PIN D2  // or D1, D2, D3, E6
+
+//#define BACKLIGHT_PIN B7
+//#define BACKLIGHT_LEVELS 3
+//#define BACKLIGHT_BREATHING
+
+#define RGB_DI_PIN D3
+#ifdef RGB_DI_PIN
+  #define RGBLED_NUM 12
+  #define RGBLIGHT_SPLIT
+  #define RGBLED_SPLIT { 6, 6 }
+  #define RGBLIGHT_LED_MAP { 0, 1, 2, 3, 4, 5, \
+                             11, 10, 9, 8, 7, 6 }
+  #define RGBLIGHT_HUE_STEP 8
+  #define RGBLIGHT_SAT_STEP 8
+  #define RGBLIGHT_VAL_STEP 8
+  #define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
+  #define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
+/*== all animations enable ==*/
+  #define RGBLIGHT_ANIMATIONS
+/*== or choose animations ==*/
+//#    define RGBLIGHT_EFFECT_BREATHING
+//#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+//#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+//#    define RGBLIGHT_EFFECT_SNAKE
+//#    define RGBLIGHT_EFFECT_KNIGHT
+//#    define RGBLIGHT_EFFECT_CHRISTMAS
+//#    define RGBLIGHT_EFFECT_STATIC_GRADIENT
+//#    define RGBLIGHT_EFFECT_RGB_TEST
+//#    define RGBLIGHT_EFFECT_ALTERNATING
+/*== customize breathing effect ==*/
+/*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
+//#    define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
+/*==== use exp() and sin() ====*/
+//#    define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
+//#    define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
+#endif
+
+/* Audio Support */
+#define C6_AUDIO
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* define if matrix has ghost (lacks anti-ghosting diodes) */
+//#define MATRIX_HAS_GHOST
+
+/* 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
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+//#define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Force NKRO
+ *
+ * Force NKRO (nKey Rollover) to be enabled by default, regardless of the saved
+ * state in the bootmagic EEPROM settings. (Note that NKRO must be enabled in the
+ * makefile for this to work.)
+ *
+ * If forced on, NKRO can be disabled via magic key (default = LShift+RShift+N)
+ * until the next keyboard reset.
+ *
+ * NKRO may prevent your keystrokes from being detected in the BIOS, but it is
+ * fully operational during normal computer usage.
+ *
+ * For a less heavy-handed approach, enable NKRO via magic key (LShift+RShift+N)
+ * or via bootmagic (hold SPACE+N while plugging in the keyboard). Once set by
+ * bootmagic, NKRO mode will always be enabled until it is toggled again during a
+ * power-up.
+ *
+ */
+//#define FORCE_NKRO
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+/* Bootmagic Lite key configuration */
+//#define BOOTMAGIC_LITE_ROW 0
+//#define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/yoichiro/lunakey_mini/info.json b/qmk/keyboards/yoichiro/lunakey_mini/info.json
new file mode 100644
index 00000000..b31ada60
--- /dev/null
+++ b/qmk/keyboards/yoichiro/lunakey_mini/info.json
@@ -0,0 +1,56 @@
+{
+    "keyboard_name": "Lunakey Mini",
+    "url": "",
+    "maintainer": "qmk",
+    "width": 14.75,
+    "height": 5,
+    "layouts": {
+        "LAYOUT_split_3x6_4": {
+            "layout": [
+                {"label":"L00", "x":0, "y":1.5},
+                {"label":"L01", "x":1, "y":1.25},
+                {"label":"L02", "x":2, "y":0.5},
+                {"label":"L03", "x":3, "y":0},
+                {"label":"L04", "x":4, "y":0.25},
+                {"label":"L05", "x":5, "y":0.5},
+                {"label":"R00", "x":8.75, "y":0.5},
+                {"label":"R01", "x":9.75, "y":0.25},
+                {"label":"R02", "x":10.75, "y":0},
+                {"label":"R03", "x":11.75, "y":0.5},
+                {"label":"R04", "x":12.75, "y":1.25},
+                {"label":"R05", "x":13.75, "y":1.5},
+                {"label":"L10", "x":0, "y":2.5},
+                {"label":"L11", "x":1, "y":2.25},
+                {"label":"L12", "x":2, "y":1.5},
+                {"label":"L13", "x":3, "y":1},
+                {"label":"L14", "x":4, "y":1.25},
+                {"label":"L15", "x":5, "y":1.5},
+                {"label":"R10", "x":8.75, "y":1.5},
+                {"label":"R11", "x":9.75, "y":1.25},
+                {"label":"R12", "x":10.75, "y":1},
+                {"label":"R13", "x":11.75, "y":1.5},
+                {"label":"R14", "x":12.75, "y":2.25},
+                {"label":"R15", "x":13.75, "y":2.5},
+                {"label":"L20", "x":0, "y":3.5},
+                {"label":"L21", "x":1, "y":3.25},
+                {"label":"L22", "x":2, "y":2.5},
+                {"label":"L23", "x":3, "y":2},
+                {"label":"L24", "x":4, "y":2.25},
+                {"label":"L25", "x":5, "y":2.5},
+                {"label":"R20", "x":8.75, "y":2.5},
+                {"label":"R21", "x":9.75, "y":2.25},
+                {"label":"R22", "x":10.75, "y":2},
+                {"label":"R23", "x":11.75, "y":2.5},
+                {"label":"R24", "x":12.75, "y":3.25},
+                {"label":"R25", "x":13.75, "y":3.5},
+                {"label":"L30", "x":3, "y":4},
+                {"label":"L31", "x":4, "y":3.75},
+                {"label":"L32", "x":5, "y":3.75},
+                {"label":"L33", "x":6, "y":4},
+                {"label":"R30", "x":7.75, "y":4},
+                {"label":"R31", "x":8.75, "y":3.75},
+                {"label":"R32", "x":9.75, "y":3.75},
+                {"label":"R33", "x":10.75, "y":4}]
+        }
+    }
+}
diff --git a/qmk/keyboards/yoichiro/lunakey_mini/keymaps/default/keymap.c b/qmk/keyboards/yoichiro/lunakey_mini/keymaps/default/keymap.c
new file mode 100644
index 00000000..eeb59b4e
--- /dev/null
+++ b/qmk/keyboards/yoichiro/lunakey_mini/keymaps/default/keymap.c
@@ -0,0 +1,81 @@
+/* Copyright 2020 Yoichiro Tanaka
+ *
+ * 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
+
+enum layer_number {
+  _QWERTY = 0,
+  _LOWER,
+  _RAISE,
+  _ADJUST,
+};
+
+#define LOWER MO(_LOWER)
+#define RAISE MO(_RAISE)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [_QWERTY] = LAYOUT_split_3x6_4(
+//+--------+--------+--------+--------+--------+--------+                 +--------+--------+--------+--------+--------+--------+
+   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+//+--------+--------+--------+--------+--------+--------+                 +--------+--------+--------+--------+--------+--------+
+   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_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
+//+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
+                              KC_LGUI, KC_LALT, LOWER,   KC_SPC,  KC_ENT,  RAISE,   KC_RALT, KC_RGUI
+//+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
+  ),
+
+  [_LOWER] = LAYOUT_split_3x6_4(
+//+--------+--------+--------+--------+--------+--------+                 +--------+--------+--------+--------+--------+--------+
+   KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                      KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
+//+--------+--------+--------+--------+--------+--------+                 +--------+--------+--------+--------+--------+--------+
+   KC_LCTL, _______, _______, _______, _______, _______,                   KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT,_______, _______,
+//+--------+--------+--------+--------+--------+--------+                 +--------+--------+--------+--------+--------+--------+
+   KC_LSFT, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______,
+//+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
+                              KC_LGUI, KC_LALT, LOWER,   KC_SPC,  KC_ENT,  RAISE,   KC_RALT, KC_RGUI
+//+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
+  ),
+
+  [_RAISE] = LAYOUT_split_3x6_4(
+//+--------+--------+--------+--------+--------+--------+                 +--------+--------+--------+--------+--------+--------+
+   KC_ESC,  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                   KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
+//+--------+--------+--------+--------+--------+--------+                 +--------+--------+--------+--------+--------+--------+
+   KC_LCTL, _______, _______, _______, _______, _______,                   KC_MINS, KC_EQL,  KC_LCBR, KC_RCBR, KC_PIPE, KC_GRV,
+//+--------+--------+--------+--------+--------+--------+                 +--------+--------+--------+--------+--------+--------+
+   KC_LSFT, KC_TILD, _______, _______, _______, _______,                   KC_UNDS, KC_PLUS, KC_LBRC, KC_RBRC, KC_BSLS, KC_TILD,
+//+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
+                              KC_LGUI, KC_LALT, LOWER,   KC_SPC,  KC_ENT,  RAISE,   KC_RALT, KC_RGUI
+//+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
+  ),
+
+  [_ADJUST] = LAYOUT_split_3x6_4(
+//+--------+--------+--------+--------+--------+--------+                 +--------+--------+--------+--------+--------+--------+
+   RESET,   _______, _______, _______, _______, _______,                   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,
+//+--------+--------+--------+--------+--------+--------+                 +--------+--------+--------+--------+--------+--------+
+   RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______,                   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
+//+--------+--------+--------+--------+--------+--------+                 +--------+--------+--------+--------+--------+--------+
+   RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______,                   _______, _______, _______, _______, _______, _______,
+//+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
+                              KC_LGUI, KC_LALT, LOWER,   KC_SPC,  KC_ENT,  RAISE,   KC_RALT, KC_RGUI
+//+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
+  )
+};
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
+}
diff --git a/qmk/keyboards/yoichiro/lunakey_mini/keymaps/default/rules.mk b/qmk/keyboards/yoichiro/lunakey_mini/keymaps/default/rules.mk
new file mode 100644
index 00000000..b4edb3a2
--- /dev/null
+++ b/qmk/keyboards/yoichiro/lunakey_mini/keymaps/default/rules.mk
@@ -0,0 +1,3 @@
+RGBLIGHT_ENABLE = no         # Enable keyboard RGB Underglow
+AUDIO_ENABLE = no            # Enable Audio output
+OLED_DRIVER_ENABLE = no      # Enable OLED Display
diff --git a/qmk/keyboards/yoichiro/lunakey_mini/keymaps/via/keymap.c b/qmk/keyboards/yoichiro/lunakey_mini/keymaps/via/keymap.c
new file mode 100644
index 00000000..eeb59b4e
--- /dev/null
+++ b/qmk/keyboards/yoichiro/lunakey_mini/keymaps/via/keymap.c
@@ -0,0 +1,81 @@
+/* Copyright 2020 Yoichiro Tanaka
+ *
+ * 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
+
+enum layer_number {
+  _QWERTY = 0,
+  _LOWER,
+  _RAISE,
+  _ADJUST,
+};
+
+#define LOWER MO(_LOWER)
+#define RAISE MO(_RAISE)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [_QWERTY] = LAYOUT_split_3x6_4(
+//+--------+--------+--------+--------+--------+--------+                 +--------+--------+--------+--------+--------+--------+
+   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,                      KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC,
+//+--------+--------+--------+--------+--------+--------+                 +--------+--------+--------+--------+--------+--------+
+   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_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,                      KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT,
+//+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
+                              KC_LGUI, KC_LALT, LOWER,   KC_SPC,  KC_ENT,  RAISE,   KC_RALT, KC_RGUI
+//+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
+  ),
+
+  [_LOWER] = LAYOUT_split_3x6_4(
+//+--------+--------+--------+--------+--------+--------+                 +--------+--------+--------+--------+--------+--------+
+   KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,                      KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
+//+--------+--------+--------+--------+--------+--------+                 +--------+--------+--------+--------+--------+--------+
+   KC_LCTL, _______, _______, _______, _______, _______,                   KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT,_______, _______,
+//+--------+--------+--------+--------+--------+--------+                 +--------+--------+--------+--------+--------+--------+
+   KC_LSFT, _______, _______, _______, _______, _______,                   _______, _______, _______, _______, _______, _______,
+//+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
+                              KC_LGUI, KC_LALT, LOWER,   KC_SPC,  KC_ENT,  RAISE,   KC_RALT, KC_RGUI
+//+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
+  ),
+
+  [_RAISE] = LAYOUT_split_3x6_4(
+//+--------+--------+--------+--------+--------+--------+                 +--------+--------+--------+--------+--------+--------+
+   KC_ESC,  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,                   KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
+//+--------+--------+--------+--------+--------+--------+                 +--------+--------+--------+--------+--------+--------+
+   KC_LCTL, _______, _______, _______, _______, _______,                   KC_MINS, KC_EQL,  KC_LCBR, KC_RCBR, KC_PIPE, KC_GRV,
+//+--------+--------+--------+--------+--------+--------+                 +--------+--------+--------+--------+--------+--------+
+   KC_LSFT, KC_TILD, _______, _______, _______, _______,                   KC_UNDS, KC_PLUS, KC_LBRC, KC_RBRC, KC_BSLS, KC_TILD,
+//+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
+                              KC_LGUI, KC_LALT, LOWER,   KC_SPC,  KC_ENT,  RAISE,   KC_RALT, KC_RGUI
+//+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
+  ),
+
+  [_ADJUST] = LAYOUT_split_3x6_4(
+//+--------+--------+--------+--------+--------+--------+                 +--------+--------+--------+--------+--------+--------+
+   RESET,   _______, _______, _______, _______, _______,                   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,
+//+--------+--------+--------+--------+--------+--------+                 +--------+--------+--------+--------+--------+--------+
+   RGB_TOG, RGB_HUI, RGB_SAI, RGB_VAI, _______, _______,                   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,
+//+--------+--------+--------+--------+--------+--------+                 +--------+--------+--------+--------+--------+--------+
+   RGB_MOD, RGB_HUD, RGB_SAD, RGB_VAD, _______, _______,                   _______, _______, _______, _______, _______, _______,
+//+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
+                              KC_LGUI, KC_LALT, LOWER,   KC_SPC,  KC_ENT,  RAISE,   KC_RALT, KC_RGUI
+//+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+--------+
+  )
+};
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+  return update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
+}
diff --git a/qmk/keyboards/yoichiro/lunakey_mini/keymaps/via/rules.mk b/qmk/keyboards/yoichiro/lunakey_mini/keymaps/via/rules.mk
new file mode 100644
index 00000000..89b0f22d
--- /dev/null
+++ b/qmk/keyboards/yoichiro/lunakey_mini/keymaps/via/rules.mk
@@ -0,0 +1,5 @@
+RGBLIGHT_ENABLE = yes        # Enable keyboard RGB Underglow
+AUDIO_ENABLE = no            # Enable Audio output
+OLED_DRIVER_ENABLE = no      # Enable OLED Display
+VIA_ENABLE = yes             # Enable VIA support
+LTO_ENABLE = yes             # CFLAGS=flto
diff --git a/qmk/keyboards/yoichiro/lunakey_mini/lunakey_mini.c b/qmk/keyboards/yoichiro/lunakey_mini/lunakey_mini.c
new file mode 100644
index 00000000..41147063
--- /dev/null
+++ b/qmk/keyboards/yoichiro/lunakey_mini/lunakey_mini.c
@@ -0,0 +1,17 @@
+/* Copyright 2020 Yoichiro Tanaka
+ *
+ * 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 "lunakey_mini.h"
diff --git a/qmk/keyboards/yoichiro/lunakey_mini/lunakey_mini.h b/qmk/keyboards/yoichiro/lunakey_mini/lunakey_mini.h
new file mode 100644
index 00000000..bb649cc0
--- /dev/null
+++ b/qmk/keyboards/yoichiro/lunakey_mini/lunakey_mini.h
@@ -0,0 +1,44 @@
+/* Copyright 2020 Yoichiro Tanaka
+ *
+ * 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 is a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+#define LAYOUT_split_3x6_4( \
+  L00, L01, L02, L03, L04, L05,           R00, R01, R02, R03, R04, R05, \
+  L10, L11, L12, L13, L14, L15,           R10, R11, R12, R13, R14, R15, \
+  L20, L21, L22, L23, L24, L25,           R20, R21, R22, R23, R24, R25, \
+                 L30, L31, L32, L33, R30, R31, R32, R33 \
+  ) \
+  { \
+    { L00, L01, L02, L03, L04, L05 }, \
+    { L10, L11, L12, L13, L14, L15 }, \
+    { L20, L21, L22, L23, L24, L25 }, \
+    { KC_NO, KC_NO, L30, L31, L32, L33 }, \
+    { R05, R04, R03, R02, R01, R00 }, \
+    { R15, R14, R13, R12, R11, R10 }, \
+    { R25, R24, R23, R22, R21, R20 }, \
+    { KC_NO, KC_NO, R33, R32, R31, R30 } \
+  }
diff --git a/qmk/keyboards/yoichiro/lunakey_mini/readme.md b/qmk/keyboards/yoichiro/lunakey_mini/readme.md
new file mode 100644
index 00000000..d8579aea
--- /dev/null
+++ b/qmk/keyboards/yoichiro/lunakey_mini/readme.md
@@ -0,0 +1,19 @@
+# Lunakey Mini
+
+![lunakey_mini](https://i.imgur.com/b1oUINil.jpg)
+
+This is a 40% split keyboard which has 3x6 vertically staggered keys and 4 thumbnail keys.
+
+* Keyboard Maintainer: [Yoichiro Tanaka](https://github.com/yoichiro)
+* Hardware Supported: Lunakey Mini PCB, Pro Micro MCU.
+* Hardware Availability: https://yoichiro.booth.pm/
+
+Make example for this keyboard (after setting up your build environment):
+
+    make yoichiro/lunakey_mini:default
+
+Flashing example for this keyboard:
+
+    make yoichiro/lunakey_mini:default:flash
+
+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).
diff --git a/qmk/keyboards/yoichiro/lunakey_mini/rules.mk b/qmk/keyboards/yoichiro/lunakey_mini/rules.mk
new file mode 100644
index 00000000..8096b223
--- /dev/null
+++ b/qmk/keyboards/yoichiro/lunakey_mini/rules.mk
@@ -0,0 +1,23 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = atmel-dfu
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no        # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # 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
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+SPLIT_KEYBOARD = yes        # Enable Split keyboard
diff --git a/qmk/keyboards/yosino58/config.h b/qmk/keyboards/yosino58/config.h
index fb1cdf39..0c308480 100644
--- a/qmk/keyboards/yosino58/config.h
+++ b/qmk/keyboards/yosino58/config.h
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #pragma once
 
 #include "config_common.h"
-#include <serial_config.h>
+#include "serial_config.h"
 
 #define USE_I2C
 #define USE_SERIAL
diff --git a/qmk/keyboards/yosino58/rev1/split_scomm.c b/qmk/keyboards/yosino58/rev1/split_scomm.c
index a1fe6ba5..82b53d7e 100644
--- a/qmk/keyboards/yosino58/rev1/split_scomm.c
+++ b/qmk/keyboards/yosino58/rev1/split_scomm.c
@@ -5,10 +5,10 @@
 #include <stdbool.h>
 #include <stdint.h>
 #include <stddef.h>
-#include <split_scomm.h>
+#include "split_scomm.h"
 #include "serial.h"
 #ifdef CONSOLE_ENABLE
-  #include <print.h>
+  #include "print.h"
 #endif
 
 uint8_t volatile serial_slave_buffer[SERIAL_SLAVE_BUFFER_LENGTH] = {0};
diff --git a/qmk/keyboards/yurei/config.h b/qmk/keyboards/yurei/config.h
index 24d6229b..57dc608e 100644
--- a/qmk/keyboards/yurei/config.h
+++ b/qmk/keyboards/yurei/config.h
@@ -218,34 +218,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/yurei/rules.mk b/qmk/keyboards/yurei/rules.mk
index 37d7d6d4..1b81d052 100644
--- a/qmk/keyboards/yurei/rules.mk
+++ b/qmk/keyboards/yurei/rules.mk
@@ -29,6 +29,5 @@ MIDI_ENABLE = no            # MIDI support
 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
 
 LAYOUTS = tkl_ansi
diff --git a/qmk/keyboards/yushakobo/quick7/config.h b/qmk/keyboards/yushakobo/quick7/config.h
index b9abd137..316d7f51 100644
--- a/qmk/keyboards/yushakobo/quick7/config.h
+++ b/qmk/keyboards/yushakobo/quick7/config.h
@@ -219,34 +219,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
 //#define MIDI_TONE_KEYCODE_OCTAVES 1
 
-/*
- * HD44780 LCD Display Configuration
- */
-/*
-#define LCD_LINES           2     //< number of visible lines of the display
-#define LCD_DISP_LENGTH    16     //< visibles characters per line of the display
-
-#define LCD_IO_MODE      1            //< 0: memory mapped mode, 1: IO port mode
-
-#if LCD_IO_MODE
-#define LCD_PORT         PORTB        //< port for the LCD lines
-#define LCD_DATA0_PORT   LCD_PORT     //< port for 4bit data bit 0
-#define LCD_DATA1_PORT   LCD_PORT     //< port for 4bit data bit 1
-#define LCD_DATA2_PORT   LCD_PORT     //< port for 4bit data bit 2
-#define LCD_DATA3_PORT   LCD_PORT     //< port for 4bit data bit 3
-#define LCD_DATA0_PIN    4            //< pin for 4bit data bit 0
-#define LCD_DATA1_PIN    5            //< pin for 4bit data bit 1
-#define LCD_DATA2_PIN    6            //< pin for 4bit data bit 2
-#define LCD_DATA3_PIN    7            //< pin for 4bit data bit 3
-#define LCD_RS_PORT      LCD_PORT     //< port for RS line
-#define LCD_RS_PIN       3            //< pin  for RS line
-#define LCD_RW_PORT      LCD_PORT     //< port for RW line
-#define LCD_RW_PIN       2            //< pin  for RW line
-#define LCD_E_PORT       LCD_PORT     //< port for Enable line
-#define LCD_E_PIN        1            //< pin  for Enable line
-#endif
-*/
-
 /* Bootmagic Lite key configuration */
 // #define BOOTMAGIC_LITE_ROW 0
 // #define BOOTMAGIC_LITE_COLUMN 0
diff --git a/qmk/keyboards/yushakobo/quick7/rules.mk b/qmk/keyboards/yushakobo/quick7/rules.mk
index 3812422e..e0de6f28 100644
--- a/qmk/keyboards/yushakobo/quick7/rules.mk
+++ b/qmk/keyboards/yushakobo/quick7/rules.mk
@@ -29,6 +29,5 @@ MIDI_ENABLE = no            # MIDI support
 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
 
 ENCODER_ENABLE = yes        # Enable support for Rotary Encoder
diff --git a/qmk/keyboards/z150_bh/config.h b/qmk/keyboards/z150_bh/config.h
index fc33021f..9fa1f0c5 100644
--- a/qmk/keyboards/z150_bh/config.h
+++ b/qmk/keyboards/z150_bh/config.h
@@ -22,6 +22,10 @@
 /* COL2ROW or ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
+#define LED_NUM_LOCK_PIN E7
+#define LED_CAPS_LOCK_PIN B0
+#define LED_SCROLL_LOCK_PIN E6
+
 /* Set 0 if debouncing isn't needed */
 #define DEBOUNCE 5
 
diff --git a/qmk/keyboards/z150_bh/z150_bh.c b/qmk/keyboards/z150_bh/z150_bh.c
index 6db784b5..b75a1ff1 100644
--- a/qmk/keyboards/z150_bh/z150_bh.c
+++ b/qmk/keyboards/z150_bh/z150_bh.c
@@ -1,32 +1 @@
 #include "z150_bh.h"
-
-void matrix_init_kb(void) {
-    setPinOutput(B0);
-    setPinOutput(E6);
-    setPinOutput(E7);
-
-    matrix_init_user();
-};
-
-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)) {
-        writePinHigh(E7);
-    } else {
-        writePinLow(E7);
-    }
-
-    if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK)) {
-        writePinHigh(B0);
-    } else {
-        writePinLow(B0);
-    }
-
-    if (IS_LED_ON(usb_led, USB_LED_SCROLL_LOCK)) {
-        writePinHigh(E6);
-    } else {
-        writePinLow(E6);
-    }
-
-    led_set_user(usb_led);
-}
diff --git a/qmk/keyboards/zfrontier/big_switch/rules.mk b/qmk/keyboards/zfrontier/big_switch/rules.mk
index 17be8a47..abec407f 100644
--- a/qmk/keyboards/zfrontier/big_switch/rules.mk
+++ b/qmk/keyboards/zfrontier/big_switch/rules.mk
@@ -29,5 +29,4 @@ MIDI_ENABLE = no            # MIDI support
 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
 TAP_DANCE_ENABLE = no
diff --git a/qmk/keyboards/zinc/keymaps/default/readme_en.md b/qmk/keyboards/zinc/keymaps/default/readme_en.md
index 6447e96e..3be6b296 100644
--- a/qmk/keyboards/zinc/keymaps/default/readme_en.md
+++ b/qmk/keyboards/zinc/keymaps/default/readme_en.md
@@ -1,4 +1,4 @@
-# The Default Zinc Layout
+# The Default Zinc Layout
 ## layout
 
 ### Qwerty
diff --git a/qmk/keyboards/zinc/keymaps/default/rules.mk b/qmk/keyboards/zinc/keymaps/default/rules.mk
index 32e0f216..7e3286f0 100644
--- a/qmk/keyboards/zinc/keymaps/default/rules.mk
+++ b/qmk/keyboards/zinc/keymaps/default/rules.mk
@@ -105,7 +105,7 @@ endif
 
 ifeq ($(strip $(RGB_MATRIX)), yes)
   RGBLIGHT_ENABLE = no
-  RGB_MATRIX_ENABLE = WS2812
+  RGB_MATRIX_ENABLE = yes
 endif
 
 ifeq ($(strip $(IOS_DEVICE_ENABLE)), yes)
diff --git a/qmk/keyboards/zinc/keymaps/toshi0383/rules.mk b/qmk/keyboards/zinc/keymaps/toshi0383/rules.mk
index 26ac02f3..530271f4 100644
--- a/qmk/keyboards/zinc/keymaps/toshi0383/rules.mk
+++ b/qmk/keyboards/zinc/keymaps/toshi0383/rules.mk
@@ -105,7 +105,7 @@ endif
 
 ifeq ($(strip $(RGB_MATRIX)), yes)
   RGBLIGHT_ENABLE = no
-  RGB_MATRIX_ENABLE = WS2812
+  RGB_MATRIX_ENABLE = yes
 endif
 
 ifeq ($(strip $(IOS_DEVICE_ENABLE)), yes)
diff --git a/qmk/keyboards/zinc/rules.mk b/qmk/keyboards/zinc/rules.mk
index 36e717d6..45928af8 100644
--- a/qmk/keyboards/zinc/rules.mk
+++ b/qmk/keyboards/zinc/rules.mk
@@ -28,7 +28,8 @@ UNICODE_ENABLE = no         # Unicode
 BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
 RGBLIGHT_ENABLE = no       # Enable WS2812 RGB underlight.  Do not enable this with audio at the same time.
 SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
-
+RGB_MATRIX_ENABLE = no
+RGB_MATRIX_DRIVER = WS2812
 
 DEFAULT_FOLDER = zinc/rev1
 
diff --git a/qmk/keyboards/zoo/wampus/bootloader_defs.h b/qmk/keyboards/zoo/wampus/bootloader_defs.h
new file mode 100644
index 00000000..dccd0fa5
--- /dev/null
+++ b/qmk/keyboards/zoo/wampus/bootloader_defs.h
@@ -0,0 +1,5 @@
+/* Address for jumping to bootloader on STM32 chips. */
+/* It is chip dependent, the correct number can be looked up here (page 175):
+ * http://www.st.com/web/en/resource/technical/document/application_note/CD00167594.pdf
+ */
+#define STM32_BOOTLOADER_ADDRESS 0x1FFFC800
diff --git a/qmk/keyboards/zoo/wampus/chconf.h b/qmk/keyboards/zoo/wampus/chconf.h
new file mode 100644
index 00000000..4640ff53
--- /dev/null
+++ b/qmk/keyboards/zoo/wampus/chconf.h
@@ -0,0 +1,714 @@
+/*
+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+/**
+ * @file    rt/templates/chconf.h
+ * @brief   Configuration file template.
+ * @details A copy of this file must be placed in each project directory, it
+ *          contains the application specific kernel settings.
+ *
+ * @addtogroup config
+ * @details Kernel related settings and hooks.
+ * @{
+ */
+
+#ifndef CHCONF_H
+#define CHCONF_H
+
+#define _CHIBIOS_RT_CONF_
+#define _CHIBIOS_RT_CONF_VER_6_0_
+
+/*===========================================================================*/
+/**
+ * @name System timers settings
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   System time counter resolution.
+ * @note    Allowed values are 16 or 32 bits.
+ */
+#if !defined(CH_CFG_ST_RESOLUTION)
+#define CH_CFG_ST_RESOLUTION                32
+#endif
+
+/**
+ * @brief   System tick frequency.
+ * @details Frequency of the system timer that drives the system ticks. This
+ *          setting also defines the system tick time unit.
+ */
+#if !defined(CH_CFG_ST_FREQUENCY)
+#define CH_CFG_ST_FREQUENCY                 10000
+#endif
+
+/**
+ * @brief   Time intervals data size.
+ * @note    Allowed values are 16, 32 or 64 bits.
+ */
+#if !defined(CH_CFG_INTERVALS_SIZE)
+#define CH_CFG_INTERVALS_SIZE               32
+#endif
+
+/**
+ * @brief   Time types data size.
+ * @note    Allowed values are 16 or 32 bits.
+ */
+#if !defined(CH_CFG_TIME_TYPES_SIZE)
+#define CH_CFG_TIME_TYPES_SIZE              32
+#endif
+
+/**
+ * @brief   Time delta constant for the tick-less mode.
+ * @note    If this value is zero then the system uses the classic
+ *          periodic tick. This value represents the minimum number
+ *          of ticks that is safe to specify in a timeout directive.
+ *          The value one is not valid, timeouts are rounded up to
+ *          this value.
+ */
+#if !defined(CH_CFG_ST_TIMEDELTA)
+#define CH_CFG_ST_TIMEDELTA                 2
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Kernel parameters and options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   Round robin interval.
+ * @details This constant is the number of system ticks allowed for the
+ *          threads before preemption occurs. Setting this value to zero
+ *          disables the preemption for threads with equal priority and the
+ *          round robin becomes cooperative. Note that higher priority
+ *          threads can still preempt, the kernel is always preemptive.
+ * @note    Disabling the round robin preemption makes the kernel more compact
+ *          and generally faster.
+ * @note    The round robin preemption is not supported in tickless mode and
+ *          must be set to zero in that case.
+ */
+#if !defined(CH_CFG_TIME_QUANTUM)
+#define CH_CFG_TIME_QUANTUM                 0
+#endif
+
+/**
+ * @brief   Managed RAM size.
+ * @details Size of the RAM area to be managed by the OS. If set to zero
+ *          then the whole available RAM is used. The core memory is made
+ *          available to the heap allocator and/or can be used directly through
+ *          the simplified core memory allocator.
+ *
+ * @note    In order to let the OS manage the whole RAM the linker script must
+ *          provide the @p __heap_base__ and @p __heap_end__ symbols.
+ * @note    Requires @p CH_CFG_USE_MEMCORE.
+ */
+#if !defined(CH_CFG_MEMCORE_SIZE)
+#define CH_CFG_MEMCORE_SIZE                 0
+#endif
+
+/**
+ * @brief   Idle thread automatic spawn suppression.
+ * @details When this option is activated the function @p chSysInit()
+ *          does not spawn the idle thread. The application @p main()
+ *          function becomes the idle thread and must implement an
+ *          infinite loop.
+ */
+#if !defined(CH_CFG_NO_IDLE_THREAD)
+#define CH_CFG_NO_IDLE_THREAD               FALSE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Performance options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   OS optimization.
+ * @details If enabled then time efficient rather than space efficient code
+ *          is used when two possible implementations exist.
+ *
+ * @note    This is not related to the compiler optimization options.
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_OPTIMIZE_SPEED)
+#define CH_CFG_OPTIMIZE_SPEED               FALSE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Subsystem options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   Time Measurement APIs.
+ * @details If enabled then the time measurement APIs are included in
+ *          the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_TM)
+#define CH_CFG_USE_TM                       FALSE
+#endif
+
+/**
+ * @brief   Threads registry APIs.
+ * @details If enabled then the registry APIs are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_REGISTRY)
+#define CH_CFG_USE_REGISTRY                 TRUE
+#endif
+
+/**
+ * @brief   Threads synchronization APIs.
+ * @details If enabled then the @p chThdWait() function is included in
+ *          the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_WAITEXIT)
+#define CH_CFG_USE_WAITEXIT                 TRUE
+#endif
+
+/**
+ * @brief   Semaphores APIs.
+ * @details If enabled then the Semaphores APIs are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_SEMAPHORES)
+#define CH_CFG_USE_SEMAPHORES               TRUE
+#endif
+
+/**
+ * @brief   Semaphores queuing mode.
+ * @details If enabled then the threads are enqueued on semaphores by
+ *          priority rather than in FIFO order.
+ *
+ * @note    The default is @p FALSE. Enable this if you have special
+ *          requirements.
+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.
+ */
+#if !defined(CH_CFG_USE_SEMAPHORES_PRIORITY)
+#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE
+#endif
+
+/**
+ * @brief   Mutexes APIs.
+ * @details If enabled then the mutexes APIs are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_MUTEXES)
+#define CH_CFG_USE_MUTEXES                  TRUE
+#endif
+
+/**
+ * @brief   Enables recursive behavior on mutexes.
+ * @note    Recursive mutexes are heavier and have an increased
+ *          memory footprint.
+ *
+ * @note    The default is @p FALSE.
+ * @note    Requires @p CH_CFG_USE_MUTEXES.
+ */
+#if !defined(CH_CFG_USE_MUTEXES_RECURSIVE)
+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE
+#endif
+
+/**
+ * @brief   Conditional Variables APIs.
+ * @details If enabled then the conditional variables APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_MUTEXES.
+ */
+#if !defined(CH_CFG_USE_CONDVARS)
+#define CH_CFG_USE_CONDVARS                 TRUE
+#endif
+
+/**
+ * @brief   Conditional Variables APIs with timeout.
+ * @details If enabled then the conditional variables APIs with timeout
+ *          specification are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_CONDVARS.
+ */
+#if !defined(CH_CFG_USE_CONDVARS_TIMEOUT)
+#define CH_CFG_USE_CONDVARS_TIMEOUT         FALSE
+#endif
+
+/**
+ * @brief   Events Flags APIs.
+ * @details If enabled then the event flags APIs are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_EVENTS)
+#define CH_CFG_USE_EVENTS                   TRUE
+#endif
+
+/**
+ * @brief   Events Flags APIs with timeout.
+ * @details If enabled then the events APIs with timeout specification
+ *          are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_EVENTS.
+ */
+#if !defined(CH_CFG_USE_EVENTS_TIMEOUT)
+#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE
+#endif
+
+/**
+ * @brief   Synchronous Messages APIs.
+ * @details If enabled then the synchronous messages APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_MESSAGES)
+#define CH_CFG_USE_MESSAGES                 TRUE
+#endif
+
+/**
+ * @brief   Synchronous Messages queuing mode.
+ * @details If enabled then messages are served by priority rather than in
+ *          FIFO order.
+ *
+ * @note    The default is @p FALSE. Enable this if you have special
+ *          requirements.
+ * @note    Requires @p CH_CFG_USE_MESSAGES.
+ */
+#if !defined(CH_CFG_USE_MESSAGES_PRIORITY)
+#define CH_CFG_USE_MESSAGES_PRIORITY        FALSE
+#endif
+
+/**
+ * @brief   Mailboxes APIs.
+ * @details If enabled then the asynchronous messages (mailboxes) APIs are
+ *          included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.
+ */
+#if !defined(CH_CFG_USE_MAILBOXES)
+#define CH_CFG_USE_MAILBOXES                TRUE
+#endif
+
+/**
+ * @brief   Core Memory Manager APIs.
+ * @details If enabled then the core memory manager APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_MEMCORE)
+#define CH_CFG_USE_MEMCORE                  FALSE
+#endif
+
+/**
+ * @brief   Heap Allocator APIs.
+ * @details If enabled then the memory heap allocator APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_MEMCORE and either @p CH_CFG_USE_MUTEXES or
+ *          @p CH_CFG_USE_SEMAPHORES.
+ * @note    Mutexes are recommended.
+ */
+#if !defined(CH_CFG_USE_HEAP)
+#define CH_CFG_USE_HEAP                     FALSE
+#endif
+
+/**
+ * @brief   Memory Pools Allocator APIs.
+ * @details If enabled then the memory pools allocator APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_MEMPOOLS)
+#define CH_CFG_USE_MEMPOOLS                 FALSE
+#endif
+
+/**
+ * @brief   Objects FIFOs APIs.
+ * @details If enabled then the objects FIFOs APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_OBJ_FIFOS)
+#define CH_CFG_USE_OBJ_FIFOS                FALSE
+#endif
+
+/**
+ * @brief   Pipes APIs.
+ * @details If enabled then the pipes APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_PIPES)
+#define CH_CFG_USE_PIPES                    FALSE
+#endif
+
+/**
+ * @brief   Dynamic Threads APIs.
+ * @details If enabled then the dynamic threads creation APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_WAITEXIT.
+ * @note    Requires @p CH_CFG_USE_HEAP and/or @p CH_CFG_USE_MEMPOOLS.
+ */
+#if !defined(CH_CFG_USE_DYNAMIC)
+#define CH_CFG_USE_DYNAMIC                  FALSE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Objects factory options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   Objects Factory APIs.
+ * @details If enabled then the objects factory APIs are included in the
+ *          kernel.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_CFG_USE_FACTORY)
+#define CH_CFG_USE_FACTORY                  FALSE
+#endif
+
+/**
+ * @brief   Maximum length for object names.
+ * @details If the specified length is zero then the name is stored by
+ *          pointer but this could have unintended side effects.
+ */
+#if !defined(CH_CFG_FACTORY_MAX_NAMES_LENGTH)
+#define CH_CFG_FACTORY_MAX_NAMES_LENGTH     8
+#endif
+
+/**
+ * @brief   Enables the registry of generic objects.
+ */
+#if !defined(CH_CFG_FACTORY_OBJECTS_REGISTRY)
+#define CH_CFG_FACTORY_OBJECTS_REGISTRY     FALSE
+#endif
+
+/**
+ * @brief   Enables factory for generic buffers.
+ */
+#if !defined(CH_CFG_FACTORY_GENERIC_BUFFERS)
+#define CH_CFG_FACTORY_GENERIC_BUFFERS      FALSE
+#endif
+
+/**
+ * @brief   Enables factory for semaphores.
+ */
+#if !defined(CH_CFG_FACTORY_SEMAPHORES)
+#define CH_CFG_FACTORY_SEMAPHORES           FALSE
+#endif
+
+/**
+ * @brief   Enables factory for mailboxes.
+ */
+#if !defined(CH_CFG_FACTORY_MAILBOXES)
+#define CH_CFG_FACTORY_MAILBOXES            FALSE
+#endif
+
+/**
+ * @brief   Enables factory for objects FIFOs.
+ */
+#if !defined(CH_CFG_FACTORY_OBJ_FIFOS)
+#define CH_CFG_FACTORY_OBJ_FIFOS            FALSE
+#endif
+
+/**
+ * @brief   Enables factory for Pipes.
+ */
+#if !defined(CH_CFG_FACTORY_PIPES) || defined(__DOXYGEN__)
+#define CH_CFG_FACTORY_PIPES                FALSE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Debug options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   Debug option, kernel statistics.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_STATISTICS)
+#define CH_DBG_STATISTICS                   FALSE
+#endif
+
+/**
+ * @brief   Debug option, system state check.
+ * @details If enabled the correct call protocol for system APIs is checked
+ *          at runtime.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_SYSTEM_STATE_CHECK)
+#define CH_DBG_SYSTEM_STATE_CHECK           FALSE
+#endif
+
+/**
+ * @brief   Debug option, parameters checks.
+ * @details If enabled then the checks on the API functions input
+ *          parameters are activated.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_ENABLE_CHECKS)
+#define CH_DBG_ENABLE_CHECKS                FALSE
+#endif
+
+/**
+ * @brief   Debug option, consistency checks.
+ * @details If enabled then all the assertions in the kernel code are
+ *          activated. This includes consistency checks inside the kernel,
+ *          runtime anomalies and port-defined checks.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_ENABLE_ASSERTS)
+#define CH_DBG_ENABLE_ASSERTS               FALSE
+#endif
+
+/**
+ * @brief   Debug option, trace buffer.
+ * @details If enabled then the trace buffer is activated.
+ *
+ * @note    The default is @p CH_DBG_TRACE_MASK_DISABLED.
+ */
+#if !defined(CH_DBG_TRACE_MASK)
+#define CH_DBG_TRACE_MASK                   CH_DBG_TRACE_MASK_DISABLED
+#endif
+
+/**
+ * @brief   Trace buffer entries.
+ * @note    The trace buffer is only allocated if @p CH_DBG_TRACE_MASK is
+ *          different from @p CH_DBG_TRACE_MASK_DISABLED.
+ */
+#if !defined(CH_DBG_TRACE_BUFFER_SIZE)
+#define CH_DBG_TRACE_BUFFER_SIZE            128
+#endif
+
+/**
+ * @brief   Debug option, stack checks.
+ * @details If enabled then a runtime stack check is performed.
+ *
+ * @note    The default is @p FALSE.
+ * @note    The stack check is performed in a architecture/port dependent way.
+ *          It may not be implemented or some ports.
+ * @note    The default failure mode is to halt the system with the global
+ *          @p panic_msg variable set to @p NULL.
+ */
+#if !defined(CH_DBG_ENABLE_STACK_CHECK)
+#define CH_DBG_ENABLE_STACK_CHECK           FALSE
+#endif
+
+/**
+ * @brief   Debug option, stacks initialization.
+ * @details If enabled then the threads working area is filled with a byte
+ *          value when a thread is created. This can be useful for the
+ *          runtime measurement of the used stack.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_FILL_THREADS)
+#define CH_DBG_FILL_THREADS                 FALSE
+#endif
+
+/**
+ * @brief   Debug option, threads profiling.
+ * @details If enabled then a field is added to the @p thread_t structure that
+ *          counts the system ticks occurred while executing the thread.
+ *
+ * @note    The default is @p FALSE.
+ * @note    This debug option is not currently compatible with the
+ *          tickless mode.
+ */
+#if !defined(CH_DBG_THREADS_PROFILING)
+#define CH_DBG_THREADS_PROFILING            FALSE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Kernel hooks
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   System structure extension.
+ * @details User fields added to the end of the @p ch_system_t structure.
+ */
+#define CH_CFG_SYSTEM_EXTRA_FIELDS                                          \
+  /* Add threads custom fields here.*/
+
+/**
+ * @brief   System initialization hook.
+ * @details User initialization code added to the @p chSysInit() function
+ *          just before interrupts are enabled globally.
+ */
+#define CH_CFG_SYSTEM_INIT_HOOK() {                                         \
+  /* Add threads initialization code here.*/                                \
+}
+
+/**
+ * @brief   Threads descriptor structure extension.
+ * @details User fields added to the end of the @p thread_t structure.
+ */
+#define CH_CFG_THREAD_EXTRA_FIELDS                                          \
+  /* Add threads custom fields here.*/
+
+/**
+ * @brief   Threads initialization hook.
+ * @details User initialization code added to the @p _thread_init() function.
+ *
+ * @note    It is invoked from within @p _thread_init() and implicitly from all
+ *          the threads creation APIs.
+ */
+#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \
+  /* Add threads initialization code here.*/                                \
+}
+
+/**
+ * @brief   Threads finalization hook.
+ * @details User finalization code added to the @p chThdExit() API.
+ */
+#define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \
+  /* Add threads finalization code here.*/                                  \
+}
+
+/**
+ * @brief   Context switch hook.
+ * @details This hook is invoked just before switching between threads.
+ */
+#define CH_CFG_CONTEXT_SWITCH_HOOK(ntp, otp) {                              \
+  /* Context switch code here.*/                                            \
+}
+
+/**
+ * @brief   ISR enter hook.
+ */
+#define CH_CFG_IRQ_PROLOGUE_HOOK() {                                        \
+  /* IRQ prologue code here.*/                                              \
+}
+
+/**
+ * @brief   ISR exit hook.
+ */
+#define CH_CFG_IRQ_EPILOGUE_HOOK() {                                        \
+  /* IRQ epilogue code here.*/                                              \
+}
+
+/**
+ * @brief   Idle thread enter hook.
+ * @note    This hook is invoked within a critical zone, no OS functions
+ *          should be invoked from here.
+ * @note    This macro can be used to activate a power saving mode.
+ */
+#define CH_CFG_IDLE_ENTER_HOOK() {                                          \
+  /* Idle-enter code here.*/                                                \
+}
+
+/**
+ * @brief   Idle thread leave hook.
+ * @note    This hook is invoked within a critical zone, no OS functions
+ *          should be invoked from here.
+ * @note    This macro can be used to deactivate a power saving mode.
+ */
+#define CH_CFG_IDLE_LEAVE_HOOK() {                                          \
+  /* Idle-leave code here.*/                                                \
+}
+
+/**
+ * @brief   Idle Loop hook.
+ * @details This hook is continuously invoked by the idle thread loop.
+ */
+#define CH_CFG_IDLE_LOOP_HOOK() {                                           \
+  /* Idle loop code here.*/                                                 \
+}
+
+/**
+ * @brief   System tick event hook.
+ * @details This hook is invoked in the system tick handler immediately
+ *          after processing the virtual timers queue.
+ */
+#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \
+  /* System tick event code here.*/                                         \
+}
+
+/**
+ * @brief   System halt hook.
+ * @details This hook is invoked in case to a system halting error before
+ *          the system is halted.
+ */
+#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \
+  /* System halt code here.*/                                               \
+}
+
+/**
+ * @brief   Trace hook.
+ * @details This hook is invoked each time a new record is written in the
+ *          trace buffer.
+ */
+#define CH_CFG_TRACE_HOOK(tep) {                                            \
+  /* Trace code here.*/                                                     \
+}
+
+/** @} */
+
+/*===========================================================================*/
+/* Port-specific settings (override port settings defaulted in chcore.h).    */
+/*===========================================================================*/
+
+#endif  /* CHCONF_H */
+
+/** @} */
diff --git a/qmk/keyboards/zoo/wampus/config.h b/qmk/keyboards/zoo/wampus/config.h
new file mode 100644
index 00000000..1b67ac89
--- /dev/null
+++ b/qmk/keyboards/zoo/wampus/config.h
@@ -0,0 +1,95 @@
+/*
+Copyright 2020 Matthew Tso (zoo)
+
+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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID    0x0200
+#define PRODUCT_ID   0xE600
+#define DEVICE_VER   0x0001
+#define MANUFACTURER zoo.haus
+#define PRODUCT      Wampus
+
+/* key matrix size */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+ */
+#define MATRIX_ROW_PINS { C13, C14, A5, A4, A3 }
+#define MATRIX_COL_PINS { A10, A9, A8, B12, A15, A13, A7, A2, A1, A0, F1, F0, B3, B4, B5 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+#define LED_NUM_LOCK_PIN B0
+#define LED_CAPS_LOCK_PIN B8
+#define LED_SCROLL_LOCK_PIN B9
+
+// In-switch LED defines
+#define BACKLIGHT_PIN           A6
+#define BACKLIGHT_LEVELS 3
+#define BACKLIGHT_BREATHING
+
+#define BACKLIGHT_PWM_DRIVER    PWMD3
+#define BACKLIGHT_PWM_CHANNEL 1
+#define BACKLIGHT_PAL_MODE      1
+
+// RGB Underglow WS2812 Matrix defines
+#define RGBLIGHT_ANIMATIONS
+#define RGB_DI_PIN B15
+#define RGBLED_NUM 20
+// SPI RGB Driver
+#define WS2812_SPI SPID2
+#define WS2812_SPI_MOSI_PAL_MODE 0
+
+// OLED defines
+#define OLED_TIMEOUT 60000
+/* Both pins are in bank B */
+#define I2C1_SCL 6 // B6
+#define I2C1_SDA 7 // B7
+#define I2C1_SCL_PAL_MODE 1
+#define I2C1_SDA_PAL_MODE 1
+/* This configures the I2C clock to 400khz assuming a 48Mhz clock */
+#define I2C1_TIMINGR_PRESC 	0U
+#define I2C1_TIMINGR_SCLDEL 3U
+#define I2C1_TIMINGR_SDADEL 1U
+#define I2C1_TIMINGR_SCLH 	3U
+#define I2C1_TIMINGR_SCLL   9U
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+/* disable these deprecated features by default */
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
diff --git a/qmk/keyboards/zoo/wampus/halconf.h b/qmk/keyboards/zoo/wampus/halconf.h
new file mode 100644
index 00000000..adb1a907
--- /dev/null
+++ b/qmk/keyboards/zoo/wampus/halconf.h
@@ -0,0 +1,525 @@
+/*
+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+/**
+ * @file    templates/halconf.h
+ * @brief   HAL configuration header.
+ * @details HAL configuration file, this file allows to enable or disable the
+ *          various device drivers from your application. You may also use
+ *          this file in order to override the device drivers default settings.
+ *
+ * @addtogroup HAL_CONF
+ * @{
+ */
+
+#ifndef HALCONF_H
+#define HALCONF_H
+
+#define _CHIBIOS_HAL_CONF_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
+
+#include "mcuconf.h"
+
+/**
+ * @brief   Enables the PAL subsystem.
+ */
+#if !defined(HAL_USE_PAL) || defined(__DOXYGEN__)
+#define HAL_USE_PAL                         TRUE
+#endif
+
+/**
+ * @brief   Enables the ADC subsystem.
+ */
+#if !defined(HAL_USE_ADC) || defined(__DOXYGEN__)
+#define HAL_USE_ADC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the CAN subsystem.
+ */
+#if !defined(HAL_USE_CAN) || defined(__DOXYGEN__)
+#define HAL_USE_CAN                         FALSE
+#endif
+
+/**
+ * @brief   Enables the cryptographic subsystem.
+ */
+#if !defined(HAL_USE_CRY) || defined(__DOXYGEN__)
+#define HAL_USE_CRY                         FALSE
+#endif
+
+/**
+ * @brief   Enables the DAC subsystem.
+ */
+#if !defined(HAL_USE_DAC) || defined(__DOXYGEN__)
+#define HAL_USE_DAC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the GPT subsystem.
+ */
+#if !defined(HAL_USE_GPT) || defined(__DOXYGEN__)
+#define HAL_USE_GPT                         FALSE
+#endif
+
+/**
+ * @brief   Enables the I2C subsystem.
+ */
+#if !defined(HAL_USE_I2C) || defined(__DOXYGEN__)
+#define HAL_USE_I2C                         TRUE
+#endif
+
+/**
+ * @brief   Enables the I2S subsystem.
+ */
+#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)
+#define HAL_USE_I2S                         FALSE
+#endif
+
+/**
+ * @brief   Enables the ICU subsystem.
+ */
+#if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)
+#define HAL_USE_ICU                         FALSE
+#endif
+
+/**
+ * @brief   Enables the MAC subsystem.
+ */
+#if !defined(HAL_USE_MAC) || defined(__DOXYGEN__)
+#define HAL_USE_MAC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the MMC_SPI subsystem.
+ */
+#if !defined(HAL_USE_MMC_SPI) || defined(__DOXYGEN__)
+#define HAL_USE_MMC_SPI                     FALSE
+#endif
+
+/**
+ * @brief   Enables the PWM subsystem.
+ */
+#if !defined(HAL_USE_PWM) || defined(__DOXYGEN__)
+#define HAL_USE_PWM                         TRUE
+#endif
+
+/**
+ * @brief   Enables the RTC subsystem.
+ */
+#if !defined(HAL_USE_RTC) || defined(__DOXYGEN__)
+#define HAL_USE_RTC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the SDC subsystem.
+ */
+#if !defined(HAL_USE_SDC) || defined(__DOXYGEN__)
+#define HAL_USE_SDC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the SERIAL subsystem.
+ */
+#if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__)
+#define HAL_USE_SERIAL                      FALSE
+#endif
+
+/**
+ * @brief   Enables the SERIAL over USB subsystem.
+ */
+#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)
+#define HAL_USE_SERIAL_USB                  FALSE
+#endif
+
+/**
+ * @brief   Enables the SIO subsystem.
+ */
+#if !defined(HAL_USE_SIO) || defined(__DOXYGEN__)
+#define HAL_USE_SIO                         FALSE
+#endif
+
+/**
+ * @brief   Enables the SPI subsystem.
+ */
+#if !defined(HAL_USE_SPI) || defined(__DOXYGEN__)
+#define HAL_USE_SPI                         TRUE
+#endif
+
+/**
+ * @brief   Enables the TRNG subsystem.
+ */
+#if !defined(HAL_USE_TRNG) || defined(__DOXYGEN__)
+#define HAL_USE_TRNG                        FALSE
+#endif
+
+/**
+ * @brief   Enables the UART subsystem.
+ */
+#if !defined(HAL_USE_UART) || defined(__DOXYGEN__)
+#define HAL_USE_UART                        FALSE
+#endif
+
+/**
+ * @brief   Enables the USB subsystem.
+ */
+#if !defined(HAL_USE_USB) || defined(__DOXYGEN__)
+#define HAL_USE_USB                         TRUE
+#endif
+
+/**
+ * @brief   Enables the WDG subsystem.
+ */
+#if !defined(HAL_USE_WDG) || defined(__DOXYGEN__)
+#define HAL_USE_WDG                         FALSE
+#endif
+
+/**
+ * @brief   Enables the WSPI subsystem.
+ */
+#if !defined(HAL_USE_WSPI) || defined(__DOXYGEN__)
+#define HAL_USE_WSPI                        FALSE
+#endif
+
+/*===========================================================================*/
+/* PAL driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(PAL_USE_CALLBACKS) || defined(__DOXYGEN__)
+#define PAL_USE_CALLBACKS                   FALSE
+#endif
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(PAL_USE_WAIT) || defined(__DOXYGEN__)
+#define PAL_USE_WAIT                        FALSE
+#endif
+
+/*===========================================================================*/
+/* ADC driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(ADC_USE_WAIT) || defined(__DOXYGEN__)
+#define ADC_USE_WAIT                        TRUE
+#endif
+
+/**
+ * @brief   Enables the @p adcAcquireBus() and @p adcReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(ADC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define ADC_USE_MUTUAL_EXCLUSION            TRUE
+#endif
+
+/*===========================================================================*/
+/* CAN driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Sleep mode related APIs inclusion switch.
+ */
+#if !defined(CAN_USE_SLEEP_MODE) || defined(__DOXYGEN__)
+#define CAN_USE_SLEEP_MODE                  TRUE
+#endif
+
+/**
+ * @brief   Enforces the driver to use direct callbacks rather than OSAL events.
+ */
+#if !defined(CAN_ENFORCE_USE_CALLBACKS) || defined(__DOXYGEN__)
+#define CAN_ENFORCE_USE_CALLBACKS           FALSE
+#endif
+
+/*===========================================================================*/
+/* CRY driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables the SW fall-back of the cryptographic driver.
+ * @details When enabled, this option, activates a fall-back software
+ *          implementation for algorithms not supported by the underlying
+ *          hardware.
+ * @note    Fall-back implementations may not be present for all algorithms.
+ */
+#if !defined(HAL_CRY_USE_FALLBACK) || defined(__DOXYGEN__)
+#define HAL_CRY_USE_FALLBACK                FALSE
+#endif
+
+/**
+ * @brief   Makes the driver forcibly use the fall-back implementations.
+ */
+#if !defined(HAL_CRY_ENFORCE_FALLBACK) || defined(__DOXYGEN__)
+#define HAL_CRY_ENFORCE_FALLBACK            FALSE
+#endif
+
+/*===========================================================================*/
+/* DAC driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(DAC_USE_WAIT) || defined(__DOXYGEN__)
+#define DAC_USE_WAIT                        TRUE
+#endif
+
+/**
+ * @brief   Enables the @p dacAcquireBus() and @p dacReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(DAC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define DAC_USE_MUTUAL_EXCLUSION            TRUE
+#endif
+
+/*===========================================================================*/
+/* I2C driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables the mutual exclusion APIs on the I2C bus.
+ */
+#if !defined(I2C_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define I2C_USE_MUTUAL_EXCLUSION            TRUE
+#endif
+
+/*===========================================================================*/
+/* MAC driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables the zero-copy API.
+ */
+#if !defined(MAC_USE_ZERO_COPY) || defined(__DOXYGEN__)
+#define MAC_USE_ZERO_COPY                   FALSE
+#endif
+
+/**
+ * @brief   Enables an event sources for incoming packets.
+ */
+#if !defined(MAC_USE_EVENTS) || defined(__DOXYGEN__)
+#define MAC_USE_EVENTS                      TRUE
+#endif
+
+/*===========================================================================*/
+/* MMC_SPI driver related settings.                                          */
+/*===========================================================================*/
+
+/**
+ * @brief   Delays insertions.
+ * @details If enabled this options inserts delays into the MMC waiting
+ *          routines releasing some extra CPU time for the threads with
+ *          lower priority, this may slow down the driver a bit however.
+ *          This option is recommended also if the SPI driver does not
+ *          use a DMA channel and heavily loads the CPU.
+ */
+#if !defined(MMC_NICE_WAITING) || defined(__DOXYGEN__)
+#define MMC_NICE_WAITING                    TRUE
+#endif
+
+/*===========================================================================*/
+/* SDC driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Number of initialization attempts before rejecting the card.
+ * @note    Attempts are performed at 10mS intervals.
+ */
+#if !defined(SDC_INIT_RETRY) || defined(__DOXYGEN__)
+#define SDC_INIT_RETRY                      100
+#endif
+
+/**
+ * @brief   Include support for MMC cards.
+ * @note    MMC support is not yet implemented so this option must be kept
+ *          at @p FALSE.
+ */
+#if !defined(SDC_MMC_SUPPORT) || defined(__DOXYGEN__)
+#define SDC_MMC_SUPPORT                     FALSE
+#endif
+
+/**
+ * @brief   Delays insertions.
+ * @details If enabled this options inserts delays into the MMC waiting
+ *          routines releasing some extra CPU time for the threads with
+ *          lower priority, this may slow down the driver a bit however.
+ */
+#if !defined(SDC_NICE_WAITING) || defined(__DOXYGEN__)
+#define SDC_NICE_WAITING                    TRUE
+#endif
+
+/**
+ * @brief   OCR initialization constant for V20 cards.
+ */
+#if !defined(SDC_INIT_OCR_V20) || defined(__DOXYGEN__)
+#define SDC_INIT_OCR_V20                    0x50FF8000U
+#endif
+
+/**
+ * @brief   OCR initialization constant for non-V20 cards.
+ */
+#if !defined(SDC_INIT_OCR) || defined(__DOXYGEN__)
+#define SDC_INIT_OCR                        0x80100000U
+#endif
+
+/*===========================================================================*/
+/* SERIAL driver related settings.                                           */
+/*===========================================================================*/
+
+/**
+ * @brief   Default bit rate.
+ * @details Configuration parameter, this is the baud rate selected for the
+ *          default configuration.
+ */
+#if !defined(SERIAL_DEFAULT_BITRATE) || defined(__DOXYGEN__)
+#define SERIAL_DEFAULT_BITRATE              38400
+#endif
+
+/**
+ * @brief   Serial buffers size.
+ * @details Configuration parameter, you can change the depth of the queue
+ *          buffers depending on the requirements of your application.
+ * @note    The default is 16 bytes for both the transmission and receive
+ *          buffers.
+ */
+#if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__)
+#define SERIAL_BUFFERS_SIZE                 16
+#endif
+
+/*===========================================================================*/
+/* SERIAL_USB driver related setting.                                        */
+/*===========================================================================*/
+
+/**
+ * @brief   Serial over USB buffers size.
+ * @details Configuration parameter, the buffer size must be a multiple of
+ *          the USB data endpoint maximum packet size.
+ * @note    The default is 256 bytes for both the transmission and receive
+ *          buffers.
+ */
+#if !defined(SERIAL_USB_BUFFERS_SIZE) || defined(__DOXYGEN__)
+#define SERIAL_USB_BUFFERS_SIZE             1
+#endif
+
+/**
+ * @brief   Serial over USB number of buffers.
+ * @note    The default is 2 buffers.
+ */
+#if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
+#define SERIAL_USB_BUFFERS_NUMBER           2
+#endif
+
+/*===========================================================================*/
+/* SPI driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(SPI_USE_WAIT) || defined(__DOXYGEN__)
+#define SPI_USE_WAIT                        TRUE
+#endif
+
+/**
+ * @brief   Enables circular transfers APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(SPI_USE_CIRCULAR) || defined(__DOXYGEN__)
+#define SPI_USE_CIRCULAR                    FALSE
+#endif
+
+
+/**
+ * @brief   Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(SPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define SPI_USE_MUTUAL_EXCLUSION            TRUE
+#endif
+
+/**
+ * @brief   Handling method for SPI CS line.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(SPI_SELECT_MODE) || defined(__DOXYGEN__)
+#define SPI_SELECT_MODE                     SPI_SELECT_MODE_PAD
+#endif
+
+/*===========================================================================*/
+/* UART driver related settings.                                             */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(UART_USE_WAIT) || defined(__DOXYGEN__)
+#define UART_USE_WAIT                       FALSE
+#endif
+
+/**
+ * @brief   Enables the @p uartAcquireBus() and @p uartReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(UART_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define UART_USE_MUTUAL_EXCLUSION           FALSE
+#endif
+
+/*===========================================================================*/
+/* USB driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(USB_USE_WAIT) || defined(__DOXYGEN__)
+#define USB_USE_WAIT                        TRUE
+#endif
+
+/*===========================================================================*/
+/* WSPI driver related settings.                                             */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(WSPI_USE_WAIT) || defined(__DOXYGEN__)
+#define WSPI_USE_WAIT                       TRUE
+#endif
+
+/**
+ * @brief   Enables the @p wspiAcquireBus() and @p wspiReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(WSPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define WSPI_USE_MUTUAL_EXCLUSION           TRUE
+#endif
+
+#endif /* HALCONF_H */
+
+/** @} */
diff --git a/qmk/keyboards/zoo/wampus/info.json b/qmk/keyboards/zoo/wampus/info.json
new file mode 100644
index 00000000..283d3667
--- /dev/null
+++ b/qmk/keyboards/zoo/wampus/info.json
@@ -0,0 +1,156 @@
+{
+    "keyboard_name": "zoo.haus Wampus",
+    "url": "https://zoo.haus",
+    "maintainer": "zoo",
+    "width": 19.75,
+    "height": 5.25, 
+    "layouts": {
+        "LAYOUT_alice_split_bs": {
+            "layout": [
+                {"label":"Esc", "x":0.5, "y":0},
+                {"label":"`", "x":1.75, "y":0.25},
+                {"label":"1", "x":2.75, "y":0.25},
+                {"label":"2", "x":3.75, "y":0},
+                {"label":"3", "x":4.75, "y":0.25},
+                {"label":"4", "x":5.75, "y":0.25},
+                {"label":"5", "x":6.75, "y":0.25},
+                {"label":"6", "x":7.75, "y":0.25},
+                {"label":"7", "x":11, "y":0.25},
+                {"label":"8", "x":12, "y":0.25},
+                {"label":"9", "x":13, "y":0.25},
+                {"label":"0", "x":14, "y":0.25},
+                {"label":"-", "x":15, "y":0},
+                {"label":"=", "x":16, "y":0.25},
+                {"label":"Del", "x":17, "y":0.25},
+                {"label":"Backspace", "x":18, "y":0.25},
+
+                {"label":"PgUp", "x":0.25, "y":1},
+                {"label":"Tab", "x":1.5, "y":1.25, "w":1.5},
+                {"label":"Q", "x":3, "y":1.25},
+                {"label":"W", "x":4.25, "y":1.25},
+                {"label":"E", "x":5.25, "y":1.25},
+                {"label":"R", "x":6.25, "y":1.25},
+                {"label":"T", "x":7.25, "y":1.25},
+                {"label":"Y", "x":10.5, "y":1.25},
+                {"label":"U", "x":11.5, "y":1.25},
+                {"label":"I", "x":12.5, "y":1.25},
+                {"label":"O", "x":13.5, "y":1.25},
+                {"label":"P", "x":14.75, "y":1.25},
+                {"label":"{", "x":15.75, "y":1.25},
+                {"label":"}", "x":16.75, "y":1.25},
+                {"label":"|", "x":17.75, "y":1.25, "w":1.5},
+
+                {"label":"PgDn", "x":0, "y":2},
+                {"label":"Caps Lock", "x":1.5, "y":2.25, "w":1.75},
+                {"label":"A", "x":3.25, "y":2.25},
+                {"label":"S", "x":4.5, "y":2.25},
+                {"label":"D", "x":5.5, "y":2.25},
+                {"label":"F", "x":6.5, "y":2.25},
+                {"label":"G", "x":7.5, "y":2.25},
+                {"label":"H", "x":10.75, "y":2.25},
+                {"label":"J", "x":11.75, "y":2.25},
+                {"label":"K", "x":12.75, "y":2.25},
+                {"label":"L", "x":13.75, "y":2.25},
+                {"label":":", "x":15.25, "y":2.25},
+                {"label":"\"", "x":16.25, "y":2.25},
+                {"label":"Enter", "x":17.25, "y":2.25, "w":2.25},
+
+                {"label":"Shift", "x":1.5, "y":3.25, "w":2.25},
+                {"label":"Z", "x":3.75, "y":3.25},
+                {"label":"X", "x":5, "y":3.25},
+                {"label":"C", "x":6, "y":3.25},
+                {"label":"V", "x":7, "y":3.25},
+                {"label":"B", "x":8, "y":3.25},
+                {"label":"Fn", "x":10.25, "y":3.25},
+                {"label":"N", "x":11.25, "y":3.25},
+                {"label":"M", "x":12.25, "y":3.25},
+                {"label":"<", "x":13.25, "y":3.25},
+                {"label":">", "x":15, "y":3.25},
+                {"label":"?", "x":16, "y":3.25},
+                {"label":"Shift", "x":17, "y":3.25, "w":1.75},
+                {"label":"Fn", "x":18.75, "y":3.25},
+
+                {"label":"Ctrl", "x":1.5, "y":4.25, "w":1.5},
+                {"label":"Alt", "x":5, "y":4.25, "w":1.5},
+                {"label":"Space", "x":6.5, "y":4.25, "w":2},
+                {"label":"Menu", "x":8.5, "y":4.25},
+                {"label":"Space", "x":10.25, "y":4.25, "w":2.75},
+                {"label":"Alt", "x":13, "y":4.25, "w":1.5},
+                {"label":"Ctrl", "x":18, "y":4.25, "w":1.5}
+            ]
+        },
+        "LAYOUT_alice": {
+            "layout": [
+                {"label":"Esc", "x":0.5, "y":0},
+                {"label":"`", "x":1.75, "y":0.25},
+                {"label":"1", "x":2.75, "y":0.25},
+                {"label":"2", "x":3.75, "y":0},
+                {"label":"3", "x":4.75, "y":0.25},
+                {"label":"4", "x":5.75, "y":0.25},
+                {"label":"5", "x":6.75, "y":0.25},
+                {"label":"6", "x":7.75, "y":0.25},
+                {"label":"7", "x":11, "y":0.25},
+                {"label":"8", "x":12, "y":0.25},
+                {"label":"9", "x":13, "y":0.25},
+                {"label":"0", "x":14, "y":0.25},
+                {"label":"-", "x":15, "y":0},
+                {"label":"=", "x":16, "y":0.25},
+                {"label":"Backspace", "x":17, "y":0.25, "w":2},
+
+                {"label":"PgUp", "x":0.25, "y":1},
+                {"label":"Tab", "x":1.5, "y":1.25, "w":1.5},
+                {"label":"Q", "x":3, "y":1.25},
+                {"label":"W", "x":4.25, "y":1.25},
+                {"label":"E", "x":5.25, "y":1.25},
+                {"label":"R", "x":6.25, "y":1.25},
+                {"label":"T", "x":7.25, "y":1.25},
+                {"label":"Y", "x":10.5, "y":1.25},
+                {"label":"U", "x":11.5, "y":1.25},
+                {"label":"I", "x":12.5, "y":1.25},
+                {"label":"O", "x":13.5, "y":1.25},
+                {"label":"P", "x":14.75, "y":1.25},
+                {"label":"{", "x":15.75, "y":1.25},
+                {"label":"}", "x":16.75, "y":1.25},
+                {"label":"|", "x":17.75, "y":1.25, "w":1.5},
+
+                {"label":"PgDn", "x":0, "y":2},
+                {"label":"Caps Lock", "x":1.5, "y":2.25, "w":1.75},
+                {"label":"A", "x":3.25, "y":2.25},
+                {"label":"S", "x":4.5, "y":2.25},
+                {"label":"D", "x":5.5, "y":2.25},
+                {"label":"F", "x":6.5, "y":2.25},
+                {"label":"G", "x":7.5, "y":2.25},
+                {"label":"H", "x":10.75, "y":2.25},
+                {"label":"J", "x":11.75, "y":2.25},
+                {"label":"K", "x":12.75, "y":2.25},
+                {"label":"L", "x":13.75, "y":2.25},
+                {"label":":", "x":15.25, "y":2.25},
+                {"label":"\"", "x":16.25, "y":2.25},
+                {"label":"Enter", "x":17.25, "y":2.25, "w":2.25},
+
+                {"label":"Shift", "x":1.5, "y":3.25, "w":2.25},
+                {"label":"Z", "x":3.75, "y":3.25},
+                {"label":"X", "x":5, "y":3.25},
+                {"label":"C", "x":6, "y":3.25},
+                {"label":"V", "x":7, "y":3.25},
+                {"label":"B", "x":8, "y":3.25},
+                {"label":"Fn", "x":10.25, "y":3.25},
+                {"label":"N", "x":11.25, "y":3.25},
+                {"label":"M", "x":12.25, "y":3.25},
+                {"label":"<", "x":13.25, "y":3.25},
+                {"label":">", "x":15, "y":3.25},
+                {"label":"?", "x":16, "y":3.25},
+                {"label":"Shift", "x":17, "y":3.25, "w":1.75},
+                {"label":"Fn", "x":18.75, "y":3.25},
+
+                {"label":"Ctrl", "x":1.5, "y":4.25, "w":1.5},
+                {"label":"Alt", "x":5, "y":4.25, "w":1.5},
+                {"label":"Space", "x":6.5, "y":4.25, "w":2},
+                {"label":"Menu", "x":8.5, "y":4.25},
+                {"label":"Space", "x":10.25, "y":4.25, "w":2.75},
+                {"label":"Alt", "x":13, "y":4.25, "w":1.5},
+                {"label":"Ctrl", "x":18, "y":4.25, "w":1.5}
+            ]
+        }
+    }
+}
diff --git a/qmk/keyboards/zoo/wampus/keymaps/default/keymap.c b/qmk/keyboards/zoo/wampus/keymaps/default/keymap.c
new file mode 100644
index 00000000..83d49b0e
--- /dev/null
+++ b/qmk/keyboards/zoo/wampus/keymaps/default/keymap.c
@@ -0,0 +1,33 @@
+/* Copyright 2020 Matthew Tso (zoo)
+ *
+ * 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_alice_split_bs(
+      KC_ESC,     KC_TILD, 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_DEL,
+      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_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_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_RGUI,
+                  KC_LCTL,          KC_LALT,          KC_SPC,  KC_LGUI, KC_SPC,                    KC_RALT,                            KC_RCTL
+  ),
+  [1] = LAYOUT_alice_split_bs(
+      RGB_TOG,    KC_TRNS, 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_DEL,  KC_TRNS,
+      RGB_MOD,    KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+      RGB_RMOD,   KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+                  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+                  KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS
+  ),
+};
diff --git a/qmk/keyboards/zoo/wampus/keymaps/via/keymap.c b/qmk/keyboards/zoo/wampus/keymaps/via/keymap.c
new file mode 100644
index 00000000..b9620c67
--- /dev/null
+++ b/qmk/keyboards/zoo/wampus/keymaps/via/keymap.c
@@ -0,0 +1,47 @@
+/* Copyright 2020 Matthew Tso (zoo)
+ *
+ * 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_alice_split_bs(
+      KC_ESC,     KC_TILD, 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_DEL,
+      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_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_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_RGUI,
+                  KC_LCTL,          KC_LALT,          KC_SPC,  KC_LGUI, KC_SPC,                    KC_RALT,                            KC_RCTL
+  ),
+  [1] = LAYOUT_alice_split_bs(
+      RGB_TOG,    KC_TRNS, 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_DEL,  KC_TRNS,
+      RGB_MOD,    KC_TRNS, KC_TRNS, KC_UP,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+      RGB_RMOD,   KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,          KC_TRNS,
+                  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
+                  KC_TRNS,          KC_TRNS,          KC_TRNS, KC_TRNS, KC_TRNS,                   KC_TRNS,                            KC_TRNS
+  ),
+  [2] = LAYOUT_alice_split_bs(
+      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, 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
+  ),
+  [3] = LAYOUT_alice_split_bs(
+      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, 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
+  )
+};
diff --git a/qmk/keyboards/zoo/wampus/keymaps/via/rules.mk b/qmk/keyboards/zoo/wampus/keymaps/via/rules.mk
new file mode 100644
index 00000000..1e5b9980
--- /dev/null
+++ b/qmk/keyboards/zoo/wampus/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/qmk/keyboards/zoo/wampus/mcuconf.h b/qmk/keyboards/zoo/wampus/mcuconf.h
new file mode 100644
index 00000000..048eb4df
--- /dev/null
+++ b/qmk/keyboards/zoo/wampus/mcuconf.h
@@ -0,0 +1,176 @@
+/*
+    ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
+/*
+ * STM32F0xx drivers configuration.
+ * The following settings override the default settings present in
+ * the various device driver implementation headers.
+ * Note that the settings for each driver only have effect if the whole
+ * driver is enabled in halconf.h.
+ *
+ * IRQ priorities:
+ * 3...0       Lowest...Highest.
+ *
+ * DMA priorities:
+ * 0...3        Lowest...Highest.
+ */
+
+#define STM32F0xx_MCUCONF
+// #define STM32F070xB
+
+/*
+ * HAL driver system settings.
+ */
+#define STM32_NO_INIT                       FALSE
+#define STM32_PVD_ENABLE                    FALSE
+#define STM32_PLS                           STM32_PLS_LEV0
+#define STM32_HSI_ENABLED                   TRUE
+#define STM32_HSI14_ENABLED                 TRUE
+#define STM32_HSI48_ENABLED                 FALSE
+#define STM32_LSI_ENABLED                   TRUE
+#define STM32_HSE_ENABLED                   FALSE
+#define STM32_LSE_ENABLED                   FALSE
+#define STM32_SW                            STM32_SW_PLL
+#define STM32_PLLSRC                        STM32_PLLSRC_HSI_DIV2
+#define STM32_PREDIV_VALUE                  1
+#define STM32_PLLMUL_VALUE                  12
+#define STM32_HPRE                          STM32_HPRE_DIV1
+#define STM32_PPRE                          STM32_PPRE_DIV1
+#define STM32_ADCSW                         STM32_ADCSW_HSI14
+#define STM32_ADCPRE                        STM32_ADCPRE_DIV4
+#define STM32_MCOSEL                        STM32_MCOSEL_NOCLOCK
+#define STM32_ADCPRE                        STM32_ADCPRE_DIV4
+#define STM32_ADCSW                         STM32_ADCSW_HSI14
+#define STM32_USBSW                         STM32_USBSW_HSI48
+#define STM32_CECSW                         STM32_CECSW_HSI
+#define STM32_I2C1SW                        STM32_I2C1SW_HSI
+#define STM32_USART1SW                      STM32_USART1SW_PCLK
+#define STM32_RTCSEL                        STM32_RTCSEL_LSI
+
+/*
+ * ADC driver system settings.
+ */
+#define STM32_ADC_USE_ADC1                  FALSE
+#define STM32_ADC_ADC1_DMA_PRIORITY         2
+#define STM32_ADC_IRQ_PRIORITY              2
+#define STM32_ADC_ADC1_DMA_IRQ_PRIORITY     2
+
+/*
+ * EXT driver system settings.
+ */
+#define STM32_EXT_EXTI0_1_IRQ_PRIORITY      3
+#define STM32_EXT_EXTI2_3_IRQ_PRIORITY      3
+#define STM32_EXT_EXTI4_15_IRQ_PRIORITY     3
+#define STM32_EXT_EXTI16_IRQ_PRIORITY       3
+#define STM32_EXT_EXTI17_IRQ_PRIORITY       3
+
+/*
+ * GPT driver system settings.
+ */
+#define STM32_GPT_USE_TIM1                  FALSE
+#define STM32_GPT_USE_TIM2                  FALSE
+#define STM32_GPT_USE_TIM3                  FALSE
+#define STM32_GPT_USE_TIM14                 FALSE
+#define STM32_GPT_TIM1_IRQ_PRIORITY         2
+#define STM32_GPT_TIM2_IRQ_PRIORITY         2
+#define STM32_GPT_TIM3_IRQ_PRIORITY         2
+#define STM32_GPT_TIM14_IRQ_PRIORITY        2
+
+/*
+ * I2C driver system settings.
+ */
+#define STM32_I2C_USE_I2C1                  TRUE
+#define STM32_I2C_USE_I2C2                  FALSE
+#define STM32_I2C_BUSY_TIMEOUT              50
+#define STM32_I2C_I2C1_IRQ_PRIORITY         3
+#define STM32_I2C_I2C2_IRQ_PRIORITY         3
+#define STM32_I2C_USE_DMA                   TRUE
+#define STM32_I2C_I2C1_DMA_PRIORITY         1
+#define STM32_I2C_I2C2_DMA_PRIORITY         1
+#define STM32_I2C_I2C1_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 7)
+#define STM32_I2C_I2C1_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 6)
+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")
+
+/*
+ * ICU driver system settings.
+ */
+#define STM32_ICU_USE_TIM1                  FALSE
+#define STM32_ICU_USE_TIM2                  FALSE
+#define STM32_ICU_USE_TIM3                  FALSE
+#define STM32_ICU_TIM1_IRQ_PRIORITY         3
+#define STM32_ICU_TIM2_IRQ_PRIORITY         3
+#define STM32_ICU_TIM3_IRQ_PRIORITY         3
+
+/*
+ * PWM driver system settings.
+ */
+#define STM32_PWM_USE_ADVANCED              FALSE
+#define STM32_PWM_USE_TIM1                  FALSE
+#define STM32_PWM_USE_TIM2                  FALSE
+#define STM32_PWM_USE_TIM3                  TRUE
+#define STM32_PWM_TIM1_IRQ_PRIORITY         3
+#define STM32_PWM_TIM2_IRQ_PRIORITY         3
+#define STM32_PWM_TIM3_IRQ_PRIORITY         3
+
+/*
+ * SERIAL driver system settings.
+ */
+#define STM32_SERIAL_USE_USART1             FALSE
+#define STM32_SERIAL_USE_USART2             FALSE
+#define STM32_SERIAL_USART1_PRIORITY        3
+#define STM32_SERIAL_USART2_PRIORITY        3
+
+/*
+ * SPI driver system settings.
+ */
+#define STM32_SPI_USE_SPI1                  FALSE
+#define STM32_SPI_USE_SPI2                  TRUE
+#define STM32_SPI_SPI1_DMA_PRIORITY         1
+#define STM32_SPI_SPI2_DMA_PRIORITY         1
+#define STM32_SPI_SPI1_IRQ_PRIORITY         2
+#define STM32_SPI_SPI2_IRQ_PRIORITY         2
+#define STM32_SPI_SPI2_RX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 4)
+#define STM32_SPI_SPI2_TX_DMA_STREAM        STM32_DMA_STREAM_ID(1, 5)
+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")
+
+/*
+ * ST driver system settings.
+ */
+#define STM32_ST_IRQ_PRIORITY               2
+#define STM32_ST_USE_TIMER                  2
+
+/*
+ * UART driver system settings.
+ */
+#define STM32_UART_USE_USART1               FALSE
+#define STM32_UART_USE_USART2               FALSE
+#define STM32_UART_USART1_IRQ_PRIORITY      3
+#define STM32_UART_USART2_IRQ_PRIORITY      3
+#define STM32_UART_USART1_DMA_PRIORITY      0
+#define STM32_UART_USART2_DMA_PRIORITY      0
+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")
+
+/*
+ * USB driver system settings.
+ */
+#define STM32_USB_USE_USB1                  TRUE
+#define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE
+#define STM32_USB_USB1_LP_IRQ_PRIORITY      3
+
+#endif /* _MCUCONF_H_ */
diff --git a/qmk/keyboards/zoo/wampus/readme.md b/qmk/keyboards/zoo/wampus/readme.md
new file mode 100644
index 00000000..dc80b8a5
--- /dev/null
+++ b/qmk/keyboards/zoo/wampus/readme.md
@@ -0,0 +1,17 @@
+# Wampus
+
+Wampus is an Alice-layout alt-ergo keyboard with daughterboard OLED display support. [More info at zoo.haus](https://zoo.haus)
+
+* Keyboard Maintainer: [zoo](https://github.com/0z00)
+* Hardware Supported: zoo.haus Wampus Case/PCB
+* Hardware Availability: Will be posted at [https://zoo.haus](https://zoo.haus)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make zoo/wampus:default
+
+Flashing example for this keyboard:
+
+    make zoo/wampus:default:flash
+
+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).
diff --git a/qmk/keyboards/zoo/wampus/rules.mk b/qmk/keyboards/zoo/wampus/rules.mk
new file mode 100644
index 00000000..889e4d85
--- /dev/null
+++ b/qmk/keyboards/zoo/wampus/rules.mk
@@ -0,0 +1,26 @@
+# MCU name
+MCU = STM32F072
+
+# Build Options
+#   change yes to no to disable
+#
+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
+# 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 = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+WS2812_DRIVER = spi         # RGB underglow driver configuration
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+OLED_DRIVER_ENABLE = no     # Enables the use of OLED displays
+
+# Enter lower-power sleep mode when on the ChibiOS idle thread
+OPT_DEFS += -DCORTEX_ENABLE_WFI_IDLE=TRUE
+
+LAYOUTS = alice alice_split_bs
diff --git a/qmk/keyboards/zoo/wampus/wampus.c b/qmk/keyboards/zoo/wampus/wampus.c
new file mode 100644
index 00000000..1a333a70
--- /dev/null
+++ b/qmk/keyboards/zoo/wampus/wampus.c
@@ -0,0 +1,29 @@
+/* Copyright 2020 Matthew Tso (zoo)
+ *
+ * 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 "wampus.h"
+#ifdef OLED_DRIVER_ENABLE
+
+void board_init(void) {
+    SYSCFG->CFGR1 |= SYSCFG_CFGR1_I2C1_DMA_RMP;
+    SYSCFG->CFGR1 &= ~(SYSCFG_CFGR1_SPI2_DMA_RMP);
+}
+
+oled_rotation_t oled_init_user(oled_rotation_t rotation) {
+    return OLED_ROTATION_180;
+}
+
+#endif
diff --git a/qmk/keyboards/zoo/wampus/wampus.h b/qmk/keyboards/zoo/wampus/wampus.h
new file mode 100644
index 00000000..f74b58b5
--- /dev/null
+++ b/qmk/keyboards/zoo/wampus/wampus.h
@@ -0,0 +1,49 @@
+/* Copyright 2020 Matthew Tso (zoo)
+ *
+ * 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 ____ KC_NO
+
+#define LAYOUT_alice_split_bs( \
+    K100,  K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, \
+    K200,  K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
+    K300,  K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,       K213, \
+           K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, \
+           K401,       K403,       K405, K406, K408,             K410,                   K414  \
+) { \
+  { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K014, }, \
+  { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, }, \
+  { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, ____, }, \
+  { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, }, \
+  { ____, K401, ____, K403, ____, K405, K406, ____, K408, ____, K410, ____, ____, ____, K414, }, \
+}
+
+#define LAYOUT_alice( \
+    K100,  K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, \
+    K200,  K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, \
+    K300,  K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,       \
+           K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, \
+           K401,       K403,       K405, K406, K408,             K410,                   K414  \
+) { \
+  { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, ____, }, \
+  { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K114, }, \
+  { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, ____, }, \
+  { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, K314, }, \
+  { ____, K401, ____, K403, ____, K405, K406, ____, K408, ____, K410, ____, ____, ____, K414, }, \
+}
diff --git a/qmk/keyboards/ztboards/after/info.json b/qmk/keyboards/ztboards/after/info.json
index f702ea03..ddd0d523 100644
--- a/qmk/keyboards/ztboards/after/info.json
+++ b/qmk/keyboards/ztboards/after/info.json
@@ -1,12 +1,12 @@
 {
     "keyboard_name": "ZTBoards After", 
-    "url": "ztboards.myshopify.com", 
+    "url": "ztb.mx", 
     "maintainer": "phlopsuh", 
     "width": 16, 
     "height": 5, 
     "layouts": {
         "LAYOUT_all": {
-			"layout": [{"label":"Rotary", "x":15.5, "y":0.5}, {"label":"Esc", "x":0, "y":1}, {"label":"!", "x":1, "y":1}, {"label":"@", "x":2, "y":1}, {"label":"#", "x":3, "y":1}, {"label":"$", "x":4, "y":1}, {"label":"%", "x":5, "y":1}, {"label":"^", "x":6, "y":1}, {"label":"&", "x":7, "y":1}, {"label":"*", "x":8, "y":1}, {"label":"(", "x":9, "y":1}, {"label":")", "x":10, "y":1}, {"label":"_", "x":11, "y":1}, {"label":"+", "x":12, "y":1}, {"label":"~", "x":13, "y":1}, {"label":"|", "x":14, "y":1}, {"label":"Tab", "x":0, "y":2, "w":1.5}, {"label":"Q", "x":1.5, "y":2}, {"label":"W", "x":2.5, "y":2}, {"label":"E", "x":3.5, "y":2}, {"label":"R", "x":4.5, "y":2}, {"label":"T", "x":5.5, "y":2}, {"label":"Y", "x":6.5, "y":2}, {"label":"U", "x":7.5, "y":2}, {"label":"I", "x":8.5, "y":2}, {"label":"O", "x":9.5, "y":2}, {"label":"P", "x":10.5, "y":2}, {"label":"{", "x":11.5, "y":2}, {"label":"}", "x":12.5, "y":2}, {"label":"|", "x":13.5, "y":2, "w":1.5}, {"label":"Del", "x":15.5, "y":2}, {"label":"Caps Lock", "x":0, "y":3, "w":1.25}, {"label":"A", "x":1.75, "y":3}, {"label":"S", "x":2.75, "y":3}, {"label":"D", "x":3.75, "y":3}, {"label":"F", "x":4.75, "y":3}, {"label":"G", "x":5.75, "y":3}, {"label":"H", "x":6.75, "y":3}, {"label":"J", "x":7.75, "y":3}, {"label":"K", "x":8.75, "y":3}, {"label":"L", "x":9.75, "y":3}, {"label":":", "x":10.75, "y":3}, {"label":"\"", "x":11.75, "y":3}, {"label":"Enter", "x":12.75, "y":3, "w":2.25}, {"label":"Pg Up", "x":15.5, "y":3}, {"label":"Shift", "x":0, "y":4, "w":2.25}, {"label":"Z", "x":2.25, "y":4}, {"label":"X", "x":3.25, "y":4}, {"label":"C", "x":4.25, "y":4}, {"label":"V", "x":5.25, "y":4}, {"label":"B", "x":6.25, "y":4}, {"label":"N", "x":7.25, "y":4}, {"label":"M", "x":8.25, "y":4}, {"label":"<", "x":9.25, "y":4}, {"label":">", "x":10.25, "y":4}, {"label":"?", "x":11.25, "y":4}, {"label":"Shift", "x":12.25, "y":4, "w":1.75}, {"label":"Pg Dn", "x":15.5, "y":4}, {"label":"Up", "x":14.25, "y":4.25}, {"label":"Ctrl", "x":0, "y":5, "w":1.5}, {"label":"Alt", "x":2.25, "y":5, "w":1.5}, {"x":3.75, "y":5, "w":6.25}, {"label":"Alt", "x":10, "y":5, "w":1.5}, {"label":"Ctrl", "x":11.5, "y":5, "w":1.5}, {"label":"Left", "x":13.25, "y":5.25}, {"label":"Down", "x":14.25, "y":5.25}, {"label":"Right", "x":15.25, "y":5.25}]
+			"layout": [{"label":"Esc", "x":0, "y":1}, {"label":"!", "x":1, "y":1}, {"label":"@", "x":2, "y":1}, {"label":"#", "x":3, "y":1}, {"label":"$", "x":4, "y":1}, {"label":"%", "x":5, "y":1}, {"label":"^", "x":6, "y":1}, {"label":"&", "x":7, "y":1}, {"label":"*", "x":8, "y":1}, {"label":"(", "x":9, "y":1}, {"label":")", "x":10, "y":1}, {"label":"_", "x":11, "y":1}, {"label":"+", "x":12, "y":1}, {"label":"|", "x":13, "y":1}, {"label":"`", "x":14, "y":1}, {"label":"Rotary", "x":15.5, "y":0.5}, {"label":"Tab", "x":0, "y":2, "w":1.5}, {"label":"Q", "x":1.5, "y":2}, {"label":"W", "x":2.5, "y":2}, {"label":"E", "x":3.5, "y":2}, {"label":"R", "x":4.5, "y":2}, {"label":"T", "x":5.5, "y":2}, {"label":"Y", "x":6.5, "y":2}, {"label":"U", "x":7.5, "y":2}, {"label":"I", "x":8.5, "y":2}, {"label":"O", "x":9.5, "y":2}, {"label":"P", "x":10.5, "y":2}, {"label":"{", "x":11.5, "y":2}, {"label":"}", "x":12.5, "y":2}, {"label":"|", "x":13.5, "y":2, "w":1.5}, {"label":"Del", "x":15.5, "y":2}, {"label":"Caps Lock", "x":0, "y":3, "w":1.75}, {"label":"A", "x":1.75, "y":3}, {"label":"S", "x":2.75, "y":3}, {"label":"D", "x":3.75, "y":3}, {"label":"F", "x":4.75, "y":3}, {"label":"G", "x":5.75, "y":3}, {"label":"H", "x":6.75, "y":3}, {"label":"J", "x":7.75, "y":3}, {"label":"K", "x":8.75, "y":3}, {"label":"L", "x":9.75, "y":3}, {"label":":", "x":10.75, "y":3}, {"label":"\"", "x":11.75, "y":3}, {"label":"Enter", "x":12.75, "y":3, "w":2.25}, {"label":"Pg Up", "x":15.5, "y":3}, {"label":"Shift", "x":0, "y":4, "w":2.25}, {"label":"Z", "x":2.25, "y":4}, {"label":"X", "x":3.25, "y":4}, {"label":"C", "x":4.25, "y":4}, {"label":"V", "x":5.25, "y":4}, {"label":"B", "x":6.25, "y":4}, {"label":"N", "x":7.25, "y":4}, {"label":"M", "x":8.25, "y":4}, {"label":"<", "x":9.25, "y":4}, {"label":">", "x":10.25, "y":4}, {"label":"?", "x":11.25, "y":4}, {"label":"Shift", "x":12.25, "y":4, "w":1.75}, {"label":"Up", "x":14.25, "y":4.25}, {"label":"Pg Dn", "x":15.5, "y":4}, {"label":"Ctrl", "x":0, "y":5, "w":1.5}, {"label":"Alt", "x":2.25, "y":5, "w":1.5}, {"x":3.75, "y":5, "w":6.25}, {"label":"Alt", "x":10, "y":5, "w":1.5}, {"label":"Ctrl", "x":11.5, "y":5, "w":1.5}, {"label":"Left", "x":13.25, "y":5.25}, {"label":"Down", "x":14.25, "y":5.25}, {"label":"Right", "x":15.25, "y":5.25}]
 		} 
 	}
 }
diff --git a/qmk/keyboards/ztboards/after/keymaps/default/keymap.c b/qmk/keyboards/ztboards/after/keymaps/default/keymap.c
index e014b3a9..7dfb9e12 100644
--- a/qmk/keyboards/ztboards/after/keymaps/default/keymap.c
+++ b/qmk/keyboards/ztboards/after/keymaps/default/keymap.c
@@ -21,33 +21,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 
 void encoder_update_user(uint8_t index, bool clockwise) {
-  /*  Custom encoder control - handles CW/CCW turning of encoder
-   *  Default behavior:
-   *    main layer:
-   *       CW: move mouse right
-   *      CCW: move mouse left
-   *    other layers:
-   *       CW: = (equals/plus - increase slider in Adobe products)
-   *      CCW: - (minus/underscore - decrease slider in adobe products)
-   * Thank you to imchipwood/dumbpad for defining this. 
-   */
   if (index == 0) {
     switch (get_highest_layer(layer_state)) {
       case 1:
         // main layer - move mouse right (CW) and left (CCW)
         if (clockwise) {
-          tap_code(KC_MS_R);
+          tap_code(KC_BRIGHTNESS_UP);
         } else {
-          tap_code(KC_MS_L);
+          tap_code(KC_BRIGHTNESS_DOWN);
         }
         break;
 
       default:
         // other layers - =/+ (quals/plus) (CW) and -/_ (minus/underscore) (CCW)
         if (clockwise) {
-          tap_code(KC_EQL);
+          tap_code(KC_AUDIO_VOL_UP);
         } else {
-          tap_code(KC_MINS);
+          tap_code(KC_AUDIO_VOL_DOWN);
         }
         break;
     }
diff --git a/qmk/keyboards/ztboards/noon/info.json b/qmk/keyboards/ztboards/noon/info.json
index cbc561f8..fed68d16 100644
--- a/qmk/keyboards/ztboards/noon/info.json
+++ b/qmk/keyboards/ztboards/noon/info.json
@@ -1,12 +1,12 @@
 {
     "keyboard_name": "ZTBoards Noon", 
-    "url": "ztboards.myshopify.com", 
+    "url": "ztb.mx", 
     "maintainer": "phlopsuh", 
     "width": 16, 
     "height": 5, 
     "layouts": {
         "LAYOUT_all": {
-			"layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"~", "x":13, "y":0}, {"label":"|", "x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Pg Up", "x":15, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.25}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Pg Dn", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"Up", "x":14, "y":3}, {"label":"Del", "x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"Alt", "x":2.25, "y":4, "w":1.5}, {"x":3.75, "y":4, "w":7}, {"label":"Alt", "x":10.75, "y":4, "w":1.5}, {"label":"Left", "x":13, "y":4}, {"label":"Down", "x":14, "y":4}, {"label":"Right", "x":15, "y":4}]		
+			"layout": [{"label":"~", "x":0, "y":0}, {"label":"!", "x":1, "y":0}, {"label":"@", "x":2, "y":0}, {"label":"#", "x":3, "y":0}, {"label":"$", "x":4, "y":0}, {"label":"%", "x":5, "y":0}, {"label":"^", "x":6, "y":0}, {"label":"&", "x":7, "y":0}, {"label":"*", "x":8, "y":0}, {"label":"(", "x":9, "y":0}, {"label":")", "x":10, "y":0}, {"label":"_", "x":11, "y":0}, {"label":"+", "x":12, "y":0}, {"label":"~", "x":13, "y":0}, {"label":"|", "x":14, "y":0}, {"label":"Tab", "x":0, "y":1, "w":1.5}, {"label":"Q", "x":1.5, "y":1}, {"label":"W", "x":2.5, "y":1}, {"label":"E", "x":3.5, "y":1}, {"label":"R", "x":4.5, "y":1}, {"label":"T", "x":5.5, "y":1}, {"label":"Y", "x":6.5, "y":1}, {"label":"U", "x":7.5, "y":1}, {"label":"I", "x":8.5, "y":1}, {"label":"O", "x":9.5, "y":1}, {"label":"P", "x":10.5, "y":1}, {"label":"{", "x":11.5, "y":1}, {"label":"}", "x":12.5, "y":1}, {"label":"|", "x":13.5, "y":1, "w":1.5}, {"label":"Pg Up", "x":15, "y":1}, {"label":"Caps Lock", "x":0, "y":2, "w":1.75}, {"label":"A", "x":1.75, "y":2}, {"label":"S", "x":2.75, "y":2}, {"label":"D", "x":3.75, "y":2}, {"label":"F", "x":4.75, "y":2}, {"label":"G", "x":5.75, "y":2}, {"label":"H", "x":6.75, "y":2}, {"label":"J", "x":7.75, "y":2}, {"label":"K", "x":8.75, "y":2}, {"label":"L", "x":9.75, "y":2}, {"label":":", "x":10.75, "y":2}, {"label":"\"", "x":11.75, "y":2}, {"label":"Enter", "x":12.75, "y":2, "w":2.25}, {"label":"Pg Dn", "x":15, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2.25}, {"label":"Z", "x":2.25, "y":3}, {"label":"X", "x":3.25, "y":3}, {"label":"C", "x":4.25, "y":3}, {"label":"V", "x":5.25, "y":3}, {"label":"B", "x":6.25, "y":3}, {"label":"N", "x":7.25, "y":3}, {"label":"M", "x":8.25, "y":3}, {"label":"<", "x":9.25, "y":3}, {"label":">", "x":10.25, "y":3}, {"label":"?", "x":11.25, "y":3}, {"label":"Shift", "x":12.25, "y":3, "w":1.75}, {"label":"Up", "x":14, "y":3}, {"label":"Del", "x":15, "y":3}, {"label":"Ctrl", "x":0, "y":4, "w":1.5}, {"label":"Alt", "x":2.25, "y":4, "w":1.5}, {"x":3.75, "y":4, "w":7}, {"label":"Alt", "x":10.75, "y":4, "w":1.5}, {"label":"Left", "x":13, "y":4}, {"label":"Down", "x":14, "y":4}, {"label":"Right", "x":15, "y":4}]		
 		} 
 	}
 }
diff --git a/qmk/layouts/community/60_ansi/brandonschlack-ansi/keymap.c b/qmk/layouts/community/60_ansi/brandonschlack-ansi/keymap.c
new file mode 100644
index 00000000..5282ff98
--- /dev/null
+++ b/qmk/layouts/community/60_ansi/brandonschlack-ansi/keymap.c
@@ -0,0 +1,83 @@
+/* Copyright 2020 Brandon Schlack
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+#include "brandonschlack.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/* Base layer
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+ * │Esc│! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│_ -│+ =│ Bckspc│
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
+ * │Tab  │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │{ [│} ]│|   \│
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │HyCaps│ A │ S │ D │ F │ G │ H │ J │ K │ L │: ;│" '│   Enter│
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
+ * │Shift   │ Z │ X │ C │ V │ B │ N │ M │< ,│> .│? /│   ↑ Shift│
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
+ * │Ctrl│ Opt│ Cmd│          Space         │CmdP│←Opt│↓ Fn│→Ctl│
+ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+ */
+[_BASE] = LAYOUT_60_ansi( \
+    KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, \
+    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, \
+    HY_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,          UP_RSFT, \
+    KC_LCTL, KC_LOPT, KC_LCMD,                            KC_SPC,                             PLY_CMD, LFT_OPT, DWN_FN1, RGT_CTL  \
+),
+
+/* Function Layer
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+ * │~ `│ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│  Del  │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
+ * │RMod │RH+│RS+│RV+│AS+│   │   │   │F13│F14│F15│PgU│LHP│ SLP │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │RTgl  │RH-│RS-│RV-│AS-│   │   │VlD│VlU│Mut│Hom│End│ PlyPse │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
+ * │        │LYR│Thm│   │   │RST│   │MKE│Prv│Nxt│PgD│          │
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
+ * │    │    │    │                        │    │    │    │    │
+ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+ */
+[_FN1] = LAYOUT_60_ansi( \
+    KC_GRV,  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_DELT, \
+    RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, KC_F13,  KC_F14,  KC_F15,  KC_PGUP, MC_LHPD, MC_SLPD, \
+    RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_HOME, KC_END,           KC_MPLY, \
+    _______,          RGB_LYR, RGB_THM, _______, _______, RESET,   _______, QM_MAKE, KC_MPRV, KC_MNXT, KC_PGDN,          _______, \
+    _______, _______, _______,                            _______,                            _______, _______, _______, _______  \
+),
+/*  Layer
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐
+ * │   │   │   │   │   │   │   │   │   │   │   │   │   │       │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤
+ * │     │   │   │   │   │   │   │   │   │   │   │   │   │     │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │      │   │   │   │   │   │   │   │   │   │   │   │        │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤
+ * │        │   │   │   │   │   │   │   │   │   │   │          │
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤
+ * │    │    │    │                        │    │    │    │    │
+ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+ */
+/*
+[BLANK] = LAYOUT_60_ansi( \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, \
+    _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, \
+    _______, _______, _______,                            _______,                            _______, _______, _______, _______  \
+)
+*/
+};
diff --git a/qmk/layouts/community/60_ansi/brandonschlack-ansi/rules.mk b/qmk/layouts/community/60_ansi/brandonschlack-ansi/rules.mk
new file mode 100644
index 00000000..7aaf727a
--- /dev/null
+++ b/qmk/layouts/community/60_ansi/brandonschlack-ansi/rules.mk
@@ -0,0 +1 @@
+USER_NAME := brandonschlack
diff --git a/qmk/layouts/community/60_ansi/talljoe-ansi/config.h b/qmk/layouts/community/60_ansi/talljoe-ansi/config.h
index 4326a2fd..79cc1900 100644
--- a/qmk/layouts/community/60_ansi/talljoe-ansi/config.h
+++ b/qmk/layouts/community/60_ansi/talljoe-ansi/config.h
@@ -1,5 +1,20 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
+/* Copyright 2020 Joseph Wasson
+ *
+ * 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_CONFIG_H
 
@@ -16,7 +31,5 @@
     K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,           \
     K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,                \
     K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C,                \
-    K40, K41, K42,           K45,           K48, K49,      K4B, K4C                 \
+    K40, K41, K42,           K46,           K48, K49,      K4B, K4C                 \
 )
-
-#endif //CONFIG_USER_H
diff --git a/qmk/layouts/community/60_ansi_split_bs_rshift/brandonschlack-split/keymap.c b/qmk/layouts/community/60_ansi_split_bs_rshift/brandonschlack-split/keymap.c
new file mode 100644
index 00000000..906925ab
--- /dev/null
+++ b/qmk/layouts/community/60_ansi_split_bs_rshift/brandonschlack-split/keymap.c
@@ -0,0 +1,83 @@
+/* Copyright 2019 Brandon Schlack
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+#include "brandonschlack.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/* Base layer
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │Esc│! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│_ -│+ =│| \│~ `│
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+ * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │{ [│} ]│Bspc │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │HyCaps│ A │ S │ D │ F │ G │ H │ J │ K │ L │: ;│" '│ Enter  │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+ * │ LShift │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │↑ Shft│FnP│
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤
+ * │Ctrl│Opt │Cmd │         Space          │ Cmd│←Opt│↓ Fn│→Ctl│
+ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+ */
+[_BASE] = LAYOUT_60_ansi_split_bs_rshift( \
+    KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV, \
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC, \
+    HY_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, UP_RSFT, PLY_FN1, \
+    KC_LCTL,  KC_LOPT,  KC_LCMD,                          KC_SPC,                             KC_RCMD, LFT_OPT, DWN_FN1, RGT_CTL  \
+),
+
+/* Function Layer
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │MKE│ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│LHP│SLP│
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+ * │RMod │RH+│RS+│RV+│AS+│   │   │   │   │   │   │ ↑ │MNC│ Del │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │RTgl  │RH-│RS-│RV-│AS-│   │   │   │VlD│VlU│ ← │ → │   Play │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+ * │        │LYR│Thm│   │   │RST│   │Mut│Prv│Nxt│ ↓ │PgUSft│   │
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤
+ * │    │    │    │                        │    │HmOp│PgDF│EndC│
+ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+ */
+[_FN1] = LAYOUT_60_ansi_split_bs_rshift( \
+    QM_MAKE, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  MC_LHPD, MC_SLPD, \
+    RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, KC_VOLU, KC_MPRV, KC_MNXT, KC_UP,   MC_MSSN, KC_DELT, \
+    RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, KC_VOLD, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT,          KC_MPLY, \
+    _______,          RGB_LYR, RGB_THM, _______, _______, RESET,   _______, KC_MUTE, KC_END,  KC_PGDN, KC_DOWN, PGU_SFT, _______, \
+    _______, _______, _______,                            _______,                            _______, HOM_OPT, PGD_FN1, END_CTL  \
+)
+/*  Layer
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+ * │     │   │   │   │   │   │   │   │   │   │   │   │   │     │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │      │   │   │   │   │   │   │   │   │   │   │   │        │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+ * │        │   │   │   │   │   │   │   │   │   │   │      │   │
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬┴───┤
+ * │    │    │    │                        │    │    │    │    │
+ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┘
+ */
+/*
+[BLANK] = LAYOUT_60_ansi_split_bs_rshift( \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, \
+    _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    _______, _______, _______,                            _______,                            _______, _______, _______, _______  \
+)
+*/
+};
diff --git a/qmk/layouts/community/60_ansi_split_bs_rshift/brandonschlack-split/rules.mk b/qmk/layouts/community/60_ansi_split_bs_rshift/brandonschlack-split/rules.mk
new file mode 100644
index 00000000..7aaf727a
--- /dev/null
+++ b/qmk/layouts/community/60_ansi_split_bs_rshift/brandonschlack-split/rules.mk
@@ -0,0 +1 @@
+USER_NAME := brandonschlack
diff --git a/qmk/layouts/community/60_ansi_split_bs_rshift/talljoe/config.h b/qmk/layouts/community/60_ansi_split_bs_rshift/talljoe/config.h
index 65568d3a..2a2ead22 100644
--- a/qmk/layouts/community/60_ansi_split_bs_rshift/talljoe/config.h
+++ b/qmk/layouts/community/60_ansi_split_bs_rshift/talljoe/config.h
@@ -1,7 +1,20 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
+/* Copyright 2020 Joseph Wasson
+ *
+ * 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_CONFIG_H
+#pragma once
 
 #define ENABLE_GAME_LAYER
 
@@ -16,7 +29,7 @@
     K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,           \
     K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,                \
     K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,           \
-    K40, K41, K42,           K45,           K48, K49,      K4B, K4C                 \
+    K40, K41, K42,           K46,           K48, K49,      K4B, K4C                 \
 )
 
 /* Color Map */
@@ -68,5 +81,3 @@
   #define BACKLIGHT_ALPHAS_MODS_ROW_2 0b0011000000000001
 
 #endif //KEYBOARD_zeal60
-
-#endif //CONFIG_USER_H
diff --git a/qmk/layouts/community/60_ansi_split_bs_rshift/talljoe/solarized.c b/qmk/layouts/community/60_ansi_split_bs_rshift/talljoe/solarized.c
index 3e9e726b..617132d4 100644
--- a/qmk/layouts/community/60_ansi_split_bs_rshift/talljoe/solarized.c
+++ b/qmk/layouts/community/60_ansi_split_bs_rshift/talljoe/solarized.c
@@ -1,3 +1,19 @@
+/* Copyright 2020 Joseph Wasson
+ *
+ * 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 "solarized.h"
 
 #define MAKE_COLOR(_H, _S, _V) \
diff --git a/qmk/layouts/community/60_ansi_split_bs_rshift/talljoe/solarized.h b/qmk/layouts/community/60_ansi_split_bs_rshift/talljoe/solarized.h
index 3b00caea..15e3d588 100644
--- a/qmk/layouts/community/60_ansi_split_bs_rshift/talljoe/solarized.h
+++ b/qmk/layouts/community/60_ansi_split_bs_rshift/talljoe/solarized.h
@@ -1,5 +1,20 @@
-#ifndef SOLARIZED_H
-#define SOLARIZED_H
+/* Copyright 2020 Joseph Wasson
+ *
+ * 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/color.h"
 
@@ -23,5 +38,3 @@ typedef struct {
 } solarized_t;
 
 extern solarized_t solarized;
-
-#endif
diff --git a/qmk/layouts/community/60_hhkb/talljoe-hhkb/config.h b/qmk/layouts/community/60_hhkb/talljoe-hhkb/config.h
index 54756a94..0424fee1 100644
--- a/qmk/layouts/community/60_hhkb/talljoe-hhkb/config.h
+++ b/qmk/layouts/community/60_hhkb/talljoe-hhkb/config.h
@@ -1,5 +1,20 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
+/* Copyright 2020 Joseph Wasson
+ *
+ * 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_CONFIG_H
 
@@ -16,10 +31,9 @@
     K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,           \
     K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C,                \
     K30,      K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, K3D,           \
-         K41, K42,           K45,           K48, K4C                                \
+         K41, K42,           K46,           K48, K4C                                \
 )
 
 #ifdef RGB_BACKLIGHT_M60_A
   #define ZEAL_RGB
 #endif
-#endif //CONFIG_USER_H
diff --git a/qmk/layouts/community/60_tsangan_hhkb/brandonschlack-tsngn/keymap.c b/qmk/layouts/community/60_tsangan_hhkb/brandonschlack-tsngn/keymap.c
new file mode 100644
index 00000000..b6db28ed
--- /dev/null
+++ b/qmk/layouts/community/60_tsangan_hhkb/brandonschlack-tsngn/keymap.c
@@ -0,0 +1,84 @@
+/* Copyright 2020 Brandon Schlack
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+#include "brandonschlack.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/* Base layer
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │Esc│! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│_ -│+ =│| \│~ `│
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+ * │Tab  │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │{ [│} ]│ Bspc│
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │HyCaps│ A │ S │ D │ F │ G │ H │ J │ K │ L │: ;│" '│   Enter│
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+ * │LShift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │↑ Shft│FnP│
+ * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤
+ * │Ctrl │Opt│Cmd  │                           │ ←Cmd│↓Op│→Ctrl│
+ * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+ */
+[_BASE] = LAYOUT_60_tsangan_hhkb( \
+    KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,  \
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC, \
+    HY_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, UP_RSFT, PLY_FN1, \
+    KC_LCTL, KC_LOPT, KC_LCMD,                            KC_SPC,                                      LFT_CMD, DWN_OPT, RGT_CTL  \
+),
+
+/* Function Layer
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │MKE│ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│LHP│SLP│
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+ * │RMod │RH+│RS+│RV+│Bl+│   │   │   │   │   │   │ ↑ │MNC│ Del │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │RTgl  │RH-│RS-│RV-│Bl-│   │   │   │VlD│Vlu│ ← │ → │   Play │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+ * │        │LYR│Thm│BlT│   │RST│   │Mut│Prv│Nxt│ ↓ │PgUSft│   │
+ * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤
+ * │     │   │     │                           │HmCmd│PDO│EndCl│
+ * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+ */
+[_FN1] = LAYOUT_60_tsangan_hhkb( \
+    QM_MAKE, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  MC_LHPD, MC_SLPD, \
+    RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, BL_INC,  _______, _______, _______, _______, _______, _______, KC_UP,   MC_MSSN, KC_DELT, \
+    RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, BL_DEC,  _______, _______, _______, KC_VOLD, KC_VOLU, KC_LEFT, KC_RGHT,          KC_MPLY, \
+    _______,          RGB_LYR, RGB_THM, BL_TOGG, _______, RESET,   _______, KC_MUTE, KC_MPRV, KC_MNXT, KC_DOWN, PGU_SFT, _______, \
+    _______, _______, _______,                            _______,                                     HOM_CMD, PGD_OPT, END_CTL  \
+)
+/*  Layer
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
+ * │     │   │   │   │   │   │   │   │   │   │   │   │   │     │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤
+ * │      │   │   │   │   │   │   │   │   │   │   │   │        │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┤
+ * │        │   │   │   │   │   │   │   │   │   │   │      │   │
+ * ├─────┬──┴┬──┴──┬┴───┴───┴───┴───┴───┴───┴──┬┴───┴┬───┬─┴───┤
+ * │     │   │     │                           │     │   │     │
+ * └─────┴───┴─────┴───────────────────────────┴─────┴───┴─────┘
+ */
+/*
+[BLANK] = LAYOUT_60_tsangan_hhkb( \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, \
+    _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    _______, _______, _______,                            _______,                                     _______, _______, _______  \
+)
+*/
+
+};
diff --git a/qmk/layouts/community/60_tsangan_hhkb/brandonschlack-tsngn/readme.md b/qmk/layouts/community/60_tsangan_hhkb/brandonschlack-tsngn/readme.md
new file mode 100644
index 00000000..d79cf7f0
--- /dev/null
+++ b/qmk/layouts/community/60_tsangan_hhkb/brandonschlack-tsngn/readme.md
@@ -0,0 +1,11 @@
+# brandonschlack's 60 Tsangan HHKB Layout
+
+It is used on
+  
+* [AN-C](https://github.com/qmk/qmk_firmware/tree/master/keyboards/cannonkeys/an_c)
+* [Instant60](https://github.com/qmk/qmk_firmware/tree/master/keyboards/cannonkeys/instant60)
+* [Polaris](https://github.com/qmk/qmk_firmware/tree/master/keyboards/ai03/polaris)
+* [Plain60](https://github.com/qmk/qmk_firmware/tree/master/keyboards/maartenwut/plain60)
+
+## Features
+### Mod-Taps & Layer-Taps
diff --git a/qmk/layouts/community/60_tsangan_hhkb/brandonschlack-tsngn/rules.mk b/qmk/layouts/community/60_tsangan_hhkb/brandonschlack-tsngn/rules.mk
new file mode 100644
index 00000000..7aaf727a
--- /dev/null
+++ b/qmk/layouts/community/60_tsangan_hhkb/brandonschlack-tsngn/rules.mk
@@ -0,0 +1 @@
+USER_NAME := brandonschlack
diff --git a/qmk/layouts/community/65_ansi_blocker/brandonschlack/config.h b/qmk/layouts/community/65_ansi_blocker/brandonschlack/config.h
new file mode 100644
index 00000000..e7b09f42
--- /dev/null
+++ b/qmk/layouts/community/65_ansi_blocker/brandonschlack/config.h
@@ -0,0 +1,64 @@
+/* Copyright 2019 Brandon Schlack
+ *
+ * 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
+
+#ifdef RGB_MATRIX_ENABLE
+// Disable RGB Effects
+#define DISABLE_RGB_MATRIX_ALPHAS_MODS
+// #define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+// #define DISABLE_RGB_MATRIX_BREATHING
+#define DISABLE_RGB_MATRIX_BAND_SAT
+#define DISABLE_RGB_MATRIX_BAND_VAL
+#define DISABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#define DISABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#define DISABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#define DISABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#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_DUAL
+#define DISABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#define DISABLE_RGB_MATRIX_DUAL_BEACON
+#define DISABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#define DISABLE_RGB_MATRIX_CYCLE_SPIRAL
+#define DISABLE_RGB_MATRIX_RAINBOW_BEACON
+#define DISABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#define DISABLE_RGB_MATRIX_RAINDROPS
+#define DISABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#define DISABLE_RGB_MATRIX_TYPING_HEATMAP
+#define DISABLE_RGB_MATRIX_DIGITAL_RAIN
+#define DISABLE_RGB_MATRIX_SOLID_REACTIVE
+// #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#define DISABLE_RGB_MATRIX_SPLASH
+#define DISABLE_RGB_MATRIX_MULTISPLASH
+#define DISABLE_RGB_MATRIX_SOLID_SPLASH
+#define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH
+
+#define QMK_KEYS_PER_SCAN 4
+
+#define USB_LED_CAPS_LOCK_SCANCODE      30
+#endif
+
+#ifdef KEYBOARD_massdrop_alt
+#undef USB_LED_INDICATOR_ENABLE
+#endif
diff --git a/qmk/layouts/community/65_ansi_blocker/brandonschlack/keymap.c b/qmk/layouts/community/65_ansi_blocker/brandonschlack/keymap.c
new file mode 100644
index 00000000..6b67cfdc
--- /dev/null
+++ b/qmk/layouts/community/65_ansi_blocker/brandonschlack/keymap.c
@@ -0,0 +1,117 @@
+/* Copyright 2019 Brandon Schlack
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+#include "brandonschlack.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/* Base Layer
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+ * │Esc│! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│_ -│+ =│ Bckspc│Hom│
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+ * │Tab  │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │{ [│} ]│|   \│PgU│
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+ * │HyCaps│ A │ S │ D │ F │ G │ H │ J │ K │ L │: ;│" '│   Enter│PgD│
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+ * │Shift   │ Z │ X │ C │ V │ B │ N │ M │< ,│> .│? /│ Shift│ Up│End│
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+ * │Ctrl│ Opt│ Cmd│          Space         │Cmd │FnPy│ │Lef│Dow│Rig│
+ * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘
+ */
+[_BASE] = LAYOUT_65_ansi_blocker( \
+    KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC, KC_HOME, \
+    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_PGUP, \
+    HY_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_PGDN, \
+    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_END,  \
+    KC_LCTL, KC_LOPT, KC_LCMD,                            KC_SPC,                    KC_RCMD, PLY_FN1,          KC_LEFT, KC_DOWN, KC_RGHT  \
+),
+/* Function Layer
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+ * │` ~│ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│ Delete│SlD│
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+ * │RMod │RH+│RS+│RV+│AS+│   │   │   │   │   │F13│F14│F15│ LHP │VlU│
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+ * │RTgl  │RH-│RS-│RV-│AS-│   │   │   │   │   │   │   │        │VlD│
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+ * │        │LYR│Thm│   │   │RST│   │Mke│Prv│Nxt│Ply│      │PgU│Mut│
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+ * │    │    │    │                        │    │    │ │Hom│PgD│End│
+ * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘
+ */
+[_FN1] = LAYOUT_65_ansi_blocker( \
+    KC_GRV,  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_DELT, MC_SLPD, \
+    RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, KC_F13,  KC_F14,  KC_F15,  MC_LHPD, KC_VOLU, \
+    RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______,          _______, KC_VOLD, \
+    _______,          RGB_LYR, RGB_THM, _______, _______, RESET,   _______, QM_MAKE, KC_MPRV, KC_MNXT, KC_MPLY, _______, KC_PGUP, KC_MUTE, \
+    _______, _______, _______,                            _______,                   _______, _______,          KC_HOME, KC_PGDN, KC_END   \
+),
+/* Blank Layout
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+ * │   │   │   │   │   │   │   │   │   │   │   │   │   │       │   │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+ * │     │   │   │   │   │   │   │   │   │   │   │   │   │     │   │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+ * │      │   │   │   │   │   │   │   │   │   │   │   │        │   │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+ * │        │   │   │   │   │   │   │   │   │   │   │      │   │   │
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬─┬───┼───┼───┤
+ * │    │    │    │                        │    │    │ │   │   │   │
+ * └────┴────┴────┴────────────────────────┴────┴────┴─┴───┴───┴───┘
+[X] = LAYOUT_65_ansi_blocker( \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, \
+    _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    _______, _______, _______,                            _______,                   _______, _______,          _______, _______, _______  \
+),
+*/
+};
+
+// Runs just one time when the keyboard initializes.
+void matrix_init_keymap(void) {
+};
+
+// Runs once after keyboard initializes
+void keyboard_post_init_keymap(void) {
+};
+
+// Runs constantly in the background, in a loop.
+void matrix_scan_keymap(void) {
+};
+
+bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+    #ifdef KEYBOARD_massdrop
+        case RGB_TOG:
+            if (record->event.pressed) {
+                rgb_matrix_cycle_flag();
+            }
+            return false;
+    #endif
+        default:
+            return true; //Process all other keycodes normally
+    }
+}
+
+#ifdef RGB_MATRIX_ENABLE
+void rgb_matrix_indicators_user(void) {
+    if (IS_HOST_LED_ON(USB_LED_CAPS_LOCK)) {
+        rgb_matrix_set_color(USB_LED_CAPS_LOCK_SCANCODE, RGB_GREEN);
+    } else if (!HAS_ANY_FLAGS(rgb_matrix_get_flags(), LED_FLAG_KEYS)){
+        rgb_matrix_set_color(USB_LED_CAPS_LOCK_SCANCODE, 0, 0, 0);
+    }
+}
+#endif
+
diff --git a/qmk/layouts/community/65_ansi_blocker/brandonschlack/readme.md b/qmk/layouts/community/65_ansi_blocker/brandonschlack/readme.md
new file mode 100644
index 00000000..effb0084
--- /dev/null
+++ b/qmk/layouts/community/65_ansi_blocker/brandonschlack/readme.md
@@ -0,0 +1,15 @@
+# brandonschlack's 65_ansi_blocker layout
+
+This is my preferred 65% layout.
+
+It is used on:
+
+* [Massdrop ALT](https://github.com/qmk/qmk_firmware/tree/master/keyboards/massdrop/alt)     
+* [KBD67 MKII](https://github.com/qmk/qmk_firmware/tree/master/keyboards/kbdfans/kbd67/mkiirgb)  
+
+## [Base Layer](http://www.keyboard-layout-editor.com/#/gists/a820c8629394f8f4c3943e6ee518d9a8)
+![Base Layer](https://i.imgur.com/gPxDZl7.jpg)
+
+## [Function Layer](http://www.keyboard-layout-editor.com/#/gists/8ca73a6d3bec8ce736f5db60edf31dcf)
+![Function Layer](https://i.imgur.com/gNKHgWa.jpg)
+
diff --git a/qmk/layouts/community/65_ansi_blocker/brandonschlack/rules.mk b/qmk/layouts/community/65_ansi_blocker/brandonschlack/rules.mk
new file mode 100644
index 00000000..85849670
--- /dev/null
+++ b/qmk/layouts/community/65_ansi_blocker/brandonschlack/rules.mk
@@ -0,0 +1,7 @@
+# Build Options
+ifeq ($(strip $(KEYBOARD)), gray_studio/space65)
+	MOUSEKEY_ENABLE = no
+	BACKLIGHT_ENABLE = no
+	CONSOLE_ENABLE = yes
+	COMMAND_ENABLE = yes
+endif
diff --git a/qmk/layouts/community/65_ansi_blocker_split_bs/brandonschlack-split/config.h b/qmk/layouts/community/65_ansi_blocker_split_bs/brandonschlack-split/config.h
new file mode 100644
index 00000000..9506c7fe
--- /dev/null
+++ b/qmk/layouts/community/65_ansi_blocker_split_bs/brandonschlack-split/config.h
@@ -0,0 +1,64 @@
+/* Copyright 2020 Brandon Schlack
+ *
+ * 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
+
+#ifdef RGB_MATRIX_ENABLE
+// Disable RGB Effects
+#define DISABLE_RGB_MATRIX_ALPHAS_MODS
+// #define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+// #define DISABLE_RGB_MATRIX_BREATHING
+#define DISABLE_RGB_MATRIX_BAND_SAT
+#define DISABLE_RGB_MATRIX_BAND_VAL
+#define DISABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#define DISABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#define DISABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#define DISABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#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_DUAL
+#define DISABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#define DISABLE_RGB_MATRIX_DUAL_BEACON
+#define DISABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#define DISABLE_RGB_MATRIX_CYCLE_SPIRAL
+#define DISABLE_RGB_MATRIX_RAINBOW_BEACON
+#define DISABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#define DISABLE_RGB_MATRIX_RAINDROPS
+#define DISABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+#define DISABLE_RGB_MATRIX_TYPING_HEATMAP
+#define DISABLE_RGB_MATRIX_DIGITAL_RAIN
+#define DISABLE_RGB_MATRIX_SOLID_REACTIVE
+// #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#define DISABLE_RGB_MATRIX_SPLASH
+#define DISABLE_RGB_MATRIX_MULTISPLASH
+#define DISABLE_RGB_MATRIX_SOLID_SPLASH
+#define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH
+
+#define QMK_KEYS_PER_SCAN 4
+
+#define USB_LED_CAPS_LOCK_SCANCODE      30
+#endif
+
+#ifdef KEYBOARD_massdrop_alt
+#undef USB_LED_INDICATOR_ENABLE
+#endif
diff --git a/qmk/layouts/community/65_ansi_blocker_split_bs/brandonschlack-split/keymap.c b/qmk/layouts/community/65_ansi_blocker_split_bs/brandonschlack-split/keymap.c
new file mode 100644
index 00000000..9482b12c
--- /dev/null
+++ b/qmk/layouts/community/65_ansi_blocker_split_bs/brandonschlack-split/keymap.c
@@ -0,0 +1,104 @@
+/* Copyright 2020 Brandon Schlack
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+#include "brandonschlack.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/* Base Layer
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │Esc│! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│_ -│+ =│| \│~ `│Hom│
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
+ * │Tab  │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │{ [│} ]│ Bspc│PgU│
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+ * │HyCaps│ A │ S │ D │ F │ G │ H │ J │ K │ L │: ;│" '│   Enter│PgD│
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+ * │Shift   │ Z │ X │ C │ V │ B │ N │ M │< ,│> .│? /│ Shift│ Up│End│
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬┬┬───┼───┼───┤
+ * │Ctrl│ Opt│ Cmd│          Space         │Cmd │FnPy│││Lef│Dow│Rig│
+ * └────┴────┴────┴────────────────────────┴────┴────┴┴┴───┴───┴───┘
+ */
+[_BASE] = LAYOUT_65_ansi_blocker_split_bs( \
+    KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSLS, KC_GRV,  KC_HOME, \
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSPC, KC_PGUP, \
+    HY_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_PGDN, \
+    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_END,  \
+    KC_LCTL, KC_LOPT, KC_LCMD,                            KC_SPC,                    KC_RCMD, PLY_FN1,          KC_LEFT, KC_DOWN, KC_RGHT  \
+),
+/* Function Layer
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │Mke│ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│LHP│MNC│SlD│
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
+ * │RMod │RH+│RS+│RV+│AS+│   │   │   │   │   │F13│F14│F15│  Del│VlU│
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+ * │RTgl  │RH-│RS-│RV-│AS-│   │   │   │   │   │   │   │        │VlD│
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+ * │        │LYR│Thm│   │   │RST│   │   │Prv│Nxt│Ply│      │PgU│Mut│
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬┬┬───┼───┼───┤
+ * │    │    │    │                        │    │    │││Hom│PgD│End│
+ * └────┴────┴────┴────────────────────────┴────┴────┴┴┴───┴───┴───┘
+ */
+[_FN1] = LAYOUT_65_ansi_blocker_split_bs( \
+    QM_MAKE, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  MC_LHPD, MC_MSSN, MC_SLPD, \
+    RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, KC_F13,  KC_F14,  KC_F15,  KC_DELT, KC_VOLU, \
+    RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______,          _______, KC_VOLD, \
+    _______,          RGB_LYR, RGB_THM, _______, _______, RESET,   _______, _______, KC_MPRV, KC_MNXT, KC_MPLY, _______, KC_PGUP, KC_MUTE, \
+    _______, _______, _______,                            _______,                   _______, _______,          KC_HOME, KC_PGDN, KC_END   \
+),
+/* Blank Layout
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
+ * │     │   │   │   │   │   │   │   │   │   │   │   │   │     │   │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+ * │      │   │   │   │   │   │   │   │   │   │   │   │        │   │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+ * │        │   │   │   │   │   │   │   │   │   │   │      │   │   │
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬┬┬───┼───┼───┤
+ * │    │    │    │                        │    │    │││   │   │   │
+ * └────┴────┴────┴────────────────────────┴────┴────┴┴┴───┴───┴───┘
+[X] = LAYOUT_65_ansi_blocker_split_bs( \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, \
+    _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    _______, _______, _______,                            _______,                   _______, _______,          _______, _______, _______  \
+),
+*/
+};
+
+bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+    #ifdef KEYBOARD_massdrop
+        case RGB_TOG:
+            if (record->event.pressed) {
+                rgb_matrix_cycle_flag();
+            }
+            return false;
+    #endif
+        default:
+            return true; //Process all other keycodes normally
+    }
+}
+
+#ifdef RGB_MATRIX_ENABLE
+void rgb_matrix_indicators_user(void) {
+    if (IS_HOST_LED_ON(USB_LED_CAPS_LOCK)) {
+        rgb_matrix_set_color(USB_LED_CAPS_LOCK_SCANCODE, RGB_GREEN);
+    } else if (!HAS_ANY_FLAGS(rgb_matrix_get_flags(), LED_FLAG_KEYS)){
+        rgb_matrix_set_color(USB_LED_CAPS_LOCK_SCANCODE, 0, 0, 0);
+    }
+}
+#endif
diff --git a/qmk/layouts/community/65_ansi_blocker_split_bs/brandonschlack-split/readme.md b/qmk/layouts/community/65_ansi_blocker_split_bs/brandonschlack-split/readme.md
new file mode 100644
index 00000000..51c7938e
--- /dev/null
+++ b/qmk/layouts/community/65_ansi_blocker_split_bs/brandonschlack-split/readme.md
@@ -0,0 +1,15 @@
+# brandonschlack's 65% ANSI blocker split backspace layout
+
+This is my preferred 65% layout.
+
+It is used on:
+
+* [Massdrop ALT](https://github.com/qmk/qmk_firmware/tree/master/keyboards/massdrop/alt)     
+* [KBD67 MKII](https://github.com/qmk/qmk_firmware/tree/master/keyboards/kbdfans/kbd67/mkiirgb)  
+
+## [Base Layer](http://www.keyboard-layout-editor.com/#/gists/a820c8629394f8f4c3943e6ee518d9a8)
+![Base Layer](https://i.imgur.com/gPxDZl7.jpg)
+
+## [Function Layer](http://www.keyboard-layout-editor.com/#/gists/8ca73a6d3bec8ce736f5db60edf31dcf)
+![Function Layer](https://i.imgur.com/gNKHgWa.jpg)
+
diff --git a/qmk/layouts/community/65_ansi_blocker_split_bs/brandonschlack-split/rules.mk b/qmk/layouts/community/65_ansi_blocker_split_bs/brandonschlack-split/rules.mk
new file mode 100644
index 00000000..d12f9d5d
--- /dev/null
+++ b/qmk/layouts/community/65_ansi_blocker_split_bs/brandonschlack-split/rules.mk
@@ -0,0 +1,2 @@
+# Build Options
+USER_NAME := brandonschlack
diff --git a/qmk/layouts/community/75_ansi/brandonschlack/keymap.c b/qmk/layouts/community/75_ansi/brandonschlack/keymap.c
new file mode 100644
index 00000000..0f9d63c7
--- /dev/null
+++ b/qmk/layouts/community/75_ansi/brandonschlack/keymap.c
@@ -0,0 +1,105 @@
+/* Copyright 2020 Brandon Schlack
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+#include "brandonschlack.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/* LAYOUT
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │
+ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┴───┼───┤
+ * │   │   │   │   │   │   │   │   │   │   │   │   │   │  2.0U │   │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+ * │1.5U │   │   │   │   │   │   │   │   │   │   │   │   │1.5U │   │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+ * │1.75U │   │   │   │   │   │   │   │   │   │   │   │2.25U   │   │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+ * │2.25U   │   │   │   │   │   │   │   │   │   │   │1.75U │   │   │
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
+ * │1.25│1.25│1.25│6.25U                   │1U │1U │1U │1U │1U │1U │
+ * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
+ */
+
+ /* Base Layer
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │Esc│ F1│ F2│ F3│ F4│ F5│ F6│ F7│ F8│ F9│F10│F11│F12│F13│F14│F15│
+ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┴───┼───┤
+ * │~ `│! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│_ -│+ =│ Bckspc│Hom│
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+ * │Tab  │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │{ [│} ]│|   \│PgU│
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+ * │Caps  │ A │ S │ D │ F │ G │ H │ J │ K │ L │: ;│" '│   Enter│PgD│
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+ * │Shift   │ Z │ X │ C │ V │ B │ N │ M │< ,│> .│? /│ Shift│ Up│End│
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
+ * │Ctrl│ Opt│ Cmd│          Space         │Cmd│Opt│Fn │Lef│Dow│Rig│
+ * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
+ */
+[_BASE] = LAYOUT_75_ansi( \
+    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_F13,  KC_F14,  KC_F15,  \
+    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_HOME, \
+    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_PGUP, \
+    HY_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_PGDN, \
+    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_END,  \
+    KC_LCTL, KC_LOPT, KC_LCMD,                            KC_SPC,                             RWD_CMD, FFD_OPT, PLY_FN1, KC_LEFT, KC_DOWN, KC_RGHT  \
+),
+/* Function Layer
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │Mke│BrD│BrU│Msn│LHP│RV-│RV+│   │   │   │   │   │   │Prv│Nxt│Ply│
+ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┴───┼───┤
+ * │   │   │   │   │   │   │   │   │   │   │   │   │   │   Del │SlD│
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+ * │RMod │RH+│RS+│RV+│AS+│   │   │   │   │   │   │   │   │     │VlU│
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+ * │RTgl  │RH-│RS-│RV-│AS-│   │   │   │   │   │   │   │        │VlD│
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+ * │        │LYR│Thm│   │   │RST│   │   │   │   │   │      │PgU│Mte│
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
+ * │    │    │    │                        │   │   │   │Hom│PgD│End│
+ * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
+ */
+[_FN1] = LAYOUT_75_ansi( \
+    QM_MAKE, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______, KC_MPRV, KC_MNXT, KC_MPLY, \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_DELT, MC_SLPD, \
+    RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_VOLU, \
+    RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______,                   _______, KC_VOLD, \
+    _______,          RGB_LYR, RGB_THM, _______, _______, RESET,   _______, _______, _______, _______, _______, _______,          KC_PGUP, KC_MUTE, \
+    _______, _______, _______,                            _______,                            _______, _______, _______, KC_HOME, KC_PGDN, KC_END   \
+),
+/* Blank Layer
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+ * │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │
+ * ├───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┼───┴───┼───┤
+ * │   │   │   │   │   │   │   │   │   │   │   │   │   │       │   │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+ * │     │   │   │   │   │   │   │   │   │   │   │   │   │     │   │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+ * │      │   │   │   │   │   │   │   │   │   │   │   │        │   │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+ * │        │   │   │   │   │   │   │   │   │   │   │      │   │   │
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
+ * │    │    │    │                        │   │   │   │   │   │   │
+ * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
+[X] = LAYOUT_75_ansi( \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                   _______, _______, \
+    _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, \
+    _______, _______, _______,                            _______,                            _______, _______, _______, _______, _______, _______  \
+),
+*/
+};
diff --git a/qmk/layouts/community/75_ansi/brandonschlack/readme.md b/qmk/layouts/community/75_ansi/brandonschlack/readme.md
new file mode 100644
index 00000000..0dfb081b
--- /dev/null
+++ b/qmk/layouts/community/75_ansi/brandonschlack/readme.md
@@ -0,0 +1,7 @@
+# brandonschlack's 75_ansi layout
+
+This is my preferred 75% layout.
+
+It is currently used on:
+
+* [KBD75](https://github.com/qmk/qmk_firmware/tree/master/keyboards/kbdfans/kbd75)
diff --git a/qmk/layouts/community/75_ansi/brandonschlack/rules.mk b/qmk/layouts/community/75_ansi/brandonschlack/rules.mk
new file mode 100644
index 00000000..104063ed
--- /dev/null
+++ b/qmk/layouts/community/75_ansi/brandonschlack/rules.mk
@@ -0,0 +1,5 @@
+# Build Options
+ifneq (, $(findstring kbd75, $(KEYBOARD)))
+	MOUSEKEY_ENABLE = no
+endif
+BACKLIGHT_ENABLE = no   # No backlights installed
diff --git a/qmk/layouts/community/alice/stanrc85-alice/keymap.c b/qmk/layouts/community/alice/stanrc85-alice/keymap.c
index 2adaabcd..a2998f00 100644
--- a/qmk/layouts/community/alice/stanrc85-alice/keymap.c
+++ b/qmk/layouts/community/alice/stanrc85-alice/keymap.c
@@ -19,7 +19,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_QWERTY] = LAYOUT_alice(
-    KC_ESC,  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_ESC,  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_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_PGDN, KC_CTLE, 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_B,   KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(_FN2_60),
@@ -27,7 +27,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_DEFAULT] = LAYOUT_alice(
-    KC_ESC,  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_ESC,  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_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_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_B,   KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, MO(_FN2_60),
@@ -35,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_FN1_60] = LAYOUT_alice(
-    _______, KC_TILD,  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_DEL,
+    _______, KC_TILD,  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_DEL,
     _______, _______,  _______, CA_QUOT, KC_VOLU, CA_SCLN, _______,          _______, KC_HOME, KC_UP,   KC_END,  KC_PSCR, _______, _______, KC_INS,
     _______, KC_CAPS,  _______, KC_MUTE, KC_VOLD, KC_MPLY, _______,          _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______,          _______,
              _______,  KC_RDP,  _______, _______, _______, _______,          _______, _______, KC_WBAK, KC_WFWD, _______, _______, _______, _______,
@@ -43,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_FN2_60] = LAYOUT_alice(
-    BL_TOGG,  RGB_TOG, RGB_MOD, RGB_VAD, RGB_VAI, RGB_SAI, RGB_HUD,  RGB_HUI, _______, _______, _______, _______, _______, _______, _______, _______,
+    BL_TOGG,  RGB_TOG, RGB_MOD, RGB_VAD, RGB_VAI, RGB_SAI, RGB_HUD,  RGB_HUI, _______, _______, _______, _______, _______, _______,          _______,
     BL_INC,   VLK_TOG, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______, _______, RESET,
     BL_DEC,   _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______,          KC_MAKE,
               _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/qmk/layouts/community/ergodox/ab/keymap.c b/qmk/layouts/community/ergodox/ab/keymap.c
index d8d7accd..001123e2 100644
--- a/qmk/layouts/community/ergodox/ab/keymap.c
+++ b/qmk/layouts/community/ergodox/ab/keymap.c
@@ -89,10 +89,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 	KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS,
 	KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN3, KC_BTN2, KC_TRNS, KC_TRNS,
-	KC_TRNS, KC_TRNS, ZM_NRM,  ZM_OUT,  ZM_IN,
+	RESET, KC_TRNS, ZM_NRM,  ZM_OUT,  ZM_IN,
 	KC_TRNS, KC_TRNS,
 	KC_TRNS,
-	RESET,   KC_TRNS, KC_TRNS,
+	KC_TRNS, KC_TRNS, KC_TRNS,
 	// Right hand
 	KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_BSPC,
 	KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
diff --git a/qmk/layouts/community/ergodox/bocaj/config.h b/qmk/layouts/community/ergodox/bocaj/config.h
index bc1d20a6..621ae784 100644
--- a/qmk/layouts/community/ergodox/bocaj/config.h
+++ b/qmk/layouts/community/ergodox/bocaj/config.h
@@ -1,6 +1,4 @@
 #pragma once
 
-#include QMK_KEYBOARD_CONFIG_H
-
 #define LEADER_TIMEOUT 250
 #define LEADER_PER_KEY_TIMING
diff --git a/qmk/layouts/community/ergodox/bocaj/keymap.c b/qmk/layouts/community/ergodox/bocaj/keymap.c
index cb78e7aa..ba105a8f 100644
--- a/qmk/layouts/community/ergodox/bocaj/keymap.c
+++ b/qmk/layouts/community/ergodox/bocaj/keymap.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2018 Jacob Jerrell <jacob.jerrell@gmail.com> @JacobJerrell
+Copyright 2020 Jacob Jerrell <jacob.jerrell@gmail.com> @JacobJerrell
 
 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
@@ -15,182 +15,161 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include QMK_KEYBOARD_H
 #include "bocaj.h"
 
-#define LAYOUT_ergodox_pretty_base( \
-    K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, \
-    K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, \
-    K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A  \
-  ) \
-  LAYOUT_ergodox_pretty_wrapper( \
-      KC_ESC,  __________________NUMBER_LEFT_______________, JJ_ARRW,                 KC_MINS,  __________________NUMBER_RIGHT______________, KC_EQUAL,  \
-      KC_DEL,  K01,        K02,        K03,        K04, K05, KC_LPRN,                 KC_RPRN,  K06, K07,        K08,        K09,        K0A, KC_BSLASH, \
-      KC_NUMS, K11, SFT_T(K12),        K13, ALT_T(K14), K15,                                    K16, ALT_T(K17), K18,     SFT_T(K19),    K1A, KC_QUOT,   \
-      OS_LSFT, CTL_T(K21), K22,        K23,        K24, K25, HYP_LBK,                 MEH_RBK,  K26, K27,        K28,        K29, CTL_T(K2A), KC_RSFT,   \
-       KC_GAME,KC_NUMS,    TT(_LOWER), KC_UP,  KC_LEFT,                                            KC_RIGHT,   KC_DOWN,    UC_DISA,KC_GAME, KC_ADJS,     \
-                                                             KC_APP,KC_HOME,    KC_END,KC_ESC,           \
-                                                                    UC_FLIP,    UC_TABL,                \
-                                                 KC_SPACE,KC_BSPACE,KC_LEAD,    UC_SHRG,KC_TAB,KC_LWEN                          \
-)
-
-#define LAYOUT_ergodox_pretty_base_wrapper(...)       LAYOUT_ergodox_pretty_base(__VA_ARGS__)
+/*
+ * The `LAYOUT_ergodox_pretty_base` macro is a template to allow the use of
+ * identical modifiers for the default layouts (eg QWERTY, Colemak, Dvorak,
+ * etc), so that there is no need to set them up for each layout, and modify
+ * all of them if I want to change them.  This helps to keep consistency and
+ * ease of use. K## is a placeholder to pass through the individual keycodes
+ */
+#define LAYOUT_ergodox_bocaj(...)       WRAPPER_ergodox_bocaj(__VA_ARGS__)
+#define LAYOUT_ergodox_bocaj_WIN(...)   WRAPPER_ergodox_bocaj_WIN(__VA_ARGS__)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Workman - http://www.keyboard-layout-editor.com/#/gists/7a07cb982ec3597ba3e3d947554225f1
-                .---------------------------------------------.                                 .---------------------------------------------.
-                |  ESC  |  1  |  2  |  3  |  4  |  5  |   ->  |                                 !   -   |  6  |  7  |  8  |  9  |  0  |   =   |
-                !-------+-----+-----+-----+-----+-------------!                                 !-------+-----+-----+-----+-----+-----+-------!
-                |  DEL  |  Q  |  D  |  R  |  W  |  B  |   (   |                                 !   )   |  J  |  F  |  U  |  P  |  ;  |   \   |
-                !-------+-----+-----+-----x-----x-----!       !                                 !       !-----x-----x-----+-----+-----+-------!
-                |  NUMS |  A  |  S  |  H  |  T  |  G  |-------!                                 !-------!  Y  |  N  |  E  |  O  |  I  |   '   |
-                !-------+-----+-----+-----x-----x-----!  HYP  !                                 !  MEH  !-----x-----x-----+-----+-----+-------!
-                | SHIFT |  Z  |  X  |  M  |  C  |  V  |   [   |                                 !   ]   |  K  |  L  |  ,  |  .  |  /  | SHIFT |
-                '-------+-----+-----+-----+-----+-------------'                                 '-------------+-----+-----+-----+-----+-------'
-                 |      | NUM | LWR |  UP | LFT | .---------------.                         .---------------. ! RGT | DWN |     |GAME | ADJ  |
-                 '------------------------------' |   APP | HOME  |                         !  PGUP |  ESC  | '------------------------------'
-                                          .-------+-------+-------!                         !-------+-------+-------.
-                                          !       !       |  END  |                         !  PGDN |       ! ENTER !
-                                          ! SPACE ! BSPCE !-------!                         !-------!  TAB  !   /   !
-                                          |       |       | COPY  |                         ! PASTE |       | LOWER |
-                                          '-----------------------'                         '-----------------------'
-*/
-  [_WORKMAN] = LAYOUT_ergodox_pretty_base_wrapper(
-                 _________________WORKMAN_L1_________________,         _________________WORKMAN_R1_________________,
-                 _________________WORKMAN_L2_________________,         _________________WORKMAN_R2_________________,
-                 _________________WORKMAN_L3_________________,         _________________WORKMAN_R3_________________
-  ),
-  [_WINWORKMAN] = LAYOUT_ergodox_pretty_base_wrapper(
-                 _________________WORKMAN_L1_________________,         _________________WORKMAN_R1_________________,
-                 ________________WWORKMAN_L2_________________,         ________________WWORKMAN_R2_________________,
-                 _________________WORKMAN_L3_________________,         _________________WORKMAN_R3_________________
-  ),
-/* QWERTY - http://www.keyboard-layout-editor.com/#/gists/b6c016a22a9d31381a276a603a42fe5f
-                 .---------------------------------------------.                               .---------------------------------------------.
-                 |  ESC  |  1  |  2  |  3  |  4  |  5  |   ->  |                               !   -   |  6  |  7  |  8  |  9  |  0  |   =   |
-                 !-------+-----+-----+-----+-----+-------------!                               !-------+-----+-----+-----+-----+-----+-------!
-                 |  DEL  |  Q  |  W  |  E  |  R  |  T  |   (   |                               !   )   |  Y  |  U  |  I  |  O  |  P  |   \   |
-                 !-------+-----+-----+-----x-----x-----!       !                               !       !-----x-----x-----+-----+-----+-------!
-                 |  NUMS |  A  |  S  |  D  |  F  |  G  |-------!                               !-------!  H  |  J  |  K  |  L  |  ;  |   '   |
-                 !-------+-----+-----+-----x-----x-----!  HYP  !                               !  MEH  !-----x-----x-----+-----+-----+-------!
-                 | SHIFT |  Z  |  X  |  C  |  V  |  B  |   [   |                               !   ]   |  N  |  M  |  ,  |  .  |  /  | SHIFT |
-                 '-------+-----+-----+-----+-----+-------------'                               '-------------+-----+-----+-----+-----+-------'
-                  | GAME | NUM | LWR |  UP | LFT | .---------------.                       .---------------. ! RGT | DWN |     |     | ADJ  |
-                  '------------------------------' |   APP | HOME  |                       !  PGUP |  ESC  | '------------------------------'
-                                           .-------+-------+-------!                       !-------+-------+-------.
-                                           !       !       |  END  |                       !  PGDN |       ! ENTER !
-                                           ! SPACE ! BSPCE !-------!                       !-------!  TAB  !   /   !
-                                           |       |       | COPY  |                       ! PASTE |       | LOWER |
-                                           '-----------------------'                       '-----------------------'
-*/
-  [_QWERTY] = LAYOUT_ergodox_pretty_base_wrapper(
-                 _________________QWERTY_L1__________________,         _________________QWERTY_R1__________________,
-                 _________________QWERTY_L2__________________,         _________________QWERTY_R2__________________,
-                 _________________QWERTY_L3__________________,         _________________QWERTY_R3__________________
-  ),
-  [_LOWER] = LAYOUT_ergodox_pretty_wrapper(
-    KC_F11 ,__________________FUNCTION_LEFT_____________, _______,    _______, __________________FUNCTION_RIGHT____________,  KC_F12,
-    _______, _______, _______,  KC_UP, _______,  _______, _______,    _______, _______,   KC_7,    KC_8,    KC_9,   KC_PAST, _______,
-   LM_GRAVE, _______, KC_LEFT, KC_DOWN,KC_RIGHT, _______,                      _______,   KC_4,    KC_5,    KC_6,   KC_PPLS, _______,
-    OS_LSFT,____________________BLANK___________________, _______,    _______, _______,   KC_1,    KC_2,    KC_3,   KC_PMNS, _______,
-      ____________________BLANK___________________,                                       KC_0,    KC_PDOT, KC_COMM,KC_PEQL, _______,
-                                                _______, _______,      _______, _______,
-                                                         _______,      _______,
-                                       _______, _______, _______,      _______, _______, _______
-  ),
-/* Adjust - http://www.keyboard-layout-editor.com/#/gists/dedeae17b35a5d5f745a42aaea78f007
-            .---------------------------------------------.                                              .---------------------------------------------.
-            | MAKE  |     |     |     |     |     | RESET |                                              !  EPRM |     |     |     |     |     |       |
-            !-------+-----+-----+-----+-----+-------------!                                              !-------+-----+-----+-----+-----+-----+-------!
-            |       |     |     |     |     |     |       |                                              !       |     |     |     |     |     |       |
-            !-------+-----+-----+-----x-----x-----!       !                                              !       !-----x-----x-----+-----+-----+-------!
-            |       | 🔇  |  🔉  | 🔊  | LCK |     |-------!                                              !-------!     |     |     |     |     | QWRTY |
-            !-------+-----+-----+-----x-----x-----!       !                                              !       !-----x-----x-----+-----+-----+-------!
-            |       |     |     |     |     |     |       |                                              !       |     |     |     |     | WIN | WRKMN |
-            '-------+-----+-----+-----+-----+-------------'                                              '-------------+-----+-----+-----+-----+-------'
-             |      |     |     |     |     | .---------------.                                      .---------------. !     |     |     |     |      |
-             '------------------------------' |       |       |                                      !       |       | '------------------------------'
-                                      .-------+-------+-------!                                      !-------+-------+-------.
-                                      !       !       |       |                                      !       |       !       !
-                                      !       !       !-------!                                      !-------!       !       !
-                                      |       |       |       |                                      !       |       |       |
-                                      '-----------------------'                                      '-----------------------'
-*/
-  [_ADJUST] = LAYOUT_ergodox_pretty_wrapper(
-    KC_MAKE,  ____________________BLANK___________________,  KC_RST,    KC_EPRM, ____________________BLANK___________________, XXXXXXX,
-    _______,  ____________________BLANK___________________, _______,    _______, ____________________BLANK___________________, XXXXXXX,
-    _______,KC__MUTE,KC__VOLDOWN,KC__VOLUP,MC_LOCK,_______,                      ____________________BLANK___________________, KC_MQWR,
-    _______,  ____________________BLANK___________________, _______,    _______, _______, _______, _______, _______,  KC_WWRK, KC_MWRK,
-      ____________________BLANK___________________,                                     ____________________BLANK___________________,
-                                                  _______, _______,      _______, _______,
-                                                           _______,      _______,
-                                         _______, _______, _______,      _______, _______, _______
-  ),
-  [_DIABLO] = LAYOUT_ergodox_pretty_wrapper(
-             KC_ESC,  KC_V,    KC_D,    KC_LALT, KC_NO,   KC_NO,   KC_NO,                   KC_NO,   KC_F9,   KC_F10,   KC_F11,  KC_F12,  KC_NO,   KC_NO,
-             KC_TAB,  KC_S,    KC_F,    KC_I,    KC_M,    KC_T,    KC_ENTER,                KC_NO,   KC_NO,   KC_NO,    KC_NO,   KC_NO,   KC_NO,   KC_NO,
-             KC_Q,    KC_1,    KC_2,    KC_3,    KC_4,    KC_P,                                      KC_NO,   KC_NO,    KC_NO,   KC_NO,   KC_NO,   KC_NO,
-             KC_LCTL, KC_D3_1, KC_D3_2, KC_D3_3, KC_D3_4, KC_Z,    KC_LOCK,                 KC_NO,   KC_N,    KC_M,     KC_NO,   KC_NO,   KC_NO,   KC_NO,
-             _______, KC_NO,   KC_NO,   KC_NO,   KC_NO,                                                         KC_NO,    KC_NO,   KC_NO,   KC_TRNS, KC_NO,
-                                                             KC_L,    KC_J,                 KC_NO,   KC_NO,
-                                                                      KC_F,                 KC_NO,
-                                     SFT_T(KC_SPACE),  ALT_T(KC_Q),   KC_DCLR,              KC_PGDN, KC_DEL,  KC_ENT
-  )
+
+    [_WORKMAN] = LAYOUT_ergodox_bocaj(
+        KC_ESC, ________________NUMBER_LEFT________________, KC_ARRW,     KC_MINS, ________________NUMBER_RIGHT_______________, KC_EQUAL,
+        KC_DEL, _________________WORKMAN_L1________________, KC_LPRN,     KC_RPRN, _________________WORKMAN_R1________________, KC_BSLS,
+       _______, _________________WORKMAN_L2________________,                       _________________WORKMAN_R2________________, KC_QUOT,
+       KC_LSFT, _________________WORKMAN_L3________________, KC_LBRC,     KC_RBRC, _________________WORKMAN_R3________________, _______,
+        MO_MOD, KC_PGUP, KC_HOME, KC_UP, KC_LEFT,                                          KC_RIGHT, KC_DOWN, KC_END, KC_PGDN, WORKMAN,
+                                              KC_APP,KC_HOME, /* <- LHS/RHS -> */ KC_END,KC_ESC,
+                                                     KC_PGUP, /* <- LHS/RHS -> */ KC_PGDN,
+                                  KC_SPACE,KC_BSPACE,KC_LEAD, /* <- LHS/RHS -> */ KC_LOCK,KC_TAB,KC_ENTER
+    ),
+
+    [_WWORKMAN] = LAYOUT_ergodox_bocaj_WIN(
+        KC_ESC, ________________NUMBER_LEFT________________, KC_ARRW,     KC_MINS, ________________NUMBER_RIGHT_______________, KC_EQUAL,
+        KC_DEL, _________________WORKMAN_L1________________, KC_LPRN,     KC_RPRN, _________________WORKMAN_R1________________, KC_BSLS,
+       _______, _________________WORKMAN_L2________________,                       _________________WORKMAN_R2________________, KC_QUOT,
+       KC_LSFT, _________________WORKMAN_L3________________, KC_LBRC,     KC_RBRC, _________________WORKMAN_R3________________, _______,
+        MO_MOD, KC_PGUP, KC_HOME, KC_UP, KC_LEFT,                                          KC_RIGHT, KC_DOWN, KC_END, KC_PGDN, WORKMAN,
+                                              KC_APP,KC_HOME, /* <- LHS/RHS -> */ KC_END,KC_ESC,
+                                                     KC_PGUP, /* <- LHS/RHS -> */ KC_PGDN,
+                                  KC_SPACE,KC_BSPACE,KC_LEAD, /* <- LHS/RHS -> */ KC_LOCK,KC_TAB,KC_ENTER
+    ),
+
+    [_LOWER] = LAYOUT_ergodox_bocaj(
+        KC_GRV, _______, _______, _______, _______,  _______, _______,     _______, _______, _______, _______, _______, _______, _______,
+       _______, _______, _______, KC_UP,   _______,  _______, _______,     _______, _______, KC_7,    KC_8,    KC_9,    KC_BSLS, _______,
+       _______, _______, KC_LEFT, KC_DOWN, KC_RIGHT, _______,                       _______, KC_4,    KC_5,    KC_6,    KC_ASTR, _______,
+       _______, _______, _______, _______, _______,  _______, _______,     _______, _______, KC_1,    KC_2,    KC_3,    KC_PLUS, _______,
+       _______, _______, _______, _______,  _______,                                         KC_0,    KC_DOT,  KC_COMM, KC_MINS, _______,
+                                               KC_APP,KC_HOME, /* <- LHS/RHS -> */ KC_END,KC_ESC,
+                                                      KC_PGUP, /* <- LHS/RHS -> */ KC_PGDN,
+                                   KC_SPACE,KC_BSPACE,KC_LEAD, /* <- LHS/RHS -> */ KC_LOCK,KC_TAB,KC_ENTER
+    ),
+
+    [_RAISE] = LAYOUT_ergodox_bocaj(
+        KC_TILD, _________________RAISE_L1__________________, _______,         _______, _________________RAISE_R1__________________, _______,
+         KC_F11, _________________RAISE_L2__________________, _______,         _______, _________________RAISE_R2__________________, KC_F12,
+        _______, _________________RAISE_L3__________________,                           _________________RAISE_R3__________________, _______,
+        _______, _______, KC_MRWD, KC_MPLY, KC_MFFD, _______, _______,         _______, ___________________BLANK___________________, _______,
+        ___________________BLANK___________________,                                             ___________________BLANK___________________,
+                                                 KC_APP,KC_HOME, /* <- LHS/RHS -> */ KC_END,KC_ESC,
+                                                        KC_PGUP, /* <- LHS/RHS -> */ KC_PGDN,
+                                     KC_SPACE,KC_BSPACE,KC_LEAD, /* <- LHS/RHS -> */ KC_LOCK,KC_TAB,KC_ENTER
+    ),
+
+    [_ADJUST] = LAYOUT_ergodox_pretty(
+        KC_MAKE, _______,  _______,     _______,   _______, _______, _______,       _______, _______, _______, _______, _______, _______, KC_RST,
+        VRSN,    _______,  _______,     _______,   _______, _______, _______,       _______, _______, _______, _______, _______, _______, EEP_RST,
+        _______, KC__MUTE, KC__VOLDOWN, KC__VOLUP, _______, KC_MNXT,                         _______, _______, _______, _______, _______, _______,
+        _______, _______,  _______,     _______,   _______, _______, _______,       _______, _______, _______, _______, _______, _______, _______,
+        _______, _______,  _______,     _______,   _______,                                           _______, _______, _______, _______, _______,
+                                              KC_APP,KC_HOME, /* <- LHS/RHS -> */ KC_END,KC_ESC,
+                                                     KC_PGUP, /* <- LHS/RHS -> */ KC_PGDN,
+                                  KC_SPACE,KC_BSPACE,KC_LEAD, /* <- LHS/RHS -> */ KC_LOCK,KC_TAB,KC_ENTER
+    ),
+
+    // Wrapping Mouse-Wheel Keys with `X_T()` style functions seems
+    // to break the mouse button. So we can't use the wrapper here.
+    [_MOD] = LAYOUT_ergodox_pretty(
+        _______, _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, KC_WH_D, _______, _______, _______,           _______, _______, _______, KC_MS_U, _______, _______, _______,
+        _______, _______, KC_WH_L, KC_WH_U, KC_WH_R, _______,                             _______, KC_MS_L, KC_MS_D, KC_MS_R, _______, _______,
+        _______, _______, _______, _______, _______, _______, _______,           _______, _______, _______, _______, _______, _______, _______,
+        _______, _______, _______, _______, KC_ACL0,                                               KC_ACL1, KC_ACL2, _______, _______, _______,
+                                                 _______,_______, /* <- LHS/RHS -> */ _______,_______,
+                                                         _______, /* <- LHS/RHS -> */ _______,
+                                         KC_BTN1,KC_BTN2,_______, /* <- LHS/RHS -> */ _______,KC_BTN3,KC_BTN4
+    )
+
 };
+// clang-format on
 
 bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
-  return true;
+    return true;
 }
 
 void matrix_init_keymap(void) {};
 
-void matrix_scan_keymap(void) {
-  uint8_t modifiers = get_mods();
-  uint8_t led_usb_state = host_keyboard_leds();
-  uint8_t one_shot = get_oneshot_mods();
-  uint8_t layer = biton32(layer_state);
+// Runs whenever there is a layer state change.
+layer_state_t layer_state_set_keymap(layer_state_t state) {
+    ergodox_board_led_off();
+    ergodox_right_led_1_off();
+    ergodox_right_led_2_off();
+    ergodox_right_led_3_off();
 
-  ergodox_board_led_off();
-  ergodox_right_led_1_off();
-  ergodox_right_led_2_off();
-  ergodox_right_led_3_off();
+    uint8_t layer = get_highest_layer(state);
+    switch (layer) {
+        case _LOWER:
+            ergodox_right_led_3_on();
+            break;
+        case _MOD:
+            ergodox_right_led_2_on();
+            break;
+        case _RAISE:
+            ergodox_right_led_1_on();
+            break;
+        case _ADJUST:
+            ergodox_right_led_1_on();
+            ergodox_right_led_2_on();
+            break;
+        default:
+            break;
+    }
 
-  switch (layer) {
-    case _WORKMAN:
-    case _QWERTY:
-    case _WINWORKMAN:
-      if (modifiers & MODS_SHIFT_MASK || led_usb_state & (1<<USB_LED_CAPS_LOCK) || one_shot & MODS_SHIFT_MASK) {
-        ergodox_right_led_1_on();
-        ergodox_right_led_1_set( 25 );
-      }
-      if (modifiers & MODS_CTRL_MASK || one_shot & MODS_CTRL_MASK || modifiers & MODS_GUI_MASK || one_shot & MODS_GUI_MASK) {
-        if ((modifiers & MODS_CTRL_MASK || one_shot & MODS_CTRL_MASK) && (modifiers & MODS_GUI_MASK || one_shot & MODS_GUI_MASK)) {
-          ergodox_right_led_2_on();
-          ergodox_right_led_2_set( 50 );
-        } else {
-          ergodox_right_led_2_on();
-          ergodox_right_led_2_set( 10 );
-        }
-      }
-      if (modifiers & MODS_ALT_MASK || one_shot & MODS_ALT_MASK) {
-        ergodox_right_led_3_on();
-        ergodox_right_led_3_set( 10 );
-      }
-      break;
-    case _LOWER:
-      ergodox_right_led_3_on();
-      ergodox_right_led_3_set(10); // Default brightness is deadly in a dark room
-      break;
-    case _ADJUST:
-      ergodox_right_led_2_on();
-      ergodox_right_led_2_set(10);
-      break;
-    case _DIABLO:
-      ergodox_right_led_1_on();
-      ergodox_right_led_1_set(10);
-      break;
-    default:
-      // none
-      break;
-  }
+    ergodox_right_led_1_set(25);
+    ergodox_right_led_2_set(25);
+    ergodox_right_led_3_set(25);
+
+    return state;
+};
+
+void matrix_scan_keymap(void) {
+    uint8_t modifiers = get_mods();
+    uint8_t led_usb_state = host_keyboard_leds();
+    uint8_t one_shot = get_oneshot_mods();
+    uint8_t layer_is_workman = layer_state_is(_WORKMAN);
+
+    if ((modifiers) && (layer_is_workman)) {
+        if (modifiers & MODS_SHIFT_MASK || led_usb_state & (1<<USB_LED_CAPS_LOCK) || one_shot & MODS_SHIFT_MASK) {
+            ergodox_right_led_1_on();
+            ergodox_right_led_1_set( 25 );
+        } else {
+            ergodox_right_led_1_off();
+        }
+        if ((modifiers & MODS_CTRL_MASK || one_shot & MODS_CTRL_MASK) && (modifiers & MODS_GUI_MASK || one_shot & MODS_GUI_MASK)) {
+            ergodox_right_led_2_on();
+            ergodox_right_led_2_set( 50 );
+        } else if ((modifiers & MODS_CTRL_MASK || one_shot & MODS_CTRL_MASK) || (modifiers & MODS_GUI_MASK || one_shot & MODS_GUI_MASK)) {
+            ergodox_right_led_2_on();
+            ergodox_right_led_2_set( 10 );
+        } else {
+            ergodox_right_led_2_off();
+        }
+        if (modifiers & MODS_ALT_MASK || one_shot & MODS_ALT_MASK) {
+            ergodox_right_led_3_on();
+            ergodox_right_led_3_set( 10 );
+        } else {
+            ergodox_right_led_3_off();
+        }
+    } else if (!(modifiers) && (layer_is_workman)) {
+        ergodox_right_led_1_off();
+        ergodox_right_led_2_off();
+        ergodox_right_led_3_off();
+    }
 };
diff --git a/qmk/layouts/community/ergodox/bocaj/readme.md b/qmk/layouts/community/ergodox/bocaj/readme.md
index 90182272..f8bce4e5 100644
--- a/qmk/layouts/community/ergodox/bocaj/readme.md
+++ b/qmk/layouts/community/ergodox/bocaj/readme.md
@@ -1,37 +1,28 @@
-# Bocaj Layout
+# Overview
 
-While I've put my own spin on most things, much of the credit for these ideas belongs to Drashna and/or the people he derived things from. Please see his [layout](../drashna/) and [userspace](../../../../users/drashna/) for lots of ideas and inspiration.
+This is my personal Ergodox EZ configuration, and my daily driver.
 
-## Layers Overview
+Most of the code resides in my userspace and is heavily based upon [Drashna's work](https://github.com/qmk/qmk_firmware/tree/master/users/drashna)... although considerably slimmed down.
 
-* Default
-  * Workman
-  * Qwerty
-  * Windows Workman (swaps GUI and CTRL buttons)
-* Lower
-  * F1-12 Top Row
-  * Grave / Layer Switch macro at Caps Lock position
-  * Navigation at QWERTY 'ESDF' position
-  * Numpad under right hand
-* Adjust
-  * Volume Control
-  * Mac Lock Macro
-  * Make / Reset/ EEPROM keys
-  * Default Layer changing keys
-  * Diablo Layer
-    * Moved shortcuts within left hands reach
-    * Macros to spam 1-4 every ~1 second
-    * Shift in thumb cluster to prevent pinky fatique
+## How to build
 
-## LEDs Overview
+Put simply:
+`make ergodox_ez:bocaj`
 
-* Used for _LOWER, _ADJUST, and _DIABLO layer indication
-* Used for Ctrl/GUI, Shift, and Alt indication when on a default layer
+On that note, I use a separate workspace when making changes to my layouts or userspace. In that repo, there is a tool that does this for me. See [JacobJerrell/qmk_layouts/tools/](https://github.com/JacobJerrell/qmk_layouts/tree/master/tools)
 
-## Wrappers Overview
+## Layers
 
-While it isn't a novel idea, I feel the need to mention it because it really appeals to me as a person that doesn't like repetitive code.
+* WORKMAN: No one uses this board but me and I've never had a reason to switch to QWERTY
+* LOWER:
+  * Left: Grave and navigation arrows
+  * Right: Numpad
+* RAISE:
+  * Symbols across the top, F-Keys on the second row
+* ADJUST
+  * Audio control, make/reset/version macros
+* MOD: mouse navigation
 
-We've all come to know and love the pretty wrapper for Ergodox because it makes for such a beautiful, self-documenting keymap. In this keymap, we are building ontop of the pretty wrapper to wrap our default layers with our keys that aren't unique to the layer.
+## Ergodox Specifics
 
-Now you can wrap your keymap with `LAYOUT_ergodox_pretty_base_wrapper()` and only feed it the alpha keys, having the top, side, bottom, and thumb clusters automatically filled in. If you make a key to any of the top, side, bottom, or thumb cluster keys, it will propegate to all layers that have this wrapper, or have KC_TRNS keycodes in the same location
+I don't have the underglow or backlit versions so the 3 LEDs on the right board are used for layer indication if not on the base layer. If you're on the base layer, they're used for mod-key indicators.
diff --git a/qmk/layouts/community/ergodox/bocaj/rules.mk b/qmk/layouts/community/ergodox/bocaj/rules.mk
index aa67ad9e..88eaf39f 100644
--- a/qmk/layouts/community/ergodox/bocaj/rules.mk
+++ b/qmk/layouts/community/ergodox/bocaj/rules.mk
@@ -1,11 +1,14 @@
-AUTO_SHIFT_ENABLE = no
-COMMAND_ENABLE = no
-SWAP_HANDS_ENABLE = no
-TAP_DANCE_ENABLE = yes
-EXTRAKEY_ENABLE = no
-KEY_LOCK_ENABLE = yes
-LEADER_ENABLE = yes
+BOOTMAGIC_ENABLE   = yes
+TAP_DANCE_ENABLE   = no
+COMMAND_ENABLE     = no  # Commands for debug and configuration
+CONSOLE_ENABLE 	   = yes
+SPACE_CADET_ENABLE = no
+KEY_LOCK_ENABLE    = yes
+MOUSEKEY_ENABLE    = yes
+EXTRAKEY_ENABLE	   = yes
+LEADER_ENABLE	   = yes
 
-UNICODE_ENABLE    = yes
-UNICODEMAP_ENABLE = no
-UCIS_ENABLE = no
+UNICODE_ENABLE     = no
+UNICODEMAP_ENABLE  = no
+RGB_MATRIX_ENABLE  = no
+RGBLIGHT_ENABLE    = no
diff --git a/qmk/layouts/community/ortho_4x12/bocaj/config.h b/qmk/layouts/community/ortho_4x12/bocaj/config.h
new file mode 100644
index 00000000..2f5b7319
--- /dev/null
+++ b/qmk/layouts/community/ortho_4x12/bocaj/config.h
@@ -0,0 +1,109 @@
+#pragma once
+
+#define LEADER_TIMEOUT 250
+#define LEADER_PER_KEY_TIMING
+
+#if defined(RGBLIGHT_ENABLE) && !defined(RGBLED_NUM)
+#    if defined(KEYBOARD_planck_light)
+#        define RGB_DI_PIN A0
+#        define RGBLED_NUM 13  // Number of LEDs
+#    endif
+#    define RGBLIGHT_HUE_STEP 12
+#    define RGBLIGHT_SAT_STEP 12
+#    define RGBLIGHT_VAL_STEP 12
+#    define RGBLIGHT_EFFECT_KNIGHT_LENGTH 2
+#    define RGBLIGHT_EFFECT_SNAKE_LENGTH 2
+#    ifdef RGB_MATRIX_ENABLE
+#        define RGBLIGHT_DISABLE_KEYCODES
+#    endif
+#endif  // RGBLIGHT_ENABLE
+
+#ifdef RGB_MATRIX_ENABLE
+#    define RGB_MATRIX_KEYPRESSES  // reacts to keypresses (will slow down matrix scan by a lot)
+// #define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (not recommened)
+#    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+// #define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
+// #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 RGB_DISABLE_WHEN_USB_SUSPENDED true  // turn off effects when suspended
+#    undef RGB_MATRIX_LED_PROCESS_LIMIT
+#    undef RGB_MATRIX_LED_FLUSH_LIMIT
+#endif
+
+#if defined(KEYBOARD_planck_ez)
+#    undef PRODUCT
+#    define PRODUCT Bocaj Hacked Planck EZ
+#endif
+
+#define EEPROM_I2C_RM24C512C
+
+#define ENCODER_DIRECTION_FLIP
+/*
+ * MIDI options
+ */
+
+/* Prevent use of disabled MIDI features in the keymap */
+//#define MIDI_ENABLE_STRICT 1
+
+/* enable basic MIDI features:
+   - MIDI notes can be sent when in Music mode is on
+*/
+
+// #define MIDI_BASIC
+
+/* enable advanced MIDI features:
+   - MIDI notes can be added to the keymap
+   - Octave shift and transpose
+   - Virtual sustain, portamento, and modulation wheel
+   - etc.
+*/
+//#define MIDI_ADVANCED
+
+/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
+//#define MIDI_TONE_KEYCODE_OCTAVES 2
+
+#define FB_ERM_LRA 1     /* For ERM:0 or LRA:1*/
+#define FB_BRAKEFACTOR 6 /* For 1x:0, 2x:1, 3x:2, 4x:3, 6x:4, 8x:5, 16x:6, Disable Braking:7 */
+#define FB_LOOPGAIN 1    /* For  Low:0, Medium:1, High:2, Very High:3 */
+
+/* default 3V ERM vibration motor voltage and library*/
+#if FB_ERM_LRA == 0
+#    define RATED_VOLTAGE 3
+#    define V_RMS 2.3
+#    define V_PEAK 3.30
+/* Library Selection */
+#    define LIB_SELECTION 4 /* For Empty:0' TS2200 library A to D:1-5, LRA Library: 6 */
+
+/* default 2V LRA voltage and library */
+#elif FB_ERM_LRA == 1
+#    define RATED_VOLTAGE 2
+#    define V_RMS 2.0
+#    define V_PEAK 2.85
+#    define F_LRA 200
+/* Library Selection */
+#    define LIB_SELECTION 6 /* For Empty:0' TS2200 library A to D:1-5, LRA Library: 6 */
+
+#endif
+
+/* Control 1 register settings */
+#define DRIVE_TIME 25
+#define AC_COUPLE 0
+#define STARTUP_BOOST 1
+
+/* Control 2 Settings */
+#define BIDIR_INPUT 1
+#define BRAKE_STAB 1 /* Loopgain is reduced when braking is almost complete to improve stability */
+#define SAMPLE_TIME 3
+#define BLANKING_TIME 1
+#define IDISS_TIME 1
+
+/* Control 3 settings */
+#define NG_THRESH 2
+#define ERM_OPEN_LOOP 1
+#define SUPPLY_COMP_DIS 0
+#define DATA_FORMAT_RTO 0
+#define LRA_DRIVE_MODE 0
+#define N_PWM_ANALOG 0
+#define LRA_OPEN_LOOP 0
+/* Control 4 settings */
+#define ZC_DET_TIME 0
+#define AUTO_CAL_TIME 3
diff --git a/qmk/layouts/community/ortho_4x12/bocaj/keymap.c b/qmk/layouts/community/ortho_4x12/bocaj/keymap.c
new file mode 100644
index 00000000..0ac22b4c
--- /dev/null
+++ b/qmk/layouts/community/ortho_4x12/bocaj/keymap.c
@@ -0,0 +1,286 @@
+/*
+Copyright 2020 Jacob Jerrell <jacob.jerrell@gmail.com> @JacobJerrell
+
+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 "bocaj.h"
+
+#ifdef BACKLIGHT_ENABLE
+enum planck_keycodes {
+    BACKLIT = NEW_SAFE_RANGE,
+    TH_LVL,
+};
+
+#else
+#    define BACKLIT OSM(MOD_LSFT)
+enum planck_keycodes {
+    TH_LVL = NEW_SAFE_RANGE,
+};
+#endif
+
+/*
+ * Tap/Hold Wrapper
+ * ,-----------------------------------------------------------------------------------.
+ * |      |      |      |      |      |      |      |      |      |      |      |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |Shift | Cmd  | Alt  |      |      | Alt  | Cmd  |Shift |      |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      | Ctrl |      |      |      |      |      |      |      |      | Ctrl |      |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |      |      |      |      |Lower |             |Raise |      |      |      |      |
+ * `-----------------------------------------------------------------------------------'
+ */
+#define LAYOUT_ortho_4x12_bocaj(...) WRAPPER_planck_bocaj(__VA_ARGS__)
+
+/*
+ * Base Alphanumeric Wrapper + Tap/Hold Wrapper
+ * ,-----------------------------------------------------------------------------------.
+ * |  Esc |      |      |      |      |      |      |      |      |      |      |  -   |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * |  Tab |      |      |      |      | HYPR | MEH  |      |      |      |      |  '   |
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | Shift|      |      |      |      |      |      |      |      |      |      | TTMOD|
+ * |------+------+------+------+------+------+------+------+------+------+------+------|
+ * | MOMOD| Lead |  Up  | Left |BkSpc |    Space    |Enter |Right | Down | XXX  | XXX  |
+ * `-----------------------------------------------------------------------------------'
+ */
+#define LAYOUT_ortho_4x12_bocaj_base(...) WRAPPER_planck_bocaj_base(__VA_ARGS__)
+#define LAYOUT_ortho_4x12_bocaj_base_WIN(...) WRAPPER_planck_bocaj_base_WIN(__VA_ARGS__)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  [_WORKMAN] = LAYOUT_ortho_4x12_bocaj_base(
+    _________________WORKMAN_L1________________, _________________WORKMAN_R1________________,
+    _________________WORKMAN_L2________________, _________________WORKMAN_R2________________,
+    _________________WORKMAN_L3________________, _________________WORKMAN_R3________________
+  ),
+  [_WWORKMAN] = LAYOUT_ortho_4x12_bocaj_base_WIN(
+    _________________WORKMAN_L1________________, _________________WORKMAN_R1________________,
+    _________________WORKMAN_L2________________, _________________WORKMAN_R2________________,
+    _________________WORKMAN_L3________________, _________________WORKMAN_R3________________
+  ),
+
+  [_QWERTY] = LAYOUT_ortho_4x12_bocaj_base(
+    _________________QWERTY_L1_________________, _________________QWERTY_R1_________________,
+    _________________QWERTY_L2_________________, _________________QWERTY_R2_________________,
+    _________________QWERTY_L3_________________, _________________QWERTY_R3_________________
+  ),
+  [_WQWERTY] = LAYOUT_ortho_4x12_bocaj_base_WIN(
+    _________________QWERTY_L1_________________, _________________QWERTY_R1_________________,
+    _________________QWERTY_L2_________________, _________________QWERTY_R2_________________,
+    _________________QWERTY_L3_________________, _________________QWERTY_R3_________________
+  ),
+
+  [_LOWER] = LAYOUT_ortho_4x12_bocaj(
+    ___________________LOWER_L1_EXT____________________, ___________________LOWER_R1_EXT____________________,
+    ___________________LOWER_L2_EXT____________________, ___________________LOWER_R2_EXT____________________,
+    ___________________LOWER_L3_EXT____________________, ___________________LOWER_R3_EXT____________________,
+    _______, _______, _______, _______, _______,     _______,      KC_0,  KC_DOT,  KC_COMM, _______, _______
+  ),
+
+  [_RAISE] = LAYOUT_ortho_4x12_bocaj(
+    KC_TILD, _________________RAISE_L1__________________, _________________RAISE_R1__________________, KC_EQUAL,
+    KC_F11,  _________________RAISE_L2__________________, _________________RAISE_R2__________________, KC_F12,
+    _______, _________________RAISE_L3__________________, _________________RAISE_R3__________________, _______,
+    _______, _______, _______, _______, _______,     _______,      _______, _______, _______, _______, _______
+  ),
+
+  [_ADJUST] = WRAPPER_ortho_4x12(
+    KC_MAKE, _________________ADJUST_L1_________________, _________________ADJUST_R1_________________, KC_RST,
+    VRSN,    _________________ADJUST_L2_________________, _________________ADJUST_R2_________________, EEP_RST,
+    TH_LVL,  _________________ADJUST_L3_________________, _________________ADJUST_R3_________________, RGB_IDL,
+    HPT_TOG, _______, _______, _______, _______,     _______,      _______, _______, _______, _______, _______
+  )
+
+};
+// clang-format on
+
+bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+#ifdef BACKLIGHT_ENABLE
+        case BACKLIT:
+            if (record->event.pressed) {
+                register_code(KC_RSFT);
+#    ifdef BACKLIGHT_ENABLE
+                backlight_step();
+#    endif
+            } else {
+                unregister_code(KC_RSFT);
+            }
+            break;
+#endif
+#ifdef KEYBOARD_planck_ez
+        case TH_LVL:
+            if (record->event.pressed) {
+                keyboard_config.led_level++;
+                if (keyboard_config.led_level > 4) {
+                    keyboard_config.led_level = 0;
+                }
+                planck_ez_right_led_level((uint8_t)keyboard_config.led_level * 255 / 4);
+                planck_ez_left_led_level((uint8_t)keyboard_config.led_level * 255 / 4);
+                eeconfig_update_kb(keyboard_config.raw);
+                layer_state_set_kb(layer_state);
+            }
+            break;
+#endif
+    }
+    return true;
+}
+
+bool music_mask_user(uint16_t keycode) {
+    switch (keycode) {
+        default:
+            return true;
+    }
+}
+
+#ifdef RGB_MATRIX_ENABLE
+
+// clang-format off
+void suspend_power_down_keymap(void) {
+    rgb_matrix_set_suspend_state(true);
+}
+
+void suspend_wakeup_init_keymap(void) {
+    rgb_matrix_set_suspend_state(false);
+}
+// clang-format on
+
+void rgb_matrix_indicators_user(void) {
+    uint8_t this_mod = get_mods();
+    uint8_t this_led = host_keyboard_leds();
+    uint8_t this_osm = get_oneshot_mods();
+    bool    is_ez;
+#    ifdef KEYBOARD_planck_ez
+    is_ez = true;
+#    endif
+
+    if (g_suspend_state || !rgb_matrix_config.enable) return;
+
+#    if defined(RGBLIGHT_ENABLE)
+    if (!userspace_config.rgb_layer_change)
+#    else
+    if (userspace_config.rgb_layer_change)
+#    endif
+    {
+        switch (get_highest_layer(layer_state)) {
+            case _MOD:
+                rgb_matrix_layer_helper(HSV_ORANGE, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER);
+                break;
+            case _RAISE:
+                rgb_matrix_layer_helper(HSV_BLUE, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER);
+                break;
+            case _LOWER:
+                rgb_matrix_layer_helper(HSV_GREEN, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER);
+                break;
+            case _ADJUST:
+                rgb_matrix_layer_helper(HSV_RED, 1, rgb_matrix_config.speed, LED_FLAG_MODIFIER);
+                break;
+            default: {
+                bool mods_enabled = false;
+                switch (get_highest_layer(default_layer_state)) {
+                    case _QWERTY:
+                        rgb_matrix_layer_helper(HSV_CYAN, mods_enabled, rgb_matrix_config.speed, LED_FLAG_MODIFIER);
+                        break;
+                    case _WQWERTY:
+                        rgb_matrix_layer_helper(HSV_BLUE, mods_enabled, rgb_matrix_config.speed, LED_FLAG_MODIFIER);
+                        break;
+                    case _WORKMAN:
+                        rgb_matrix_layer_helper(HSV_SPRINGGREEN, mods_enabled, rgb_matrix_config.speed, LED_FLAG_MODIFIER);
+                        break;
+                    case _WWORKMAN:
+                        rgb_matrix_layer_helper(HSV_GREEN, mods_enabled, rgb_matrix_config.speed, LED_FLAG_MODIFIER);
+                        break;
+                }
+                break;
+            }
+        }
+    }
+
+    switch (get_highest_layer(default_layer_state)) {
+        case _QWERTY:
+            rgb_matrix_set_color(is_ez ? 41 : 42, 0x00, 0xFF, 0xFF);
+            break;
+        case _WORKMAN:
+            rgb_matrix_set_color(is_ez ? 41 : 42, 0xD9, 0xA5, 0x21);
+            break;
+    }
+
+    if ((this_mod | this_osm) & MODS_SHIFT_MASK || this_led & (1 << USB_LED_CAPS_LOCK)) {
+        rgb_matrix_set_color_row(0, 0x00, 0xFF, 0x00);
+    }
+    if ((this_mod | this_osm) & MODS_CTRL_MASK && (this_mod | this_osm) & MODS_GUI_MASK) {
+        rgb_matrix_set_color_row(1, 0xFF, 0xD9, 0xFF);
+    } else if ((this_mod | this_osm) & MODS_CTRL_MASK) {
+        rgb_matrix_set_color_row(1, 0xFF, 0x00, 0x00);
+    } else if ((this_mod | this_osm) & MODS_GUI_MASK) {
+        rgb_matrix_set_color_row(1, 0xFF, 0xD9, 0x00);
+    }
+    if ((this_mod | this_osm) & MODS_ALT_MASK) {
+        rgb_matrix_set_color_row(2, 0x00, 0x00, 0xFF);
+    }
+}
+#endif  // RGB_MATRIX_INIT
+
+void matrix_init_keymap(void) {}
+
+#ifdef ENCODER_ENABLE
+void encoder_update(bool clockwise) {
+    switch (get_highest_layer(layer_state)) {
+        case _RAISE:
+            clockwise ? tap_code(KC_VOLD) : tap_code(KC_VOLU);
+            break;
+        case _LOWER:
+#    ifdef RGB_MATRIX_ENABLE
+            clockwise ? rgb_matrix_step() : rgb_matrix_step_reverse();
+#    else
+            clockwise ? tap_code(KC_PGDN) : tap_code(KC_PGUP);
+#    endif
+            break;
+        case _ADJUST:
+#    ifdef AUDIO_CLICKY
+            clockwise ? clicky_freq_up() : clicky_freq_down();
+#    endif
+            break;
+        default:
+            clockwise ? tap_code(KC_DOWN) : tap_code(KC_UP);
+    }
+#    ifdef AUDIO_CLICKY
+    clicky_play();
+#    endif
+}
+#endif  // ENCODER_ENABLE
+
+#ifdef KEYBOARD_planck_ez
+layer_state_t layer_state_set_keymap(layer_state_t state) {
+    planck_ez_left_led_off();
+    planck_ez_right_led_off();
+    switch (get_highest_layer(state)) {
+        case _LOWER:
+            planck_ez_left_led_on();
+            break;
+        case _RAISE:
+            planck_ez_right_led_on();
+            break;
+        case _ADJUST:
+            planck_ez_right_led_on();
+            planck_ez_left_led_on();
+            break;
+        default:
+            break;
+    }
+    return state;
+}
+#endif
diff --git a/qmk/layouts/community/ortho_4x12/bocaj/readme.md b/qmk/layouts/community/ortho_4x12/bocaj/readme.md
new file mode 100644
index 00000000..a3716b8d
--- /dev/null
+++ b/qmk/layouts/community/ortho_4x12/bocaj/readme.md
@@ -0,0 +1,23 @@
+# Overview
+
+This is my Planck EZ layout, heavily based upon [my ergodox layout](../../ergodox/bocaj/).
+
+I got this keyboard for two reasons:
+
+1. QMK spoiled me and the Ergodox isn't incredibly portable (ok 3 reasons)
+2. This can sit ontop of my janky Macbook Pro keyboard (disabled with Karabiner if the planck is connected) when I want to work from the couch.
+
+## How to Build
+
+Put simply:
+`make planck/ez:bocaj`
+
+On that note, I use a separate workspace when making changes to my layouts or userspace. In that repo, there is a tool that does this for me. See [JacobJerrell/qmk_layouts/tools/](https://github.com/JacobJerrell/qmk_layouts/tree/master/tools) until I get documentation finished (Write code first, define requirements second... right?).
+
+## Layers
+
+* WORKMAN/QWERTY: Default is workman, can be switched via the ADJUST layer. Idk why you would though.
+* LOWER: Nums across the top, switches enter key to tab and tab key to delete. Symbols in the middle, remenascent of the ergodox
+* RAISE: Symbols across the top, F-Keys on the 2nd row. Switches backspace to delete
+* ADJUST: Computer Audio controls, RGB controls, Sound controls, macros, etc.
+* MOD: Mouse controls under the left hand. Numpad under the right hand
\ No newline at end of file
diff --git a/qmk/layouts/community/ortho_4x12/bocaj/rules.mk b/qmk/layouts/community/ortho_4x12/bocaj/rules.mk
new file mode 100644
index 00000000..3383cfd3
--- /dev/null
+++ b/qmk/layouts/community/ortho_4x12/bocaj/rules.mk
@@ -0,0 +1,44 @@
+BOOTMAGIC_ENABLE   = lite       # Virtual DIP switch configuration(+1000)
+MOUSEKEY_ENABLE    = no       # Mouse keys(+4700)
+EXTRAKEY_ENABLE    = yes       # Audio control and System control(+450)
+TAP_DANCE_ENABLE   = no
+SPACE_CADET_ENABLE = no
+NKRO_ENABLE        = yes
+
+ifneq ($(strip $(KEYBOARD)), planck/rev6)
+    CONSOLE_ENABLE    			= no
+    COMMAND_ENABLE    			= no
+    ifeq ($(strip $(LAYOUT_HAS_RGB)), yes)
+        RGBLIGHT_ENABLE         = yes
+        INDICATOR_LIGHTS            = yes
+        RGBLIGHT_TWINKLE            = yes
+        RGBLIGHT_STARTUP_ANIMATION  = yes
+    endif
+else
+    CONSOLE_ENABLE    			= yes
+    COMMAND_ENABLE    			= yes
+    RGBLIGHT_ENABLE             = yes
+    RGBLIGHT_STARTUP_ANIMATION  = yes
+    RGB_MATRIX_ENABLE           = no
+    AUDIO_ENABLE       			= yes
+    EEPROM_DRIVER 				= i2c
+endif
+ifeq ($(strip $(KEYBOARD)), planck/light)
+    RGB_MATRIX_ENABLE           = yes
+    RGBLIGHT_ENABLE             = yes
+    RGBLIGHT_STARTUP_ANIMATION  = yes
+    AUDIO_ENABLE       			= yes
+    # HAPTIC_ENABLE               += SOLENOID
+endif
+ifeq ($(strip $(KEYBOARD)), planck/ez)
+    RGBLIGHT_ENABLE = no
+    # SERIAL_LINK_ENABLE = yes
+    ENCODER_ENABLE = yes
+    RGB_MATRIX_ENABLE = IS31FL3737
+    INDICATOR_LIGHTS            = yes
+    RGBLIGHT_TWINKLE            = yes
+    RGBLIGHT_STARTUP_ANIMATION  = yes
+    CONSOLE_ENABLE    			= yes
+    COMMAND_ENABLE    			= yes
+    AUDIO_ENABLE       			= yes
+endif
diff --git a/qmk/layouts/community/ortho_4x12/brandonschlack/config.h b/qmk/layouts/community/ortho_4x12/brandonschlack/config.h
new file mode 100644
index 00000000..9b6789c1
--- /dev/null
+++ b/qmk/layouts/community/ortho_4x12/brandonschlack/config.h
@@ -0,0 +1,55 @@
+/* Copyright 2020 Brandon Schlack
+ *
+ * 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
+
+#ifdef KEYBOARD_planck_rev6
+#ifdef AUDIO_ENABLE
+    #define STARTUP_SONG SONG(PLANCK_SOUND)
+    // #define STARTUP_SONG SONG(NO_SOUND)
+
+    #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND) \
+                                }
+#endif
+
+#define MUSIC_MASK (keycode != KC_NO)
+
+/*
+ * MIDI options
+ */
+
+/* Prevent use of disabled MIDI features in the keymap */
+//#define MIDI_ENABLE_STRICT 1
+
+/* enable basic MIDI features:
+   - MIDI notes can be sent when in Music mode is on
+*/
+
+#define MIDI_BASIC
+
+/* enable advanced MIDI features:
+   - MIDI notes can be added to the keymap
+   - Octave shift and transpose
+   - Virtual sustain, portamento, and modulation wheel
+   - etc.
+*/
+//#define MIDI_ADVANCED
+
+/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
+//#define MIDI_TONE_KEYCODE_OCTAVES 2
+
+// Most tactile encoders have detents every 4 stages
+#define ENCODER_RESOLUTION 4
+#endif
diff --git a/qmk/layouts/community/ortho_4x12/brandonschlack/keymap.c b/qmk/layouts/community/ortho_4x12/brandonschlack/keymap.c
new file mode 100644
index 00000000..d4c1a4a8
--- /dev/null
+++ b/qmk/layouts/community/ortho_4x12/brandonschlack/keymap.c
@@ -0,0 +1,218 @@
+/* Copyright 2019 Brandon Schlack
+ *
+ * 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
+#ifdef KEYBOARD_planck_rev6
+    #include "muse.h"
+#endif
+#include "brandonschlack.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/* Qwerty */
+[_BASE] = LAYOUT_ortho_4x12( \
+// ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC, \
+// ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤
+    HY_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, \
+// ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SFT_ENT, \
+// ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤
+    MCO_LYR, KC_LCTL, KC_LOPT, KC_LCMD, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT  \
+// └────────┴────────┴────────┴────────┴────────┴─────────────────┴────────┴────────┴────────┴────────┴────────┘
+),
+
+/* Lower */
+[_LOWER] = LAYOUT_ortho_4x12( \
+// ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC, \
+// ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤
+    KC_DELT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, KC_PIPE, \
+// ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤
+    SF_CAPS, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_HOME, KC_PGUP, KC_PGDN, KC_END,  _______, \
+// ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤
+    _______, _______, _______, _______, _______, KC_MUTE, KC_MUTE, _______, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT  \
+// └────────┴────────┴────────┴────────┴────────┴─────────────────┴────────┴────────┴────────┴────────┴────────┘
+),
+
+/* Raise */
+[_RAISE] = LAYOUT_ortho_4x12( \
+// ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC, \
+// ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤
+    KC_DELT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, KC_BSLS, \
+// ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤
+    SF_CAPS, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_HOME, KC_PGUP, KC_PGDN, KC_END,  _______, \
+// ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤
+    _______, _______, _______, _______, _______, KC_MPLY, KC_MPLY, _______, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT  \
+// └────────┴────────┴────────┴────────┴────────┴─────────────────┴────────┴────────┴────────┴────────┴────────┘
+),
+
+/* Macros */
+[_MACRO] = LAYOUT_ortho_4x12( \
+// ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+    _______, _______, _______, _______, _______, _______, _______, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, MC_SLPD, \
+// ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤
+    _______, _______, _______, _______, _______, _______, _______, MC_BACK, MC_FWRD, PRV_TAB, NXT_TAB, NXT_WIN, \
+// ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤
+    _______, _______, _______, _______, _______, _______, PX_AFLL, OP_AFLL, _______, _______, _______, _______, \
+// ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  \
+// └────────┴────────┴────────┴────────┴────────┴─────────────────┴────────┴────────┴────────┴────────┴────────┘
+),
+
+/* Adjust (Lower + Raise) */
+[_ADJUST] = LAYOUT_ortho_4x12( \
+// ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+    QM_MAKE, RESET,   DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, MC_SLPD, \
+// ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤
+    QM_FLSH, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, \
+// ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤
+    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  RGB_RTHM,RGB_THM, _______, _______, _______, \
+// ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤
+    EEP_RST, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  \
+// └────────┴────────┴────────┴────────┴────────┴─────────────────┴────────┴────────┴────────┴────────┴────────┘
+)
+
+};
+
+layer_state_t layer_state_set_keymap(layer_state_t state) {
+    state = update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
+    return state;
+}
+
+#ifdef KEYBOARD_plaid
+// Turn on Red LED when initialized
+void keyboard_post_init_keymap(void) {
+    writePinHigh(LED_RED);
+}
+
+// Use Green LED for Caps Lock
+void led_set_user(uint8_t usb_led) {
+    if (IS_LED_OFF(usb_led, USB_LED_CAPS_LOCK)) {
+        writePinLow(LED_GREEN);
+    } else {
+        writePinHigh(LED_GREEN);
+    }
+}
+#endif
+
+#ifdef KEYBOARD_planck_rev6
+#ifdef AUDIO_ENABLE
+    float plover_song[][2]     = SONG(PLOVER_SOUND);
+    float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
+#endif
+
+bool muse_mode = false;
+uint8_t last_muse_note = 0;
+uint16_t muse_counter = 0;
+uint8_t muse_offset = 70;
+uint16_t muse_tempo = 50;
+
+void encoder_update_keymap(uint8_t index, bool clockwise) {
+    if (muse_mode) {
+        if (IS_LAYER_ON(_RAISE)) {
+            if (clockwise) {
+                muse_offset++;
+            } else {
+                muse_offset--;
+            }
+        } else {
+            if (clockwise) {
+                muse_tempo+=1;
+            } else {
+                muse_tempo-=1;
+            }
+        }
+    } else {
+        if (clockwise) {
+        #ifdef MOUSEKEY_ENABLE
+            tap_code(MC_WH_U);
+        #else
+            tap_code(KC_VOLU);
+        #endif
+        } else {
+        #ifdef MOUSEKEY_ENABLE
+            tap_code(MC_WH_D);
+        #else
+            tap_code(KC_VOLD);
+        #endif
+        }
+    }
+}
+
+void dip_switch_update_user(uint8_t index, bool active) {
+    switch (index) {
+        case 0: {
+#ifdef AUDIO_ENABLE
+            static bool play_sound = false;
+#endif
+            if (active) {
+#ifdef AUDIO_ENABLE
+                if (play_sound) { PLAY_SONG(plover_song); }
+#endif
+                layer_on(_ADJUST);
+            } else {
+#ifdef AUDIO_ENABLE
+                if (play_sound) { PLAY_SONG(plover_gb_song); }
+#endif
+                layer_off(_ADJUST);
+            }
+#ifdef AUDIO_ENABLE
+            play_sound = true;
+#endif
+            break;
+        }
+        case 1:
+            if (active) {
+                muse_mode = true;
+            } else {
+                muse_mode = false;
+            }
+    }
+}
+
+void matrix_scan_keymap(void) {
+#ifdef AUDIO_ENABLE
+    if (muse_mode) {
+        if (muse_counter == 0) {
+            uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()];
+            if (muse_note != last_muse_note) {
+                stop_note(compute_freq_for_midi_note(last_muse_note));
+                play_note(compute_freq_for_midi_note(muse_note), 0xF);
+                last_muse_note = muse_note;
+            }
+        }
+        muse_counter = (muse_counter + 1) % muse_tempo;
+    } else {
+        if (muse_counter) {
+            stop_all_notes();
+            muse_counter = 0;
+        }
+    }
+#endif
+}
+
+bool music_mask_user(uint16_t keycode) {
+    switch (keycode) {
+        case RAISE:
+        case LOWER:
+        case MCO_LYR:
+            return false;
+        default:
+            return true;
+    }
+}
+#endif
diff --git a/qmk/layouts/community/ortho_4x12/brandonschlack/readme.md b/qmk/layouts/community/ortho_4x12/brandonschlack/readme.md
new file mode 100644
index 00000000..84785132
--- /dev/null
+++ b/qmk/layouts/community/ortho_4x12/brandonschlack/readme.md
@@ -0,0 +1,20 @@
+# brandonschlack's 4x12 Ortho Keymap
+
+This layout is based on the Planck layout. It is macOS-centric, with Colemak and DVORAK removed as I don't use them.
+
+## Keyboards Using This Layout
+
+* [Planck](https://github.com/qmk/qmk_firmware/tree/master/keyboards/planck)
+* [Plaid](https://github.com/qmk/qmk_firmware/tree/master/keyboards/plaid)
+* [JNAO](https://github.com/qmk/qmk_firmware/tree/master/keyboards/planck) (FORCE_LAYOUT=ortho_4x12)
+
+## Features
+
+* *Enter* acts as *Right Shift* when held
+* On either **LOWER** or **RAISE** layers, tapping *Shift* will toggle *Caps Lock*, hold for Shift.
+* Bottom left key is *Hyper* (Shift+Control+Option+Command) which I use to map global shortcuts in macOS.
+  * Holding *Esc* will also act as Hyper.
+* **ADJUST** Layer
+  * Make command for compiling keyboard firmmware, a Reset key, and Debug toggle.
+  * Mission Control, Launchpad, and Sleep Display macOS macros
+  * Alt-Gui swapping
diff --git a/qmk/layouts/community/ortho_4x12/brandonschlack/rules.mk b/qmk/layouts/community/ortho_4x12/brandonschlack/rules.mk
new file mode 100644
index 00000000..e36b073d
--- /dev/null
+++ b/qmk/layouts/community/ortho_4x12/brandonschlack/rules.mk
@@ -0,0 +1,10 @@
+ifeq ($(strip $(KEYBOARD)), planck/rev6)
+	SRC += muse.c
+endif
+
+MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
+BACKLIGHT_ENABLE = no       # No backlights installed
+
+ifeq ($(strip $(KEYBOARD)), jnao)
+	BOOTMAGIC_ENABLE = lite
+endif
diff --git a/qmk/layouts/community/ortho_4x12/drashna/rules.mk b/qmk/layouts/community/ortho_4x12/drashna/rules.mk
index 3383cfd3..2a957675 100644
--- a/qmk/layouts/community/ortho_4x12/drashna/rules.mk
+++ b/qmk/layouts/community/ortho_4x12/drashna/rules.mk
@@ -34,7 +34,7 @@ ifeq ($(strip $(KEYBOARD)), planck/ez)
     RGBLIGHT_ENABLE = no
     # SERIAL_LINK_ENABLE = yes
     ENCODER_ENABLE = yes
-    RGB_MATRIX_ENABLE = IS31FL3737
+    RGB_MATRIX_ENABLE = yes
     INDICATOR_LIGHTS            = yes
     RGBLIGHT_TWINKLE            = yes
     RGBLIGHT_STARTUP_ANIMATION  = yes
diff --git a/qmk/layouts/community/ortho_4x12/talljoe/config.h b/qmk/layouts/community/ortho_4x12/talljoe/config.h
index 61229e7f..34c24b86 100644
--- a/qmk/layouts/community/ortho_4x12/talljoe/config.h
+++ b/qmk/layouts/community/ortho_4x12/talljoe/config.h
@@ -1,7 +1,21 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
+/* Copyright 2020 Joseph Wasson
+ *
+ * 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_CONFIG_H
 #define SPACE_COUNT 3
 
 #define TEMPLATE(                                                                   \
@@ -17,6 +31,3 @@ LAYOUT_ortho_4x12(                                              \
     K30, K32, K33, K34, K35, K36, K37, K38, K39, K3A, K3B, K3C, \
     K40, K41, K0D, K42, K44, K45, K45, K46, K48, K49, K4B, K4C  \
 )
-
-
-#endif //CONFIG_USER_H
diff --git a/qmk/layouts/community/ortho_5x12/brandonschlack/config.h b/qmk/layouts/community/ortho_5x12/brandonschlack/config.h
new file mode 100644
index 00000000..99682973
--- /dev/null
+++ b/qmk/layouts/community/ortho_5x12/brandonschlack/config.h
@@ -0,0 +1,55 @@
+/* Copyright 2020 Brandon Schlack
+ *
+ * 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
+
+#ifdef KEYBOARD_preonic_rev3
+#ifdef AUDIO_ENABLE
+    #define STARTUP_SONG SONG(PREONIC_SOUND)
+    // #define STARTUP_SONG SONG(NO_SOUND)
+
+    #define DEFAULT_LAYER_SONGS { SONG(QWERTY_SOUND) \
+                                }
+#endif
+
+#define MUSIC_MASK (keycode != KC_NO)
+
+/*
+ * MIDI options
+ */
+
+/* Prevent use of disabled MIDI features in the keymap */
+//#define MIDI_ENABLE_STRICT 1
+
+/* enable basic MIDI features:
+   - MIDI notes can be sent when in Music mode is on
+*/
+
+#define MIDI_BASIC
+
+/* enable advanced MIDI features:
+   - MIDI notes can be added to the keymap
+   - Octave shift and transpose
+   - Virtual sustain, portamento, and modulation wheel
+   - etc.
+*/
+//#define MIDI_ADVANCED
+
+/* override number of MIDI tone keycodes (each octave adds 12 keycodes and allocates 12 bytes) */
+//#define MIDI_TONE_KEYCODE_OCTAVES 2
+
+// Most tactile encoders have detents every 4 stages
+#define ENCODER_RESOLUTION 4
+#endif
diff --git a/qmk/layouts/community/ortho_5x12/brandonschlack/keymap.c b/qmk/layouts/community/ortho_5x12/brandonschlack/keymap.c
new file mode 100644
index 00000000..4d7b7483
--- /dev/null
+++ b/qmk/layouts/community/ortho_5x12/brandonschlack/keymap.c
@@ -0,0 +1,214 @@
+/* Copyright 2019 Brandon Schlack
+ *
+ * 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
+#ifdef KEYBOARD_preonic_rev3
+    #include "muse.h"
+#endif
+#include "brandonschlack.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/* Qwerty */
+[_BASE] = LAYOUT_ortho_5x12( \
+// ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSLS, \
+// ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_BSPC, \
+// ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+    HY_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, \
+// ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, SFT_ENT, \
+// ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤
+    MCO_LYR, KC_LCTL, KC_LOPT, KC_LCMD, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT  \
+// └────────┴────────┴────────┴────────┴────────┴─────────────────┴────────┴────────┴────────┴────────┴────────┘
+),
+
+/* Lower */
+[_LOWER] = LAYOUT_ortho_5x12( \
+// ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+    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_ESC,  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_DELT, \
+// ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_UNDS, KC_PLUS, KC_LCBR, KC_RCBR, _______, \
+// ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+    SF_CAPS, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_HOME, KC_PGDN, KC_PGUP, KC_END,  _______, \
+// ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤
+    _______, _______, _______, _______, _______, KC_MUTE, KC_MUTE, _______, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT  \
+// └────────┴────────┴────────┴────────┴────────┴─────────────────┴────────┴────────┴────────┴────────┴────────┘
+),
+
+/* Raise */
+[_RAISE] = LAYOUT_ortho_5x12( \
+// ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+    KC_GRV,  KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_PIPE, \
+// ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+    KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_DELT, \
+// ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_MINS, KC_EQL,  KC_LBRC, KC_RBRC, _______, \
+// ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+    SF_CAPS, KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_HOME, KC_PGDN, KC_PGUP, KC_END,  _______, \
+// ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤
+    _______, _______, _______, _______, _______, KC_MPLY, KC_MPLY, _______, KC_MPRV, KC_VOLD, KC_VOLU, KC_MNXT  \
+// └────────┴────────┴────────┴────────┴────────┴─────────────────┴────────┴────────┴────────┴────────┴────────┘
+),
+
+/* Function */
+[_MACRO] = LAYOUT_ortho_5x12( \
+// ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+    _______, _______, _______, _______, _______, _______, _______, KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, MC_SLPD, \
+// ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
+// ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+    _______, _______, _______, _______, _______, _______, _______, MC_BACK, MC_FWRD, PRV_TAB, NXT_TAB, NXT_WIN, \
+// ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+    _______, _______, _______, _______, _______, _______, PX_AFLL, OP_AFLL, _______, _______, _______, _______, \
+// ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  \
+// └────────┴────────┴────────┴────────┴────────┴─────────────────┴────────┴────────┴────────┴────────┴────────┘
+),
+
+/* Adjust (Lower + Raise) */
+[_ADJUST] = LAYOUT_ortho_5x12( \
+// ┌────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┬────────┐
+    KC_ESC,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, MC_SLPD, \
+// ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+    QM_MAKE, RESET,   DEBUG,   RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, \
+// ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+    QM_FLSH, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, _______, _______, _______, _______, _______, \
+// ├────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┼────────┤
+    _______, MUV_DE,  MUV_IN,  MU_ON,   MU_OFF,  MI_ON,   MI_OFF,  RGB_RTHM,RGB_THM, _______, _______, _______, \
+// ├────────┼────────┼────────┼────────┼────────┼────────┴────────┼────────┼────────┼────────┼────────┼────────┤
+    EEP_RST, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______  \
+// └────────┴────────┴────────┴────────┴────────┴─────────────────┴────────┴────────┴────────┴────────┴────────┘
+)
+
+
+};
+
+layer_state_t layer_state_set_keymap(layer_state_t state) {
+    state = update_tri_layer_state(state, _LOWER, _RAISE, _ADJUST);
+    return state;
+}
+
+#ifdef KEYBOARD_preonic_rev3
+#ifdef AUDIO_ENABLE
+  float plover_song[][2]     = SONG(PLOVER_SOUND);
+  float plover_gb_song[][2]  = SONG(PLOVER_GOODBYE_SOUND);
+#endif
+
+bool muse_mode = false;
+uint8_t last_muse_note = 0;
+uint16_t muse_counter = 0;
+uint8_t muse_offset = 70;
+uint16_t muse_tempo = 50;
+
+void encoder_update_keymap(uint8_t index, bool clockwise) {
+    if (muse_mode) {
+        if (IS_LAYER_ON(_RAISE)) {
+            if (clockwise) {
+                muse_offset++;
+            } else {
+                muse_offset--;
+            }
+        } else {
+            if (clockwise) {
+                muse_tempo+=1;
+            } else {
+                muse_tempo-=1;
+            }
+        }
+    } else {
+        if (clockwise) {
+        #ifdef MOUSEKEY_ENABLE
+            tap_code(MC_WH_U);
+        #else
+            tap_code(KC_VOLU);
+        #endif
+        } else {
+        #ifdef MOUSEKEY_ENABLE
+            tap_code(MC_WH_D);
+        #else
+            tap_code(KC_VOLD);
+        #endif
+        }
+    }
+}
+
+void dip_switch_update_user(uint8_t index, bool active) {
+    switch (index) {
+        case 0: {
+#ifdef AUDIO_ENABLE
+            static bool play_sound = false;
+#endif
+            if (active) {
+#ifdef AUDIO_ENABLE
+                if (play_sound) { PLAY_SONG(plover_song); }
+#endif
+                layer_on(_ADJUST);
+            } else {
+#ifdef AUDIO_ENABLE
+                if (play_sound) { PLAY_SONG(plover_gb_song); }
+#endif
+                layer_off(_ADJUST);
+            }
+#ifdef AUDIO_ENABLE
+            play_sound = true;
+#endif
+            break;
+        }
+        case 1:
+            if (active) {
+                muse_mode = true;
+            } else {
+                muse_mode = false;
+            }
+    }
+}
+
+
+void matrix_scan_keymap(void) {
+#ifdef AUDIO_ENABLE
+    if (muse_mode) {
+        if (muse_counter == 0) {
+            uint8_t muse_note = muse_offset + SCALE[muse_clock_pulse()];
+            if (muse_note != last_muse_note) {
+                stop_note(compute_freq_for_midi_note(last_muse_note));
+                play_note(compute_freq_for_midi_note(muse_note), 0xF);
+                last_muse_note = muse_note;
+            }
+        }
+        muse_counter = (muse_counter + 1) % muse_tempo;
+    } else {
+        if (muse_counter) {
+            stop_all_notes();
+            muse_counter = 0;
+        }
+    }
+#endif
+}
+
+bool music_mask_user(uint16_t keycode) {
+    switch (keycode) {
+        case RAISE:
+        case LOWER:
+        case MCO_LYR:
+            return false;
+        default:
+            return true;
+    }
+}
+#endif
diff --git a/qmk/layouts/community/ortho_5x12/brandonschlack/readme.md b/qmk/layouts/community/ortho_5x12/brandonschlack/readme.md
new file mode 100644
index 00000000..787fbb82
--- /dev/null
+++ b/qmk/layouts/community/ortho_5x12/brandonschlack/readme.md
@@ -0,0 +1,19 @@
+# brandonschlack's 5x12 Ortho Keymap
+
+This layout takes inspiration from the Preonic and JNAO. It is macOS-centric, with Colemak and DVORAK removed as I don't use them.
+
+## Keyboards Using This Layout
+
+* [Preonic](https://github.com/qmk/qmk_firmware/tree/master/keyboards/planck)
+* [JNAO](https://github.com/qmk/qmk_firmware/tree/master/keyboards/planck) (FORCE_LAYOUT=ortho_5x12)
+
+## Features
+
+* *Enter* acts as *Right Shift* when held
+* On either **LOWER** or **RAISE** layers, tapping *Shift* will toggle *Caps Lock*, hold for Shift.
+* Bottom left key is *Hyper* (Shift+Control+Option+Command) which I use to map global shortcuts in macOS.
+  * Holding *Esc* will also act as Hyper.
+* **ADJUST** Layer
+  * Make command for compiling keyboard firmmware, a Reset key, and Debug toggle.
+  * Mission Control, Launchpad, and Sleep Display macOS macros
+  * Alt-Gui swapping
diff --git a/qmk/layouts/community/ortho_5x12/brandonschlack/rules.mk b/qmk/layouts/community/ortho_5x12/brandonschlack/rules.mk
new file mode 100644
index 00000000..dacfc28b
--- /dev/null
+++ b/qmk/layouts/community/ortho_5x12/brandonschlack/rules.mk
@@ -0,0 +1,10 @@
+ifeq ($(strip $(KEYBOARD)), preonic/rev3)
+	SRC += muse.c
+endif
+
+MOUSEKEY_ENABLE = yes       # Mouse keys(+4700)
+BACKLIGHT_ENABLE = no       # No backlights installed
+
+ifeq ($(strip $(KEYBOARD)), jnao)
+	BOOTMAGIC_ENABLE = lite
+endif
diff --git a/qmk/layouts/community/ortho_5x12/riblee/keymap.c b/qmk/layouts/community/ortho_5x12/riblee/keymap.c
index ba5eb07b..a0a196ad 100644
--- a/qmk/layouts/community/ortho_5x12/riblee/keymap.c
+++ b/qmk/layouts/community/ortho_5x12/riblee/keymap.c
@@ -48,6 +48,27 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_QWERTY] = LAYOUT_ortho_5x12(
+    KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSPC,
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_DEL,
+    KC_ESC,  KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
+    BACKLIT, KC_LCTL, KC_LALT, KC_LGUI, LOWER,   KC_SPC,  KC_SPC,  RAISE,   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+),
+
+/* Hungarian
+* ,-----------------------------------------------------------------------------------.
+* |   `  |   1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  | Bksp |
+* |------+------+------+------+------+------+------+------+------+------+------+------|
+* | Tab  |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Del  |
+* |------+------+------+------+------+-------------+------+------+------+------+------|
+* | Esc  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
+* |------+------+------+------+------+------|------+------+------+------+------+------|
+* | Shift|   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
+* |------+------+------+------+------+------+------+------+------+------+------+------|
+* | Brite| Ctrl | Alt  | GUI  |Lower |Space |Space |Raise | Left | Down |  Up  |Right |
+* `-----------------------------------------------------------------------------------'
+*/
+[_HUNGARIAN] = LAYOUT_ortho_5x12(
     KC_GRV,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,      KC_8,      KC_9,      KC_0,    KC_BSPC,
     KC_TAB,  KC_Q,    KC_W,    C_KC_E,  KC_R,    KC_T,    KC_Y,    C_KC_U,    C_KC_I,    C_KC_O,    KC_P,    KC_DEL,
     KC_ESC,  C_KC_A,  KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,      KC_K,      KC_L,      KC_SCLN, KC_QUOT,
@@ -153,11 +174,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
  * `-----------------------------------------------------------------------------------'
  */
 [_ADJUST] = LAYOUT_ortho_5x12(
-    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,
-    _______, RESET,   DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______,  _______, KC_DEL,
-    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,   _______, _______,
-    _______, _______, _______, _______, _______, _______, NK_TOGG, LCG_SWP, LCG_NRM, UC_MOD,   _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______, _______
+    KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,   KC_F11,    KC_F12,
+    _______, RESET,   DEBUG,   _______, _______, _______, _______, TERM_ON, TERM_OFF,_______,  _______,   KC_DEL,
+    _______, _______, MU_MOD,  AU_ON,   AU_OFF,  AG_NORM, AG_SWAP, QWERTY,  COLEMAK, DVORAK,   HUNGARIAN, _______,
+    _______, _______, _______, _______, _______, _______, NK_TOGG, LCG_SWP, LCG_NRM, UC_MOD,   _______,   _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,  _______,   _______
 )
 
 };
\ No newline at end of file
diff --git a/qmk/layouts/community/split_3x6_3/bcat/config.h b/qmk/layouts/community/split_3x6_3/bcat/config.h
new file mode 100644
index 00000000..e177f0ff
--- /dev/null
+++ b/qmk/layouts/community/split_3x6_3/bcat/config.h
@@ -0,0 +1,34 @@
+/* Copyright 2020 Jonathan Rascher
+ *
+ * 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
+
+#if defined(KEYBOARD_crkbd_rev1_common) || defined(KEYBOARD_crkbd_rev1_legacy)
+#    define EE_HANDS
+
+#    if defined(RGBLIGHT_ENABLE)
+/* Configure RGB for underglow only (first six LEDs on each side). */
+#        undef RGBLED_SPLIT
+#        define RGBLED_SPLIT \
+            { 6, 6 }
+#    endif
+
+#    if defined(RGB_MATRIX_ENABLE)
+/* Limit max RGB LED current to avoid tripping controller fuse. */
+#        undef RGB_MATRIX_MAXIMUM_BRIGHTNESS
+#        define RGB_MATRIX_MAXIMUM_BRIGHTNESS 150
+#    endif
+#endif
diff --git a/qmk/layouts/community/split_3x6_3/bcat/keymap.c b/qmk/layouts/community/split_3x6_3/bcat/keymap.c
new file mode 100644
index 00000000..934a8e31
--- /dev/null
+++ b/qmk/layouts/community/split_3x6_3/bcat/keymap.c
@@ -0,0 +1,72 @@
+/* Copyright 2020 Jonathan Rascher
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+#include "bcat.h"
+
+enum layer {
+    LAYER_DEFAULT,
+    LAYER_LOWER,
+    LAYER_RAISE,
+    LAYER_ADJUST,
+};
+
+#define LY_LWR MO(LAYER_LOWER)
+#define LY_RSE MO(LAYER_RAISE)
+
+#define KY_CSPC LCTL(KC_SPC)
+#define KY_ZMIN LCTL(KC_EQL)
+#define KY_ZMOUT LCTL(KC_MINS)
+#define KY_ZMRST LCTL(KC_0)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /* Default layer: http://www.keyboard-layout-editor.com/#/gists/08d9827d916662a9414f48805aa895a5 */
+    [LAYER_DEFAULT] = LAYOUT_split_3x6_3(
+        KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,                         KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_BSPC,
+        KC_ESC,   KC_A,     KC_S,     KC_D,     KC_F,     KC_G,                         KC_H,     KC_J,     KC_K,     KC_L,     KC_SCLN,  KC_QUOT,
+        KC_LSFT,  KC_Z,     KC_X,     KC_C,     KC_V,     KC_B,                         KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,  KC_RSFT,
+                                                KC_LCTL,  LY_LWR,   KC_SPC,   KC_ENT,   LY_RSE,   KC_RALT
+    ),
+
+    /* Lower layer: http://www.keyboard-layout-editor.com/#/gists/c3fba5eaa2cd70fdfbdbc0f9e34d3bc0 */
+    [LAYER_LOWER] = LAYOUT_split_3x6_3(
+        MC_ALTT,  KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,   KC_PERC,                      KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_LPRN,  KC_RPRN,  _______,
+        KY_CSPC,  KY_ZMRST, KY_ZMOUT, KY_ZMIN,  KC_WBAK,  KC_WFWD,                      KC_PIPE,  KC_UNDS,  KC_PLUS,  KC_LCBR,  KC_RCBR,  KC_TILD,
+        _______,  KC_APP,   KC_PSCR,  KC_SLCK,  KC_PAUS,  KC_LGUI,                      KC_BSLS,  KC_MINS,  KC_EQL,   KC_LBRC,  KC_RBRC,  KC_GRV,
+                                                _______,  _______,  _______,  _______,  _______,  _______
+    ),
+
+    /* Raise layer: http://www.keyboard-layout-editor.com/#/gists/08b44355d4ca85d294bad9e2821f91d7 */
+    [LAYER_RAISE] = LAYOUT_split_3x6_3(
+        KC_CAPS,  KC_1,     KC_2,     KC_3,     KC_4,     KC_5,                         KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     _______,
+        _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,                        KC_LEFT,  KC_DOWN,  KC_UP,    KC_RGHT,  KC_F11,   KC_DEL,
+        _______,  KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,                       KC_HOME,  KC_PGDN,  KC_PGUP,  KC_END,   KC_F12,   KC_INS,
+                                                _______,  _______,  _______,  _______,  _______,  _______
+    ),
+
+    /* Adjust layer: http://www.keyboard-layout-editor.com/#/gists/77e7572e077b36a23eb2086017e16fee */
+    [LAYER_ADJUST] = LAYOUT_split_3x6_3(
+        _______,  NK_TOGG,  KC_MPLY,  KC_VOLU,  KC_MSTP,  _______,                      EEP_RST,  RESET,    _______,  _______,  _______,  _______,
+        _______,  _______,  KC_MPRV,  KC_VOLD,  KC_MNXT,  _______,                      RGB_RMOD, RGB_VAD,  RGB_VAI,  RGB_MOD,  RGB_SPI,  _______,
+        _______,  _______,  _______,  KC_MUTE,  _______,  _______,                      RGB_HUI,  RGB_SAD,  RGB_SAI,  RGB_HUD,  RGB_SPD,  _______,
+                                                _______,  _______,  _______,  RGB_TOG,  _______,  _______
+    ),
+};
+
+layer_state_t layer_state_set_keymap(layer_state_t state) {
+    return update_tri_layer_state(state, LAYER_LOWER, LAYER_RAISE, LAYER_ADJUST);
+}
diff --git a/qmk/layouts/community/split_3x6_3/bcat/readme.md b/qmk/layouts/community/split_3x6_3/bcat/readme.md
new file mode 100644
index 00000000..ed17b841
--- /dev/null
+++ b/qmk/layouts/community/split_3x6_3/bcat/readme.md
@@ -0,0 +1,126 @@
+# bcat's split 3x6 + 3 thumb keys layout
+
+This is my favorite split ergo layout for typing, featuring the traditional
+four ortho/ergo layers (Default, Lower, Raise, Adjust). It is loosely inspired
+by the default Planck (numbers on Lower, symbols on Raise) and Crkbd (Space on
+left, Enter on right) layouts, but has since been redesigned heavily according
+to the principles described below.
+
+* Since my most-frequently-used keyboard shortcuts involve Ctrl, which lives on
+the left half of the keyboard, keys frequently used with it (numbers, function
+keys, etc.) are on the Raise layer activated by the right thumb.
+
+* Navigation can be done on the right half alone, to enable simultaneous
+left-handed mousing. Additionally, Web pages can be scrolled with Space or
+Shift+Space on the left half alone, to enable taking notes with the right hand
+at the same time.
+
+* Other than Right Shift (which I seldom use), mods aren't rebound on layers.
+
+* Likewise, Backspace is not rebound on layers to avoid having to let go of
+layer-switch keys to correct mistakes.
+
+## Default layer
+
+![Default layer layout](https://i.imgur.com/g5N7g8D.png)
+
+([KLE](http://www.keyboard-layout-editor.com/#/gists/08d9827d916662a9414f48805aa895a5))
+
+* The alpha keys are a standard QWERTY layout, no funny business there.
+
+* Tab and Backspace are in familiar locations from my row-staggered boards
+(almost all of which use HHKB-style split backspace).
+
+* The Esc key is next to the home row for convenience in Vim.
+
+* There are two Shift keys, although I generally use Left Shift. (I've
+considered replacing Right Shift with another key, but haven't chosen one.)
+
+* Lower and Raise layer-switch keys are in the resting position of my left and
+right thumbs, respectively.
+
+* Space and Enter are on the big thumb keys so they're easy to press.
+
+* Ctrl is on the left for ease of chording, especially one-handed use of common
+shortcuts like Ctrl+T and Ctrl+W. This puts Alt on the right by the process of
+elimination. (I would really like one more 1U thumb key on each half to allow
+for a redundant Alt key on the left and a dedicated Super key on the right.)
+
+## Lower layer
+
+![Lower layer layout](https://i.imgur.com/vaIc9JY.png)
+
+([KLE](http://www.keyboard-layout-editor.com/#/gists/c3fba5eaa2cd70fdfbdbc0f9e34d3bc0))
+
+* This could also be called the "symbol layer".
+
+* Shifted numbers are bound in their usual positions on the top row.
+
+* Hyphen/Underscore and Equals/Plus are in the right index- and middle-finger
+columns for easy reach. They share the same relative position as on a
+row-staggered keyboard, and the shifted versions are physically above the
+unshifted versions as a mnemonic device.
+
+* Brackets and braces are placed below the parens for easy recall. Once again,
+the shifted versions are on the home row and the unshifted versions are on the
+bottom row.
+
+* Forward Slash/Pipe and Backtick/Tilde fill out the remaining positions on the
+right half, with the same relative positions as on a row-staggered HHKB layout.
+And yup, the shifted versions are above the unshifted versions.
+
+* Remaining keys from a TKL are placed out of the way on the bottom row of the
+left half.
+
+* The home row on the left half contains handy shortcuts for zooming and browser
+navigation.
+
+* Lower+Esc is bound to Ctrl+Space because the Ctrl and Space keys are both on
+the left thumb, so this key combination (which I use for tmux prefix and editor
+autocomplete) is hard to press in its natural location.
+
+* Lower+Tab is bound to a custom Alt+Tab macro that keeps the Alt modifier held
+as long as the Lower key is held down. This means that window switching is on
+Lower+Tab immediately next to browser tab switching (Ctrl+Tab).
+
+## Raise layer
+
+![Raise layer layout](https://i.imgur.com/VNEiV9A.png)
+
+([KLE](http://www.keyboard-layout-editor.com/#/gists/08b44355d4ca85d294bad9e2821f91d7))
+
+* This could also be called the "number layer".
+
+* Unshifted numbers are bound in their usual positions on the top row.
+
+* Arrow keys are on VIM-style HJKL keys.
+
+* Home/End and Page Up/Page Down are in the same column as the arrow keys, but
+translated down one row. (This means that the comma and period keys are not
+bound on the number layer, which makes data entry a bit funky. I might add a
+dedicated numpad layer to compensate.)
+
+* Function keys F1–F10 take up most of remaining space on the left half, with
+F11 and F12 spilling over to the right half. (This puts the most used function
+keys (F1–F5) on the home row.)
+
+* Insert and Delete are on the rightmost column, because there didn't seem to
+be a better place to put them.
+
+* Caps Lock is bound in the same position as on an HHKB, for lack of an obvious
+better location.
+
+## Adjust layer
+
+![Adjust layer layout](https://i.imgur.com/fZouko5.png)
+
+([KLE](http://www.keyboard-layout-editor.com/#/gists/77e7572e077b36a23eb2086017e16fee))
+
+* Media keys are centered around the ESDF cluster, just like I arrange them on
+row-staggered keyboards. (It's even more sensible with columnar stagger.)
+
+* The navigation keys are replaced by RGB controls. Again, this mirrors the
+positioning I use on my row-staggered keyboards.
+
+* Finally, reset keys live at the top-left corner of the right half where it's
+reasonably hard to press them by accident.
diff --git a/qmk/layouts/community/split_3x6_3/bcat/rules.mk b/qmk/layouts/community/split_3x6_3/bcat/rules.mk
new file mode 100644
index 00000000..caf6ec7e
--- /dev/null
+++ b/qmk/layouts/community/split_3x6_3/bcat/rules.mk
@@ -0,0 +1,10 @@
+ifeq ($(strip $(KEYBOARD)), crkbd/rev1/common)
+	BOOTLOADER = atmel-dfu  # Elite-C
+
+	# Enable underglow only. (Split Common doesn't support RGB matrix on slave.)
+	RGBLIGHT_ENABLE = yes
+else ifeq ($(strip $(KEYBOARD)), crkbd/rev1/legacy)
+	BOOTLOADER = atmel-dfu  # Elite-C
+
+	RGB_MATRIX_ENABLE = yes  # per-key RGB and underglow
+endif
diff --git a/qmk/layouts/community/split_3x6_3/ddeklerk/rules.mk b/qmk/layouts/community/split_3x6_3/ddeklerk/rules.mk
new file mode 100644
index 00000000..a05fa266
--- /dev/null
+++ b/qmk/layouts/community/split_3x6_3/ddeklerk/rules.mk
@@ -0,0 +1 @@
+EXTRAKEY_ENABLE = yes # Audio control and System control
diff --git a/qmk/layouts/community/split_3x6_3/drashna/keymap.c b/qmk/layouts/community/split_3x6_3/drashna/keymap.c
index 30e3958f..e53d0539 100644
--- a/qmk/layouts/community/split_3x6_3/drashna/keymap.c
+++ b/qmk/layouts/community/split_3x6_3/drashna/keymap.c
@@ -16,8 +16,6 @@
 
 #include "drashna.h"
 
-extern uint8_t is_master;
-
 #ifdef RGBLIGHT_ENABLE
 // Following line allows macro to read current RGB settings
 extern rgblight_config_t rgblight_config;
diff --git a/qmk/layouts/community/split_3x6_3/drashna/rules.mk b/qmk/layouts/community/split_3x6_3/drashna/rules.mk
index 6ac1554b..46f543f4 100644
--- a/qmk/layouts/community/split_3x6_3/drashna/rules.mk
+++ b/qmk/layouts/community/split_3x6_3/drashna/rules.mk
@@ -22,7 +22,7 @@ SLEEP_LED_ENABLE = no    # Breathing sleep LED during USB suspend
 
 ifeq ($(strip $(KEYBOARD)), crkbd/rev1)
     OLED_DRIVER_ENABLE = yes
-    RGB_MATRIX_ENABLE = WS2812
+    RGB_MATRIX_ENABLE = yes
     HAPTIC_ENABLE = SOLENOID
     BOOTLOADER = qmk-dfu
 endif
diff --git a/qmk/layouts/community/tkl_ansi/brandonschlack/config.h b/qmk/layouts/community/tkl_ansi/brandonschlack/config.h
new file mode 100644
index 00000000..df296540
--- /dev/null
+++ b/qmk/layouts/community/tkl_ansi/brandonschlack/config.h
@@ -0,0 +1,20 @@
+/* Copyright 2020 Brandon Schlack
+ *
+ * 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
+
+// Explicit RGB Animation Mode Include
+#undef RGBLIGHT_ANIMATIONS
+#define RGBLIGHT_EFFECT_BREATHING // Only have Breathing Animation
diff --git a/qmk/layouts/community/tkl_ansi/brandonschlack/keymap.c b/qmk/layouts/community/tkl_ansi/brandonschlack/keymap.c
new file mode 100644
index 00000000..6f13d33b
--- /dev/null
+++ b/qmk/layouts/community/tkl_ansi/brandonschlack/keymap.c
@@ -0,0 +1,102 @@
+/* Copyright 2019 Brandon Schlack
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+#include QMK_KEYBOARD_H
+#include "brandonschlack.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+/* Base Layer
+ * ┌───┬───┬───┬───┬───┬───┬─┬───┬───┬───┬───┬─┬───┬───┬───┬───┬─┬───┬───┬───┐
+ * │Esc│   │ F1│ F2│ F3│ F4│ │ F5│ F6│ F7│ F8│ │ F9│F10│F11│F12│ │F13│F14│F15│
+ * ├───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┤
+ * ├───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┤
+ * │~ `│! 1│@ 2│# 3│$ 4│% 5│^ 6│& 7│* 8│( 9│) 0│_ -│+ =│ Bckspc│ │Ins│Hom│PgU│
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤
+ * │Tab  │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │{ [│} ]│|   \│ │Del│End│PgD│
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┤
+ * │HyCaps│ A │ S │ D │ F │ G │ H │ J │ K │ L │: ;│" '│   Enter│             │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤     ┌───┐   │
+ * │Shift   │ Z │ X │ C │ V │ B │ N │ M │< ,│> .│? /│     Shift│     │ Up│   │
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───┤
+ * │Ctrl│ Opt│ Cmd│          Space         │Cmd │Opt │Fn  │Ctrl│ │Lef│Dow│Rig│
+ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┴─┴───┴───┴───┘
+ */
+[_BASE] = LAYOUT_tkl_ansi( \
+    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_F13,  KC_F14,  KC_F15,  \
+    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, \
+    HY_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_LOPT, KC_LCMD,                           KC_SPC,                              RWD_CMD, FFD_OPT, PLY_FN1, KC_RCTL,          KC_LEFT, KC_DOWN, KC_RGHT  \
+),
+/* Function Layer
+ * ┌───┬───┬───┬───┬───┬───┬─┬───┬───┬───┬───┬─┬───┬───┬───┬───┬─┬───┬───┬───┐
+ * │Mke│   │BrD│BrU│Msn│LHP│ │RV-│RV+│   │   │ │   │   │   │   │ │   │   │Mut│
+ * ├───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┤
+ * ├───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┤
+ * │   │   │   │   │   │   │   │   │   │   │   │   │   │   Del │ │Ply│Slp│VlU│
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤
+ * │RMod │RH+│RS+│RV+│AS+│   │   │   │   │   │   │   │   │     │ │Prv│Nxt│VlD│
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┤
+ * │RTgl  │RH-│RS-│RV-│AS-│   │   │   │   │   │   │   │        │             │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤     ┌───┐   │
+ * │        │LYR│Thm│   │   │RST│   │   │   │   │   │          │     │PgU│   │
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───┤
+ * │    │    │    │                        │    │    │    │    │ │Hom│PgD│End│
+ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┴─┴───┴───┴───┘
+ */
+[_FN1] = LAYOUT_tkl_ansi( \
+    QM_MAKE,          KC_BRMD, KC_BRMU, MC_MSSN, MC_LHPD, RGB_VAD, RGB_VAI, _______, _______, _______, _______, _______, _______,          _______, _______, KC_MUTE, \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DELT,          KC_MPLY, MC_SLPD, KC_VOLU, \
+    RGB_MOD, RGB_HUI, RGB_SAI, RGB_VAI, RGB_SPI, _______, _______, _______, _______, _______, _______, _______, _______, _______,          KC_MPRV, KC_MNXT, KC_VOLD, \
+    RGB_TOG, RGB_HUD, RGB_SAD, RGB_VAD, RGB_SPD, _______, _______, _______, _______, _______, _______, _______,          _______,                                     \
+    _______,          RGB_LYR, RGB_THM, _______, _______, RESET,   _______, _______, _______, _______, _______,          _______,                   KC_PGUP,          \
+    _______, _______, _______,                           _______,                             _______, _______, _______, _______,          KC_HOME, KC_PGDN, KC_END   \
+)
+/* Blank Template
+ * ┌───┬───┬───┬───┬───┬───┬─┬───┬───┬───┬───┬─┬───┬───┬───┬───┬─┬───┬───┬───┐
+ * │   │   │   │   │   │   │ │   │   │   │   │ │   │   │   │   │ │   │   │   │
+ * ├───┘   └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┴───┘ └───┴───┴───┤
+ * ├───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┐ ┌───┬───┬───┤
+ * │   │   │   │   │   │   │   │   │   │   │   │   │   │       │ │   │   │   │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┤ ├───┼───┼───┤
+ * │     │   │   │   │   │   │   │   │   │   │   │   │   │     │ │   │   │   │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┤ └───┴───┴───┤
+ * │      │   │   │   │   │   │   │   │   │   │   │   │        │             │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────────┤     ┌───┐   │
+ * │        │   │   │   │   │   │   │   │   │   │   │          │     │   │   │
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴───┼───┴┬────┬────┤ ┌───┼───┼───┤
+ * │    │    │    │                        │    │    │    │    │ │   │   │   │
+ * └────┴────┴────┴────────────────────────┴────┴────┴────┴────┴─┴───┴───┴───┘
+ */
+/*
+[BLANK] = LAYOUT_tkl_ansi( \
+    _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, \
+    _______, _______, _______,_______,  _______, _______, _______, _______, _______, _______, _______, _______,          _______,                                     \
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,                   _______,          \
+    _______, _______, _______,                           _______,                             _______, _______, _______, _______,          _______, _______, _______  \
+)
+*/
+};
+
+bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
+    return true;
+}
+
+void led_set_user(uint8_t usb_led) {
+
+}
diff --git a/qmk/layouts/community/tkl_ansi/brandonschlack/readme.md b/qmk/layouts/community/tkl_ansi/brandonschlack/readme.md
new file mode 100644
index 00000000..e8885a13
--- /dev/null
+++ b/qmk/layouts/community/tkl_ansi/brandonschlack/readme.md
@@ -0,0 +1,55 @@
+# brandonschlack's TKL ANSI layout
+
+A mostly typical Mac setup, with some personal QMK touches.
+
+## Base Layer
+
+The base layer has a standard macOS modifier layout, with **F13-F15** in the F row, in place of **Print Screen**, **Scroll Lock**, and **Pause/Break**.
+
+### [Mod-Taps](https://docs.qmk.fm/#/feature_advanced_keycodes?id=mod-tap)
+
+* Hyper Caps Lock
+  * Hold **Caps Lock** for '**Hyper**' (**Shift**+**Control**+**Option**+**Command**). I use it for mapping global shortcuts for apps.
+  * Tapping **Caps Lock** functions normally
+* Media controls mapped to Right Modifiers
+  * **Right Command** for **Prev Track**
+  * **Right Option** for **Next Track**
+  * **Fn** for **Play/Pause**
+
+## Function Layer
+
+The Function layer is a mix of [Apple's *Fn* shortcuts](https://support.apple.com/en-us/HT201236), [WASD Keyboard's Media shortcuts](https://codekeyboards.com/#multimedia), and some QMK functionality.
+
+### [Apple's *Fn* shortcuts](https://support.apple.com/en-us/HT201236)
+
+* **Home/Page Down/Page Up/End** as **Fn+Left/Down/Up/Right**
+* **Foward Delete** as **Fn+Backspace**
+* **Display Brightness Down/Up** as **Fn+F1/F2**
+* **Misson Control** (*KC_FIND, but use [Karabiner-Elements](https://pqrs.org/osx/karabiner/index.html) as find -> mission_control*) as **Fn+F3**
+* **Launchpad** (*KC_MENU, but use [Karabiner-Elements](https://pqrs.org/osx/karabiner/index.html) as menu -> launchpad*) as **Fn+F4**
+* Keyboard Illumination Down/Up used as **RGB Underglow Value Decrease/Increase** on **Fn+F5/F6**
+
+### [WASD Keyboard's Media shortcuts](https://codekeyboards.com/#multimedia)
+
+* **Play/Pause** as **Fn+Insert**
+* **Prev/Next Track** as **Fn+Delete/End**
+* **Volume Up/Down** as **Fn+Page Up/Page Down**
+* **Volume Mute** as **Fn+F15**
+
+### Personal & QMK shortcuts
+
+* **Sleep Display** (Shift+Control+Power) as **Fn+Home**.
+* **QMK Make** as **Fn+Esc**. Sends make command to command line. Holding **Shift** will also append `:flash` target and put keyboard into bootloader.
+* **Reset** as **Fn+B**
+
+### RGB Controls
+
+* **RGB Toggle** as **Fn+Caps Lock**
+* **RGB Hue Increase/Decrease** as **Fn+Q/A**
+* **RGB Saturation Increase/Decrease** as **Fn+W/S**
+* **RGB Value Increase/Decrease** as **Fn+E/D**
+* **RGB Mode Next/Previous** as **Fn+Tab/Shift+Tab**
+* **RGB Toggle Layer Indication** as **Fn+Z**
+  * Changes RGB Color with Layer change (*uses custom RGB_THEME*).
+* **RGB Cycle Next Theme** as **Fn+X**
+
diff --git a/qmk/layouts/community/tkl_ansi/brandonschlack/rules.mk b/qmk/layouts/community/tkl_ansi/brandonschlack/rules.mk
new file mode 100644
index 00000000..5ce3c8ee
--- /dev/null
+++ b/qmk/layouts/community/tkl_ansi/brandonschlack/rules.mk
@@ -0,0 +1,4 @@
+# Build Options
+CONSOLE_ENABLE = yes       # Enable Console for Debugging
+MOUSEKEY_ENABLE = no       # Don't need Mouse Keys
+BACKLIGHT_ENABLE = no      # Backlights not installed
diff --git a/qmk/layouts/community/tkl_ansi/talljoe-tkl/config.h b/qmk/layouts/community/tkl_ansi/talljoe-tkl/config.h
index 02f8a94e..15869ed0 100644
--- a/qmk/layouts/community/tkl_ansi/talljoe-tkl/config.h
+++ b/qmk/layouts/community/tkl_ansi/talljoe-tkl/config.h
@@ -1,5 +1,20 @@
-#ifndef CONFIG_USER_H
-#define CONFIG_USER_H
+/* Copyright 2020 Joseph Wasson
+ *
+ * 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_CONFIG_H
 
@@ -18,7 +33,5 @@
   KJ2, KJ5, KI5, KH5, KG5, KG2, KF2, KF5, KE5, KD5, KR5, KR2, KE2, KB3,   KK4, KO7, KQ7, \
   KI2, KJ3, KI3, KH3, KG3, KG6, KF6, KF3, KE3, KD3, KR3, KR6,      KB1,                  \
   KN2,      KJ1, KI1, KH1, KG1, KG0, KF0, KF1, KE1, KD1, KR0,      KN3,        KO6,      \
-  KA4, KP2, KC6,                KK6,                KC0, KM3, KD0, KA1,   KO0, KK0, KL0  \
+  KA4, KP2, KC6,                KX2,                KC0, KM3, KD0, KA1,   KO0, KK0, KL0  \
 )
-
-#endif //CONFIG_USER_H
diff --git a/qmk/layouts/default/65_ansi_split_bs/default_65_ansi_split_bs/keymap.c b/qmk/layouts/default/65_ansi_split_bs/default_65_ansi_split_bs/keymap.c
new file mode 100644
index 00000000..c5a14259
--- /dev/null
+++ b/qmk/layouts/default/65_ansi_split_bs/default_65_ansi_split_bs/keymap.c
@@ -0,0 +1,24 @@
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+     * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+     * │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = |Bsp|Bsp|Hom│
+     * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
+     * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │  \  │PgU│
+     * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+     * │ Caps │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │  Enter │PgD│
+     * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+     * │ Shift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Shift│ ↑ │End│
+     * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
+     * │Ctrl│GUI │Alt │                        │Alt│GUI│Ctl│ ← │ ↓ │ → │
+     * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
+     */
+    [0] = LAYOUT_65_ansi_split_bs(
+        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_HOME,
+        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_PGUP,
+        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_PGDN,
+        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_END,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                             KC_RALT, KC_RGUI, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    )
+};
diff --git a/qmk/layouts/default/65_ansi_split_bs/info.json b/qmk/layouts/default/65_ansi_split_bs/info.json
new file mode 100644
index 00000000..565c1aea
--- /dev/null
+++ b/qmk/layouts/default/65_ansi_split_bs/info.json
@@ -0,0 +1,86 @@
+{
+    "keyboard_name": "65% ANSI layout with split Backspace",
+    "url": "",
+    "maintainer": "qmk",
+    "width": 16,
+    "height": 5,
+    "layouts": {
+        "LAYOUT_65_ansi": {
+            "layout": [
+                {"x":0, "y":0},
+                {"x":1, "y":0},
+                {"x":2, "y":0},
+                {"x":3, "y":0},
+                {"x":4, "y":0},
+                {"x":5, "y":0},
+                {"x":6, "y":0},
+                {"x":7, "y":0},
+                {"x":8, "y":0},
+                {"x":9, "y":0},
+                {"x":10, "y":0},
+                {"x":11, "y":0},
+                {"x":12, "y":0},
+                {"x":13, "y":0},
+                {"x":14, "y":0},
+                {"x":15, "y":0},
+
+                {"x":0, "y":1, "w":1.5},
+                {"x":1.5, "y":1},
+                {"x":2.5, "y":1},
+                {"x":3.5, "y":1},
+                {"x":4.5, "y":1},
+                {"x":5.5, "y":1},
+                {"x":6.5, "y":1},
+                {"x":7.5, "y":1},
+                {"x":8.5, "y":1},
+                {"x":9.5, "y":1},
+                {"x":10.5, "y":1},
+                {"x":11.5, "y":1},
+                {"x":12.5, "y":1},
+                {"x":13.5, "y":1, "w":1.5},
+                {"x":15, "y":1},
+
+                {"x":0, "y":2, "w":1.75},
+                {"x":1.75, "y":2},
+                {"x":2.75, "y":2},
+                {"x":3.75, "y":2},
+                {"x":4.75, "y":2},
+                {"x":5.75, "y":2},
+                {"x":6.75, "y":2},
+                {"x":7.75, "y":2},
+                {"x":8.75, "y":2},
+                {"x":9.75, "y":2},
+                {"x":10.75, "y":2},
+                {"x":11.75, "y":2},
+                {"x":12.75, "y":2, "w":2.25},
+                {"x":15, "y":2},
+
+                {"x":0, "y":3, "w":2.25},
+                {"x":2.25, "y":3},
+                {"x":3.25, "y":3},
+                {"x":4.25, "y":3},
+                {"x":5.25, "y":3},
+                {"x":6.25, "y":3},
+                {"x":7.25, "y":3},
+                {"x":8.25, "y":3},
+                {"x":9.25, "y":3},
+                {"x":10.25, "y":3},
+                {"x":11.25, "y":3},
+                {"x":12.25, "y":3, "w":1.75},
+                {"x":14, "y":3},
+                {"x":15, "y":3},
+
+                {"x":0, "y":4, "w":1.25},
+                {"x":1.25, "y":4, "w":1.25},
+                {"x":2.5, "y":4, "w":1.25},
+                {"x":3.75, "y":4, "w":6.25},
+                {"x":10, "y":4},
+                {"x":11, "y":4},
+                {"x":12, "y":4},
+                {"x":13, "y":4},
+                {"x":14, "y":4},
+                {"x":15, "y":4}
+            ]
+        }
+    }
+}
diff --git a/qmk/layouts/default/65_ansi_split_bs/layout.json b/qmk/layouts/default/65_ansi_split_bs/layout.json
new file mode 100644
index 00000000..f6eb1ec4
--- /dev/null
+++ b/qmk/layouts/default/65_ansi_split_bs/layout.json
@@ -0,0 +1,5 @@
+[{a:7},"","","","","","","","","","","","","","","",""],
+[{w:1.5},"","","","","","","","","","","","","",{w:1.5},"",""],
+[{w:1.75},"","","","","","","","","","","","",{w:2.25},"",""],
+[{w:2.25},"","","","","","","","","","","",{w:1.75},"","",""],
+[{w:1.25},"",{w:1.25},"",{w:1.25},"",{w:6.25},"","","","","","",""]
diff --git a/qmk/layouts/default/65_ansi_split_bs/readme.md b/qmk/layouts/default/65_ansi_split_bs/readme.md
new file mode 100644
index 00000000..3051b706
--- /dev/null
+++ b/qmk/layouts/default/65_ansi_split_bs/readme.md
@@ -0,0 +1,3 @@
+# 65_ansi_split_bs
+
+    LAYOUT_65_ansi_split_bs
diff --git a/qmk/layouts/default/alice/default_alice/keymap.c b/qmk/layouts/default/alice/default_alice/keymap.c
index 28ab2195..d65ee309 100644
--- a/qmk/layouts/default/alice/default_alice/keymap.c
+++ b/qmk/layouts/default/alice/default_alice/keymap.c
@@ -30,7 +30,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
      *        └─────┘     └─────┴───────┴─────┘     └──────────┴─────┘             └─────┘
      */
     [0] = LAYOUT_alice(
-        KC_ESC,  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_ESC,  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_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_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_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_RSFT,
diff --git a/qmk/layouts/default/alice_split_bs/default_alice_split_bs/keymap.c b/qmk/layouts/default/alice_split_bs/default_alice_split_bs/keymap.c
new file mode 100644
index 00000000..9237652d
--- /dev/null
+++ b/qmk/layouts/default/alice_split_bs/default_alice_split_bs/keymap.c
@@ -0,0 +1,39 @@
+/* Copyright 2020 MudkipMao, noroadsleft
+ *
+ * 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] = {
+    /*
+     *    ┌───┐  ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐
+     *    │Esc│  │ ` │ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │         │ 7 │ 8 │ 9 │ 0 │ - │ = │Bsp│Del│
+     *   ┌┴──┬┘ ┌┴───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┐
+     *   │PUp│  │ Tab │ Q │ W │ E │ R │ T │          │ Y │ U │ I │ O │ P │ [ │ ] │   \  │
+     *  ┌┴──┬┘ ┌┴─────┼───┼───┼───┼───┼───┤          └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴──────┴┐
+     *  │PDn│  │ Caps │ A │ S │ D │ F │ G │           │ H │ J │ K │ L │ ; │ ' │   Enter  │
+     *  └───┘ ┌┴──────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐        ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───────┬──┴┐
+     *        │ Shift  │ Z │ X │ C │ V │ B │        │ B │ N │ M │ , │ . │ / │  Shift  │Shf│
+     *        ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴──┐     ├───┴───┴──┬┴───┴┬──┴───┴──────┬──┴──┬┘
+     *        │ Ctl │     │ Alt │       │ GUI │     │          │ Alt │             │ Ctl │
+     *        └─────┘     └─────┴───────┴─────┘     └──────────┴─────┘             └─────┘
+     */
+    [0] = LAYOUT_alice_split_bs(
+        KC_ESC,  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_DEL,
+        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_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_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_RSFT,
+                 KC_LCTL,          KC_LALT,          KC_SPC,  KC_LGUI,                   KC_SPC,           KC_RALT,                            KC_RCTL
+    )
+};
diff --git a/qmk/layouts/default/alice_split_bs/info.json b/qmk/layouts/default/alice_split_bs/info.json
new file mode 100644
index 00000000..f7b4a68b
--- /dev/null
+++ b/qmk/layouts/default/alice_split_bs/info.json
@@ -0,0 +1,83 @@
+{
+    "keyboard_name": "Alice layout with Split Backspace",
+    "url": "",
+    "maintainer": "qmk",
+    "width": 18.35,
+    "height": 5.1,
+    "layouts": {
+        "LAYOUT_alice_split_bs": {
+            "layout": [
+                {"x":0.4, "y":0},
+                {"x":1.55, "y":0.1},
+                {"x":2.55, "y":0.1},
+                {"x":3.55, "y":0},
+                {"x":4.55, "y":0.1},
+                {"x":5.55, "y":0.1},
+                {"x":6.55, "y":0.1},
+                {"x":7.55, "y":0.1},
+                {"x":9.75, "y":0.1},
+                {"x":10.75, "y":0.1},
+                {"x":11.75, "y":0.1},
+                {"x":12.75, "y":0.1},
+                {"x":13.75, "y":0},
+                {"x":14.75, "y":0.1},
+                {"x":15.75, "y":0.1},
+                {"x":16.75, "y":0.1},
+
+                {"x":0.2, "y":1.0},
+                {"x":1.35, "y":1.1, "w":1.5},
+                {"x":2.85, "y":1.1},
+                {"x":3.85, "y":1.1},
+                {"x":4.85, "y":1.1},
+                {"x":5.85, "y":1.1},
+                {"x":6.85, "y":1.1},
+                {"x":9.45, "y":1.1},
+                {"x":10.45, "y":1.1},
+                {"x":11.45, "y":1.1},
+                {"x":12.45, "y":1.1},
+                {"x":13.45, "y":1.1},
+                {"x":14.45, "y":1.1},
+                {"x":15.45, "y":1.1},
+                {"x":16.45, "y":1.1, "w":1.5},
+
+                {"x":0, "y":2.0},
+                {"x":1.15, "y":2.1, "w":1.75},
+                {"x":2.9, "y":2.1},
+                {"x":3.9, "y":2.1},
+                {"x":4.9, "y":2.1},
+                {"x":5.9, "y":2.1},
+                {"x":6.9, "y":2.1},
+                {"x":9.9, "y":2.1},
+                {"x":10.9, "y":2.1},
+                {"x":11.9, "y":2.1},
+                {"x":12.9, "y":2.1},
+                {"x":13.9, "y":2.1},
+                {"x":14.9, "y":2.1},
+                {"x":15.9, "y":2.1, "w":2.25},
+
+                {"x":0.95, "y":3.1, "w":2.25},
+                {"x":3.2, "y":3.1},
+                {"x":4.2, "y":3.1},
+                {"x":5.2, "y":3.1},
+                {"x":6.2, "y":3.1},
+                {"x":7.2, "y":3.1},
+                {"x":9.6, "y":3.1},
+                {"x":10.6, "y":3.1},
+                {"x":11.6, "y":3.1},
+                {"x":12.6, "y":3.1},
+                {"x":13.6, "y":3.1},
+                {"x":14.6, "y":3.1},
+                {"x":15.6, "y":3.1, "w":1.75},
+                {"x":17.35, "y":3.1},
+
+                {"x":0.95, "y":4.1, "w":1.5},
+                {"x":3.85, "y":4.1, "w":1.5},
+                {"x":5.35, "y":4.1, "w":2},
+                {"x":7.35, "y":4.1, "w":1.25},
+                {"x":9.6, "y":4.1, "w":2.75},
+                {"x":12.35, "y":4.1, "w":1.5},
+                {"x":16.65, "y":4.1, "w":1.5}
+            ]
+        }
+    }
+}
diff --git a/qmk/layouts/default/alice_split_bs/layout.json b/qmk/layouts/default/alice_split_bs/layout.json
new file mode 100644
index 00000000..87d811c2
--- /dev/null
+++ b/qmk/layouts/default/alice_split_bs/layout.json
@@ -0,0 +1,21 @@
+[{y:0.9,x:0.55,a:7},"",{x:2.15},"",{x:8.55},""],
+[{y:-0.9,x:1.7},"","",{x:10.55},"","",""],
+[{y:-0.1,x:0.35},""],
+[{y:-0.95,x:12.95},""],
+[{y:-0.95,x:1.5,w:1.5},"","",{x:9.95},"","",{w:1.5},""],
+[{y:-0.1,x:0.15},""],
+[{y:-0.9,x:1.3,w:1.75},"","",{x:9.35},"","",{w:2.25},""],
+[{x:1.1,w:2.25},"","",{x:8.75},"","",{w:1.75},"",""],
+[{x:1.1,w:1.5},"",{x:13.55,w:1.5},""],
+[{r:12,y:-6,x:5},"","","",""],
+[{x:4.5},"","","",""],
+[{x:4.8},"","","",""],
+[{x:5.3},"","","",""],
+[{x:6.45,w:2},"",{w:1.25},""],
+[{y:-0.95,x:4.95,w:1.5},""],
+[{r:-12,y:-1.45,x:8.55},"","","",""],
+[{x:8.05},"","","",""],
+[{x:8.2},"","","",""],
+[{x:7.75},"","","",""],
+[{x:7.75,w:2.75},""],
+[{y:-0.95,x:10.5,w:1.5},""]
diff --git a/qmk/layouts/default/alice_split_bs/readme.md b/qmk/layouts/default/alice_split_bs/readme.md
new file mode 100644
index 00000000..705defa8
--- /dev/null
+++ b/qmk/layouts/default/alice_split_bs/readme.md
@@ -0,0 +1,3 @@
+# alice_split_bs
+
+    LAYOUT_alice_split_bs
diff --git a/qmk/layouts/default/readme.md b/qmk/layouts/default/readme.md
index 9e1e7cfb..96f9c8e0 100644
--- a/qmk/layouts/default/readme.md
+++ b/qmk/layouts/default/readme.md
@@ -246,6 +246,21 @@ LAYOUT_65_ansi_blocker_tsangan
 └─────┴───┴─────┴───────────────────────────┴─────┘ └───┴───┴───┘
 ```
 
+```
+LAYOUT_65_ansi_split_bs
+┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
+│   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │   │
+├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┼───┤
+│     │   │   │   │   │   │   │   │   │   │   │   │   │     │   │
+├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+│      │   │   │   │   │   │   │   │   │   │   │   │        │   │
+├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+│        │   │   │   │   │   │   │   │   │   │   │      │   │   │
+├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
+│    │    │    │                        │   │   │   │   │   │   │
+└────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
+```
+
 ```
 LAYOUT_65_iso
 ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
@@ -481,6 +496,21 @@ LAYOUT_alice
       └─────┘     └─────┴───────┴─────┘     └──────────┴─────┘             └─────┘
 ```
 
+```
+LAYOUT_alice_split_bs
+  ┌───┐  ┌───┬───┬───┬───┬───┬───┬───┐         ┌───┬───┬───┬───┬───┬───┬───┬───┐
+  │   │  │   │   │   │   │   │   │   │         │   │   │   │   │   │   │   │   │
+ ┌┴──┬┘ ┌┴───┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┘       ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┴┐
+ │   │  │     │   │   │   │   │   │          │   │   │   │   │   │   │   │      │
+┌┴──┬┘ ┌┴─────┼───┼───┼───┼───┼───┤          └┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴──────┴┐
+│   │  │      │   │   │   │   │   │           │   │   │   │   │   │   │          │
+└───┘ ┌┴──────┴┬──┴┬──┴┬──┴┬──┴┬──┴┐        ┌─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───────┬──┴┐
+      │        │   │   │   │   │   │        │   │   │   │   │   │   │         │   │
+      ├─────┬──┴──┬┴───┴┬──┴───┴┬──┴──┐     ├───┴───┴──┬┴───┴┬──┴───┴──────┬──┴──┬┘
+      │     │     │     │       │     │     │          │     │             │     │
+      └─────┘     └─────┴───────┴─────┘     └──────────┴─────┘             └─────┘
+```
+
 ```
 LAYOUT_ergodox
 ┌─────┬───┬───┬───┬───┬───┬───┐                   ┌───┬───┬───┬───┬───┬───┬─────┐
diff --git a/qmk/lib/python/qmk/cli/__init__.py b/qmk/lib/python/qmk/cli/__init__.py
index 47e1b443..372c4092 100644
--- a/qmk/lib/python/qmk/cli/__init__.py
+++ b/qmk/lib/python/qmk/cli/__init__.py
@@ -8,16 +8,20 @@ from milc import cli
 
 from . import c2json
 from . import cformat
+from . import chibios
+from . import clean
 from . import compile
 from . import config
 from . import docs
 from . import doctor
+from . import fileformat
 from . import flash
 from . import generate
 from . import hello
 from . import info
 from . import json
 from . import json2c
+from . import lint
 from . import list
 from . import kle2json
 from . import new
diff --git a/qmk/lib/python/qmk/cli/cformat.py b/qmk/lib/python/qmk/cli/cformat.py
index 6bcd15a1..5aab3184 100644
--- a/qmk/lib/python/qmk/cli/cformat.py
+++ b/qmk/lib/python/qmk/cli/cformat.py
@@ -23,8 +23,6 @@ def cformat_run(files, all_files):
         if not files:
             cli.log.warn('No changes detected. Use "qmk cformat -a" to format all files')
             return False
-        if files and all_files:
-            cli.log.warning('Filenames passed with -a, only formatting: %s', ','.join(files))
         subprocess.run(clang_format + [file for file in files], check=True)
         cli.log.info('Successfully formatted the C code.')
 
@@ -48,6 +46,8 @@ def cformat(cli):
     # Find the list of files to format
     if cli.args.files:
         files.extend(normpath(file) for file in cli.args.files)
+        if cli.args.all_files:
+            cli.log.warning('Filenames passed with -a, only formatting: %s', ','.join(map(str, files)))
     # If -a is specified
     elif cli.args.all_files:
         all_files = c_source_files(core_dirs)
diff --git a/qmk/lib/python/qmk/cli/chibios/__init__.py b/qmk/lib/python/qmk/cli/chibios/__init__.py
new file mode 100644
index 00000000..4301837d
--- /dev/null
+++ b/qmk/lib/python/qmk/cli/chibios/__init__.py
@@ -0,0 +1 @@
+from . import confmigrate
diff --git a/qmk/lib/python/qmk/cli/chibios/confmigrate.py b/qmk/lib/python/qmk/cli/chibios/confmigrate.py
new file mode 100644
index 00000000..eae294a0
--- /dev/null
+++ b/qmk/lib/python/qmk/cli/chibios/confmigrate.py
@@ -0,0 +1,161 @@
+"""This script automates the copying of the default keymap into your own keymap.
+"""
+import re
+import sys
+import os
+
+from qmk.constants import QMK_FIRMWARE
+from qmk.path import normpath
+from milc import cli
+
+
+def eprint(*args, **kwargs):
+    print(*args, file=sys.stderr, **kwargs)
+
+
+fileHeader = """\
+/* Copyright 2020 QMK
+ *
+ * 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/>.
+ */
+
+/*
+ * This file was auto-generated by:
+ *    `qmk chibios-confupdate -i {0} -r {1}`
+ */
+
+#pragma once
+"""
+
+
+def collect_defines(filepath):
+    with open(filepath, 'r') as f:
+        content = f.read()
+        define_search = re.compile(r'(?m)^#\s*define\s+(?:.*\\\r?\n)*.*$', re.MULTILINE)
+        value_search = re.compile(r'^#\s*define\s+(?P<name>[a-zA-Z0-9_]+(\([^\)]*\))?)\s*(?P<value>.*)', re.DOTALL)
+        define_matches = define_search.findall(content)
+
+        defines = {"keys": [], "dict": {}}
+        for define_match in define_matches:
+            value_match = value_search.search(define_match)
+            defines["keys"].append(value_match.group("name"))
+            defines["dict"][value_match.group("name")] = value_match.group("value")
+        return defines
+
+
+def check_diffs(input_defs, reference_defs):
+    not_present_in_input = []
+    not_present_in_reference = []
+    to_override = []
+
+    for key in reference_defs["keys"]:
+        if key not in input_defs["dict"]:
+            not_present_in_input.append(key)
+            continue
+
+    for key in input_defs["keys"]:
+        if key not in input_defs["dict"]:
+            not_present_in_input.append(key)
+            continue
+
+    for key in input_defs["keys"]:
+        if key in reference_defs["keys"] and input_defs["dict"][key] != reference_defs["dict"][key]:
+            to_override.append((key, input_defs["dict"][key]))
+
+    return (to_override, not_present_in_input, not_present_in_reference)
+
+
+def migrate_chconf_h(to_override, outfile):
+    print(fileHeader.format(cli.args.input.relative_to(QMK_FIRMWARE), cli.args.reference.relative_to(QMK_FIRMWARE)), file=outfile)
+
+    for override in to_override:
+        print("#define %s %s" % (override[0], override[1]), file=outfile)
+        print("", file=outfile)
+
+    print("#include_next <chconf.h>\n", file=outfile)
+
+
+def migrate_halconf_h(to_override, outfile):
+    print(fileHeader.format(cli.args.input.relative_to(QMK_FIRMWARE), cli.args.reference.relative_to(QMK_FIRMWARE)), file=outfile)
+
+    for override in to_override:
+        print("#define %s %s" % (override[0], override[1]), file=outfile)
+        print("", file=outfile)
+
+    print("#include_next <halconf.h>\n", file=outfile)
+
+
+def migrate_mcuconf_h(to_override, outfile):
+    print(fileHeader.format(cli.args.input.relative_to(QMK_FIRMWARE), cli.args.reference.relative_to(QMK_FIRMWARE)), file=outfile)
+
+    print("#include_next <mcuconf.h>\n", file=outfile)
+
+    for override in to_override:
+        print("#undef %s" % (override[0]), file=outfile)
+        print("#define %s %s" % (override[0], override[1]), file=outfile)
+        print("", file=outfile)
+
+
+@cli.argument('-i', '--input', type=normpath, arg_only=True, help='Specify input config file.')
+@cli.argument('-r', '--reference', type=normpath, arg_only=True, help='Specify the reference file to compare against')
+@cli.argument('-o', '--overwrite', arg_only=True, action='store_true', help='Overwrites the input file during migration.')
+@cli.argument('-d', '--delete', arg_only=True, action='store_true', help='If the file has no overrides, migration will delete the input file.')
+@cli.subcommand('Generates a migrated ChibiOS configuration file, as a result of comparing the input against a reference')
+def chibios_confmigrate(cli):
+    """Generates a usable ChibiOS replacement configuration file, based on a fully-defined conf and a reference config.
+    """
+
+    input_defs = collect_defines(cli.args.input)
+    reference_defs = collect_defines(cli.args.reference)
+
+    (to_override, not_present_in_input, not_present_in_reference) = check_diffs(input_defs, reference_defs)
+
+    if len(not_present_in_input) > 0:
+        eprint("Keys not in input, but present inside reference (potential manual migration required):")
+        for key in not_present_in_input:
+            eprint("   %s" % (key))
+
+    if len(not_present_in_reference) > 0:
+        eprint("Keys not in reference, but present inside input (potential manual migration required):")
+        for key in not_present_in_reference:
+            eprint("   %s" % (key))
+
+    if len(to_override) == 0:
+        eprint('No overrides found! If there were no missing keys above, it should be safe to delete the input file.')
+        if cli.args.delete:
+            os.remove(cli.args.input)
+    else:
+        eprint('Overrides found:')
+        for override in to_override:
+            eprint("%40s: %s -> %s" % (override[0], reference_defs["dict"][override[0]].encode('unicode_escape').decode("utf-8"), override[1].encode('unicode_escape').decode("utf-8")))
+
+        eprint('--------------------------------------')
+
+        if "CHCONF_H" in input_defs["dict"] or "_CHCONF_H_" in input_defs["dict"]:
+            migrate_chconf_h(to_override, outfile=sys.stdout)
+            if cli.args.overwrite:
+                with open(cli.args.input, "w") as out_file:
+                    migrate_chconf_h(to_override, outfile=out_file)
+
+        elif "HALCONF_H" in input_defs["dict"] or "_HALCONF_H_" in input_defs["dict"]:
+            migrate_halconf_h(to_override, outfile=sys.stdout)
+            if cli.args.overwrite:
+                with open(cli.args.input, "w") as out_file:
+                    migrate_halconf_h(to_override, outfile=out_file)
+
+        elif "MCUCONF_H" in input_defs["dict"] or "_MCUCONF_H_" in input_defs["dict"]:
+            migrate_mcuconf_h(to_override, outfile=sys.stdout)
+            if cli.args.overwrite:
+                with open(cli.args.input, "w") as out_file:
+                    migrate_mcuconf_h(to_override, outfile=out_file)
diff --git a/qmk/lib/python/qmk/cli/clean.py b/qmk/lib/python/qmk/cli/clean.py
new file mode 100644
index 00000000..ec6501b7
--- /dev/null
+++ b/qmk/lib/python/qmk/cli/clean.py
@@ -0,0 +1,16 @@
+"""Clean the QMK firmware folder of build artifacts.
+"""
+from qmk.commands import run
+from milc import cli
+
+import shutil
+
+
+@cli.argument('-a', '--all', arg_only=True, action='store_true', help='Remove *.hex and *.bin files in the QMK root as well.')
+@cli.subcommand('Clean the QMK firmware folder of build artifacts.')
+def clean(cli):
+    """Runs `make clean` (or `make distclean` if --all is passed)
+    """
+    make_cmd = 'gmake' if shutil.which('gmake') else 'make'
+
+    run([make_cmd, 'distclean' if cli.args.all else 'clean'])
diff --git a/qmk/lib/python/qmk/cli/doctor.py b/qmk/lib/python/qmk/cli/doctor.py
index caa98a71..ea1113c6 100644
--- a/qmk/lib/python/qmk/cli/doctor.py
+++ b/qmk/lib/python/qmk/cli/doctor.py
@@ -7,13 +7,21 @@ import re
 import shutil
 import subprocess
 from pathlib import Path
+from enum import Enum
 
 from milc import cli
+from milc.questions import yesno
 from qmk import submodules
 from qmk.constants import QMK_FIRMWARE
-from qmk.questions import yesno
 from qmk.commands import run
 
+
+class CheckStatus(Enum):
+    OK = 1
+    WARNING = 2
+    ERROR = 3
+
+
 ESSENTIAL_BINARIES = {
     'dfu-programmer': {},
     'avrdude': {},
@@ -33,9 +41,12 @@ def _udev_rule(vid, pid=None, *args):
     """
     rule = ""
     if pid:
-        rule = 'SUBSYSTEMS=="usb", ATTRS{idVendor}=="%s", ATTRS{idProduct}=="%s", TAG+="uaccess", RUN{builtin}+="uaccess"' % (vid, pid)
+        rule = 'SUBSYSTEMS=="usb", ATTRS{idVendor}=="%s", ATTRS{idProduct}=="%s", TAG+="uaccess"' % (
+            vid,
+            pid,
+        )
     else:
-        rule = 'SUBSYSTEMS=="usb", ATTRS{idVendor}=="%s", TAG+="uaccess", RUN{builtin}+="uaccess"' % vid
+        rule = 'SUBSYSTEMS=="usb", ATTRS{idVendor}=="%s", TAG+="uaccess"' % vid
     if args:
         rule = ', '.join([rule, *args])
     return rule
@@ -69,24 +80,25 @@ def check_arm_gcc_version():
         version_number = ESSENTIAL_BINARIES['arm-none-eabi-gcc']['output'].strip()
         cli.log.info('Found arm-none-eabi-gcc version %s', version_number)
 
-    return True  # Right now all known arm versions are ok
+    return CheckStatus.OK  # Right now all known arm versions are ok
 
 
 def check_avr_gcc_version():
     """Returns True if the avr-gcc version is not known to cause problems.
     """
+    rc = CheckStatus.ERROR
     if 'output' in ESSENTIAL_BINARIES['avr-gcc']:
         version_number = ESSENTIAL_BINARIES['avr-gcc']['output'].strip()
 
+        cli.log.info('Found avr-gcc version %s', version_number)
+        rc = CheckStatus.OK
+
         parsed_version = parse_gcc_version(version_number)
         if parsed_version['major'] > 8:
-            cli.log.error('We do not recommend avr-gcc newer than 8. Downgrading to 8.x is recommended.')
-            return False
+            cli.log.warning('{fg_yellow}We do not recommend avr-gcc newer than 8. Downgrading to 8.x is recommended.')
+            rc = CheckStatus.WARNING
 
-        cli.log.info('Found avr-gcc version %s', version_number)
-        return True
-
-    return False
+    return rc
 
 
 def check_avrdude_version():
@@ -95,7 +107,7 @@ def check_avrdude_version():
         version_number = last_line.split()[2][:-1]
         cli.log.info('Found avrdude version %s', version_number)
 
-    return True
+    return CheckStatus.OK
 
 
 def check_dfu_util_version():
@@ -104,7 +116,7 @@ def check_dfu_util_version():
         version_number = first_line.split()[1]
         cli.log.info('Found dfu-util version %s', version_number)
 
-    return True
+    return CheckStatus.OK
 
 
 def check_dfu_programmer_version():
@@ -113,7 +125,7 @@ def check_dfu_programmer_version():
         version_number = first_line.split()[1]
         cli.log.info('Found dfu-programmer version %s', version_number)
 
-    return True
+    return CheckStatus.OK
 
 
 def check_binaries():
@@ -131,58 +143,67 @@ def check_binaries():
 def check_submodules():
     """Iterates through all submodules to make sure they're cloned and up to date.
     """
-    ok = True
-
     for submodule in submodules.status().values():
         if submodule['status'] is None:
             cli.log.error('Submodule %s has not yet been cloned!', submodule['name'])
-            ok = False
+            return CheckStatus.ERROR
         elif not submodule['status']:
-            cli.log.error('Submodule %s is not up to date!', submodule['name'])
-            ok = False
+            cli.log.warning('Submodule %s is not up to date!', submodule['name'])
+            return CheckStatus.WARNING
 
-    return ok
+    return CheckStatus.OK
+
+
+def check_git_repo():
+    """Checks that the .git directory exists inside QMK_HOME.
+
+    This is a decent enough indicator that the qmk_firmware directory is a
+    proper Git repository, rather than a .zip download from GitHub.
+    """
+    dot_git_dir = QMK_FIRMWARE / '.git'
+
+    return CheckStatus.OK if dot_git_dir.is_dir() else CheckStatus.WARNING
 
 
 def check_udev_rules():
     """Make sure the udev rules look good.
     """
-    ok = True
+    rc = CheckStatus.OK
     udev_dir = Path("/etc/udev/rules.d/")
     desired_rules = {
         'atmel-dfu': {
-            _udev_rule("03EB", "2FEF"),  # ATmega16U2
-            _udev_rule("03EB", "2FF0"),  # ATmega32U2
-            _udev_rule("03EB", "2FF3"),  # ATmega16U4
-            _udev_rule("03EB", "2FF4"),  # ATmega32U4
-            _udev_rule("03EB", "2FF9"),  # AT90USB64
-            _udev_rule("03EB", "2FFB")  # AT90USB128
+            _udev_rule("03eb", "2fef"),  # ATmega16U2
+            _udev_rule("03eb", "2ff0"),  # ATmega32U2
+            _udev_rule("03eb", "2ff3"),  # ATmega16U4
+            _udev_rule("03eb", "2ff4"),  # ATmega32U4
+            _udev_rule("03eb", "2ff9"),  # AT90USB64
+            _udev_rule("03eb", "2ffb")  # AT90USB128
         },
-        'kiibohd': {_udev_rule("1C11", "B007")},
+        'kiibohd': {_udev_rule("1c11", "b007")},
         'stm32': {
-            _udev_rule("1EAF", "0003"),  # STM32duino
-            _udev_rule("0483", "DF11")  # STM32 DFU
+            _udev_rule("1eaf", "0003"),  # STM32duino
+            _udev_rule("0483", "df11")  # STM32 DFU
         },
-        'bootloadhid': {_udev_rule("16C0", "05DF")},
-        'usbasploader': {_udev_rule("16C0", "05DC")},
-        'massdrop': {_udev_rule("03EB", "6124", 'ENV{ID_MM_DEVICE_IGNORE}="1"')},
+        'bootloadhid': {_udev_rule("16c0", "05df")},
+        'usbasploader': {_udev_rule("16c0", "05dc")},
+        'massdrop': {_udev_rule("03eb", "6124", 'ENV{ID_MM_DEVICE_IGNORE}="1"')},
         'caterina': {
             # Spark Fun Electronics
-            _udev_rule("1B4F", "9203", 'ENV{ID_MM_DEVICE_IGNORE}="1"'),  # Pro Micro 3V3/8MHz
-            _udev_rule("1B4F", "9205", 'ENV{ID_MM_DEVICE_IGNORE}="1"'),  # Pro Micro 5V/16MHz
-            _udev_rule("1B4F", "9207", 'ENV{ID_MM_DEVICE_IGNORE}="1"'),  # LilyPad 3V3/8MHz (and some Pro Micro clones)
-            # Pololu Electronics
-            _udev_rule("1FFB", "0101", 'ENV{ID_MM_DEVICE_IGNORE}="1"'),  # A-Star 32U4
+            _udev_rule("1b4f", "9203", 'ENV{ID_MM_DEVICE_IGNORE}="1"'),  # Pro Micro 3V3/8MHz
+            _udev_rule("1b4f", "9205", 'ENV{ID_MM_DEVICE_IGNORE}="1"'),  # Pro Micro 5V/16MHz
+            _udev_rule("1b4f", "9207", 'ENV{ID_MM_DEVICE_IGNORE}="1"'),  # LilyPad 3V3/8MHz (and some Pro Micro clones)
+            # Pololu EleCTRONICS
+            _udev_rule("1ffb", "0101", 'ENV{ID_MM_DEVICE_IGNORE}="1"'),  # A-Star 32U4
             # Arduino SA
             _udev_rule("2341", "0036", 'ENV{ID_MM_DEVICE_IGNORE}="1"'),  # Leonardo
             _udev_rule("2341", "0037", 'ENV{ID_MM_DEVICE_IGNORE}="1"'),  # Micro
-            # Adafruit Industries LLC
-            _udev_rule("239A", "000C", 'ENV{ID_MM_DEVICE_IGNORE}="1"'),  # Feather 32U4
-            _udev_rule("239A", "000D", 'ENV{ID_MM_DEVICE_IGNORE}="1"'),  # ItsyBitsy 32U4 3V3/8MHz
-            _udev_rule("239A", "000E", 'ENV{ID_MM_DEVICE_IGNORE}="1"'),  # ItsyBitsy 32U4 5V/16MHz
-            # dog hunter AG
-            _udev_rule("2A03", "0036", 'ENV{ID_MM_DEVICE_IGNORE}="1"'),  # Leonardo
-            _udev_rule("2A03", "0037", 'ENV{ID_MM_DEVICE_IGNORE}="1"')  # Micro
+            # Adafruit INDUSTRIES llC
+            _udev_rule("239a", "000c", 'ENV{ID_MM_DEVICE_IGNORE}="1"'),  # Feather 32U4
+            _udev_rule("239a", "000d", 'ENV{ID_MM_DEVICE_IGNORE}="1"'),  # ItsyBitsy 32U4 3V3/8MHz
+            _udev_rule("239a", "000e", 'ENV{ID_MM_DEVICE_IGNORE}="1"'),  # ItsyBitsy 32U4 5V/16MHz
+            # dog hunter ag
+            _udev_rule("2a03", "0036", 'ENV{ID_MM_DEVICE_IGNORE}="1"'),  # Leonardo
+            _udev_rule("2a03", "0037", 'ENV{ID_MM_DEVICE_IGNORE}="1"')  # Micro
         }
     }
 
@@ -209,31 +230,43 @@ def check_udev_rules():
 
         # Check if the desired rules are among the currently present rules
         for bootloader, rules in desired_rules.items():
-            # For caterina, check if ModemManager is running
-            if bootloader == "caterina":
-                if check_modem_manager():
-                    ok = False
-                    cli.log.warn("{bg_yellow}Detected ModemManager without the necessary udev rules. Please either disable it or set the appropriate udev rules if you are using a Pro Micro.")
             if not rules.issubset(current_rules):
                 deprecated_rule = deprecated_rules.get(bootloader)
                 if deprecated_rule and deprecated_rule.issubset(current_rules):
-                    cli.log.warn("{bg_yellow}Found old, deprecated udev rules for '%s' boards. The new rules on https://docs.qmk.fm/#/faq_build?id=linux-udev-rules offer better security with the same functionality.", bootloader)
+                    cli.log.warning("{fg_yellow}Found old, deprecated udev rules for '%s' boards. The new rules on https://docs.qmk.fm/#/faq_build?id=linux-udev-rules offer better security with the same functionality.", bootloader)
                 else:
-                    cli.log.warn("{bg_yellow}Missing udev rules for '%s' boards. See https://docs.qmk.fm/#/faq_build?id=linux-udev-rules for more details.", bootloader)
+                    # For caterina, check if ModemManager is running
+                    if bootloader == "caterina":
+                        if check_modem_manager():
+                            rc = CheckStatus.WARNING
+                            cli.log.warning("{fg_yellow}Detected ModemManager without the necessary udev rules. Please either disable it or set the appropriate udev rules if you are using a Pro Micro.")
+                    rc = CheckStatus.WARNING
+                    cli.log.warning("{fg_yellow}Missing or outdated udev rules for '%s' boards. Run 'sudo cp %s/util/udev/50-qmk.rules /etc/udev/rules.d/'.", bootloader, QMK_FIRMWARE)
 
-    return ok
+    else:
+        cli.log.warning("{fg_yellow}'%s' does not exist. Skipping udev rule checking...", udev_dir)
+
+    return rc
+
+
+def check_systemd():
+    """Check if it's a systemd system
+    """
+    return bool(shutil.which("systemctl"))
 
 
 def check_modem_manager():
     """Returns True if ModemManager is running.
+
     """
-    if shutil.which("systemctl"):
+    if check_systemd():
         mm_check = run(["systemctl", "--quiet", "is-active", "ModemManager.service"], timeout=10)
         if mm_check.returncode == 0:
             return True
-
     else:
-        cli.log.warn("Can't find systemctl to check for ModemManager.")
+        """(TODO): Add check for non-systemd systems
+        """
+    return False
 
 
 def is_executable(command):
@@ -259,16 +292,28 @@ def is_executable(command):
     return False
 
 
+def os_tests():
+    """Determine our OS and run platform specific tests
+    """
+    platform_id = platform.platform().lower()
+
+    if 'darwin' in platform_id or 'macos' in platform_id:
+        return os_test_macos()
+    elif 'linux' in platform_id:
+        return os_test_linux()
+    elif 'windows' in platform_id:
+        return os_test_windows()
+    else:
+        cli.log.warning('Unsupported OS detected: %s', platform_id)
+        return CheckStatus.WARNING
+
+
 def os_test_linux():
     """Run the Linux specific tests.
     """
     cli.log.info("Detected {fg_cyan}Linux.")
-    ok = True
 
-    if not check_udev_rules():
-        ok = False
-
-    return ok
+    return check_udev_rules()
 
 
 def os_test_macos():
@@ -276,7 +321,7 @@ def os_test_macos():
     """
     cli.log.info("Detected {fg_cyan}macOS.")
 
-    return True
+    return CheckStatus.OK
 
 
 def os_test_windows():
@@ -284,7 +329,7 @@ def os_test_windows():
     """
     cli.log.info("Detected {fg_cyan}Windows.")
 
-    return True
+    return CheckStatus.OK
 
 
 @cli.argument('-y', '--yes', action='store_true', arg_only=True, help='Answer yes to all questions.')
@@ -299,26 +344,18 @@ def doctor(cli):
         * [ ] Compile a trivial program with each compiler
     """
     cli.log.info('QMK Doctor is checking your environment.')
-    ok = True
 
-    # Determine our OS and run platform specific tests
-    platform_id = platform.platform().lower()
-
-    if 'darwin' in platform_id or 'macos' in platform_id:
-        if not os_test_macos():
-            ok = False
-    elif 'linux' in platform_id:
-        if not os_test_linux():
-            ok = False
-    elif 'windows' in platform_id:
-        if not os_test_windows():
-            ok = False
-    else:
-        cli.log.error('Unsupported OS detected: %s', platform_id)
-        ok = False
+    status = os_tests()
 
     cli.log.info('QMK home: {fg_cyan}%s', QMK_FIRMWARE)
 
+    # Make sure our QMK home is a Git repo
+    git_ok = check_git_repo()
+
+    if git_ok == CheckStatus.WARNING:
+        cli.log.warning("QMK home does not appear to be a Git repository! (no .git folder)")
+        status = CheckStatus.WARNING
+
     # Make sure the basic CLI tools we need are available and can be executed.
     bin_ok = check_binaries()
 
@@ -330,31 +367,41 @@ def doctor(cli):
     if bin_ok:
         cli.log.info('All dependencies are installed.')
     else:
-        ok = False
+        status = CheckStatus.ERROR
 
     # Make sure the tools are at the correct version
+    ver_ok = []
     for check in (check_arm_gcc_version, check_avr_gcc_version, check_avrdude_version, check_dfu_util_version, check_dfu_programmer_version):
-        if not check():
-            ok = False
+        ver_ok.append(check())
+
+    if CheckStatus.ERROR in ver_ok:
+        status = CheckStatus.ERROR
+    elif CheckStatus.WARNING in ver_ok and status == CheckStatus.OK:
+        status = CheckStatus.WARNING
 
     # Check out the QMK submodules
     sub_ok = check_submodules()
 
-    if sub_ok:
+    if sub_ok == CheckStatus.OK:
         cli.log.info('Submodules are up to date.')
     else:
         if yesno('Would you like to clone the submodules?', default=True):
             submodules.update()
             sub_ok = check_submodules()
 
-        if not sub_ok:
-            ok = False
+        if CheckStatus.ERROR in sub_ok:
+            status = CheckStatus.ERROR
+        elif CheckStatus.WARNING in sub_ok and status == CheckStatus.OK:
+            status = CheckStatus.WARNING
 
     # Report a summary of our findings to the user
-    if ok:
+    if status == CheckStatus.OK:
         cli.log.info('{fg_green}QMK is ready to go')
+        return 0
+    elif status == CheckStatus.WARNING:
+        cli.log.info('{fg_yellow}QMK is ready to go, but minor problems were found')
+        return 1
     else:
-        cli.log.info('{fg_yellow}Problems detected, please fix these problems before proceeding.')
-        # FIXME(skullydazed/unclaimed): Link to a document about troubleshooting, or discord or something
-
-    return ok
+        cli.log.info('{fg_red}Major problems detected, please fix these problems before proceeding.')
+        cli.log.info('{fg_blue}Check out the FAQ (https://docs.qmk.fm/#/faq_build) or join the QMK Discord (https://discord.gg/Uq7gcHh) for help.')
+        return 2
diff --git a/qmk/lib/python/qmk/cli/fileformat.py b/qmk/lib/python/qmk/cli/fileformat.py
new file mode 100644
index 00000000..db8e13f1
--- /dev/null
+++ b/qmk/lib/python/qmk/cli/fileformat.py
@@ -0,0 +1,13 @@
+"""Format files according to QMK's style.
+"""
+from milc import cli
+
+import subprocess
+
+
+@cli.subcommand("Format files according to QMK's style.", hidden=True)
+def fileformat(cli):
+    """Run several general formatting commands.
+    """
+    dos2unix = subprocess.run(['bash', '-c', 'git ls-files -z | xargs -0 dos2unix'])
+    return dos2unix.returncode
diff --git a/qmk/lib/python/qmk/cli/generate/__init__.py b/qmk/lib/python/qmk/cli/generate/__init__.py
index 4dc7607e..f9585bfb 100644
--- a/qmk/lib/python/qmk/cli/generate/__init__.py
+++ b/qmk/lib/python/qmk/cli/generate/__init__.py
@@ -1 +1,3 @@
 from . import api
+from . import docs
+from . import rgb_breathe_table
diff --git a/qmk/lib/python/qmk/cli/generate/api.py b/qmk/lib/python/qmk/cli/generate/api.py
index 9807a9cd..66db37cb 100644
--- a/qmk/lib/python/qmk/cli/generate/api.py
+++ b/qmk/lib/python/qmk/cli/generate/api.py
@@ -36,7 +36,7 @@ def generate_api(cli):
         keyboard_readme_src = Path('keyboards') / keyboard_name / 'readme.md'
 
         keyboard_dir.mkdir(parents=True, exist_ok=True)
-        keyboard_info.write_text(json.dumps(kb_all['keyboards'][keyboard_name]))
+        keyboard_info.write_text(json.dumps({'last_updated': current_datetime(), 'keyboards': {keyboard_name: kb_all['keyboards'][keyboard_name]}}))
 
         if keyboard_readme_src.exists():
             copyfile(keyboard_readme_src, keyboard_readme)
diff --git a/qmk/lib/python/qmk/cli/generate/docs.py b/qmk/lib/python/qmk/cli/generate/docs.py
new file mode 100644
index 00000000..a59a24db
--- /dev/null
+++ b/qmk/lib/python/qmk/cli/generate/docs.py
@@ -0,0 +1,37 @@
+"""Build QMK documentation locally
+"""
+import shutil
+import subprocess
+from pathlib import Path
+
+from milc import cli
+
+DOCS_PATH = Path('docs/')
+BUILD_PATH = Path('.build/docs/')
+
+
+@cli.subcommand('Build QMK documentation.', hidden=False if cli.config.user.developer else True)
+def generate_docs(cli):
+    """Invoke the docs generation process
+
+    TODO(unclaimed):
+        * [ ] Add a real build step... something static docs
+    """
+
+    if BUILD_PATH.exists():
+        shutil.rmtree(BUILD_PATH)
+
+    shutil.copytree(DOCS_PATH, BUILD_PATH)
+
+    # When not verbose we want to hide all output
+    args = {'check': True}
+    if not cli.args.verbose:
+        args.update({'stdout': subprocess.DEVNULL, 'stderr': subprocess.STDOUT})
+
+    cli.log.info('Generating internal docs...')
+
+    # Generate internal docs
+    subprocess.run(['doxygen', 'Doxyfile'], **args)
+    subprocess.run(['moxygen', '-q', '-a', '-g', '-o', BUILD_PATH / 'internals_%s.md', 'doxygen/xml'], **args)
+
+    cli.log.info('Successfully generated internal docs to %s.', BUILD_PATH)
diff --git a/qmk/lib/python/qmk/cli/generate/rgb_breathe_table.py b/qmk/lib/python/qmk/cli/generate/rgb_breathe_table.py
new file mode 100644
index 00000000..e1c5423e
--- /dev/null
+++ b/qmk/lib/python/qmk/cli/generate/rgb_breathe_table.py
@@ -0,0 +1,79 @@
+"""Generate rgblight_breathe_table.h
+"""
+import math
+from argparse import ArgumentTypeError
+
+from milc import cli
+
+import qmk.path
+
+
+def breathing_center(value):
+    value = float(value)
+    if value >= 1 and value <= 2.7:
+        return value
+    else:
+        raise ArgumentTypeError('Breathing center must be between 1 and 2.7')
+
+
+def breathing_max(value):
+    value = int(value)
+    if value in range(0, 256):
+        return value
+    else:
+        raise ArgumentTypeError('Breathing max must be between 0 and 255')
+
+
+@cli.argument('-c', '--center', arg_only=True, type=breathing_center, default=1.85, help='The breathing center value, from 1 to 2.7. Default: 1.85')
+@cli.argument('-m', '--max', arg_only=True, type=breathing_max, default=255, help='The breathing maximum value, from 0 to 255. Default: 255')
+@cli.argument('-o', '--output', arg_only=True, type=qmk.path.normpath, help='File to write to')
+@cli.argument('-q', '--quiet', arg_only=True, action='store_true', help='Quiet mode, only output error messages')
+@cli.subcommand('Generates an RGB Light breathing table header.')
+def generate_rgb_breathe_table(cli):
+    """Generate a rgblight_breathe_table.h file containing a breathing LUT for RGB Lighting (Underglow) feature.
+    """
+    breathe_values = [0] * 256
+    for pos in range(0, 256):
+        breathe_values[pos] = (int)((math.exp(math.sin((pos/255) * math.pi)) - cli.args.center / math.e) * (cli.args.max / (math.e - 1 / math.e)))  # noqa: yapf insists there be no whitespace around /
+
+    values_template = ''
+    for s in range(0, 3):
+        step = 1 << s
+
+        values_template += '#if RGBLIGHT_BREATHE_TABLE_SIZE == {}\n'.format(256 >> s)
+
+        for pos in range(0, 256, step):
+            values_template += '    ' if pos % 8 == 0 else ''
+            values_template += '0x{:02X}'.format(breathe_values[pos])
+            values_template += ',' if (pos + step) < 256 else ''
+            values_template += '\n' if (pos+step) % 8 == 0 else ' '  # noqa: yapf insists there be no whitespace around +
+
+        values_template += '#endif'
+        values_template += '\n\n' if s < 2 else ''
+
+    table_template = '''#pragma once
+
+#define RGBLIGHT_EFFECT_BREATHE_TABLE
+
+// clang-format off
+
+// Breathing center: {0:.2f}
+// Breathing max:    {1:d}
+
+const uint8_t PROGMEM rgblight_effect_breathe_table[] = {{
+{2}
+}};
+
+static const int table_scale = 256 / sizeof(rgblight_effect_breathe_table);
+'''.format(cli.args.center, cli.args.max, values_template)
+
+    if cli.args.output:
+        cli.args.output.parent.mkdir(parents=True, exist_ok=True)
+        if cli.args.output.exists():
+            cli.args.output.replace(cli.args.output.name + '.bak')
+        cli.args.output.write_text(table_template)
+
+        if not cli.args.quiet:
+            cli.log.info('Wrote header to %s.', cli.args.output)
+    else:
+        print(table_template)
diff --git a/qmk/lib/python/qmk/cli/info.py b/qmk/lib/python/qmk/cli/info.py
index 44ce1186..9ab299a2 100644
--- a/qmk/lib/python/qmk/cli/info.py
+++ b/qmk/lib/python/qmk/cli/info.py
@@ -3,6 +3,7 @@
 Compile an info.json for a particular keyboard and pretty-print it.
 """
 import json
+import platform
 
 from milc import cli
 
@@ -12,6 +13,8 @@ from qmk.keymap import locate_keymap
 from qmk.info import info_json
 from qmk.path import is_keyboard
 
+platform_id = platform.platform().lower()
+
 ROW_LETTERS = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnop'
 COL_LETTERS = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijilmnopqrstuvwxyz'
 
@@ -36,13 +39,13 @@ def show_keymap(kb_info_json, title_caps=True):
             else:
                 cli.echo('{fg_cyan}layer_%s{fg_reset}:', layer_num)
 
-            print(render_layout(kb_info_json['layouts'][layout_name]['layout'], layer))
+            print(render_layout(kb_info_json['layouts'][layout_name]['layout'], cli.config.info.ascii, layer))
 
 
 def show_layouts(kb_info_json, title_caps=True):
     """Render the layouts with info.json labels.
     """
-    for layout_name, layout_art in render_layouts(kb_info_json).items():
+    for layout_name, layout_art in render_layouts(kb_info_json, cli.config.info.ascii).items():
         title = layout_name.title() if title_caps else layout_name
         cli.echo('{fg_cyan}%s{fg_reset}:', title)
         print(layout_art)  # Avoid passing dirty data to cli.echo()
@@ -69,7 +72,7 @@ def show_matrix(kb_info_json, title_caps=True):
         else:
             cli.echo('{fg_blue}matrix_%s{fg_reset}:', layout_name)
 
-        print(render_layout(kb_info_json['layouts'][layout_name]['layout'], labels))
+        print(render_layout(kb_info_json['layouts'][layout_name]['layout'], cli.config.info.ascii, labels))
 
 
 def print_friendly_output(kb_info_json):
@@ -124,6 +127,7 @@ def print_text_output(kb_info_json):
 @cli.argument('-l', '--layouts', action='store_true', help='Render the layouts.')
 @cli.argument('-m', '--matrix', action='store_true', help='Render the layouts with matrix information.')
 @cli.argument('-f', '--format', default='friendly', arg_only=True, help='Format to display the data in (friendly, text, json) (Default: friendly).')
+@cli.argument('--ascii', action='store_true', default='windows' in platform_id, help='Render layout box drawings in ASCII only.')
 @cli.subcommand('Keyboard information.')
 @automagic_keyboard
 @automagic_keymap
@@ -132,7 +136,7 @@ def info(cli):
     """
     # Determine our keyboard(s)
     if not cli.config.info.keyboard:
-        cli.log.error('Missing paramater: --keyboard')
+        cli.log.error('Missing parameter: --keyboard')
         cli.subcommands['info'].print_help()
         return False
 
diff --git a/qmk/lib/python/qmk/cli/lint.py b/qmk/lib/python/qmk/cli/lint.py
new file mode 100644
index 00000000..74467021
--- /dev/null
+++ b/qmk/lib/python/qmk/cli/lint.py
@@ -0,0 +1,70 @@
+"""Command to look over a keyboard/keymap and check for common mistakes.
+"""
+from milc import cli
+
+from qmk.decorators import automagic_keyboard, automagic_keymap
+from qmk.info import info_json
+from qmk.keymap import locate_keymap
+from qmk.path import is_keyboard, keyboard
+
+
+@cli.argument('--strict', action='store_true', help='Treat warnings as errors.')
+@cli.argument('-kb', '--keyboard', help='The keyboard to check.')
+@cli.argument('-km', '--keymap', help='The keymap to check.')
+@cli.subcommand('Check keyboard and keymap for common mistakes.')
+@automagic_keyboard
+@automagic_keymap
+def lint(cli):
+    """Check keyboard and keymap for common mistakes.
+    """
+    if not cli.config.lint.keyboard:
+        cli.log.error('Missing required argument: --keyboard')
+        cli.print_help()
+        return False
+
+    if not is_keyboard(cli.config.lint.keyboard):
+        cli.log.error('No such keyboard: %s', cli.config.lint.keyboard)
+        return False
+
+    # Gather data about the keyboard.
+    ok = True
+    keyboard_path = keyboard(cli.config.lint.keyboard)
+    keyboard_info = info_json(cli.config.lint.keyboard)
+    readme_path = keyboard_path / 'readme.md'
+
+    # Check for errors in the info.json
+    if keyboard_info['parse_errors']:
+        ok = False
+        cli.log.error('Errors found when generating info.json.')
+
+    if cli.config.lint.strict and keyboard_info['parse_warnings']:
+        ok = False
+        cli.log.error('Warnings found when generating info.json (Strict mode enabled.)')
+
+    # Check for a readme.md and warn if it doesn't exist
+    if not readme_path.exists():
+        ok = False
+        cli.log.error('Missing %s', readme_path)
+
+    # Keymap specific checks
+    if cli.config.lint.keymap:
+        keymap_path = locate_keymap(cli.config.lint.keyboard, cli.config.lint.keymap)
+
+        if not keymap_path:
+            ok = False
+            cli.log.error("Can't find %s keymap for %s keyboard.", cli.config.lint.keymap, cli.config.lint.keyboard)
+        else:
+            keymap_readme = keymap_path.parent / 'readme.md'
+            if not keymap_readme.exists():
+                cli.log.warning('Missing %s', keymap_readme)
+
+                if cli.config.lint.strict:
+                    ok = False
+
+    # Check and report the overall status
+    if ok:
+        cli.log.info('Lint check passed!')
+        return True
+
+    cli.log.error('Lint check failed!')
+    return False
diff --git a/qmk/lib/python/qmk/info.py b/qmk/lib/python/qmk/info.py
index e92c3335..f476dc66 100644
--- a/qmk/lib/python/qmk/info.py
+++ b/qmk/lib/python/qmk/info.py
@@ -28,6 +28,8 @@ def info_json(keyboard):
         'keyboard_folder': str(keyboard),
         'keymaps': {},
         'layouts': {},
+        'parse_errors': [],
+        'parse_warnings': [],
         'maintainer': 'qmk',
     }
 
@@ -36,7 +38,7 @@ def info_json(keyboard):
         info_data['keymaps'][keymap.name] = {'url': f'https://raw.githubusercontent.com/qmk/qmk_firmware/master/{keymap}/keymap.json'}
 
     # Populate layout data
-    for layout_name, layout_json in _find_all_layouts(keyboard, rules).items():
+    for layout_name, layout_json in _find_all_layouts(info_data, keyboard, rules).items():
         if not layout_name.startswith('LAYOUT_kc'):
             info_data['layouts'][layout_name] = layout_json
 
@@ -104,14 +106,16 @@ def _extract_rules_mk(info_data):
     mcu = rules.get('MCU')
 
     if mcu in CHIBIOS_PROCESSORS:
-        arm_processor_rules(info_data, rules)
-    elif mcu in LUFA_PROCESSORS + VUSB_PROCESSORS:
-        avr_processor_rules(info_data, rules)
-    else:
-        cli.log.warning("%s: Unknown MCU: %s" % (info_data['keyboard_folder'], mcu))
-        unknown_processor_rules(info_data, rules)
+        return arm_processor_rules(info_data, rules)
 
-    return info_data
+    elif mcu in LUFA_PROCESSORS + VUSB_PROCESSORS:
+        return avr_processor_rules(info_data, rules)
+
+    msg = "Unknown MCU: " + str(mcu)
+
+    _log_warning(info_data, msg)
+
+    return unknown_processor_rules(info_data, rules)
 
 
 def _search_keyboard_h(path):
@@ -127,7 +131,7 @@ def _search_keyboard_h(path):
     return layouts
 
 
-def _find_all_layouts(keyboard, rules):
+def _find_all_layouts(info_data, keyboard, rules):
     """Looks for layout macros associated with this keyboard.
     """
     layouts = _search_keyboard_h(Path(keyboard))
@@ -135,7 +139,7 @@ def _find_all_layouts(keyboard, rules):
     if not layouts:
         # If we didn't find any layouts above we widen our search. This is error
         # prone which is why we want to encourage people to follow the standard above.
-        cli.log.warning('%s: Falling back to searching for KEYMAP/LAYOUT macros.' % (keyboard))
+        _log_warning(info_data, 'Falling back to searching for KEYMAP/LAYOUT macros.')
         for file in glob('keyboards/%s/*.h' % keyboard):
             if file.endswith('.h'):
                 these_layouts = find_layouts(file)
@@ -153,11 +157,25 @@ def _find_all_layouts(keyboard, rules):
                 supported_layouts.remove(layout_name)
 
         if supported_layouts:
-            cli.log.error('%s: Missing LAYOUT() macro for %s' % (keyboard, ', '.join(supported_layouts)))
+            _log_error(info_data, 'Missing LAYOUT() macro for %s' % (', '.join(supported_layouts)))
 
     return layouts
 
 
+def _log_error(info_data, message):
+    """Send an error message to both JSON and the log.
+    """
+    info_data['parse_errors'].append(message)
+    cli.log.error('%s: %s', info_data.get('keyboard_folder', 'Unknown Keyboard!'), message)
+
+
+def _log_warning(info_data, message):
+    """Send a warning message to both JSON and the log.
+    """
+    info_data['parse_warnings'].append(message)
+    cli.log.warning('%s: %s', info_data.get('keyboard_folder', 'Unknown Keyboard!'), message)
+
+
 def arm_processor_rules(info_data, rules):
     """Setup the default info for an ARM board.
     """
@@ -212,11 +230,15 @@ def merge_info_jsons(keyboard, info_data):
     """
     for info_file in find_info_json(keyboard):
         # Load and validate the JSON data
-        with info_file.open('r') as info_fd:
-            new_info_data = json.load(info_fd)
+        try:
+            with info_file.open('r') as info_fd:
+                new_info_data = json.load(info_fd)
+        except Exception as e:
+            _log_error(info_data, "Invalid JSON in file %s: %s: %s" % (str(info_file), e.__class__.__name__, e))
+            continue
 
         if not isinstance(new_info_data, dict):
-            cli.log.error("Invalid file %s, root object should be a dictionary.", str(info_file))
+            _log_error(info_data, "Invalid file %s, root object should be a dictionary." % (str(info_file),))
             continue
 
         # Copy whitelisted keys into `info_data`
@@ -230,7 +252,8 @@ def merge_info_jsons(keyboard, info_data):
                 # Only pull in layouts we have a macro for
                 if layout_name in info_data['layouts']:
                     if info_data['layouts'][layout_name]['key_count'] != len(json_layout['layout']):
-                        cli.log.error('%s: %s: Number of elements in info.json does not match! info.json:%s != %s:%s', info_data['keyboard_folder'], layout_name, len(json_layout['layout']), layout_name, len(info_data['layouts'][layout_name]['layout']))
+                        msg = '%s: Number of elements in info.json does not match! info.json:%s != %s:%s'
+                        _log_error(info_data, msg % (layout_name, len(json_layout['layout']), layout_name, len(info_data['layouts'][layout_name]['layout'])))
                     else:
                         for i, key in enumerate(info_data['layouts'][layout_name]['layout']):
                             key.update(json_layout['layout'][i])
diff --git a/qmk/lib/python/qmk/keyboard.py b/qmk/lib/python/qmk/keyboard.py
index 9ebb2d77..a4c28737 100644
--- a/qmk/lib/python/qmk/keyboard.py
+++ b/qmk/lib/python/qmk/keyboard.py
@@ -9,6 +9,25 @@ from glob import glob
 from qmk.c_parse import parse_config_h_file
 from qmk.makefile import parse_rules_mk_file
 
+BOX_DRAWING_CHARACTERS = {
+    "unicode": {
+        "tl": "┌",
+        "tr": "┐",
+        "bl": "└",
+        "br": "┘",
+        "v": "│",
+        "h": "─",
+    },
+    "ascii": {
+        "tl": " ",
+        "tr": " ",
+        "bl": "|",
+        "br": "|",
+        "v": "|",
+        "h": "_",
+    },
+}
+
 base_path = os.path.join(os.getcwd(), "keyboards") + os.path.sep
 
 
@@ -72,10 +91,12 @@ def rules_mk(keyboard):
     return rules
 
 
-def render_layout(layout_data, key_labels=None):
+def render_layout(layout_data, render_ascii, key_labels=None):
     """Renders a single layout.
     """
     textpad = [array('u', ' ' * 200) for x in range(50)]
+    style = 'ascii' if render_ascii else 'unicode'
+    box_chars = BOX_DRAWING_CHARACTERS[style]
 
     for key in layout_data:
         x = ceil(key.get('x', 0) * 4)
@@ -97,13 +118,13 @@ def render_layout(layout_data, key_labels=None):
             label = label[:label_len]
 
         label_blank = ' ' * label_len
-        label_border = '─' * label_len
+        label_border = box_chars['h'] * label_len
         label_middle = label + ' '*label_leftover  # noqa: yapf insists there be no whitespace around *
 
-        top_line = array('u', '┌' + label_border + '┐')
-        lab_line = array('u', '│' + label_middle + '│')
-        mid_line = array('u', '│' + label_blank + '│')
-        bot_line = array('u', '└' + label_border + "┘")
+        top_line = array('u', box_chars['tl'] + label_border + box_chars['tr'])
+        lab_line = array('u', box_chars['v'] + label_middle + box_chars['v'])
+        mid_line = array('u', box_chars['v'] + label_blank + box_chars['v'])
+        bot_line = array('u', box_chars['bl'] + label_border + box_chars['br'])
 
         textpad[y][x:x + w] = top_line
         textpad[y + 1][x:x + w] = lab_line
@@ -119,13 +140,13 @@ def render_layout(layout_data, key_labels=None):
     return '\n'.join(lines)
 
 
-def render_layouts(info_json):
+def render_layouts(info_json, render_ascii):
     """Renders all the layouts from an `info_json` structure.
     """
     layouts = {}
 
     for layout in info_json['layouts']:
         layout_data = info_json['layouts'][layout]['layout']
-        layouts[layout] = render_layout(layout_data)
+        layouts[layout] = render_layout(layout_data, render_ascii)
 
     return layouts
diff --git a/qmk/lib/python/qmk/path.py b/qmk/lib/python/qmk/path.py
index 591fad03..54def1d5 100644
--- a/qmk/lib/python/qmk/path.py
+++ b/qmk/lib/python/qmk/path.py
@@ -28,15 +28,21 @@ def under_qmk_firmware():
         return None
 
 
-def keymap(keyboard):
+def keyboard(keyboard_name):
+    """Returns the path to a keyboard's directory relative to the qmk root.
+    """
+    return Path('keyboards') / keyboard_name
+
+
+def keymap(keyboard_name):
     """Locate the correct directory for storing a keymap.
 
     Args:
 
-        keyboard
+        keyboard_name
             The name of the keyboard. Example: clueboard/66/rev3
     """
-    keyboard_folder = Path('keyboards') / keyboard
+    keyboard_folder = keyboard(keyboard_name)
 
     for i in range(MAX_KEYBOARD_SUBFOLDERS):
         if (keyboard_folder / 'keymaps').exists():
@@ -45,7 +51,7 @@ def keymap(keyboard):
         keyboard_folder = keyboard_folder.parent
 
     logging.error('Could not find the keymaps directory!')
-    raise NoSuchKeyboardError('Could not find keymaps directory for: %s' % keyboard)
+    raise NoSuchKeyboardError('Could not find keymaps directory for: %s' % keyboard_name)
 
 
 def normpath(path):
diff --git a/qmk/lib/python/qmk/tests/test_cli_commands.py b/qmk/lib/python/qmk/tests/test_cli_commands.py
index 7ac0bcbd..08e80f2c 100644
--- a/qmk/lib/python/qmk/tests/test_cli_commands.py
+++ b/qmk/lib/python/qmk/tests/test_cli_commands.py
@@ -1,7 +1,11 @@
+import platform
+
 from subprocess import STDOUT, PIPE
 
 from qmk.commands import run
 
+is_windows = 'windows' in platform.platform().lower()
+
 
 def check_subcommand(command, *args):
     cmd = ['bin/qmk', command] + list(args)
@@ -9,14 +13,14 @@ def check_subcommand(command, *args):
     return result
 
 
-def check_returncode(result, expected=0):
+def check_returncode(result, expected=[0]):
     """Print stdout if `result.returncode` does not match `expected`.
     """
-    if result.returncode != expected:
+    if result.returncode not in expected:
         print('`%s` stdout:' % ' '.join(result.args))
         print(result.stdout)
         print('returncode:', result.returncode)
-    assert result.returncode == expected
+    assert result.returncode in expected
 
 
 def test_cformat():
@@ -30,7 +34,7 @@ def test_compile():
 
 
 def test_compile_json():
-    result = check_subcommand('compile', '-kb', 'handwired/onekey/pytest', '-km', 'default_json')
+    result = check_subcommand('compile', '-kb', 'handwired/onekey/pytest', '-km', 'default_json', '-n')
     check_returncode(result)
 
 
@@ -41,7 +45,7 @@ def test_flash():
 
 def test_flash_bootloaders():
     result = check_subcommand('flash', '-b')
-    check_returncode(result, 1)
+    check_returncode(result, [1])
 
 
 def test_config():
@@ -58,7 +62,7 @@ def test_kle2json():
 
 def test_doctor():
     result = check_subcommand('doctor', '-n')
-    check_returncode(result)
+    check_returncode(result, [0, 1])
     assert 'QMK Doctor is checking your environment.' in result.stdout
     assert 'QMK is ready to go' in result.stdout
 
@@ -85,43 +89,43 @@ def test_list_keyboards():
 
 def test_list_keymaps():
     result = check_subcommand('list-keymaps', '-kb', 'handwired/onekey/pytest')
-    check_returncode(result, 0)
+    check_returncode(result)
     assert 'default' and 'test' in result.stdout
 
 
 def test_list_keymaps_long():
     result = check_subcommand('list-keymaps', '--keyboard', 'handwired/onekey/pytest')
-    check_returncode(result, 0)
+    check_returncode(result)
     assert 'default' and 'test' in result.stdout
 
 
 def test_list_keymaps_kb_only():
     result = check_subcommand('list-keymaps', '-kb', 'niu_mini')
-    check_returncode(result, 0)
+    check_returncode(result)
     assert 'default' and 'via' in result.stdout
 
 
 def test_list_keymaps_vendor_kb():
     result = check_subcommand('list-keymaps', '-kb', 'ai03/lunar')
-    check_returncode(result, 0)
+    check_returncode(result)
     assert 'default' and 'via' in result.stdout
 
 
 def test_list_keymaps_vendor_kb_rev():
     result = check_subcommand('list-keymaps', '-kb', 'kbdfans/kbd67/mkiirgb/v2')
-    check_returncode(result, 0)
+    check_returncode(result)
     assert 'default' and 'via' in result.stdout
 
 
 def test_list_keymaps_no_keyboard_found():
     result = check_subcommand('list-keymaps', '-kb', 'asdfghjkl')
-    check_returncode(result, 1)
+    check_returncode(result, [1])
     assert 'does not exist' in result.stdout
 
 
 def test_json2c():
     result = check_subcommand('json2c', 'keyboards/handwired/onekey/keymaps/default_json/keymap.json')
-    check_returncode(result, 0)
+    check_returncode(result)
     assert result.stdout == '#include QMK_KEYBOARD_H\nconst uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {\t[0] = LAYOUT_ortho_1x1(KC_A)};\n\n'
 
 
@@ -148,7 +152,11 @@ def test_info_keymap_render():
     check_returncode(result)
     assert 'Keyboard Name: handwired/onekey/pytest' in result.stdout
     assert 'Processor: STM32F303' in result.stdout
-    assert '│A │' in result.stdout
+
+    if is_windows:
+        assert '|A |' in result.stdout
+    else:
+        assert '│A │' in result.stdout
 
 
 def test_info_matrix_render():
@@ -157,7 +165,12 @@ def test_info_matrix_render():
     assert 'Keyboard Name: handwired/onekey/pytest' in result.stdout
     assert 'Processor: STM32F303' in result.stdout
     assert 'LAYOUT_ortho_1x1' in result.stdout
-    assert '│0A│' in result.stdout
+
+    if is_windows:
+        assert '|0A|' in result.stdout
+    else:
+        assert '│0A│' in result.stdout
+
     assert 'Matrix for "LAYOUT_ortho_1x1"' in result.stdout
 
 
@@ -171,3 +184,16 @@ def test_c2json_nocpp():
     result = check_subcommand("c2json", "--no-cpp", "-kb", "handwired/onekey/pytest", "-km", "default", "keyboards/handwired/onekey/keymaps/pytest_nocpp/keymap.c")
     check_returncode(result)
     assert result.stdout.strip() == '{"keyboard": "handwired/onekey/pytest", "documentation": "This file is a keymap.json file for handwired/onekey/pytest", "keymap": "default", "layout": "LAYOUT", "layers": [["KC_ENTER"]]}'
+
+
+def test_clean():
+    result = check_subcommand('clean', '-a')
+    check_returncode(result)
+    assert result.stdout.count('done') == 2
+
+
+def test_generate_rgb_breathe_table():
+    result = check_subcommand("generate-rgb-breathe-table", "-c", "1.2", "-m", "127")
+    check_returncode(result)
+    assert 'Breathing center: 1.2' in result.stdout
+    assert 'Breathing max:    127' in result.stdout
diff --git a/qmk/message.mk b/qmk/message.mk
index be04fa9b..84b23c1b 100644
--- a/qmk/message.mk
+++ b/qmk/message.mk
@@ -5,6 +5,7 @@ ifeq ($(COLOR),true)
 	OK_COLOR=\033[32;01m
 	ERROR_COLOR=\033[31;01m
 	WARN_COLOR=\033[33;01m
+	SKIPPED_COLOR=\033[36;01m
 	BLUE=\033[0;34m
 	BOLD=\033[1m
 endif
@@ -20,6 +21,7 @@ ON_ERROR ?= exit 1
 OK_STRING=$(OK_COLOR)[OK]$(NO_COLOR)\n
 ERROR_STRING=$(ERROR_COLOR)[ERRORS]$(NO_COLOR)\n
 WARN_STRING=$(WARN_COLOR)[WARNINGS]$(NO_COLOR)\n
+SKIPPED_STRING=$(SKIPPED_COLOR)[SKIPPED]$(NO_COLOR)\n
 
 TAB_LOG = printf "\n%s\n\n" "$$LOG" | $(AWK) '{ sub(/^/," | "); print }'
 TAB_LOG_PLAIN = printf "%s\n" "$$LOG"
@@ -29,6 +31,7 @@ PRINT_ERROR = ($(SILENT) ||printf " $(ERROR_STRING)" | $(AWK_STATUS)) && $(TAB_L
 PRINT_WARNING = ($(SILENT) || printf " $(WARN_STRING)" | $(AWK_STATUS)) && $(TAB_LOG)
 PRINT_ERROR_PLAIN = ($(SILENT) ||printf " $(ERROR_STRING)" | $(AWK_STATUS)) && $(TAB_LOG_PLAIN) && $(ON_ERROR)
 PRINT_WARNING_PLAIN = ($(SILENT) || printf " $(WARN_STRING)" | $(AWK_STATUS)) && $(TAB_LOG_PLAIN)
+PRINT_SKIPPED_PLAIN = ($(SILENT) || printf " $(SKIPPED_STRING)" | $(AWK_STATUS))
 PRINT_OK = $(SILENT) || printf " $(OK_STRING)" | $(AWK_STATUS)
 BUILD_CMD = LOG=$$($(CMD) 2>&1) ; if [ $$? -gt 0 ]; then $(PRINT_ERROR); elif [ "$$LOG" != "" ] ; then $(PRINT_WARNING); else $(PRINT_OK); fi;
 MAKE_MSG_FORMAT = $(AWK) '{ printf "%-118s", $$0;}'
diff --git a/qmk/platforms/chibios/BLACKPILL_STM32_F401/configs/config.h b/qmk/platforms/chibios/BLACKPILL_STM32_F401/configs/config.h
index eb73e72e..1c9d9c61 100644
--- a/qmk/platforms/chibios/BLACKPILL_STM32_F401/configs/config.h
+++ b/qmk/platforms/chibios/BLACKPILL_STM32_F401/configs/config.h
@@ -20,4 +20,6 @@
 #define STM32_LSECLK 32768U
 #define STM32_HSECLK 25000000U
 
-#define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
+#ifndef EARLY_INIT_PERFORM_BOOTLOADER_JUMP
+#    define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
+#endif
diff --git a/qmk/platforms/chibios/BLACKPILL_STM32_F411/configs/config.h b/qmk/platforms/chibios/BLACKPILL_STM32_F411/configs/config.h
index eb73e72e..1c9d9c61 100644
--- a/qmk/platforms/chibios/BLACKPILL_STM32_F411/configs/config.h
+++ b/qmk/platforms/chibios/BLACKPILL_STM32_F411/configs/config.h
@@ -20,4 +20,6 @@
 #define STM32_LSECLK 32768U
 #define STM32_HSECLK 25000000U
 
-#define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
+#ifndef EARLY_INIT_PERFORM_BOOTLOADER_JUMP
+#    define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
+#endif
diff --git a/qmk/platforms/chibios/GENERIC_STM32_F042X6/board/board.c b/qmk/platforms/chibios/GENERIC_STM32_F042X6/board/board.c
index 7d93b68f..3c6f54ef 100644
--- a/qmk/platforms/chibios/GENERIC_STM32_F042X6/board/board.c
+++ b/qmk/platforms/chibios/GENERIC_STM32_F042X6/board/board.c
@@ -19,8 +19,8 @@
  * generator plugin. Do not edit manually.
  */
 
-#include "hal.h"
-#include "stm32_gpio.h"
+#include <hal.h>
+#include <stm32_gpio.h>
 
 /*===========================================================================*/
 /* Driver local definitions.                                                 */
diff --git a/qmk/platforms/chibios/GENERIC_STM32_F042X6/configs/bootloader_defs.h b/qmk/platforms/chibios/GENERIC_STM32_F042X6/configs/bootloader_defs.h
index 4994be9c..6b218f7b 100644
--- a/qmk/platforms/chibios/GENERIC_STM32_F042X6/configs/bootloader_defs.h
+++ b/qmk/platforms/chibios/GENERIC_STM32_F042X6/configs/bootloader_defs.h
@@ -1,7 +1,5 @@
 /* Address for jumping to bootloader on STM32 chips. */
 /* It is chip dependent, the correct number can be looked up here:
  * http://www.st.com/web/en/resource/technical/document/application_note/CD00167594.pdf
- * This also requires a patch to chibios:
- *  <tmk_dir>/tmk_core/tool/chibios/ch-bootloader-jump.patch
  */
 #define STM32_BOOTLOADER_ADDRESS 0x1FFFC400
\ No newline at end of file
diff --git a/qmk/platforms/chibios/GENERIC_STM32_F042X6/configs/config.h b/qmk/platforms/chibios/GENERIC_STM32_F042X6/configs/config.h
new file mode 100644
index 00000000..a73f0c0b
--- /dev/null
+++ b/qmk/platforms/chibios/GENERIC_STM32_F042X6/configs/config.h
@@ -0,0 +1,20 @@
+/* Copyright 2020 Nick Brassel (tzarc)
+ *
+ *  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 3 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 <https://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#ifndef EARLY_INIT_PERFORM_BOOTLOADER_JUMP
+#    define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
+#endif
diff --git a/qmk/platforms/chibios/GENERIC_STM32_F042X6/configs/mcuconf.h b/qmk/platforms/chibios/GENERIC_STM32_F042X6/configs/mcuconf.h
new file mode 100644
index 00000000..4643e9f9
--- /dev/null
+++ b/qmk/platforms/chibios/GENERIC_STM32_F042X6/configs/mcuconf.h
@@ -0,0 +1,168 @@
+/*
+    ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+        http://www.apache.org/licenses/LICENSE-2.0
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
+/*
+ * STM32F0xx drivers configuration.
+ * The following settings override the default settings present in
+ * the various device driver implementation headers.
+ * Note that the settings for each driver only have effect if the whole
+ * driver is enabled in halconf.h.
+ *
+ * IRQ priorities:
+ * 3...0       Lowest...Highest.
+ *
+ * DMA priorities:
+ * 0...3        Lowest...Highest.
+ */
+
+#define STM32F0xx_MCUCONF
+
+/*
+ * HAL driver system settings.
+ */
+#define STM32_NO_INIT                       FALSE
+#define STM32_PVD_ENABLE                    FALSE
+#define STM32_PLS                           STM32_PLS_LEV0
+#define STM32_HSI_ENABLED                   TRUE
+#define STM32_HSI14_ENABLED                 TRUE
+#define STM32_HSI48_ENABLED                 FALSE
+#define STM32_LSI_ENABLED                   TRUE
+#define STM32_HSE_ENABLED                   FALSE
+#define STM32_LSE_ENABLED                   FALSE
+#define STM32_SW                            STM32_SW_PLL
+#define STM32_PLLSRC                        STM32_PLLSRC_HSI_DIV2
+#define STM32_PREDIV_VALUE                  1
+#define STM32_PLLMUL_VALUE                  12
+#define STM32_HPRE                          STM32_HPRE_DIV1
+#define STM32_PPRE                          STM32_PPRE_DIV1
+#define STM32_ADCSW                         STM32_ADCSW_HSI14
+#define STM32_ADCPRE                        STM32_ADCPRE_DIV4
+#define STM32_MCOSEL                        STM32_MCOSEL_NOCLOCK
+#define STM32_ADCPRE                        STM32_ADCPRE_DIV4
+#define STM32_ADCSW                         STM32_ADCSW_HSI14
+#define STM32_USBSW                         STM32_USBSW_HSI48
+#define STM32_CECSW                         STM32_CECSW_HSI
+#define STM32_I2C1SW                        STM32_I2C1SW_HSI
+#define STM32_USART1SW                      STM32_USART1SW_PCLK
+#define STM32_RTCSEL                        STM32_RTCSEL_LSI
+
+/*
+ * ADC driver system settings.
+ */
+#define STM32_ADC_USE_ADC1                  FALSE
+#define STM32_ADC_ADC1_DMA_PRIORITY         2
+#define STM32_ADC_IRQ_PRIORITY              2
+#define STM32_ADC_ADC1_DMA_IRQ_PRIORITY     2
+
+/*
+ * EXT driver system settings.
+ */
+#define STM32_EXT_EXTI0_1_IRQ_PRIORITY      3
+#define STM32_EXT_EXTI2_3_IRQ_PRIORITY      3
+#define STM32_EXT_EXTI4_15_IRQ_PRIORITY     3
+#define STM32_EXT_EXTI16_IRQ_PRIORITY       3
+#define STM32_EXT_EXTI17_IRQ_PRIORITY       3
+
+/*
+ * GPT driver system settings.
+ */
+#define STM32_GPT_USE_TIM1                  FALSE
+#define STM32_GPT_USE_TIM2                  FALSE
+#define STM32_GPT_USE_TIM3                  FALSE
+#define STM32_GPT_USE_TIM14                 FALSE
+#define STM32_GPT_TIM1_IRQ_PRIORITY         2
+#define STM32_GPT_TIM2_IRQ_PRIORITY         2
+#define STM32_GPT_TIM3_IRQ_PRIORITY         2
+#define STM32_GPT_TIM14_IRQ_PRIORITY        2
+
+/*
+ * I2C driver system settings.
+ */
+#define STM32_I2C_USE_I2C1                  FALSE
+#define STM32_I2C_USE_I2C2                  FALSE
+#define STM32_I2C_BUSY_TIMEOUT              50
+#define STM32_I2C_I2C1_IRQ_PRIORITY         3
+#define STM32_I2C_I2C2_IRQ_PRIORITY         3
+#define STM32_I2C_USE_DMA                   TRUE
+#define STM32_I2C_I2C1_DMA_PRIORITY         1
+#define STM32_I2C_I2C2_DMA_PRIORITY         1
+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")
+
+/*
+ * ICU driver system settings.
+ */
+#define STM32_ICU_USE_TIM1                  FALSE
+#define STM32_ICU_USE_TIM2                  FALSE
+#define STM32_ICU_USE_TIM3                  FALSE
+#define STM32_ICU_TIM1_IRQ_PRIORITY         3
+#define STM32_ICU_TIM2_IRQ_PRIORITY         3
+#define STM32_ICU_TIM3_IRQ_PRIORITY         3
+
+/*
+ * PWM driver system settings.
+ */
+#define STM32_PWM_USE_ADVANCED              FALSE
+#define STM32_PWM_USE_TIM1                  FALSE
+#define STM32_PWM_USE_TIM2                  FALSE
+#define STM32_PWM_USE_TIM3                  FALSE
+#define STM32_PWM_TIM1_IRQ_PRIORITY         3
+#define STM32_PWM_TIM2_IRQ_PRIORITY         3
+#define STM32_PWM_TIM3_IRQ_PRIORITY         3
+
+/*
+ * SERIAL driver system settings.
+ */
+#define STM32_SERIAL_USE_USART1             FALSE
+#define STM32_SERIAL_USE_USART2             FALSE
+#define STM32_SERIAL_USART1_PRIORITY        3
+#define STM32_SERIAL_USART2_PRIORITY        3
+
+/*
+ * SPI driver system settings.
+ */
+#define STM32_SPI_USE_SPI1                  FALSE
+#define STM32_SPI_USE_SPI2                  FALSE
+#define STM32_SPI_SPI1_DMA_PRIORITY         1
+#define STM32_SPI_SPI2_DMA_PRIORITY         1
+#define STM32_SPI_SPI1_IRQ_PRIORITY         2
+#define STM32_SPI_SPI2_IRQ_PRIORITY         2
+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")
+
+/*
+ * ST driver system settings.
+ */
+#define STM32_ST_IRQ_PRIORITY               2
+#define STM32_ST_USE_TIMER                  2
+
+/*
+ * UART driver system settings.
+ */
+#define STM32_UART_USE_USART1               FALSE
+#define STM32_UART_USE_USART2               FALSE
+#define STM32_UART_USART1_IRQ_PRIORITY      3
+#define STM32_UART_USART2_IRQ_PRIORITY      3
+#define STM32_UART_USART1_DMA_PRIORITY      0
+#define STM32_UART_USART2_DMA_PRIORITY      0
+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")
+
+/*
+ * USB driver system settings.
+ */
+#define STM32_USB_USE_USB1                  TRUE
+#define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE
+#define STM32_USB_USB1_LP_IRQ_PRIORITY      3
+
+#endif /* _MCUCONF_H_ */
\ No newline at end of file
diff --git a/qmk/platforms/chibios/GENERIC_STM32_F072XB/board/board.mk b/qmk/platforms/chibios/GENERIC_STM32_F072XB/board/board.mk
index 842e3359..3f0e6c46 100644
--- a/qmk/platforms/chibios/GENERIC_STM32_F072XB/board/board.mk
+++ b/qmk/platforms/chibios/GENERIC_STM32_F072XB/board/board.mk
@@ -1,8 +1,8 @@
 # List of all the board related files.
-BOARDSRC = $(BOARD_PATH)/board/board.c
+BOARDSRC = $(CHIBIOS)/os/hal/boards/ST_NUCLEO64_F072RB/board.c
 
 # Required include directories
-BOARDINC = $(BOARD_PATH)/board
+BOARDINC = $(CHIBIOS)/os/hal/boards/ST_NUCLEO64_F072RB
 
 # Shared variables
 ALLCSRC += $(BOARDSRC)
diff --git a/qmk/platforms/chibios/GENERIC_STM32_F072XB/configs/board.h b/qmk/platforms/chibios/GENERIC_STM32_F072XB/configs/board.h
new file mode 100644
index 00000000..30af6b0c
--- /dev/null
+++ b/qmk/platforms/chibios/GENERIC_STM32_F072XB/configs/board.h
@@ -0,0 +1,20 @@
+/* Copyright 2020 Nick Brassel (tzarc)
+ *
+ *  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 3 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 <https://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#include_next "board.h"
+
+#undef STM32_HSE_BYPASS
diff --git a/qmk/platforms/chibios/GENERIC_STM32_F072XB/configs/bootloader_defs.h b/qmk/platforms/chibios/GENERIC_STM32_F072XB/configs/bootloader_defs.h
index 02c48c4e..dccd0fa5 100644
--- a/qmk/platforms/chibios/GENERIC_STM32_F072XB/configs/bootloader_defs.h
+++ b/qmk/platforms/chibios/GENERIC_STM32_F072XB/configs/bootloader_defs.h
@@ -1,7 +1,5 @@
 /* Address for jumping to bootloader on STM32 chips. */
 /* It is chip dependent, the correct number can be looked up here (page 175):
  * http://www.st.com/web/en/resource/technical/document/application_note/CD00167594.pdf
- * This also requires a patch to chibios:
- *  <tmk_dir>/tmk_core/tool/chibios/ch-bootloader-jump.patch
  */
 #define STM32_BOOTLOADER_ADDRESS 0x1FFFC800
diff --git a/qmk/platforms/chibios/GENERIC_STM32_F072XB/configs/config.h b/qmk/platforms/chibios/GENERIC_STM32_F072XB/configs/config.h
new file mode 100644
index 00000000..a73f0c0b
--- /dev/null
+++ b/qmk/platforms/chibios/GENERIC_STM32_F072XB/configs/config.h
@@ -0,0 +1,20 @@
+/* Copyright 2020 Nick Brassel (tzarc)
+ *
+ *  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 3 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 <https://www.gnu.org/licenses/>.
+ */
+#pragma once
+
+#ifndef EARLY_INIT_PERFORM_BOOTLOADER_JUMP
+#    define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
+#endif
diff --git a/qmk/platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h b/qmk/platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h
new file mode 100644
index 00000000..688350e9
--- /dev/null
+++ b/qmk/platforms/chibios/GENERIC_STM32_F072XB/configs/mcuconf.h
@@ -0,0 +1,177 @@
+/*
+    ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
+/*
+ * STM32F0xx drivers configuration.
+ * The following settings override the default settings present in
+ * the various device driver implementation headers.
+ * Note that the settings for each driver only have effect if the whole
+ * driver is enabled in halconf.h.
+ *
+ * IRQ priorities:
+ * 3...0       Lowest...Highest.
+ *
+ * DMA priorities:
+ * 0...3        Lowest...Highest.
+ */
+
+#define STM32F0xx_MCUCONF
+// #define STM32F070xB
+
+/*
+ * HAL driver system settings.
+ */
+#define STM32_NO_INIT FALSE
+#define STM32_PVD_ENABLE FALSE
+#define STM32_PLS STM32_PLS_LEV0
+#define STM32_HSI_ENABLED TRUE
+#define STM32_HSI14_ENABLED TRUE
+#define STM32_HSI48_ENABLED FALSE
+#define STM32_LSI_ENABLED TRUE
+#define STM32_HSE_ENABLED FALSE
+#define STM32_LSE_ENABLED FALSE
+#define STM32_SW STM32_SW_PLL
+#define STM32_PLLSRC STM32_PLLSRC_HSI_DIV2
+#define STM32_PREDIV_VALUE 1
+#define STM32_PLLMUL_VALUE 12
+#define STM32_HPRE STM32_HPRE_DIV1
+#define STM32_PPRE STM32_PPRE_DIV1
+#define STM32_ADCSW STM32_ADCSW_HSI14
+#define STM32_ADCPRE STM32_ADCPRE_DIV4
+#define STM32_MCOSEL STM32_MCOSEL_NOCLOCK
+#define STM32_ADCPRE STM32_ADCPRE_DIV4
+#define STM32_ADCSW STM32_ADCSW_HSI14
+#define STM32_USBSW STM32_USBSW_HSI48
+#define STM32_CECSW STM32_CECSW_HSI
+#define STM32_I2C1SW STM32_I2C1SW_HSI
+#define STM32_USART1SW STM32_USART1SW_PCLK
+#define STM32_RTCSEL STM32_RTCSEL_LSI
+
+/*
+ * IRQ system settings.
+ */
+#define STM32_IRQ_EXTI0_1_IRQ_PRIORITY 3
+#define STM32_IRQ_EXTI2_3_IRQ_PRIORITY 3
+#define STM32_IRQ_EXTI4_15_IRQ_PRIORITY 3
+#define STM32_IRQ_EXTI16_IRQ_PRIORITY 3
+#define STM32_IRQ_EXTI17_20_IRQ_PRIORITY 3
+#define STM32_IRQ_EXTI21_22_IRQ_PRIORITY 3
+
+/*
+ * ADC driver system settings.
+ */
+#define STM32_ADC_USE_ADC1 FALSE
+#define STM32_ADC_ADC1_DMA_PRIORITY 2
+#define STM32_ADC_IRQ_PRIORITY 2
+#define STM32_ADC_ADC1_DMA_IRQ_PRIORITY 2
+
+/*
+ * GPT driver system settings.
+ */
+#define STM32_GPT_USE_TIM1 FALSE
+#define STM32_GPT_USE_TIM2 FALSE
+#define STM32_GPT_USE_TIM3 FALSE
+#define STM32_GPT_USE_TIM14 FALSE
+#define STM32_GPT_TIM1_IRQ_PRIORITY 2
+#define STM32_GPT_TIM2_IRQ_PRIORITY 2
+#define STM32_GPT_TIM3_IRQ_PRIORITY 2
+#define STM32_GPT_TIM14_IRQ_PRIORITY 2
+
+/*
+ * I2C driver system settings.
+ */
+#define STM32_I2C_USE_I2C1 FALSE
+#define STM32_I2C_USE_I2C2 FALSE
+#define STM32_I2C_BUSY_TIMEOUT 50
+#define STM32_I2C_I2C1_IRQ_PRIORITY 3
+#define STM32_I2C_I2C2_IRQ_PRIORITY 3
+#define STM32_I2C_USE_DMA TRUE
+#define STM32_I2C_I2C1_DMA_PRIORITY 1
+#define STM32_I2C_I2C2_DMA_PRIORITY 1
+#define STM32_I2C_I2C1_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 7)
+#define STM32_I2C_I2C1_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 6)
+#define STM32_I2C_DMA_ERROR_HOOK(i2cp) osalSysHalt("DMA failure")
+
+/*
+ * ICU driver system settings.
+ */
+#define STM32_ICU_USE_TIM1 FALSE
+#define STM32_ICU_USE_TIM2 FALSE
+#define STM32_ICU_USE_TIM3 FALSE
+#define STM32_ICU_TIM1_IRQ_PRIORITY 3
+#define STM32_ICU_TIM2_IRQ_PRIORITY 3
+#define STM32_ICU_TIM3_IRQ_PRIORITY 3
+
+/*
+ * PWM driver system settings.
+ */
+#define STM32_PWM_USE_ADVANCED FALSE
+#define STM32_PWM_USE_TIM1 FALSE
+#define STM32_PWM_USE_TIM2 FALSE
+#define STM32_PWM_USE_TIM3 TRUE
+#define STM32_PWM_TIM1_IRQ_PRIORITY 3
+#define STM32_PWM_TIM2_IRQ_PRIORITY 3
+#define STM32_PWM_TIM3_IRQ_PRIORITY 3
+
+/*
+ * SERIAL driver system settings.
+ */
+#define STM32_SERIAL_USE_USART1 FALSE
+#define STM32_SERIAL_USE_USART2 FALSE
+#define STM32_SERIAL_USART1_PRIORITY 3
+#define STM32_SERIAL_USART2_PRIORITY 3
+
+/*
+ * SPI driver system settings.
+ */
+#define STM32_SPI_USE_SPI1 FALSE
+#define STM32_SPI_USE_SPI2 TRUE
+#define STM32_SPI_SPI1_DMA_PRIORITY 1
+#define STM32_SPI_SPI2_DMA_PRIORITY 1
+#define STM32_SPI_SPI1_IRQ_PRIORITY 2
+#define STM32_SPI_SPI2_IRQ_PRIORITY 2
+#define STM32_SPI_SPI2_RX_DMA_STREAM STM32_DMA_STREAM_ID(1, 4)
+#define STM32_SPI_SPI2_TX_DMA_STREAM STM32_DMA_STREAM_ID(1, 5)
+#define STM32_SPI_DMA_ERROR_HOOK(spip) osalSysHalt("DMA failure")
+
+/*
+ * ST driver system settings.
+ */
+#define STM32_ST_IRQ_PRIORITY 2
+#define STM32_ST_USE_TIMER 2
+
+/*
+ * UART driver system settings.
+ */
+#define STM32_UART_USE_USART1 FALSE
+#define STM32_UART_USE_USART2 FALSE
+#define STM32_UART_USART1_IRQ_PRIORITY 3
+#define STM32_UART_USART2_IRQ_PRIORITY 3
+#define STM32_UART_USART1_DMA_PRIORITY 0
+#define STM32_UART_USART2_DMA_PRIORITY 0
+#define STM32_UART_DMA_ERROR_HOOK(uartp) osalSysHalt("DMA failure")
+
+/*
+ * USB driver system settings.
+ */
+#define STM32_USB_USE_USB1 TRUE
+#define STM32_USB_LOW_POWER_ON_SUSPEND FALSE
+#define STM32_USB_USB1_LP_IRQ_PRIORITY 3
+
+#endif /* _MCUCONF_H_ */
diff --git a/qmk/platforms/chibios/GENERIC_STM32_F303XC/configs/bootloader_defs.h b/qmk/platforms/chibios/GENERIC_STM32_F303XC/configs/bootloader_defs.h
index 3b0e9d20..87ac7b10 100644
--- a/qmk/platforms/chibios/GENERIC_STM32_F303XC/configs/bootloader_defs.h
+++ b/qmk/platforms/chibios/GENERIC_STM32_F303XC/configs/bootloader_defs.h
@@ -1,7 +1,5 @@
 /* Address for jumping to bootloader on STM32 chips. */
 /* It is chip dependent, the correct number can be looked up here:
  * http://www.st.com/web/en/resource/technical/document/application_note/CD00167594.pdf
- * This also requires a patch to chibios:
- *  <tmk_dir>/tmk_core/tool/chibios/ch-bootloader-jump.patch
  */
 #define STM32_BOOTLOADER_ADDRESS 0x1FFFD800
diff --git a/qmk/platforms/chibios/GENERIC_STM32_F303XC/configs/config.h b/qmk/platforms/chibios/GENERIC_STM32_F303XC/configs/config.h
index 48a7a900..a73f0c0b 100644
--- a/qmk/platforms/chibios/GENERIC_STM32_F303XC/configs/config.h
+++ b/qmk/platforms/chibios/GENERIC_STM32_F303XC/configs/config.h
@@ -15,4 +15,6 @@
  */
 #pragma once
 
-#define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
+#ifndef EARLY_INIT_PERFORM_BOOTLOADER_JUMP
+#    define EARLY_INIT_PERFORM_BOOTLOADER_JUMP TRUE
+#endif
diff --git a/qmk/platforms/chibios/IC_TEENSY_3_1/board/board.c b/qmk/platforms/chibios/IC_TEENSY_3_1/board/board.c
index 63e3f649..36ae8051 100644
--- a/qmk/platforms/chibios/IC_TEENSY_3_1/board/board.c
+++ b/qmk/platforms/chibios/IC_TEENSY_3_1/board/board.c
@@ -13,7 +13,7 @@
     See the License for the specific language governing permissions and
     limitations under the License.
 */
-#include "hal.h"
+#include <hal.h>
 
 #if HAL_USE_PAL || defined(__DOXYGEN__)
 /**
diff --git a/qmk/platforms/chibios/STM32_F103_STM32DUINO/board/board.c b/qmk/platforms/chibios/STM32_F103_STM32DUINO/board/board.c
index 9135f613..8a34e81f 100644
--- a/qmk/platforms/chibios/STM32_F103_STM32DUINO/board/board.c
+++ b/qmk/platforms/chibios/STM32_F103_STM32DUINO/board/board.c
@@ -14,7 +14,7 @@
     limitations under the License.
 */
 
-#include "hal.h"
+#include <hal.h>
 
 // Value to place in RTC backup register 10 for persistent bootloader mode
 #define RTC_BOOTLOADER_FLAG 0x424C
diff --git a/qmk/platforms/chibios/STM32_F103_STM32DUINO/configs/mcuconf.h b/qmk/platforms/chibios/STM32_F103_STM32DUINO/configs/mcuconf.h
new file mode 100644
index 00000000..9945e740
--- /dev/null
+++ b/qmk/platforms/chibios/STM32_F103_STM32DUINO/configs/mcuconf.h
@@ -0,0 +1,209 @@
+/*
+    ChibiOS - Copyright (C) 2006..2015 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#ifndef _MCUCONF_H_
+#define _MCUCONF_H_
+
+#define STM32F103_MCUCONF
+
+/*
+ * STM32F103 drivers configuration.
+ * The following settings override the default settings present in
+ * the various device driver implementation headers.
+ * Note that the settings for each driver only have effect if the whole
+ * driver is enabled in halconf.h.
+ *
+ * IRQ priorities:
+ * 15...0       Lowest...Highest.
+ *
+ * DMA priorities:
+ * 0...3        Lowest...Highest.
+ */
+
+/*
+ * HAL driver system settings.
+ */
+#define STM32_NO_INIT                       FALSE
+#define STM32_HSI_ENABLED                   TRUE
+#define STM32_LSI_ENABLED                   FALSE
+#define STM32_HSE_ENABLED                   TRUE
+#define STM32_LSE_ENABLED                   FALSE
+#define STM32_SW                            STM32_SW_PLL
+#define STM32_PLLSRC                        STM32_PLLSRC_HSE
+#define STM32_PLLXTPRE                      STM32_PLLXTPRE_DIV1
+#define STM32_PLLMUL_VALUE                  9
+#define STM32_HPRE                          STM32_HPRE_DIV1
+#define STM32_PPRE1                         STM32_PPRE1_DIV2
+#define STM32_PPRE2                         STM32_PPRE2_DIV2
+#define STM32_ADCPRE                        STM32_ADCPRE_DIV4
+#define STM32_USB_CLOCK_REQUIRED            TRUE
+#define STM32_USBPRE                        STM32_USBPRE_DIV1P5
+#define STM32_MCOSEL                        STM32_MCOSEL_NOCLOCK
+#define STM32_RTCSEL                        STM32_RTCSEL_HSEDIV
+#define STM32_PVD_ENABLE                    FALSE
+#define STM32_PLS                           STM32_PLS_LEV0
+
+/*
+ * ADC driver system settings.
+ */
+#define STM32_ADC_USE_ADC1                  FALSE
+#define STM32_ADC_ADC1_DMA_PRIORITY         2
+#define STM32_ADC_ADC1_IRQ_PRIORITY         6
+
+/*
+ * CAN driver system settings.
+ */
+#define STM32_CAN_USE_CAN1                  FALSE
+#define STM32_CAN_CAN1_IRQ_PRIORITY         11
+
+/*
+ * EXT driver system settings.
+ */
+#define STM32_EXT_EXTI0_IRQ_PRIORITY        6
+#define STM32_EXT_EXTI1_IRQ_PRIORITY        6
+#define STM32_EXT_EXTI2_IRQ_PRIORITY        6
+#define STM32_EXT_EXTI3_IRQ_PRIORITY        6
+#define STM32_EXT_EXTI4_IRQ_PRIORITY        6
+#define STM32_EXT_EXTI5_9_IRQ_PRIORITY      6
+#define STM32_EXT_EXTI10_15_IRQ_PRIORITY    6
+#define STM32_EXT_EXTI16_IRQ_PRIORITY       6
+#define STM32_EXT_EXTI17_IRQ_PRIORITY       6
+#define STM32_EXT_EXTI18_IRQ_PRIORITY       6
+#define STM32_EXT_EXTI19_IRQ_PRIORITY       6
+
+/*
+ * GPT driver system settings.
+ */
+#define STM32_GPT_USE_TIM1                  FALSE
+#define STM32_GPT_USE_TIM2                  FALSE
+#define STM32_GPT_USE_TIM3                  FALSE
+#define STM32_GPT_USE_TIM4                  FALSE
+#define STM32_GPT_USE_TIM5                  FALSE
+#define STM32_GPT_USE_TIM8                  FALSE
+#define STM32_GPT_TIM1_IRQ_PRIORITY         7
+#define STM32_GPT_TIM2_IRQ_PRIORITY         7
+#define STM32_GPT_TIM3_IRQ_PRIORITY         7
+#define STM32_GPT_TIM4_IRQ_PRIORITY         7
+#define STM32_GPT_TIM5_IRQ_PRIORITY         7
+#define STM32_GPT_TIM8_IRQ_PRIORITY         7
+
+/*
+ * I2C driver system settings.
+ */
+#define STM32_I2C_USE_I2C1                  FALSE
+#define STM32_I2C_USE_I2C2                  FALSE
+#define STM32_I2C_BUSY_TIMEOUT              50
+#define STM32_I2C_I2C1_IRQ_PRIORITY         5
+#define STM32_I2C_I2C2_IRQ_PRIORITY         5
+#define STM32_I2C_I2C1_DMA_PRIORITY         3
+#define STM32_I2C_I2C2_DMA_PRIORITY         3
+#define STM32_I2C_DMA_ERROR_HOOK(i2cp)      osalSysHalt("DMA failure")
+
+/*
+ * ICU driver system settings.
+ */
+#define STM32_ICU_USE_TIM1                  FALSE
+#define STM32_ICU_USE_TIM2                  FALSE
+#define STM32_ICU_USE_TIM3                  FALSE
+#define STM32_ICU_USE_TIM4                  FALSE
+#define STM32_ICU_USE_TIM5                  FALSE
+#define STM32_ICU_USE_TIM8                  FALSE
+#define STM32_ICU_TIM1_IRQ_PRIORITY         7
+#define STM32_ICU_TIM2_IRQ_PRIORITY         7
+#define STM32_ICU_TIM3_IRQ_PRIORITY         7
+#define STM32_ICU_TIM4_IRQ_PRIORITY         7
+#define STM32_ICU_TIM5_IRQ_PRIORITY         7
+#define STM32_ICU_TIM8_IRQ_PRIORITY         7
+
+/*
+ * PWM driver system settings.
+ */
+#define STM32_PWM_USE_ADVANCED              FALSE
+#define STM32_PWM_USE_TIM1                  FALSE
+#define STM32_PWM_USE_TIM2                  FALSE
+#define STM32_PWM_USE_TIM3                  FALSE
+#define STM32_PWM_USE_TIM4                  FALSE
+#define STM32_PWM_USE_TIM5                  FALSE
+#define STM32_PWM_USE_TIM8                  FALSE
+#define STM32_PWM_TIM1_IRQ_PRIORITY         7
+#define STM32_PWM_TIM2_IRQ_PRIORITY         7
+#define STM32_PWM_TIM3_IRQ_PRIORITY         7
+#define STM32_PWM_TIM4_IRQ_PRIORITY         7
+#define STM32_PWM_TIM5_IRQ_PRIORITY         7
+#define STM32_PWM_TIM8_IRQ_PRIORITY         7
+
+/*
+ * RTC driver system settings.
+ */
+#define STM32_RTC_IRQ_PRIORITY              15
+
+/*
+ * SERIAL driver system settings.
+ */
+#define STM32_SERIAL_USE_USART1             FALSE
+#define STM32_SERIAL_USE_USART2             FALSE
+#define STM32_SERIAL_USE_USART3             FALSE
+#define STM32_SERIAL_USE_UART4              FALSE
+#define STM32_SERIAL_USE_UART5              FALSE
+#define STM32_SERIAL_USART1_PRIORITY        12
+#define STM32_SERIAL_USART2_PRIORITY        12
+#define STM32_SERIAL_USART3_PRIORITY        12
+#define STM32_SERIAL_UART4_PRIORITY         12
+#define STM32_SERIAL_UART5_PRIORITY         12
+
+/*
+ * SPI driver system settings.
+ */
+#define STM32_SPI_USE_SPI1                  FALSE
+#define STM32_SPI_USE_SPI2                  TRUE
+#define STM32_SPI_USE_SPI3                  FALSE
+#define STM32_SPI_SPI1_DMA_PRIORITY         1
+#define STM32_SPI_SPI2_DMA_PRIORITY         1
+#define STM32_SPI_SPI3_DMA_PRIORITY         1
+#define STM32_SPI_SPI1_IRQ_PRIORITY         10
+#define STM32_SPI_SPI2_IRQ_PRIORITY         10
+#define STM32_SPI_SPI3_IRQ_PRIORITY         10
+#define STM32_SPI_DMA_ERROR_HOOK(spip)      osalSysHalt("DMA failure")
+
+/*
+ * ST driver system settings.
+ */
+#define STM32_ST_IRQ_PRIORITY               8
+#define STM32_ST_USE_TIMER                  2
+
+/*
+ * UART driver system settings.
+ */
+#define STM32_UART_USE_USART1               FALSE
+#define STM32_UART_USE_USART2               FALSE
+#define STM32_UART_USE_USART3               FALSE
+#define STM32_UART_USART1_IRQ_PRIORITY      12
+#define STM32_UART_USART2_IRQ_PRIORITY      12
+#define STM32_UART_USART3_IRQ_PRIORITY      12
+#define STM32_UART_USART1_DMA_PRIORITY      0
+#define STM32_UART_USART2_DMA_PRIORITY      0
+#define STM32_UART_USART3_DMA_PRIORITY      0
+#define STM32_UART_DMA_ERROR_HOOK(uartp)    osalSysHalt("DMA failure")
+
+/*
+ * USB driver system settings.
+ */
+#define STM32_USB_USE_USB1                  TRUE
+#define STM32_USB_LOW_POWER_ON_SUSPEND      FALSE
+#define STM32_USB_USB1_HP_IRQ_PRIORITY      13
+#define STM32_USB_USB1_LP_IRQ_PRIORITY      14
+
+#endif /* _MCUCONF_H_ */
diff --git a/qmk/platforms/chibios/common/configs/chconf.h b/qmk/platforms/chibios/common/configs/chconf.h
new file mode 100644
index 00000000..aac33037
--- /dev/null
+++ b/qmk/platforms/chibios/common/configs/chconf.h
@@ -0,0 +1,714 @@
+/*
+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+/**
+ * @file    rt/templates/chconf.h
+ * @brief   Configuration file template.
+ * @details A copy of this file must be placed in each project directory, it
+ *          contains the application specific kernel settings.
+ *
+ * @addtogroup config
+ * @details Kernel related settings and hooks.
+ * @{
+ */
+
+#ifndef CHCONF_H
+#define CHCONF_H
+
+#define _CHIBIOS_RT_CONF_
+#define _CHIBIOS_RT_CONF_VER_6_0_
+
+/*===========================================================================*/
+/**
+ * @name System timers settings
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   System time counter resolution.
+ * @note    Allowed values are 16 or 32 bits.
+ */
+#if !defined(CH_CFG_ST_RESOLUTION)
+#define CH_CFG_ST_RESOLUTION                32
+#endif
+
+/**
+ * @brief   System tick frequency.
+ * @details Frequency of the system timer that drives the system ticks. This
+ *          setting also defines the system tick time unit.
+ */
+#if !defined(CH_CFG_ST_FREQUENCY)
+#define CH_CFG_ST_FREQUENCY                 100000
+#endif
+
+/**
+ * @brief   Time intervals data size.
+ * @note    Allowed values are 16, 32 or 64 bits.
+ */
+#if !defined(CH_CFG_INTERVALS_SIZE)
+#define CH_CFG_INTERVALS_SIZE               32
+#endif
+
+/**
+ * @brief   Time types data size.
+ * @note    Allowed values are 16 or 32 bits.
+ */
+#if !defined(CH_CFG_TIME_TYPES_SIZE)
+#define CH_CFG_TIME_TYPES_SIZE              32
+#endif
+
+/**
+ * @brief   Time delta constant for the tick-less mode.
+ * @note    If this value is zero then the system uses the classic
+ *          periodic tick. This value represents the minimum number
+ *          of ticks that is safe to specify in a timeout directive.
+ *          The value one is not valid, timeouts are rounded up to
+ *          this value.
+ */
+#if !defined(CH_CFG_ST_TIMEDELTA)
+#define CH_CFG_ST_TIMEDELTA                 2
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Kernel parameters and options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   Round robin interval.
+ * @details This constant is the number of system ticks allowed for the
+ *          threads before preemption occurs. Setting this value to zero
+ *          disables the preemption for threads with equal priority and the
+ *          round robin becomes cooperative. Note that higher priority
+ *          threads can still preempt, the kernel is always preemptive.
+ * @note    Disabling the round robin preemption makes the kernel more compact
+ *          and generally faster.
+ * @note    The round robin preemption is not supported in tickless mode and
+ *          must be set to zero in that case.
+ */
+#if !defined(CH_CFG_TIME_QUANTUM)
+#define CH_CFG_TIME_QUANTUM                 0
+#endif
+
+/**
+ * @brief   Managed RAM size.
+ * @details Size of the RAM area to be managed by the OS. If set to zero
+ *          then the whole available RAM is used. The core memory is made
+ *          available to the heap allocator and/or can be used directly through
+ *          the simplified core memory allocator.
+ *
+ * @note    In order to let the OS manage the whole RAM the linker script must
+ *          provide the @p __heap_base__ and @p __heap_end__ symbols.
+ * @note    Requires @p CH_CFG_USE_MEMCORE.
+ */
+#if !defined(CH_CFG_MEMCORE_SIZE)
+#define CH_CFG_MEMCORE_SIZE                 0
+#endif
+
+/**
+ * @brief   Idle thread automatic spawn suppression.
+ * @details When this option is activated the function @p chSysInit()
+ *          does not spawn the idle thread. The application @p main()
+ *          function becomes the idle thread and must implement an
+ *          infinite loop.
+ */
+#if !defined(CH_CFG_NO_IDLE_THREAD)
+#define CH_CFG_NO_IDLE_THREAD               FALSE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Performance options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   OS optimization.
+ * @details If enabled then time efficient rather than space efficient code
+ *          is used when two possible implementations exist.
+ *
+ * @note    This is not related to the compiler optimization options.
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_OPTIMIZE_SPEED)
+#define CH_CFG_OPTIMIZE_SPEED               TRUE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Subsystem options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   Time Measurement APIs.
+ * @details If enabled then the time measurement APIs are included in
+ *          the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_TM)
+#define CH_CFG_USE_TM                       TRUE
+#endif
+
+/**
+ * @brief   Threads registry APIs.
+ * @details If enabled then the registry APIs are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_REGISTRY)
+#define CH_CFG_USE_REGISTRY                 TRUE
+#endif
+
+/**
+ * @brief   Threads synchronization APIs.
+ * @details If enabled then the @p chThdWait() function is included in
+ *          the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_WAITEXIT)
+#define CH_CFG_USE_WAITEXIT                 TRUE
+#endif
+
+/**
+ * @brief   Semaphores APIs.
+ * @details If enabled then the Semaphores APIs are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_SEMAPHORES)
+#define CH_CFG_USE_SEMAPHORES               TRUE
+#endif
+
+/**
+ * @brief   Semaphores queuing mode.
+ * @details If enabled then the threads are enqueued on semaphores by
+ *          priority rather than in FIFO order.
+ *
+ * @note    The default is @p FALSE. Enable this if you have special
+ *          requirements.
+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.
+ */
+#if !defined(CH_CFG_USE_SEMAPHORES_PRIORITY)
+#define CH_CFG_USE_SEMAPHORES_PRIORITY      FALSE
+#endif
+
+/**
+ * @brief   Mutexes APIs.
+ * @details If enabled then the mutexes APIs are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_MUTEXES)
+#define CH_CFG_USE_MUTEXES                  TRUE
+#endif
+
+/**
+ * @brief   Enables recursive behavior on mutexes.
+ * @note    Recursive mutexes are heavier and have an increased
+ *          memory footprint.
+ *
+ * @note    The default is @p FALSE.
+ * @note    Requires @p CH_CFG_USE_MUTEXES.
+ */
+#if !defined(CH_CFG_USE_MUTEXES_RECURSIVE)
+#define CH_CFG_USE_MUTEXES_RECURSIVE        FALSE
+#endif
+
+/**
+ * @brief   Conditional Variables APIs.
+ * @details If enabled then the conditional variables APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_MUTEXES.
+ */
+#if !defined(CH_CFG_USE_CONDVARS)
+#define CH_CFG_USE_CONDVARS                 TRUE
+#endif
+
+/**
+ * @brief   Conditional Variables APIs with timeout.
+ * @details If enabled then the conditional variables APIs with timeout
+ *          specification are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_CONDVARS.
+ */
+#if !defined(CH_CFG_USE_CONDVARS_TIMEOUT)
+#define CH_CFG_USE_CONDVARS_TIMEOUT         TRUE
+#endif
+
+/**
+ * @brief   Events Flags APIs.
+ * @details If enabled then the event flags APIs are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_EVENTS)
+#define CH_CFG_USE_EVENTS                   TRUE
+#endif
+
+/**
+ * @brief   Events Flags APIs with timeout.
+ * @details If enabled then the events APIs with timeout specification
+ *          are included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_EVENTS.
+ */
+#if !defined(CH_CFG_USE_EVENTS_TIMEOUT)
+#define CH_CFG_USE_EVENTS_TIMEOUT           TRUE
+#endif
+
+/**
+ * @brief   Synchronous Messages APIs.
+ * @details If enabled then the synchronous messages APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_MESSAGES)
+#define CH_CFG_USE_MESSAGES                 TRUE
+#endif
+
+/**
+ * @brief   Synchronous Messages queuing mode.
+ * @details If enabled then messages are served by priority rather than in
+ *          FIFO order.
+ *
+ * @note    The default is @p FALSE. Enable this if you have special
+ *          requirements.
+ * @note    Requires @p CH_CFG_USE_MESSAGES.
+ */
+#if !defined(CH_CFG_USE_MESSAGES_PRIORITY)
+#define CH_CFG_USE_MESSAGES_PRIORITY        TRUE
+#endif
+
+/**
+ * @brief   Mailboxes APIs.
+ * @details If enabled then the asynchronous messages (mailboxes) APIs are
+ *          included in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_SEMAPHORES.
+ */
+#if !defined(CH_CFG_USE_MAILBOXES)
+#define CH_CFG_USE_MAILBOXES                TRUE
+#endif
+
+/**
+ * @brief   Core Memory Manager APIs.
+ * @details If enabled then the core memory manager APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_MEMCORE)
+#define CH_CFG_USE_MEMCORE                  TRUE
+#endif
+
+/**
+ * @brief   Heap Allocator APIs.
+ * @details If enabled then the memory heap allocator APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_MEMCORE and either @p CH_CFG_USE_MUTEXES or
+ *          @p CH_CFG_USE_SEMAPHORES.
+ * @note    Mutexes are recommended.
+ */
+#if !defined(CH_CFG_USE_HEAP)
+#define CH_CFG_USE_HEAP                     TRUE
+#endif
+
+/**
+ * @brief   Memory Pools Allocator APIs.
+ * @details If enabled then the memory pools allocator APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_MEMPOOLS)
+#define CH_CFG_USE_MEMPOOLS                 TRUE
+#endif
+
+/**
+ * @brief   Objects FIFOs APIs.
+ * @details If enabled then the objects FIFOs APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_OBJ_FIFOS)
+#define CH_CFG_USE_OBJ_FIFOS                TRUE
+#endif
+
+/**
+ * @brief   Pipes APIs.
+ * @details If enabled then the pipes APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ */
+#if !defined(CH_CFG_USE_PIPES)
+#define CH_CFG_USE_PIPES                    TRUE
+#endif
+
+/**
+ * @brief   Dynamic Threads APIs.
+ * @details If enabled then the dynamic threads creation APIs are included
+ *          in the kernel.
+ *
+ * @note    The default is @p TRUE.
+ * @note    Requires @p CH_CFG_USE_WAITEXIT.
+ * @note    Requires @p CH_CFG_USE_HEAP and/or @p CH_CFG_USE_MEMPOOLS.
+ */
+#if !defined(CH_CFG_USE_DYNAMIC)
+#define CH_CFG_USE_DYNAMIC                  TRUE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Objects factory options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   Objects Factory APIs.
+ * @details If enabled then the objects factory APIs are included in the
+ *          kernel.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_CFG_USE_FACTORY)
+#define CH_CFG_USE_FACTORY                  TRUE
+#endif
+
+/**
+ * @brief   Maximum length for object names.
+ * @details If the specified length is zero then the name is stored by
+ *          pointer but this could have unintended side effects.
+ */
+#if !defined(CH_CFG_FACTORY_MAX_NAMES_LENGTH)
+#define CH_CFG_FACTORY_MAX_NAMES_LENGTH     8
+#endif
+
+/**
+ * @brief   Enables the registry of generic objects.
+ */
+#if !defined(CH_CFG_FACTORY_OBJECTS_REGISTRY)
+#define CH_CFG_FACTORY_OBJECTS_REGISTRY     TRUE
+#endif
+
+/**
+ * @brief   Enables factory for generic buffers.
+ */
+#if !defined(CH_CFG_FACTORY_GENERIC_BUFFERS)
+#define CH_CFG_FACTORY_GENERIC_BUFFERS      TRUE
+#endif
+
+/**
+ * @brief   Enables factory for semaphores.
+ */
+#if !defined(CH_CFG_FACTORY_SEMAPHORES)
+#define CH_CFG_FACTORY_SEMAPHORES           TRUE
+#endif
+
+/**
+ * @brief   Enables factory for mailboxes.
+ */
+#if !defined(CH_CFG_FACTORY_MAILBOXES)
+#define CH_CFG_FACTORY_MAILBOXES            TRUE
+#endif
+
+/**
+ * @brief   Enables factory for objects FIFOs.
+ */
+#if !defined(CH_CFG_FACTORY_OBJ_FIFOS)
+#define CH_CFG_FACTORY_OBJ_FIFOS            TRUE
+#endif
+
+/**
+ * @brief   Enables factory for Pipes.
+ */
+#if !defined(CH_CFG_FACTORY_PIPES) || defined(__DOXYGEN__)
+#define CH_CFG_FACTORY_PIPES                TRUE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Debug options
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   Debug option, kernel statistics.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_STATISTICS)
+#define CH_DBG_STATISTICS                   FALSE
+#endif
+
+/**
+ * @brief   Debug option, system state check.
+ * @details If enabled the correct call protocol for system APIs is checked
+ *          at runtime.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_SYSTEM_STATE_CHECK)
+#define CH_DBG_SYSTEM_STATE_CHECK           FALSE
+#endif
+
+/**
+ * @brief   Debug option, parameters checks.
+ * @details If enabled then the checks on the API functions input
+ *          parameters are activated.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_ENABLE_CHECKS)
+#define CH_DBG_ENABLE_CHECKS                FALSE
+#endif
+
+/**
+ * @brief   Debug option, consistency checks.
+ * @details If enabled then all the assertions in the kernel code are
+ *          activated. This includes consistency checks inside the kernel,
+ *          runtime anomalies and port-defined checks.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_ENABLE_ASSERTS)
+#define CH_DBG_ENABLE_ASSERTS               FALSE
+#endif
+
+/**
+ * @brief   Debug option, trace buffer.
+ * @details If enabled then the trace buffer is activated.
+ *
+ * @note    The default is @p CH_DBG_TRACE_MASK_DISABLED.
+ */
+#if !defined(CH_DBG_TRACE_MASK)
+#define CH_DBG_TRACE_MASK                   CH_DBG_TRACE_MASK_DISABLED
+#endif
+
+/**
+ * @brief   Trace buffer entries.
+ * @note    The trace buffer is only allocated if @p CH_DBG_TRACE_MASK is
+ *          different from @p CH_DBG_TRACE_MASK_DISABLED.
+ */
+#if !defined(CH_DBG_TRACE_BUFFER_SIZE)
+#define CH_DBG_TRACE_BUFFER_SIZE            128
+#endif
+
+/**
+ * @brief   Debug option, stack checks.
+ * @details If enabled then a runtime stack check is performed.
+ *
+ * @note    The default is @p FALSE.
+ * @note    The stack check is performed in a architecture/port dependent way.
+ *          It may not be implemented or some ports.
+ * @note    The default failure mode is to halt the system with the global
+ *          @p panic_msg variable set to @p NULL.
+ */
+#if !defined(CH_DBG_ENABLE_STACK_CHECK)
+#define CH_DBG_ENABLE_STACK_CHECK           TRUE
+#endif
+
+/**
+ * @brief   Debug option, stacks initialization.
+ * @details If enabled then the threads working area is filled with a byte
+ *          value when a thread is created. This can be useful for the
+ *          runtime measurement of the used stack.
+ *
+ * @note    The default is @p FALSE.
+ */
+#if !defined(CH_DBG_FILL_THREADS)
+#define CH_DBG_FILL_THREADS                 FALSE
+#endif
+
+/**
+ * @brief   Debug option, threads profiling.
+ * @details If enabled then a field is added to the @p thread_t structure that
+ *          counts the system ticks occurred while executing the thread.
+ *
+ * @note    The default is @p FALSE.
+ * @note    This debug option is not currently compatible with the
+ *          tickless mode.
+ */
+#if !defined(CH_DBG_THREADS_PROFILING)
+#define CH_DBG_THREADS_PROFILING            FALSE
+#endif
+
+/** @} */
+
+/*===========================================================================*/
+/**
+ * @name Kernel hooks
+ * @{
+ */
+/*===========================================================================*/
+
+/**
+ * @brief   System structure extension.
+ * @details User fields added to the end of the @p ch_system_t structure.
+ */
+#define CH_CFG_SYSTEM_EXTRA_FIELDS                                          \
+  /* Add threads custom fields here.*/
+
+/**
+ * @brief   System initialization hook.
+ * @details User initialization code added to the @p chSysInit() function
+ *          just before interrupts are enabled globally.
+ */
+#define CH_CFG_SYSTEM_INIT_HOOK() {                                         \
+  /* Add threads initialization code here.*/                                \
+}
+
+/**
+ * @brief   Threads descriptor structure extension.
+ * @details User fields added to the end of the @p thread_t structure.
+ */
+#define CH_CFG_THREAD_EXTRA_FIELDS                                          \
+  /* Add threads custom fields here.*/
+
+/**
+ * @brief   Threads initialization hook.
+ * @details User initialization code added to the @p _thread_init() function.
+ *
+ * @note    It is invoked from within @p _thread_init() and implicitly from all
+ *          the threads creation APIs.
+ */
+#define CH_CFG_THREAD_INIT_HOOK(tp) {                                       \
+  /* Add threads initialization code here.*/                                \
+}
+
+/**
+ * @brief   Threads finalization hook.
+ * @details User finalization code added to the @p chThdExit() API.
+ */
+#define CH_CFG_THREAD_EXIT_HOOK(tp) {                                       \
+  /* Add threads finalization code here.*/                                  \
+}
+
+/**
+ * @brief   Context switch hook.
+ * @details This hook is invoked just before switching between threads.
+ */
+#define CH_CFG_CONTEXT_SWITCH_HOOK(ntp, otp) {                              \
+  /* Context switch code here.*/                                            \
+}
+
+/**
+ * @brief   ISR enter hook.
+ */
+#define CH_CFG_IRQ_PROLOGUE_HOOK() {                                        \
+  /* IRQ prologue code here.*/                                              \
+}
+
+/**
+ * @brief   ISR exit hook.
+ */
+#define CH_CFG_IRQ_EPILOGUE_HOOK() {                                        \
+  /* IRQ epilogue code here.*/                                              \
+}
+
+/**
+ * @brief   Idle thread enter hook.
+ * @note    This hook is invoked within a critical zone, no OS functions
+ *          should be invoked from here.
+ * @note    This macro can be used to activate a power saving mode.
+ */
+#define CH_CFG_IDLE_ENTER_HOOK() {                                          \
+  /* Idle-enter code here.*/                                                \
+}
+
+/**
+ * @brief   Idle thread leave hook.
+ * @note    This hook is invoked within a critical zone, no OS functions
+ *          should be invoked from here.
+ * @note    This macro can be used to deactivate a power saving mode.
+ */
+#define CH_CFG_IDLE_LEAVE_HOOK() {                                          \
+  /* Idle-leave code here.*/                                                \
+}
+
+/**
+ * @brief   Idle Loop hook.
+ * @details This hook is continuously invoked by the idle thread loop.
+ */
+#define CH_CFG_IDLE_LOOP_HOOK() {                                           \
+  /* Idle loop code here.*/                                                 \
+}
+
+/**
+ * @brief   System tick event hook.
+ * @details This hook is invoked in the system tick handler immediately
+ *          after processing the virtual timers queue.
+ */
+#define CH_CFG_SYSTEM_TICK_HOOK() {                                         \
+  /* System tick event code here.*/                                         \
+}
+
+/**
+ * @brief   System halt hook.
+ * @details This hook is invoked in case to a system halting error before
+ *          the system is halted.
+ */
+#define CH_CFG_SYSTEM_HALT_HOOK(reason) {                                   \
+  /* System halt code here.*/                                               \
+}
+
+/**
+ * @brief   Trace hook.
+ * @details This hook is invoked each time a new record is written in the
+ *          trace buffer.
+ */
+#define CH_CFG_TRACE_HOOK(tep) {                                            \
+  /* Trace code here.*/                                                     \
+}
+
+/** @} */
+
+/*===========================================================================*/
+/* Port-specific settings (override port settings defaulted in chcore.h).    */
+/*===========================================================================*/
+
+#endif  /* CHCONF_H */
+
+/** @} */
diff --git a/qmk/platforms/chibios/common/configs/halconf.h b/qmk/platforms/chibios/common/configs/halconf.h
new file mode 100644
index 00000000..6b48e289
--- /dev/null
+++ b/qmk/platforms/chibios/common/configs/halconf.h
@@ -0,0 +1,525 @@
+/*
+    ChibiOS - Copyright (C) 2006..2018 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+/**
+ * @file    templates/halconf.h
+ * @brief   HAL configuration header.
+ * @details HAL configuration file, this file allows to enable or disable the
+ *          various device drivers from your application. You may also use
+ *          this file in order to override the device drivers default settings.
+ *
+ * @addtogroup HAL_CONF
+ * @{
+ */
+
+#ifndef HALCONF_H
+#define HALCONF_H
+
+#define _CHIBIOS_HAL_CONF_
+#define _CHIBIOS_HAL_CONF_VER_7_0_
+
+#include "mcuconf.h"
+
+/**
+ * @brief   Enables the PAL subsystem.
+ */
+#if !defined(HAL_USE_PAL) || defined(__DOXYGEN__)
+#define HAL_USE_PAL                         TRUE
+#endif
+
+/**
+ * @brief   Enables the ADC subsystem.
+ */
+#if !defined(HAL_USE_ADC) || defined(__DOXYGEN__)
+#define HAL_USE_ADC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the CAN subsystem.
+ */
+#if !defined(HAL_USE_CAN) || defined(__DOXYGEN__)
+#define HAL_USE_CAN                         FALSE
+#endif
+
+/**
+ * @brief   Enables the cryptographic subsystem.
+ */
+#if !defined(HAL_USE_CRY) || defined(__DOXYGEN__)
+#define HAL_USE_CRY                         FALSE
+#endif
+
+/**
+ * @brief   Enables the DAC subsystem.
+ */
+#if !defined(HAL_USE_DAC) || defined(__DOXYGEN__)
+#define HAL_USE_DAC                         TRUE
+#endif
+
+/**
+ * @brief   Enables the GPT subsystem.
+ */
+#if !defined(HAL_USE_GPT) || defined(__DOXYGEN__)
+#define HAL_USE_GPT                         TRUE
+#endif
+
+/**
+ * @brief   Enables the I2C subsystem.
+ */
+#if !defined(HAL_USE_I2C) || defined(__DOXYGEN__)
+#define HAL_USE_I2C                         TRUE
+#endif
+
+/**
+ * @brief   Enables the I2S subsystem.
+ */
+#if !defined(HAL_USE_I2S) || defined(__DOXYGEN__)
+#define HAL_USE_I2S                         FALSE
+#endif
+
+/**
+ * @brief   Enables the ICU subsystem.
+ */
+#if !defined(HAL_USE_ICU) || defined(__DOXYGEN__)
+#define HAL_USE_ICU                         FALSE
+#endif
+
+/**
+ * @brief   Enables the MAC subsystem.
+ */
+#if !defined(HAL_USE_MAC) || defined(__DOXYGEN__)
+#define HAL_USE_MAC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the MMC_SPI subsystem.
+ */
+#if !defined(HAL_USE_MMC_SPI) || defined(__DOXYGEN__)
+#define HAL_USE_MMC_SPI                     FALSE
+#endif
+
+/**
+ * @brief   Enables the PWM subsystem.
+ */
+#if !defined(HAL_USE_PWM) || defined(__DOXYGEN__)
+#define HAL_USE_PWM                         TRUE
+#endif
+
+/**
+ * @brief   Enables the RTC subsystem.
+ */
+#if !defined(HAL_USE_RTC) || defined(__DOXYGEN__)
+#define HAL_USE_RTC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the SDC subsystem.
+ */
+#if !defined(HAL_USE_SDC) || defined(__DOXYGEN__)
+#define HAL_USE_SDC                         FALSE
+#endif
+
+/**
+ * @brief   Enables the SERIAL subsystem.
+ */
+#if !defined(HAL_USE_SERIAL) || defined(__DOXYGEN__)
+#define HAL_USE_SERIAL                      FALSE
+#endif
+
+/**
+ * @brief   Enables the SERIAL over USB subsystem.
+ */
+#if !defined(HAL_USE_SERIAL_USB) || defined(__DOXYGEN__)
+#define HAL_USE_SERIAL_USB                  TRUE
+#endif
+
+/**
+ * @brief   Enables the SIO subsystem.
+ */
+#if !defined(HAL_USE_SIO) || defined(__DOXYGEN__)
+#define HAL_USE_SIO                         FALSE
+#endif
+
+/**
+ * @brief   Enables the SPI subsystem.
+ */
+#if !defined(HAL_USE_SPI) || defined(__DOXYGEN__)
+#define HAL_USE_SPI                         TRUE
+#endif
+
+/**
+ * @brief   Enables the TRNG subsystem.
+ */
+#if !defined(HAL_USE_TRNG) || defined(__DOXYGEN__)
+#define HAL_USE_TRNG                        FALSE
+#endif
+
+/**
+ * @brief   Enables the UART subsystem.
+ */
+#if !defined(HAL_USE_UART) || defined(__DOXYGEN__)
+#define HAL_USE_UART                        FALSE
+#endif
+
+/**
+ * @brief   Enables the USB subsystem.
+ */
+#if !defined(HAL_USE_USB) || defined(__DOXYGEN__)
+#define HAL_USE_USB                         TRUE
+#endif
+
+/**
+ * @brief   Enables the WDG subsystem.
+ */
+#if !defined(HAL_USE_WDG) || defined(__DOXYGEN__)
+#define HAL_USE_WDG                         FALSE
+#endif
+
+/**
+ * @brief   Enables the WSPI subsystem.
+ */
+#if !defined(HAL_USE_WSPI) || defined(__DOXYGEN__)
+#define HAL_USE_WSPI                        FALSE
+#endif
+
+/*===========================================================================*/
+/* PAL driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(PAL_USE_CALLBACKS) || defined(__DOXYGEN__)
+#define PAL_USE_CALLBACKS                   TRUE
+#endif
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(PAL_USE_WAIT) || defined(__DOXYGEN__)
+#define PAL_USE_WAIT                        TRUE
+#endif
+
+/*===========================================================================*/
+/* ADC driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(ADC_USE_WAIT) || defined(__DOXYGEN__)
+#define ADC_USE_WAIT                        TRUE
+#endif
+
+/**
+ * @brief   Enables the @p adcAcquireBus() and @p adcReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(ADC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define ADC_USE_MUTUAL_EXCLUSION            TRUE
+#endif
+
+/*===========================================================================*/
+/* CAN driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Sleep mode related APIs inclusion switch.
+ */
+#if !defined(CAN_USE_SLEEP_MODE) || defined(__DOXYGEN__)
+#define CAN_USE_SLEEP_MODE                  TRUE
+#endif
+
+/**
+ * @brief   Enforces the driver to use direct callbacks rather than OSAL events.
+ */
+#if !defined(CAN_ENFORCE_USE_CALLBACKS) || defined(__DOXYGEN__)
+#define CAN_ENFORCE_USE_CALLBACKS           FALSE
+#endif
+
+/*===========================================================================*/
+/* CRY driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables the SW fall-back of the cryptographic driver.
+ * @details When enabled, this option, activates a fall-back software
+ *          implementation for algorithms not supported by the underlying
+ *          hardware.
+ * @note    Fall-back implementations may not be present for all algorithms.
+ */
+#if !defined(HAL_CRY_USE_FALLBACK) || defined(__DOXYGEN__)
+#define HAL_CRY_USE_FALLBACK                FALSE
+#endif
+
+/**
+ * @brief   Makes the driver forcibly use the fall-back implementations.
+ */
+#if !defined(HAL_CRY_ENFORCE_FALLBACK) || defined(__DOXYGEN__)
+#define HAL_CRY_ENFORCE_FALLBACK            FALSE
+#endif
+
+/*===========================================================================*/
+/* DAC driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(DAC_USE_WAIT) || defined(__DOXYGEN__)
+#define DAC_USE_WAIT                        TRUE
+#endif
+
+/**
+ * @brief   Enables the @p dacAcquireBus() and @p dacReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(DAC_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define DAC_USE_MUTUAL_EXCLUSION            TRUE
+#endif
+
+/*===========================================================================*/
+/* I2C driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables the mutual exclusion APIs on the I2C bus.
+ */
+#if !defined(I2C_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define I2C_USE_MUTUAL_EXCLUSION            TRUE
+#endif
+
+/*===========================================================================*/
+/* MAC driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables the zero-copy API.
+ */
+#if !defined(MAC_USE_ZERO_COPY) || defined(__DOXYGEN__)
+#define MAC_USE_ZERO_COPY                   FALSE
+#endif
+
+/**
+ * @brief   Enables an event sources for incoming packets.
+ */
+#if !defined(MAC_USE_EVENTS) || defined(__DOXYGEN__)
+#define MAC_USE_EVENTS                      TRUE
+#endif
+
+/*===========================================================================*/
+/* MMC_SPI driver related settings.                                          */
+/*===========================================================================*/
+
+/**
+ * @brief   Delays insertions.
+ * @details If enabled this options inserts delays into the MMC waiting
+ *          routines releasing some extra CPU time for the threads with
+ *          lower priority, this may slow down the driver a bit however.
+ *          This option is recommended also if the SPI driver does not
+ *          use a DMA channel and heavily loads the CPU.
+ */
+#if !defined(MMC_NICE_WAITING) || defined(__DOXYGEN__)
+#define MMC_NICE_WAITING                    TRUE
+#endif
+
+/*===========================================================================*/
+/* SDC driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Number of initialization attempts before rejecting the card.
+ * @note    Attempts are performed at 10mS intervals.
+ */
+#if !defined(SDC_INIT_RETRY) || defined(__DOXYGEN__)
+#define SDC_INIT_RETRY                      100
+#endif
+
+/**
+ * @brief   Include support for MMC cards.
+ * @note    MMC support is not yet implemented so this option must be kept
+ *          at @p FALSE.
+ */
+#if !defined(SDC_MMC_SUPPORT) || defined(__DOXYGEN__)
+#define SDC_MMC_SUPPORT                     FALSE
+#endif
+
+/**
+ * @brief   Delays insertions.
+ * @details If enabled this options inserts delays into the MMC waiting
+ *          routines releasing some extra CPU time for the threads with
+ *          lower priority, this may slow down the driver a bit however.
+ */
+#if !defined(SDC_NICE_WAITING) || defined(__DOXYGEN__)
+#define SDC_NICE_WAITING                    TRUE
+#endif
+
+/**
+ * @brief   OCR initialization constant for V20 cards.
+ */
+#if !defined(SDC_INIT_OCR_V20) || defined(__DOXYGEN__)
+#define SDC_INIT_OCR_V20                    0x50FF8000U
+#endif
+
+/**
+ * @brief   OCR initialization constant for non-V20 cards.
+ */
+#if !defined(SDC_INIT_OCR) || defined(__DOXYGEN__)
+#define SDC_INIT_OCR                        0x80100000U
+#endif
+
+/*===========================================================================*/
+/* SERIAL driver related settings.                                           */
+/*===========================================================================*/
+
+/**
+ * @brief   Default bit rate.
+ * @details Configuration parameter, this is the baud rate selected for the
+ *          default configuration.
+ */
+#if !defined(SERIAL_DEFAULT_BITRATE) || defined(__DOXYGEN__)
+#define SERIAL_DEFAULT_BITRATE              38400
+#endif
+
+/**
+ * @brief   Serial buffers size.
+ * @details Configuration parameter, you can change the depth of the queue
+ *          buffers depending on the requirements of your application.
+ * @note    The default is 16 bytes for both the transmission and receive
+ *          buffers.
+ */
+#if !defined(SERIAL_BUFFERS_SIZE) || defined(__DOXYGEN__)
+#define SERIAL_BUFFERS_SIZE                 16
+#endif
+
+/*===========================================================================*/
+/* SERIAL_USB driver related setting.                                        */
+/*===========================================================================*/
+
+/**
+ * @brief   Serial over USB buffers size.
+ * @details Configuration parameter, the buffer size must be a multiple of
+ *          the USB data endpoint maximum packet size.
+ * @note    The default is 256 bytes for both the transmission and receive
+ *          buffers.
+ */
+#if !defined(SERIAL_USB_BUFFERS_SIZE) || defined(__DOXYGEN__)
+#define SERIAL_USB_BUFFERS_SIZE             1
+#endif
+
+/**
+ * @brief   Serial over USB number of buffers.
+ * @note    The default is 2 buffers.
+ */
+#if !defined(SERIAL_USB_BUFFERS_NUMBER) || defined(__DOXYGEN__)
+#define SERIAL_USB_BUFFERS_NUMBER           2
+#endif
+
+/*===========================================================================*/
+/* SPI driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(SPI_USE_WAIT) || defined(__DOXYGEN__)
+#define SPI_USE_WAIT                        TRUE
+#endif
+
+/**
+ * @brief   Enables circular transfers APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(SPI_USE_CIRCULAR) || defined(__DOXYGEN__)
+#define SPI_USE_CIRCULAR                    FALSE
+#endif
+
+
+/**
+ * @brief   Enables the @p spiAcquireBus() and @p spiReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(SPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define SPI_USE_MUTUAL_EXCLUSION            TRUE
+#endif
+
+/**
+ * @brief   Handling method for SPI CS line.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(SPI_SELECT_MODE) || defined(__DOXYGEN__)
+#define SPI_SELECT_MODE                     SPI_SELECT_MODE_PAD
+#endif
+
+/*===========================================================================*/
+/* UART driver related settings.                                             */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(UART_USE_WAIT) || defined(__DOXYGEN__)
+#define UART_USE_WAIT                       FALSE
+#endif
+
+/**
+ * @brief   Enables the @p uartAcquireBus() and @p uartReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(UART_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define UART_USE_MUTUAL_EXCLUSION           FALSE
+#endif
+
+/*===========================================================================*/
+/* USB driver related settings.                                              */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(USB_USE_WAIT) || defined(__DOXYGEN__)
+#define USB_USE_WAIT                        TRUE
+#endif
+
+/*===========================================================================*/
+/* WSPI driver related settings.                                             */
+/*===========================================================================*/
+
+/**
+ * @brief   Enables synchronous APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(WSPI_USE_WAIT) || defined(__DOXYGEN__)
+#define WSPI_USE_WAIT                       TRUE
+#endif
+
+/**
+ * @brief   Enables the @p wspiAcquireBus() and @p wspiReleaseBus() APIs.
+ * @note    Disabling this option saves both code and data space.
+ */
+#if !defined(WSPI_USE_MUTUAL_EXCLUSION) || defined(__DOXYGEN__)
+#define WSPI_USE_MUTUAL_EXCLUSION           TRUE
+#endif
+
+#endif /* HALCONF_H */
+
+/** @} */
diff --git a/qmk/platforms/chibios/common/ld/MKL26Z64.ld b/qmk/platforms/chibios/common/ld/MKL26Z64.ld
new file mode 100644
index 00000000..c4ca8b87
--- /dev/null
+++ b/qmk/platforms/chibios/common/ld/MKL26Z64.ld
@@ -0,0 +1,105 @@
+/*
+ * Copyright (C) 2013-2016 Fabio Utzig, http://fabioutzig.com
+ *           (C) 2016 flabbergast <s3+flabbergast@sdfeu.org>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
+/*
+ * KL26Z64 memory setup.
+ */
+MEMORY
+{
+  flash0   : org = 0x00000000, len = 0x100
+  flash1   : org = 0x00000400, len = 0x10
+  flash2   : org = 0x00000410, len = 62k - 0x410
+  flash3   : org = 0x0000F800, len = 2k
+  flash4   : org = 0x00000000, len = 0
+  flash5   : org = 0x00000000, len = 0
+  flash6   : org = 0x00000000, len = 0
+  flash7   : org = 0x00000000, len = 0
+  ram0     : org = 0x1FFFF800, len = 8k
+  ram1     : org = 0x00000000, len = 0
+  ram2     : org = 0x00000000, len = 0
+  ram3     : org = 0x00000000, len = 0
+  ram4     : org = 0x00000000, len = 0
+  ram5     : org = 0x00000000, len = 0
+  ram6     : org = 0x00000000, len = 0
+  ram7     : org = 0x00000000, len = 0
+}
+
+/* Flash region for the configuration bytes.*/
+SECTIONS
+{
+  .cfmprotect : ALIGN(4) SUBALIGN(4)
+  {
+    KEEP(*(.cfmconfig))
+  } > flash1
+}
+
+/* For each data/text section two region are defined, a virtual region
+   and a load region (_LMA suffix).*/
+
+/* Flash region to be used for exception vectors.*/
+REGION_ALIAS("VECTORS_FLASH", flash0);
+REGION_ALIAS("VECTORS_FLASH_LMA", flash0);
+
+/* Flash region to be used for constructors and destructors.*/
+REGION_ALIAS("XTORS_FLASH", flash2);
+REGION_ALIAS("XTORS_FLASH_LMA", flash2);
+
+/* Flash region to be used for code text.*/
+REGION_ALIAS("TEXT_FLASH", flash2);
+REGION_ALIAS("TEXT_FLASH_LMA", flash2);
+
+/* Flash region to be used for read only data.*/
+REGION_ALIAS("RODATA_FLASH", flash2);
+REGION_ALIAS("RODATA_FLASH_LMA", flash2);
+
+/* Flash region to be used for various.*/
+REGION_ALIAS("VARIOUS_FLASH", flash2);
+REGION_ALIAS("VARIOUS_FLASH_LMA", flash2);
+
+/* Flash region to be used for RAM(n) initialization data.*/
+REGION_ALIAS("RAM_INIT_FLASH_LMA", flash2);
+
+/* RAM region to be used for Main stack. This stack accommodates the processing
+   of all exceptions and interrupts.*/
+REGION_ALIAS("MAIN_STACK_RAM", ram0);
+
+/* RAM region to be used for the process stack. This is the stack used by
+   the main() function.*/
+REGION_ALIAS("PROCESS_STACK_RAM", ram0);
+
+/* RAM region to be used for data segment.*/
+REGION_ALIAS("DATA_RAM", ram0);
+REGION_ALIAS("DATA_RAM_LMA", flash2);
+
+/* RAM region to be used for BSS segment.*/
+REGION_ALIAS("BSS_RAM", ram0);
+
+/* RAM region to be used for the default heap.*/
+REGION_ALIAS("HEAP_RAM", ram0);
+
+__eeprom_workarea_start__ = ORIGIN(flash3);
+__eeprom_workarea_size__  = LENGTH(flash3);
+__eeprom_workarea_end__   = __eeprom_workarea_start__ + __eeprom_workarea_size__;
+
+/* Generic rules inclusion.*/
+INCLUDE rules.ld
diff --git a/qmk/platforms/chibios/common/ld/STM32F103x8_stm32duino_bootloader.ld b/qmk/platforms/chibios/common/ld/STM32F103x8_stm32duino_bootloader.ld
new file mode 100644
index 00000000..bb852422
--- /dev/null
+++ b/qmk/platforms/chibios/common/ld/STM32F103x8_stm32duino_bootloader.ld
@@ -0,0 +1,85 @@
+/*
+    ChibiOS - Copyright (C) 2006..2016 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+/*
+ * ST32F103xB memory setup for use with the maplemini bootloader.
+ */
+MEMORY
+{
+    flash0  : org = 0x08002000, len = 64k - 0x2000
+    flash1  : org = 0x00000000, len = 0
+    flash2  : org = 0x00000000, len = 0
+    flash3  : org = 0x00000000, len = 0
+    flash4  : org = 0x00000000, len = 0
+    flash5  : org = 0x00000000, len = 0
+    flash6  : org = 0x00000000, len = 0
+    flash7  : org = 0x00000000, len = 0
+    ram0    : org = 0x20000000, len = 20k
+    ram1    : org = 0x00000000, len = 0
+    ram2    : org = 0x00000000, len = 0
+    ram3    : org = 0x00000000, len = 0
+    ram4    : org = 0x00000000, len = 0
+    ram5    : org = 0x00000000, len = 0
+    ram6    : org = 0x00000000, len = 0
+    ram7    : org = 0x00000000, len = 0
+}
+
+/* For each data/text section two region are defined, a virtual region
+   and a load region (_LMA suffix).*/
+
+/* Flash region to be used for exception vectors.*/
+REGION_ALIAS("VECTORS_FLASH", flash0);
+REGION_ALIAS("VECTORS_FLASH_LMA", flash0);
+
+/* Flash region to be used for constructors and destructors.*/
+REGION_ALIAS("XTORS_FLASH", flash0);
+REGION_ALIAS("XTORS_FLASH_LMA", flash0);
+
+/* Flash region to be used for code text.*/
+REGION_ALIAS("TEXT_FLASH", flash0);
+REGION_ALIAS("TEXT_FLASH_LMA", flash0);
+
+/* Flash region to be used for read only data.*/
+REGION_ALIAS("RODATA_FLASH", flash0);
+REGION_ALIAS("RODATA_FLASH_LMA", flash0);
+
+/* Flash region to be used for various.*/
+REGION_ALIAS("VARIOUS_FLASH", flash0);
+REGION_ALIAS("VARIOUS_FLASH_LMA", flash0);
+
+/* Flash region to be used for RAM(n) initialization data.*/
+REGION_ALIAS("RAM_INIT_FLASH_LMA", flash0);
+
+/* RAM region to be used for Main stack. This stack accommodates the processing
+   of all exceptions and interrupts.*/
+REGION_ALIAS("MAIN_STACK_RAM", ram0);
+
+/* RAM region to be used for the process stack. This is the stack used by
+   the main() function.*/
+REGION_ALIAS("PROCESS_STACK_RAM", ram0);
+
+/* RAM region to be used for data segment.*/
+REGION_ALIAS("DATA_RAM", ram0);
+REGION_ALIAS("DATA_RAM_LMA", flash0);
+
+/* RAM region to be used for BSS segment.*/
+REGION_ALIAS("BSS_RAM", ram0);
+
+/* RAM region to be used for the default heap.*/
+REGION_ALIAS("HEAP_RAM", ram0);
+
+/* Generic rules inclusion.*/
+INCLUDE rules.ld
diff --git a/qmk/platforms/chibios/keyboard-config-templates/board.h b/qmk/platforms/chibios/keyboard-config-templates/board.h
index 967ec13a..5b840c38 100644
--- a/qmk/platforms/chibios/keyboard-config-templates/board.h
+++ b/qmk/platforms/chibios/keyboard-config-templates/board.h
@@ -15,6 +15,6 @@
  */
 #pragma once
 
-#include_next "board.h"
+#include_next <board.h>
 
 // #undef STM32_HSE_BYPASS
diff --git a/qmk/platforms/chibios/keyboard-config-templates/chconf.h b/qmk/platforms/chibios/keyboard-config-templates/chconf.h
index 7c2af93f..fca44474 100644
--- a/qmk/platforms/chibios/keyboard-config-templates/chconf.h
+++ b/qmk/platforms/chibios/keyboard-config-templates/chconf.h
@@ -17,4 +17,4 @@
 
 // #define CH_CFG_OPTIMIZE_SPEED TRUE
 
-#include_next "chconf.h"
+#include_next <chconf.h>
diff --git a/qmk/platforms/chibios/keyboard-config-templates/halconf.h b/qmk/platforms/chibios/keyboard-config-templates/halconf.h
index ab5f738f..456020f1 100644
--- a/qmk/platforms/chibios/keyboard-config-templates/halconf.h
+++ b/qmk/platforms/chibios/keyboard-config-templates/halconf.h
@@ -17,4 +17,4 @@
 
 // #define HAL_USE_DAC TRUE
 
-#include_next "halconf.h"
+#include_next <halconf.h>
diff --git a/qmk/platforms/chibios/keyboard-config-templates/mcuconf.h b/qmk/platforms/chibios/keyboard-config-templates/mcuconf.h
index 5b42747b..c690b02f 100644
--- a/qmk/platforms/chibios/keyboard-config-templates/mcuconf.h
+++ b/qmk/platforms/chibios/keyboard-config-templates/mcuconf.h
@@ -15,7 +15,7 @@
  */
 #pragma once
 
-#include_next "mcuconf.h"
+#include_next <mcuconf.h>
 
 // #undef STM32_HSE_ENABLED
 // #define STM32_HSE_ENABLED FALSE
diff --git a/qmk/quantum/audio/audio_chibios.c b/qmk/quantum/audio/audio_chibios.c
index fba7c598..1f147f2c 100644
--- a/qmk/quantum/audio/audio_chibios.c
+++ b/qmk/quantum/audio/audio_chibios.c
@@ -15,8 +15,8 @@
  */
 
 #include "audio.h"
-#include "ch.h"
-#include "hal.h"
+#include <ch.h>
+#include <hal.h>
 
 #include <string.h>
 #include "print.h"
diff --git a/qmk/quantum/audio/luts.h b/qmk/quantum/audio/luts.h
index 117d74cd..6fdd3b46 100644
--- a/qmk/quantum/audio/luts.h
+++ b/qmk/quantum/audio/luts.h
@@ -19,8 +19,8 @@
 #    include <avr/interrupt.h>
 #    include <avr/pgmspace.h>
 #else
-#    include "ch.h"
-#    include "hal.h"
+#    include <ch.h>
+#    include <hal.h>
 #endif
 
 #ifndef LUTS_H
diff --git a/qmk/quantum/audio/voices.c b/qmk/quantum/audio/voices.c
index 53a65e4e..1592618b 100644
--- a/qmk/quantum/audio/voices.c
+++ b/qmk/quantum/audio/voices.c
@@ -15,7 +15,7 @@
  */
 #include "voices.h"
 #include "audio.h"
-#include "stdlib.h"
+#include <stdlib.h>
 
 // these are imported from audio.c
 extern uint16_t envelope_index;
diff --git a/qmk/quantum/backlight/backlight_avr.c b/qmk/quantum/backlight/backlight_avr.c
index b3e882ff..4d66da80 100644
--- a/qmk/quantum/backlight/backlight_avr.c
+++ b/qmk/quantum/backlight/backlight_avr.c
@@ -3,6 +3,11 @@
 #include "backlight_driver_common.h"
 #include "debug.h"
 
+// Maximum duty cycle limit
+#ifndef BACKLIGHT_LIMIT_VAL
+#    define BACKLIGHT_LIMIT_VAL 255
+#endif
+
 // This logic is a bit complex, we support 3 setups:
 //
 //   1. Hardware PWM when backlight is wired to a PWM pin.
@@ -240,6 +245,9 @@ static uint16_t cie_lightness(uint16_t v) {
     }
 }
 
+// rescale the supplied backlight value to be in terms of the value limit
+static uint32_t rescale_limit_val(uint32_t val) { return (val * (BACKLIGHT_LIMIT_VAL + 1)) / 256; }
+
 // range for val is [0..TIMER_TOP]. PWM pin is high while the timer count is below val.
 static inline void set_pwm(uint16_t val) { OCRxx = val; }
 
@@ -269,7 +277,7 @@ void backlight_set(uint8_t level) {
 #endif
     }
     // Set the brightness
-    set_pwm(cie_lightness(TIMER_TOP * (uint32_t)level / BACKLIGHT_LEVELS));
+    set_pwm(cie_lightness(rescale_limit_val(TIMER_TOP * (uint32_t)level / BACKLIGHT_LEVELS)));
 }
 
 void backlight_task(void) {}
@@ -375,7 +383,7 @@ ISR(TIMERx_OVF_vect)
         breathing_interrupt_disable();
     }
 
-    set_pwm(cie_lightness(scale_backlight((uint16_t)pgm_read_byte(&breathing_table[index]) * 0x0101U)));
+    set_pwm(cie_lightness(rescale_limit_val(scale_backlight((uint16_t)pgm_read_byte(&breathing_table[index]) * 0x0101U))));
 }
 
 #endif  // BACKLIGHT_BREATHING
diff --git a/qmk/quantum/backlight/backlight_chibios.c b/qmk/quantum/backlight/backlight_chibios.c
index 0fe812bf..4d5a69e1 100644
--- a/qmk/quantum/backlight/backlight_chibios.c
+++ b/qmk/quantum/backlight/backlight_chibios.c
@@ -3,6 +3,11 @@
 #include <hal.h>
 #include "debug.h"
 
+// Maximum duty cycle limit
+#ifndef BACKLIGHT_LIMIT_VAL
+#    define BACKLIGHT_LIMIT_VAL 255
+#endif
+
 // GPIOV2 && GPIOV3
 #ifndef BACKLIGHT_PAL_MODE
 #    define BACKLIGHT_PAL_MODE 2
@@ -58,6 +63,11 @@ static uint16_t cie_lightness(uint16_t v) {
     }
 }
 
+static uint32_t rescale_limit_val(uint32_t val) {
+    // rescale the supplied backlight value to be in terms of the value limit
+    return (val * (BACKLIGHT_LIMIT_VAL + 1)) / 256;
+}
+
 void backlight_init_ports(void) {
 #ifdef USE_GPIOV1
     palSetPadMode(PAL_PORT(BACKLIGHT_PIN), PAL_PAD(BACKLIGHT_PIN), PAL_MODE_STM32_ALTERNATE_PUSHPULL);
@@ -85,7 +95,7 @@ void backlight_set(uint8_t level) {
         pwmDisableChannel(&BACKLIGHT_PWM_DRIVER, BACKLIGHT_PWM_CHANNEL - 1);
     } else {
         // Turn backlight on
-        uint32_t duty = (uint32_t)(cie_lightness(0xFFFF * (uint32_t)level / BACKLIGHT_LEVELS));
+        uint32_t duty = (uint32_t)(cie_lightness(rescale_limit_val(0xFFFF * (uint32_t)level / BACKLIGHT_LEVELS)));
         pwmEnableChannel(&BACKLIGHT_PWM_DRIVER, BACKLIGHT_PWM_CHANNEL - 1, PWM_FRACTION_TO_WIDTH(&BACKLIGHT_PWM_DRIVER, 0xFFFF, duty));
     }
 }
@@ -129,7 +139,7 @@ void breathing_callback(PWMDriver *pwmp) {
     static uint16_t breathing_counter = 0;
     breathing_counter                 = (breathing_counter + 1) % (breathing_period * 256);
     uint8_t  index                    = breathing_counter / interval % BREATHING_STEPS;
-    uint32_t duty                     = cie_lightness(scale_backlight(breathing_table[index] * 256));
+    uint32_t duty                     = cie_lightness(rescale_limit_val(scale_backlight(breathing_table[index] * 256)));
 
     chSysLockFromISR();
     pwmEnableChannelI(pwmp, BACKLIGHT_PWM_CHANNEL - 1, PWM_FRACTION_TO_WIDTH(&BACKLIGHT_PWM_DRIVER, 0xFFFF, duty));
diff --git a/qmk/quantum/color.h b/qmk/quantum/color.h
index 5c5a0f0e..f0ee7827 100644
--- a/qmk/quantum/color.h
+++ b/qmk/quantum/color.h
@@ -36,20 +36,38 @@
 #    define LED_TYPE RGB
 #endif
 
-// WS2812 specific layout
+#define WS2812_BYTE_ORDER_RGB 0
+#define WS2812_BYTE_ORDER_GRB 1
+
+#ifndef WS2812_BYTE_ORDER
+#    define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_GRB
+#endif
+
 typedef struct PACKED {
+#if (WS2812_BYTE_ORDER == WS2812_BYTE_ORDER_GRB)
     uint8_t g;
     uint8_t r;
     uint8_t b;
+#elif (WS2812_BYTE_ORDER == WS2812_BYTE_ORDER_RGB)
+    uint8_t r;
+    uint8_t g;
+    uint8_t b;
+#endif
 } cRGB;
 
 typedef cRGB RGB;
 
 // WS2812 specific layout
 typedef struct PACKED {
+#if (WS2812_BYTE_ORDER == WS2812_BYTE_ORDER_GRB)
     uint8_t g;
     uint8_t r;
     uint8_t b;
+#elif (WS2812_BYTE_ORDER == WS2812_BYTE_ORDER_RGB)
+    uint8_t r;
+    uint8_t g;
+    uint8_t b;
+#endif
     uint8_t w;
 } cRGBW;
 
diff --git a/qmk/quantum/config_common.h b/qmk/quantum/config_common.h
index c1e6698e..2d9c70b0 100644
--- a/qmk/quantum/config_common.h
+++ b/qmk/quantum/config_common.h
@@ -39,7 +39,7 @@
 #        define PIND_ADDRESS 0x9
 #        define PINE_ADDRESS 0xC
 #        define PINF_ADDRESS 0xF
-#    elif defined(__AVR_ATmega32U2__) || defined(__AVR_ATmega16U2__)
+#    elif defined(__AVR_ATmega32U2__) || defined(__AVR_ATmega16U2__) || defined(__AVR_ATmega328P__) || defined(__AVR_ATmega328__)
 #        define ADDRESS_BASE 0x00
 #        define PINB_ADDRESS 0x3
 #        define PINC_ADDRESS 0x6
@@ -58,11 +58,6 @@
 #        define PINC_ADDRESS 0x3
 #        define PINB_ADDRESS 0x6
 #        define PINA_ADDRESS 0x9
-#    elif defined(__AVR_ATmega328P__) || defined(__AVR_ATmega328__)
-#        define ADDRESS_BASE 0x00
-#        define PINB_ADDRESS 0x3
-#        define PINC_ADDRESS 0x6
-#        define PIND_ADDRESS 0x9
 #    elif defined(__AVR_ATtiny85__)
 #        define ADDRESS_BASE 0x10
 #        define PINB_ADDRESS 0x6
@@ -284,6 +279,91 @@
 #        define F13 PAL_LINE(GPIOF, 13)
 #        define F14 PAL_LINE(GPIOF, 14)
 #        define F15 PAL_LINE(GPIOF, 15)
+#        define G0 PAL_LINE(GPIOG, 0)
+#        define G1 PAL_LINE(GPIOG, 1)
+#        define G2 PAL_LINE(GPIOG, 2)
+#        define G3 PAL_LINE(GPIOG, 3)
+#        define G4 PAL_LINE(GPIOG, 4)
+#        define G5 PAL_LINE(GPIOG, 5)
+#        define G6 PAL_LINE(GPIOG, 6)
+#        define G7 PAL_LINE(GPIOG, 7)
+#        define G8 PAL_LINE(GPIOG, 8)
+#        define G9 PAL_LINE(GPIOG, 9)
+#        define G10 PAL_LINE(GPIOG, 10)
+#        define G11 PAL_LINE(GPIOG, 11)
+#        define G12 PAL_LINE(GPIOG, 12)
+#        define G13 PAL_LINE(GPIOG, 13)
+#        define G14 PAL_LINE(GPIOG, 14)
+#        define G15 PAL_LINE(GPIOG, 15)
+#        define H0 PAL_LINE(GPIOH, 0)
+#        define H1 PAL_LINE(GPIOH, 1)
+#        define H2 PAL_LINE(GPIOH, 2)
+#        define H3 PAL_LINE(GPIOH, 3)
+#        define H4 PAL_LINE(GPIOH, 4)
+#        define H5 PAL_LINE(GPIOH, 5)
+#        define H6 PAL_LINE(GPIOH, 6)
+#        define H7 PAL_LINE(GPIOH, 7)
+#        define H8 PAL_LINE(GPIOH, 8)
+#        define H9 PAL_LINE(GPIOH, 9)
+#        define H10 PAL_LINE(GPIOH, 10)
+#        define H11 PAL_LINE(GPIOH, 11)
+#        define H12 PAL_LINE(GPIOH, 12)
+#        define H13 PAL_LINE(GPIOH, 13)
+#        define H14 PAL_LINE(GPIOH, 14)
+#        define H15 PAL_LINE(GPIOH, 15)
+#        define I0 PAL_LINE(GPIOI, 0)
+#        define I1 PAL_LINE(GPIOI, 1)
+#        define I2 PAL_LINE(GPIOI, 2)
+#        define I3 PAL_LINE(GPIOI, 3)
+#        define I4 PAL_LINE(GPIOI, 4)
+#        define I5 PAL_LINE(GPIOI, 5)
+#        define I6 PAL_LINE(GPIOI, 6)
+#        define I7 PAL_LINE(GPIOI, 7)
+#        define I8 PAL_LINE(GPIOI, 8)
+#        define I9 PAL_LINE(GPIOI, 9)
+#        define I10 PAL_LINE(GPIOI, 10)
+#        define I11 PAL_LINE(GPIOI, 11)
+#        define I12 PAL_LINE(GPIOI, 12)
+#        define I13 PAL_LINE(GPIOI, 13)
+#        define I14 PAL_LINE(GPIOI, 14)
+#        define I15 PAL_LINE(GPIOI, 15)
+#        define J0 PAL_LINE(GPIOJ, 0)
+#        define J1 PAL_LINE(GPIOJ, 1)
+#        define J2 PAL_LINE(GPIOJ, 2)
+#        define J3 PAL_LINE(GPIOJ, 3)
+#        define J4 PAL_LINE(GPIOJ, 4)
+#        define J5 PAL_LINE(GPIOJ, 5)
+#        define J6 PAL_LINE(GPIOJ, 6)
+#        define J7 PAL_LINE(GPIOJ, 7)
+#        define J8 PAL_LINE(GPIOJ, 8)
+#        define J9 PAL_LINE(GPIOJ, 9)
+#        define J10 PAL_LINE(GPIOJ, 10)
+#        define J11 PAL_LINE(GPIOJ, 11)
+#        define J12 PAL_LINE(GPIOJ, 12)
+#        define J13 PAL_LINE(GPIOJ, 13)
+#        define J14 PAL_LINE(GPIOJ, 14)
+#        define J15 PAL_LINE(GPIOJ, 15)
+// Keyboards can `#define KEYBOARD_REQUIRES_GPIOK` if they need to access GPIO-K pins. These conflict with a whole
+// bunch of layout definitions, so it's intentionally left out unless absolutely required -- in that case, the
+// keyboard designer should use a different symbol when defining their layout macros.
+#        ifdef KEYBOARD_REQUIRES_GPIOK
+#            define K0 PAL_LINE(GPIOK, 0)
+#            define K1 PAL_LINE(GPIOK, 1)
+#            define K2 PAL_LINE(GPIOK, 2)
+#            define K3 PAL_LINE(GPIOK, 3)
+#            define K4 PAL_LINE(GPIOK, 4)
+#            define K5 PAL_LINE(GPIOK, 5)
+#            define K6 PAL_LINE(GPIOK, 6)
+#            define K7 PAL_LINE(GPIOK, 7)
+#            define K8 PAL_LINE(GPIOK, 8)
+#            define K9 PAL_LINE(GPIOK, 9)
+#            define K10 PAL_LINE(GPIOK, 10)
+#            define K11 PAL_LINE(GPIOK, 11)
+#            define K12 PAL_LINE(GPIOK, 12)
+#            define K13 PAL_LINE(GPIOK, 13)
+#            define K14 PAL_LINE(GPIOK, 14)
+#            define K15 PAL_LINE(GPIOK, 15)
+#        endif
 #    endif
 #endif
 
diff --git a/qmk/quantum/debounce/sym_defer_pk.c b/qmk/quantum/debounce/sym_defer_pk.c
index f404cf9c..6c0e3bb0 100644
--- a/qmk/quantum/debounce/sym_defer_pk.c
+++ b/qmk/quantum/debounce/sym_defer_pk.c
@@ -38,12 +38,12 @@ static bool                counters_need_update;
 #define MAX_DEBOUNCE (DEBOUNCE_ELAPSED - 1)
 
 static uint8_t wrapping_timer_read(void) {
-    static uint16_t time = 0;
+    static uint16_t time        = 0;
     static uint8_t  last_result = 0;
-    uint16_t new_time = timer_read();
-    uint16_t diff = new_time - time;
-    time = new_time;
-    last_result = (last_result + diff) % (MAX_DEBOUNCE + 1);
+    uint16_t        new_time    = timer_read();
+    uint16_t        diff        = new_time - time;
+    time                        = new_time;
+    last_result                 = (last_result + diff) % (MAX_DEBOUNCE + 1);
     return last_result;
 }
 
diff --git a/qmk/quantum/encoder.c b/qmk/quantum/encoder.c
index 81ec1bb3..7ca31afe 100644
--- a/qmk/quantum/encoder.c
+++ b/qmk/quantum/encoder.c
@@ -23,7 +23,7 @@
 // for memcpy
 #include <string.h>
 
-#ifndef ENCODER_RESOLUTION
+#if !defined(ENCODER_RESOLUTIONS) && !defined(ENCODER_RESOLUTION)
 #    define ENCODER_RESOLUTION 4
 #endif
 
@@ -34,6 +34,9 @@
 #define NUMBER_OF_ENCODERS (sizeof(encoders_pad_a) / sizeof(pin_t))
 static pin_t encoders_pad_a[] = ENCODERS_PAD_A;
 static pin_t encoders_pad_b[] = ENCODERS_PAD_B;
+#ifdef ENCODER_RESOLUTIONS
+static uint8_t encoder_resolutions[] = ENCODER_RESOLUTIONS;
+#endif
 
 #ifndef ENCODER_DIRECTION_FLIP
 #    define ENCODER_CLOCKWISE true
@@ -65,9 +68,15 @@ void encoder_init(void) {
     if (!isLeftHand) {
         const pin_t encoders_pad_a_right[] = ENCODERS_PAD_A_RIGHT;
         const pin_t encoders_pad_b_right[] = ENCODERS_PAD_B_RIGHT;
+#    if defined(ENCODER_RESOLUTIONS_RIGHT)
+        const uint8_t encoder_resolutions_right[] = ENCODER_RESOLUTIONS_RIGHT;
+#    endif
         for (uint8_t i = 0; i < NUMBER_OF_ENCODERS; i++) {
             encoders_pad_a[i] = encoders_pad_a_right[i];
             encoders_pad_b[i] = encoders_pad_b_right[i];
+#    if defined(ENCODER_RESOLUTIONS_RIGHT)
+            encoder_resolutions[i] = encoder_resolutions_right[i];
+#    endif
         }
     }
 #endif
@@ -87,19 +96,26 @@ void encoder_init(void) {
 
 static void encoder_update(int8_t index, uint8_t state) {
     uint8_t i = index;
+
+#ifdef ENCODER_RESOLUTIONS
+    int8_t resolution = encoder_resolutions[i];
+#else
+    int8_t resolution = ENCODER_RESOLUTION;
+#endif
+
 #ifdef SPLIT_KEYBOARD
     index += thisHand;
 #endif
     encoder_pulses[i] += encoder_LUT[state & 0xF];
-    if (encoder_pulses[i] >= ENCODER_RESOLUTION) {
+    if (encoder_pulses[i] >= resolution) {
         encoder_value[index]++;
         encoder_update_kb(index, ENCODER_COUNTER_CLOCKWISE);
     }
-    if (encoder_pulses[i] <= -ENCODER_RESOLUTION) {  // direction is arbitrary here, but this clockwise
+    if (encoder_pulses[i] <= -resolution) {  // direction is arbitrary here, but this clockwise
         encoder_value[index]--;
         encoder_update_kb(index, ENCODER_CLOCKWISE);
     }
-    encoder_pulses[i] %= ENCODER_RESOLUTION;
+    encoder_pulses[i] %= resolution;
 }
 
 void encoder_read(void) {
diff --git a/qmk/quantum/fauxclicky.c b/qmk/quantum/fauxclicky.c
index a57e2ed0..53499c9c 100644
--- a/qmk/quantum/fauxclicky.c
+++ b/qmk/quantum/fauxclicky.c
@@ -15,10 +15,10 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include <avr/interrupt.h>
 #include <avr/io.h>
-#include <timer.h>
-#include <fauxclicky.h>
+#include "timer.h"
+#include "fauxclicky.h"
 #include <stdbool.h>
-#include <musical_notes.h>
+#include "musical_notes.h"
 
 bool     fauxclicky_enabled = true;
 uint16_t note_start         = 0;
diff --git a/qmk/quantum/fauxclicky.h b/qmk/quantum/fauxclicky.h
index 5c056918..ed54d0ed 100644
--- a/qmk/quantum/fauxclicky.h
+++ b/qmk/quantum/fauxclicky.h
@@ -18,13 +18,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #endif
 
 #include "musical_notes.h"
-#include "stdbool.h"
+#include <stdbool.h>
 
 __attribute__((weak)) float fauxclicky_pressed_note[2]  = MUSICAL_NOTE(_D4, 0.25);
 __attribute__((weak)) float fauxclicky_released_note[2] = MUSICAL_NOTE(_C4, 0.125);
 __attribute__((weak)) float fauxclicky_beep_note[2]     = MUSICAL_NOTE(_C4, 0.25);
 
-bool fauxclicky_enabled;
+extern bool fauxclicky_enabled;
 
 //
 // tempo in BPM
diff --git a/qmk/quantum/joystick.h b/qmk/quantum/joystick.h
index a95472b9..87dbc24a 100644
--- a/qmk/quantum/joystick.h
+++ b/qmk/quantum/joystick.h
@@ -1,5 +1,9 @@
 #pragma once
 
+#include "quantum.h"
+
+#include <stdint.h>
+
 #ifndef JOYSTICK_BUTTON_COUNT
 #    define JOYSTICK_BUTTON_COUNT 8
 #endif
@@ -8,9 +12,13 @@
 #    define JOYSTICK_AXES_COUNT 4
 #endif
 
-#include "quantum.h"
+#ifndef JOYSTICK_AXES_RESOLUTION
+#    define JOYSTICK_AXES_RESOLUTION 8
+#elif JOYSTICK_AXES_RESOLUTION < 8 || JOYSTICK_AXES_RESOLUTION > 16
+#    error JOYSTICK_AXES_RESOLUTION must be between 8 and 16
+#endif
 
-#include <stdint.h>
+#define JOYSTICK_RESOLUTION ((1L << (JOYSTICK_AXES_RESOLUTION - 1)) - 1)
 
 // configure on input_pin of the joystick_axes array entry to JS_VIRTUAL_AXIS
 // to prevent it from being read from the ADC. This allows outputing forged axis value.
diff --git a/qmk/quantum/keymap.h b/qmk/quantum/keymap.h
index de3bece1..90a2398b 100644
--- a/qmk/quantum/keymap.h
+++ b/qmk/quantum/keymap.h
@@ -25,7 +25,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    include <avr/pgmspace.h>
 #elif defined PROTOCOL_CHIBIOS
 // We need to ensure that chibios is include before redefining reset
-#    include "ch.h"
+#    include <ch.h>
 #endif
 #include "keycode.h"
 #include "action_macro.h"
diff --git a/qmk/quantum/keymap_extras/keymap_canadian_multilingual.h b/qmk/quantum/keymap_extras/keymap_canadian_multilingual.h
index 382e67ac..bb8e44d5 100644
--- a/qmk/quantum/keymap_extras/keymap_canadian_multilingual.h
+++ b/qmk/quantum/keymap_extras/keymap_canadian_multilingual.h
@@ -149,8 +149,8 @@
 // Row 3
 #define CA_DEG  ALGR(CA_SCLN) // °
 // Row 4
-#define CA_LDAQ ALGR(CA_X)    // «
-#define CA_RDAQ ALGR(CA_C)    // »
+#define CA_LDAQ ALGR(CA_Z)    // «
+#define CA_RDAQ ALGR(CA_X)    // »
 #define CA_LABK ALGR(CA_COMM) // <
 #define CA_RABK ALGR(CA_DOT)  // >
 
diff --git a/qmk/quantum/keymap_extras/keymap_french_osx.h b/qmk/quantum/keymap_extras/keymap_french_osx.h
index d0132a2d..de8dd756 100644
--- a/qmk/quantum/keymap_extras/keymap_french_osx.h
+++ b/qmk/quantum/keymap_extras/keymap_french_osx.h
@@ -237,7 +237,7 @@
 #define FR_PERM S(A(FR_LUGR)) // ‰
 // Row 4
 #define FR_GTEQ S(A(FR_LABK)) // ≥
-#define FR_LSAQ S(A(FR_W))    // ›
+#define FR_RSAQ S(A(FR_W))    // ›
 #define FR_FRSL S(A(FR_X))    // ⁄
 #define FR_CENT S(A(FR_C))    // ¢
 #define FR_SQRT S(A(FR_V))    // √
diff --git a/qmk/quantum/led.c b/qmk/quantum/led.c
new file mode 100644
index 00000000..3e30b1a5
--- /dev/null
+++ b/qmk/quantum/led.c
@@ -0,0 +1,137 @@
+/* Copyright 2020 zvecr<git@zvecr.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 "quantum.h"
+
+#ifdef BACKLIGHT_ENABLE
+#    include "backlight.h"
+extern backlight_config_t backlight_config;
+#else
+// Cannot use BACKLIGHT_CAPS_LOCK without backlight being enabled
+#    undef BACKLIGHT_CAPS_LOCK
+#endif
+
+#ifndef LED_PIN_ON_STATE
+#    define LED_PIN_ON_STATE 1
+#endif
+
+#if defined(BACKLIGHT_CAPS_LOCK)
+/** \brief Caps Lock indicator using backlight (for keyboards without dedicated LED)
+ */
+static void handle_backlight_caps_lock(led_t led_state) {
+    // Use backlight as Caps Lock indicator
+    uint8_t bl_toggle_lvl = 0;
+
+    if (led_state.caps_lock && !backlight_config.enable) {
+        // Turning Caps Lock ON and backlight is disabled in config
+        // Toggling backlight to the brightest level
+        bl_toggle_lvl = BACKLIGHT_LEVELS;
+    } else if (!led_state.caps_lock && backlight_config.enable) {
+        // Turning Caps Lock OFF and backlight is enabled in config
+        // Toggling backlight and restoring config level
+        bl_toggle_lvl = backlight_config.level;
+    }
+
+    // Set level without modify backlight_config to keep ability to restore state
+    backlight_set(bl_toggle_lvl);
+}
+#endif
+
+/** \brief Lock LED set callback - keymap/user level
+ *
+ * \deprecated Use led_update_user() instead.
+ */
+__attribute__((weak)) void led_set_user(uint8_t usb_led) {}
+
+/** \brief Lock LED set callback - keyboard level
+ *
+ * \deprecated Use led_update_kb() instead.
+ */
+__attribute__((weak)) void led_set_kb(uint8_t usb_led) { led_set_user(usb_led); }
+
+/** \brief Lock LED update callback - keymap/user level
+ *
+ * \return True if led_update_kb() should run its own code, false otherwise.
+ */
+__attribute__((weak)) bool led_update_user(led_t led_state) { return true; }
+
+/** \brief Lock LED update callback - keyboard level
+ *
+ * \return Ignored for now.
+ */
+__attribute__((weak)) bool led_update_kb(led_t led_state) {
+    bool res = led_update_user(led_state);
+    if (res) {
+#if defined(LED_NUM_LOCK_PIN) || defined(LED_CAPS_LOCK_PIN) || defined(LED_SCROLL_LOCK_PIN) || defined(LED_COMPOSE_PIN) || defined(LED_KANA_PIN)
+#    if LED_PIN_ON_STATE == 0
+        // invert the whole thing to avoid having to conditionally !led_state.x later
+        led_state.raw = ~led_state.raw;
+#    endif
+
+#    ifdef LED_NUM_LOCK_PIN
+        writePin(LED_NUM_LOCK_PIN, led_state.num_lock);
+#    endif
+#    ifdef LED_CAPS_LOCK_PIN
+        writePin(LED_CAPS_LOCK_PIN, led_state.caps_lock);
+#    endif
+#    ifdef LED_SCROLL_LOCK_PIN
+        writePin(LED_SCROLL_LOCK_PIN, led_state.scroll_lock);
+#    endif
+#    ifdef LED_COMPOSE_PIN
+        writePin(LED_COMPOSE_PIN, led_state.compose);
+#    endif
+#    ifdef LED_KANA_PIN
+        writePin(LED_KANA_PIN, led_state.kana);
+#    endif
+#endif
+    }
+    return res;
+}
+
+/** \brief Initialise any LED related hardware and/or state
+ */
+__attribute__((weak)) void led_init_ports(void) {
+#ifdef LED_NUM_LOCK_PIN
+    setPinOutput(LED_NUM_LOCK_PIN);
+    writePin(LED_NUM_LOCK_PIN, !LED_PIN_ON_STATE);
+#endif
+#ifdef LED_CAPS_LOCK_PIN
+    setPinOutput(LED_CAPS_LOCK_PIN);
+    writePin(LED_CAPS_LOCK_PIN, !LED_PIN_ON_STATE);
+#endif
+#ifdef LED_SCROLL_LOCK_PIN
+    setPinOutput(LED_SCROLL_LOCK_PIN);
+    writePin(LED_SCROLL_LOCK_PIN, !LED_PIN_ON_STATE);
+#endif
+#ifdef LED_COMPOSE_PIN
+    setPinOutput(LED_COMPOSE_PIN);
+    writePin(LED_COMPOSE_PIN, !LED_PIN_ON_STATE);
+#endif
+#ifdef LED_KANA_PIN
+    setPinOutput(LED_KANA_PIN);
+    writePin(LED_KANA_PIN, !LED_PIN_ON_STATE);
+#endif
+}
+
+/** \brief Entrypoint for protocol to LED binding
+ */
+__attribute__((weak)) void led_set(uint8_t usb_led) {
+#ifdef BACKLIGHT_CAPS_LOCK
+    handle_backlight_caps_lock((led_t)usb_led);
+#endif
+
+    led_set_kb(usb_led);
+    led_update_kb((led_t)usb_led);
+}
\ No newline at end of file
diff --git a/qmk/quantum/led_matrix.c b/qmk/quantum/led_matrix.c
index 5c24c797..eb523990 100644
--- a/qmk/quantum/led_matrix.c
+++ b/qmk/quantum/led_matrix.c
@@ -20,7 +20,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include "quantum.h"
-#include "ledmatrix.h"
+#include "led_matrix.h"
 #include "progmem.h"
 #include "config.h"
 #include "eeprom.h"
diff --git a/qmk/quantum/led_matrix.h b/qmk/quantum/led_matrix.h
new file mode 100644
index 00000000..5867ba98
--- /dev/null
+++ b/qmk/quantum/led_matrix.h
@@ -0,0 +1,127 @@
+/* Copyright 2017 Jason Williams
+ * Copyright 2017 Jack Humbert
+ * Copyright 2018 Yiancar
+ * Copyright 2019 Clueboard
+ *
+ * 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 LED_MATRIX_H
+#define LED_MATRIX_H
+
+#ifndef BACKLIGHT_ENABLE
+#    error You must define BACKLIGHT_ENABLE with LED_MATRIX_ENABLE
+#endif
+
+typedef struct Point {
+    uint8_t x;
+    uint8_t y;
+} __attribute__((packed)) Point;
+
+typedef struct led_matrix {
+    union {
+        uint8_t raw;
+        struct {
+            uint8_t row : 4;  // 16 max
+            uint8_t col : 4;  // 16 max
+        };
+    } matrix_co;
+    Point   point;
+    uint8_t modifier : 1;
+} __attribute__((packed)) led_matrix;
+
+extern const led_matrix g_leds[LED_DRIVER_LED_COUNT];
+
+typedef struct {
+    uint8_t index;
+    uint8_t value;
+} led_indicator;
+
+typedef union {
+    uint32_t raw;
+    struct {
+        bool    enable : 1;
+        uint8_t mode : 6;
+        uint8_t hue : 8;  // Unused by led_matrix
+        uint8_t sat : 8;  // Unused by led_matrix
+        uint8_t val : 8;
+        uint8_t speed : 8;  // EECONFIG needs to be increased to support this
+    };
+} led_config_t;
+
+enum led_matrix_effects {
+    LED_MATRIX_UNIFORM_BRIGHTNESS = 1,
+    // All new effects go above this line
+    LED_MATRIX_EFFECT_MAX
+};
+
+void led_matrix_set_index_value(int index, uint8_t value);
+void led_matrix_set_index_value_all(uint8_t value);
+
+// This runs after another backlight effect and replaces
+// colors already set
+void led_matrix_indicators(void);
+void led_matrix_indicators_kb(void);
+void led_matrix_indicators_user(void);
+
+void led_matrix_init(void);
+void led_matrix_setup_drivers(void);
+
+void led_matrix_set_suspend_state(bool state);
+void led_matrix_set_indicator_state(uint8_t state);
+
+void led_matrix_task(void);
+
+// This should not be called from an interrupt
+// (eg. from a timer interrupt).
+// Call this while idle (in between matrix scans).
+// If the buffer is dirty, it will update the driver with the buffer.
+void led_matrix_update_pwm_buffers(void);
+
+bool process_led_matrix(uint16_t keycode, keyrecord_t *record);
+
+uint32_t led_matrix_get_tick(void);
+
+void    led_matrix_toggle(void);
+void    led_matrix_enable(void);
+void    led_matrix_enable_noeeprom(void);
+void    led_matrix_disable(void);
+void    led_matrix_disable_noeeprom(void);
+void    led_matrix_step(void);
+void    led_matrix_step_reverse(void);
+void    led_matrix_increase_val(void);
+void    led_matrix_decrease_val(void);
+void    led_matrix_increase_speed(void);
+void    led_matrix_decrease_speed(void);
+void    led_matrix_mode(uint8_t mode, bool eeprom_write);
+void    led_matrix_mode_noeeprom(uint8_t mode);
+uint8_t led_matrix_get_mode(void);
+void    led_matrix_set_value(uint8_t mode);
+void    led_matrix_set_value_noeeprom(uint8_t mode);
+
+typedef struct {
+    /* Perform any initialisation required for the other driver functions to work. */
+    void (*init)(void);
+
+    /* Set the brightness of a single LED in the buffer. */
+    void (*set_value)(int index, uint8_t value);
+    /* Set the brightness of all LEDS on the keyboard in the buffer. */
+    void (*set_value_all)(uint8_t value);
+    /* Flush any buffered changes to the hardware. */
+    void (*flush)(void);
+} led_matrix_driver_t;
+
+extern const led_matrix_driver_t led_matrix_driver;
+
+#endif
diff --git a/qmk/quantum/led_matrix_drivers.c b/qmk/quantum/led_matrix_drivers.c
index 6877bf4c..9decaa33 100644
--- a/qmk/quantum/led_matrix_drivers.c
+++ b/qmk/quantum/led_matrix_drivers.c
@@ -18,7 +18,7 @@
 #include <stdint.h>
 #include <stdbool.h>
 #include "quantum.h"
-#include "ledmatrix.h"
+#include "led_matrix.h"
 
 /* Each driver needs to define a struct:
  *
diff --git a/qmk/quantum/matrix.c b/qmk/quantum/matrix.c
index c68c56ca..9083ff38 100644
--- a/qmk/quantum/matrix.c
+++ b/qmk/quantum/matrix.c
@@ -32,6 +32,17 @@ static const pin_t col_pins[MATRIX_COLS] = MATRIX_COL_PINS;
 extern matrix_row_t raw_matrix[MATRIX_ROWS];  // raw values
 extern matrix_row_t matrix[MATRIX_ROWS];      // debounced values
 
+static inline void setPinOutput_writeLow(pin_t pin) {
+    ATOMIC_BLOCK_FORCEON {
+        setPinOutput(pin);
+        writePinLow(pin);
+    }
+}
+
+static inline void setPinInputHigh_atomic(pin_t pin) {
+    ATOMIC_BLOCK_FORCEON { setPinInputHigh(pin); }
+}
+
 // matrix code
 
 #ifdef DIRECT_PINS
@@ -69,23 +80,20 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
 #elif defined(DIODE_DIRECTION)
 #    if (DIODE_DIRECTION == COL2ROW)
 
-static void select_row(uint8_t row) {
-    setPinOutput(row_pins[row]);
-    writePinLow(row_pins[row]);
-}
+static void select_row(uint8_t row) { setPinOutput_writeLow(row_pins[row]); }
 
-static void unselect_row(uint8_t row) { setPinInputHigh(row_pins[row]); }
+static void unselect_row(uint8_t row) { setPinInputHigh_atomic(row_pins[row]); }
 
 static void unselect_rows(void) {
     for (uint8_t x = 0; x < MATRIX_ROWS; x++) {
-        setPinInputHigh(row_pins[x]);
+        setPinInputHigh_atomic(row_pins[x]);
     }
 }
 
 static void init_pins(void) {
     unselect_rows();
     for (uint8_t x = 0; x < MATRIX_COLS; x++) {
-        setPinInputHigh(col_pins[x]);
+        setPinInputHigh_atomic(col_pins[x]);
     }
 }
 
@@ -119,23 +127,20 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
 
 #    elif (DIODE_DIRECTION == ROW2COL)
 
-static void select_col(uint8_t col) {
-    setPinOutput(col_pins[col]);
-    writePinLow(col_pins[col]);
-}
+static void select_col(uint8_t col) { setPinOutput_writeLow(col_pins[col]); }
 
-static void unselect_col(uint8_t col) { setPinInputHigh(col_pins[col]); }
+static void unselect_col(uint8_t col) { setPinInputHigh_atomic(col_pins[col]); }
 
 static void unselect_cols(void) {
     for (uint8_t x = 0; x < MATRIX_COLS; x++) {
-        setPinInputHigh(col_pins[x]);
+        setPinInputHigh_atomic(col_pins[x]);
     }
 }
 
 static void init_pins(void) {
     unselect_cols();
     for (uint8_t x = 0; x < MATRIX_ROWS; x++) {
-        setPinInputHigh(row_pins[x]);
+        setPinInputHigh_atomic(row_pins[x]);
     }
 }
 
diff --git a/qmk/quantum/mcu_selection.mk b/qmk/quantum/mcu_selection.mk
index 295dfd31..9518a646 100644
--- a/qmk/quantum/mcu_selection.mk
+++ b/qmk/quantum/mcu_selection.mk
@@ -318,6 +318,9 @@ ifneq (,$(filter $(MCU),atmega16u2 atmega32u2 atmega16u4 atmega32u4 at90usb646 a
   ifeq (,$(filter $(NO_INTERRUPT_CONTROL_ENDPOINT),yes))
     OPT_DEFS += -DINTERRUPT_CONTROL_ENDPOINT
   endif
+  ifneq (,$(filter $(MCU),atmega16u2 atmega32u2))
+    NO_I2C = yes
+  endif
 endif
 
 ifneq (,$(filter $(MCU),atmega32a))
diff --git a/qmk/quantum/process_keycode/process_auto_shift.c b/qmk/quantum/process_keycode/process_auto_shift.c
index b1267922..a2d31540 100644
--- a/qmk/quantum/process_keycode/process_auto_shift.c
+++ b/qmk/quantum/process_keycode/process_auto_shift.c
@@ -16,48 +16,149 @@
 
 #ifdef AUTO_SHIFT_ENABLE
 
+#    include <stdbool.h>
 #    include <stdio.h>
 
 #    include "process_auto_shift.h"
 
-static bool     autoshift_enabled = true;
 static uint16_t autoshift_time    = 0;
 static uint16_t autoshift_timeout = AUTO_SHIFT_TIMEOUT;
 static uint16_t autoshift_lastkey = KC_NO;
+static struct {
+    // Whether autoshift is enabled.
+    bool enabled : 1;
+    // Whether the last auto-shifted key was released after the timeout.  This
+    // is used to replicate the last key for a tap-then-hold.
+    bool lastshifted : 1;
+    // Whether an auto-shiftable key has been pressed but not processed.
+    bool in_progress : 1;
+    // Whether the auto-shifted keypress has been registered.
+    bool holding_shift : 1;
+} autoshift_flags = {true, false, false, false};
 
-void autoshift_flush(void) {
-    if (autoshift_lastkey != KC_NO) {
-        uint16_t elapsed = timer_elapsed(autoshift_time);
-
-        if (elapsed > autoshift_timeout) {
-            tap_code16(LSFT(autoshift_lastkey));
-        } else {
-            tap_code(autoshift_lastkey);
-        }
-
-        autoshift_time    = 0;
-        autoshift_lastkey = KC_NO;
+/** \brief Record the press of an autoshiftable key
+ *
+ *  \return Whether the record should be further processed.
+ */
+static bool autoshift_press(uint16_t keycode, uint16_t now, keyrecord_t *record) {
+    if (!autoshift_flags.enabled) {
+        return true;
     }
+
+#    ifndef AUTO_SHIFT_MODIFIERS
+    if (get_mods() & (~MOD_BIT(KC_LSFT))) {
+        return true;
+    }
+#    endif
+#    ifdef AUTO_SHIFT_REPEAT
+    const uint16_t elapsed = TIMER_DIFF_16(now, autoshift_time);
+#        ifndef AUTO_SHIFT_NO_AUTO_REPEAT
+    if (!autoshift_flags.lastshifted) {
+#        endif
+        if (elapsed < TAPPING_TERM && keycode == autoshift_lastkey) {
+            // Allow a tap-then-hold for keyrepeat.
+            if (!autoshift_flags.lastshifted) {
+                register_code(autoshift_lastkey);
+            } else {
+                // Simulate pressing the shift key.
+                add_weak_mods(MOD_BIT(KC_LSFT));
+                register_code(autoshift_lastkey);
+            }
+            return false;
+        }
+#        ifndef AUTO_SHIFT_NO_AUTO_REPEAT
+    }
+#        endif
+#    endif
+
+    // Record the keycode so we can simulate it later.
+    autoshift_lastkey           = keycode;
+    autoshift_time              = now;
+    autoshift_flags.in_progress = true;
+
+#    if !defined(NO_ACTION_ONESHOT) && !defined(NO_ACTION_TAPPING)
+    clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED);
+#    endif
+    return false;
 }
 
-void autoshift_on(uint16_t keycode) {
-    autoshift_time    = timer_read();
-    autoshift_lastkey = keycode;
+/** \brief Registers an autoshiftable key under the right conditions
+ *
+ * If the autoshift delay has elapsed, register a shift and the key.
+ *
+ * If the autoshift key is released before the delay has elapsed, register the
+ * key without a shift.
+ */
+static void autoshift_end(uint16_t keycode, uint16_t now, bool matrix_trigger) {
+    // Called on key down with KC_NO, auto-shifted key up, and timeout.
+    if (autoshift_flags.in_progress) {
+        // Process the auto-shiftable key.
+        autoshift_flags.in_progress = false;
+
+        // Time since the initial press was recorded.
+        const uint16_t elapsed = TIMER_DIFF_16(now, autoshift_time);
+        if (elapsed < autoshift_timeout) {
+            register_code(autoshift_lastkey);
+            autoshift_flags.lastshifted = false;
+        } else {
+            // Simulate pressing the shift key.
+            add_weak_mods(MOD_BIT(KC_LSFT));
+            register_code(autoshift_lastkey);
+            autoshift_flags.lastshifted = true;
+#    if defined(AUTO_SHIFT_REPEAT) && !defined(AUTO_SHIFT_NO_AUTO_REPEAT)
+            if (matrix_trigger) {
+                // Prevents release.
+                return;
+            }
+#    endif
+        }
+
+#    if TAP_CODE_DELAY > 0
+        wait_ms(TAP_CODE_DELAY);
+#    endif
+        unregister_code(autoshift_lastkey);
+        del_weak_mods(MOD_BIT(KC_LSFT));
+    } else {
+        // Release after keyrepeat.
+        unregister_code(keycode);
+        if (keycode == autoshift_lastkey) {
+            // This will only fire when the key was the last auto-shiftable
+            // pressed. That prevents aaaaBBBB then releasing a from unshifting
+            // later Bs (if B wasn't auto-shiftable).
+            del_weak_mods(MOD_BIT(KC_LSFT));
+        }
+    }
+    send_keyboard_report();  // del_weak_mods doesn't send one.
+    // Roll the autoshift_time forward for detecting tap-and-hold.
+    autoshift_time = now;
+}
+
+/** \brief Simulates auto-shifted key releases when timeout is hit
+ *
+ *  Can be called from \c matrix_scan_user so that auto-shifted keys are sent
+ *  immediately after the timeout has expired, rather than waiting for the key
+ *  to be released.
+ */
+void autoshift_matrix_scan(void) {
+    if (autoshift_flags.in_progress) {
+        const uint16_t now     = timer_read();
+        const uint16_t elapsed = TIMER_DIFF_16(now, autoshift_time);
+        if (elapsed >= autoshift_timeout) {
+            autoshift_end(autoshift_lastkey, now, true);
+        }
+    }
 }
 
 void autoshift_toggle(void) {
-    if (autoshift_enabled) {
-        autoshift_enabled = false;
-        autoshift_flush();
-    } else {
-        autoshift_enabled = true;
-    }
+    autoshift_flags.enabled = !autoshift_flags.enabled;
+    del_weak_mods(MOD_BIT(KC_LSFT));
 }
 
-void autoshift_enable(void) { autoshift_enabled = true; }
+void autoshift_enable(void) { autoshift_flags.enabled = true; }
+
 void autoshift_disable(void) {
-    autoshift_enabled = false;
-    autoshift_flush();
+    autoshift_flags.enabled = false;
+    del_weak_mods(MOD_BIT(KC_LSFT));
 }
 
 #    ifndef AUTO_SHIFT_NO_SETUP
@@ -70,19 +171,30 @@ void autoshift_timer_report(void) {
 }
 #    endif
 
-bool get_autoshift_state(void) { return autoshift_enabled; }
+bool get_autoshift_state(void) { return autoshift_flags.enabled; }
 
 uint16_t get_autoshift_timeout(void) { return autoshift_timeout; }
 
 void set_autoshift_timeout(uint16_t timeout) { autoshift_timeout = timeout; }
 
 bool process_auto_shift(uint16_t keycode, keyrecord_t *record) {
+    // Note that record->event.time isn't reliable, see:
+    // https://github.com/qmk/qmk_firmware/pull/9826#issuecomment-733559550
+    const uint16_t now = timer_read();
+
     if (record->event.pressed) {
+        if (autoshift_flags.in_progress) {
+            // Evaluate previous key if there is one. Doing this elsewhere is
+            // more complicated and easier to break.
+            autoshift_end(KC_NO, now, false);
+        }
+        // For pressing another key while keyrepeating shifted autoshift.
+        del_weak_mods(MOD_BIT(KC_LSFT));
+
         switch (keycode) {
             case KC_ASTG:
                 autoshift_toggle();
                 return true;
-
             case KC_ASON:
                 autoshift_enable();
                 return true;
@@ -102,41 +214,28 @@ bool process_auto_shift(uint16_t keycode, keyrecord_t *record) {
                 autoshift_timer_report();
                 return true;
 #    endif
-#    ifndef NO_AUTO_SHIFT_ALPHA
-            case KC_A ... KC_Z:
-#    endif
-#    ifndef NO_AUTO_SHIFT_NUMERIC
-            case KC_1 ... KC_0:
-#    endif
-#    ifndef NO_AUTO_SHIFT_SPECIAL
-            case KC_TAB:
-            case KC_MINUS ... KC_SLASH:
-            case KC_NONUS_BSLASH:
-#    endif
-                autoshift_flush();
-                if (!autoshift_enabled) return true;
-
-#    ifndef AUTO_SHIFT_MODIFIERS
-                if (get_mods()) {
-                    return true;
-                }
-#    endif
-                autoshift_on(keycode);
-
-                // We need some extra handling here for OSL edge cases
-#    if !defined(NO_ACTION_ONESHOT) && !defined(NO_ACTION_TAPPING)
-                clear_oneshot_layer_state(ONESHOT_OTHER_KEY_PRESSED);
-#    endif
-                return false;
-
-            default:
-                autoshift_flush();
-                return true;
         }
-    } else {
-        autoshift_flush();
     }
 
+    switch (keycode) {
+#    ifndef NO_AUTO_SHIFT_ALPHA
+        case KC_A ... KC_Z:
+#    endif
+#    ifndef NO_AUTO_SHIFT_NUMERIC
+        case KC_1 ... KC_0:
+#    endif
+#    ifndef NO_AUTO_SHIFT_SPECIAL
+        case KC_TAB:
+        case KC_MINUS ... KC_SLASH:
+        case KC_NONUS_BSLASH:
+#    endif
+            if (record->event.pressed) {
+                return autoshift_press(keycode, now, record);
+            } else {
+                autoshift_end(keycode, now, false);
+                return false;
+            }
+    }
     return true;
 }
 
diff --git a/qmk/quantum/process_keycode/process_auto_shift.h b/qmk/quantum/process_keycode/process_auto_shift.h
index e86c4658..5b2718f1 100644
--- a/qmk/quantum/process_keycode/process_auto_shift.h
+++ b/qmk/quantum/process_keycode/process_auto_shift.h
@@ -30,3 +30,4 @@ void     autoshift_toggle(void);
 bool     get_autoshift_state(void);
 uint16_t get_autoshift_timeout(void);
 void     set_autoshift_timeout(uint16_t timeout);
+void     autoshift_matrix_scan(void);
diff --git a/qmk/quantum/process_keycode/process_joystick.c b/qmk/quantum/process_keycode/process_joystick.c
index 5778a743..3ffaf42b 100644
--- a/qmk/quantum/process_keycode/process_joystick.c
+++ b/qmk/quantum/process_keycode/process_joystick.c
@@ -129,17 +129,17 @@ bool process_joystick_analogread_quantum() {
         // test the converted value against the lower range
         int32_t ref        = joystick_axes[axis_index].mid_digit;
         int32_t range      = joystick_axes[axis_index].min_digit;
-        int32_t ranged_val = ((axis_val - ref) * -127) / (range - ref);
+        int32_t ranged_val = ((axis_val - ref) * -JOYSTICK_RESOLUTION) / (range - ref);
 
         if (ranged_val > 0) {
             // the value is in the higher range
             range      = joystick_axes[axis_index].max_digit;
-            ranged_val = ((axis_val - ref) * 127) / (range - ref);
+            ranged_val = ((axis_val - ref) * JOYSTICK_RESOLUTION) / (range - ref);
         }
 
         // clamp the result in the valid range
-        ranged_val = ranged_val < -127 ? -127 : ranged_val;
-        ranged_val = ranged_val > 127 ? 127 : ranged_val;
+        ranged_val = ranged_val < -JOYSTICK_RESOLUTION ? -JOYSTICK_RESOLUTION : ranged_val;
+        ranged_val = ranged_val > JOYSTICK_RESOLUTION ? JOYSTICK_RESOLUTION : ranged_val;
 
         if (ranged_val != joystick_status.axes[axis_index]) {
             joystick_status.axes[axis_index] = ranged_val;
diff --git a/qmk/quantum/process_keycode/process_key_lock.c b/qmk/quantum/process_keycode/process_key_lock.c
index 602127a7..4bd58f0c 100644
--- a/qmk/quantum/process_keycode/process_key_lock.c
+++ b/qmk/quantum/process_keycode/process_key_lock.c
@@ -14,8 +14,8 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "inttypes.h"
-#include "stdint.h"
+#include <inttypes.h>
+#include <stdint.h>
 #include "process_key_lock.h"
 
 #define BV_64(shift) (((uint64_t)1) << (shift))
diff --git a/qmk/quantum/process_keycode/process_midi.c b/qmk/quantum/process_keycode/process_midi.c
index e5257701..8e2fb955 100644
--- a/qmk/quantum/process_keycode/process_midi.c
+++ b/qmk/quantum/process_keycode/process_midi.c
@@ -41,12 +41,12 @@ static int8_t   midi_modulation_step;
 static uint16_t midi_modulation_timer;
 midi_config_t   midi_config;
 
-inline uint8_t compute_velocity(uint8_t setting) { return (setting + 1) * (128 / (MIDI_VELOCITY_MAX - MIDI_VELOCITY_MIN + 1)); }
+inline uint8_t compute_velocity(uint8_t setting) { return setting * (128 / (MIDI_VELOCITY_MAX - MIDI_VELOCITY_MIN)); }
 
 void midi_init(void) {
     midi_config.octave              = MI_OCT_2 - MIDI_OCTAVE_MIN;
     midi_config.transpose           = 0;
-    midi_config.velocity            = (MIDI_VELOCITY_MAX - MIDI_VELOCITY_MIN);
+    midi_config.velocity            = 127;
     midi_config.channel             = 0;
     midi_config.modulation_interval = 8;
 
@@ -66,7 +66,7 @@ bool process_midi(uint16_t keycode, keyrecord_t *record) {
         case MIDI_TONE_MIN ... MIDI_TONE_MAX: {
             uint8_t channel  = midi_config.channel;
             uint8_t tone     = keycode - MIDI_TONE_MIN;
-            uint8_t velocity = compute_velocity(midi_config.velocity);
+            uint8_t velocity = midi_config.velocity;
             if (record->event.pressed) {
                 if (tone_status[tone] == MIDI_INVALID_NOTE) {
                     uint8_t note = midi_compute_note(keycode);
@@ -124,19 +124,30 @@ bool process_midi(uint16_t keycode, keyrecord_t *record) {
             return false;
         case MIDI_VELOCITY_MIN ... MIDI_VELOCITY_MAX:
             if (record->event.pressed) {
-                midi_config.velocity = keycode - MIDI_VELOCITY_MIN;
+                midi_config.velocity = compute_velocity(keycode - MIDI_VELOCITY_MIN);
                 dprintf("midi velocity %d\n", midi_config.velocity);
             }
             return false;
         case MI_VELD:
             if (record->event.pressed && midi_config.velocity > 0) {
-                midi_config.velocity--;
+                if (midi_config.velocity == 127) {
+                    midi_config.velocity -= 10;
+                } else if (midi_config.velocity > 12) {
+                    midi_config.velocity -= 13;
+                } else {
+                    midi_config.velocity = 0;
+                }
+
                 dprintf("midi velocity %d\n", midi_config.velocity);
             }
             return false;
         case MI_VELU:
-            if (record->event.pressed) {
-                midi_config.velocity++;
+            if (record->event.pressed && midi_config.velocity < 127) {
+                if (midi_config.velocity < 115) {
+                    midi_config.velocity += 13;
+                } else {
+                    midi_config.velocity = 127;
+                }
                 dprintf("midi velocity %d\n", midi_config.velocity);
             }
             return false;
diff --git a/qmk/quantum/process_keycode/process_midi.h b/qmk/quantum/process_keycode/process_midi.h
index 0007b3ed..ef5661dd 100644
--- a/qmk/quantum/process_keycode/process_midi.h
+++ b/qmk/quantum/process_keycode/process_midi.h
@@ -35,7 +35,7 @@ typedef union {
     struct {
         uint8_t octave : 4;
         int8_t  transpose : 4;
-        uint8_t velocity : 4;
+        uint8_t velocity : 7;
         uint8_t channel : 4;
         uint8_t modulation_interval : 4;
     };
diff --git a/qmk/quantum/process_keycode/process_sequencer.c b/qmk/quantum/process_keycode/process_sequencer.c
new file mode 100644
index 00000000..334b4c00
--- /dev/null
+++ b/qmk/quantum/process_keycode/process_sequencer.c
@@ -0,0 +1,62 @@
+/* Copyright 2020 Rodolphe Belouin
+ *
+ * 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 "process_sequencer.h"
+
+bool process_sequencer(uint16_t keycode, keyrecord_t *record) {
+    if (record->event.pressed) {
+        switch (keycode) {
+            case SQ_ON:
+                sequencer_on();
+                return false;
+            case SQ_OFF:
+                sequencer_off();
+                return false;
+            case SQ_TOG:
+                sequencer_toggle();
+                return false;
+            case SQ_TMPD:
+                sequencer_decrease_tempo();
+                return false;
+            case SQ_TMPU:
+                sequencer_increase_tempo();
+                return false;
+            case SEQUENCER_RESOLUTION_MIN ... SEQUENCER_RESOLUTION_MAX:
+                sequencer_set_resolution(keycode - SEQUENCER_RESOLUTION_MIN);
+                return false;
+            case SQ_RESD:
+                sequencer_decrease_resolution();
+                return false;
+            case SQ_RESU:
+                sequencer_increase_resolution();
+                return false;
+            case SQ_SALL:
+                sequencer_set_all_steps_on();
+                return false;
+            case SQ_SCLR:
+                sequencer_set_all_steps_off();
+                return false;
+            case SEQUENCER_STEP_MIN ... SEQUENCER_STEP_MAX:
+                sequencer_toggle_step(keycode - SEQUENCER_STEP_MIN);
+                return false;
+            case SEQUENCER_TRACK_MIN ... SEQUENCER_TRACK_MAX:
+                sequencer_toggle_single_active_track(keycode - SEQUENCER_TRACK_MIN);
+                return false;
+        }
+    }
+
+    return true;
+}
diff --git a/qmk/quantum/process_keycode/process_sequencer.h b/qmk/quantum/process_keycode/process_sequencer.h
new file mode 100644
index 00000000..2b85f242
--- /dev/null
+++ b/qmk/quantum/process_keycode/process_sequencer.h
@@ -0,0 +1,21 @@
+/* Copyright 2020 Rodolphe Belouin
+ *
+ * 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"
+
+bool process_sequencer(uint16_t keycode, keyrecord_t *record);
diff --git a/qmk/quantum/quantum.c b/qmk/quantum/quantum.c
index dab6c917..3ac0ed87 100644
--- a/qmk/quantum/quantum.c
+++ b/qmk/quantum/quantum.c
@@ -23,7 +23,6 @@
 
 #ifdef BACKLIGHT_ENABLE
 #    include "backlight.h"
-extern backlight_config_t backlight_config;
 #endif
 
 #ifdef FAUXCLICKY_ENABLE
@@ -59,6 +58,10 @@ float bell_song[][2] = SONG(TERMINAL_SOUND);
 #    endif
 #endif
 
+#ifdef AUTO_SHIFT_ENABLE
+#    include "process_auto_shift.h"
+#endif
+
 static void do_code16(uint16_t code, void (*f)(uint8_t)) {
     switch (code) {
         case QK_MODS ... QK_MODS_MAX:
@@ -229,6 +232,9 @@ bool process_record_quantum(keyrecord_t *record) {
             process_record_via(keycode, record) &&
 #endif
             process_record_kb(keycode, record) &&
+#if defined(SEQUENCER_ENABLE)
+            process_sequencer(keycode, record) &&
+#endif
 #if defined(MIDI_ENABLE) && defined(MIDI_ADVANCED)
             process_midi(keycode, record) &&
 #endif
@@ -602,6 +608,10 @@ void matrix_init_quantum() {
     if (!eeconfig_is_enabled()) {
         eeconfig_init();
     }
+#if defined(LED_NUM_LOCK_PIN) || defined(LED_CAPS_LOCK_PIN) || defined(LED_SCROLL_LOCK_PIN) || defined(LED_COMPOSE_PIN) || defined(LED_KANA_PIN)
+    // TODO: remove calls to led_init_ports from keyboards and remove ifdef
+    led_init_ports();
+#endif
 #ifdef BACKLIGHT_ENABLE
 #    ifdef LED_MATRIX_ENABLE
     led_matrix_init();
@@ -633,6 +643,10 @@ void matrix_scan_quantum() {
     matrix_scan_music();
 #endif
 
+#ifdef SEQUENCER_ENABLE
+    matrix_scan_sequencer();
+#endif
+
 #ifdef TAP_DANCE_ENABLE
     matrix_scan_tap_dance();
 #endif
@@ -661,6 +675,10 @@ void matrix_scan_quantum() {
     dip_switch_read(false);
 #endif
 
+#ifdef AUTO_SHIFT_ENABLE
+    autoshift_matrix_scan();
+#endif
+
     matrix_scan_kb();
 }
 
@@ -725,55 +743,6 @@ void api_send_unicode(uint32_t unicode) {
 #endif
 }
 
-/** \brief Lock LED set callback - keymap/user level
- *
- * \deprecated Use led_update_user() instead.
- */
-__attribute__((weak)) void led_set_user(uint8_t usb_led) {}
-
-/** \brief Lock LED set callback - keyboard level
- *
- * \deprecated Use led_update_kb() instead.
- */
-__attribute__((weak)) void led_set_kb(uint8_t usb_led) { led_set_user(usb_led); }
-
-/** \brief Lock LED update callback - keymap/user level
- *
- * \return True if led_update_kb() should run its own code, false otherwise.
- */
-__attribute__((weak)) bool led_update_user(led_t led_state) { return true; }
-
-/** \brief Lock LED update callback - keyboard level
- *
- * \return Ignored for now.
- */
-__attribute__((weak)) bool led_update_kb(led_t led_state) { return led_update_user(led_state); }
-
-__attribute__((weak)) void led_init_ports(void) {}
-
-__attribute__((weak)) void led_set(uint8_t usb_led) {
-#if defined(BACKLIGHT_CAPS_LOCK) && defined(BACKLIGHT_ENABLE)
-    // Use backlight as Caps Lock indicator
-    uint8_t bl_toggle_lvl = 0;
-
-    if (IS_LED_ON(usb_led, USB_LED_CAPS_LOCK) && !backlight_config.enable) {
-        // Turning Caps Lock ON and backlight is disabled in config
-        // Toggling backlight to the brightest level
-        bl_toggle_lvl = BACKLIGHT_LEVELS;
-    } else if (IS_LED_OFF(usb_led, USB_LED_CAPS_LOCK) && backlight_config.enable) {
-        // Turning Caps Lock OFF and backlight is enabled in config
-        // Toggling backlight and restoring config level
-        bl_toggle_lvl = backlight_config.level;
-    }
-
-    // Set level without modify backlight_config to keep ability to restore state
-    backlight_set(bl_toggle_lvl);
-#endif
-
-    led_set_kb(usb_led);
-    led_update_kb((led_t)usb_led);
-}
-
 //------------------------------------------------------------------------------
 // Override these functions in your keymap file to play different tunes on
 // different events such as startup and bootloader jump
@@ -781,5 +750,3 @@ __attribute__((weak)) void led_set(uint8_t usb_led) {
 __attribute__((weak)) void startup_user() {}
 
 __attribute__((weak)) void shutdown_user() {}
-
-//------------------------------------------------------------------------------
diff --git a/qmk/quantum/quantum.h b/qmk/quantum/quantum.h
index a2c0ec9a..3e09df4f 100644
--- a/qmk/quantum/quantum.h
+++ b/qmk/quantum/quantum.h
@@ -21,7 +21,7 @@
 #    include <avr/interrupt.h>
 #endif
 #if defined(PROTOCOL_CHIBIOS)
-#    include "hal.h"
+#    include <hal.h>
 #    include "chibios_config.h"
 #endif
 
@@ -31,7 +31,7 @@
 
 #ifdef BACKLIGHT_ENABLE
 #    ifdef LED_MATRIX_ENABLE
-#        include "ledmatrix.h"
+#        include "led_matrix.h"
 #    else
 #        include "backlight.h"
 #    endif
@@ -68,6 +68,11 @@ extern layer_state_t default_layer_state;
 extern layer_state_t layer_state;
 #endif
 
+#if defined(SEQUENCER_ENABLE)
+#    include "sequencer.h"
+#    include "process_sequencer.h"
+#endif
+
 #if defined(MIDI_ENABLE) && defined(MIDI_ADVANCED)
 #    include "process_midi.h"
 #endif
@@ -213,13 +218,68 @@ typedef ioline_t pin_t;
 
 #    define writePinHigh(pin) palSetLine(pin)
 #    define writePinLow(pin) palClearLine(pin)
-#    define writePin(pin, level) ((level) ? writePinHigh(pin) : writePinLow(pin))
+#    define writePin(pin, level) ((level) ? (writePinHigh(pin)) : (writePinLow(pin)))
 
 #    define readPin(pin) palReadLine(pin)
 
 #    define togglePin(pin) palToggleLine(pin)
 #endif
 
+// Atomic macro to help make GPIO and other controls atomic.
+#ifdef IGNORE_ATOMIC_BLOCK
+/* do nothing atomic macro */
+#    define ATOMIC_BLOCK for (uint8_t __ToDo = 1; __ToDo; __ToDo = 0)
+#    define ATOMIC_BLOCK_RESTORESTATE ATOMIC_BLOCK
+#    define ATOMIC_BLOCK_FORCEON ATOMIC_BLOCK
+
+#elif defined(__AVR__)
+/* atomic macro for AVR */
+#    include <util/atomic.h>
+
+#    define ATOMIC_BLOCK_RESTORESTATE ATOMIC_BLOCK(ATOMIC_RESTORESTATE)
+#    define ATOMIC_BLOCK_FORCEON ATOMIC_BLOCK(ATOMIC_FORCEON)
+
+#elif defined(PROTOCOL_CHIBIOS) || defined(PROTOCOL_ARM_ATSAM)
+/* atomic macro for ChibiOS / ARM ATSAM */
+#    if defined(PROTOCOL_ARM_ATSAM)
+#        include "arm_atsam_protocol.h"
+#    endif
+
+static __inline__ uint8_t __interrupt_disable__(void) {
+#    if defined(PROTOCOL_CHIBIOS)
+    chSysLock();
+#    endif
+#    if defined(PROTOCOL_ARM_ATSAM)
+    __disable_irq();
+#    endif
+    return 1;
+}
+
+static __inline__ void __interrupt_enable__(const uint8_t *__s) {
+#    if defined(PROTOCOL_CHIBIOS)
+    chSysUnlock();
+#    endif
+#    if defined(PROTOCOL_ARM_ATSAM)
+    __enable_irq();
+#    endif
+    __asm__ volatile("" ::: "memory");
+    (void)__s;
+}
+
+#    define ATOMIC_BLOCK(type) for (type, __ToDo = __interrupt_disable__(); __ToDo; __ToDo = 0)
+#    define ATOMIC_FORCEON uint8_t sreg_save __attribute__((__cleanup__(__interrupt_enable__))) = 0
+
+#    define ATOMIC_BLOCK_RESTORESTATE _Static_assert(0, "ATOMIC_BLOCK_RESTORESTATE dose not implement")
+#    define ATOMIC_BLOCK_FORCEON ATOMIC_BLOCK(ATOMIC_FORCEON)
+
+/* Other platform */
+#else
+
+#    define ATOMIC_BLOCK_RESTORESTATE _Static_assert(0, "ATOMIC_BLOCK_RESTORESTATE dose not implement")
+#    define ATOMIC_BLOCK_FORCEON _Static_assert(0, "ATOMIC_BLOCK_FORCEON dose not implement")
+
+#endif
+
 #define SEND_STRING(string) send_string_P(PSTR(string))
 #define SEND_STRING_DELAY(string, interval) send_string_with_delay_P(PSTR(string), interval)
 
diff --git a/qmk/quantum/quantum_keycodes.h b/qmk/quantum/quantum_keycodes.h
index a0a7bc34..a2cc7b38 100644
--- a/qmk/quantum/quantum_keycodes.h
+++ b/qmk/quantum/quantum_keycodes.h
@@ -16,6 +16,10 @@
 #ifndef QUANTUM_KEYCODES_H
 #define QUANTUM_KEYCODES_H
 
+#if defined(SEQUENCER_ENABLE)
+#    include "sequencer.h"
+#endif
+
 #ifndef MIDI_ENABLE_STRICT
 #    define MIDI_ENABLE_STRICT 0
 #endif
@@ -343,7 +347,8 @@ enum quantum_keycodes {
     MI_TRNSU,  // transpose up
 
     MIDI_VELOCITY_MIN,
-    MI_VEL_1 = MIDI_VELOCITY_MIN,
+    MI_VEL_0 = MIDI_VELOCITY_MIN,
+    MI_VEL_1,
     MI_VEL_2,
     MI_VEL_3,
     MI_VEL_4,
@@ -549,6 +554,37 @@ enum quantum_keycodes {
     JS_BUTTON31,
     JS_BUTTON_MAX = JS_BUTTON31,
 
+#if defined(SEQUENCER_ENABLE)
+    SQ_ON,
+    SQ_OFF,
+    SQ_TOG,
+
+    SQ_TMPD,  // Decrease tempo
+    SQ_TMPU,  // Increase tempo
+
+    SEQUENCER_RESOLUTION_MIN,
+    SEQUENCER_RESOLUTION_MAX = SEQUENCER_RESOLUTION_MIN + SEQUENCER_RESOLUTIONS,
+    SQ_RESD,  // Decrease resolution
+    SQ_RESU,  // Increase resolution
+
+    SQ_SALL,  // All steps on
+    SQ_SCLR,  // All steps off
+    SEQUENCER_STEP_MIN,
+    SEQUENCER_STEP_MAX = SEQUENCER_STEP_MIN + SEQUENCER_STEPS,
+
+    SEQUENCER_TRACK_MIN,
+    SEQUENCER_TRACK_MAX = SEQUENCER_TRACK_MIN + SEQUENCER_TRACKS,
+
+/**
+ * Helpers to assign a keycode to a step, a resolution, or a track.
+ * Falls back to NOOP if n is out of range.
+ */
+#    define SQ_S(n) (n < SEQUENCER_STEPS ? SEQUENCER_STEP_MIN + n : XXXXXXX)
+#    define SQ_R(n) (n < SEQUENCER_RESOLUTIONS ? SEQUENCER_RESOLUTION_MIN + n : XXXXXXX)
+#    define SQ_T(n) (n < SEQUENCER_TRACKS ? SEQUENCER_TRACK_MIN + n : XXXXXXX)
+
+#endif
+
     // always leave at the end
     SAFE_RANGE
 };
diff --git a/qmk/quantum/rgb_matrix.c b/qmk/quantum/rgb_matrix.c
index 802c5afc..c756857a 100644
--- a/qmk/quantum/rgb_matrix.c
+++ b/qmk/quantum/rgb_matrix.c
@@ -23,7 +23,7 @@
 #include <string.h>
 #include <math.h>
 
-#include "lib/lib8tion/lib8tion.h"
+#include <lib/lib8tion/lib8tion.h>
 
 #ifndef RGB_MATRIX_CENTER
 const point_t k_rgb_matrix_center = {112, 32};
@@ -31,6 +31,8 @@ const point_t k_rgb_matrix_center = {112, 32};
 const point_t k_rgb_matrix_center = RGB_MATRIX_CENTER;
 #endif
 
+__attribute__((weak)) RGB rgb_matrix_hsv_to_rgb(HSV hsv) { return hsv_to_rgb(hsv); }
+
 // Generic effect runners
 #include "rgb_matrix_runners/effect_runner_dx_dy_dist.h"
 #include "rgb_matrix_runners/effect_runner_dx_dy.h"
@@ -401,6 +403,10 @@ void rgb_matrix_task(void) {
             break;
         case RENDERING:
             rgb_task_render(effect);
+            if (!suspend_backlight) {
+                rgb_matrix_indicators();
+                rgb_matrix_indicators_advanced(&rgb_effect_params);
+            }
             break;
         case FLUSHING:
             rgb_task_flush(effect);
@@ -409,10 +415,6 @@ void rgb_matrix_task(void) {
             rgb_task_sync();
             break;
     }
-
-    if (!suspend_backlight) {
-        rgb_matrix_indicators();
-    }
 }
 
 void rgb_matrix_indicators(void) {
@@ -424,6 +426,28 @@ __attribute__((weak)) void rgb_matrix_indicators_kb(void) {}
 
 __attribute__((weak)) void rgb_matrix_indicators_user(void) {}
 
+void rgb_matrix_indicators_advanced(effect_params_t *params) {
+    /* special handling is needed for "params->iter", since it's already been incremented.
+     * Could move the invocations to rgb_task_render, but then it's missing a few checks
+     * and not sure which would be better. Otherwise, this should be called from
+     * rgb_task_render, right before the iter++ line.
+     */
+#if defined(RGB_MATRIX_LED_PROCESS_LIMIT) && RGB_MATRIX_LED_PROCESS_LIMIT > 0 && RGB_MATRIX_LED_PROCESS_LIMIT < DRIVER_LED_TOTAL
+    uint8_t min = RGB_MATRIX_LED_PROCESS_LIMIT * (params->iter - 1);
+    uint8_t max = min + RGB_MATRIX_LED_PROCESS_LIMIT;
+    if (max > DRIVER_LED_TOTAL) max = DRIVER_LED_TOTAL;
+#else
+    uint8_t min = 0;
+    uint8_t max = DRIVER_LED_TOTAL;
+#endif
+    rgb_matrix_indicators_advanced_kb(min, max);
+    rgb_matrix_indicators_advanced_user(min, max);
+}
+
+__attribute__((weak)) void rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max) {}
+
+__attribute__((weak)) void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) {}
+
 void rgb_matrix_init(void) {
     rgb_matrix_driver.init();
 
diff --git a/qmk/quantum/rgb_matrix.h b/qmk/quantum/rgb_matrix.h
index 73333334..1fd016d7 100644
--- a/qmk/quantum/rgb_matrix.h
+++ b/qmk/quantum/rgb_matrix.h
@@ -57,6 +57,11 @@
         uint8_t max = DRIVER_LED_TOTAL;
 #endif
 
+#define RGB_MATRIX_INDICATOR_SET_COLOR(i, r, g, b) \
+    if (i >= led_min && i <= led_max) {            \
+        rgb_matrix_set_color(i, r, g, b);          \
+    }
+
 #define RGB_MATRIX_TEST_LED_FLAGS() \
     if (!HAS_ANY_FLAGS(g_led_config.flags[i], params->flags)) continue
 
@@ -86,6 +91,7 @@ enum rgb_matrix_effects {
 };
 
 void eeconfig_update_rgb_matrix_default(void);
+void eeconfig_update_rgb_matrix(void);
 
 uint8_t rgb_matrix_map_row_column_to_led_kb(uint8_t row, uint8_t column, uint8_t *led_i);
 uint8_t rgb_matrix_map_row_column_to_led(uint8_t row, uint8_t column, uint8_t *led_i);
@@ -103,6 +109,10 @@ void rgb_matrix_indicators(void);
 void rgb_matrix_indicators_kb(void);
 void rgb_matrix_indicators_user(void);
 
+void rgb_matrix_indicators_advanced(effect_params_t *params);
+void rgb_matrix_indicators_advanced_kb(uint8_t led_min, uint8_t led_max);
+void rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max);
+
 void rgb_matrix_init(void);
 
 void        rgb_matrix_set_suspend_state(bool state);
@@ -150,6 +160,7 @@ led_flags_t rgb_matrix_get_flags(void);
 void        rgb_matrix_set_flags(led_flags_t flags);
 
 #ifndef RGBLIGHT_ENABLE
+#    define eeconfig_update_rgblight_current eeconfig_update_rgb_matrix
 #    define rgblight_toggle rgb_matrix_toggle
 #    define rgblight_toggle_noeeprom rgb_matrix_toggle_noeeprom
 #    define rgblight_enable rgb_matrix_enable
diff --git a/qmk/quantum/rgb_matrix_animations/alpha_mods_anim.h b/qmk/quantum/rgb_matrix_animations/alpha_mods_anim.h
index 0778ab20..426d88ef 100644
--- a/qmk/quantum/rgb_matrix_animations/alpha_mods_anim.h
+++ b/qmk/quantum/rgb_matrix_animations/alpha_mods_anim.h
@@ -7,9 +7,9 @@ bool ALPHAS_MODS(effect_params_t* params) {
     RGB_MATRIX_USE_LIMITS(led_min, led_max);
 
     HSV hsv  = rgb_matrix_config.hsv;
-    RGB rgb1 = hsv_to_rgb(hsv);
+    RGB rgb1 = rgb_matrix_hsv_to_rgb(hsv);
     hsv.h += rgb_matrix_config.speed;
-    RGB rgb2 = hsv_to_rgb(hsv);
+    RGB rgb2 = rgb_matrix_hsv_to_rgb(hsv);
 
     for (uint8_t i = led_min; i < led_max; i++) {
         RGB_MATRIX_TEST_LED_FLAGS();
diff --git a/qmk/quantum/rgb_matrix_animations/breathing_anim.h b/qmk/quantum/rgb_matrix_animations/breathing_anim.h
index 887425f9..340bd93e 100644
--- a/qmk/quantum/rgb_matrix_animations/breathing_anim.h
+++ b/qmk/quantum/rgb_matrix_animations/breathing_anim.h
@@ -8,7 +8,7 @@ bool BREATHING(effect_params_t* params) {
     HSV      hsv  = rgb_matrix_config.hsv;
     uint16_t time = scale16by8(g_rgb_timer, rgb_matrix_config.speed / 8);
     hsv.v         = scale8(abs8(sin8(time) - 128) * 2, hsv.v);
-    RGB rgb       = hsv_to_rgb(hsv);
+    RGB rgb       = rgb_matrix_hsv_to_rgb(hsv);
     for (uint8_t i = led_min; i < led_max; i++) {
         RGB_MATRIX_TEST_LED_FLAGS();
         rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
diff --git a/qmk/quantum/rgb_matrix_animations/gradient_left_right_anim.h b/qmk/quantum/rgb_matrix_animations/gradient_left_right_anim.h
index 2eab2eb7..53dfd04e 100644
--- a/qmk/quantum/rgb_matrix_animations/gradient_left_right_anim.h
+++ b/qmk/quantum/rgb_matrix_animations/gradient_left_right_anim.h
@@ -12,7 +12,7 @@ bool GRADIENT_LEFT_RIGHT(effect_params_t* params) {
         // The x range will be 0..224, map this to 0..7
         // Relies on hue being 8-bit and wrapping
         hsv.h   = rgb_matrix_config.hsv.h + (scale * g_led_config.point[i].x >> 5);
-        RGB rgb = hsv_to_rgb(hsv);
+        RGB rgb = rgb_matrix_hsv_to_rgb(hsv);
         rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
     }
     return led_max < DRIVER_LED_TOTAL;
diff --git a/qmk/quantum/rgb_matrix_animations/gradient_up_down_anim.h b/qmk/quantum/rgb_matrix_animations/gradient_up_down_anim.h
index 0f1f8e23..7e0d2898 100644
--- a/qmk/quantum/rgb_matrix_animations/gradient_up_down_anim.h
+++ b/qmk/quantum/rgb_matrix_animations/gradient_up_down_anim.h
@@ -12,7 +12,7 @@ bool GRADIENT_UP_DOWN(effect_params_t* params) {
         // The y range will be 0..64, map this to 0..4
         // Relies on hue being 8-bit and wrapping
         hsv.h   = rgb_matrix_config.hsv.h + scale * (g_led_config.point[i].y >> 4);
-        RGB rgb = hsv_to_rgb(hsv);
+        RGB rgb = rgb_matrix_hsv_to_rgb(hsv);
         rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
     }
     return led_max < DRIVER_LED_TOTAL;
diff --git a/qmk/quantum/rgb_matrix_animations/jellybean_raindrops_anim.h b/qmk/quantum/rgb_matrix_animations/jellybean_raindrops_anim.h
index ef2d1500..9493b385 100644
--- a/qmk/quantum/rgb_matrix_animations/jellybean_raindrops_anim.h
+++ b/qmk/quantum/rgb_matrix_animations/jellybean_raindrops_anim.h
@@ -5,7 +5,7 @@ RGB_MATRIX_EFFECT(JELLYBEAN_RAINDROPS)
 static void jellybean_raindrops_set_color(int i, effect_params_t* params) {
     if (!HAS_ANY_FLAGS(g_led_config.flags[i], params->flags)) return;
     HSV hsv = {rand() & 0xFF, rand() & 0xFF, rgb_matrix_config.hsv.v};
-    RGB rgb = hsv_to_rgb(hsv);
+    RGB rgb = rgb_matrix_hsv_to_rgb(hsv);
     rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
 }
 
diff --git a/qmk/quantum/rgb_matrix_animations/raindrops_anim.h b/qmk/quantum/rgb_matrix_animations/raindrops_anim.h
index 6e1b5acb..38359cdc 100644
--- a/qmk/quantum/rgb_matrix_animations/raindrops_anim.h
+++ b/qmk/quantum/rgb_matrix_animations/raindrops_anim.h
@@ -15,7 +15,7 @@ static void raindrops_set_color(int i, effect_params_t* params) {
     }
 
     hsv.h   = rgb_matrix_config.hsv.h + (deltaH * (rand() & 0x03));
-    RGB rgb = hsv_to_rgb(hsv);
+    RGB rgb = rgb_matrix_hsv_to_rgb(hsv);
     rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
 }
 
diff --git a/qmk/quantum/rgb_matrix_animations/solid_color_anim.h b/qmk/quantum/rgb_matrix_animations/solid_color_anim.h
index c8f5e70e..79d63cf1 100644
--- a/qmk/quantum/rgb_matrix_animations/solid_color_anim.h
+++ b/qmk/quantum/rgb_matrix_animations/solid_color_anim.h
@@ -4,7 +4,7 @@ RGB_MATRIX_EFFECT(SOLID_COLOR)
 bool SOLID_COLOR(effect_params_t* params) {
     RGB_MATRIX_USE_LIMITS(led_min, led_max);
 
-    RGB rgb = hsv_to_rgb(rgb_matrix_config.hsv);
+    RGB rgb = rgb_matrix_hsv_to_rgb(rgb_matrix_config.hsv);
     for (uint8_t i = led_min; i < led_max; i++) {
         RGB_MATRIX_TEST_LED_FLAGS();
         rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
diff --git a/qmk/quantum/rgb_matrix_animations/typing_heatmap_anim.h b/qmk/quantum/rgb_matrix_animations/typing_heatmap_anim.h
index e82c1b49..b855fdc1 100644
--- a/qmk/quantum/rgb_matrix_animations/typing_heatmap_anim.h
+++ b/qmk/quantum/rgb_matrix_animations/typing_heatmap_anim.h
@@ -51,7 +51,7 @@ bool TYPING_HEATMAP(effect_params_t* params) {
             if (!HAS_ANY_FLAGS(g_led_config.flags[led[j]], params->flags)) continue;
 
             HSV hsv = {170 - qsub8(val, 85), rgb_matrix_config.hsv.s, scale8((qadd8(170, val) - 170) * 3, rgb_matrix_config.hsv.v)};
-            RGB rgb = hsv_to_rgb(hsv);
+            RGB rgb = rgb_matrix_hsv_to_rgb(hsv);
             rgb_matrix_set_color(led[j], rgb.r, rgb.g, rgb.b);
         }
 
diff --git a/qmk/quantum/rgb_matrix_drivers.c b/qmk/quantum/rgb_matrix_drivers.c
index 0685a347..2978e7be 100644
--- a/qmk/quantum/rgb_matrix_drivers.c
+++ b/qmk/quantum/rgb_matrix_drivers.c
@@ -34,6 +34,12 @@ static void init(void) {
 #        ifdef DRIVER_ADDR_2
     IS31FL3731_init(DRIVER_ADDR_2);
 #        endif
+#        ifdef DRIVER_ADDR_3
+    IS31FL3731_init(DRIVER_ADDR_3);
+#        endif
+#        ifdef DRIVER_ADDR_4
+    IS31FL3731_init(DRIVER_ADDR_4);
+#        endif
 #    elif defined(IS31FL3733)
     IS31FL3733_init(DRIVER_ADDR_1, 0);
 #    elif defined(IS31FL3737)
@@ -60,6 +66,12 @@ static void init(void) {
 #        ifdef DRIVER_ADDR_2
     IS31FL3731_update_led_control_registers(DRIVER_ADDR_2, 1);
 #        endif
+#        ifdef DRIVER_ADDR_3
+    IS31FL3731_update_led_control_registers(DRIVER_ADDR_3, 2);
+#        endif
+#        ifdef DRIVER_ADDR_4
+    IS31FL3731_update_led_control_registers(DRIVER_ADDR_4, 3);
+#        endif
 #    elif defined(IS31FL3733)
     IS31FL3733_update_led_control_registers(DRIVER_ADDR_1, 0);
     IS31FL3733_update_led_control_registers(DRIVER_ADDR_2, 1);
@@ -76,6 +88,12 @@ static void flush(void) {
 #        ifdef DRIVER_ADDR_2
     IS31FL3731_update_pwm_buffers(DRIVER_ADDR_2, 1);
 #        endif
+#        ifdef DRIVER_ADDR_3
+    IS31FL3731_update_pwm_buffers(DRIVER_ADDR_3, 2);
+#        endif
+#        ifdef DRIVER_ADDR_4
+    IS31FL3731_update_pwm_buffers(DRIVER_ADDR_4, 3);
+#        endif
 }
 
 const rgb_matrix_driver_t rgb_matrix_driver = {
diff --git a/qmk/quantum/rgb_matrix_runners/effect_runner_dx_dy.h b/qmk/quantum/rgb_matrix_runners/effect_runner_dx_dy.h
index 9d0c9fab..4867609c 100644
--- a/qmk/quantum/rgb_matrix_runners/effect_runner_dx_dy.h
+++ b/qmk/quantum/rgb_matrix_runners/effect_runner_dx_dy.h
@@ -10,7 +10,7 @@ bool effect_runner_dx_dy(effect_params_t* params, dx_dy_f effect_func) {
         RGB_MATRIX_TEST_LED_FLAGS();
         int16_t dx  = g_led_config.point[i].x - k_rgb_matrix_center.x;
         int16_t dy  = g_led_config.point[i].y - k_rgb_matrix_center.y;
-        RGB     rgb = hsv_to_rgb(effect_func(rgb_matrix_config.hsv, dx, dy, time));
+        RGB     rgb = rgb_matrix_hsv_to_rgb(effect_func(rgb_matrix_config.hsv, dx, dy, time));
         rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
     }
     return led_max < DRIVER_LED_TOTAL;
diff --git a/qmk/quantum/rgb_matrix_runners/effect_runner_dx_dy_dist.h b/qmk/quantum/rgb_matrix_runners/effect_runner_dx_dy_dist.h
index 2824c825..9545b418 100644
--- a/qmk/quantum/rgb_matrix_runners/effect_runner_dx_dy_dist.h
+++ b/qmk/quantum/rgb_matrix_runners/effect_runner_dx_dy_dist.h
@@ -11,7 +11,7 @@ bool effect_runner_dx_dy_dist(effect_params_t* params, dx_dy_dist_f effect_func)
         int16_t dx   = g_led_config.point[i].x - k_rgb_matrix_center.x;
         int16_t dy   = g_led_config.point[i].y - k_rgb_matrix_center.y;
         uint8_t dist = sqrt16(dx * dx + dy * dy);
-        RGB     rgb  = hsv_to_rgb(effect_func(rgb_matrix_config.hsv, dx, dy, dist, time));
+        RGB     rgb  = rgb_matrix_hsv_to_rgb(effect_func(rgb_matrix_config.hsv, dx, dy, dist, time));
         rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
     }
     return led_max < DRIVER_LED_TOTAL;
diff --git a/qmk/quantum/rgb_matrix_runners/effect_runner_i.h b/qmk/quantum/rgb_matrix_runners/effect_runner_i.h
index 5e6bf5da..95bfe8b3 100644
--- a/qmk/quantum/rgb_matrix_runners/effect_runner_i.h
+++ b/qmk/quantum/rgb_matrix_runners/effect_runner_i.h
@@ -8,7 +8,7 @@ bool effect_runner_i(effect_params_t* params, i_f effect_func) {
     uint8_t time = scale16by8(g_rgb_timer, rgb_matrix_config.speed / 4);
     for (uint8_t i = led_min; i < led_max; i++) {
         RGB_MATRIX_TEST_LED_FLAGS();
-        RGB rgb = hsv_to_rgb(effect_func(rgb_matrix_config.hsv, i, time));
+        RGB rgb = rgb_matrix_hsv_to_rgb(effect_func(rgb_matrix_config.hsv, i, time));
         rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
     }
     return led_max < DRIVER_LED_TOTAL;
diff --git a/qmk/quantum/rgb_matrix_runners/effect_runner_reactive.h b/qmk/quantum/rgb_matrix_runners/effect_runner_reactive.h
index 53e77e3f..8485b61f 100644
--- a/qmk/quantum/rgb_matrix_runners/effect_runner_reactive.h
+++ b/qmk/quantum/rgb_matrix_runners/effect_runner_reactive.h
@@ -20,7 +20,7 @@ bool effect_runner_reactive(effect_params_t* params, reactive_f effect_func) {
         }
 
         uint16_t offset = scale16by8(tick, rgb_matrix_config.speed);
-        RGB      rgb    = hsv_to_rgb(effect_func(rgb_matrix_config.hsv, offset));
+        RGB      rgb    = rgb_matrix_hsv_to_rgb(effect_func(rgb_matrix_config.hsv, offset));
         rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
     }
     return led_max < DRIVER_LED_TOTAL;
diff --git a/qmk/quantum/rgb_matrix_runners/effect_runner_reactive_splash.h b/qmk/quantum/rgb_matrix_runners/effect_runner_reactive_splash.h
index b5d284a4..5c69d0fb 100644
--- a/qmk/quantum/rgb_matrix_runners/effect_runner_reactive_splash.h
+++ b/qmk/quantum/rgb_matrix_runners/effect_runner_reactive_splash.h
@@ -20,7 +20,7 @@ bool effect_runner_reactive_splash(uint8_t start, effect_params_t* params, react
             hsv           = effect_func(hsv, dx, dy, dist, tick);
         }
         hsv.v   = scale8(hsv.v, rgb_matrix_config.hsv.v);
-        RGB rgb = hsv_to_rgb(hsv);
+        RGB rgb = rgb_matrix_hsv_to_rgb(hsv);
         rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
     }
     return led_max < DRIVER_LED_TOTAL;
diff --git a/qmk/quantum/rgb_matrix_runners/effect_runner_sin_cos_i.h b/qmk/quantum/rgb_matrix_runners/effect_runner_sin_cos_i.h
index 3fb7d480..02351de5 100644
--- a/qmk/quantum/rgb_matrix_runners/effect_runner_sin_cos_i.h
+++ b/qmk/quantum/rgb_matrix_runners/effect_runner_sin_cos_i.h
@@ -10,7 +10,7 @@ bool effect_runner_sin_cos_i(effect_params_t* params, sin_cos_i_f effect_func) {
     int8_t   sin_value = sin8(time) - 128;
     for (uint8_t i = led_min; i < led_max; i++) {
         RGB_MATRIX_TEST_LED_FLAGS();
-        RGB rgb = hsv_to_rgb(effect_func(rgb_matrix_config.hsv, cos_value, sin_value, i, time));
+        RGB rgb = rgb_matrix_hsv_to_rgb(effect_func(rgb_matrix_config.hsv, cos_value, sin_value, i, time));
         rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
     }
     return led_max < DRIVER_LED_TOTAL;
diff --git a/qmk/quantum/rgblight.c b/qmk/quantum/rgblight.c
index 76bb6eb8..db725301 100644
--- a/qmk/quantum/rgblight.c
+++ b/qmk/quantum/rgblight.c
@@ -24,7 +24,7 @@
 #    include "eeprom.h"
 #endif
 #ifdef STM32_EEPROM_ENABLE
-#    include "hal.h"
+#    include <hal.h>
 #    include "eeprom_stm32.h"
 #endif
 #include "wait.h"
@@ -34,7 +34,7 @@
 #include "color.h"
 #include "debug.h"
 #include "led_tables.h"
-#include "lib/lib8tion/lib8tion.h"
+#include <lib/lib8tion/lib8tion.h>
 #ifdef VELOCIKEY_ENABLE
 #    include "velocikey.h"
 #endif
@@ -123,9 +123,11 @@ void rgblight_set_effect_range(uint8_t start_pos, uint8_t num_leds) {
     rgblight_ranges.effect_num_leds  = num_leds;
 }
 
+__attribute__((weak)) RGB rgblight_hsv_to_rgb(HSV hsv) { return hsv_to_rgb(hsv); }
+
 void sethsv_raw(uint8_t hue, uint8_t sat, uint8_t val, LED_TYPE *led1) {
     HSV hsv = {hue, sat, val};
-    RGB rgb = hsv_to_rgb(hsv);
+    RGB rgb = rgblight_hsv_to_rgb(hsv);
     setrgb(rgb.r, rgb.g, rgb.b, led1);
 }
 
diff --git a/qmk/quantum/rgblight_breathe_table.h b/qmk/quantum/rgblight_breathe_table.h
index a438332b..30245318 100644
--- a/qmk/quantum/rgblight_breathe_table.h
+++ b/qmk/quantum/rgblight_breathe_table.h
@@ -1,468 +1,117 @@
-#ifndef RGBLIGHT_EFFECT_BREATHE_TABLE
+#pragma once
+
 #define RGBLIGHT_EFFECT_BREATHE_TABLE
 
-const uint8_t rgblight_effect_breathe_table[] PROGMEM = {
-/* #define RGBLIGHT_EFFECT_BREATHE_CENTER   1.85 */
-/* #define RGBLIGHT_EFFECT_BREATHE_MAX      255 */
+// clang-format off
 
+// Breathing center: 1.85
+// Breathing max:    255
+
+const uint8_t PROGMEM rgblight_effect_breathe_table[] = {
 #if RGBLIGHT_BREATHE_TABLE_SIZE == 256
-    0x22,
-    0x23,
-    0x25,
-    0x26,
-    0x28,
-    0x29,
-    0x2a,
-    0x2c,
-    0x2d,
-    0x2f,
-    0x30,
-    0x32,
-    0x33,
-    0x35,
-    0x36,
-    0x38,
-    0x3a,
-    0x3b,
-    0x3d,
-    0x3e,
-    0x40,
-    0x42,
-    0x43,
-    0x45,
-    0x47,
-    0x49,
-    0x4a,
-    0x4c,
-    0x4e,
-    0x50,
-    0x51,
-    0x53,
-    0x55,
-    0x57,
-    0x59,
-    0x5a,
-    0x5c,
-    0x5e,
-    0x60,
-    0x62,
-    0x64,
-    0x66,
-    0x68,
-    0x69,
-    0x6b,
-    0x6d,
-    0x6f,
-    0x71,
-    0x73,
-    0x75,
-    0x77,
-    0x79,
-    0x7b,
-    0x7d,
-    0x7f,
-    0x81,
-    0x83,
-    0x85,
-    0x87,
-    0x89,
-    0x8a,
-    0x8c,
-    0x8e,
-    0x90,
-    0x92,
-    0x94,
-    0x96,
-    0x98,
-    0x9a,
-    0x9c,
-    0x9e,
-    0x9f,
-    0xa1,
-    0xa3,
-    0xa5,
-    0xa7,
-    0xa8,
-    0xaa,
-    0xac,
-    0xae,
-    0xaf,
-    0xb1,
-    0xb3,
-    0xb4,
-    0xb6,
-    0xb8,
-    0xb9,
-    0xbb,
-    0xbc,
-    0xbe,
-    0xbf,
-    0xc1,
-    0xc2,
-    0xc3,
-    0xc5,
-    0xc6,
-    0xc7,
-    0xc9,
-    0xca,
-    0xcb,
-    0xcc,
-    0xcd,
-    0xce,
-    0xd0,
-    0xd1,
-    0xd2,
-    0xd2,
-    0xd3,
-    0xd4,
-    0xd5,
-    0xd6,
-    0xd7,
-    0xd7,
-    0xd8,
-    0xd9,
-    0xd9,
-    0xda,
-    0xda,
-    0xdb,
-    0xdb,
-    0xdb,
-    0xdc,
-    0xdc,
-    0xdc,
-    0xdc,
-    0xdc,
-    0xdd,
-    0xdd,
-    0xdd,
-    0xdd,
-    0xdc,
-    0xdc,
-    0xdc,
-    0xdc,
-    0xdc,
-    0xdb,
-    0xdb,
-    0xdb,
-    0xda,
-    0xda,
-    0xd9,
-    0xd9,
-    0xd8,
-    0xd7,
-    0xd7,
-    0xd6,
-    0xd5,
-    0xd4,
-    0xd3,
-    0xd2,
-    0xd2,
-    0xd1,
-    0xd0,
-    0xce,
-    0xcd,
-    0xcc,
-    0xcb,
-    0xca,
-    0xc9,
-    0xc7,
-    0xc6,
-    0xc5,
-    0xc3,
-    0xc2,
-    0xc1,
-    0xbf,
-    0xbe,
-    0xbc,
-    0xbb,
-    0xb9,
-    0xb8,
-    0xb6,
-    0xb4,
-    0xb3,
-    0xb1,
-    0xaf,
-    0xae,
-    0xac,
-    0xaa,
-    0xa8,
-    0xa7,
-    0xa5,
-    0xa3,
-    0xa1,
-    0x9f,
-    0x9e,
-    0x9c,
-    0x9a,
-    0x98,
-    0x96,
-    0x94,
-    0x92,
-    0x90,
-    0x8e,
-    0x8c,
-    0x8a,
-    0x89,
-    0x87,
-    0x85,
-    0x83,
-    0x81,
-    0x7f,
-    0x7d,
-    0x7b,
-    0x79,
-    0x77,
-    0x75,
-    0x73,
-    0x71,
-    0x6f,
-    0x6d,
-    0x6b,
-    0x69,
-    0x68,
-    0x66,
-    0x64,
-    0x62,
-    0x60,
-    0x5e,
-    0x5c,
-    0x5a,
-    0x59,
-    0x57,
-    0x55,
-    0x53,
-    0x51,
-    0x50,
-    0x4e,
-    0x4c,
-    0x4a,
-    0x49,
-    0x47,
-    0x45,
-    0x43,
-    0x42,
-    0x40,
-    0x3e,
-    0x3d,
-    0x3b,
-    0x3a,
-    0x38,
-    0x36,
-    0x35,
-    0x33,
-    0x32,
-    0x30,
-    0x2f,
-    0x2d,
-    0x2c,
-    0x2a,
-    0x29,
-    0x28,
-    0x26,
-    0x25,
-    0x23,
-    0x22
-#endif /* 256 bytes table */
+    0x22, 0x23, 0x25, 0x26, 0x28, 0x29, 0x2A, 0x2C,
+    0x2D, 0x2F, 0x30, 0x32, 0x33, 0x35, 0x36, 0x38,
+    0x3A, 0x3B, 0x3D, 0x3E, 0x40, 0x42, 0x43, 0x45,
+    0x47, 0x49, 0x4A, 0x4C, 0x4E, 0x50, 0x51, 0x53,
+    0x55, 0x57, 0x59, 0x5A, 0x5C, 0x5E, 0x60, 0x62,
+    0x64, 0x66, 0x68, 0x69, 0x6B, 0x6D, 0x6F, 0x71,
+    0x73, 0x75, 0x77, 0x79, 0x7B, 0x7D, 0x7F, 0x81,
+    0x83, 0x85, 0x87, 0x89, 0x8A, 0x8C, 0x8E, 0x90,
+    0x92, 0x94, 0x96, 0x98, 0x9A, 0x9C, 0x9E, 0x9F,
+    0xA1, 0xA3, 0xA5, 0xA7, 0xA8, 0xAA, 0xAC, 0xAE,
+    0xAF, 0xB1, 0xB3, 0xB4, 0xB6, 0xB8, 0xB9, 0xBB,
+    0xBC, 0xBE, 0xBF, 0xC1, 0xC2, 0xC3, 0xC5, 0xC6,
+    0xC7, 0xC9, 0xCA, 0xCB, 0xCC, 0xCD, 0xCE, 0xD0,
+    0xD1, 0xD2, 0xD2, 0xD3, 0xD4, 0xD5, 0xD6, 0xD7,
+    0xD7, 0xD8, 0xD9, 0xD9, 0xDA, 0xDA, 0xDB, 0xDB,
+    0xDB, 0xDC, 0xDC, 0xDC, 0xDC, 0xDC, 0xDD, 0xDD,
+    0xDD, 0xDD, 0xDC, 0xDC, 0xDC, 0xDC, 0xDC, 0xDB,
+    0xDB, 0xDB, 0xDA, 0xDA, 0xD9, 0xD9, 0xD8, 0xD7,
+    0xD7, 0xD6, 0xD5, 0xD4, 0xD3, 0xD2, 0xD2, 0xD1,
+    0xD0, 0xCE, 0xCD, 0xCC, 0xCB, 0xCA, 0xC9, 0xC7,
+    0xC6, 0xC5, 0xC3, 0xC2, 0xC1, 0xBF, 0xBE, 0xBC,
+    0xBB, 0xB9, 0xB8, 0xB6, 0xB4, 0xB3, 0xB1, 0xAF,
+    0xAE, 0xAC, 0xAA, 0xA8, 0xA7, 0xA5, 0xA3, 0xA1,
+    0x9F, 0x9E, 0x9C, 0x9A, 0x98, 0x96, 0x94, 0x92,
+    0x90, 0x8E, 0x8C, 0x8A, 0x89, 0x87, 0x85, 0x83,
+    0x81, 0x7F, 0x7D, 0x7B, 0x79, 0x77, 0x75, 0x73,
+    0x71, 0x6F, 0x6D, 0x6B, 0x69, 0x68, 0x66, 0x64,
+    0x62, 0x60, 0x5E, 0x5C, 0x5A, 0x59, 0x57, 0x55,
+    0x53, 0x51, 0x50, 0x4E, 0x4C, 0x4A, 0x49, 0x47,
+    0x45, 0x43, 0x42, 0x40, 0x3E, 0x3D, 0x3B, 0x3A,
+    0x38, 0x36, 0x35, 0x33, 0x32, 0x30, 0x2F, 0x2D,
+    0x2C, 0x2A, 0x29, 0x28, 0x26, 0x25, 0x23, 0x22
+#endif
 
 #if RGBLIGHT_BREATHE_TABLE_SIZE == 128
-    0x22,
-    0x25,
-    0x28,
-    0x2a,
-    0x2d,
-    0x30,
-    0x33,
-    0x36,
-    0x3a,
-    0x3d,
-    0x40,
-    0x43,
-    0x47,
-    0x4a,
-    0x4e,
-    0x51,
-    0x55,
-    0x59,
-    0x5c,
-    0x60,
-    0x64,
-    0x68,
-    0x6b,
-    0x6f,
-    0x73,
-    0x77,
-    0x7b,
-    0x7f,
-    0x83,
-    0x87,
-    0x8a,
-    0x8e,
-    0x92,
-    0x96,
-    0x9a,
-    0x9e,
-    0xa1,
-    0xa5,
-    0xa8,
-    0xac,
-    0xaf,
-    0xb3,
-    0xb6,
-    0xb9,
-    0xbc,
-    0xbf,
-    0xc2,
-    0xc5,
-    0xc7,
-    0xca,
-    0xcc,
-    0xce,
-    0xd1,
-    0xd2,
-    0xd4,
-    0xd6,
-    0xd7,
-    0xd9,
-    0xda,
-    0xdb,
-    0xdb,
-    0xdc,
-    0xdc,
-    0xdd,
-    0xdd,
-    0xdc,
-    0xdc,
-    0xdc,
-    0xdb,
-    0xda,
-    0xd9,
-    0xd8,
-    0xd7,
-    0xd5,
-    0xd3,
-    0xd2,
-    0xd0,
-    0xcd,
-    0xcb,
-    0xc9,
-    0xc6,
-    0xc3,
-    0xc1,
-    0xbe,
-    0xbb,
-    0xb8,
-    0xb4,
-    0xb1,
-    0xae,
-    0xaa,
-    0xa7,
-    0xa3,
-    0x9f,
-    0x9c,
-    0x98,
-    0x94,
-    0x90,
-    0x8c,
-    0x89,
-    0x85,
-    0x81,
-    0x7d,
-    0x79,
-    0x75,
-    0x71,
-    0x6d,
-    0x69,
-    0x66,
-    0x62,
-    0x5e,
-    0x5a,
-    0x57,
-    0x53,
-    0x50,
-    0x4c,
-    0x49,
-    0x45,
-    0x42,
-    0x3e,
-    0x3b,
-    0x38,
-    0x35,
-    0x32,
-    0x2f,
-    0x2c,
-    0x29,
-    0x26,
-    0x23
-#endif /* 128 bytes table */
+    0x22, 0x25, 0x28, 0x2A,
+    0x2D, 0x30, 0x33, 0x36,
+    0x3A, 0x3D, 0x40, 0x43,
+    0x47, 0x4A, 0x4E, 0x51,
+    0x55, 0x59, 0x5C, 0x60,
+    0x64, 0x68, 0x6B, 0x6F,
+    0x73, 0x77, 0x7B, 0x7F,
+    0x83, 0x87, 0x8A, 0x8E,
+    0x92, 0x96, 0x9A, 0x9E,
+    0xA1, 0xA5, 0xA8, 0xAC,
+    0xAF, 0xB3, 0xB6, 0xB9,
+    0xBC, 0xBF, 0xC2, 0xC5,
+    0xC7, 0xCA, 0xCC, 0xCE,
+    0xD1, 0xD2, 0xD4, 0xD6,
+    0xD7, 0xD9, 0xDA, 0xDB,
+    0xDB, 0xDC, 0xDC, 0xDD,
+    0xDD, 0xDC, 0xDC, 0xDC,
+    0xDB, 0xDA, 0xD9, 0xD8,
+    0xD7, 0xD5, 0xD3, 0xD2,
+    0xD0, 0xCD, 0xCB, 0xC9,
+    0xC6, 0xC3, 0xC1, 0xBE,
+    0xBB, 0xB8, 0xB4, 0xB1,
+    0xAE, 0xAA, 0xA7, 0xA3,
+    0x9F, 0x9C, 0x98, 0x94,
+    0x90, 0x8C, 0x89, 0x85,
+    0x81, 0x7D, 0x79, 0x75,
+    0x71, 0x6D, 0x69, 0x66,
+    0x62, 0x5E, 0x5A, 0x57,
+    0x53, 0x50, 0x4C, 0x49,
+    0x45, 0x42, 0x3E, 0x3B,
+    0x38, 0x35, 0x32, 0x2F,
+    0x2C, 0x29, 0x26, 0x23
+#endif
 
 #if RGBLIGHT_BREATHE_TABLE_SIZE == 64
-    0x22,
-    0x28,
-    0x2d,
-    0x33,
-    0x3a,
-    0x40,
-    0x47,
-    0x4e,
-    0x55,
-    0x5c,
-    0x64,
-    0x6b,
-    0x73,
-    0x7b,
-    0x83,
-    0x8a,
-    0x92,
-    0x9a,
-    0xa1,
-    0xa8,
-    0xaf,
-    0xb6,
-    0xbc,
-    0xc2,
-    0xc7,
-    0xcc,
-    0xd1,
-    0xd4,
-    0xd7,
-    0xda,
-    0xdb,
-    0xdc,
-    0xdd,
-    0xdc,
-    0xdb,
-    0xd9,
-    0xd7,
-    0xd3,
-    0xd0,
-    0xcb,
-    0xc6,
-    0xc1,
-    0xbb,
-    0xb4,
-    0xae,
-    0xa7,
-    0x9f,
-    0x98,
-    0x90,
-    0x89,
-    0x81,
-    0x79,
-    0x71,
-    0x69,
-    0x62,
-    0x5a,
-    0x53,
-    0x4c,
-    0x45,
-    0x3e,
-    0x38,
-    0x32,
-    0x2c,
-    0x26
-#endif /* 64 bytes table */
+    0x22, 0x28,
+    0x2D, 0x33,
+    0x3A, 0x40,
+    0x47, 0x4E,
+    0x55, 0x5C,
+    0x64, 0x6B,
+    0x73, 0x7B,
+    0x83, 0x8A,
+    0x92, 0x9A,
+    0xA1, 0xA8,
+    0xAF, 0xB6,
+    0xBC, 0xC2,
+    0xC7, 0xCC,
+    0xD1, 0xD4,
+    0xD7, 0xDA,
+    0xDB, 0xDC,
+    0xDD, 0xDC,
+    0xDB, 0xD9,
+    0xD7, 0xD3,
+    0xD0, 0xCB,
+    0xC6, 0xC1,
+    0xBB, 0xB4,
+    0xAE, 0xA7,
+    0x9F, 0x98,
+    0x90, 0x89,
+    0x81, 0x79,
+    0x71, 0x69,
+    0x62, 0x5A,
+    0x53, 0x4C,
+    0x45, 0x3E,
+    0x38, 0x32,
+    0x2C, 0x26
+#endif
 };
 
 static const int table_scale = 256 / sizeof(rgblight_effect_breathe_table);
-
-#endif /* RGBLIGHT_EFFECT_BREATHE_TABLE */
diff --git a/qmk/quantum/rgblight_list.h b/qmk/quantum/rgblight_list.h
index e30733ba..f29a646b 100644
--- a/qmk/quantum/rgblight_list.h
+++ b/qmk/quantum/rgblight_list.h
@@ -34,6 +34,8 @@
 #define RGB_PURPLE 0x7A, 0x00, 0xFF
 #define RGB_MAGENTA 0xFF, 0x00, 0xFF
 #define RGB_PINK 0xFF, 0x80, 0xBF
+#define RGB_BLACK 0x00, 0x00, 0x00
+#define RGB_OFF RGB_BLACK
 
 /*            HSV COLORS            */
 #define HSV_WHITE 0, 0, 255
@@ -54,6 +56,8 @@
 #define HSV_PURPLE 191, 255, 255
 #define HSV_MAGENTA 213, 255, 255
 #define HSV_PINK 234, 128, 255
+#define HSV_BLACK 0, 0, 0
+#define HSV_OFF HSV_BLACK
 
 /*
 ########################################################################################
diff --git a/qmk/quantum/sequencer/sequencer.c b/qmk/quantum/sequencer/sequencer.c
new file mode 100644
index 00000000..0eaf3a17
--- /dev/null
+++ b/qmk/quantum/sequencer/sequencer.c
@@ -0,0 +1,275 @@
+/* Copyright 2020 Rodolphe Belouin
+ *
+ * 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 "sequencer.h"
+
+#ifdef MIDI_ENABLE
+#    include "process_midi.h"
+#endif
+
+#ifdef MIDI_MOCKED
+#    include "tests/midi_mock.h"
+#endif
+
+sequencer_config_t sequencer_config = {
+    false,     // enabled
+    {false},   // steps
+    {0},       // track notes
+    60,        // tempo
+    SQ_RES_4,  // resolution
+};
+
+sequencer_state_t sequencer_internal_state = {0, 0, 0, 0, SEQUENCER_PHASE_ATTACK};
+
+bool is_sequencer_on(void) { return sequencer_config.enabled; }
+
+void sequencer_on(void) {
+    dprintln("sequencer on");
+    sequencer_config.enabled               = true;
+    sequencer_internal_state.current_track = 0;
+    sequencer_internal_state.current_step  = 0;
+    sequencer_internal_state.timer         = timer_read();
+    sequencer_internal_state.phase         = SEQUENCER_PHASE_ATTACK;
+}
+
+void sequencer_off(void) {
+    dprintln("sequencer off");
+    sequencer_config.enabled              = false;
+    sequencer_internal_state.current_step = 0;
+}
+
+void sequencer_toggle(void) {
+    if (is_sequencer_on()) {
+        sequencer_off();
+    } else {
+        sequencer_on();
+    }
+}
+
+void sequencer_set_track_notes(const uint16_t track_notes[SEQUENCER_TRACKS]) {
+    for (uint8_t i = 0; i < SEQUENCER_TRACKS; i++) {
+        sequencer_config.track_notes[i] = track_notes[i];
+    }
+}
+
+bool is_sequencer_track_active(uint8_t track) { return (sequencer_internal_state.active_tracks >> track) & true; }
+
+void sequencer_set_track_activation(uint8_t track, bool value) {
+    if (value) {
+        sequencer_internal_state.active_tracks |= (1 << track);
+    } else {
+        sequencer_internal_state.active_tracks &= ~(1 << track);
+    }
+    dprintf("sequencer: track %d is %s\n", track, value ? "active" : "inactive");
+}
+
+void sequencer_toggle_track_activation(uint8_t track) { sequencer_set_track_activation(track, !is_sequencer_track_active(track)); }
+
+void sequencer_toggle_single_active_track(uint8_t track) {
+    if (is_sequencer_track_active(track)) {
+        sequencer_internal_state.active_tracks = 0;
+    } else {
+        sequencer_internal_state.active_tracks = 1 << track;
+    }
+}
+
+bool is_sequencer_step_on(uint8_t step) { return step < SEQUENCER_STEPS && (sequencer_config.steps[step] & sequencer_internal_state.active_tracks) > 0; }
+
+bool is_sequencer_step_on_for_track(uint8_t step, uint8_t track) { return step < SEQUENCER_STEPS && (sequencer_config.steps[step] >> track) & true; }
+
+void sequencer_set_step(uint8_t step, bool value) {
+    if (step < SEQUENCER_STEPS) {
+        if (value) {
+            sequencer_config.steps[step] |= sequencer_internal_state.active_tracks;
+        } else {
+            sequencer_config.steps[step] &= ~sequencer_internal_state.active_tracks;
+        }
+        dprintf("sequencer: step %d is %s\n", step, value ? "on" : "off");
+    } else {
+        dprintf("sequencer: step %d is out of range\n", step);
+    }
+}
+
+void sequencer_toggle_step(uint8_t step) {
+    if (is_sequencer_step_on(step)) {
+        sequencer_set_step_off(step);
+    } else {
+        sequencer_set_step_on(step);
+    }
+}
+
+void sequencer_set_all_steps(bool value) {
+    for (uint8_t step = 0; step < SEQUENCER_STEPS; step++) {
+        if (value) {
+            sequencer_config.steps[step] |= sequencer_internal_state.active_tracks;
+        } else {
+            sequencer_config.steps[step] &= ~sequencer_internal_state.active_tracks;
+        }
+    }
+    dprintf("sequencer: all steps are %s\n", value ? "on" : "off");
+}
+
+uint8_t sequencer_get_tempo(void) { return sequencer_config.tempo; }
+
+void sequencer_set_tempo(uint8_t tempo) {
+    if (tempo > 0) {
+        sequencer_config.tempo = tempo;
+        dprintf("sequencer: tempo set to %d bpm\n", tempo);
+    } else {
+        dprintln("sequencer: cannot set tempo to 0");
+    }
+}
+
+void sequencer_increase_tempo(void) {
+    // Handling potential uint8_t overflow
+    if (sequencer_config.tempo < UINT8_MAX) {
+        sequencer_set_tempo(sequencer_config.tempo + 1);
+    } else {
+        dprintf("sequencer: cannot set tempo above %d\n", UINT8_MAX);
+    }
+}
+
+void sequencer_decrease_tempo(void) { sequencer_set_tempo(sequencer_config.tempo - 1); }
+
+sequencer_resolution_t sequencer_get_resolution(void) { return sequencer_config.resolution; }
+
+void sequencer_set_resolution(sequencer_resolution_t resolution) {
+    if (resolution >= 0 && resolution < SEQUENCER_RESOLUTIONS) {
+        sequencer_config.resolution = resolution;
+        dprintf("sequencer: resolution set to %d\n", resolution);
+    } else {
+        dprintf("sequencer: resolution %d is out of range\n", resolution);
+    }
+}
+
+void sequencer_increase_resolution(void) { sequencer_set_resolution(sequencer_config.resolution + 1); }
+
+void sequencer_decrease_resolution(void) { sequencer_set_resolution(sequencer_config.resolution - 1); }
+
+uint8_t sequencer_get_current_step(void) { return sequencer_internal_state.current_step; }
+
+void sequencer_phase_attack(void) {
+    dprintf("sequencer: step %d\n", sequencer_internal_state.current_step);
+    dprintf("sequencer: time %d\n", timer_read());
+
+    if (sequencer_internal_state.current_track == 0) {
+        sequencer_internal_state.timer = timer_read();
+    }
+
+    if (timer_elapsed(sequencer_internal_state.timer) < sequencer_internal_state.current_track * SEQUENCER_TRACK_THROTTLE) {
+        return;
+    }
+
+#if defined(MIDI_ENABLE) || defined(MIDI_MOCKED)
+    if (is_sequencer_step_on_for_track(sequencer_internal_state.current_step, sequencer_internal_state.current_track)) {
+        process_midi_basic_noteon(midi_compute_note(sequencer_config.track_notes[sequencer_internal_state.current_track]));
+    }
+#endif
+
+    if (sequencer_internal_state.current_track < SEQUENCER_TRACKS - 1) {
+        sequencer_internal_state.current_track++;
+    } else {
+        sequencer_internal_state.phase = SEQUENCER_PHASE_RELEASE;
+    }
+}
+
+void sequencer_phase_release(void) {
+    if (timer_elapsed(sequencer_internal_state.timer) < SEQUENCER_PHASE_RELEASE_TIMEOUT + sequencer_internal_state.current_track * SEQUENCER_TRACK_THROTTLE) {
+        return;
+    }
+#if defined(MIDI_ENABLE) || defined(MIDI_MOCKED)
+    if (is_sequencer_step_on_for_track(sequencer_internal_state.current_step, sequencer_internal_state.current_track)) {
+        process_midi_basic_noteoff(midi_compute_note(sequencer_config.track_notes[sequencer_internal_state.current_track]));
+    }
+#endif
+    if (sequencer_internal_state.current_track > 0) {
+        sequencer_internal_state.current_track--;
+    } else {
+        sequencer_internal_state.phase = SEQUENCER_PHASE_PAUSE;
+    }
+}
+
+void sequencer_phase_pause(void) {
+    if (timer_elapsed(sequencer_internal_state.timer) < sequencer_get_step_duration()) {
+        return;
+    }
+
+    sequencer_internal_state.current_step = (sequencer_internal_state.current_step + 1) % SEQUENCER_STEPS;
+    sequencer_internal_state.phase        = SEQUENCER_PHASE_ATTACK;
+}
+
+void matrix_scan_sequencer(void) {
+    if (!sequencer_config.enabled) {
+        return;
+    }
+
+    if (sequencer_internal_state.phase == SEQUENCER_PHASE_PAUSE) {
+        sequencer_phase_pause();
+    }
+
+    if (sequencer_internal_state.phase == SEQUENCER_PHASE_RELEASE) {
+        sequencer_phase_release();
+    }
+
+    if (sequencer_internal_state.phase == SEQUENCER_PHASE_ATTACK) {
+        sequencer_phase_attack();
+    }
+}
+
+uint16_t sequencer_get_beat_duration(void) { return get_beat_duration(sequencer_config.tempo); }
+
+uint16_t sequencer_get_step_duration(void) { return get_step_duration(sequencer_config.tempo, sequencer_config.resolution); }
+
+uint16_t get_beat_duration(uint8_t tempo) {
+    // Don’t crash in the unlikely case where the given tempo is 0
+    if (tempo == 0) {
+        return get_beat_duration(60);
+    }
+
+    /**
+     * Given
+     *  t = tempo and d = duration, both strictly greater than 0
+     * When
+     *  t beats / minute = 1 beat / d ms
+     * Then
+     *  t beats / 60000ms = 1 beat / d ms
+     *  d ms = 60000ms / t
+     */
+    return 60000 / tempo;
+}
+
+uint16_t get_step_duration(uint8_t tempo, sequencer_resolution_t resolution) {
+    /**
+     * Resolution cheatsheet:
+     * 1/2  => 2 steps per 4 beats
+     * 1/2T => 3 steps per 4 beats
+     * 1/4  => 4 steps per 4 beats
+     * 1/4T => 6 steps per 4 beats
+     * 1/8  => 8 steps per 4 beats
+     * 1/8T => 12 steps per 4 beats
+     * 1/16 => 16 steps per 4 beats
+     * 1/16T => 24 steps per 4 beats
+     * 1/32 => 32 steps per 4 beats
+     *
+     * The number of steps for binary resolutions follows the powers of 2.
+     * The ternary variants are simply 1.5x faster.
+     */
+    bool     is_binary            = resolution % 2 == 0;
+    uint8_t  binary_steps         = 2 << (resolution / 2);
+    uint16_t binary_step_duration = get_beat_duration(tempo) * 4 / binary_steps;
+
+    return is_binary ? binary_step_duration : 2 * binary_step_duration / 3;
+}
diff --git a/qmk/quantum/sequencer/sequencer.h b/qmk/quantum/sequencer/sequencer.h
new file mode 100644
index 00000000..aeca7a1e
--- /dev/null
+++ b/qmk/quantum/sequencer/sequencer.h
@@ -0,0 +1,122 @@
+/* Copyright 2020 Rodolphe Belouin
+ *
+ * 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 <stdbool.h>
+#include "debug.h"
+#include "timer.h"
+
+// Maximum number of steps: 256
+#ifndef SEQUENCER_STEPS
+#    define SEQUENCER_STEPS 16
+#endif
+
+// Maximum number of tracks: 8
+#ifndef SEQUENCER_TRACKS
+#    define SEQUENCER_TRACKS 8
+#endif
+
+#ifndef SEQUENCER_TRACK_THROTTLE
+#    define SEQUENCER_TRACK_THROTTLE 3
+#endif
+
+#ifndef SEQUENCER_PHASE_RELEASE_TIMEOUT
+#    define SEQUENCER_PHASE_RELEASE_TIMEOUT 30
+#endif
+
+/**
+ * Make sure that the items of this enumeration follow the powers of 2, separated by a ternary variant.
+ * Check the implementation of `get_step_duration` for further explanation.
+ */
+typedef enum { SQ_RES_2, SQ_RES_2T, SQ_RES_4, SQ_RES_4T, SQ_RES_8, SQ_RES_8T, SQ_RES_16, SQ_RES_16T, SQ_RES_32, SEQUENCER_RESOLUTIONS } sequencer_resolution_t;
+
+typedef struct {
+    bool                   enabled;
+    uint8_t                steps[SEQUENCER_STEPS];
+    uint16_t               track_notes[SEQUENCER_TRACKS];
+    uint8_t                tempo;  // Is a maximum tempo of 255 reasonable?
+    sequencer_resolution_t resolution;
+} sequencer_config_t;
+
+/**
+ * Because Digital Audio Workstations get overwhelmed when too many MIDI signals are sent concurrently,
+ * We use a "phase" state machine to delay some of the events.
+ */
+typedef enum sequencer_phase_t {
+    SEQUENCER_PHASE_ATTACK,   // t=0ms, send the MIDI note on signal
+    SEQUENCER_PHASE_RELEASE,  // t=SEQUENCER_PHASE_RELEASE_TIMEOUT ms, send the MIDI note off signal
+    SEQUENCER_PHASE_PAUSE     // t=step duration ms, loop
+} sequencer_phase_t;
+
+typedef struct {
+    uint8_t           active_tracks;
+    uint8_t           current_track;
+    uint8_t           current_step;
+    uint16_t          timer;
+    sequencer_phase_t phase;
+} sequencer_state_t;
+
+extern sequencer_config_t sequencer_config;
+
+// We expose the internal state to make the feature more "unit-testable"
+extern sequencer_state_t sequencer_internal_state;
+
+bool is_sequencer_on(void);
+void sequencer_toggle(void);
+void sequencer_on(void);
+void sequencer_off(void);
+
+void sequencer_set_track_notes(const uint16_t track_notes[SEQUENCER_TRACKS]);
+
+bool is_sequencer_track_active(uint8_t track);
+void sequencer_set_track_activation(uint8_t track, bool value);
+void sequencer_toggle_track_activation(uint8_t track);
+void sequencer_toggle_single_active_track(uint8_t track);
+
+#define sequencer_activate_track(track) sequencer_set_track_activation(track, true)
+#define sequencer_deactivate_track(track) sequencer_set_track_activation(track, false)
+
+bool is_sequencer_step_on(uint8_t step);
+bool is_sequencer_step_on_for_track(uint8_t step, uint8_t track);
+void sequencer_set_step(uint8_t step, bool value);
+void sequencer_toggle_step(uint8_t step);
+void sequencer_set_all_steps(bool value);
+
+#define sequencer_set_step_on(step) sequencer_set_step(step, true)
+#define sequencer_set_step_off(step) sequencer_set_step(step, false)
+#define sequencer_set_all_steps_on() sequencer_set_all_steps(true)
+#define sequencer_set_all_steps_off() sequencer_set_all_steps(false)
+
+uint8_t sequencer_get_tempo(void);
+void    sequencer_set_tempo(uint8_t tempo);
+void    sequencer_increase_tempo(void);
+void    sequencer_decrease_tempo(void);
+
+sequencer_resolution_t sequencer_get_resolution(void);
+void                   sequencer_set_resolution(sequencer_resolution_t resolution);
+void                   sequencer_increase_resolution(void);
+void                   sequencer_decrease_resolution(void);
+
+uint8_t sequencer_get_current_step(void);
+
+uint16_t sequencer_get_beat_duration(void);
+uint16_t sequencer_get_step_duration(void);
+
+uint16_t get_beat_duration(uint8_t tempo);
+uint16_t get_step_duration(uint8_t tempo, sequencer_resolution_t resolution);
+
+void matrix_scan_sequencer(void);
diff --git a/qmk/quantum/sequencer/tests/midi_mock.c b/qmk/quantum/sequencer/tests/midi_mock.c
new file mode 100644
index 00000000..236e16f9
--- /dev/null
+++ b/qmk/quantum/sequencer/tests/midi_mock.c
@@ -0,0 +1,26 @@
+/* Copyright 2020 Rodolphe Belouin
+ *
+ * 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 "midi_mock.h"
+
+uint16_t last_noteon  = 0;
+uint16_t last_noteoff = 0;
+
+uint16_t midi_compute_note(uint16_t keycode) { return keycode; }
+
+void process_midi_basic_noteon(uint16_t note) { last_noteon = note; }
+
+void process_midi_basic_noteoff(uint16_t note) { last_noteoff = note; }
diff --git a/qmk/quantum/sequencer/tests/midi_mock.h b/qmk/quantum/sequencer/tests/midi_mock.h
new file mode 100644
index 00000000..4d8c2eb3
--- /dev/null
+++ b/qmk/quantum/sequencer/tests/midi_mock.h
@@ -0,0 +1,26 @@
+/* Copyright 2020 Rodolphe Belouin
+ *
+ * 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 <stdint.h>
+
+extern uint16_t last_noteon;
+extern uint16_t last_noteoff;
+
+uint16_t midi_compute_note(uint16_t keycode);
+void     process_midi_basic_noteon(uint16_t note);
+void     process_midi_basic_noteoff(uint16_t note);
diff --git a/qmk/quantum/sequencer/tests/rules.mk b/qmk/quantum/sequencer/tests/rules.mk
new file mode 100644
index 00000000..76c221cf
--- /dev/null
+++ b/qmk/quantum/sequencer/tests/rules.mk
@@ -0,0 +1,11 @@
+# The letter case of these variables might seem odd. However:
+# - it is consistent with the serial_link example that is used as a reference in the Unit Testing article (https://docs.qmk.fm/#/unit_testing?id=adding-tests-for-new-or-existing-features)
+# - Neither `make test:sequencer` or `make test:SEQUENCER` work when using SCREAMING_SNAKE_CASE
+
+sequencer_DEFS := -DNO_DEBUG -DMIDI_MOCKED
+
+sequencer_SRC := \
+	$(QUANTUM_PATH)/sequencer/tests/midi_mock.c \
+	$(QUANTUM_PATH)/sequencer/tests/sequencer_tests.cpp \
+	$(QUANTUM_PATH)/sequencer/sequencer.c \
+	$(TMK_PATH)/common/test/timer.c
diff --git a/qmk/quantum/sequencer/tests/sequencer_tests.cpp b/qmk/quantum/sequencer/tests/sequencer_tests.cpp
new file mode 100644
index 00000000..e81984e5
--- /dev/null
+++ b/qmk/quantum/sequencer/tests/sequencer_tests.cpp
@@ -0,0 +1,590 @@
+/* Copyright 2020 Rodolphe Belouin
+ *
+ * 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 "gtest/gtest.h"
+
+extern "C" {
+#include "sequencer.h"
+#include "midi_mock.h"
+#include "quantum/quantum_keycodes.h"
+}
+
+extern "C" {
+void set_time(uint32_t t);
+void advance_time(uint32_t ms);
+}
+
+class SequencerTest : public ::testing::Test {
+   protected:
+    void SetUp() override {
+        config_copy.enabled = sequencer_config.enabled;
+
+        for (int i = 0; i < SEQUENCER_STEPS; i++) {
+            config_copy.steps[i] = sequencer_config.steps[i];
+        }
+
+        for (int i = 0; i < SEQUENCER_TRACKS; i++) {
+            config_copy.track_notes[i] = sequencer_config.track_notes[i];
+        }
+
+        config_copy.tempo      = sequencer_config.tempo;
+        config_copy.resolution = sequencer_config.resolution;
+
+        state_copy.active_tracks = sequencer_internal_state.active_tracks;
+        state_copy.current_track = sequencer_internal_state.current_track;
+        state_copy.current_step  = sequencer_internal_state.current_step;
+        state_copy.timer         = sequencer_internal_state.timer;
+
+        last_noteon  = 0;
+        last_noteoff = 0;
+
+        set_time(0);
+    }
+
+    void TearDown() override {
+        sequencer_config.enabled = config_copy.enabled;
+
+        for (int i = 0; i < SEQUENCER_STEPS; i++) {
+            sequencer_config.steps[i] = config_copy.steps[i];
+        }
+
+        for (int i = 0; i < SEQUENCER_TRACKS; i++) {
+            sequencer_config.track_notes[i] = config_copy.track_notes[i];
+        }
+
+        sequencer_config.tempo      = config_copy.tempo;
+        sequencer_config.resolution = config_copy.resolution;
+
+        sequencer_internal_state.active_tracks = state_copy.active_tracks;
+        sequencer_internal_state.current_track = state_copy.current_track;
+        sequencer_internal_state.current_step  = state_copy.current_step;
+        sequencer_internal_state.timer         = state_copy.timer;
+    }
+
+    sequencer_config_t config_copy;
+    sequencer_state_t  state_copy;
+};
+
+TEST_F(SequencerTest, TestOffByDefault) { EXPECT_EQ(is_sequencer_on(), false); }
+
+TEST_F(SequencerTest, TestOn) {
+    sequencer_config.enabled = false;
+
+    sequencer_on();
+    EXPECT_EQ(is_sequencer_on(), true);
+
+    // sequencer_on is idempotent
+    sequencer_on();
+    EXPECT_EQ(is_sequencer_on(), true);
+}
+
+TEST_F(SequencerTest, TestOff) {
+    sequencer_config.enabled = true;
+
+    sequencer_off();
+    EXPECT_EQ(is_sequencer_on(), false);
+
+    // sequencer_off is idempotent
+    sequencer_off();
+    EXPECT_EQ(is_sequencer_on(), false);
+}
+
+TEST_F(SequencerTest, TestToggle) {
+    sequencer_config.enabled = false;
+
+    sequencer_toggle();
+    EXPECT_EQ(is_sequencer_on(), true);
+
+    sequencer_toggle();
+    EXPECT_EQ(is_sequencer_on(), false);
+}
+
+TEST_F(SequencerTest, TestNoActiveTrackByDefault) {
+    for (int i = 0; i < SEQUENCER_TRACKS; i++) {
+        EXPECT_EQ(is_sequencer_track_active(i), false);
+    }
+}
+
+TEST_F(SequencerTest, TestGetActiveTracks) {
+    sequencer_internal_state.active_tracks = (1 << 7) + (1 << 6) + (1 << 3) + (1 << 1) + (1 << 0);
+
+    EXPECT_EQ(is_sequencer_track_active(0), true);
+    EXPECT_EQ(is_sequencer_track_active(1), true);
+    EXPECT_EQ(is_sequencer_track_active(2), false);
+    EXPECT_EQ(is_sequencer_track_active(3), true);
+    EXPECT_EQ(is_sequencer_track_active(4), false);
+    EXPECT_EQ(is_sequencer_track_active(5), false);
+    EXPECT_EQ(is_sequencer_track_active(6), true);
+    EXPECT_EQ(is_sequencer_track_active(7), true);
+}
+
+TEST_F(SequencerTest, TestGetActiveTracksOutOfBound) {
+    sequencer_set_track_activation(-1, true);
+    sequencer_set_track_activation(8, true);
+
+    EXPECT_EQ(is_sequencer_track_active(-1), false);
+    EXPECT_EQ(is_sequencer_track_active(8), false);
+}
+
+TEST_F(SequencerTest, TestToggleTrackActivation) {
+    sequencer_internal_state.active_tracks = (1 << 7) + (1 << 6) + (1 << 3) + (1 << 1) + (1 << 0);
+
+    sequencer_toggle_track_activation(6);
+
+    EXPECT_EQ(is_sequencer_track_active(0), true);
+    EXPECT_EQ(is_sequencer_track_active(1), true);
+    EXPECT_EQ(is_sequencer_track_active(2), false);
+    EXPECT_EQ(is_sequencer_track_active(3), true);
+    EXPECT_EQ(is_sequencer_track_active(4), false);
+    EXPECT_EQ(is_sequencer_track_active(5), false);
+    EXPECT_EQ(is_sequencer_track_active(6), false);
+    EXPECT_EQ(is_sequencer_track_active(7), true);
+}
+
+TEST_F(SequencerTest, TestToggleSingleTrackActivation) {
+    sequencer_internal_state.active_tracks = (1 << 7) + (1 << 6) + (1 << 3) + (1 << 1) + (1 << 0);
+
+    sequencer_toggle_single_active_track(2);
+
+    EXPECT_EQ(is_sequencer_track_active(0), false);
+    EXPECT_EQ(is_sequencer_track_active(1), false);
+    EXPECT_EQ(is_sequencer_track_active(2), true);
+    EXPECT_EQ(is_sequencer_track_active(3), false);
+    EXPECT_EQ(is_sequencer_track_active(4), false);
+    EXPECT_EQ(is_sequencer_track_active(5), false);
+    EXPECT_EQ(is_sequencer_track_active(6), false);
+    EXPECT_EQ(is_sequencer_track_active(7), false);
+}
+
+TEST_F(SequencerTest, TestStepOffByDefault) {
+    for (int i = 0; i < SEQUENCER_STEPS; i++) {
+        EXPECT_EQ(is_sequencer_step_on(i), false);
+    }
+}
+
+TEST_F(SequencerTest, TestIsStepOffWithNoActiveTracks) {
+    sequencer_config.steps[3] = 0xFF;
+    EXPECT_EQ(is_sequencer_step_on(3), false);
+}
+
+TEST_F(SequencerTest, TestIsStepOffWithGivenActiveTracks) {
+    sequencer_set_track_activation(2, true);
+    sequencer_set_track_activation(3, true);
+
+    sequencer_config.steps[3] = (1 << 0) + (1 << 1);
+
+    // No active tracks have the step enabled, so it is off
+    EXPECT_EQ(is_sequencer_step_on(3), false);
+}
+
+TEST_F(SequencerTest, TestIsStepOnWithGivenActiveTracks) {
+    sequencer_set_track_activation(2, true);
+    sequencer_set_track_activation(3, true);
+
+    sequencer_config.steps[3] = (1 << 2);
+
+    // Track 2 has the step enabled, so it is on
+    EXPECT_EQ(is_sequencer_step_on(3), true);
+}
+
+TEST_F(SequencerTest, TestIsStepOffForGivenTrack) {
+    sequencer_config.steps[3] = 0x00;
+    EXPECT_EQ(is_sequencer_step_on_for_track(3, 5), false);
+}
+
+TEST_F(SequencerTest, TestIsStepOnForGivenTrack) {
+    sequencer_config.steps[3] = (1 << 5);
+    EXPECT_EQ(is_sequencer_step_on_for_track(3, 5), true);
+}
+
+TEST_F(SequencerTest, TestSetStepOn) {
+    sequencer_internal_state.active_tracks = (1 << 6) + (1 << 3) + (1 << 2);
+    sequencer_config.steps[2]              = (1 << 5) + (1 << 2);
+
+    sequencer_set_step(2, true);
+
+    EXPECT_EQ(sequencer_config.steps[2], (1 << 6) + (1 << 5) + (1 << 3) + (1 << 2));
+}
+
+TEST_F(SequencerTest, TestSetStepOff) {
+    sequencer_internal_state.active_tracks = (1 << 6) + (1 << 3) + (1 << 2);
+    sequencer_config.steps[2]              = (1 << 5) + (1 << 2);
+
+    sequencer_set_step(2, false);
+
+    EXPECT_EQ(sequencer_config.steps[2], (1 << 5));
+}
+
+TEST_F(SequencerTest, TestToggleStepOff) {
+    sequencer_internal_state.active_tracks = (1 << 6) + (1 << 3) + (1 << 2);
+    sequencer_config.steps[2]              = (1 << 5) + (1 << 2);
+
+    sequencer_toggle_step(2);
+
+    EXPECT_EQ(sequencer_config.steps[2], (1 << 5));
+}
+
+TEST_F(SequencerTest, TestToggleStepOn) {
+    sequencer_internal_state.active_tracks = (1 << 6) + (1 << 3) + (1 << 2);
+    sequencer_config.steps[2]              = 0;
+
+    sequencer_toggle_step(2);
+
+    EXPECT_EQ(sequencer_config.steps[2], (1 << 6) + (1 << 3) + (1 << 2));
+}
+
+TEST_F(SequencerTest, TestSetAllStepsOn) {
+    sequencer_internal_state.active_tracks = (1 << 6) + (1 << 3) + (1 << 2);
+    sequencer_config.steps[2]              = (1 << 7) + (1 << 6);
+    sequencer_config.steps[4]              = (1 << 3) + (1 << 1);
+
+    sequencer_set_all_steps(true);
+
+    EXPECT_EQ(sequencer_config.steps[2], (1 << 7) + (1 << 6) + (1 << 3) + (1 << 2));
+    EXPECT_EQ(sequencer_config.steps[4], (1 << 6) + (1 << 3) + (1 << 2) + (1 << 1));
+}
+
+TEST_F(SequencerTest, TestSetAllStepsOff) {
+    sequencer_internal_state.active_tracks = (1 << 6) + (1 << 3) + (1 << 2);
+    sequencer_config.steps[2]              = (1 << 7) + (1 << 6);
+    sequencer_config.steps[4]              = (1 << 3) + (1 << 1);
+
+    sequencer_set_all_steps(false);
+
+    EXPECT_EQ(sequencer_config.steps[2], (1 << 7));
+    EXPECT_EQ(sequencer_config.steps[4], (1 << 1));
+}
+
+TEST_F(SequencerTest, TestSetTempoZero) {
+    sequencer_config.tempo = 123;
+
+    sequencer_set_tempo(0);
+
+    EXPECT_EQ(sequencer_config.tempo, 123);
+}
+
+TEST_F(SequencerTest, TestIncreaseTempoMax) {
+    sequencer_config.tempo = UINT8_MAX;
+
+    sequencer_increase_tempo();
+
+    EXPECT_EQ(sequencer_config.tempo, UINT8_MAX);
+}
+
+TEST_F(SequencerTest, TestSetResolutionLowerBound) {
+    sequencer_config.resolution = SQ_RES_4;
+
+    sequencer_set_resolution((sequencer_resolution_t)-1);
+
+    EXPECT_EQ(sequencer_config.resolution, SQ_RES_4);
+}
+
+TEST_F(SequencerTest, TestSetResolutionUpperBound) {
+    sequencer_config.resolution = SQ_RES_4;
+
+    sequencer_set_resolution(SEQUENCER_RESOLUTIONS);
+
+    EXPECT_EQ(sequencer_config.resolution, SQ_RES_4);
+}
+
+TEST_F(SequencerTest, TestGetBeatDuration) {
+    EXPECT_EQ(get_beat_duration(60), 1000);
+    EXPECT_EQ(get_beat_duration(120), 500);
+    EXPECT_EQ(get_beat_duration(240), 250);
+    EXPECT_EQ(get_beat_duration(0), 1000);
+}
+
+TEST_F(SequencerTest, TestGetStepDuration60) {
+    /**
+     * Resolution cheatsheet:
+     * 1/2  => 2 steps per 4 beats
+     * 1/2T => 3 steps per 4 beats
+     * 1/4  => 4 steps per 4 beats
+     * 1/4T => 6 steps per 4 beats
+     * 1/8  => 8 steps per 4 beats
+     * 1/8T => 12 steps per 4 beats
+     * 1/16 => 16 steps per 4 beats
+     * 1/16T => 24 steps per 4 beats
+     * 1/32 => 32 steps per 4 beats
+     *
+     * The number of steps for binary resolutions follows the powers of 2.
+     * The ternary variants are simply 1.5x faster.
+     */
+    EXPECT_EQ(get_step_duration(60, SQ_RES_2), 2000);
+    EXPECT_EQ(get_step_duration(60, SQ_RES_4), 1000);
+    EXPECT_EQ(get_step_duration(60, SQ_RES_8), 500);
+    EXPECT_EQ(get_step_duration(60, SQ_RES_16), 250);
+    EXPECT_EQ(get_step_duration(60, SQ_RES_32), 125);
+
+    EXPECT_EQ(get_step_duration(60, SQ_RES_2T), 1333);
+    EXPECT_EQ(get_step_duration(60, SQ_RES_4T), 666);
+    EXPECT_EQ(get_step_duration(60, SQ_RES_8T), 333);
+    EXPECT_EQ(get_step_duration(60, SQ_RES_16T), 166);
+}
+
+TEST_F(SequencerTest, TestGetStepDuration120) {
+    /**
+     * Resolution cheatsheet:
+     * 1/2  => 2 steps per 4 beats
+     * 1/2T => 3 steps per 4 beats
+     * 1/4  => 4 steps per 4 beats
+     * 1/4T => 6 steps per 4 beats
+     * 1/8  => 8 steps per 4 beats
+     * 1/8T => 12 steps per 4 beats
+     * 1/16 => 16 steps per 4 beats
+     * 1/16T => 24 steps per 4 beats
+     * 1/32 => 32 steps per 4 beats
+     *
+     * The number of steps for binary resolutions follows the powers of 2.
+     * The ternary variants are simply 1.5x faster.
+     */
+    EXPECT_EQ(get_step_duration(30, SQ_RES_2), 4000);
+    EXPECT_EQ(get_step_duration(30, SQ_RES_4), 2000);
+    EXPECT_EQ(get_step_duration(30, SQ_RES_8), 1000);
+    EXPECT_EQ(get_step_duration(30, SQ_RES_16), 500);
+    EXPECT_EQ(get_step_duration(30, SQ_RES_32), 250);
+
+    EXPECT_EQ(get_step_duration(30, SQ_RES_2T), 2666);
+    EXPECT_EQ(get_step_duration(30, SQ_RES_4T), 1333);
+    EXPECT_EQ(get_step_duration(30, SQ_RES_8T), 666);
+    EXPECT_EQ(get_step_duration(30, SQ_RES_16T), 333);
+}
+
+void setUpMatrixScanSequencerTest(void) {
+    sequencer_config.enabled    = true;
+    sequencer_config.tempo      = 120;
+    sequencer_config.resolution = SQ_RES_16;
+
+    // Configure the notes for each track
+    sequencer_config.track_notes[0] = MI_C;
+    sequencer_config.track_notes[1] = MI_D;
+    sequencer_config.track_notes[2] = MI_E;
+    sequencer_config.track_notes[3] = MI_F;
+    sequencer_config.track_notes[4] = MI_G;
+    sequencer_config.track_notes[5] = MI_A;
+    sequencer_config.track_notes[6] = MI_B;
+    sequencer_config.track_notes[7] = MI_C;
+
+    // Turn on some steps
+    sequencer_config.steps[0] = (1 << 0);
+    sequencer_config.steps[2] = (1 << 1) + (1 << 0);
+}
+
+TEST_F(SequencerTest, TestMatrixScanSequencerShouldAttackFirstTrackOfFirstStep) {
+    setUpMatrixScanSequencerTest();
+
+    matrix_scan_sequencer();
+    EXPECT_EQ(last_noteon, MI_C);
+    EXPECT_EQ(last_noteoff, 0);
+}
+
+TEST_F(SequencerTest, TestMatrixScanSequencerShouldAttackSecondTrackAfterFirstTrackOfFirstStep) {
+    setUpMatrixScanSequencerTest();
+
+    matrix_scan_sequencer();
+    EXPECT_EQ(sequencer_internal_state.current_step, 0);
+    EXPECT_EQ(sequencer_internal_state.current_track, 1);
+    EXPECT_EQ(sequencer_internal_state.phase, SEQUENCER_PHASE_ATTACK);
+}
+
+TEST_F(SequencerTest, TestMatrixScanSequencerShouldNotAttackInactiveTrackFirstStep) {
+    setUpMatrixScanSequencerTest();
+
+    sequencer_internal_state.current_step  = 0;
+    sequencer_internal_state.current_track = 1;
+
+    // Wait some time after the first track has been attacked
+    advance_time(SEQUENCER_TRACK_THROTTLE);
+
+    matrix_scan_sequencer();
+    EXPECT_EQ(last_noteon, 0);
+    EXPECT_EQ(last_noteoff, 0);
+}
+
+TEST_F(SequencerTest, TestMatrixScanSequencerShouldAttackThirdTrackAfterSecondTrackOfFirstStep) {
+    setUpMatrixScanSequencerTest();
+
+    sequencer_internal_state.current_step  = 0;
+    sequencer_internal_state.current_track = 1;
+
+    // Wait some time after the second track has been attacked
+    advance_time(2 * SEQUENCER_TRACK_THROTTLE);
+
+    matrix_scan_sequencer();
+    EXPECT_EQ(sequencer_internal_state.current_step, 0);
+    EXPECT_EQ(sequencer_internal_state.current_track, 2);
+    EXPECT_EQ(sequencer_internal_state.phase, SEQUENCER_PHASE_ATTACK);
+}
+
+TEST_F(SequencerTest, TestMatrixScanSequencerShouldEnterReleasePhaseAfterLastTrackHasBeenProcessedFirstStep) {
+    setUpMatrixScanSequencerTest();
+
+    sequencer_internal_state.current_step  = 0;
+    sequencer_internal_state.current_track = SEQUENCER_TRACKS - 1;
+
+    // Wait until all notes have been attacked
+    advance_time((SEQUENCER_TRACKS - 1) * SEQUENCER_TRACK_THROTTLE);
+
+    matrix_scan_sequencer();
+    EXPECT_EQ(last_noteon, 0);
+    EXPECT_EQ(last_noteoff, 0);
+    EXPECT_EQ(sequencer_internal_state.current_step, 0);
+    EXPECT_EQ(sequencer_internal_state.current_track, SEQUENCER_TRACKS - 1);
+    EXPECT_EQ(sequencer_internal_state.phase, SEQUENCER_PHASE_RELEASE);
+}
+
+TEST_F(SequencerTest, TestMatrixScanSequencerShouldReleaseBackwards) {
+    setUpMatrixScanSequencerTest();
+
+    sequencer_internal_state.current_step  = 0;
+    sequencer_internal_state.current_track = SEQUENCER_TRACKS - 1;
+    sequencer_internal_state.phase         = SEQUENCER_PHASE_RELEASE;
+
+    // Wait until all notes have been attacked
+    advance_time((SEQUENCER_TRACKS - 1) * SEQUENCER_TRACK_THROTTLE);
+    // + the release timeout
+    advance_time(SEQUENCER_PHASE_RELEASE_TIMEOUT);
+
+    matrix_scan_sequencer();
+    EXPECT_EQ(sequencer_internal_state.current_step, 0);
+    EXPECT_EQ(sequencer_internal_state.current_track, SEQUENCER_TRACKS - 2);
+    EXPECT_EQ(sequencer_internal_state.phase, SEQUENCER_PHASE_RELEASE);
+}
+
+TEST_F(SequencerTest, TestMatrixScanSequencerShouldNotReleaseInactiveTrackFirstStep) {
+    setUpMatrixScanSequencerTest();
+
+    sequencer_internal_state.current_step  = 0;
+    sequencer_internal_state.current_track = SEQUENCER_TRACKS - 1;
+    sequencer_internal_state.phase         = SEQUENCER_PHASE_RELEASE;
+
+    // Wait until all notes have been attacked
+    advance_time((SEQUENCER_TRACKS - 1) * SEQUENCER_TRACK_THROTTLE);
+    // + the release timeout
+    advance_time(SEQUENCER_PHASE_RELEASE_TIMEOUT);
+
+    matrix_scan_sequencer();
+    EXPECT_EQ(last_noteon, 0);
+    EXPECT_EQ(last_noteoff, 0);
+}
+
+TEST_F(SequencerTest, TestMatrixScanSequencerShouldReleaseFirstTrackFirstStep) {
+    setUpMatrixScanSequencerTest();
+
+    sequencer_internal_state.current_step  = 0;
+    sequencer_internal_state.current_track = 0;
+    sequencer_internal_state.phase         = SEQUENCER_PHASE_RELEASE;
+
+    // Wait until all notes have been attacked
+    advance_time((SEQUENCER_TRACKS - 1) * SEQUENCER_TRACK_THROTTLE);
+    // + the release timeout
+    advance_time(SEQUENCER_PHASE_RELEASE_TIMEOUT);
+    // + all the other notes have been released
+    advance_time((SEQUENCER_TRACKS - 1) * SEQUENCER_TRACK_THROTTLE);
+
+    matrix_scan_sequencer();
+    EXPECT_EQ(last_noteon, 0);
+    EXPECT_EQ(last_noteoff, MI_C);
+}
+
+TEST_F(SequencerTest, TestMatrixScanSequencerShouldEnterPausePhaseAfterRelease) {
+    setUpMatrixScanSequencerTest();
+
+    sequencer_internal_state.current_step  = 0;
+    sequencer_internal_state.current_track = 0;
+    sequencer_internal_state.phase         = SEQUENCER_PHASE_RELEASE;
+
+    // Wait until all notes have been attacked
+    advance_time((SEQUENCER_TRACKS - 1) * SEQUENCER_TRACK_THROTTLE);
+    // + the release timeout
+    advance_time(SEQUENCER_PHASE_RELEASE_TIMEOUT);
+    // + all the other notes have been released
+    advance_time((SEQUENCER_TRACKS - 1) * SEQUENCER_TRACK_THROTTLE);
+
+    matrix_scan_sequencer();
+    EXPECT_EQ(sequencer_internal_state.current_step, 0);
+    EXPECT_EQ(sequencer_internal_state.current_track, 0);
+    EXPECT_EQ(sequencer_internal_state.phase, SEQUENCER_PHASE_PAUSE);
+}
+
+TEST_F(SequencerTest, TestMatrixScanSequencerShouldProcessFirstTrackOfSecondStepAfterPause) {
+    setUpMatrixScanSequencerTest();
+
+    sequencer_internal_state.current_step  = 0;
+    sequencer_internal_state.current_track = 0;
+    sequencer_internal_state.phase         = SEQUENCER_PHASE_PAUSE;
+
+    // Wait until all notes have been attacked
+    advance_time((SEQUENCER_TRACKS - 1) * SEQUENCER_TRACK_THROTTLE);
+    // + the release timeout
+    advance_time(SEQUENCER_PHASE_RELEASE_TIMEOUT);
+    // + all the other notes have been released
+    advance_time((SEQUENCER_TRACKS - 1) * SEQUENCER_TRACK_THROTTLE);
+    // + the step duration (one 16th at tempo=120 lasts 125ms)
+    advance_time(125);
+
+    matrix_scan_sequencer();
+    EXPECT_EQ(sequencer_internal_state.current_step, 1);
+    EXPECT_EQ(sequencer_internal_state.current_track, 1);
+    EXPECT_EQ(sequencer_internal_state.phase, SEQUENCER_PHASE_ATTACK);
+}
+
+TEST_F(SequencerTest, TestMatrixScanSequencerShouldProcessSecondTrackTooEarly) {
+    setUpMatrixScanSequencerTest();
+
+    sequencer_internal_state.current_step  = 2;
+    sequencer_internal_state.current_track = 1;
+
+    matrix_scan_sequencer();
+    EXPECT_EQ(last_noteon, 0);
+    EXPECT_EQ(last_noteoff, 0);
+}
+
+TEST_F(SequencerTest, TestMatrixScanSequencerShouldProcessSecondTrackOnTime) {
+    setUpMatrixScanSequencerTest();
+
+    sequencer_internal_state.current_step  = 2;
+    sequencer_internal_state.current_track = 1;
+
+    // Wait until first track has been attacked
+    advance_time(SEQUENCER_TRACK_THROTTLE);
+
+    matrix_scan_sequencer();
+    EXPECT_EQ(last_noteon, MI_D);
+    EXPECT_EQ(last_noteoff, 0);
+}
+
+TEST_F(SequencerTest, TestMatrixScanSequencerShouldLoopOnceSequenceIsOver) {
+    setUpMatrixScanSequencerTest();
+
+    sequencer_internal_state.current_step  = SEQUENCER_STEPS - 1;
+    sequencer_internal_state.current_track = 0;
+    sequencer_internal_state.phase         = SEQUENCER_PHASE_PAUSE;
+
+    // Wait until all notes have been attacked
+    advance_time((SEQUENCER_TRACKS - 1) * SEQUENCER_TRACK_THROTTLE);
+    // + the release timeout
+    advance_time(SEQUENCER_PHASE_RELEASE_TIMEOUT);
+    // + all the other notes have been released
+    advance_time((SEQUENCER_TRACKS - 1) * SEQUENCER_TRACK_THROTTLE);
+    // + the step duration (one 16th at tempo=120 lasts 125ms)
+    advance_time(125);
+
+    matrix_scan_sequencer();
+    EXPECT_EQ(sequencer_internal_state.current_step, 0);
+    EXPECT_EQ(sequencer_internal_state.current_track, 1);
+    EXPECT_EQ(sequencer_internal_state.phase, SEQUENCER_PHASE_ATTACK);
+}
diff --git a/qmk/quantum/sequencer/tests/testlist.mk b/qmk/quantum/sequencer/tests/testlist.mk
new file mode 100644
index 00000000..bb389911
--- /dev/null
+++ b/qmk/quantum/sequencer/tests/testlist.mk
@@ -0,0 +1 @@
+TEST_LIST += sequencer
diff --git a/qmk/quantum/serial_link/system/serial_link.c b/qmk/quantum/serial_link/system/serial_link.c
index c59c0689..f77483ad 100644
--- a/qmk/quantum/serial_link/system/serial_link.c
+++ b/qmk/quantum/serial_link/system/serial_link.c
@@ -24,7 +24,7 @@ SOFTWARE.
 #include "report.h"
 #include "host_driver.h"
 #include "serial_link/system/serial_link.h"
-#include "hal.h"
+#include <hal.h>
 #include "serial_link/protocol/byte_stuffer.h"
 #include "serial_link/protocol/transport.h"
 #include "serial_link/protocol/frame_router.h"
diff --git a/qmk/quantum/serial_link/system/serial_link.h b/qmk/quantum/serial_link/system/serial_link.h
index f48fbe9e..b6a47395 100644
--- a/qmk/quantum/serial_link/system/serial_link.h
+++ b/qmk/quantum/serial_link/system/serial_link.h
@@ -36,7 +36,7 @@ host_driver_t* get_serial_link_driver(void);
 void           serial_link_update(void);
 
 #if defined(PROTOCOL_CHIBIOS)
-#    include "ch.h"
+#    include <ch.h>
 
 static inline void serial_link_lock(void) { chSysLock(); }
 
diff --git a/qmk/quantum/split_common/matrix.c b/qmk/quantum/split_common/matrix.c
index 5bad9db0..51bf8b10 100644
--- a/qmk/quantum/split_common/matrix.c
+++ b/qmk/quantum/split_common/matrix.c
@@ -45,6 +45,17 @@ uint8_t thisHand, thatHand;
 // user-defined overridable functions
 __attribute__((weak)) void matrix_slave_scan_user(void) {}
 
+static inline void setPinOutput_writeLow(pin_t pin) {
+    ATOMIC_BLOCK_FORCEON {
+        setPinOutput(pin);
+        writePinLow(pin);
+    }
+}
+
+static inline void setPinInputHigh_atomic(pin_t pin) {
+    ATOMIC_BLOCK_FORCEON { setPinInputHigh(pin); }
+}
+
 // matrix code
 
 #ifdef DIRECT_PINS
@@ -82,23 +93,20 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
 #elif defined(DIODE_DIRECTION)
 #    if (DIODE_DIRECTION == COL2ROW)
 
-static void select_row(uint8_t row) {
-    setPinOutput(row_pins[row]);
-    writePinLow(row_pins[row]);
-}
+static void select_row(uint8_t row) { setPinOutput_writeLow(row_pins[row]); }
 
-static void unselect_row(uint8_t row) { setPinInputHigh(row_pins[row]); }
+static void unselect_row(uint8_t row) { setPinInputHigh_atomic(row_pins[row]); }
 
 static void unselect_rows(void) {
     for (uint8_t x = 0; x < ROWS_PER_HAND; x++) {
-        setPinInputHigh(row_pins[x]);
+        setPinInputHigh_atomic(row_pins[x]);
     }
 }
 
 static void init_pins(void) {
     unselect_rows();
     for (uint8_t x = 0; x < MATRIX_COLS; x++) {
-        setPinInputHigh(col_pins[x]);
+        setPinInputHigh_atomic(col_pins[x]);
     }
 }
 
@@ -132,23 +140,20 @@ static bool read_cols_on_row(matrix_row_t current_matrix[], uint8_t current_row)
 
 #    elif (DIODE_DIRECTION == ROW2COL)
 
-static void select_col(uint8_t col) {
-    setPinOutput(col_pins[col]);
-    writePinLow(col_pins[col]);
-}
+static void select_col(uint8_t col) { setPinOutput_writeLow(col_pins[col]); }
 
-static void unselect_col(uint8_t col) { setPinInputHigh(col_pins[col]); }
+static void unselect_col(uint8_t col) { setPinInputHigh_atomic(col_pins[col]); }
 
 static void unselect_cols(void) {
     for (uint8_t x = 0; x < MATRIX_COLS; x++) {
-        setPinInputHigh(col_pins[x]);
+        setPinInputHigh_atomic(col_pins[x]);
     }
 }
 
 static void init_pins(void) {
     unselect_cols();
     for (uint8_t x = 0; x < ROWS_PER_HAND; x++) {
-        setPinInputHigh(row_pins[x]);
+        setPinInputHigh_atomic(row_pins[x]);
     }
 }
 
diff --git a/qmk/quantum/split_common/split_util.c b/qmk/quantum/split_common/split_util.c
index e8e944d7..2ae44e6e 100644
--- a/qmk/quantum/split_common/split_util.c
+++ b/qmk/quantum/split_common/split_util.c
@@ -12,7 +12,7 @@
 #endif
 
 #ifdef PROTOCOL_VUSB
-#    include "usbdrv.h"
+#    include <usbdrv/usbdrv.h>
 #endif
 
 #ifdef EE_HANDS
@@ -95,7 +95,7 @@ static uint8_t peek_matrix_intersection(pin_t out_pin, pin_t in_pin) {
     uint8_t pin_state = readPin(in_pin);
     // Set out_pin to a setting that is less susceptible to noise.
     setPinInputHigh(out_pin);
-    matrix_io_delay(); // Wait for the pull-up to go HIGH.
+    matrix_io_delay();  // Wait for the pull-up to go HIGH.
     return pin_state;
 }
 #endif
@@ -106,11 +106,11 @@ __attribute__((weak)) bool is_keyboard_left(void) {
     setPinInput(SPLIT_HAND_PIN);
     return readPin(SPLIT_HAND_PIN);
 #elif defined(SPLIT_HAND_MATRIX_GRID)
-#   ifdef SPLIT_HAND_MATRIX_GRID_LOW_IS_RIGHT
+#    ifdef SPLIT_HAND_MATRIX_GRID_LOW_IS_RIGHT
     return peek_matrix_intersection(SPLIT_HAND_MATRIX_GRID);
-#   else
+#    else
     return !peek_matrix_intersection(SPLIT_HAND_MATRIX_GRID);
-#   endif
+#    endif
 #elif defined(EE_HANDS)
     return eeconfig_read_handedness();
 #elif defined(MASTER_RIGHT)
diff --git a/qmk/quantum/split_common/transport.h b/qmk/quantum/split_common/transport.h
index ccce57e4..f3e752bf 100644
--- a/qmk/quantum/split_common/transport.h
+++ b/qmk/quantum/split_common/transport.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <common/matrix.h>
+#include "common/matrix.h"
 
 void transport_master_init(void);
 void transport_slave_init(void);
diff --git a/qmk/quantum/template/avr/config.h b/qmk/quantum/template/avr/config.h
index 5f0bc736..4192bbcf 100644
--- a/qmk/quantum/template/avr/config.h
+++ b/qmk/quantum/template/avr/config.h
@@ -52,6 +52,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #define SOFT_SERIAL_PIN D0  // or D1, D2, D3, E6
 
+//#define LED_NUM_LOCK_PIN B0
+//#define LED_CAPS_LOCK_PIN B1
+//#define LED_SCROLL_LOCK_PIN B2
+//#define LED_COMPOSE_PIN B3
+//#define LED_KANA_PIN B4
+
 //#define BACKLIGHT_PIN B7
 //#define BACKLIGHT_LEVELS 3
 //#define BACKLIGHT_BREATHING
diff --git a/qmk/quantum/template/ps2avrgb/config.h b/qmk/quantum/template/ps2avrgb/config.h
index ef065c0f..6150bcce 100644
--- a/qmk/quantum/template/ps2avrgb/config.h
+++ b/qmk/quantum/template/ps2avrgb/config.h
@@ -47,8 +47,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* COL2ROW, ROW2COL */
 #define DIODE_DIRECTION COL2ROW
 
+//#define LED_NUM_LOCK_PIN D0
+//#define LED_CAPS_LOCK_PIN D1
+//#define LED_SCROLL_LOCK_PIN D6
+
 #define BACKLIGHT_PIN D4
-#define BACKLIGHT_LEVELS 3
+//#define BACKLIGHT_LEVELS 3
 //#define BACKLIGHT_BREATHING
 
 #define RGBLED_NUM 16
diff --git a/qmk/quantum/via.h b/qmk/quantum/via.h
index 373843f9..d0510fca 100644
--- a/qmk/quantum/via.h
+++ b/qmk/quantum/via.h
@@ -16,7 +16,7 @@
 
 #pragma once
 
-#include <tmk_core/common/eeconfig.h>  // for EECONFIG_SIZE
+#include "tmk_core/common/eeconfig.h"  // for EECONFIG_SIZE
 
 // Keyboard level code can change where VIA stores the magic.
 // The magic is the build date YYMMDD encoded as BCD in 3 bytes,
diff --git a/qmk/quantum/visualizer/lcd_backlight.h b/qmk/quantum/visualizer/lcd_backlight.h
index 7b0b6a9f..0a1535ed 100644
--- a/qmk/quantum/visualizer/lcd_backlight.h
+++ b/qmk/quantum/visualizer/lcd_backlight.h
@@ -24,7 +24,7 @@ SOFTWARE.
 
 #ifndef LCD_BACKLIGHT_H_
 #define LCD_BACKLIGHT_H_
-#include "stdint.h"
+#include <stdint.h>
 
 // Helper macros for storing hue, staturation and intensity as unsigned integers
 #define LCD_COLOR(hue, saturation, intensity) (hue << 16 | saturation << 8 | intensity)
diff --git a/qmk/quantum/visualizer/lcd_keyframes.c b/qmk/quantum/visualizer/lcd_keyframes.c
index c7d9841d..1d6f3dca 100644
--- a/qmk/quantum/visualizer/lcd_keyframes.c
+++ b/qmk/quantum/visualizer/lcd_keyframes.c
@@ -157,14 +157,14 @@ bool lcd_keyframe_draw_logo(keyframe_animation_t* animation, visualizer_state_t*
     (void)animation;
     // Read the uGFX documentation for information how to use the displays
     // http://wiki.ugfx.org/index.php/Main_Page
-    gdispClear(White);
+    gdispClear(Black);
 
     // You can use static variables for things that can't be found in the animation
     // or state structs, here we use the image
 
     // gdispGBlitArea is a tricky function to use since it supports blitting part of the image
     // if you have full screen image, then just use LCD_WIDTH and LCD_HEIGHT for both source and target dimensions
-    gdispGBlitArea(GDISP, 0, 0, LCD_WIDTH, LCD_HEIGHT, 0, 0, LCD_WIDTH, (pixel_t*)resource_lcd_logo);
+    gdispGBlitArea(GDISP, 0, 0, 128, 32, 0, 0, LCD_WIDTH, (pixel_t*)resource_lcd_logo);
 
     return false;
 }
diff --git a/qmk/quantum/visualizer/led_backlight_keyframes.c b/qmk/quantum/visualizer/led_backlight_keyframes.c
index d81117d2..338ada52 100644
--- a/qmk/quantum/visualizer/led_backlight_keyframes.c
+++ b/qmk/quantum/visualizer/led_backlight_keyframes.c
@@ -22,7 +22,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
 */
 #include "gfx.h"
-#include "math.h"
+#include <math.h>
 #include "led_backlight_keyframes.h"
 
 static uint8_t fade_led_color(keyframe_animation_t* animation, int from, int to) {
diff --git a/qmk/quantum/visualizer/resources/lcd_logo.c b/qmk/quantum/visualizer/resources/lcd_logo.c
index 165e6d1f..13bf734c 100644
--- a/qmk/quantum/visualizer/resources/lcd_logo.c
+++ b/qmk/quantum/visualizer/resources/lcd_logo.c
@@ -16,6 +16,8 @@
 
 #include "resources.h"
 
+// clang-format off
+
 // To generate an image array like this
 // Ensure the image is 128 x 32 or smaller
 // Convert the bitmap to a C array using a program like http://www.riuson.com/lcd-image-converter/
@@ -23,7 +25,21 @@
 // Update array in the source code with the C array produced by the conversion program
 
 // The image below is generated from lcd_logo.png
-__attribute__((weak)) const uint8_t resource_lcd_logo[512] = {0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf8, 0xfe, 0x3e, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x38, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                              0x00, 0x38, 0x38, 0x38, 0x06, 0x29, 0x41, 0x24, 0x52, 0x24, 0x46, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x38, 0x38, 0x09, 0x55, 0x42, 0xaa, 0xaa, 0xaa, 0xa8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x38, 0x38, 0x09, 0x55, 0x82, 0x28, 0xaa, 0xae, 0x8c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x38, 0x38, 0x09, 0x55, 0x43, 0x28, 0xaa, 0xaa, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x38, 0x38, 0x0a, 0x55, 0x42, 0x28, 0xaa, 0xaa, 0x88, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x38, 0x38, 0x38, 0x05, 0x45, 0x42, 0x28, 0x89, 0x4a, 0x86, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x38, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1c, 0x38, 0x70, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                              0x00, 0x0e, 0x38, 0xe0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03, 0xff, 0x80, 0x04, 0x45, 0x14, 0xa4, 0x92, 0x83, 0x52, 0x22, 0x22, 0x36, 0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x0a, 0xaa, 0xaa, 0xaa, 0xba, 0x84, 0x55, 0x55, 0x57, 0x45, 0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x08, 0xaa, 0xaa, 0xaa, 0x92, 0xb2, 0x55, 0x55, 0x42, 0x65, 0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x08, 0xaa, 0xaa, 0xaa, 0x92, 0x81, 0x56, 0x65, 0x42, 0x45, 0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x0a, 0xaa, 0xaa, 0xaa, 0x92, 0x81, 0x54, 0x45, 0x42, 0x45, 0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x04, 0x48, 0xa2, 0x4a, 0x89, 0x06, 0x24, 0x42, 0x41, 0x36, 0x00, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                                                              0x00, 0x00, 0xfe, 0x00, 0x00, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00};
+__attribute__((weak)) const uint8_t resource_lcd_logo[512] = {
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x02, 0x92, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x92, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x02, 0x92, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xFF, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x1F, 0xFF, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xFF, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0xFE, 0xEE, 0xFE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0xEE, 0xF0, 0x01, 0xC6, 0x0D, 0x8C, 0x1F, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0xFE, 0xEE, 0xFE, 0x03, 0xE7, 0x1D, 0x9C, 0x1F, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1E, 0xEE, 0xF0, 0x06, 0x37, 0x1D, 0xB8, 0x18, 0x0B, 0x59, 0xC8, 0x09, 0xE5, 0x9E, 0x00,
+    0x00, 0x1E, 0xEE, 0xF0, 0x06, 0x37, 0xBD, 0xF0, 0x18, 0x6F, 0x7F, 0xEC, 0x9B, 0x37, 0xB3, 0x00, 0x00, 0xFE, 0xEE, 0xFE, 0x06, 0x37, 0xBD, 0xE0, 0x1F, 0x6C, 0x66, 0x6D, 0xD8, 0x36, 0x33, 0x00,
+    0x00, 0x1E, 0xEE, 0xF0, 0x06, 0x36, 0xED, 0xF0, 0x1F, 0x6C, 0x66, 0x6D, 0x59, 0xF6, 0x3E, 0x00, 0x00, 0x1F, 0x6D, 0xF0, 0x06, 0x36, 0xED, 0xB8, 0x18, 0x6C, 0x66, 0x67, 0x73, 0x36, 0x30, 0x00,
+    0x00, 0xFF, 0x83, 0xFE, 0x03, 0xE6, 0x4D, 0x9C, 0x18, 0x6C, 0x66, 0x67, 0x73, 0x36, 0x1F, 0x00, 0x00, 0x1F, 0xEF, 0xF0, 0x01, 0xC6, 0x0D, 0x8C, 0x18, 0x6C, 0x66, 0x62, 0x21, 0xD6, 0x0E, 0x00,
+    0x00, 0xFF, 0xEF, 0xFE, 0x00, 0x60, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x1F, 0xFF, 0xF0, 0x00, 0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x1F, 0xFF, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0F, 0xFF, 0xE0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x02, 0x92, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0x92, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x02, 0x92, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
+};
diff --git a/qmk/quantum/visualizer/visualizer.c b/qmk/quantum/visualizer/visualizer.c
index 9e9cb6d4..709affbb 100644
--- a/qmk/quantum/visualizer/visualizer.c
+++ b/qmk/quantum/visualizer/visualizer.c
@@ -26,7 +26,7 @@ SOFTWARE.
 #include "visualizer.h"
 #include <string.h>
 #ifdef PROTOCOL_CHIBIOS
-#    include "ch.h"
+#    include <ch.h>
 #endif
 
 #include "gfx.h"
diff --git a/qmk/quantum/visualizer/visualizer.mk b/qmk/quantum/visualizer/visualizer.mk
index 3bf3f7de..4c961ac5 100644
--- a/qmk/quantum/visualizer/visualizer.mk
+++ b/qmk/quantum/visualizer/visualizer.mk
@@ -58,12 +58,14 @@ ULIBS += -lm
 endif
 
 ifeq ($(strip $(LCD_ENABLE)), yes)
-SRC += $(VISUALIZER_DIR)/lcd_backlight.c
-SRC += $(VISUALIZER_DIR)/lcd_keyframes.c
-SRC += $(VISUALIZER_DIR)/lcd_backlight_keyframes.c
+    SRC += $(VISUALIZER_DIR)/lcd_keyframes.c
+    ifeq ($(strip $(LCD_BACKLIGHT_ENABLE)), yes)
+        OPT_DEFS += -DLCD_BACKLIGHT_ENABLE
+        SRC += $(VISUALIZER_DIR)/lcd_backlight.c
+        SRC += $(VISUALIZER_DIR)/lcd_backlight_keyframes.c
+    endif
 # Note, that the linker will strip out any resources that are not actually in use
 SRC += $(VISUALIZER_DIR)/resources/lcd_logo.c
-OPT_DEFS += -DLCD_BACKLIGHT_ENABLE
 $(eval $(call ADD_DRIVER,LCD))
 endif
 
diff --git a/qmk/requirements.txt b/qmk/requirements.txt
index d2080357..6e907cf8 100644
--- a/qmk/requirements.txt
+++ b/qmk/requirements.txt
@@ -1,7 +1,7 @@
 # Python requirements
-# milc FIXME(skullydazed): Included in the repo for now.
 appdirs
 argcomplete
 colorama
 hjson
+milc
 pygments
diff --git a/qmk/shell.nix b/qmk/shell.nix
index 6c828524..7814a10d 100644
--- a/qmk/shell.nix
+++ b/qmk/shell.nix
@@ -16,6 +16,25 @@ let
       inherit pname version;
       sha256 = "1yaimcgz8w0ps1wk28wk9g9zdidp79d14xqqj9rjkvxalvx2f5qx";
     };
+
+    doCheck = false;
+  };
+
+  milc = with pkgs.python3Packages; buildPythonPackage rec {
+    pname = "milc";
+    version = "1.0.10";
+
+    src = fetchPypi {
+      inherit pname version;
+      sha256 = "1q1p7qrqk78mw67nhv04zgxaq8himmdxmy2vp4fmi7chwgcbpi32";
+    };
+
+    propagatedBuildInputs = [
+      appdirs
+      argcomplete
+      colorama
+    ];
+
     doCheck = false;
   };
 
@@ -25,6 +44,7 @@ let
     argcomplete
     colorama
     hjson
+    milc
     pygments
     # requirements-dev.txt
     nose2
diff --git a/qmk/show_options.mk b/qmk/show_options.mk
index 2a578177..df3d0395 100644
--- a/qmk/show_options.mk
+++ b/qmk/show_options.mk
@@ -20,6 +20,7 @@ HARDWARE_OPTION_NAMES = \
   RGBLIGHT_ENABLE \
   RGBLIGHT_CUSTOM_DRIVER \
   RGB_MATRIX_ENABLE \
+  RGB_MATRIX_DRIVER \
   SERIAL_LINK_ENABLE \
   CIE1931_CURVE \
   MIDI_ENABLE \
diff --git a/qmk/testlist.mk b/qmk/testlist.mk
index d949fb3e..ca140880 100644
--- a/qmk/testlist.mk
+++ b/qmk/testlist.mk
@@ -1,6 +1,7 @@
 TEST_LIST = $(notdir $(patsubst %/rules.mk,%,$(wildcard $(ROOT_DIR)/tests/*/rules.mk)))
 FULL_TESTS := $(TEST_LIST)
 
+include $(ROOT_DIR)/quantum/sequencer/tests/testlist.mk
 include $(ROOT_DIR)/quantum/serial_link/tests/testlist.mk
 
 define VALIDATE_TEST_LIST
diff --git a/qmk/tmk_core/chibios.mk b/qmk/tmk_core/chibios.mk
index 2bd53f0d..e53edcce 100644
--- a/qmk/tmk_core/chibios.mk
+++ b/qmk/tmk_core/chibios.mk
@@ -123,6 +123,8 @@ else ifneq ("$(wildcard $(KEYBOARD_PATH_1)/chconf.h)","")
     CHCONFDIR = $(KEYBOARD_PATH_1)
 else ifneq ("$(wildcard $(TOP_DIR)/platforms/chibios/$(BOARD)/configs/chconf.h)","")
     CHCONFDIR = $(TOP_DIR)/platforms/chibios/$(BOARD)/configs
+else ifneq ("$(wildcard $(TOP_DIR)/platforms/chibios/common/configs/chconf.h)","")
+    CHCONFDIR = $(TOP_DIR)/platforms/chibios/common/configs
 endif
 
 ifneq ("$(wildcard $(KEYBOARD_PATH_5)/halconf.h)","")
@@ -137,6 +139,8 @@ else ifneq ("$(wildcard $(KEYBOARD_PATH_1)/halconf.h)","")
     HALCONFDIR = $(KEYBOARD_PATH_1)
 else ifneq ("$(wildcard $(TOP_DIR)/platforms/chibios/$(BOARD)/configs/halconf.h)","")
     HALCONFDIR = $(TOP_DIR)/platforms/chibios/$(BOARD)/configs
+else ifneq ("$(wildcard $(TOP_DIR)/platforms/chibios/common/configs/halconf.h)","")
+    HALCONFDIR = $(TOP_DIR)/platforms/chibios/common/configs
 endif
 
 # HAL-OSAL files (optional).
@@ -183,8 +187,8 @@ else ifneq ("$(wildcard $(KEYBOARD_PATH_2)/ld/$(MCU_LDSCRIPT).ld)","")
     LDSCRIPT = $(KEYBOARD_PATH_2)/ld/$(MCU_LDSCRIPT).ld
 else ifneq ("$(wildcard $(KEYBOARD_PATH_1)/ld/$(MCU_LDSCRIPT).ld)","")
     LDSCRIPT = $(KEYBOARD_PATH_1)/ld/$(MCU_LDSCRIPT).ld
-else ifneq ("$(wildcard $(TOP_DIR)/platforms/chibios/ld/$(MCU_LDSCRIPT).ld)","")
-    LDSCRIPT = $(TOP_DIR)/platforms/chibios/ld/$(MCU_LDSCRIPT).ld
+else ifneq ("$(wildcard $(TOP_DIR)/platforms/chibios/common/ld/$(MCU_LDSCRIPT).ld)","")
+    LDSCRIPT = $(TOP_DIR)/platforms/chibios/common/ld/$(MCU_LDSCRIPT).ld
 else ifneq ("$(wildcard $(STARTUPLD_CONTRIB)/$(MCU_LDSCRIPT).ld)","")
     LDSCRIPT = $(STARTUPLD_CONTRIB)/$(MCU_LDSCRIPT).ld
     USE_CHIBIOS_CONTRIB = yes
@@ -209,6 +213,8 @@ CHIBISRC := $(patsubst $(TOP_DIR)/%,%,$(CHIBISRC))
 
 EXTRAINCDIRS += $(CHIBIOS)/os/license $(CHIBIOS)/os/oslib/include \
          $(TOP_DIR)/platforms/chibios/$(BOARD)/configs \
+         $(TOP_DIR)/platforms/chibios/common/configs \
+         $(HALCONFDIR) $(CHCONFDIR) \
          $(STARTUPINC) $(KERNINC) $(PORTINC) $(OSALINC) \
          $(HALINC) $(PLATFORMINC) $(BOARDINC) $(TESTINC) \
          $(STREAMSINC) $(CHIBIOS)/os/various $(COMMON_VPATH)
diff --git a/qmk/tmk_core/common/action.c b/qmk/tmk_core/common/action.c
index ee9aa0df..a7432bae 100644
--- a/qmk/tmk_core/common/action.c
+++ b/qmk/tmk_core/common/action.c
@@ -37,20 +37,28 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #    include "nodebug.h"
 #endif
 
+#ifdef POINTING_DEVICE_ENABLE
+#    include "pointing_device.h"
+#endif
+
 int tp_buttons;
 
-#ifdef RETRO_TAPPING
+#if defined(RETRO_TAPPING) || defined(RETRO_TAPPING_PER_KEY)
 int retro_tapping_counter = 0;
 #endif
 
 #ifdef FAUXCLICKY_ENABLE
-#    include <fauxclicky.h>
+#    include "fauxclicky.h"
 #endif
 
 #ifdef IGNORE_MOD_TAP_INTERRUPT_PER_KEY
 __attribute__((weak)) bool get_ignore_mod_tap_interrupt(uint16_t keycode, keyrecord_t *record) { return false; }
 #endif
 
+#ifdef RETRO_TAPPING_PER_KEY
+__attribute__((weak)) bool get_retro_tapping(uint16_t keycode, keyrecord_t *record) { return false; }
+#endif
+
 #ifndef TAP_CODE_DELAY
 #    define TAP_CODE_DELAY 0
 #endif
@@ -67,7 +75,7 @@ void action_exec(keyevent_t event) {
         dprint("EVENT: ");
         debug_event(event);
         dprintln();
-#ifdef RETRO_TAPPING
+#if defined(RETRO_TAPPING) || defined(RETRO_TAPPING_PER_KEY)
         retro_tapping_counter++;
 #endif
     }
@@ -220,6 +228,19 @@ void process_record_handler(keyrecord_t *record) {
     process_action(record, action);
 }
 
+#if defined(PS2_MOUSE_ENABLE) || defined(POINTING_DEVICE_ENABLE)
+void register_button(bool pressed, enum mouse_buttons button) {
+#    ifdef PS2_MOUSE_ENABLE
+    tp_buttons = pressed ? tp_buttons | button : tp_buttons & ~button;
+#    endif
+#    ifdef POINTING_DEVICE_ENABLE
+    report_mouse_t currentReport = pointing_device_get_report();
+    currentReport.buttons        = pressed ? currentReport.buttons | button : currentReport.buttons & ~button;
+    pointing_device_set_report(currentReport);
+#    endif
+}
+#endif
+
 /** \brief Take an action and processes it.
  *
  * FIXME: Needs documentation.
@@ -404,15 +425,23 @@ void process_action(keyrecord_t *record, action_t action) {
             if (event.pressed) {
                 mousekey_on(action.key.code);
                 switch (action.key.code) {
-#    ifdef PS2_MOUSE_ENABLE
+#    if defined(PS2_MOUSE_ENABLE) || defined(POINTING_DEVICE_ENABLE)
                     case KC_MS_BTN1:
-                        tp_buttons |= (1 << 0);
+                        register_button(true, MOUSE_BTN1);
                         break;
                     case KC_MS_BTN2:
-                        tp_buttons |= (1 << 1);
+                        register_button(true, MOUSE_BTN2);
                         break;
                     case KC_MS_BTN3:
-                        tp_buttons |= (1 << 2);
+                        register_button(true, MOUSE_BTN3);
+                        break;
+#    endif
+#    ifdef POINTING_DEVICE_ENABLE
+                    case KC_MS_BTN4:
+                        register_button(true, MOUSE_BTN4);
+                        break;
+                    case KC_MS_BTN5:
+                        register_button(true, MOUSE_BTN5);
                         break;
 #    endif
                     default:
@@ -422,15 +451,23 @@ void process_action(keyrecord_t *record, action_t action) {
             } else {
                 mousekey_off(action.key.code);
                 switch (action.key.code) {
-#    ifdef PS2_MOUSE_ENABLE
+#    if defined(PS2_MOUSE_ENABLE) || defined(POINTING_DEVICE_ENABLE)
                     case KC_MS_BTN1:
-                        tp_buttons &= ~(1 << 0);
+                        register_button(false, MOUSE_BTN1);
                         break;
                     case KC_MS_BTN2:
-                        tp_buttons &= ~(1 << 1);
+                        register_button(false, MOUSE_BTN2);
                         break;
                     case KC_MS_BTN3:
-                        tp_buttons &= ~(1 << 2);
+                        register_button(false, MOUSE_BTN3);
+                        break;
+#    endif
+#    ifdef POINTING_DEVICE_ENABLE
+                    case KC_MS_BTN4:
+                        register_button(false, MOUSE_BTN4);
+                        break;
+                    case KC_MS_BTN5:
+                        register_button(false, MOUSE_BTN5);
                         break;
 #    endif
                     default:
@@ -692,20 +729,23 @@ void process_action(keyrecord_t *record, action_t action) {
 #endif
 
 #ifndef NO_ACTION_TAPPING
-#    ifdef RETRO_TAPPING
+#    if defined(RETRO_TAPPING) || defined(RETRO_TAPPING_PER_KEY)
     if (!is_tap_action(action)) {
         retro_tapping_counter = 0;
     } else {
         if (event.pressed) {
             if (tap_count > 0) {
                 retro_tapping_counter = 0;
-            } else {
             }
         } else {
             if (tap_count > 0) {
                 retro_tapping_counter = 0;
             } else {
-                if (retro_tapping_counter == 2) {
+                if (
+#        ifdef RETRO_TAPPING_PER_KEY
+                    get_retro_tapping(get_event_keycode(record->event, false), record) &&
+#        endif
+                    retro_tapping_counter == 2) {
                     tap_code(action.layer_tap.code);
                 }
                 retro_tapping_counter = 0;
diff --git a/qmk/tmk_core/common/action_util.c b/qmk/tmk_core/common/action_util.c
index fd0e4409..000503b0 100644
--- a/qmk/tmk_core/common/action_util.c
+++ b/qmk/tmk_core/common/action_util.c
@@ -290,6 +290,32 @@ void set_macro_mods(uint8_t mods) { macro_mods = mods; }
 void clear_macro_mods(void) { macro_mods = 0; }
 
 #ifndef NO_ACTION_ONESHOT
+/** \brief get oneshot mods
+ *
+ * FIXME: needs doc
+ */
+uint8_t get_oneshot_mods(void) { return oneshot_mods; }
+
+void add_oneshot_mods(uint8_t mods) {
+    if ((oneshot_mods & mods) != mods) {
+#    if (defined(ONESHOT_TIMEOUT) && (ONESHOT_TIMEOUT > 0))
+        oneshot_time = timer_read();
+#    endif
+        oneshot_mods |= mods;
+        oneshot_mods_changed_kb(mods);
+    }
+}
+
+void del_oneshot_mods(uint8_t mods) {
+    if (oneshot_mods & mods) {
+        oneshot_mods &= ~mods;
+#    if (defined(ONESHOT_TIMEOUT) && (ONESHOT_TIMEOUT > 0))
+        oneshot_time = oneshot_mods ? timer_read() : 0;
+#    endif
+        oneshot_mods_changed_kb(oneshot_mods);
+    }
+}
+
 /** \brief set oneshot mods
  *
  * FIXME: needs doc
@@ -316,11 +342,6 @@ void clear_oneshot_mods(void) {
         oneshot_mods_changed_kb(oneshot_mods);
     }
 }
-/** \brief get oneshot mods
- *
- * FIXME: needs doc
- */
-uint8_t get_oneshot_mods(void) { return oneshot_mods; }
 #endif
 
 /** \brief Called when the one shot modifiers have been changed.
diff --git a/qmk/tmk_core/common/action_util.h b/qmk/tmk_core/common/action_util.h
index 5dd8393d..743ff140 100644
--- a/qmk/tmk_core/common/action_util.h
+++ b/qmk/tmk_core/common/action_util.h
@@ -57,12 +57,11 @@ void    set_macro_mods(uint8_t mods);
 void    clear_macro_mods(void);
 
 /* oneshot modifier */
-void    set_oneshot_mods(uint8_t mods);
 uint8_t get_oneshot_mods(void);
+void    add_oneshot_mods(uint8_t mods);
+void    del_oneshot_mods(uint8_t mods);
+void    set_oneshot_mods(uint8_t mods);
 void    clear_oneshot_mods(void);
-void    oneshot_toggle(void);
-void    oneshot_enable(void);
-void    oneshot_disable(void);
 bool    has_oneshot_mods_timed_out(void);
 
 uint8_t get_oneshot_locked_mods(void);
diff --git a/qmk/tmk_core/common/arm_atsam/suspend.c b/qmk/tmk_core/common/arm_atsam/suspend.c
index d1077be4..e5142612 100644
--- a/qmk/tmk_core/common/arm_atsam/suspend.c
+++ b/qmk/tmk_core/common/arm_atsam/suspend.c
@@ -1,6 +1,6 @@
 #include "matrix.h"
 #include "i2c_master.h"
-#include "led_matrix.h"
+#include "md_rgb_matrix.h"
 #include "suspend.h"
 
 /** \brief Suspend idle
diff --git a/qmk/tmk_core/common/bootmagic_lite.c b/qmk/tmk_core/common/bootmagic_lite.c
index 38275cdd..cbf756a1 100644
--- a/qmk/tmk_core/common/bootmagic_lite.c
+++ b/qmk/tmk_core/common/bootmagic_lite.c
@@ -1,7 +1,5 @@
 #include "quantum.h"
 
-bool is_keyboard_left(void);
-
 /** \brief Reset eeprom
  *
  * ...just incase someone wants to only change the eeprom behaviour
@@ -48,4 +46,4 @@ __attribute__((weak)) void bootmagic_lite(void) {
         // Jump to bootloader.
         bootloader_jump();
     }
-}
\ No newline at end of file
+}
diff --git a/qmk/tmk_core/common/chibios/bootloader.c b/qmk/tmk_core/common/chibios/bootloader.c
index 7b2cf5c4..6cabcc4b 100644
--- a/qmk/tmk_core/common/chibios/bootloader.c
+++ b/qmk/tmk_core/common/chibios/bootloader.c
@@ -1,7 +1,7 @@
 #include "bootloader.h"
 
-#include "ch.h"
-#include "hal.h"
+#include <ch.h>
+#include <hal.h>
 #include "wait.h"
 
 /* This code should be checked whether it runs correctly on platforms */
@@ -32,7 +32,7 @@
 
 extern uint32_t __ram0_end__;
 
-void bootloader_jump(void) {
+__attribute__((weak)) void bootloader_jump(void) {
     // For STM32 MCUs with dual-bank flash, and we're incapable of jumping to the bootloader. The first valid flash
     // bank is executed unconditionally after a reset, so it doesn't enter DFU unless BOOT0 is high. Instead, we do
     // it with hardware...in this case, we pull a GPIO high/low depending on the configuration, connects 3.3V to
@@ -58,7 +58,7 @@ void enter_bootloader_mode_if_requested(void) {}  // not needed at all, but if a
 
 extern uint32_t __ram0_end__;
 
-void bootloader_jump(void) {
+__attribute__((weak)) void bootloader_jump(void) {
     *MAGIC_ADDR = BOOTLOADER_MAGIC;  // set magic flag => reset handler will jump into boot loader
     NVIC_SystemReset();
 }
@@ -85,8 +85,8 @@ void enter_bootloader_mode_if_requested(void) {
 #    if defined(BOOTLOADER_KIIBOHD)
 /* Kiibohd Bootloader (MCHCK and Infinity KB) */
 #        define SCB_AIRCR_VECTKEY_WRITEMAGIC 0x05FA0000
-const uint8_t sys_reset_to_loader_magic[] = "\xff\x00\x7fRESET TO LOADER\x7f\x00\xff";
-void          bootloader_jump(void) {
+const uint8_t              sys_reset_to_loader_magic[] = "\xff\x00\x7fRESET TO LOADER\x7f\x00\xff";
+__attribute__((weak)) void bootloader_jump(void) {
     __builtin_memcpy((void *)VBAT, (const void *)sys_reset_to_loader_magic, sizeof(sys_reset_to_loader_magic));
     // request reset
     SCB->AIRCR = SCB_AIRCR_VECTKEY_WRITEMAGIC | SCB_AIRCR_SYSRESETREQ_Msk;
@@ -95,7 +95,7 @@ void          bootloader_jump(void) {
 #    else /* defined(BOOTLOADER_KIIBOHD) */
 /* Default for Kinetis - expecting an ARM Teensy */
 #        include "wait.h"
-void bootloader_jump(void) {
+__attribute__((weak)) void bootloader_jump(void) {
     wait_ms(100);
     __BKPT(0);
 }
diff --git a/qmk/tmk_core/common/chibios/eeprom_stm32.h b/qmk/tmk_core/common/chibios/eeprom_stm32.h
index ea0ce064..373325cd 100644
--- a/qmk/tmk_core/common/chibios/eeprom_stm32.h
+++ b/qmk/tmk_core/common/chibios/eeprom_stm32.h
@@ -24,8 +24,8 @@
 #ifndef __EEPROM_H
 #define __EEPROM_H
 
-#include "ch.h"
-#include "hal.h"
+#include <ch.h>
+#include <hal.h>
 #include "flash_stm32.h"
 
 // HACK ALERT. This definition may not match your processor
diff --git a/qmk/tmk_core/common/chibios/eeprom_teensy.c b/qmk/tmk_core/common/chibios/eeprom_teensy.c
index d436d0cb..e135e19a 100644
--- a/qmk/tmk_core/common/chibios/eeprom_teensy.c
+++ b/qmk/tmk_core/common/chibios/eeprom_teensy.c
@@ -1,5 +1,5 @@
-#include "ch.h"
-#include "hal.h"
+#include <ch.h>
+#include <hal.h>
 
 #include "eeconfig.h"
 
diff --git a/qmk/tmk_core/common/chibios/flash_stm32.h b/qmk/tmk_core/common/chibios/flash_stm32.h
index 33ab7867..8a874f60 100644
--- a/qmk/tmk_core/common/chibios/flash_stm32.h
+++ b/qmk/tmk_core/common/chibios/flash_stm32.h
@@ -23,8 +23,8 @@
 extern "C" {
 #endif
 
-#include "ch.h"
-#include "hal.h"
+#include <ch.h>
+#include <hal.h>
 
 typedef enum { FLASH_BUSY = 1, FLASH_ERROR_PG, FLASH_ERROR_WRP, FLASH_ERROR_OPT, FLASH_COMPLETE, FLASH_TIMEOUT, FLASH_BAD_ADDRESS } FLASH_Status;
 
diff --git a/qmk/tmk_core/common/chibios/sleep_led.c b/qmk/tmk_core/common/chibios/sleep_led.c
index df1a1b5f..18c6d6e1 100644
--- a/qmk/tmk_core/common/chibios/sleep_led.c
+++ b/qmk/tmk_core/common/chibios/sleep_led.c
@@ -1,5 +1,5 @@
-#include "ch.h"
-#include "hal.h"
+#include <ch.h>
+#include <hal.h>
 
 #include "led.h"
 #include "sleep_led.h"
diff --git a/qmk/tmk_core/common/chibios/suspend.c b/qmk/tmk_core/common/chibios/suspend.c
index 64dfc05a..24efb0ac 100644
--- a/qmk/tmk_core/common/chibios/suspend.c
+++ b/qmk/tmk_core/common/chibios/suspend.c
@@ -1,7 +1,7 @@
 /* TODO */
 
-#include "ch.h"
-#include "hal.h"
+#include <ch.h>
+#include <hal.h>
 
 #include "matrix.h"
 #include "action.h"
diff --git a/qmk/tmk_core/common/chibios/timer.c b/qmk/tmk_core/common/chibios/timer.c
index ac5a5af6..9f664e1f 100644
--- a/qmk/tmk_core/common/chibios/timer.c
+++ b/qmk/tmk_core/common/chibios/timer.c
@@ -1,4 +1,4 @@
-#include "ch.h"
+#include <ch.h>
 
 #include "timer.h"
 
diff --git a/qmk/tmk_core/common/eeconfig.c b/qmk/tmk_core/common/eeconfig.c
index fe56c57d..5e3ebe6e 100644
--- a/qmk/tmk_core/common/eeconfig.c
+++ b/qmk/tmk_core/common/eeconfig.c
@@ -5,7 +5,7 @@
 #include "action_layer.h"
 
 #ifdef STM32_EEPROM_ENABLE
-#    include "hal.h"
+#    include <hal.h>
 #    include "eeprom_stm32.h"
 #endif
 
@@ -13,6 +13,10 @@
 #    include "eeprom_driver.h"
 #endif
 
+#if defined(HAPTIC_ENABLE)
+#    include "haptic.h"
+#endif
+
 /** \brief eeconfig enable
  *
  * FIXME: needs doc
@@ -65,6 +69,15 @@ void eeconfig_init_quantum(void) {
     eeprom_update_byte(EECONFIG_HANDEDNESS, 0);
 #endif
 
+#if defined(HAPTIC_ENABLE)
+    haptic_reset();
+#else
+    // this is used in case haptic is disabled, but we still want sane defaults
+    // in the haptic configuration eeprom. All zero will trigger a haptic_reset
+    // when a haptic-enabled firmware is loaded onto the keyboard.
+    eeprom_update_dword(EECONFIG_HAPTIC, 0);
+#endif
+
     eeconfig_init_kb();
 }
 
diff --git a/qmk/tmk_core/common/keyboard.c b/qmk/tmk_core/common/keyboard.c
index a45af56d..8c7bdc8b 100644
--- a/qmk/tmk_core/common/keyboard.c
+++ b/qmk/tmk_core/common/keyboard.c
@@ -222,6 +222,12 @@ void keyboard_setup(void) {
  */
 __attribute__((weak)) bool is_keyboard_master(void) { return true; }
 
+/** \brief is_keyboard_left
+ *
+ * FIXME: needs doc
+ */
+__attribute__((weak)) bool is_keyboard_left(void) { return true; }
+
 /** \brief should_process_keypress
  *
  * Override this function if you have a condition where keypresses processing should change:
@@ -229,6 +235,20 @@ __attribute__((weak)) bool is_keyboard_master(void) { return true; }
  */
 __attribute__((weak)) bool should_process_keypress(void) { return is_keyboard_master(); }
 
+/** \brief housekeeping_task_kb
+ *
+ * Override this function if you have a need to execute code for every keyboard main loop iteration.
+ * This is specific to keyboard-level functionality.
+ */
+__attribute__((weak)) void housekeeping_task_kb(void) {}
+
+/** \brief housekeeping_task_user
+ *
+ * Override this function if you have a need to execute code for every keyboard main loop iteration.
+ * This is specific to user/keymap-level functionality.
+ */
+__attribute__((weak)) void housekeeping_task_user(void) {}
+
 /** \brief keyboard_init
  *
  * FIXME: needs doc
@@ -285,6 +305,10 @@ void keyboard_init(void) {
     dip_switch_init();
 #endif
 
+#if defined(DEBUG_MATRIX_SCAN_RATE) && defined(CONSOLE_ENABLE)
+    debug_enable = true;
+#endif
+
     keyboard_post_init_kb(); /* Always keep this last */
 }
 
@@ -309,6 +333,9 @@ void keyboard_task(void) {
     uint8_t keys_processed = 0;
 #endif
 
+    housekeeping_task_kb();
+    housekeeping_task_user();
+
 #if defined(OLED_DRIVER_ENABLE) && !defined(OLED_DISABLE_TIMEOUT)
     uint8_t ret = matrix_scan();
 #else
diff --git a/qmk/tmk_core/common/keyboard.h b/qmk/tmk_core/common/keyboard.h
index 98ceca49..caa18e7e 100644
--- a/qmk/tmk_core/common/keyboard.h
+++ b/qmk/tmk_core/common/keyboard.h
@@ -63,12 +63,17 @@ void keyboard_task(void);
 void keyboard_set_leds(uint8_t leds);
 /* it runs whenever code has to behave differently on a slave */
 bool is_keyboard_master(void);
+/* it runs whenever code has to behave differently on left vs right split */
+bool is_keyboard_left(void);
 
 void keyboard_pre_init_kb(void);
 void keyboard_pre_init_user(void);
 void keyboard_post_init_kb(void);
 void keyboard_post_init_user(void);
 
+void housekeeping_task_kb(void);
+void housekeeping_task_user(void);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/qmk/tmk_core/common/led.h b/qmk/tmk_core/common/led.h
index 99028286..0fe38ea0 100644
--- a/qmk/tmk_core/common/led.h
+++ b/qmk/tmk_core/common/led.h
@@ -15,10 +15,10 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#ifndef LED_H
-#define LED_H
-#include "stdint.h"
-#include "stdbool.h"
+#pragma once
+
+#include <stdint.h>
+#include <stdbool.h>
 
 /* FIXME: Add doxygen comments here. */
 
@@ -52,5 +52,3 @@ void led_init_ports(void);
 #ifdef __cplusplus
 }
 #endif
-
-#endif
diff --git a/qmk/tmk_core/common/matrix.h b/qmk/tmk_core/common/matrix.h
index 78506059..31ec8443 100644
--- a/qmk/tmk_core/common/matrix.h
+++ b/qmk/tmk_core/common/matrix.h
@@ -30,16 +30,6 @@ typedef uint32_t matrix_row_t;
 #    error "MATRIX_COLS: invalid value"
 #endif
 
-#if (MATRIX_ROWS <= 8)
-typedef uint8_t matrix_col_t;
-#elif (MATRIX_ROWS <= 16)
-typedef uint16_t matrix_col_t;
-#elif (MATRIX_ROWS <= 32)
-typedef uint32_t matrix_col_t;
-#else
-#    error "MATRIX_ROWS: invalid value"
-#endif
-
 #define MATRIX_ROW_SHIFTER ((matrix_row_t)1)
 
 #define MATRIX_IS_ON(row, col) (matrix_get_row(row) && (1 << col))
diff --git a/qmk/tmk_core/common/report.h b/qmk/tmk_core/common/report.h
index 1aa33c99..610addf4 100644
--- a/qmk/tmk_core/common/report.h
+++ b/qmk/tmk_core/common/report.h
@@ -192,7 +192,11 @@ typedef struct {
 
 typedef struct {
 #if JOYSTICK_AXES_COUNT > 0
+#    if JOYSTICK_AXES_RESOLUTION > 8
+    int16_t axes[JOYSTICK_AXES_COUNT];
+#    else
     int8_t axes[JOYSTICK_AXES_COUNT];
+#    endif
 #endif
 
 #if JOYSTICK_BUTTON_COUNT > 0
diff --git a/qmk/tmk_core/common/timer.h b/qmk/tmk_core/common/timer.h
index 52bc1cc6..7ee7feac 100644
--- a/qmk/tmk_core/common/timer.h
+++ b/qmk/tmk_core/common/timer.h
@@ -45,8 +45,8 @@ uint16_t timer_elapsed(uint16_t last);
 uint32_t timer_elapsed32(uint32_t last);
 
 // Utility functions to check if a future time has expired & autmatically handle time wrapping if checked / reset frequently (half of max value)
-#define timer_expired(current, future) (((uint16_t)current - (uint16_t)future) < 0x8000)
-#define timer_expired32(current, future) (((uint32_t)current - (uint32_t)future) < 0x80000000)
+#define timer_expired(current, future) ((uint16_t)(current - future) < UINT16_MAX / 2)
+#define timer_expired32(current, future) ((uint32_t)(current - future) < UINT32_MAX / 2)
 
 #ifdef __cplusplus
 }
diff --git a/qmk/tmk_core/common/wait.h b/qmk/tmk_core/common/wait.h
index c82cd2d6..f5ef12ac 100644
--- a/qmk/tmk_core/common/wait.h
+++ b/qmk/tmk_core/common/wait.h
@@ -12,7 +12,7 @@ extern "C" {
 #    define wait_ms(ms) _delay_ms(ms)
 #    define wait_us(us) _delay_us(us)
 #elif defined PROTOCOL_CHIBIOS
-#    include "ch.h"
+#    include <ch.h>
 #    define wait_ms(ms)                     \
         do {                                \
             if (ms != 0) {                  \
diff --git a/qmk/tmk_core/protocol/arm_atsam.mk b/qmk/tmk_core/protocol/arm_atsam.mk
index 8d6f724f..5bb45d65 100644
--- a/qmk/tmk_core/protocol/arm_atsam.mk
+++ b/qmk/tmk_core/protocol/arm_atsam.mk
@@ -4,9 +4,9 @@ SRC += $(ARM_ATSAM_DIR)/adc.c
 SRC += $(ARM_ATSAM_DIR)/clks.c
 SRC += $(ARM_ATSAM_DIR)/d51_util.c
 SRC += $(ARM_ATSAM_DIR)/i2c_master.c
-ifeq ($(RGB_MATRIX_ENABLE),custom)
-  SRC += $(ARM_ATSAM_DIR)/led_matrix_programs.c
-  SRC += $(ARM_ATSAM_DIR)/led_matrix.c
+ifeq ($(RGB_MATRIX_DRIVER),custom)
+  SRC += $(ARM_ATSAM_DIR)/md_rgb_matrix_programs.c
+  SRC += $(ARM_ATSAM_DIR)/md_rgb_matrix.c
 endif
 SRC += $(ARM_ATSAM_DIR)/main_arm_atsam.c
 SRC += $(ARM_ATSAM_DIR)/spi.c
diff --git a/qmk/tmk_core/protocol/arm_atsam/arm_atsam_protocol.h b/qmk/tmk_core/protocol/arm_atsam/arm_atsam_protocol.h
index 8cb00b87..d126c66e 100644
--- a/qmk/tmk_core/protocol/arm_atsam/arm_atsam_protocol.h
+++ b/qmk/tmk_core/protocol/arm_atsam/arm_atsam_protocol.h
@@ -35,7 +35,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #    include "main_arm_atsam.h"
 #    ifdef RGB_MATRIX_ENABLE
-#        include "led_matrix.h"
+#        include "md_rgb_matrix.h"
 #        include "rgb_matrix.h"
 #    endif
 #    include "issi3733_driver.h"
diff --git a/qmk/tmk_core/protocol/arm_atsam/main_arm_atsam.c b/qmk/tmk_core/protocol/arm_atsam/main_arm_atsam.c
index e4e79d35..e10be52f 100644
--- a/qmk/tmk_core/protocol/arm_atsam/main_arm_atsam.c
+++ b/qmk/tmk_core/protocol/arm_atsam/main_arm_atsam.c
@@ -305,6 +305,10 @@ int main(void) {
             // dprintf("5v=%u 5vu=%u dlow=%u dhi=%u gca=%u gcd=%u\r\n", v_5v, v_5v_avg, v_5v_avg - V5_LOW, v_5v_avg - V5_HIGH, gcr_actual, gcr_desired);
         }
 #endif  // CONSOLE_ENABLE
+
+        // Run housekeeping
+        housekeeping_task_kb();
+        housekeeping_task_user();
     }
 
     return 1;
diff --git a/qmk/tmk_core/protocol/arm_atsam/md_rgb_matrix.c b/qmk/tmk_core/protocol/arm_atsam/md_rgb_matrix.c
new file mode 100644
index 00000000..439aaf8b
--- /dev/null
+++ b/qmk/tmk_core/protocol/arm_atsam/md_rgb_matrix.c
@@ -0,0 +1,472 @@
+/*
+Copyright 2018 Massdrop Inc.
+
+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 "arm_atsam_protocol.h"
+#include "tmk_core/common/led.h"
+#include "rgb_matrix.h"
+#include <string.h>
+#include <math.h>
+
+#ifdef USE_MASSDROP_CONFIGURATOR
+__attribute__((weak)) led_instruction_t led_instructions[] = {{.end = 1}};
+static void                             md_rgb_matrix_config_override(int i);
+#endif  // USE_MASSDROP_CONFIGURATOR
+
+void SERCOM1_0_Handler(void) {
+    if (SERCOM1->I2CM.INTFLAG.bit.ERROR) {
+        SERCOM1->I2CM.INTFLAG.reg = SERCOM_I2CM_INTENCLR_ERROR;
+    }
+}
+
+void DMAC_0_Handler(void) {
+    if (DMAC->Channel[0].CHINTFLAG.bit.TCMPL) {
+        DMAC->Channel[0].CHINTFLAG.reg = DMAC_CHINTENCLR_TCMPL;
+
+        i2c1_stop();
+
+        i2c_led_q_running = 0;
+
+        i2c_led_q_run();
+
+        return;
+    }
+
+    if (DMAC->Channel[0].CHINTFLAG.bit.TERR) {
+        DMAC->Channel[0].CHINTFLAG.reg = DMAC_CHINTENCLR_TERR;
+    }
+}
+
+issi3733_driver_t issidrv[ISSI3733_DRIVER_COUNT];
+
+issi3733_led_t led_map[ISSI3733_LED_COUNT] = ISSI3733_LED_MAP;
+RGB            led_buffer[ISSI3733_LED_COUNT];
+
+uint8_t gcr_desired;
+uint8_t gcr_actual;
+uint8_t gcr_actual_last;
+#ifdef USE_MASSDROP_CONFIGURATOR
+uint8_t gcr_breathe;
+float   breathe_mult;
+float   pomod;
+#endif
+
+#define ACT_GCR_NONE 0
+#define ACT_GCR_INC 1
+#define ACT_GCR_DEC 2
+
+#define LED_GCR_STEP_AUTO 2
+
+static uint8_t gcr_min_counter;
+static uint8_t v_5v_cat_hit;
+
+// WARNING: Automatic GCR is in place to prevent USB shutdown and LED driver overloading
+void gcr_compute(void) {
+    uint8_t action  = ACT_GCR_NONE;
+    uint8_t gcr_use = gcr_desired;
+
+#ifdef USE_MASSDROP_CONFIGURATOR
+    if (led_animation_breathing) {
+        gcr_use = gcr_breathe;
+    }
+#endif
+
+    // If the 5v takes a catastrophic hit, disable the LED drivers briefly, assert auto gcr mode, min gcr and let the auto take over
+    if (v_5v < V5_CAT) {
+        I2C3733_Control_Set(0);
+        // CDC_print("USB: WARNING: 5V catastrophic level reached! Disabling LED drivers!\r\n"); //Blocking print is bad here!
+        v_5v_cat_hit = 20;  //~100ms recover
+        gcr_actual   = 0;   // Minimize GCR
+        usb_gcr_auto = 1;   // Force auto mode enabled
+        return;
+    } else if (v_5v_cat_hit > 1) {
+        v_5v_cat_hit--;
+        return;
+    } else if (v_5v_cat_hit == 1) {
+        I2C3733_Control_Set(1);
+        CDC_print("USB: WARNING: Re-enabling LED drivers\r\n");
+        v_5v_cat_hit = 0;
+        return;
+    }
+
+    if (usb_gcr_auto) {
+        if (v_5v_avg < V5_LOW)
+            action = ACT_GCR_DEC;
+        else if (v_5v_avg > V5_HIGH && gcr_actual < gcr_use)
+            action = ACT_GCR_INC;
+        else if (gcr_actual > gcr_use)
+            action = ACT_GCR_DEC;
+    } else {
+        if (gcr_actual < gcr_use)
+            action = ACT_GCR_INC;
+        else if (gcr_actual > gcr_use)
+            action = ACT_GCR_DEC;
+    }
+
+    if (action == ACT_GCR_NONE) {
+        gcr_min_counter = 0;
+    } else if (action == ACT_GCR_INC) {
+        if (LED_GCR_STEP_AUTO > LED_GCR_MAX - gcr_actual)
+            gcr_actual = LED_GCR_MAX;  // Obey max and prevent wrapping
+        else
+            gcr_actual += LED_GCR_STEP_AUTO;
+        gcr_min_counter = 0;
+    } else if (action == ACT_GCR_DEC) {
+        if (LED_GCR_STEP_AUTO > gcr_actual)  // Prevent wrapping
+        {
+            gcr_actual = 0;
+            // At this point, power can no longer be cut from the LED drivers, so focus on cutting out extra port if active
+            if (usb_extra_state != USB_EXTRA_STATE_DISABLED_UNTIL_REPLUG)  // If not in a wait for replug state
+            {
+                if (usb_extra_state == USB_EXTRA_STATE_ENABLED)  // If extra usb is enabled
+                {
+                    gcr_min_counter++;
+                    if (gcr_min_counter > 200)  // 5ms per check = 1s delay
+                    {
+                        USB_ExtraSetState(USB_EXTRA_STATE_DISABLED_UNTIL_REPLUG);
+                        usb_extra_manual = 0;  // Force disable manual mode of extra port
+                        if (usb_extra_manual)
+                            CDC_print("USB: Disabling extra port until replug and manual mode toggle!\r\n");
+                        else
+                            CDC_print("USB: Disabling extra port until replug!\r\n");
+                    }
+                }
+            }
+        } else {
+            // Power successfully cut back from LED drivers
+            gcr_actual -= LED_GCR_STEP_AUTO;
+            gcr_min_counter = 0;
+
+#ifdef USE_MASSDROP_CONFIGURATOR
+            // If breathe mode is active, the top end can fluctuate if the host can not supply enough current
+            // So set the breathe GCR to where it becomes stable
+            if (led_animation_breathing == 1) {
+                gcr_breathe = gcr_actual;
+                // PS: At this point, setting breathing to exhale makes a noticebly shorter cycle
+                //    and the same would happen maybe one or two more times. Therefore I'm favoring
+                //    powering through one full breathe and letting gcr settle completely
+            }
+#endif
+        }
+    }
+}
+
+void issi3733_prepare_arrays(void) {
+    memset(issidrv, 0, sizeof(issi3733_driver_t) * ISSI3733_DRIVER_COUNT);
+
+    int     i;
+    uint8_t addrs[ISSI3733_DRIVER_COUNT] = ISSI3773_DRIVER_ADDRESSES;
+
+    for (i = 0; i < ISSI3733_DRIVER_COUNT; i++) {
+        issidrv[i].addr = addrs[i];
+    }
+
+    for (uint8_t i = 0; i < ISSI3733_LED_COUNT; i++) {
+        // BYTE: 1 + (SW-1)*16 + (CS-1)
+        led_map[i].rgb.g = issidrv[led_map[i].adr.drv - 1].pwm + 1 + ((led_map[i].adr.swg - 1) * 16 + (led_map[i].adr.cs - 1));
+        led_map[i].rgb.r = issidrv[led_map[i].adr.drv - 1].pwm + 1 + ((led_map[i].adr.swr - 1) * 16 + (led_map[i].adr.cs - 1));
+        led_map[i].rgb.b = issidrv[led_map[i].adr.drv - 1].pwm + 1 + ((led_map[i].adr.swb - 1) * 16 + (led_map[i].adr.cs - 1));
+
+        // BYTE: 1 + (SW-1)*2 + (CS-1)/8
+        // BIT: (CS-1)%8
+        *(issidrv[led_map[i].adr.drv - 1].onoff + 1 + (led_map[i].adr.swg - 1) * 2 + (led_map[i].adr.cs - 1) / 8) |= (1 << ((led_map[i].adr.cs - 1) % 8));
+        *(issidrv[led_map[i].adr.drv - 1].onoff + 1 + (led_map[i].adr.swr - 1) * 2 + (led_map[i].adr.cs - 1) / 8) |= (1 << ((led_map[i].adr.cs - 1) % 8));
+        *(issidrv[led_map[i].adr.drv - 1].onoff + 1 + (led_map[i].adr.swb - 1) * 2 + (led_map[i].adr.cs - 1) / 8) |= (1 << ((led_map[i].adr.cs - 1) % 8));
+    }
+}
+
+void md_rgb_matrix_prepare(void) {
+    for (uint8_t i = 0; i < ISSI3733_LED_COUNT; i++) {
+        *led_map[i].rgb.r = 0;
+        *led_map[i].rgb.g = 0;
+        *led_map[i].rgb.b = 0;
+    }
+}
+
+void led_set_one(int i, uint8_t r, uint8_t g, uint8_t b) {
+    if (i < ISSI3733_LED_COUNT) {
+#ifdef USE_MASSDROP_CONFIGURATOR
+        md_rgb_matrix_config_override(i);
+#else
+        led_buffer[i].r = r;
+        led_buffer[i].g = g;
+        led_buffer[i].b = b;
+#endif
+    }
+}
+
+void led_set_all(uint8_t r, uint8_t g, uint8_t b) {
+    for (uint8_t i = 0; i < ISSI3733_LED_COUNT; i++) {
+        led_set_one(i, r, g, b);
+    }
+}
+
+void init(void) {
+    DBGC(DC_LED_MATRIX_INIT_BEGIN);
+
+    issi3733_prepare_arrays();
+
+    md_rgb_matrix_prepare();
+
+    gcr_min_counter = 0;
+    v_5v_cat_hit    = 0;
+
+    DBGC(DC_LED_MATRIX_INIT_COMPLETE);
+}
+
+void flush(void) {
+#ifdef USE_MASSDROP_CONFIGURATOR
+    if (!led_enabled) {
+        return;
+    }  // Prevent calculations and I2C traffic if LED drivers are not enabled
+#else
+    if (!sr_exp_data.bit.SDB_N) {
+        return;
+    }  // Prevent calculations and I2C traffic if LED drivers are not enabled
+#endif
+
+    // Wait for previous transfer to complete
+    while (i2c_led_q_running) {
+    }
+
+    // Copy buffer to live DMA region
+    for (uint8_t i = 0; i < ISSI3733_LED_COUNT; i++) {
+        *led_map[i].rgb.r = led_buffer[i].r;
+        *led_map[i].rgb.g = led_buffer[i].g;
+        *led_map[i].rgb.b = led_buffer[i].b;
+    }
+
+#ifdef USE_MASSDROP_CONFIGURATOR
+    breathe_mult = 1;
+
+    if (led_animation_breathing) {
+        //+60us 119 LED
+        led_animation_breathe_cur += BREATHE_STEP * breathe_dir;
+
+        if (led_animation_breathe_cur >= BREATHE_MAX_STEP)
+            breathe_dir = -1;
+        else if (led_animation_breathe_cur <= BREATHE_MIN_STEP)
+            breathe_dir = 1;
+
+        // Brightness curve created for 256 steps, 0 - ~98%
+        breathe_mult = 0.000015 * led_animation_breathe_cur * led_animation_breathe_cur;
+        if (breathe_mult > 1)
+            breathe_mult = 1;
+        else if (breathe_mult < 0)
+            breathe_mult = 0;
+    }
+
+    // This should only be performed once per frame
+    pomod = (float)((g_rgb_timer / 10) % (uint32_t)(1000.0f / led_animation_speed)) / 10.0f * led_animation_speed;
+    pomod *= 100.0f;
+    pomod = (uint32_t)pomod % 10000;
+    pomod /= 100.0f;
+
+#endif  // USE_MASSDROP_CONFIGURATOR
+
+    uint8_t drvid;
+
+    // NOTE: GCR does not need to be timed with LED processing, but there is really no harm
+    if (gcr_actual != gcr_actual_last) {
+        for (drvid = 0; drvid < ISSI3733_DRIVER_COUNT; drvid++) I2C_LED_Q_GCR(drvid);  // Queue data
+        gcr_actual_last = gcr_actual;
+    }
+
+    for (drvid = 0; drvid < ISSI3733_DRIVER_COUNT; drvid++) I2C_LED_Q_PWM(drvid);  // Queue data
+
+    i2c_led_q_run();
+}
+
+void md_rgb_matrix_indicators(void) {
+    uint8_t kbled = keyboard_leds();
+    if (kbled && rgb_matrix_config.enable) {
+        for (uint8_t i = 0; i < ISSI3733_LED_COUNT; i++) {
+            if (
+#if USB_LED_NUM_LOCK_SCANCODE != 255
+                (led_map[i].scan == USB_LED_NUM_LOCK_SCANCODE && (kbled & (1 << USB_LED_NUM_LOCK))) ||
+#endif  // NUM LOCK
+#if USB_LED_CAPS_LOCK_SCANCODE != 255
+                (led_map[i].scan == USB_LED_CAPS_LOCK_SCANCODE && (kbled & (1 << USB_LED_CAPS_LOCK))) ||
+#endif  // CAPS LOCK
+#if USB_LED_SCROLL_LOCK_SCANCODE != 255
+                (led_map[i].scan == USB_LED_SCROLL_LOCK_SCANCODE && (kbled & (1 << USB_LED_SCROLL_LOCK))) ||
+#endif  // SCROLL LOCK
+#if USB_LED_COMPOSE_SCANCODE != 255
+                (led_map[i].scan == USB_LED_COMPOSE_SCANCODE && (kbled & (1 << USB_LED_COMPOSE))) ||
+#endif  // COMPOSE
+#if USB_LED_KANA_SCANCODE != 255
+                (led_map[i].scan == USB_LED_KANA_SCANCODE && (kbled & (1 << USB_LED_KANA))) ||
+#endif  // KANA
+                (0)) {
+                if (rgb_matrix_get_flags() & LED_FLAG_INDICATOR) {
+                    led_buffer[i].r = 255 - led_buffer[i].r;
+                    led_buffer[i].g = 255 - led_buffer[i].g;
+                    led_buffer[i].b = 255 - led_buffer[i].b;
+                }
+            }
+        }
+    }
+}
+
+const rgb_matrix_driver_t rgb_matrix_driver = {.init = init, .flush = flush, .set_color = led_set_one, .set_color_all = led_set_all};
+
+/*==============================================================================
+=                           Legacy Lighting Support                            =
+==============================================================================*/
+
+#ifdef USE_MASSDROP_CONFIGURATOR
+// Ported from Massdrop QMK GitHub Repo
+
+// TODO?: wire these up to keymap.c
+uint8_t led_animation_orientation = 0;
+uint8_t led_animation_direction   = 0;
+uint8_t led_animation_breathing   = 0;
+uint8_t led_animation_id          = 0;
+float   led_animation_speed       = 4.0f;
+uint8_t led_lighting_mode         = LED_MODE_NORMAL;
+uint8_t led_enabled               = 1;
+uint8_t led_animation_breathe_cur = BREATHE_MIN_STEP;
+uint8_t breathe_dir               = 1;
+
+static void led_run_pattern(led_setup_t* f, float* ro, float* go, float* bo, float pos) {
+    float po;
+
+    while (f->end != 1) {
+        po = pos;  // Reset po for new frame
+
+        // Add in any moving effects
+        if ((!led_animation_direction && f->ef & EF_SCR_R) || (led_animation_direction && (f->ef & EF_SCR_L))) {
+            po -= pomod;
+
+            if (po > 100)
+                po -= 100;
+            else if (po < 0)
+                po += 100;
+        } else if ((!led_animation_direction && f->ef & EF_SCR_L) || (led_animation_direction && (f->ef & EF_SCR_R))) {
+            po += pomod;
+
+            if (po > 100)
+                po -= 100;
+            else if (po < 0)
+                po += 100;
+        }
+
+        // Check if LED's po is in current frame
+        if (po < f->hs) {
+            f++;
+            continue;
+        }
+        if (po > f->he) {
+            f++;
+            continue;
+        }
+        // note: < 0 or > 100 continue
+
+        // Calculate the po within the start-stop percentage for color blending
+        po = (po - f->hs) / (f->he - f->hs);
+
+        // Add in any color effects
+        if (f->ef & EF_OVER) {
+            *ro = (po * (f->re - f->rs)) + f->rs;  // + 0.5;
+            *go = (po * (f->ge - f->gs)) + f->gs;  // + 0.5;
+            *bo = (po * (f->be - f->bs)) + f->bs;  // + 0.5;
+        } else if (f->ef & EF_SUBTRACT) {
+            *ro -= (po * (f->re - f->rs)) + f->rs;  // + 0.5;
+            *go -= (po * (f->ge - f->gs)) + f->gs;  // + 0.5;
+            *bo -= (po * (f->be - f->bs)) + f->bs;  // + 0.5;
+        } else {
+            *ro += (po * (f->re - f->rs)) + f->rs;  // + 0.5;
+            *go += (po * (f->ge - f->gs)) + f->gs;  // + 0.5;
+            *bo += (po * (f->be - f->bs)) + f->bs;  // + 0.5;
+        }
+
+        f++;
+    }
+}
+
+static void md_rgb_matrix_config_override(int i) {
+    float ro = 0;
+    float go = 0;
+    float bo = 0;
+
+    float po = (led_animation_orientation) ? (float)g_led_config.point[i].y / 64.f * 100 : (float)g_led_config.point[i].x / 224.f * 100;
+
+    uint8_t highest_active_layer = biton32(layer_state);
+
+    if (led_lighting_mode == LED_MODE_KEYS_ONLY && HAS_FLAGS(g_led_config.flags[i], LED_FLAG_UNDERGLOW)) {
+        // Do not act on this LED
+    } else if (led_lighting_mode == LED_MODE_NON_KEYS_ONLY && !HAS_FLAGS(g_led_config.flags[i], LED_FLAG_UNDERGLOW)) {
+        // Do not act on this LED
+    } else if (led_lighting_mode == LED_MODE_INDICATORS_ONLY) {
+        // Do not act on this LED (Only show indicators)
+    } else {
+        led_instruction_t* led_cur_instruction = led_instructions;
+        while (!led_cur_instruction->end) {
+            // Check if this applies to current layer
+            if ((led_cur_instruction->flags & LED_FLAG_MATCH_LAYER) && (led_cur_instruction->layer != highest_active_layer)) {
+                goto next_iter;
+            }
+
+            // Check if this applies to current index
+            if (led_cur_instruction->flags & LED_FLAG_MATCH_ID) {
+                uint8_t   modid    = i / 32;                             // Calculate which id# contains the led bit
+                uint32_t  modidbit = 1 << (i % 32);                      // Calculate the bit within the id#
+                uint32_t* bitfield = &led_cur_instruction->id0 + modid;  // Add modid as offset to id0 address. *bitfield is now idX of the led id
+                if (~(*bitfield) & modidbit) {                           // Check if led bit is not set in idX
+                    goto next_iter;
+                }
+            }
+
+            if (led_cur_instruction->flags & LED_FLAG_USE_RGB) {
+                ro = led_cur_instruction->r;
+                go = led_cur_instruction->g;
+                bo = led_cur_instruction->b;
+            } else if (led_cur_instruction->flags & LED_FLAG_USE_PATTERN) {
+                led_run_pattern(led_setups[led_cur_instruction->pattern_id], &ro, &go, &bo, po);
+            } else if (led_cur_instruction->flags & LED_FLAG_USE_ROTATE_PATTERN) {
+                led_run_pattern(led_setups[led_animation_id], &ro, &go, &bo, po);
+            }
+
+        next_iter:
+            led_cur_instruction++;
+        }
+
+        if (ro > 255)
+            ro = 255;
+        else if (ro < 0)
+            ro = 0;
+        if (go > 255)
+            go = 255;
+        else if (go < 0)
+            go = 0;
+        if (bo > 255)
+            bo = 255;
+        else if (bo < 0)
+            bo = 0;
+
+        if (led_animation_breathing) {
+            ro *= breathe_mult;
+            go *= breathe_mult;
+            bo *= breathe_mult;
+        }
+    }
+
+    led_buffer[i].r = (uint8_t)ro;
+    led_buffer[i].g = (uint8_t)go;
+    led_buffer[i].b = (uint8_t)bo;
+}
+
+#endif  // USE_MASSDROP_CONFIGURATOR
diff --git a/qmk/tmk_core/protocol/arm_atsam/md_rgb_matrix.h b/qmk/tmk_core/protocol/arm_atsam/md_rgb_matrix.h
new file mode 100644
index 00000000..322b0f99
--- /dev/null
+++ b/qmk/tmk_core/protocol/arm_atsam/md_rgb_matrix.h
@@ -0,0 +1,158 @@
+/*
+Copyright 2018 Massdrop Inc.
+
+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 _LED_MATRIX_H_
+#define _LED_MATRIX_H_
+
+#include "quantum.h"
+
+// From keyboard
+#include "config_led.h"
+
+// CS1-CS16 Current Source "Col"
+#define ISSI3733_CS_COUNT 16
+
+// SW1-SW12 Switch "Row"
+#define ISSI3733_SW_COUNT 12
+
+#define ISSI3733_LED_RGB_COUNT ISSI3733_CS_COUNT *ISSI3733_SW_COUNT
+#define ISSI3733_PG0_BYTES ISSI3733_LED_RGB_COUNT / 8 + 1  //+1 for first byte being memory start offset for I2C transfer
+#define ISSI3733_PG1_BYTES ISSI3733_LED_RGB_COUNT + 1      //+1 for first byte being memory start offset for I2C transfer
+#define ISSI3733_PG2_BYTES ISSI3733_LED_RGB_COUNT + 1      //+1 for first byte being memory start offset for I2C transfer
+#define ISSI3733_PG3_BYTES 18 + 1                          //+1 for first byte being memory start offset for I2C transfer
+
+#define ISSI3733_PG_ONOFF_BYTES ISSI3733_PG0_BYTES
+#define ISSI3733_PG_OR_BYTES ISSI3733_PG0_BYTES
+#define ISSI3733_PG_SR_BYTES ISSI3733_PG0_BYTES
+#define ISSI3733_PG_PWM_BYTES ISSI3733_PG1_BYTES
+#define ISSI3733_PG_ABM_BYTES ISSI3733_PG2_BYTES
+#define ISSI3733_PG_FN_BYTES ISSI3733_PG3_BYTES
+
+typedef struct issi3733_driver_s {
+    uint8_t addr;                            // Address of the driver according to wiring "ISSI3733: Table 1 Slave Address"
+    uint8_t onoff[ISSI3733_PG_ONOFF_BYTES];  // PG0 - LED Control Register - LED On/Off Register
+    uint8_t open[ISSI3733_PG_OR_BYTES];      // PG0 - LED Control Register - LED Open Register
+    uint8_t shrt[ISSI3733_PG_SR_BYTES];      // PG0 - LED Control Register - LED Short Register
+    uint8_t pwm[ISSI3733_PG_PWM_BYTES];      // PG1 - PWM Register
+    uint8_t abm[ISSI3733_PG_ABM_BYTES];      // PG2 - Auto Breath Mode Register
+    uint8_t conf[ISSI3733_PG_FN_BYTES];      // PG3 - Function Register
+} issi3733_driver_t;
+
+typedef struct issi3733_rgb_s {
+    uint8_t *r;  // Direct access into PWM data
+    uint8_t *g;  // Direct access into PWM data
+    uint8_t *b;  // Direct access into PWM data
+} issi3733_rgb_t;
+
+typedef struct issi3733_rgb_adr_s {
+    uint8_t drv;  // Driver from given list
+    uint8_t cs;   // CS
+    uint8_t swr;  // SW Red
+    uint8_t swg;  // SW Green
+    uint8_t swb;  // SW Blue
+} issi3733_rgb_adr_t;
+
+typedef struct issi3733_led_s {
+    uint8_t            id;    // According to PCB ref
+    issi3733_rgb_t     rgb;   // PWM settings of R G B
+    issi3733_rgb_adr_t adr;   // Hardware addresses
+    float              x;     // Physical position X
+    float              y;     // Physical position Y
+    float              px;    // Physical position X in percent
+    float              py;    // Physical position Y in percent
+    uint8_t            scan;  // Key scan code from wiring (set 0xFF if no key)
+} issi3733_led_t;
+
+extern issi3733_driver_t issidrv[ISSI3733_DRIVER_COUNT];
+
+extern uint8_t gcr_desired;
+extern uint8_t gcr_breathe;
+extern uint8_t gcr_actual;
+extern uint8_t gcr_actual_last;
+
+void gcr_compute(void);
+
+void md_rgb_matrix_indicators(void);
+
+/*-------------------------  Legacy Lighting Support  ------------------------*/
+
+#ifdef USE_MASSDROP_CONFIGURATOR
+
+#    define EF_NONE 0x00000000      // No effect
+#    define EF_OVER 0x00000001      // Overwrite any previous color information with new
+#    define EF_SCR_L 0x00000002     // Scroll left
+#    define EF_SCR_R 0x00000004     // Scroll right
+#    define EF_SUBTRACT 0x00000008  // Subtract color values
+
+typedef struct led_setup_s {
+    float    hs;   // Band begin at percent
+    float    he;   // Band end at percent
+    uint8_t  rs;   // Red start value
+    uint8_t  re;   // Red end value
+    uint8_t  gs;   // Green start value
+    uint8_t  ge;   // Green end value
+    uint8_t  bs;   // Blue start value
+    uint8_t  be;   // Blue end value
+    uint32_t ef;   // Animation and color effects
+    uint8_t  end;  // Set to signal end of the setup
+} led_setup_t;
+
+extern const uint8_t led_setups_count;
+extern void *        led_setups[];
+
+// LED Extra Instructions
+#    define LED_FLAG_NULL 0x00                // Matching and coloring not used (default)
+#    define LED_FLAG_MATCH_ID 0x01            // Match on the ID of the LED (set id#'s to desired bit pattern, first LED is id 1)
+#    define LED_FLAG_MATCH_LAYER 0x02         // Match on the current active layer (set layer to desired match layer)
+#    define LED_FLAG_USE_RGB 0x10             // Use a specific RGB value (set r, g, b to desired output color values)
+#    define LED_FLAG_USE_PATTERN 0x20         // Use a specific pattern ID (set pattern_id to desired output pattern)
+#    define LED_FLAG_USE_ROTATE_PATTERN 0x40  // Use pattern the user has cycled to manually
+
+typedef struct led_instruction_s {
+    uint16_t flags;  // Bitfield for LED instructions
+    uint32_t id0;    // Bitwise id, IDs 0-31
+    uint32_t id1;    // Bitwise id, IDs 32-63
+    uint32_t id2;    // Bitwise id, IDs 64-95
+    uint32_t id3;    // Bitwise id, IDs 96-127
+    uint8_t  layer;
+    uint8_t  r;
+    uint8_t  g;
+    uint8_t  b;
+    uint8_t  pattern_id;
+    uint8_t  end;
+} led_instruction_t;
+
+extern led_instruction_t led_instructions[];
+
+extern uint8_t led_animation_breathing;
+extern uint8_t led_animation_id;
+extern float   led_animation_speed;
+extern uint8_t led_lighting_mode;
+extern uint8_t led_enabled;
+extern uint8_t led_animation_breathe_cur;
+extern uint8_t led_animation_direction;
+extern uint8_t breathe_dir;
+
+#    define LED_MODE_NORMAL 0  // Must be 0
+#    define LED_MODE_KEYS_ONLY 1
+#    define LED_MODE_NON_KEYS_ONLY 2
+#    define LED_MODE_INDICATORS_ONLY 3
+#    define LED_MODE_MAX_INDEX LED_MODE_INDICATORS_ONLY  // Must be highest value
+
+#endif  // USE_MASSDROP_CONFIGURATOR
+
+#endif  //_LED_MATRIX_H_
diff --git a/qmk/tmk_core/protocol/arm_atsam/md_rgb_matrix_programs.c b/qmk/tmk_core/protocol/arm_atsam/md_rgb_matrix_programs.c
new file mode 100644
index 00000000..b43008cc
--- /dev/null
+++ b/qmk/tmk_core/protocol/arm_atsam/md_rgb_matrix_programs.c
@@ -0,0 +1,99 @@
+/*
+Copyright 2018 Massdrop Inc.
+
+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/>.
+*/
+
+#ifdef USE_MASSDROP_CONFIGURATOR
+
+#    include "md_rgb_matrix.h"
+
+// Teal <-> Salmon
+led_setup_t leds_teal_salmon[] = {
+    {.hs = 0, .he = 33, .rs = 24, .re = 24, .gs = 215, .ge = 215, .bs = 204, .be = 204, .ef = EF_NONE},
+    {.hs = 33, .he = 66, .rs = 24, .re = 255, .gs = 215, .ge = 114, .bs = 204, .be = 118, .ef = EF_NONE},
+    {.hs = 66, .he = 100, .rs = 255, .re = 255, .gs = 114, .ge = 114, .bs = 118, .be = 118, .ef = EF_NONE},
+    {.end = 1},
+};
+
+// Yellow
+led_setup_t leds_yellow[] = {
+    {.hs = 0, .he = 100, .rs = 255, .re = 255, .gs = 255, .ge = 255, .bs = 0, .be = 0, .ef = EF_NONE},
+    {.end = 1},
+};
+
+// Off
+led_setup_t leds_off[] = {
+    {.hs = 0, .he = 100, .rs = 0, .re = 0, .gs = 0, .ge = 0, .bs = 0, .be = 0, .ef = EF_NONE},
+    {.end = 1},
+};
+
+// Red
+led_setup_t leds_red[] = {
+    {.hs = 0, .he = 100, .rs = 255, .re = 255, .gs = 0, .ge = 0, .bs = 0, .be = 0, .ef = EF_NONE},
+    {.end = 1},
+};
+
+// Green
+led_setup_t leds_green[] = {
+    {.hs = 0, .he = 100, .rs = 0, .re = 0, .gs = 255, .ge = 255, .bs = 0, .be = 0, .ef = EF_NONE},
+    {.end = 1},
+};
+
+// Blue
+led_setup_t leds_blue[] = {
+    {.hs = 0, .he = 100, .rs = 0, .re = 0, .gs = 0, .ge = 0, .bs = 255, .be = 255, .ef = EF_NONE},
+    {.end = 1},
+};
+
+// White
+led_setup_t leds_white[] = {
+    {.hs = 0, .he = 100, .rs = 255, .re = 255, .gs = 255, .ge = 255, .bs = 255, .be = 255, .ef = EF_NONE},
+    {.end = 1},
+};
+
+// White with moving red stripe
+led_setup_t leds_white_with_red_stripe[] = {
+    {.hs = 0, .he = 100, .rs = 255, .re = 255, .gs = 255, .ge = 255, .bs = 255, .be = 255, .ef = EF_NONE},
+    {.hs = 0, .he = 15, .rs = 0, .re = 0, .gs = 0, .ge = 255, .bs = 0, .be = 255, .ef = EF_SCR_R | EF_SUBTRACT},
+    {.hs = 15, .he = 30, .rs = 0, .re = 0, .gs = 255, .ge = 0, .bs = 255, .be = 0, .ef = EF_SCR_R | EF_SUBTRACT},
+    {.end = 1},
+};
+
+// Black with moving red stripe
+led_setup_t leds_black_with_red_stripe[] = {
+    {.hs = 0, .he = 15, .rs = 0, .re = 255, .gs = 0, .ge = 0, .bs = 0, .be = 0, .ef = EF_SCR_R},
+    {.hs = 15, .he = 30, .rs = 255, .re = 0, .gs = 0, .ge = 0, .bs = 0, .be = 0, .ef = EF_SCR_R},
+    {.end = 1},
+};
+
+// Rainbow no scrolling
+led_setup_t leds_rainbow_ns[] = {
+    {.hs = 0, .he = 16.67, .rs = 255, .re = 255, .gs = 0, .ge = 255, .bs = 0, .be = 0, .ef = EF_OVER}, {.hs = 16.67, .he = 33.33, .rs = 255, .re = 0, .gs = 255, .ge = 255, .bs = 0, .be = 0, .ef = EF_OVER}, {.hs = 33.33, .he = 50, .rs = 0, .re = 0, .gs = 255, .ge = 255, .bs = 0, .be = 255, .ef = EF_OVER}, {.hs = 50, .he = 66.67, .rs = 0, .re = 0, .gs = 255, .ge = 0, .bs = 255, .be = 255, .ef = EF_OVER}, {.hs = 66.67, .he = 83.33, .rs = 0, .re = 255, .gs = 0, .ge = 0, .bs = 255, .be = 255, .ef = EF_OVER}, {.hs = 83.33, .he = 100, .rs = 255, .re = 255, .gs = 0, .ge = 0, .bs = 255, .be = 0, .ef = EF_OVER}, {.end = 1},
+};
+
+// Rainbow scrolling
+led_setup_t leds_rainbow_s[] = {
+    {.hs = 0, .he = 16.67, .rs = 255, .re = 255, .gs = 0, .ge = 255, .bs = 0, .be = 0, .ef = EF_OVER | EF_SCR_R}, {.hs = 16.67, .he = 33.33, .rs = 255, .re = 0, .gs = 255, .ge = 255, .bs = 0, .be = 0, .ef = EF_OVER | EF_SCR_R}, {.hs = 33.33, .he = 50, .rs = 0, .re = 0, .gs = 255, .ge = 255, .bs = 0, .be = 255, .ef = EF_OVER | EF_SCR_R}, {.hs = 50, .he = 66.67, .rs = 0, .re = 0, .gs = 255, .ge = 0, .bs = 255, .be = 255, .ef = EF_OVER | EF_SCR_R}, {.hs = 66.67, .he = 83.33, .rs = 0, .re = 255, .gs = 0, .ge = 0, .bs = 255, .be = 255, .ef = EF_OVER | EF_SCR_R}, {.hs = 83.33, .he = 100, .rs = 255, .re = 255, .gs = 0, .ge = 0, .bs = 255, .be = 0, .ef = EF_OVER | EF_SCR_R}, {.end = 1},
+};
+
+// Add new LED animations here using one from above as example
+// The last entry must be { .end = 1 }
+// Add the new animation name to the list below following its format
+
+void *led_setups[] = {leds_rainbow_s, leds_rainbow_ns, leds_teal_salmon, leds_yellow, leds_red, leds_green, leds_blue, leds_white, leds_white_with_red_stripe, leds_black_with_red_stripe, leds_off};
+
+const uint8_t led_setups_count = sizeof(led_setups) / sizeof(led_setups[0]);
+
+#endif
diff --git a/qmk/tmk_core/protocol/arm_atsam/usb/udi_device_conf.h b/qmk/tmk_core/protocol/arm_atsam/usb/udi_device_conf.h
index 505db47b..9c9d9478 100644
--- a/qmk/tmk_core/protocol/arm_atsam/usb/udi_device_conf.h
+++ b/qmk/tmk_core/protocol/arm_atsam/usb/udi_device_conf.h
@@ -291,7 +291,7 @@ typedef struct {
 extern uint8_t udi_hid_kbd_report_set;
 
 // report buffer (to host)
-#    define UDI_HID_KBD_REPORT_SIZE 8
+#define UDI_HID_KBD_REPORT_SIZE 8
 extern uint8_t udi_hid_kbd_report[UDI_HID_KBD_REPORT_SIZE];
 
 COMPILER_PACK_RESET()
@@ -784,7 +784,7 @@ COMPILER_PACK_RESET()
 COMPILER_PACK_SET(1)
 
 typedef struct {
-    usb_conf_desc_t conf;
+    usb_conf_desc_t    conf;
     udi_hid_kbd_desc_t hid_kbd;
 #ifdef MOUSE_ENABLE
     udi_hid_mou_desc_t hid_mou;
diff --git a/qmk/tmk_core/protocol/arm_atsam/usb/udi_hid_kbd_desc.c b/qmk/tmk_core/protocol/arm_atsam/usb/udi_hid_kbd_desc.c
index a3fb46a3..814389b6 100644
--- a/qmk/tmk_core/protocol/arm_atsam/usb/udi_hid_kbd_desc.c
+++ b/qmk/tmk_core/protocol/arm_atsam/usb/udi_hid_kbd_desc.c
@@ -83,7 +83,7 @@ UDC_DESC_STORAGE usb_dev_desc_t udc_device_desc = {.bLength         = sizeof(usb
 #ifdef USB_DEVICE_PRODUCT_NAME
                                                    .iProduct = 2,
 #else
-                                                   .iProduct      = 0,  // No product string
+                                                   .iProduct = 0,  // No product string
 #endif
 #if (defined USB_DEVICE_SERIAL_NAME || defined USB_DEVICE_GET_SERIAL_NAME_POINTER)
                                                    .iSerialNumber = 3,
@@ -120,7 +120,7 @@ UDC_DESC_STORAGE udc_desc_t udc_desc = {
     .conf.iConfiguration      = 0,
     .conf.bmAttributes        = /* USB_CONFIG_ATTR_MUST_SET | */ USB_DEVICE_ATTR,
     .conf.bMaxPower           = USB_CONFIG_MAX_POWER(USB_DEVICE_POWER),
-    .hid_kbd = UDI_HID_KBD_DESC,
+    .hid_kbd                  = UDI_HID_KBD_DESC,
 #ifdef RAW_ENABLE
     .hid_raw = UDI_HID_RAW_DESC,
 #endif
diff --git a/qmk/tmk_core/protocol/chibios/lufa_utils/LUFA/Drivers/USB/USB.h b/qmk/tmk_core/protocol/chibios/lufa_utils/LUFA/Drivers/USB/USB.h
index f59c8d1d..22f882cb 100644
--- a/qmk/tmk_core/protocol/chibios/lufa_utils/LUFA/Drivers/USB/USB.h
+++ b/qmk/tmk_core/protocol/chibios/lufa_utils/LUFA/Drivers/USB/USB.h
@@ -1,6 +1,6 @@
 #include "progmem.h"
-#include "stddef.h"
-#include "inttypes.h"
+#include <stddef.h>
+#include <inttypes.h>
 
 #define ATTR_PACKED __attribute__((packed))
 /** Concatenates the given input into a single token, via the C Preprocessor.
diff --git a/qmk/tmk_core/protocol/chibios/main.c b/qmk/tmk_core/protocol/chibios/main.c
index a0d28f9a..e07c181f 100644
--- a/qmk/tmk_core/protocol/chibios/main.c
+++ b/qmk/tmk_core/protocol/chibios/main.c
@@ -15,8 +15,8 @@
  * GPL v2 or later.
  */
 
-#include "ch.h"
-#include "hal.h"
+#include <ch.h>
+#include <hal.h>
 
 #include "usb_main.h"
 
@@ -31,7 +31,7 @@
 #include "led.h"
 #include "sendchar.h"
 #include "debug.h"
-#include "printf.h"
+#include "print.h"
 
 #ifndef EARLY_INIT_PERFORM_BOOTLOADER_JUMP
 // Change this to be TRUE once we've migrated keyboards to the new init system
@@ -54,6 +54,9 @@
 #ifdef STM32_EEPROM_ENABLE
 #    include "eeprom_stm32.h"
 #endif
+#ifdef EEPROM_DRIVER
+#    include "eeprom_driver.h"
+#endif
 #include "suspend.h"
 #include "wait.h"
 
@@ -150,6 +153,9 @@ int main(void) {
 #ifdef STM32_EEPROM_ENABLE
     EEPROM_Init();
 #endif
+#ifdef EEPROM_DRIVER
+    eeprom_driver_init();
+#endif
 
     // TESTING
     // chThdCreateStatic(waThread1, sizeof(waThread1), NORMALPRIO, Thread1, NULL);
@@ -230,6 +236,7 @@ int main(void) {
                 /* Remote wakeup */
                 if (suspend_wakeup_condition()) {
                     usbWakeupHost(&USB_DRIVER);
+                    restart_usb_driver(&USB_DRIVER);
                 }
             }
             /* Woken up */
@@ -258,5 +265,9 @@ int main(void) {
 #ifdef RAW_ENABLE
         raw_hid_task();
 #endif
+
+        // Run housekeeping
+        housekeeping_task_kb();
+        housekeeping_task_user();
     }
 }
diff --git a/qmk/tmk_core/protocol/chibios/usb_driver.c b/qmk/tmk_core/protocol/chibios/usb_driver.c
index 22d3c91f..cc0ce760 100644
--- a/qmk/tmk_core/protocol/chibios/usb_driver.c
+++ b/qmk/tmk_core/protocol/chibios/usb_driver.c
@@ -22,7 +22,7 @@
  * @{
  */
 
-#include "hal.h"
+#include <hal.h>
 #include "usb_driver.h"
 #include <string.h>
 
diff --git a/qmk/tmk_core/protocol/chibios/usb_driver.h b/qmk/tmk_core/protocol/chibios/usb_driver.h
index 77dff806..6d71bcec 100644
--- a/qmk/tmk_core/protocol/chibios/usb_driver.h
+++ b/qmk/tmk_core/protocol/chibios/usb_driver.h
@@ -25,7 +25,7 @@
 #ifndef USB_DRIVER_H
 #    define USB_DRIVER_H
 
-#    include "hal_usb_cdc.h"
+#    include <hal_usb_cdc.h>
 
 /*===========================================================================*/
 /* Driver constants.                                                         */
diff --git a/qmk/tmk_core/protocol/chibios/usb_main.c b/qmk/tmk_core/protocol/chibios/usb_main.c
index ae33e86a..9745d147 100644
--- a/qmk/tmk_core/protocol/chibios/usb_main.c
+++ b/qmk/tmk_core/protocol/chibios/usb_main.c
@@ -25,8 +25,8 @@
  *   makes the assumption this is safe to avoid littering with preprocessor directives.
  */
 
-#include "ch.h"
-#include "hal.h"
+#include <ch.h>
+#include <hal.h>
 
 #include "usb_main.h"
 
@@ -165,6 +165,19 @@ static const USBEndpointConfig shared_ep_config = {
 };
 #endif
 
+#if STM32_USB_USE_OTG1
+typedef struct {
+    size_t              queue_capacity_in;
+    size_t              queue_capacity_out;
+    USBInEndpointState  in_ep_state;
+    USBOutEndpointState out_ep_state;
+    USBInEndpointState  int_ep_state;
+    USBEndpointConfig   inout_ep_config;
+    USBEndpointConfig   int_ep_config;
+    const QMKUSBConfig  config;
+    QMKUSBDriver        driver;
+} usb_driver_config_t;
+#else
 typedef struct {
     size_t              queue_capacity_in;
     size_t              queue_capacity_out;
@@ -177,64 +190,112 @@ typedef struct {
     const QMKUSBConfig  config;
     QMKUSBDriver        driver;
 } usb_driver_config_t;
+#endif
 
+#if STM32_USB_USE_OTG1
 /* Reusable initialization structure - see USBEndpointConfig comment at top of file */
-#define QMK_USB_DRIVER_CONFIG(stream, notification, fixedsize)                                                              \
-    {                                                                                                                       \
-        .queue_capacity_in = stream##_IN_CAPACITY, .queue_capacity_out = stream##_OUT_CAPACITY,                             \
-        .in_ep_config =                                                                                                     \
-            {                                                                                                               \
-                stream##_IN_MODE,      /* Interrupt EP */                                                                   \
-                NULL,                  /* SETUP packet notification callback */                                             \
-                qmkusbDataTransmitted, /* IN notification callback */                                                       \
-                NULL,                  /* OUT notification callback */                                                      \
-                stream##_EPSIZE,       /* IN maximum packet size */                                                         \
-                0,                     /* OUT maximum packet size */                                                        \
-                NULL,                  /* IN Endpoint state */                                                              \
-                NULL,                  /* OUT endpoint state */                                                             \
-                2,                     /* IN multiplier */                                                                  \
-                NULL                   /* SETUP buffer (not a SETUP endpoint) */                                            \
-            },                                                                                                              \
-        .out_ep_config =                                                                                                    \
-            {                                                                                                               \
-                stream##_OUT_MODE,  /* Interrupt EP */                                                                      \
-                NULL,               /* SETUP packet notification callback */                                                \
-                NULL,               /* IN notification callback */                                                          \
-                qmkusbDataReceived, /* OUT notification callback */                                                         \
-                0,                  /* IN maximum packet size */                                                            \
-                stream##_EPSIZE,    /* OUT maximum packet size */                                                           \
-                NULL,               /* IN Endpoint state */                                                                 \
-                NULL,               /* OUT endpoint state */                                                                \
-                2,                  /* IN multiplier */                                                                     \
-                NULL,               /* SETUP buffer (not a SETUP endpoint) */                                               \
-            },                                                                                                              \
-        .int_ep_config =                                                                                                    \
-            {                                                                                                               \
-                USB_EP_MODE_TYPE_INTR,      /* Interrupt EP */                                                              \
-                NULL,                       /* SETUP packet notification callback */                                        \
-                qmkusbInterruptTransmitted, /* IN notification callback */                                                  \
-                NULL,                       /* OUT notification callback */                                                 \
-                CDC_NOTIFICATION_EPSIZE,    /* IN maximum packet size */                                                    \
-                0,                          /* OUT maximum packet size */                                                   \
-                NULL,                       /* IN Endpoint state */                                                         \
-                NULL,                       /* OUT endpoint state */                                                        \
-                2,                          /* IN multiplier */                                                             \
-                NULL,                       /* SETUP buffer (not a SETUP endpoint) */                                       \
-            },                                                                                                              \
-        .config = {                                                                                                         \
-            .usbp        = &USB_DRIVER,                                                                                     \
-            .bulk_in     = stream##_IN_EPNUM,                                                                               \
-            .bulk_out    = stream##_OUT_EPNUM,                                                                              \
-            .int_in      = notification,                                                                                    \
-            .in_buffers  = stream##_IN_CAPACITY,                                                                            \
-            .out_buffers = stream##_OUT_CAPACITY,                                                                           \
-            .in_size     = stream##_EPSIZE,                                                                                 \
-            .out_size    = stream##_EPSIZE,                                                                                 \
-            .fixed_size  = fixedsize,                                                                                       \
-            .ib          = (__attribute__((aligned(4))) uint8_t[BQ_BUFFER_SIZE(stream##_IN_CAPACITY, stream##_EPSIZE)]){},  \
-            .ob          = (__attribute__((aligned(4))) uint8_t[BQ_BUFFER_SIZE(stream##_OUT_CAPACITY, stream##_EPSIZE)]){}, \
-        }                                                                                                                   \
-    }
+#    define QMK_USB_DRIVER_CONFIG(stream, notification, fixedsize)                                                              \
+        {                                                                                                                       \
+            .queue_capacity_in = stream##_IN_CAPACITY, .queue_capacity_out = stream##_OUT_CAPACITY,                             \
+            .inout_ep_config =                                                                                                  \
+                {                                                                                                               \
+                    stream##_IN_MODE,      /* Interrupt EP */                                                                   \
+                    NULL,                  /* SETUP packet notification callback */                                             \
+                    qmkusbDataTransmitted, /* IN notification callback */                                                       \
+                    qmkusbDataReceived,    /* OUT notification callback */                                                      \
+                    stream##_EPSIZE,       /* IN maximum packet size */                                                         \
+                    stream##_EPSIZE,       /* OUT maximum packet size */                                                        \
+                    NULL,                  /* IN Endpoint state */                                                              \
+                    NULL,                  /* OUT endpoint state */                                                             \
+                    2,                     /* IN multiplier */                                                                  \
+                    NULL                   /* SETUP buffer (not a SETUP endpoint) */                                            \
+                },                                                                                                              \
+            .int_ep_config =                                                                                                    \
+                {                                                                                                               \
+                    USB_EP_MODE_TYPE_INTR,      /* Interrupt EP */                                                              \
+                    NULL,                       /* SETUP packet notification callback */                                        \
+                    qmkusbInterruptTransmitted, /* IN notification callback */                                                  \
+                    NULL,                       /* OUT notification callback */                                                 \
+                    CDC_NOTIFICATION_EPSIZE,    /* IN maximum packet size */                                                    \
+                    0,                          /* OUT maximum packet size */                                                   \
+                    NULL,                       /* IN Endpoint state */                                                         \
+                    NULL,                       /* OUT endpoint state */                                                        \
+                    2,                          /* IN multiplier */                                                             \
+                    NULL,                       /* SETUP buffer (not a SETUP endpoint) */                                       \
+                },                                                                                                              \
+            .config = {                                                                                                         \
+                .usbp        = &USB_DRIVER,                                                                                     \
+                .bulk_in     = stream##_IN_EPNUM,                                                                               \
+                .bulk_out    = stream##_OUT_EPNUM,                                                                              \
+                .int_in      = notification,                                                                                    \
+                .in_buffers  = stream##_IN_CAPACITY,                                                                            \
+                .out_buffers = stream##_OUT_CAPACITY,                                                                           \
+                .in_size     = stream##_EPSIZE,                                                                                 \
+                .out_size    = stream##_EPSIZE,                                                                                 \
+                .fixed_size  = fixedsize,                                                                                       \
+                .ib          = (__attribute__((aligned(4))) uint8_t[BQ_BUFFER_SIZE(stream##_IN_CAPACITY, stream##_EPSIZE)]){},  \
+                .ob          = (__attribute__((aligned(4))) uint8_t[BQ_BUFFER_SIZE(stream##_OUT_CAPACITY, stream##_EPSIZE)]){}, \
+            }                                                                                                                   \
+        }
+#else
+/* Reusable initialization structure - see USBEndpointConfig comment at top of file */
+#    define QMK_USB_DRIVER_CONFIG(stream, notification, fixedsize)                                                              \
+        {                                                                                                                       \
+            .queue_capacity_in = stream##_IN_CAPACITY, .queue_capacity_out = stream##_OUT_CAPACITY,                             \
+            .in_ep_config =                                                                                                     \
+                {                                                                                                               \
+                    stream##_IN_MODE,      /* Interrupt EP */                                                                   \
+                    NULL,                  /* SETUP packet notification callback */                                             \
+                    qmkusbDataTransmitted, /* IN notification callback */                                                       \
+                    NULL,                  /* OUT notification callback */                                                      \
+                    stream##_EPSIZE,       /* IN maximum packet size */                                                         \
+                    0,                     /* OUT maximum packet size */                                                        \
+                    NULL,                  /* IN Endpoint state */                                                              \
+                    NULL,                  /* OUT endpoint state */                                                             \
+                    2,                     /* IN multiplier */                                                                  \
+                    NULL                   /* SETUP buffer (not a SETUP endpoint) */                                            \
+                },                                                                                                              \
+            .out_ep_config =                                                                                                    \
+                {                                                                                                               \
+                    stream##_OUT_MODE,  /* Interrupt EP */                                                                      \
+                    NULL,               /* SETUP packet notification callback */                                                \
+                    NULL,               /* IN notification callback */                                                          \
+                    qmkusbDataReceived, /* OUT notification callback */                                                         \
+                    0,                  /* IN maximum packet size */                                                            \
+                    stream##_EPSIZE,    /* OUT maximum packet size */                                                           \
+                    NULL,               /* IN Endpoint state */                                                                 \
+                    NULL,               /* OUT endpoint state */                                                                \
+                    2,                  /* IN multiplier */                                                                     \
+                    NULL,               /* SETUP buffer (not a SETUP endpoint) */                                               \
+                },                                                                                                              \
+            .int_ep_config =                                                                                                    \
+                {                                                                                                               \
+                    USB_EP_MODE_TYPE_INTR,      /* Interrupt EP */                                                              \
+                    NULL,                       /* SETUP packet notification callback */                                        \
+                    qmkusbInterruptTransmitted, /* IN notification callback */                                                  \
+                    NULL,                       /* OUT notification callback */                                                 \
+                    CDC_NOTIFICATION_EPSIZE,    /* IN maximum packet size */                                                    \
+                    0,                          /* OUT maximum packet size */                                                   \
+                    NULL,                       /* IN Endpoint state */                                                         \
+                    NULL,                       /* OUT endpoint state */                                                        \
+                    2,                          /* IN multiplier */                                                             \
+                    NULL,                       /* SETUP buffer (not a SETUP endpoint) */                                       \
+                },                                                                                                              \
+            .config = {                                                                                                         \
+                .usbp        = &USB_DRIVER,                                                                                     \
+                .bulk_in     = stream##_IN_EPNUM,                                                                               \
+                .bulk_out    = stream##_OUT_EPNUM,                                                                              \
+                .int_in      = notification,                                                                                    \
+                .in_buffers  = stream##_IN_CAPACITY,                                                                            \
+                .out_buffers = stream##_OUT_CAPACITY,                                                                           \
+                .in_size     = stream##_EPSIZE,                                                                                 \
+                .out_size    = stream##_EPSIZE,                                                                                 \
+                .fixed_size  = fixedsize,                                                                                       \
+                .ib          = (__attribute__((aligned(4))) uint8_t[BQ_BUFFER_SIZE(stream##_IN_CAPACITY, stream##_EPSIZE)]){},  \
+                .ob          = (__attribute__((aligned(4))) uint8_t[BQ_BUFFER_SIZE(stream##_OUT_CAPACITY, stream##_EPSIZE)]){}, \
+            }                                                                                                                   \
+        }
+#endif
 
 typedef struct {
     union {
@@ -327,8 +388,12 @@ static void usb_event_cb(USBDriver *usbp, usbevent_t event) {
             usbInitEndpointI(usbp, SHARED_IN_EPNUM, &shared_ep_config);
 #endif
             for (int i = 0; i < NUM_USB_DRIVERS; i++) {
+#if STM32_USB_USE_OTG1
+                usbInitEndpointI(usbp, drivers.array[i].config.bulk_in, &drivers.array[i].inout_ep_config);
+#else
                 usbInitEndpointI(usbp, drivers.array[i].config.bulk_in, &drivers.array[i].in_ep_config);
                 usbInitEndpointI(usbp, drivers.array[i].config.bulk_out, &drivers.array[i].out_ep_config);
+#endif
                 if (drivers.array[i].config.int_in) {
                     usbInitEndpointI(usbp, drivers.array[i].config.int_in, &drivers.array[i].int_ep_config);
                 }
@@ -479,7 +544,7 @@ static bool usb_request_hook_cb(USBDriver *usbp) {
 #ifdef NKRO_ENABLE
                             keymap_config.nkro = !!keyboard_protocol;
                             if (!keymap_config.nkro && keyboard_idle) {
-#else  /* NKRO_ENABLE */
+#else /* NKRO_ENABLE */
                             if (keyboard_idle) {
 #endif /* NKRO_ENABLE */
                                 /* arm the idle timer if boot protocol & idle */
@@ -497,7 +562,7 @@ static bool usb_request_hook_cb(USBDriver *usbp) {
                                                         /* arm the timer */
 #ifdef NKRO_ENABLE
                         if (!keymap_config.nkro && keyboard_idle) {
-#else  /* NKRO_ENABLE */
+#else /* NKRO_ENABLE */
                         if (keyboard_idle) {
 #endif /* NKRO_ENABLE */
                             osalSysLockFromISR();
@@ -553,12 +618,21 @@ static const USBConfig usbcfg = {
  */
 void init_usb_driver(USBDriver *usbp) {
     for (int i = 0; i < NUM_USB_DRIVERS; i++) {
+#if STM32_USB_USE_OTG1
+        QMKUSBDriver *driver                       = &drivers.array[i].driver;
+        drivers.array[i].inout_ep_config.in_state  = &drivers.array[i].in_ep_state;
+        drivers.array[i].inout_ep_config.out_state = &drivers.array[i].out_ep_state;
+        drivers.array[i].int_ep_config.in_state    = &drivers.array[i].int_ep_state;
+        qmkusbObjectInit(driver, &drivers.array[i].config);
+        qmkusbStart(driver, &drivers.array[i].config);
+#else
         QMKUSBDriver *driver                     = &drivers.array[i].driver;
         drivers.array[i].in_ep_config.in_state   = &drivers.array[i].in_ep_state;
         drivers.array[i].out_ep_config.out_state = &drivers.array[i].out_ep_state;
         drivers.array[i].int_ep_config.in_state  = &drivers.array[i].int_ep_state;
         qmkusbObjectInit(driver, &drivers.array[i].config);
         qmkusbStart(driver, &drivers.array[i].config);
+#endif
     }
 
     /*
@@ -574,6 +648,13 @@ void init_usb_driver(USBDriver *usbp) {
     chVTObjectInit(&keyboard_idle_timer);
 }
 
+void restart_usb_driver(USBDriver *usbp) {
+    usbStop(usbp);
+    usbDisconnectBus(usbp);
+    usbStart(usbp, &usbcfg);
+    usbConnectBus(usbp);
+}
+
 /* ---------------------------------------------------------
  *                  Keyboard functions
  * ---------------------------------------------------------
@@ -608,7 +689,7 @@ static void keyboard_idle_timer_cb(void *arg) {
 
 #ifdef NKRO_ENABLE
     if (!keymap_config.nkro && keyboard_idle && keyboard_protocol) {
-#else  /* NKRO_ENABLE */
+#else /* NKRO_ENABLE */
     if (keyboard_idle && keyboard_protocol) {
 #endif /* NKRO_ENABLE */
         /* TODO: are we sure we want the KBD_ENDPOINT? */
@@ -657,7 +738,7 @@ void send_keyboard(report_keyboard_t *report) {
         usbStartTransmitI(&USB_DRIVER, SHARED_IN_EPNUM, (uint8_t *)report, sizeof(struct nkro_report));
     } else
 #endif /* NKRO_ENABLE */
-    {  /* regular protocol */
+    { /* regular protocol */
         /* need to wait until the previous packet has made it through */
         /* busy wait, should be short and not very common */
         if (usbGetTransmitStatusI(&USB_DRIVER, KEYBOARD_IN_EPNUM)) {
@@ -724,7 +805,7 @@ void send_mouse(report_mouse_t *report) {
     osalSysUnlock();
 }
 
-#else  /* MOUSE_ENABLE */
+#else /* MOUSE_ENABLE */
 void send_mouse(report_mouse_t *report) { (void)report; }
 #endif /* MOUSE_ENABLE */
 
@@ -804,7 +885,7 @@ void console_task(void) {
     } while (size > 0);
 }
 
-#else  /* CONSOLE_ENABLE */
+#else /* CONSOLE_ENABLE */
 int8_t sendchar(uint8_t c) {
     (void)c;
     return 0;
diff --git a/qmk/tmk_core/protocol/chibios/usb_main.h b/qmk/tmk_core/protocol/chibios/usb_main.h
index 94baf9b3..1381d076 100644
--- a/qmk/tmk_core/protocol/chibios/usb_main.h
+++ b/qmk/tmk_core/protocol/chibios/usb_main.h
@@ -21,8 +21,8 @@
 // TESTING
 // extern uint8_t blinkLed;
 
-#include "ch.h"
-#include "hal.h"
+#include <ch.h>
+#include <hal.h>
 
 /* -------------------------
  * General USB driver header
@@ -35,6 +35,9 @@
 /* Initialize the USB driver and bus */
 void init_usb_driver(USBDriver *usbp);
 
+/* Restart the USB driver and bus */
+void restart_usb_driver(USBDriver *usbp);
+
 /* ---------------
  * Keyboard header
  * ---------------
diff --git a/qmk/tmk_core/protocol/lufa/lufa.c b/qmk/tmk_core/protocol/lufa/lufa.c
index cec00440..8fd4be8a 100644
--- a/qmk/tmk_core/protocol/lufa/lufa.c
+++ b/qmk/tmk_core/protocol/lufa/lufa.c
@@ -61,7 +61,7 @@ extern keymap_config_t keymap_config;
 #endif
 
 #ifdef AUDIO_ENABLE
-#    include <audio.h>
+#    include "audio.h"
 #endif
 
 #ifdef BLUETOOTH_ENABLE
@@ -1104,6 +1104,10 @@ int main(void) {
 #if !defined(INTERRUPT_CONTROL_ENDPOINT)
         USB_USBTask();
 #endif
+
+        // Run housekeeping
+        housekeeping_task_kb();
+        housekeeping_task_user();
     }
 }
 
diff --git a/qmk/tmk_core/protocol/midi/bytequeue/interrupt_setting.c b/qmk/tmk_core/protocol/midi/bytequeue/interrupt_setting.c
index 1be1fee9..407cc65f 100644
--- a/qmk/tmk_core/protocol/midi/bytequeue/interrupt_setting.c
+++ b/qmk/tmk_core/protocol/midi/bytequeue/interrupt_setting.c
@@ -32,7 +32,7 @@ interrupt_setting_t store_and_clear_interrupt(void) {
 
 void restore_interrupt_setting(interrupt_setting_t setting) { SREG = setting; }
 #elif defined(__arm__)
-#    include "ch.h"
+#    include <ch.h>
 
 interrupt_setting_t store_and_clear_interrupt(void) {
     chSysLock();
diff --git a/qmk/tmk_core/protocol/usb_descriptor.c b/qmk/tmk_core/protocol/usb_descriptor.c
index f5d32445..7ea4b2e3 100644
--- a/qmk/tmk_core/protocol/usb_descriptor.c
+++ b/qmk/tmk_core/protocol/usb_descriptor.c
@@ -41,6 +41,10 @@
 #include "usb_descriptor.h"
 #include "usb_descriptor_common.h"
 
+#ifdef JOYSTICK_ENABLE
+#    include "joystick.h"
+#endif
+
 // clang-format off
 
 /*
@@ -308,10 +312,17 @@ const USB_Descriptor_HIDReport_Datatype_t PROGMEM JoystickReport[] = {
             HID_RI_USAGE(8, 0x35),      // Rz
 #    endif
 #    if JOYSTICK_AXES_COUNT >= 1
-            HID_RI_LOGICAL_MINIMUM(8, -127),
-            HID_RI_LOGICAL_MAXIMUM(8, 127),
+     # if JOYSTICK_AXES_RESOLUTION == 8
+            HID_RI_LOGICAL_MINIMUM(8, -JOYSTICK_RESOLUTION),
+            HID_RI_LOGICAL_MAXIMUM(8, JOYSTICK_RESOLUTION),
             HID_RI_REPORT_COUNT(8, JOYSTICK_AXES_COUNT),
             HID_RI_REPORT_SIZE(8, 0x08),
+     # else
+            HID_RI_LOGICAL_MINIMUM(16, -JOYSTICK_RESOLUTION),
+            HID_RI_LOGICAL_MAXIMUM(16, JOYSTICK_RESOLUTION),
+            HID_RI_REPORT_COUNT(8, JOYSTICK_AXES_COUNT),
+            HID_RI_REPORT_SIZE(8, 0x10),
+     # endif
             HID_RI_INPUT(8, HID_IOF_DATA | HID_IOF_VARIABLE | HID_IOF_ABSOLUTE),
 #    endif
 
@@ -363,7 +374,11 @@ const USB_Descriptor_Device_t PROGMEM DeviceDescriptor = {
     .ReleaseNumber              = DEVICE_VER,
     .ManufacturerStrIndex       = 0x01,
     .ProductStrIndex            = 0x02,
+#if defined(SERIAL_NUMBER)
     .SerialNumStrIndex          = 0x03,
+#else
+    .SerialNumStrIndex          = 0x00,
+#endif
     .NumberOfConfigurations     = FIXED_NUM_CONFIGURATIONS
 };
 
@@ -939,10 +954,7 @@ const USB_Descriptor_String_t PROGMEM ProductString = {
     .UnicodeString              = LSTR(PRODUCT)
 };
 
-#ifndef SERIAL_NUMBER
-#    define SERIAL_NUMBER 0
-#endif
-
+#if defined(SERIAL_NUMBER)
 const USB_Descriptor_String_t PROGMEM SerialNumberString = {
     .Header = {
         .Size                   = USB_STRING_LEN(sizeof(STR(SERIAL_NUMBER)) - 1), // Subtract 1 for null terminator
@@ -950,6 +962,7 @@ const USB_Descriptor_String_t PROGMEM SerialNumberString = {
     },
     .UnicodeString              = LSTR(SERIAL_NUMBER)
 };
+#endif
 
 // clang-format on
 
@@ -994,11 +1007,13 @@ uint16_t get_usb_descriptor(const uint16_t wValue, const uint16_t wIndex, const
                     Size    = pgm_read_byte(&ProductString.Header.Size);
 
                     break;
+#if defined(SERIAL_NUMBER)
                 case 0x03:
                     Address = &SerialNumberString;
                     Size    = pgm_read_byte(&SerialNumberString.Header.Size);
 
                     break;
+#endif
             }
 
             break;
diff --git a/qmk/tmk_core/protocol/usb_descriptor.h b/qmk/tmk_core/protocol/usb_descriptor.h
index 02a4b1ce..3a7c0bdb 100644
--- a/qmk/tmk_core/protocol/usb_descriptor.h
+++ b/qmk/tmk_core/protocol/usb_descriptor.h
@@ -46,7 +46,7 @@
 #include <LUFA/Drivers/USB/USB.h>
 
 #ifdef PROTOCOL_CHIBIOS
-#    include "hal.h"
+#    include <hal.h>
 #endif
 
 /*
@@ -204,8 +204,12 @@ enum usb_endpoints {
 #endif
 
 #ifdef RAW_ENABLE
-    RAW_IN_EPNUM  = NEXT_EPNUM,
+    RAW_IN_EPNUM = NEXT_EPNUM,
+#    if STM32_USB_USE_OTG1
+#        define RAW_OUT_EPNUM RAW_IN_EPNUM
+#    else
     RAW_OUT_EPNUM = NEXT_EPNUM,
+#    endif
 #endif
 
 #ifdef SHARED_EP_ENABLE
@@ -216,28 +220,44 @@ enum usb_endpoints {
     CONSOLE_IN_EPNUM = NEXT_EPNUM,
 
 #    ifdef PROTOCOL_CHIBIOS
-    // ChibiOS has enough memory and descriptor to actually enable the endpoint
-    // It could use the same endpoint numbers, as that's supported by ChibiOS
-    // But the QMK code currently assumes that the endpoint numbers are different
+// ChibiOS has enough memory and descriptor to actually enable the endpoint
+// It could use the same endpoint numbers, as that's supported by ChibiOS
+// But the QMK code currently assumes that the endpoint numbers are different
+#        if STM32_USB_USE_OTG1
+#            define CONSOLE_OUT_EPNUM CONSOLE_IN_EPNUM
+#        else
     CONSOLE_OUT_EPNUM = NEXT_EPNUM,
+#        endif
 #    else
 #        define CONSOLE_OUT_EPNUM CONSOLE_IN_EPNUM
 #    endif
 #endif
 
 #ifdef MIDI_ENABLE
-    MIDI_STREAM_IN_EPNUM  = NEXT_EPNUM,
+    MIDI_STREAM_IN_EPNUM = NEXT_EPNUM,
+#    if STM32_USB_USE_OTG1
+#        define MIDI_STREAM_OUT_EPNUM MIDI_STREAM_IN_EPNUM
+#    else
     MIDI_STREAM_OUT_EPNUM = NEXT_EPNUM,
+#    endif
 #endif
 
 #ifdef VIRTSER_ENABLE
     CDC_NOTIFICATION_EPNUM = NEXT_EPNUM,
     CDC_IN_EPNUM           = NEXT_EPNUM,
-    CDC_OUT_EPNUM          = NEXT_EPNUM,
+#    if STM32_USB_USE_OTG1
+#        define CDC_OUT_EPNUM CDC_IN_EPNUM
+#    else
+    CDC_OUT_EPNUM = NEXT_EPNUM,
+#    endif
 #endif
 #ifdef JOYSTICK_ENABLE
-    JOYSTICK_IN_EPNUM  = NEXT_EPNUM,
+    JOYSTICK_IN_EPNUM = NEXT_EPNUM,
+#    if STM32_USB_USE_OTG1
+    JOYSTICK_OUT_EPNUM = JOYSTICK_IN_EPNUM,
+#    else
     JOYSTICK_OUT_EPNUM = NEXT_EPNUM,
+#    endif
 #endif
 };
 
diff --git a/qmk/tmk_core/protocol/vusb/main.c b/qmk/tmk_core/protocol/vusb/main.c
index a57df5ce..0e3447d9 100644
--- a/qmk/tmk_core/protocol/vusb/main.c
+++ b/qmk/tmk_core/protocol/vusb/main.c
@@ -153,6 +153,10 @@ int main(void) {
                 console_task();
             }
 #endif
+
+            // Run housekeeping
+            housekeeping_task_kb();
+            housekeeping_task_user();
         } else if (suspend_wakeup_condition()) {
             usb_remote_wakeup();
         }
diff --git a/qmk/tmk_core/protocol/vusb/vusb.c b/qmk/tmk_core/protocol/vusb/vusb.c
index 77bbbd7b..9b65ba9a 100644
--- a/qmk/tmk_core/protocol/vusb/vusb.c
+++ b/qmk/tmk_core/protocol/vusb/vusb.c
@@ -531,10 +531,6 @@ const PROGMEM uchar console_hid_report[] = {
 };
 #endif
 
-#ifndef SERIAL_NUMBER
-#    define SERIAL_NUMBER 0
-#endif
-
 #ifndef USB_MAX_POWER_CONSUMPTION
 #    define USB_MAX_POWER_CONSUMPTION 500
 #endif
@@ -569,6 +565,7 @@ const PROGMEM usbStringDescriptor_t usbStringDescriptorProduct = {
     .bString             = LSTR(PRODUCT)
 };
 
+#if defined(SERIAL_NUMBER)
 const PROGMEM usbStringDescriptor_t usbStringDescriptorSerial = {
     .header = {
         .bLength         = USB_STRING_LEN(sizeof(STR(SERIAL_NUMBER)) - 1),
@@ -576,6 +573,7 @@ const PROGMEM usbStringDescriptor_t usbStringDescriptorSerial = {
     },
     .bString             = LSTR(SERIAL_NUMBER)
 };
+#endif
 
 /*
  * Device descriptor
@@ -595,7 +593,11 @@ const PROGMEM usbDeviceDescriptor_t usbDeviceDescriptor = {
     .bcdDevice           = DEVICE_VER,
     .iManufacturer       = 0x01,
     .iProduct            = 0x02,
+#if defined(SERIAL_NUMBER)
     .iSerialNumber       = 0x03,
+#else
+    .iSerialNumber       = 0x00,
+#endif
     .bNumConfigurations  = 1
 };
 
@@ -821,10 +823,12 @@ USB_PUBLIC usbMsgLen_t usbFunctionDescriptor(struct usbRequest *rq) {
                     usbMsgPtr = (usbMsgPtr_t)&usbStringDescriptorProduct;
                     len       = usbStringDescriptorProduct.header.bLength;
                     break;
+#if defined(SERIAL_NUMBER)
                 case 3:  // iSerialNumber
                     usbMsgPtr = (usbMsgPtr_t)&usbStringDescriptorSerial;
                     len       = usbStringDescriptorSerial.header.bLength;
                     break;
+#endif
             }
             break;
         case USBDESCR_HID:
diff --git a/qmk/users/bcat/config.h b/qmk/users/bcat/config.h
index b0d55618..16188950 100644
--- a/qmk/users/bcat/config.h
+++ b/qmk/users/bcat/config.h
@@ -1,26 +1,32 @@
+/* Copyright 2020 Jonathan Rascher
+ *
+ * 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/>.
+ */
+
 /* Wait between tap_code register and unregister to fix flaky media keys. */
 #undef TAP_CODE_DELAY
 
 #define TAP_CODE_DELAY 20
 
-/*
- * Force the default tapping term since some keyboards make it way too short
- * (*cough*Lily58*cough*).
- */
-#undef TAPPING_TERM
-
-#define TAPPING_TERM 200
-
-/*
- * Treat mod-tap keys as holds even if the mod-tap key and the key being
- * modified are both relased within TAPPING_TERM. This assumes the mod-tap key
+/* Treat mod-tap keys as holds even if the mod-tap key and the key being
+ * modified are both released within TAPPING_TERM. This assumes the mod-tap key
  * isn't usually pressed in quick succession with other tapped keys, which is
  * good when the tap keycode is something like KC_ESC rather than a letter.
  */
 #define PERMISSIVE_HOLD
 
-/*
- * Turn off key repeat support of the tap keycode for tap-hold keys, enabling
+/* Turn off key repeat support of the tap keycode for tap-hold keys, enabling
  * holds to work correctly in quick succession after taps.
  */
 #define TAPPING_FORCE_HOLD
@@ -57,6 +63,9 @@
 #    define RGBLIGHT_HUE_STEP 8
 #    define RGBLIGHT_SAT_STEP 17
 #    define RGBLIGHT_VAL_STEP 17
+
+/* Turn on additional RGB animations. */
+#    define RGBLIGHT_ANIMATIONS
 #endif
 
 #if defined(BACKLIGHT_ENABLE)
diff --git a/qmk/users/bcat/readme.md b/qmk/users/bcat/readme.md
index 49fbea1a..6d097d66 100644
--- a/qmk/users/bcat/readme.md
+++ b/qmk/users/bcat/readme.md
@@ -1,13 +1,48 @@
 # bcat's userspace
 
 This is some code and config shared by all of [my](https://github.com/bcat)
-keyboards. I have a few different keymaps spread throughout the repo; however,
-they are all derived from two "canonical" keymaps for my preferred layouts:
+keyboards. I use community layouts wherever possible, only writing
+keyboard-specific keymaps for boards without standard layout support. I derive
+my keymaps from two canonical ones (preferred for typing and gaming,
+respectively).
 
-* For typing, my canonical layout is my
-[Crkbd](https://github.com/qmk/qmk_firmware/tree/master/keyboards/crkbd/keymaps/bcat)
-(split ergo, columnar-staggered) layout.
+## Canonical keymaps
 
-* For gaming, my canonical layout is my
-[Tsangan](https://github.com/qmk/qmk_firmware/tree/master/layouts/community/60_tsangan_hhkb/bcat)
-(row-staggered) layout.
+* [Split 3x6 + 3 thumb
+keys](https://github.com/qmk/qmk_firmware/tree/master/layouts/community/split_3x6_3/bcat):
+Columnar-staggered split ergo layout, preferred for typing. Used on Crkbd.
+
+* [60% Tsangan
+HHKB](https://github.com/qmk/qmk_firmware/tree/master/layouts/community/60_tsangan_hhkb/bcat):
+Row-staggered layout, preferred for gaming. Used on ai03 Polaris, CannonKeys
+AN-C, CannonKeys Instant60.
+
+## Other keymaps
+
+### Ergo
+
+* [Lily58](https://github.com/qmk/qmk_firmware/tree/master/keyboards/lily58/keymaps/bcat)
+
+### Ortho
+
+* [Eco](https://github.com/qmk/qmk_firmware/tree/master/keyboards/eco/keymaps/bcat)
+
+### Traditional
+
+* [60% ANSI split
+backspace/right-shift](https://github.com/qmk/qmk_firmware/tree/master/layouts/community/60_ansi_split_bs_rshift/bcat).
+Used on DZ60.
+
+* [65% ANSI blocker split
+backspace](https://github.com/qmk/qmk_firmware/tree/master/layouts/community/65_ansi_blocker_split_bs/bcat).
+Used on KBDfans KBD67 hotswap.
+
+* [Keebio
+Quefrency](https://github.com/qmk/qmk_firmware/tree/master/keyboards/keebio/quefrency/keymaps/bcat)
+
+### Macropads
+
+* [9-Key](https://github.com/qmk/qmk_firmware/tree/master/keyboards/9key/keymaps/bcat)
+
+* [Keebio
+BDN9](https://github.com/qmk/qmk_firmware/tree/master/keyboards/keebio/bdn9/keymaps/bcat)
diff --git a/qmk/users/bocaj/.gitignore b/qmk/users/bocaj/.gitignore
new file mode 100644
index 00000000..c6df8c01
--- /dev/null
+++ b/qmk/users/bocaj/.gitignore
@@ -0,0 +1 @@
+secrets.c
diff --git a/qmk/users/bocaj/.gitlab-ci.yml b/qmk/users/bocaj/.gitlab-ci.yml
new file mode 100644
index 00000000..71e3d26e
--- /dev/null
+++ b/qmk/users/bocaj/.gitlab-ci.yml
@@ -0,0 +1,24 @@
+stages:
+  - test
+
+QMK Firmware:
+  stage: test
+  variables:
+    GIT_SUBMODULE_STRATEGY: recursive
+  tags:
+    - linux
+  image: qmkfm/base_container
+  before_script:
+    - apt-get update -qy
+    - apt-get install -y build-essential avr-libc binutils-arm-none-eabi binutils-avr dfu-programmer dfu-util gcc gcc-arm-none-eabi git libnewlib-arm-none-eabi gcc-avr python3 unzip wget zip
+    - avr-gcc --version
+    - uname -a
+  script:
+    - make planck/rev6:default planck/rev5:default
+    - make all:bocaj -j2
+  artifacts:
+    name: "$CI_JOB_NAME-$CI_COMMIT_REF_SLUG"
+    paths:
+      - ./*.hex
+      - ./*.bin
+    expire_in: 1 month
diff --git a/qmk/users/bocaj/bocaj.c b/qmk/users/bocaj/bocaj.c
index 689dbe7b..83fe8123 100644
--- a/qmk/users/bocaj/bocaj.c
+++ b/qmk/users/bocaj/bocaj.c
@@ -1,5 +1,5 @@
 /*
-Copyright 2018 Jacob Jerrell <jacob.jerrell@gmail.com> @JacobJerrell
+Copyright 2020 Jacob Jerrell <jacob.jerrell@gmail.com> @JacobJerrell	
 
 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
@@ -17,173 +17,194 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "bocaj.h"
 
+#ifdef KEYBOARD_planck_ez
 userspace_config_t userspace_config;
-#if (defined(UNICODE_ENABLE) || defined(UNICODEMAP_ENABLE) || defined(UCIS_ENABLE))
-  #define BOCAJ_UNICODE_MODE UC_OSX
-#else
-  // set to 2 for UC_WIN, set to 4 for UC_WINC
-  #define BOCAJ_UNICODE_MODE 2
 #endif
 
-void tap(uint16_t keycode){ register_code(keycode); unregister_code(keycode); };
+bool mod_key_press_timer(uint16_t code, uint16_t mod_code, bool pressed) {
+    static uint16_t this_timer;
+    if (pressed) {
+        this_timer = timer_read();
+    } else {
+        if (timer_elapsed(this_timer) < TAPPING_TERM) {
+            tap_code(code);
+        } else {
+            register_code(mod_code);
+            tap_code(code);
+            unregister_code(mod_code);
+        }
+    }
+    return false;
+}
 
+bool mod_key_press(uint16_t code, uint16_t mod_code, bool pressed, uint16_t this_timer) {
+    if (pressed) {
+        this_timer = timer_read();
+    } else {
+        if (timer_elapsed(this_timer) < TAPPING_TERM) {
+            tap_code(code);
+        } else {
+            register_code(mod_code);
+            tap_code(code);
+            unregister_code(mod_code);
+        }
+    }
+    return false;
+}
+
+void bootmagic_lite(void) {
+    matrix_scan();
+#if defined(DEBOUNCING_DELAY) && DEBOUNCING_DELAY > 0
+    wait_ms(DEBOUNCING_DELAY * 2);
+#elif defined(DEBOUNCE) && DEBOUNCE > 0
+    wait_ms(DEBOUNCE * 2);
+#else
+    wait_ms(30);
+#endif
+    matrix_scan();
+    if (matrix_get_row(BOOTMAGIC_LITE_ROW) & (1 << BOOTMAGIC_LITE_COLUMN)) {
+        bootloader_jump();
+    }
+}
+
+__attribute__((weak)) void keyboard_pre_init_keymap(void) {}
+
+void keyboard_pre_init_user(void) {
+#ifdef KEYBOARD_planck_ez
+    userspace_config.raw = eeconfig_read_user();
+#endif
+    keyboard_pre_init_keymap();
+}
 // Add reconfigurable functions here, for keymap customization
 // This allows for a global, userspace functions, and continued
 // customization of the keymap.  Use _keymap instead of _user
 // functions in the keymaps
-__attribute__ ((weak))
-void matrix_init_keymap(void) {}
-
-__attribute__ ((weak))
-void startup_keymap(void) {}
-
-__attribute__ ((weak))
-void suspend_power_down_keymap(void) {}
-
-__attribute__ ((weak))
-void suspend_wakeup_init_keymap(void) {}
-
-__attribute__ ((weak))
-void matrix_scan_keymap(void) {}
-
-__attribute__ ((weak))
-bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
-
-__attribute__ ((weak))
-void matrix_scan_secrets(void) {}
-
-__attribute__ ((weak))
-uint32_t layer_state_set_keymap (uint32_t state) {
-  return state;
-}
-
-__attribute__ ((weak))
-uint32_t default_layer_state_set_keymap (uint32_t state) {
-  return state;
-}
-
-__attribute__ ((weak))
-void led_set_keymap(uint8_t usb_led) {}
+__attribute__((weak)) void matrix_init_keymap(void) {}
 
 // Call user matrix init, set default RGB colors and then
 // call the keymap's init function
 void matrix_init_user(void) {
-  userspace_config.raw = eeconfig_read_user();
-
-  #if (defined(UNICODE_ENABLE) || defined(UNICODEMAP_ENABLE) || defined(UCIS_ENABLE))
-    set_unicode_input_mode(BOCAJ_UNICODE_MODE);
-    get_unicode_input_mode();
-  #endif //UNICODE_ENABLE
-
-
-  matrix_init_keymap();
+    matrix_init_keymap();
 }
 
-void startup_user (void) {
-  startup_keymap();
+__attribute__((weak)) void keyboard_post_init_keymap(void) {}
+
+void keyboard_post_init_user(void) {
+#if defined(RGB_MATRIX_ENABLE)
+    keyboard_post_init_rgb_matrix();
+#endif
+    keyboard_post_init_keymap();
 }
 
-void suspend_power_down_user(void)
-{
-    suspend_power_down_keymap();
+__attribute__((weak)) void shutdown_keymap(void) {}
+
+void rgb_matrix_update_pwm_buffers(void);
+
+void shutdown_user(void) {
+#ifdef RGB_MATRIX_ENABLE
+    rgb_matrix_set_color_all(0xFF, 0x00, 0x00);
+    rgb_matrix_update_pwm_buffers();
+
+#endif  // RGB_MATRIX_ENABLE
+    shutdown_keymap();
 }
 
-void suspend_wakeup_init_user(void)
-{
-  suspend_wakeup_init_keymap();
-  #ifdef KEYBOARD_ergodox_ez
-  wait_ms(10);
-  #endif
-}
+__attribute__((weak)) void suspend_power_down_keymap(void) {}
 
-void eeconfig_init_user(void) {
-  userspace_config.raw = 0;
-  eeconfig_update_user(userspace_config.raw);
-  #if (defined(UNICODE_ENABLE) || defined(UNICODEMAP_ENABLE) || defined(UCIS_ENABLE))
-    set_unicode_input_mode(BOCAJ_UNICODE_MODE);
-    get_unicode_input_mode();
-  #else
-    eeprom_update_byte(EECONFIG_UNICODEMODE, BOCAJ_UNICODE_MODE);
-  #endif
-}
+void suspend_power_down_user(void) { suspend_power_down_keymap(); }
+
+__attribute__((weak)) void suspend_wakeup_init_keymap(void) {}
+
+void suspend_wakeup_init_user(void) { suspend_wakeup_init_keymap(); }
+
+__attribute__((weak)) void matrix_scan_secrets(void) {}
+__attribute__((weak)) void matrix_scan_keymap(void) {}
 
 LEADER_EXTERNS();
+
 // No global matrix scan code, so just run keymap's matrix
 // scan function
 void matrix_scan_user(void) {
-  static bool has_ran_yet;
-  if (!has_ran_yet) {
-    has_ran_yet = true;
-    startup_user();
-  }
-  LEADER_DICTIONARY() {
-    leading = false;
-    leader_end();
-
-    // Mac Save (Leader -> s)
-    SEQ_ONE_KEY(KC_S) {
-      SEND_STRING(SS_LGUI("s"));
+    static bool has_ran_yet;
+    if (!has_ran_yet) {
+        has_ran_yet = true;
+        startup_user();
     }
 
-    // Mac copy line down (Leader -> d, d)
-    SEQ_TWO_KEYS(KC_D, KC_D) {
-      register_code(KC_LSHIFT);
-      register_code(KC_HOME);
-      unregister_code(KC_HOME);
-      unregister_code(KC_LSHIFT);
-      SEND_STRING(SS_LGUI("c"));
-      tap(KC_END);
-      tap(KC_ENTER);
-      SEND_STRING(SS_LGUI("v"));
+    LEADER_DICTIONARY() {
+        leading = false;
+        leader_end();
+
+        // Website Refresh / XCode "Run"
+        SEQ_ONE_KEY(KC_R) {
+            SEND_STRING(SS_LGUI("r"));
+        }
+
+        SEQ_TWO_KEYS(KC_B, KC_D) {
+            SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION " Built at: " QMK_BUILDDATE);
+        }
+
+        #ifndef NO_SECRETS
+        matrix_scan_secrets();
+        #endif // !NO_SECRETS
     }
+    
+#if defined(RGB_MATRIX_ENABLE)
+    matrix_scan_rgb_matrix();
+#endif
 
-    // Mac copy line up (Leader -> u, u)
-    SEQ_TWO_KEYS(KC_U, KC_U) {
-      register_code(KC_LSHIFT);
-      register_code(KC_HOME);
-      unregister_code(KC_HOME);
-      unregister_code(KC_LSHIFT);
-      SEND_STRING(SS_LGUI("c"));
-      tap(KC_UP);
-      tap(KC_END);
-      tap(KC_ENTER);
-      SEND_STRING(SS_LGUI("v"));
-    }
-
-    // Mac VS Debug
-    SEQ_ONE_KEY(KC_D) {
-      tap(KC_F5);
-    }
-
-    // Mac VS Stop Debug
-    SEQ_TWO_KEYS(KC_S, KC_D) {
-      register_code(KC_LSHIFT);
-      tap(KC_F5);
-      unregister_code(KC_LSHIFT);
-    }
-
-    // Start Diablo 3
-    SEQ_ONE_KEY(KC_3) {
-      SEND_STRING(SS_LCTRL(" "));
-      SEND_STRING("Diablo");
-      tap(KC_ENTER);
-    }
-
-    SEQ_ONE_KEY(KC_B) {
-      SEND_STRING (QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION " ");
-      tap(KC_ENTER);
-      SEND_STRING ("Built at: " QMK_BUILDDATE);
-    }
-#ifndef NO_SECRETS
-    matrix_scan_secrets();
-#endif // !NO_SECRETS
-  }
-
-#ifdef TAP_DANCE_ENABLE  // Run Diablo 3 macro checking code.
-  run_diablo_macro_check();
-#endif // TAP_DANCE_ENABLE
-
-  matrix_scan_keymap();
+    matrix_scan_keymap();
+}
+
+__attribute__((weak)) layer_state_t layer_state_set_keymap(layer_state_t state) { return state; }
+
+// on layer change, no matter where the change was initiated
+// Then runs keymap's layer change check
+layer_state_t layer_state_set_user(layer_state_t state) {
+    state = update_tri_layer_state(state, _RAISE, _LOWER, _ADJUST);
+#if defined(RGBLIGHT_ENABLE)
+    state = layer_state_set_rgb_light(state);
+#endif  // RGBLIGHT_ENABLE
+    return layer_state_set_keymap(state);
+}
+
+__attribute__((weak)) layer_state_t default_layer_state_set_keymap(layer_state_t state) { return state; }
+
+// Runs state check and changes underglow color and animation
+layer_state_t default_layer_state_set_user(layer_state_t state) {
+    state = default_layer_state_set_keymap(state);
+#if 0
+#   if defined(RGB_MATRIX_ENABLE)
+        state = default_layer_state_set_rgb(state);
+#   endif  // RGB_MATRIX_ENABLE
+#endif
+    return state;
+}
+
+__attribute__((weak)) void led_set_keymap(uint8_t usb_led) {}
+
+// Any custom LED code goes here.
+// So far, I only have keyboard specific code,
+// So nothing goes here.
+void led_set_user(uint8_t usb_led) { led_set_keymap(usb_led); }
+
+__attribute__((weak)) void eeconfig_init_keymap(void) {}
+
+void eeconfig_init_user(void) {
+#ifdef KEYBOARD_planck_ez
+    userspace_config.raw              = 0;
+#  if defined(RGB_MATRIX_ENABLE)
+    userspace_config.rgb_layer_change = true;
+#  endif
+    eeconfig_update_user(userspace_config.raw);
+#endif
+    eeconfig_init_keymap();
+    keyboard_init();
+}
+
+bool hasAllBitsInMask(uint8_t value, uint8_t mask) {
+    value &= 0xF;
+    mask &= 0xF;
+
+    return (value & mask) == mask;
 }
diff --git a/qmk/users/bocaj/bocaj.h b/qmk/users/bocaj/bocaj.h
index 04991a01..e69be74d 100644
--- a/qmk/users/bocaj/bocaj.h
+++ b/qmk/users/bocaj/bocaj.h
@@ -1,5 +1,6 @@
 /*
-Copyright 2018 Jacob Jerrell <jacob.jerrell@gmail.com> @JacobJerrell
+Copyright 2017 Christopher Courtney <drashna@live.com> @drashna
+Copyright 2020 Jacob Jerrell <jacob.jerrell@gmail.com> @JacobJerrell
 
 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
@@ -16,70 +17,57 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #pragma once
-#include "quantum.h"
+#include QMK_KEYBOARD_H
+
 #include "version.h"
 #include "eeprom.h"
-#include "wrappers.h"
 #include "process_records.h"
-#ifdef TAP_DANCE_ENABLE
-  #include "tap_dances.h"
-#endif // TAP_DANCE_ENABLE
-
-/* Layer Names */
-enum userspace_layers {
-  _WORKMAN = 0,
-  _WINWORKMAN,
-  _QWERTY,
-  _LOWER,
-  _ADJUST,
-  _DIABLO,
-};
-
-#if (defined(UNICODE_ENABLE) || defined(UNICODEMAP_ENABLE) || defined(UCIS_ENABLE))
-  #define BOCAJ_UNICODE_MODE UC_OSX
-#else
-  // set to 2 for UC_WIN, set to 4 for UC_WINC
-  #define BOCAJ_UNICODE_MODE 2
+#include "wrappers.h"
+#if defined(RGB_MATRIX_ENABLE)
+#    include "rgb_matrix_stuff.h"
 #endif
 
-/*
-define modifiers here, since MOD_* doesn't seem to work for these
- */
+/* Define layer names */
+enum userspace_layers {
+    _WORKMAN = 0,
+    _QWERTY,
+    _WWORKMAN,
+    _WQWERTY,
+    _LOWER,
+    _RAISE,
+    _ADJUST,
+    _MOD,
+    LAYER_SAFE_RANGE,
+};
+
 #define MODS_SHIFT_MASK  (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT))
-#define MODS_CTRL_MASK  (MOD_BIT(KC_LCTL)|MOD_BIT(KC_RCTRL))
-#define MODS_ALT_MASK  (MOD_BIT(KC_LALT)|MOD_BIT(KC_RALT))
-#define MODS_GUI_MASK  (MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI))
+#define MODS_CTRL_MASK   (MOD_BIT(KC_LCTL)|MOD_BIT(KC_RCTRL))
+#define MODS_ALT_MASK    (MOD_BIT(KC_LALT)|MOD_BIT(KC_RALT))
+#define MODS_GUI_MASK    (MOD_BIT(KC_LGUI)|MOD_BIT(KC_RGUI))
 
-bool mod_key_press_timer (uint16_t code, uint16_t mod_code, bool pressed);
-bool mod_key_press (uint16_t code, uint16_t mod_code, bool pressed, uint16_t this_timer);
-bool send_game_macro(const char *str, keyrecord_t *record, bool override);
-void matrix_init_keymap(void);
-void shutdown_keymap(void);
-void suspend_power_down_keymap(void);
-void suspend_wakeup_init_keymap(void);
-void matrix_scan_keymap(void);
-uint32_t layer_state_set_keymap (uint32_t state);
-uint32_t default_layer_state_set_keymap (uint32_t state);
-void led_set_keymap(uint8_t usb_led);
-void eeconfig_init_keymap(void);
-void tap(uint16_t keycode);
+bool          mod_key_press_timer(uint16_t code, uint16_t mod_code, bool pressed);
+bool          mod_key_press(uint16_t code, uint16_t mod_code, bool pressed, uint16_t this_timer);
+void          matrix_init_keymap(void);
+void          shutdown_keymap(void);
+void          suspend_power_down_keymap(void);
+void          suspend_wakeup_init_keymap(void);
+void          matrix_scan_keymap(void);
+layer_state_t layer_state_set_keymap(layer_state_t state);
+layer_state_t default_layer_state_set_keymap(layer_state_t state);
+void          led_set_keymap(uint8_t usb_led);
+void          eeconfig_init_keymap(void);
+bool          hasAllBitsInMask(uint8_t value, uint8_t mask);
 
+// clang-format off
+#ifdef KEYBOARD_planck_ez
 typedef union {
-  uint8_t raw;
+    uint32_t raw;
+    struct {
+        bool    rgb_layer_change     :1;
+        bool    rgb_matrix_idle_anim :1;
+    };
 } userspace_config_t;
+// clang-format on
 
 extern userspace_config_t userspace_config;
-
-// If Tap Dancing is enabled, we manage that here.
-// If it is not, then we define the KC_D3_# codes gracefully
-#ifdef TAP_DANCE_ENABLE
-  #define KC_D3_1 TD(TD_D3_1)
-  #define KC_D3_2 TD(TD_D3_2)
-  #define KC_D3_3 TD(TD_D3_3)
-  #define KC_D3_4 TD(TD_D3_4)
-#else // !TAP_DANCE_ENABLE
-  #define KC_D3_1 KC_1
-  #define KC_D3_2 KC_2
-  #define KC_D3_3 KC_3
-  #define KC_D3_4 KC_4
-#endif // TAP_DANCE_ENABLE
+#endif
diff --git a/qmk/users/bocaj/config.h b/qmk/users/bocaj/config.h
index 1956ea6d..2a44aabf 100644
--- a/qmk/users/bocaj/config.h
+++ b/qmk/users/bocaj/config.h
@@ -1,8 +1,82 @@
 #pragma once
 
-#ifndef QMK_KEYS_PER_SCAN
-  #define QMK_KEYS_PER_SCAN 4
-#endif // QMK KEYS PER SCAN
+// Use custom magic number so that when switching branches, EEPROM always gets reset
+#define EECONFIG_MAGIC_NUMBER (uint16_t)0x1339
+
+/* Set Polling rate to 1000Hz */
+#define USB_POLLING_INTERVAL_MS 1
+
+#ifdef AUDIO_ENABLE
+
+#    define AUDIO_CLICKY
+#    define STARTUP_SONG SONG(RICK_ROLL)
+#    define GOODBYE_SONG SONG(SONIC_RING)
+#    define DEFAULT_LAYER_SONGS \
+        { SONG(QWERTY_SOUND), SONG(COLEMAK_SOUND), SONG(DVORAK_SOUND), SONG(OVERWATCH_THEME) }
+
+#    define AUDIO_CLICKY_FREQ_RANDOMNESS 1.5f
+
+#    define UNICODE_SONG_MAC SONG(RICK_ROLL)
+#    define UNICODE_SONG_LNX SONG(RICK_ROLL)
+#    define UNICODE_SONG_WIN SONG(RICK_ROLL)
+#    define UNICODE_SONG_BSD SONG(RICK_ROLL)
+#    define UNICODE_SONG_WINC SONG(RICK_ROLL)
+#endif  // !AUDIO_ENABLE
+
+#ifdef RGB_MATRIX_ENABLE
+#    define RGB_MATRIX_KEYPRESSES  // reacts to keypresses (will slow down matrix scan by a lot)
+// #   define RGB_MATRIX_KEYRELEASES // reacts to keyreleases (not recommened)
+#    define RGB_MATRIX_FRAMEBUFFER_EFFECTS
+// #   define RGB_DISABLE_AFTER_TIMEOUT 0 // number of ticks to wait until disabling effects
+#    define RGB_DISABLE_WHEN_USB_SUSPENDED true  // turn off effects when suspended
+// #   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__)
+#        define DISABLE_RGB_MATRIX_ALPHAS_MODS
+#        define DISABLE_RGB_MATRIX_GRADIENT_UP_DOWN
+#        define DISABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
+#        define DISABLE_RGB_MATRIX_BREATHING
+#        define DISABLE_RGB_MATRIX_BAND_SAT
+#        define DISABLE_RGB_MATRIX_BAND_VAL
+#        define DISABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
+#        define DISABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
+#        define DISABLE_RGB_MATRIX_BAND_SPIRAL_SAT
+#        define DISABLE_RGB_MATRIX_BAND_SPIRAL_VAL
+#        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_DUAL
+#        define DISABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
+#        define DISABLE_RGB_MATRIX_DUAL_BEACON
+#        define DISABLE_RGB_MATRIX_CYCLE_PINWHEEL
+#        define DISABLE_RGB_MATRIX_CYCLE_SPIRAL
+#        define DISABLE_RGB_MATRIX_RAINBOW_BEACON
+#        define DISABLE_RGB_MATRIX_RAINBOW_PINWHEELS
+#        define DISABLE_RGB_MATRIX_RAINDROPS
+#        define DISABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
+// #       define DISABLE_RGB_MATRIX_TYPING_HEATMAP
+#        define DISABLE_RGB_MATRIX_DIGITAL_RAIN
+#        define DISABLE_RGB_MATRIX_SOLID_REACTIVE
+#        define DISABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
+#        define DISABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
+#        define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
+#        define DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
+#        define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
+#        define DISABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
+#        define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
+#        define DISABLE_RGB_MATRIX_SPLASH
+#        define DISABLE_RGB_MATRIX_MULTISPLASH
+#        define DISABLE_RGB_MATRIX_SOLID_SPLASH
+#        define DISABLE_RGB_MATRIX_SOLID_MULTISPLASH
+#    endif  // AVR
+#endif      // RGB_MATRIX_ENABLE
+
+#ifdef QMK_KEYS_PER_SCAN
+#    undef QMK_KEYS_PER_SCAN
+#    define QMK_KEYS_PER_SCAN 1
+#endif  // !QMK_KEYS_PER_SCAN
 
 // this makes it possible to do rolling combos (zx) with keys that
 // convert to other keys on hold (z becomes ctrl when you hold it,
@@ -10,24 +84,30 @@
 // actually sends Ctrl-x. That's bad.)
 #define IGNORE_MOD_TAP_INTERRUPT
 #undef PERMISSIVE_HOLD
-#define PREVENT_STUCK_MODIFIERS
+//#define TAPPING_FORCE_HOLD
+//#define RETRO_TAPPING
+
+#define FORCE_NKRO
+
+#ifndef TAPPING_TOGGLE
+#    define TAPPING_TOGGLE 1
+#endif
 
 #ifdef TAPPING_TERM
-#undef TAPPING_TERM
-#endif // TAPPING_TERM
-#define TAPPING_TERM 175
+#    undef TAPPING_TERM
+#endif  // TAPPING_TERM
+#if defined(KEYBOARD_ergodox_ez)
+#    define TAPPING_TERM 185
+#else
+#    define TAPPING_TERM 175
+#endif
 
-#define RETRO_TAPPING
+#define TAP_CODE_DELAY 5
 
-// Disable action_get_macro and fn_actions, since we don't use these
-// and it saves on space in the firmware.
-#ifndef NO_DEBUG
-#define NO_DEBUG
-#endif // !NO_DEBUG
-#if !defined(NO_PRINT) && !defined(CONSOLE_ENABLE)
-#define NO_PRINT
-#endif // !NO_PRINT
-#define NO_ACTION_MACRO
-#define NO_ACTION_FUNCTION
-
-#define MACRO_TIMER 5
+/* Disable unused and unneeded features to reduce on firmware size */
+#ifdef LOCKING_SUPPORT_ENABLE
+#    undef LOCKING_SUPPORT_ENABLE
+#endif
+#ifdef LOCKING_RESYNC_ENABLE
+#    undef LOCKING_RESYNC_ENABLE
+#endif
diff --git a/qmk/users/bocaj/process_records.c b/qmk/users/bocaj/process_records.c
index c36683f8..9eb181ad 100644
--- a/qmk/users/bocaj/process_records.c
+++ b/qmk/users/bocaj/process_records.c
@@ -1,149 +1,111 @@
 #include "bocaj.h"
-#include QMK_KEYBOARD_H
+#include <print.h>
 
-uint16_t copy_paste_timer;
-uint16_t grave_layer_timer;
-uint16_t heal_layer_timer;
+__attribute__((weak)) bool process_record_keymap(uint16_t keycode, keyrecord_t *record) { return true; }
 
-__attribute__ ((weak))
-bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
-  return true;
-}
+__attribute__((weak)) bool process_record_secrets(uint16_t keycode, keyrecord_t *record) { return true; }
 
 // Defines actions tor my global custom keycodes. Defined in bocaj.h file
 // Then runs the _keymap's record handler if not processed here
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case KC_MWRK:
-      if (!record->event.pressed) {
-        set_single_persistent_default_layer(_WORKMAN);
-        #if (defined(UNICODE_ENABLE) || defined(UNICODEMAP_ENABLE) || defined(UCIS_ENABLE))
-          set_unicode_input_mode(0);
-        #endif
-        layer_move(0);
-        ergodox_blink_all_leds();
-      }
-      break;
-    case KC_WWRK:
-      if (!record->event.pressed) {
-        set_single_persistent_default_layer(_WINWORKMAN);
-        #if (defined(UNICODE_ENABLE) || defined(UNICODEMAP_ENABLE) || defined(UCIS_ENABLE))
-          set_unicode_input_mode(4);
-        #endif
-        layer_move(0);
-        ergodox_blink_all_leds();
-      }
-      break;
-    case KC_MQWR:
-      if (!record->event.pressed) {
-        set_single_persistent_default_layer(_QWERTY);
-        #if (defined(UNICODE_ENABLE) || defined(UNICODEMAP_ENABLE) || defined(UCIS_ENABLE))
-          set_unicode_input_mode(0);
-        #endif
-        layer_move(0);
-        ergodox_blink_all_leds();
-      }
-      break;
-    case MC_LOCK:
-      if (!record->event.pressed) {
-        layer_move(0);
-        SEND_STRING(SS_LCTRL(SS_LGUI("q")));
-      }
-      break;
-    case KC_MAKE:  // Compiles the firmware, and adds the flash command based on keyboard bootloader
-      if (!record->event.pressed) {
-        uint8_t temp_mod = get_mods();
-        uint8_t temp_osm = get_oneshot_mods();
-        clear_mods();
-        clear_oneshot_mods();
-        if (biton32(default_layer_state) == _WINWORKMAN) {
-          send_string_with_delay_P(PSTR("make " QMK_KEYBOARD ":" QMK_KEYMAP), 10);
-        } else {
-          send_string_with_delay_P(PSTR("util/docker_build.sh " QMK_KEYBOARD ":" QMK_KEYMAP), 10);
-        }
-        if (temp_mod & MODS_SHIFT_MASK) {
-          send_string_with_delay_P(PSTR(":teensy"), 10);
-        }
-        if (temp_mod & MODS_CTRL_MASK) {
-          send_string_with_delay_P(PSTR(" -j8 --output-sync"), 10);
-        }
-        send_string_with_delay_P(PSTR(SS_TAP(X_ENTER)), 10);
-        set_mods(temp_mod);
-        layer_move(0);
-      }
-      break;
-    case KC_DCLR:  // reset all Diablo timers, disabling them
-#ifdef TAP_DANCE_ENABLE
-      if (record->event.pressed) {
-        uint8_t dtime;
-        for (dtime = 0; dtime < 4; dtime++) {
-          diablo_key_time[dtime] = diablo_times[0];
-        }
-      }
-#endif // TAP_DANCE_ENABLE
-      break;
-      case JJ_ARRW:
-      if (!record->event.pressed) {
-        SEND_STRING("->");
-      }
-      return false;
-      break;
-    case LM_GRAVE:
-      if (record->event.pressed) {
-        grave_layer_timer = timer_read();
-      } else {
-        if (timer_elapsed(grave_layer_timer) < TAPPING_TERM) {
-          uint8_t temp_mod = get_mods();
-          uint8_t one_shot = get_oneshot_mods();
-          clear_mods();
-          if (temp_mod & MODS_SHIFT_MASK || one_shot & MODS_SHIFT_MASK) {
-            register_code(KC_LSFT);
-            tap(KC_GRAVE);
-            unregister_code(KC_LSFT);
-          } else {
-            tap(KC_GRAVE);
-          }
-          set_mods(temp_mod);
-        } else {
-          layer_move(0);
-        }
-      }
-      return false;
-      break;
-    case KC_CCCV:
-      if (record->event.pressed) {
-        copy_paste_timer = timer_read();
-      } else {
-        if (timer_elapsed(copy_paste_timer) > TAPPING_TERM) { // Hold, copy
-          SEND_STRING(SS_LGUI("c"));
-        } else {
-          SEND_STRING(SS_LGUI("v"));
-        }
-      }
-      return false;
-      break;
-#ifdef UNICODE_ENABLE
-    case UC_FLIP: // (ノಠ痊ಠ)ノ彡┻━┻
-      if (record->event.pressed) {
-        send_unicode_hex_string("0028 30CE 0CA0 75CA 0CA0 0029 30CE 5F61 253B 2501 253B");
-      }
-      break;
-    case UC_TABL: // ┬─┬ノ( º _ ºノ)
-      if (record->event.pressed) {
-        send_unicode_hex_string("252C 2500 252C 30CE 0028 0020 00BA 0020 005F 0020 00BA 30CE 0029");
-      }
-      break;
-    case UC_SHRG: // ¯\_(ツ)_/¯
-      if (record->event.pressed) {
-        send_unicode_hex_string("00AF 005C 005F 0028 30C4 0029 005F 002F 00AF");
-      }
-      break;
-    case UC_DISA: // ಠ_ಠ
-      if (record->event.pressed) {
-        send_unicode_hex_string("0CA0 005F 0CA0");
-      }
-      break;
+
+    if (process_record_keymap(keycode, record) && process_record_secrets(keycode, record)
+#ifdef RGB_MATRIX_ENABLE
+        && process_record_user_rgb_matrix(keycode, record)
 #endif
-  }
-  return process_record_keymap(keycode, record);
+    ) {
+        switch (keycode) {
+            case KC_WORKMAN:
+                if (!record->event.pressed) {
+                    uint8_t mods = mod_config(get_mods());
+                    if (!mods) {
+                        set_single_persistent_default_layer(_WORKMAN);
+
+                    } else if (mods & (MODS_GUI_MASK | MODS_CTRL_MASK)) {
+                        set_single_persistent_default_layer(_WWORKMAN);
+                    }
+                }
+                return false;
+                break;
+            case KC_QWERTY:
+                if (!record->event.pressed) {
+                    uint8_t mods = mod_config(get_mods());
+                    if (!mods) {
+                        set_single_persistent_default_layer(_QWERTY);
+                    } else if (mods & (MODS_GUI_MASK | MODS_CTRL_MASK)) {
+                        set_single_persistent_default_layer(_WQWERTY);
+                    }
+                }
+                return false;
+                break;
+
+            case MC_ARRW:
+                if (!record->event.pressed) {
+                    clear_mods();
+                    send_string_with_delay_P(PSTR("->"), TAP_CODE_DELAY);
+                }
+                return false;
+                break;
+
+            case KC_MAKE:  // Compiles the firmware, and adds the flash command based on keyboard bootloader
+                if (!record->event.pressed) {
+                    clear_mods();
+                    send_string_with_delay_P(PSTR("qmk compile "), TAP_CODE_DELAY);
+                    send_string_with_delay_P(PSTR("-kb " QMK_KEYBOARD), TAP_CODE_DELAY);
+                    send_string_with_delay_P(PSTR(SS_TAP(X_ENTER)), TAP_CODE_DELAY);
+                }
+                return false;
+                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;
+#if defined(RGB_MATRIX_ENABLE)
+            case KC_RGB_T:  // This allows me to use underglow as layer indication, or as normal
+                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) {
+                        rgblight_enable_noeeprom();
+                        layer_state_set(layer_state);  // This is needed to immediately set the layer color (looks better)
+                    } else {
+                        rgblight_disable_noeeprom();
+                    }
+                }
+                return false;
+                break;
+            case RGB_TOG:
+                if (!record->event.pressed) {
+#    if defined(RGB_MATRIX_ENABLE) && !defined(RGB_MATRIX_DISABLE_KEYCODES)
+                    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;
+#    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);
+                    }
+                }
+                return false;
+                break;
+#endif
+        }
+    }
+#ifdef CONSOLE_ENABLE
+    uprintf("KL: kc: %u, col: %u, row: %u, pressed: %u\n", keycode, record->event.key.col, record->event.key.row, record->event.pressed);
+#endif
+    return true;
 }
diff --git a/qmk/users/bocaj/process_records.h b/qmk/users/bocaj/process_records.h
index 5c55df35..c17e2ffd 100644
--- a/qmk/users/bocaj/process_records.h
+++ b/qmk/users/bocaj/process_records.h
@@ -2,49 +2,43 @@
 #include "bocaj.h"
 
 #if defined(KEYMAP_SAFE_RANGE)
-  #define PLACEHOLDER_SAFE_RANGE KEYMAP_SAFE_RANGE
+#    define PLACEHOLDER_SAFE_RANGE KEYMAP_SAFE_RANGE
 #else
-  #define PLACEHOLDER_SAFE_RANGE SAFE_RANGE
+#    define PLACEHOLDER_SAFE_RANGE SAFE_RANGE
 #endif
 
 enum userspace_custom_keycodes {
-  KC_EPRM = PLACEHOLDER_SAFE_RANGE, // can always be here
-  KC_MWRK,
-  KC_WWRK,
-  KC_MQWR,
-  KC_VRSN,
-  LM_GRAVE,            // Shift if held, layer change if tapped
-  JJ_COPY,
-  JJ_PSTE,
-  JJ_ARRW,
-  KC_CCCV,
-  MC_LOCK,
-  KC_DCLR,
-  KC_MAKE,
-  UC_FLIP,           // (ಠ痊ಠ)┻━┻
-  UC_TABL,           // ┬─┬ノ( º _ ºノ)
-  UC_SHRG,           // ¯\_(ツ)_/¯
-  UC_DISA,           // ಠ_ಠ
-  NEW_SAFE_RANGE  //use "NEWPLACEHOLDER for keymap specific codes
+    VRSN = PLACEHOLDER_SAFE_RANGE,  // Prints QMK Firmware and board info
+    KC_WORKMAN,                     // Sets default layer to WORKMAN
+    KC_QWERTY,                      // Sets default layer to QWERTY
+    // KC_COLEMAK,                     // Sets default layer to COLEMAK
+    // KC_DVORAK,                      // Sets default layer to DVORAK
+    KC_MAKE,                        // Run keyboard's customized make command
+    KC_RGB_T,                       // Toggles RGB Layer Indication mode
+    RGB_IDL,                        // RGB Idling animations
+    MC_ARRW,                        // ->
+    UC_FLIP,                        // (ಠ痊ಠ)┻━┻
+    UC_TABL,                        // ┬─┬ノ( º _ ºノ)
+    UC_SHRG,                        // ¯\_(ツ)_/¯
+    UC_DISA,                        // ಠ_ಠ
+    NEW_SAFE_RANGE                  // use "NEWPLACEHOLDER for keymap specific codes
 };
 
+bool process_record_secrets(uint16_t keycode, keyrecord_t *record);
 bool process_record_keymap(uint16_t keycode, keyrecord_t *record);
 
-// One Shot
-#define OS_LSFT OSM(MOD_LSFT)
+#define QWERTY  KC_QWERTY
+#define WORKMAN KC_WORKMAN
 
-// Space Cadet Hyper/Meh and [/]
+#define KC_ARRW MC_ARRW
+
+#define KC_RST   RESET
+
+#define MO_MOD MO(_MOD)
+#define ALT_APP ALT_T(KC_APP)
 #define HYP_LBK ALL_T(KC_LBRACKET)
 #define MEH_RBK MEH_T(KC_RBRACKET)
+#define HYP_LPR ALL_T(KC_LPRN)
+#define MEH_RPR MEH_T(KC_RPRN)
 
-#define GUI_CTR(os, kc) MT( (os == 0) ? (MOD_LGUI) : (MOD_LCTL), kc )
-
-// Layout beauti-/simpli-fication
-#define KC_LWEN LT(_LOWER, KC_ENTER)
-#define KC_ADJS TT(_ADJUST)
-#define KC_NUMS TT(_LOWER)
-#define KC_GAME TT(_DIABLO)
-
-// Other Keycodes
-#define KC_RST RESET
-#define KC_BS  KC_BSLASH
+#define MG_NKRO MAGIC_TOGGLE_NKRO
diff --git a/qmk/users/bocaj/readme.md b/qmk/users/bocaj/readme.md
index 669299cb..12063596 100644
--- a/qmk/users/bocaj/readme.md
+++ b/qmk/users/bocaj/readme.md
@@ -1,102 +1,5 @@
 # Overview
 
-My personal QMK userspace. First, I must say that the credit for a majority of the code found here belongs to Drashna and/or the people he derived his code from. My Ergodox layout is briefly described in its respective folder. As for explaining this userspace, you could honestly go to Drashna's userspace and read his well put together readme. Regardless, I am mostly writing this as an excercise for myself to better understand what is going on, and where applicable, describe things that I innovated on my own.
+This is my personal userspace file.  Most of my code exists here, as it's heavily shared.
 
-## Bocaj.c
-
-### Unicode
-
-I've always had difficulty implementing unicode in QMK, all of this code is literally copy/pasted from Drashna's userspace and lies dormant here until I can take the time to figure it out.
-
-Update: Got it to work in Mac OS which is more important to me than Windows (probably pretty easy to figure out at this point). So I'm a happy table flipping person now!
-
-(ノಠ痊ಠ)ノ彡┻━┻
-
-┬─┬ノ( º _ ºノ)
-
-### Tap Macro
-
-Not sure why this doesn't exist in QMK already (maybe it does?)
-
-```c
-void tap(uint16_t keycode){ register_code(keycode); unregister_code(keycode); };
-```
-
-### *_keymap functions
-
-We're running *_user functions in the userspace, that way we can add to or reconfigure at the keyboard level. Any *_user functions should call the equivalent *_keymap function at the end. If the *_keymap function isn't defined in the keymap, the `__attribute__ ((weak))` will prevent build problems.
-
-### Startup/Suspend/Shutdown Functions
-
-I have no idea what these do. Non-Ergodox keyboard functions?
-
-### Matrix Scan User
-
-Leader key defines, Diablo macro ancillary function, run matrix_scan_keymap.
-
-#### Leader Key
-
-I've always been interested in this feature, but I've had 0 experience with applications that have similar behavior. My implementation seeks to implement features that I feel VS2017 lacks
-
-## Secrets
-
-Hacked Drashna's secret macro implementation to work with the leader key instead.
-TODO: Finish documentation
-
-## Bocaj.h
-
-Layer defines, some macro ancillary defines, setup Diablo macros and failsafe
-
-## Process_Records.c/.h
-
-Again, taking ideas from Drashna to make maintenance simpler. A couple of things that I'm proud of here, but nothing really ground breaking.
-
-* Features
-  * Change default layer
-    * KC_MWRK, KC_WWRK, KC_MQWR
-  * MacOS Lock Screen Macro
-  * Make macro (Credit: Drashna)
-    * Need to reconfigure so it runs the docker command if one of the Mac OS layers are default because the AVR install fails on the corporate laptop
-  * Arrow macro (->) because I find myself telling people how to get to something quite frequently and typing this manually requires moving the right hand to the top-left of the ergodox and then to the bottom right, which feels unnatural.
-  * LM_GRAVE
-    * While combining _NUMS and _LOWER, I also needed a place to put F1-12 keys. This required me to relocate the grave key. The most comfortable place to put it was over a key that I frequently use to toggle the numpad. I do have other ways to get to/from this layer but my mind has been wired to use them for different workflows, so I would sit here frozen for a moment trying to tell my fingers where to go
-    * How it works
-      * A timer starts when pressed down
-      * If the timer at release was less than the TAPPING_TERM define
-        * Get mods
-        * If Shift was held or one-shot shift was active
-          * Send `~`
-        * Else
-          * Send `
-      * Else (timer at released was greater than the TAPPING_TERM define)
-        * Move to the default layer
-  * KC_CCCV
-    * Another neat idea I found in Drashna's userspace... highly underutilized in my layout but the inspiration for LM_GRAVE was obviously derived from this code
-  * Unicode stuff
-    * All I've ever wanted was a table-flip macro... I managed to get about half of it to work before I gave up and disabled it
-
-## Send_Unicode.c/.h
-
-I have some basic understanding of this, Drashna may already have it documented in his userspace. I'll put it in my own words when I get around to making it work and understanding it better.
-
-## Tap_Dances.c/h
-
-Again, building on Drashna's userspace organization to simplify maintenance of a heavily configured layout. This is all the stuff for the Diablo 3 macros that spam a given skill (1-4) every ~1 second
-
-## Wrappers.h
-
-Traditionally, you would put all of this into the \<username>.h file. But I liked the idea of separating it to simplify modification in the future.
-
-### GUI_CTR(os, kc)
-
-A notable mention in this file is the GUI_CTR(os, kc) custom keycode defined in process_records.h as:
-
-```c
-#define GUI_CTR(os, kc) MT( (os == 0) ? (MOD_LGUI) : (MOD_LCTL), kc )
-```
-
-I tried several things before coming to this one-liner conclusion. I believe it is quite elegant and it definitely solves the problem I had (separate wrappers for Windows/MacOS layers). But I would love to make this into something more intuitive, like a macro that detects which layer you're on and sends the applicable hotkey when held, or keycode when tapped. Ultimately, I was too tired of thinking about it to come up with a solution like that at this time.
-
-Anyhow, if you set `os == 1`, it sends the Windows CTRL hotkey when held. If you set `os == 0`, it sends the Mac OS GUI hotkey when held. If tapped, it sends the keycode.
-
-This is effectively a slightly more advanced `MOD_T(kc)` keycode.
+The template was taken from [Drashna's userspace](https://github.com/qmk/qmk_firmware/tree/master/users/drashna). There isn't much if anything in this userspace that warrants documentation he hasn't already covered.
diff --git a/qmk/users/bocaj/rgb_matrix_stuff.c b/qmk/users/bocaj/rgb_matrix_stuff.c
new file mode 100644
index 00000000..bc50349d
--- /dev/null
+++ b/qmk/users/bocaj/rgb_matrix_stuff.c
@@ -0,0 +1,106 @@
+#include "bocaj.h"
+
+#include "lib/lib8tion/lib8tion.h"
+extern led_config_t g_led_config;
+
+static uint32_t hypno_timer;
+#if defined(SPLIT_KEYBOARD) || defined(KEYBOARD_ergodox_ez) || defined(KEYBOARD_crkbd)
+#    define RGB_MATRIX_REST_MODE RGB_MATRIX_CYCLE_OUT_IN_DUAL
+#else
+#    define RGB_MATRIX_REST_MODE RGB_MATRIX_CYCLE_OUT_IN
+#endif
+
+void rgb_matrix_set_color_row(uint8_t row, uint8_t red, uint8_t green, uint8_t blue) {
+#ifdef KEYBOARD_planck_ez
+    if (row > 2) {
+        row = 0;
+    }
+    uint8_t row_multiplier = row * 12;
+
+    rgb_matrix_set_color(1 + row_multiplier, red, green, blue);
+    rgb_matrix_set_color(2 + row_multiplier, red, green, blue);
+    rgb_matrix_set_color(3 + row_multiplier, red, green, blue);
+    rgb_matrix_set_color(4 + row_multiplier, red, green, blue);
+    rgb_matrix_set_color(5 + row_multiplier, red, green, blue);
+    rgb_matrix_set_color(6 + row_multiplier, red, green, blue);
+    rgb_matrix_set_color(7 + row_multiplier, red, green, blue);
+    rgb_matrix_set_color(8 + row_multiplier, red, green, blue);
+    rgb_matrix_set_color(9 + row_multiplier, red, green, blue);
+    rgb_matrix_set_color(10 + row_multiplier, red, green, blue);
+#endif
+}
+
+void rgb_matrix_layer_helper(uint8_t hue, uint8_t sat, uint8_t val, uint8_t mode, uint8_t speed, uint8_t led_type) {
+    HSV hsv = {hue, sat, val};
+    if (hsv.v > rgb_matrix_get_val()) {
+        hsv.v = rgb_matrix_get_val();
+    }
+
+    switch (mode) {
+        case 1:  // breathing
+        {
+            uint16_t time = scale16by8(g_rgb_timer, speed / 8);
+            hsv.v         = scale8(abs8(sin8(time) - 128) * 2, hsv.v);
+            RGB rgb       = hsv_to_rgb(hsv);
+            for (uint8_t i = 0; i < DRIVER_LED_TOTAL; i++) {
+                if (HAS_FLAGS(g_led_config.flags[i], led_type)) {
+                    rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
+                }
+            }
+            break;
+        }
+        default:  // Solid Color
+        {
+            RGB rgb = hsv_to_rgb(hsv);
+            for (uint8_t i = 0; i < DRIVER_LED_TOTAL; i++) {
+                if (HAS_FLAGS(g_led_config.flags[i], led_type)) {
+                    rgb_matrix_set_color(i, rgb.r, rgb.g, rgb.b);
+                }
+            }
+            break;
+        }
+    }
+}
+
+__attribute__((weak)) void rgb_matrix_indicator_keymap(void) {}
+
+void matrix_scan_rgb_matrix(void) {
+#if defined(RGB_MATRIX_FRAMEBUFFER_EFFECTS)
+    if (userspace_config.rgb_matrix_idle_anim && rgb_matrix_get_mode() == RGB_MATRIX_TYPING_HEATMAP && timer_elapsed32(hypno_timer) > 15000) {
+        rgb_matrix_mode_noeeprom(RGB_MATRIX_REST_MODE);
+    }
+#endif
+    rgb_matrix_indicator_keymap();
+}
+
+void keyboard_post_init_rgb_matrix(void) {
+#if defined(RGB_MATRIX_FRAMEBUFFER_EFFECTS)
+    if (userspace_config.rgb_matrix_idle_anim) {
+        rgb_matrix_mode_noeeprom(RGB_MATRIX_REST_MODE);
+    }
+#endif
+}
+
+bool process_record_user_rgb_matrix(uint16_t keycode, keyrecord_t *record) {
+#if defined(RGB_MATRIX_FRAMEBUFFER_EFFECTS)
+    hypno_timer = timer_read32();
+    if (userspace_config.rgb_matrix_idle_anim && rgb_matrix_get_mode() == RGB_MATRIX_REST_MODE) {
+        rgb_matrix_mode_noeeprom(RGB_MATRIX_TYPING_HEATMAP);
+    }
+#endif
+    switch (keycode) {
+        case RGB_IDL:
+#if defined(RGB_MATRIX_ENABLE) && defined(RGB_MATRIX_FRAMEBUFFER_EFFECTS)
+            if (record->event.pressed) {
+                userspace_config.rgb_matrix_idle_anim ^= 1;
+                dprintf("RGB Matrix Idle Animation [EEPROM]: %u\n", userspace_config.rgb_matrix_idle_anim);
+                eeconfig_update_user(userspace_config.raw);
+                if (userspace_config.rgb_matrix_idle_anim) {
+                    rgb_matrix_mode_noeeprom(RGB_MATRIX_TYPING_HEATMAP);
+                }
+            }
+#endif
+            break;
+    }
+    return true;
+}
diff --git a/qmk/users/bocaj/rgb_matrix_stuff.h b/qmk/users/bocaj/rgb_matrix_stuff.h
new file mode 100644
index 00000000..e48add21
--- /dev/null
+++ b/qmk/users/bocaj/rgb_matrix_stuff.h
@@ -0,0 +1,10 @@
+#pragma once
+#include "quantum.h"
+
+bool process_record_user_rgb_matrix(uint16_t keycode, keyrecord_t *record);
+void keyboard_post_init_rgb_matrix(void);
+void matrix_scan_rgb_matrix(void);
+
+void rgb_matrix_set_color_all(uint8_t red, uint8_t green, uint8_t blue);
+void rgb_matrix_layer_helper(uint8_t hue, uint8_t sat, uint8_t val, uint8_t mode, uint8_t speed, uint8_t led_type);
+void rgb_matrix_set_color_row(uint8_t row, uint8_t red, uint8_t green, uint8_t blue);
diff --git a/qmk/users/bocaj/rules.mk b/qmk/users/bocaj/rules.mk
index 9ed8c250..a0e7e93b 100644
--- a/qmk/users/bocaj/rules.mk
+++ b/qmk/users/bocaj/rules.mk
@@ -1,33 +1,26 @@
 SRC += bocaj.c \
        process_records.c
 
-ifneq ("$(wildcard $(USER_PATH)/secrets.c)","")
-  SRC += secrets.c
+LEADER_ENABLE = yes
+MOUSEKEY_ENABLE = yes
+EXTRAKEY_ENABLE = yes
+
+ifneq ($(PLATFORM),CHIBIOS)
+    LTO_ENABLE        = yes
+endif
+SPACE_CADET_ENABLE    = no
+GRAVE_ESC_ENABLE      = no
+
+ifneq ($(strip $(NO_SECRETS)), yes)
+    ifneq ("$(wildcard $(USER_PATH)/secrets.c)","")
+        SRC += secrets.c
+    endif
+    ifeq ($(strip $(NO_SECRETS)), lite)
+        OPT_DEFS += -DNO_SECRETS
+    endif
 endif
 
-ifeq ($(strip $(TAP_DANCE_ENABLE)), yes)
-  SRC += tap_dances.c
-endif
-
-# Caused problems when building via docker on Mac OS
-# EXTRAFLAGS += -flto
-
-ifeq ($(strip $(NO_SECRETS)), yes)
-    OPT_DEFS += -DNO_SECRETS
-endif
-
-ifeq ($(strip $(MACROS_ENABLED)), yes)
-    OPT_DEFS += -DMACROS_ENABLED
-endif
-
-ifeq ($(strip $(UCIS_ENABLE)), yes)
-  SRC += send_unicode.c
-endif
-
-ifeq ($(strip $(UNICODEMAP_ENABLE)), yes)
-  SRC += send_unicode.c
-endif
-
-ifeq ($(strip $(UNICODE_ENABLE)), yes)
-  SRC += send_unicode.c
+RGB_MATRIX_ENABLE ?= no
+ifneq ($(strip $(RGB_MATRIX_ENABLE)), no)
+    SRC += rgb_matrix_stuff.c
 endif
diff --git a/qmk/users/bocaj/wrappers.h b/qmk/users/bocaj/wrappers.h
index 379edaad..c76820f4 100644
--- a/qmk/users/bocaj/wrappers.h
+++ b/qmk/users/bocaj/wrappers.h
@@ -1,37 +1,193 @@
 #pragma once
 #include "bocaj.h"
 
+/*
+Since our quirky block definitions are basically a list of comma separated
+arguments, we need a wrapper in order for these definitions to be
+expanded before being used as arguments to the LAYOUT_xxx macro.
+*/
 #if (!defined(LAYOUT) && defined(KEYMAP))
-#define LAYOUT KEYMAP
+#    define LAYOUT KEYMAP
 #endif
 
-#define LAYOUT_ergodox_wrapper(...)        LAYOUT_ergodox(__VA_ARGS__)
-#define LAYOUT_ergodox_pretty_wrapper(...) LAYOUT_ergodox_pretty(__VA_ARGS__)
+// clang-format off
+#define WRAPPER_ergodox_pretty(...)          LAYOUT_ergodox_pretty(__VA_ARGS__)
+#define WRAPPER_ortho_4x12(...)              LAYOUT_planck_mit(__VA_ARGS__)
 
-#define _________________QWERTY_L1__________________        KC_Q,     KC_W,           KC_E,           KC_R,           KC_T
-#define _________________QWERTY_L2__________________        KC_A,     KC_S,    GUI_CTR(0, KC_D),      KC_F,           KC_G
-#define _________________QWERTY_L3__________________        KC_Z,     KC_X,           KC_C,           KC_V,           KC_B
+/*  ---------- LEFT HAND -----------   ---------- RIGHT HAND ---------- */
+#define WRAPPER_ergodox_bocaj(                                           \
+    L00,L01,L02,L03,L04,L05,L06,           R00,R01,R02,R03,R04,R05,R06,  \
+    L10,L11,L12,L13,L14,L15,L16,           R10,R11,R12,R13,R14,R15,R16,  \
+    L20,L21,L22,L23,L24,L25,                   R21,R22,R23,R24,R25,R26,  \
+    L30,L31,L32,L33,L34,L35,L36,           R30,R31,R32,R33,R34,R35,R36,  \
+    L40,L41,L42,L43,L44,                           R42,R43,R44,R45,R46,  \
+                            L55,L56,   R50,R51,                          \
+                                L54,   R52,                              \
+                        L53,L52,L51,   R55,R54,R53 )                     \
+  WRAPPER_ergodox_pretty( \
+      L00,       L01,        L02,        L03,        L04,  L05, L06,                R00,  R01,       R02,        R03,        R04,       R05,  R06, \
+      L10,       L11,        L12,        L13,        L14,  L15, L16,                R10,  R11,       R12,        R13,        R14,       R15,  R16, \
+      L20,       L21,  SFT_T(L22), GUI_T(L23), ALT_T(L24), L25,                           R21, ALT_T(R22), GUI_T(R23), SFT_T(R24),      R25,  R26, \
+      L30, CTL_T(L31),       L32,        L33,        L34,  L35, ALL_T(L36),   MEH_T(R30), R31,       R32,        R33,        R34, CTL_T(R35), R36, \
+      L40,       L41,        L42,        L43,        L44,                                            R42,        R43,        R44,       R45,  R46, \
+                                                         L55,L56, /* <- LHS/RHS -> */ R50,R51,                                                     \
+                                                             L54, /* <- LHS/RHS -> */ R52,                                                         \
+                                         LT(_LOWER, L53),L52,L51, /* <- LHS/RHS -> */ R55,R54,LT(_RAISE, R53)                                      \
+)
 
-#define _________________QWERTY_R1__________________        KC_Y,     KC_U,           KC_I,           KC_O,           KC_P
-#define _________________QWERTY_R2__________________        KC_H,     KC_J,    GUI_CTR(0, KC_K),      KC_L,           KC_SCLN
-#define _________________QWERTY_R3__________________        KC_N,     KC_M,           KC_COMM,        KC_DOT,         KC_SLASH
+#define WRAPPER_ergodox_bocaj_WIN(                                       \
+    L00,L01,L02,L03,L04,L05,L06,           R00,R01,R02,R03,R04,R05,R06,  \
+    L10,L11,L12,L13,L14,L15,L16,           R10,R11,R12,R13,R14,R15,R16,  \
+    L20,L21,L22,L23,L24,L25,                   R21,R22,R23,R24,R25,R26,  \
+    L30,L31,L32,L33,L34,L35,L36,           R30,R31,R32,R33,R34,R35,R36,  \
+    L40,L41,L42,L43,L44,                           R42,R43,R44,R45,R46,  \
+                            L55,L56,   R50,R51,                          \
+                                L54,   R52,                              \
+                        L53,L52,L51,   R55,R54,R53 )                     \
+  WRAPPER_ergodox_pretty( \
+      L00,       L01,        L02,        L03,        L04,  L05, L06,                R00,  R01,       R02,        R03,        R04,       R05,  R06, \
+      L10,       L11,        L12,        L13,        L14,  L15, L16,                R10,  R11,       R12,        R13,        R14,       R15,  R16, \
+      L20,       L21,  SFT_T(L22), CTL_T(L23), ALT_T(L24), L25,                           R21, ALT_T(R22), CTL_T(R23), SFT_T(R24),      R25,  R26, \
+      L30, GUI_T(L31),       L32,        L33,        L34,  L35, ALL_T(L36),   MEH_T(R30), R31,       R32,        R33,        R34, GUI_T(R35), R36, \
+      L40,       L41,        L42,        L43,        L44,                                            R42,        R43,        R44,       R45,  R46, \
+                                                         L55,L56, /* <- LHS/RHS -> */ R50,R51,                                                     \
+                                                             L54, /* <- LHS/RHS -> */ R52,                                                         \
+                                         LT(_LOWER, L53),L52,L51, /* <- LHS/RHS -> */ R55,R54,LT(_RAISE, R53)                                      \
+)
 
-// Hardware Driven Workman
-#define _________________WORKMAN_L1_________________        KC_Q,     KC_D,           KC_R,           KC_W,           KC_B
-#define _________________WORKMAN_L2_________________        KC_A,     KC_S,    GUI_CTR(0, KC_H),      KC_T,           KC_G // GUI_CTR(0, kc) behaves as GUI_T(kc)
-#define ________________WWORKMAN_L2_________________        KC_A,     KC_S,    GUI_CTR(1, KC_H),      KC_T,           KC_G // GUI_CTR(1, kc) behaves as CTR_T(kc)
-#define _________________WORKMAN_L3_________________        KC_Z,     KC_X,           KC_M,           KC_C,           KC_V
+/*
+  Planck EZ Wrappers
+*/
+#define WRAPPER_planck_bocaj( \
+  K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, \
+  K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, \
+  K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \
+  K31, K32, K33, K34, K35,    K36,   K37, K38, K39, K3A, K3B  \
+)\
+  WRAPPER_ortho_4x12( \
+    K01,       K02,        K03,        K04,            K05,        K06,         K07,            K08,        K09,        K0A,        K0B,  K0C, \
+    K11,       K12,  SFT_T(K13), GUI_T(K14),     ALT_T(K15),       K16,         K17,      ALT_T(K18), GUI_T(K19), SFT_T(K1A),       K1B,  K1C,  \
+    K21, CTL_T(K22),       K23,        K24,            K25,        K26,         K27,            K28,        K29,        K2A,  CTL_T(K2B), K2C, \
+    K31,       K32,        K33,        K34, LT(_LOWER, K35),              K36,       LT(_RAISE, K37),       K38,        K39,        K3A,  K3B )
 
-#define _________________WORKMAN_R1_________________        KC_J,     KC_F,           KC_U,           KC_P,           KC_SCLN
-#define _________________WORKMAN_R2_________________        KC_Y,     KC_N,    GUI_CTR(0, KC_E),      KC_O,           KC_I // GUI_CTR(0, kc) behaves as GUI_T(kc)
-#define ________________WWORKMAN_R2_________________        KC_Y,     KC_N,    GUI_CTR(1, KC_E),      KC_O,           KC_I // GUI_CTR(1, kc) behaves as CTR_T(kc)
-#define _________________WORKMAN_R3_________________        KC_K,     KC_L,           KC_COMM,        KC_DOT,         KC_SLASH
+#define WRAPPER_planck_bocaj_WIN( \
+  K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, \
+  K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, \
+  K21, K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, \
+  K31, K32, K33, K34, K35,    K36,   K37, K38, K39, K3A, K3B  \
+)\
+  WRAPPER_ortho_4x12( \
+    K01,       K02,        K03,        K04,            K05,        K06,         K07,            K08,        K09,        K0A,        K0B,  K0C, \
+    K11,       K12,  SFT_T(K13), CTL_T(K14),     ALT_T(K15),       K16,         K17,      ALT_T(K18), CTL_T(K19), SFT_T(K1A),       K1B,  K1C,  \
+    K21, GUI_T(K22),       K23,        K24,            K25,        K26,         K27,            K28,        K29,        K2A,  GUI_T(K2B), K2C, \
+    K31,       K32,        K33,        K34, LT(_LOWER, K35),              K36,       LT(_RAISE, K37),       K38,        K39,        K3A,  K3B )
 
+#define WRAPPER_planck_bocaj_base( \
+ K01, K02, K03, K04, K05,      K06, K07, K08, K09, K0A, \
+ K11, K12, K13, K14, K15,      K16, K17, K18, K19, K1A, \
+ K21, K22, K23, K24, K25,      K26, K27, K28, K29, K2A  \
+) \
+  WRAPPER_planck_bocaj( \
+    KC_ESC,   K01,     K02,   K03,     K04,        K05,        K06,  K07,      K08,      K09,     K0A,    KC_MINS, \
+    KC_TAB,   K11,     K12,   K13,     K14,  ALL_T(K15), MEH_T(K16), K17,      K18,      K19,     K1A,    KC_QUOT, \
+    KC_LSFT,  K21,     K22,   K23,     K24,        K25,        K26,  K27,      K28,      K29,     K2A,    _______,  \
+    _______,  KC_LEAD, KC_UP, KC_LEFT, KC_BSPC,         KC_SPC,      KC_ENTER, KC_RIGHT, KC_DOWN, QWERTY, WORKMAN  \
+  )
 
-#define __________________NUMBER_LEFT_______________        KC_1,     KC_2,           KC_3,           KC_4,           KC_5
-#define __________________NUMBER_RIGHT______________        KC_6,     KC_7,           KC_8,           KC_9,           KC_0
+#define WRAPPER_planck_bocaj_base_WIN( \
+ K01, K02, K03, K04, K05,      K06, K07, K08, K09, K0A, \
+ K11, K12, K13, K14, K15,      K16, K17, K18, K19, K1A, \
+ K21, K22, K23, K24, K25,      K26, K27, K28, K29, K2A  \
+) \
+  WRAPPER_planck_bocaj_WIN( \
+    KC_ESC,   K01,     K02,   K03,     K04,        K05,        K06,  K07,      K08,      K09,     K0A,    KC_MINS, \
+    KC_TAB,   K11,     K12,   K13,     K14,  ALL_T(K15), MEH_T(K16), K17,      K18,      K19,     K1A,    KC_QUOT, \
+    KC_LSFT,  K21,     K22,   K23,     K24,        K25,        K26,  K27,      K28,      K29,     K2A,    _______,  \
+    _______,  KC_LEAD, KC_UP, KC_LEFT, KC_BSPC,         KC_SPC,      KC_ENTER, KC_RIGHT, KC_DOWN, QWERTY, WORKMAN  \
+  )
 
-#define __________________FUNCTION_LEFT_____________        KC_F1,    KC_F2,          KC_F3,          KC_F4,          KC_F5
-#define __________________FUNCTION_RIGHT____________        KC_F6,    KC_F7,          KC_F8,          KC_F9,          KC_F10
+/*
+Blocks for each of the four major keyboard layouts
+Organized so we can quickly adapt and modify all of them
+at once, rather than for each keyboard, one at a time.
+And this allows for much cleaner blocks in the keymaps.
+For instance Tap/Hold for Control on all of the layouts
 
-#define ____________________BLANK___________________        KC_TRNS,  KC_TRNS,        KC_TRNS,        KC_TRNS,        KC_TRNS
+NOTE: These are all the same length.  If you do a search/replace
+  then you need to add/remove underscores to keep the
+  lengths consistent.
+*/
+
+#define _________________QWERTY_L1_________________       KC_Q,    KC_W,    KC_E,    KC_R,    KC_T
+#define _________________QWERTY_L2_________________       KC_A,    KC_S,    KC_D,    KC_F,    KC_G
+#define _________________QWERTY_L3_________________       KC_Z,    KC_X,    KC_C,    KC_V,    KC_B
+
+#define _________________QWERTY_R1_________________       KC_Y,    KC_U,    KC_I,    KC_O,    KC_P
+#define _________________QWERTY_R2_________________       KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN
+#define _________________QWERTY_R3_________________       KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLASH
+
+#define _________________COLEMAK_L1________________       KC_Q,    KC_W,    KC_F,    KC_P,    KC_G
+#define _________________COLEMAK_L2________________       KC_A,    KC_R,    KC_S,    KC_T,    KC_D
+#define _________________COLEMAK_L3________________       KC_Z,    KC_X,    KC_C,    KC_V,    KC_B
+
+#define _________________COLEMAK_R1________________       KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN
+#define _________________COLEMAK_R2________________       KC_H,    KC_N,    KC_E,    KC_I,    KC_O
+#define _________________COLEMAK_R3________________       KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLASH
+
+#define _________________DVORAK_L1_________________       KC_QUOT, KC_COMM, KC_DOT, KC_P,     KC_Y
+#define _________________DVORAK_L2_________________       KC_A,    KC_O,    KC_E,   KC_U,     KC_I
+#define _________________DVORAK_L3_________________       KC_SCLN, KC_Q,    KC_J,   KC_K,     KC_X
+
+#define _________________DVORAK_R1_________________       KC_F,    KC_G,    KC_C,    KC_R,    KC_L
+#define _________________DVORAK_R2_________________       KC_D,    KC_H,    KC_T,    KC_N,    KC_S
+#define _________________DVORAK_R3_________________       KC_B,    KC_M,    KC_W,    KC_V,    KC_Z
+
+#define _________________WORKMAN_L1________________       KC_Q,    KC_D,    KC_R,   KC_W,     KC_B
+#define _________________WORKMAN_L2________________       KC_A,    KC_S,    KC_H,   KC_T,     KC_G
+#define _________________WORKMAN_L3________________       KC_Z,    KC_X,    KC_M,   KC_C,     KC_V
+
+#define _________________WORKMAN_R1________________       KC_J,    KC_F,    KC_U,    KC_P,    KC_SCLN
+#define _________________WORKMAN_R2________________       KC_Y,    KC_N,    KC_E,    KC_O,    KC_I
+#define _________________WORKMAN_R3________________       KC_K,    KC_L,    KC_COMM, KC_DOT,  KC_SLASH
+
+#define ________________NUMBER_LEFT________________       KC_1,    KC_2,    KC_3,    KC_4,    KC_5
+#define ________________NUMBER_RIGHT_______________       KC_6,    KC_7,    KC_8,    KC_9,    KC_0
+#define _________________FUNC_LEFT_________________       KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5
+#define _________________FUNC_RIGHT________________       KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10
+
+#define ___________________BLANK___________________       _______, _______, _______, _______, _______
+#define _________________UNDEFINED_________________       XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX
+
+#define ___________________LOWER_L1_EXT____________________       KC_GRV,  _______, _______, KC_UP,   _______, KC_ARRW
+#define ___________________LOWER_L2_EXT____________________       KC_DEL,  _______, KC_LEFT, KC_DOWN, KC_RGHT, KC_LPRN
+#define ___________________LOWER_L3_EXT____________________       _______, _______, _______, _______, _______, KC_LBRC
+
+#define ___________________LOWER_R1_EXT____________________       KC_MINS, KC_7,    KC_8,    KC_9,    KC_PLUS, KC_EQUAL
+#define ___________________LOWER_R2_EXT____________________       KC_RPRN, KC_4,    KC_5,    KC_6,    KC_ASTR, KC_BSLS
+#define ___________________LOWER_R3_EXT____________________       KC_RBRC, KC_1,    KC_2,    KC_3,    KC_SLSH, _______
+
+// #define _________________LOWER_L1__________________       ________________NUMBER_LEFT________________
+// #define _________________LOWER_L2__________________       _______, _______, _______, _______, KC_LPRN
+// #define _________________LOWER_L3__________________       _______, _______, _______, KC_ARRW, KC_LBRC
+
+// #define _________________LOWER_R1__________________       ________________NUMBER_RIGHT_______________
+// #define _________________LOWER_R2__________________       KC_RPRN, _______, _______, _______, _______
+// #define _________________LOWER_R3__________________       KC_RBRC, _______, _______, _______, _______
+
+#define _________________RAISE_L1__________________       KC_EXLM, KC_AT,   KC_HASH, KC_DLR, KC_PERC
+#define _________________RAISE_L2__________________       _________________FUNC_LEFT_________________
+#define _________________RAISE_L3__________________       ___________________BLANK___________________
+
+#define _________________RAISE_R1__________________       KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN
+#define _________________RAISE_R2__________________       _________________FUNC_RIGHT________________
+#define _________________RAISE_R3__________________       ___________________BLANK___________________
+
+#define _________________ADJUST_L1_________________       RGB_MOD,  RGB_HUI,     RGB_SAI,   RGB_VAI, RGB_TOG
+#define _________________ADJUST_L2_________________       KC__MUTE, KC__VOLDOWN, KC__VOLUP, _______, KC_MNXT
+#define _________________ADJUST_L3_________________       RGB_RMOD, RGB_HUD,     RGB_SAD,   RGB_VAD, KC_RGB_T
+
+#define _________________ADJUST_R1_________________       ___________________BLANK___________________
+#define _________________ADJUST_R2_________________       CG_SWAP, WORKMAN, QWERTY,  _______, _______
+#define _________________ADJUST_R3_________________       MU_TOG , CK_TOGG, AU_ON,   AU_OFF,  CG_NORM
+
+// clang-format on
diff --git a/qmk/users/brandonschlack/brandonschlack.c b/qmk/users/brandonschlack/brandonschlack.c
new file mode 100644
index 00000000..1e52bd64
--- /dev/null
+++ b/qmk/users/brandonschlack/brandonschlack.c
@@ -0,0 +1,214 @@
+/* Copyright 2020 Brandon Schlack
+ *
+ * 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 "brandonschlack.h"
+
+user_config_t user_config;
+#ifdef STOPLIGHT_LED
+static stoplight_led_t stoplight_led;
+#endif
+
+/**
+ * Resets user config in EEPROM
+ *
+ * Default is use rgb for layer indication
+ */
+void eeconfig_init_user(void) {
+    user_config.raw = 0;
+    user_config.rgb_layer_change = true;
+    user_config.rgb_theme = 0;
+    eeconfig_update_user(user_config.raw);
+}
+
+__attribute__((weak))
+void matrix_init_keymap(void){ }
+
+void matrix_init_user(void) {
+    matrix_init_keymap();
+}
+
+__attribute__((weak))
+void keyboard_post_init_keymap(void){ }
+
+/**
+ * Reads user config from EEPROM,
+ * calls RGB init if RGBs enabled
+ */
+void keyboard_post_init_user(void){
+    // Read the user config from EEPROM
+    user_config.raw = eeconfig_read_user();
+    // Do Stoplight Animation if enabled
+#ifdef STOPLIGHT_LED
+    led_stoplight_start();
+#endif
+    // Do RGB things if RGBs enabled
+#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE)
+    keyboard_post_init_rgb();
+#endif
+    keyboard_post_init_keymap();
+}
+
+__attribute__ ((weak))
+void shutdown_keymap(void) {}
+
+/**
+ * On shutdown,
+ * If RGBs enabled,
+ * then set RGB color to Red
+ */
+void shutdown_user (void) {
+#ifdef RGBLIGHT_ENABLE
+    rgblight_enable_noeeprom();
+    rgblight_mode_noeeprom(RGBLIGHT_MODE_STATIC_LIGHT);
+    rgblight_sethsv_noeeprom(0, 255, 127);
+#endif // RGBLIGHT_ENABLE
+#ifdef RGB_MATRIX_ENABLE
+    rgb_matrix_set_color_all( 0xFF, 0x00, 0x00 );
+#endif //RGB_MATRIX_ENABLE
+    shutdown_keymap();
+}
+
+__attribute__ ((weak))
+void suspend_power_down_keymap(void) {}
+
+/**
+ * Set rgb_matrix suspend state to true if not already
+ */
+void suspend_power_down_user(void) {
+#ifdef RGB_MATRIX_ENABLE
+    if (!g_suspend_state) {
+        rgb_matrix_set_suspend_state(true);
+    }
+#endif //RGB_MATRIX_ENABLE
+    suspend_power_down_keymap();
+}
+
+__attribute__ ((weak))
+void suspend_wakeup_init_keymap(void) {}
+
+/**
+ * Set rgb_matrix suspend state to false if not already
+ */
+void suspend_wakeup_init_user(void) {
+#ifdef RGB_MATRIX_ENABLE
+    if (g_suspend_state) {
+        rgb_matrix_set_suspend_state(false);
+    }
+#endif //RGB_MATRIX_ENABLE
+    suspend_wakeup_init_keymap();
+}
+
+__attribute__ ((weak))
+void matrix_scan_keymap(void) {}
+
+/**
+ * Checks for Super CMD↯TAB
+ */
+void matrix_scan_user(void) {
+    matrix_scan_cmd_tab();
+#ifdef STOPLIGHT_LED
+    matrix_scan_led_stoplight();
+#endif
+    matrix_scan_keymap();
+}
+
+__attribute__ ((weak))
+layer_state_t default_layer_state_set_keymap(layer_state_t state) {
+    return state;
+}
+
+/**
+ * For macropads, if a new default layer is set from DF()
+ * then automatically set that layer with layer_move()
+ */
+layer_state_t default_layer_state_set_user(layer_state_t state) {
+#if defined(IS_MACROPAD)
+    layer_move(get_highest_layer(state));
+#endif
+    return default_layer_state_set_keymap(state);
+}
+
+__attribute__ ((weak))
+layer_state_t layer_state_set_keymap(layer_state_t state) {
+    return state;
+}
+
+/**
+ * Do RGB things (like layer indication) on layer change
+ */
+layer_state_t layer_state_set_user(layer_state_t state) {
+#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE)
+    state = layer_state_set_rgb(state);
+#endif // RGBLIGHT_ENABLE
+    return layer_state_set_keymap(state);
+}
+
+__attribute__((weak)) bool led_update_keymap(led_t led_state) { return true; }
+
+bool led_update_user(led_t led_state) {
+#ifdef STOPLIGHT_LED
+    if (stoplight_led.is_active) {
+        return false;
+    }
+#endif
+    return led_update_keymap(led_state);
+}
+
+#ifdef STOPLIGHT_LED
+void led_stoplight_start(void) {
+    writePin(TOP_LED, LED_ON(false));
+    writePin(MIDDLE_LED, LED_ON(false));
+    writePin(BOTTOM_LED, LED_ON(false));
+
+    stoplight_led.is_active = true;
+    stoplight_led.timer = timer_read();
+};
+
+void led_stoplight_set(pin_t pin) {
+    writePin(pin, LED_ON(true));
+};
+
+void led_stoplight_end(void) {
+    // Reset timer and status variables
+    stoplight_led.is_active = false;
+    stoplight_led.index = 0;
+    stoplight_led.timer = 0;
+    led_update_kb(host_keyboard_led_state());
+};
+
+void matrix_scan_led_stoplight(void) {
+    if (stoplight_led.is_active) {
+        if (timer_elapsed(stoplight_led.timer) > (1000 * (stoplight_led.index + 1))) {
+            switch (stoplight_led.index){
+                case 0:
+                    led_stoplight_set(TOP_LED);
+                    stoplight_led.index++;
+                    break;
+                case 1:
+                    led_stoplight_set(MIDDLE_LED);
+                    stoplight_led.index++;
+                    break;
+                case 2:
+                    led_stoplight_set(BOTTOM_LED);
+                    stoplight_led.index++;
+                    break;
+                default:
+                    led_stoplight_end();
+                    break;
+            }
+        }
+    }
+};
+#endif
diff --git a/qmk/users/brandonschlack/brandonschlack.h b/qmk/users/brandonschlack/brandonschlack.h
new file mode 100644
index 00000000..d7dbc0ea
--- /dev/null
+++ b/qmk/users/brandonschlack/brandonschlack.h
@@ -0,0 +1,83 @@
+/* Copyright 2020 Brandon Schlack
+ *
+ * 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"
+#include "version.h"
+#include "eeprom.h"
+#include "process_records.h"
+#ifdef TAP_DANCE_ENABLE
+#   include "tap_dances.h"
+#endif // TAP_DANCE_ENABLE
+#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE)
+#   include "rgb_bs.h"
+#endif
+
+/* TODO Layer Names */
+enum bs_layers {
+    _BASE = 0,
+    _M1 = 1,
+    _M2 = 2,
+    _M3 = 3,
+    _M4 = 4,
+    _FN1 = 5,
+    _M1_FN1 = 6,
+    _M2_FN1 = 7,
+    _M3_FN1 = 8,
+    _M4_FN1 = 9,
+    _FN2 = 10,
+    _M1_FN2 = 11,
+    _M2_FN2 = 12,
+    _M3_FN2 = 13,
+    _M4_FN2 = 14,
+    _ADJUST = 15 // 15: Change keyboard settings
+};
+
+#define _LOWER _FN1
+#define _RAISE _FN2
+
+/* TODO User EECONFIG */
+typedef union {
+  uint32_t raw;
+  struct {
+    bool     rgb_layer_change :1;
+    uint8_t  rgb_theme :4;
+  };
+} user_config_t;
+extern user_config_t user_config;
+
+void matrix_init_keymap(void);
+void keyboard_post_init_keymap(void);
+void shutdown_keymap(void);
+void suspend_power_down_keymap(void);
+void suspend_wakeup_init_keymap(void);
+void matrix_scan_keymap(void);
+layer_state_t default_layer_state_set_keymap(layer_state_t state);
+layer_state_t layer_state_set_keymap(layer_state_t state);
+bool led_update_keymap(led_t led_state);
+
+#ifdef STOPLIGHT_LED
+typedef struct {
+    bool     is_active :1;
+    uint8_t  index     :7;
+    uint16_t timer     :16;
+} stoplight_led_t;
+
+void led_stoplight_start(void);
+void led_stoplight_set(pin_t pin);
+void led_stoplight_end(void);
+void matrix_scan_led_stoplight(void);
+#endif
diff --git a/qmk/users/brandonschlack/config.h b/qmk/users/brandonschlack/config.h
new file mode 100644
index 00000000..8f09adef
--- /dev/null
+++ b/qmk/users/brandonschlack/config.h
@@ -0,0 +1,55 @@
+/* Copyright 2020 Brandon Schlack
+ *
+ * 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
+
+#define TAPPING_TOGGLE 2
+#define TAPPING_TERM 200
+#define PERMISSIVE_HOLD
+#define TAP_HOLD_CAPS_DELAY 200
+
+#ifdef RGBLIGHT_ENABLE
+#   define RGBLIGHT_SLEEP
+#endif
+
+#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE) && !defined(RGBLIGHT_LAYERS)
+#   define RGB_THEME_ENABLE
+#endif
+
+#ifdef RGB_THEME_ENABLE
+#   define DISABLE_RGB_THEME_JAMON
+#   define DISABLE_RGB_THEME_OBLIQUE
+#endif
+
+#ifdef ENCODER_ENABLE
+#    define TAP_CODE_DELAY 10
+#else
+#    define TAP_CODE_DELAY 5
+#endif
+
+/* Disable unused and unneeded features to reduce on firmware size */
+#ifndef NO_ACTION_MACRO
+#   define NO_ACTION_MACRO
+#endif
+#ifndef NO_ACTION_FUNCTION
+#   define NO_ACTION_FUNCTION
+#endif
+
+#ifdef LOCKING_SUPPORT_ENABLE
+#    undef LOCKING_SUPPORT_ENABLE
+#endif
+#ifdef LOCKING_RESYNC_ENABLE
+#    undef LOCKING_RESYNC_ENABLE
+#endif
diff --git a/qmk/users/brandonschlack/process_records.c b/qmk/users/brandonschlack/process_records.c
new file mode 100644
index 00000000..dfd427bd
--- /dev/null
+++ b/qmk/users/brandonschlack/process_records.c
@@ -0,0 +1,172 @@
+/* Copyright 2020 Brandon Schlack
+ *
+ * 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 "brandonschlack.h"
+
+// Super CMD↯TAB
+bool is_cmd_tab_active = false;
+uint16_t cmd_tab_timer = 0;
+
+__attribute__ ((weak))
+bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
+    return true;
+}
+
+// Consolidated Macros
+bool process_record_user(uint16_t keycode, keyrecord_t *record) {
+    switch (keycode) {
+        case QM_MAKE: // Sends 'qmk compile' or 'qmk flash'
+            if (record->event.pressed) {
+                bool flash = false;
+        // If is a keyboard and auto-flash is not set in rules.mk,
+        // then Shift will trigger the flash command
+        #if !defined(FLASH_BOOTLOADER) && !defined(IS_MACROPAD)
+                uint8_t temp_mod = get_mods();
+                uint8_t temp_osm = get_oneshot_mods();
+                clear_mods();
+                clear_oneshot_mods();
+                if ( (temp_mod | temp_osm) & MOD_MASK_SHIFT )
+        #endif
+                {
+                    flash = true;
+                }
+                send_make_command(flash);
+            }
+            break;
+        case QM_FLSH: // Sends flash command instead of compile
+            if (record->event.pressed) {
+                clear_mods();
+                clear_oneshot_mods();
+                send_make_command(true);
+            }
+            break;
+        case QM_VRSN:  // Prints firmware version
+            if (record->event.pressed) {
+                SEND_STRING(QMK_KEYBOARD "/" QMK_KEYMAP " @ " QMK_VERSION ", Built on: " QMK_BUILDDATE);
+            }
+            break;
+        case QM_KYBD:  // Prints keyboard path
+            if (record->event.pressed) {
+                SEND_STRING("keyboards/" QMK_KEYBOARD "/");
+            }
+            break;
+        case QM_KYMP:  // Prints keymap path
+            if (record->event.pressed) {
+                SEND_STRING("keyboards/" QMK_KEYBOARD "/keymaps/" QMK_KEYMAP "/keymap.c");
+            }
+            break;
+        case CMD_TAB: // Super CMD↯TAB
+            if (record->event.pressed) {
+                if (!is_cmd_tab_active) {
+                    is_cmd_tab_active = true;
+                    register_code(KC_LGUI);
+                }
+                cmd_tab_timer = timer_read();
+                register_code(KC_TAB);
+            } else {
+                unregister_code(KC_TAB);
+            }
+            break;
+        #if defined(RGB_THEME_ENABLE)
+        case RGB_LYR:
+            if (record->event.pressed) {
+                user_config.rgb_layer_change ^= 1;
+                dprintf("rgb layer change [EEPROM]: %u\n", user_config.rgb_layer_change);
+                eeconfig_update_user(user_config.raw);
+                if (user_config.rgb_layer_change) {
+                    layer_state_set(layer_state);
+                }
+            }
+            break;
+        case RGB_HUI ... RGB_SAD:
+            if (record->event.pressed) {
+                if (user_config.rgb_layer_change) {
+                    user_config.rgb_layer_change = false;
+                    dprintf("rgb layer change [EEPROM]: %u\n", user_config.rgb_layer_change);
+                    eeconfig_update_user(user_config.raw);
+                }
+            }
+            break;
+        case RGB_THEME_FORWARD:
+            if (record->event.pressed) {
+                uint8_t shifted = get_mods() & (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT));
+                if(shifted) {
+                    rgb_theme_step_reverse();
+                } else {
+                    rgb_theme_step();
+                }
+                layer_state_set(layer_state);
+            }
+            break;
+        case RGB_THEME_REVERSE:
+            if (record->event.pressed) {
+                uint8_t shifted = get_mods() & (MOD_BIT(KC_LSHIFT)|MOD_BIT(KC_RSHIFT));
+                if(shifted) {
+                    rgb_theme_step();
+                } else {
+                    rgb_theme_step_reverse();
+                }
+                layer_state_set(layer_state);
+            }
+            break;
+        #endif
+    }
+    return process_record_keymap(keycode, record);
+}
+
+// Super CMD↯TAB
+void matrix_scan_cmd_tab(void) {
+    if (is_cmd_tab_active) {
+        if (timer_elapsed(cmd_tab_timer) > 500) {
+            unregister_code(KC_LGUI);
+            is_cmd_tab_active = false;
+        }
+    }
+}
+
+/**
+ * Send Make Command
+ *
+ * Sends 'qmk compile -kb keyboard -km keymap' command to compile firmware
+ * Uses 'qmk flash' and resets keyboard, if flash_bootloader set to true
+ * Sends CTPC and/or FORCE_LAYOUT parameters if built with those options
+ */
+void send_make_command(bool flash_bootloader) {
+#ifdef FORCE_LAYOUT // Add layout string if built with FORCE_LAYOUT
+    SEND_STRING("FORCE_LAYOUT=" FORCE_LAYOUT " ");
+#endif
+#ifdef CONVERT_TO_PROTON_C // Add CTPC if built with CONVERT_TO_PROTON_C
+    SEND_STRING("CTPC=yes ");
+#endif
+    SEND_STRING("qmk ");
+    if (flash_bootloader) {
+#ifndef KEYBOARD_massdrop // Don't run flash for Massdrop boards
+        SEND_STRING("flash ");
+    } else {
+#endif
+        SEND_STRING("compile ");
+    }
+    SEND_STRING("-kb " QMK_KEYBOARD " ");
+    SEND_STRING("-km " QMK_KEYMAP);
+    if (flash_bootloader) {
+#if defined(KEYBOARD_massdrop) // only run for Massdrop boards
+        SEND_STRING(" && mdlflash " QMK_KEYBOARD " " QMK_KEYMAP);
+#endif
+    }
+    SEND_STRING(SS_TAP(X_ENTER));
+    if (flash_bootloader) {
+        reset_keyboard();
+    }
+}
diff --git a/qmk/users/brandonschlack/process_records.h b/qmk/users/brandonschlack/process_records.h
new file mode 100644
index 00000000..057233fb
--- /dev/null
+++ b/qmk/users/brandonschlack/process_records.h
@@ -0,0 +1,152 @@
+/* Copyright 2020 Brandon Schlack
+ *
+ * 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 "brandonschlack.h"
+
+// Macros
+enum custom_keycodes {
+    QM_MAKE = SAFE_RANGE,
+    QM_FLSH,
+    QM_VRSN,
+    QM_KYBD,
+    QM_KYMP,
+    CMD_TAB,
+    RGB_LYR,
+    RGB_THEME_FORWARD,
+    RGB_THEME_REVERSE,
+    KEYMAP_SAFE_RANGE
+};
+
+bool process_record_keymap(uint16_t keycode, keyrecord_t *record);
+void matrix_scan_cmd_tab(void);
+
+/**
+ * QMK Defines
+ * Some meta aliases for QMK features such as Mod-Taps
+ * and for cleaner looking Layer Toggles
+ */
+/* Control Mod-Tap */
+#define CTL_ESC    CTL_T(KC_ESC)       // Hold Escape for Control
+#define CTL_TAB    CTL_T(KC_TAB)       // Hold Tab for Control
+#define CTL_CAP    CTL_T(KC_CAPS)      // Hold Caps Lock for Control
+/* Command Mod-Tap */
+#define CMD_ESC    CMD_T(KC_ESC)       // Hold Escape for Command
+#define CMD_CAP    CMD_T(KC_CAPS)      // Hold Caps Lock for Command
+#define CMD_SPC    CMD_T(KC_SPC)       // Hold Space for Command
+/* Hyper Mod-Tap */
+#define HY_ESC    ALL_T(KC_ESC)        // Hold Escape for Hyper (Shift-Control-Option-Command)
+#define HY_TAB    ALL_T(KC_TAB)        // Hold Tab for Hyper (Shift-Control-Option-Command)
+#define HY_CAPS   ALL_T(KC_CAPS)       // Hold Caps Lock for Hyper (Shift-Control-Option-Command)
+/* Shift Mod-Tap */
+#define SF_CAPS   LSFT_T(KC_CAPS)      // Hold Caps Lock for Left Shift
+#define SFT_ENT   RSFT_T(KC_ENT)       // Hold Enter for Right Shift
+#define SF_SLSH   RSFT_T(KC_SLSH)      // Tap Right Shift for Slash (/)
+#define SF_BSLS   RSFT_T(KC_BSLS)      // Tap Right Shift for Back Slash (\)
+/* Layer Aliases */
+#define FN_LYR    MO(_FN1)             // Hold for FN Layer
+#define FN2_LYR   MO(_FN2)             // Hold for FN2 Layer
+#define LOWER     MO(_LOWER)           // Hold for LOWER Layer
+#define RAISE     MO(_RAISE)           // Hold for RAISE Layer
+#define TT_FN     TT(_FN1)             // Hold for FN Layer, or Double-Tap to Toggle
+#define TT_FN2    TT(_FN2)             // Hold for FN2 Layer, or Double-Tap to Toggle
+#define TT_LWR    TT(_LOWER)           // Hold for LOWER Layer, or Double-Tap to Toggle
+#define TT_RAI    TT(_RAISE)           // Hold for RAISE Layer, or Double-Tap to Toggle
+#define SPC_LWR   LT(_LOWER, KC_SPC)   // Tap for Space, Hold for LOWER Layer
+#define SPC_RAI   LT(_RAISE, KC_SPC)   // Tap for Space, Hold for RAISE Layer
+#define SLH_LWR   LT(_LOWER, KC_SLSH)  // Tap for /, Hold for LOWER Layer
+#define BSL_LWR   LT(_LOWER, KC_BSLS)  // Tap for \, Hold for LOWER Layer
+#define MCO_LYR   MO(_MACRO)           // Hold for MACRO Layer
+#define TG_ADJT   TG(_ADJUST)          // Toggle ADJUST Layer
+#define TG_LGHT   TG(_LIGHT)           // Toggle LIGHT Layer
+/**
+ * Media Mod-Tap
+ * Use the Mod-Tap feature for easy media controls
+ * Used with >=65% layouts
+ */
+#define RWD_CMD   RCMD_T(KC_MPRV)      // Tap Right Command for Prev Track
+#define PLY_CMD   RCMD_T(KC_MPLY)      // Tap Right Command for Play/Pause
+#define FFD_OPT   ROPT_T(KC_MNXT)      // Tap Right Option for Next Track
+#define PLY_FN1   LT(_FN1, KC_MPLY)    // Tap Fn for Play/Pause
+#define PLY_FN2   LT(_FN2, KC_MPLY)    // Tap Fn2 for Play/Pause
+#define MUT_SFT   RSFT_T(KC_MUTE)      // Tap Right Shift for Mute
+/**
+ * Arrow Mod-Tap
+ * Use the Mod-Tap feature for arrow keys
+ * Mostly used for 40-60% layouts
+ */
+#define UP_RSFT   RSFT_T(KC_UP)        // Tap Right Shift for Up
+#define LFT_OPT   ROPT_T(KC_LEFT)      // Tap Right Option for Left
+#define LFT_CMD   RCMD_T(KC_LEFT)      // Tap Right Command for Left
+#define DWN_FN1   LT(1, KC_DOWN)       // Tap Fn for Down
+#define DWN_LWR   DWN_FN1              // Tap Lower for Down
+#define DWN_FN2   LT(2, KC_DOWN)       // Tap Fn2 for Down
+#define DWN_RAI   DWN_FN2              // Tap Raise for Down
+#define DWN_OPT   ROPT_T(KC_DOWN)      // Tap Right Option for Down
+#define RGT_SFT   RSFT_T(KC_RGHT)      // Tap Right Shift for Right
+#define RGT_OPT   ROPT_T(KC_RGHT)      // Tap Right Option for Right
+#define RGT_CTL   RCTL_T(KC_RGHT)      // Tap Right Ctrl for Right
+/**
+ * Nav Mod-Tap
+ * Use the Mod-Tap feature for nav keys (Home/End, Page Up/Down)
+ * Mostly used for 40-60% layouts, on a function layer
+ */
+#define PGU_SFT   RSFT_T(KC_PGUP)      // Tap Right Shift for Page Up
+#define HOM_OPT   ROPT_T(KC_HOME)      // Tap Right Option for Home
+#define HOM_CMD   RCMD_T(KC_HOME)      // Tap Right Command for Home
+#define PGD_OPT   ROPT_T(KC_PGDN)      // Tap Right Option for Page Down
+#define PGD_FN1   LT(1, KC_PGDN)       // Tap Fn for Page Down
+#define PGD_LWR   PGD_FN1              // Tap Lower for Page Down
+#define PGD_FN2   LT(2, KC_PGDN)       // Tap Fn2 for Page Down
+#define PGD_RAI   PGD_FN2              // Tap Raise for Page Down
+#define END_OPT   ROPT_T(KC_END)       // Tap Right Option for End
+#define END_CTL   RCTL_T(KC_END)       // Tap Right Control for End
+
+/**
+ * MacOS
+ * Common shortcuts used in macOS
+ * Reference: https://support.apple.com/en-us/HT201236
+ */
+#define MC_POWR   KC_POWER             // Power (KC_POWER)
+#define MC_SLEP   LOPT(LCMD(KC_POWER)) // Sleep (Option-Command-Power)
+#define MC_SLPD   LCTL(LSFT(KC_POWER)) // Sleep Display (Control-Shift-Power)
+#define MC_LOCK   LCTL(LCMD(KC_Q))     // Lock Screen (Control-Command-Q)
+#define MC_MSSN   KC_FIND              // Mission Control: Configure karabiner for find -> mission_control
+#define MC_LHPD   KC_MENU              // Launchpad: Configure karabiner for menu -> launchpad
+#define MC_CMTB   LCMD(KC_TAB)         // Command-Tab
+#define MC_BACK   LCMD(KC_LBRC)        // Back (Command–Left Bracket)
+#define MC_FWRD   LCMD(KC_RBRC)        // Forward (Command–Right Bracket)
+#define CLS_TAB   LCMD(KC_W)           // Close Tab (Command–W)
+#define REO_TAB   LSFT(LCMD(KC_T))     // Reopen Last Tab (Shift-Command-T)
+#define NXT_TAB   LCTL(KC_TAB)         // Next Tab (Control-Tab)
+#define PRV_TAB   LSFT(LCTL(KC_TAB))   // Previous Tab (Shift-Control-Tab)
+#define NXT_WIN   LCMD(KC_GRV)         // Next Window (Control-Grave)
+#define PRV_WIN   LCMD(KC_TILD)        // Previous Window (Shift-Control-Grave)
+#define MC_PLYR   LCMD(KC_F8)          // Focuses current Media Player
+#define MC_UNDO   LCMD(KC_Z)           // Undo (Command-Z)
+#define MC_REDO   LSFT(LCMD(KC_Z))     // Redo (Shift-Command-Z)
+#define OP_AFLL   HYPR(KC_BSLS)        // 1Password Autofill (Shift-Control-Option-Command-\)
+#define PX_AFLL   LSFT(LOPT(KC_X))     // 1PasswordX Autofill (Shift-Option-X)
+// Reverse scrolling for using with macOS Natural Scrolling.
+#define MC_WH_U   KC_WH_D              // Mouse Wheel Up
+#define MC_WH_D   KC_WH_U              // Mouse Wheel Down
+#define MC_WH_L   KC_WH_R              // Mouse Wheel Left
+#define MC_WH_R   KC_WH_L              // Mouse Wheel Right
+
+// RGB Theme
+#define RGB_THM   RGB_THEME_FORWARD    // Cycle next RGB_THEME
+#define RGB_RTHM  RGB_THEME_REVERSE    // Cycle previous RGB_THEME
+
+void send_make_command(bool flash_bootloader);
diff --git a/qmk/users/brandonschlack/readme.md b/qmk/users/brandonschlack/readme.md
new file mode 100644
index 00000000..84f216f9
--- /dev/null
+++ b/qmk/users/brandonschlack/readme.md
@@ -0,0 +1,48 @@
+# Overview
+
+My QMK home. I feel as though I stand on the shoulders of giants, for a lot of my code here is borrowed and adapted from so many contributors here, and that I hope my code here can help or inspire others.
+
+## Layers, Handlers, and Macros
+### Layers
+
+I have some predefined layer names for keyboards:
+* **_BASE**: Default Layer, QWERTY layout.
+* **_FN1**: Function Layer for 60% and above, and additional macros and shortcuts on 50% and below. 
+* **_LOWER** and **_RAISE**: Function layers for 40%
+
+and macropads:
+* **_REEDER**: Shortcuts for [Reeder.app](https://reederapp.com/), my RSS feed reader
+* **_MEDIA**: Media controls
+* **_NAVI**: Navigation macros, for changing tabs and scrolling
+* **_KARABINER**: Generic macro keys, meant to be customized per app with [Karabiner](https://pqrs.org/osx/karabiner/)
+
+#### Protected Layers
+I have some named "protected" layers, meant to be at the end of the layer list for changing keyboard settings and features.
+
+* **KEYMAP_LAYERS**: Add additional layers in keymap.
+* **_AUDIO**: Audio feature controls.
+* **_LIGHT**: RGB Light/Matrix feature controls.
+* **_ADJUST**: General keyboard settings and toggles. Can also contain RGB and Audio controls on larger boards that don't need and extra layer for those controls.
+
+### EEPROM User Config
+
+I have a custom userspace config implemented to save settings on the board to persist across shutdowns. I currently store:
+
+* rgb_layer_change - a toggle for using RGB themes for layer indication
+* rgb_theme - a pointer to the currently set RGB Theme
+
+### Process Handlers
+
+### Keycode Aliases
+
+I am a macOS user and so a lot of my aliases are 
+
+### Macros
+
+
+## Tap Dances
+
+### Tap Dance Trigger Layer
+
+## RGB
+### RGB Theme
diff --git a/qmk/users/brandonschlack/rgb_bs.c b/qmk/users/brandonschlack/rgb_bs.c
new file mode 100644
index 00000000..1abf785b
--- /dev/null
+++ b/qmk/users/brandonschlack/rgb_bs.c
@@ -0,0 +1,146 @@
+/* Copyright 2020 Brandon Schlack
+ *
+ * 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 "brandonschlack.h"
+#include "rgb_theme.h"
+#include "rgb_bs.h"
+
+#if defined(RGBLIGHT_ENABLE)
+extern rgblight_config_t rgblight_config;
+#elif defined(RGB_MATRIX_ENABLE)
+extern rgb_config_t rgb_matrix_config;
+extern bool g_suspend_state;
+extern led_config_t g_led_config;
+#endif
+
+#if defined(RGB_THEME_ENABLE)
+// Should be rgb_theme.c
+#define RGB_THEME(name) const rgb_theme_t RGB_##name
+#define RGB_THEME_IMPLS
+#include "rgb_theme_user.inc"
+#undef RGB_THEME_IMPLS
+#undef RGB_THEME
+
+#define RGB_THEME(name) [RGB_THEME_##name] = &RGB_##name,
+const rgb_theme_t *themes[] = {
+    #include "rgb_theme_user.inc"
+};
+#undef RGB_THEME
+
+// Userspace loose colors
+rgb_theme_color_t default_adjust = { HSV_SPRINGGREEN };
+#endif
+
+void keyboard_post_init_rgb(void) {
+    layer_state_set_user(layer_state);
+}
+
+#if defined(RGB_THEME_ENABLE)
+void set_rgb_theme(uint8_t index) {
+    if (!user_config.rgb_layer_change) {
+        user_config.rgb_layer_change = true;
+    }
+    user_config.rgb_theme = index;
+    dprintf("rgb theme [EEPROM]: %u\n", user_config.rgb_theme);
+    eeconfig_update_user(user_config.raw);
+}
+
+rgb_theme_t get_rgb_theme(void) {
+    return *themes[user_config.rgb_theme];
+}
+
+void rgb_theme_step(void) {
+    uint8_t current = user_config.rgb_theme;
+    current = (current + 1) % RGB_THEME_MAX;
+    set_rgb_theme(current);
+}
+
+void rgb_theme_step_reverse(void) {
+    uint8_t current = user_config.rgb_theme;
+    current = (current - 1) % RGB_THEME_MAX;
+    set_rgb_theme(current);
+}
+
+rgb_theme_color_t get_rgb_theme_color(uint8_t index) {
+    rgb_theme_t theme = get_rgb_theme();
+    size_t rgb_theme_color_max = sizeof theme.colors / sizeof *theme.colors;
+
+    if (index == _ADJUST) {
+        return default_adjust;
+    } else {
+        return **(theme.colors + (index % rgb_theme_color_max));
+    }
+};
+
+void rgb_theme_layer(layer_state_t state) {
+    uint8_t rgb_color_index = get_highest_layer(state);
+    HSV color = get_rgb_theme_color(rgb_color_index);
+#if defined(RGBLIGHT_ENABLE)
+    color.v = rgblight_config.val;
+#elif defined(RGB_MATRIX_ENABLE)
+    color.v = rgb_matrix_config.hsv.v;
+#endif
+    rgb_layer_helper( color.h, color.s, color.v );
+}
+#endif
+
+#ifdef RGB_MATRIX_ENABLE
+void rgb_matrix_layer_helper (uint8_t red, uint8_t green, uint8_t blue, uint8_t led_type) {
+    for (int i = 0; i < DRIVER_LED_TOTAL; i++) {
+        if (!HAS_ANY_FLAGS(g_led_config.flags[i], led_type)) {
+            rgb_matrix_set_color( i, red, green, blue );
+        }
+    }
+}
+
+void rgb_matrix_cycle_flag (void) {
+    switch (rgb_matrix_get_flags()) {
+        case LED_FLAG_ALL:
+            rgb_matrix_set_flags(LED_FLAG_KEYS);
+            rgb_matrix_set_color_all(0, 0, 0);
+            break;
+        case LED_FLAG_KEYS:
+            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_set_color_all(0, 0, 0);
+            break;
+        default:
+            rgb_matrix_set_flags(LED_FLAG_ALL);
+            rgb_matrix_enable();
+            break;
+    }
+}
+#endif
+
+void rgb_layer_helper(uint8_t hue, uint8_t sat, uint8_t val) {
+#if defined(RGBLIGHT_ENABLE) || defined(RGB_MATRIX_ENABLE)
+    rgblight_sethsv_noeeprom(hue, sat, val);
+#ifdef RGB_MATRIX_ENABLE
+    rgb_matrix_layer_helper(0, 0, 0, rgb_matrix_get_flags());
+#endif
+}
+#endif
+
+layer_state_t layer_state_set_rgb(layer_state_t state) {
+#if defined(RGB_THEME_ENABLE)
+    if (user_config.rgb_layer_change) {
+        rgb_theme_layer(state);
+    }
+#endif // RGBLIGHT_ENABLE
+    return state;
+}
diff --git a/qmk/users/brandonschlack/rgb_bs.h b/qmk/users/brandonschlack/rgb_bs.h
new file mode 100644
index 00000000..c5cbd596
--- /dev/null
+++ b/qmk/users/brandonschlack/rgb_bs.h
@@ -0,0 +1,35 @@
+/* Copyright 2020 Brandon Schlack
+ *
+ * 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"
+#ifdef RGB_THEME_ENABLE
+#   include "rgb_theme.h"
+#endif
+#ifdef RGB_MATRIX_ENABLE
+#   include "rgb_matrix.h"
+#endif
+
+#ifdef RGB_MATRIX_ENABLE
+#define LED_FLAG_KEYS (LED_FLAG_KEYLIGHT | LED_FLAG_MODIFIER)
+
+void rgb_matrix_layer_helper(uint8_t red, uint8_t green, uint8_t blue, uint8_t led_type);
+void rgb_matrix_cycle_flag(void);
+#endif
+
+void keyboard_post_init_rgb(void);
+void rgb_layer_helper(uint8_t hue, uint8_t sat, uint8_t val);
+
+layer_state_t layer_state_set_rgb(layer_state_t state);
diff --git a/qmk/users/brandonschlack/rgb_theme.h b/qmk/users/brandonschlack/rgb_theme.h
new file mode 100644
index 00000000..7c8b2923
--- /dev/null
+++ b/qmk/users/brandonschlack/rgb_theme.h
@@ -0,0 +1,51 @@
+/* Copyright 2020 Brandon Schlack
+ *
+ * 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 "brandonschlack.h"
+#include "color.h"
+#include "rgblight_list.h"
+
+/*TODO Update as RGBLIGHT Mode */
+#ifndef RGB_THEME_COLORS_MAX
+#define RGB_THEME_COLORS_MAX 5
+#endif
+
+enum rgb_themes {
+#define RGB_THEME(name) RGB_THEME_##name,
+    #include "rgb_theme_user.inc"
+#undef RGB_THEME
+    RGB_THEME_MAX
+};
+
+// RGB Theme Color
+typedef const HSV rgb_theme_color_t;
+#define RGB_THEME_COLOR(tname, tcolor,...)   rgb_theme_color_t tname ## _ ## tcolor = { __VA_ARGS__ }
+
+// RGB Theme
+typedef struct {
+    const HSV *colors[RGB_THEME_COLORS_MAX];
+} rgb_theme_t;
+extern const rgb_theme_t *themes[];
+
+void set_rgb_theme(uint8_t index);
+rgb_theme_t get_rgb_theme(void);
+
+void rgb_theme_step(void);
+void rgb_theme_step_reverse(void);
+
+rgb_theme_color_t get_rgb_theme_color(uint8_t index);
+void rgb_theme_layer(layer_state_t state);
diff --git a/qmk/users/brandonschlack/rgb_theme_user.inc b/qmk/users/brandonschlack/rgb_theme_user.inc
new file mode 100644
index 00000000..a07e62b7
--- /dev/null
+++ b/qmk/users/brandonschlack/rgb_theme_user.inc
@@ -0,0 +1,95 @@
+// Basic Theme
+#ifndef DISABLE_RGB_THEME_BASIC
+#ifndef RGB_THEME_IMPLS
+RGB_THEME(BASIC)
+#else
+RGB_THEME_COLOR(BASIC, WHITE, HSV_WHITE);
+RGB_THEME_COLOR(BASIC, BLUE, HSV_BLUE);
+RGB_THEME_COLOR(BASIC, RED, HSV_RED);
+RGB_THEME_COLOR(BASIC, GREEN, HSV_GREEN);
+RGB_THEME_COLOR(BASIC, YELLOW, HSV_YELLOW);
+RGB_THEME(BASIC) = { { &BASIC_WHITE, &BASIC_BLUE, &BASIC_RED, &BASIC_GREEN, &BASIC_YELLOW } };
+#endif // RGB_THEME_IMPLS
+#endif // DISABLE_RGB_THEME_BASIC
+
+// Laser Theme
+#ifndef DISABLE_RGB_THEME_LASER
+#ifndef RGB_THEME_IMPLS
+RGB_THEME(LASER)
+#else
+RGB_THEME_COLOR(LASER, PURPLE, 191, 255, 255);
+RGB_THEME_COLOR(LASER, PINK, 237, 255, 255);
+RGB_THEME_COLOR(LASER, BLUE, 165, 255, 255);
+RGB_THEME_COLOR(LASER, CYAN, 133, 255, 255);
+RGB_THEME_COLOR(LASER, MAGENTA, 213, 255, 255);
+RGB_THEME(LASER) = { { &LASER_PURPLE, &LASER_PINK, &LASER_BLUE, &LASER_CYAN, &LASER_MAGENTA } };
+#endif // RGB_THEME_IMPLS
+#endif // DISABLE_RGB_THEME_LASER
+
+// Metropolis Theme
+#ifndef DISABLE_RGB_THEME_METROPOLIS
+#ifndef RGB_THEME_IMPLS
+RGB_THEME(METROPOLIS)
+#else
+RGB_THEME_COLOR(METROPOLIS, TEAL,   96,  207, 255);
+RGB_THEME_COLOR(METROPOLIS, RED,    HSV_RED);
+RGB_THEME_COLOR(METROPOLIS, YELLOW, 24,  255, 255);
+RGB_THEME_COLOR(METROPOLIS, BLUE,   168, 255, 255);
+RGB_THEME_COLOR(METROPOLIS, WHITE,  HSV_WHITE);
+RGB_THEME(METROPOLIS) = { { &METROPOLIS_TEAL, &METROPOLIS_RED, &METROPOLIS_YELLOW, &METROPOLIS_BLUE, &METROPOLIS_WHITE } };
+#endif // RGB_THEME_IMPLS
+#endif // DISABLE_RGB_THEME_METROPOLIS
+
+// Canvas Theme
+#ifndef DISABLE_RGB_THEME_CANVAS
+#ifndef RGB_THEME_IMPLS
+RGB_THEME(CANVAS)
+#else
+RGB_THEME_COLOR(CANVAS, WHITE,  HSV_WHITE);
+RGB_THEME_COLOR(CANVAS, ORANGE, 10,  255, 255);
+RGB_THEME_COLOR(CANVAS, RED,     0,  231, 255);
+RGB_THEME_COLOR(CANVAS, GREEN,  74,  207, 255);
+RGB_THEME_COLOR(CANVAS, BLUE,  170,  135, 255);
+RGB_THEME(CANVAS) = { { &CANVAS_WHITE, &CANVAS_ORANGE, &CANVAS_RED, &CANVAS_GREEN, &CANVAS_BLUE } };
+#endif // RGB_THEME_IMPLS
+#endif // DISABLE_RGB_THEME_CANVAS
+
+// Jamon Theme
+#ifndef DISABLE_RGB_THEME_JAMON
+#ifndef RGB_THEME_IMPLS
+RGB_THEME(JAMON)
+#else
+RGB_THEME_COLOR(JAMON, RED, HSV_RED);
+RGB_THEME_COLOR(JAMON, LIGHTRED, 4,  255, 255);
+RGB_THEME_COLOR(JAMON, WHITE,  HSV_WHITE);
+RGB_THEME_COLOR(JAMON, YELLOW,  HSV_GOLD);
+RGB_THEME(JAMON) = { { &JAMON_RED, &JAMON_LIGHTRED, &JAMON_WHITE, &JAMON_YELLOW } };
+#endif // RGB_THEME_IMPLS
+#endif // DISABLE_RGB_THEME_JAMON
+
+// Striker Theme
+#ifndef DISABLE_RGB_THEME_STRIKER
+#ifndef RGB_THEME_IMPLS
+RGB_THEME(STRIKER)
+#else
+RGB_THEME_COLOR(STRIKER, BLUE, HSV_BLUE);
+RGB_THEME_COLOR(STRIKER, AZURE, HSV_AZURE);
+RGB_THEME_COLOR(STRIKER, WHITE,  HSV_WHITE);
+RGB_THEME_COLOR(STRIKER, RED,  HSV_RED);
+RGB_THEME(STRIKER) = { { &STRIKER_BLUE, &STRIKER_AZURE, &STRIKER_WHITE, &STRIKER_RED } };
+#endif // RGB_THEME_IMPLS
+#endif // DISABLE_RGB_THEME_STRIKER
+
+// Oblique Theme
+#ifndef DISABLE_RGB_THEME_OBLIQUE
+#ifndef RGB_THEME_IMPLS
+RGB_THEME(OBLIQUE)
+#else
+RGB_THEME_COLOR(OBLIQUE, WHITE, HSV_WHITE);
+RGB_THEME_COLOR(OBLIQUE, PURPLE, 186, 143, 255);
+RGB_THEME_COLOR(OBLIQUE, RED, 10,  200, 255);
+RGB_THEME_COLOR(OBLIQUE, ORANGE, 26,  215, 255);
+RGB_THEME_COLOR(OBLIQUE, GREEN, 58,  199, 255);
+RGB_THEME(OBLIQUE) = { { &OBLIQUE_WHITE, &OBLIQUE_PURPLE, &OBLIQUE_RED, &OBLIQUE_ORANGE, &OBLIQUE_GREEN } };
+#endif // RGB_THEME_IMPLS
+#endif // DISABLE_RGB_THEME_OBLIQUE
diff --git a/qmk/users/brandonschlack/rules.mk b/qmk/users/brandonschlack/rules.mk
new file mode 100644
index 00000000..2dfc332a
--- /dev/null
+++ b/qmk/users/brandonschlack/rules.mk
@@ -0,0 +1,34 @@
+SRC += brandonschlack.c \
+       process_records.c
+
+SPACE_CADET_ENABLE = no
+
+# Use LTO except for ChibiOS
+ifneq ($(PLATFORM),CHIBIOS)
+    LTO_ENABLE            = yes
+endif
+
+ifeq ($(strip $(IS_MACROPAD)), yes)
+    OPT_DEFS += -DIS_MACROPAD
+endif
+
+ifeq ($(strip $(RGBLIGHT_ENABLE)), yes)
+    SRC += rgb_bs.c
+endif
+
+RGB_MATRIX_ENABLE ?= no
+ifneq ($(strip $(RGB_MATRIX_ENABLE)), no)
+    SRC += rgb_bs.c
+endif
+
+ifeq ($(strip $(TAP_DANCE_ENABLE)), yes)
+    SRC += tap_dances.c
+endif
+
+ifeq ($(strip $(FLASH_BOOTLOADER)), yes)
+    OPT_DEFS += -DFLASH_BOOTLOADER
+endif
+
+ifneq ($(FORCE_LAYOUT),)
+    OPT_DEFS += -DFORCE_LAYOUT=\"$(FORCE_LAYOUT)\"
+endif
diff --git a/qmk/users/brandonschlack/tap_dances.c b/qmk/users/brandonschlack/tap_dances.c
new file mode 100644
index 00000000..861b3180
--- /dev/null
+++ b/qmk/users/brandonschlack/tap_dances.c
@@ -0,0 +1,91 @@
+/* Copyright 2020 Brandon Schlack
+ *
+ * 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"
+#include "process_keycode/process_tap_dance.h"
+
+int cur_dance (qk_tap_dance_state_t *state) {
+    if (state->count == 1) {
+        if (state->interrupted || !state->pressed)  return SINGLE_TAP;
+        else return SINGLE_HOLD;
+    } else if (state->count == 2) {
+        if (state->interrupted) return DOUBLE_SINGLE_TAP;
+        else if (state->pressed) return DOUBLE_HOLD;
+        else return DOUBLE_TAP;
+    }
+    if (state->count == 3) {
+        if (state->interrupted || !state->pressed)  return TRIPLE_TAP;
+        else return TRIPLE_HOLD;
+    }
+    else return 8;
+}
+
+__attribute__ ((weak))
+void process_tap_dance_keycode (bool reset, uint8_t toggle_layer) { };
+
+void td_trigger_layer_finished (qk_tap_dance_state_t *state, void *user_data) {
+    qk_tap_dance_trigger_layer_t *data = (qk_tap_dance_trigger_layer_t *)user_data;
+    data->state = cur_dance(state);
+
+    if (data->state == data->trigger) {
+        layer_on(data->layer);
+    } else {
+        process_tap_dance_keycode(false, data->layer);
+    }
+
+}
+void td_trigger_layer_reset (qk_tap_dance_state_t *state, void *user_data) {
+    qk_tap_dance_trigger_layer_t *data = (qk_tap_dance_trigger_layer_t *)user_data;
+    if (data->state == data->trigger) {
+        switch (data->trigger) {
+            case SINGLE_HOLD:
+            case DOUBLE_HOLD:
+            case TRIPLE_HOLD:
+                layer_off(data->layer);
+                break;
+        }
+    } else {
+        process_tap_dance_keycode(true, data->layer);
+    }
+    data->state = 0;
+}
+
+/* Tap Dance: Layer Mod. Toggles Layer when tapped, Mod when held. */
+void td_layer_mod_each(qk_tap_dance_state_t *state, void *user_data) {
+    qk_tap_dance_dual_role_t *data = (qk_tap_dance_dual_role_t *)user_data;
+
+    // Single tap → toggle layer, Single hold → mod
+    if (state->pressed) {
+        register_code(data->kc);
+    } else if (state->count == 1) {
+        state->finished = true;
+    }
+}
+
+void td_layer_mod_finished(qk_tap_dance_state_t *state, void *user_data) {
+    qk_tap_dance_dual_role_t *data = (qk_tap_dance_dual_role_t *)user_data;
+
+    if (state->count == 1 && !state->pressed) {
+        layer_invert(data->layer);
+    }
+}
+
+void td_layer_mod_reset(qk_tap_dance_state_t *state, void *user_data) {
+    qk_tap_dance_dual_role_t *data = (qk_tap_dance_dual_role_t *)user_data;
+
+    if (state->count == 1) {
+        unregister_code(data->kc);
+    }
+}
diff --git a/qmk/users/brandonschlack/tap_dances.h b/qmk/users/brandonschlack/tap_dances.h
new file mode 100644
index 00000000..3747619a
--- /dev/null
+++ b/qmk/users/brandonschlack/tap_dances.h
@@ -0,0 +1,52 @@
+/* Copyright 2020 Brandon Schlack
+ *
+ * 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 "brandonschlack.h"
+#ifdef TAP_DANCE_ENABLE
+#   include "process_keycode/process_tap_dance.h"
+#endif
+
+enum tap_dance_states {
+    SINGLE_TAP = 1,
+    SINGLE_HOLD = 2,
+    DOUBLE_TAP = 3,
+    DOUBLE_HOLD = 4,
+    DOUBLE_SINGLE_TAP = 5,
+    TRIPLE_TAP = 6,
+    TRIPLE_HOLD = 7
+};
+
+int cur_dance (qk_tap_dance_state_t *state);
+void process_tap_dance_keycode (bool reset, uint8_t toggle_layer);
+
+/* Tap Dance: Trigger Layer
+ *
+ * Toggles Layer based on given trigger (Single Hold, Double Tap, Double Hold, etc).
+ * Uses process_tap_dance_keycode() to allow keycode defines based on layer
+ */
+typedef struct {
+    uint8_t  trigger;
+    uint8_t  layer;
+    uint8_t  state;
+} qk_tap_dance_trigger_layer_t;
+
+#define ACTION_TAP_DANCE_TRIGGER_LAYER(trigger, layer) { \
+    .fn = { NULL, td_trigger_layer_finished, td_trigger_layer_reset }, \
+    .user_data = (void *)&((qk_tap_dance_trigger_layer_t) { trigger, layer, 0 }), \
+}
+
+void td_trigger_layer_finished (qk_tap_dance_state_t *state, void *user_data);
+void td_trigger_layer_reset (qk_tap_dance_state_t *state, void *user_data);
diff --git a/qmk/users/riblee/riblee.c b/qmk/users/riblee/riblee.c
index e1fe607e..6e548f1d 100644
--- a/qmk/users/riblee/riblee.c
+++ b/qmk/users/riblee/riblee.c
@@ -15,6 +15,8 @@
  */
 
 #include "riblee.h"
+#include "raw_hid.h"
+#include <string.h>
 
 const uint8_t shift = MOD_BIT(KC_LSFT) | MOD_BIT(KC_RSFT);
 
@@ -150,6 +152,12 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
             }
             return false;
             break;
+        case HUNGARIAN:
+            if (record->event.pressed) {
+                set_single_persistent_default_layer(_HUNGARIAN);
+            }
+            return false;
+            break;
         case BACKLIT:
             if (record->event.pressed) {
                 register_code(keycode_config(KC_LGUI));
@@ -164,3 +172,59 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
     }
     return true;
 };
+
+#ifdef OLED_DRIVER_ENABLE
+
+static char receive_buffer[128] = {};
+static uint8_t receive_buffer_length = 0;
+
+void oled_task_user(void) {
+    // Keyboard Layer Status
+    oled_write_P(PSTR("Layer: "), false);
+
+    switch (get_highest_layer(layer_state)) {
+        case _QWERTY:
+            oled_write_P(PSTR("Default\n"), false);
+            break;
+        case _LOWER:
+            oled_write_P(PSTR("Lower\n"), false);
+            break;
+        case _RAISE:
+            oled_write_P(PSTR("Raise\n"), false);
+            break;
+        case _ADJUST:
+            oled_write_P(PSTR("Adjust\n"), false);
+            break;
+        default:
+            oled_write_P(PSTR("Undefined\n"), false);
+    }
+
+    // Print string received via HID RAW
+    oled_write_ln(receive_buffer, false);
+}
+
+#ifdef RAW_ENABLE
+
+void raw_hid_receive(uint8_t *data, uint8_t length) {
+
+    // Append data to receive_buffer, without the first byte
+    memcpy(receive_buffer + receive_buffer_length, data + 1, length - 1);
+    receive_buffer_length += (length - 1);
+
+    // First byte indicate if we will recive more package for the current string
+    // If it's 1 then this was the last package and we can reset the offset
+    if (data[0] == 1) {
+        // Reset the offset for memcpy to the begining of our buffer
+        receive_buffer_length = 0;
+    }
+
+    // Reset the offset to prevent overwriting memory outside of the buffer
+    if (receive_buffer_length + 32 >= 128) {
+        receive_buffer_length = 0;
+    }
+
+}
+
+#endif
+
+#endif
\ No newline at end of file
diff --git a/qmk/users/riblee/riblee.h b/qmk/users/riblee/riblee.h
index bdaa9f32..a4038765 100644
--- a/qmk/users/riblee/riblee.h
+++ b/qmk/users/riblee/riblee.h
@@ -18,8 +18,9 @@
 
 #include QMK_KEYBOARD_H
 
-enum preonic_layers {
+enum layer_names {
     _QWERTY,
+    _HUNGARIAN,
     _COLEMAK,
     _DVORAK,
     _LOWER,
@@ -27,8 +28,9 @@ enum preonic_layers {
     _ADJUST
 };
 
-enum preonic_keycodes {
+enum custom_keycodes {
     QWERTY = SAFE_RANGE,
+    HUNGARIAN,
     COLEMAK,
     DVORAK,
     BACKLIT
diff --git a/qmk/users/rupa/config.h b/qmk/users/rupa/config.h
index 90240520..723d9b3b 100644
--- a/qmk/users/rupa/config.h
+++ b/qmk/users/rupa/config.h
@@ -5,4 +5,7 @@
 #define ONESHOT_TAP_TOGGLE 5
 #define ONESHOT_TIMEOUT 5000
 
+#undef TAP_CODE_DELAY
 #define TAP_CODE_DELAY 5 //DEFAULT: 100
+
+//#define UNICODE_SCRIPT_MODE_ENABLE
diff --git a/qmk/users/rupa/process_records.c b/qmk/users/rupa/process_records.c
index 2d723101..2d23e340 100644
--- a/qmk/users/rupa/process_records.c
+++ b/qmk/users/rupa/process_records.c
@@ -17,7 +17,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "rupa.h"
 
-font_t *translator = NULL;
+uint16_t processed_keycode;
 
 __attribute__((weak))
 bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
@@ -25,47 +25,93 @@ bool process_record_keymap(uint16_t keycode, keyrecord_t *record) {
 }
 
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    bool is_shifted = get_mods()&MOD_MASK_SHIFT;
-    bool is_pressed = record->event.pressed;
+    if (record->event.pressed) {
 
-    switch(keycode) {
-        case VRSN:
-            if (is_pressed) {
+        processed_keycode = keycode;
+        // mask out mod taps
+        if (
+            (keycode >= QK_MOD_TAP && keycode <= QK_MOD_TAP_MAX) ||
+            (keycode >= QK_LAYER_TAP && keycode <= QK_LAYER_TAP_MAX)
+        ) {
+            processed_keycode &= 0xFF;
+        }
+
+        bool is_shifted = (get_mods() | get_oneshot_mods() | get_weak_mods()) & MOD_MASK_SHIFT;
+        switch(processed_keycode) {
+            case VRSN:
                 send_string_with_delay_P(PSTR(
-                  "# " QMK_KEYBOARD "/" QMK_KEYMAP ":" QMK_VERSION " " QMK_BUILDDATE "\n"
+                    "# " QMK_KEYBOARD "/" QMK_KEYMAP ":" QMK_VERSION " " QMK_BUILDDATE "\n"
                 ), TAP_CODE_DELAY);
-            }
-            return false;
+                return false;
 
-        case LOD:
-        case RUPA:
-            if (is_pressed) {
-                if (keycode == LOD) {
-                    send_unicode_string((is_shifted ? "¯\\_(ツ)_/¯" : "ಠ_ಠ"));
-                } else if (keycode == RUPA) {
-                    send_unicode_string((is_shifted ? "Śrīrūpa" : "rūpa"));
+            case BUGS:
+                return u_xp(is_shifted, "ᙙᙖ", "ଳ");
+            case CATS:
+                return u_xp(is_shifted, "ⓛ ᆽ ⓛ ", "ㅇㅅㅇ");
+            case DANCE:
+                return u_x(dance(is_shifted));
+            case DICE:
+                return u_x(d6());
+            case DOMO:
+                return u_xp(is_shifted, "(シ_ _)シ", "m(_ _)m");
+            case FART:
+                return u_x("⊥ʶ∀Ⅎ");
+            case FLIP:
+                return u_x(flip(is_shifted));
+            case HUGS:
+                return u_xp(is_shifted, "(づ￣ ³￣)づ", "(っಠ‿ಠ)っ");
+            case JOY:
+                return u_x(joy(is_shifted));
+            case RNDM:
+                return false;
+            case KISS:
+                return u_xp(is_shifted, "꒒ ০ ⌵ ୧ ♡", "( ˘ ³˘)♥");
+            case LOD:
+                return u_xp(is_shifted, "( ͡ಠ ʖ̯ ͡ಠ)", "ಠ_ಠ");
+            case MUSIC:
+                return u_xp(is_shifted, "(˳˘ ɜ˘)˳ ♬ ♪♫", "(´▽｀)ノ♫");
+            case RUPA:
+                return u_xp(is_shifted, "Śrīrūpa", "rūpa");
+            case SHRUG:
+                return u_xp(is_shifted, "⋌ ༼ •̀ ⌂ •́ ༽⋋", "¯\\_(ツ)_/¯");
+            case TADA:
+                return u_xp(is_shifted, "☆ *･゜ﾟ･*(^O^)/*･゜ﾟ･*☆", "＼＼(゜ロ＼＼)Ξ(／／ロ゜)／／");
+            case WAT:
+                return u_xp(is_shifted, "༼  ຶཽཀ  ຶཽ༽", "ヽ༼⊙_⊙༽ﾉ");
+            case YUNO:
+                return u_xp(is_shifted, "o(^^o)", "щ(゜ロ゜щ)");
+            case ZALGO:
+                set_combined_mode(CM_ZALGO);
+                break;
+            case ZZZZZ:
+                cycle_combined_mode();
+                break;
+
+#if defined(UNICODE_SCRIPT_MODE_ENABLE)
+            // script modes
+            case U_FRACT:
+                return set_script_mode(F_FRACT);
+            case U_ITALI:
+                return set_script_mode(F_ITALI);
+            case U_MONOS:
+                return set_script_mode(F_MONOS);
+            case U_NORML:
+                return set_script_mode(F_NORML);
+            case U_SANSI:
+                return set_script_mode(F_SANSI);
+            case U_SANSN:
+                return set_script_mode(F_SANSN);
+            case U_SCRPT:
+                return set_script_mode(F_SCRPT);
+
+            default:
+                if (get_script_mode() != NULL) {
+                    return script_mode_translate(is_shifted, processed_keycode);
                 }
-            }
-            return false;
-
-        // script modes
-        case U_FRACT:
-        case U_MONOS:
-        case U_SCRPT:
-            if (is_pressed) {
-                if (keycode == U_SCRPT) {
-                    translator = (translator == &script_bold ? NULL : &script_bold);
-                } else if (keycode == U_FRACT) {
-                    translator = (translator == &fraktu_bold ? NULL : &fraktu_bold);
-                } else if (keycode == U_MONOS) {
-                    translator = (translator == &monosp_bold ? NULL : &monosp_bold);
+                if (combined_mode != CM_NULL && combined_text(processed_keycode)) {
+                    return false;
                 }
-            }
-            return true;
-
-        default:
-            if (is_pressed && translator != NULL) {
-                return script_mode_translate(translator, is_shifted, keycode);
+#endif
             }
     }
     return process_record_keymap(keycode, record);
diff --git a/qmk/users/rupa/readme.md b/qmk/users/rupa/readme.md
new file mode 100644
index 00000000..b6c2dd1f
--- /dev/null
+++ b/qmk/users/rupa/readme.md
@@ -0,0 +1,7 @@
+# rupa's userspace
+
+* rupa.c has some unicode script mode stuff
+* unicode.c has my unicode map
+* process_record.c has my keycode handler
+
+my keymap is in [keyboards/tada68](../../keyboards/tada68/keymaps/rupa/)
diff --git a/qmk/users/rupa/rules.mk b/qmk/users/rupa/rules.mk
index c4f147d9..ed33e85f 100644
--- a/qmk/users/rupa/rules.mk
+++ b/qmk/users/rupa/rules.mk
@@ -1,3 +1,5 @@
+UNICODEMAP_ENABLE = yes
+LTO_ENABLE = yes
 SRC += rupa.c \
        process_records.c \
        unicode.c
diff --git a/qmk/users/rupa/rupa.c b/qmk/users/rupa/rupa.c
index 60fec3ca..85de5c16 100644
--- a/qmk/users/rupa/rupa.c
+++ b/qmk/users/rupa/rupa.c
@@ -18,14 +18,46 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <print.h>
 #include "rupa.h"
 
+#if defined(UNICODE_SCRIPT_MODE_ENABLE)
+const font_t * translator = NULL;
+
 // https://en.wikipedia.org/wiki/Mathematical_Alphanumeric_Symbols
-font_t script_bold = {0x1D4D0, 0x1D4EA, 0x1D7CE}; // with bold numbers
-font_t fraktu_bold = {0x1D56C, 0x1D586, 0x1D7D8}; // with doublestruck numbers
-font_t monosp_bold = {0x1D670, 0x1D68A, 0x1D7F6};
+static const font_t *fonts_map[] = {
+    [F_FRACT] = &(font_t){0x1D56C, 0x1D586, 0x1D7D8}, // fraktur/doublestruck numbers
+    [F_ITALI] = &(font_t){0x1D468, 0x1D482, 0x1D7CE}, // italic/bold numbers
+    [F_MONOS] = &(font_t){0x1D670, 0x1D68A, 0x1D7F6}, // monospace
+    [F_NORML] = &(font_t){0x1D400, 0x1D41A, 0x00030}, // normal!
+    [F_SANSI] = &(font_t){0x1D63C, 0x1D656, 0x1D7EC}, // sans 1talic/sans bold numbers
+    [F_SANSN] = &(font_t){0x1D5D4, 0x1D5EE, 0x1D7E2}, // sans normal/sans numbers
+    [F_SCRPT] = &(font_t){0x1D4D0, 0x1D4EA, 0x1D7CE}, // script/bold numbers
+};
+
+/*
+font_t doublestruc = {0x1D538, 0x1D552, 0x1D7D8};
+uint_32 []snowflakes = {
+  // doublestruck
+  0x1D53B, // C
+  0x1D540, // H
+  0x1D546, // N
+  0x1D548, // P
+  0x1D549, // Q
+  0x1D54A, // R
+  0x1D552, // Z
+};
+*/
+
+const font_t *get_script_mode(void) {
+    return translator;
+}
+bool set_script_mode(int fc) {
+    translator = translator == fonts_map[fc] ? NULL : fonts_map[fc];
+    dprintf("set_script_mode: %u %b\n", fc, translator != NULL);
+    return true;
+}
 
 // Maps A-Z, a-z, and 0-9 to other unicode ranges. We also map space to EN
 // SPACE for some reason :)
-uint32_t map_alnum(font_t *f, bool is_shifted, uint32_t keycode) {
+uint32_t map_alnum(const font_t *f, bool is_shifted, uint32_t keycode) {
     switch (keycode) {
         case KC_SPACE:
             return (is_shifted ? 0 : 0x2002); // EN SPACE
@@ -40,10 +72,11 @@ uint32_t map_alnum(font_t *f, bool is_shifted, uint32_t keycode) {
     }
 }
 
-bool script_mode_translate(font_t *translator, bool is_shifted, uint32_t keycode) {
+bool script_mode_translate(bool is_shifted, uint32_t keycode) {
     uint32_t translated = map_alnum(translator, is_shifted, keycode);
     if (translated == 0) return true;
     dprintf("script_mode_translate: %u => %d\n", keycode, translated);
     register_unicode(translated);
     return false;
 }
+#endif
diff --git a/qmk/users/rupa/rupa.h b/qmk/users/rupa/rupa.h
index 9be3a2d6..cfe873ff 100644
--- a/qmk/users/rupa/rupa.h
+++ b/qmk/users/rupa/rupa.h
@@ -20,19 +20,55 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "version.h"
 #include "process_records.h"
 #include "unicode.h"
+#include "wrappers.h"
 
 enum userspace_layers {
     _QWERTY = 0,
+    _LOWER,
     _RAISE,
+    _ADJUST
 };
 
 enum userspace_custom_keycodes {
     VRSN = SAFE_RANGE,
+    BUGS,
+    CATS,
+    DANCE,
+    DICE,
+    DOMO,
+    FART,
+    FLIP,
+    HUGS,
+    JOY,
+    KISS,
     LOD,
+    MUSIC,
+    RNDM,
     RUPA,
+    SHRUG,
+    TADA,
     U_FRACT,
+    U_ITALI,
     U_MONOS,
+    U_NORML,
+    U_SANSI,
+    U_SANSN,
     U_SCRPT,
+    WAT,
+    YUNO,
+    ZALGO,
+    ZZZZZ,
+    NEXT_SAFE_RANGE
+};
+
+enum userspace_font_choices {
+    F_FRACT = 0,
+    F_ITALI,
+    F_MONOS,
+    F_NORML,
+    F_SANSI,
+    F_SANSN,
+    F_SCRPT
 };
 
 typedef struct font_t {
@@ -41,14 +77,6 @@ typedef struct font_t {
     uint32_t zero_glyph;
 } font_t;
 
-font_t fraktu_bold;
-font_t monosp_bold;
-font_t script_bold;
-
-bool script_mode_translate(font_t *translator, bool is_shifted, uint32_t keycode);
-
-#define RAISE   MO(_RAISE)
-#define OS_RGUI OSM(MOD_RGUI)
-#define OS_RALT OSM(MOD_RALT)
-#define OS_RCTL OSM(MOD_RCTL)
-#define OS_RSFT OSM(MOD_RSFT)
+const font_t* get_script_mode(void);
+bool set_script_mode(int fc);
+bool script_mode_translate(bool is_shifted, uint32_t keycode);
diff --git a/qmk/users/rupa/unicode.c b/qmk/users/rupa/unicode.c
index 89a0d476..2302a955 100644
--- a/qmk/users/rupa/unicode.c
+++ b/qmk/users/rupa/unicode.c
@@ -17,26 +17,155 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "unicode.h"
 
+combined_mode_t combined_mode = CM_NULL;
+bool _seeded = false;
+
 #if defined(UNICODEMAP_ENABLE)
 const uint32_t PROGMEM unicode_map[] = {
-    [CHEK] = 0x2713, // ✓
-    /*
-    [DI1]  = 0x2680, // ⚀
-    [DI2]  = 0x2681, // ⚁
-    [DI3]  = 0x2682, // ⚂
-    [DI4]  = 0x2683, // ⚃
-    [DI5]  = 0x2684, // ⚄
-    [DI6]  = 0x2685, // ⚅
-    */
-    [HAS]  = 0x262D, // ☭
-    [IBNG] = 0x203D, // ‽
-    [IRNY] = 0x2E2E, // ⸮
-    [M4]   = 0x2669, // ♩
-    [M8]   = 0x266A, // ♪
-    [M8B]  = 0x266B, // ♫
-    [M16]  = 0x266C, // ♬
-    [OM]   = 0x0950, // ॐ
-    [STB]  = 0x2605, // ★
-    [STW]  = 0x2606, // ☆
+    [CCIR] = 0x20DD,  // COMBINING CIRCLE  ⃝
+    [CENT] = 0x00A2,  // ¢
+    [CHEK] = 0x2713,  // ✓
+    [CKEY] = 0x20E3,  // COMBINING KEYCAP  ⃣
+    [CUI]  = 0x26A0,  // ⚠
+    [ECKS] = 0x2716,  // ✖
+    [EFF]  = 0x017F,  // ſ
+    [HAS]  = 0x262D,  // ☭
+    [HUN]  = 0x1F4AF, // 💯
+    [IBNG] = 0x203D,  // ‽
+    [IRNY] = 0x2E2E,  // ⸮
+    [LALL] = 0x2200,  // ∀
+    [LELM] = 0x2208,  // ∈
+    [LEXI] = 0x2203,  // ∃
+    [LPRO] = 0x22A2,  // ⊢
+    [M4]   = 0x2669,  // ♩
+    [M8]   = 0x266A,  // ♪
+    [M8B]  = 0x266B,  // ♫
+    [M16]  = 0x266C,  // ♬
+    [NEG]  = 0x20E0,  // COMBINING NO  ⃠
+    [NOPE] = 0x1F6AB, // 🚫
+    [NUM]  = 0x2116,  // №
+    [OM]   = 0x0950,  // ॐ
+    [SMB]  = 0x263A,  // ☻
+    [SMW]  = 0x263B,  // ☺
+    [STB]  = 0x2605,  // ★
+    [STOP] = 0x26D4,  // ⛔
+    [STW]  = 0x2606,  // ☆
 };
 #endif
+
+const char *d6_map[] = {
+    "⚀", "⚁", "⚂", "⚃", "⚄", "⚅"
+};
+const char *dance_map[] = {
+    "〜(￣▽￣〜)",
+    "(〜￣▽￣)〜"
+};
+const char *dance_more_map[] = {
+    "ƪ(˘⌣˘)┐",
+    "┌(˘⌣˘)ʃ"
+};
+const char *flip_map[] = {
+    "(╯°□°）╯︵ ┻━━┻",
+    "（ノ－＿－）ノ･･ ┻━━┻",
+    "(ﾉꐦ⊙曲ఠ)ﾉ彡┻━┻"
+};
+const char *flip_back_map[] = {
+    "┬──┬◡ﾉ(° -°ﾉ)",
+    "┬──┬ノ( ゜-゜ノ)",
+    "┬──┬ノ(ಠ_ಠノ)"
+};
+const char *joy_map[] = {
+    "ᕕ( ᐛ )ᕗ ",
+    "٩(ˊᗜˋ*)و",
+    "٩( ᐛ )و"
+};
+const char *joy_harder_map[] = {
+    "＼\\ ٩( ᐛ )و /／",
+    "✧*｡٩(ˊᗜˋ*)و✧*｡"
+};
+
+const char *choice(const char *choices[], int size) {
+    if (_seeded == false) {
+        srand(timer_read32());
+        dprintf("_seeded the roll\n");
+        _seeded = true;
+    }
+    return choices[rand() % size];
+}
+
+const char *d6(void) {
+    return choice(d6_map, 6);
+}
+const char *dance(bool more) {
+    if (more) {
+        return choice(dance_more_map, 2);
+    }
+    return choice(dance_map, 2);
+}
+const char *flip(bool flip_back) {
+    if (flip_back) {
+        return choice(flip_back_map, 3);
+    }
+    return choice(flip_map, 3);
+}
+const char *joy(bool harder) {
+    if (harder) {
+        return choice(joy_harder_map, 2);
+    }
+    return choice(joy_map, 3);
+}
+
+bool u_x(const char *text) {
+    send_unicode_string(text);
+    return false;
+};
+bool u_xp(bool is_shifted, const char *shifted, const char *plain) {
+    send_unicode_string(is_shifted ? shifted : plain);
+    return false;
+};
+
+void zalgo(void) {
+    int number = (rand() % (8 + 1 - 2)) + 2;
+    unsigned int index;
+    for (index=0; index<number; index++) {
+        uint16_t hex = (rand() % (0x036F + 1 - 0x0300)) + 0x0300;
+        register_hex(hex);
+    }
+}
+
+bool combined_text(uint16_t keycode) {
+    if (keycode < KC_A || (keycode > KC_0 && keycode < KC_MINUS) || keycode > KC_SLASH) {
+        return false;
+    }
+    tap_code(keycode);
+    unicode_input_start();
+    switch (combined_mode) {
+        case CM_CIRCLE:
+          register_hex(0x20DD);
+          break;
+        case CM_NO:
+          register_hex(0x20E0);
+          break;
+        case CM_KEYCAP:
+          register_hex(0x20E3);
+          break;
+        case CM_ZALGO:
+          zalgo();
+          break;
+        default:
+          break;
+    }
+    unicode_input_finish();
+    return true;
+}
+
+void cycle_combined_mode(void) {
+    if (combined_mode++ >= CM_MAX - 1) {
+        combined_mode = CM_NULL;
+    }
+}
+
+combined_mode_t set_combined_mode(combined_mode_t mode) {
+    combined_mode = combined_mode == mode ? CM_NULL : mode;
+    return combined_mode;
+}
diff --git a/qmk/users/rupa/unicode.h b/qmk/users/rupa/unicode.h
index 0c067bd9..92303b13 100644
--- a/qmk/users/rupa/unicode.h
+++ b/qmk/users/rupa/unicode.h
@@ -20,24 +20,58 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #if defined(UNICODEMAP_ENABLE)
 enum unicode_names {
-    CHEK,
-    /*
-    DI1, // ⚀
-    DI2, // ⚁
-    DI3, // ⚂
-    DI4, // ⚃
-    DI5, // ⚄
-    DI6, // ⚅
-    */
+    CCIR, // COMBINING  ⃝
+    CENT, // ¢
+    CHEK, // ✓
+    CKEY, // COMBINING  ⃣
+    CUI,  // ⚠
+    ECKS, // ✖
+    EFF,  // ſ
     HAS,  // ☭
+    HUN,  // 💯
     IBNG, // ‽
     IRNY, // ⸮
+    LALL, // ∀
+    LELM, // ∈
+    LEXI, // ∃
+    LPRO, // ⊢
     M4,   // ♩
     M8,   // ♪
     M8B,  // ♫
     M16,  // ♬
+    NEG,  // COMBINING  ⃠
+    NOPE, // 🚫
+    NUM,  // №
     OM,   // ॐ
+    SMB,  // ☻
+    SMW,  // ☺
     STB,  // ★
+    STOP, // ⛔
     STW,  // ☆
 };
 #endif
+
+typedef enum combined_modes {
+    CM_NULL = 0,
+    CM_CIRCLE,
+    CM_NO,
+    CM_KEYCAP,
+    CM_ZALGO,
+    CM_MAX
+} combined_mode_t;
+
+combined_mode_t combined_mode;
+
+// random choices
+const char * d6(void);
+const char * dance(bool more);
+const char * flip(bool back);
+const char * joy(bool harder);
+
+// like X and XP
+bool u_x(const char *text);
+bool u_xp(bool is_shifted, const char * shifted, const char *plain);
+
+bool combined_text(uint16_t keycode);
+void cycle_combined_mode(void);
+combined_mode_t set_combined_mode(combined_mode_t mode);
diff --git a/qmk/users/rupa/wrappers.h b/qmk/users/rupa/wrappers.h
new file mode 100644
index 00000000..c5cae464
--- /dev/null
+++ b/qmk/users/rupa/wrappers.h
@@ -0,0 +1,122 @@
+/*
+Copyright 2020 rupa <rupa@lrrr.us> @rupa
+
+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 "rupa.h"
+
+#define LOWER   MO(_LOWER)
+#define RAISE   MO(_RAISE)
+#define OS_RGUI OSM(MOD_RGUI)
+#define OS_RALT OSM(MOD_RALT)
+#define OS_RCTL OSM(MOD_RCTL)
+#define OS_RSFT OSM(MOD_RSFT)
+
+#define G_LWR   LT(_LOWER, KC_G)
+
+#if defined(UNICODEMAP_ENABLE)
+#    define CSHAPES XP(CCIR,CKEY)
+#    define CUIDADO XP(CUI,HAS)
+#    define NOPENAH XP(NOPE,STOP)
+#    define MUSIC_A XP(M4,M8)
+#    define MUSIC_B XP(M8B,M16)
+#    define SMILE   XP(SMB,SMW)
+#    define STARS   XP(STB,STW)
+#    define YEPYEP  XP(CHEK,HUN)
+#endif
+
+/* _QWERTY
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+ * │Es~│ 1 │ 2 │ 3 │ 4 │ 5 │ 6 │ 7 │ 8 │ 9 │ 0 │ - │ = │ Backsp│~ `│
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+ * │ Tab │ Q │ W │ E │ R │ T │ Y │ U │ I │ O │ P │ [ │ ] │  \  │Del│
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+ * │RAISE │ A │ S │ D │ F │ G │ H │ J │ K │ L │ ; │ ' │  Enter │PgU│
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+ * │ Shift  │ Z │ X │ C │ V │ B │ N │ M │ , │ . │ / │ Shift│ ↑ │PgD│
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
+ * │Ctrl│Alt │Gui │        Space           │RAI│LOW│CAP│ ← │ ↓ │ → │
+ * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
+ */
+#define ____65_QWERTY______________ROW1    KC_GESC, 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_GRV
+#define ____65_QWERTY______________ROW2    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
+#define ____65_QWERTY______________ROW3    RAISE,   KC_A,    KC_S,    KC_D,    KC_F,    G_LWR,   KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,          KC_ENT,  KC_PGUP
+#define ____65_QWERTY______________ROW4    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_PGDN
+#define ____65_QWERTY______________ROW5    KC_LCTL, KC_LALT, KC_LGUI,                            KC_SPC,                    RAISE,   LOWER,   KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT
+
+/* _RAISE
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+ * │ ` │ ‽ │ ⸮ │   │ ¢ │   │   │   │★  │   │ ☻ │  ⃠ │CSH│  Del  │Hme│
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+ * │     │   │WAT│ ∃ │Rup│TAD│YUN│   │ ∈ │ ॐ │   │♩ ♪│♫ ♬│     │Ins│
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+ * │      │ ∀ │ ſ │ ⚂ │FRT│   │HUG│JOY│KSS│LOD│   │NO!│ ✓  💯  │End│
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+ * │ RShift │⚠ ☭│ ✖ │CAT│BOW│BUG│ № │MUS│DNC│ ⊢ │SHR│   McL│M↑ │McR│
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
+ * │RCtl│RAlt│RGui│          FLIP          │   │   │   │M← │M↓ │M→ │
+ * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
+ */
+#define ____65_RAISE_______________ROW1    KC_GRV,  X(IBNG), X(IRNY), _______, X(CENT), _______, _______, _______, STARS,   _______, SMILE,   X(NEG),  CSHAPES, KC_DEL,  KC_HOME
+#define ____65_RAISE_______________ROW2    _______, _______, WAT,     X(LEXI), RUPA,    TADA,    YUNO,    _______, X(LELM), X(OM),   _______, MUSIC_A, MUSIC_B, _______, KC_INS
+#define ____65_RAISE_______________ROW3    _______, X(LALL), X(EFF),  DICE,    FART,    _______, HUGS,    JOY,     KISS,    LOD,     _______, NOPENAH,          YEPYEP,  KC_END
+#define ____65_RAISE_______________ROW4    OS_RSFT,          CUIDADO, X(ECKS), CATS,    DOMO,    BUGS,    X(NUM),  MUSIC,   DANCE,   X(LPRO), SHRUG,   KC_BTN1, KC_MS_U, KC_BTN2
+#define ____65_RAISE_______________ROW5    OS_RCTL, OS_RALT, OS_RGUI,                            FLIP,                      _______, _______, _______, KC_MS_L, KC_MS_D, KC_MS_R
+
+/* _LOWER
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+ * │   │   │   │   │   │   │   │   │   │   │   │   │zzz│       │   │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+ * │     │u_f│u_i│u_m│u_n│usi│usn│u_s│   │   │PRT│   │   │     │   │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+ * │      │   │SLK│PAU│   │   │   │   │   │   │   │   │        │   │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+ * │        │ZAL│   │CAP│VSN│   │NLK│   │   │   │   │      │   │   │
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
+ * │    │    │    │                        │   │   │   │ ← │ ↓ │ → │
+ * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
+ */
+#define ____65_LOWER_______________ROW1    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, ZZZZZ,   _______, _______
+#define ____65_LOWER_______________ROW2    _______, U_FRACT, U_ITALI, U_MONOS, U_NORML, U_SANSI, U_SANSN, U_SCRPT, _______, _______, KC_PSCR, _______, _______, _______, _______
+#define ____65_LOWER_______________ROW3    _______, _______, KC_SLCK, KC_PAUS, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______
+#define ____65_LOWER_______________ROW4    _______,          ZALGO  , _______, KC_CAPS, VRSN,    _______, KC_NLCK, _______, _______, _______, _______, _______, _______, _______
+#define ____65_LOWER_______________ROW5    _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______, _______
+
+/* _ADJUST
+ * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───────┬───┐
+ * │   │F1 │F2 │F3 │F4 │F5 │F6 │F7 │F8 │F9 │F10│F11│F12│       │   │
+ * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─────┼───┤
+ * │     │r x│r m│rh+│rh-│rs+│rs-│rv+│rv-│ra+│ra-│   │   │RESET│   │
+ * ├─────┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴┬──┴─────┼───┤
+ * │      │   │   │   │   │   │   │   │   │   │   │   │EEP RSET│   │
+ * ├──────┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴────┬───┼───┤
+ * │        │   │   │   │   │   │   │Mut│V- │V+ │   │U MODE│   │   │
+ * ├────┬───┴┬──┴─┬─┴───┴───┴───┴───┴───┴──┬┴──┬┴──┬┴──┬───┼───┼───┤
+ * │    │    │    │                        │   │   │   │   │   │   │
+ * └────┴────┴────┴────────────────────────┴───┴───┴───┴───┴───┴───┘
+ */
+#define ____65_ADJUST______________ROW1    _______, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______, _______
+#define ____65_ADJUST______________ROW2    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,   _______
+#define ____65_ADJUST______________ROW3    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          EEP_RST, _______
+#define ____65_ADJUST______________ROW4    _______,          _______, _______, _______, _______, _______, _______, KC_MUTE, KC_VOLD, KC_VOLU, _______, UC_MOD,  _______, _______
+#define ____65_ADJUST______________ROW5    _______, _______, _______,                            _______,                   _______, _______, _______, _______, _______, _______
+
+#define ____65_ADJUST__________RGB_ROW2    _______, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, RGB_SPI, RGB_SPD, _______, _______, RESET,   _______
+#define ____65_ADJUST__________RGB_ROW3    _______, RGB_M_P, RGB_M_B, _______, _______, _______, _______, _______, _______, _______, _______, _______,          EEP_RST, _______
+
+#define ____65_ADJUST___________BL_ROW2    _______, BL_TOGG, BL_BRTG, BL_STEP, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET,   _______
+
+// clang-format on
diff --git a/qmk/users/stanrc85/config.h b/qmk/users/stanrc85/config.h
index 71b915e4..ae0a66ae 100644
--- a/qmk/users/stanrc85/config.h
+++ b/qmk/users/stanrc85/config.h
@@ -7,3 +7,9 @@
   #define RGBLIGHT_LAYERS
   #define RGBLIGHT_SLEEP
 #endif
+
+#ifdef KEYBOARD_sneakbox_aliceclone
+  #define INDICATOR_PIN_0 D7
+  #define INDICATOR_PIN_1 D6
+  #define INDICATOR_PIN_2 D4 
+#endif
diff --git a/qmk/users/stanrc85/indicator_layers_sneakbox.c b/qmk/users/stanrc85/indicator_layers_sneakbox.c
new file mode 100644
index 00000000..8aa1a41e
--- /dev/null
+++ b/qmk/users/stanrc85/indicator_layers_sneakbox.c
@@ -0,0 +1,28 @@
+ /* Copyright 2020 Stanrc85 
+  * 
+  * 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 "stanrc85.h"
+
+layer_state_t layer_state_set_user(layer_state_t state) {
+    writePin(INDICATOR_PIN_2, layer_state_cmp(state, _FN2_60) || layer_state_cmp(state, _DEFAULT));
+    writePin(INDICATOR_PIN_1, layer_state_cmp(state, _FN1_60) || layer_state_cmp(state, _DEFAULT));    
+    return state;
+}
+
+bool led_update_user(led_t led_state) {
+    writePin(INDICATOR_PIN_0, led_state.caps_lock);
+    return false;
+}
\ No newline at end of file
diff --git a/qmk/users/stanrc85/rules.mk b/qmk/users/stanrc85/rules.mk
index 54f0f762..fc2560d3 100644
--- a/qmk/users/stanrc85/rules.mk
+++ b/qmk/users/stanrc85/rules.mk
@@ -18,6 +18,14 @@ ifeq ($(strip $(KEYBOARD)), projectkb/alice/rev2)
   LTO_ENABLE = no
   VELOCIKEY_ENABLE=yes
 endif
+ifeq ($(strip $(KEYBOARD)), sneakbox/aliceclone)
+  SRC += indicator_layers_sneakbox.c
+  #SRC += startup_fanfare.c
+  OPT_DEFS += -DHAS_INDICATORS
+  OPT_DEFS += -DHAS_ROTARY
+  VIA_ENABLE = yes
+  LTO_ENABLE = no
+endif
 ifeq ($(strip $(KEYBOARD)), tkc/osav2)
   SRC += rgblight_layers_osa.c
   VIA_ENABLE = yes
diff --git a/qmk/users/stanrc85/stanrc85.c b/qmk/users/stanrc85/stanrc85.c
index 2dbd4197..8bc52b0f 100644
--- a/qmk/users/stanrc85/stanrc85.c
+++ b/qmk/users/stanrc85/stanrc85.c
@@ -44,6 +44,18 @@ void ctl_copy_reset (qk_tap_dance_state_t *state, void *user_data) {
   }
 }
 
+#if defined(HAS_ROTARY)
+  void encoder_update_user(uint8_t index, bool clockwise) {
+    if (index == 0) { /* First encoder */
+        if (clockwise) {
+            tap_code(KC_VOLD);
+        } else {
+            tap_code(KC_VOLU);
+        }
+    }
+  }
+#endif
+
 #if defined(HAS_INDICATORS)
   static uint8_t led_user = 0;
 #endif
@@ -55,6 +67,9 @@ void lock_unlock (qk_tap_dance_state_t *state, void *user_data) {
     tap_code16(KC_CAD);
     #if defined(HAS_INDICATORS)
       led_user = 0;
+      #if defined(KEYBOARD_sneakbox_aliceclone)
+        led_user = 1;
+      #endif
       writePin(INDICATOR_PIN_0, !led_user);
       wait_ms(200);
       writePin(INDICATOR_PIN_1, !led_user);
@@ -68,6 +83,9 @@ void lock_unlock (qk_tap_dance_state_t *state, void *user_data) {
     tap_code16(KC_LOCK);
     #if defined(HAS_INDICATORS)
       led_user = 1;
+      #if defined(KEYBOARD_sneakbox_aliceclone)
+        led_user = 0;
+      #endif
       writePin(INDICATOR_PIN_2, !led_user);
       wait_ms(200);
       writePin(INDICATOR_PIN_1, !led_user);
diff --git a/qmk/users/talljoe/config.h b/qmk/users/talljoe/config.h
index 33374014..8a5fd50c 100644
--- a/qmk/users/talljoe/config.h
+++ b/qmk/users/talljoe/config.h
@@ -1,5 +1,19 @@
-#ifndef USERSPACE_CONFIG_H
-#define USERSPACE_CONFIG_H
+/* Copyright 2020 Joseph Wasson
+ *
+ * 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
 
 #define PERMISSIVE_HOLD
 
@@ -9,4 +23,5 @@
 #define BOOTMAGIC_KEY_SKIP KC_I
 #define BOOTMAGIC_KEY_EEPROM_CLEAR KC_E
 
-#endif // !USERSPACE_CONFIG_H
+#define COMBO_COUNT 2
+#define COMBO_TERM 250
diff --git a/qmk/users/talljoe/macros.c b/qmk/users/talljoe/macros.c
new file mode 100644
index 00000000..db8d28d4
--- /dev/null
+++ b/qmk/users/talljoe/macros.c
@@ -0,0 +1,40 @@
+/* Copyright 2020 Joseph Wasson
+ *
+ * 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 "talljoe.h"
+
+extern keymap_config_t keymap_config;
+
+ostype_t get_os() {
+  if(keymap_config.swap_lalt_lgui) {
+    return MACOSX;
+  }
+
+  return WINDOWS;
+}
+
+#define IS_OSX() (get_os() == MACOSX)
+
+#define MOD_SEND(KEY) (IS_OSX() ? SEND_STRING(SS_LCMD(KEY)) : SEND_STRING(SS_LCTRL(KEY)))
+
+void macro_copy() { MOD_SEND("c"); }
+void macro_paste() { MOD_SEND("v"); }
+void macro_lock() {
+  if (IS_OSX()) {
+    SEND_STRING(SS_LCTRL(SS_LCMD("q")));
+  } else {
+    SEND_STRING(SS_LGUI("l"));
+  }
+}
diff --git a/qmk/users/talljoe/macros.h b/qmk/users/talljoe/macros.h
new file mode 100644
index 00000000..832d4403
--- /dev/null
+++ b/qmk/users/talljoe/macros.h
@@ -0,0 +1,27 @@
+/* Copyright 2020 Joseph Wasson
+ *
+ * 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/>.
+ */
+
+typedef enum OSTYPE {
+  WINDOWS,
+  MACOSX,
+  LINUX
+} ostype_t;
+
+ostype_t get_os(void);
+
+void macro_copy(void);
+void macro_paste(void);
+void macro_lock(void);
diff --git a/qmk/users/talljoe/rules.mk b/qmk/users/talljoe/rules.mk
index e0a71561..42ffb411 100644
--- a/qmk/users/talljoe/rules.mk
+++ b/qmk/users/talljoe/rules.mk
@@ -1,4 +1,11 @@
-SRC += talljoe.c tapdance.c
+SRC += talljoe.c macros.c $(wildcard users/talljoe/tapdance/*.c)
+ifeq ($(strip $(VISUALIZER_ENABLE)), yes)
+  SRC += visualizer.c
+endif
+
+ifeq ($(strip $(FLASH_BOOTLOADER)), yes)
+    OPT_DEFS += -DFLASH_BOOTLOADER
+endif
 
 EXTRAFLAGS+=-flto
 
diff --git a/qmk/users/talljoe/talljoe.c b/qmk/users/talljoe/talljoe.c
index a533ff61..517f712e 100644
--- a/qmk/users/talljoe/talljoe.c
+++ b/qmk/users/talljoe/talljoe.c
@@ -1,3 +1,18 @@
+/* Copyright 2020 Joseph Wasson
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
 #include QMK_KEYBOARD_H
 
 #include "talljoe.h"
@@ -5,14 +20,31 @@
 #include "../../../keyboards/wilba_tech/wt_rgb_backlight.h"
 #endif
 
+#ifdef VISUALIZER_ENABLE
+const char layer_names[32][16] = {
+  [_BASE] = "QWERTY",
+  [_WORKMAN] = "Workman",
+  [_NORMAN] = "Norman",
+  [_DVORAK] = "Dvorak",
+  [_COLMAK] = "Colmak",
+  [_MALTROFF] = "Maltroff",
+  [_NORTRON] = "Nortron",
+  [_GAME] = "Game",
+  [_NAV] = "Navigation",
+  [_NUM] = "Numpad",
+  [_ADJUST] = "Adjust",
+  [_RESET] = "Reset",
+};
+#endif
+
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = TEMPLATE_TKL(
-      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, MO_ADJ ,
+      US_LOCK, 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, MO_ADJ ,
       US_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 , US_BSLS, KC_INS , KC_HOME, KC_PGUP,
       US_TAB , KC_Q,    KC_W,    KC_E,    KC_R,    KC_T   , KC_Y,    KC_U,    KC_I,    KC_O,    KC_P   , KC_LBRC, KC_RBRC, KC_BSPC, KC_DEL , KC_END , KC_PGDN,
       CTL_ESC, KC_A,    KC_S,    KC_D,    KC_F,    KC_G   , KC_H,    KC_J,    KC_K,    KC_L,    US_SCLN, KC_QUOT,          US_ENT ,
       SH_LBRC, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B   , KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH,                   SH_RBRC,          KC_UP  ,
-      KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC2, KC_SPC1, KC_SPC3,                   KC_RALT, KC_RGUI, KC_RCTL, KC_PTT , KC_LEFT, KC_DOWN, KC_RGHT),
+      KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC2, KC_SPC3, KC_SPC1,                   KC_RALT, KC_RGUI, KC_RCTL, KC_PTT , KC_LEFT, KC_DOWN, KC_RGHT),
   [_WORKMAN] = TEMPLATE(
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
       _______, KC_Q   , KC_D   , KC_R   , KC_W   , KC_B   , KC_J   , KC_F   , KC_U   , KC_P   , US_SCLN, _______, _______, _______,
@@ -42,9 +74,16 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_MALTROFF] = TEMPLATE(
       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
       _______, KC_Q,    KC_P,    KC_Y,    KC_G,    KC_B   , KC_J,    KC_M,    KC_U,    KC_K,    KC_L,    _______, _______, _______,
-      _______, KC_A,    KC_N,    KC_I,    KC_S,    KC_F   , KC_D,    KC_T,    KC_H,    KC_O,    KC_R   , US_ENT ,          KC_BSPC,
-      _______, KC_Z,    KC_X,    KC_C,    KC_V,    US_QUOT, KC_SCLN, KC_W,    KC_COMM, KC_DOT,  KC_SLSH,          _______, _______,
+      _______, KC_A,    KC_N,    KC_I,    KC_S,    KC_F   , KC_D,    KC_T,    KC_H,    KC_O,    KC_R   , _______,          _______,
+      _______, KC_Z,    KC_X,    KC_C,    KC_V,    KC_SCLN, KC_BSPC, KC_W,    KC_COMM, KC_DOT,  KC_SLSH,          _______, _______,
       _______, _______, _______,                   MLT_E  , _______, _______,                   _______, _______, _______, _______),
+  // It's Norman but like Maltron
+  [_NORTRON] = TEMPLATE(
+      _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+      _______, KC_Q   , KC_W   , KC_D   , KC_F   , KC_K   , KC_J   , KC_U   , KC_BSPC, KC_L   , US_SCLN, _______, _______, _______,
+      _______, KC_A   , KC_S   , KC_I   , KC_T   , KC_G   , KC_Y   , KC_N   , KC_R   , KC_O   , KC_H   , _______,          _______,
+      _______, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   , KC_P   , KC_M   , KC_COMM, KC_DOT , KC_SLSH,          _______, _______,
+      _______, _______, _______,                   MLT_E  , US_ENT , _______,                   _______, _______, _______, _______),
 #endif
 #ifdef ENABLE_GAME_LAYER
   [_GAME] = TEMPLATE(
@@ -57,27 +96,33 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_NAV] = TEMPLATE_NAV(
       KC_GRV , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_F9  , KC_F10 , KC_F11 , KC_F12 , XXXXXXX, XXXXXXX,
       US_TAB , KC_EXLM, KC_AT  , KC_HASH, KC_DLR , KC_PERC, KC_INS , KC_PGUP, KC_UP  , KC_PGDN, KC_BTN1, KC_BTN3, KC_BTN2, KC_DEL ,
-      CTL_ESC, KC_LCBR, KC_RCBR, KC_LPRN, KC_RPRN, KC_AMPR, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END , US_QUOT,          TG_ADJ ,
+      CTL_ESC, KC_LCBR, KC_RCBR, KC_LPRN, KC_RPRN, KC_AMPR, KC_HOME, KC_LEFT, KC_DOWN, KC_RGHT, KC_END , KC_BSPC,          TG_ADJ ,
       KC_LSFT, KC_EQL,  KC_PLUS, KC_MINS, KC_UNDS, KC_ASTR, KC_CALC, US_GRV , KC_WBAK, KC_WFWD, KC_WREF,          KC_RSFT, KC_APP ,
-      KC_LCTL, KC_LGUI, KC_LALT,                   NV_SPC2, NV_SPC1, NV_SPC3,                   KC_RALT, KC_RGUI, KC_RCTL, KC_PTT ),
+      KC_LCTL, KC_LGUI, KC_LALT,                   NV_SPC2, NV_SPC3, NV_SPC1,                   KC_RALT, KC_RGUI, KC_RCTL, KC_PTT ),
   [_NUM] = TEMPLATE_NUM(
       XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,
       KC_GRV , KC_F1  , KC_F2  , KC_F3  , KC_F4  , KC_VOLU, KC_CIRC, KC_7,    KC_8,    KC_9,    KC_PMNS, XXXXXXX, XXXXXXX, KC_DEL ,
-      CTL_ESC, KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_MUTE, KC_PENT, KC_4,    KC_5,    KC_6,    KC_PPLS, XXXXXXX,          KC_ENT ,
+      CTL_ESC, KC_F5  , KC_F6  , KC_F7  , KC_F8  , KC_MUTE, KC_PENT, KC_4,    KC_5,    KC_6,    KC_PPLS, KC_BSPC,          KC_ENT ,
       KC_LSFT, KC_F9  , KC_F10 , KC_F11 , KC_F12 , KC_VOLD, KC_PIPE, KC_1,    KC_2,    KC_3,    KC_PAST,          KC_PSLS, TG_NUM ,
-      KC_LCTL, KC_LGUI, KC_LALT,                   NM_SPC2, NM_SPC1, NM_SPC3,                   KC_PDOT, KC_PCMM, KC_RCTL, KC_PTT ),
+      KC_LCTL, KC_LGUI, KC_LALT,                   NM_SPC2, NM_SPC3, NM_SPC1,                   KC_PDOT, KC_PCMM, KC_RCTL, KC_PTT ),
  // Adjust layer is on the split-shift key; or NAV+Enter (for non-split keyboards)
   [_ADJUST] = TEMPLATE_ADJUST(
       MO_RST , FX(1)  , FX(2)  , FX(3)  , FX(4)  , FX(5)  , FX(6)  , FX(7)  , FX(8) ,  FX(9) ,  FX(10) , BR_DEC , BR_INC , XXXXXXX, MO_RST ,
       MO_RST , H1_INC , S1_INC , H2_INC , S2_INC , EF_INC , RGB_HUI, RGB_SAI, RGB_MOD, RGB_M_P, DFAULTS, RGB_VAD, RGB_VAI, MO_RST ,
       XXXXXXX, H1_DEC , S1_DEC , H2_DEC , S2_DEC , EF_DEC , RGB_HUD, RGB_SAD, RGB_RMOD,RGB_M_K, RGB_M_B, RGB_M_G,          TG_ADJ ,
-      TG_NKRO, LY_QWER, LY_WORK, LY_NRMN, LY_DVRK, LY_CLMK, XXXXXXX, LY_MALT, XXXXXXX, XXXXXXX, KC_MAKE,          KC_CAPS, XXXXXXX,
-      MO_RST , AG_SWAP, AG_NORM,                   XXXXXXX, BL_TOGG, XXXXXXX,                   RGB_TOG, XXXXXXX, XXXXXXX, TG_GAME),
+      TG_NKRO, LY_QWER, LY_WORK, LY_CLMK, LY_DVRK, LY_NTRN, LY_NRMN, LY_MALT, XXXXXXX, XXXXXXX, KC_MAKE,          KC_CAPS, XXXXXXX,
+      MO_RST , AG_SWAP, AG_NORM,                   XXXXXXX, XXXXXXX, BL_TOGG,                   RGB_TOG, XXXXXXX, XXXXXXX, TG_GAME),
   // To Reset hit FN + ` + Esc
   [_RESET] = TEMPLATE_RESET,
 };
 
+__attribute__((weak))
+void matrix_scan_keymap(void) {
+}
+
 void matrix_scan_user(void) {
+  matrix_scan_keymap();
+
   #ifdef KEYBOARD_gh60
     if (IS_LAYER_ON(_GAME)) {
       gh60_wasd_leds_on();
@@ -140,16 +185,21 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   switch (keycode) {
     case KC_MAKE:  // Compiles the firmware, and adds the flash command based on keyboard bootloader
       if (!record->event.pressed) {
-        SEND_STRING("make " QMK_KEYBOARD ":" QMK_KEYMAP
-
-  #if   defined(BOOTLOADER_HALFKAY)
-                    ":teensy"
-  #elif defined(BOOTLOADER_CATERINA)
-                    ":avrdude"
-  #else
-                    ":dfu"
-  #endif
-                    SS_TAP(X_ENTER));
+          uint8_t temp_mod = get_mods();
+          uint8_t temp_osm = get_oneshot_mods();
+          clear_mods(); clear_oneshot_mods();
+          SEND_STRING("make " QMK_KEYBOARD ":" QMK_KEYMAP);
+#ifndef FLASH_BOOTLOADER
+          if ((temp_mod | temp_osm) & MOD_MASK_SHIFT)
+#endif
+          {
+              SEND_STRING(":flash");
+          }
+          if ((temp_mod | temp_osm) & MOD_MASK_CTRL) {
+              SEND_STRING(" -j8 --output-sync");
+          }
+          tap_code(KC_ENT);
+          set_mods(temp_mod);
       }
       return false;
       break;
diff --git a/qmk/users/talljoe/talljoe.h b/qmk/users/talljoe/talljoe.h
index 496a6222..f151bde6 100644
--- a/qmk/users/talljoe/talljoe.h
+++ b/qmk/users/talljoe/talljoe.h
@@ -1,7 +1,24 @@
-#ifndef USERSPACE
-#define USERSPACE
+/* Copyright 2020 Joseph Wasson
+ *
+ * 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 "quantum.h"
+#pragma once
+
+#include QMK_KEYBOARD_H
+#include "tapdance/tapdance.h"
+#include "macros.h"
 
 enum userspace_custom_keycodes {
   KC_MAKE = SAFE_RANGE, // can always be here
@@ -22,6 +39,7 @@ enum layers {
     _DVORAK,
     _COLMAK,
     _MALTROFF,
+    _NORTRON,
     _GAME,
     _NAV,
     _NUM,
@@ -29,14 +47,12 @@ enum layers {
     _RESET = RESET_LAYER,
 };
 
-enum tap_dancers {
-  TD_SEMICOLON,
-  TD_GRAVE,
-  TD_QUOTE,
-};
+#ifdef VISUALIZER_ENABLE
+  extern const char layer_names[][16];
+#endif
 
 #define MO_NAV    MO(_NAV)
-#define MO_ADJ    MO(_ADJUST)
+#define MO_ADJ    TD(TD_FUNCTION)
 #define MO_RST    MO(_RESET)
 #define TG_ADJ    TG(_ADJUST)
 #define TG_NUM    TG(_NUM)
@@ -52,8 +68,10 @@ enum tap_dancers {
 #define LY_CLMK   DF(_COLMAK)
 #if SPACE_COUNT >= 2
   #define LY_MALT DF(_MALTROFF)
+  #define LY_NTRN DF(_NORTRON)
 #else
   #define LY_MALT KC_NO
+  #define LY_NTRN KC_NO
 #endif
 #define TG_NKRO   MAGIC_TOGGLE_NKRO
 #define KC_PTT    KC_F24
@@ -66,60 +84,28 @@ enum tap_dancers {
 #define US_BSLS   LCA_T(KC_BSLS)
 #define US_SCLN   TD(TD_SEMICOLON)
 #define US_GRV    TD(TD_GRAVE)
-#define US_QUOT   TD(TD_QUOTE)
 #define US_TAB    C_S_T(KC_TAB)
 #define SH_LBRC   LSFT_T(KC_LBRC)
 #define SH_RBRC   RSFT_T(KC_RBRC)
+#define US_LOCK   TD(TD_LOCK)
 
 #define MLT_E     LT(_NUM, KC_E)
 
-#ifndef SPACE_COUNT
-  #define SPACE_COUNT 1
+#ifndef SWAP_HANDS_ENABLE
+#define SH_T
 #endif
-#if (SPACE_COUNT == 1)
-  #define KC_SPC1   LT(_NAV, KC_SPC)
-  #define KC_SPC2   XXXXXXX
-  #define KC_SPC3   XXXXXXX
 
-  #define NV_SPC1   _______
-  #define NV_SPC2   _______
-  #define NV_SPC3   _______
+#define KC_SPC1   LT(_NAV,KC_SPC)
+#define KC_SPC2   LT(_NUM,KC_ENT)
+#define KC_SPC3   SH_T(KC_BSPC)
 
-  #define NM_SPC1   _______
-  #define NM_SPC2   _______
-  #define NM_SPC3   _______
-#elif (SPACE_COUNT == 2)
-  #define KC_SPC1   LT(_NAV,KC_SPC)
-  #define KC_SPC2   LT(_NUM,KC_ENT)
+#define NV_SPC1   KC_SPC
+#define NV_SPC2   KC_ENT
+#define NV_SPC3   KC_SPC
 
-  #define NV_SPC1   KC_SPC
-  #define NV_SPC2   KC_ENT
-
-  #define NM_SPC1   KC_0
-  #define NM_SPC2   KC_SPC
-
-  #define KC_SPC3   XXXXXXX
-  #define NV_SPC3   XXXXXXX
-  #define NM_SPC3   XXXXXXX
-#elif (SPACE_COUNT == 3)
-  #ifdef SWAP_HANDS_ENABLE
-    #define KC_SPC1 SH_T(KC_BSPC)
-  #else
-    #define KC_SPC1 KC_BSPC
-  #endif
-  #define KC_SPC2   LT(_NUM,KC_ENT)
-  #define KC_SPC3   LT(_NAV,KC_SPC)
-
-  #define NV_SPC1   KC_SPC
-  #define NV_SPC2   KC_ENT
-  #define NV_SPC3   KC_SPC
-
-  #define NM_SPC1   KC_SPC
-  #define NM_SPC2   XXXXXXX
-  #define NM_SPC3   KC_0
-#else
-  #error "Unsupported space count:" SPACE_COUNT
-#endif
+#define NM_SPC1   KC_0
+#define NM_SPC2   XXXXXXX
+#define NM_SPC3   KC_SPC
 
 #ifndef ZEAL_RGB
   #define BR_INC KC_NO
@@ -195,5 +181,3 @@ enum tap_dancers {
       XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX,          XXXXXXX, XXXXXXX,           \
       RESET  , XXXXXXX, XXXXXXX,                   XXXXXXX, RESET  , XXXXXXX,                   XXXXXXX, XXXXXXX, XXXXXXX, XXXXXXX)
 #endif
-
-#endif
diff --git a/qmk/users/talljoe/tapdance/actions/td.function.c b/qmk/users/talljoe/tapdance/actions/td.function.c
new file mode 100644
index 00000000..fffbf283
--- /dev/null
+++ b/qmk/users/talljoe/tapdance/actions/td.function.c
@@ -0,0 +1,35 @@
+/* Copyright 2020 Joseph Wasson
+ *
+ * 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/>.
+ */
+
+static struct {
+  int state;
+} function_state = {0};
+
+// Send semi-colon + enter on two taps
+void tap_dance_function_finished(qk_tap_dance_state_t *state, void *user_data) {
+  function_state.state = hold_cur_dance(state);
+  switch (function_state.state) {
+    case SINGLE_HOLD: layer_on(_ADJUST); break;
+  }
+}
+
+void tap_dance_function_reset(qk_tap_dance_state_t *state, void *user_data) {
+  switch (function_state.state) {
+    case SPECIAL: reset_keyboard(); break;
+    case SINGLE_HOLD: layer_off(_ADJUST); break;
+  }
+  function_state.state = 0;
+}
diff --git a/qmk/users/talljoe/tapdance/actions/td.grave.c b/qmk/users/talljoe/tapdance/actions/td.grave.c
new file mode 100644
index 00000000..509b66dc
--- /dev/null
+++ b/qmk/users/talljoe/tapdance/actions/td.grave.c
@@ -0,0 +1,36 @@
+/* Copyright 2020 Joseph Wasson
+ *
+ * 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/>.
+ */
+
+// Send `. ~. ```
+void tap_dance_grave_finished(qk_tap_dance_state_t *state, void *user_data) {
+  switch(state->count) {
+    case 1:
+      SEND_STRING("`");
+      break;
+    case 2:
+      SEND_STRING("~");
+      break;
+  }
+}
+
+void tap_dance_grave_each(qk_tap_dance_state_t *state, void *user_data) {
+  if(state->count == 3) {
+    SEND_STRING("```");
+  } else if (state->count > 3) {
+    SEND_STRING("`");
+  }
+}
+
diff --git a/qmk/users/talljoe/tapdance/actions/td.lock.c b/qmk/users/talljoe/tapdance/actions/td.lock.c
new file mode 100644
index 00000000..4422d9e2
--- /dev/null
+++ b/qmk/users/talljoe/tapdance/actions/td.lock.c
@@ -0,0 +1,35 @@
+/* Copyright 2020 Joseph Wasson
+ *
+ * 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/>.
+ */
+
+static struct {
+  int state;
+} lock_state = {0};
+
+// Send semi-colon + enter on two taps
+void tap_dance_lock_finished(qk_tap_dance_state_t *state, void *user_data) {
+  lock_state.state = cur_dance(state);
+  switch (lock_state.state) {
+    case SINGLE_TAP: register_code(KC_ESC); break;
+    case SINGLE_HOLD: macro_lock(); break;
+  }
+}
+
+void tap_dance_lock_reset(qk_tap_dance_state_t *state, void *user_data) {
+  switch (lock_state.state) {
+    case SINGLE_TAP: unregister_code(KC_ESC); break;
+  }
+  lock_state.state = 0;
+}
diff --git a/qmk/users/talljoe/tapdance/actions/td.semicolon.c b/qmk/users/talljoe/tapdance/actions/td.semicolon.c
new file mode 100644
index 00000000..45776492
--- /dev/null
+++ b/qmk/users/talljoe/tapdance/actions/td.semicolon.c
@@ -0,0 +1,54 @@
+/* Copyright 2020 Joseph Wasson
+ *
+ * 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/>.
+ */
+
+static struct {
+  int semicolon;
+  bool mods;
+} tap_state = {0};
+
+void tap_dance_semicolon_each(qk_tap_dance_state_t *state, void *user_data) {
+    tap_state.mods |= get_mods();
+}
+
+// Send semi-colon + enter on two taps
+void tap_dance_semicolon_finished(qk_tap_dance_state_t *state, void *user_data) {
+  tap_state.semicolon = hold_cur_dance(state);
+  switch (tap_state.semicolon) {
+    case SINGLE_TAP: case DOUBLE_HOLD: register_code(KC_SCLN); break;
+    case SINGLE_HOLD: layer_on(_NUM); break;
+  }
+}
+
+void tap_dance_semicolon_reset(qk_tap_dance_state_t *state, void *user_data) {
+  switch (tap_state.semicolon) {
+    case SINGLE_TAP: case DOUBLE_HOLD: unregister_code(KC_SCLN); break;
+    case DOUBLE_TAP: {
+      if (tap_state.mods) {
+        SEND_STRING(";;"); // send normal when mods are pressed
+      }
+      else {
+        SEND_STRING(";\n");
+      }
+      break;
+    }
+    case TRIPLE_TAP: {
+      SEND_STRING(";\n\n");
+    }
+    case SPECIAL: layer_invert(_NUM); break;
+    case SINGLE_HOLD: layer_off(_NUM); break;
+  }
+  tap_state.semicolon = 0;
+}
diff --git a/qmk/users/talljoe/tapdance/tapdance.h b/qmk/users/talljoe/tapdance/tapdance.h
new file mode 100644
index 00000000..532e978c
--- /dev/null
+++ b/qmk/users/talljoe/tapdance/tapdance.h
@@ -0,0 +1,26 @@
+/* Copyright 2020 Joseph Wasson
+ *
+ * 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 "quantum.h"
+#include "td_setup.h"
+
+enum tap_dancers {
+  TD_SEMICOLON,
+  TD_GRAVE,
+  TD_LOCK,
+  TD_FUNCTION,
+};
+
diff --git a/qmk/users/talljoe/tapdance/tapdance_actions.c b/qmk/users/talljoe/tapdance/tapdance_actions.c
new file mode 100644
index 00000000..59a34b7b
--- /dev/null
+++ b/qmk/users/talljoe/tapdance/tapdance_actions.c
@@ -0,0 +1,28 @@
+/* Copyright 2020 Joseph Wasson
+ *
+ * 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 "../talljoe.h"
+#include "actions/td.grave.c"
+#include "actions/td.lock.c"
+#include "actions/td.semicolon.c"
+#include "actions/td.function.c"
+
+qk_tap_dance_action_t tap_dance_actions[] = {
+  [TD_SEMICOLON] = ACTION_TAP_DANCE_FN_ADVANCED(tap_dance_semicolon_each, tap_dance_semicolon_finished, tap_dance_semicolon_reset),
+  [TD_LOCK]      = ACTION_TAP_DANCE_FN_ADVANCED(NULL, tap_dance_lock_finished, tap_dance_lock_reset),
+  [TD_GRAVE]     = ACTION_TAP_DANCE_FN_ADVANCED(tap_dance_grave_each, tap_dance_grave_finished, NULL),
+  [TD_FUNCTION]  = ACTION_TAP_DANCE_FN_ADVANCED(NULL, tap_dance_function_finished, tap_dance_function_reset),
+};
diff --git a/qmk/users/talljoe/tapdance/td_setup.c b/qmk/users/talljoe/tapdance/td_setup.c
new file mode 100644
index 00000000..d8464144
--- /dev/null
+++ b/qmk/users/talljoe/tapdance/td_setup.c
@@ -0,0 +1,70 @@
+/* Copyright 2020 Joseph Wasson
+ *
+ * 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 "tapdance.h"
+
+int cur_dance (qk_tap_dance_state_t *state) {
+  if (state->count == 1) {
+    //If count = 1, and it has been interrupted - it doesn't matter if it is pressed or not: Send SINGLE_TAP
+    if (state->interrupted) {
+      //     if (!state->pressed) return SINGLE_TAP;
+      //need "permissive hold" here.
+      //     else return SINGLE_HOLD;
+      //If the interrupting key is released before the tap-dance key, then it is a single HOLD
+      //However, if the tap-dance key is released first, then it is a single TAP
+      //But how to get access to the state of the interrupting key????
+      return SINGLE_TAP;
+    }
+    else {
+      if (!state->pressed) return SINGLE_TAP;
+      else return SINGLE_HOLD;
+    }
+  }
+  //If count = 2, and it has been interrupted - assume that user is trying to type the letter associated
+  //with single tap.
+  else if (state->count == 2) {
+    if (state->interrupted) return DOUBLE_SINGLE_TAP;
+    else if (state->pressed) return DOUBLE_HOLD;
+    else return DOUBLE_TAP;
+  }
+  else if ((state->count == 3) && ((state->interrupted) || (!state->pressed))) return TRIPLE_TAP;
+  else if (state->count == 3) return TRIPLE_HOLD;
+  else return SPECIAL;
+}
+
+int hold_cur_dance (qk_tap_dance_state_t *state) {
+  if (state->count == 1) {
+    if (state->interrupted) {
+      if (!state->pressed) return SINGLE_TAP;
+      else return SINGLE_HOLD;
+    }
+    else {
+      if (!state->pressed) return SINGLE_TAP;
+      else return SINGLE_HOLD;
+    }
+  }
+  //If count = 2, and it has been interrupted - assume that user is trying to type the letter associated
+  //with single tap.
+  else if (state->count == 2) {
+    if (state->pressed) return DOUBLE_HOLD;
+    else return DOUBLE_TAP;
+  }
+  else if (state->count == 3) {
+    if (!state->pressed) return TRIPLE_TAP;
+    else return TRIPLE_HOLD;
+  }
+  else return SPECIAL;
+}
diff --git a/qmk/users/talljoe/tapdance/td_setup.h b/qmk/users/talljoe/tapdance/td_setup.h
new file mode 100644
index 00000000..85d45d94
--- /dev/null
+++ b/qmk/users/talljoe/tapdance/td_setup.h
@@ -0,0 +1,29 @@
+/* Copyright 2020 Joseph Wasson
+ *
+ * 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/>.
+ */
+
+enum {
+  SINGLE_TAP = 1,
+  SINGLE_HOLD = 2,
+  DOUBLE_TAP = 3,
+  DOUBLE_HOLD = 4,
+  DOUBLE_SINGLE_TAP = 5, //send two single taps
+  TRIPLE_TAP = 6,
+  TRIPLE_HOLD = 7,
+  SPECIAL = 8
+};
+
+int cur_dance (qk_tap_dance_state_t *state);
+int hold_cur_dance (qk_tap_dance_state_t *state);
diff --git a/qmk/users/talljoe/visualizer.c b/qmk/users/talljoe/visualizer.c
new file mode 100644
index 00000000..c17b5670
--- /dev/null
+++ b/qmk/users/talljoe/visualizer.c
@@ -0,0 +1,21 @@
+/* Copyright 2020 Joseph Wasson
+ *
+ * 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 "talljoe.h"
+
+static void get_visualizer_layer_and_color(visualizer_state_t* state) {
+  state->status_text = layer_names[biton32(state->status.layer)];
+}
diff --git a/qmk/users/tominabox1/rules.mk b/qmk/users/tominabox1/rules.mk
index b70b128c..22b6a858 100644
--- a/qmk/users/tominabox1/rules.mk
+++ b/qmk/users/tominabox1/rules.mk
@@ -8,7 +8,7 @@ NKRO_ENABLE = yes
 BOOTMAGIC_ENABLE = full      # Virtual DIP switch configuration
 
 ifeq ($(strip $(KEYBOARD)), crkbd/rev1)
-RGB_MATRIX_ENABLE = WS2812
+RGB_MATRIX_ENABLE = yes
 EXTRAFLAGS += -flto
 BOOTLOADER = qmk-dfu
 OLED_DRIVER_ENABLE = yes
@@ -19,7 +19,6 @@ MOUSEKEY_ENABLE = no        # Mouse keys
 EXTRAKEY_ENABLE = yes        # Audio control and System control
 BACKLIGHT_ENABLE = yes       # Enable keyboard backlight functionality on B7 by default
 RGBLIGHT_ENABLE = yes        # Enable keyboard RGB underglow
-# RGB_MATRIX_ENABLE = WS2812
 endif
 
 
diff --git a/qmk/users/yanfali/config.h b/qmk/users/yanfali/config.h
index 2c427f03..26517a9f 100644
--- a/qmk/users/yanfali/config.h
+++ b/qmk/users/yanfali/config.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#ifdef KEYBOARD_maartenwut_plain60
+#ifdef KEYBOARD_evyd13_plain60
 
 #define B7_AUDIO
 #ifdef AUDIO_ENABLE
diff --git a/qmk/users/yanfali/rules.mk b/qmk/users/yanfali/rules.mk
index a7208daa..467adcee 100644
--- a/qmk/users/yanfali/rules.mk
+++ b/qmk/users/yanfali/rules.mk
@@ -1,24 +1,29 @@
-BOOTMAGIC = lite
+BOOTMAGIC_ENABLE = lite
 DYNAMIC_KEYMAP_ENABLE = no
-CONSOLE_ENABLE = yes
-COMMAND_ENABLE = yes
 LTO_ENABLE = yes
 AUDIO_ENABLE = no
 
 # only enable audio on specific boards
-ifeq ($(strip $(KEYBOARD)), maartenwut/plain60)
+ifeq ($(strip $(KEYBOARD)), evyd13/plain60)
     AUDIO_ENABLE = yes
+    CONSOLE_ENABLE = yes
+    COMMAND_ENABLE = yes
 endif
 
 ifeq ($(strip $(KEYBOARD)), clueboard/60)
     AUDIO_ENABLE = yes
+    CONSOLE_ENABLE = yes
+    COMMAND_ENABLE = yes
 endif
 
 ifeq ($(strip $(KEYBOARD)), hadron/ver3)
     AUDIO_ENABLE = yes
+    CONSOLE_ENABLE = yes
+    COMMAND_ENABLE = yes
 endif
 
 ifeq ($(strip $(KEYBOARD)), fruity60)
+    CONSOLE_ENABLE = yes
     COMMAND_ENABLE = no
 endif
 
@@ -28,4 +33,6 @@ endif
 
 ifeq ($(strip $(KEYBOARD)), ai03/polaris)
     RGBLIGHT_ENABLE = no
+    CONSOLE_ENABLE = yes
+    COMMAND_ENABLE = yes
 endif
diff --git a/qmk/util/install/arch.sh b/qmk/util/install/arch.sh
new file mode 100644
index 00000000..7442e2f1
--- /dev/null
+++ b/qmk/util/install/arch.sh
@@ -0,0 +1,16 @@
+#!/bin/bash
+
+_qmk_install() {
+    echo "Installing dependencies"
+
+    sudo pacman --needed  --noconfirm -S \
+        base-devel clang diffutils gcc git unzip wget zip \
+        python-pip \
+        avr-binutils \
+        arm-none-eabi-binutils arm-none-eabi-gcc arm-none-eabi-newlib \
+        avrdude dfu-programmer dfu-util
+    sudo pacman --needed --noconfirm -U https://archive.archlinux.org/packages/a/avr-gcc/avr-gcc-8.3.0-1-x86_64.pkg.tar.xz
+    sudo pacman --needed --noconfirm -S avr-libc # Must be installed after the above, or it will bring in the latest avr-gcc instead
+
+    python3 -m pip install --user -r $QMK_FIRMWARE_DIR/requirements.txt
+}
diff --git a/qmk/util/install/debian.sh b/qmk/util/install/debian.sh
new file mode 100644
index 00000000..e7180c65
--- /dev/null
+++ b/qmk/util/install/debian.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+DEBIAN_FRONTEND=noninteractive
+DEBCONF_NONINTERACTIVE_SEEN=true
+export DEBIAN_FRONTEND DEBCONF_NONINTERACTIVE_SEEN
+
+_qmk_install_prepare() {
+    sudo apt-get update
+}
+
+_qmk_install() {
+    echo "Installing dependencies"
+
+    sudo apt-get -yq install \
+        build-essential clang-format diffutils gcc git unzip wget zip \
+        python3-pip \
+        binutils-avr gcc-avr avr-libc \
+        binutils-arm-none-eabi gcc-arm-none-eabi libnewlib-arm-none-eabi \
+        avrdude dfu-programmer dfu-util teensy-loader-cli
+
+    python3 -m pip install --user -r $QMK_FIRMWARE_DIR/requirements.txt
+}
diff --git a/qmk/util/install/fedora.sh b/qmk/util/install/fedora.sh
new file mode 100644
index 00000000..250cda66
--- /dev/null
+++ b/qmk/util/install/fedora.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+_qmk_install() {
+    echo "Installing dependencies"
+
+    # TODO: Check whether devel/headers packages are really needed
+    sudo dnf -y install \
+        clang diffutils git gcc glibc-headers kernel-devel kernel-headers make unzip wget zip \
+        python3 \
+        avr-binutils avr-gcc avr-libc \
+        arm-none-eabi-binutils-cs arm-none-eabi-gcc-cs arm-none-eabi-newlib \
+        avrdude dfu-programmer dfu-util
+
+    python3 -m pip install --user -r $QMK_FIRMWARE_DIR/requirements.txt
+}
diff --git a/qmk/util/install/freebsd.sh b/qmk/util/install/freebsd.sh
new file mode 100644
index 00000000..353c52d6
--- /dev/null
+++ b/qmk/util/install/freebsd.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+_qmk_install_prepare() {
+    sudo pkg update
+}
+
+_qmk_install() {
+    echo "Installing dependencies"
+
+    sudo pkg install -y \
+        git wget gmake gcc zip unzip diffutils \
+        python3 \
+        avr-binutils avr-gcc avr-libc \
+        arm-none-eabi-binutils arm-none-eabi-gcc arm-none-eabi-newlib \
+        avrdude dfu-programmer dfu-util
+
+    sudo python3 -m pip install -r $QMK_FIRMWARE_DIR/requirements.txt
+}
diff --git a/qmk/util/install/gentoo.sh b/qmk/util/install/gentoo.sh
new file mode 100644
index 00000000..d4284e9a
--- /dev/null
+++ b/qmk/util/install/gentoo.sh
@@ -0,0 +1,33 @@
+#!/bin/bash
+
+_qmk_install_prepare() {
+    echo "This script will make a USE change in order to ensure that that QMK works on your system."
+    echo "All changes will be sent to the file /etc/portage/package.use/qmkfirmware -- please review it, and read Portage's output carefully before installing any packages on your system."
+    echo "You will also need to ensure that your kernel is compiled with support for the microcontroller that you are using (e.g. enable Arduino for the Pro Micro). Further information can be found on the Gentoo wiki."
+
+    read -p "Proceed? [y/N] " res
+    case $res in
+        [Yy]*)
+            return 0;;
+        *)
+            return 1;;
+    esac
+}
+
+_qmk_install() {
+    echo "Installing dependencies"
+
+    sudo touch /etc/portage/package.use/qmkfirmware
+    # tee is used here since sudo doesn't apply to >>
+    echo "sys-devel/gcc multilib" | sudo tee --append /etc/portage/package.use/qmkfirmware >/dev/null
+    sudo emerge -auN sys-devel/gcc
+    sudo emerge -au --noreplace \
+        app-arch/unzip app-arch/zip net-misc/wget sys-devel/clang sys-devel/crossdev \
+        \>=dev-lang/python-3.6 \
+        dev-embedded/avrdude dev-embedded/dfu-programmer app-mobilephone/dfu-util
+
+    sudo crossdev -s4 --stable --g \<9 --portage --verbose --target avr
+    sudo crossdev -s4 --stable --g \<9 --portage --verbose --target arm-none-eabi
+
+    python3 -m pip install --user -r $QMK_FIRMWARE_DIR/requirements.txt
+}
diff --git a/qmk/util/install/linux_shared.sh b/qmk/util/install/linux_shared.sh
new file mode 100644
index 00000000..cb81e861
--- /dev/null
+++ b/qmk/util/install/linux_shared.sh
@@ -0,0 +1,13 @@
+#!/bin/bash
+
+# For those distros that do not package bootloadHID
+_qmk_install_bootloadhid() {
+    if ! command -v bootloadHID > /dev/null; then
+        wget https://www.obdev.at/downloads/vusb/bootloadHID.2012-12-08.tar.gz -O - | tar -xz -C /tmp
+        pushd /tmp/bootloadHID.2012-12-08/commandline/ > /dev/null
+        if make; then
+            sudo cp bootloadHID /usr/local/bin
+        fi
+        popd > /dev/null
+    fi
+}
diff --git a/qmk/util/install/macos.sh b/qmk/util/install/macos.sh
new file mode 100644
index 00000000..93fda912
--- /dev/null
+++ b/qmk/util/install/macos.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+_qmk_install_prepare() {
+    echo "Checking Homebrew installation"
+
+    if ! brew --version >/dev/null 2>&1; then
+        echo "Error! Homebrew is broken or not installed."
+        echo "Please run \`brew doctor\` or follow the installation instructions at https://brew.sh/, then re-run this script."
+        return 1
+    fi
+
+    brew update && brew upgrade
+}
+
+_qmk_install() {
+    echo "Installing dependencies"
+
+    # All macOS dependencies are managed in the Homebrew package:
+    # https://github.com/qmk/homebrew-qmk
+    brew install qmk/qmk/qmk
+
+    brew link --force avr-gcc@8
+    brew link --force arm-gcc-bin@8
+
+    python3 -m pip install -r $QMK_FIRMWARE_DIR/requirements.txt
+}
diff --git a/qmk/util/install/msys2.sh b/qmk/util/install/msys2.sh
new file mode 100644
index 00000000..c8598a60
--- /dev/null
+++ b/qmk/util/install/msys2.sh
@@ -0,0 +1,36 @@
+#!/bin/bash
+
+_qmk_install_prepare() {
+    pacman -Syu
+}
+
+_qmk_install() {
+    echo "Installing dependencies"
+
+    pacman --needed --noconfirm --disable-download-timeout -S pactoys-git
+    pacboy sync --needed --noconfirm --disable-download-timeout \
+        base-devel: toolchain:x clang:x git: unzip: \
+        python3-pip:x \
+        avr-binutils:x avr-gcc:x avr-libc:x \
+        arm-none-eabi-binutils:x arm-none-eabi-gcc:x arm-none-eabi-newlib:x \
+        avrdude:x bootloadhid:x dfu-programmer:x dfu-util:x teensy-loader-cli:x
+
+    _qmk_install_drivers
+
+    python3 -m pip install -r "$QMK_FIRMWARE_DIR/requirements.txt"
+}
+
+_qmk_install_drivers() {
+    echo "Installing drivers"
+
+    tmpdir=$(mktemp -d)
+    cp "$QMK_FIRMWARE_UTIL_DIR/drivers.txt" $tmpdir
+    pushd $tmpdir > /dev/null
+
+    wget "https://github.com/qmk/qmk_driver_installer/releases/download/v1.01/qmk_driver_installer.exe"
+
+    cmd.exe //c "qmk_driver_installer.exe --all --force drivers.txt"
+
+    popd > /dev/null
+    rm -r $tmpdir
+}
diff --git a/qmk/util/install/opensuse.sh b/qmk/util/install/opensuse.sh
new file mode 100644
index 00000000..47b44ae3
--- /dev/null
+++ b/qmk/util/install/opensuse.sh
@@ -0,0 +1,31 @@
+#!/bin/bash
+
+_qmk_install_prepare() {
+    case $(grep ID /etc/os-release) in
+        *15.1*)
+            REPO_RELEASE=Leap_15.1;;
+        *15.2*)
+            REPO_RELEASE=Leap_15.2;;
+        *)
+            #REPO_RELEASE=Tumbleweed;;
+            echo "ERROR: Tumbleweed is currently not supported."
+            exit 1
+    esac
+
+    sudo zypper addrepo https://download.opensuse.org/repositories/devel:gcc/openSUSE_$REPO_RELEASE/devel:gcc.repo
+    sudo zypper addrepo https://download.opensuse.org/repositories/hardware/openSUSE_$REPO_RELEASE/hardware.repo
+    sudo zypper --gpg-auto-import-keys refresh
+}
+
+_qmk_install() {
+    echo "Installing dependencies"
+
+    sudo zypper install -y \
+        make clang gcc unzip wget zip \
+        python3-pip \
+        cross-avr-binutils cross-avr-gcc8 avr-libc \
+        cross-arm-binutils cross-arm-none-gcc8 cross-arm-none-newlib-devel \
+        avrdude dfu-programmer dfu-util
+
+    python3 -m pip install --user -r $QMK_FIRMWARE_DIR/requirements.txt
+}
diff --git a/qmk/util/install/sabayon.sh b/qmk/util/install/sabayon.sh
new file mode 100644
index 00000000..fd4f4d8d
--- /dev/null
+++ b/qmk/util/install/sabayon.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+_qmk_install() {
+    echo "Installing dependencies"
+
+    sudo equo install \
+        app-arch/unzip app-arch/zip net-misc/wget dev-vcs/git sys-devel/clang sys-devel/gcc sys-devel/crossdev \
+        dev-python/pip \
+        dev-embedded/avrdude dev-embedded/dfu-programmer app-mobilephone/dfu-util
+
+    sudo crossdev -s4 --stable --g \<9 --portage --verbose --target avr
+    sudo crossdev -s4 --stable --g \<9 --portage --verbose --target arm-none-eabi
+
+    python3 -m pip install --user -r $QMK_FIRMWARE_DIR/requirements.txt
+}
diff --git a/qmk/util/install/slackware.sh b/qmk/util/install/slackware.sh
new file mode 100644
index 00000000..d7330315
--- /dev/null
+++ b/qmk/util/install/slackware.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+
+_qmk_install_prepare() {
+    echo "Before you continue, please ensure that your user is added to sudoers and that sboinstall is configured."
+    read -p "Proceed? [y/N] " res
+
+    case $res in
+        [Yy]*)
+            ;;
+        *)
+            return 1;;
+    esac
+}
+
+_qmk_install() {
+    echo "Installing dependencies"
+
+    sudo sboinstall \
+        avr-binutils avr-gcc avr-libc \
+        arm-binutils arm-gcc newlib \
+        python3 \
+        avrdude dfu-programmer dfu-util teensy_loader_cli
+
+    python3 -m pip install --user -r $QMK_FIRMWARE_DIR/requirements.txt
+}
diff --git a/qmk/util/install/solus.sh b/qmk/util/install/solus.sh
new file mode 100644
index 00000000..5633f703
--- /dev/null
+++ b/qmk/util/install/solus.sh
@@ -0,0 +1,19 @@
+#!/bin/bash
+
+_qmk_install_prepare() {
+    sudo eopkg -y update-repo
+    sudo eopkg -y upgrade
+}
+
+_qmk_install() {
+    echo "Installing dependencies"
+
+    sudo eopkg -y install \
+        -c system.devel git wget zip unzip \
+        python3 \
+        avr-binutils avr-gcc avr-libc \
+        arm-none-eabi-binutils arm-none-eabi-gcc arm-none-eabi-newlib \
+        avrdude dfu-programmer dfu-util
+
+    python3 -m pip install --user -r $QMK_FIRMWARE_DIR/requirements.txt
+}
diff --git a/qmk/util/install/void.sh b/qmk/util/install/void.sh
new file mode 100644
index 00000000..9ec7019e
--- /dev/null
+++ b/qmk/util/install/void.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+_qmk_install() {
+    echo "Installing dependencies"
+
+    sudo xbps-install \
+        gcc git make wget unzip zip \
+        python3-pip \
+        avr-binutils avr-gcc avr-libc \
+        cross-arm-none-eabi-binutils cross-arm-none-eabi-gcc cross-arm-none-eabi-newlib \
+        avrdude dfu-programmer dfu-util teensy_loader_cli \
+        libusb-compat-devel
+
+    python3 -m pip install --user -r $QMK_FIRMWARE_DIR/requirements.txt
+}
diff --git a/qmk/util/list_keyboards.sh b/qmk/util/list_keyboards.sh
new file mode 100644
index 00000000..7849cf4d
--- /dev/null
+++ b/qmk/util/list_keyboards.sh
@@ -0,0 +1,10 @@
+#!/bin/sh
+# Temporary shell script to find keyboards
+#
+# This allows us to exclude keyboards by including a .noci file.
+
+find -L keyboards -type f -name rules.mk | grep -v keymaps | while read keyboard; do
+	keyboard=$(echo $keyboard | sed 's!keyboards/\(.*\)/rules.mk!\1!')
+
+	[ "$1" = "noci" -a -e "keyboards/${keyboard}/.noci" ] || echo "$keyboard"
+done
diff --git a/qmk/util/qmk_install.sh b/qmk/util/qmk_install.sh
index 714ee914..5076e980 100644
--- a/qmk/util/qmk_install.sh
+++ b/qmk/util/qmk_install.sh
@@ -1,27 +1,74 @@
-#!/bin/sh
-# Pick the correct install script based on the current OS
+#!/bin/bash
 
-util_dir=$(dirname "$0")
+QMK_FIRMWARE_DIR=$(cd -P -- "$(dirname -- "$0")/.." && pwd -P)
+QMK_FIRMWARE_UTIL_DIR=$QMK_FIRMWARE_DIR/util
 
 case $(uname -a) in
-	*Darwin*)
-		exec "${util_dir}/macos_install.sh"
-	;;
-	*FreeBSD*)
-		exec "${util_dir}/freebsd_install.sh"
-	;;
-	*Linux*)
-		exec "${util_dir}/linux_install.sh"
-	;;
-	MINGW64_NT*)
-		exec "${util_dir}/msys2_install.sh"
-	;;
-	MSYS_NT*|MINGW32_NT*)
-		echo "Please open a MinGW 64-bit terminal window and re-run this script."
-		exit 1
-	;;
-	*)
-		echo "Environment not supported. Please see https://docs.qmk.fm for details on how to configure the QMK Firmware build tools manually."
-		exit 1
-	;;
+    *Darwin*)
+        . "$QMK_FIRMWARE_UTIL_DIR/install/macos.sh";;
+    *FreeBSD*)
+        . "$QMK_FIRMWARE_UTIL_DIR/install/freebsd.sh";;
+    *MINGW64_NT*)
+        . "$QMK_FIRMWARE_UTIL_DIR/install/msys2.sh";;
+    *MSYS_NT*|*MINGW32_NT*)
+        echo "Please open a MinGW64 terminal window and re-run this script."
+        exit 1;;
+    *Linux*)
+        . "$QMK_FIRMWARE_UTIL_DIR/install/linux_shared.sh"
+
+        case $(grep ID /etc/os-release) in
+            *arch*|*manjaro*)
+                . "$QMK_FIRMWARE_UTIL_DIR/install/arch.sh";;
+            *debian*|*ubuntu*)
+                . "$QMK_FIRMWARE_UTIL_DIR/install/debian.sh";;
+            *fedora*)
+                . "$QMK_FIRMWARE_UTIL_DIR/install/fedora.sh";;
+            *gentoo*)
+                . "$QMK_FIRMWARE_UTIL_DIR/install/gentoo.sh";;
+            *opensuse*|*tumbleweed*)
+                . "$QMK_FIRMWARE_UTIL_DIR/install/opensuse.sh";;
+            *sabayon*)
+                . "$QMK_FIRMWARE_UTIL_DIR/install/sabayon.sh";;
+            *slackware*)
+                . "$QMK_FIRMWARE_UTIL_DIR/install/slackware.sh";;
+            *solus*)
+                . "$QMK_FIRMWARE_UTIL_DIR/install/solus.sh";;
+            *void*)
+                . "$QMK_FIRMWARE_UTIL_DIR/install/void.sh";;
+            *)
+                echo "Sorry, we don't recognize your distribution. Help us by contributing support!"
+                echo
+                echo "https://docs.qmk.fm/#/contributing"
+                exit 1;;
+        esac
+
+        if uname -a | grep -qi microsoft; then
+            echo "********************************************************************************"
+            echo "* Detected Windows Subsystem for Linux.                                        *"
+            echo "* Currently, WSL has no access to USB devices and so flashing from within the  *"
+            echo "* WSL terminal will not work.                                                  *"
+            echo "*                                                                              *"
+            echo "* Please install the QMK Toolbox instead:                                      *"
+            echo "*    https://github.com/qmk/qmk_toolbox/releases                               *"
+            echo "* Then, map your WSL filesystem as a network drive:                            *"
+            echo "*    \\\\\\\\wsl$\\<distro>                                                           *"
+            echo "********************************************************************************"
+            echo
+        fi
+        ;;
+    *)
+        echo "Sorry, we don't recognize your environment. Help us by contributing support!"
+        echo
+        echo "https://docs.qmk.fm/#/contributing"
+        exit 1;;
 esac
+
+if type _qmk_install_prepare &>/dev/null; then
+    _qmk_install_prepare || exit 1
+fi
+
+_qmk_install
+
+if type _qmk_install_bootloadhid &>/dev/null; then
+    _qmk_install_bootloadhid
+fi
diff --git a/qmk/util/travis_build.sh b/qmk/util/travis_build.sh
index 6d5dbed6..e7bbe36a 100644
--- a/qmk/util/travis_build.sh
+++ b/qmk/util/travis_build.sh
@@ -2,8 +2,6 @@
 
 source util/travis_utils.sh
 
-NUM_CORE_CHANGES=$(echo "$QMK_CHANGES" | grep -Ecv -e '^(docs/)' -e '^(keyboards/)' -e '^(layouts/)' -e '^(util/)' -e '^(lib/python/)' -e '^(bin/qmk)' -e '^(requirements.txt)' -e '(.travis.yml)')
-
 if [[ "$TRAVIS_COMMIT_MESSAGE" == *"[skip build]"* ]]; then
     echo "Skipping due to commit message"
     exit 0
diff --git a/qmk/util/travis_compiled_push.sh b/qmk/util/travis_compiled_push.sh
index 195a8720..6300442f 100644
--- a/qmk/util/travis_compiled_push.sh
+++ b/qmk/util/travis_compiled_push.sh
@@ -10,37 +10,10 @@ echo "Using git hash ${rev}"
 
 if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" ]] ; then
 
-# fix formatting
 git checkout master
-git diff --diff-filter=AM --name-only -n 1 -z ${TRAVIS_COMMIT_RANGE} | xargs -0 dos2unix
-git diff --diff-filter=AM --name-only -n 1 -z ${TRAVIS_COMMIT_RANGE} '*.c' '*.h' '*.cpp' | grep -z -e '^drivers' -e '^quantum' -e '^tests' -e '^tmk_core' | grep -zv -e 'quantum/template' -e 'tmk_core/protocol/usb_hid' -e 'platforms/chibios' | xargs -0 clang-format-7 -i
-git diff --diff-filter=AM --name-only -n 1 -z ${TRAVIS_COMMIT_RANGE} | xargs -0 git add
-git commit -m "format code according to conventions [skip ci]" && git push git@github.com:qmk/qmk_firmware.git master
-
-increment_version ()
-{
-  declare -a part=( ${1//\./ } )
-  part[2]=$((part[2] + 1))
-  new="${part[*]}"
-  echo -e "${new// /.}"
-}
 
 git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE}
 
-NEFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/)' | grep -Ev '^(docs/)' | grep -Ev '^(users/)' | grep -Ev '^(layouts/)' | wc -l)
-if [[ $NEFM -gt 0 ]] ; then
-	echo "Essential files modified."
-	git fetch --tags
-	lasttag=$(git tag --sort=-creatordate --no-column --list '*.*.*' | grep -E -m1 '^[0-9]+\.[0-9]+\.[0-9]+$')
-	newtag=$(increment_version $lasttag)
-	until git tag $newtag; do
-		newtag=$(increment_version $newtag)
-	done
-	git push --tags git@github.com:qmk/qmk_firmware.git
-else
-	echo "No essential files modified."
-fi
-
 if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then
 	make generate-keyboards-file SILENT=true > .keyboards
 	cd ..
diff --git a/qmk/util/travis_test.sh b/qmk/util/travis_test.sh
index c6fc0f90..be0cfce0 100644
--- a/qmk/util/travis_test.sh
+++ b/qmk/util/travis_test.sh
@@ -2,8 +2,6 @@
 
 source util/travis_utils.sh
 
-NUM_CORE_CHANGES=$(echo "$QMK_CHANGES" | grep -Ecv -e '^(docs/)' -e '^(keyboards/)' -e '^(layouts/)' -e '^(util/)' -e '^(lib/python/)' -e '^(bin/qmk)' -e '^(requirements.txt)' -e '(.travis.yml)')
-
 if [[ "$TRAVIS_COMMIT_MESSAGE" == *"[skip test]"* ]]; then
     echo "Skipping due to commit message"
     exit 0
diff --git a/qmk/util/travis_utils.sh b/qmk/util/travis_utils.sh
index e3d806df..e949946e 100644
--- a/qmk/util/travis_utils.sh
+++ b/qmk/util/travis_utils.sh
@@ -12,6 +12,7 @@ TRAVIS_COMMIT_RANGE="${TRAVIS_COMMIT_RANGE:-HEAD~1..HEAD}"
 # Extra variables
 LOCAL_BRANCH=$(git rev-parse --abbrev-ref HEAD)
 QMK_CHANGES=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE})
+NUM_CORE_CHANGES=$(echo "$QMK_CHANGES" | grep -Ec -e '^Makefile' -e '^[^/]*.mk' -e '^drivers/' -e '^lib/atsam' -e '^lib/lib8tion/' -e '^platforms' -e '^quantum' -e '^tests' -e '^tmk_core')
 
 # if docker is installed - patch calls to within the qmk docker image
 if command -v docker >/dev/null; then
diff --git a/qmk/util/udev/50-qmk.rules b/qmk/util/udev/50-qmk.rules
index d2abf490..70bd7e6e 100644
--- a/qmk/util/udev/50-qmk.rules
+++ b/qmk/util/udev/50-qmk.rules
@@ -1,60 +1,60 @@
 # Atmel DFU
 ### ATmega16U2
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="03EB", ATTRS{idProduct}=="2FEF", TAG+="uaccess", RUN{builtin}+="uaccess"
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2fef", TAG+="uaccess"
 ### ATmega32U2
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="03EB", ATTRS{idProduct}=="2FF0", TAG+="uaccess", RUN{builtin}+="uaccess"
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2ff0", TAG+="uaccess"
 ### ATmega16U4
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="03EB", ATTRS{idProduct}=="2FF3", TAG+="uaccess", RUN{builtin}+="uaccess"
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2ff3", TAG+="uaccess"
 ### ATmega32U4
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="03EB", ATTRS{idProduct}=="2FF4", TAG+="uaccess", RUN{builtin}+="uaccess"
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2ff4", TAG+="uaccess"
 ### AT90USB64
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="03EB", ATTRS{idProduct}=="2FF9", TAG+="uaccess", RUN{builtin}+="uaccess"
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2ff9", TAG+="uaccess"
 ### AT90USB128
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="03EB", ATTRS{idProduct}=="2FFB", TAG+="uaccess", RUN{builtin}+="uaccess"
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2ffb", TAG+="uaccess"
 
 # Input Club
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="1C11", ATTRS{idProduct}=="B007", TAG+="uaccess", RUN{builtin}+="uaccess"
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="1c11", ATTRS{idProduct}=="b007", TAG+="uaccess"
 
 # STM32duino
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="1EAF", ATTRS{idProduct}=="0003", TAG+="uaccess", RUN{builtin}+="uaccess"
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="1eaf", ATTRS{idProduct}=="0003", TAG+="uaccess"
 # STM32 DFU
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="DF11", TAG+="uaccess", RUN{builtin}+="uaccess"
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="df11", TAG+="uaccess"
 
 # BootloadHID
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="16C0", ATTRS{idProduct}=="05DF", TAG+="uaccess", RUN{builtin}+="uaccess"
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="05df", TAG+="uaccess"
 
 # USBAspLoader
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="16C0", ATTRS{idProduct}=="05DC", TAG+="uaccess", RUN{builtin}+="uaccess"
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="16c0", ATTRS{idProduct}=="05dc", TAG+="uaccess"
 
 # ModemManager should ignore the following devices
 # Atmel SAM-BA (Massdrop)
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="03EB", ATTRS{idProduct}=="6124", TAG+="uaccess", RUN{builtin}+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="6124", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
 
 # Caterina (Pro Micro)
 ## Spark Fun Electronics
 ### Pro Micro 3V3/8MHz
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="1B4F", ATTRS{idProduct}=="9203", TAG+="uaccess", RUN{builtin}+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="1b4f", ATTRS{idProduct}=="9203", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
 ### Pro Micro 5V/16MHz
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="1B4F", ATTRS{idProduct}=="9205", TAG+="uaccess", RUN{builtin}+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="1b4f", ATTRS{idProduct}=="9205", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
 ### LilyPad 3V3/8MHz (and some Pro Micro clones)
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="1B4F", ATTRS{idProduct}=="9207", TAG+="uaccess", RUN{builtin}+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="1b4f", ATTRS{idProduct}=="9207", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
 ## Pololu Electronics
 ### A-Star 32U4
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="1FFB", ATTRS{idProduct}=="0101", TAG+="uaccess", RUN{builtin}+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="1ffb", ATTRS{idProduct}=="0101", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
 ## Arduino SA
 ### Leonardo
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="2341", ATTRS{idProduct}=="0036", TAG+="uaccess", RUN{builtin}+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="2341", ATTRS{idProduct}=="0036", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
 ### Micro
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="2341", ATTRS{idProduct}=="0037", TAG+="uaccess", RUN{builtin}+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="2341", ATTRS{idProduct}=="0037", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
 ## Adafruit Industries LLC
 ### Feather 32U4
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="239A", ATTRS{idProduct}=="000C", TAG+="uaccess", RUN{builtin}+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="239a", ATTRS{idProduct}=="000c", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
 ### ItsyBitsy 32U4 3V3/8MHz
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="239A", ATTRS{idProduct}=="000D", TAG+="uaccess", RUN{builtin}+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="239a", ATTRS{idProduct}=="000d", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
 ### ItsyBitsy 32U4 5V/16MHz
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="239A", ATTRS{idProduct}=="000E", TAG+="uaccess", RUN{builtin}+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="239a", ATTRS{idProduct}=="000e", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
 ## dog hunter AG
 ### Leonardo
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="2A03", ATTRS{idProduct}=="0036", TAG+="uaccess", RUN{builtin}+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="2a03", ATTRS{idProduct}=="0036", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
 ### Micro
-SUBSYSTEMS=="usb", ATTRS{idVendor}=="2A03", ATTRS{idProduct}=="0037", TAG+="uaccess", RUN{builtin}+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"
+SUBSYSTEMS=="usb", ATTRS{idVendor}=="2a03", ATTRS{idProduct}=="0037", TAG+="uaccess", ENV{ID_MM_DEVICE_IGNORE}="1"