Merge remote-tracking branch 'upstream/master' into develop

21 files changed, 0 insertions, 970 deletions

diff --git a/keyboards/1upkeyboards/1up60rgb/keymaps/mdyevimnav/keymap.c b/keyboards/1upkeyboards/1up60rgb/keymaps/mdyevimnav/keymap.c
deleted file mode 100644
index f78af99bf6..0000000000
--- a/keyboards/1upkeyboards/1up60rgb/keymaps/mdyevimnav/keymap.c
+++ /dev/null
@@ -1,48 +0,0 @@
-#include QMK_KEYBOARD_H
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-/*
- * Layer 0
- * ,-----------------------------------------------------------------------------------------.
- * |  ~  |  1  |  2  |  3  |  4  |  5  |  6  |  7  |  8  |  9  |  0  |  -  |  =  |    Bksp   |
- * |-----------------------------------------------------------------------------------------+
- * | Tab    |  q  |  w  |  e  |  r  |  t  |  y  |  u  |  i  |  o  |  p  |  [  |  ]  |   \    |
- * |-----------------------------------------------------------------------------------------+
- * | Esc     |  a  |  s  |  d  |  f  |  g  |  h  |  j  |  k  |  l  |  ;  |  '  |    Enter    |
- * |-----------------------------------------------------------------------------------------+
- * | Shift      |  z  |  x  |  c  |  v  |  b  |  n  |  m  |  ,  |  .  |  /  |    Shift       |
- * |-----------------------------------------------------------------------------------------+
- * | Ctrl  |  L1   |  Alt  |               space             |  Alt  |  Sup  |  L1   | Ctrl  |
- * \-----------------------------------------------------------------------------------------/
- *
- */
-  LAYOUT_all(
-    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_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_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_RSFT,
-    KC_LCTL, MO(1), KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL),
-
-/*
- * Layer 1
- * ,-----------------------------------------------------------------------------------------.
- * |     |  f1 |  f2 |  f3 |  f4 |  f5 |  f6 |  f7 |  f8 |  f9 | f10 | f11 | f12 |    Del    |
- * |-----------------------------------------------------------------------------------------+
- * |        |     |     |     |     |     |     |     | Ins |     | Paus|     |     |  Prnt  |
- * |-----------------------------------------------------------------------------------------+
- * |         |     |     |     |     |     |  L  |  D  |  U  |  R  |     |     |             |
- * |-----------------------------------------------------------------------------------------+
- * |            |     |     |     |     |     | Hom | PDn | PUp | End |     |                |
- * |-----------------------------------------------------------------------------------------+
- * |       |       |       |                                 |       |       |       |       |
- * \-----------------------------------------------------------------------------------------/
- *
- */
-  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_DEL,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_INS, KC_TRNS, KC_PAUS, KC_TRNS, KC_TRNS, KC_PSCR,
-    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_LEFT, KC_DOWN, KC_UP, 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_HOME, KC_PGDN, KC_PGUP, KC_END, 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/keyboards/1upkeyboards/super16/keymaps/15game/keymap.c b/keyboards/1upkeyboards/super16/keymaps/15game/keymap.c
deleted file mode 100644
index e92a9fc10d..0000000000
--- a/keyboards/1upkeyboards/super16/keymaps/15game/keymap.c
+++ /dev/null
@@ -1,110 +0,0 @@
-/* Copyright 2020 Sam Reinehr
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received 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 my_keycodes {
-    K00 = SAFE_RANGE,
-    K01,
-    K02,
-    K03,
-    K04,
-    K05,
-    K06,
-    K07,
-    K08,
-    K09,
-    K10,
-    K11,
-    K12,
-    K13,
-    K14,
-    K15,
-};
-/* just a simple way to give each key a unique code */
-//clang-format off
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    /* Base */
-    [0] = LAYOUT_ortho_4x4(
-        K00, K01, K02, K03,
-        K04, K05, K06, K07,
-        K08, K09, K10, K11,
-        K12, K13, K14, K15
-    )
-};
-/* flags describing current free square/0 */
-uint8_t current = 0;
-/* r g and b describe the colors for the initial map,
-currently blank for free, and evenly spaced hues with maximum sat/value  */
-const uint8_t r[16] = {
-    0x00, 0xFF, 0xFF, 0xFF,
-    0xCC, 0x66, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x00,
-    0x66, 0xCC, 0xFF, 0xFF
-};
-const uint8_t g[16] = {
-    0x00, 0x00, 0x66, 0xCC,
-    0xFF, 0xFF, 0xFF, 0xFF,
-    0xFF, 0xCC, 0x66, 0x00,
-    0x00, 0x00, 0x00, 0x00
-};
-const uint8_t b[16] = {
-    0x00, 0x00, 0x00, 0x00,
-    0x00, 0x00, 0x00, 0x66,
-    0xCC, 0xFF, 0xFF, 0xFF,
-    0xFF, 0xFF, 0xCC, 0x66
-};
-/* pos contains the current positions, could technically be compressed to 4 bits per, but not worth it
-   index into pos is the position we're looking at, output is the tile that is currently there */
-uint8_t tiles[16] = {
-    0, 1, 2, 3,
-    4, 5, 6, 7,
-    8, 9, 10, 11,
-    12, 13, 14, 15
-};
-/* default led array for super 16 has them in a snake, so we must do some remapping/flipping of the 2nd and 4th rows */
-uint8_t remap[16] = {
-    0, 1, 2, 3,
-    7, 6, 5, 4,
-    8, 9, 10, 11,
-    15, 14, 13, 12
-};
-//clang-format on
-/* function to refresh the led coloring with the positions with current tiles */
-void refresh_leds(void) {
-    for (uint8_t index = 0; index < 16; ++index) {
-        uint8_t tile = tiles[index];
-        setrgb(r[tile], g[tile], b[tile], (rgb_led_t *)&led[remap[index]]);
-    }
-    rgblight_set();
-}
-void keyboard_post_init_user(void) {
-    rgblight_mode(RGBLIGHT_MODE_STATIC_LIGHT);
-    rgblight_enable_noeeprom();
-    refresh_leds();
-}
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    uint8_t offset = keycode - K00;
-    uint8_t x      = offset & 0x03;
-    uint8_t y      = (offset & 0x0C) >> 2;
-    /* if the adjacent space exists and is empty, */
-    if ((x > 0 && 0 == tiles[offset - 1]) || (y > 0 && 0 == tiles[offset - 4]) || (x < 3 && 0 == tiles[offset + 1]) || (y < 3 && 0 == tiles[offset + 4])) {
-        /* set the currently blank tile to this tile, and make this one blank */
-        tiles[current] = tiles[offset];
-        tiles[offset]  = 0;
-        current        = offset;
-    }
-    refresh_leds();
-    return false;
-}
diff --git a/keyboards/1upkeyboards/super16/keymaps/15game/readme.md b/keyboards/1upkeyboards/super16/keymaps/15game/readme.md
deleted file mode 100644
index ede6bdd152..0000000000
--- a/keyboards/1upkeyboards/super16/keymaps/15game/readme.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# Trying to put a game that plays like the 15 puzzle on the super16
-The 15/16 puzzle consists of a grid where one space is free, and adjacent spaces can be swapped with the free space 
-* future planned features:
-* fix the start at red
-* have a cute animation play when the puzzle is solved
diff --git a/keyboards/1upkeyboards/super16/keymaps/15game/rules.mk b/keyboards/1upkeyboards/super16/keymaps/15game/rules.mk
deleted file mode 100644
index 03198637f1..0000000000
--- a/keyboards/1upkeyboards/super16/keymaps/15game/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-RGBLIGHT_ENABLE = yes
-RGB_MATRIX_ENABLE = no
diff --git a/keyboards/1upkeyboards/super16/keymaps/ahk_companion/ahk_companion.ahk b/keyboards/1upkeyboards/super16/keymaps/ahk_companion/ahk_companion.ahk
deleted file mode 100644
index becab49e5c..0000000000
--- a/keyboards/1upkeyboards/super16/keymaps/ahk_companion/ahk_companion.ahk
+++ /dev/null
@@ -1,104 +0,0 @@
-#Persistent
-#SingleInstance force
-
-;=================================================================
-;                      Macro Pad Shortcuts                       ;
-;=================================================================
-
-;=================================================================
-;                       Layer 0
-;;=================================================================
-;Row 1
-
-F13::Send a
-F14::Send b
-F15::Send c
-F16::Send d
-
-;Row 2
-
-F17::Send e
-F18::Send f
-F19::Send g
-F20::Send h
-
-;Row 3
-
-F21::Send i
-F22::Send j
-F23::Send k
-F24::Send l
-
-
-;=================================================================
-;                       Layer 1
-;;=================================================================
-;Row 1
-
-!F13::Send m
-!F14::Send n
-!F15::Send o
-!F16::Send p
-
-;Row 2
-
-!F17::Send q
-!F18::Send r
-!F19::Send s
-!F20::Send t
-
-;Row 3
-
-!F21::Send u
-!F22::Send v
-!F23::Send w
-!F24::Send x
-
-
-;=================================================================
-;                       Layer 2
-;;=================================================================
-;Row 1
-
-+F13::Send y
-+F14::Send z
-+F15::Send A
-+F16::Send B
-
-;Row 2
-
-+F17::Send C
-+F18::Send D
-+F19::Send E
-+F20::Send F
-
-;Row 3
-
-+F21::Send G
-+F22::Send H
-+F23::Send I
-+F24::Send J
-
-;=================================================================
-;                       Layer 3
-;;=================================================================
-;Row 1
-
-^F13::Send K
-^F14::Send L
-^F15::Send M
-^F16::Send N
-
-;Row 2
-
-^F17::Send O
-^F18::Send P
-^F19::Send Q
-^F20::Send R
-
-;Row 3
-
-^F21::Send S
-^F22::Send T
-^F23::Send U
-^F24::Send V
diff --git a/keyboards/1upkeyboards/super16/keymaps/ahk_companion/config.h b/keyboards/1upkeyboards/super16/keymaps/ahk_companion/config.h
deleted file mode 100644
index 3b7fd81d69..0000000000
--- a/keyboards/1upkeyboards/super16/keymaps/ahk_companion/config.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#pragma once
-
-// Time out one shot layers after 3 seconds
-#define ONESHOT_TIMEOUT 3000
-
-#define RGBLED_NUM 16
-
-// Undef and redefine default brightness to half of 255
-#undef RGBLIGHT_LIMIT_VAL
-#define RGBLIGHT_LIMIT_VAL 128
-
-//Define a preview timeout for RGB reviews
-#define PREVIEW_TIMEOUT 5000
-#define TAPPING_TERM 200
-
-// Enable Light Layers implementation
-#define RGBLIGHT_LAYERS
-// Allow Light Layers to override RGB off configuration
-#define RGBLIGHT_LAYERS_OVERRIDE_RGB_OFF
diff --git a/keyboards/1upkeyboards/super16/keymaps/ahk_companion/keymap.c b/keyboards/1upkeyboards/super16/keymaps/ahk_companion/keymap.c
deleted file mode 100644
index a326abcf83..0000000000
--- a/keyboards/1upkeyboards/super16/keymaps/ahk_companion/keymap.c
+++ /dev/null
@@ -1,136 +0,0 @@
-#include QMK_KEYBOARD_H
-
-#if defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_LAYERS)
-static uint32_t rgb_preview_timer = 0;
-#endif
-extern rgblight_config_t rgblight_config;
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-        //Layer 0 - Base Layer (F13 to F24, and One Shot Layer 1,2,3 or Toggle Layer 4)
-        [0] = LAYOUT_ortho_4x4(
-                KC_F13, KC_F14, KC_F15, KC_F16,
-                KC_F17, KC_F18, KC_F19, KC_F20,
-                KC_F21, KC_F22, KC_F23, KC_F24,
-                OSL(1), OSL(2), OSL(3), TG(4)    //Transparent to let you go between layers
-		),
-
-        [1] = LAYOUT_ortho_4x4(
-                LALT(KC_F13), LALT(KC_F14), LALT(KC_F15), LALT(KC_F16),
-                LALT(KC_F17), LALT(KC_F18), LALT(KC_F19), LALT(KC_F20),
-                LALT(KC_F21), LALT(KC_F22), LALT(KC_F23), LALT(KC_F24),
-                KC_TRNS,      KC_TRNS,      KC_TRNS,      KC_TRNS         //Transparent to let you go between layers
-        ),
-
-        //Layer 2 - Shift + Function Key Layer
-        [2] = LAYOUT_ortho_4x4(
-                LSFT(KC_F13), LSFT(KC_F14), LSFT(KC_F15), LSFT(KC_F16),
-                LSFT(KC_F17), LSFT(KC_F18), LSFT(KC_F19), LSFT(KC_F20),
-                LSFT(KC_F21), LSFT(KC_F22), LSFT(KC_F23), LSFT(KC_F24),
-                KC_TRNS,      KC_TRNS,      KC_TRNS,      KC_TRNS         //Transparent to let you go between layers
-        ),
-
-        //Layer 3 - Control + Function Key
-        [3] = LAYOUT_ortho_4x4(
-                LCTL(KC_F13), LCTL(KC_F14), LCTL(KC_F15), LCTL(KC_F16),
-                LCTL(KC_F17), LCTL(KC_F18), LCTL(KC_F19), LCTL(KC_F20),
-                LCTL(KC_F21), LCTL(KC_F22), LCTL(KC_F23), LCTL(KC_F24),
-                KC_TRNS,      KC_TRNS,      KC_TRNS,      KC_TRNS         //Transparent to let you go between layers
-        ),
-
-        //Layer 4 - Multimedia
-        [4] = LAYOUT_ortho_4x4(
-                KC_MPRV, KC_MPLY, KC_MNXT,   KC_VOLU,
-                KC_NO,   KC_NO,   KC_NO,     KC_MUTE,
-                KC_NO,   QK_BOOT, EE_CLR,    KC_VOLD,
-                TG(5),   KC_TRNS, KC_TRNS,   KC_TRNS         //Transparent to let you go between layers
-        ),
-
-        //Layer 5 - Keyboard Lights, Programming and Special Functions
-        [5] = LAYOUT_ortho_4x4(
-                RGB_MOD,  RGB_HUI, RGB_SAI,   RGB_VAI,
-                RGB_RMOD, RGB_HUD, RGB_SAD,   RGB_VAD,
-                RGB_TOG,  EE_CLR,  QK_BOOT,   KC_LSFT,
-                KC_TRNS,  KC_TRNS, KC_TRNS,   KC_TRNS         //Transparent to let you go between layers
-        ),
-};
-
-const rgblight_segment_t PROGMEM my_layer0_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-		{0,16,HSV_ORANGE}
-	);
-const rgblight_segment_t PROGMEM my_layer1_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-		{0,16,HSV_GREEN}
-	);
-const rgblight_segment_t PROGMEM my_layer2_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-		{0,16,HSV_RED}
-	);
-const rgblight_segment_t PROGMEM my_layer3_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-		{0,16,HSV_BLUE}
-	);
-const rgblight_segment_t PROGMEM my_layer4_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-		{0,16,HSV_WHITE}
-	);
-const rgblight_segment_t PROGMEM my_layer5_layer[] = RGBLIGHT_LAYER_SEGMENTS(
-		{0,16,HSV_TEAL}
-	);
-const rgblight_segment_t* const PROGMEM my_rgb_layers[] = RGBLIGHT_LAYERS_LIST(
-        my_layer0_layer,
-		my_layer1_layer,
-		my_layer2_layer,
-		my_layer3_layer,
-		my_layer4_layer,
-        my_layer5_layer
-	);
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    return true;
-}
-
-void post_process_record_user(uint16_t keycode, keyrecord_t *record) {
-    // Allow for a preview of changes when modifying RGB
-# if defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_LAYERS)
-  switch (keycode) {
-    case RGB_TOG ... QK_VELOCIKEY_TOGGLE:
-      for (uint8_t i = 0; i < RGBLIGHT_MAX_LAYERS; i++) {
-        rgblight_set_layer_state(i, false);
-      }
-      rgb_preview_timer = timer_read32();
-      break;
-  }
-# endif
-  return;
-}
-
-//Set the appropriate layer color
-layer_state_t layer_state_set_user(layer_state_t state) {
-    rgblight_set_layer_state(1, layer_state_cmp(state, 1));
-    rgblight_set_layer_state(2, layer_state_cmp(state, 2));
-    rgblight_set_layer_state(3, layer_state_cmp(state, 3));
-    rgblight_set_layer_state(4, layer_state_cmp(state, 4));
-    rgblight_set_layer_state(5, layer_state_cmp(state, 5));
-    return state;
-}
-
-void keyboard_post_init_user(void) {
-	//Enable the LED layers
-	rgblight_layers = my_rgb_layers;
-	layer_state_set_user(layer_state);
-}
-
-void matrix_scan_user(void) {
-# if defined(RGBLIGHT_ENABLE) && defined(RGBLIGHT_LAYERS)
-    // Allow preview for
-    if (rgb_preview_timer && TIMER_DIFF_32(timer_read32(), rgb_preview_timer) > PREVIEW_TIMEOUT) {
-        rgb_preview_timer = 0;
-        default_layer_state_set_user(default_layer_state);
-        layer_state_set_user(layer_state);
-        led_update_user((led_t) host_keyboard_leds());
-    }
-# endif
-}
-
-//EEPROM Reset Function
-void eeconfig_init_user(void) {
-  rgblight_enable(); // Enable RGB by default
-  rgblight_sethsv(HSV_ORANGE);  // Set it to orange by default
-}
-
diff --git a/keyboards/1upkeyboards/super16/keymaps/ahk_companion/readme.md b/keyboards/1upkeyboards/super16/keymaps/ahk_companion/readme.md
deleted file mode 100644
index 7a0107c994..0000000000
--- a/keyboards/1upkeyboards/super16/keymaps/ahk_companion/readme.md
+++ /dev/null
@@ -1,58 +0,0 @@
-## AutoHotKey Companion  ##
-
-### Overview ### 
-AutoHotKey Companion Keymap for <a href="https://www.1upkeyboards.com/shop/keyboard-kits/macro-pads/super-16-macro-pad/">1upkeyboards Super16</a> is designed be a quick and easy way to get started with AutoHotKey and to provide a foundation for customizing your own macropad. I chose the Super16 because it provided an easy way (RGB) to identify what layer I was on with a quick glance or peripheral vision. The F13 to F24 keys were selected as they are rarely used so you won't run into conflicts with existing application shortcuts and AutoHotKey recognizes them without any issues. 
-
-Same functionality can be accomplished with other similar applications on the host system like Keyboard Maestro, AutoIt, etc. 
-
-* <a href="https://www.autohotkey.com">AutoHotKey</a>(Windows)
-* <a href="https://www.autoitscript.com/site/autoit/">AutoIT</a> (Windows)
-* <a href="https://www.keyboardmaestro.com/main/">Keyboard Maestro</a>(Mac)
-* <a href="https://github.com/autokey/autokey">AutoKey</a>(Linux)
-
-This keymap allows for a total of 48 Function/Macro keys that are accessible within 2 sequential key presses (or more when extended with your own code and additional layers) 
-
-### Alternate Implementations ###
-I chose to use <a href="https://docs.qmk.fm/#/feature_layers?id=switching-and-toggling-layers">QMK OSL</a> (One Shot Layer) functionality to avoid having to hold a key while selecting the next key and to have my layers always go back to the default layer as the starting point. This also helps me avoid having to cognitively remember what layer I am on. 
-
-If persistent behavior is prefered, OSL can be swapped for TG which will toggle the layer on/off with a key press instead of clearing the layer once the Function key is pressed. This is useful if a layer contains several keys that need to be used in sequence. I also added a OSL timeout of 3 seconds, so that if the key is not pressed within 3 seconds the layer will go back to default. This can be adjusted in the config.h file by increasing 3000 to a desired value: `#define ONESHOT_TIMEOUT 3000` 
-
-
-
-
-### Layers ###
-
-While the first 5 layers are accessible with only 1 key press at most, the 5th (less frequently used) layer is accessed by first going to the 4th layer, which makes the TG(5) button available on the bottom left. Space for additional 2 more layer toggles is available on the 2 middle buttons on the bottom row. Please refer to the layer diagrams.
-
-
-* Layer 0 (Base Layer) - the default layer and functions like sending the F13 to F24 keys along with the bottom row to activate another 4 layers. 
-
-    ![Image of Base Layer ](https://i.imgur.com/0LhityX.png)
-
-* Layer 1 (Alt Layer) - Equivalent to Alt+Fxx key being pressed 
-
-    ![Image of Layer 1 ](https://i.imgur.com/ZblqLZt.png)
-
-* Layer 2 (Shift Layer) - Equivalent to Shift+Fxx key being pressed
-
-    ![Image of Layer 2 ](https://i.imgur.com/ZQHwLC0.png)
-
-* Layer 3 (Control Layer) - Equivalent to Ctrl+Fxx key being pressed
-
-    ![Image of Layer 3 ](https://i.imgur.com/JkM8bqV.png)
-
-* Layer 4 (Config Layer) - Layer for multimedia. You can replace the KC_TRNS on this layer in keymap.c to TG(x) to enable additional layers.
-
-    ![Image of Layer 4 ](https://i.imgur.com/srDp5Lv.png)
-    
-* Layer 5 (RGB Control/QMK) - RGB control layer and Quantum functions (Reset, EEPROM Reset, )
-
-    ![Image of Layer 5 ](https://i.imgur.com/Os3n8dx.png)
-    
-### Host Configuration ### 
-
-Once the keymap has been flashed to the Super16, you can download the accompanying AutoHotKey file or create your own and have it start automatically either via a Windows Task or another way. Using AutoHotKey allows adjustment of functionality of the buttons without the need to change your map and reflash the macropad every time.
-Starting the AHK file can be done either by:
-* Creating a Windows Task 
-* Adding the AHK to the startup folder
-* Launch manually
diff --git a/keyboards/1upkeyboards/super16/keymaps/ahk_companion/rules.mk b/keyboards/1upkeyboards/super16/keymaps/ahk_companion/rules.mk
deleted file mode 100644
index b5bd51b327..0000000000
--- a/keyboards/1upkeyboards/super16/keymaps/ahk_companion/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-RGB_MATRIX_ENABLE = no
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/1upkeyboards/super16/keymaps/nblyumberg/config.h b/keyboards/1upkeyboards/super16/keymaps/nblyumberg/config.h
deleted file mode 100644
index 3d03512888..0000000000
--- a/keyboards/1upkeyboards/super16/keymaps/nblyumberg/config.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#pragma once
-
-// Time out one shot layers after 3 seconds
-#define ONESHOT_TIMEOUT 3000
-
-#define RGBLED_NUM 16
-
-
-// Undef and redefine default brightness to half of 255
-#undef RGBLIGHT_LIMIT_VAL
-#define RGBLIGHT_LIMIT_VAL 128
-
-#define TAPPING_TERM 200
diff --git a/keyboards/1upkeyboards/super16/keymaps/nblyumberg/keymap.c b/keyboards/1upkeyboards/super16/keymaps/nblyumberg/keymap.c
deleted file mode 100644
index 514b8b7a73..0000000000
--- a/keyboards/1upkeyboards/super16/keymaps/nblyumberg/keymap.c
+++ /dev/null
@@ -1,127 +0,0 @@
-#include QMK_KEYBOARD_H
-
-uint16_t copy_paste_timer;
-uint16_t enter_timer;
-
-extern rgblight_config_t rgblight_config;
-
-// Define custom keycodes
-enum my_keycodes {
-	KC_CCCV = SAFE_RANGE,
-	KC_2ENTER
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-        //Layer 0 - Base Layer (F13 to F24, and One Shot Layer 1,2,3,4)
-        [0] = LAYOUT_ortho_4x4(
-                KC_F13, KC_F14, KC_F15, KC_F16,
-                KC_F17, KC_CCCV, KC_F19, KC_F20,
-                KC_F21, KC_F22, KC_F23, KC_2ENTER,
-                OSL(1), OSL(2), OSL(3), TG(4)    //Transparent to let you go between layers
-		),
-
-        [1] = LAYOUT_ortho_4x4(
-                LALT(KC_F13), LALT(KC_F14), LALT(KC_F15), LALT(KC_F16),
-                LALT(KC_F17), LALT(KC_F18), LALT(KC_F19), LALT(KC_F20),
-                LALT(KC_F21), LALT(KC_F22), LALT(KC_F23), LALT(KC_F24),
-                KC_TRNS,      KC_TRNS,      KC_TRNS,      KC_TRNS         //Transparent to let you go between layers
-        ),
-
-        //Layer 2 - Shift + Function Key Layer
-        [2] = LAYOUT_ortho_4x4(
-                LSFT(KC_F13), LSFT(KC_F14), LSFT(KC_F15), LSFT(KC_F16),
-                LSFT(KC_F17), LSFT(KC_F18), LSFT(KC_F19), LSFT(KC_F20),
-                LSFT(KC_F21), LSFT(KC_F22), LSFT(KC_F23), LSFT(KC_F24),
-                KC_TRNS,      KC_TRNS,      KC_TRNS,      KC_TRNS         //Transparent to let you go between layers
-        ),
-
-        //Layer 3 - Control + Function Key
-        [3] = LAYOUT_ortho_4x4(
-                LCTL(KC_F13), LCTL(KC_F14), LCTL(KC_F15), LCTL(KC_F16),
-                LCTL(KC_F17), LCTL(KC_F18), LCTL(KC_F19), LCTL(KC_F20),
-                LCTL(KC_F21), LCTL(KC_F22), LCTL(KC_F23), LCTL(KC_F24),
-                KC_TRNS,      KC_TRNS,      KC_TRNS,      KC_TRNS         //Transparent to let you go between layers
-        ),
-
-        //Layer 4 - Keyboard Lights. Programming and Special Functions
-        [4] = LAYOUT_ortho_4x4(
-                KC_MPRV, KC_MPLY, KC_MNXT,   KC_VOLU,
-                RGB_TOG, RGB_MOD, RGB_RMOD,  KC_MUTE,
-                TO(0),   QK_BOOT, EE_CLR,    KC_VOLD,
-                KC_TRNS, KC_TRNS, KC_TRNS,   KC_TRNS         //Transparent to let you go between layers
-        ),
-};
-
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    switch (keycode) {
-        case KC_CCCV:  // One key copy/paste
-            if (record->event.pressed) {
-                copy_paste_timer = timer_read();
-            } else {
-                if (timer_elapsed(copy_paste_timer) > TAPPING_TERM) {  // Hold, copy
-                    tap_code16(LCTL(KC_C));
-                } else {  // Tap, paste
-                    tap_code16(LCTL(KC_V));
-                }
-            } return true;
-		case KC_2ENTER:
-		    if (record->event.pressed) {
-                enter_timer = timer_read();
-            } else {
-                if (timer_elapsed(enter_timer) > TAPPING_TERM) {  // Hold, shift+enter
-                    tap_code16(LSFT(KC_ENTER));
-                } else {  // Tap, enter
-                    tap_code16(KC_F24);
-                }
-            } 
-			return true;
-        default:
-            return true;
-    }
-}
-
-
-void keyboard_post_init_user(void) {
-	//Enable the LED layers
-	layer_state_set_user(layer_state);
-}
-
-layer_state_t layer_state_set_user(layer_state_t state) {
-  rgblight_sethsv_noeeprom(HSV_WHITE);
-  switch(get_highest_layer(state)) {
-  case 1:
-    // Green
-    rgblight_enable_noeeprom();
-    rgblight_sethsv_noeeprom(HSV_GREEN);
-    break;
-  case 2:
-    // Red
-    rgblight_enable_noeeprom();	
-    rgblight_sethsv_noeeprom(HSV_RED);
-    break;
-  case 3:
-    // Blue
-    rgblight_enable_noeeprom();
-    rgblight_sethsv_noeeprom(HSV_BLUE);
-    break;
-  case 4:
-    // Orange
-    rgblight_enable_noeeprom();
-//    rgblight_sethsv_noeeprom(HSV_PURPLE);
-    rgblight_sethsv_noeeprom(HSV_ORANGE);
-    break;
-  default:
-    // White
-    //Read RGB Light State
-    rgblight_config.raw = eeconfig_read_rgblight();
-    //If enabled, set white
-    if (rgblight_config.enable) {
-		rgblight_sethsv_noeeprom(HSV_WHITE);
-	} else { //Otherwise go back to disabled
-		rgblight_disable_noeeprom();
-	}
-    break;
-}
-return state;
-}
\ No newline at end of file
diff --git a/keyboards/1upkeyboards/super16/keymaps/nblyumberg/readme.md b/keyboards/1upkeyboards/super16/keymaps/nblyumberg/readme.md
deleted file mode 100644
index 5ae101b535..0000000000
--- a/keyboards/1upkeyboards/super16/keymaps/nblyumberg/readme.md
+++ /dev/null
@@ -1,6 +0,0 @@
-# Nick B's Super16 keymap
-
-A modification of the default keymap to include layer indicators with RGB
-* Added a time out of 3 seconds to 1 shot layers
-* Reduced brightness to half to reduce power draw
-* Added a one key copy/paste keycode  
diff --git a/keyboards/1upkeyboards/super16/keymaps/nblyumberg/rules.mk b/keyboards/1upkeyboards/super16/keymaps/nblyumberg/rules.mk
deleted file mode 100644
index b5bd51b327..0000000000
--- a/keyboards/1upkeyboards/super16/keymaps/nblyumberg/rules.mk
+++ /dev/null
@@ -1,2 +0,0 @@
-RGB_MATRIX_ENABLE = no
-RGBLIGHT_ENABLE = yes
diff --git a/keyboards/1upkeyboards/super16v2/keymaps/mouse/keymap.c b/keyboards/1upkeyboards/super16v2/keymaps/mouse/keymap.c
deleted file mode 100644
index 8888fe35e4..0000000000
--- a/keyboards/1upkeyboards/super16v2/keymaps/mouse/keymap.c
+++ /dev/null
@@ -1,50 +0,0 @@
-/* Copyright 2022 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_ortho_4x4( /* Base */
-    KC_TRNS,    KC_DELETE,    KC_BACKSPACE,    KC_MUTE,
-    KC_P4,    KC_P5,    KC_P6,    KC_PPLS,
-    KC_P1,    KC_P2,    KC_P3,    KC_PSLS,
-    MO(1),    KC_P0,    KC_PDOT,  KC_BTN3
-  ),
-
-  [1] = LAYOUT_ortho_4x4( /* Fn Layer */
-    RGB_TOG,   RGB_HUI,    RGB_SAI,    RGB_VAI,
-    RGB_MOD,   RGB_HUD,    RGB_SAD,    RGB_VAD,
-    RGB_SPD,   RGB_SPI,    KC_TRNS,    KC_TRNS,
-    KC_TRNS,   KC_TRNS,    KC_TRNS,    QK_BOOT
-  ),
-};
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) { /* First encoder */
-        if (clockwise) {
-            tap_code_delay(KC_MS_RIGHT, 10);
-        } else {
-            tap_code_delay(KC_MS_LEFT, 10);
-        }
-    } else if (index == 1) { /* Second encoder */
-        if (clockwise) {
-            tap_code_delay(KC_AUDIO_VOL_UP, 10);
-        } else {
-            tap_code_delay(KC_AUDIO_VOL_DOWN, 10);
-        }
-    }
-    return false;
-}
\ No newline at end of file
diff --git a/keyboards/1upkeyboards/super16v2/keymaps/mouse/readme.md b/keyboards/1upkeyboards/super16v2/keymaps/mouse/readme.md
deleted file mode 100644
index e229fcba74..0000000000
--- a/keyboards/1upkeyboards/super16v2/keymaps/mouse/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default keymap for Super 16 V2
diff --git a/keyboards/1upkeyboards/sweet16/keymaps/dlaroe/keymap.c b/keyboards/1upkeyboards/sweet16/keymaps/dlaroe/keymap.c
deleted file mode 100644
index 5305d0ad05..0000000000
--- a/keyboards/1upkeyboards/sweet16/keymaps/dlaroe/keymap.c
+++ /dev/null
@@ -1,38 +0,0 @@
-#include QMK_KEYBOARD_H
-
-enum layers {
- num,
- extra,
- mouse
-};
-
-
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [num] = LAYOUT_numpad_4x4(
-        KC_P7,   KC_P8,  KC_P9,  LT(extra, KC_PPLS),
-        KC_P4,   KC_P5,  KC_P6,
-        KC_P1,   KC_P2,  KC_P3,  KC_PENT,
-             LT(mouse, KC_P0),      KC_DOT
-    ),
-
- [extra] = LAYOUT_numpad_4x4(
-        KC_PSLS,   KC_PAST,  KC_PMNS,  KC_TRNS,
-        KC_BSPC,   KC_EXECUTE,  KC_DEL,
-        KC_LPRN,   KC_RPRN,  KC_PEQL,  KC_PENT,
-             KC_TAB,      KC_NUM
-    ),
-
-
-[mouse] = LAYOUT_numpad_4x4(
-        KC_WH_D,   KC_MS_U,  KC_WH_U,  LT(extra, KC_PPLS),
-        KC_MS_L,   KC_MS_D,  KC_MS_R,
-        KC_BTN1,   KC_BTN2,  KC_BTN3,  KC_PENT,
-             KC_TRNS,      KC_DOT
-    )
-
-
-
-
-};
-
diff --git a/keyboards/1upkeyboards/sweet16/keymaps/dlaroe/readme.md b/keyboards/1upkeyboards/sweet16/keymaps/dlaroe/readme.md
deleted file mode 100644
index aabcf82c61..0000000000
--- a/keyboards/1upkeyboards/sweet16/keymaps/dlaroe/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Dale's keymap for the Sweet16
-
-I wanted to reuse a standard numpad keyset and have the full functionality of an larger numpad with a nod to Excel functionality.
diff --git a/keyboards/1upkeyboards/sweet16/keymaps/ridingintraffic/config.h b/keyboards/1upkeyboards/sweet16/keymaps/ridingintraffic/config.h
deleted file mode 100644
index 161b46c814..0000000000
--- a/keyboards/1upkeyboards/sweet16/keymaps/ridingintraffic/config.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#pragma once
-
-/* tap dance stuff*/
-#undef TAPPING_TERM
-#define TAPPING_TERM 500
-#define PERMISSIVE_HOLD
-
-#define TAPPING_TOGGLE 2
-
-#define EXAMPLESTRING1 "tapdance_1"
-#define EXAMPLESTRING2 "tapdance_2"
-#define EXAMPLESTRING3 "tapdance_3"
-#define EXAMPLESTRING4 "tapdance_4"
-
-#undef RGBLED_NUM
-#define RGBLED_NUM 16
diff --git a/keyboards/1upkeyboards/sweet16/keymaps/ridingintraffic/keymap.c b/keyboards/1upkeyboards/sweet16/keymaps/ridingintraffic/keymap.c
deleted file mode 100644
index 2e7505ec1c..0000000000
--- a/keyboards/1upkeyboards/sweet16/keymaps/ridingintraffic/keymap.c
+++ /dev/null
@@ -1,215 +0,0 @@
-/*
-tap danc eis turned on in the rules now...
-*/
-#include QMK_KEYBOARD_H
-
-#define _EMOJI 0
-#define _TAPLAND 1
-#define _LEDCNTL 2
-
-enum custom_keycodes {
-    SHRUG,
-    DISFACE,
-    FU,
-    TFLIP,
-    TFLIP2,
-    SAD_EYES,
-    TPUT,
-    HAPPYFACE,
-    HEARTFACE,
-    CLOUD,
-    CHANFACE,
-    CMDCLEAR
-};
-//Tap Dance Declarations
-enum {
-  TD_EXAMPLE1 = 0,
-  TD_EXAMPLE2,
-  TD_EXAMPLE3,
-  TD_EXAMPLE4
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-
-    /* EMOJI Pad
-    * ,-------------------------------.
-    * |TFLIP | TFlIP2|DISFACE|   FU   |
-    * |------+-------+-------+--------|
-    * | CLOUD|       |       | CLEAR  |
-    * |------+-------+-------+--------|
-    * |SHRUG |DISFACE| HRTFAC| HAPPYF |
-    * |------+-------+-------+--------|
-    * | ENTER|       |LEDCNTR| tapland|
-    * `-------------------------------'
-    */
-      //purple
-    [_EMOJI] = LAYOUT_ortho_4x4(
-       TFLIP,   TFLIP2,   KC_NO,      FU ,
-       CLOUD,   KC_NO,  KC_NO,      CMDCLEAR,
-       SHRUG,   DISFACE,  HEARTFACE,    HAPPYFACE,
-       KC_ENT,  RGB_TOG,  MO(_LEDCNTL), MO(_TAPLAND)
-    ),
-
-    /* TapLand //
-    * ,-------------------------------.
-    * | str1 | str2  |  str3 |   str4 |
-    * |------+-------+-------+--------|
-    * |      |       |       |        |
-    * |------+-------+-------+--------|
-    * |      |       |       |        |
-    * |------+-------+-------+--------|
-    * |      |       |       |        |
-    * `-------------------------------'
-    */
-    //blue
-    [_TAPLAND] = LAYOUT_ortho_4x4(
-       TD(TD_EXAMPLE1), TD(TD_EXAMPLE2),  TD(TD_EXAMPLE3), TD(TD_EXAMPLE4),
-       KC_NO,         KC_NO,          KC_NO,         KC_NO,
-       KC_NO,         KC_NO,          KC_NO,         KC_NO,
-       KC_NO,         KC_NO,          KC_NO,         KC_NO
-    ),
-    /* LEDControl Pad
-    * ,-------------------------------.
-    * | snake|breathe|rainbow|gradient|
-    * |------+-------+-------+--------|
-    * | xmas |  Val+ | Sat+  |   HUE+ |
-    * |------+-------+-------+--------|
-    * |kngrdr|  Val- | Sat-  |   HUE- |
-    * |------+-------+-------+--------|
-    * | swirl| PLAIN |       | ON/OFF |
-    * `-------------------------------'
-    */
-    //blue
-    [_LEDCNTL] = LAYOUT_ortho_4x4(
-        RGB_M_SN, RGB_M_B,    RGB_M_R,     RGB_M_G,
-        RGB_M_X,  RGB_VAI,    RGB_SAI,     RGB_HUI,
-        RGB_M_K,  RGB_VAD,    RGB_SAD,     RGB_HUD,
-        RGB_M_SW, RGB_M_P,    KC_NO,     RGB_TOG
-     ),
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    if (record->event.pressed) {
-        switch(keycode) {
-            case CLOUD:
-                if(record->event.pressed){
-                    send_unicode_string("(っ◕‿◕)っ");
-                }
-                return false;
-                break;
-            case FU:
-                if(record->event.pressed){
-                    SEND_STRING("t(-_-t)");
-                }
-                return false;
-                break;
-            case HAPPYFACE:
-                if(record->event.pressed){
-                     send_unicode_string("ʘ‿ʘ");
-                }
-                return false;
-                break;
-            case CMDCLEAR:
-                if (record->event.pressed) {
-                    register_code(KC_LGUI);
-                    tap_code(KC_A);
-                    unregister_code(KC_LGUI);
-                    tap_code(KC_DEL);
-                }
-                return false;
-                break;
-            case SHRUG:
-                if (record->event.pressed) {
-                    send_unicode_string("¯\\_(ツ)_/¯");
-                }
-                return false;
-                break;
-            case HEARTFACE:
-                if(record->event.pressed){
-                    send_unicode_string("♥‿♥");
-                }
-                return false;
-                break;
-            case DISFACE:
-                if(record->event.pressed){
-                    send_unicode_string("ಠ_ಠ");
-                }
-                return false;
-                break;
-            case TFLIP:
-                if(record->event.pressed){
-                    send_unicode_string("(╯°□°)╯ ︵ ┻━┻");
-                }
-                return false;
-                break;
-            case TFLIP2:
-                if(record->event.pressed){
-                    send_unicode_string("┻━┻︵ \\(°□°)/ ︵ ┻━┻");
-                }
-                return false;
-                break;
-                }
-    }
-    return true;
-}
-
-
-/* tap dance time */
-void tdexample1(tap_dance_state_t *state, void *user_data) {
-  if (state->count >= 2) {
-    SEND_STRING(EXAMPLESTRING1);
-    reset_tap_dance (state);
-  }
-}
-void tdexample2(tap_dance_state_t *state, void *user_data) {
-  if (state->count >= 2) {
-    SEND_STRING(EXAMPLESTRING2);
-    reset_tap_dance (state);
-  }
-}
-void tdexample3(tap_dance_state_t *state, void *user_data) {
-  if (state->count >= 2) {
-    SEND_STRING(EXAMPLESTRING3);
-    reset_tap_dance (state);
-  }
-}
-void tdexample4(tap_dance_state_t *state, void *user_data) {
-  if (state->count >= 2) {
-    SEND_STRING(EXAMPLESTRING4);
-    reset_tap_dance (state);
-  }
-}
-
-tap_dance_action_t tap_dance_actions[] = {
-    [TD_EXAMPLE1] = ACTION_TAP_DANCE_FN(tdexample1),
-    [TD_EXAMPLE2] = ACTION_TAP_DANCE_FN(tdexample2),
-    [TD_EXAMPLE3] = ACTION_TAP_DANCE_FN(tdexample3),
-    [TD_EXAMPLE4] = ACTION_TAP_DANCE_FN(tdexample4)
-};
-
-// Runs just one time when the keyboard initializes.
-void matrix_scan_user(void) {
-  static bool has_ran_yet;
-  if (!has_ran_yet) {
-    has_ran_yet = true;
-        rgblight_setrgb (16, 0, 16);
-  }
-}
-layer_state_t layer_state_set_user(layer_state_t state) {
-    switch (get_highest_layer(state)) {
-    case _TAPLAND:
-        rgblight_setrgb(0, 16, 0); //green
-        break;
-    case _LEDCNTL:
-        rgblight_setrgb(0, 0, 16); //blue
-        break;
-    case _EMOJI:
-        rgblight_setrgb (16, 0, 16); //purple
-        break;
-
-    default: //  for any other layers, or the default layer
-        rgblight_setrgb (16, 0, 16); //purple
-        break;
-    }
-  return state;
-}
diff --git a/keyboards/1upkeyboards/sweet16/keymaps/ridingintraffic/readme.md b/keyboards/1upkeyboards/sweet16/keymaps/ridingintraffic/readme.md
deleted file mode 100644
index 7a3b8c8e44..0000000000
--- a/keyboards/1upkeyboards/sweet16/keymaps/ridingintraffic/readme.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# Ridingtraffic's examples
-===
-This keymap has many features:
-3 layers
-Momentary layer switching
-16 pixel neopixel
-Unicode Enabled
-Tap dance enabled
-
-The rgb also updates depending on what layer you are on, and then flips back when done.
diff --git a/keyboards/1upkeyboards/sweet16/keymaps/ridingintraffic/rules.mk b/keyboards/1upkeyboards/sweet16/keymaps/ridingintraffic/rules.mk
deleted file mode 100644
index de44175531..0000000000
--- a/keyboards/1upkeyboards/sweet16/keymaps/ridingintraffic/rules.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-# turning on tap dance
-TAP_DANCE_ENABLE = yes
-RGBLIGHT_ENABLE = yes
-MOUSEKEY_ENABLE = no
-UNICODE_ENABLE = yes 
\ No newline at end of file