Merge upstream master to 2022 Q4 breaking change

42 files changed, 0 insertions, 2460 deletions

diff --git a/keyboards/tada68/keymaps/abishalom/keymap.c b/keyboards/tada68/keymaps/abishalom/keymap.c
deleted file mode 100644
index f21fd93313..0000000000
--- a/keyboards/tada68/keymaps/abishalom/keymap.c
+++ /dev/null
@@ -1,69 +0,0 @@
-#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
-
-#define SEMI_FN LT(_FL, KC_SCLN)
-
-//Tap Dance Declarations
-enum {
-  TD_WIN_LOCK = 0
-};
-
-//Tap Dance Definitions
-qk_tap_dance_action_t tap_dance_actions[] = {
-  [TD_WIN_LOCK]  = ACTION_TAP_DANCE_DOUBLE(MAGIC_NO_GUI, MAGIC_UNNO_GUI)
-};
-
-//
-////In Layer declaration, add tap dance item in place of a key code
-//TD(TD_WIN_LOCK)
-
-// Press fn+GUI once to lock, double tap to unlock.
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _BL: (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 |
-   * |----------------------------------------------------------------|
-   * |FNCAP|  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Enter  |PgUp  |
-   * |----------------------------------------------------------------|
-   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift | Up|PgDn|
-   * |----------------------------------------------------------------|
-   * |Ctrl|Win |Alt |        Space          |Alt| FN|Ctrl|Lef|Dow|Rig |
-   * `----------------------------------------------------------------'
-   */
-[_BL] = LAYOUT_ansi(
-  QK_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, \
-  LT(_FL, KC_CAPS), KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,   SEMI_FN,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(_FL),KC_RCTL, KC_LEFT,KC_DOWN,KC_RGHT),
-
-  /* Keymap _FL: Function Layer
-   * ,----------------------------------------------------------------.
-   * | ` | F1|F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|Del    |    |
-   * |----------------------------------------------------------------|
-   * |     |Pre| U |NXT|   |   |   |PGD| U |PGU|PSC|   |   |     |Ins |
-   * |----------------------------------------------------------------|
-   * |      |MUT|VU-|VU+|PPl|   |   | L | D | R |   |   |        |Home|
-   * |----------------------------------------------------------------|
-   * |        |   |BRG|BL-|BL+|BLT|   |   |   |   |   |      |Stp|End |
-   * |----------------------------------------------------------------|
-   * |    |WTOG|    |                       |   |   |    |Pre|PPl|Nxt |
-   * `----------------------------------------------------------------'
-   */
-[_FL] = LAYOUT_ansi(
-  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_MPRV,KC_MNXT,_______, _______,_______,KC_PGDN,KC_UP,KC_PGUP,KC_PSCR,_______,_______, _______,KC_INSERT, \
-  _______,KC_MUTE,KC_VOLD,KC_VOLU,KC_MPLY,_______,_______,KC_LEFT,KC_DOWN,KC_RGHT,_______,_______,        _______,KC_HOME, \
-  _______,_______,BL_BRTG,BL_DOWN,BL_UP, BL_TOGG, _______,_______,_______,_______,_______,_______, KC_STOP, KC_END, \
-  _______,TD(TD_WIN_LOCK),_______,                 _______,               _______,KC_TRNS,_______,KC_MPRV,KC_MPLY, KC_MNXT),
-
-};
diff --git a/keyboards/tada68/keymaps/amnesia0287/keymap.c b/keyboards/tada68/keymaps/amnesia0287/keymap.c
deleted file mode 100644
index 005eea2380..0000000000
--- a/keyboards/tada68/keymaps/amnesia0287/keymap.c
+++ /dev/null
@@ -1,111 +0,0 @@
-#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 _HLa 1
-#define _HLb 2
-#define _HL  3
-#define _XL  4
-
-enum hype_keycodes {
-  FN_HLa = SAFE_RANGE,
-  FN_HLb
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _BL: (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 |
-   * |----------------------------------------------------------------|
-   * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |PgUp|
-   * |----------------------------------------------------------------|
-   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift | Up|PgDn|
-   * |----------------------------------------------------------------|
-   * |Ctrl|Win |Alt |        Space          |Alt| FN|Ctrl|Lef|Dow|Rig |
-   * `----------------------------------------------------------------'
-   */
-[_BL] = 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_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_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_PGDN,  \
-  SC_LSPO,         KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM,KC_DOT, KC_SLSH,   SC_RSPC,KC_UP,LT(_HLa, KC_END), \
-  KC_LCTL, KC_LGUI,KC_LALT,                KC_SPC,                        KC_RALT,FN_HLa,FN_HLb, KC_LEFT,KC_DOWN,KC_RGHT),
-
-  /* Keymap _HL: Hype Fn Layer
-   * ,----------------------------------------------------------------.
-   * |   | F1|F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|Del    |Ins |
-   * |----------------------------------------------------------------|
-   * |     |   |Up |   |   |   |   |   |   |   |   |   |   |     |Hme |
-   * |----------------------------------------------------------------|
-   * |      |<- |Dn | ->|   |   |   |   |   |   |   |   |        |End |
-   * |----------------------------------------------------------------|
-   * |        |   |   |Bl-|BL |BL+|   |VU-|VU+|MUT|   |   McL|MsU|McR |
-   * |----------------------------------------------------------------|
-   * |    |    |    |                       |   |   |    |MsL|MsD|MsR |
-   * `----------------------------------------------------------------'
-   */
-[_HLa] = LAYOUT_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_INS,  \
-     KC_CAPS,_______,  KC_UP,_______,_______,_______,_______,_______,KC_PSCR,KC_SCRL,KC_PAUS,  KC_UP,_______,     _______,_______, \
-      _______,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),
-
-[_HLb] = LAYOUT_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_INS,  \
-     KC_CAPS,_______,  KC_UP,_______,_______,_______,_______,_______,KC_PSCR,KC_SCRL,KC_PAUS,  KC_UP,_______,     _______,_______, \
-      _______,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),
-
-[_HL] = LAYOUT_ansi(
-  BL_TOGG, BL_DOWN,BL_UP, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,LALT(KC_F4),MAGIC_UNSWAP_BACKSLASH_BACKSPACE,  \
-     _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,     _______,MAGIC_SWAP_BACKSLASH_BACKSPACE, \
-      _______,KC_VOLD,KC_VOLU,KC_MUTE,_______,_______,_______,_______,_______,_______,_______,_______,            _______,_______, \
-           _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,       _______,KC_MNXT,_______, \
-    KC_MPRV,  KC_MPLY,  KC_MNXT,                     KC_MPLY,                     _______,_______,_______,KC_MRWD,KC_MPRV,KC_MFFD),
-
-[_XL] = LAYOUT_ansi(
-  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        _______,_______,  \
-     _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,     _______,_______, \
-      _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,            _______,_______, \
-           _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,       _______,_______,_______, \
-    _______,  _______,  _______,                     _______,                     _______,_______,_______,_______,_______,_______),
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch (keycode) {
-    case FN_HLa:
-      if (record->event.pressed)
-      {
-        layer_on(_HLa);
-        update_tri_layer(_HLa, _HLb, _HL);
-      }
-      else
-      {
-        layer_off(_HLa);
-        update_tri_layer(_HLa, _HLb, _HL);
-      }
-      return false;
-      break;
-    case FN_HLb:
-      if (record->event.pressed)
-      {
-        layer_on(_HLb);
-        update_tri_layer(_HLa, _HLb, _HL);
-      }
-      else
-      {
-        layer_off(_HLb);
-        update_tri_layer(_HLa, _HLb, _HL);
-      }
-      return false;
-      break;
-  }
-  return true;
-}
diff --git a/keyboards/tada68/keymaps/ardakilic/keymap.c b/keyboards/tada68/keymaps/ardakilic/keymap.c
deleted file mode 100755
index 141c18de3f..0000000000
--- a/keyboards/tada68/keymaps/ardakilic/keymap.c
+++ /dev/null
@@ -1,55 +0,0 @@
-#include QMK_KEYBOARD_H
-
-//KC_NUBS (\|) is equivalent to ["é] key in Turkish keyboards.
-//KC_GRV (~ `) is equivalent to [<>|] key in Turkish keyboards.
-//I've put grave to bottom, and nonUS backslash to top to make it more similar to Turkish layout.  ["é] key is more above than [<>|] key.
-//Default top right button was KC_GRV (~ `) (Grave key) even if it looks like Tilde key.
-
-// 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
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _BL: (Base Layer) Default Layer
-   * ,----------------------------------------------------------------.
-   * |Esc | 1|  2|  3|  4|  5|  6|  7|  8|  9|  0|  -|  =|Backsp |PWR |
-   * |----------------------------------------------------------------|
-   * |Tab  |  Q|  W|  E|  R|  T|  Y|  U|  I|  O|  P|  [|  ]|  \  |Del |
-   * |----------------------------------------------------------------|
-   * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |\ | |
-   * |----------------------------------------------------------------|
-   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift | Up|~ ` |
-   * |----------------------------------------------------------------|
-   * |Ctrl|Alt |CMD |        Space          |CMD |FN |Alt|Lef|Dow|Rig |
-   * `----------------------------------------------------------------'
-   */
-[_BL] = 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_PWR, \
-  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_NUBS,  \
-  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_GRV, \
-  KC_LCTL, KC_LALT,KC_LGUI,                KC_SPC,                        KC_RGUI,MO(_FL),KC_RALT, KC_LEFT,KC_DOWN,KC_RGHT),
-
-  /* Keymap _FL: Function Layer
-   * ,----------------------------------------------------------------.
-   * |   | F1|F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|Del    |Ins |
-   * |----------------------------------------------------------------|
-   * |     |   |   |   |   |   |   |   |   |   |   |   |   |     |Hme |
-   * |----------------------------------------------------------------|
-   * |      |   |   |   |   |   |   | PP|PLA|PN |   |   |        |End |
-   * |----------------------------------------------------------------|
-   * |        |   |   |Bl-|BL |BL+|   |MUT|VU-|VU+|   |      |   |    |
-   * |----------------------------------------------------------------|
-   * |    |    |    |                       |   |   |    |   |   |    |
-   * `----------------------------------------------------------------'
-   */
-[_FL] = LAYOUT_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_DEL, KC_INS ,  \
-  _______,_______,_______,_______,_______, _______,_______,_______,_______,_______,_______,_______,_______, _______,KC_HOME, \
-  _______,_______,_______,_______,_______,_______,_______,KC_MPRV,KC_MPLY,KC_MNXT,_______,_______,        _______,KC_END, \
-  _______,_______,_______,BL_DOWN,BL_TOGG,BL_UP,  _______,KC_MUTE,KC_VOLD,KC_VOLU,_______,_______,_______,_______, \
-  _______,_______,_______,                 _______,               _______,_______,_______,_______,_______,_______),
-};
diff --git a/keyboards/tada68/keymaps/ardakilic/readme.md b/keyboards/tada68/keymaps/ardakilic/readme.md
deleted file mode 100755
index 72654f55ed..0000000000
--- a/keyboards/tada68/keymaps/ardakilic/readme.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Ardakilic's TADA68 layout
-
-This layout aims to use Ansi keyboard for my needs in ease, especially to work on macOS, and to have a layout more similar to Apple keyboards.
-
-This layout aims to have a similar layout to Apple keyboards while using ISO layouts with the ANSI keymap. The layout is directly considered using Turkish Qwerty keyboards.
-
-The changes that were applied over default layout:
-
-* Make Win/cmd keys right next to space bar just like Apple keyboards.
-* Adding a power (`KC_PWR`) key, so the lock screen shortcut works.
-* Re-use the page up and page down keys to make ["é] (`KC_NUBS`) and [<>|] (`KC_GRAVE`) keys more accessible.
-* Optimize the function layer, by removing the mouse movement combinations and adding additional media keys.
-* Swap the positions of volume up and volume down and mute buttons on function layer, so these keys are actually with the same order as Apple keyboard layout.
-
-I'm re-purposing page up and page down keys in this layout, because in macOS alt/option + arrow keys, in Windows and Linux, space bar/shift spacebar combinations already cover their work, and is more accessible if you'd ask me.
diff --git a/keyboards/tada68/keymaps/bazooka/keymap.c b/keyboards/tada68/keymaps/bazooka/keymap.c
deleted file mode 100644
index c6984594d7..0000000000
--- a/keyboards/tada68/keymaps/bazooka/keymap.c
+++ /dev/null
@@ -1,181 +0,0 @@
-#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 _MAC 1
-#define _FUNC 2
-#define _MOUSE 3
-
-#define MAC_TOG TG(_MAC)
-
-enum {
-  FUN_LAY = SAFE_RANGE,
-  MOU_TOG,
-  WIN_LCK,
-  WIN_KEY,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _BL: (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 |
-   * |----------------------------------------------------------------|
-   * |CAPS   |  A|  S|  D|  F|  G|  H|  J|  K|  L|  ;|  '|Return |PgUp|
-   * |----------------------------------------------------------------|
-   * |Shift   |  Z|  X|  C|  V|  B|  N|  M|  ,|  .|  /|Shift | Up|PgDn|
-   * |----------------------------------------------------------------|
-   * |Ctrl|Win |Alt |        Space          |Alt| FN|Ctrl|Lef|Dow|Rig |
-   * `----------------------------------------------------------------'
-   */
-[_BL] = LAYOUT_ansi(
-  QK_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, \
-  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,WIN_KEY,KC_LALT,                         KC_SPC,                KC_RALT,FUN_LAY,KC_RCTL,KC_LEFT,KC_DOWN,KC_RGHT),
-
-  /* Keymap _MAC: Mac Layer
-   * ,----------------------------------------------------------------.
-   * |   |   |   |   |   |   |   |   |   |   |   |   |   |       |    |
-   * |----------------------------------------------------------------|
-   * |     |   |   |   |   |   |   |   |   |   |   |   |   |     |    |
-   * |----------------------------------------------------------------|
-   * |      |   |   |   |   |   |   |   |   |   |   |   |        |    |
-   * |----------------------------------------------------------------|
-   * |        |   |   |   |   |   |   |   |   |   |   |      |   |    |
-   * |----------------------------------------------------------------|
-   * |Win |Alt |Ctrl|                       |Ctrl|   |Win|   |   |    |
-   * `----------------------------------------------------------------'
-   */
-[_MAC] = LAYOUT_ansi(
-  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, \
-  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, \
-  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        _______,_______, \
-          _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, \
-  KC_LGUI,KC_LALT,KC_LCTL,                        _______,                KC_RCTL,_______,KC_RGUI,_______,_______,_______),
-
-
-  /* Keymap _FUNC: Function Layer
-   * ,----------------------------------------------------------------.
-   * |   |F1 |F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|  Del  |HPg |
-   * |----------------------------------------------------------------|
-   * |     |   |   |   |   |   |   |   |Mac|   |PSc|ScL|PsB| Calc|Ins |
-   * |----------------------------------------------------------------|
-   * |      |   |   |   |   |   |   |   |Stp|Ply|PTr|NTr|        |Hme |
-   * |----------------------------------------------------------------|
-   * |        |BL |Bl-|Bl+|   |   |   |Mou|MUT|VU-|VU+|      |PgU|End |
-   * |----------------------------------------------------------------|
-   * |    |WnLc|    |                       |   |   |    |Hme|PgD|End |
-   * `----------------------------------------------------------------'
-   */
-[_FUNC] = LAYOUT_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_DEL,KC_WHOM, \
-  _______,_______,_______,_______,_______,_______,_______,_______,MAC_TOG,_______,KC_PSCR,KC_SCRL,KC_PAUS,KC_CALC, KC_INS,  \
-  _______,_______,_______,_______,_______,_______,_______,_______,KC_MSTP,KC_MPLY,KC_MPRV,KC_MNXT,        _______,KC_HOME, \
-          _______,BL_TOGG, BL_DOWN,BL_UP, _______,_______,_______,MOU_TOG,KC_MUTE,KC_VOLD,KC_VOLU,_______,KC_PGUP,KC_END , \
-  _______,WIN_LCK,_______,                        _______,                _______,_______,_______,KC_HOME,KC_PGDN,KC_END),
-
-  /* Keymap _MOUSE: Mouse Navigation Layer
-   * ,----------------------------------------------------------------.
-   * |   |   |   |   |   |   |   |   |   |   |   |   |   |       |    |
-   * |----------------------------------------------------------------|
-   * |     |   |   |   |   |   |   |   |   |   |   |   |   |     |    |
-   * |----------------------------------------------------------------|
-   * |      |   |   |   |   |   |   |   |   |   |   |   |   McR  |    |
-   * |----------------------------------------------------------------|
-   * |        |   |   |   |   |   |   |   |   |   |   |  McL |MsU|    |
-   * |----------------------------------------------------------------|
-   * |    |    |    |                       |   |   |    |MsL|MsD|MsR |
-   * `----------------------------------------------------------------'
-   */
-[_MOUSE] = LAYOUT_ansi(
-  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, \
-  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, \
-  _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,        KC_BTN2,_______, \
-          _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,KC_BTN1,KC_MS_U,_______, \
-  _______,_______,_______,                        _______,                _______,_______,_______,KC_MS_L,KC_MS_D,KC_MS_R),
-
-};
-
-#define SET_BIT(var, pos) (var |= (1UL << pos))
-#define CLEAR_BIT(var, pos) (var &= ~(1UL << pos))
-#define TOGGLE_BIT(var, pos) (var ^= (1UL << pos))
-#define CHECK_BIT(var, pos) (var & (1U << pos)) 
-
-static uint8_t keyboard_state = 0;
-// bit 0 = function layer status (on/off)
-// bit 1 = mouse navigation layer state
-// bit 2 = windows key lock state
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-  switch(keycode) {
-    // acts like a momentary function layer press
-    case FUN_LAY:
-      if (record->event.pressed) { 
-        layer_on(_FUNC);
-        if (CHECK_BIT(keyboard_state, 1)) {
-          layer_on(_MOUSE);
-        } 
-        else {
-          layer_off(_MOUSE);
-        }
-        // turns on function layer status
-        SET_BIT(keyboard_state, 0);
-      }
-      // key released
-      else {
-        layer_off(_FUNC);
-        layer_off(_MOUSE);
-        // turns off function layer status
-        CLEAR_BIT(keyboard_state, 0);
-      }
-      break;
-
-    case MOU_TOG:
-      if(record->event.pressed) {
-        // toggles navigation layer state
-        TOGGLE_BIT(keyboard_state, 1);
-
-        // if FN is pressed down while hitting this key, the correct layer will be updated,
-        // so that the FN key doesn't need to be pressed down again to start using the functionality
-        if (CHECK_BIT(keyboard_state, 0)) {
-          if (CHECK_BIT(keyboard_state, 1)) {
-            layer_on(_MOUSE);
-          }
-          else {
-            layer_off(_MOUSE);
-          } 
-        }
-      }
-      break;
-
-    case WIN_LCK:
-      if (record->event.pressed) {
-        // toggles windows key lock state
-        TOGGLE_BIT(keyboard_state, 2);
-      }
-      break;
-
-    // uses seperate WIN_KEY so that WIN_LCK does not affect Mac Layer's KC_LGUI
-    case WIN_KEY:
-      // checks if windows key lock is off to allow key to be pressed
-      if (!CHECK_BIT(keyboard_state, 2)) {
-        if (record->event.pressed) {
-          SEND_STRING(SS_DOWN(X_LGUI));
-          return false;
-        }
-        // key released
-        else { 
-          SEND_STRING(SS_UP(X_LGUI));
-          return false;
-        }
-      }
-      break;
-  }
-  return true;
-};
diff --git a/keyboards/tada68/keymaps/cheese/keymap.c b/keyboards/tada68/keymaps/cheese/keymap.c
deleted file mode 100755
index a3660a557b..0000000000
--- a/keyboards/tada68/keymaps/cheese/keymap.c
+++ /dev/null
@@ -1,107 +0,0 @@
-#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
-#define _CL 2
-#define _AL 3
-
-enum custom_keycodes {
-    SPX4 = SAFE_RANGE
-};
-
-bool process_record_user(uint16_t keycode, keyrecord_t *record) {
-    if (record->event.pressed) {
-        switch(keycode) {
-            case SPX4:
-                SEND_STRING("    ");
-                return false;
-        }
-    }
-    return true;
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  /* Keymap _BL: (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 |Win |        Space          |Win| FN|Ctrl|Lef|Dow|Rig |
-   * `----------------------------------------------------------------'
-   */
-[_BL] = 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_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, \
-  MO(_CL),  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_LALT,LM(_AL,0x08),                KC_SPC,                       LM(_AL,0x18),MO(_FL),KC_RCTL, KC_LEFT,KC_DOWN,KC_RGHT),
-
-  /* Keymap _FL: Function Layer
-   * ,----------------------------------------------------------------.
-   * |   | F1|F2 |F3 |F4 |F5 |F6 |F7 |F8 |F9 |F10|F11|F12|Del    |` ~ |
-   * |----------------------------------------------------------------|
-   * |     |   |Up |   |   |   |   |   |   |   |   |   |