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

14 files changed, 694 insertions, 615 deletions

diff --git a/keyboards/keebio/quefrency/keymaps/default/config.h b/keyboards/keebio/quefrency/keymaps/default/config.h
index f9efe78c5b..53bf8fb933 100644
--- a/keyboards/keebio/quefrency/keymaps/default/config.h
+++ b/keyboards/keebio/quefrency/keymaps/default/config.h
@@ -21,7 +21,4 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
-/* Use I2C or Serial, not both */
-
-#define USE_SERIAL
 // #define USE_I2C
diff --git a/keyboards/keebio/quefrency/keymaps/default/keymap.c b/keyboards/keebio/quefrency/keymaps/default/keymap.c
index 008cf5128d..a152c304a7 100644
--- a/keyboards/keebio/quefrency/keymaps/default/keymap.c
+++ b/keyboards/keebio/quefrency/keymaps/default/keymap.c
@@ -1,31 +1,53 @@
-#include QMK_KEYBOARD_H
+// Copyright 2022 Danny Nguyen (@nooges)
+// SPDX-License-Identifier: GPL-2.0-or-later
 
+#include QMK_KEYBOARD_H
 
 // Each layer gets a name for readability, which is then used in the keymap matrix below.
 // The underscores don't mean anything - you can have a layer called STUFF or any other name.
 // Layer names don't all need to be of the same length, obviously, and you can also skip them
 // entirely and just use numbers.
-#define _BASE 0
-#define _FN1 1
+enum custom_layer {
+    _BASE,
+    _FN1,
+};
 
 enum custom_keycodes {
   QWERTY = SAFE_RANGE,
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT(
-    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_DEL,  KC_BSPC,
-    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
-    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
-    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,
-    KC_LCTL, KC_LALT, KC_LGUI, MO(_FN1),KC_SPC,           MO(_FN1),KC_BSPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+  [_BASE] = LAYOUT_65_with_macro(
+    KC_F1,   KC_F2,   KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_DEL,  KC_BSPC, KC_HOME,
+    KC_F3,   KC_F4,   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_END,
+    KC_F5,   KC_F6,   KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  KC_PGUP,
+    KC_F7,   KC_F8,   KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_PGDN,
+    KC_F9,   KC_F10,  KC_LCTL, KC_LALT, KC_LGUI, MO(_FN1),KC_SPC,           MO(_FN1),KC_SPC,  KC_RALT, KC_RCTL, KC_RGUI, KC_LEFT, KC_DOWN, KC_RGHT
   ),
 
-  [_FN1] = LAYOUT(
-    KC_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_BSPC,
-    RGB_TOG, RGB_MOD, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    KC_TILD, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______
+  [_FN1] = LAYOUT_65_with_macro(
+    _______, _______, KC_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_BSPC, _______,
+    _______, _______, RGB_TOG, RGB_MOD, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, KC_TILD, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______, _______
   )
 };
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+    if (index == 0) {
+        if (clockwise) {
+            tap_code(KC_PGDN);
+        } else {
+            tap_code(KC_PGUP);
+        }
+    }
+    else if (index == 1) {
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    }
+    return false;
+}
diff --git a/keyboards/keebio/quefrency/keymaps/default65macro/config.h b/keyboards/keebio/quefrency/keymaps/default60/config.h
index 53bf8fb933..f9efe78c5b 100644
--- a/keyboards/keebio/quefrency/keymaps/default65macro/config.h
+++ b/keyboards/keebio/quefrency/keymaps/default60/config.h
@@ -21,4 +21,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
+/* Use I2C or Serial, not both */
+
+#define USE_SERIAL
 // #define USE_I2C
diff --git a/keyboards/keebio/quefrency/keymaps/default60/keymap.c b/keyboards/keebio/quefrency/keymaps/default60/keymap.c
new file mode 100644
index 0000000000..f987d9aa4d
--- /dev/null
+++ b/keyboards/keebio/quefrency/keymaps/default60/keymap.c
@@ -0,0 +1,35 @@
+// Copyright 2022 Danny Nguyen (@nooges)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+// Each layer gets a name for readability, which is then used in the keymap matrix below.
+// The underscores don't mean anything - you can have a layer called STUFF or any other name.
+// Layer names don't all need to be of the same length, obviously, and you can also skip them
+// entirely and just use numbers.
+enum custom_layer {
+    _BASE,
+    _FN1,
+};
+
+enum custom_keycodes {
+  QWERTY = SAFE_RANGE,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+  [_BASE] = LAYOUT_60(
+    KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_DEL,  KC_BSPC,
+    KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
+    KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
+    KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,
+    KC_LCTL, KC_LALT, KC_LGUI, MO(_FN1),KC_SPC,           MO(_FN1),KC_BSPC, KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+  ),
+
+  [_FN1] = LAYOUT_60(
+    KC_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_BSPC,
+    RGB_TOG, RGB_MOD, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______,
+    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+    KC_TILD, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______
+  )
+};
diff --git a/keyboards/keebio/quefrency/keymaps/default65macro/keymap.c b/keyboards/keebio/quefrency/keymaps/default65macro/keymap.c
deleted file mode 100644
index f452232b2d..0000000000
--- a/keyboards/keebio/quefrency/keymaps/default65macro/keymap.c
+++ /dev/null
@@ -1,50 +0,0 @@
-#include QMK_KEYBOARD_H
-
-extern keymap_config_t keymap_config;
-
-// Each layer gets a name for readability, which is then used in the keymap matrix below.
-// The underscores don't mean anything - you can have a layer called STUFF or any other name.
-// Layer names don't all need to be of the same length, obviously, and you can also skip them
-// entirely and just use numbers.
-#define _BASE 0
-#define _FN1 1
-
-enum custom_keycodes {
-  QWERTY = SAFE_RANGE,
-};
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-  [_BASE] = LAYOUT_65_with_macro(
-    KC_F1,   KC_F2,   KC_GESC, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_DEL,  KC_BSPC, KC_HOME,
-    KC_F3,   KC_F4,   KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS, KC_END,
-    KC_F5,   KC_F6,   KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,  KC_PGUP,
-    KC_F7,   KC_F8,   KC_LSFT, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_PGDN,
-    KC_F9,   KC_F10,  KC_LCTL, KC_LALT, KC_LGUI, MO(_FN1),KC_SPC,           MO(_FN1),KC_SPC,  KC_RALT, KC_RCTL, KC_RGUI, KC_LEFT, KC_DOWN, KC_RGHT
-  ),
-
-  [_FN1] = LAYOUT_65_with_macro(
-    _______, _______, KC_GESC, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_BSPC, _______,
-    _______, _______, RGB_TOG, RGB_MOD, _______, KC_UP,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
-    _______, _______, KC_TILD, _______, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______, _______
-  )
-};
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
-    if (index == 0) {
-        if (clockwise) {
-            tap_code(KC_PGDN);
-        } else {
-            tap_code(KC_PGUP);
-        }
-    }
-    else if (index == 1) {
-        if (clockwise) {
-            tap_code(KC_VOLU);
-        } else {
-            tap_code(KC_VOLD);
-        }
-    }
-    return false;
-}
diff --git a/keyboards/keebio/quefrency/quefrency.h b/keyboards/keebio/quefrency/quefrency.h
index 2c77dc2ad3..d9a14c439c 100644
--- a/keyboards/keebio/quefrency/quefrency.h
+++ b/keyboards/keebio/quefrency/quefrency.h
@@ -14,3 +14,6 @@
 #ifdef KEYBOARD_keebio_quefrency_rev4
     #include "rev4.h"
 #endif
+#ifdef KEYBOARD_keebio_quefrency_rev5
+    #include "rev5.h"
+#endif
diff --git a/keyboards/keebio/quefrency/rev4/info.json b/keyboards/keebio/quefrency/rev4/info.json
index 3c2364ef15..314bb807f0 100644
--- a/keyboards/keebio/quefrency/rev4/info.json
+++ b/keyboards/keebio/quefrency/rev4/info.json
@@ -365,473 +365,6 @@
                 { "label": "Down", "x": 17.25, "y": 4 },
                 { "label": "Right", "x": 18.25, "y": 4 }
             ]
-        },
-        "LAYOUT_60_iso": {
-            "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "1", "x": 1, "y": 0 },
-                { "label": "2", "x": 2, "y": 0 },
-                { "label": "3", "x": 3, "y": 0 },
-                { "label": "4", "x": 4, "y": 0 },
-                { "label": "5", "x": 5, "y": 0 },
-                { "label": "6", "x": 6, "y": 0 },
-
-                { "label": "7", "x": 8, "y": 0 },
-                { "label": "8", "x": 9, "y": 0 },
-                { "label": "9", "x": 10, "y": 0 },
-                { "label": "0", "x": 11, "y": 0 },
-                { "label": "-", "x": 12, "y": 0 },
-                { "label": "=", "x": 13, "y": 0 },
-                { "label": "Del", "x": 14, "y": 0 },
-                { "label": "Bksp", "x": 15, "y": 0 },
-
-                { "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 1 },
-                { "label": "W", "x": 2.5, "y": 1 },
-                { "label": "E", "x": 3.5, "y": 1 },
-                { "label": "R", "x": 4.5, "y": 1 },
-                { "label": "T", "x": 5.5, "y": 1 },
-
-                { "label": "Y", "x": 7.5, "y": 1 },
-                { "label": "U", "x": 8.5, "y": 1 },
-                { "label": "I", "x": 9.5, "y": 1 },
-                { "label": "O", "x": 10.5, "y": 1 },
-                { "label": "P", "x": 11.5, "y": 1 },
-                { "label": "[", "x": 12.5, "y": 1 },
-                { "label": "]", "x": 13.5, "y": 1 },
-
-                { "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 2 },
-                { "label": "S", "x": 2.75, "y": 2 },
-                { "label": "D", "x": 3.75, "y": 2 },
-                { "label": "F", "x": 4.75, "y": 2 },
-                { "label": "G", "x": 5.75, "y": 2 },
-
-                { "label": "H", "x": 7.75, "y": 2 },
-                { "label": "J", "x": 8.75, "y": 2 },
-                { "label": "K", "x": 9.75, "y": 2 },
-                { "label": "L", "x": 10.75, "y": 2 },
-                { "label": ";", "x": 11.75, "y": 2 },
-                { "label": "'", "x": 12.75, "y": 2 },
-                { "label": "NUHS", "x": 13.75, "y": 2 },
-                { "label": "Enter", "x": 14.75, "y": 1, "w": 1.25, "h": 2 },
-
-                { "label": "Shift", "x": 0, "y": 3, "w": 1.25 },
-                { "label": "NUBS", "x": 1.25, "y": 3 },
-                { "label": "Z", "x": 2.25, "y": 3 },
-                { "label": "X", "x": 3.25, "y": 3 },
-                { "label": "C", "x": 4.25, "y": 3 },
-                { "label": "V", "x": 5.25, "y": 3 },
-                { "label": "B", "x": 6.25, "y": 3 },
-
-                { "label": "N", "x": 8.25, "y": 3 },
-                { "label": "M", "x": 9.25, "y": 3 },
-                { "label": ",", "x": 10.25, "y": 3 },
-                { "label": ".", "x": 11.25, "y": 3 },
-                { "label": "/", "x": 12.25, "y": 3 },
-                { "label": "Shift", "x": 13.25, "y": 3, "w": 1.75 },
-                { "label": "Up", "x": 15, "y": 3 },
-
-                { "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 },
-                { "label": "Alt", "x": 1.25, "y": 4, "w": 1.25 },
-                { "label": "Win", "x": 2.5, "y": 4, "w": 1.25 },
-                { "label": "Fn", "x": 3.75, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 5, "y": 4, "w": 2.25 },
-
-                { "label": "Fn", "x": 8.25, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 9.5, "y": 4, "w": 1.5 },
-                { "label": "Alt", "x": 11, "y": 4 },
-                { "label": "Ctrl", "x": 12, "y": 4 },
-                { "label": "Left", "x": 13, "y": 4 },
-                { "label": "Down", "x": 14, "y": 4 },
-                { "label": "Right", "x": 15, "y": 4 }
-            ]
-        },
-        "LAYOUT_65_iso": {
-            "layout": [
-                { "label": "Esc", "x": 0, "y": 0 },
-                { "label": "1", "x": 1, "y": 0 },
-                { "label": "2", "x": 2, "y": 0 },
-                { "label": "3", "x": 3, "y": 0 },
-                { "label": "4", "x": 4, "y": 0 },
-                { "label": "5", "x": 5, "y": 0 },
-                { "label": "6", "x": 6, "y": 0 },
-
-                { "label": "7", "x": 8, "y": 0 },
-                { "label": "8", "x": 9, "y": 0 },
-                { "label": "9", "x": 10, "y": 0 },
-                { "label": "0", "x": 11, "y": 0 },
-                { "label": "-", "x": 12, "y": 0 },
-                { "label": "=", "x": 13, "y": 0 },
-                { "label": "Del", "x": 14, "y": 0 },
-                { "label": "Bksp", "x": 15, "y": 0 },
-                { "label": "Home", "x": 16, "y": 0 },
-
-                { "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
-                { "label": "Q", "x": 1.5, "y": 1 },
-                { "label": "W", "x": 2.5, "y": 1 },
-                { "label": "E", "x": 3.5, "y": 1 },
-                { "label": "R", "x": 4.5, "y": 1 },
-                { "label": "T", "x": 5.5, "y": 1 },
-
-                { "label": "Y", "x": 7.5, "y": 1 },
-                { "label": "U", "x": 8.5, "y": 1 },
-                { "label": "I", "x": 9.5, "y": 1 },
-                { "label": "O", "x": 10.5, "y": 1 },
-                { "label": "P", "x": 11.5, "y": 1 },
-                { "label": "[", "x": 12.5, "y": 1 },
-                { "label": "]", "x": 13.5, "y": 1 },
-                { "label": "End", "x": 16, "y": 1 },
-
-                { "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 },
-                { "label": "A", "x": 1.75, "y": 2 },
-                { "label": "S", "x": 2.75, "y": 2 },
-                { "label": "D", "x": 3.75, "y": 2 },
-                { "label": "F", "x": 4.75, "y": 2 },
-                { "label": "G", "x": 5.75, "y": 2 },
-
-                { "label": "H", "x": 7.75, "y": 2 },
-                { "label": "J", "x": 8.75, "y": 2 },
-                { "label": "K", "x": 9.75, "y": 2 },
-                { "label": "L", "x": 10.75, "y": 2 },
-                { "label": ";", "x": 11.75, "y": 2 },
-                { "label": "'", "x": 12.75, "y": 2 },
-                { "label": "NUHS", "x": 13.75, "y": 2 },
-                { "label": "Enter", "x": 14.75, "y": 1, "w": 1.25, "h": 2 },
-                { "label": "Page Up", "x": 16, "y": 2 },
-
-                { "label": "Shift", "x": 0, "y": 3, "w": 1.25 },
-                { "label": "NUBS", "x": 1.25, "y": 3 },
-                { "label": "Z", "x": 2.25, "y": 3 },
-                { "label": "X", "x": 3.25, "y": 3 },
-                { "label": "C", "x": 4.25, "y": 3 },
-                { "label": "V", "x": 5.25, "y": 3 },
-                { "label": "B", "x": 6.25, "y": 3 },
-
-                { "label": "N", "x": 8.25, "y": 3 },
-                { "label": "M", "x": 9.25, "y": 3 },
-                { "label": ",", "x": 10.25, "y": 3 },
-                { "label": ".", "x": 11.25, "y": 3 },
-                { "label": "/", "x": 12.25, "y": 3 },
-                { "label": "Shift", "x": 13.25, "y": 3, "w": 1.75 },
-                { "label": "Up", "x": 15, "y": 3 },
-                { "label": "Page Down", "x": 16, "y": 3 },
-
-                { "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 },
-                { "label": "Alt", "x": 1.25, "y": 4, "w": 1.25 },
-                { "label": "Win", "x": 2.5, "y": 4, "w": 1.25 },
-                { "label": "Fn", "x": 3.75, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 5, "y": 4, "w": 2.25 },
-
-                { "label": "Fn", "x": 8.25, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 9.5, "y": 4, "w": 1.5 },
-                { "label": "Alt", "x": 11, "y": 4 },
-                { "label": "Ctrl", "x": 12, "y": 4 },
-                { "label": "Win", "x": 13, "y": 4 },
-                { "label": "Left", "x": 14, "y": 4 },
-                { "label": "Down", "x": 15, "y": 4 },
-                { "label": "Right", "x": 16, "y": 4 }
-            ]
-        },
-        "LAYOUT_60_iso_with_macro": {
-            "layout": [
-                { "label": "F1", "x": 0, "y": 0 },
-                { "label": "F6", "x": 1, "y": 0 },
-
-                { "label": "Esc", "x": 2.25, "y": 0 },
-                { "label": "1", "x": 3.25, "y": 0 },
-                { "label": "2", "x": 4.25, "y": 0 },
-                { "label": "3", "x": 5.25, "y": 0 },
-                { "label": "4", "x": 6.25, "y": 0 },
-                { "label": "5", "x": 7.25, "y": 0 },
-                { "label": "6", "x": 8.25, "y": 0 },
-
-                { "label": "7", "x": 10.25, "y": 0 },
-                { "label": "8", "x": 11.25, "y": 0 },
-                { "label": "9", "x": 12.25, "y": 0 },
-                { "label": "0", "x": 13.25, "y": 0 },
-                { "label": "-", "x": 14.25, "y": 0 },
-                { "label": "=", "x": 15.25, "y": 0 },
-                { "label": "Del", "x": 16.25, "y": 0 },
-                { "label": "Bksp", "x": 17.25, "y": 0 },
-
-                { "label": "F2", "x": 0, "y": 1 },
-                { "label": "F7", "x": 1, "y": 1 },
-
-                { "label": "Tab", "x": 2.25, "y": 1, "w": 1.5 },
-                { "label": "Q", "x": 3.75, "y": 1 },
-                { "label": "W", "x": 4.75, "y": 1 },
-                { "label": "E", "x": 5.75, "y": 1 },
-                { "label": "R", "x": 6.75, "y": 1 },
-                { "label": "T", "x": 7.75, "y": 1 },
-
-                { "label": "Y", "x": 9.75, "y": 1 },
-                { "label": "U", "x": 10.75, "y": 1 },
-                { "label": "I", "x": 11.75, "y": 1 },
-                { "label": "O", "x": 12.75, "y": 1 },
-                { "label": "P", "x": 13.75, "y": 1 },
-                { "label": "[", "x": 14.75, "y": 1 },
-                { "label": "]", "x": 15.75, "y": 1 },
-
-                { "label": "F3", "x": 0, "y": 2 },
-                { "label": "F8", "x": 1, "y": 2 },
-
-                { "label": "Caps Lock", "x": 2.25, "y": 2, "w": 1.75 },
-                { "label": "A", "x": 4, "y": 2 },
-                { "label": "S", "x": 5, "y": 2 },
-                { "label": "D", "x": 6, "y": 2 },
-                { "label": "F", "x": 7, "y": 2 },
-                { "label": "G", "x": 8, "y": 2 },
-
-                { "label": "H", "x": 10, "y": 2 },
-                { "label": "J", "x": 11, "y": 2 },
-                { "label": "K", "x": 12, "y": 2 },
-                { "label": "L", "x": 13, "y": 2 },
-                { "label": ";", "x": 14, "y": 2 },
-                { "label": "'", "x": 15, "y": 2 },
-                { "label": "NUHS", "x": 16, "y": 2 },
-                { "label": "Enter", "x": 17, "y": 1, "w": 1.25, "h": 2 },
-
-                { "label": "F4", "x": 0, "y": 3 },
-                { "label": "F9", "x": 1, "y": 3 },
-
-                { "label": "Shift", "x": 2.25, "y": 3, "w": 1.25 },
-                { "label": "NUBS", "x": 3.5, "y": 3 },
-                { "label": "Z", "x": 4.5, "y": 3 },
-                { "label": "X", "x": 5.5, "y": 3 },
-                { "label": "C", "x": 6.5, "y": 3 },
-                { "label": "V", "x": 7.5, "y": 3 },
-                { "label": "B", "x": 8.5, "y": 3 },
-
-                { "label": "N", "x": 10.5, "y": 3 },
-                { "label": "M", "x": 11.5, "y": 3 },
-                { "label": ",", "x": 12.5, "y": 3 },
-                { "label": ".", "x": 13.5, "y": 3 },
-                { "label": "/", "x": 14.5, "y": 3 },
-                { "label": "Shift", "x": 15.5, "y": 3, "w": 1.75 },
-                { "label": "Up", "x": 17.25, "y": 3 },
-
-                { "label": "F5", "x": 0, "y": 4 },
-                { "label": "F10", "x": 1, "y": 4 },
-
-                { "label": "Ctrl", "x": 2.25, "y": 4, "w": 1.25 },
-                { "label": "Alt", "x": 3.5, "y": 4, "w": 1.25 },
-                { "label": "Win", "x": 4.75, "y": 4, "w": 1.25 },
-                { "label": "Fn", "x": 6, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 7.25, "y": 4, "w": 2.25 },
-
-                { "label": "Fn", "x": 10.5, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 11.75, "y": 4, "w": 1.5 },
-                { "label": "Alt", "x": 13.25, "y": 4 },
-                { "label": "Ctrl", "x": 14.25, "y": 4 },
-                { "label": "Left", "x": 15.25, "y": 4 },
-                { "label": "Down", "x": 16.25, "y": 4 },
-                { "label": "Right", "x": 17.25, "y": 4 }
-            ]
-        },
-        "LAYOUT_65_iso_with_macro": {
-            "layout": [
-                { "label": "F1", "x": 0, "y": 0 },
-                { "label": "F6", "x": 1, "y": 0 },
-
-                { "label": "Esc", "x": 2.25, "y": 0 },
-                { "label": "1", "x": 3.25, "y": 0 },
-                { "label": "2", "x": 4.25, "y": 0 },
-                { "label": "3", "x": 5.25, "y": 0 },
-                { "label": "4", "x": 6.25, "y": 0 },
-                { "label": "5", "x": 7.25, "y": 0 },
-                { "label": "6", "x": 8.25, "y": 0 },
-
-                { "label": "7", "x": 10.25, "y": 0 },
-                { "label": "8", "x": 11.25, "y": 0 },
-                { "label": "9", "x": 12.25, "y": 0 },
-                { "label": "0", "x": 13.25, "y": 0 },
-                { "label": "-", "x": 14.25, "y": 0 },
-                { "label": "=", "x": 15.25, "y": 0 },
-                { "label": "Del", "x": 16.25, "y": 0 },
-                { "label": "Bksp", "x": 17.25, "y": 0 },
-                { "label": "Home", "x": 18.25, "y": 0 },
-
-                { "label": "F2", "x": 0, "y": 1 },
-                { "label": "F7", "x": 1, "y": 1 },
-
-                { "label": "Tab", "x": 2.25, "y": 1, "w": 1.5 },
-                { "label": "Q", "x": 3.75, "y": 1 },
-                { "label": "W", "x": 4.75, "y": 1 },
-                { "label": "E", "x": 5.75, "y": 1 },
-                { "label": "R", "x": 6.75, "y": 1 },
-                { "label": "T", "x": 7.75, "y": 1 },
-
-                { "label": "Y", "x": 9.75, "y": 1 },
-                { "label": "U", "x": 10.75, "y": 1 },
-                { "label": "I", "x": 11.75, "y": 1 },
-                { "label": "O", "x": 12.75, "y": 1 },
-                { "label": "P", "x": 13.75, "y": 1 },
-                { "label": "[", "x": 14.75, "y": 1 },
-                { "label": "]", "x": 15.75, "y": 1 },
-                { "label": "PgUp", "x": 18.25, "y": 1 },
-
-                { "label": "F3", "x": 0, "y": 2 },
-                { "label": "F8", "x": 1, "y": 2 },
-
-                { "label": "Caps Lock", "x": 2.25, "y": 2, "w": 1.75 },
-                { "label": "A", "x": 4, "y": 2 },
-                { "label": "S", "x": 5, "y": 2 },
-                { "label": "D", "x": 6, "y": 2 },
-                { "label": "F", "x": 7, "y": 2 },
-                { "label": "G", "x": 8, "y": 2 },
-
-                { "label": "H", "x": 10, "y": 2 },
-                { "label": "J", "x": 11, "y": 2 },
-                { "label": "K", "x": 12, "y": 2 },
-                { "label": "L", "x": 13, "y": 2 },
-                { "label": ";", "x": 14, "y": 2 },
-                { "label": "'", "x": 15, "y": 2 },
-                { "label": "NUHS", "x": 16, "y": 2 },
-                { "label": "Enter", "x": 17, "y": 1, "w": 1.25, "h": 2 },
-                { "label": "PgDn", "x": 18.25, "y": 2 },
-
-                { "label": "F4", "x": 0, "y": 3 },
-                { "label": "F9", "x": 1, "y": 3 },
-
-                { "label": "Shift", "x": 2.25, "y": 3, "w": 1.25 },
-                { "label": "NUBS", "x": 3.5, "y": 3 },
-                { "label": "Z", "x": 4.5, "y": 3 },
-                { "label": "X", "x": 5.5, "y": 3 },
-                { "label": "C", "x": 6.5, "y": 3 },
-                { "label": "V", "x": 7.5, "y": 3 },
-                { "label": "B", "x": 8.5, "y": 3 },
-
-                { "label": "N", "x": 10.5, "y": 3 },
-                { "label": "M", "x": 11.5, "y": 3 },
-                { "label": ",", "x": 12.5, "y": 3 },
-                { "label": ".", "x": 13.5, "y": 3 },
-                { "label": "/", "x": 14.5, "y": 3 },
-                { "label": "Shift", "x": 15.5, "y": 3, "w": 1.75 },
-                { "label": "Up", "x": 17.25, "y": 3 },
-                { "label": "End", "x": 18.25, "y": 3 },
-
-                { "label": "F5", "x": 0, "y": 4 },
-                { "label": "F10", "x": 1, "y": 4 },
-
-                { "label": "Ctrl", "x": 2.25, "y": 4, "w": 1.25 },
-                { "label": "Alt", "x": 3.5, "y": 4, "w": 1.25 },
-                { "label": "Win", "x": 4.75, "y": 4, "w": 1.25 },
-                { "label": "Fn", "x": 6, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 7.25, "y": 4, "w": 2.25 },
-
-                { "label": "Fn", "x": 10.5, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 11.75, "y": 4, "w": 1.5 },
-                { "label": "Alt", "x": 13.25, "y": 4 },
-                { "label": "Ctrl", "x": 14.25, "y": 4 },
-                { "label": "Win", "x": 15.25, "y": 4 },
-                { "label": "Left", "x": 16.25, "y": 4 },
-                { "label": "Down", "x": 17.25, "y": 4 },
-                { "label": "Right", "x": 18.25, "y": 4 }
-            ]
-        },
-        "LAYOUT_all": {
-            "layout": [
-                { "label": "F1", "x": 0, "y": 0 },
-                { "label": "F6", "x": 1, "y": 0 },
-
-                { "label": "Esc", "x": 2.25, "y": 0 },
-                { "label": "1", "x": 3.25, "y": 0 },
-                { "label": "2", "x": 4.25, "y": 0 },
-                { "label": "3", "x": 5.25, "y": 0 },
-                { "label": "4", "x": 6.25, "y": 0 },
-                { "label": "5", "x": 7.25, "y": 0 },
-                { "label": "6", "x": 8.25, "y": 0 },
-
-                { "label": "7", "x": 10.25, "y": 0 },
-                { "label": "8", "x": 11.25, "y": 0 },
-                { "label": "9", "x": 12.25, "y": 0 },
-                { "label": "0", "x": 13.25, "y": 0 },
-                { "label": "-", "x": 14.25, "y": 0 },
-                { "label": "=", "x": 15.25, "y": 0 },
-                { "label": "Del", "x": 16.25, "y": 0 },
-                { "label": "Bksp", "x": 17.25, "y": 0 },
-                { "label": "Home", "x": 18.25, "y": 0 },
-
-                { "label": "F2", "x": 0, "y": 1 },
-                { "label": "F7", "x": 1, "y": 1 },
-
-                { "label": "Tab", "x": 2.25, "y": 1, "w": 1.5 },
-                { "label": "Q", "x": 3.75, "y": 1 },
-                { "label": "W", "x": 4.75, "y": 1 },
-                { "label": "E", "x": 5.75, "y": 1 },
-                { "label": "R", "x": 6.75, "y": 1 },
-                { "label": "T", "x": 7.75, "y": 1 },
-
-                { "label": "Y", "x": 9.75, "y": 1 },
-                { "label": "U", "x": 10.75, "y": 1 },
-                { "label": "I", "x": 11.75, "y": 1 },
-                { "label": "O", "x": 12.75, "y": 1 },
-                { "label": "P", "x": 13.75, "y": 1 },
-                { "label": "[", "x": 14.75, "y": 1 },
-                { "label": "]", "x": 15.75, "y": 1 },
-                { "label": "Backslash", "x": 16.75, "y": 1, "w": 1.5 },
-                { "label": "PgUp", "x": 18.25, "y": 1 },
-
-                { "label": "F3", "x": 0, "y": 2 },
-                { "label": "F8", "x": 1, "y": 2 },
-
-                { "label": "Caps Lock", "x": 2.25, "y": 2, "w": 1.75 },
-                { "label": "A", "x": 4, "y": 2 },
-                { "label": "S", "x": 5, "y": 2 },
-                { "label": "D", "x": 6, "y": 2 },
-                { "label": "F", "x": 7, "y": 2 },
-                { "label": "G", "x": 8, "y": 2 },
-
-                { "label": "H", "x": 10, "y": 2 },
-                { "label": "J", "x": 11, "y": 2 },
-                { "label": "K", "x": 12, "y": 2 },
-                { "label": "L", "x": 13, "y": 2 },
-                { "label": ";", "x": 14, "y": 2 },
-                { "label": "'", "x": 15, "y": 2 },
-                { "label": "NUHS", "x": 16, "y": 2 },
-                { "label": "Enter", "x": 17, "y": 2, "w": 1.25 },
-                { "label": "PgDn", "x": 18.25, "y": 2 },
-
-                { "label": "F4", "x": 0, "y": 3 },
-                { "label": "F9", "x": 1, "y": 3 },
-
-                { "label": "Shift", "x": 2.25, "y": 3, "w": 1.25 },
-                { "label": "NUBS", "x": 3.5, "y": 3 },
-                { "label": "Z", "x": 4.5, "y": 3 },
-                { "label": "X", "x": 5.5, "y": 3 },
-                { "label": "C", "x": 6.5, "y": 3 },
-                { "label": "V", "x": 7.5, "y": 3 },
-                { "label": "B", "x": 8.5, "y": 3 },
-
-                { "label": "N", "x": 10.5, "y": 3 },
-                { "label": "M", "x": 11.5, "y": 3 },
-                { "label": ",", "x": 12.5, "y": 3 },
-                { "label": ".", "x": 13.5, "y": 3 },
-                { "label": "/", "x": 14.5, "y": 3 },
-                { "label": "Shift", "x": 15.5, "y": 3, "w": 1.75 },
-                { "label": "Up", "x": 17.25, "y": 3 },
-                { "label": "End", "x": 18.25, "y": 3 },
-
-                { "label": "F5", "x": 0, "y": 4 },
-                { "label": "F10", "x": 1, "y": 4 },
-
-                { "label": "Ctrl", "x": 2.25, "y": 4, "w": 1.25 },
-                { "label": "Alt", "x": 3.5, "y": 4, "w": 1.25 },
-                { "label": "Win", "x": 4.75, "y": 4, "w": 1.25 },
-                { "label": "Fn", "x": 6, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 7.25, "y": 4 },
-                { "label": "Space", "x": 8.25, "y": 4, "w": 1.25 },
-
-                { "label": "Fn", "x": 10.5, "y": 4, "w": 1.25 },
-                { "label": "Space", "x": 11.75, "y": 4, "w": 1.5 },
-                { "label": "Alt", "x": 13.25, "y": 4 },
-                { "label": "Ctrl", "x": 14.25, "y": 4 },
-                { "label": "Win", "x": 15.25, "y": 4 },
-                { "label": "Left", "x": 16.25, "y": 4 },
-                { "label": "Down", "x": 17.25, "y": 4 },
-                { "label": "Right", "x": 18.25, "y": 4 }
-            ]
         }
     }
 }
diff --git a/keyboards/keebio/quefrency/rev4/rev4.h b/keyboards/keebio/quefrency/rev4/rev4.h
index 12f76d5c85..2284a6da43 100644
--- a/keyboards/keebio/quefrency/rev4/rev4.h
+++ b/keyboards/keebio/quefrency/rev4/rev4.h
@@ -99,86 +99,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, RE9 } \
   }
 
-#define LAYOUT_60_iso( \
-  LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, \
-  LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7,      \
-  LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, \
-  LD3, LD4, LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, \
-  LE3, LE4, LE5, LE6,      LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8 \
-  ) \
-  { \
-    { KC_NO, KC_NO, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { KC_NO, KC_NO, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { KC_NO, KC_NO, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
-    { KC_NO, KC_NO, LD3, LD4, LD5, LD6, LD7, LD8, LD9 }, \
-    { KC_NO, KC_NO, LE3, LE4, LE5, LE6, KC_NO, LE8, KC_NO }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, KC_NO }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, KC_NO, KC_NO }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, KC_NO }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, KC_NO }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, KC_NO } \
-  }
-
-#define LAYOUT_65_iso( \
-  LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9, \
-  LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7,      RB9, \
-  LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, RC9, \
-  LD3, LD4, LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, RD9, \
-  LE3, LE4, LE5, LE6,      LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8, RE9 \
-  ) \
-  { \
-    { KC_NO, KC_NO, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { KC_NO, KC_NO, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { KC_NO, KC_NO, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
-    { KC_NO, KC_NO, LD3, LD4, LD5, LD6, LD7, LD8, LD9 }, \
-    { KC_NO, KC_NO, LE3, LE4, LE5, LE6, KC_NO, LE8, KC_NO }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9 }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, KC_NO, RB9 }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, RC9 }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, RD9 }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, RE9 } \
-  }
-
-#define LAYOUT_60_iso_with_macro( \
-  LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, \
-  LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7,      \
-  LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, \
-  LD1, LD2, LD3, LD4, LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, \
-  LE1, LE2, LE3, LE4, LE5, LE6,      LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8 \
-  ) \
-  { \
-    { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
-    { LD1, LD2, LD3, LD4, LD5, LD6, LD7, LD8, LD9 }, \
-    { LE1, LE2, LE3, LE4, LE5, LE6, KC_NO, LE8, KC_NO }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, KC_NO }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, KC_NO, KC_NO }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, KC_NO }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, KC_NO }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, KC_NO } \
-  }
-
-#define LAYOUT_65_iso_with_macro( \
-  LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9, \
-  LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7,      RB9, \
-  LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, RC9, \
-  LD1, LD2, LD3, LD4, LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, RD9, \
-  LE1, LE2, LE3, LE4, LE5, LE6,      LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8, RE9 \
-  ) \
-  { \
-    { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
-    { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
-    { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
-    { LD1, LD2, LD3, LD4, LD5, LD6, LD7, LD8, LD9 }, \
-    { LE1, LE2, LE3, LE4, LE5, LE6, KC_NO, LE8, KC_NO }, \
-    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9 }, \
-    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, KC_NO, RB9 }, \
-    { RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, RC9 }, \
-    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, RD9 }, \
-    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, RE9 } \
-  }
-
 #define LAYOUT_all( \
   LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9, \
   LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9, \
diff --git a/keyboards/keebio/quefrency/rev5/config.h b/keyboards/keebio/quefrency/rev5/config.h
new file mode 100644
index 0000000000..ad57a7f8c7
--- /dev/null
+++ b/keyboards/keebio/quefrency/rev5/config.h
@@ -0,0 +1,69 @@
+/* Copyright 2021 Danny Nguyen <danny@keeb.io>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#pragma once
+
+/* USB Device descriptor parameter */
+#define VENDOR_ID       0xCB10
+#define PRODUCT_ID      0x5257
+#define DEVICE_VER      0x0500
+#define MANUFACTURER    Keebio
+#define PRODUCT         Quefrency Rev. 5
+
+/* key matrix size */
+// Rows are doubled-up
+#define MATRIX_ROWS 10
+#define MATRIX_COLS 9
+
+#define DIODE_DIRECTION COL2ROW
+// wiring of each half
+#define MATRIX_ROW_PINS { B1, B2, C7, B4, D7 }
+#define MATRIX_COL_PINS { F4, F1, F0, B7, B3, D2, D3, D5, D4 }
+#define MATRIX_ROW_PINS_RIGHT { B3, B2, B6, B4, D7 }
+#define MATRIX_COL_PINS_RIGHT { F1, F0, F4, F5, F6, D5, C7, D3, B7 }
+#define SPLIT_HAND_PIN F7
+#define ENCODERS_PAD_A { F5 }
+#define ENCODERS_PAD_B { F6 }
+#define ENCODERS_PAD_A_RIGHT { D6 }
+#define ENCODERS_PAD_B_RIGHT { D4 }
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/* serial.c configuration for split keyboard */
+#define SOFT_SERIAL_PIN D0
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
+
+/* ws2812 RGB LED */
+#define RGB_DI_PIN E6
+#define RGBLED_NUM 16    // Number of LEDs
+#define RGBLED_SPLIT { 8, 8 }
+#define RGBLIGHT_LED_MAP { 1, 2, 3, 12, 13, 14, 15, 0, 7, 6, 5, 4, 11, 10, 9, 8 }
+#define RGBLIGHT_DEFAULT_MODE (RGBLIGHT_MODE_RAINBOW_SWIRL + 2)
+#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
diff --git a/keyboards/keebio/quefrency/rev5/info.json b/keyboards/keebio/quefrency/rev5/info.json
new file mode 100644
index 0000000000..9509663c86
--- /dev/null
+++ b/keyboards/keebio/quefrency/rev5/info.json
@@ -0,0 +1,370 @@
+{
+    "keyboard_name": "Quefrency Rev. 5",
+    "url": "https://keeb.io",
+    "maintainer": "nooges",
+    "layout_aliases": {
+        "LAYOUT": "LAYOUT_60"
+    },
+    "layouts": {
+        "LAYOUT_60": {
+            "layout": [
+                { "label": "Esc", "x": 0, "y": 0 },
+                { "label": "1", "x": 1, "y": 0 },
+                { "label": "2", "x": 2, "y": 0 },
+                { "label": "3", "x": 3, "y": 0 },
+                { "label": "4", "x": 4, "y": 0 },
+                { "label": "5", "x": 5, "y": 0 },
+                { "label": "6", "x": 6, "y": 0 },
+
+                { "label": "7", "x": 8, "y": 0 },
+                { "label": "8", "x": 9, "y": 0 },
+                { "label": "9", "x": 10, "y": 0 },
+                { "label": "0", "x": 11, "y": 0 },
+                { "label": "-", "x": 12, "y": 0 },
+                { "label": "=", "x": 13, "y": 0 },
+                { "label": "Del", "x": 14, "y": 0 },
+                { "label": "Bksp", "x": 15, "y": 0 },
+
+                { "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
+                { "label": "Q", "x": 1.5, "y": 1 },
+                { "label": "W", "x": 2.5, "y": 1 },
+                { "label": "E", "x": 3.5, "y": 1 },
+                { "label": "R", "x": 4.5, "y": 1 },
+                { "label": "T", "x": 5.5, "y": 1 },
+
+                { "label": "Y", "x": 7.5, "y": 1 },
+                { "label": "U", "x": 8.5, "y": 1 },
+                { "label": "I", "x": 9.5, "y": 1 },
+                { "label": "O", "x": 10.5, "y": 1 },
+                { "label": "P", "x": 11.5, "y": 1 },
+                { "label": "[", "x": 12.5, "y": 1 },
+                { "label": "]", "x": 13.5, "y": 1 },
+                { "label": "Backslash", "x": 14.5, "y": 1, "w": 1.5 },
+
+                { "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 },
+                { "label": "A", "x": 1.75, "y": 2 },
+                { "label": "S", "x": 2.75, "y": 2 },
+                { "label": "D", "x": 3.75, "y": 2 },
+                { "label": "F", "x": 4.75, "y": 2 },
+                { "label": "G", "x": 5.75, "y": 2 },
+
+                { "label": "H", "x": 7.75, "y": 2 },
+                { "label": "J", "x": 8.75, "y": 2 },
+                { "label": "K", "x": 9.75, "y": 2 },
+                { "label": "L", "x": 10.75, "y": 2 },
+                { "label": ";", "x": 11.75, "y": 2 },
+                { "label": "'", "x": 12.75, "y": 2 },
+                { "label": "Enter", "x": 13.75, "y": 2, "w": 2.25 },
+
+                { "label": "Shift", "x": 0, "y": 3, "w": 2.25 },
+                { "label": "Z", "x": 2.25, "y": 3 },
+                { "label": "X", "x": 3.25, "y": 3 },
+                { "label": "C", "x": 4.25, "y": 3 },
+                { "label": "V", "x": 5.25, "y": 3 },
+                { "label": "B", "x": 6.25, "y": 3 },
+
+                { "label": "N", "x": 8.25, "y": 3 },
+                { "label": "M", "x": 9.25, "y": 3 },
+                { "label": ",", "x": 10.25, "y": 3 },
+                { "label": ".", "x": 11.25, "y": 3 },
+                { "label": "/", "x": 12.25, "y": 3 },
+                { "label": "Shift", "x": 13.25, "y": 3, "w": 1.75 },
+                { "label": "Up", "x": 15, "y": 3 },
+
+                { "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 },
+                { "label": "Alt", "x": 1.25, "y": 4, "w": 1.25 },
+                { "label": "Win", "x": 2.5, "y": 4, "w": 1.25 },
+                { "label": "Fn", "x": 3.75, "y": 4, "w": 1.25 },
+                { "label": "Space", "x": 5, "y": 4, "w": 2.25 },
+
+                { "label": "Fn", "x": 8.25, "y": 4, "w": 1.25 },
+                { "label": "Space", "x": 9.5, "y": 4, "w": 1.5 },
+                { "label": "Alt", "x": 11, "y": 4 },
+                { "label": "Ctrl", "x": 12, "y": 4 },
+                { "label": "Left", "x": 13, "y": 4 },
+                { "label": "Down", "x": 14, "y": 4 },
+                { "label": "Right", "x": 15, "y": 4 }
+            ]
+        },
+        "LAYOUT_65": {
+            "layout": [
+                { "label": "Esc", "x": 0, "y": 0 },
+                { "label": "1", "x": 1, "y": 0 },
+                { "label": "2", "x": 2, "y": 0 },
+                { "label": "3", "x": 3, "y": 0 },
+                { "label": "4", "x": 4, "y": 0 },
+                { "label": "5", "x": 5, "y": 0 },
+                { "label": "6", "x": 6, "y": 0 },
+
+                { "label": "7", "x": 8, "y": 0 },
+                { "label": "8", "x": 9, "y": 0 },
+                { "label": "9", "x": 10, "y": 0 },
+                { "label": "0", "x": 11, "y": 0 },
+                { "label": "-", "x": 12, "y": 0 },
+                { "label": "=", "x": 13, "y": 0 },
+                { "label": "Del", "x": 14, "y": 0 },
+                { "label": "Bksp", "x": 15, "y": 0 },
+                { "label": "Home", "x": 16, "y": 0 },
+
+                { "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
+                { "label": "Q", "x": 1.5, "y": 1 },
+                { "label": "W", "x": 2.5, "y": 1 },
+                { "label": "E", "x": 3.5, "y": 1 },
+                { "label": "R", "x": 4.5, "y": 1 },
+                { "label": "T", "x": 5.5, "y": 1 },
+
+                { "label": "Y", "x": 7.5, "y": 1 },
+                { "label": "U", "x": 8.5, "y": 1 },
+                { "label": "I", "x": 9.5, "y": 1 },
+                { "label": "O", "x": 10.5, "y": 1 },
+                { "label": "P", "x": 11.5, "y": 1 },
+                { "label": "[", "x": 12.5, "y": 1 },
+                { "label": "]", "x": 13.5, "y": 1 },
+                { "label": "Backslash", "x": 14.5, "y": 1, "w": 1.5 },
+                { "label": "End", "x": 16, "y": 1 },
+
+                { "label": "Caps Lock", "x": 0, "y": 2, "w": 1.75 },
+                { "label": "A", "x": 1.75, "y": 2 },
+                { "label": "S", "x": 2.75, "y": 2 },
+                { "label": "D", "x": 3.75, "y": 2 },
+                { "label": "F", "x": 4.75, "y": 2 },
+                { "label": "G", "x": 5.75, "y": 2 },
+
+                { "label": "H", "x": 7.75, "y": 2 },
+                { "label": "J", "x": 8.75, "y": 2 },
+                { "label": "K", "x": 9.75, "y": 2 },
+                { "label": "L", "x": 10.75, "y": 2 },
+                { "label": ";", "x": 11.75, "y": 2 },
+                { "label": "'", "x": 12.75, "y": 2 },
+                { "label": "Enter", "x": 13.75, "y": 2, "w": 2.25 },
+                { "label": "Page Up", "x": 16, "y": 2 },
+
+                { "label": "Shift", "x": 0, "y": 3, "w": 2.25 },
+                { "label": "Z", "x": 2.25, "y": 3 },
+                { "label": "X", "x": 3.25, "y": 3 },
+                { "label": "C", "x": 4.25, "y": 3 },
+                { "label": "V", "x": 5.25, "y": 3 },
+                { "label": "B", "x": 6.25, "y": 3 },
+
+                { "label": "N", "x": 8.25, "y": 3 },
+                { "label": "M", "x": 9.25, "y": 3 },
+                { "label": ",", "x": 10.25, "y": 3 },
+                { "label": ".", "x": 11.25, "y": 3 },
+                { "label": "/", "x": 12.25, "y": 3 },
+                { "label": "Shift", "x": 13.25, "y": 3, "w": 1.75 },
+                { "label": "Up", "x": 15, "y": 3 },
+                { "label": "Page Down", "x": 16, "y": 3 },
+
+                { "label": "Ctrl", "x": 0, "y": 4, "w": 1.25 },
+                { "label": "Alt", "x": 1.25, "y": 4, "w": 1.25 },
+                { "label": "Win", "x": 2.5, "y": 4, "w": 1.25 },
+                { "label": "Fn", "x": 3.75, "y": 4, "w": 1.25 },
+                { "label": "Space", "x": 5, "y": 4, "w": 2.25 },
+
+                { "label": "Fn", "x": 8.25, "y": 4, "w": 1.25 },
+                { "label": "Space", "x": 9.5, "y": 4, "w": 1.5 },
+                { "label": "Alt", "x": 11, "y": 4 },
+                { "label": "Ctrl", "x": 12, "y": 4 },
+                { "label": "Win", "x": 13, "y": 4 },
+                { "label": "Left", "x": 14, "y": 4 },
+                { "label": "Down", "x": 15, "y": 4 },
+                { "label": "Right", "x": 16, "y": 4 }
+            ]
+        },
+        "LAYOUT_60_with_macro": {
+            "layout": [
+                { "label": "F1", "x": 0, "y": 0 },
+                { "label": "F6", "x": 1, "y": 0 },
+
+                { "label": "Esc", "x": 2.25, "y": 0 },
+                { "label": "1", "x": 3.25, "y": 0 },
+                { "label": "2", "x": 4.25, "y": 0 },
+                { "label": "3", "x": 5.25, "y": 0 },
+                { "label": "4", "x": 6.25, "y": 0 },
+                { "label": "5", "x": 7.25, "y": 0 },
+                { "label": "6", "x": 8.25, "y": 0 },
+
+                { "label": "7", "x": 10.25, "y": 0 },
+                { "label": "8", "x": 11.25, "y": 0 },
+                { "label": "9", "x": 12.25, "y": 0 },
+                { "label": "0", "x": 13.25, "y": 0 },
+                { "label": "-", "x": 14.25, "y": 0 },
+                { "label": "=", "x": 15.25, "y": 0 },
+                { "label": "Del", "x": 16.25, "y": 0 },
+                { "label": "Bksp", "x": 17.25, "y": 0 },
+
+                { "label": "F2", "x": 0, "y": 1 },
+                { "label": "F7", "x": 1, "y": 1 },
+
+                { "label": "Tab", "x": 2.25, "y": 1, "w": 1.5 },
+                { "label": "Q", "x": 3.75, "y": 1 },
+                { "label": "W", "x": 4.75, "y": 1 },
+                { "label": "E", "x": 5.75, "y": 1 },
+                { "label": "R", "x": 6.75, "y": 1 },
+                { "label": "T", "x": 7.75, "y": 1 },
+
+                { "label": "Y", "x": 9.75, "y": 1 },
+                { "label": "U", "x": 10.75, "y": 1 },
+                { "label": "I", "x": 11.75, "y": 1 },
+                { "label": "O", "x": 12.75, "y": 1 },
+                { "label": "P", "x": 13.75, "y": 1 },
+                { "label": "[", "x": 14.75, "y": 1 },
+                { "label": "]", "x": 15.75, "y": 1 },
+                { "label": "Backslash", "x": 16.75, "y": 1, "w": 1.5 },
+
+                { "label": "F3", "x": 0, "y": 2 },
+                { "label": "F8", "x": 1, "y": 2 },
+
+                { "label": "Caps Lock", "x": 2.25, "y": 2, "w": 1.75 },
+                { "label": "A", "x": 4, "y": 2 },
+                { "label": "S", "x": 5, "y": 2 },
+                { "label": "D", "x": 6, "y": 2 },
+                { "label": "F", "x": 7, "y": 2 },
+                { "label": "G", "x": 8, "y": 2 },
+
+                { "label": "H", "x": 10, "y": 2 },
+                { "label": "J", "x": 11, "y": 2 },
+                { "label": "K", "x": 12, "y": 2 },
+                { "label": "L", "x": 13, "y": 2 },
+                { "label": ";", "x": 14, "y": 2 },
+                { "label": "'", "x": 15, "y": 2 },
+                { "label": "Enter", "x": 16, "y": 2, "w": 2.25 },
+
+                { "label": "F4", "x": 0, "y": 3 },
+                { "label": "F9", "x": 1, "y": 3 },
+
+                { "label": "Shift", "x": 2.25, "y": 3, "w": 2.25 },
+                { "label": "Z", "x": 4.5, "y": 3 },
+                { "label": "X", "x": 5.5, "y": 3 },
+                { "label": "C", "x": 6.5, "y": 3 },
+                { "label": "V", "x": 7.5, "y": 3 },
+                { "label": "B", "x": 8.5, "y": 3 },
+
+                { "label": "N", "x": 10.5, "y": 3 },
+                { "label": "M", "x": 11.5, "y": 3 },
+                { "label": ",", "x": 12.5, "y": 3 },
+                { "label": ".", "x": 13.5, "y": 3 },
+                { "label": "/", "x": 14.5, "y": 3 },
+                { "label": "Shift", "x": 15.5, "y": 3, "w": 1.75 },
+                { "label": "Up", "x": 17.25, "y": 3 },
+
+                { "label": "F5", "x": 0, "y": 4 },
+                { "label": "F10", "x": 1, "y": 4 },
+
+                { "label": "Ctrl", "x": 2.25, "y": 4, "w": 1.25 },
+                { "label": "Alt", "x": 3.5, "y": 4, "w": 1.25 },
+                { "label": "Win", "x": 4.75, "y": 4, "w": 1.25 },
+                { "label": "Fn", "x": 6, "y": 4, "w": 1.25 },
+                { "label": "Space", "x": 7.25, "y": 4, "w": 2.25 },
+
+                { "label": "Fn", "x": 10.5, "y": 4, "w": 1.25 },
+                { "label": "Space", "x": 11.75, "y": 4, "w": 1.5 },
+                { "label": "Alt", "x": 13.25, "y": 4 },
+                { "label": "Ctrl", "x": 14.25, "y": 4 },
+                { "label": "Left", "x": 15.25, "y": 4 },
+                { "label": "Down", "x": 16.25, "y": 4 },
+                { "label": "Right", "x": 17.25, "y": 4 }
+            ]
+        },
+        "LAYOUT_65_with_macro": {
+            "layout": [
+                { "label": "F1", "x": 0, "y": 0 },
+                { "label": "F6", "x": 1, "y": 0 },
+
+                { "label": "Esc", "x": 2.25, "y": 0 },
+                { "label": "1", "x": 3.25, "y": 0 },
+                { "label": "2", "x": 4.25, "y": 0 },
+                { "label": "3", "x": 5.25, "y": 0 },
+                { "label": "4", "x": 6.25, "y": 0 },
+                { "label": "5", "x": 7.25, "y": 0 },
+                { "label": "6", "x": 8.25, "y": 0 },
+
+                { "label": "7", "x": 10.25, "y": 0 },
+                { "label": "8", "x": 11.25, "y": 0 },
+                { "label": "9", "x": 12.25, "y": 0 },
+                { "label": "0", "x": 13.25, "y": 0 },
+                { "label": "-", "x": 14.25, "y": 0 },
+                { "label": "=", "x": 15.25, "y": 0 },
+                { "label": "Del", "x": 16.25, "y": 0 },
+                { "label": "Bksp", "x": 17.25, "y": 0 },
+                { "label": "Home", "x": 18.25, "y": 0 },
+
+                { "label": "F2", "x": 0, "y": 1 },
+                { "label": "F7", "x": 1, "y": 1 },
+
+                { "label": "Tab", "x": 2.25, "y": 1, "w": 1.5 },
+                { "label": "Q", "x": 3.75, "y": 1 },
+                { "label": "W", "x": 4.75, "y": 1 },
+                { "label": "E", "x": 5.75, "y": 1 },
+                { "label": "R", "x": 6.75, "y": 1 },
+                { "label": "T", "x": 7.75, "y": 1 },
+
+                { "label": "Y", "x": 9.75, "y": 1 },
+                { "label": "U", "x": 10.75, "y": 1 },
+                { "label": "I", "x": 11.75, "y": 1 },
+                { "label": "O", "x": 12.75, "y": 1 },
+                { "label": "P", "x": 13.75, "y": 1 },
+                { "label": "[", "x": 14.75, "y": 1 },
+                { "label": "]", "x": 15.75, "y": 1 },
+                { "label": "Backslash", "x": 16.75, "y": 1, "w": 1.5 },
+                { "label": "PgUp", "x": 18.25, "y": 1 },
+
+                { "label": "F3", "x": 0, "y": 2 },
+                { "label": "F8", "x": 1, "y": 2 },
+
+                { "label": "Caps Lock", "x": 2.25, "y": 2, "w": 1.75 },
+                { "label": "A", "x": 4, "y": 2 },
+                { "label": "S", "x": 5, "y": 2 },
+                { "label": "D", "x": 6, "y": 2 },
+                { "label": "F", "x": 7, "y": 2 },
+                { "label": "G", "x": 8, "y": 2 },
+
+                { "label": "H", "x": 10, "y": 2 },
+                { "label": "J", "x": 11, "y": 2 },
+                { "label": "K", "x": 12, "y": 2 },
+                { "label": "L", "x": 13, "y": 2 },
+                { "label": ";", "x": 14, "y": 2 },
+                { "label": "'", "x": 15, "y": 2 },
+                { "label": "Enter", "x": 16, "y": 2, "w": 2.25 },
+                { "label": "PgDn", "x": 18.25, "y": 2 },
+
+                { "label": "F4", "x": 0, "y": 3 },
+                { "label": "F9", "x": 1, "y": 3 },
+
+                { "label": "Shift", "x": 2.25, "y": 3, "w": 2.25 },
+                { "label": "Z", "x": 4.5, "y": 3 },
+                { "label": "X", "x": 5.5, "y": 3 },
+                { "label": "C", "x": 6.5, "y": 3 },
+                { "label": "V", "x": 7.5, "y": 3 },
+                { "label": "B", "x": 8.5, "y": 3 },
+
+                { "label": "N", "x": 10.5, "y": 3 },
+                { "label": "M", "x": 11.5, "y": 3 },
+                { "label": ",", "x": 12.5, "y": 3 },
+                { "label": ".", "x": 13.5, "y": 3 },
+                { "label": "/", "x": 14.5, "y": 3 },
+                { "label": "Shift", "x": 15.5, "y": 3, "w": 1.75 },
+                { "label": "Up", "x": 17.25, "y": 3 },
+                { "label": "End", "x": 18.25, "y": 3 },
+
+                { "label": "F5", "x": 0, "y": 4 },
+                { "label": "F10", "x": 1, "y": 4 },
+
+                { "label": "Ctrl", "x": 2.25, "y": 4, "w": 1.25 },
+                { "label": "Alt", "x": 3.5, "y": 4, "w": 1.25 },
+                { "label": "Win", "x": 4.75, "y": 4, "w": 1.25 },
+                { "label": "Fn", "x": 6, "y": 4, "w": 1.25 },
+                { "label": "Space", "x": 7.25, "y": 4, "w": 2.25 },
+
+                { "label": "Fn", "x": 10.5, "y": 4, "w": 1.25 },
+                { "label": "Space", "x": 11.75, "y": 4, "w": 1.5 },
+                { "label": "Alt", "x": 13.25, "y": 4 },
+                { "label": "Ctrl", "x": 14.25, "y": 4 },
+                { "label": "Win", "x": 15.25, "y": 4 },
+                { "label": "Left", "x": 16.25, "y": 4 },
+                { "label": "Down", "x": 17.25, "y": 4 },
+                { "label": "Right", "x": 18.25, "y": 4 }
+            ]
+        }
+    }
+}
diff --git a/keyboards/keebio/quefrency/rev5/readme.md b/keyboards/keebio/quefrency/rev5/readme.md
new file mode 100644
index 0000000000..77e296f5f1
--- /dev/null
+++ b/keyboards/keebio/quefrency/rev5/readme.md
@@ -0,0 +1,18 @@
+# Quefrency Rev. 5
+
+Quefrency Rev. 5 features Kailh hotswap sockets with a fixed layout. The left macro portion and right column can be broken off, and split backspace or 2u backspace can be used.
+
+* Keyboard Maintainer: [Bakingpy/nooges](https://github.com/nooges)
+* Hardware Availability: [Keebio](https://keeb.io/)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make keebio/quefrency/rev5:default
+
+Example of flashing this keyboard:
+
+    make keebio/quefrency/rev5: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).
+
+A build guide for this keyboard can be found here: [Keebio Build Guides](https://docs.keeb.io)
diff --git a/keyboards/keebio/quefrency/rev5/rev5.c b/keyboards/keebio/quefrency/rev5/rev5.c
new file mode 100644
index 0000000000..190135420f
--- /dev/null
+++ b/keyboards/keebio/quefrency/rev5/rev5.c
@@ -0,0 +1,35 @@
+/* Copyright 2021 Danny Nguyen <danny@keeb.io>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "quefrency.h"
+
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) { return false; }
+    if (index == 0) {
+        if (clockwise) {
+            tap_code(KC_PGDN);
+        } else {
+            tap_code(KC_PGUP);
+        }
+    } else if (index == 1) {
+        if (clockwise) {
+            tap_code(KC_VOLU);
+        } else {
+            tap_code(KC_VOLD);
+        }
+    }
+    return false;
+}
diff --git a/keyboards/keebio/quefrency/rev5/rev5.h b/keyboards/keebio/quefrency/rev5/rev5.h
new file mode 100644
index 0000000000..2284a6da43
--- /dev/null
+++ b/keyboards/keebio/quefrency/rev5/rev5.h
@@ -0,0 +1,120 @@
+/* Copyright 2021 Danny Nguyen <danny@keeb.io>
+
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should 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 "quefrency.h"
+#include "quantum.h"
+
+#define LAYOUT_60( \
+  LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, \
+  LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, \
+  LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6,      RC8, \
+  LD3,      LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, \
+  LE3, LE4, LE5, LE6,      LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8 \
+  ) \
+  { \
+    { KC_NO, KC_NO, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
+    { KC_NO, KC_NO, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
+    { KC_NO, KC_NO, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
+    { KC_NO, KC_NO, LD3, KC_NO, LD5, LD6, LD7, LD8, LD9 }, \
+    { KC_NO, KC_NO, LE3, LE4, LE5, LE6, KC_NO, LE8, KC_NO }, \
+    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, KC_NO }, \
+    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, KC_NO }, \
+    { RC1, RC2, RC3, RC4, RC5, RC6, KC_NO, RC8, KC_NO }, \
+    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, KC_NO }, \
+    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, KC_NO } \
+  }
+
+#define LAYOUT_65( \
+  LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9, \
+  LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9, \
+  LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6,      RC8, RC9, \
+  LD3,      LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, RD9, \
+  LE3, LE4, LE5, LE6,      LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8, RE9 \
+  ) \
+  { \
+    { KC_NO, KC_NO, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
+    { KC_NO, KC_NO, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
+    { KC_NO, KC_NO, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
+    { KC_NO, KC_NO, LD3, KC_NO, LD5, LD6, LD7, LD8, LD9 }, \
+    { KC_NO, KC_NO, LE3, LE4, LE5, LE6, KC_NO, LE8, KC_NO }, \
+    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9 }, \
+    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9 }, \
+    { RC1, RC2, RC3, RC4, RC5, RC6, KC_NO, RC8, RC9 }, \
+    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, RD9 }, \
+    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, RE9 } \
+  }
+
+#define LAYOUT_60_with_macro( \
+  LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, \
+  LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, \
+  LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6,      RC8, \
+  LD1, LD2, LD3,      LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, \
+  LE1, LE2, LE3, LE4, LE5, LE6,      LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8 \
+  ) \
+  { \
+    { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
+    { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
+    { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
+    { LD1, LD2, LD3, KC_NO, LD5, LD6, LD7, LD8, LD9 }, \
+    { LE1, LE2, LE3, LE4, LE5, LE6, KC_NO, LE8, KC_NO }, \
+    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, KC_NO }, \
+    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, KC_NO }, \
+    { RC1, RC2, RC3, RC4, RC5, RC6, KC_NO, RC8, KC_NO }, \
+    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, KC_NO }, \
+    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, KC_NO } \
+  }
+
+#define LAYOUT_65_with_macro( \
+  LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9, \
+  LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9, \
+  LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6,      RC8, RC9, \
+  LD1, LD2, LD3,      LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, RD9, \
+  LE1, LE2, LE3, LE4, LE5, LE6,      LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8, RE9 \
+  ) \
+  { \
+    { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
+    { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
+    { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
+    { LD1, LD2, LD3, KC_NO, LD5, LD6, LD7, LD8, LD9 }, \
+    { LE1, LE2, LE3, LE4, LE5, LE6, KC_NO, LE8, KC_NO }, \
+    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9 }, \
+    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9 }, \
+    { RC1, RC2, RC3, RC4, RC5, RC6, KC_NO, RC8, RC9 }, \
+    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, RD9 }, \
+    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, RE9 } \
+  }
+
+#define LAYOUT_all( \
+  LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9,      RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9, \
+  LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8,           RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9, \
+  LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8,           RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, RC9, \
+  LD1, LD2, LD3, LD4, LD5, LD6, LD7, LD8, LD9,      RD1, RD2, RD3, RD4, RD5,      RD7, RD8, RD9, \
+  LE1, LE2, LE3, LE4, LE5, LE6, LE7, LE8,           RE1, RE2, RE3, RE4, RE5,      RE7, RE8, RE9 \
+  ) \
+  { \
+    { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \
+    { LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, KC_NO }, \
+    { LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, KC_NO }, \
+    { LD1, LD2, LD3, LD4, LD5, LD6, LD7, LD8, LD9 }, \
+    { LE1, LE2, LE3, LE4, LE5, LE6, LE7, LE8, KC_NO }, \
+    { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9 }, \
+    { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9 }, \
+    { RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, RC9 }, \
+    { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, RD9 }, \
+    { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, RE9 } \
+  }
diff --git a/keyboards/keebio/quefrency/rev5/rules.mk b/keyboards/keebio/quefrency/rev5/rules.mk
new file mode 100644
index 0000000000..f071ae81b8
--- /dev/null
+++ b/keyboards/keebio/quefrency/rev5/rules.mk
@@ -0,0 +1,4 @@
+BOOTLOADER = atmel-dfu
+BACKLIGHT_ENABLE = no
+RGBLIGHT_ENABLE = yes
+ENCODER_ENABLE = yes