Merge upstream master to 2022 Q4 breaking change

24 files changed, 0 insertions, 1240 deletions

diff --git a/keyboards/mechlovin/infinity87/infinity87.h b/keyboards/mechlovin/infinity87/infinity87.h
deleted file mode 100644
index b7b00bef40..0000000000
--- a/keyboards/mechlovin/infinity87/infinity87.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* Copyright 2020 Team Mechlovin'
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/mechlovin/infinity87/rev1/rev1.h b/keyboards/mechlovin/infinity87/rev1/rev1.h
deleted file mode 100644
index 167ed6940a..0000000000
--- a/keyboards/mechlovin/infinity87/rev1/rev1.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2021 Mechlovin' Studio
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/mechlovin/infinity87/rev1/rogue87/info.json b/keyboards/mechlovin/infinity87/rev1/rogue87/info.json
deleted file mode 100644
index 25fa20a9c7..0000000000
--- a/keyboards/mechlovin/infinity87/rev1/rogue87/info.json
+++ /dev/null
@@ -1,116 +0,0 @@
-{
-    "keyboard_name": "Rogue87 Rev.1",
-    "manufacturer": "Mechlovin.Studio",
-    "url": "",
-    "maintainer": "Mechlovin' Studio",
-    "usb": {
-        "vid": "0x4D4C",
-        "pid": "0x8704",
-        "device_version": "0.0.1"
-    },
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"label":"K00", "x":0, "y":0, "matrix": [0, 0]},
-
-                {"label":"K01", "x":2, "y":0, "matrix": [0, 1]},
-                {"label":"K02", "x":3, "y":0, "matrix": [0, 2]},
-                {"label":"K03", "x":4, "y":0, "matrix": [0, 3]},
-                {"label":"K04", "x":5, "y":0, "matrix": [0, 4]},
-
-                {"label":"K05", "x":6.5, "y":0, "matrix": [0, 5]},
-                {"label":"K06", "x":7.5, "y":0, "matrix": [0, 6]},
-                {"label":"K07", "x":8.5, "y":0, "matrix": [0, 7]},
-                {"label":"K08", "x":9.5, "y":0, "matrix": [0, 8]},
-
-                {"label":"K09", "x":11, "y":0, "matrix": [0, 9]},
-                {"label":"K0A", "x":12, "y":0, "matrix": [0, 10]},
-                {"label":"K0B", "x":13, "y":0, "matrix": [0, 11]},
-                {"label":"K0C", "x":14, "y":0, "matrix": [0, 12]},
-
-                {"label":"K0E", "x":15.25, "y":0, "matrix": [0, 14]},
-                {"label":"K0F", "x":16.25, "y":0, "matrix": [0, 15]},
-                {"label":"K0G", "x":17.25, "y":0, "matrix": [0, 16]},
-
-                {"label":"K10", "x":0, "y":1.25, "matrix": [1, 0]},
-                {"label":"K11", "x":1, "y":1.25, "matrix": [1, 1]},
-                {"label":"K12", "x":2, "y":1.25, "matrix": [1, 2]},
-                {"label":"K13", "x":3, "y":1.25, "matrix": [1, 3]},
-                {"label":"K14", "x":4, "y":1.25, "matrix": [1, 4]},
-                {"label":"K15", "x":5, "y":1.25, "matrix": [1, 5]},
-                {"label":"K16", "x":6, "y":1.25, "matrix": [1, 6]},
-                {"label":"K17", "x":7, "y":1.25, "matrix": [1, 7]},
-                {"label":"K18", "x":8, "y":1.25, "matrix": [1, 8]},
-                {"label":"K19", "x":9, "y":1.25, "matrix": [1, 9]},
-                {"label":"K1A", "x":10, "y":1.25, "matrix": [1, 10]},
-                {"label":"K1B", "x":11, "y":1.25, "matrix": [1, 11]},
-                {"label":"K1C", "x":12, "y":1.25, "matrix": [1, 12]},
-                {"label":"K1D", "x":13, "y":1.25, "w":2, "matrix": [1, 13]},
-
-                {"label":"K1E", "x":15.25, "y":1.25, "matrix": [1, 14]},
-                {"label":"K1F", "x":16.25, "y":1.25, "matrix": [1, 15]},
-                {"label":"K1G", "x":17.25, "y":1.25, "matrix": [1, 16]},
-
-                {"label":"K20", "x":0, "y":2.25, "w":1.5, "matrix": [2, 0]},
-                {"label":"K21", "x":1.5, "y":2.25, "matrix": [2, 1]},
-                {"label":"K22", "x":2.5, "y":2.25, "matrix": [2, 2]},
-                {"label":"K23", "x":3.5, "y":2.25, "matrix": [2, 3]},
-                {"label":"K24", "x":4.5, "y":2.25, "matrix": [2, 4]},
-                {"label":"K25", "x":5.5, "y":2.25, "matrix": [2, 5]},
-                {"label":"K26", "x":6.5, "y":2.25, "matrix": [2, 6]},
-                {"label":"K27", "x":7.5, "y":2.25, "matrix": [2, 7]},
-                {"label":"K28", "x":8.5, "y":2.25, "matrix": [2, 8]},
-                {"label":"K29", "x":9.5, "y":2.25, "matrix": [2, 9]},
-                {"label":"K2A", "x":10.5, "y":2.25, "matrix": [2, 10]},
-                {"label":"K2B", "x":11.5, "y":2.25, "matrix": [2, 11]},
-                {"label":"K2C", "x":12.5, "y":2.25, "matrix": [2, 12]},
-                {"label":"K2D", "x":13.5, "y":2.25, "w":1.5, "matrix": [2, 13]},
-
-                {"label":"K2E", "x":15.25, "y":2.25, "matrix": [2, 14]},
-                {"label":"K2F", "x":16.25, "y":2.25, "matrix": [2, 15]},
-                {"label":"K2G", "x":17.25, "y":2.25, "matrix": [2, 16]},
-
-                {"label":"K30", "x":0, "y":3.25, "w":1.75, "matrix": [3, 0]},
-                {"label":"K31", "x":1.75, "y":3.25, "matrix": [3, 1]},
-                {"label":"K32", "x":2.75, "y":3.25, "matrix": [3, 2]},
-                {"label":"K33", "x":3.75, "y":3.25, "matrix": [3, 3]},
-                {"label":"K34", "x":4.75, "y":3.25, "matrix": [3, 4]},
-                {"label":"K35", "x":5.75, "y":3.25, "matrix": [3, 5]},
-                {"label":"K36", "x":6.75, "y":3.25, "matrix": [3, 6]},
-                {"label":"K37", "x":7.75, "y":3.25, "matrix": [3, 7]},
-                {"label":"K38", "x":8.75, "y":3.25, "matrix": [3, 8]},
-                {"label":"K39", "x":9.75, "y":3.25, "matrix": [3, 9]},
-                {"label":"K3A", "x":10.75, "y":3.25, "matrix": [3, 10]},
-                {"label":"K3B", "x":11.75, "y":3.25, "matrix": [3, 11]},
-                {"label":"K3C", "x":12.75, "y":3.25, "matrix": [3, 12]},
-                {"label":"K3D", "x":13.75, "y":3.25, "w":1.25, "matrix": [3, 13]},
-
-                {"label":"K40", "x":0, "y":4.25, "w":1.25, "matrix": [4, 0]},
-                {"label":"K41", "x":1.25, "y":4.25, "matrix": [4, 1]},
-                {"label":"K42", "x":2.25, "y":4.25, "matrix": [4, 2]},
-                {"label":"K43", "x":3.25, "y":4.25, "matrix": [4, 3]},
-                {"label":"K44", "x":4.25, "y":4.25, "matrix": [4, 4]},
-                {"label":"K45", "x":5.25, "y":4.25, "matrix": [4, 5]},
-                {"label":"K46", "x":6.25, "y":4.25, "matrix": [4, 6]},
-                {"label":"K47", "x":7.25, "y":4.25, "matrix": [4, 7]},
-                {"label":"K48", "x":8.25, "y":4.25, "matrix": [4, 8]},
-                {"label":"K49", "x":9.25, "y":4.25, "matrix": [4, 9]},
-                {"label":"K4A", "x":10.25, "y":4.25, "matrix": [4, 10]},
-                {"label":"K4B", "x":11.25, "y":4.25, "matrix": [4, 11]},
-                {"label":"K4D", "x":12.25, "y":4.25, "w":2.75, "matrix": [4, 13]},
-
-                {"label":"K4F", "x":16.25, "y":4.25, "matrix": [4, 15]},
-
-                {"label":"K50", "x":0, "y":5.25, "w":1.5, "matrix": [5, 0]},
-                {"label":"K52", "x":2.5, "y":5.25, "w":1.5, "matrix": [5, 2]},
-                {"label":"K56", "x":4, "y":5.25, "w":7, "matrix": [5, 6]},
-                {"label":"K5B", "x":11, "y":5.25, "w":1.5, "matrix": [5, 11]},
-                {"label":"K5D", "x":13.5, "y":5.25, "w":1.5, "matrix": [5, 13]},
-
-                {"label":"K5E", "x":15.25, "y":5.25, "matrix": [5, 14]},
-                {"label":"K5F", "x":16.25, "y":5.25, "matrix": [5, 15]},
-                {"label":"K5G", "x":17.25, "y":5.25, "matrix": [5, 16]}
-            ]
-        }
-    }
-}
diff --git a/keyboards/mechlovin/infinity87/rev1/rogue87/keymaps/default/keymap.c b/keyboards/mechlovin/infinity87/rev1/rogue87/keymaps/default/keymap.c
deleted file mode 100644
index 037b22e1c0..0000000000
--- a/keyboards/mechlovin/infinity87/rev1/rogue87/keymaps/default/keymap.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2020 Team Mechlovin'
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received 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_SCRL, 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_HASH, 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_LSFT,                              KC_UP,
-        KC_LCTL,   KC_LALT,                                     KC_SPC,                             KC_LALT,                   KC_LCTL,            KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-};
diff --git a/keyboards/mechlovin/infinity87/rev1/rogue87/keymaps/via/keymap.c b/keyboards/mechlovin/infinity87/rev1/rogue87/keymaps/via/keymap.c
deleted file mode 100644
index 57f974a3df..0000000000
--- a/keyboards/mechlovin/infinity87/rev1/rogue87/keymaps/via/keymap.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/* Copyright 2020 Team Mechlovin'
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received 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_SCRL, 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_HASH, 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_LSFT,                              KC_UP,
-        KC_LCTL,   KC_LALT,                                     KC_SPC,                             KC_LALT,                   KC_LCTL,            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
-    ),
-    [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
-    ),
-    [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
-    ),
-
-};
diff --git a/keyboards/mechlovin/infinity87/rev1/rouge87/info.json b/keyboards/mechlovin/infinity87/rev1/rouge87/info.json
deleted file mode 100644
index 983d20fdbf..0000000000
--- a/keyboards/mechlovin/infinity87/rev1/rouge87/info.json
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-    "keyboard_name": "Rouge87 Rev.1",
-    "manufacturer": "Mechlovin.Studio",
-    "url": "",
-    "maintainer": "Mechlovin' Studio",
-    "usb": {
-        "vid": "0x4D4C",
-        "pid": "0x8703",
-        "device_version": "0.0.1"
-    },
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"label":"K00", "x":0, "y":0, "matrix": [0, 0]},
-
-                {"label":"K01", "x":2, "y":0, "matrix": [0, 1]},
-                {"label":"K02", "x":3, "y":0, "matrix": [0, 2]},
-                {"label":"K03", "x":4, "y":0, "matrix": [0, 3]},
-                {"label":"K04", "x":5, "y":0, "matrix": [0, 4]},
-
-                {"label":"K05", "x":6.5, "y":0, "matrix": [0, 5]},
-                {"label":"K06", "x":7.5, "y":0, "matrix": [0, 6]},
-                {"label":"K07", "x":8.5, "y":0, "matrix": [0, 7]},
-                {"label":"K08", "x":9.5, "y":0, "matrix": [0, 8]},
-
-                {"label":"K09", "x":11, "y":0, "matrix": [0, 9]},
-                {"label":"K0A", "x":12, "y":0, "matrix": [0, 10]},
-                {"label":"K0B", "x":13, "y":0, "matrix": [0, 11]},
-                {"label":"K0C", "x":14, "y":0, "matrix": [0, 12]},
-
-                {"label":"K0E", "x":15.25, "y":0, "matrix": [0, 14]},
-                {"label":"K0F", "x":16.25, "y":0, "matrix": [0, 15]},
-                {"label":"K0G", "x":17.25, "y":0, "matrix": [0, 16]},
-
-                {"label":"K10", "x":0, "y":1.25, "matrix": [1, 0]},
-                {"label":"K11", "x":1, "y":1.25, "matrix": [1, 1]},
-                {"label":"K12", "x":2, "y":1.25, "matrix": [1, 2]},
-                {"label":"K13", "x":3, "y":1.25, "matrix": [1, 3]},
-                {"label":"K14", "x":4, "y":1.25, "matrix": [1, 4]},
-                {"label":"K15", "x":5, "y":1.25, "matrix": [1, 5]},
-                {"label":"K16", "x":6, "y":1.25, "matrix": [1, 6]},
-                {"label":"K17", "x":7, "y":1.25, "matrix": [1, 7]},
-                {"label":"K18", "x":8, "y":1.25, "matrix": [1, 8]},
-                {"label":"K19", "x":9, "y":1.25, "matrix": [1, 9]},
-                {"label":"K1A", "x":10, "y":1.25, "matrix": [1, 10]},
-                {"label":"K1B", "x":11, "y":1.25, "matrix": [1, 11]},
-                {"label":"K1C", "x":12, "y":1.25, "matrix": [1, 12]},
-                {"label":"K1D", "x":13, "y":1.25, "w":2, "matrix": [1, 13]},
-
-                {"label":"K1E", "x":15.25, "y":1.25, "matrix": [1, 14]},
-                {"label":"K1F", "x":16.25, "y":1.25, "matrix": [1, 15]},
-                {"label":"K1G", "x":17.25, "y":1.25, "matrix": [1, 16]},
-
-                {"label":"K20", "x":0, "y":2.25, "w":1.5, "matrix": [2, 0]},
-                {"label":"K21", "x":1.5, "y":2.25, "matrix": [2, 1]},
-                {"label":"K22", "x":2.5, "y":2.25, "matrix": [2, 2]},
-                {"label":"K23", "x":3.5, "y":2.25, "matrix": [2, 3]},
-                {"label":"K24", "x":4.5, "y":2.25, "matrix": [2, 4]},
-                {"label":"K25", "x":5.5, "y":2.25, "matrix": [2, 5]},
-                {"label":"K26", "x":6.5, "y":2.25, "matrix": [2, 6]},
-                {"label":"K27", "x":7.5, "y":2.25, "matrix": [2, 7]},
-                {"label":"K28", "x":8.5, "y":2.25, "matrix": [2, 8]},
-                {"label":"K29", "x":9.5, "y":2.25, "matrix": [2, 9]},
-                {"label":"K2A", "x":10.5, "y":2.25, "matrix": [2, 10]},
-                {"label":"K2B", "x":11.5, "y":2.25, "matrix": [2, 11]},
-                {"label":"K2C", "x":12.5, "y":2.25, "matrix": [2, 12]},
-                {"label":"K2D", "x":13.5, "y":2.25, "w":1.5, "matrix": [2, 13]},
-
-                {"label":"K2E", "x":15.25, "y":2.25, "matrix": [2, 14]},
-                {"label":"K2F", "x":16.25, "y":2.25, "matrix": [2, 15]},
-                {"label":"K2G", "x":17.25, "y":2.25, "matrix": [2, 16]},
-
-                {"label":"K30", "x":0, "y":3.25, "w":1.75, "matrix": [3, 0]},
-                {"label":"K31", "x":1.75, "y":3.25, "matrix": [3, 1]},
-                {"label":"K32", "x":2.75, "y":3.25, "matrix": [3, 2]},
-                {"label":"K33", "x":3.75, "y":3.25, "matrix": [3, 3]},
-                {"label":"K34", "x":4.75, "y":3.25, "matrix": [3, 4]},
-                {"label":"K35", "x":5.75, "y":3.25, "matrix": [3, 5]},
-                {"label":"K36", "x":6.75, "y":3.25, "matrix": [3, 6]},
-                {"label":"K37", "x":7.75, "y":3.25, "matrix": [3, 7]},
-                {"label":"K38", "x":8.75, "y":3.25, "matrix": [3, 8]},
-                {"label":"K39", "x":9.75, "y":3.25, "matrix": [3, 9]},
-                {"label":"K3A", "x":10.75, "y":3.25, "matrix": [3, 10]},
-                {"label":"K3B", "x":11.75, "y":3.25, "matrix": [3, 11]},
-                {"label":"K3C", "x":12.75, "y":3.25, "matrix": [3, 12]},
-                {"label":"K3D", "x":13.75, "y":3.25, "w":1.25, "matrix": [3, 13]},
-
-                {"label":"K40", "x":0, "y":4.25, "w":1.25, "matrix": [4, 0]},
-                {"label":"K41", "x":1.25, "y":4.25, "matrix": [4, 1]},
-                {"label":"K42", "x":2.25, "y":4.25, "matrix": [4, 2]},
-                {"label":"K43", "x":3.25, "y":4.25, "matrix": [4, 3]},
-                {"label":"K44", "x":4.25, "y":4.25, "matrix": [4, 4]},
-                {"label":"K45", "x":5.25, "y":4.25, "matrix": [4, 5]},
-                {"label":"K46", "x":6.25, "y":4.25, "matrix": [4, 6]},
-                {"label":"K47", "x":7.25, "y":4.25, "matrix": [4, 7]},
-                {"label":"K48", "x":8.25, "y":4.25, "matrix": [4, 8]},
-                {"label":"K49", "x":9.25, "y":4.25, "matrix": [4, 9]},
-                {"label":"K4A", "x":10.25, "y":4.25, "matrix": [4, 10]},
-                {"label":"K4B", "x":11.25, "y":4.25, "matrix": [4, 11]},
-                {"label":"K4D", "x":12.25, "y":4.25, "w":2.75, "matrix": [4, 13]},
-
-                {"label":"K4F", "x":16.25, "y":4.25, "matrix": [4, 15]},
-
-                {"label":"K50", "x":0, "y":5.25, "w":1.5, "matrix": [5, 0]},
-                {"label":"K51", "x":1.5, "y":5.25, "matrix": [5, 1]},
-                {"label":"K52", "x":2.5, "y":5.25, "w":1.5, "matrix": [5, 2]},
-                {"label":"K56", "x":4, "y":5.25, "w":7, "matrix": [5, 6]},
-                {"label":"K5B", "x":11, "y":5.25, "w":1.5, "matrix": [5, 11]},
-                {"label":"K5C", "x":12.5, "y":5.25, "matrix": [5, 12]},
-                {"label":"K5D", "x":13.5, "y":5.25, "w":1.5, "matrix": [5, 13]},
-
-                {"label":"K5E", "x":15.25, "y":5.25, "matrix": [5, 14]},
-                {"label":"K5F", "x":16.25, "y":5.25, "matrix": [5, 15]},
-                {"label":"K5G", "x":17.25, "y":5.25, "matrix": [5, 16]}
-            ]
-        }
-    }
-}
diff --git a/keyboards/mechlovin/infinity87/rev1/rouge87/keymaps/default/keymap.c b/keyboards/mechlovin/infinity87/rev1/rouge87/keymaps/default/keymap.c
deleted file mode 100644
index e1f5113669..0000000000
--- a/keyboards/mechlovin/infinity87/rev1/rouge87/keymaps/default/keymap.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2020 Team Mechlovin'
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received 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_SCRL, 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_HASH, 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_LSFT,                              KC_UP,
-        KC_LCTL,   KC_LGUI, KC_LALT,                            KC_SPC,                             KC_LALT, KC_LGUI,          KC_LCTL,            KC_LEFT, KC_DOWN, KC_RGHT
-    ),
-};
diff --git a/keyboards/mechlovin/infinity87/rev1/rouge87/keymaps/via/keymap.c b/keyboards/mechlovin/infinity87/rev1/rouge87/keymaps/via/keymap.c
deleted file mode 100644
index 151de57029..0000000000
--- a/keyboards/mechlovin/infinity87/rev1/rouge87/keymaps/via/keymap.c
+++ /dev/null
@@ -1,53 +0,0 @@
-/* Copyright 2020 Team Mechlovin'
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received 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_SCRL, 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_HASH, 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_LSFT,                              KC_UP,
-        KC_LCTL,   KC_LGUI, KC_LALT,                            KC_SPC,                             KC_LALT, KC_LGUI,          KC_LCTL,            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
-    ),
-    [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
-    ),
-    [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
-    ),
-
-};
diff --git a/keyboards/mechlovin/infinity87/rev1/standard/config.h b/keyboards/mechlovin/infinity87/rev1/standard/config.h
deleted file mode 100644
index f154c344b3..0000000000
--- a/keyboards/mechlovin/infinity87/rev1/standard/config.h
+++ /dev/null
@@ -1,34 +0,0 @@
-/* Copyright 2020 Team Mechlovin'
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should 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 A15
-#define RGBLED_NUM 26
-#define RGBLIGHT_SLEEP  /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-#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_TWINKLE
-
-// generated by KBFirmware JSON to QMK Parser
-// https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/mechlovin/infinity87/rev1/standard/info.json b/keyboards/mechlovin/infinity87/rev1/standard/info.json
deleted file mode 100644
index 29597cce3f..0000000000
--- a/keyboards/mechlovin/infinity87/rev1/standard/info.json
+++ /dev/null
@@ -1,122 +0,0 @@
-{
-    "keyboard_name": "infinity87 Rev.1",
-    "manufacturer": "Mechlovin.Studio",
-    "url": "",
-    "maintainer": "Team Mechlovin'",
-    "usb": {
-        "vid": "0x4D4C",
-        "pid": "0x8701",
-        "device_version": "0.0.1"
-    },
-    "layouts": {
-        "LAYOUT_all": {
-            "layout": [
-                {"label":"K00 (B0,B6)", "x":0, "y":0, "matrix": [0, 0]},
-
-                {"label":"K01 (B0,F4)", "x":2, "y":0, "matrix": [0, 1]},
-                {"label":"K02 (B0,C0)", "x":3, "y":0, "matrix": [0, 2]},
-                {"label":"K03 (B0,C1)", "x":4, "y":0, "matrix": [0, 3]},
-                {"label":"K04 (B0,C2)", "x":5, "y":0, "matrix": [0, 4]},
-
-                {"label":"K05 (B0,C3)", "x":6.5, "y":0, "matrix": [0, 5]},
-                {"label":"K06 (B0,C4)", "x":7.5, "y":0, "matrix": [0, 6]},
-                {"label":"K07 (B0,C5)", "x":8.5, "y":0, "matrix": [0, 7]},
-                {"label":"K08 (B0,C6)", "x":9.5, "y":0, "matrix": [0, 8]},
-
-                {"label":"K09 (B0,C7)", "x":11, "y":0, "matrix": [0, 9]},
-                {"label":"K0A (B0,D0)", "x":12, "y":0, "matrix": [0, 10]},
-                {"label":"K0B (B0,D1)", "x":13, "y":0, "matrix": [0, 11]},
-                {"label":"K0C (B0,D2)", "x":14, "y":0, "matrix": [0, 12]},
-
-                {"label":"K0E (B0,D4)", "x":15.25, "y":0, "matrix": [0, 14]},
-                {"label":"K0F (B0,D5)", "x":16.25, "y":0, "matrix": [0, 15]},
-                {"label":"K0G (B0,D6)", "x":17.25, "y":0, "matrix": [0, 16]},
-
-                {"label":"K10 (B1,B6)", "x":0, "y":1.25, "matrix": [1, 0]},
-                {"label":"K11 (B1,F4)", "x":1, "y":1.25, "matrix": [1, 1]},
-                {"label":"K12 (B1,C0)", "x":2, "y":1.25, "matrix": [1, 2]},
-                {"label":"K13 (B1,C1)", "x":3, "y":1