Merge remote-tracking branch 'origin/develop'

30 files changed, 0 insertions, 1242 deletions

diff --git a/keyboards/space_space/readme.md b/keyboards/space_space/readme.md
deleted file mode 100644
index 08fa640f22..0000000000
--- a/keyboards/space_space/readme.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# space_space
-
-![space_space](https://i.imgur.com/SxjhzIMl.jpg)
-
-Give your space some space  
-
-* Keyboard Maintainer: https://github.com/qpockets
-* Hardware Availability: [p3dstore](https://p3dstore.com/products/space-space-acrylic-case?_pos=21&_sid=c75de6a78&_ss=r&variant=39907740844216)
-
-Make example for this keyboard (after setting up your build environment):
-
-    make space_space/rev2:default
-
-Flashing example for this keyboard:
-
-    make space_space/rev2:default:flash
-
-See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/space_space/rev1/config.h b/keyboards/space_space/rev1/config.h
deleted file mode 100644
index d52aad4c2b..0000000000
--- a/keyboards/space_space/rev1/config.h
+++ /dev/null
@@ -1,54 +0,0 @@
-/* Copyright 2020 qpockets
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "config_common.h"
-
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x7170
-#define PRODUCT_ID 0x7373
-#define DEVICE_VER 0x3000
-#define MANUFACTURER qpockets
-#define PRODUCT space_space
-
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 11
-
-#define MATRIX_ROW_PINS \
-    { F1, F4, F5, C7 }
-#define MATRIX_COL_PINS \
-    { D4, B4, B5, B6, C6, F7, F6, F0, B0, E6, B1 }
-
-#define UNUSED_PINS
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-/* ROTARY ENCODERS */
-#define ENCODERS_PAD_A \
-    { B3, D6 }
-#define ENCODERS_PAD_B \
-    { B2, D7 }
-
-#define ENCODER_RESOLUTIONS \
-    { 3, 4 }
-//#define ENCODER_DIRECTION_FLIP
-
-#define DEBOUNCE 7
-
-#define LOCKING_SUPPORT_ENABLE
diff --git a/keyboards/space_space/rev1/info.json b/keyboards/space_space/rev1/info.json
deleted file mode 100644
index 5bac73c642..0000000000
--- a/keyboards/space_space/rev1/info.json
+++ /dev/null
@@ -1,90 +0,0 @@
-{
-  "keyboard_name": "space_space",
-  "url": "",
-  "maintainer": "qpockets",
-  "layouts": {
-    "LAYOUT_default": {
-	  "layout": [
-			{"label":"Q", "x":0, "y":0}, 
-			{"label":"W", "x":1, "y":0}, 
-			{"label":"E", "x":2, "y":0}, 
-			{"label":"R", "x":3, "y":0}, 
-			{"label":"T", "x":4, "y":0}, 
-			{"label":"Delete", "x":5, "y":0, "w":1.5}, 
-			{"label":"Y", "x":6.5, "y":0}, 
-			{"label":"U", "x":7.5, "y":0}, 
-			{"label":"I", "x":8.5, "y":0}, 
-			{"label":"O", "x":9.5, "y":0}, 
-			{"label":"P", "x":10.5, "y":0}, 
-			{"label":"A", "x":0, "y":1}, 
-			{"label":"S", "x":1, "y":1}, 
-			{"label":"D", "x":2, "y":1}, 
-			{"label":"F", "x":3, "y":1}, 
-			{"label":"G", "x":4, "y":1}, 
-			{"label":"Tab", "x":5, "y":1, "w":1.5}, 
-			{"label":"H", "x":6.5, "y":1}, 
-			{"label":"J", "x":7.5, "y":1}, 
-			{"label":"K", "x":8.5, "y":1}, 
-			{"label":"L", "x":9.5, "y":1}, 
-			{"label":"\"", "x":10.5, "y":1}, 
-			{"label":"Z", "x":0, "y":2}, 
-			{"label":"X", "x":1, "y":2}, 
-			{"label":"C", "x":2, "y":2}, 
-			{"label":"V", "x":3, "y":2}, 
-			{"label":"B", "x":4, "y":2}, 
-			{"label":"Shift", "x":5, "y":2, "w":1.5}, 
-			{"label":"N", "x":6.5, "y":2}, 
-			{"label":"M", "x":7.5, "y":2}, 
-			{"label":"<", "x":8.5, "y":2}, 
-			{"label":">", "x":9.5, "y":2}, 
-			{"label":"?", "x":10.5, "y":2}, 
-			{"label":"Ctrl", "x":1.25, "y":3.35, "w":1.25}, 
-			{"label":"Fn", "x":2.5, "y":3.35}, 
-			{"label":"Backspace", "x":3.5, "y":3.35, "w":2}, 
-			{"label":"Space", "x":5.5, "y":3.35, "w":2.25}, 
-			{"label":"Gui", "x":7.75, "y":3.35}, 
-			{"label":"Alt", "x":8.75, "y":3.35, "w":1.25}
-      ]
-    },
-	    "LAYOUT_big_space": {
-      "layout": [
-			{"label":"Q", "x":0, "y":0}, 
-			{"label":"W", "x":1, "y":0}, 
-			{"label":"E", "x":2, "y":0}, 
-			{"label":"R", "x":3, "y":0}, 
-			{"label":"T", "x":4, "y":0}, 
-			{"label":"Delete", "x":5, "y":0, "w":1.5}, 
-			{"label":"Y", "x":6.5, "y":0}, 
-			{"label":"U", "x":7.5, "y":0}, 
-			{"label":"I", "x":8.5, "y":0}, 
-			{"label":"O", "x":9.5, "y":0}, 
-			{"label":"P", "x":10.5, "y":0}, 
-			{"label":"A", "x":0, "y":1}, 
-			{"label":"S", "x":1, "y":1}, 
-			{"label":"D", "x":2, "y":1}, 
-			{"label":"F", "x":3, "y":1}, 
-			{"label":"G", "x":4, "y":1}, 
-			{"label":"Tab", "x":5, "y":1, "w":1.5}, 
-			{"label":"H", "x":6.5, "y":1}, 
-			{"label":"J", "x":7.5, "y":1}, 
-			{"label":"K", "x":8.5, "y":1}, 
-			{"label":"L", "x":9.5, "y":1}, 
-			{"label":"\"", "x":10.5, "y":1}, 
-			{"label":"Z", "x":0, "y":2}, 
-			{"label":"X", "x":1, "y":2}, 
-			{"label":"C", "x":2, "y":2}, 
-			{"label":"V", "x":3, "y":2}, 
-			{"label":"B", "x":4, "y":2}, 
-			{"label":"Shift", "x":5, "y":2, "w":1.5}, 
-			{"label":"N", "x":6.5, "y":2}, 
-			{"label":"M", "x":7.5, "y":2}, 
-			{"label":"<", "x":8.5, "y":2}, 
-			{"label":">", "x":9.5, "y":2}, 
-			{"label":"?", "x":10.5, "y":2}, 
-			{"label":"Ctrl", "x":1.25, "y":3.35, "w":1.25}, 
-			{"label":"Space", "x":2.5, "y":3.35, "w":6.25}, 
-			{"label":"Alt", "x":8.75, "y":3.35, "w":1.25}
-      ]
-    }
-  }
-}
diff --git a/keyboards/space_space/rev1/keymaps/big_space/config.h b/keyboards/space_space/rev1/keymaps/big_space/config.h
deleted file mode 100644
index ffc2124e1b..0000000000
--- a/keyboards/space_space/rev1/keymaps/big_space/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2021 qpockets
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/*Modtaps*/
-#define TAPPING_TERM 175
-#define IGNORE_MOD_TAP_INTERRUPT
-
-/*Combos*/
-#ifdef COMBO_ENABLE
-#    define COMBO_COUNT 5
-#    define COMBO_TERM 50
-#endif 
\ No newline at end of file
diff --git a/keyboards/space_space/rev1/keymaps/big_space/keymap.c b/keyboards/space_space/rev1/keymaps/big_space/keymap.c
deleted file mode 100644
index 62241532e8..0000000000
--- a/keyboards/space_space/rev1/keymaps/big_space/keymap.c
+++ /dev/null
@@ -1,130 +0,0 @@
-/* Copyright 2020 qpockets
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-enum layers{
-  _BASE,
-  _SYM,
-  _NUM,
-  _NAV
-};
-
-enum combo_events {
- COMBO_BSPC,
- COMBO_ENT,
- COMBO_TAB,
- COMBO_ESC,
- COMBO_DEL
-};
-#define KC_UP_SPC LT(_SYM, KC_SPC)
-#define KC_GZ LGUI_T(KC_Z)
-#define KC_AA LALT_T(KC_A)
-#define KC_CC LCTL_T(KC_C)
-#define KC_SF LSFT_T(KC_F)
-#define KC_SJ RSFT_T(KC_J)
-#define KC_CCOMM RCTL_T(KC_COMM)
-#define KC_AQUOT RALT_T(KC_QUOT)
-#define KC_GSLSH RGUI_T(KC_SLSH)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT_big_space(
-    KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_DEL,   KC_Y,   KC_U,   KC_I,    KC_O,   KC_P,
-    KC_AA,   KC_S,   KC_D,  KC_SF,   KC_G,   KC_BSPC,   KC_H,   KC_SJ,  KC_K,    KC_L,   KC_AQUOT,
-    KC_GZ,   KC_X,   KC_CC,   KC_V,    KC_B,   KC_LSFT,  KC_N,   KC_M,   KC_CCOMM, KC_DOT, KC_GSLSH,
-                  MO(_NAV),  KC_UP_SPC,  KC_RALT
-  ),
-
- [_SYM] = LAYOUT_big_space(
-    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_TRNS, KC_6,    KC_7,    KC_8,    KC_9,     KC_0,
-    KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_TRNS, KC_CIRC, KC_AMPR, KC_ASTR, KC_EQUAL, KC_MINS,
-    KC_PIPE, KC_BSLS, KC_LPRN, KC_LBRC, KC_SCLN, KC_TRNS, KC_COLN, KC_RBRC, KC_RPRN, KC_PLUS,  KC_UNDS,
-                    KC_TRNS,      KC_TRNS,      KC_TRNS
-  ),
-
-  [_NAV] = LAYOUT_big_space(
-    KC_HOME, KC_UP,   KC_END,   KC_PGUP, KC_TRNS, RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSPC,
-    KC_LEFT, KC_DOWN, KC_RIGHT, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TAB,
-    KC_MPRV, KC_MPLY, KC_MNXT,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_ENT,
-                    KC_TRNS,   KC_TRNS,   KC_TRNS
-  ),
-};
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 1) { /* left encoder*/
-        switch(get_highest_layer(layer_state)){
-
-			 case _NAV:
-                if (clockwise) {
-                tap_code16(C(KC_TAB));
-                } else {
-                tap_code16(C(S(KC_TAB)));
-                }
-                break;
-
-            case _SYM:
-                if (clockwise) {
-                tap_code(KC_PGUP);
-                } else {
-                tap_code(KC_PGDN);
-
-                }
-                break;
-
-            default:
-                if (clockwise){
-                    tap_code(KC_WH_U);
-                } else{
-                    tap_code(KC_WH_D);
-                }
-                break;
-      }
-    } else if (index == 0) { /* right encoder */
-	           switch(get_highest_layer(layer_state)){
-            case _SYM:
-                if (clockwise) {
-                tap_code(KC_MPRV);
-                } else {
-                tap_code(KC_MNXT);
-                }
-                break;
-
-            default:
-                if (clockwise){
-                    tap_code(KC_VOLU);
-                } else{
-                    tap_code(KC_VOLD);
-                }
-                break;
-        }
-    }
-    return true;
-}
-
-#ifdef COMBO_ENABLE
-const uint16_t PROGMEM combo_bspc[] = {KC_O, KC_P, COMBO_END};
-const uint16_t PROGMEM combo_ent[] = {KC_K, KC_L, COMBO_END};
-const uint16_t PROGMEM combo_tab[] = {KC_S, KC_D, COMBO_END};
-const uint16_t PROGMEM combo_esc[] = {KC_T, KC_Y, COMBO_END};
-const uint16_t PROGMEM combo_del[] = {KC_Q, KC_W, COMBO_END};
-
-combo_t key_combos[COMBO_COUNT] = {
-  [COMBO_BSPC] = COMBO(combo_bspc,KC_BSPC),
-  [COMBO_ENT] = COMBO(combo_ent,KC_ENT),
-  [COMBO_TAB] = COMBO(combo_tab,KC_TAB),
-  [COMBO_ESC] = COMBO(combo_esc,KC_ESC),
-  [COMBO_DEL] = COMBO(combo_del,KC_DEL)
-};
-#endif
diff --git a/keyboards/space_space/rev1/keymaps/big_space/rules.mk b/keyboards/space_space/rev1/keymaps/big_space/rules.mk
deleted file mode 100644
index ff681299e4..0000000000
--- a/keyboards/space_space/rev1/keymaps/big_space/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-COMBO_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/space_space/rev1/keymaps/default/config.h b/keyboards/space_space/rev1/keymaps/default/config.h
deleted file mode 100644
index ffc2124e1b..0000000000
--- a/keyboards/space_space/rev1/keymaps/default/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2021 qpockets
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/*Modtaps*/
-#define TAPPING_TERM 175
-#define IGNORE_MOD_TAP_INTERRUPT
-
-/*Combos*/
-#ifdef COMBO_ENABLE
-#    define COMBO_COUNT 5
-#    define COMBO_TERM 50
-#endif 
\ No newline at end of file
diff --git a/keyboards/space_space/rev1/keymaps/default/keymap.c b/keyboards/space_space/rev1/keymaps/default/keymap.c
deleted file mode 100644
index 6b4219b289..0000000000
--- a/keyboards/space_space/rev1/keymaps/default/keymap.c
+++ /dev/null
@@ -1,132 +0,0 @@
-/* Copyright 2020 qpockets
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include QMK_KEYBOARD_H
-
-enum layers{
-  _BASE,
-  _SYM,
-  _NUM,
-  _NAV
-};
-
-enum combo_events {
- COMBO_BSPC,
- COMBO_ENT,
- COMBO_TAB,
- COMBO_ESC,
- COMBO_DEL
-};
-#define KC_DN_BSPC LT(_NUM, KC_BSPC)
-#define KC_UP_SPC LT(_SYM, KC_SPC)
-#define KC_SF LSFT_T(KC_F)
-#define KC_SJ RSFT_T(KC_J)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT_default(
-    KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_DEL,   KC_Y,   KC_U,   KC_I,    KC_O,   KC_P,
-    KC_A,   KC_S,   KC_D,  KC_SF,   KC_G,   KC_TAB,  KC_H,   KC_SJ,  KC_K,    KC_L,   KC_QUOT,
-    KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_LSFT,  KC_N,   KC_M,   KC_COMM, KC_DOT, KC_SLSH,
-                  KC_LCTL, MO(_NAV), KC_DN_BSPC,    KC_UP_SPC, KC_LGUI,   KC_RALT
-  ),
-
- [_SYM] = LAYOUT_default(
-    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_TRNS, KC_6,    KC_7,    KC_8,    KC_9,     KC_0,
-    KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_TRNS, KC_CIRC, KC_AMPR, KC_ASTR, KC_EQUAL, KC_MINS,
-    KC_PIPE, KC_BSLS, KC_LPRN, KC_LBRC, KC_SCLN, KC_TRNS, KC_COLN, KC_RBRC, KC_RPRN, KC_PLUS,  KC_UNDS,
-                    KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,      KC_TRNS,    KC_TRNS
-  ),
-
-  [_NUM] = LAYOUT_default(
-    KC_PSLS,  KC_P7, KC_P8, KC_P9, KC_PMNS, KC_EQL,  KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_BSPC,
-    KC_PLUS,  KC_P4, KC_P5, KC_P6, KC_BSPC, KC_LSFT, KC_TRNS, KC_TRNS, KC_SCLN,  KC_COLN,  KC_TAB,
-    KC_PAST,  KC_P1, KC_P2, KC_P3, KC_ENT,  KC_TAB,  KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_ENT,
-                    KC_P0,   KC_PDOT,  KC_TRNS,   KC_TRNS,   KC_TRNS, KC_TRNS
-  ),
-
-  [_NAV] = LAYOUT_default(
-    KC_HOME, KC_UP,   KC_END,   KC_PGUP, KC_TRNS, RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSPC,
-    KC_LEFT, KC_DOWN, KC_RIGHT, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TAB,
-    KC_MPRV, KC_MPLY, KC_MNXT,  KC_TRNS, KC_TRNS, KC_LCAP, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_ENT,
-                    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS
-  ),
-};
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 1) { /* left encoder*/
-        switch(get_highest_layer(layer_state)){
-
-			 case _NAV:
-                if (clockwise) {
-                tap_code16(C(KC_TAB));
-                } else {
-                tap_code16(C(S(KC_TAB)));
-                }
-                break;
-
-            case _NUM:
-                if (clockwise) {
-                tap_code(KC_PGUP);
-                } else {
-                tap_code(KC_PGDN);
-
-                }
-                break;
-
-            default:
-                if (clockwise){
-                    tap_code(KC_WH_U);
-                } else{
-                    tap_code(KC_WH_D);
-                }
-                break;
-      }
-    } else if (index == 0) { /* right encoder */
-        switch(get_highest_layer(layer_state)){
-            case _SYM:
-                if (clockwise) {
-                tap_code(KC_MPRV);
-                } else {
-                tap_code(KC_MNXT);
-                }
-                break;
-
-            default:
-                if (clockwise){
-                    tap_code(KC_VOLU);
-                } else{
-                    tap_code(KC_VOLD);
-                }
-                break;
-        }
-    }
-    return true;
-}
-
-#ifdef COMBO_ENABLE
-const uint16_t PROGMEM combo_bspc[] = {KC_O, KC_P, COMBO_END};
-const uint16_t PROGMEM combo_ent[] = {KC_K, KC_L, COMBO_END};
-const uint16_t PROGMEM combo_tab[] = {KC_S, KC_D, COMBO_END};
-const uint16_t PROGMEM combo_esc[] = {KC_T, KC_Y, COMBO_END};
-const uint16_t PROGMEM combo_del[] = {KC_Q, KC_W, COMBO_END};
-
-combo_t key_combos[COMBO_COUNT] = {
-  [COMBO_BSPC] = COMBO(combo_bspc,KC_BSPC),
-  [COMBO_ENT] = COMBO(combo_ent,KC_ENT),
-  [COMBO_TAB] = COMBO(combo_tab,KC_TAB),
-  [COMBO_ESC] = COMBO(combo_esc,KC_ESC),
-  [COMBO_DEL] = COMBO(combo_del,KC_DEL)
-};
-#endif
diff --git a/keyboards/space_space/rev1/keymaps/default/rules.mk b/keyboards/space_space/rev1/keymaps/default/rules.mk
deleted file mode 100644
index ff681299e4..0000000000
--- a/keyboards/space_space/rev1/keymaps/default/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-COMBO_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/space_space/rev1/keymaps/readme.md b/keyboards/space_space/rev1/keymaps/readme.md
deleted file mode 100644
index 79e944c711..0000000000
--- a/keyboards/space_space/rev1/keymaps/readme.md
+++ /dev/null
@@ -1,76 +0,0 @@
-space space default layout
-
-Default layout on space space uses 3 layers + base, 5 combos, layer taps on the split space bars, and tap-hold for shift on F & J.
-
-* combos include:
-
-O+P = backspace
-
-K+L = enter
-
-S+D = tab
-
-T+Y = escape
-
-Q+W = delete
-
-
-* The encoders are also set to function differently depending on layer:
-
-right encoder
-default = volume up/down
-
-symbol layer (hold space) = media next/previous
-
-left encoder
-default = mousewheel up/down
-
-number layer (hold backspace) = page up/down
-
-nav layer (hold Fn) = control tab/control shift tab
-
-Default Layout:
-
-```
-Base
-
- ,-------------------------------------------------------------------.
- |  Q  |  W  |  E  |  R  |  T  |  Del  |  Y  |  U  |  I  |  O  |  P  |
- |-----+-----+-----+-----+-----+-------+-----+-----+-----+-----+-----|
- |  A  |  S  |  D  |  F  |  G  |  Tab  |  H  |  J  |  K  |  L  |  "  |
- |-----+-----+-----+-----+-----+-------+-----+-----+-----+-----+-----|
- |  Z  |  X  |  C  |  V  |  B  | Shift |  N  |  M  |  ,  |  .  |  /  |
- `-----+-----+-----+-----+-----+-------+-----+-----+-----+-----+-----'
-          | Ctrl | FN  |   Back   |   Space    | Gui |  Alt  |
-           `-------------------------------------------------'
-Symbols
- ,-------------------------------------------------------------------.
- |  1  |  2  |  3  |  4  |  5  |  Del  |  6  |  7  |  8  |  9  |  0  |
- |-----+-----+-----+-----+-----+-------+-----+-----+-----+-----+-----|
- |  !  |  @  |  #  |  $  |  %  |  Tab  |  ^  |  &  |  *  |  =  |  -  |
- |-----+-----+-----+-----+-----+-------+-----+-----+-----+-----+-----|
- |  |  |  \  |  (  |  [  |  ;  | Shift |  :  |  ]  |  )  |  +  |  _  |
- `-----+-----+-----+-----+-----+-------+-----+-----+-----+-----+-----'
-          | Ctrl | FN  |   Back   |   Space    | Gui |  Alt  |
-           `-------------------------------------------------'
-Numpad
- ,-------------------------------------------------------------------.
- |  /  |  7  |  8  |  9  |  -  |   =   |  Y  |  U  |  I  |  O  | Bsp |
- |-----+-----+-----+-----+-----+-------+-----+-----+-----+-----+-----|
- |  +  |  4  |  5  |  6  | Bsp | Shift |  H  |  J  |  K  |  L  | Tab |
- |-----+-----+-----+-----+-----+-------+-----+-----+-----+-----+-----|
- |  *  |  1  |  2  |  3  | Ent |  Tab  |  N  |  M  |  ,  |  .  | Ent |
- `-----+-----+-----+-----+-----+-------+-----+-----+-----+-----+-----'
-          |   0  |  .  |   Back   |   Space    | Gui |  Alt  |
-           `-------------------------------------------------'
-Nav
- ,-------------------------------------------------------------------.
- |  Hm |  Up | End | PgU |  T  |  Del  |  Y  |  U  |  I  |  O  | Bsp |
- |-----+-----+-----+-----+-----+-------+-----+-----+-----+-----+-----|
- | Lft |  Dn | Rgt | PgD |  G  |  Tab  |  H  |  J  |  K  |  L  | Tab |
- |-----+-----+-----+-----+-----+-------+-----+-----+-----+-----+-----|
- | Prv | Pse | Nxt |  V  |  B  |  Caps |  N  |  M  |  ,  |  .  | Ent |
- `-----+-----+-----+-----+-----+-------+-----+-----+-----+-----+-----'
-          | Ctrl | FN  |   Back   |   Space    | Gui |  Alt  |
-           `-------------------------------------------------'
-		   
diff --git a/keyboards/space_space/rev1/readme.md b/keyboards/space_space/rev1/readme.md
deleted file mode 100644
index 4b170612e8..0000000000
--- a/keyboards/space_space/rev1/readme.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# space_space
-
-![space_space](https://i.imgur.com/qdkG8K7l.jpg)
-
-Give your space some space  
-
-* Keyboard Maintainer: https://github.com/qpockets
-* Hardware Availability: limited
-
-Make example for this keyboard (after setting up your build environment):
-
-    make space_space/rev1:default
-
-Flashing example for this keyboard:
-
-    make space_space/rev1:default:flash
-
-See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/space_space/rev1/rev1.c b/keyboards/space_space/rev1/rev1.c
deleted file mode 100644
index e639552cfb..0000000000
--- a/keyboards/space_space/rev1/rev1.c
+++ /dev/null
@@ -1,17 +0,0 @@
-
-/* Copyright 2020 qpockets
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "rev1.h"
diff --git a/keyboards/space_space/rev1/rev1.h b/keyboards/space_space/rev1/rev1.h
deleted file mode 100644
index e56068ec42..0000000000
--- a/keyboards/space_space/rev1/rev1.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/* Copyright 2020 qpockets
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_default( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K50, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K51, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K52, \
-              K32, K33, K34,      K36, K37, K38 \
-) { \
-    {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K50}, \
-    {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K51}, \
-    {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K52}, \
-    {XXX, XXX, K32, K33, K34, XXX, K36, K37, K38, XXX, XXX} \
-}
-
-#define LAYOUT_big_space( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K50, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K51, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K52, \
-              K32,           K35,           K38 \
-) { \
-    {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K50}, \
-    {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K51}, \
-    {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K52}, \
-    {XXX, XXX, K32, XXX, XXX, K35, XXX, XXX, K38, XXX, XXX} \
-}
diff --git a/keyboards/space_space/rev1/rules.mk b/keyboards/space_space/rev1/rules.mk
deleted file mode 100644
index 5f58c5684b..0000000000
--- a/keyboards/space_space/rev1/rules.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes
diff --git a/keyboards/space_space/rev2/config.h b/keyboards/space_space/rev2/config.h
deleted file mode 100644
index bb8f04da2b..0000000000
--- a/keyboards/space_space/rev2/config.h
+++ /dev/null
@@ -1,58 +0,0 @@
-/* Copyright 2021 qpockets
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "config_common.h"
-
-/* USB Device descriptor parameter */
-#define VENDOR_ID 0x7170
-#define PRODUCT_ID 0x7373
-#define DEVICE_VER 0x3002
-#define MANUFACTURER qpockets
-#define PRODUCT space_space
-
-/* key matrix size */
-#define MATRIX_ROWS 4
-#define MATRIX_COLS 11
-
-#define MATRIX_ROW_PINS \
-    { B1, B0, D5, B6 }
-#define MATRIX_COL_PINS \
-    { C6, F6, F1, F4, F5, E6, D6, B2, B5, D3, D2 }
-
-#define UNUSED_PINS
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-/* ROTARY ENCODERS */
-#define ENCODERS_PAD_A \
-    { B4, C7 }
-#define ENCODERS_PAD_B \
-    { D7, F7 }
-
-#define ENCODER_RESOLUTION 3
-
-#define DEBOUNCE 5
-
-#define LOCKING_SUPPORT_ENABLE
-
-#define RGB_DI_PIN F0
-#define RGBLED_NUM 4
-
-#define DRIVER_LED_TOTAL RGBLED_NUM
-#define RGBLIGHT_DEFAULT_HUE 130
diff --git a/keyboards/space_space/rev2/info.json b/keyboards/space_space/rev2/info.json
deleted file mode 100644
index 5bac73c642..0000000000
--- a/keyboards/space_space/rev2/info.json
+++ /dev/null
@@ -1,90 +0,0 @@
-{
-  "keyboard_name": "space_space",
-  "url": "",
-  "maintainer": "qpockets",
-  "layouts": {
-    "LAYOUT_default": {
-	  "layout": [
-			{"label":"Q", "x":0, "y":0}, 
-			{"label":"W", "x":1, "y":0}, 
-			{"label":"E", "x":2, "y":0}, 
-			{"label":"R", "x":3, "y":0}, 
-			{"label":"T", "x":4, "y":0}, 
-			{"label":"Delete", "x":5, "y":0, "w":1.5}, 
-			{"label":"Y", "x":6.5, "y":0}, 
-			{"label":"U", "x":7.5, "y":0}, 
-			{"label":"I", "x":8.5, "y":0}, 
-			{"label":"O", "x":9.5, "y":0}, 
-			{"label":"P", "x":10.5, "y":0}, 
-			{"label":"A", "x":0, "y":1}, 
-			{"label":"S", "x":1, "y":1}, 
-			{"label":"D", "x":2, "y":1}, 
-			{"label":"F", "x":3, "y":1}, 
-			{"label":"G", "x":4, "y":1}, 
-			{"label":"Tab", "x":5, "y":1, "w":1.5}, 
-			{"label":"H", "x":6.5, "y":1}, 
-			{"label":"J", "x":7.5, "y":1}, 
-			{"label":"K", "x":8.5, "y":1}, 
-			{"label":"L", "x":9.5, "y":1}, 
-			{"label":"\"", "x":10.5, "y":1}, 
-			{"label":"Z", "x":0, "y":2}, 
-			{"label":"X", "x":1, "y":2}, 
-			{"label":"C", "x":2, "y":2}, 
-			{"label":"V", "x":3, "y":2}, 
-			{"label":"B", "x":4, "y":2}, 
-			{"label":"Shift", "x":5, "y":2, "w":1.5}, 
-			{"label":"N", "x":6.5, "y":2}, 
-			{"label":"M", "x":7.5, "y":2}, 
-			{"label":"<", "x":8.5, "y":2}, 
-			{"label":">", "x":9.5, "y":2}, 
-			{"label":"?", "x":10.5, "y":2}, 
-			{"label":"Ctrl", "x":1.25, "y":3.35, "w":1.25}, 
-			{"label":"Fn", "x":2.5, "y":3.35}, 
-			{"label":"Backspace", "x":3.5, "y":3.35, "w":2}, 
-			{"label":"Space", "x":5.5, "y":3.35, "w":2.25}, 
-			{"label":"Gui", "x":7.75, "y":3.35}, 
-			{"label":"Alt", "x":8.75, "y":3.35, "w":1.25}
-      ]
-    },
-	    "LAYOUT_big_space": {
-      "layout": [
-			{"label":"Q", "x":0, "y":0}, 
-			{"label":"W", "x":1, "y":0}, 
-			{"label":"E", "x":2, "y":0}, 
-			{"label":"R", "x":3, "y":0}, 
-			{"label":"T", "x":4, "y":0}, 
-			{"label":"Delete", "x":5, "y":0, "w":1.5}, 
-			{"label":"Y", "x":6.5, "y":0}, 
-			{"label":"U", "x":7.5, "y":0}, 
-			{"label":"I", "x":8.5, "y":0}, 
-			{"label":"O", "x":9.5, "y":0}, 
-			{"label":"P", "x":10.5, "y":0}, 
-			{"label":"A", "x":0, "y":1}, 
-			{"label":"S", "x":1, "y":1}, 
-			{"label":"D", "x":2, "y":1}, 
-			{"label":"F", "x":3, "y":1}, 
-			{"label":"G", "x":4, "y":1}, 
-			{"label":"Tab", "x":5, "y":1, "w":1.5}, 
-			{"label":"H", "x":6.5, "y":1}, 
-			{"label":"J", "x":7.5, "y":1}, 
-			{"label":"K", "x":8.5, "y":1}, 
-			{"label":"L", "x":9.5, "y":1}, 
-			{"label":"\"", "x":10.5, "y":1}, 
-			{"label":"Z", "x":0, "y":2}, 
-			{"label":"X", "x":1, "y":2}, 
-			{"label":"C", "x":2, "y":2}, 
-			{"label":"V", "x":3, "y":2}, 
-			{"label":"B", "x":4, "y":2}, 
-			{"label":"Shift", "x":5, "y":2, "w":1.5}, 
-			{"label":"N", "x":6.5, "y":2}, 
-			{"label":"M", "x":7.5, "y":2}, 
-			{"label":"<", "x":8.5, "y":2}, 
-			{"label":">", "x":9.5, "y":2}, 
-			{"label":"?", "x":10.5, "y":2}, 
-			{"label":"Ctrl", "x":1.25, "y":3.35, "w":1.25}, 
-			{"label":"Space", "x":2.5, "y":3.35, "w":6.25}, 
-			{"label":"Alt", "x":8.75, "y":3.35, "w":1.25}
-      ]
-    }
-  }
-}
diff --git a/keyboards/space_space/rev2/keymaps/big_space/config.h b/keyboards/space_space/rev2/keymaps/big_space/config.h
deleted file mode 100644
index ffc2124e1b..0000000000
--- a/keyboards/space_space/rev2/keymaps/big_space/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2021 qpockets
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/*Modtaps*/
-#define TAPPING_TERM 175
-#define IGNORE_MOD_TAP_INTERRUPT
-
-/*Combos*/
-#ifdef COMBO_ENABLE
-#    define COMBO_COUNT 5
-#    define COMBO_TERM 50
-#endif 
\ No newline at end of file
diff --git a/keyboards/space_space/rev2/keymaps/big_space/keymap.c b/keyboards/space_space/rev2/keymaps/big_space/keymap.c
deleted file mode 100644
index a272c001b4..0000000000
--- a/keyboards/space_space/rev2/keymaps/big_space/keymap.c
+++ /dev/null
@@ -1,81 +0,0 @@
-/* Copyright 2020 qpockets
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
- 
-#include QMK_KEYBOARD_H
-
-enum layers{
-  _BASE,
-  _SYM,
-  _NUM,
-  _NAV
-};
-
-enum combo_events {
- COMBO_BSPC,
- COMBO_ENT,
- COMBO_TAB,
- COMBO_ESC,
- COMBO_DEL
-};
-#define KC_UP_SPC LT(_SYM, KC_SPC)
-#define KC_GZ LGUI_T(KC_Z)
-#define KC_AA LALT_T(KC_A)
-#define KC_CC LCTL_T(KC_C)
-#define KC_SF LSFT_T(KC_F)
-#define KC_SJ RSFT_T(KC_J)
-#define KC_CCOMM RCTL_T(KC_COMM)
-#define KC_AQUOT RALT_T(KC_QUOT)
-#define KC_GSLSH RGUI_T(KC_SLSH)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT_big_space(
-    KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_DEL,   KC_Y,   KC_U,   KC_I,    KC_O,   KC_P,
-    KC_AA,   KC_S,   KC_D,  KC_SF,   KC_G,   KC_BSPC,   KC_H,   KC_SJ,  KC_K,    KC_L,   KC_AQUOT,
-    KC_GZ,   KC_X,   KC_CC,   KC_V,    KC_B,   KC_LSFT,  KC_N,   KC_M,   KC_CCOMM, KC_DOT, KC_GSLSH,
-                  MO(_NAV),  KC_UP_SPC,  KC_RALT
-  ),
-
- [_SYM] = LAYOUT_big_space(
-    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_TRNS, KC_6,    KC_7,    KC_8,    KC_9,     KC_0,
-    KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_TRNS, KC_CIRC, KC_AMPR, KC_ASTR, KC_EQUAL, KC_MINS,
-    KC_PIPE, KC_BSLS, KC_LPRN, KC_LBRC, KC_SCLN, KC_TRNS, KC_COLN, KC_RBRC, KC_RPRN, KC_PLUS,  KC_UNDS,
-                    KC_TRNS,      KC_TRNS,      KC_TRNS 
-  ),
-
-  [_NAV] = LAYOUT_big_space(
-    KC_HOME, KC_UP,   KC_END,   KC_PGUP, KC_TRNS, RESET,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_BSPC,
-    KC_LEFT, KC_DOWN, KC_RIGHT, KC_PGDN, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TAB,
-    KC_MPRV, KC_MPLY, KC_MNXT,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_ENT,
-                    KC_TRNS,   KC_TRNS,   KC_TRNS 
-  ),
-};
-
-
-#ifdef COMBO_ENABLE
-const uint16_t PROGMEM combo_bspc[] = {KC_O, KC_P, COMBO_END};
-const uint16_t PROGMEM combo_ent[] = {KC_K, KC_L, COMBO_END};
-const uint16_t PROGMEM combo_tab[] = {KC_S, KC_D, COMBO_END};
-const uint16_t PROGMEM combo_esc[] = {KC_T, KC_Y, COMBO_END};
-const uint16_t PROGMEM combo_del[] = {KC_Q, KC_W, COMBO_END};
-
-combo_t key_combos[COMBO_COUNT] = {
-  [COMBO_BSPC] = COMBO(combo_bspc,KC_BSPC),
-  [COMBO_ENT] = COMBO(combo_ent,KC_ENT),
-  [COMBO_TAB] = COMBO(combo_tab,KC_TAB),
-  [COMBO_ESC] = COMBO(combo_esc,KC_ESC),
-  [COMBO_DEL] = COMBO(combo_del,KC_DEL)
-};
-#endif
diff --git a/keyboards/space_space/rev2/keymaps/big_space/rules.mk b/keyboards/space_space/rev2/keymaps/big_space/rules.mk
deleted file mode 100644
index ff681299e4..0000000000
--- a/keyboards/space_space/rev2/keymaps/big_space/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-COMBO_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/space_space/rev2/keymaps/default/config.h b/keyboards/space_space/rev2/keymaps/default/config.h
deleted file mode 100644
index 0b0e89fa1f..0000000000
--- a/keyboards/space_space/rev2/keymaps/default/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2021 qpockets
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/*Modtaps*/
-#define TAPPING_TERM 165
-#define IGNORE_MOD_TAP_INTERRUPT
-
-/*Combos*/
-#ifdef COMBO_ENABLE
-#    define COMBO_COUNT 5
-#    define COMBO_TERM 50
-#endif 
\ No newline at end of file
diff --git a/keyboards/space_space/rev2/keymaps/default/keymap.c b/keyboards/space_space/rev2/keymaps/default/keymap.c
deleted file mode 100644
index 64f34c8291..0000000000
--- a/keyboards/space_space/rev2/keymaps/default/keymap.c
+++ /dev/null
@@ -1,77 +0,0 @@
-/* Copyright 2021 qpockets
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
- 
-#include QMK_KEYBOARD_H
-
-enum layers{
-  _BASE,
-  _SYM,
-  _NAV
-};
-
-enum combo_events {
- COMBO_BSPC,
- COMBO_ENT,
- COMBO_TAB,
- COMBO_ESC,
- COMBO_DEL
-};
-#define KC_DN_BSPC LT(_NAV, KC_BSPC)
-#define KC_UP_SPC LT(_SYM, KC_SPC)
-#define KC_SF LSFT_T(KC_F)
-#define KC_SJ RSFT_T(KC_J)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT_default(
-    KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_DEL,   KC_Y,   KC_U,   KC_I,    KC_O,   KC_P,
-    KC_A,   KC_S,   KC_D,  KC_SF,   KC_G,   KC_TAB,  KC_H,   KC_SJ,  KC_K,    KC_L,   KC_QUOT,
-    KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_LSFT,  KC_N,   KC_M,   KC_COMM, KC_DOT, KC_SLSH,
-                  KC_LGUI, KC_LCTL, KC_DN_BSPC,    KC_UP_SPC, KC_RALT,   KC_MPLY
-  ),
-
- [_SYM] = LAYOUT_default(
-    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_TRNS, KC_6,    KC_7,    KC_8,    KC_9,     KC_0,
-    KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_TRNS, KC_CIRC, KC_AMPR, KC_ASTR, KC_EQUAL, KC_MINS,
-    KC_PIPE, KC_BSLS, KC_LPRN, KC_LBRC, KC_SCLN, KC_TRNS, KC_COLN, KC_RBRC, KC_RPRN, KC_PLUS,  KC_UNDS,
-                    KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,      KC_TRNS,    KC_TRNS 
-  ),
-
-  [_NAV] = LAYOUT_default(
-    KC_TRNS, KC_HOME, KC_UP,   KC_END,   KC_PGUP,  RESET,   KC_F1, KC_F2,  KC_F3,  KC_F4,  KC_BSPC,
-    KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_PGDN,  KC_TRNS, KC_F4, KC_F5,  KC_F6,  KC_F7,  KC_TAB,
-    KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT,  KC_TRNS,  KC_LCAP, KC_F9, KC_F10, KC_F11, KC_F12, KC_ENT,
-                    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS 
-  ),
-};
-
-
-
-
-#ifdef COMBO_ENABLE
-const uint16_t PROGMEM combo_bspc[] = {KC_O, KC_P, COMBO_END};
-const uint16_t PROGMEM combo_ent[] = {KC_K, KC_L, COMBO_END};
-const uint16_t PROGMEM combo_tab[] = {KC_S, KC_D, COMBO_END};
-const uint16_t PROGMEM combo_esc[] = {KC_T, KC_Y, COMBO_END};
-const uint16_t PROGMEM combo_del[] = {KC_Q, KC_W, COMBO_END};
-
-combo_t key_combos[COMBO_COUNT] = {
-  [COMBO_BSPC] = COMBO(combo_bspc,KC_BSPC),
-  [COMBO_ENT] = COMBO(combo_ent,KC_ENT),
-  [COMBO_TAB] = COMBO(combo_tab,KC_TAB),
-  [COMBO_ESC] = COMBO(combo_esc,KC_ESC),
-  [COMBO_DEL] = COMBO(combo_del,KC_DEL)
-};
-#endif
diff --git a/keyboards/space_space/rev2/keymaps/default/rules.mk b/keyboards/space_space/rev2/keymaps/default/rules.mk
deleted file mode 100644
index ab1e438182..0000000000
--- a/keyboards/space_space/rev2/keymaps/default/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-COMBO_ENABLE = yes
diff --git a/keyboards/space_space/rev2/keymaps/qpockets/config.h b/keyboards/space_space/rev2/keymaps/qpockets/config.h
deleted file mode 100644
index bf8c47eb3e..0000000000
--- a/keyboards/space_space/rev2/keymaps/qpockets/config.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/* Copyright 2021 qpockets
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-/*Modtaps*/
-#define TAPPING_TERM 145
-#define IGNORE_MOD_TAP_INTERRUPT
-
-/*Combos*/
-#ifdef COMBO_ENABLE
-#    define COMBO_COUNT 5
-#    define COMBO_TERM 25
-#endif 
diff --git a/keyboards/space_space/rev2/keymaps/qpockets/keymap.c b/keyboards/space_space/rev2/keymaps/qpockets/keymap.c
deleted file mode 100644
index 986e435957..0000000000
--- a/keyboards/space_space/rev2/keymaps/qpockets/keymap.c
+++ /dev/null
@@ -1,75 +0,0 @@
-/* Copyright 2021 qpockets
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
- 
-#include QMK_KEYBOARD_H
-
-enum layers{
-  _BASE,
-  _SYM,
-  _NAV
-};
-
-enum combo_events {
- COMBO_BSPC,
- COMBO_ENT,
- COMBO_TAB,
- COMBO_ESC,
- COMBO_DEL
-};
-#define KC_DN_BSPC LT(_NAV, KC_BSPC)
-#define KC_UP_SPC LT(_SYM, KC_SPC)
-#define KC_SF LSFT_T(KC_F)
-#define KC_SJ RSFT_T(KC_J)
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT_default(
-    KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_DEL,   KC_Y,   KC_U,   KC_I,    KC_O,   KC_P,
-    KC_A,   KC_S,   KC_D,  KC_SF,   KC_G,   KC_LGUI,  KC_H,   KC_SJ,  KC_K,    KC_L,   KC_QUOT,
-    KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_ENT,  KC_N,   KC_M,   KC_COMM, KC_DOT, KC_SLSH,
-                   KC_PSCR, KC_LCTL, KC_DN_BSPC,   KC_UP_SPC,  KC_RALT, KC_MPLY
-  ),
-  
- [_SYM] = LAYOUT_default(
-    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_TRNS, KC_6,    KC_7,    KC_8,    KC_9,     KC_0,
-    KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_TRNS, KC_CIRC, KC_AMPR, KC_ASTR, KC_EQUAL, KC_MINS,
-    KC_PIPE, KC_BSLS, KC_LPRN, KC_LBRC, KC_SCLN, KC_TRNS, KC_COLN, KC_RBRC, KC_RPRN, KC_PLUS,  KC_UNDS,
-                    KC_TRNS,    KC_TRNS,   KC_TRNS,    KC_TRNS,      KC_TRNS,    KC_TRNS 
-  ),
-
-  [_NAV] = LAYOUT_default(
-    KC_TRNS, KC_HOME, KC_UP,   KC_END,   KC_PGUP, RESET,   KC_F1, KC_F2,  KC_F3,  KC_F4,  KC_BSPC,
-    KC_TRNS, KC_LEFT, KC_DOWN, KC_RIGHT, KC_PGDN, KC_TRNS, KC_F5, KC_F6,  KC_F7,  KC_F8,  KC_TAB,
-    KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT,  KC_TRNS, KC_CAPS, KC_F9, KC_F10, KC_F11, KC_F12, KC_ENT,
-                    KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS 
-  ),
-};
-
-
-#ifdef COMBO_ENABLE
-const uint16_t PROGMEM combo_bspc[] = {KC_O, KC_P, COMBO_END};
-const uint16_t PROGMEM combo_ent[] = {KC_K, KC_L, COMBO_END};
-const uint16_t PROGMEM combo_tab[] = {KC_S, KC_D, COMBO_END};
-const uint16_t PROGMEM combo_esc[] = {KC_T, KC_Y, COMBO_END};
-const uint16_t PROGMEM combo_del[] = {KC_Q, KC_W, COMBO_END};
-
-combo_t key_combos[COMBO_COUNT] = {
-  [COMBO_BSPC] = COMBO(combo_bspc,KC_BSPC),
-  [COMBO_ENT] = COMBO(combo_ent,KC_ENT),
-  [COMBO_TAB] = COMBO(combo_tab,KC_TAB),
-  [COMBO_ESC] = COMBO(combo_esc,KC_ESC),
-  [COMBO_DEL] = COMBO(combo_del,KC_DEL)
-};
-#endif
diff --git a/keyboards/space_space/rev2/keymaps/qpockets/rules.mk b/keyboards/space_space/rev2/keymaps/qpockets/rules.mk
deleted file mode 100644
index ff681299e4..0000000000
--- a/keyboards/space_space/rev2/keymaps/qpockets/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-COMBO_ENABLE = yes
\ No newline at end of file
diff --git a/keyboards/space_space/rev2/readme.md b/keyboards/space_space/rev2/readme.md
deleted file mode 100644
index d8391a21a6..0000000000
--- a/keyboards/space_space/rev2/readme.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# space_space
-
-![space_space](https://i.imgur.com/SxjhzIMh.jpg)
-
-Give your space some space  
-
-* Keyboard Maintainer: https://github.com/qpockets
-* Hardware Availability: https://p3dstore.com/products/space-space-acrylic-case?_pos=21&_sid=c75de6a78&_ss=r&variant=39907740844216
-
-Make example for this keyboard (after setting up your build environment):
-
-    make space_space/rev2:default
-
-Flashing example for this keyboard:
-
-    make space_space/rev2:default:flash
-
-See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/space_space/rev2/rev2.c b/keyboards/space_space/rev2/rev2.c
deleted file mode 100644
index 07b93b36aa..0000000000
--- a/keyboards/space_space/rev2/rev2.c
+++ /dev/null
@@ -1,35 +0,0 @@
-
-/* Copyright 2021 qpockets
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-#include "rev2.h"
-
-bool encoder_update_kb(uint8_t index, bool clockwise) {
-    if (!encoder_update_user(index, clockwise)) { return false; }
-    if (index == 1) { /* left encoder*/
-                if (clockwise){
-                    tap_code(KC_WH_U);
-                } else {
-                    tap_code(KC_WH_D);
-                }
-    } else if (index == 0) { /* right encoder */
-                if (clockwise){
-                    tap_code(KC_VOLU);
-                } else {
-                    tap_code(KC_VOLD);
-        }
-    }
-    return true;
-}
diff --git a/keyboards/space_space/rev2/rev2.h b/keyboards/space_space/rev2/rev2.h
deleted file mode 100644
index 99362b900f..0000000000
--- a/keyboards/space_space/rev2/rev2.h
+++ /dev/null
@@ -1,49 +0,0 @@
-/* Copyright 2021 qpockets
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define XXX KC_NO
-
-#define LAYOUT_default( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K50, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K51, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K52, \
-              K32, K33, K34,      K36, K37, K38 \
-) \
-{ \
-    {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K50}, \
-    {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K51}, \
-    {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K52}, \
-    {XXX, XXX, K32, K33, K34, XXX, K36, K37, K38, XXX, XXX} \
-} \
-
-#define LAYOUT_big_space( \
-    K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K50, \
-    K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K51, \
-    K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K52, \
-              K32,           K35,           K38 \
-) \
-{ \
-   {K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K50}, \
-   {K10, K11, K12, K13, K14, K15, K16, K17, K18, K19, K51}, \
-   {K20, K21, K22, K23, K24, K25, K26, K27, K28, K29, K52}, \
-   {XXX, XXX, K32, XXX, XXX, K35, XXX, XXX, K38, XXX, XXX} \
-}
-
-
diff --git a/keyboards/space_space/rev2/rules.mk b/keyboards/space_space/rev2/rules.mk
deleted file mode 100644
index 8876a45881..0000000000
--- a/keyboards/space_space/rev2/rules.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = atmel-dfu
-
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes      # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes       # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE =  no      # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes
diff --git a/keyboards/space_space/rules.mk b/keyboards/space_space/rules.mk
deleted file mode 100644
index 2ca04be440..0000000000
--- a/keyboards/space_space/rules.mk
+++ /dev/null
@@ -1 +0,0 @@
-DEFAULT_FOLDER = space_space/rev2