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

17 files changed, 674 insertions, 0 deletions

diff --git a/keyboards/checkerboards/quark_plus/config.h b/keyboards/checkerboards/quark_plus/config.h
new file mode 100644
index 0000000000..a2d2dc230c
--- /dev/null
+++ b/keyboards/checkerboards/quark_plus/config.h
@@ -0,0 +1,74 @@
+/* Copyright 2022 Nathan Spears
+ *
+ * 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       0x7070
+#define PRODUCT_ID      0x5344
+#define DEVICE_VER      0x0001
+#define MANUFACTURER    Nasp
+#define PRODUCT         QUARK_PlUS
+
+/* key matrix size */
+#define MATRIX_ROWS 8
+#define MATRIX_COLS 6
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { B4, B1, C2, D0, D6, B0, B6, B5 }
+#define MATRIX_COL_PINS { C6, D1, D5, D4, D3, D2 }
+#define UNUSED_PINS
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Set 0 if debouncing isn't needed */
+#define DEBOUNCE 5
+
+/* 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
+
+/* Switch LED Backlighting */
+#define BACKLIGHT_PIN C4
+#define BACKLIGHT_LEVELS 6
+#define BACKLIGHT_BREATHING
+#define BREATHING_PERIOD 6
+
+// ws2812 options
+#define RGB_DI_PIN C5 // pin the DI on the ws2812 is hooked-up to
+#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
+#define RGBLED_NUM 14 // number of LEDs
+#define RGBLIGHT_HUE_STEP 12 // units to step when in/decreasing hue
+#define RGBLIGHT_SAT_STEP 12 // units to step when in/decresing saturation
+#define RGBLIGHT_VAL_STEP 12 // units to step when in/decreasing value (brightness)
+
+#define ENCODERS_PAD_A { C7, B7, B3, B2}
+#define ENCODERS_PAD_B { B7, C7, B2, B3}
+#define ENCODER_RESOLUTION 4
diff --git a/keyboards/checkerboards/quark_plus/info.json b/keyboards/checkerboards/quark_plus/info.json
new file mode 100644
index 0000000000..b5a111ce8e
--- /dev/null
+++ b/keyboards/checkerboards/quark_plus/info.json
@@ -0,0 +1,23 @@
+{
+    "keyboard_name": "Quark_Plus",
+    "url": "https://www.github.com/qmk/qmk_firmware/tree/master/keyboards/checkerboards/quark_plus",
+    "maintainer": "nasp",
+    "layouts": {
+          "LAYOUT_grid": {
+              "layout":
+                [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Back Space", "x":11, "y":0}, {"label":"Esc", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"'", "x":11, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"/", "x":10, "y":2}, {"label":"Return", "x":11, "y":2}, {"label":"CTRL", "x":0, "y":3}, {"label":"WIN", "x":1, "y":3}, {"label":"MENU", "x":2, "y":3}, {"label":"ALT", "x":3, "y":3}, {"label":"&dArr;", "x":4, "y":3}, {"x":5, "y":3}, {"x":6, "y":3}, {"label":"&uArr;", "x":7, "y":3}, {"label":"LEFT", "x":8, "y":3}, {"label":"DOWN", "x":9, "y":3}, {"label":"UP", "x":10, "y":3}, {"label":"RIGHT", "x":11, "y":3}]
+                               },
+          "LAYOUT_2u":   {
+              "layout":
+                [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Back Space", "x":11, "y":0}, {"label":"Esc", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"'", "x":11, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"/", "x":10, "y":2}, {"label":"Return", "x":11, "y":2}, {"label":"CTRL", "x":0, "y":3}, {"label":"WIN", "x":1, "y":3}, {"label":"MENU", "x":2, "y":3}, {"label":"ALT", "x":3, "y":3}, {"label":"&dArr;", "x":4, "y":3}, {"x":5, "y":3, "w":2}, {"label":"&uArr;", "x":7, "y":3}, {"label":"LEFT", "x":8, "y":3}, {"label":"DOWN", "x":9, "y":3}, {"label":"UP", "x":10, "y":3}, {"label":"RIGHT", "x":11, "y":3}]
+                               },
+          "LAYOUT_2x225u": {
+              "layout":
+                [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Back Space", "x":11, "y":0}, {"label":"Esc", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"'", "x":11, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"/", "x":10, "y":2}, {"label":"Return", "x":11, "y":2}, {"label":"CTRL", "x":0, "y":3, "w":1.25}, {"label":"WIN", "x":1.25, "y":3, "w":1.25}, {"label":"ALT", "x":2.5, "y":3, "w":1.25}, {"x":3.75, "y":3, "w":2.25}, {"x":6, "y":3, "w":2.25}, {"label":"ALT", "x":8.25, "y":3, "w":1.25}, {"label":"MENU", "x":9.5, "y":3, "w":1.25}, {"label":"CTRL", "x":10.75, "y":3, "w":1.25}]
+                               },
+          "LAYOUT_2x3u":   {
+              "layout":
+                [{"label":"Tab", "x":0, "y":0}, {"label":"Q", "x":1, "y":0}, {"label":"W", "x":2, "y":0}, {"label":"E", "x":3, "y":0}, {"label":"R", "x":4, "y":0}, {"label":"T", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "y":0}, {"label":"Back Space", "x":11, "y":0}, {"label":"Esc", "x":0, "y":1}, {"label":"A", "x":1, "y":1}, {"label":"S", "x":2, "y":1}, {"label":"D", "x":3, "y":1}, {"label":"F", "x":4, "y":1}, {"label":"G", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":";", "x":10, "y":1}, {"label":"'", "x":11, "y":1}, {"label":"Shift", "x":0, "y":2}, {"label":"Z", "x":1, "y":2}, {"label":"X", "x":2, "y":2}, {"label":"C", "x":3, "y":2}, {"label":"V", "x":4, "y":2}, {"label":"B", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":",", "x":8, "y":2}, {"label":".", "x":9, "y":2}, {"label":"/", "x":10, "y":2}, {"label":"Return", "x":11, "y":2}, {"label":"CTRL", "x":0, "y":3}, {"label":"WIN", "x":1, "y":3}, {"label":"ALT", "x":2, "y":3}, {"x":3, "y":3, "w":3}, {"x":6, "y":3, "w":3}, {"label":"ALT", "x":9, "y":3}, {"label":"MENU", "x":10, "y":3}, {"label":"CTRL", "x":11, "y":3}]
+                               }
+                 }
+  }
diff --git a/keyboards/checkerboards/quark_plus/keymaps/2u/config.h b/keyboards/checkerboards/quark_plus/keymaps/2u/config.h
new file mode 100644
index 0000000000..9ec4fd1a94
--- /dev/null
+++ b/keyboards/checkerboards/quark_plus/keymaps/2u/config.h
@@ -0,0 +1 @@
+#define TAPPING_TOGGLE 2
diff --git a/keyboards/checkerboards/quark_plus/keymaps/2u/keymap.c b/keyboards/checkerboards/quark_plus/keymaps/2u/keymap.c
new file mode 100644
index 0000000000..b62e60370e
--- /dev/null
+++ b/keyboards/checkerboards/quark_plus/keymaps/2u/keymap.c
@@ -0,0 +1,82 @@
+/* Copyright 2022 Nathan Spears
+ *
+ * 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
+
+// Defines for task manager and such
+#define CALTDEL LCTL(LALT(KC_DEL))
+#define TSKMGR LCTL(LSFT(KC_ESC))
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  /* [0]
+  * ,-----------------------------------------------------------------------------------------.
+  * |------------+------+------+------+------+------+------+------+------+------+------+------|
+  * | TAB       |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | DEL   |
+  * |------------+------+------+------+------+-------------+------+------+------+------+------|
+  * | CTRL&ESC  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "    |
+  * |------------+------+------+------+------+------|------+------+------+------+------+------|
+  * | SHIFT     |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  | ENTER |
+  * |-------+-------+-------+-------+-------+-------+------+------+------+------+------+------|
+  * |    PRINT   | Ctrl | ALT  | GUI  |LOWER |   SPACE    |RAISE | LEFT | DOWN |  UP  |RIGHT  |
+  * `-----------------------------------------------------------------------------------------'
+  */
+  [0] = LAYOUT_2u(
+      KC_TAB,        KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_DEL,
+      CTL_T(KC_ESC), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+      KC_LSFT,       KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
+      KC_PSCR,       KC_LCTL, KC_LALT, KC_LGUI, TT(1),   KC_SPC,  TT(2),   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+    ),
+
+  /* [1]
+  * ,---------------------------------------------------------------------------------------.
+  * |------------+------+------+------+------+------+------+------+------+------+------+----|
+  * |   ~    | !    |  @   |  #  |  $   |  %   |  | ^  |  &   |  *  |  (    |  )  | BCKSPC  |
+  * |------------+------+------+------+------+-------------+------+------+------+------+----|
+  * |   \    |    1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |   /   |
+  * |------------+------+------+------+------+------|------+------+------+------+------+----|
+  * |       |       |      |      |      |      |      |   +   |   =  |      |      |       |
+  * |-------+-------+-------+-------+-------+-------+------+------+------+------+------+----|
+  * |     |    | ESC  |CTRL-ALT-DEL|TASK|        |     |     |    |  '|'  |   `   |       |
+  * `---------------------------------------------------------------------------------------'
+  */
+  [1] = LAYOUT_2u(
+      KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
+      KC_SLSH, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSLS,
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_EQL, _______, _______, _______,
+      _______, KC_ESC,  CALTDEL,  TSKMGR, _______, _______, _______, _______, KC_NUBS, KC_GRV, _______
+    ),
+
+  /* [2]
+  * ,---------------------------------------------------------------------------------------.
+  * |------------+------+------+------+------+------+------+------+------+------+------+---|
+  * |       |      |      |  UP  |       |      |     |   _   |     |   [   |  ]    |      |
+  * |------------+------+------+------+------+-------------+------+------+------+------+---|
+  * |       |     | LEFT | DOWN  | RIGHT |     |      |   -  |      |   [   |   ]   |      |
+  * |------------+------+------+------+------+-----+-----+------+------+------+------+-----|
+  * |   F1  | F2 |  F3  |   F4  | F5    | F6  | F7   | F8   | F9    | F10  | F11   | F12   |
+  * |-------+-------+-------+-------+-------+-------+------+------+------+------+------+---|
+  * |RESET |    |      |       |       |            |      |       |      |       |        |
+  * `---------------------------------------------------------------------------------------'
+     */
+  [2] = LAYOUT_2u(
+      _______,  _______,  _______,   KC_UP,   _______,   _______,  _______,  KC_UNDS, _______,  KC_LBRC,  KC_RBRC, _______,
+      _______,  _______,   KC_LEFT, KC_DOWN,  KC_RGHT,   _______,  _______,  KC_MINS, _______,  KC_LCBR,  KC_RCBR, _______,
+      KC_F1,    KC_F2,     KC_F3,   KC_F4,    KC_F5,     KC_F6,    KC_F7,    KC_F8,   KC_F9,    KC_F10,   KC_F11,  KC_F12,
+      RESET,    _______,   _______, _______,  _______,    _______,  _______, _______,  _______,  _______, _______
+    ),
+    };
diff --git a/keyboards/checkerboards/quark_plus/keymaps/2x225u/config.h b/keyboards/checkerboards/quark_plus/keymaps/2x225u/config.h
new file mode 100644
index 0000000000..9ec4fd1a94
--- /dev/null
+++ b/keyboards/checkerboards/quark_plus/keymaps/2x225u/config.h
@@ -0,0 +1 @@
+#define TAPPING_TOGGLE 2
diff --git a/keyboards/checkerboards/quark_plus/keymaps/2x225u/keymap.c b/keyboards/checkerboards/quark_plus/keymaps/2x225u/keymap.c
new file mode 100644
index 0000000000..f490f76f9f
--- /dev/null
+++ b/keyboards/checkerboards/quark_plus/keymaps/2x225u/keymap.c
@@ -0,0 +1,82 @@
+/* Copyright 2015-2017 Jack Humbert
+ * Modified by Nasp for the Quark
+ * 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
+
+// Defines for task manager and such
+#define CALTDEL LCTL(LALT(KC_DEL))
+#define TSKMGR LCTL(LSFT(KC_ESC))
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  /* [0]
+  * ,-----------------------------------------------------------------------------------------.
+  * |------------+------+------+------+------+------+------+------+------+------+------+------|
+  * | Tab        |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Del  |
+  * |------------+------+------+------+------+-------------+------+------+------+------+------|
+  * | CTL & ESC  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
+  * |------------+------+------+------+------+------|------+------+------+------+------+------|
+  * | Shift      |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
+  * |-------+-------+-------+-------+-------+-------+------+------+------+------+------+------|
+  * | PRINT   |  OS   |  Alt  |  Layer  |    Space & Layer     |   [     |   ]    |    CAPS   |
+  * `-----------------------------------------------------------------------------------------'
+  */
+  [0] = LAYOUT_2x225u(
+    KC_TAB,        KC_Q,    KC_W,    KC_F,     KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,    KC_SCLN, KC_BSPC,
+    CTL_T(KC_ESC), KC_A,    KC_R,    KC_S,     KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,    KC_O,    KC_QUOT,
+    KC_LSFT,       KC_Z,    KC_X,    KC_C,     KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
+    KC_PSCR, KC_LGUI, KC_LALT, TT(1), LT(2, KC_SPC), KC_LBRC, KC_RBRC, KC_CAPS
+    ),
+
+  /* [1]
+  * ,---------------------------------------------------------------------------------------.
+  * |------------+------+------+------+------+------+------+------+------+------+------+----|
+  * |   ~    | !    |  @   |  #  |  $   |  %   |  | ^  |  &   |  *  |  (    |  )  | BCKSPC  |
+  * |------------+------+------+------+------+-------------+------+------+------+------+----|
+  * |   \    |    1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |   /   |
+  * |------------+------+------+------+------+------|------+------+------+------+------+----|
+  * |     |      |      |      |      |      |      |   +   |   =   |      |        |       |
+  * |-------+-------+-------+-------+-------+-------+------+------+------+------+------+----|
+  * |   ESC  |  CTRL-ALT-DEL   |   TASK   |         |        |    '|'    |    `    |        |
+  * `---------------------------------------------------------------------------------------'
+  */
+  [1] = LAYOUT_2x225u(
+      KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
+      KC_SLSH, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSLS,
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_EQL, _______, _______, _______,
+      KC_ESC,  CALTDEL,  TSKMGR, _______, _______, KC_NUBS, KC_GRV,  _______
+    ),
+
+  /* [2]
+  * ,---------------------------------------------------------------------------------------.
+  * |------------+------+------+------+------+------+------+------+------+------+------+---|
+  * |       |      |      |  UP  |       |      |     |   _   |     |   [   |  ]    |      |
+  * |------------+------+------+------+------+-------------+------+------+------+------+---|
+  * |       |     | LEFT | DOWN  | RIGHT |     |      |   -  |      |   [   |   ]   |      |
+  * |------------+------+------+------+------+-----+-----+------+------+------+------+-----|
+  * |   F1  | F2 |  F3  |   F4  | F5    | F6  | F7   | F8   | F9    | F10  | F11   | F12   |
+  * |-------+-------+-------+-------+-------+-------+------+------+------+------+------+---|
+  * |     RESET    |           |          |         |         |         |        |         |
+  * `---------------------------------------------------------------------------------------'
+     */
+  [2] = LAYOUT_2x225u(
+      _______,  _______,  _______,   KC_UP,   _______,  _______,  _______,  KC_UNDS, _______, KC_LBRC, KC_RBRC, _______,
+      _______,  _______,   KC_LEFT, KC_DOWN, KC_RGHT,   _______,  _______,  KC_MINS, _______, KC_LCBR, KC_RCBR, _______,
+      KC_F1,    KC_F2,     KC_F3,   KC_F4,   KC_F5,     KC_F6,    KC_F7,    KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,
+      RESET,  _______, _______, _______,  _______,  _______,  _______, _______
+    ),
+    };
diff --git a/keyboards/checkerboards/quark_plus/keymaps/2x3u/config.h b/keyboards/checkerboards/quark_plus/keymaps/2x3u/config.h
new file mode 100644
index 0000000000..9ec4fd1a94
--- /dev/null
+++ b/keyboards/checkerboards/quark_plus/keymaps/2x3u/config.h
@@ -0,0 +1 @@
+#define TAPPING_TOGGLE 2
diff --git a/keyboards/checkerboards/quark_plus/keymaps/2x3u/keymap.c b/keyboards/checkerboards/quark_plus/keymaps/2x3u/keymap.c
new file mode 100644
index 0000000000..ea65b98cd9
--- /dev/null
+++ b/keyboards/checkerboards/quark_plus/keymaps/2x3u/keymap.c
@@ -0,0 +1,82 @@
+/* Copyright 2015-2017 Jack Humbert
+ * Modified by Nasp for the Quark
+ * 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
+
+// Defines for task manager and such
+#define CALTDEL LCTL(LALT(KC_DEL))
+#define TSKMGR LCTL(LSFT(KC_ESC))
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+/* [0]
+* ,-----------------------------------------------------------------------------------------.
+* |------------+------+------+------+------+------+------+------+------+------+------+------|
+* | Tab        |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | Del  |
+* |------------+------+------+------+------+-------------+------+------+------+------+------|
+* | CTL & ESC  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "   |
+* |------------+------+------+------+------+------|------+------+------+------+------+------|
+* | Shift      |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  |Enter |
+* |-------+-------+-------+-------+-------+-------+------+------+------+------+------+------|
+* | PRINT   |  OS   |  Alt  |  Layer  |    Space & Layer     |   [     |   ]    |    CAPS   |
+* `-----------------------------------------------------------------------------------------'
+*/
+[0] = LAYOUT_2x3u(
+    KC_TAB,        KC_Q,    KC_W,    KC_F,     KC_P,    KC_G,    KC_J,    KC_L,    KC_U,    KC_Y,   KC_SCLN,  KC_BSPC,
+    CTL_T(KC_ESC), KC_A,    KC_R,    KC_S,     KC_T,    KC_D,    KC_H,    KC_N,    KC_E,    KC_I,   KC_O,     KC_QUOT,
+    KC_LSFT,       KC_Z,    KC_X,    KC_C,     KC_V,    KC_B,    KC_K,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
+    KC_PSCR, KC_LGUI, KC_LALT, TT(1), LT(2, KC_SPC), KC_LBRC, KC_RBRC, KC_CAPS
+  ),
+
+/* [1]
+* ,---------------------------------------------------------------------------------------.
+* |------------+------+------+------+------+------+------+------+------+------+------+----|
+* |   ~    | !    |  @   |  #  |  $   |  %   |  | ^  |  &   |  *  |  (    |  )  | BCKSPC  |
+* |------------+------+------+------+------+-------------+------+------+------+------+----|
+* |   \    |    1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |   /   |
+* |------------+------+------+------+------+------|------+------+------+------+------+----|
+* |     |      |      |      |      |      |      |   +   |   =   |      |        |       |
+* |-------+-------+-------+-------+-------+-------+------+------+------+------+------+----|
+* |   ESC  |  CTRL-ALT-DEL   |   TASK   |         |        |    '|'    |    `    |        |
+* `---------------------------------------------------------------------------------------'
+*/
+[1] = LAYOUT_2x3u(
+    KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
+    KC_SLSH, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSLS,
+    KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_EQL, _______, _______, _______,
+    KC_ESC,  CALTDEL,  TSKMGR, _______, _______, KC_NUBS, KC_GRV,  _______
+  ),
+
+/* [2]
+* ,---------------------------------------------------------------------------------------.
+* |------------+------+------+------+------+------+------+------+------+------+------+---|
+* |       |      |      |  UP  |       |      |     |   _   |     |   [   |  ]    |      |
+* |------------+------+------+------+------+-------------+------+------+------+------+---|
+* |       |     | LEFT | DOWN  | RIGHT |     |      |   -  |      |   [   |   ]   |      |
+* |------------+------+------+------+------+-----+-----+------+------+------+------+-----|
+* |   F1  | F2 |  F3  |   F4  | F5    | F6  | F7   | F8   | F9    | F10  | F11   | F12   |
+* |-------+-------+-------+-------+-------+-------+------+------+------+------+------+---|
+* |     RESET    |           |          |         |         |         |        |         |
+* `---------------------------------------------------------------------------------------'
+   */
+[2] = LAYOUT_2x3u(
+    _______,  _______,  _______,   KC_UP,   _______,  _______,  _______,  KC_UNDS, _______, KC_LBRC, KC_RBRC, _______,
+    _______,  _______,   KC_LEFT, KC_DOWN, KC_RGHT,   _______,  _______,  KC_MINS, _______, KC_LCBR, KC_RCBR, _______,
+    KC_F1,    KC_F2,     KC_F3,   KC_F4,   KC_F5,     KC_F6,    KC_F7,    KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,
+    RESET,  _______, _______, _______,  _______,  _______,  _______, _______
+  ),
+  };
diff --git a/keyboards/checkerboards/quark_plus/keymaps/default/config.h b/keyboards/checkerboards/quark_plus/keymaps/default/config.h
new file mode 100644
index 0000000000..9ec4fd1a94
--- /dev/null
+++ b/keyboards/checkerboards/quark_plus/keymaps/default/config.h
@@ -0,0 +1 @@
+#define TAPPING_TOGGLE 2
diff --git a/keyboards/checkerboards/quark_plus/keymaps/default/keymap.c b/keyboards/checkerboards/quark_plus/keymaps/default/keymap.c
new file mode 100644
index 0000000000..871a386441
--- /dev/null
+++ b/keyboards/checkerboards/quark_plus/keymaps/default/keymap.c
@@ -0,0 +1,82 @@
+/* Copyright 2022 Nathan Spears
+ *
+ * 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
+
+// Defines for task manager and such
+#define CALTDEL LCTL(LALT(KC_DEL))
+#define TSKMGR LCTL(LSFT(KC_ESC))
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  /* [0]
+  * ,-----------------------------------------------------------------------------------------.
+  * |------------+------+------+------+------+------+------+------+------+------+------+------|
+  * | TAB       |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | DEL   |
+  * |------------+------+------+------+------+-------------+------+------+------+------+------|
+  * | CTRL&ESC  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "    |
+  * |------------+------+------+------+------+------|------+------+------+------+------+------|
+  * | SHIFT     |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  | ENTER |
+  * |-------+-------+-------+-------+-------+-------+------+------+------+------+------+------|
+  * |    PRINT   | Ctrl | ALT  | GUI  |LOWER |SPACE |SPACE|RAISE | LEFT | DOWN |  UP  |RIGHT  |
+  * `-----------------------------------------------------------------------------------------'
+  */
+  [0] = LAYOUT_grid(
+      KC_TAB,        KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_DEL,
+      CTL_T(KC_ESC), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+      KC_LSFT,       KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
+      KC_PSCR,       KC_LCTL, KC_LALT, KC_LGUI, TT(1),   KC_SPC,  KC_SPC,  TT(2),   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+    ),
+
+  /* [1]
+  * ,---------------------------------------------------------------------------------------.
+  * |------------+------+------+------+------+------+------+------+------+------+------+----|
+  * |   ~    | !    |  @   |  #  |  $   |  %   |  | ^  |  &   |  *  |  (    |  )  | BCKSPC  |
+  * |------------+------+------+------+------+-------------+------+------+------+------+----|
+  * |   \    |    1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |   /   |
+  * |------------+------+------+------+------+------|------+------+------+------+------+----|
+  * |       |       |      |      |      |      |      |   +   |   =  |      |      |       |
+  * |-------+-------+-------+-------+-------+-------+------+------+------+------+------+----|
+  * |     |    | ESC  |CTRL-ALT-DEL|TASK|    |     |     |     |    |  '|'  |   `   |       |
+  * `---------------------------------------------------------------------------------------'
+  */
+  [1] = LAYOUT_grid(
+      KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
+      KC_SLSH, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSLS,
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_EQL, _______, _______, _______,
+      _______, KC_ESC,  CALTDEL,  TSKMGR, _______, _______, _______, _______, _______, KC_NUBS, KC_GRV, _______
+    ),
+
+  /* [2]
+  * ,---------------------------------------------------------------------------------------.
+  * |------------+------+------+------+------+------+------+------+------+------+------+---|
+  * |       |      |      |  UP  |       |      |     |   _   |     |   [   |  ]    |      |
+  * |------------+------+------+------+------+-------------+------+------+------+------+---|
+  * |       |     | LEFT | DOWN  | RIGHT |     |      |   -  |      |   [   |   ]   |      |
+  * |------------+------+------+------+------+-----+-----+------+------+------+------+-----|
+  * |   F1  | F2 |  F3  |   F4  | F5    | F6  | F7   | F8   | F9    | F10  | F11   | F12   |
+  * |-------+-------+-------+-------+-------+-------+------+------+------+------+------+---|
+  * |RESET |    |      |       |       |     |      |      |       |      |       |        |
+  * `---------------------------------------------------------------------------------------'
+     */
+  [2] = LAYOUT_grid(
+      _______,  _______,  _______,   KC_UP,   _______,   _______,  _______,  KC_UNDS, _______,  KC_LBRC,  KC_RBRC, _______,
+      _______,  _______,   KC_LEFT, KC_DOWN,  KC_RGHT,   _______,  _______,  KC_MINS, _______,  KC_LCBR,  KC_RCBR, _______,
+      KC_F1,    KC_F2,     KC_F3,   KC_F4,    KC_F5,     KC_F6,    KC_F7,    KC_F8,   KC_F9,    KC_F10,   KC_F11,  KC_F12,
+      RESET,    _______,   _______, _______,  _______,   _______,  _______,  _______, _______,  _______,  _______, _______
+    ),
+  };
diff --git a/keyboards/checkerboards/quark_plus/keymaps/default/readme.md b/keyboards/checkerboards/quark_plus/keymaps/default/readme.md
new file mode 100644
index 0000000000..65ffbc82db
--- /dev/null
+++ b/keyboards/checkerboards/quark_plus/keymaps/default/readme.md
@@ -0,0 +1 @@
+The Default Quark_Plus Layout
diff --git a/keyboards/checkerboards/quark_plus/keymaps/via/keymap.c b/keyboards/checkerboards/quark_plus/keymaps/via/keymap.c
new file mode 100644
index 0000000000..165ecbbd53
--- /dev/null
+++ b/keyboards/checkerboards/quark_plus/keymaps/via/keymap.c
@@ -0,0 +1,89 @@
+/* Copyright 2022 Nathan Spears
+ *
+ * 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
+
+// Defines for task manager and such
+#define CALTDEL LCTL(LALT(KC_DEL))
+#define TSKMGR LCTL(LSFT(KC_ESC))
+
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+  /* [0]
+  * ,-----------------------------------------------------------------------------------------.
+  * |------------+------+------+------+------+------+------+------+------+------+------+------|
+  * | TAB       |   Q  |   W  |   E  |   R  |   T  |   Y  |   U  |   I  |   O  |   P  | DEL   |
+  * |------------+------+------+------+------+-------------+------+------+------+------+------|
+  * | CTRL&ESC  |   A  |   S  |   D  |   F  |   G  |   H  |   J  |   K  |   L  |   ;  |  "    |
+  * |------------+------+------+------+------+------|------+------+------+------+------+------|
+  * | SHIFT     |   Z  |   X  |   C  |   V  |   B  |   N  |   M  |   ,  |   .  |   /  | ENTER |
+  * |-------+-------+-------+-------+-------+-------+------+------+------+------+------+------|
+  * |    PRINT   | Ctrl | ALT  | GUI  |LOWER |SPACE |SPACE|RAISE | LEFT | DOWN |  UP  |RIGHT  |
+  * `-----------------------------------------------------------------------------------------'
+  */
+  [0] = LAYOUT_grid(
+      KC_TAB,        KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_DEL,
+      CTL_T(KC_ESC), KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,
+      KC_LSFT,       KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_ENT,
+      KC_PSCR,       KC_LCTL, KC_LALT, KC_LGUI, TT(1),   KC_SPC,  KC_SPC,  TT(2),   KC_LEFT, KC_DOWN, KC_UP,   KC_RGHT
+    ),
+
+  /* [1]
+  * ,---------------------------------------------------------------------------------------.
+  * |------------+------+------+------+------+------+------+------+------+------+------+----|
+  * |   ~    | !    |  @   |  #  |  $   |  %   |  | ^  |  &   |  *  |  (    |  )  | BCKSPC  |
+  * |------------+------+------+------+------+-------------+------+------+------+------+----|
+  * |   \    |    1  |   2  |   3  |   4  |   5  |   6  |   7  |   8  |   9  |   0  |   /   |
+  * |------------+------+------+------+------+------|------+------+------+------+------+----|
+  * |       |       |      |      |      |      |      |   +   |   =  |      |      |       |
+  * |-------+-------+-------+-------+-------+-------+------+------+------+------+------+----|
+  * |     |    | ESC  |CTRL-ALT-DEL|TASK|    |     |     |     |    |  '|'  |   `   |       |
+  * `---------------------------------------------------------------------------------------'
+  */
+  [1] = LAYOUT_grid(
+      KC_TILD, KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, KC_BSPC,
+      KC_SLSH, KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_BSLS,
+      KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_EQL, _______, _______, _______,
+      _______, KC_ESC,  CALTDEL,  TSKMGR, _______, _______, _______, _______, _______, KC_NUBS, KC_GRV, _______
+    ),
+
+  /* [2]
+  * ,---------------------------------------------------------------------------------------.
+  * |------------+------+------+------+------+------+------+------+------+------+------+---|
+  * |       |      |      |  UP  |       |      |     |   _   |     |   [   |  ]    |      |
+  * |------------+------+------+------+------+-------------+------+------+------+------+---|
+  * |       |     | LEFT | DOWN  | RIGHT |     |      |   -  |      |   [   |   ]   |      |
+  * |------------+------+------+------+------+-----+-----+------+------+------+------+-----|
+  * |   F1  | F2 |  F3  |   F4  | F5    | F6  | F7   | F8   | F9    | F10  | F11   | F12   |
+  * |-------+-------+-------+-------+-------+-------+------+------+------+------+------+---|
+  * |RESET |    |      |       |       |     |      |      |       |      |       |        |
+  * `---------------------------------------------------------------------------------------'
+     */
+  [2] = LAYOUT_grid(
+      _______,  _______,  _______,   KC_UP,   _______,   _______,  _______,  KC_UNDS, _______,  KC_LBRC,  KC_RBRC, _______,
+      _______,  _______,   KC_LEFT, KC_DOWN,  KC_RGHT,   _______,  _______,  KC_MINS, _______,  KC_LCBR,  KC_RCBR, _______,
+      KC_F1,    KC_F2,     KC_F3,   KC_F4,    KC_F5,     KC_F6,    KC_F7,    KC_F8,   KC_F9,    KC_F10,   KC_F11,  KC_F12,
+      RESET,    _______,   _______, _______,  _______,   _______,  _______,  _______, _______,  _______,  _______, _______
+    ),
+
+  [3] = LAYOUT_grid(
+      _______, _______, _______,   KC_UP,  _______, _______,  _______,  KC_UNDS, _______,  KC_LBRC,  KC_RBRC, _______,
+      _______, _______, KC_LEFT, KC_DOWN,  KC_RGHT, _______,  _______,  KC_MINS, _______,  KC_LCBR,  KC_RCBR, _______,
+      KC_F1,   KC_F2,   KC_F3,     KC_F4,    KC_F5,   KC_F6,    KC_F7,    KC_F8,   KC_F9,   KC_F10,   KC_F11,  KC_F12,
+      RESET,   _______, _______, _______,  _______, _______,  _______,  _______, _______,  _______,  _______, _______
+    ),
+  };
diff --git a/keyboards/checkerboards/quark_plus/keymaps/via/rules.mk b/keyboards/checkerboards/quark_plus/keymaps/via/rules.mk
new file mode 100644
index 0000000000..69de2e4c5a
--- /dev/null
+++ b/keyboards/checkerboards/quark_plus/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes

diff --git a/keyboards/checkerboards/quark_plus/quark_plus.c b/keyboards/checkerboards/quark_plus/quark_plus.c
new file mode 100644
index 0000000000..036d3a96c5
--- /dev/null
+++ b/keyboards/checkerboards/quark_plus/quark_plus.c
@@ -0,0 +1,35 @@
+/* Copyright 2022 Nathan Spears
+ *
+ * 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 "quark_plus.h"
+
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_kb(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/checkerboards/quark_plus/quark_plus.h b/keyboards/checkerboards/quark_plus/quark_plus.h
new file mode 100644
index 0000000000..4152acbe50
--- /dev/null
+++ b/keyboards/checkerboards/quark_plus/quark_plus.h
@@ -0,0 +1,82 @@
+/* Copyright 2022 Nathan Spears
+ *
+ * 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_grid( \
+    k00, k10, k11, k01, k02, k12, k13, k03, k04, k14, k15, k05, \
+    k20, k30, k31, k21, k22, k32, k33, k23, k24, k34, k35, k25, \
+    k40, k50, k51, k41, k42, k52, k53, k43, k44, k54, k55, k45, \
+    k60, k70, k71, k61, k62, k72, k73, k63, k64, k74, k75, k65 \
+) { \
+    { k00, k01, k02, k03, k04, k05 }, \
+    { k10, k11, k12, k13, k14, k15 }, \
+    { k20, k21, k22, k23, k24, k25 }, \
+    { k30, k31, k32, k33, k34, k35 }, \
+    { k40, k41, k42, k43, k44, k45 }, \
+    { k50, k51, k52, k53, k54, k55 }, \
+    { k60, k61, k62, k63, k64, k65 }, \
+    { k70, k71, k72, k73, k74, k75 } \
+}
+#define LAYOUT_2u( \
+    k00, k10, k11, k01, k02, k12, k13, k03, k04, k14, k15, k05, \
+    k20, k30, k31, k21, k22, k32, k33, k23, k24, k34, k35, k25, \
+    k40, k50, k51, k41, k42, k52, k53, k43, k44, k54, k55, k45, \
+    k60, k70, k71, k61, k62,      k73, k63, k64, k74, k75, k65 \
+) { \
+    { k00, k01, k02, k03, k04, k05 }, \
+    { k10, k11, k12, k13, k14, k15 }, \
+    { k20, k21, k22, k23, k24, k25 }, \
+    { k30, k31, k32, k33, k34, k35 }, \
+    { k40, k41, k42, k43, k44, k45 }, \
+    { k50, k51, k52, k53, k54, k55 }, \
+    { k60, k61, k62, XXX, k64, k65 }, \
+    { k70, k71, XXX, k73, k74, k75 } \
+}
+#define LAYOUT_2x225u( \
+    k00, k10, k11, k01, k02, k12, k13, k03, k04, k14, k15, k05, \
+    k20, k30, k31, k21, k22, k32, k33, k23, k24, k34, k35, k25, \
+    k40, k50, k51, k41, k42, k52, k53, k43, k44, k54, k55, k45, \
+    k60, k70,      k61, k62,           k63, k64,      k75, k65 \
+) { \
+    { k00, k01, k02, k03, k04, k05 }, \
+    { k10, k11, k12, k13, k14, k15 }, \
+    { k20, k21, k22, k23, k24, k25 }, \
+    { k30, k31, k32, k33, k34, k35 }, \
+    { k40, k41, k42, k43, k44, k45 }, \
+    { k50, k51, k52, k53, k54, k55 }, \
+    { k60, k61, k62, k63, k64, k65 }, \
+    { k70, XXX, XXX, XXX, XXX, k75 } \
+}
+#define LAYOUT_2x3u( \
+    k00, k10, k11, k01, k02, k12, k13, k03, k04, k14, k15, k05, \
+    k20, k30, k31, k21, k22, k32, k33, k23, k24, k34, k35, k25, \
+    k40, k50, k51, k41, k42, k52, k53, k43, k44, k54, k55, k45, \
+    k60, k70, k71,      k62,           k63,      k74, k75, k65 \
+) { \
+    { k00, k01, k02, k03, k04, k05 }, \
+    { k10, k11, k12, k13, k14, k15 }, \
+    { k20, k21, k22, k23, k24, k25 }, \
+    { k30, k31, k32, k33, k34, k35 }, \
+    { k40, k41, k42, k43, k44, k45 }, \
+    { k50, k51, k52, k53, k54, k55 }, \
+    { k60, XXX, k62, k63, XXX, k65 }, \
+    { k70, k71, XXX, XXX, k74, k75 } \
+}
diff --git a/keyboards/checkerboards/quark_plus/readme.md b/keyboards/checkerboards/quark_plus/readme.md
new file mode 100644
index 0000000000..6e4ff5f65f
--- /dev/null
+++ b/keyboards/checkerboards/quark_plus/readme.md
@@ -0,0 +1,17 @@
+# Quark_Plus
+
+![Quark_Plus](https://i.imgur.com/4TI6BA0h.png)
+
+The Quark Plus is a premium Quark for those that want more features of the original. It features support for 4 rotary encoders (it is recommended to use 1 per left and right side), LED backlighting, RGB underglow, JST connector, and compatibility for earlier revisions of your favorite ortholinear keyboard.
+
+* Keyboard Maintainer: [Nasp](https://github.com/npspears)
+* Hardware Supported: Quark_Plus
+* Hardware Availability: https://www.checkerboards.xyz
+
+Make example for this keyboard (after setting up your build environment):
+
+    make checkerboards/quark_plus:default
+
+To enter the bootloader, press the hardware button on the back of the PCB just to the left of the USB connector.
+
+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/checkerboards/quark_plus/rules.mk b/keyboards/checkerboards/quark_plus/rules.mk
new file mode 100644
index 0000000000..8ffb43e252
--- /dev/null
+++ b/keyboards/checkerboards/quark_plus/rules.mk
@@ -0,0 +1,20 @@
+# MCU name
+MCU = atmega32u2
+
+# 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 = no            # Enable N-Key Rollover
+BACKLIGHT_ENABLE = yes      # Enable keyboard backlight functionality
+BACKLIGHT_DRIVER = pwm	    # Valid driver values are pwm, software, custom or no
+RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+AUDIO_ENABLE = no           # Audio output
+ENCODER_ENABLE = yes	      # Enable rotary encoder